Merge branch 'master' into gcp-hotfix-test-job

2 jobs for !379 with gcp-hotfix-test-job in 53 minutes and 45 seconds (queued for 2 seconds)
latest merge request