Merge "Fix SonarQube warnings"