Scheduler Fixes
Merge commit '8a0f57a20697b52c177ee6ad5bd8762f73af4cd6' into Scheduler