#12386 Rock War changes