Merge pull request #8266 from eileenmcnaughton/CRM-18482