Activation events sent and handled
Merge branch 'origin/master'