Merge branch 'jk/diff-algo-finishing-touches'