Merge branch 'gcp-refactor-vars-unit' into 'master'

Refactor vars for unit (GONRG-1203)

See merge request !131
3 jobs for master in 23 seconds (queued for 2 seconds)