Merge branch 'rc/diff-cleanup-records'