-- fixed for CRM-10983, removed duplicated custom data