Change in scheduler time.
Merge branch 'dev'