Merge "Add external Preferences indexing"