Merge tag 'v3.3-rc7' into sched/core