configuration EventManager
Merge branch 'myBranch'