Merge branch 'jk/diff-no-rename-empty' into maint