Merge "Fix type of cot_desc_ptr" into integration