Merge branch 'hotfix/4232'

Close #4232
fixed setEventManager
Merge pull request #4235 from prolic/patch-3

fixed setEventManager
Merge branch 'hotfix/4235' into develop

Forward port #4235