companion for substrate#7546 (#1954)

* companion for substrate#7546

* update to substrate master
10 jobs for master in 33 minutes and 26 seconds (queued for 3 seconds)