Started fix.1.
Fixed s3 issue.
Merge branch 'fix.1'