Merge "Fixing SonarQube violations"