Merge branch 'jk/add-i-diff-compact-heuristics' into maint