Merge branch 'jc/checkdiff'