Manadatory Weight (#931)

* upsub

* Revert branch change

* Fix some

* Fix build
8 jobs for master in 20 minutes and 52 seconds (queued for 1 second)