diff --git a/extensions/git/package.json b/extensions/git/package.json
index a4afad8facb..61575483e42 100644
--- a/extensions/git/package.json
+++ b/extensions/git/package.json
@@ -911,7 +911,8 @@
         "git.autofetch": {
           "type": "boolean",
           "description": "%config.autofetch%",
-          "default": false
+          "default": false,
+          "tags": ["backgroundOnlineFeature"]
         },
         "git.confirmSync": {
           "type": "boolean",
diff --git a/extensions/typescript-language-features/package.json b/extensions/typescript-language-features/package.json
index 78377f20166..46bca84de1a 100644
--- a/extensions/typescript-language-features/package.json
+++ b/extensions/typescript-language-features/package.json
@@ -73,7 +73,8 @@
           "type": "boolean",
           "default": false,
           "description": "%typescript.disableAutomaticTypeAcquisition%",
-          "scope": "window"
+          "scope": "window",
+          "tags": ["backgroundOnlineFeature"]
         },
         "typescript.npm": {
           "type": [
diff --git a/src/vs/platform/configuration/common/configurationRegistry.ts b/src/vs/platform/configuration/common/configurationRegistry.ts
index ef37ffe80d5..0c63a065226 100644
--- a/src/vs/platform/configuration/common/configurationRegistry.ts
+++ b/src/vs/platform/configuration/common/configurationRegistry.ts
@@ -78,6 +78,7 @@ export interface IConfigurationPropertySchema extends IJSONSchema {
 	scope?: ConfigurationScope;
 	notMultiRootAdopted?: boolean;
 	included?: boolean;
+	tags?: string[];
 }
 
 export interface IConfigurationNode {
diff --git a/src/vs/platform/telemetry/common/telemetryService.ts b/src/vs/platform/telemetry/common/telemetryService.ts
index 0b8470198a3..0edfc7c942b 100644
--- a/src/vs/platform/telemetry/common/telemetryService.ts
+++ b/src/vs/platform/telemetry/common/telemetryService.ts
@@ -167,7 +167,8 @@ Registry.as<IConfigurationRegistry>(Extensions.Configuration).registerConfigurat
 		'telemetry.enableTelemetry': {
 			'type': 'boolean',
 			'description': localize('telemetry.enableTelemetry', "Enable usage data and errors to be sent to Microsoft."),
-			'default': true
+			'default': true,
+			'tags': ['backgroundOnlineFeature']
 		}
 	}
 });
\ No newline at end of file
diff --git a/src/vs/platform/update/node/update.config.contribution.ts b/src/vs/platform/update/node/update.config.contribution.ts
index 86ad52731dc..42e989b58e7 100644
--- a/src/vs/platform/update/node/update.config.contribution.ts
+++ b/src/vs/platform/update/node/update.config.contribution.ts
@@ -21,18 +21,21 @@ configurationRegistry.registerConfiguration({
 			'enum': ['none', 'default'],
 			'default': 'default',
 			'scope': ConfigurationScope.APPLICATION,
-			'description': nls.localize('updateChannel', "Configure whether you receive automatic updates from an update channel. Requires a restart after change.")
+			'description': nls.localize('updateChannel', "Configure whether you receive automatic updates from an update channel. Requires a restart after change."),
+			'tags': ['backgroundOnlineFeature']
 		},
 		'update.enableWindowsBackgroundUpdates': {
 			'type': 'boolean',
 			'default': true,
 			'scope': ConfigurationScope.APPLICATION,
-			'description': nls.localize('enableWindowsBackgroundUpdates', "Enables Windows background updates.")
+			'description': nls.localize('enableWindowsBackgroundUpdates', "Enables Windows background updates."),
+			'tags': ['backgroundOnlineFeature']
 		},
 		'update.showReleaseNotes': {
 			'type': 'boolean',
 			'default': true,
-			'description': nls.localize('showReleaseNotes', "Show Release Notes after an update.")
+			'description': nls.localize('showReleaseNotes', "Show Release Notes after an update."),
+			'tags': ['backgroundOnlineFeature']
 		}
 	}
 });
diff --git a/src/vs/workbench/electron-browser/main.contribution.ts b/src/vs/workbench/electron-browser/main.contribution.ts
index 6ef42882159..e6ed4bc6b2a 100644
--- a/src/vs/workbench/electron-browser/main.contribution.ts
+++ b/src/vs/workbench/electron-browser/main.contribution.ts
@@ -488,7 +488,8 @@ configurationRegistry.registerConfiguration({
 			'type': 'boolean',
 			'description': nls.localize('enableNaturalLanguageSettingsSearch', "Controls whether to enable the natural language search mode for settings."),
 			'default': true,
-			'scope': ConfigurationScope.WINDOW
+			'scope': ConfigurationScope.WINDOW,
+			'tags': ['backgroundOnlineFeature']
 		},
 		'workbench.settings.settingsSearchTocBehavior': {
 			'type': 'string',
diff --git a/src/vs/workbench/parts/extensions/electron-browser/extensions.contribution.ts b/src/vs/workbench/parts/extensions/electron-browser/extensions.contribution.ts
index 3e42ab38486..51008b00d24 100644
--- a/src/vs/workbench/parts/extensions/electron-browser/extensions.contribution.ts
+++ b/src/vs/workbench/parts/extensions/electron-browser/extensions.contribution.ts
@@ -206,7 +206,8 @@ Registry.as<IConfigurationRegistry>(ConfigurationExtensions.Configuration)
 				type: 'boolean',
 				description: localize('extensionsAutoUpdate', "Automatically update extensions."),
 				default: true,
-				scope: ConfigurationScope.APPLICATION
+				scope: ConfigurationScope.APPLICATION,
+				tags: ['backgroundOnlineFeature']
 			},
 			'extensions.ignoreRecommendations': {
 				type: 'boolean',
@@ -216,7 +217,8 @@ Registry.as<IConfigurationRegistry>(ConfigurationExtensions.Configuration)
 			'extensions.showRecommendationsOnlyOnDemand': {
 				type: 'boolean',
 				description: localize('extensionsShowRecommendationsOnlyOnDemand', "When enabled, recommendations will not be fetched or shown unless specifically requested by the user."),
-				default: false
+				default: false,
+				tags: ['backgroundOnlineFeature']
 			},
 			'extensions.closeExtensionDetailsOnViewChange': {
 				type: 'boolean',
diff --git a/src/vs/workbench/services/crashReporter/electron-browser/crashReporterService.ts b/src/vs/workbench/services/crashReporter/electron-browser/crashReporterService.ts
index 2b63e252efb..b0997699777 100644
--- a/src/vs/workbench/services/crashReporter/electron-browser/crashReporterService.ts
+++ b/src/vs/workbench/services/crashReporter/electron-browser/crashReporterService.ts
@@ -37,7 +37,8 @@ configurationRegistry.registerConfiguration({
 		'telemetry.enableCrashReporter': {
 			'type': 'boolean',
 			'description': nls.localize('telemetry.enableCrashReporting', "Enable crash reports to be sent to Microsoft.\nThis option requires restart to take effect."),
-			'default': true
+			'default': true,
+			'tags': ['backgroundOnlineFeature']
 		}
 	}
 });