Merge pull request #5499 from colemanw/CRM-16155