Merge "Fix vts tests:" into oc-dev