Core/Battleground: addition to c28345e279f31af2fa32df2411325ccfabe06fc8