Merge branch 'jk/diff-algo'