Merge branch 'da/mergetool-winmerge' into next