Merge "Add display name and id to traces"