Merge branch 'master' into develop
Case 3794 - Removed empty keywords error, added some validation.
Merge branch 'case-3794' into develop

* case-3794:
  Case 3794 - Removed empty keywords error, added some validation.
Merge branch 'develop'