Merge branch 'jk/diff-algo' into maint