Merge branch 'master' into develop
Case 3196 - Changed entity.
Merge branch 'case-3196' into develop

* case-3196:
  Case 3196 - Changed entity.
Merge branch 'develop'