Merge branch 'WIP.sched/core' into sched/core