Merge "Clear transitions from the map on merge" into main