Update logic.

Andy Marquisrequested to merge
issue/custom_field-3585475:3585475-sdc-ui-patterns-compatibility into 4.0.x

Closes #3585475

Merge request reports