Merge branch 'ps/pathspec-empty-prefix-origin'