Merge branch 'chat-moderation-stable' into chat-moderation