Merge "Clean up statemachine" into jb-mr2-dev