Merge branch 'jc/add-2.0-u-A-sans-pathspec' (early part)