Merge branch 'da/difftool'