Retain alloc’d and updated data in cpi (#16850)