[stable2509] Backport #9178

[paritytech-release-backport-bot]

Backport #9178 into stable2509 from alexggh.

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

[EgorPopelyaev]

@alexggh Alex, could you please check conflicts here?

[sandreim]

This one cannot be backported without #9929 . But #9929 cannot be backported because it has major semver bump. So closing this ...