Merge "[Settings] Adjust code for performance"