PIM-3531: fixing CSV import scenarios