Merge pull request #2181 from maryamtahhan/feat_ovs_events_dispatch_option