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

GC changes only

Fix gc containerize-bootstrap

See merge request !631 (merged)

(cherry picked from commit f95451a3)

584970cc ~hotfix for pypi packages installation b2a5dc60 hotfix for pypi packages installation