Merge branch 'jc/diff'