Prepare for chat client
Merge remote-tracking branch 'origin/master' into chat