Update event mapping on-the-fly
Merge remote-tracking branch 'origin/master'