CSTL-711 : fix issue when importing data/metadata.