Merge pull request #6348 from colemanw/CRM-16204-b