[stable2503] Backport #7075#7681

EgorPopelyaev merged 2 commits into

stable2503paritytech/polkadot-sdk:stable2503from

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