Merge branch 'hotfix/noTalkPage' into develop
Merge branch 'develop'