Interim commit for scheduler changes.