Merge pull request #6548 from eileenmcnaughton/CRM-16512