Merge branch 'nd/struct-pathspec'