Reduce major Sonar issues
Merge branch 'master' into develop