Merge "Fix closure of record thread"