Merge pull request #4695 from colemanw/CRM-15550