Merge branch 'sched/urgent' into sched/core to avoid conflicts with upcoming changes