Merge pull request #6031 from eileenmcnaughton/CRM-16699