[DF-3992] Removed flags control for Entity
[DF-185] Merge