One more fix for duplicates
Merging with fixes for external images backups
Merge branch 'production' of github:Alghayma/Alghayma