Merge "Separate global and override config sent to client"