GONRG-5724 - small fixes

3 jobs for !149 with GONRG-5724-gcp-tests-fix in 15 minutes and 8 seconds (queued for 2 seconds)
latest merge request