Merge "populate attributes when re-writing perf data"