Merge branch 'da/difftool-fixes' into next