Merge branch 'sonar'