Merge branch 'development'
Not using s3 endpoints in development