Merge branch 'da/mergetool-lib'