Case 2230 - Added action buttons.
Merge branch 'case-2230' into new-search

* case-2230:
  Case 2230 - Added action buttons.