Merge pull request #7525 from eileenmcnaughton/CRM-17764