Merge pull request #6492 from eileenmcnaughton/CRM-17020