Merge branch 'jc/retire-compaction-heuristics'