Merge API changes from NavalBattle