limited event joining on routes
Merge branch 'master' into github