first step of trace analysis
Merge branch 'trace-analysis'