Merge main into releases/v3

[github-actions[bot]]

Merging 0d5982aa3 into releases/v3.

Conductor for this PR is @rvermeulen.

Contains the following pull requests:

• 2394 (@rvermeulen)

• 2411 (@henrymercer)

• 2412 (@henrymercer)

• 2416 (@henrymercer)

• ~#2417 (@alexet)~

• 2418 (@henrymercer)

• 2419 (@dependabot[bot])

• 2421 (@henrymercer)

Please do the following:

• [x] Ensure the CHANGELOG displays the correct version and date.
• [x] Ensure the CHANGELOG includes all relevant, user-facing changes since the last release.
• [ ] Check that there are not any unexpected commits being merged into the releases/v3 branch.
• [ ] Ensure the docs team is aware of any documentation changes that need to be released.
• [x] Mark the PR as ready for review to trigger the full set of PR checks.
• [ ] Approve and merge this PR. Make sure Create a merge commit is selected rather than Squash and merge or Rebase and merge.
• [ ] Merge the mergeback PR that will automatically be created once this PR is merged.
• [ ] Merge all backport PRs to older release branches, that will automatically be created once this PR is merged.

[rvermeulen]

Reverted #2417 (@alexet) for immediate release. Will be stored in merge backs to main.