3614826-backport-to-4.x

Andy Marquisrequested to merge
issue/custom_field-3614826:3614826-htmlescape-argument-1-backport4.0.x into 4.0.x

Closes #3614826

Merge request reports