no sol tracing for now :(
Merge remote-tracking branch 'upstream/master'