Merge "Add indexing for Settings (Part 1)"