Merge branch 'en/do-match-pathspec-fix'