Merge tag 'v3.12-rc5' into perf/core