Merge branch 'sched/clock' into sched/urgent