Merge pull request #7854 from eileenmcnaughton/CRM-18091