Merge pull request #7519 from eileenmcnaughton/CRM-17762