Merge commit 'v2.6.37-rc7' into perf/core