Merge "Share TraceFiles as 1 Zip rather than 8+ Files" into main