Changed default behavior of convention router
Merge branch 'default-event-router'