Merge "Fix VTS test" into sc-dev