companion for substrate#9788 (#3858)

* companion for https://github.com/paritytech/substrate/pull/9788

* fmt

* Some fixes

* final fixes

* fix a few small things

* update Substrate

Co-authored-by: parity-processbot <>