Add workaround support for dynamic_entity_reference fields

Closes #3441330

Merge request reports

Loading