Merge pull request #720 from wolfmanjm/feature/on_halt_actions_to_switch