Merge branch 'jc/fixdiff'