Updated to support s3 upload.
Merge branch 'test' into dev