Merge "Do not reuse fragment indices." into nyc-support-25.4-dev