Merge "Sonar Major issues"