Merge pull request #3974 from ZappoMan/librarization

Librarization of Entities Rendering