Merge pull request #7857 from eileenmcnaughton/CRM-18096