Merge branch 'da/mergetool-tool-help'