Merge pull request #7616 from eileenmcnaughton/CRM-17837