Make is possible to switch state machines

Huh? Did anyone ever test this?
Merge remote-tracking branch 'origin/2.0'