[#15972] Security update for entity api
Merge pull request #142 from previousnext/15972-entity-update

[#15972] Security update for entity api