Merge change Iccd6c010

* changes:
  Make the traige process for self-verification found divergence easier.