Merge "Fix handling of some corner cases in TracePipeline" into main