[v1.12] Backport #6205#6242

ggwpez wants to merge 2 commits intorelease-crates-io-v1.12.0paritytech/polkadot-sdk:release-crates-io-v1.12.0from

oty-backport-6205-to-1.12paritytech/polkadot-sdk:oty-backport-6205-to-1.12Copy head branch name to clipboard