-- fixed for CRM-10983, prevent the generation of duplicate custom data.