Merge pull request #6394 from colemanw/CRM-14599