Modify Scheduler to better support startup
Merge branch 'schedulerStartup'