Fixed scheduler to use the device class.
Merge remote-tracking branch 'origin/master'