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