Merge branch 'jk/clean-d-pathspec' into maint