task: #3611475 Storing entity storage as a class property is not recommended

Steven Ayersrequested to merge
issue/name-3611475:3611475-storing-entity-storage into 2.0.x

By: bluegeek9

Closes #3611475

Merge request reports