Merge main into releases/v3

[github-actions[bot]]

Merging 7e2780741 into releases/v3.

Conductor for this PR is @angelapwen.

Contains the following pull requests:

• 2438 (@angelapwen)

• 2441 (@angelapwen)

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.
• [x] Check that there are not any unexpected commits being merged into the releases/v3 branch.
• [x] 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.
• [x] 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.