Merge branch 'nd/struct-pathspec' into next