Output trace when failing in tracker
Merge remote-tracking branch 'origin/master'