Merge "Remove special case for replaced transitions" into main