Fixed 4713: Sync event manager to -x v3.0

Sync event manager to -x v3.0