Merge branch 'cp/add-u-pathspec' into maint