Merge commit 'v3.0-rc5' into sched/core