Merge change I38e951b6

* changes:
  Write HierarchyViewer's data in UTF-8.