Merge "Revise CTS Verifier message" into tm-dev