[FIX][T4494] Revamped some logics in the importer

Merged Hermes requested to merge T4494 into 12.0
  1. Jun 05, 2024