Merge change 7406 into donut

* changes:
  Update Searchables test with new GlobalSearch name