[stable2412] Backport #7075#7680

EgorPopelyaev merged 2 commits into

stable2412paritytech/polkadot-sdk:stable2412from

backport-7075-to-stable2412paritytech/polkadot-sdk:backport-7075-to-stable2412Copy head branch name to clipboard