UI3292 fixed issues CHAT-26 and CHAT- 22