fix bad merge
tracing improvements
merge from 1.2