[stable2503] Backport #8020

[paritytech-release-backport-bot]

Backport #8020 into stable2503 from claravanstaden.

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-8020-to-stable2503
git worktree add --checkout .worktree/backport-8020-to-stable2503 backport-8020-to-stable2503
cd .worktree/backport-8020-to-stable2503
git reset --hard HEAD^
git cherry-pick -x 0f3f611ed8b58be9e6c1d96694719b6c6fda3a62
git push --force-with-lease

[acatangiu]

Let's wait on #8089 to make sure CI is green before we merge any other PRs to 2503