Patch to solve CRM-13596