case 3010 - Notice fixed.
Merge branch 'case-3010' into new-search

* case-3010:
  case 3010 - Notice fixed.