Merge branch 'nd/attr-pathspec-fix' into maint