Merge tag 'v5.4-rc7' into sched/core, to pick up fixes