Merge "Various CTS fixes" into klp-modular-dev