Update handling of synonymous fields

Closes #3584018

Merge request reports

Loading