Merge "mem leak fix for cpi->tplist"