Merge branch 'modify-config.md-for-S3' into 'develop'