Merge "Update settings"