Merge change 7171

* changes:
  Add real info.