Merged changes in `Event` made by Luca Sirri