First.
Merge old events with new, reorder.
Merge branch 'develop'