Merge branch 'jc/diff' into next