Merge "Prevent merging transitions if we don't handle it" into main