Fix render problem in chat
Compiled Version
Merge master into compiled