Tweak Sonar configuration
Merge branch 'sonar'