s3 fixes
merge with develop
merge with develop