Merge branch 'case-2788' into new-search

* case-2788:
  Case 2788 - Added new show more/less buttons.