Backport for the game engine with solutions from our latest project