Merge "Fix the CtsVerifier issue" into sc-v2-dev