Merge changes made in technic_game