Issue #379
Replace Java Uploader