Improved upload to s3.
Merge branch 'test' into dev