[23468] Update after 3.3.1

[cferreiragonz]

Description

@Mergifyio backport 3.4.x

Contributor Checklist

• Commit messages follow the project guidelines.
• N/A: Changes do not break current interoperability.
• N/A: New feature has been documented/Current behavior is correctly described in the documentation.
• Applicable backports have been included in the description.

Reviewer Checklist

• The PR has a milestone assigned.
• The title and description correctly express the PR's purpose.
• Check contributor checklist is correct.
• CI passes without warnings or errors.

[rsanchez15]

@Mergifyio backport 3.4.x

[mergify]

backport 3.4.x

✅ Backports have been created

Details

• #232 [23468] Update after 3.3.1 (backport #230) has been created for branch 3.4.x but encountered conflicts

Cherry-pick of a76acad has failed:

On branch mergify/bp/3.4.x/pr-230
Your branch is up to date with 'origin/3.4.x'.

You are currently cherry-picking commit a76acad.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	both modified:   .github/pull_request_template.md
	deleted by us:   .github/workflows/nightly-ubuntu-ci.yml
	deleted by us:   .github/workflows/nightly-windows-ci.yml

no changes added to commit (use "git add" and/or "git commit -a")

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally