CRM-14398 ... export issues