Merge "Introduce TransitionKey" into main