BK-1185 Show user chat in the editor
Merge branch 'BK1185' into 2.0