Merge commit 'v2.6.29-rc4' into tracing/core