Fix errors in uploading files for a product
Merge branch 'dranzd/fix/file-upload'