branchbefore/main/combat_revampcancel