Merge pull request #4297 from colemanw/CRM-15412