Merge branch 'master' into develop
Case 2855 - Removed ?text= in search.
Merge branch 'case-2855' into develop

* case-2855:
  Case 2855 - Removed ?text= in search.
Merge branch 'develop'