Merge branch 'rs/maint-archive-match-pathspec' into maint