Integration of TW-26207 into tc7