Merge remote-tracking branch 'origin/master' into gcp-fix-sonar-comments

2 jobs for !62 with gcp-fix-sonar-comments in 48 minutes and 50 seconds (queued for 2 seconds)
merge request