Merge release/3.0.0 additions into trunk to unblock

[felixarntz]

This is simply a merge of #1111 and #1112 from the 3.0.0 release branch into trunk.

Normally we would only do this after the 3.0.0 release, but because #1112 avoids CI failures in trunk and #1111 unblocks working on #1032, it makes sense to already merge these two changes back at this point.

[github-actions]

The following accounts have interacted with this PR and/or linked issues. I will continue to update these lists as activity occurs. You can also manually ask me to refresh this list by adding the props-bot label.

If you're merging code through a pull request on GitHub, copy and paste the following into the bottom of the merge commit message.

Co-authored-by: felixarntz <flixos90@git.wordpress.org>
Co-authored-by: westonruter <westonruter@git.wordpress.org>
Co-authored-by: joemcgill <joemcgill@git.wordpress.org>

To understand the WordPress project's expectations around crediting contributors, please review the Contributor Attribution page in the Core Handbook.

[joemcgill]

This seems fine to me, though we'll need to make sure that the version bumps that get made to update the @since values also get merged back to trunk after the release. This should happen automatically if the release steps in the handbook are followed, but want to make sure we're keeping an eye on it.