Merge tag 'v5.7-rc7' into perf/core, to pick up fixes