Merge pull request #6763 from eileenmcnaughton/CRM-17242