Merge branch 'da/difftool-fixes'