MARI-39 MARI-38 added support for chat service for client