Merge "Add indexable setting items"