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