Merge commit 'f2331a63c0e7f6ffeedf16185c92a0aeffa5512c' * commit 'f2331a63c0e7f6ffeedf16185c92a0aeffa5512c': Refactor SearchableInfo.
Merge commit 'f2331a63c0e7f6ffeedf16185c92a0aeffa5512c' * commit 'f2331a63c0e7f6ffeedf16185c92a0aeffa5512c': Refactor SearchableInfo.