[Bug #8488] - Offer possibility to add samples for event types
Merge remote branch 'upstream/master'