Merge branch 'release/1.0.1' into develop
update to use s3_file
Merge branch 'release/1.0.2'