Merging upstream/master to dev

- Brings in scheduler changes that were in `master` but not `dev`