[stable2412] Backport #7947

[paritytech-release-backport-bot]

Backport #7947 into stable2412 from alistair-singh.

See the documentation on how to use this bot.

[paritytech-release-backport-bot]

Please cherry-pick the changes locally and resolve any conflicts.

git fetch origin backport-7947-to-stable2412
git worktree add --checkout .worktree/backport-7947-to-stable2412 backport-7947-to-stable2412
cd .worktree/backport-7947-to-stable2412
git reset --hard HEAD^
git cherry-pick -x 13cb4a31f77a14ea1bec880a7369a59432afaec9
git push --force-with-lease

[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 not need an 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.

[acatangiu]

@alistair-singh please fix conflicts on the backport

[alistair-singh]

@alistair-singh please fix conflicts on the backport

Merge conflicts addressed in #8270