Merge branch 'rs/archive-excluded-directory' into maint