Merge "Add TraceConfig trace starts" into main