Fixed typo in parallel_uploads
Merge branch 'test' into dev