Various backports and alignments with polkadot-sdk (which does not depend on crates.io versions)

Various backports and alignments with polkadot-sdk (which does not depend on crates.io versions) #173