Merge pull request #10003 from eileenmcnaughton/cust_date2