Merge branch 'master' into record_last_compaction