Merged configs after sonar upgrade