Merge pull request #4245 from colemanw/CRM-15365