Merge branch 'hotfix/1.1.2'
s3_key support cloudfront
Merge branch 'hotfix/1.1.3' into develop