Merge "Change indirect reference table to use ObjPtr"