Merge pull request #5210 from eileenmcnaughton/CRM-15996