[stable2503] Backport #9094#9155

EgorPopelyaev merged 2 commits intostable2503paritytech/polkadot-sdk:stable2503from

backport-9094-to-stable2503paritytech/polkadot-sdk:backport-9094-to-stable2503Copy head branch name to clipboard