Merge pull request #8092 from eileenmcnaughton/CRM-18368