Added image list propperly for s3.
Merge branch 'test' into dev