Merge pull request #6088 from eileenmcnaughton/CRM-16473