Merge pull request #7946 from eileenmcnaughton/CRM-18106