Merge pull request #4609 from colemanw/CRM-15618