Merge pull request #15711 from eileenmcnaughton/cust_ug