Merge pull request #6377 from colemanw/CRM-16447