Added fallback for bundle fields which are not in the field map.

Closes #3522951

Merge request reports

Loading