Merge "Rollout and test the config change"