Merge "Add drop_event support"