Merge remote-tracking branch 'public/tags/tracing-pull-request' into staging