Issue #3225695: Support entity types whose entity bundle type does not end with `_type` and entities without created date