Merge "Support record-tgid"