3503075 port single value fallback on multi-value fields to 2.0.x

Closes #3503075 for 2.0.x branch

Merge request reports

Loading