PreEntityLoaded
Merge branch 'PreEntityLoaded'