--HR-379 Import improvement changes
Merge pull request #708 from NileemaJadhav/HR-379

--HR-379 Import improvement changes