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