Very LARGE Sonar syntax bugfix
Merge branch 'bugfix-fix_Sonar_Bugs' into develop