Merge branch 'da/mergetool-diff-order'