Merge commit 'v2.6.33' into tracing/core