bundle update
Fixed uploaders
Merge branch 'develop'