Fix #348, #474, #557, #740, #928: improved deduplication logic to prevent...

Fix #348, #474, #557, #740, #928: improved deduplication logic to prevent skipped files during import