Merge "Fix vts tests:" into oc-dr1-dev