Issue #2249723 by andrei.dincu: Check if field type exists in an entity_type and then add condition for bundles