events for osd
merged with master