scheduler updates
Merge remote branch 'upstream/master'