Merge branch 'da/mergetool-temporary-directory'