Merge "Fix SonarQube Violations"