Merge "Sonar major issues"