Merge pull request #6936 from eileenmcnaughton/CRM-14720