Fixed white magic
Merge remote-tracking branch 'origin/battle_test' into battle_test