[cvs-nhc98] patch applied (yhc): Added self-resetting (based on event type and target) event handler