Merge "Fix malformed trace section" into main