Update Match to take into account a number of misunderstandings of tactic execution in 8.4 and 8.4pl1
