Merge branch 'da/mergetool-trust-exit-code' into maint