Fixed eventplot issues
#22286
+32
−8
Merged
eventplot issues
#22286
eventplot issues
#22286