Merge branch 'master' into core-and-module-updates-
update scheduler
update core
Merge branch 'core-and-module-updates-'