Merge pull request #7839 from eileenmcnaughton/CRM-18078