930 Commits (refactor/missing-events)