Merge "Fix mismatch in Transition ID/instances"