Merge pull request #8119 from eileenmcnaughton/CRM-18303