Update scheduling from develop branch
Merge remote-tracking branch 'origin/release/0.8' into release/0.8