Merge branch 'jk/diff-files-assume-unchanged' into maint