case 3003 - Add context for update handling.
Merge branch 'case-3003' into new-search

* case-3003:
  case 3003 - Add context for update handling.