Merge branch 'da/difftool-updates'