Merge pull request #1542 from winzou/state-machine

Soft apply the create transition on FinalizeStep
Move from Finite to SM