Refactoring gcp part.

3 jobs for !116 with gcp-refactoring in 21 minutes and 12 seconds (queued for 2 seconds)
latest merge request