Merge pull request #5322 from colemanw/CRM-15932