Merge branch 'jc/fix-diff-files-unmerged'