Merge pull request #2810 from jmarshallnz/eval_conditions_before_actions