Merge branch 'gcp-fix-sonar-comments' into 'master'

Gcp fix sonar comments (GONRG-1370)

See merge request !51
20 jobs for master in 26 minutes and 28 seconds (queued for 3 seconds)