Merge "Add handler callbacks to StateMachine"