Backport polkadot-sdk
changes to master
#2519
Merged
polkadot-sdk
changes to master
#2519