Merge branch 'sched/balancing' into sched/core