Merge branch 'fix-gsa-challenge' into 'master'

GCP release/0.5 - fix GSA Challenge (GONRG-1796)

See merge request !67
21 jobs for master in 55 minutes and 56 seconds (queued for 1 second)