Merge "Do not replicate Sonar config"