Fixing event ordering
Merge branch 'develop'