Ensure that base field overrides are handled correctly

Closes #3610902

Merge request reports

Loading