Merge branch 'jk/test-suite-tracing'