Merge branch 'jc/diff-algo-attribute'