Merge "General sonar fixes"