Merge branch 'da/mergetool-xxdiff-hotkey' into maint