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