Merge branch 'Features/chat' into develop
Merge branch 'develop' into Features/chat