Merge pull request #6456 from eileenmcnaughton/CRM-16993