Resolve #3577332 "Field entity override follow up"

Closes #3577332

Merge request reports

Loading