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

* case-3196:
  Case 3196 - Code review.
  Case 3196 - Changed entity.