Cleaned up Rescued lookup logic, and allowed parallel lookups.
Merge commit 'a8447060fed8f6a2381c98ec3f981f826b7a6b9f'
Pulling in changes from shine.