CDB-4425 Fixing OOM scenario upon import