Merge change 6907 into donut

* changes:
  Initialize searchmanager on demand