Event ordering
Merge branch 'hotfix/user-ordering'