Merge from trunk + rename the event. Not tested yet.