Merge branch 'gk/tracing-optimization'