Merge pull request #4603 from colemanw/CRM-15633