Merge "Fix QC vts test failure" into sc-dev