Merge "Include name prefix in search index"