Merge commit 'v2.6.34-rc7' into tracing/core