Merge branch 'zj-format-chat-messages' of gitlab.com:gitlab-org/gitlab-ce into zj-format-chat-messages