Merge branch 'sched/urgent' into locking/core, to pick up scheduler fix we rely on