[CTPP] TAZ delineation update