use upperPoint
Merge branch 'trace-analysis'