Import docker-gc-build branch