Merge pull request #7623 from eileenmcnaughton/CRM-17850