Merge branch 'feature/stabilization'
Merge branch 'master' into feature/stabilization
UI-3292 Fixe bug for issue CHAT-18
Merge commit '2c64360b1018b4b29cb8ba7a7046016ca0abc516' into HEAD