fix chat board.
Merge branch 'fix/chat' into develop