MAP-3 : Fire custom events
Integrate the MAP-3 branch to fix merge conflicts