update EventManagerService
Merge branch 'master' into nomodul