Merge pull request #3240 from eileenmcnaughton/CRM-14197