Merge pull request #5344 from eileenmcnaughton/CRM-16082