Merge "Weaver: functional VTS tests" into oc-dr1-dev