Issue #2137801 by Berdir: Refactor entity storage to load field values before instantiating entity objects