Fixed S3 proxy bug
Merging