Merge '3d-game-world' into develop