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