Merge branch 'doc-search-paths-35306'