Merge "Fix Vts errors" into oc-dev