Merge branch 'fix-chat' into 'develop'