Merging StateMachine.xml versions with the probable newer version
Fixing application behavior will follow