Merge "[Settings] Allow more user to take responsibility"