Fix product download inserted multiple times
Code cleanup
Merge pull request #1941 from shaffe-fr/1.6

[-] CORE : duplicated product downloads