Merge pull request #14726 from eileenmcnaughton/cust_field_5