Merge "Fix major Sonar issues"