Merge branch 'lf/setup-prefix-pathspec' into maint