oops! forgot to link Object Manager and Event Manager
Merge branch 'fix-internal-dispatching' into development