Merge pull request #8159 from eileenmcnaughton/CRM-18428