Merge "Flag the CTS for thread cleanup" into main