Merge branch 'master' into MM-47853-true-up-review-telemetry-off-non-air-gapped

api4/channel_category_test.go

@@ -103,7 +103,6 @@ func TestCreateCategoryForTeamForUser(t *testing.T) {
 	})
 
 	t.Run("should publish expected WS payload", func(t *testing.T) {
-		t.Skip("MM-42652")
 		userWSClient, err := th.CreateWebSocketClient()
 		require.NoError(t, err)
 		defer userWSClient.Close()