Fixed behavior on S3 fail
Merge remote-tracking branch 'origin/dev' into dev