Fixed listing for s3 images.
Merge branch 'test' into dev