Merge branch 'jc/diff-algo-cleanup' into maint