GC: Cherry pick to release 0.25

Yan Sushchynski [EPAM/GC]requested to merge
cherry-pick-release-0.25 into release/0.25

Original MRs: !59 (merged) and !60 (merged)

Fix config map for GC

Cherry-picks:

Edited by David Diederich

Merge request reports