Merge change 1063 into donut

* changes:
  Refactor SearchableInfo.