Merge remote-tracking branch 'stefanha/tracing' into staging