Merge commit '3cf2f34' into sched/core, to fix build error