s3 configuration
Merge branch 'develop'