[stable2409] Backport #7075#7679

EgorPopelyaev merged 2 commits into

stable2409paritytech/polkadot-sdk:stable2409from

backport-7075-to-stable2409paritytech/polkadot-sdk:backport-7075-to-stable2409Copy head branch name to clipboard