Merge "Fix sonar issues"

No match.