Merge "Fixed sl-os-ovs"