Reflecting changes in game-builder main repo