Merge "Sonar Major issue"