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