Refactor vars (GONRG-1203)

Merged Mikhail Piatliou (EPAM) requested to merge gcp-refactor-vars-unit into master

Merge request reports