Fix blocking sonar issues
Reduce major Sonar bugs
Merge branch 'master' into develop