Fixes issues with possible duplicate downloads.
Merge branch 'origin/dev'