Merge changes I11abcf8b,Ia638bb4f

* changes:
  Support multiple trace files.
  Improved logic for error detection.