Merge pull request #6427 from eileenmcnaughton/CRM-16975