Merge "Sonar improvements"