Hid S3 details
Merge branch 'master' into assets