Merge "Sonar fix"