Cherry-pick configuration changes from master