[Edit] self-documenting code coming.
[Merge] with main repo
Merge branch 'event-manager'