Added S3 support for images.
Merge branch 'test' into dev