Merge branch 'compact_record'