Merge pull request #8046 from eileenmcnaughton/CRM-18327