Merge "Fix malformed trace sections" into main