Merge "Add data_set for Settings table as well."