Merge prefetch-results branch & small update to docs