tier0 state transition
Merge pull request #5456 from ticoann/fix_state_transition

tier0 state transition