Issue #3076862: Avoid depending on 'field_' field name prefix for determining bundle fields

Closes #3076862

Merge request reports

Loading