Merge branch 'fix-gc-bootstrap' into 'master'

Aliaksandr Ramanovich (EPAM)requested to merge
cherry-pick-d4abf357 into release/0.25

GC changes only

hotfix to avoid image build errors

See merge request !463 (merged)

(cherry picked from commit d4abf357)

e2e7e889 hotfix to avoid image build errors

Merge request reports