LPS-40289 Apply the same for import