Merge branch 'main' into combined-prs-branch

Author: bot-githubaction

Diff for: .github/workflows/combine-dependabot-prs.yml

@@ -19,5 +19,5 @@ jobs:
       - name: combine-dependabot-prs
         uses: github/[email protected]
         with:
-          branch_regex: ^(dependa|wrapper)bot\/.*$
+          branch_regex: ^(dependa|wrapper|upgrade)bot\/.*$
           github_token: ${{ secrets.GH_BOT_GITHUB_TOKEN }}