Merge branch 'jk/diff-compact-heuristic'