Use s3 of uploading people avatar
Merge branch 'MH-1043' into dev