Companion for #5412 (#942)

* Fixes for democracy using Scheduler

* Revert branch change
8 jobs for master