Merge "Fix most sonar issues"