Merge branch '2974_broken_war_opening'