Merge "Sonar issues"