Merge "Fix transport override" into main