Backport #4812 and #5189 into stable

[ggwpez]

Backport #4812 and #5189 to fix the CI.

[github-actions]

This pull request is amending an existing release. Please proceed with extreme caution,
as to not impact downstream teams that rely on the stability of it. Some things to consider:

• Backports are only for 'patch' or 'minor' changes. No 'major' or other breaking change.
• Should be a legit fix for some bug, not adding tons of new features.
• Must either be already audited or trivial (not sure audit).

Emergency Bypass

If you really need to bypass this check: add validate: false to each crate
in the Prdoc where a breaking change is introduced. This will release a new major
version of that crate and all its reverse dependencies and basically break the release.