Issue #3126343 by drewble, amateescu, joseph.olstad, joshuami: Scheduler needs to maintain its base fields properly
Closes #3126343