Fix cursor handling in ClusterEventService
#26089
+28
−24
Merged