Merge "Prepare a transition before starting it" into main