Merge pull request #6603 from eileenmcnaughton/CRM-17092