Merge tag 'v6.6-rc4' into perf/core, to pick up fixes