Merge branch 'jn/add-2.0-u-A-sans-pathspec'