Merge pull request #6323 from eileenmcnaughton/CRM-16923