Merge remote-tracking branch 'remotes/stefanha-gitlab/tags/tracing-pull-request'...