Merge "Add OTI event-handler project"