Merge "Handle redirects during prefix search exact match"