Fix reference to scheduler in main
Merge branch 'develop' into setup