Merge branch 'rs/empty-archive' into maint