Merge change Idc84bb2b

* changes:
  Fix trace builder to not confuse self-verification.