Support new event changes
Merge branch 'refs/heads/develop'