Merge "Small change to CTS" into klp-modular-dev