Merge pull request #5304 from colemanw/CRM-15932