Merge "No environment reset for failure after prefetch hit"