Merge "[Thread] fix CTS for U branches" into main