Merge "DO NOT MERGE: Optimize IndirectRefTable." into ics-mr1