Merge pull request #4711 from colemanw/CRM-15720