fixed setEventManager
Merge branch 'hotfix/4235' into develop

Forward port #4235