Merge branch 'DOS63936' into 'master'

Corrects some remaining sonarqube bug reports

See merge request !118
1 job for v2.7.0 in 6 minutes and 42 seconds
latest