TDI-29986 : Fix problems of import items