Merge pull request #4562 from colemanw/CRM-15597