faster timeout for uploads/override S3_BUCKET
merged conflicts