Merge branch 'hotfix/userinfo' into develop
userinfo
Merge branches 'develop' and 'master'