Merge branch 'jm/mergetool-pathspec' into next