Merge "Move Heap parameters to ObjPtr"