Merge pull request #1971 from maryamtahhan/feat_ovs_link