Merge "Filter out old legacy trace files" into main