tpt++ changes also included in 29.6