Cherry-pick: Merge branch 'Yauhen_Shaliou-master-patch-85546' into 'release/0.23'

gcp to gc renaming

See merge request !135 (merged)

(cherry picked from commit 07cdd126)

ae115dbb gcp to gc renaming