Merge pull request #5487 from eileenmcnaughton/CRM-16165