Merge pull request #4983 from colemanw/CRM-15842