Merge pull request #8057 from eileenmcnaughton/CRM-18341