Merge pull request #12127 from eileenmcnaughton/cust_generic