Merge "Fix malformed trace section" into tm-qpr-dev