Case 3196 - Entity fixes.
Merge branch 'case-3196' into easy

* case-3196:
  Case 3196 - Entity fixes.