Merge branch 'jt/avoid-prefetch-when-able-in-diff'