Merge pull request #4911 from colemanw/CRM-15802