Pulling changes from AiBattleground master