Evaluate conditional actions in a block, then execute them
Merge pull request #2810 from jmarshallnz/eval_conditions_before_actions

Eval conditions before actions