Merge branch 'hotfix/1.2.8'
Add avatar s3 key
Merge branch 'hotfix/1.2.9' into develop