Merge "Fix a CtsVerifier crash issue" into sc-v2-dev