Merge "ObjPtr misc cleanup"