Merge pull request #4703 from colemanw/CRM-13611