Merge "Fix sonar violations"