Issue #3076862 by simeonkesmev: Avoid depending on 'field_' field name prefix for determining bundle fields
mentioned in commit 2064289b