Merge branch 'ks/difftool-dir-diff-copy-fix' into maint