Merge pull request #7925 from eileenmcnaughton/CRM-18166