Merge commit 'v2.6.32-rc5' into perf/probes