Merge branch 'case-2784' into new-search

* case-2784:
  case 2784 - Handle changes of search provider.
case 2784 - Bugfix for IE9.