Merge tag 'v3.4-rc4' into perf/core