Merge branch 'hotfix/hotfix'
Chats fix
Merge branch 'hotfix/hotfix' into develop