Issue #3280776: Stop passing the entity storage in batch initialization to avoid getEntityClass() must be of the type string, null returned