Merge branch 'da/mergetool-tests'