Merge pull request #2130 from maryamtahhan/issue_ovs_events_2127