Merge "Sonar major issue"