Soft apply the create transition on FinalizeStep

Fix #1537
Replace #1537