Merge release/v2.30.1 into master

[serban-nicusor-toptal]

Submission Checklist

• [ ] Run unit tests
• Documentation
  • [ ] If a user-facing facing change was made, the documentation PR is here:
  • [ ] OR, no user-facing changes were made

Release notes

Replace this text with a short note on what will change if this pull request is merged. This will be included in the release notes.

Copyright and Licensing

By submitting this pull request, the copyright holder is agreeing to license the submitted work under the BSD 3-clause license (https://opensource.org/licenses/BSD-3-Clause)

[WardBrian]

We can't merge this branch directly due to the cherry-picking. We need to cherry-pick just 60c5597a544771416354418d3a3dbe7f9915fcd9 into its own branch and merge that

[serban-nicusor-toptal]

I just realised after seeing all the commits, doing it now.