Merge commit 'v2.6.35-rc4' into perf/core