Merge "Return DiffStatus from FilterOutRenamedRecordFields"