Merge "Fix prefetched items being evicted by non-prefetch" into nyc-mr1-dev