This release is again in an non-working state

More work on the state machine transition