trace bug
Merge branch 'haosun'
debug