Case 2882 - Code review.
Merge branch 'case-2882' into new-search

* case-2882:
  Case 2882 - Code review.