Merge branch 'da/difftool-mergtool-refactor'