Merge "Reduce IndirectReferenceTable memory usage"