More GT work in TSG workflows