Retry 400 RequestTimeouts from S3
Merge branch 'retry-400-timeout' into develop

* retry-400-timeout:
  Retry 400 RequestTimeouts from S3