Merge branch 'sched/locking' into sched/core