Merge pull request #6577 from eileenmcnaughton/CRM-17071