[stable2506] Backport #9731#10010

EgorPopelyaev merged 2 commits intostable2506paritytech/polkadot-sdk:stable2506from

backport-9731-to-stable2506paritytech/polkadot-sdk:backport-9731-to-stable2506Copy head branch name to clipboard