Comanion for substrate/pull/6173 (#1184)

* Make it work

* Upsub
7 jobs for master in 21 minutes and 31 seconds (queued for 1 second)