diff --git a/.github/workflows/no-yarn-lock-changes.yml b/.github/workflows/no-yarn-lock-changes.yml
index 7bceb299030..ac37eaa61ea 100644
--- a/.github/workflows/no-yarn-lock-changes.yml
+++ b/.github/workflows/no-yarn-lock-changes.yml
@@ -7,7 +7,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - id: file_changes
-        uses: trilom/file-changes-action@v1.2.4
+        uses: trilom/file-changes-action@ce38c8ce2459ca3c303415eec8cb0409857b4272
       - name: Check for yarn.lock changes
         run: |
           cat $HOME/files.json | jq -e '.[] | test("yarn\\.lock$") | not' \
diff --git a/.vscode/notebooks/api.github-issues b/.vscode/notebooks/api.github-issues
index c0154336692..ebb916bf795 100644
--- a/.vscode/notebooks/api.github-issues
+++ b/.vscode/notebooks/api.github-issues
@@ -9,7 +9,7 @@
   {
     "kind": 2,
     "language": "github-issues",
-    "value": "$repo=repo:microsoft/vscode\n$milestone=milestone:\"February 2021\"",
+    "value": "$repo=repo:microsoft/vscode\n$milestone=milestone:\"March 2021\"",
     "editable": true,
     "outputs": []
   },
diff --git a/.vscode/notebooks/my-work.github-issues b/.vscode/notebooks/my-work.github-issues
index 4cb58bad7a6..bc9aa8dcac6 100644
--- a/.vscode/notebooks/my-work.github-issues
+++ b/.vscode/notebooks/my-work.github-issues
@@ -9,7 +9,7 @@
   {
     "kind": 2,
     "language": "github-issues",
-    "value": "// list of repos we work in\n$repos=repo:microsoft/vscode repo:microsoft/vscode-remote-release repo:microsoft/vscode-js-debug repo:microsoft/vscode-pull-request-github repo:microsoft/vscode-github-issue-notebooks repo:microsoft/vscode-internalbacklog\n\n// current milestone name\n$milestone=milestone:\"February 2021\"",
+    "value": "// list of repos we work in\n$repos=repo:microsoft/vscode repo:microsoft/vscode-remote-release repo:microsoft/vscode-js-debug repo:microsoft/vscode-pull-request-github repo:microsoft/vscode-github-issue-notebooks repo:microsoft/vscode-internalbacklog\n\n// current milestone name\n$milestone=milestone:\"March 2021\"",
     "editable": true,
     "outputs": []
   },
diff --git a/build/.moduleignore b/build/.moduleignore
index d1f9194ba2a..98bca26eafe 100644
--- a/build/.moduleignore
+++ b/build/.moduleignore
@@ -80,13 +80,11 @@ node-pty/scripts/**
 !node-pty/build/Release/*.dll
 !node-pty/build/Release/*.node
 
-vscode-nsfw/binding.gyp
-vscode-nsfw/build/**
-vscode-nsfw/src/**
-vscode-nsfw/openpa/**
-vscode-nsfw/includes/**
-!vscode-nsfw/build/Release/*.node
-!vscode-nsfw/**/*.a
+nsfw/binding.gyp
+nsfw/build/**
+nsfw/src/**
+nsfw/includes/**
+!nsfw/build/Release/*.node
 
 vsda/build/**
 vsda/ci/**
diff --git a/build/lib/i18n.js b/build/lib/i18n.js
index 7a529824a5a..50ec3f3f45a 100644
--- a/build/lib/i18n.js
+++ b/build/lib/i18n.js
@@ -237,14 +237,14 @@ XLF.parse = function (xlfString) {
                         }
                         let val = unit.target[0];
                         if (typeof val !== 'string') {
-                            val = val._;
+                            // We allow empty source values so support them for translations as well.
+                            val = val._ ? val._ : '';
                         }
-                        if (key && val) {
-                            messages[key] = decodeEntities(val);
-                        }
-                        else {
-                            reject(new Error(`XLF parsing error: XLIFF file ${originalFilePath} does not contain full localization data. ID or target translation for one of the trans-unit nodes is not present.`));
+                        if (!key) {
+                            reject(new Error(`XLF parsing error: trans-unit ${JSON.stringify(unit, undefined, 0)} defined in file ${originalFilePath} is missing the ID attribute.`));
+                            return;
                         }
+                        messages[key] = decodeEntities(val);
                     });
                     files.push({ messages: messages, originalFilePath: originalFilePath, language: language.toLowerCase() });
                 }
diff --git a/build/lib/i18n.ts b/build/lib/i18n.ts
index a23b58ccd3d..746c481b262 100644
--- a/build/lib/i18n.ts
+++ b/build/lib/i18n.ts
@@ -339,13 +339,14 @@ export class XLF {
 
 							let val = unit.target[0];
 							if (typeof val !== 'string') {
-								val = val._;
+								// We allow empty source values so support them for translations as well.
+								val = val._ ? val._ : '';
 							}
-							if (key && val) {
-								messages[key] = decodeEntities(val);
-							} else {
-								reject(new Error(`XLF parsing error: XLIFF file ${originalFilePath} does not contain full localization data. ID or target translation for one of the trans-unit nodes is not present.`));
+							if (!key) {
+								reject(new Error(`XLF parsing error: trans-unit ${JSON.stringify(unit, undefined, 0)} defined in file ${originalFilePath} is missing the ID attribute.`));
+								return;
 							}
+							messages[key] = decodeEntities(val);
 						});
 						files.push({ messages: messages, originalFilePath: originalFilePath, language: language.toLowerCase() });
 					}
diff --git a/build/package.json b/build/package.json
index cb70e42902d..c717a1585da 100644
--- a/build/package.json
+++ b/build/package.json
@@ -52,7 +52,7 @@
     "p-limit": "^3.1.0",
     "plist": "^3.0.1",
     "source-map": "0.6.1",
-    "typescript": "^4.3.0-dev.20210216",
+    "typescript": "^4.3.0-dev.20210226",
     "vsce": "1.48.0",
     "vscode-universal": "deepak1556/universal#61454d96223b774c53cda10f72c2098c0ce02d58"
   },
diff --git a/build/yarn.lock b/build/yarn.lock
index 67dd26a7624..b73eb19d249 100644
--- a/build/yarn.lock
+++ b/build/yarn.lock
@@ -1884,10 +1884,10 @@ typescript@^4.1.3:
   resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.1.3.tgz#519d582bd94cba0cf8934c7d8e8467e473f53bb7"
   integrity sha512-B3ZIOf1IKeH2ixgHhj6la6xdwR9QrLC5d1VKeCSY4tvkqhF2eqd9O7txNlS0PO3GrBAFIdr3L1ndNwteUbZLYg==
 
-typescript@^4.3.0-dev.20210216:
-  version "4.3.0-dev.20210216"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.3.0-dev.20210216.tgz#233327e6094008c02265ba140f8d9ece9133421e"
-  integrity sha512-pJLcC/kqnE+0rftTRc2/gYBkz9nl+kJfaU8sSOLYnzUvD8p+LOZMzXfaLoKPdGFJ6U9+Ox/sYV9HBTJVEjSTYg==
+typescript@^4.3.0-dev.20210226:
+  version "4.3.0-dev.20210226"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.3.0-dev.20210226.tgz#e754283dfaa01d79cea9df6d0f8a18114ace41ec"
+  integrity sha512-jxqKjVQsHkEMbyacr5CFpWnU3pv7H9QBljjORr3ct7qq+Q7ynHHmmFd5zQjU8HgHZYOMapIBhLsZSeqUeduQGQ==
 
 uc.micro@^1.0.1, uc.micro@^1.0.5:
   version "1.0.5"
diff --git a/extensions/emmet/package.json b/extensions/emmet/package.json
index 4d26781cfd2..119dd6fd4e6 100644
--- a/extensions/emmet/package.json
+++ b/extensions/emmet/package.json
@@ -84,12 +84,11 @@
           "description": "%emmetExclude%"
         },
         "emmet.extensionsPath": {
-          "type": [
-            "string",
-            "array",
-            "null"
-          ],
-          "default": null,
+          "type": "array",
+          "items": {
+            "type": "string"
+          },
+          "default": [],
           "description": "%emmetExtensionsPath%"
         },
         "emmet.triggerExpansionOnTab": {
diff --git a/extensions/emmet/src/abbreviationActions.ts b/extensions/emmet/src/abbreviationActions.ts
index 97ba3ac73a5..3ec42d4ae49 100644
--- a/extensions/emmet/src/abbreviationActions.ts
+++ b/extensions/emmet/src/abbreviationActions.ts
@@ -440,10 +440,18 @@ export function isValidLocationForEmmetAbbreviation(document: vscode.TextDocumen
 			return true;
 		}
 
+		// Get the abbreviation right now
+		// Fixes https://github.com/microsoft/vscode/issues/74505
+		// Stylesheet abbreviations starting with @ should bring up suggestions
+		// even at outer-most level
+		const abbreviation = document.getText(new vscode.Range(abbreviationRange.start.line, abbreviationRange.start.character, abbreviationRange.end.line, abbreviationRange.end.character));
+		if (abbreviation.startsWith('@')) {
+			return true;
+		}
+
 		// Fix for https://github.com/microsoft/vscode/issues/34162
 		// Other than sass, stylus, we can make use of the terminator tokens to validate position
 		if (syntax !== 'sass' && syntax !== 'stylus' && currentNode.type === 'property') {
-
 			// Fix for upstream issue https://github.com/emmetio/css-parser/issues/3
 			if (currentNode.parent
 				&& currentNode.parent.type !== 'rule'
@@ -451,7 +459,6 @@ export function isValidLocationForEmmetAbbreviation(document: vscode.TextDocumen
 				return false;
 			}
 
-			const abbreviation = document.getText(new vscode.Range(abbreviationRange.start.line, abbreviationRange.start.character, abbreviationRange.end.line, abbreviationRange.end.character));
 			const propertyNode = <Property>currentNode;
 			if (propertyNode.terminatorToken
 				&& propertyNode.separator
diff --git a/extensions/emmet/src/defaultCompletionProvider.ts b/extensions/emmet/src/defaultCompletionProvider.ts
index bb9226c59b0..f78b3af40c4 100644
--- a/extensions/emmet/src/defaultCompletionProvider.ts
+++ b/extensions/emmet/src/defaultCompletionProvider.ts
@@ -6,7 +6,7 @@
 import * as vscode from 'vscode';
 import { Node, Stylesheet } from 'EmmetFlatNode';
 import { isValidLocationForEmmetAbbreviation, getSyntaxFromArgs } from './abbreviationActions';
-import { getEmmetHelper, getMappingForIncludedLanguages, parsePartialStylesheet, getEmmetConfiguration, getEmmetMode, isStyleSheet, getFlatNode, allowedMimeTypesInScriptTag, toLSTextDocument, getHtmlFlatNode } from './util';
+import { getEmmetHelper, getMappingForIncludedLanguages, parsePartialStylesheet, getEmmetConfiguration, getEmmetMode, isStyleSheet, getFlatNode, allowedMimeTypesInScriptTag, toLSTextDocument, getHtmlFlatNode, getEmbeddedCssNodeIfAny } from './util';
 import { Range as LSRange } from 'vscode-languageserver-textdocument';
 import { getRootNode } from './parseDocument';
 
@@ -137,6 +137,20 @@ export class DefaultCompletionItemProvider implements vscode.CompletionItemProvi
 			currentNode = getFlatNode(rootNode, offset, true);
 		}
 
+		// Fix for https://github.com/microsoft/vscode/issues/107578
+		// Validate location if syntax is of styleSheet type to ensure that location is valid for emmet abbreviation.
+		// For an html document containing a <style> node, compute the embeddedCssNode and fetch the flattened node as currentNode.
+		if (!isStyleSheet(document.languageId) && isStyleSheet(syntax) && context.triggerKind !== vscode.CompletionTriggerKind.TriggerForIncompleteCompletions) {
+			validateLocation = true;
+			rootNode = getRootNode(document, true);
+			if (!rootNode) {
+				return;
+			}
+			let flatNode = getFlatNode(rootNode, offset, true);
+			let embeddedCssNode = getEmbeddedCssNodeIfAny(document, flatNode, position);
+			currentNode = getFlatNode(embeddedCssNode, offset, true);
+		}
+
 		if (validateLocation && !isValidLocationForEmmetAbbreviation(document, rootNode, currentNode, syntax, offset, toRange(extractAbbreviationResults.abbreviationRange))) {
 			return;
 		}
diff --git a/extensions/emmet/src/emmetCommon.ts b/extensions/emmet/src/emmetCommon.ts
index 93c58f5ae1e..b4c57b134be 100644
--- a/extensions/emmet/src/emmetCommon.ts
+++ b/extensions/emmet/src/emmetCommon.ts
@@ -17,12 +17,14 @@ import { fetchEditPoint } from './editPoint';
 import { fetchSelectItem } from './selectItem';
 import { evaluateMathExpression } from './evaluateMathExpression';
 import { incrementDecrement } from './incrementDecrement';
-import { LANGUAGE_MODES, getMappingForIncludedLanguages, updateEmmetExtensionsPath, getPathBaseName, getSyntaxes, getEmmetMode } from './util';
+import { LANGUAGE_MODES, getMappingForIncludedLanguages, updateEmmetExtensionsPath, migrateEmmetExtensionsPath, getPathBaseName, getSyntaxes, getEmmetMode } from './util';
 import { reflectCssValue } from './reflectCssValue';
 import { addFileToParseCache, removeFileFromParseCache } from './parseDocument';
 
 export function activateEmmetExtension(context: vscode.ExtensionContext) {
+	migrateEmmetExtensionsPath();
 	registerCompletionProviders(context);
+	updateEmmetExtensionsPath();
 
 	context.subscriptions.push(vscode.commands.registerCommand('editor.emmet.action.wrapWithAbbreviation', (args) => {
 		wrapWithAbbreviation(args);
@@ -125,8 +127,6 @@ export function activateEmmetExtension(context: vscode.ExtensionContext) {
 		vscode.commands.executeCommand('workbench.action.quickOpen', '>Emmet: ');
 	}));
 
-	updateEmmetExtensionsPath();
-
 	context.subscriptions.push(vscode.workspace.onDidChangeConfiguration((e) => {
 		if (e.affectsConfiguration('emmet.includeLanguages')) {
 			registerCompletionProviders(context);
diff --git a/extensions/emmet/src/test/index.ts b/extensions/emmet/src/test/index.ts
index 7d5667439cb..cf92c7a6c3f 100644
--- a/extensions/emmet/src/test/index.ts
+++ b/extensions/emmet/src/test/index.ts
@@ -8,7 +8,7 @@ const testRunner = require('../../../../test/integration/electron/testrunner');
 
 const options: any = {
 	ui: 'tdd',
-	useColors: (!process.env.BUILD_ARTIFACTSTAGINGDIRECTORY && process.platform !== 'win32'),
+	color: (!process.env.BUILD_ARTIFACTSTAGINGDIRECTORY && process.platform !== 'win32'),
 	timeout: 60000
 };
 
@@ -38,34 +38,3 @@ if (process.env.BUILD_ARTIFACTSTAGINGDIRECTORY) {
 testRunner.configure(options);
 
 export = testRunner;
-
-// import * as path from 'path';
-// import * as Mocha from 'mocha';
-// import * as glob from 'glob';
-
-// export function run(testsRoot: string, cb: (error: any, failures?: number) => void): void {
-// 	// Create the mocha test
-// 	const mocha = new Mocha({
-// 		ui: 'tdd'
-// 	});
-// 	mocha.useColors(true);
-
-// 	glob('**/**.test.js', { cwd: testsRoot }, (err, files) => {
-// 		if (err) {
-// 			return cb(err);
-// 		}
-
-// 		// Add files to the test suite
-// 		files.forEach(f => mocha.addFile(path.resolve(testsRoot, f)));
-
-// 		try {
-// 			// Run the mocha test
-// 			mocha.run(failures => {
-// 				cb(null, failures);
-// 			});
-// 		} catch (err) {
-// 			console.error(err);
-// 			cb(err);
-// 		}
-// 	});
-// }
diff --git a/extensions/emmet/src/test/partialParsingStylesheet.test.ts b/extensions/emmet/src/test/partialParsingStylesheet.test.ts
index b0928e1a32f..30cdd698ee7 100644
--- a/extensions/emmet/src/test/partialParsingStylesheet.test.ts
+++ b/extensions/emmet/src/test/partialParsingStylesheet.test.ts
@@ -60,7 +60,7 @@ p {
 /* .foo { op.3
 dn	{
 */
-	@
+	bgc
 } bg
 `;
 		return withRandomFileEditor(sassContents, '.scss', (_, doc) => {
@@ -69,7 +69,7 @@ dn	{
 				new vscode.Range(2, 3, 2, 7),		// Line commented selector
 				new vscode.Range(3, 3, 3, 7),		// Block commented selector
 				new vscode.Range(4, 0, 4, 2),		// dn inside block comment
-				new vscode.Range(6, 1, 6, 2),		// @ inside a rule whose opening brace is commented
+				new vscode.Range(6, 1, 6, 2),		// bgc inside a rule whose opening brace is commented
 				new vscode.Range(7, 2, 7, 4)		// bg after ending of badly constructed block
 			];
 			rangesNotEmmet.forEach(range => {
diff --git a/extensions/emmet/src/util.ts b/extensions/emmet/src/util.ts
index cdb796da920..6b91b607e96 100644
--- a/extensions/emmet/src/util.ts
+++ b/extensions/emmet/src/util.ts
@@ -13,7 +13,7 @@ import { TextDocument as LSTextDocument } from 'vscode-languageserver-textdocume
 import { getRootNode } from './parseDocument';
 
 let _emmetHelper: typeof EmmetHelper;
-let _currentExtensionsPath: string | undefined = undefined;
+let _currentExtensionsPath: string[] | undefined;
 
 let _homeDir: vscode.Uri | undefined;
 
@@ -28,7 +28,6 @@ export function getEmmetHelper() {
 	if (!_emmetHelper) {
 		_emmetHelper = require('vscode-emmet-helper');
 	}
-	updateEmmetExtensionsPath();
 	return _emmetHelper;
 }
 
@@ -36,10 +35,11 @@ export function getEmmetHelper() {
  * Update Emmet Helper to use user snippets from the extensionsPath setting
  */
 export function updateEmmetExtensionsPath(forceRefresh: boolean = false) {
-	if (!_emmetHelper) {
-		return;
+	const helper = getEmmetHelper();
+	let extensionsPath = vscode.workspace.getConfiguration('emmet').get<string[]>('extensionsPath');
+	if (!extensionsPath) {
+		extensionsPath = [];
 	}
-	let extensionsPath = vscode.workspace.getConfiguration('emmet')['extensionsPath'];
 	if (forceRefresh || _currentExtensionsPath !== extensionsPath) {
 		_currentExtensionsPath = extensionsPath;
 		if (!vscode.workspace.workspaceFolders || vscode.workspace.workspaceFolders.length === 0) {
@@ -47,11 +47,43 @@ export function updateEmmetExtensionsPath(forceRefresh: boolean = false) {
 		} else {
 			const rootPath = vscode.workspace.workspaceFolders[0].uri;
 			const fileSystem = vscode.workspace.fs;
-			_emmetHelper.updateExtensionsPath(extensionsPath, fileSystem, rootPath, _homeDir).then(null, (err: string) => vscode.window.showErrorMessage(err));
+			helper.updateExtensionsPath(extensionsPath, fileSystem, rootPath, _homeDir).catch(err => {
+				if (Array.isArray(extensionsPath) && extensionsPath.length) {
+					vscode.window.showErrorMessage(err.message);
+				}
+			});
 		}
 	}
 }
 
+/**
+ * Migrate old configuration(string) for extensionsPath to new type(string[])
+ * https://github.com/microsoft/vscode/issues/117517
+ */
+export function migrateEmmetExtensionsPath() {
+	// Get the detail info of emmet.extensionsPath setting
+	let config = vscode.workspace.getConfiguration().inspect('emmet.extensionsPath');
+
+	// Update Global setting if the value type is string or the value is null
+	if (typeof config?.globalValue === 'string') {
+		vscode.workspace.getConfiguration().update('emmet.extensionsPath', [config.globalValue], true);
+	} else if (config?.globalValue === null) {
+		vscode.workspace.getConfiguration().update('emmet.extensionsPath', [], true);
+	}
+	// Update Workspace setting if the value type is string or the value is null
+	if (typeof config?.workspaceValue === 'string') {
+		vscode.workspace.getConfiguration().update('emmet.extensionsPath', [config.workspaceValue], false);
+	} else if (config?.workspaceValue === null) {
+		vscode.workspace.getConfiguration().update('emmet.extensionsPath', [], false);
+	}
+	// Update WorkspaceFolder setting if the value type is string or the value is null
+	if (typeof config?.workspaceFolderValue === 'string') {
+		vscode.workspace.getConfiguration().update('emmet.extensionsPath', [config.workspaceFolderValue]);
+	} else if (config?.workspaceFolderValue === null) {
+		vscode.workspace.getConfiguration().update('emmet.extensionsPath', []);
+	}
+}
+
 /**
  * Mapping between languages that support Emmet and completion trigger characters
  */
diff --git a/extensions/emmet/yarn.lock b/extensions/emmet/yarn.lock
index 8ebb09f5c3b..50294f89cac 100644
--- a/extensions/emmet/yarn.lock
+++ b/extensions/emmet/yarn.lock
@@ -54,14 +54,14 @@
   integrity sha1-Rs/+oRmgoAMxKiHC2bVijLX81EI=
 
 "@types/node@^12.19.9":
-  version "12.20.1"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-12.20.1.tgz#63d36c10e162666f0107f247cdca76542c3c7472"
-  integrity sha512-tCkE96/ZTO+cWbln2xfyvd6ngHLanvVlJ3e5BeirJ3BYI5GbAyubIrmV4JjjugDly5D9fHjOL5MNsqsCnqwW6g==
+  version "12.20.4"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-12.20.4.tgz#73687043dd00fcb6962c60fbf499553a24d6bdf2"
+  integrity sha512-xRCgeE0Q4pT5UZ189TJ3SpYuX/QGl6QIAOAIeDSbAVAd2gX1NxSZup4jNVK7cxIeP8KDSbJgcckun495isP1jQ==
 
 emmet@^2.3.0:
-  version "2.3.1"
-  resolved "https://registry.yarnpkg.com/emmet/-/emmet-2.3.1.tgz#77614d949d1d01e5c248d08043a13a7f4d539e47"
-  integrity sha512-u8h++9u3y9QWhn0imUXfQO+s80To5MGD97zd/00wGC39CfNGBPe//ZKepJz9I1LQ2FDRXHrn+e3JaN/53Y5z6A==
+  version "2.3.2"
+  resolved "https://registry.yarnpkg.com/emmet/-/emmet-2.3.2.tgz#3f855ab240f17e5d5feead0fb04f2f83c5d8dede"
+  integrity sha512-PRHGy5RfLp7+WBgoNq0QYtjSbbG1g28PtnN8McPhlEMoPwZWBDftVIz4vDNUNvQFSBtekuYZxB7J0vLgodZxFw==
   dependencies:
     "@emmetio/abbreviation" "^2.2.1"
     "@emmetio/css-abbreviation" "^2.1.2"
@@ -77,9 +77,9 @@ jsonc-parser@^2.3.0:
   integrity sha512-H8jvkz1O50L3dMZCsLqiuB2tA7muqbSg1AtGEkN0leAqGjsUzDJir3Zwr02BhqdcITPg3ei3mZ+HjMocAknhhg==
 
 vscode-emmet-helper@^2.3.0:
-  version "2.3.2"
-  resolved "https://registry.yarnpkg.com/vscode-emmet-helper/-/vscode-emmet-helper-2.3.2.tgz#7f73cd579eef187a4456dc71768fb2237f47fbd4"
-  integrity sha512-uulOziI/5Ml+AyfHwgkZDXlGZsu9yNcfwZgOfRSPokc6lqYEoGK+/u902LH8Xaf68dhPLctJlhhGYwDJuqoGxg==
+  version "2.4.0"
+  resolved "https://registry.yarnpkg.com/vscode-emmet-helper/-/vscode-emmet-helper-2.4.0.tgz#12f82fd05fb1df11ef7e78f85df63724de54a05b"
+  integrity sha512-aMbUL3oHBWM/Ux/C035a6KKLgIV8+GNGuu1b7ztuHXM6VmrdFFLNI5+tfFjfYQ3GBpD+Q7ZQU7CX/JaGlBbBiA==
   dependencies:
     emmet "^2.3.0"
     jsonc-parser "^2.3.0"
diff --git a/extensions/git/package.json b/extensions/git/package.json
index e10eca6796e..5cfdd3d934a 100644
--- a/extensions/git/package.json
+++ b/extensions/git/package.json
@@ -2360,6 +2360,13 @@
         "when": "config.git.enabled",
         "enablement": "git.state == initialized",
         "group": "5_scm@1"
+      },
+      {
+        "view": "explorer",
+        "contents": "%view.workbench.learnMore%",
+        "when": "config.git.enabled",
+        "enablement": "git.state == initialized",
+        "group": "5_scm@10"
       }
     ]
   },
diff --git a/extensions/git/package.nls.json b/extensions/git/package.nls.json
index 3eac8e0783e..2d82fe61782 100644
--- a/extensions/git/package.nls.json
+++ b/extensions/git/package.nls.json
@@ -211,5 +211,6 @@
 	"view.workbench.scm.folder": "The folder currently open doesn't have a git repository. You can initialize a repository which will enable source control features powered by git.\n[Initialize Repository](command:git.init?%5Btrue%5D)\nTo learn more about how to use git and source control in VS Code [read our docs](https://aka.ms/vscode-scm).",
 	"view.workbench.scm.workspace": "The workspace currently open doesn't have any folders containing git repositories. You can initialize a repository on a folder which will enable source control features powered by git.\n[Initialize Repository](command:git.init)\nTo learn more about how to use git and source control in VS Code [read our docs](https://aka.ms/vscode-scm).",
 	"view.workbench.scm.emptyWorkspace": "The workspace currently open doesn't have any folders containing git repositories.\n[Add Folder to Workspace](command:workbench.action.addRootFolder)\nTo learn more about how to use git and source control in VS Code [read our docs](https://aka.ms/vscode-scm).",
-	"view.workbench.cloneRepository": "You can also clone a repository from a URL. To learn more about how to use git and source control in VS Code [read our docs](https://aka.ms/vscode-scm).\n[Clone Repository](command:git.clone 'Clone a repository once the git extension has activated')"
+	"view.workbench.cloneRepository": "You can clone a repository locally.\n[Clone Repository](command:git.clone 'Clone a repository once the git extension has activated')",
+	"view.workbench.learnMore": "To learn more about how to use git and source control in VS Code [read our docs](https://aka.ms/vscode-scm)."
 }
diff --git a/extensions/git/src/api/api1.ts b/extensions/git/src/api/api1.ts
index c5f7cd9246d..fbd6b793f9c 100644
--- a/extensions/git/src/api/api1.ts
+++ b/extensions/git/src/api/api1.ts
@@ -5,7 +5,7 @@
 
 import { Model } from '../model';
 import { Repository as BaseRepository, Resource } from '../repository';
-import { InputBox, Git, API, Repository, Remote, RepositoryState, Branch, ForcePushMode, Ref, Submodule, Commit, Change, RepositoryUIState, Status, LogOptions, APIState, CommitOptions, RefType, RemoteSourceProvider, CredentialsProvider, BranchQuery, PushErrorHandler, PublishEvent } from './git';
+import { InputBox, Git, API, Repository, Remote, RepositoryState, Branch, ForcePushMode, Ref, Submodule, Commit, Change, RepositoryUIState, Status, LogOptions, APIState, CommitOptions, RefType, RemoteSourceProvider, CredentialsProvider, BranchQuery, PushErrorHandler, PublishEvent, FetchOptions } from './git';
 import { Event, SourceControlInputBox, Uri, SourceControl, Disposable, commands } from 'vscode';
 import { mapEvent } from '../util';
 import { toGitUri } from '../uri';
@@ -193,8 +193,16 @@ export class ApiRepository implements Repository {
 		return this._repository.renameRemote(name, newName);
 	}
 
-	fetch(remote?: string | undefined, ref?: string | undefined, depth?: number | undefined): Promise<void> {
-		return this._repository.fetch(remote, ref, depth);
+	fetch(arg0?: FetchOptions | string | undefined,
+		ref?: string | undefined,
+		depth?: number | undefined,
+		prune?: boolean | undefined
+	): Promise<void> {
+		if (arg0 !== undefined && typeof arg0 !== 'string') {
+			return this._repository.fetch(arg0);
+		}
+
+		return this._repository.fetch({ remote: arg0, ref, depth, prune });
 	}
 
 	pull(unshallow?: boolean): Promise<void> {
diff --git a/extensions/git/src/api/git.d.ts b/extensions/git/src/api/git.d.ts
index 43832f18600..19ac3aa708d 100644
--- a/extensions/git/src/api/git.d.ts
+++ b/extensions/git/src/api/git.d.ts
@@ -139,6 +139,14 @@ export interface CommitOptions {
 	requireUserConfig?: boolean;
 }
 
+export interface FetchOptions {
+	remote?: string;
+	ref?: string;
+	all?: boolean;
+	prune?: boolean;
+	depth?: number;
+}
+
 export interface BranchQuery {
 	readonly remote?: boolean;
 	readonly pattern?: string;
@@ -197,6 +205,7 @@ export interface Repository {
 	removeRemote(name: string): Promise<void>;
 	renameRemote(name: string, newName: string): Promise<void>;
 
+	fetch(options?: FetchOptions): Promise<void>;
 	fetch(remote?: string, ref?: string, depth?: number): Promise<void>;
 	pull(unshallow?: boolean): Promise<void>;
 	push(remoteName?: string, branchName?: string, setUpstream?: boolean, force?: ForcePushMode): Promise<void>;
diff --git a/extensions/git/src/commands.ts b/extensions/git/src/commands.ts
index 9ded16f3e77..9b1415ecd17 100644
--- a/extensions/git/src/commands.ts
+++ b/extensions/git/src/commands.ts
@@ -2247,7 +2247,7 @@ export class CommandCenter {
 		}
 
 		await repository.addRemote(name, url);
-		await repository.fetch(name);
+		await repository.fetch({ remote: name });
 		return name;
 	}
 
diff --git a/extensions/git/src/repository.ts b/extensions/git/src/repository.ts
index 90149ad0a87..cefe23848fa 100644
--- a/extensions/git/src/repository.ts
+++ b/extensions/git/src/repository.ts
@@ -7,7 +7,7 @@ import * as fs from 'fs';
 import * as path from 'path';
 import { CancellationToken, Command, Disposable, Event, EventEmitter, Memento, OutputChannel, ProgressLocation, ProgressOptions, scm, SourceControl, SourceControlInputBox, SourceControlInputBoxValidation, SourceControlInputBoxValidationType, SourceControlResourceDecorations, SourceControlResourceGroup, SourceControlResourceState, ThemeColor, Uri, window, workspace, WorkspaceEdit, FileDecoration, commands } from 'vscode';
 import * as nls from 'vscode-nls';
-import { Branch, Change, ForcePushMode, GitErrorCodes, LogOptions, Ref, RefType, Remote, Status, CommitOptions, BranchQuery } from './api/git';
+import { Branch, Change, ForcePushMode, GitErrorCodes, LogOptions, Ref, RefType, Remote, Status, CommitOptions, BranchQuery, FetchOptions } from './api/git';
 import { AutoFetcher } from './autofetch';
 import { debounce, memoize, throttle } from './decorators';
 import { Commit, GitError, Repository as BaseRepository, Stash, Submodule, LogFileOptions } from './git';
@@ -1319,8 +1319,8 @@ export class Repository implements Disposable {
 		await this._fetch({ all: true });
 	}
 
-	async fetch(remote?: string, ref?: string, depth?: number): Promise<void> {
-		await this._fetch({ remote, ref, depth });
+	async fetch(options: FetchOptions): Promise<void> {
+		await this._fetch(options);
 	}
 
 	private async _fetch(options: { remote?: string, ref?: string, all?: boolean, prune?: boolean, depth?: number, silent?: boolean; } = {}): Promise<void> {
diff --git a/extensions/git/src/test/index.ts b/extensions/git/src/test/index.ts
index 819850af768..3fe682fc27f 100644
--- a/extensions/git/src/test/index.ts
+++ b/extensions/git/src/test/index.ts
@@ -8,7 +8,7 @@ const testRunner = require('../../../../test/integration/electron/testrunner');
 
 const options: any = {
 	ui: 'tdd',
-	useColors: (!process.env.BUILD_ARTIFACTSTAGINGDIRECTORY && process.platform !== 'win32'),
+	color: (!process.env.BUILD_ARTIFACTSTAGINGDIRECTORY && process.platform !== 'win32'),
 	timeout: 60000
 };
 
diff --git a/extensions/github-authentication/package.json b/extensions/github-authentication/package.json
index 726949d02e0..543a8608ac1 100644
--- a/extensions/github-authentication/package.json
+++ b/extensions/github-authentication/package.json
@@ -34,13 +34,7 @@
           "when": "false"
         }
       ]
-    },
-    "authentication": [
-      {
-        "label": "GitHub",
-        "id": "github"
-      }
-    ]
+    }
   },
   "aiKey": "AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217",
   "main": "./out/extension.js",
diff --git a/extensions/html-language-features/server/src/modes/javascriptMode.ts b/extensions/html-language-features/server/src/modes/javascriptMode.ts
index bb630594852..a17cd4c839b 100644
--- a/extensions/html-language-features/server/src/modes/javascriptMode.ts
+++ b/extensions/html-language-features/server/src/modes/javascriptMode.ts
@@ -65,9 +65,7 @@ function getLanguageServiceHost(scriptKind: ts.ScriptKind) {
 			return compilerOptions;
 		},
 		dispose() {
-			if (jsLanguageService) {
-				jsLanguageService.then(s => s.dispose());
-			}
+			jsLanguageService.then(s => s.dispose());
 		}
 	};
 }
diff --git a/extensions/image-preview/package.json b/extensions/image-preview/package.json
index 5f49df1d609..fb7ae58a13a 100644
--- a/extensions/image-preview/package.json
+++ b/extensions/image-preview/package.json
@@ -55,12 +55,12 @@
       "commandPalette": [
         {
           "command": "imagePreview.zoomIn",
-          "when": "imagePreviewFocus",
+          "when": "activeCustomEditorId == 'imagePreview.previewEditor'",
           "group": "1_imagePreview"
         },
         {
           "command": "imagePreview.zoomOut",
-          "when": "imagePreviewFocus",
+          "when": "activeCustomEditorId == 'imagePreview.previewEditor'",
           "group": "1_imagePreview"
         }
       ]
diff --git a/extensions/julia/package.json b/extensions/julia/package.json
index 971ad4fe96e..3c30069dce6 100644
--- a/extensions/julia/package.json
+++ b/extensions/julia/package.json
@@ -9,7 +9,7 @@
 		"vscode": "0.10.x"
 	},
   "scripts": {
-    "update-grammar": "node ../node_modules/.bin/vscode-grammar-updater JuliaEditorSupport/atom-language-julia grammars/julia_vscode.json ./syntaxes/julia.tmLanguage.json"
+    "update-grammar": "node ../node_modules/vscode-grammar-updater/bin JuliaEditorSupport/atom-language-julia grammars/julia_vscode.json ./syntaxes/julia.tmLanguage.json"
   },
 	"contributes": {
 		"languages": [
diff --git a/extensions/make/cgmanifest.json b/extensions/make/cgmanifest.json
index 9a311cfe811..35b8bc4c52e 100644
--- a/extensions/make/cgmanifest.json
+++ b/extensions/make/cgmanifest.json
@@ -6,7 +6,7 @@
 				"git": {
 					"name": "fadeevab/make.tmbundle",
 					"repositoryUrl": "https://github.com/fadeevab/make.tmbundle",
-					"commitHash": "e36e02becd20730259b0115d9ca5c419f65023a9"
+					"commitHash": "91b724d1ad86fa65e4b240a960311a280b92f971"
 				}
 			},
 			"licenseDetail": [
diff --git a/extensions/make/syntaxes/make.tmLanguage.json b/extensions/make/syntaxes/make.tmLanguage.json
index 890148cb19f..e08936b2d22 100644
--- a/extensions/make/syntaxes/make.tmLanguage.json
+++ b/extensions/make/syntaxes/make.tmLanguage.json
@@ -4,7 +4,7 @@
 		"If you want to provide a fix or improvement, please create a pull request against the original repository.",
 		"Once accepted there, we are happy to receive an update request."
 	],
-	"version": "https://github.com/fadeevab/make.tmbundle/commit/e36e02becd20730259b0115d9ca5c419f65023a9",
+	"version": "https://github.com/fadeevab/make.tmbundle/commit/91b724d1ad86fa65e4b240a960311a280b92f971",
 	"name": "Makefile",
 	"scopeName": "source.makefile",
 	"patterns": [
@@ -29,7 +29,7 @@
 	],
 	"repository": {
 		"comment": {
-			"begin": "(^[ \\t]+)?(?=#)",
+			"begin": "(^[ ]+)?(?=#)",
 			"beginCaptures": {
 				"1": {
 					"name": "punctuation.whitespace.comment.leading.makefile"
@@ -130,9 +130,6 @@
 						{
 							"include": "#variables"
 						},
-						{
-							"include": "#comment"
-						},
 						{
 							"include": "#directives"
 						}
@@ -195,37 +192,7 @@
 					]
 				},
 				{
-					"begin": "^\\s*(ifdef|ifndef)\\s*([^\\s]+)(?=\\s)",
-					"captures": {
-						"1": {
-							"name": "keyword.control.$1.makefile"
-						},
-						"2": {
-							"name": "variable.other.makefile"
-						},
-						"3": {
-							"name": "punctuation.separator.key-value.makefile"
-						}
-					},
-					"end": "^\\s*(endif)\\b",
-					"name": "meta.scope.conditional.makefile",
-					"patterns": [
-						{
-							"begin": "\\G(?!\\n)",
-							"end": "^",
-							"patterns": [
-								{
-									"include": "#comment"
-								}
-							]
-						},
-						{
-							"include": "$self"
-						}
-					]
-				},
-				{
-					"begin": "^\\s*(ifeq|ifneq)(?=\\s)",
+					"begin": "^\\s*(ifeq|ifneq|ifdef|ifndef)(?=\\s)",
 					"captures": {
 						"1": {
 							"name": "keyword.control.$1.makefile"
@@ -254,7 +221,15 @@
 									"name": "keyword.control.else.makefile"
 								}
 							},
-							"end": "^"
+							"end": "^",
+							"patterns": [
+								{
+									"include": "#variables"
+								},
+								{
+									"include": "#comment"
+								}
+							]
 						},
 						{
 							"include": "$self"
diff --git a/extensions/markdown-language-features/src/test/index.ts b/extensions/markdown-language-features/src/test/index.ts
index 56ba0dde4b6..4589f10f8d9 100644
--- a/extensions/markdown-language-features/src/test/index.ts
+++ b/extensions/markdown-language-features/src/test/index.ts
@@ -8,7 +8,7 @@ const testRunner = require('../../../../test/integration/electron/testrunner');
 
 const options: any = {
 	ui: 'tdd',
-	useColors: (!process.env.BUILD_ARTIFACTSTAGINGDIRECTORY && process.platform !== 'win32'),
+	color: (!process.env.BUILD_ARTIFACTSTAGINGDIRECTORY && process.platform !== 'win32'),
 	timeout: 60000
 };
 
diff --git a/extensions/microsoft-authentication/package.json b/extensions/microsoft-authentication/package.json
index 54405b6939f..a4d5cda967e 100644
--- a/extensions/microsoft-authentication/package.json
+++ b/extensions/microsoft-authentication/package.json
@@ -20,14 +20,6 @@
     "workspace",
     "web"
   ],
-  "contributes": {
-    "authentication": [
-      {
-        "label": "Microsoft",
-        "id": "microsoft"
-      }
-    ]
-  },
   "aiKey": "AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217",
   "main": "./out/extension.js",
   "browser": "./dist/browser/extension.js",
diff --git a/extensions/npm/package.json b/extensions/npm/package.json
index 6efde64fc8e..d943ce51460 100644
--- a/extensions/npm/package.json
+++ b/extensions/npm/package.json
@@ -62,7 +62,8 @@
         {
           "id": "npm",
           "name": "%view.name%",
-          "icon": "$(code)",
+          "when": "npm:showScriptExplorer",
+          "icon": "$(json)",
           "visibility": "hidden"
         }
       ]
diff --git a/extensions/npm/src/npmMain.ts b/extensions/npm/src/npmMain.ts
index 6ed3b7532ab..c5d442a4ddb 100644
--- a/extensions/npm/src/npmMain.ts
+++ b/extensions/npm/src/npmMain.ts
@@ -8,7 +8,7 @@ import * as vscode from 'vscode';
 import { addJSONProviders } from './features/jsonContributions';
 import { runSelectedScript, selectAndRunScriptFromFolder } from './commands';
 import { NpmScriptsTreeDataProvider } from './npmView';
-import { getPackageManager, invalidateTasksCache, NpmTaskProvider } from './tasks';
+import { getPackageManager, invalidateTasksCache, NpmTaskProvider, hasPackageJson } from './tasks';
 import { invalidateHoverScriptsCache, NpmScriptHoverProvider } from './scriptHover';
 import { NpmScriptLensProvider } from './npmScriptLens';
 
@@ -53,6 +53,11 @@ export async function activate(context: vscode.ExtensionContext): Promise<void>
 	registerHoverProvider(context);
 
 	context.subscriptions.push(vscode.commands.registerCommand('npm.runSelectedScript', runSelectedScript));
+
+	if (await hasPackageJson()) {
+		vscode.commands.executeCommand('setContext', 'npm:showScriptExplorer', true);
+	}
+
 	context.subscriptions.push(vscode.commands.registerCommand('npm.runScriptFromFolder', selectAndRunScriptFromFolder));
 	context.subscriptions.push(vscode.commands.registerCommand('npm.refresh', () => {
 		invalidateScriptCaches();
diff --git a/extensions/npm/src/tasks.ts b/extensions/npm/src/tasks.ts
index 96db9e0dc39..dee763ae1b7 100644
--- a/extensions/npm/src/tasks.ts
+++ b/extensions/npm/src/tasks.ts
@@ -365,19 +365,8 @@ export function getPackageJsonUriFromTask(task: Task): Uri | null {
 }
 
 export async function hasPackageJson(): Promise<boolean> {
-	let folders = workspace.workspaceFolders;
-	if (!folders) {
-		return false;
-	}
-	for (const folder of folders) {
-		if (folder.uri.scheme === 'file') {
-			let packageJson = path.join(folder.uri.fsPath, 'package.json');
-			if (await exists(packageJson)) {
-				return true;
-			}
-		}
-	}
-	return false;
+	const files = await workspace.findFiles('**/package.json', undefined, 1);
+	return files.length > 0;
 }
 
 async function exists(file: string): Promise<boolean> {
diff --git a/extensions/search-result/src/extension.ts b/extensions/search-result/src/extension.ts
index 67fb86553a9..fee71869dea 100644
--- a/extensions/search-result/src/extension.ts
+++ b/extensions/search-result/src/extension.ts
@@ -129,7 +129,7 @@ export function activate(context: vscode.ExtensionContext) {
 
 function relativePathToUri(path: string, resultsUri: vscode.Uri): vscode.Uri | undefined {
 
-	const userDataPrefix = 'vscode-userdata:';
+	const userDataPrefix = '(Settings) ';
 	if (path.startsWith(userDataPrefix)) {
 		return vscode.Uri.file(path.slice(userDataPrefix.length)).with({ scheme: 'vscode-userdata' });
 	}
diff --git a/extensions/swift/syntaxes/swift.tmLanguage.json b/extensions/swift/syntaxes/swift.tmLanguage.json
index 632b3160377..3396ff07de9 100644
--- a/extensions/swift/syntaxes/swift.tmLanguage.json
+++ b/extensions/swift/syntaxes/swift.tmLanguage.json
@@ -4,7 +4,7 @@
 		"If you want to provide a fix or improvement, please create a pull request against the original repository.",
 		"Once accepted there, we are happy to receive an update request."
 	],
-	"version": "https://github.com/textmate/swift.tmbundle/commit/d31bae2e0d6a4d977187dc7f06f538d6ba56b89b",
+	"version": "https://github.com/textmate/swift.tmbundle/commit/2ee3d7c63f7dd2c769167278b48e3716d1b60b26",
 	"name": "Swift",
 	"scopeName": "source.swift",
 	"comment": "See swift.tmbundle/grammar-test.swift for test cases.",
@@ -14,6 +14,20 @@
 		}
 	],
 	"repository": {
+		"async-throws": {
+			"captures": {
+				"1": {
+					"name": "invalid.illegal.await-must-precede-throws.swift"
+				},
+				"2": {
+					"name": "keyword.control.exception.swift"
+				},
+				"3": {
+					"name": "keyword.control.async.swift"
+				}
+			},
+			"match": "\\b(?:(throws\\s+async|rethrows\\s+async)|(throws|rethrows)|(async))\\b"
+		},
 		"attributes": {
 			"patterns": [
 				{
@@ -791,6 +805,10 @@
 						{
 							"include": "#attributes"
 						},
+						{
+							"match": "\\basync\\b",
+							"name": "keyword.control.async.swift"
+						},
 						{
 							"match": "\\b(?:throws|rethrows)\\b",
 							"name": "keyword.control.exception.swift"
@@ -999,8 +1017,7 @@
 							"include": "#function-result"
 						},
 						{
-							"match": "\\b(?:throws|rethrows)\\b",
-							"name": "keyword.control.exception.swift"
+							"include": "#async-throws"
 						},
 						{
 							"comment": "Swift 3: generic constraints after the parameters and return type",
@@ -1054,8 +1071,7 @@
 							"include": "#parameter-clause"
 						},
 						{
-							"match": "\\b(?:throws|rethrows)\\b",
-							"name": "keyword.control.exception.swift"
+							"include": "#async-throws"
 						},
 						{
 							"comment": "Swift 3: generic constraints after the parameters and return type",
@@ -1508,10 +1524,13 @@
 							"name": "punctuation.definition.parameters.begin.swift"
 						}
 					},
-					"end": "(\\))",
+					"end": "(\\))(?:\\s*(async)\\b)?",
 					"endCaptures": {
 						"1": {
 							"name": "punctuation.definition.parameters.end.swift"
+						},
+						"2": {
+							"name": "keyword.control.async.swift"
 						}
 					},
 					"name": "meta.parameter-clause.swift",
@@ -1796,8 +1815,7 @@
 									"include": "#parameter-clause"
 								},
 								{
-									"match": "\\b(?:throws|rethrows)\\b",
-									"name": "keyword.control.exception.swift"
+									"include": "#async-throws"
 								},
 								{
 									"comment": "Swift 3: generic constraints after the parameters and return type",
@@ -1857,8 +1875,7 @@
 									"include": "#function-result"
 								},
 								{
-									"match": "\\b(?:throws|rethrows)\\b",
-									"name": "keyword.control.exception.swift"
+									"include": "#async-throws"
 								},
 								{
 									"comment": "Swift 3: generic constraints after the parameters and return type",
@@ -2520,10 +2537,22 @@
 							"name": "punctuation.section.tuple.begin.swift"
 						}
 					},
-					"end": "\\)",
+					"comment": "correctly matching closure expressions is too hard (depends on trailing \"in\") so we just tack on some basics to the end of parenthesized-expression",
+					"end": "(\\))\\s*((?:\\b(?:async|throws|rethrows)\\s)*)",
 					"endCaptures": {
-						"0": {
+						"1": {
 							"name": "punctuation.section.tuple.end.swift"
+						},
+						"2": {
+							"patterns": [
+								{
+									"match": "\\brethrows\\b",
+									"name": "invalid.illegal.rethrows-only-allowed-on-function-declarations.swift"
+								},
+								{
+									"include": "#async-throws"
+								}
+							]
 						}
 					},
 					"patterns": [
@@ -2584,6 +2613,17 @@
 					"match": "(?<!\\.)\\bdefer\\b",
 					"name": "keyword.control.defer.swift"
 				},
+				{
+					"captures": {
+						"1": {
+							"name": "invalid.illegal.try-must-precede-await.swift"
+						},
+						"2": {
+							"name": "keyword.control.await.swift"
+						}
+					},
+					"match": "(?<!\\.)\\b(?:(await\\s+try)|(await)\\b)"
+				},
 				{
 					"match": "(?<!\\.)\\b(?:catch|throws?|rethrows|try)\\b|\\btry[?!]\\B",
 					"name": "keyword.control.exception.swift"
@@ -2622,7 +2662,7 @@
 				},
 				{
 					"comment": "matches weak, unowned, unowned(safe), unowned(unsafe)",
-					"match": "(?<!\\.)\\b(?:weak|unowned)\\b|\\bunowned\\((?:safe|unsafe)\\)",
+					"match": "(?<!\\.)\\bunowned\\((?:safe|unsafe)\\)|(?<!\\.)\\b(?:weak|unowned)\\b",
 					"name": "keyword.other.capture-specifier.swift"
 				},
 				{
diff --git a/extensions/theme-seti/.vscodeignore b/extensions/theme-seti/.vscodeignore
index d3bfa3c35a7..61098379c23 100644
--- a/extensions/theme-seti/.vscodeignore
+++ b/extensions/theme-seti/.vscodeignore
@@ -1,3 +1,4 @@
 build/**
 cgmanifest.json
 icons/preview.html
+CONTRIBUTING.md
diff --git a/extensions/theme-seti/CONTRIBUTING.md b/extensions/theme-seti/CONTRIBUTING.md
new file mode 100644
index 00000000000..888829ff004
--- /dev/null
+++ b/extensions/theme-seti/CONTRIBUTING.md
@@ -0,0 +1,32 @@
+# theme-seti
+
+This is an icon theme that uses the icons from [`seti-ui`](https://github.com/jesseweed/seti-ui).
+
+## Updating icons
+
+There is script that can be used to update icons, [./build/update-icon-theme.js](build/update-icon-theme.js).
+
+To run this script, run `npm run update` from the `theme-seti` directory.
+
+This can be run in one of two ways: looking at a local copy of `seti-ui` for icons, or getting them straight from GitHub.
+
+If you want to run it from a local copy of `seti-ui`, first clone [`seti-ui`](https://github.com/jesseweed/seti-ui) to the folder next to your `vscode` repo (from the `theme-seti` directory, `../../`).
+Then, inside the `set-ui` directory, run `npm install` followed by `npm run prepublishOnly`. This will generate updated icons.
+
+If you want to download the icons straight from GitHub, change the `FROM_DISK` variable to `false` inside of `update-icon-theme.js`.
+
+### Languages not shipped with `vscode`
+
+Languages that are not shipped with `vscode` must be added to the `nonBuiltInLanguages` object inside of `update-icon-theme.js`.
+
+These should match [the file mapping in `seti-ui`](https://github.com/jesseweed/seti-ui/blob/master/styles/components/icons/mapping.less).
+
+Please try and keep this list in alphabetical order! Thank you.
+
+## Previewing icons
+
+There is a [`./icons/preview.html`](./icons/preview.html) file that can be opened to see all of the icons included in the theme.
+Note that to view this, it needs to be hosted by a web server.
+
+When updating icons, it is always a good idea to make sure that they work properly by looking at this page.
+When submitting a PR that updates these icons, a screenshot of the preview page should accompany it.
diff --git a/extensions/theme-seti/README.md b/extensions/theme-seti/README.md
new file mode 100644
index 00000000000..888829ff004
--- /dev/null
+++ b/extensions/theme-seti/README.md
@@ -0,0 +1,32 @@
+# theme-seti
+
+This is an icon theme that uses the icons from [`seti-ui`](https://github.com/jesseweed/seti-ui).
+
+## Updating icons
+
+There is script that can be used to update icons, [./build/update-icon-theme.js](build/update-icon-theme.js).
+
+To run this script, run `npm run update` from the `theme-seti` directory.
+
+This can be run in one of two ways: looking at a local copy of `seti-ui` for icons, or getting them straight from GitHub.
+
+If you want to run it from a local copy of `seti-ui`, first clone [`seti-ui`](https://github.com/jesseweed/seti-ui) to the folder next to your `vscode` repo (from the `theme-seti` directory, `../../`).
+Then, inside the `set-ui` directory, run `npm install` followed by `npm run prepublishOnly`. This will generate updated icons.
+
+If you want to download the icons straight from GitHub, change the `FROM_DISK` variable to `false` inside of `update-icon-theme.js`.
+
+### Languages not shipped with `vscode`
+
+Languages that are not shipped with `vscode` must be added to the `nonBuiltInLanguages` object inside of `update-icon-theme.js`.
+
+These should match [the file mapping in `seti-ui`](https://github.com/jesseweed/seti-ui/blob/master/styles/components/icons/mapping.less).
+
+Please try and keep this list in alphabetical order! Thank you.
+
+## Previewing icons
+
+There is a [`./icons/preview.html`](./icons/preview.html) file that can be opened to see all of the icons included in the theme.
+Note that to view this, it needs to be hosted by a web server.
+
+When updating icons, it is always a good idea to make sure that they work properly by looking at this page.
+When submitting a PR that updates these icons, a screenshot of the preview page should accompany it.
diff --git a/extensions/theme-seti/build/update-icon-theme.js b/extensions/theme-seti/build/update-icon-theme.js
index 09fb12dda14..a9aa74bc2ae 100644
--- a/extensions/theme-seti/build/update-icon-theme.js
+++ b/extensions/theme-seti/build/update-icon-theme.js
@@ -11,29 +11,31 @@ let https = require('https');
 let url = require('url');
 
 // list of languagesId not shipped with VSCode. The information is used to associate an icon with a language association
+// Please try and keep this list in alphabetical order! Thank you.
 let nonBuiltInLanguages = { // { fileNames, extensions  }
-	"r": { extensions: ['r', 'rhistory', 'rprofile', 'rt'] },
 	"argdown": { extensions: ['ad', 'adown', 'argdown', 'argdn'] },
-	"elm": { extensions: ['elm'] },
-	"ocaml": { extensions: ['ml', 'mli'] },
-	"nunjucks": { extensions: ['nunjucks', 'nunjs', 'nunj', 'nj', 'njk', 'tmpl', 'tpl'] },
-	"mustache": { extensions: ['mustache', 'mst', 'mu', 'stache'] },
-	"erb": { extensions: ['erb', 'rhtml', 'html.erb'] },
-	"terraform": { extensions: ['tf', 'tfvars', 'hcl'] },
-	"vue": { extensions: ['vue'] },
-	"sass": { extensions: ['sass'] },
-	"puppet": { extensions: ['puppet'] },
-	"kotlin": { extensions: ['kt'] },
-	"jinja": { extensions: ['jinja'] },
-	"haxe": { extensions: ['hx'] },
-	"haskell": { extensions: ['hs'] },
-	"gradle": { extensions: ['gradle'] },
 	"elixir": { extensions: ['ex'] },
-	"haml": { extensions: ['haml'] },
-	"stylus": { extensions: ['styl'] },
-	"vala": { extensions: ['vala'] },
+	"elm": { extensions: ['elm'] },
+	"erb": { extensions: ['erb', 'rhtml', 'html.erb'] },
 	"github-issues": { extensions: ['github-issues'] },
-	"todo": { fileNames: ['todo'] }
+	"gradle": { extensions: ['gradle'] },
+	"godot": { extensions: ['gd', 'godot', 'tres', 'tscn'] },
+	"haml": { extensions: ['haml'] },
+	"haskell": { extensions: ['hs'] },
+	"haxe": { extensions: ['hx'] },
+	"jinja": { extensions: ['jinja'] },
+	"kotlin": { extensions: ['kt'] },
+	"mustache": { extensions: ['mustache', 'mst', 'mu', 'stache'] },
+	"nunjucks": { extensions: ['nunjucks', 'nunjs', 'nunj', 'nj', 'njk', 'tmpl', 'tpl'] },
+	"ocaml": { extensions: ['ml', 'mli'] },
+	"puppet": { extensions: ['puppet'] },
+	"r": { extensions: ['r', 'rhistory', 'rprofile', 'rt'] },
+	"sass": { extensions: ['sass'] },
+	"stylus": { extensions: ['styl'] },
+	"terraform": { extensions: ['tf', 'tfvars', 'hcl'] },
+	"todo": { fileNames: ['todo'] },
+	"vala": { extensions: ['vala'] },
+	"vue": { extensions: ['vue'] }
 };
 
 // list of languagesId that inherit the icon from another language
diff --git a/extensions/theme-seti/cgmanifest.json b/extensions/theme-seti/cgmanifest.json
index 3c3017b0615..f2414fe58ba 100644
--- a/extensions/theme-seti/cgmanifest.json
+++ b/extensions/theme-seti/cgmanifest.json
@@ -6,7 +6,7 @@
 				"git": {
 					"name": "seti-ui",
 					"repositoryUrl": "https://github.com/jesseweed/seti-ui",
-					"commitHash": "9c1c29d6e9358f9ae99bd3a4bf0d2fa804dca686"
+					"commitHash": "4c16086852e7559cc23f63c45cce00c983ce36db"
 				}
 			},
 			"version": "0.1.0"
diff --git a/extensions/theme-seti/icons/seti.woff b/extensions/theme-seti/icons/seti.woff
index cd77f8d15aa..3e449273f8c 100644
Binary files a/extensions/theme-seti/icons/seti.woff and b/extensions/theme-seti/icons/seti.woff differ
diff --git a/extensions/theme-seti/icons/vs-seti-icon-theme.json b/extensions/theme-seti/icons/vs-seti-icon-theme.json
index 7a10a533a5a..663a3361dbb 100644
--- a/extensions/theme-seti/icons/vs-seti-icon-theme.json
+++ b/extensions/theme-seti/icons/vs-seti-icon-theme.json
@@ -23,11 +23,11 @@
 	],
 	"iconDefinitions": {
 		"_R_light": {
-			"fontCharacter": "\\E075",
+			"fontCharacter": "\\E076",
 			"fontColor": "#498ba7"
 		},
 		"_R": {
-			"fontCharacter": "\\E075",
+			"fontCharacter": "\\E076",
 			"fontColor": "#519aba"
 		},
 		"_argdown_light": {
@@ -462,967 +462,999 @@
 			"fontCharacter": "\\E036",
 			"fontColor": "#519aba"
 		},
-		"_gradle_light": {
+		"_godot_light": {
 			"fontCharacter": "\\E037",
 			"fontColor": "#498ba7"
 		},
+		"_godot": {
+			"fontCharacter": "\\E037",
+			"fontColor": "#519aba"
+		},
+		"_godot_1_light": {
+			"fontCharacter": "\\E037",
+			"fontColor": "#b8383d"
+		},
+		"_godot_1": {
+			"fontCharacter": "\\E037",
+			"fontColor": "#cc3e44"
+		},
+		"_godot_2_light": {
+			"fontCharacter": "\\E037",
+			"fontColor": "#b7b73b"
+		},
+		"_godot_2": {
+			"fontCharacter": "\\E037",
+			"fontColor": "#cbcb41"
+		},
+		"_godot_3_light": {
+			"fontCharacter": "\\E037",
+			"fontColor": "#9068b0"
+		},
+		"_godot_3": {
+			"fontCharacter": "\\E037",
+			"fontColor": "#a074c4"
+		},
+		"_gradle_light": {
+			"fontCharacter": "\\E038",
+			"fontColor": "#498ba7"
+		},
 		"_gradle": {
-			"fontCharacter": "\\E037",
+			"fontCharacter": "\\E038",
 			"fontColor": "#519aba"
 		},
 		"_grails_light": {
-			"fontCharacter": "\\E038",
+			"fontCharacter": "\\E039",
 			"fontColor": "#7fae42"
 		},
 		"_grails": {
-			"fontCharacter": "\\E038",
+			"fontCharacter": "\\E039",
 			"fontColor": "#8dc149"
 		},
 		"_graphql_light": {
-			"fontCharacter": "\\E039",
+			"fontCharacter": "\\E03A",
 			"fontColor": "#dd4b78"
 		},
 		"_graphql": {
-			"fontCharacter": "\\E039",
+			"fontCharacter": "\\E03A",
 			"fontColor": "#f55385"
 		},
 		"_grunt_light": {
-			"fontCharacter": "\\E03A",
+			"fontCharacter": "\\E03B",
 			"fontColor": "#cc6d2e"
 		},
 		"_grunt": {
-			"fontCharacter": "\\E03A",
+			"fontCharacter": "\\E03B",
 			"fontColor": "#e37933"
 		},
 		"_gulp_light": {
-			"fontCharacter": "\\E03B",
+			"fontCharacter": "\\E03C",
 			"fontColor": "#b8383d"
 		},
 		"_gulp": {
-			"fontCharacter": "\\E03B",
+			"fontCharacter": "\\E03C",
 			"fontColor": "#cc3e44"
 		},
 		"_haml_light": {
-			"fontCharacter": "\\E03D",
+			"fontCharacter": "\\E03E",
 			"fontColor": "#b8383d"
 		},
 		"_haml": {
-			"fontCharacter": "\\E03D",
+			"fontCharacter": "\\E03E",
 			"fontColor": "#cc3e44"
 		},
 		"_happenings_light": {
-			"fontCharacter": "\\E03E",
+			"fontCharacter": "\\E03F",
 			"fontColor": "#498ba7"
 		},
 		"_happenings": {
-			"fontCharacter": "\\E03E",
+			"fontCharacter": "\\E03F",
 			"fontColor": "#519aba"
 		},
 		"_haskell_light": {
-			"fontCharacter": "\\E03F",
+			"fontCharacter": "\\E040",
 			"fontColor": "#9068b0"
 		},
 		"_haskell": {
-			"fontCharacter": "\\E03F",
+			"fontCharacter": "\\E040",
 			"fontColor": "#a074c4"
 		},
 		"_haxe_light": {
-			"fontCharacter": "\\E040",
+			"fontCharacter": "\\E041",
 			"fontColor": "#cc6d2e"
 		},
 		"_haxe": {
-			"fontCharacter": "\\E040",
+			"fontCharacter": "\\E041",
 			"fontColor": "#e37933"
 		},
 		"_haxe_1_light": {
-			"fontCharacter": "\\E040",
+			"fontCharacter": "\\E041",
 			"fontColor": "#b7b73b"
 		},
 		"_haxe_1": {
-			"fontCharacter": "\\E040",
+			"fontCharacter": "\\E041",
 			"fontColor": "#cbcb41"
 		},
 		"_haxe_2_light": {
-			"fontCharacter": "\\E040",
+			"fontCharacter": "\\E041",
 			"fontColor": "#498ba7"
 		},
 		"_haxe_2": {
-			"fontCharacter": "\\E040",
+			"fontCharacter": "\\E041",
 			"fontColor": "#519aba"
 		},
 		"_haxe_3_light": {
-			"fontCharacter": "\\E040",
+			"fontCharacter": "\\E041",
 			"fontColor": "#9068b0"
 		},
 		"_haxe_3": {
-			"fontCharacter": "\\E040",
+			"fontCharacter": "\\E041",
 			"fontColor": "#a074c4"
 		},
 		"_heroku_light": {
-			"fontCharacter": "\\E041",
+			"fontCharacter": "\\E042",
 			"fontColor": "#9068b0"
 		},
 		"_heroku": {
-			"fontCharacter": "\\E041",
+			"fontCharacter": "\\E042",
 			"fontColor": "#a074c4"
 		},
 		"_hex_light": {
-			"fontCharacter": "\\E042",
+			"fontCharacter": "\\E043",
 			"fontColor": "#b8383d"
 		},
 		"_hex": {
-			"fontCharacter": "\\E042",
+			"fontCharacter": "\\E043",
 			"fontColor": "#cc3e44"
 		},
 		"_html_light": {
-			"fontCharacter": "\\E043",
+			"fontCharacter": "\\E044",
 			"fontColor": "#498ba7"
 		},
 		"_html": {
-			"fontCharacter": "\\E043",
+			"fontCharacter": "\\E044",
 			"fontColor": "#519aba"
 		},
 		"_html_1_light": {
-			"fontCharacter": "\\E043",
+			"fontCharacter": "\\E044",
 			"fontColor": "#7fae42"
 		},
 		"_html_1": {
-			"fontCharacter": "\\E043",
+			"fontCharacter": "\\E044",
 			"fontColor": "#8dc149"
 		},
 		"_html_2_light": {
-			"fontCharacter": "\\E043",
+			"fontCharacter": "\\E044",
 			"fontColor": "#b7b73b"
 		},
 		"_html_2": {
-			"fontCharacter": "\\E043",
+			"fontCharacter": "\\E044",
 			"fontColor": "#cbcb41"
 		},
 		"_html_3_light": {
-			"fontCharacter": "\\E043",
+			"fontCharacter": "\\E044",
 			"fontColor": "#cc6d2e"
 		},
 		"_html_3": {
-			"fontCharacter": "\\E043",
+			"fontCharacter": "\\E044",
 			"fontColor": "#e37933"
 		},
 		"_html_erb_light": {
-			"fontCharacter": "\\E044",
+			"fontCharacter": "\\E045",
 			"fontColor": "#b8383d"
 		},
 		"_html_erb": {
-			"fontCharacter": "\\E044",
+			"fontCharacter": "\\E045",
 			"fontColor": "#cc3e44"
 		},
 		"_ignored_light": {
-			"fontCharacter": "\\E045",
+			"fontCharacter": "\\E046",
 			"fontColor": "#3b4b52"
 		},
 		"_ignored": {
-			"fontCharacter": "\\E045",
+			"fontCharacter": "\\E046",
 			"fontColor": "#41535b"
 		},
 		"_illustrator_light": {
-			"fontCharacter": "\\E046",
+			"fontCharacter": "\\E047",
 			"fontColor": "#b7b73b"
 		},
 		"_illustrator": {
-			"fontCharacter": "\\E046",
+			"fontCharacter": "\\E047",
 			"fontColor": "#cbcb41"
 		},
 		"_image_light": {
-			"fontCharacter": "\\E047",
+			"fontCharacter": "\\E048",
 			"fontColor": "#9068b0"
 		},
 		"_image": {
-			"fontCharacter": "\\E047",
+			"fontCharacter": "\\E048",
 			"fontColor": "#a074c4"
 		},
 		"_info_light": {
-			"fontCharacter": "\\E048",
+			"fontCharacter": "\\E049",
 			"fontColor": "#498ba7"
 		},
 		"_info": {
-			"fontCharacter": "\\E048",
+			"fontCharacter": "\\E049",
 			"fontColor": "#519aba"
 		},
 		"_ionic_light": {
-			"fontCharacter": "\\E049",
+			"fontCharacter": "\\E04A",
 			"fontColor": "#498ba7"
 		},
 		"_ionic": {
-			"fontCharacter": "\\E049",
+			"fontCharacter": "\\E04A",
 			"fontColor": "#519aba"
 		},
 		"_jade_light": {
-			"fontCharacter": "\\E04A",
+			"fontCharacter": "\\E04B",
 			"fontColor": "#b8383d"
 		},
 		"_jade": {
-			"fontCharacter": "\\E04A",
+			"fontCharacter": "\\E04B",
 			"fontColor": "#cc3e44"
 		},
 		"_java_light": {
-			"fontCharacter": "\\E04B",
+			"fontCharacter": "\\E04C",
 			"fontColor": "#b8383d"
 		},
 		"_java": {
-			"fontCharacter": "\\E04B",
+			"fontCharacter": "\\E04C",
 			"fontColor": "#cc3e44"
 		},
 		"_javascript_light": {
-			"fontCharacter": "\\E04C",
+			"fontCharacter": "\\E04D",
 			"fontColor": "#b7b73b"
 		},
 		"_javascript": {
-			"fontCharacter": "\\E04C",
+			"fontCharacter": "\\E04D",
 			"fontColor": "#cbcb41"
 		},
 		"_javascript_1_light": {
-			"fontCharacter": "\\E04C",
+			"fontCharacter": "\\E04D",
 			"fontColor": "#cc6d2e"
 		},
 		"_javascript_1": {
-			"fontCharacter": "\\E04C",
+			"fontCharacter": "\\E04D",
 			"fontColor": "#e37933"
 		},
 		"_javascript_2_light": {
-			"fontCharacter": "\\E04C",
+			"fontCharacter": "\\E04D",
 			"fontColor": "#498ba7"
 		},
 		"_javascript_2": {
-			"fontCharacter": "\\E04C",
+			"fontCharacter": "\\E04D",
 			"fontColor": "#519aba"
 		},
 		"_jenkins_light": {
-			"fontCharacter": "\\E04D",
+			"fontCharacter": "\\E04E",
 			"fontColor": "#b8383d"
 		},
 		"_jenkins": {
-			"fontCharacter": "\\E04D",
+			"fontCharacter": "\\E04E",
 			"fontColor": "#cc3e44"
 		},
 		"_jinja_light": {
-			"fontCharacter": "\\E04E",
+			"fontCharacter": "\\E04F",
 			"fontColor": "#b8383d"
 		},
 		"_jinja": {
-			"fontCharacter": "\\E04E",
+			"fontCharacter": "\\E04F",
 			"fontColor": "#cc3e44"
 		},
 		"_json_light": {
-			"fontCharacter": "\\E04F",
+			"fontCharacter": "\\E050",
 			"fontColor": "#b7b73b"
 		},
 		"_json": {
-			"fontCharacter": "\\E04F",
+			"fontCharacter": "\\E050",
 			"fontColor": "#cbcb41"
 		},
 		"_json_1_light": {
-			"fontCharacter": "\\E04F",
+			"fontCharacter": "\\E050",
 			"fontColor": "#7fae42"
 		},
 		"_json_1": {
-			"fontCharacter": "\\E04F",
+			"fontCharacter": "\\E050",
 			"fontColor": "#8dc149"
 		},
 		"_julia_light": {
-			"fontCharacter": "\\E051",
+			"fontCharacter": "\\E052",
 			"fontColor": "#9068b0"
 		},
 		"_julia": {
-			"fontCharacter": "\\E051",
+			"fontCharacter": "\\E052",
 			"fontColor": "#a074c4"
 		},
 		"_karma_light": {
-			"fontCharacter": "\\E052",
+			"fontCharacter": "\\E053",
 			"fontColor": "#7fae42"
 		},
 		"_karma": {
-			"fontCharacter": "\\E052",
+			"fontCharacter": "\\E053",
 			"fontColor": "#8dc149"
 		},
 		"_kotlin_light": {
-			"fontCharacter": "\\E053",
+			"fontCharacter": "\\E054",
 			"fontColor": "#cc6d2e"
 		},
 		"_kotlin": {
-			"fontCharacter": "\\E053",
+			"fontCharacter": "\\E054",
 			"fontColor": "#e37933"
 		},
 		"_less_light": {
-			"fontCharacter": "\\E054",
+			"fontCharacter": "\\E055",
 			"fontColor": "#498ba7"
 		},
 		"_less": {
-			"fontCharacter": "\\E054",
+			"fontCharacter": "\\E055",
 			"fontColor": "#519aba"
 		},
 		"_license_light": {
-			"fontCharacter": "\\E055",
+			"fontCharacter": "\\E056",
 			"fontColor": "#b7b73b"
 		},
 		"_license": {
-			"fontCharacter": "\\E055",
+			"fontCharacter": "\\E056",
 			"fontColor": "#cbcb41"
 		},
 		"_license_1_light": {
-			"fontCharacter": "\\E055",
+			"fontCharacter": "\\E056",
 			"fontColor": "#cc6d2e"
 		},
 		"_license_1": {
-			"fontCharacter": "\\E055",
+			"fontCharacter": "\\E056",
 			"fontColor": "#e37933"
 		},
 		"_license_2_light": {
-			"fontCharacter": "\\E055",
+			"fontCharacter": "\\E056",
 			"fontColor": "#b8383d"
 		},
 		"_license_2": {
-			"fontCharacter": "\\E055",
+			"fontCharacter": "\\E056",
 			"fontColor": "#cc3e44"
 		},
 		"_liquid_light": {
-			"fontCharacter": "\\E056",
+			"fontCharacter": "\\E057",
 			"fontColor": "#7fae42"
 		},
 		"_liquid": {
-			"fontCharacter": "\\E056",
+			"fontCharacter": "\\E057",
 			"fontColor": "#8dc149"
 		},
 		"_livescript_light": {
-			"fontCharacter": "\\E057",
+			"fontCharacter": "\\E058",
 			"fontColor": "#498ba7"
 		},
 		"_livescript": {
-			"fontCharacter": "\\E057",
+			"fontCharacter": "\\E058",
 			"fontColor": "#519aba"
 		},
 		"_lock_light": {
-			"fontCharacter": "\\E058",
+			"fontCharacter": "\\E059",
 			"fontColor": "#7fae42"
 		},
 		"_lock": {
-			"fontCharacter": "\\E058",
+			"fontCharacter": "\\E059",
 			"fontColor": "#8dc149"
 		},
 		"_lua_light": {
-			"fontCharacter": "\\E059",
+			"fontCharacter": "\\E05A",
 			"fontColor": "#498ba7"
 		},
 		"_lua": {
-			"fontCharacter": "\\E059",
+			"fontCharacter": "\\E05A",
 			"fontColor": "#519aba"
 		},
 		"_makefile_light": {
-			"fontCharacter": "\\E05A",
+			"fontCharacter": "\\E05B",
 			"fontColor": "#cc6d2e"
 		},
 		"_makefile": {
-			"fontCharacter": "\\E05A",
+			"fontCharacter": "\\E05B",
 			"fontColor": "#e37933"
 		},
 		"_makefile_1_light": {
-			"fontCharacter": "\\E05A",
+			"fontCharacter": "\\E05B",
 			"fontColor": "#9068b0"
 		},
 		"_makefile_1": {
-			"fontCharacter": "\\E05A",
+			"fontCharacter": "\\E05B",
 			"fontColor": "#a074c4"
 		},
 		"_makefile_2_light": {
-			"fontCharacter": "\\E05A",
+			"fontCharacter": "\\E05B",
 			"fontColor": "#627379"
 		},
 		"_makefile_2": {
-			"fontCharacter": "\\E05A",
+			"fontCharacter": "\\E05B",
 			"fontColor": "#6d8086"
 		},
 		"_makefile_3_light": {
-			"fontCharacter": "\\E05A",
+			"fontCharacter": "\\E05B",
 			"fontColor": "#498ba7"
 		},
 		"_makefile_3": {
-			"fontCharacter": "\\E05A",
+			"fontCharacter": "\\E05B",
 			"fontColor": "#519aba"
 		},
 		"_markdown_light": {
-			"fontCharacter": "\\E05B",
+			"fontCharacter": "\\E05C",
 			"fontColor": "#498ba7"
 		},
 		"_markdown": {
-			"fontCharacter": "\\E05B",
+			"fontCharacter": "\\E05C",
 			"fontColor": "#519aba"
 		},
 		"_maven_light": {
-			"fontCharacter": "\\E05C",
+			"fontCharacter": "\\E05D",
 			"fontColor": "#b8383d"
 		},
 		"_maven": {
-			"fontCharacter": "\\E05C",
+			"fontCharacter": "\\E05D",
 			"fontColor": "#cc3e44"
 		},
 		"_mdo_light": {
-			"fontCharacter": "\\E05D",
+			"fontCharacter": "\\E05E",
 			"fontColor": "#b8383d"
 		},
 		"_mdo": {
-			"fontCharacter": "\\E05D",
+			"fontCharacter": "\\E05E",
 			"fontColor": "#cc3e44"
 		},
 		"_mustache_light": {
-			"fontCharacter": "\\E05E",
+			"fontCharacter": "\\E05F",
 			"fontColor": "#cc6d2e"
 		},
 		"_mustache": {
-			"fontCharacter": "\\E05E",
+			"fontCharacter": "\\E05F",
 			"fontColor": "#e37933"
 		},
 		"_nim_light": {
-			"fontCharacter": "\\E060",
+			"fontCharacter": "\\E061",
 			"fontColor": "#b7b73b"
 		},
 		"_nim": {
-			"fontCharacter": "\\E060",
+			"fontCharacter": "\\E061",
 			"fontColor": "#cbcb41"
 		},
 		"_notebook_light": {
-			"fontCharacter": "\\E061",
+			"fontCharacter": "\\E062",
 			"fontColor": "#498ba7"
 		},
 		"_notebook": {
-			"fontCharacter": "\\E061",
+			"fontCharacter": "\\E062",
 			"fontColor": "#519aba"
 		},
 		"_npm_light": {
-			"fontCharacter": "\\E062",
+			"fontCharacter": "\\E063",
 			"fontColor": "#3b4b52"
 		},
 		"_npm": {
-			"fontCharacter": "\\E062",
+			"fontCharacter": "\\E063",
 			"fontColor": "#41535b"
 		},
 		"_npm_1_light": {
-			"fontCharacter": "\\E062",
+			"fontCharacter": "\\E063",
 			"fontColor": "#b8383d"
 		},
 		"_npm_1": {
-			"fontCharacter": "\\E062",
+			"fontCharacter": "\\E063",
 			"fontColor": "#cc3e44"
 		},
 		"_npm_ignored_light": {
-			"fontCharacter": "\\E063",
+			"fontCharacter": "\\E064",
 			"fontColor": "#3b4b52"
 		},
 		"_npm_ignored": {
-			"fontCharacter": "\\E063",
+			"fontCharacter": "\\E064",
 			"fontColor": "#41535b"
 		},
 		"_nunjucks_light": {
-			"fontCharacter": "\\E064",
+			"fontCharacter": "\\E065",
 			"fontColor": "#7fae42"
 		},
 		"_nunjucks": {
-			"fontCharacter": "\\E064",
+			"fontCharacter": "\\E065",
 			"fontColor": "#8dc149"
 		},
 		"_ocaml_light": {
-			"fontCharacter": "\\E065",
+			"fontCharacter": "\\E066",
 			"fontColor": "#cc6d2e"
 		},
 		"_ocaml": {
-			"fontCharacter": "\\E065",
+			"fontCharacter": "\\E066",
 			"fontColor": "#e37933"
 		},
 		"_odata_light": {
-			"fontCharacter": "\\E066",
+			"fontCharacter": "\\E067",
 			"fontColor": "#cc6d2e"
 		},
 		"_odata": {
-			"fontCharacter": "\\E066",
+			"fontCharacter": "\\E067",
 			"fontColor": "#e37933"
 		},
 		"_pddl_light": {
-			"fontCharacter": "\\E067",
+			"fontCharacter": "\\E068",
 			"fontColor": "#9068b0"
 		},
 		"_pddl": {
-			"fontCharacter": "\\E067",
+			"fontCharacter": "\\E068",
 			"fontColor": "#a074c4"
 		},
 		"_pdf_light": {
-			"fontCharacter": "\\E068",
+			"fontCharacter": "\\E069",
 			"fontColor": "#b8383d"
 		},
 		"_pdf": {
-			"fontCharacter": "\\E068",
+			"fontCharacter": "\\E069",
 			"fontColor": "#cc3e44"
 		},
 		"_perl_light": {
-			"fontCharacter": "\\E069",
+			"fontCharacter": "\\E06A",
 			"fontColor": "#498ba7"
 		},
 		"_perl": {
-			"fontCharacter": "\\E069",
+			"fontCharacter": "\\E06A",
 			"fontColor": "#519aba"
 		},
 		"_photoshop_light": {
-			"fontCharacter": "\\E06A",
+			"fontCharacter": "\\E06B",
 			"fontColor": "#498ba7"
 		},
 		"_photoshop": {
-			"fontCharacter": "\\E06A",
+			"fontCharacter": "\\E06B",
 			"fontColor": "#519aba"
 		},
 		"_php_light": {
-			"fontCharacter": "\\E06B",
+			"fontCharacter": "\\E06C",
 			"fontColor": "#9068b0"
 		},
 		"_php": {
-			"fontCharacter": "\\E06B",
+			"fontCharacter": "\\E06C",
 			"fontColor": "#a074c4"
 		},
 		"_plan_light": {
-			"fontCharacter": "\\E06C",
+			"fontCharacter": "\\E06D",
 			"fontColor": "#7fae42"
 		},
 		"_plan": {
-			"fontCharacter": "\\E06C",
+			"fontCharacter": "\\E06D",
 			"fontColor": "#8dc149"
 		},
 		"_platformio_light": {
-			"fontCharacter": "\\E06D",
+			"fontCharacter": "\\E06E",
 			"fontColor": "#cc6d2e"
 		},
 		"_platformio": {
-			"fontCharacter": "\\E06D",
+			"fontCharacter": "\\E06E",
 			"fontColor": "#e37933"
 		},
 		"_powershell_light": {
-			"fontCharacter": "\\E06E",
+			"fontCharacter": "\\E06F",
 			"fontColor": "#498ba7"
 		},
 		"_powershell": {
-			"fontCharacter": "\\E06E",
+			"fontCharacter": "\\E06F",
 			"fontColor": "#519aba"
 		},
 		"_prisma_light": {
-			"fontCharacter": "\\E06F",
+			"fontCharacter": "\\E070",
 			"fontColor": "#498ba7"
 		},
 		"_prisma": {
-			"fontCharacter": "\\E06F",
+			"fontCharacter": "\\E070",
 			"fontColor": "#519aba"
 		},
 		"_prolog_light": {
-			"fontCharacter": "\\E071",
+			"fontCharacter": "\\E072",
 			"fontColor": "#cc6d2e"
 		},
 		"_prolog": {
-			"fontCharacter": "\\E071",
+			"fontCharacter": "\\E072",
 			"fontColor": "#e37933"
 		},
 		"_pug_light": {
-			"fontCharacter": "\\E072",
+			"fontCharacter": "\\E073",
 			"fontColor": "#b8383d"
 		},
 		"_pug": {
-			"fontCharacter": "\\E072",
+			"fontCharacter": "\\E073",
 			"fontColor": "#cc3e44"
 		},
 		"_puppet_light": {
-			"fontCharacter": "\\E073",
+			"fontCharacter": "\\E074",
 			"fontColor": "#b7b73b"
 		},
 		"_puppet": {
-			"fontCharacter": "\\E073",
+			"fontCharacter": "\\E074",
 			"fontColor": "#cbcb41"
 		},
 		"_python_light": {
-			"fontCharacter": "\\E074",
+			"fontCharacter": "\\E075",
 			"fontColor": "#498ba7"
 		},
 		"_python": {
-			"fontCharacter": "\\E074",
+			"fontCharacter": "\\E075",
 			"fontColor": "#519aba"
 		},
 		"_react_light": {
-			"fontCharacter": "\\E077",
+			"fontCharacter": "\\E078",
 			"fontColor": "#498ba7"
 		},
 		"_react": {
-			"fontCharacter": "\\E077",
+			"fontCharacter": "\\E078",
 			"fontColor": "#519aba"
 		},
 		"_react_1_light": {
-			"fontCharacter": "\\E077",
+			"fontCharacter": "\\E078",
 			"fontColor": "#cc6d2e"
 		},
 		"_react_1": {
-			"fontCharacter": "\\E077",
+			"fontCharacter": "\\E078",
 			"fontColor": "#e37933"
 		},
 		"_react_2_light": {
-			"fontCharacter": "\\E077",
+			"fontCharacter": "\\E078",
 			"fontColor": "#b7b73b"
 		},
 		"_react_2": {
-			"fontCharacter": "\\E077",
+			"fontCharacter": "\\E078",
 			"fontColor": "#cbcb41"
 		},
 		"_reasonml_light": {
-			"fontCharacter": "\\E078",
+			"fontCharacter": "\\E079",
 			"fontColor": "#b8383d"
 		},
 		"_reasonml": {
-			"fontCharacter": "\\E078",
+			"fontCharacter": "\\E079",
 			"fontColor": "#cc3e44"
 		},
 		"_rollup_light": {
-			"fontCharacter": "\\E079",
+			"fontCharacter": "\\E07A",
 			"fontColor": "#b8383d"
 		},
 		"_rollup": {
-			"fontCharacter": "\\E079",
+			"fontCharacter": "\\E07A",
 			"fontColor": "#cc3e44"
 		},
 		"_ruby_light": {
-			"fontCharacter": "\\E07A",
+			"fontCharacter": "\\E07B",
 			"fontColor": "#b8383d"
 		},
 		"_ruby": {
-			"fontCharacter": "\\E07A",
+			"fontCharacter": "\\E07B",
 			"fontColor": "#cc3e44"
 		},
 		"_rust_light": {
-			"fontCharacter": "\\E07B",
+			"fontCharacter": "\\E07C",
 			"fontColor": "#627379"
 		},
 		"_rust": {
-			"fontCharacter": "\\E07B",
+			"fontCharacter": "\\E07C",
 			"fontColor": "#6d8086"
 		},
 		"_salesforce_light": {
-			"fontCharacter": "\\E07C",
+			"fontCharacter": "\\E07D",
 			"fontColor": "#498ba7"
 		},
 		"_salesforce": {
-			"fontCharacter": "\\E07C",
+			"fontCharacter": "\\E07D",
 			"fontColor": "#519aba"
 		},
 		"_sass_light": {
-			"fontCharacter": "\\E07D",
+			"fontCharacter": "\\E07E",
 			"fontColor": "#dd4b78"
 		},
 		"_sass": {
-			"fontCharacter": "\\E07D",
+			"fontCharacter": "\\E07E",
 			"fontColor": "#f55385"
 		},
 		"_sbt_light": {
-			"fontCharacter": "\\E07E",
+			"fontCharacter": "\\E07F",
 			"fontColor": "#498ba7"
 		},
 		"_sbt": {
-			"fontCharacter": "\\E07E",
+			"fontCharacter": "\\E07F",
 			"fontColor": "#519aba"
 		},
 		"_scala_light": {
-			"fontCharacter": "\\E07F",
+			"fontCharacter": "\\E080",
 			"fontColor": "#b8383d"
 		},
 		"_scala": {
-			"fontCharacter": "\\E07F",
+			"fontCharacter": "\\E080",
 			"fontColor": "#cc3e44"
 		},
 		"_shell_light": {
-			"fontCharacter": "\\E082",
+			"fontCharacter": "\\E083",
 			"fontColor": "#455155"
 		},
 		"_shell": {
-			"fontCharacter": "\\E082",
+			"fontCharacter": "\\E083",
 			"fontColor": "#4d5a5e"
 		},
 		"_slim_light": {
-			"fontCharacter": "\\E083",
+			"fontCharacter": "\\E084",
 			"fontColor": "#cc6d2e"
 		},
 		"_slim": {
-			"fontCharacter": "\\E083",
+			"fontCharacter": "\\E084",
 			"fontColor": "#e37933"
 		},
 		"_smarty_light": {
-			"fontCharacter": "\\E084",
+			"fontCharacter": "\\E085",
 			"fontColor": "#b7b73b"
 		},
 		"_smarty": {
-			"fontCharacter": "\\E084",
+			"fontCharacter": "\\E085",
 			"fontColor": "#cbcb41"
 		},
 		"_spring_light": {
-			"fontCharacter": "\\E085",
+			"fontCharacter": "\\E086",
 			"fontColor": "#7fae42"
 		},
 		"_spring": {
-			"fontCharacter": "\\E085",
+			"fontCharacter": "\\E086",
 			"fontColor": "#8dc149"
 		},
 		"_stylelint_light": {
-			"fontCharacter": "\\E086",
+			"fontCharacter": "\\E087",
 			"fontColor": "#bfc2c1"
 		},
 		"_stylelint": {
-			"fontCharacter": "\\E086",
+			"fontCharacter": "\\E087",
 			"fontColor": "#d4d7d6"
 		},
 		"_stylelint_1_light": {
-			"fontCharacter": "\\E086",
+			"fontCharacter": "\\E087",
 			"fontColor": "#455155"
 		},
 		"_stylelint_1": {
-			"fontCharacter": "\\E086",
+			"fontCharacter": "\\E087",
 			"fontColor": "#4d5a5e"
 		},
 		"_stylus_light": {
-			"fontCharacter": "\\E087",
+			"fontCharacter": "\\E088",
 			"fontColor": "#7fae42"
 		},
 		"_stylus": {
-			"fontCharacter": "\\E087",
+			"fontCharacter": "\\E088",
 			"fontColor": "#8dc149"
 		},
 		"_sublime_light": {
-			"fontCharacter": "\\E088",
+			"fontCharacter": "\\E089",
 			"fontColor": "#cc6d2e"
 		},
 		"_sublime": {
-			"fontCharacter": "\\E088",
+			"fontCharacter": "\\E089",
 			"fontColor": "#e37933"
 		},
 		"_svelte_light": {
-			"fontCharacter": "\\E089",
+			"fontCharacter": "\\E08A",
 			"fontColor": "#b8383d"
 		},
 		"_svelte": {
-			"fontCharacter": "\\E089",
+			"fontCharacter": "\\E08A",
 			"fontColor": "#cc3e44"
 		},
 		"_svg_light": {
-			"fontCharacter": "\\E08A",
+			"fontCharacter": "\\E08B",
 			"fontColor": "#9068b0"
 		},
 		"_svg": {
-			"fontCharacter": "\\E08A",
+			"fontCharacter": "\\E08B",
 			"fontColor": "#a074c4"
 		},
 		"_svg_1_light": {
-			"fontCharacter": "\\E08A",
+			"fontCharacter": "\\E08B",
 			"fontColor": "#498ba7"
 		},
 		"_svg_1": {
-			"fontCharacter": "\\E08A",
+			"fontCharacter": "\\E08B",
 			"fontColor": "#519aba"
 		},
 		"_swift_light": {
-			"fontCharacter": "\\E08B",
+			"fontCharacter": "\\E08C",
 			"fontColor": "#cc6d2e"
 		},
 		"_swift": {
-			"fontCharacter": "\\E08B",
+			"fontCharacter": "\\E08C",
 			"fontColor": "#e37933"
 		},
 		"_terraform_light": {
-			"fontCharacter": "\\E08C",
+			"fontCharacter": "\\E08D",
 			"fontColor": "#9068b0"
 		},
 		"_terraform": {
-			"fontCharacter": "\\E08C",
+			"fontCharacter": "\\E08D",
 			"fontColor": "#a074c4"
 		},
 		"_tex_light": {
-			"fontCharacter": "\\E08D",
+			"fontCharacter": "\\E08E",
 			"fontColor": "#498ba7"
 		},
 		"_tex": {
-			"fontCharacter": "\\E08D",
+			"fontCharacter": "\\E08E",
 			"fontColor": "#519aba"
 		},
 		"_tex_1_light": {
-			"fontCharacter": "\\E08D",
+			"fontCharacter": "\\E08E",
 			"fontColor": "#b7b73b"
 		},
 		"_tex_1": {
-			"fontCharacter": "\\E08D",
+			"fontCharacter": "\\E08E",
 			"fontColor": "#cbcb41"
 		},
 		"_tex_2_light": {
-			"fontCharacter": "\\E08D",
+			"fontCharacter": "\\E08E",
 			"fontColor": "#cc6d2e"
 		},
 		"_tex_2": {
-			"fontCharacter": "\\E08D",
+			"fontCharacter": "\\E08E",
 			"fontColor": "#e37933"
 		},
 		"_tex_3_light": {
-			"fontCharacter": "\\E08D",
+			"fontCharacter": "\\E08E",
 			"fontColor": "#bfc2c1"
 		},
 		"_tex_3": {
-			"fontCharacter": "\\E08D",
+			"fontCharacter": "\\E08E",
 			"fontColor": "#d4d7d6"
 		},
 		"_todo": {
-			"fontCharacter": "\\E08F"
+			"fontCharacter": "\\E090"
 		},
 		"_tsconfig_light": {
-			"fontCharacter": "\\E090",
+			"fontCharacter": "\\E091",
 			"fontColor": "#498ba7"
 		},
 		"_tsconfig": {
-			"fontCharacter": "\\E090",
+			"fontCharacter": "\\E091",
 			"fontColor": "#519aba"
 		},
 		"_twig_light": {
-			"fontCharacter": "\\E091",
+			"fontCharacter": "\\E092",
 			"fontColor": "#7fae42"
 		},
 		"_twig": {
-			"fontCharacter": "\\E091",
+			"fontCharacter": "\\E092",
 			"fontColor": "#8dc149"
 		},
 		"_typescript_light": {
-			"fontCharacter": "\\E092",
+			"fontCharacter": "\\E093",
 			"fontColor": "#498ba7"
 		},
 		"_typescript": {
-			"fontCharacter": "\\E092",
+			"fontCharacter": "\\E093",
 			"fontColor": "#519aba"
 		},
 		"_typescript_1_light": {
-			"fontCharacter": "\\E092",
+			"fontCharacter": "\\E093",
 			"fontColor": "#b7b73b"
 		},
 		"_typescript_1": {
-			"fontCharacter": "\\E092",
+			"fontCharacter": "\\E093",
 			"fontColor": "#cbcb41"
 		},
 		"_vala_light": {
-			"fontCharacter": "\\E093",
+			"fontCharacter": "\\E094",
 			"fontColor": "#627379"
 		},
 		"_vala": {
-			"fontCharacter": "\\E093",
+			"fontCharacter": "\\E094",
 			"fontColor": "#6d8086"
 		},
 		"_video_light": {
-			"fontCharacter": "\\E094",
+			"fontCharacter": "\\E095",
 			"fontColor": "#dd4b78"
 		},
 		"_video": {
-			"fontCharacter": "\\E094",
+			"fontCharacter": "\\E095",
 			"fontColor": "#f55385"
 		},
 		"_vue_light": {
-			"fontCharacter": "\\E095",
+			"fontCharacter": "\\E096",
 			"fontColor": "#7fae42"
 		},
 		"_vue": {
-			"fontCharacter": "\\E095",
+			"fontCharacter": "\\E096",
 			"fontColor": "#8dc149"
 		},
 		"_wasm_light": {
-			"fontCharacter": "\\E096",
+			"fontCharacter": "\\E097",
 			"fontColor": "#9068b0"
 		},
 		"_wasm": {
-			"fontCharacter": "\\E096",
+			"fontCharacter": "\\E097",
 			"fontColor": "#a074c4"
 		},
 		"_wat_light": {
-			"fontCharacter": "\\E097",
+			"fontCharacter": "\\E098",
 			"fontColor": "#9068b0"
 		},
 		"_wat": {
-			"fontCharacter": "\\E097",
+			"fontCharacter": "\\E098",
 			"fontColor": "#a074c4"
 		},
 		"_webpack_light": {
-			"fontCharacter": "\\E098",
+			"fontCharacter": "\\E099",
 			"fontColor": "#498ba7"
 		},
 		"_webpack": {
-			"fontCharacter": "\\E098",
+			"fontCharacter": "\\E099",
 			"fontColor": "#519aba"
 		},
 		"_wgt_light": {
-			"fontCharacter": "\\E099",
+			"fontCharacter": "\\E09A",
 			"fontColor": "#498ba7"
 		},
 		"_wgt": {
-			"fontCharacter": "\\E099",
+			"fontCharacter": "\\E09A",
 			"fontColor": "#519aba"
 		},
 		"_windows_light": {
-			"fontCharacter": "\\E09A",
+			"fontCharacter": "\\E09B",
 			"fontColor": "#498ba7"
 		},
 		"_windows": {
-			"fontCharacter": "\\E09A",
+			"fontCharacter": "\\E09B",
 			"fontColor": "#519aba"
 		},
 		"_word_light": {
-			"fontCharacter": "\\E09B",
+			"fontCharacter": "\\E09C",
 			"fontColor": "#498ba7"
 		},
 		"_word": {
-			"fontCharacter": "\\E09B",
+			"fontCharacter": "\\E09C",
 			"fontColor": "#519aba"
 		},
 		"_xls_light": {
-			"fontCharacter": "\\E09C",
+			"fontCharacter": "\\E09D",
 			"fontColor": "#7fae42"
 		},
 		"_xls": {
-			"fontCharacter": "\\E09C",
+			"fontCharacter": "\\E09D",
 			"fontColor": "#8dc149"
 		},
 		"_xml_light": {
-			"fontCharacter": "\\E09D",
+			"fontCharacter": "\\E09E",
 			"fontColor": "#cc6d2e"
 		},
 		"_xml": {
-			"fontCharacter": "\\E09D",
+			"fontCharacter": "\\E09E",
 			"fontColor": "#e37933"
 		},
 		"_yarn_light": {
-			"fontCharacter": "\\E09E",
+			"fontCharacter": "\\E09F",
 			"fontColor": "#498ba7"
 		},
 		"_yarn": {
-			"fontCharacter": "\\E09E",
+			"fontCharacter": "\\E09F",
 			"fontColor": "#519aba"
 		},
 		"_yml_light": {
-			"fontCharacter": "\\E09F",
+			"fontCharacter": "\\E0A0",
 			"fontColor": "#9068b0"
 		},
 		"_yml": {
-			"fontCharacter": "\\E09F",
+			"fontCharacter": "\\E0A0",
 			"fontColor": "#a074c4"
 		},
 		"_zip_light": {
-			"fontCharacter": "\\E0A0",
+			"fontCharacter": "\\E0A1",
 			"fontColor": "#b8383d"
 		},
 		"_zip": {
-			"fontCharacter": "\\E0A0",
+			"fontCharacter": "\\E0A1",
 			"fontColor": "#cc3e44"
 		},
 		"_zip_1_light": {
-			"fontCharacter": "\\E0A0",
+			"fontCharacter": "\\E0A1",
 			"fontColor": "#627379"
 		},
 		"_zip_1": {
-			"fontCharacter": "\\E0A0",
+			"fontCharacter": "\\E0A1",
 			"fontColor": "#6d8086"
 		}
 	},
@@ -1477,6 +1509,10 @@
 		"gitmodules": "_git",
 		"slide": "_go",
 		"article": "_go",
+		"gd": "_godot",
+		"godot": "_godot_1",
+		"tres": "_godot_2",
+		"tscn": "_godot_3",
 		"gradle": "_gradle",
 		"gsp": "_grails",
 		"gql": "_graphql",
@@ -1501,7 +1537,6 @@
 		"es7": "_javascript",
 		"jinja": "_jinja",
 		"jinja2": "_jinja",
-		"jl": "_julia",
 		"kt": "_kotlin",
 		"kts": "_kotlin",
 		"dart": "_dart",
@@ -1721,6 +1756,7 @@
 		"javascriptreact": "_react",
 		"javascript": "_javascript",
 		"json": "_json",
+		"julia": "_julia",
 		"less": "_less",
 		"lua": "_lua",
 		"makefile": "_makefile",
@@ -1746,25 +1782,26 @@
 		"xml": "_xml",
 		"yaml": "_yml",
 		"argdown": "_argdown",
-		"elm": "_elm",
-		"ocaml": "_ocaml",
-		"nunjucks": "_nunjucks",
-		"mustache": "_mustache",
-		"erb": "_html_erb",
-		"terraform": "_terraform",
-		"vue": "_vue",
-		"sass": "_sass",
-		"kotlin": "_kotlin",
-		"jinja": "_jinja",
-		"haxe": "_haxe",
-		"haskell": "_haskell",
-		"gradle": "_gradle",
 		"elixir": "_elixir",
-		"haml": "_haml",
-		"stylus": "_stylus",
-		"vala": "_vala",
+		"elm": "_elm",
+		"erb": "_html_erb",
 		"github-issues": "_github",
+		"gradle": "_gradle",
+		"godot": "_godot",
+		"haml": "_haml",
+		"haskell": "_haskell",
+		"haxe": "_haxe",
+		"jinja": "_jinja",
+		"kotlin": "_kotlin",
+		"mustache": "_mustache",
+		"nunjucks": "_nunjucks",
+		"ocaml": "_ocaml",
+		"sass": "_sass",
+		"stylus": "_stylus",
+		"terraform": "_terraform",
 		"todo": "_todo",
+		"vala": "_vala",
+		"vue": "_vue",
 		"postcss": "_css",
 		"django-html": "_html_3"
 	},
@@ -1820,6 +1857,10 @@
 			"gitmodules": "_git_light",
 			"slide": "_go_light",
 			"article": "_go_light",
+			"gd": "_godot_light",
+			"godot": "_godot_1_light",
+			"tres": "_godot_2_light",
+			"tscn": "_godot_3_light",
 			"gradle": "_gradle_light",
 			"gsp": "_grails_light",
 			"gql": "_graphql_light",
@@ -1844,7 +1885,6 @@
 			"es7": "_javascript_light",
 			"jinja": "_jinja_light",
 			"jinja2": "_jinja_light",
-			"jl": "_julia_light",
 			"kt": "_kotlin_light",
 			"kts": "_kotlin_light",
 			"dart": "_dart_light",
@@ -2007,6 +2047,7 @@
 			"javascriptreact": "_react_light",
 			"javascript": "_javascript_light",
 			"json": "_json_light",
+			"julia": "_julia_light",
 			"less": "_less_light",
 			"lua": "_lua_light",
 			"makefile": "_makefile_light",
@@ -2032,24 +2073,25 @@
 			"xml": "_xml_light",
 			"yaml": "_yml_light",
 			"argdown": "_argdown_light",
-			"elm": "_elm_light",
-			"ocaml": "_ocaml_light",
-			"nunjucks": "_nunjucks_light",
-			"mustache": "_mustache_light",
-			"erb": "_html_erb_light",
-			"terraform": "_terraform_light",
-			"vue": "_vue_light",
-			"sass": "_sass_light",
-			"kotlin": "_kotlin_light",
-			"jinja": "_jinja_light",
-			"haxe": "_haxe_light",
-			"haskell": "_haskell_light",
-			"gradle": "_gradle_light",
 			"elixir": "_elixir_light",
-			"haml": "_haml_light",
-			"stylus": "_stylus_light",
-			"vala": "_vala_light",
+			"elm": "_elm_light",
+			"erb": "_html_erb_light",
 			"github-issues": "_github_light",
+			"gradle": "_gradle_light",
+			"godot": "_godot_light",
+			"haml": "_haml_light",
+			"haskell": "_haskell_light",
+			"haxe": "_haxe_light",
+			"jinja": "_jinja_light",
+			"kotlin": "_kotlin_light",
+			"mustache": "_mustache_light",
+			"nunjucks": "_nunjucks_light",
+			"ocaml": "_ocaml_light",
+			"sass": "_sass_light",
+			"stylus": "_stylus_light",
+			"terraform": "_terraform_light",
+			"vala": "_vala_light",
+			"vue": "_vue_light",
 			"postcss": "_css_light",
 			"django-html": "_html_3_light"
 		},
@@ -2110,5 +2152,5 @@
 			"npm-debug.log": "_npm_ignored_light"
 		}
 	},
-	"version": "https://github.com/jesseweed/seti-ui/commit/9c1c29d6e9358f9ae99bd3a4bf0d2fa804dca686"
+	"version": "https://github.com/jesseweed/seti-ui/commit/4c16086852e7559cc23f63c45cce00c983ce36db"
 }
\ No newline at end of file
diff --git a/extensions/typescript-language-features/package.json b/extensions/typescript-language-features/package.json
index 78201193e17..a27bf1be9c5 100644
--- a/extensions/typescript-language-features/package.json
+++ b/extensions/typescript-language-features/package.json
@@ -9,6 +9,7 @@
   "license": "MIT",
   "aiKey": "AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217",
   "enableProposedApi": true,
+  "requiresWorkspaceTrust": "onDemand",
   "engines": {
     "vscode": "^1.30.0"
   },
diff --git a/extensions/typescript-language-features/src/commands/goToProjectConfiguration.ts b/extensions/typescript-language-features/src/commands/goToProjectConfiguration.ts
index 11adec35251..fde3a4e40db 100644
--- a/extensions/typescript-language-features/src/commands/goToProjectConfiguration.ts
+++ b/extensions/typescript-language-features/src/commands/goToProjectConfiguration.ts
@@ -3,8 +3,8 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as vscode from 'vscode';
 import TypeScriptServiceClientHost from '../typeScriptServiceClientHost';
+import { ActiveJsTsEditorTracker } from '../utils/activeJsTsEditorTracker';
 import { Lazy } from '../utils/lazy';
 import { openProjectConfigForFile, ProjectType } from '../utils/tsconfig';
 import { Command } from './commandManager';
@@ -13,11 +13,12 @@ export class TypeScriptGoToProjectConfigCommand implements Command {
 	public readonly id = 'typescript.goToProjectConfig';
 
 	public constructor(
+		private readonly activeJsTsEditorTracker: ActiveJsTsEditorTracker,
 		private readonly lazyClientHost: Lazy<TypeScriptServiceClientHost>,
 	) { }
 
 	public execute() {
-		const editor = vscode.window.activeTextEditor;
+		const editor = this.activeJsTsEditorTracker.activeJsTsEditor;
 		if (editor) {
 			openProjectConfigForFile(ProjectType.TypeScript, this.lazyClientHost.value.serviceClient, editor.document.uri);
 		}
@@ -28,14 +29,14 @@ export class JavaScriptGoToProjectConfigCommand implements Command {
 	public readonly id = 'javascript.goToProjectConfig';
 
 	public constructor(
+		private readonly activeJsTsEditorTracker: ActiveJsTsEditorTracker,
 		private readonly lazyClientHost: Lazy<TypeScriptServiceClientHost>,
 	) { }
 
 	public execute() {
-		const editor = vscode.window.activeTextEditor;
+		const editor = this.activeJsTsEditorTracker.activeJsTsEditor;
 		if (editor) {
 			openProjectConfigForFile(ProjectType.JavaScript, this.lazyClientHost.value.serviceClient, editor.document.uri);
 		}
 	}
 }
-
diff --git a/extensions/typescript-language-features/src/commands/index.ts b/extensions/typescript-language-features/src/commands/index.ts
index 7ab7ae09d20..74faf7a46f6 100644
--- a/extensions/typescript-language-features/src/commands/index.ts
+++ b/extensions/typescript-language-features/src/commands/index.ts
@@ -4,6 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import TypeScriptServiceClientHost from '../typeScriptServiceClientHost';
+import { ActiveJsTsEditorTracker } from '../utils/activeJsTsEditorTracker';
 import { Lazy } from '../utils/lazy';
 import { PluginManager } from '../utils/plugins';
 import { CommandManager } from './commandManager';
@@ -18,15 +19,16 @@ import { SelectTypeScriptVersionCommand } from './selectTypeScriptVersion';
 export function registerBaseCommands(
 	commandManager: CommandManager,
 	lazyClientHost: Lazy<TypeScriptServiceClientHost>,
-	pluginManager: PluginManager
+	pluginManager: PluginManager,
+	activeJsTsEditorTracker: ActiveJsTsEditorTracker,
 ): void {
 	commandManager.register(new ReloadTypeScriptProjectsCommand(lazyClientHost));
 	commandManager.register(new ReloadJavaScriptProjectsCommand(lazyClientHost));
 	commandManager.register(new SelectTypeScriptVersionCommand(lazyClientHost));
 	commandManager.register(new OpenTsServerLogCommand(lazyClientHost));
 	commandManager.register(new RestartTsServerCommand(lazyClientHost));
-	commandManager.register(new TypeScriptGoToProjectConfigCommand(lazyClientHost));
-	commandManager.register(new JavaScriptGoToProjectConfigCommand(lazyClientHost));
+	commandManager.register(new TypeScriptGoToProjectConfigCommand(activeJsTsEditorTracker, lazyClientHost));
+	commandManager.register(new JavaScriptGoToProjectConfigCommand(activeJsTsEditorTracker, lazyClientHost));
 	commandManager.register(new ConfigurePluginCommand(pluginManager));
 	commandManager.register(new LearnMoreAboutRefactoringsCommand());
 }
diff --git a/extensions/typescript-language-features/src/extension.browser.ts b/extensions/typescript-language-features/src/extension.browser.ts
index 676c5f366dc..d3c0cbb9f83 100644
--- a/extensions/typescript-language-features/src/extension.browser.ts
+++ b/extensions/typescript-language-features/src/extension.browser.ts
@@ -16,6 +16,7 @@ import API from './utils/api';
 import { CommandManager } from './commands/commandManager';
 import { TypeScriptServiceConfiguration } from './utils/configuration';
 import { PluginManager } from './utils/plugins';
+import { ActiveJsTsEditorTracker } from './utils/activeJsTsEditorTracker';
 
 class StaticVersionProvider implements ITypeScriptVersionProvider {
 
@@ -49,6 +50,9 @@ export function activate(
 	const onCompletionAccepted = new vscode.EventEmitter<vscode.CompletionItem>();
 	context.subscriptions.push(onCompletionAccepted);
 
+	const activeJsTsEditorTracker = new ActiveJsTsEditorTracker();
+	context.subscriptions.push(activeJsTsEditorTracker);
+
 	const versionProvider = new StaticVersionProvider(
 		new TypeScriptVersion(
 			TypeScriptVersionSource.Bundled,
@@ -61,12 +65,13 @@ export function activate(
 		logDirectoryProvider: noopLogDirectoryProvider,
 		cancellerFactory: noopRequestCancellerFactory,
 		versionProvider,
-		processFactory: WorkerServerProcess
+		processFactory: WorkerServerProcess,
+		activeJsTsEditorTracker
 	}, item => {
 		onCompletionAccepted.fire(item);
 	});
 
-	registerBaseCommands(commandManager, lazyClientHost, pluginManager);
+	registerBaseCommands(commandManager, lazyClientHost, pluginManager, activeJsTsEditorTracker);
 
 	// context.subscriptions.push(task.register(lazyClientHost.map(x => x.serviceClient)));
 
@@ -74,7 +79,7 @@ export function activate(
 		context.subscriptions.push(module.register());
 	});
 
-	context.subscriptions.push(lazilyActivateClient(lazyClientHost, pluginManager));
+	context.subscriptions.push(lazilyActivateClient(lazyClientHost, pluginManager, activeJsTsEditorTracker));
 
 	return getExtensionApi(onCompletionAccepted.event, pluginManager);
 }
diff --git a/extensions/typescript-language-features/src/extension.ts b/extensions/typescript-language-features/src/extension.ts
index 2a567898f1a..fbc2ec7fdef 100644
--- a/extensions/typescript-language-features/src/extension.ts
+++ b/extensions/typescript-language-features/src/extension.ts
@@ -14,6 +14,7 @@ import { nodeRequestCancellerFactory } from './tsServer/cancellation.electron';
 import { NodeLogDirectoryProvider } from './tsServer/logDirectoryProvider.electron';
 import { ChildServerProcess } from './tsServer/serverProcess.electron';
 import { DiskTypeScriptVersionProvider } from './tsServer/versionProvider.electron';
+import { ActiveJsTsEditorTracker } from './utils/activeJsTsEditorTracker';
 import { onCaseInsenitiveFileSystem } from './utils/fileSystem.electron';
 import { PluginManager } from './utils/plugins';
 import * as temp from './utils/temp.electron';
@@ -35,6 +36,9 @@ export function activate(
 
 	context.subscriptions.push(new LanguageConfigurationManager());
 
+	const activeJsTsEditorTracker = new ActiveJsTsEditorTracker();
+	context.subscriptions.push(activeJsTsEditorTracker);
+
 	const lazyClientHost = createLazyClientHost(context, onCaseInsenitiveFileSystem(), {
 		pluginManager,
 		commandManager,
@@ -42,11 +46,12 @@ export function activate(
 		cancellerFactory: nodeRequestCancellerFactory,
 		versionProvider,
 		processFactory: ChildServerProcess,
+		activeJsTsEditorTracker,
 	}, item => {
 		onCompletionAccepted.fire(item);
 	});
 
-	registerBaseCommands(commandManager, lazyClientHost, pluginManager);
+	registerBaseCommands(commandManager, lazyClientHost, pluginManager, activeJsTsEditorTracker);
 
 	import('./task/taskProvider').then(module => {
 		context.subscriptions.push(module.register(lazyClientHost.map(x => x.serviceClient)));
@@ -56,7 +61,7 @@ export function activate(
 		context.subscriptions.push(module.register());
 	});
 
-	context.subscriptions.push(lazilyActivateClient(lazyClientHost, pluginManager));
+	context.subscriptions.push(lazilyActivateClient(lazyClientHost, pluginManager, activeJsTsEditorTracker));
 
 	return getExtensionApi(onCompletionAccepted.event, pluginManager);
 }
diff --git a/extensions/typescript-language-features/src/languageFeatures/codeLens/referencesCodeLens.ts b/extensions/typescript-language-features/src/languageFeatures/codeLens/referencesCodeLens.ts
index 57a9e599c40..bbb8e21ec2f 100644
--- a/extensions/typescript-language-features/src/languageFeatures/codeLens/referencesCodeLens.ts
+++ b/extensions/typescript-language-features/src/languageFeatures/codeLens/referencesCodeLens.ts
@@ -8,7 +8,7 @@ import * as nls from 'vscode-nls';
 import type * as Proto from '../../protocol';
 import * as PConst from '../../protocol.const';
 import { CachedResponse } from '../../tsServer/cachedResponse';
-import { ExectuionTarget } from '../../tsServer/server';
+import { ExecutionTarget } from '../../tsServer/server';
 import { ClientCapability, ITypeScriptServiceClient } from '../../typescriptService';
 import { conditionalRegistration, requireConfiguration, requireSomeCapability } from '../../utils/dependentRegistration';
 import { DocumentSelector } from '../../utils/documentSelector';
@@ -30,7 +30,7 @@ export class TypeScriptReferencesCodeLensProvider extends TypeScriptBaseCodeLens
 		const args = typeConverters.Position.toFileLocationRequestArgs(codeLens.file, codeLens.range.start);
 		const response = await this.client.execute('references', args, token, {
 			lowPriority: true,
-			executionTarget: ExectuionTarget.Semantic,
+			executionTarget: ExecutionTarget.Semantic,
 			cancelOnResourceChange: codeLens.document,
 		});
 		if (response.type !== 'response' || !response.body) {
diff --git a/extensions/typescript-language-features/src/languageFeatures/completions.ts b/extensions/typescript-language-features/src/languageFeatures/completions.ts
index e7f09e36bd7..22544099c04 100644
--- a/extensions/typescript-language-features/src/languageFeatures/completions.ts
+++ b/extensions/typescript-language-features/src/languageFeatures/completions.ts
@@ -177,7 +177,13 @@ class MyCompletionItem extends vscode.CompletionItem {
 			const args: Proto.CompletionDetailsRequestArgs = {
 				...typeConverters.Position.toFileLocationRequestArgs(filepath, this.position),
 				entryNames: [
-					this.tsEntry.source ? { name: this.tsEntry.name, source: this.tsEntry.source } : this.tsEntry.name
+					// @ts-expect-error until TypeScript 4.3 protocol update
+					this.tsEntry.source || this.tsEntry.data ? {
+						name: this.tsEntry.name,
+						source: this.tsEntry.source,
+						// @ts-expect-error until TypeScript 4.3 protocol update
+						data: this.tsEntry.data,
+					} : this.tsEntry.name
 				]
 			};
 			const response = await client.interruptGetErr(() => client.execute('completionEntryDetails', args, requestToken.token));
diff --git a/extensions/typescript-language-features/src/languageFeatures/languageConfiguration.ts b/extensions/typescript-language-features/src/languageFeatures/languageConfiguration.ts
index 75d32770a68..4c47cd0cdfc 100644
--- a/extensions/typescript-language-features/src/languageFeatures/languageConfiguration.ts
+++ b/extensions/typescript-language-features/src/languageFeatures/languageConfiguration.ts
@@ -15,7 +15,7 @@ import * as languageModeIds from '../utils/languageModeIds';
 const jsTsLanguageConfiguration: vscode.LanguageConfiguration = {
 	indentationRules: {
 		decreaseIndentPattern: /^((?!.*?\/\*).*\*\/)?\s*[\}\]].*$/,
-		increaseIndentPattern: /^((?!\/\/).)*(\{[^}"'`]*|\([^)"'`]*|\[[^\]"'`]*)$/,
+		increaseIndentPattern: /^((?!\/\/).)*(\{([^}"'`]*|(\t|[ ])*\/\/.*)|\([^)"'`]*|\[[^\]"'`]*)$/,
 		// e.g.  * ...| or */| or *-----*/|
 		unIndentedLinePattern: /^(\t|[ ])*[ ]\*[^/]*\*\/\s*$|^(\t|[ ])*[ ]\*\/\s*$|^(\t|[ ])*[ ]\*([ ]([^\*]|\*(?!\/))*)?$/
 	},
diff --git a/extensions/typescript-language-features/src/languageFeatures/quickFix.ts b/extensions/typescript-language-features/src/languageFeatures/quickFix.ts
index cdb6aa35fdb..7b69b7aa4e7 100644
--- a/extensions/typescript-language-features/src/languageFeatures/quickFix.ts
+++ b/extensions/typescript-language-features/src/languageFeatures/quickFix.ts
@@ -223,7 +223,7 @@ class TypeScriptQuickFixProvider implements vscode.CodeActionProvider<VsCodeCode
 		_range: vscode.Range,
 		context: vscode.CodeActionContext,
 		token: vscode.CancellationToken
-	): Promise<vscode.CodeAction[]> {
+	): Promise<VsCodeCodeAction[]> {
 		const file = this.client.toOpenedFilePath(document);
 		if (!file) {
 			return [];
diff --git a/extensions/typescript-language-features/src/languageFeatures/refactor.ts b/extensions/typescript-language-features/src/languageFeatures/refactor.ts
index b8a4bcfdab0..f64c0b27553 100644
--- a/extensions/typescript-language-features/src/languageFeatures/refactor.ts
+++ b/extensions/typescript-language-features/src/languageFeatures/refactor.ts
@@ -284,7 +284,7 @@ class TypeScriptRefactorProvider implements vscode.CodeActionProvider<TsCodeActi
 		context: vscode.CodeActionContext,
 		token: vscode.CancellationToken
 	): Promise<TsCodeAction[] | undefined> {
-		if (!this.shouldTrigger(rangeOrSelection, context)) {
+		if (!this.shouldTrigger(context)) {
 			return undefined;
 		}
 		if (!this.client.toOpenedFilePath(document)) {
@@ -309,7 +309,15 @@ class TypeScriptRefactorProvider implements vscode.CodeActionProvider<TsCodeActi
 			return undefined;
 		}
 
-		const actions = this.convertApplicableRefactors(response.body, document, rangeOrSelection);
+		const actions = this.convertApplicableRefactors(response.body, document, rangeOrSelection).filter(action => {
+			// Don't show 'infer return type' refactoring unless it has been explicitly requested
+			// https://github.com/microsoft/TypeScript/issues/42993
+			if (!context.only && action.kind?.value === 'refactor.rewrite.function.returnType') {
+				return false;
+			}
+			return true;
+		});
+
 		if (!context.only) {
 			return actions;
 		}
@@ -327,10 +335,10 @@ class TypeScriptRefactorProvider implements vscode.CodeActionProvider<TsCodeActi
 	}
 
 	private toTsTriggerReason(context: vscode.CodeActionContext): Proto.RefactorTriggerReason | undefined {
-		if (!context.only) {
-			return;
+		if (context.triggerKind === vscode.CodeActionTriggerKind.Manual) {
+			return 'invoked';
 		}
-		return 'invoked';
+		return undefined;
 	}
 
 	private convertApplicableRefactors(
@@ -376,12 +384,12 @@ class TypeScriptRefactorProvider implements vscode.CodeActionProvider<TsCodeActi
 		return codeAction;
 	}
 
-	private shouldTrigger(rangeOrSelection: vscode.Range | vscode.Selection, context: vscode.CodeActionContext) {
+	private shouldTrigger(context: vscode.CodeActionContext) {
 		if (context.only && !vscode.CodeActionKind.Refactor.contains(context.only)) {
 			return false;
 		}
 
-		return rangeOrSelection instanceof vscode.Selection;
+		return context.triggerKind === vscode.CodeActionTriggerKind.Manual;
 	}
 
 	private static getKind(refactor: Proto.RefactorActionInfo) {
diff --git a/extensions/typescript-language-features/src/lazyClientHost.ts b/extensions/typescript-language-features/src/lazyClientHost.ts
index c5ec9b883b0..8f980990055 100644
--- a/extensions/typescript-language-features/src/lazyClientHost.ts
+++ b/extensions/typescript-language-features/src/lazyClientHost.ts
@@ -10,6 +10,7 @@ import { ILogDirectoryProvider } from './tsServer/logDirectoryProvider';
 import { TsServerProcessFactory } from './tsServer/server';
 import { ITypeScriptVersionProvider } from './tsServer/versionProvider';
 import TypeScriptServiceClientHost from './typeScriptServiceClientHost';
+import { ActiveJsTsEditorTracker } from './utils/activeJsTsEditorTracker';
 import { flatten } from './utils/arrays';
 import * as fileSchemes from './utils/fileSchemes';
 import { standardLanguageDescriptions } from './utils/languageDescription';
@@ -27,6 +28,7 @@ export function createLazyClientHost(
 		cancellerFactory: OngoingRequestCancellerFactory,
 		versionProvider: ITypeScriptVersionProvider,
 		processFactory: TsServerProcessFactory,
+		activeJsTsEditorTracker: ActiveJsTsEditorTracker,
 	},
 	onCompletionAccepted: (item: vscode.CompletionItem) => void,
 ): Lazy<TypeScriptServiceClientHost> {
@@ -47,6 +49,7 @@ export function createLazyClientHost(
 export function lazilyActivateClient(
 	lazyClientHost: Lazy<TypeScriptServiceClientHost>,
 	pluginManager: PluginManager,
+	activeJsTsEditorTracker: ActiveJsTsEditorTracker,
 ): vscode.Disposable {
 	const disposables: vscode.Disposable[] = [];
 
@@ -62,7 +65,7 @@ export function lazilyActivateClient(
 			// Force activation
 			void lazyClientHost.value;
 
-			disposables.push(new ManagedFileContextManager(resource => {
+			disposables.push(new ManagedFileContextManager(activeJsTsEditorTracker, resource => {
 				return lazyClientHost.value.serviceClient.toPath(resource);
 			}));
 			return true;
diff --git a/extensions/typescript-language-features/src/test-all.ts b/extensions/typescript-language-features/src/test-all.ts
index 0057b8aa4a8..ef6cc04ce70 100644
--- a/extensions/typescript-language-features/src/test-all.ts
+++ b/extensions/typescript-language-features/src/test-all.ts
@@ -21,7 +21,7 @@ const testRunner = require('../../../test/integration/electron/testrunner');
 // See https://github.com/mochajs/mocha/wiki/Using-mocha-programmatically#set-options for more info
 testRunner.configure({
 	ui: 'tdd', 		// the TDD UI is being used in extension.test.ts (suite, test, etc.)
-	useColors: (!process.env.BUILD_ARTIFACTSTAGINGDIRECTORY && process.platform !== 'win32'), // colored output from test results (only windows cannot handle)
+	color: (!process.env.BUILD_ARTIFACTSTAGINGDIRECTORY && process.platform !== 'win32'), // colored output from test results (only windows cannot handle)
 	timeout: 60000,
 });
 
diff --git a/extensions/typescript-language-features/src/test/index.ts b/extensions/typescript-language-features/src/test/index.ts
index 6ddff532d24..11204e863b4 100644
--- a/extensions/typescript-language-features/src/test/index.ts
+++ b/extensions/typescript-language-features/src/test/index.ts
@@ -21,7 +21,7 @@ const testRunner = require('../../../../test/integration/electron/testrunner');
 // See https://github.com/mochajs/mocha/wiki/Using-mocha-programmatically#set-options for more info
 testRunner.configure({
 	ui: 'tdd', 		// the TDD UI is being used in extension.test.ts (suite, test, etc.)
-	useColors: (!process.env.BUILD_ARTIFACTSTAGINGDIRECTORY && process.platform !== 'win32'), // colored output from test results (only windows cannot handle)
+	color: (!process.env.BUILD_ARTIFACTSTAGINGDIRECTORY && process.platform !== 'win32'), // colored output from test results (only windows cannot handle)
 	timeout: 60000,
 });
 
diff --git a/extensions/typescript-language-features/src/test/smoke/index.ts b/extensions/typescript-language-features/src/test/smoke/index.ts
index 7c6b176189c..ab3d87566e5 100644
--- a/extensions/typescript-language-features/src/test/smoke/index.ts
+++ b/extensions/typescript-language-features/src/test/smoke/index.ts
@@ -21,7 +21,7 @@ const testRunner = require('../../../../../test/integration/electron/testrunner'
 // See https://github.com/mochajs/mocha/wiki/Using-mocha-programmatically#set-options for more info
 testRunner.configure({
 	ui: 'tdd', 		// the TDD UI is being used in extension.test.ts (suite, test, etc.)
-	useColors: (!process.env.BUILD_ARTIFACTSTAGINGDIRECTORY && process.platform !== 'win32'), // colored output from test results (only windows cannot handle)
+	color: (!process.env.BUILD_ARTIFACTSTAGINGDIRECTORY && process.platform !== 'win32'), // colored output from test results (only windows cannot handle)
 	timeout: 60000,
 });
 
diff --git a/extensions/typescript-language-features/src/test/unit/index.ts b/extensions/typescript-language-features/src/test/unit/index.ts
index 7c6b176189c..ab3d87566e5 100644
--- a/extensions/typescript-language-features/src/test/unit/index.ts
+++ b/extensions/typescript-language-features/src/test/unit/index.ts
@@ -21,7 +21,7 @@ const testRunner = require('../../../../../test/integration/electron/testrunner'
 // See https://github.com/mochajs/mocha/wiki/Using-mocha-programmatically#set-options for more info
 testRunner.configure({
 	ui: 'tdd', 		// the TDD UI is being used in extension.test.ts (suite, test, etc.)
-	useColors: (!process.env.BUILD_ARTIFACTSTAGINGDIRECTORY && process.platform !== 'win32'), // colored output from test results (only windows cannot handle)
+	color: (!process.env.BUILD_ARTIFACTSTAGINGDIRECTORY && process.platform !== 'win32'), // colored output from test results (only windows cannot handle)
 	timeout: 60000,
 });
 
diff --git a/extensions/typescript-language-features/src/test/unit/onEnter.test.ts b/extensions/typescript-language-features/src/test/unit/onEnter.test.ts
index cd0d99c0e41..7affd473f62 100644
--- a/extensions/typescript-language-features/src/test/unit/onEnter.test.ts
+++ b/extensions/typescript-language-features/src/test/unit/onEnter.test.ts
@@ -110,4 +110,15 @@ suite.skip('OnEnter', () => {
 					` * x`));
 		});
 	});
+
+	test('should indent after if block followed by comment with quote', () => {
+		return withRandomFileEditor(`if (true) { // '${CURSOR}`, 'js', async (_editor, document) => {
+			await type(document, '\nx');
+			assert.strictEqual(
+				document.getText(),
+				joinLines(
+					`if (true) { // '`,
+					`    x`));
+		});
+	});
 });
diff --git a/extensions/typescript-language-features/src/tsServer/server.ts b/extensions/typescript-language-features/src/tsServer/server.ts
index d6294f2512d..4ca6fbe4fa5 100644
--- a/extensions/typescript-language-features/src/tsServer/server.ts
+++ b/extensions/typescript-language-features/src/tsServer/server.ts
@@ -18,7 +18,7 @@ import { OngoingRequestCanceller } from './cancellation';
 import { TypeScriptVersionManager } from './versionManager';
 import { TypeScriptVersion } from './versionProvider';
 
-export enum ExectuionTarget {
+export enum ExecutionTarget {
 	Semantic,
 	Syntax
 }
@@ -32,9 +32,9 @@ export interface ITypeScriptServer {
 
 	kill(): void;
 
-	executeImpl(command: keyof TypeScriptRequests, args: any, executeInfo: { isAsync: boolean, token?: vscode.CancellationToken, expectsResult: false, lowPriority?: boolean, executionTarget?: ExectuionTarget }): undefined;
-	executeImpl(command: keyof TypeScriptRequests, args: any, executeInfo: { isAsync: boolean, token?: vscode.CancellationToken, expectsResult: boolean, lowPriority?: boolean, executionTarget?: ExectuionTarget }): Promise<ServerResponse.Response<Proto.Response>>;
-	executeImpl(command: keyof TypeScriptRequests, args: any, executeInfo: { isAsync: boolean, token?: vscode.CancellationToken, expectsResult: boolean, lowPriority?: boolean, executionTarget?: ExectuionTarget }): Promise<ServerResponse.Response<Proto.Response>> | undefined;
+	executeImpl(command: keyof TypeScriptRequests, args: any, executeInfo: { isAsync: boolean, token?: vscode.CancellationToken, expectsResult: false, lowPriority?: boolean, executionTarget?: ExecutionTarget }): undefined;
+	executeImpl(command: keyof TypeScriptRequests, args: any, executeInfo: { isAsync: boolean, token?: vscode.CancellationToken, expectsResult: boolean, lowPriority?: boolean, executionTarget?: ExecutionTarget }): Promise<ServerResponse.Response<Proto.Response>>;
+	executeImpl(command: keyof TypeScriptRequests, args: any, executeInfo: { isAsync: boolean, token?: vscode.CancellationToken, expectsResult: boolean, lowPriority?: boolean, executionTarget?: ExecutionTarget }): Promise<ServerResponse.Response<Proto.Response>> | undefined;
 
 	dispose(): void;
 }
@@ -202,9 +202,9 @@ export class ProcessBasedTsServer extends Disposable implements ITypeScriptServe
 		}
 	}
 
-	public executeImpl(command: keyof TypeScriptRequests, args: any, executeInfo: { isAsync: boolean, token?: vscode.CancellationToken, expectsResult: false, lowPriority?: boolean, executionTarget?: ExectuionTarget }): undefined;
-	public executeImpl(command: keyof TypeScriptRequests, args: any, executeInfo: { isAsync: boolean, token?: vscode.CancellationToken, expectsResult: boolean, lowPriority?: boolean, executionTarget?: ExectuionTarget }): Promise<ServerResponse.Response<Proto.Response>>;
-	public executeImpl(command: keyof TypeScriptRequests, args: any, executeInfo: { isAsync: boolean, token?: vscode.CancellationToken, expectsResult: boolean, lowPriority?: boolean, executionTarget?: ExectuionTarget }): Promise<ServerResponse.Response<Proto.Response>> | undefined {
+	public executeImpl(command: keyof TypeScriptRequests, args: any, executeInfo: { isAsync: boolean, token?: vscode.CancellationToken, expectsResult: false, lowPriority?: boolean, executionTarget?: ExecutionTarget }): undefined;
+	public executeImpl(command: keyof TypeScriptRequests, args: any, executeInfo: { isAsync: boolean, token?: vscode.CancellationToken, expectsResult: boolean, lowPriority?: boolean, executionTarget?: ExecutionTarget }): Promise<ServerResponse.Response<Proto.Response>>;
+	public executeImpl(command: keyof TypeScriptRequests, args: any, executeInfo: { isAsync: boolean, token?: vscode.CancellationToken, expectsResult: boolean, lowPriority?: boolean, executionTarget?: ExecutionTarget }): Promise<ServerResponse.Response<Proto.Response>> | undefined {
 		const request = this._requestQueue.createRequest(command, args);
 		const requestInfo: RequestItem = {
 			request,
@@ -307,7 +307,7 @@ interface ExecuteInfo {
 	readonly token?: vscode.CancellationToken;
 	readonly expectsResult: boolean;
 	readonly lowPriority?: boolean;
-	readonly executionTarget?: ExectuionTarget;
+	readonly executionTarget?: ExecutionTarget;
 }
 
 class RequestRouter {
@@ -355,7 +355,7 @@ class RequestRouter {
 			for (let serverIndex = 0; serverIndex < this.servers.length; ++serverIndex) {
 				const server = this.servers[serverIndex].server;
 
-				const request = server.executeImpl(command, args, { ...executeInfo, token });
+				const request = server.executeImpl(command, args, { ...executeInfo, token }) as Promise<ServerResponse.Response<Proto.Response>> | undefined;
 				if (serverIndex === 0) {
 					firstRequest = request;
 				}
@@ -460,9 +460,9 @@ export class GetErrRoutingTsServer extends Disposable implements ITypeScriptServ
 		this.mainServer.kill();
 	}
 
-	public executeImpl(command: keyof TypeScriptRequests, args: any, executeInfo: { isAsync: boolean, token?: vscode.CancellationToken, expectsResult: false, lowPriority?: boolean, executionTarget?: ExectuionTarget }): undefined;
-	public executeImpl(command: keyof TypeScriptRequests, args: any, executeInfo: { isAsync: boolean, token?: vscode.CancellationToken, expectsResult: boolean, lowPriority?: boolean, executionTarget?: ExectuionTarget }): Promise<ServerResponse.Response<Proto.Response>>;
-	public executeImpl(command: keyof TypeScriptRequests, args: any, executeInfo: { isAsync: boolean, token?: vscode.CancellationToken, expectsResult: boolean, lowPriority?: boolean, executionTarget?: ExectuionTarget }): Promise<ServerResponse.Response<Proto.Response>> | undefined {
+	public executeImpl(command: keyof TypeScriptRequests, args: any, executeInfo: { isAsync: boolean, token?: vscode.CancellationToken, expectsResult: false, lowPriority?: boolean, executionTarget?: ExecutionTarget }): undefined;
+	public executeImpl(command: keyof TypeScriptRequests, args: any, executeInfo: { isAsync: boolean, token?: vscode.CancellationToken, expectsResult: boolean, lowPriority?: boolean, executionTarget?: ExecutionTarget }): Promise<ServerResponse.Response<Proto.Response>>;
+	public executeImpl(command: keyof TypeScriptRequests, args: any, executeInfo: { isAsync: boolean, token?: vscode.CancellationToken, expectsResult: boolean, lowPriority?: boolean, executionTarget?: ExecutionTarget }): Promise<ServerResponse.Response<Proto.Response>> | undefined {
 		return this.router.execute(command, args, executeInfo);
 	}
 }
@@ -533,8 +533,8 @@ export class SyntaxRoutingTsServer extends Disposable implements ITypeScriptServ
 					server: this.syntaxServer,
 					canRun: (command, execInfo) => {
 						switch (execInfo.executionTarget) {
-							case ExectuionTarget.Semantic: return false;
-							case ExectuionTarget.Syntax: return true;
+							case ExecutionTarget.Semantic: return false;
+							case ExecutionTarget.Syntax: return true;
 						}
 
 						if (SyntaxRoutingTsServer.syntaxAlwaysCommands.has(command)) {
@@ -602,9 +602,9 @@ export class SyntaxRoutingTsServer extends Disposable implements ITypeScriptServ
 		this.semanticServer.kill();
 	}
 
-	public executeImpl(command: keyof TypeScriptRequests, args: any, executeInfo: { isAsync: boolean, token?: vscode.CancellationToken, expectsResult: false, lowPriority?: boolean, executionTarget?: ExectuionTarget }): undefined;
-	public executeImpl(command: keyof TypeScriptRequests, args: any, executeInfo: { isAsync: boolean, token?: vscode.CancellationToken, expectsResult: boolean, lowPriority?: boolean, executionTarget?: ExectuionTarget }): Promise<ServerResponse.Response<Proto.Response>>;
-	public executeImpl(command: keyof TypeScriptRequests, args: any, executeInfo: { isAsync: boolean, token?: vscode.CancellationToken, expectsResult: boolean, lowPriority?: boolean, executionTarget?: ExectuionTarget }): Promise<ServerResponse.Response<Proto.Response>> | undefined {
+	public executeImpl(command: keyof TypeScriptRequests, args: any, executeInfo: { isAsync: boolean, token?: vscode.CancellationToken, expectsResult: false, lowPriority?: boolean, executionTarget?: ExecutionTarget }): undefined;
+	public executeImpl(command: keyof TypeScriptRequests, args: any, executeInfo: { isAsync: boolean, token?: vscode.CancellationToken, expectsResult: boolean, lowPriority?: boolean, executionTarget?: ExecutionTarget }): Promise<ServerResponse.Response<Proto.Response>>;
+	public executeImpl(command: keyof TypeScriptRequests, args: any, executeInfo: { isAsync: boolean, token?: vscode.CancellationToken, expectsResult: boolean, lowPriority?: boolean, executionTarget?: ExecutionTarget }): Promise<ServerResponse.Response<Proto.Response>> | undefined {
 		return this.router.execute(command, args, executeInfo);
 	}
 }
diff --git a/extensions/typescript-language-features/src/tsServer/versionManager.ts b/extensions/typescript-language-features/src/tsServer/versionManager.ts
index 4811fefd3a7..cdd85fb02d6 100644
--- a/extensions/typescript-language-features/src/tsServer/versionManager.ts
+++ b/extensions/typescript-language-features/src/tsServer/versionManager.ts
@@ -32,9 +32,22 @@ export class TypeScriptVersionManager extends Disposable {
 		this._currentVersion = this.versionProvider.defaultVersion;
 
 		if (this.useWorkspaceTsdkSetting) {
-			const localVersion = this.versionProvider.localVersion;
-			if (localVersion) {
-				this._currentVersion = localVersion;
+			if (this.isWorkspaceTrusted) {
+				const localVersion = this.versionProvider.localVersion;
+				if (localVersion) {
+					this._currentVersion = localVersion;
+				}
+			} else {
+				setImmediate(() => {
+					vscode.workspace.requireWorkspaceTrust({ modal: false })
+						.then(trustState => {
+							if (trustState === vscode.WorkspaceTrustState.Trusted && this.versionProvider.localVersion) {
+								this.updateActiveVersion(this.versionProvider.localVersion);
+							} else {
+								this.updateActiveVersion(this.versionProvider.defaultVersion);
+							}
+						});
+				});
 			}
 		}
 
@@ -86,7 +99,7 @@ export class TypeScriptVersionManager extends Disposable {
 	private getBundledPickItem(): QuickPickItem {
 		const bundledVersion = this.versionProvider.defaultVersion;
 		return {
-			label: (!this.useWorkspaceTsdkSetting
+			label: (!this.useWorkspaceTsdkSetting || !this.isWorkspaceTrusted
 				? '• '
 				: '') + localize('useVSCodeVersionOption', "Use VS Code's Version"),
 			description: bundledVersion.displayName,
@@ -101,16 +114,19 @@ export class TypeScriptVersionManager extends Disposable {
 	private getLocalPickItems(): QuickPickItem[] {
 		return this.versionProvider.localVersions.map(version => {
 			return {
-				label: (this.useWorkspaceTsdkSetting && this.currentVersion.eq(version)
+				label: (this.useWorkspaceTsdkSetting && this.isWorkspaceTrusted && this.currentVersion.eq(version)
 					? '• '
 					: '') + localize('useWorkspaceVersionOption', "Use Workspace Version"),
 				description: version.displayName,
 				detail: version.pathLabel,
 				run: async () => {
-					await this.workspaceState.update(useWorkspaceTsdkStorageKey, true);
-					const tsConfig = vscode.workspace.getConfiguration('typescript');
-					await tsConfig.update('tsdk', version.pathLabel, false);
-					this.updateActiveVersion(version);
+					const trustState = await vscode.workspace.requireWorkspaceTrust();
+					if (trustState === vscode.WorkspaceTrustState.Trusted) {
+						await this.workspaceState.update(useWorkspaceTsdkStorageKey, true);
+						const tsConfig = vscode.workspace.getConfiguration('typescript');
+						await tsConfig.update('tsdk', version.pathLabel, false);
+						this.updateActiveVersion(version);
+					}
 				},
 			};
 		});
@@ -149,6 +165,10 @@ export class TypeScriptVersionManager extends Disposable {
 		}
 	}
 
+	private get isWorkspaceTrusted(): boolean {
+		return vscode.workspace.trustState === vscode.WorkspaceTrustState.Trusted;
+	}
+
 	private get useWorkspaceTsdkSetting(): boolean {
 		return this.workspaceState.get<boolean>(useWorkspaceTsdkStorageKey, false);
 	}
diff --git a/extensions/typescript-language-features/src/tsServer/versionStatus.ts b/extensions/typescript-language-features/src/tsServer/versionStatus.ts
index 1d4e128942c..a868c3e2502 100644
--- a/extensions/typescript-language-features/src/tsServer/versionStatus.ts
+++ b/extensions/typescript-language-features/src/tsServer/versionStatus.ts
@@ -7,6 +7,7 @@ import * as vscode from 'vscode';
 import * as nls from 'vscode-nls';
 import { Command, CommandManager } from '../commands/commandManager';
 import { ITypeScriptServiceClient } from '../typescriptService';
+import { ActiveJsTsEditorTracker } from '../utils/activeJsTsEditorTracker';
 import { coalesce } from '../utils/arrays';
 import { Disposable } from '../utils/dispose';
 import { isTypeScriptDocument } from '../utils/languageModeIds';
@@ -130,6 +131,7 @@ export default class VersionStatus extends Disposable {
 	constructor(
 		private readonly _client: ITypeScriptServiceClient,
 		commandManager: CommandManager,
+		private readonly _activeTextEditorManager: ActiveJsTsEditorTracker,
 	) {
 		super();
 
@@ -144,7 +146,7 @@ export default class VersionStatus extends Disposable {
 		commandManager.register(command);
 		this._statusBarEntry.command = command.id;
 
-		vscode.window.onDidChangeActiveTextEditor(this.updateStatus, this, this._disposables);
+		_activeTextEditorManager.onDidChangeActiveJsTsEditor(this.updateStatus, this, this._disposables);
 
 		this._client.onReady(() => {
 			this._ready = true;
@@ -161,12 +163,13 @@ export default class VersionStatus extends Disposable {
 	}
 
 	private async updateStatus() {
-		if (!vscode.window.activeTextEditor) {
+		const editor = this._activeTextEditorManager.activeJsTsEditor;
+		if (!editor) {
 			this.hide();
 			return;
 		}
 
-		const doc = vscode.window.activeTextEditor.document;
+		const doc = editor.document;
 		if (isTypeScriptDocument(doc)) {
 			const file = this._client.toOpenedFilePath(doc, { suppressAlertOnFailure: true });
 			if (file) {
@@ -190,12 +193,6 @@ export default class VersionStatus extends Disposable {
 			}
 		}
 
-		if (!vscode.window.activeTextEditor.viewColumn) {
-			// viewColumn is undefined for the debug/output panel, but we still want
-			// to show the version info in the existing editor
-			return;
-		}
-
 		this.hide();
 	}
 
diff --git a/extensions/typescript-language-features/src/typeScriptServiceClientHost.ts b/extensions/typescript-language-features/src/typeScriptServiceClientHost.ts
index af08509e40d..db53b5cf4d3 100644
--- a/extensions/typescript-language-features/src/typeScriptServiceClientHost.ts
+++ b/extensions/typescript-language-features/src/typeScriptServiceClientHost.ts
@@ -29,6 +29,7 @@ import { PluginManager } from './utils/plugins';
 import * as typeConverters from './utils/typeConverters';
 import TypingsStatus, { AtaProgressReporter } from './utils/typingsStatus';
 import * as ProjectStatus from './utils/largeProjectStatus';
+import { ActiveJsTsEditorTracker } from './utils/activeJsTsEditorTracker';
 
 // Style check diagnostics that can be reported as warnings
 const styleCheckDiagnostics = new Set([
@@ -66,6 +67,7 @@ export default class TypeScriptServiceClientHost extends Disposable {
 			cancellerFactory: OngoingRequestCancellerFactory,
 			versionProvider: ITypeScriptVersionProvider,
 			processFactory: TsServerProcessFactory,
+			activeJsTsEditorTracker: ActiveJsTsEditorTracker,
 		},
 		onCompletionAccepted: (item: vscode.CompletionItem) => void,
 	) {
@@ -87,7 +89,7 @@ export default class TypeScriptServiceClientHost extends Disposable {
 		this.client.onConfigDiagnosticsReceived(diag => this.configFileDiagnosticsReceived(diag), null, this._disposables);
 		this.client.onResendModelsRequested(() => this.populateService(), null, this._disposables);
 
-		this._register(new VersionStatus(this.client, services.commandManager));
+		this._register(new VersionStatus(this.client, services.commandManager, services.activeJsTsEditorTracker));
 		this._register(new AtaProgressReporter(this.client));
 		this.typingsStatus = this._register(new TypingsStatus(this.client));
 		this._register(ProjectStatus.create(this.client));
diff --git a/extensions/typescript-language-features/src/typescriptService.ts b/extensions/typescript-language-features/src/typescriptService.ts
index 8bcfb24f5b2..116cbc4de56 100644
--- a/extensions/typescript-language-features/src/typescriptService.ts
+++ b/extensions/typescript-language-features/src/typescriptService.ts
@@ -6,7 +6,7 @@
 import * as vscode from 'vscode';
 import * as Proto from './protocol';
 import BufferSyncSupport from './tsServer/bufferSyncSupport';
-import { ExectuionTarget } from './tsServer/server';
+import { ExecutionTarget } from './tsServer/server';
 import { TypeScriptVersion } from './tsServer/versionProvider';
 import API from './utils/api';
 import { TypeScriptServiceConfiguration } from './utils/configuration';
@@ -91,7 +91,7 @@ export type ExecConfig = {
 	readonly lowPriority?: boolean;
 	readonly nonRecoverable?: boolean;
 	readonly cancelOnResourceChange?: vscode.Uri;
-	readonly executionTarget?: ExectuionTarget;
+	readonly executionTarget?: ExecutionTarget;
 };
 
 export enum ClientCapability {
diff --git a/extensions/typescript-language-features/src/utils/activeJsTsEditorTracker.ts b/extensions/typescript-language-features/src/utils/activeJsTsEditorTracker.ts
new file mode 100644
index 00000000000..f26380b3b7f
--- /dev/null
+++ b/extensions/typescript-language-features/src/utils/activeJsTsEditorTracker.ts
@@ -0,0 +1,75 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import * as vscode from 'vscode';
+import { Disposable } from './dispose';
+import { isJsConfigOrTsConfigFileName } from './languageDescription';
+import { isSupportedLanguageMode } from './languageModeIds';
+
+/**
+ * Tracks the active JS/TS editor.
+ *
+ * This tries to handle the case where the user focuses in the output view / debug console.
+ * When this happens, we want to treat the last real focused editor as the active editor,
+ * instead of using `vscode.window.activeTextEditor`
+ */
+export class ActiveJsTsEditorTracker extends Disposable {
+
+	private _activeJsTsEditor: vscode.TextEditor | undefined;
+
+	private readonly _onDidChangeActiveJsTsEditor = this._register(new vscode.EventEmitter<vscode.TextEditor | undefined>());
+	public readonly onDidChangeActiveJsTsEditor = this._onDidChangeActiveJsTsEditor.event;
+
+	public constructor() {
+		super();
+		vscode.window.onDidChangeActiveTextEditor(this.onDidChangeActiveTextEditor, this, this._disposables);
+		vscode.window.onDidChangeVisibleTextEditors(() => {
+			// Make sure the active editor is still in the visible set.
+			// This can happen if the output view is focused and the last active TS file is closed
+			if (this._activeJsTsEditor) {
+				if (!vscode.window.visibleTextEditors.some(visibleEditor => visibleEditor === this._activeJsTsEditor)) {
+					this.onDidChangeActiveTextEditor(undefined);
+				}
+			}
+		}, this, this._disposables);
+
+		this.onDidChangeActiveTextEditor(vscode.window.activeTextEditor);
+	}
+
+	public get activeJsTsEditor(): vscode.TextEditor | undefined {
+		return this._activeJsTsEditor;
+	}
+
+	private onDidChangeActiveTextEditor(editor: vscode.TextEditor | undefined): any {
+		if (editor === this._activeJsTsEditor) {
+			return;
+		}
+
+		if (editor && !editor.viewColumn) {
+			// viewColumn is undefined for the debug/output panel, but we still want
+			// to show the version info for the previous editor
+			return;
+		}
+
+		if (editor && this.isManagedFile(editor)) {
+			this._activeJsTsEditor = editor;
+		} else {
+			this._activeJsTsEditor = undefined;
+		}
+		this._onDidChangeActiveJsTsEditor.fire(this._activeJsTsEditor);
+	}
+
+	private isManagedFile(editor: vscode.TextEditor): boolean {
+		return this.isManagedScriptFile(editor) || this.isManagedConfigFile(editor);
+	}
+
+	private isManagedScriptFile(editor: vscode.TextEditor): boolean {
+		return isSupportedLanguageMode(editor.document);
+	}
+
+	private isManagedConfigFile(editor: vscode.TextEditor): boolean {
+		return isJsConfigOrTsConfigFileName(editor.document.fileName);
+	}
+}
diff --git a/extensions/typescript-language-features/src/utils/fileSchemes.ts b/extensions/typescript-language-features/src/utils/fileSchemes.ts
index b072923b39a..42067c3eae4 100644
--- a/extensions/typescript-language-features/src/utils/fileSchemes.ts
+++ b/extensions/typescript-language-features/src/utils/fileSchemes.ts
@@ -9,11 +9,13 @@ export const git = 'git';
 /** Live share scheme */
 export const vsls = 'vsls';
 export const walkThroughSnippet = 'walkThroughSnippet';
+export const vscodeNotebookCell = 'vscode-notebook-cell';
 
 export const semanticSupportedSchemes = [
 	file,
 	untitled,
 	walkThroughSnippet,
+	vscodeNotebookCell,
 ];
 
 /**
diff --git a/extensions/typescript-language-features/src/utils/managedFileContext.ts b/extensions/typescript-language-features/src/utils/managedFileContext.ts
index 481f2482d26..750cc74c7d0 100644
--- a/extensions/typescript-language-features/src/utils/managedFileContext.ts
+++ b/extensions/typescript-language-features/src/utils/managedFileContext.ts
@@ -4,11 +4,12 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as vscode from 'vscode';
+import { ActiveJsTsEditorTracker } from './activeJsTsEditorTracker';
 import { Disposable } from './dispose';
 import { isJsConfigOrTsConfigFileName } from './languageDescription';
 import { isSupportedLanguageMode } from './languageModeIds';
 
-/**
+/**E
  * When clause context set when the current file is managed by vscode's built-in typescript extension.
  */
 export default class ManagedFileContextManager extends Disposable {
@@ -17,17 +18,20 @@ export default class ManagedFileContextManager extends Disposable {
 	private isInManagedFileContext: boolean = false;
 
 	public constructor(
-		private readonly normalizePath: (resource: vscode.Uri) => string | undefined
+		activeJsTsEditorTracker: ActiveJsTsEditorTracker,
+		private readonly normalizePath: (resource: vscode.Uri) => string | undefined,
 	) {
 		super();
-		vscode.window.onDidChangeActiveTextEditor(this.onDidChangeActiveTextEditor, this, this._disposables);
+		activeJsTsEditorTracker.onDidChangeActiveJsTsEditor(this.onDidChangeActiveTextEditor, this, this._disposables);
 
-		this.onDidChangeActiveTextEditor(vscode.window.activeTextEditor);
+		this.onDidChangeActiveTextEditor(activeJsTsEditorTracker.activeJsTsEditor);
 	}
 
-	private onDidChangeActiveTextEditor(editor?: vscode.TextEditor): any {
+	private onDidChangeActiveTextEditor(editor?: vscode.TextEditor): void {
 		if (editor) {
 			this.updateContext(this.isManagedFile(editor));
+		} else {
+			this.updateContext(false);
 		}
 	}
 
@@ -52,3 +56,4 @@ export default class ManagedFileContextManager extends Disposable {
 		return isJsConfigOrTsConfigFileName(editor.document.fileName);
 	}
 }
+
diff --git a/extensions/vscode-api-tests/src/singlefolder-tests/index.ts b/extensions/vscode-api-tests/src/singlefolder-tests/index.ts
index 8e0c944f8b2..2b283c396be 100644
--- a/extensions/vscode-api-tests/src/singlefolder-tests/index.ts
+++ b/extensions/vscode-api-tests/src/singlefolder-tests/index.ts
@@ -8,7 +8,7 @@ const testRunner = require('../../../../test/integration/electron/testrunner');
 
 const options: any = {
 	ui: 'tdd',
-	useColors: (!process.env.BUILD_ARTIFACTSTAGINGDIRECTORY && process.platform !== 'win32'),
+	color: (!process.env.BUILD_ARTIFACTSTAGINGDIRECTORY && process.platform !== 'win32'),
 	timeout: 60000
 };
 
diff --git a/extensions/vscode-api-tests/src/singlefolder-tests/workspace.tasks.test.ts b/extensions/vscode-api-tests/src/singlefolder-tests/workspace.tasks.test.ts
index d6761c73444..a2684538707 100644
--- a/extensions/vscode-api-tests/src/singlefolder-tests/workspace.tasks.test.ts
+++ b/extensions/vscode-api-tests/src/singlefolder-tests/workspace.tasks.test.ts
@@ -20,7 +20,7 @@ import { assertNoRpc } from '../utils';
 			disposables.length = 0;
 		});
 
-		test('CustomExecution task should start and shutdown successfully', (done) => {
+		test('CustomExecution task should start and shutdown successfully', async () => {
 			interface CustomTestingTaskDefinition extends TaskDefinition {
 				/**
 				 * One of the task properties. This can be used to customize the task in the tasks.json
@@ -30,7 +30,6 @@ import { assertNoRpc } from '../utils';
 			const taskType: string = 'customTesting';
 			const taskName = 'First custom task';
 			let isPseudoterminalClosed = false;
-			let terminal: Terminal | undefined;
 			// There's a strict order that should be observed here:
 			// 1. The terminal opens
 			// 2. The terminal is written to.
@@ -44,75 +43,69 @@ import { assertNoRpc } from '../utils';
 
 			let testOrder = TestOrder.Start;
 
-			disposables.push(window.onDidOpenTerminal(term => {
-				try {
-					assert.equal(testOrder, TestOrder.Start);
-				} catch (e) {
-					done(e);
-				}
-				testOrder = TestOrder.TerminalOpened;
-				terminal = term;
-			}));
-			disposables.push(window.onDidWriteTerminalData(e => {
-				try {
-					assert.equal(testOrder, TestOrder.TerminalOpened);
-					testOrder = TestOrder.TerminalWritten;
-					assert.notEqual(terminal, undefined);
-					assert.equal(e.data, 'testing\r\n');
-				} catch (e) {
-					done(e);
-				}
+			// Launch the task
+			const terminal = await new Promise<Terminal>(r => {
+				disposables.push(window.onDidOpenTerminal(e => {
+					assert.strictEqual(testOrder, TestOrder.Start);
+					testOrder = TestOrder.TerminalOpened;
+					r(e);
+				}));
+				disposables.push(tasks.registerTaskProvider(taskType, {
+					provideTasks: () => {
+						const result: Task[] = [];
+						const kind: CustomTestingTaskDefinition = {
+							type: taskType,
+							customProp1: 'testing task one'
+						};
+						const writeEmitter = new EventEmitter<string>();
+						const execution = new CustomExecution((): Thenable<Pseudoterminal> => {
+							const pty: Pseudoterminal = {
+								onDidWrite: writeEmitter.event,
+								open: () => writeEmitter.fire('testing\r\n'),
+								close: () => isPseudoterminalClosed = true
+							};
+							return Promise.resolve(pty);
+						});
+						const task = new Task(kind, TaskScope.Workspace, taskName, taskType, execution);
+						result.push(task);
+						return result;
+					},
+					resolveTask(_task: Task): Task | undefined {
+						assert.fail('resolveTask should not trigger during the test');
+					}
+				}));
+				commands.executeCommand('workbench.action.tasks.runTask', `${taskType}: ${taskName}`);
+			});
 
-				if (terminal) {
-					terminal.dispose();
-				}
-			}));
-			disposables.push(window.onDidCloseTerminal(() => {
-				try {
-					assert.equal(testOrder, TestOrder.TerminalWritten);
+			// Verify the output
+			await new Promise<void>(r => {
+				disposables.push(window.onDidWriteTerminalData(e => {
+					if (e.terminal !== terminal) {
+						return;
+					}
+					assert.strictEqual(testOrder, TestOrder.TerminalOpened);
+					testOrder = TestOrder.TerminalWritten;
+					assert.notStrictEqual(terminal, undefined);
+					assert.strictEqual(e.data, 'testing\r\n');
+					r();
+				}));
+			});
+
+			// Dispose the terminal
+			await new Promise<void>(r => {
+				disposables.push(window.onDidCloseTerminal(() => {
+					assert.strictEqual(testOrder, TestOrder.TerminalWritten);
 					testOrder = TestOrder.TerminalClosed;
 					// Pseudoterminal.close should have fired by now, additionally we want
 					// to make sure all events are flushed before continuing with more tests
 					assert.ok(isPseudoterminalClosed);
-				} catch (e) {
-					done(e);
-					return;
-				}
-				done();
-			}));
-			disposables.push(tasks.registerTaskProvider(taskType, {
-				provideTasks: () => {
-					const result: Task[] = [];
-					const kind: CustomTestingTaskDefinition = {
-						type: taskType,
-						customProp1: 'testing task one'
-					};
-					const writeEmitter = new EventEmitter<string>();
-					const execution = new CustomExecution((): Thenable<Pseudoterminal> => {
-						const pty: Pseudoterminal = {
-							onDidWrite: writeEmitter.event,
-							open: () => writeEmitter.fire('testing\r\n'),
-							close: () => isPseudoterminalClosed = true
-						};
-						return Promise.resolve(pty);
-					});
-					const task = new Task(kind, TaskScope.Workspace, taskName, taskType, execution);
-					result.push(task);
-					return result;
-				},
-				resolveTask(_task: Task): Task | undefined {
-					try {
-						assert.fail('resolveTask should not trigger during the test');
-					} catch (e) {
-						done(e);
-					}
-					return undefined;
-				}
-			}));
-			commands.executeCommand('workbench.action.tasks.runTask', `${taskType}: ${taskName}`);
+					r();
+				}));
+				terminal.dispose();
+			});
 		});
 
-		test('sync CustomExecution task should flush all data on close', (done) => {
+		test('sync CustomExecution task should flush all data on close', async () => {
 			interface CustomTestingTaskDefinition extends TaskDefinition {
 				/**
 				 * One of the task properties. This can be used to customize the task in the tasks.json
@@ -121,52 +114,58 @@ import { assertNoRpc } from '../utils';
 			}
 			const taskType: string = 'customTesting';
 			const taskName = 'First custom task';
-			disposables.push(window.onDidOpenTerminal(term => {
-				disposables.push(window.onDidWriteTerminalData(e => {
-					try {
-						assert.equal(e.data, 'exiting');
-					} catch (e) {
-						done(e);
-					}
-					disposables.push(window.onDidCloseTerminal(() => done()));
-					term.dispose();
-				}));
-			}));
-			disposables.push(tasks.registerTaskProvider(taskType, {
-				provideTasks: () => {
-					const result: Task[] = [];
-					const kind: CustomTestingTaskDefinition = {
-						type: taskType,
-						customProp1: 'testing task one'
-					};
-					const writeEmitter = new EventEmitter<string>();
-					const closeEmitter = new EventEmitter<void>();
-					const execution = new CustomExecution((): Thenable<Pseudoterminal> => {
-						const pty: Pseudoterminal = {
-							onDidWrite: writeEmitter.event,
-							onDidClose: closeEmitter.event,
-							open: () => {
-								writeEmitter.fire('exiting');
-								closeEmitter.fire();
-							},
-							close: () => { }
+
+			// Launch the task
+			const terminal = await new Promise<Terminal>(r => {
+				disposables.push(window.onDidOpenTerminal(e => r(e)));
+				disposables.push(tasks.registerTaskProvider(taskType, {
+					provideTasks: () => {
+						const result: Task[] = [];
+						const kind: CustomTestingTaskDefinition = {
+							type: taskType,
+							customProp1: 'testing task one'
 						};
-						return Promise.resolve(pty);
-					});
-					const task = new Task(kind, TaskScope.Workspace, taskName, taskType, execution);
-					result.push(task);
-					return result;
-				},
-				resolveTask(_task: Task): Task | undefined {
-					try {
+						const writeEmitter = new EventEmitter<string>();
+						const closeEmitter = new EventEmitter<void>();
+						const execution = new CustomExecution((): Thenable<Pseudoterminal> => {
+							const pty: Pseudoterminal = {
+								onDidWrite: writeEmitter.event,
+								onDidClose: closeEmitter.event,
+								open: () => {
+									writeEmitter.fire('exiting');
+									closeEmitter.fire();
+								},
+								close: () => { }
+							};
+							return Promise.resolve(pty);
+						});
+						const task = new Task(kind, TaskScope.Workspace, taskName, taskType, execution);
+						result.push(task);
+						return result;
+					},
+					resolveTask(_task: Task): Task | undefined {
 						assert.fail('resolveTask should not trigger during the test');
-					} catch (e) {
-						done(e);
 					}
-					return undefined;
-				}
-			}));
-			commands.executeCommand('workbench.action.tasks.runTask', `${taskType}: ${taskName}`);
+				}));
+				commands.executeCommand('workbench.action.tasks.runTask', `${taskType}: ${taskName}`);
+			});
+
+			// Verify the output
+			await new Promise<void>(r => {
+				disposables.push(window.onDidWriteTerminalData(e => {
+					if (e.terminal !== terminal) {
+						return;
+					}
+					assert.strictEqual(e.data, 'exiting');
+					r();
+				}));
+			});
+
+			// Dispose the terminal
+			await new Promise<void>(r => {
+				disposables.push(window.onDidCloseTerminal(() => r()));
+				terminal.dispose();
+			});
 		});
 
 		test('Execution from onDidEndTaskProcess and onDidStartTaskProcess are equal to original', () => {
diff --git a/extensions/vscode-api-tests/src/workspace-tests/index.ts b/extensions/vscode-api-tests/src/workspace-tests/index.ts
index f636d2fd70b..ba41f64f480 100644
--- a/extensions/vscode-api-tests/src/workspace-tests/index.ts
+++ b/extensions/vscode-api-tests/src/workspace-tests/index.ts
@@ -8,7 +8,7 @@ const testRunner = require('../../../../test/integration/electron/testrunner');
 
 const options: any = {
 	ui: 'tdd',
-	useColors: (!process.env.BUILD_ARTIFACTSTAGINGDIRECTORY && process.platform !== 'win32'),
+	color: (!process.env.BUILD_ARTIFACTSTAGINGDIRECTORY && process.platform !== 'win32'),
 	timeout: 60000
 };
 
diff --git a/extensions/vscode-colorize-tests/src/index.ts b/extensions/vscode-colorize-tests/src/index.ts
index a6e6e6818f2..f8066005703 100644
--- a/extensions/vscode-colorize-tests/src/index.ts
+++ b/extensions/vscode-colorize-tests/src/index.ts
@@ -10,7 +10,7 @@ const suite = 'Integration Colorize Tests';
 
 const options: any = {
 	ui: 'tdd',
-	useColors: (!process.env.BUILD_ARTIFACTSTAGINGDIRECTORY && process.platform !== 'win32'),
+	color: (!process.env.BUILD_ARTIFACTSTAGINGDIRECTORY && process.platform !== 'win32'),
 	timeout: 60000
 };
 
diff --git a/extensions/vscode-colorize-tests/test/colorize-results/makefile.json b/extensions/vscode-colorize-tests/test/colorize-results/makefile.json
index eacaa05384f..2acfa87705a 100644
--- a/extensions/vscode-colorize-tests/test/colorize-results/makefile.json
+++ b/extensions/vscode-colorize-tests/test/colorize-results/makefile.json
@@ -748,8 +748,8 @@
 		}
 	},
 	{
-		"c": "\t",
-		"t": "source.makefile punctuation.whitespace.comment.leading.makefile",
+		"c": "\t# \"",
+		"t": "source.makefile meta.scope.recipe.makefile",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -759,25 +759,25 @@
 		}
 	},
 	{
-		"c": "#",
-		"t": "source.makefile comment.line.number-sign.makefile punctuation.definition.comment.makefile",
+		"c": "$$",
+		"t": "source.makefile meta.scope.recipe.makefile variable.language.makefile",
 		"r": {
-			"dark_plus": "comment: #6A9955",
-			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #6A9955",
-			"light_vs": "comment: #008000",
-			"hc_black": "comment: #7CA668"
+			"dark_plus": "variable.language: #569CD6",
+			"light_plus": "variable.language: #0000FF",
+			"dark_vs": "variable.language: #569CD6",
+			"light_vs": "variable.language: #0000FF",
+			"hc_black": "variable: #9CDCFE"
 		}
 	},
 	{
-		"c": " \"$$\" in a shell means to escape makefile's variable substitution.",
-		"t": "source.makefile comment.line.number-sign.makefile",
+		"c": "\" in a shell means to escape makefile's variable substitution.",
+		"t": "source.makefile meta.scope.recipe.makefile",
 		"r": {
-			"dark_plus": "comment: #6A9955",
-			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #6A9955",
-			"light_vs": "comment: #008000",
-			"hc_black": "comment: #7CA668"
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF"
 		}
 	},
 	{
@@ -968,8 +968,8 @@
 		}
 	},
 	{
-		"c": "\t",
-		"t": "source.makefile punctuation.whitespace.comment.leading.makefile",
+		"c": "\t# And we can see variables are highlited as supposed to be:",
+		"t": "source.makefile meta.scope.recipe.makefile",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -978,28 +978,6 @@
 			"hc_black": "default: #FFFFFF"
 		}
 	},
-	{
-		"c": "#",
-		"t": "source.makefile comment.line.number-sign.makefile punctuation.definition.comment.makefile",
-		"r": {
-			"dark_plus": "comment: #6A9955",
-			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #6A9955",
-			"light_vs": "comment: #008000",
-			"hc_black": "comment: #7CA668"
-		}
-	},
-	{
-		"c": " And we can see variables are highlited as supposed to be:",
-		"t": "source.makefile comment.line.number-sign.makefile",
-		"r": {
-			"dark_plus": "comment: #6A9955",
-			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #6A9955",
-			"light_vs": "comment: #008000",
-			"hc_black": "comment: #7CA668"
-		}
-	},
 	{
 		"c": "\t",
 		"t": "source.makefile meta.scope.recipe.makefile",
diff --git a/extensions/vscode-custom-editor-tests/src/test/index.ts b/extensions/vscode-custom-editor-tests/src/test/index.ts
index c5a810981f8..e37bf5bed83 100644
--- a/extensions/vscode-custom-editor-tests/src/test/index.ts
+++ b/extensions/vscode-custom-editor-tests/src/test/index.ts
@@ -10,7 +10,7 @@ const suite = 'Custom Editor Tests';
 
 const options: any = {
 	ui: 'tdd',
-	useColors: (!process.env.BUILD_ARTIFACTSTAGINGDIRECTORY && process.platform !== 'win32'),
+	color: (!process.env.BUILD_ARTIFACTSTAGINGDIRECTORY && process.platform !== 'win32'),
 	timeout: 6000000
 };
 
diff --git a/extensions/vscode-notebook-tests/src/index.ts b/extensions/vscode-notebook-tests/src/index.ts
index 27c81a57fb1..c6aec5845fc 100644
--- a/extensions/vscode-notebook-tests/src/index.ts
+++ b/extensions/vscode-notebook-tests/src/index.ts
@@ -8,7 +8,7 @@ const testRunner = require('../../../test/integration/electron/testrunner');
 
 const options: any = {
 	ui: 'tdd',
-	useColors: (!process.env.BUILD_ARTIFACTSTAGINGDIRECTORY && process.platform !== 'win32'),
+	color: (!process.env.BUILD_ARTIFACTSTAGINGDIRECTORY && process.platform !== 'win32'),
 	timeout: 60000
 };
 
diff --git a/package.json b/package.json
index 04fc8a2304f..a4cd5ff8b8a 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "code-oss-dev",
   "version": "1.55.0",
-  "distro": "ba8bff4ad8b6bec9a223b9699197a5a95b6418a4",
+  "distro": "554eb3a374b57363e730dd1aacc561a4c9da5780",
   "author": {
     "name": "Microsoft Corporation"
   },
@@ -72,11 +72,11 @@
     "native-keymap": "2.2.1",
     "native-watchdog": "1.3.0",
     "node-pty": "0.10.0-beta19",
+    "nsfw": "^2.1.1",
     "spdlog": "^0.11.1",
     "sudo-prompt": "9.1.1",
     "tas-client-umd": "0.1.2",
     "v8-inspect-profiler": "^0.0.20",
-    "vscode-nsfw": "1.2.9",
     "vscode-oniguruma": "1.3.1",
     "vscode-proxy-agent": "^0.5.2",
     "vscode-regexpp": "^3.1.0",
@@ -154,7 +154,7 @@
     "gulp-replace": "^0.5.4",
     "gulp-shell": "^0.6.5",
     "gulp-sourcemaps": "^3.0.0",
-    "gulp-tsb": "4.0.5",
+    "gulp-tsb": "4.0.6",
     "gulp-untar": "^0.0.7",
     "gulp-vinyl-zip": "^2.1.2",
     "husky": "^0.13.1",
@@ -191,7 +191,7 @@
     "style-loader": "^1.0.0",
     "ts-loader": "^6.2.1",
     "tsec": "0.1.4",
-    "typescript": "^4.3.0-dev.20210216",
+    "typescript": "^4.3.0-dev.20210226",
     "typescript-formatter": "7.1.0",
     "underscore": "^1.8.2",
     "vinyl": "^2.0.0",
diff --git a/product.json b/product.json
index 0efd8c07e50..8b23e096886 100644
--- a/product.json
+++ b/product.json
@@ -76,7 +76,7 @@
 		},
 		{
 			"name": "ms-vscode.js-debug-companion",
-			"version": "1.0.8",
+			"version": "1.0.9",
 			"repo": "https://github.com/microsoft/vscode-js-debug-companion",
 			"metadata": {
 				"id": "99cb0b7f-7354-4278-b8da-6cc79972169d",
diff --git a/remote/package.json b/remote/package.json
index 3d36902888e..05f9cec1ec5 100644
--- a/remote/package.json
+++ b/remote/package.json
@@ -14,9 +14,9 @@
     "minimist": "^1.2.5",
     "native-watchdog": "1.3.0",
     "node-pty": "0.10.0-beta19",
+    "nsfw": "^2.1.1",
     "spdlog": "^0.11.1",
     "tas-client-umd": "0.1.2",
-    "vscode-nsfw": "1.2.9",
     "vscode-oniguruma": "1.3.1",
     "vscode-proxy-agent": "^0.5.2",
     "vscode-regexpp": "^3.1.0",
diff --git a/remote/yarn.lock b/remote/yarn.lock
index a264b79dde8..295fc4327b9 100644
--- a/remote/yarn.lock
+++ b/remote/yarn.lock
@@ -146,15 +146,6 @@ fill-range@^7.0.1:
   dependencies:
     to-regex-range "^5.0.1"
 
-fs-extra@^7.0.0:
-  version "7.0.1"
-  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-7.0.1.tgz#4f189c44aa123b895f722804f55ea23eadc348e9"
-  integrity sha512-YJDaCJZEnBmcbw13fvdAM9AwNOJwOzrE4pqMqBq5nFiEqXUqHwlK4B+3pUw6JNvfSPtX05xFHtYy/1ni01eGCw==
-  dependencies:
-    graceful-fs "^4.1.2"
-    jsonfile "^4.0.0"
-    universalify "^0.1.0"
-
 fsevents@~2.3.1:
   version "2.3.1"
   resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.1.tgz#b209ab14c61012636c8863507edf7fb68cc54e9f"
@@ -172,11 +163,6 @@ graceful-fs@4.2.3:
   resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.3.tgz#4a12ff1b60376ef09862c2093edd908328be8423"
   integrity sha512-a30VEBm4PEdx1dRB7MFK7BejejvCvBronbLjht+sHuGYj8PHs7M/5Z+rt5lw551vZ7yfTCj4Vuyy3mSJytDWRQ==
 
-graceful-fs@^4.1.2, graceful-fs@^4.1.6:
-  version "4.2.4"
-  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.4.tgz#2256bde14d3632958c465ebc96dc467ca07a29fb"
-  integrity sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw==
-
 http-proxy-agent@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/http-proxy-agent/-/http-proxy-agent-2.1.0.tgz#e4821beef5b2142a2026bd73926fe537631c5405"
@@ -240,23 +226,6 @@ jschardet@2.2.1:
   resolved "https://registry.yarnpkg.com/jschardet/-/jschardet-2.2.1.tgz#03b0264669a90c7a5c436a68c5a7d4e4cb0c9823"
   integrity sha512-Ks2JNuUJoc7PGaZ7bVFtSEvOcr0rBq6Q1J5/7+zKWLT+g+4zziL63O0jg7y2jxhzIa1LVsHUbPXrbaWmz9iwDw==
 
-jsonfile@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-4.0.0.tgz#8771aae0799b64076b76640fca058f9c10e33ecb"
-  integrity sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=
-  optionalDependencies:
-    graceful-fs "^4.1.6"
-
-lodash.isinteger@^4.0.4:
-  version "4.0.4"
-  resolved "https://registry.yarnpkg.com/lodash.isinteger/-/lodash.isinteger-4.0.4.tgz#619c0af3d03f8b04c31f5882840b77b11cd68343"
-  integrity sha1-YZwK89A/iwTDH1iChAt3sRzWg0M=
-
-lodash.isundefined@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/lodash.isundefined/-/lodash.isundefined-3.0.1.tgz#23ef3d9535565203a66cefd5b830f848911afb48"
-  integrity sha1-I+89lTVWUgOmbO/VuDD4SJEa+0g=
-
 minimist@0.0.8:
   version "0.0.8"
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d"
@@ -284,11 +253,6 @@ ms@^2.1.1:
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009"
   integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==
 
-nan@^2.10.0:
-  version "2.14.2"
-  resolved "https://registry.yarnpkg.com/nan/-/nan-2.14.2.tgz#f5376400695168f4cc694ac9393d0c9585eeea19"
-  integrity sha512-M2ufzIiINKCuDfBSAUr1vWQ+vuVcA9kqx8JJUsbQi6yf1uGRyb7HfpdfUr5qLXf3B/t8dPvcjhKMmlfnP47EzQ==
-
 nan@^2.14.0:
   version "2.14.0"
   resolved "https://registry.yarnpkg.com/nan/-/nan-2.14.0.tgz#7818f722027b2459a86f0295d434d1fc2336c52c"
@@ -299,6 +263,11 @@ native-watchdog@1.3.0:
   resolved "https://registry.yarnpkg.com/native-watchdog/-/native-watchdog-1.3.0.tgz#88cee94c9dc766b85c8506eda14c8bd8c9618e27"
   integrity sha512-WOjGRNGkYZ5MXsntcvCYrKtSYMaewlbCFplbcUVo9bE80LPVt8TAVFHYWB8+a6fWCGYheq21+Wtt6CJrUaCJhw==
 
+node-addon-api@*:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-3.1.0.tgz#98b21931557466c6729e51cb77cd39c965f42239"
+  integrity sha512-flmrDNB06LIl5lywUz7YlNGZH/5p0M7W28k8hzd9Lshtdh1wshD2Y+U4h9LD6KObOy1f+fEVdgprPrEymjM5uw==
+
 node-addon-api@^3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-3.0.2.tgz#04bc7b83fd845ba785bb6eae25bc857e1ef75681"
@@ -316,6 +285,13 @@ normalize-path@^3.0.0, normalize-path@~3.0.0:
   resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-3.0.0.tgz#0dcd69ff23a1c9b11fd0978316644a0388216a65"
   integrity sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==
 
+nsfw@^2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/nsfw/-/nsfw-2.1.1.tgz#3cc8cc9ebf567c0121364cd42bb26167242b4be0"
+  integrity sha512-DvkPpsIkw/DogPxI4vQugtrSc0AtuCoxiprLxTLVZrZuEe8H++0DHpV/081q0LOtUc+96yW3FBl0pEKiyMOfJg==
+  dependencies:
+    node-addon-api "*"
+
 pend@~1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/pend/-/pend-1.2.0.tgz#7a57eb550a6783f9115331fcf4663d5c8e007a50"
@@ -390,21 +366,6 @@ to-regex-range@^5.0.1:
   dependencies:
     is-number "^7.0.0"
 
-universalify@^0.1.0:
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.1.2.tgz#b646f69be3942dabcecc9d6639c80dc105efaa66"
-  integrity sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==
-
-vscode-nsfw@1.2.9:
-  version "1.2.9"
-  resolved "https://registry.yarnpkg.com/vscode-nsfw/-/vscode-nsfw-1.2.9.tgz#87def7c538ae713d08c88592a8a043d2b2009951"
-  integrity sha512-VwaB8H1fS0ngl9eAHgFqtF/q3N3J/ZWfI17zvC8Gfj33cL4UrIW/XxdoFYptBZR/MIA6Qj8FZyYu9D/JvlKWXg==
-  dependencies:
-    fs-extra "^7.0.0"
-    lodash.isinteger "^4.0.4"
-    lodash.isundefined "^3.0.1"
-    nan "^2.10.0"
-
 vscode-oniguruma@1.3.1:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/vscode-oniguruma/-/vscode-oniguruma-1.3.1.tgz#e2383879c3485b19f533ec34efea9d7a2b14be8f"
diff --git a/src/vs/base/browser/ui/actionbar/actionViewItems.ts b/src/vs/base/browser/ui/actionbar/actionViewItems.ts
index f8cde279f9d..26523c5508b 100644
--- a/src/vs/base/browser/ui/actionbar/actionViewItems.ts
+++ b/src/vs/base/browser/ui/actionbar/actionViewItems.ts
@@ -383,6 +383,7 @@ export class SelectActionViewItem extends BaseActionViewItem {
 		super(ctx, action);
 
 		this.selectBox = new SelectBox(options, selected, contextViewProvider, undefined, selectBoxOptions);
+		this.selectBox.setFocusable(false);
 
 		this._register(this.selectBox);
 		this.registerListeners();
@@ -406,6 +407,10 @@ export class SelectActionViewItem extends BaseActionViewItem {
 		return option;
 	}
 
+	setFocusable(focusable: boolean): void {
+		this.selectBox.setFocusable(focusable);
+	}
+
 	focus(): void {
 		if (this.selectBox) {
 			this.selectBox.focus();
diff --git a/src/vs/base/browser/ui/actionbar/actionbar.css b/src/vs/base/browser/ui/actionbar/actionbar.css
index cc0608fe9fb..30c24917d84 100644
--- a/src/vs/base/browser/ui/actionbar/actionbar.css
+++ b/src/vs/base/browser/ui/actionbar/actionbar.css
@@ -20,10 +20,6 @@
 	display: inline-block;
 }
 
-.monaco-action-bar.reverse .actions-container {
-	flex-direction: row-reverse;
-}
-
 .monaco-action-bar .action-item {
 	cursor: pointer;
 	display: inline-block;
diff --git a/src/vs/base/browser/ui/actionbar/actionbar.ts b/src/vs/base/browser/ui/actionbar/actionbar.ts
index 414806416a6..2a51544c746 100644
--- a/src/vs/base/browser/ui/actionbar/actionbar.ts
+++ b/src/vs/base/browser/ui/actionbar/actionbar.ts
@@ -28,9 +28,7 @@ export interface IActionViewItemProvider {
 
 export const enum ActionsOrientation {
 	HORIZONTAL,
-	HORIZONTAL_REVERSE,
 	VERTICAL,
-	VERTICAL_REVERSE,
 }
 
 export interface ActionTrigger {
@@ -135,21 +133,11 @@ export class ActionBar extends Disposable implements IActionRunner {
 				previousKeys = [KeyCode.LeftArrow];
 				nextKeys = [KeyCode.RightArrow];
 				break;
-			case ActionsOrientation.HORIZONTAL_REVERSE:
-				previousKeys = [KeyCode.RightArrow];
-				nextKeys = [KeyCode.LeftArrow];
-				this.domNode.className += ' reverse';
-				break;
 			case ActionsOrientation.VERTICAL:
 				previousKeys = [KeyCode.UpArrow];
 				nextKeys = [KeyCode.DownArrow];
 				this.domNode.className += ' vertical';
 				break;
-			case ActionsOrientation.VERTICAL_REVERSE:
-				previousKeys = [KeyCode.DownArrow];
-				nextKeys = [KeyCode.UpArrow];
-				this.domNode.className += ' vertical reverse';
-				break;
 		}
 
 		this._register(DOM.addDisposableListener(this.domNode, DOM.EventType.KEY_DOWN, e => {
@@ -163,8 +151,12 @@ export class ActionBar extends Disposable implements IActionRunner {
 				eventHandled = this.focusNext();
 			} else if (event.equals(KeyCode.Escape) && this.cancelHasListener) {
 				this._onDidCancel.fire();
+			} else if (event.equals(KeyCode.Home)) {
+				eventHandled = this.focusFirst();
+			} else if (event.equals(KeyCode.End)) {
+				eventHandled = this.focusLast();
 			} else if (event.equals(KeyCode.Tab) && focusedItem instanceof BaseActionViewItem && focusedItem.trapsArrowNavigation) {
-				this.focusNext();
+				eventHandled = this.focusNext();
 			} else if (this.isTriggerKeyEvent(event)) {
 				// Staying out of the else branch even if not triggered
 				if (this._triggerKeys.keyDown) {
@@ -425,9 +417,21 @@ export class ActionBar extends Disposable implements IActionRunner {
 		}
 	}
 
+	private focusFirst(): boolean {
+		this.focusedItem = this.length() > 1 ? 1 : 0;
+		return this.focusPrevious();
+	}
+
+	private focusLast(): boolean {
+		this.focusedItem = this.length() < 2 ? 0 : this.length() - 2;
+		return this.focusNext();
+	}
+
 	protected focusNext(): boolean {
 		if (typeof this.focusedItem === 'undefined') {
 			this.focusedItem = this.viewItems.length - 1;
+		} else if (this.viewItems.length <= 1) {
+			return false;
 		}
 
 		const startIndex = this.focusedItem;
@@ -450,6 +454,8 @@ export class ActionBar extends Disposable implements IActionRunner {
 	protected focusPrevious(): boolean {
 		if (typeof this.focusedItem === 'undefined') {
 			this.focusedItem = 0;
+		} else if (this.viewItems.length <= 1) {
+			return false;
 		}
 
 		const startIndex = this.focusedItem;
diff --git a/src/vs/base/browser/ui/menu/menubar.css b/src/vs/base/browser/ui/menu/menubar.css
index e6aa5f4ddbe..d2a70146718 100644
--- a/src/vs/base/browser/ui/menu/menubar.css
+++ b/src/vs/base/browser/ui/menu/menubar.css
@@ -85,3 +85,11 @@
 .menubar.compact .toolbar-toggle-more::before {
 	content: "\eb94" !important;
 }
+
+/* Match behavior of outline for activity bar icons */
+.menubar.compact > .menubar-menu-button.open,
+.menubar.compact > .menubar-menu-button:focus,
+.menubar.compact > .menubar-menu-button:hover {
+	outline-width: 1px !important;
+	outline-offset: -8px !important;
+}
diff --git a/src/vs/base/browser/ui/menu/menubar.ts b/src/vs/base/browser/ui/menu/menubar.ts
index 7ff135971f9..129c5663523 100644
--- a/src/vs/base/browser/ui/menu/menubar.ts
+++ b/src/vs/base/browser/ui/menu/menubar.ts
@@ -976,7 +976,7 @@ export class MenuBar extends Disposable {
 			menuHolder.style.right = `${this.container.clientWidth}px`;
 			menuHolder.style.left = 'auto';
 		} else {
-			menuHolder.style.top = `${this.container.clientHeight}px`;
+			menuHolder.style.top = `${buttonBoundingRect.bottom}px`;
 			menuHolder.style.left = `${buttonBoundingRect.left}px`;
 		}
 
diff --git a/src/vs/base/browser/ui/selectBox/selectBox.ts b/src/vs/base/browser/ui/selectBox/selectBox.ts
index 4315b8e8f9a..21e853c2bd5 100644
--- a/src/vs/base/browser/ui/selectBox/selectBox.ts
+++ b/src/vs/base/browser/ui/selectBox/selectBox.ts
@@ -29,6 +29,7 @@ export interface ISelectBoxDelegate extends IDisposable {
 	setAriaLabel(label: string): void;
 	focus(): void;
 	blur(): void;
+	setFocusable(focus: boolean): void;
 
 	// Delegated Widget interface
 	render(container: HTMLElement): void;
@@ -93,41 +94,43 @@ export class SelectBox extends Widget implements ISelectBoxDelegate {
 
 	// Public SelectBox Methods - routed through delegate interface
 
-	public get onDidSelect(): Event<ISelectData> {
+	get onDidSelect(): Event<ISelectData> {
 		return this.selectBoxDelegate.onDidSelect;
 	}
 
-	public setOptions(options: ISelectOptionItem[], selected?: number): void {
+	setOptions(options: ISelectOptionItem[], selected?: number): void {
 		this.selectBoxDelegate.setOptions(options, selected);
 	}
 
-	public select(index: number): void {
+	select(index: number): void {
 		this.selectBoxDelegate.select(index);
 	}
 
-	public setAriaLabel(label: string): void {
+	setAriaLabel(label: string): void {
 		this.selectBoxDelegate.setAriaLabel(label);
 	}
 
-	public focus(): void {
+	focus(): void {
 		this.selectBoxDelegate.focus();
 	}
 
-	public blur(): void {
+	blur(): void {
 		this.selectBoxDelegate.blur();
 	}
 
-	// Public Widget Methods - routed through delegate interface
+	setFocusable(focusable: boolean): void {
+		this.selectBoxDelegate.setFocusable(focusable);
+	}
 
-	public render(container: HTMLElement): void {
+	render(container: HTMLElement): void {
 		this.selectBoxDelegate.render(container);
 	}
 
-	public style(styles: ISelectBoxStyles): void {
+	style(styles: ISelectBoxStyles): void {
 		this.selectBoxDelegate.style(styles);
 	}
 
-	public applyStyles(): void {
+	applyStyles(): void {
 		this.selectBoxDelegate.applyStyles();
 	}
 }
diff --git a/src/vs/base/browser/ui/selectBox/selectBoxCustom.ts b/src/vs/base/browser/ui/selectBox/selectBoxCustom.ts
index 9a2fab22e13..19e22c09854 100644
--- a/src/vs/base/browser/ui/selectBox/selectBoxCustom.ts
+++ b/src/vs/base/browser/ui/selectBox/selectBoxCustom.ts
@@ -293,16 +293,22 @@ export class SelectBoxList extends Disposable implements ISelectBoxDelegate, ILi
 
 	public focus(): void {
 		if (this.selectElement) {
+			this.selectElement.tabIndex = 0;
 			this.selectElement.focus();
 		}
 	}
 
 	public blur(): void {
 		if (this.selectElement) {
+			this.selectElement.tabIndex = -1;
 			this.selectElement.blur();
 		}
 	}
 
+	public setFocusable(focusable: boolean): void {
+		this.selectElement.tabIndex = focusable ? 0 : -1;
+	}
+
 	public render(container: HTMLElement): void {
 		this.container = container;
 		container.classList.add('select-container');
diff --git a/src/vs/base/browser/ui/selectBox/selectBoxNative.ts b/src/vs/base/browser/ui/selectBox/selectBoxNative.ts
index b6ed0f12383..58eaeb28eb4 100644
--- a/src/vs/base/browser/ui/selectBox/selectBoxNative.ts
+++ b/src/vs/base/browser/ui/selectBox/selectBoxNative.ts
@@ -132,16 +132,22 @@ export class SelectBoxNative extends Disposable implements ISelectBoxDelegate {
 
 	public focus(): void {
 		if (this.selectElement) {
+			this.selectElement.tabIndex = 0;
 			this.selectElement.focus();
 		}
 	}
 
 	public blur(): void {
 		if (this.selectElement) {
+			this.selectElement.tabIndex = -1;
 			this.selectElement.blur();
 		}
 	}
 
+	public setFocusable(focusable: boolean): void {
+		this.selectElement.tabIndex = focusable ? 0 : -1;
+	}
+
 	public render(container: HTMLElement): void {
 		container.classList.add('select-container');
 		container.appendChild(this.selectElement);
diff --git a/src/vs/base/common/async.ts b/src/vs/base/common/async.ts
index 28935409f02..95107d4db85 100644
--- a/src/vs/base/common/async.ts
+++ b/src/vs/base/common/async.ts
@@ -8,6 +8,7 @@ import { canceled, onUnexpectedError } from 'vs/base/common/errors';
 import { Emitter, Event, Listener } from 'vs/base/common/event';
 import { IDisposable, toDisposable } from 'vs/base/common/lifecycle';
 import { LinkedList } from 'vs/base/common/linkedList';
+import { extUri as defaultExtUri, IExtUri } from 'vs/base/common/resources';
 import { URI } from 'vs/base/common/uri';
 
 export function isThenable<T>(obj: unknown): obj is Promise<T> {
@@ -592,19 +593,21 @@ export class ResourceQueue implements IDisposable {
 
 	private readonly queues = new Map<string, Queue<void>>();
 
-	queueFor(resource: URI): Queue<void> {
-		const key = resource.toString();
-		if (!this.queues.has(key)) {
-			const queue = new Queue<void>();
-			queue.onFinished(() => {
-				queue.dispose();
+	queueFor(resource: URI, extUri: IExtUri = defaultExtUri): Queue<void> {
+		const key = extUri.getComparisonKey(resource);
+
+		let queue = this.queues.get(key);
+		if (!queue) {
+			queue = new Queue<void>();
+			Event.once(queue.onFinished)(() => {
+				queue?.dispose();
 				this.queues.delete(key);
 			});
 
 			this.queues.set(key, queue);
 		}
 
-		return this.queues.get(key)!;
+		return queue;
 	}
 
 	dispose(): void {
diff --git a/src/vs/base/common/filters.ts b/src/vs/base/common/filters.ts
index 48f708a4421..5677cbebebb 100644
--- a/src/vs/base/common/filters.ts
+++ b/src/vs/base/common/filters.ts
@@ -365,28 +365,15 @@ export function matchesFuzzy2(pattern: string, word: string): IMatch[] | null {
 	return score ? createMatches(score) : null;
 }
 
-export function anyScore(pattern: string, lowPattern: string, _patternPos: number, word: string, lowWord: string, _wordPos: number): FuzzyScore {
-	const result = fuzzyScore(pattern, lowPattern, 0, word, lowWord, 0, true);
-	if (result) {
-		return result;
-	}
-	let matches: number[] = [];
-	let score = 0;
-	let idx = _wordPos;
-	for (let patternPos = 0; patternPos < lowPattern.length && patternPos < _maxLen; ++patternPos) {
-		const wordPos = lowWord.indexOf(lowPattern.charAt(patternPos), idx);
-		if (wordPos >= 0) {
-			score += 1;
-			matches.unshift(wordPos);
-			idx = wordPos + 1;
-		} else if (matches.length > 0) {
-			// once we have started matching things
-			// we need to match the remaining pattern
-			// characters
-			break;
+export function anyScore(pattern: string, lowPattern: string, patternPos: number, word: string, lowWord: string, wordPos: number): FuzzyScore {
+	const max = Math.min(13, pattern.length);
+	for (; patternPos < max; patternPos++) {
+		const result = fuzzyScore(pattern, lowPattern, patternPos, word, lowWord, wordPos, false);
+		if (result) {
+			return result;
 		}
 	}
-	return [score, _wordPos, ...matches];
+	return [0, wordPos];
 }
 
 //#region --- fuzzyScore ---
diff --git a/src/vs/base/common/performance.js b/src/vs/base/common/performance.js
index ac8c2cdb714..d15367be8b2 100644
--- a/src/vs/base/common/performance.js
+++ b/src/vs/base/common/performance.js
@@ -7,113 +7,117 @@
 
 //@ts-check
 
-/**
- * @returns {{mark(name:string):void, getMarks():{name:string, startTime:number}[]}}
- */
-function _definePolyfillMarks(timeOrigin) {
+(function () {
 
-	const _data = [];
-	if (typeof timeOrigin === 'number') {
-		_data.push('code/timeOrigin', timeOrigin);
-	}
+	/**
+	 * @returns {{mark(name:string):void, getMarks():{name:string, startTime:number}[]}}
+	 */
+	function _definePolyfillMarks(timeOrigin) {
 
-	function mark(name) {
-		_data.push(name, Date.now());
-	}
-	function getMarks() {
-		const result = [];
-		for (let i = 0; i < _data.length; i += 2) {
-			result.push({
-				name: _data[i],
-				startTime: _data[i + 1],
-			});
+		const _data = [];
+		if (typeof timeOrigin === 'number') {
+			_data.push('code/timeOrigin', timeOrigin);
 		}
-		return result;
+
+		function mark(name) {
+			_data.push(name, Date.now());
+		}
+		function getMarks() {
+			const result = [];
+			for (let i = 0; i < _data.length; i += 2) {
+				result.push({
+					name: _data[i],
+					startTime: _data[i + 1],
+				});
+			}
+			return result;
+		}
+		return { mark, getMarks };
 	}
-	return { mark, getMarks };
-}
 
-/**
- * @returns {{mark(name:string):void, getMarks():{name:string, startTime:number}[]}}
- */
-function _define() {
+	/**
+	 * @returns {{mark(name:string):void, getMarks():{name:string, startTime:number}[]}}
+	 */
+	function _define() {
 
-	if (typeof performance === 'object' && typeof performance.mark === 'function') {
-		// in a browser context, reuse performance-util
+		if (typeof performance === 'object' && typeof performance.mark === 'function') {
+			// in a browser context, reuse performance-util
 
-		if (typeof performance.timeOrigin !== 'number' && !performance.timing) {
-			// safari & webworker: because there is no timeOrigin and no workaround
-			// we use the `Date.now`-based polyfill.
-			return _definePolyfillMarks();
+			if (typeof performance.timeOrigin !== 'number' && !performance.timing) {
+				// safari & webworker: because there is no timeOrigin and no workaround
+				// we use the `Date.now`-based polyfill.
+				return _definePolyfillMarks();
+
+			} else {
+				// use "native" performance for mark and getMarks
+				return {
+					mark(name) {
+						performance.mark(name);
+					},
+					getMarks() {
+						let timeOrigin = performance.timeOrigin;
+						if (typeof timeOrigin !== 'number') {
+							// safari: there is no timerOrigin but in renderers there is the timing-property
+							// see https://bugs.webkit.org/show_bug.cgi?id=174862
+							timeOrigin = performance.timing.navigationStart || performance.timing.redirectStart || performance.timing.fetchStart;
+						}
+						const result = [{ name: 'code/timeOrigin', startTime: Math.round(timeOrigin) }];
+						for (const entry of performance.getEntriesByType('mark')) {
+							result.push({
+								name: entry.name,
+								startTime: Math.round(timeOrigin + entry.startTime)
+							});
+						}
+						return result;
+					}
+				};
+			}
+
+		} else if (typeof process === 'object') {
+			// node.js: use the normal polyfill but add the timeOrigin
+			// from the node perf_hooks API as very first mark
+			const timeOrigin = Math.round((require.nodeRequire || require)('perf_hooks').performance.timeOrigin);
+			return _definePolyfillMarks(timeOrigin);
 
 		} else {
-			// use "native" performance for mark and getMarks
-			return {
-				mark(name) {
-					performance.mark(name);
-				},
-				getMarks() {
-					let timeOrigin = performance.timeOrigin;
-					if (typeof timeOrigin !== 'number') {
-						// safari: there is no timerOrigin but in renderers there is the timing-property
-						// see https://bugs.webkit.org/show_bug.cgi?id=174862
-						timeOrigin = performance.timing.navigationStart || performance.timing.redirectStart || performance.timing.fetchStart;
-					}
-					const result = [{ name: 'code/timeOrigin', startTime: Math.round(timeOrigin) }];
-					for (const entry of performance.getEntriesByType('mark')) {
-						result.push({
-							name: entry.name,
-							startTime: Math.round(timeOrigin + entry.startTime)
-						});
-					}
-					return result;
-				}
-			};
+			// unknown environment
+			console.trace('perf-util loaded in UNKNOWN environment');
+			return _definePolyfillMarks();
 		}
+	}
 
-	} else if (typeof process === 'object') {
-		// node.js: use the normal polyfill but add the timeOrigin
-		// from the node perf_hooks API as very first mark
-		const timeOrigin = Math.round((require.nodeRequire || require)('perf_hooks').performance.timeOrigin);
-		return _definePolyfillMarks(timeOrigin);
+	function _factory(sharedObj) {
+		if (!sharedObj.MonacoPerformanceMarks) {
+			sharedObj.MonacoPerformanceMarks = _define();
+		}
+		return sharedObj.MonacoPerformanceMarks;
+	}
 
+	// This module can be loaded in an amd and commonjs-context.
+	// Because we want both instances to use the same perf-data
+	// we store them globally
+
+	// eslint-disable-next-line no-var
+	var sharedObj;
+	if (typeof global === 'object') {
+		// nodejs
+		sharedObj = global;
+	} else if (typeof self === 'object') {
+		// browser
+		sharedObj = self;
 	} else {
-		// unknown environment
-		console.trace('perf-util loaded in UNKNOWN environment');
-		return _definePolyfillMarks();
+		sharedObj = {};
 	}
-}
 
-function _factory(sharedObj) {
-	if (!sharedObj.MonacoPerformanceMarks) {
-		sharedObj.MonacoPerformanceMarks = _define();
+	if (typeof define === 'function') {
+		// amd
+		define([], function () { return _factory(sharedObj); });
+	} else if (typeof module === 'object' && typeof module.exports === 'object') {
+		// commonjs
+		module.exports = _factory(sharedObj);
+	} else {
+		console.trace('perf-util defined in UNKNOWN context (neither requirejs or commonjs)');
+		sharedObj.perf = _factory(sharedObj);
 	}
-	return sharedObj.MonacoPerformanceMarks;
-}
 
-// This module can be loaded in an amd and commonjs-context.
-// Because we want both instances to use the same perf-data
-// we store them globally
-
-// eslint-disable-next-line no-var
-var sharedObj;
-if (typeof global === 'object') {
-	// nodejs
-	sharedObj = global;
-} else if (typeof self === 'object') {
-	// browser
-	sharedObj = self;
-} else {
-	sharedObj = {};
-}
-
-if (typeof define === 'function') {
-	// amd
-	define([], function () { return _factory(sharedObj); });
-} else if (typeof module === 'object' && typeof module.exports === 'object') {
-	// commonjs
-	module.exports = _factory(sharedObj);
-} else {
-	console.trace('perf-util defined in UNKNOWN context (neither requirejs or commonjs)');
-	sharedObj.perf = _factory(sharedObj);
-}
+})();
diff --git a/src/vs/base/node/pfs.ts b/src/vs/base/node/pfs.ts
index 830892f2035..28e7ca8c18f 100644
--- a/src/vs/base/node/pfs.ts
+++ b/src/vs/base/node/pfs.ts
@@ -6,12 +6,13 @@
 import * as fs from 'fs';
 import { tmpdir } from 'os';
 import { join } from 'vs/base/common/path';
-import { Queue } from 'vs/base/common/async';
+import { ResourceQueue } from 'vs/base/common/async';
 import { isLinux, isMacintosh, isWindows } from 'vs/base/common/platform';
-import { Event } from 'vs/base/common/event';
 import { isEqualOrParent, isRootOrDriveLetter } from 'vs/base/common/extpath';
 import { generateUuid } from 'vs/base/common/uuid';
 import { normalizeNFC } from 'vs/base/common/normalization';
+import { extUriBiasedIgnorePathCase } from 'vs/base/common/resources';
+import { URI } from 'vs/base/common/uri';
 
 //#region Constants
 
@@ -361,6 +362,11 @@ export namespace SymlinkSupport {
 
 //#region Write File
 
+// According to node.js docs (https://nodejs.org/docs/v6.5.0/api/fs.html#fs_fs_writefile_file_data_options_callback)
+// it is not safe to call writeFile() on the same path multiple times without waiting for the callback to return.
+// Therefor we use a Queue on the path that is given to us to sequentialize calls to the same path properly.
+const writeQueues = new ResourceQueue();
+
 /**
  * Same as `fs.writeFile` but with an additional call to
  * `fs.fdatasync` after writing to ensure changes are
@@ -373,47 +379,13 @@ export function writeFile(path: string, data: Buffer, options?: IWriteFileOption
 export function writeFile(path: string, data: Uint8Array, options?: IWriteFileOptions): Promise<void>;
 export function writeFile(path: string, data: string | Buffer | Uint8Array, options?: IWriteFileOptions): Promise<void>;
 export function writeFile(path: string, data: string | Buffer | Uint8Array, options?: IWriteFileOptions): Promise<void> {
-	const queueKey = toQueueKey(path);
-
-	return ensureWriteFileQueue(queueKey).queue(() => {
+	return writeQueues.queueFor(URI.file(path), extUriBiasedIgnorePathCase).queue(() => {
 		const ensuredOptions = ensureWriteOptions(options);
 
 		return new Promise((resolve, reject) => doWriteFileAndFlush(path, data, ensuredOptions, error => error ? reject(error) : resolve()));
 	});
 }
 
-// According to node.js docs (https://nodejs.org/docs/v6.5.0/api/fs.html#fs_fs_writefile_file_data_options_callback)
-// it is not safe to call writeFile() on the same path multiple times without waiting for the callback to return.
-// Therefor we use a Queue on the path that is given to us to sequentialize calls to the same path properly.
-const writeFilePathQueues: Map<string, Queue<void>> = new Map();
-
-function toQueueKey(path: string): string {
-	let queueKey = path;
-	if (isWindows || isMacintosh) {
-		queueKey = queueKey.toLowerCase(); // accommodate for case insensitive file systems
-	}
-
-	return queueKey;
-}
-
-function ensureWriteFileQueue(queueKey: string): Queue<void> {
-	const existingWriteFileQueue = writeFilePathQueues.get(queueKey);
-	if (existingWriteFileQueue) {
-		return existingWriteFileQueue;
-	}
-
-	const writeFileQueue = new Queue<void>();
-	writeFilePathQueues.set(queueKey, writeFileQueue);
-
-	const onFinish = Event.once(writeFileQueue.onFinished);
-	onFinish(() => {
-		writeFilePathQueues.delete(queueKey);
-		writeFileQueue.dispose();
-	});
-
-	return writeFileQueue;
-}
-
 export interface IWriteFileOptions {
 	mode?: number;
 	flag?: string;
@@ -607,9 +579,6 @@ async function doCopy(source: string, target: string, payload: ICopyPayload): Pr
 
 	// Symlink
 	if (symbolicLink) {
-		if (symbolicLink.dangling) {
-			return; // do not copy dangling symbolic links (https://github.com/microsoft/vscode/issues/111621)
-		}
 
 		// Try to re-create the symlink unless `preserveSymlinks: false`
 		if (payload.options.preserveSymlinks) {
@@ -620,6 +589,10 @@ async function doCopy(source: string, target: string, payload: ICopyPayload): Pr
 				console.warn('[node.js fs] copy of symlink failed: ', error);
 			}
 		}
+
+		if (symbolicLink.dangling) {
+			return; // skip dangling symbolic links from here on (https://github.com/microsoft/vscode/issues/111621)
+		}
 	}
 
 	// Folder
diff --git a/src/vs/base/parts/quickinput/browser/quickInput.ts b/src/vs/base/parts/quickinput/browser/quickInput.ts
index 2ab5e7a478d..bea0f810f49 100644
--- a/src/vs/base/parts/quickinput/browser/quickInput.ts
+++ b/src/vs/base/parts/quickinput/browser/quickInput.ts
@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import 'vs/css!./media/quickInput';
-import { IQuickPickItem, IPickOptions, IInputOptions, IQuickNavigateConfiguration, IQuickPick, IQuickInput, IQuickInputButton, IInputBox, IQuickPickItemButtonEvent, QuickPickInput, IQuickPickSeparator, IKeyMods, IQuickPickAcceptEvent, NO_KEY_MODS, ItemActivation } from 'vs/base/parts/quickinput/common/quickInput';
+import { IQuickPickItem, IPickOptions, IInputOptions, IQuickNavigateConfiguration, IQuickPick, IQuickInput, IQuickInputButton, IInputBox, IQuickPickItemButtonEvent, QuickPickInput, IQuickPickSeparator, IKeyMods, IQuickPickAcceptEvent, NO_KEY_MODS, ItemActivation, QuickInputHideReason, IQuickInputHideEvent } from 'vs/base/parts/quickinput/common/quickInput';
 import * as dom from 'vs/base/browser/dom';
 import { CancellationToken } from 'vs/base/common/cancellation';
 import { QuickInputList, QuickInputListFocus } from './quickInputList';
@@ -31,6 +31,7 @@ import { registerCodicon, Codicon } from 'vs/base/common/codicons';
 import { ActionViewItem } from 'vs/base/browser/ui/actionbar/actionViewItems';
 import { escape } from 'vs/base/common/strings';
 import { renderLabelWithIcons } from 'vs/base/browser/ui/iconLabel/iconLabels';
+import { isString } from 'vs/base/common/types';
 
 export interface IQuickInputOptions {
 	idPrefix: string;
@@ -133,6 +134,7 @@ type Visibilities = {
 };
 
 class QuickInput extends Disposable implements IQuickInput {
+	protected static readonly noPromptMessage = localize('inputModeEntry', "Press 'Enter' to confirm your input or 'Escape' to cancel");
 
 	private _title: string | undefined;
 	private _description: string | undefined;
@@ -144,9 +146,14 @@ class QuickInput extends Disposable implements IQuickInput {
 	private _busy = false;
 	private _ignoreFocusOut = false;
 	private _buttons: IQuickInputButton[] = [];
+	protected noValidationMessage = QuickInput.noPromptMessage;
+	private _validationMessage: string | undefined;
+	private _lastValidationMessage: string | undefined;
+	private _severity: Severity = Severity.Ignore;
+	private _lastSeverity: Severity | undefined;
 	private buttonsUpdated = false;
 	private readonly onDidTriggerButtonEmitter = this._register(new Emitter<IQuickInputButton>());
-	private readonly onDidHideEmitter = this._register(new Emitter<void>());
+	private readonly onDidHideEmitter = this._register(new Emitter<IQuickInputHideEvent>());
 	private readonly onDisposeEmitter = this._register(new Emitter<void>());
 
 	protected readonly visibleDisposables = this._register(new DisposableStore());
@@ -241,6 +248,24 @@ class QuickInput extends Disposable implements IQuickInput {
 		this.update();
 	}
 
+	get validationMessage() {
+		return this._validationMessage;
+	}
+
+	set validationMessage(validationMessage: string | undefined) {
+		this._validationMessage = validationMessage;
+		this.update();
+	}
+
+	get severity() {
+		return this._severity;
+	}
+
+	set severity(severity: Severity) {
+		this._severity = severity;
+		this.update();
+	}
+
 	readonly onDidTriggerButton = this.onDidTriggerButtonEmitter.event;
 
 	show(): void {
@@ -266,10 +291,10 @@ class QuickInput extends Disposable implements IQuickInput {
 		this.ui.hide();
 	}
 
-	didHide(): void {
+	didHide(reason = QuickInputHideReason.Other): void {
 		this.visible = false;
 		this.visibleDisposables.clear();
-		this.onDidHideEmitter.fire();
+		this.onDidHideEmitter.fire({ reason });
 	}
 
 	readonly onDidHide = this.onDidHideEmitter.event;
@@ -328,6 +353,16 @@ class QuickInput extends Disposable implements IQuickInput {
 		this.ui.ignoreFocusOut = this.ignoreFocusOut;
 		this.ui.setEnabled(this.enabled);
 		this.ui.setContextKey(this.contextKey);
+
+		const validationMessage = this.validationMessage || this.noValidationMessage;
+		if (this._lastValidationMessage !== validationMessage) {
+			this._lastValidationMessage = validationMessage;
+			dom.reset(this.ui.message, ...renderLabelWithIcons(escape(validationMessage)));
+		}
+		if (this._lastSeverity !== this.severity) {
+			this._lastSeverity = this.severity;
+			this.showMessageDecoration(this.severity);
+		}
 	}
 
 	private getTitle() {
@@ -359,7 +394,7 @@ class QuickInput extends Disposable implements IQuickInput {
 
 	protected showMessageDecoration(severity: Severity) {
 		this.ui.inputBox.showDecoration(severity);
-		if (severity === Severity.Error) {
+		if (severity !== Severity.Ignore) {
 			const styles = this.ui.inputBox.stylesForType(severity);
 			this.ui.message.style.color = styles.foreground ? `${styles.foreground}` : '';
 			this.ui.message.style.backgroundColor = styles.background ? `${styles.background}` : '';
@@ -414,8 +449,6 @@ class QuickPick<T extends IQuickPickItem> extends QuickInput implements IQuickPi
 	private readonly onDidTriggerItemButtonEmitter = this._register(new Emitter<IQuickPickItemButtonEvent<T>>());
 	private _valueSelection: Readonly<[number, number]> | undefined;
 	private valueSelectionUpdated = true;
-	private _validationMessage: string | undefined;
-	private _lastValidationMessage: string | undefined;
 	private _ok: boolean | 'default' = 'default';
 	private _customButton = false;
 	private _customButtonLabel: string | undefined;
@@ -587,15 +620,6 @@ class QuickPick<T extends IQuickPickItem> extends QuickInput implements IQuickPi
 		this.update();
 	}
 
-	get validationMessage() {
-		return this._validationMessage;
-	}
-
-	set validationMessage(validationMessage: string | undefined) {
-		this._validationMessage = validationMessage;
-		this.update();
-	}
-
 	get customButton() {
 		return this._customButton;
 	}
@@ -964,12 +988,6 @@ class QuickPick<T extends IQuickPickItem> extends QuickInput implements IQuickPi
 				this.selectedItemsToConfirm = null;
 			}
 		}
-		const validationMessage = this.validationMessage || '';
-		if (this._lastValidationMessage !== validationMessage) {
-			this._lastValidationMessage = validationMessage;
-			dom.reset(this.ui.message, ...renderLabelWithIcons(escape(validationMessage)));
-			this.showMessageDecoration(this.validationMessage ? Severity.Error : Severity.Ignore);
-		}
 		this.ui.customButton.label = this.customLabel || '';
 		this.ui.customButton.element.title = this.customHover || '';
 		this.ui.setComboboxAccessibility(true);
@@ -987,18 +1005,12 @@ class QuickPick<T extends IQuickPickItem> extends QuickInput implements IQuickPi
 }
 
 class InputBox extends QuickInput implements IInputBox {
-
-	private static readonly noPromptMessage = localize('inputModeEntry', "Press 'Enter' to confirm your input or 'Escape' to cancel");
-
 	private _value = '';
 	private _valueSelection: Readonly<[number, number]> | undefined;
 	private valueSelectionUpdated = true;
 	private _placeholder: string | undefined;
 	private _password = false;
 	private _prompt: string | undefined;
-	private noValidationMessage = InputBox.noPromptMessage;
-	private _validationMessage: string | undefined;
-	private _lastValidationMessage: string | undefined;
 	private readonly onDidValueChangeEmitter = this._register(new Emitter<string>());
 	private readonly onDidAcceptEmitter = this._register(new Emitter<void>());
 
@@ -1043,16 +1055,7 @@ class InputBox extends QuickInput implements IInputBox {
 		this._prompt = prompt;
 		this.noValidationMessage = prompt
 			? localize('inputModeEntryDescription', "{0} (Press 'Enter' to confirm or 'Escape' to cancel)", prompt)
-			: InputBox.noPromptMessage;
-		this.update();
-	}
-
-	get validationMessage() {
-		return this._validationMessage;
-	}
-
-	set validationMessage(validationMessage: string | undefined) {
-		this._validationMessage = validationMessage;
+			: QuickInput.noPromptMessage;
 		this.update();
 	}
 
@@ -1100,12 +1103,7 @@ class InputBox extends QuickInput implements IInputBox {
 		if (this.ui.inputBox.password !== this.password) {
 			this.ui.inputBox.password = this.password;
 		}
-		const validationMessage = this.validationMessage || this.noValidationMessage;
-		if (this._lastValidationMessage !== validationMessage) {
-			this._lastValidationMessage = validationMessage;
-			dom.reset(this.ui.message, ...renderLabelWithIcons(validationMessage));
-			this.showMessageDecoration(this.validationMessage ? Severity.Error : Severity.Ignore);
-		}
+
 	}
 }
 
@@ -1257,7 +1255,7 @@ export class QuickInputController extends Disposable {
 		}, true));
 		this._register(focusTracker.onDidBlur(() => {
 			if (!this.getUI().ignoreFocusOut && !this.options.ignoreFocusOut()) {
-				this.hide();
+				this.hide(QuickInputHideReason.Blur);
 			}
 			this.previousFocusElement = undefined;
 		}));
@@ -1273,7 +1271,7 @@ export class QuickInputController extends Disposable {
 					break;
 				case KeyCode.Escape:
 					dom.EventHelper.stop(e, true);
-					this.hide();
+					this.hide(QuickInputHideReason.Gesture);
 					break;
 				case KeyCode.Tab:
 					if (!event.altKey && !event.ctrlKey && !event.metaKey) {
@@ -1438,6 +1436,22 @@ export class QuickInputController extends Disposable {
 		});
 	}
 
+	private setValidationOnInput(input: IInputBox, validationResult: string | {
+		content: string;
+		severity: Severity;
+	} | null | undefined) {
+		if (validationResult && isString(validationResult)) {
+			input.severity = Severity.Error;
+			input.validationMessage = validationResult;
+		} else if (validationResult && !isString(validationResult)) {
+			input.severity = validationResult.severity;
+			input.validationMessage = validationResult.content;
+		} else {
+			input.severity = Severity.Ignore;
+			input.validationMessage = undefined;
+		}
+	}
+
 	input(options: IInputOptions = {}, token: CancellationToken = CancellationToken.None): Promise<string | undefined> {
 		return new Promise<string | undefined>((resolve) => {
 			if (token.isCancellationRequested) {
@@ -1458,7 +1472,7 @@ export class QuickInputController extends Disposable {
 					}
 					validation.then(result => {
 						if (value === validationValue) {
-							input.validationMessage = result || undefined;
+							this.setValidationOnInput(input, result);
 						}
 					});
 				}),
@@ -1469,11 +1483,11 @@ export class QuickInputController extends Disposable {
 						validationValue = value;
 					}
 					validation.then(result => {
-						if (!result) {
+						if (!result || (!isString(result) && result.severity !== Severity.Error)) {
 							resolve(value);
 							input.hide();
 						} else if (value === validationValue) {
-							input.validationMessage = result;
+							this.setValidationOnInput(input, result);
 						}
 					});
 				}),
@@ -1600,7 +1614,7 @@ export class QuickInputController extends Disposable {
 		}
 	}
 
-	hide() {
+	hide(reason?: QuickInputHideReason) {
 		const controller = this.controller;
 		if (controller) {
 			const focusChanged = !this.ui?.container.contains(document.activeElement);
@@ -1615,7 +1629,7 @@ export class QuickInputController extends Disposable {
 					this.options.returnFocus();
 				}
 			}
-			controller.didHide();
+			controller.didHide(reason);
 		}
 	}
 
diff --git a/src/vs/base/parts/quickinput/common/quickInput.ts b/src/vs/base/parts/quickinput/common/quickInput.ts
index da566eaff4a..33c29d9d3ed 100644
--- a/src/vs/base/parts/quickinput/common/quickInput.ts
+++ b/src/vs/base/parts/quickinput/common/quickInput.ts
@@ -10,6 +10,7 @@ import { IDisposable } from 'vs/base/common/lifecycle';
 import { IMatch } from 'vs/base/common/filters';
 import { IItemAccessor } from 'vs/base/common/fuzzyScorer';
 import { Schemas } from 'vs/base/common/network';
+import Severity from 'vs/base/common/severity';
 
 export interface IQuickPickItemHighlights {
 	label?: IMatch[];
@@ -145,12 +146,34 @@ export interface IInputOptions {
 	/**
 	 * an optional function that is used to validate user input.
 	 */
-	validateInput?: (input: string) => Promise<string | null | undefined>;
+	validateInput?: (input: string) => Promise<string | null | undefined | { content: string, severity: Severity }>;
+}
+
+export enum QuickInputHideReason {
+
+	/**
+	 * Focus moved away from the quick input.
+	 */
+	Blur = 1,
+
+	/**
+	 * An explicit user gesture, e.g. pressing Escape key.
+	 */
+	Gesture,
+
+	/**
+	 * Anything else.
+	 */
+	Other
+}
+
+export interface IQuickInputHideEvent {
+	reason: QuickInputHideReason;
 }
 
 export interface IQuickInput extends IDisposable {
 
-	readonly onDidHide: Event<void>;
+	readonly onDidHide: Event<IQuickInputHideEvent>;
 	readonly onDispose: Event<void>;
 
 	title: string | undefined;
@@ -301,6 +324,8 @@ export interface IInputBox extends IQuickInput {
 	prompt: string | undefined;
 
 	validationMessage: string | undefined;
+
+	severity: Severity;
 }
 
 export interface IQuickInputButton {
diff --git a/src/vs/base/test/node/pfs/pfs.test.ts b/src/vs/base/test/node/pfs/pfs.test.ts
index 62bb9c7e3ee..904a111f826 100644
--- a/src/vs/base/test/node/pfs/pfs.test.ts
+++ b/src/vs/base/test/node/pfs/pfs.test.ts
@@ -232,14 +232,19 @@ flakySuite('PFS', function () {
 			assert.ok(!symbolicLink2);
 		}
 
-		// Copy ignores dangling symlinks
+		// Copy does not fail over dangling symlinks
 
 		await rimraf(copyTarget);
 		await rimraf(symbolicLinkTarget);
 
 		await copy(symLink, copyTarget, { preserveSymlinks: true }); // this should not throw
 
-		assert.ok(!fs.existsSync(copyTarget));
+		if (!isWindows) {
+			const { symbolicLink } = await SymlinkSupport.stat(copyTarget);
+			assert.ok(symbolicLink?.dangling);
+		} else {
+			assert.ok(!fs.existsSync(copyTarget));
+		}
 	});
 
 	test('copy handles symbolic links when the reference is inside source', async () => {
diff --git a/src/vs/code/electron-browser/sharedProcess/sharedProcessMain.ts b/src/vs/code/electron-browser/sharedProcess/sharedProcessMain.ts
index 4ebb2bf0fec..6cdcb6a401c 100644
--- a/src/vs/code/electron-browser/sharedProcess/sharedProcessMain.ts
+++ b/src/vs/code/electron-browser/sharedProcess/sharedProcessMain.ts
@@ -58,7 +58,7 @@ import { INativeHostService } from 'vs/platform/native/electron-sandbox/native';
 import { LoggerService } from 'vs/platform/log/node/loggerService';
 import { UserDataSyncLogService } from 'vs/platform/userDataSync/common/userDataSyncLog';
 import { UserDataAutoSyncService } from 'vs/platform/userDataSync/electron-sandbox/userDataAutoSyncService';
-import { NativeStorageService2 } from 'vs/platform/storage/electron-sandbox/storageService2';
+import { NativeStorageService } from 'vs/platform/storage/electron-sandbox/storageService';
 import { IStorageService } from 'vs/platform/storage/common/storage';
 import { GlobalExtensionEnablementService } from 'vs/platform/extensionManagement/common/extensionEnablementService';
 import { UserDataSyncResourceEnablementService } from 'vs/platform/userDataSync/common/userDataSyncResourceEnablementService';
@@ -175,7 +175,7 @@ class SharedProcessMain extends Disposable {
 		await configurationService.initialize();
 
 		// Storage (global access only)
-		const storageService = new NativeStorageService2(undefined, mainProcessService, environmentService);
+		const storageService = new NativeStorageService(undefined, mainProcessService, environmentService);
 		services.set(IStorageService, storageService);
 
 		await storageService.initialize();
diff --git a/src/vs/code/electron-main/app.ts b/src/vs/code/electron-main/app.ts
index dc9446a34e1..b3832d12ec4 100644
--- a/src/vs/code/electron-main/app.ts
+++ b/src/vs/code/electron-main/app.ts
@@ -80,7 +80,6 @@ import { EncryptionMainService, IEncryptionMainService } from 'vs/platform/encry
 import { ActiveWindowManager } from 'vs/platform/windows/node/windowTracker';
 import { IKeyboardLayoutMainService, KeyboardLayoutMainService } from 'vs/platform/keyboardLayout/electron-main/keyboardLayoutMainService';
 import { NativeParsedArgs } from 'vs/platform/environment/common/argv';
-import { DisplayMainService, IDisplayMainService } from 'vs/platform/display/electron-main/displayMainService';
 import { isLaunchedFromCli } from 'vs/platform/environment/node/argvHelper';
 import { isEqualOrParent } from 'vs/base/common/extpath';
 import { CancellationToken, CancellationTokenSource } from 'vs/base/common/cancellation';
@@ -559,9 +558,6 @@ export class CodeApplication extends Disposable {
 		// Keyboard Layout
 		services.set(IKeyboardLayoutMainService, new SyncDescriptor(KeyboardLayoutMainService));
 
-		// Display
-		services.set(IDisplayMainService, new SyncDescriptor(DisplayMainService));
-
 		// Native Host
 		services.set(INativeHostMainService, new SyncDescriptor(NativeHostMainService, [sharedProcess]));
 
@@ -633,10 +629,6 @@ export class CodeApplication extends Disposable {
 		const keyboardLayoutChannel = ProxyChannel.fromService(accessor.get(IKeyboardLayoutMainService));
 		mainProcessElectronServer.registerChannel('keyboardLayout', keyboardLayoutChannel);
 
-		// Display
-		const displayChannel = ProxyChannel.fromService(accessor.get(IDisplayMainService));
-		mainProcessElectronServer.registerChannel('display', displayChannel);
-
 		// Native host (main & shared process)
 		this.nativeHostMainService = accessor.get(INativeHostMainService);
 		const nativeHostChannel = ProxyChannel.fromService(this.nativeHostMainService);
diff --git a/src/vs/code/electron-main/main.ts b/src/vs/code/electron-main/main.ts
index 7cbdd078f09..a9f65257a3b 100644
--- a/src/vs/code/electron-main/main.ts
+++ b/src/vs/code/electron-main/main.ts
@@ -23,7 +23,7 @@ import { SyncDescriptor } from 'vs/platform/instantiation/common/descriptors';
 import { ILogService, ConsoleMainLogger, MultiplexLogService, getLogLevel, ILoggerService } from 'vs/platform/log/common/log';
 import { StateService } from 'vs/platform/state/node/stateService';
 import { IStateService } from 'vs/platform/state/node/state';
-import { IEnvironmentService } from 'vs/platform/environment/common/environment';
+import { IEnvironmentService, INativeEnvironmentService } from 'vs/platform/environment/common/environment';
 import { NativeParsedArgs } from 'vs/platform/environment/common/argv';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
 import { ConfigurationService } from 'vs/platform/configuration/common/configurationService';
@@ -130,16 +130,17 @@ class CodeMain {
 		const services = new ServiceCollection();
 
 		// Environment
-		const environmentService = new EnvironmentMainService(args);
-		const instanceEnvironment = this.patchEnvironment(environmentService); // Patch `process.env` with the instance's environment
-		services.set(IEnvironmentService, environmentService);
-		services.set(IEnvironmentMainService, environmentService);
+		const environmentMainService = new EnvironmentMainService(args);
+		const instanceEnvironment = this.patchEnvironment(environmentMainService); // Patch `process.env` with the instance's environment
+		services.set(IEnvironmentService, environmentMainService);
+		services.set(INativeEnvironmentService, environmentMainService);
+		services.set(IEnvironmentMainService, environmentMainService);
 
 		// Log: We need to buffer the spdlog logs until we are sure
 		// we are the only instance running, otherwise we'll have concurrent
 		// log file access on Windows (https://github.com/microsoft/vscode/issues/41218)
 		const bufferLogService = new BufferLogService();
-		const logService = new MultiplexLogService([new ConsoleMainLogger(getLogLevel(environmentService)), bufferLogService]);
+		const logService = new MultiplexLogService([new ConsoleMainLogger(getLogLevel(environmentMainService)), bufferLogService]);
 		process.once('exit', () => logService.dispose());
 		services.set(ILogService, logService);
 
@@ -153,14 +154,14 @@ class CodeMain {
 		services.set(ILoggerService, new LoggerService(logService, fileService));
 
 		// Configuration
-		const configurationService = new ConfigurationService(environmentService.settingsResource, fileService);
+		const configurationService = new ConfigurationService(environmentMainService.settingsResource, fileService);
 		services.set(IConfigurationService, configurationService);
 
 		// Lifecycle
 		services.set(ILifecycleMainService, new SyncDescriptor(LifecycleMainService));
 
 		// State
-		const stateService = new StateService(environmentService, logService);
+		const stateService = new StateService(environmentMainService, logService);
 		services.set(IStateService, stateService);
 
 		// Request
@@ -178,7 +179,7 @@ class CodeMain {
 		// Tunnel
 		services.set(ITunnelService, new SyncDescriptor(TunnelService));
 
-		return [new InstantiationService(services, true), instanceEnvironment, environmentService, configurationService, stateService, bufferLogService];
+		return [new InstantiationService(services, true), instanceEnvironment, environmentMainService, configurationService, stateService, bufferLogService];
 	}
 
 	private patchEnvironment(environmentMainService: IEnvironmentMainService): IProcessEnvironment {
diff --git a/src/vs/editor/browser/controller/textAreaHandler.ts b/src/vs/editor/browser/controller/textAreaHandler.ts
index 534b00652e8..35aa7a6dec2 100644
--- a/src/vs/editor/browser/controller/textAreaHandler.ts
+++ b/src/vs/editor/browser/controller/textAreaHandler.ts
@@ -416,9 +416,8 @@ export class TextAreaHandler extends ViewPart {
 		this._accessibilitySupport = options.get(EditorOption.accessibilitySupport);
 		const accessibilityPageSize = options.get(EditorOption.accessibilityPageSize);
 		if (this._accessibilitySupport === AccessibilitySupport.Enabled && accessibilityPageSize === EditorOptions.accessibilityPageSize.defaultValue) {
-			// If a screen reader is attached and the default value is not set we shuold automatically increase the page size to 100 for a better experience
-			// If we put more than 100 lines the nvda can not handle this https://github.com/microsoft/vscode/issues/89717
-			this._accessibilityPageSize = 100;
+			// If a screen reader is attached and the default value is not set we shuold automatically increase the page size to 1000 for a better experience
+			this._accessibilityPageSize = 2000;
 		} else {
 			this._accessibilityPageSize = accessibilityPageSize;
 		}
diff --git a/src/vs/editor/browser/services/codeEditorServiceImpl.ts b/src/vs/editor/browser/services/codeEditorServiceImpl.ts
index 952b317c640..1ac3378b440 100644
--- a/src/vs/editor/browser/services/codeEditorServiceImpl.ts
+++ b/src/vs/editor/browser/services/codeEditorServiceImpl.ts
@@ -328,7 +328,7 @@ export class DecorationTypeOptionsProvider implements IModelDecorationOptionsPro
 }
 
 
-const _CSS_MAP: { [prop: string]: string; } = {
+export const _CSS_MAP: { [prop: string]: string; } = {
 	color: 'color:{0} !important;',
 	opacity: 'opacity:{0};',
 	backgroundColor: 'background-color:{0};',
diff --git a/src/vs/editor/common/config/editorOptions.ts b/src/vs/editor/common/config/editorOptions.ts
index fd183e4fd8c..975d0bf3f24 100644
--- a/src/vs/editor/common/config/editorOptions.ts
+++ b/src/vs/editor/common/config/editorOptions.ts
@@ -3883,7 +3883,10 @@ export const EditorOptions = {
 	)),
 	accessibilitySupport: register(new EditorAccessibilitySupport()),
 	accessibilityPageSize: register(new EditorIntOption(EditorOption.accessibilityPageSize, 'accessibilityPageSize', 10, 1, Constants.MAX_SAFE_SMALL_INTEGER,
-		{ description: nls.localize('accessibilityPageSize', "Controls the number of lines in the editor that can be read out by a screen reader. Warning: this has a performance implication for numbers larger than the default.") })),
+		{
+			description: nls.localize('accessibilityPageSize', "Controls the number of lines in the editor that can be read out by a screen reader at once. When we detect a screen reader we automatically set the default to be 2000. Warning: this has a performance implication for numbers larger than the default."),
+			deprecationMessage: nls.localize('accessibilityPageSize.deprecated', "This setting is deprecated, editor will automatically choose the accessibility page size when we detect a screen reader. 2000 lines will be the new default.")
+		})),
 	ariaLabel: register(new EditorStringOption(
 		EditorOption.ariaLabel, 'ariaLabel', nls.localize('editorViewAccessibleLabel', "Editor content")
 	)),
diff --git a/src/vs/editor/contrib/gotoSymbol/goToSymbol.ts b/src/vs/editor/contrib/gotoSymbol/goToSymbol.ts
index e3e7ec687d5..030aa0cafb8 100644
--- a/src/vs/editor/contrib/gotoSymbol/goToSymbol.ts
+++ b/src/vs/editor/contrib/gotoSymbol/goToSymbol.ts
@@ -5,10 +5,12 @@
 
 import { CancellationToken } from 'vs/base/common/cancellation';
 import { onUnexpectedExternalError } from 'vs/base/common/errors';
+import { extUri } from 'vs/base/common/resources';
 import { registerModelAndPositionCommand } from 'vs/editor/browser/editorExtensions';
 import { Position } from 'vs/editor/common/core/position';
 import { ITextModel } from 'vs/editor/common/model';
-import { LocationLink, DefinitionProviderRegistry, ImplementationProviderRegistry, TypeDefinitionProviderRegistry, DeclarationProviderRegistry, ProviderResult, ReferenceProviderRegistry } from 'vs/editor/common/modes';
+import { Range } from 'vs/editor/common/core/range';
+import { Location, LocationLink, DefinitionProviderRegistry, ImplementationProviderRegistry, TypeDefinitionProviderRegistry, DeclarationProviderRegistry, ProviderResult, ReferenceProviderRegistry } from 'vs/editor/common/modes';
 import { LanguageFeatureRegistry } from 'vs/editor/common/modes/languageFeatureRegistry';
 
 
@@ -37,7 +39,8 @@ function getLocationLinks<T>(
 				result.push(value);
 			}
 		}
-		return result;
+
+		return sortAndDeduplicate(result);
 	});
 }
 
@@ -80,6 +83,22 @@ export function getReferencesAtPosition(model: ITextModel, position: Position, c
 	});
 }
 
+export function sortAndDeduplicate(locations: Location[]): Location[] {
+	const result: LocationLink[] = [];
+	let last: LocationLink | undefined;
+	for (const link of locations.sort(compareLocations)) {
+		if (last === undefined || compareLocations(last, link) !== 0) {
+			result.push(link);
+			last = link;
+		}
+	}
+	return result;
+}
+
+function compareLocations(a: Location, b: Location): number {
+	return extUri.compare(a.uri, b.uri) || Range.compareRangesUsingStarts(a.range, b.range);
+}
+
 registerModelAndPositionCommand('_executeDefinitionProvider', (model, position) => getDefinitionsAtPosition(model, position, CancellationToken.None));
 registerModelAndPositionCommand('_executeDeclarationProvider', (model, position) => getDeclarationsAtPosition(model, position, CancellationToken.None));
 registerModelAndPositionCommand('_executeImplementationProvider', (model, position) => getImplementationsAtPosition(model, position, CancellationToken.None));
diff --git a/src/vs/editor/contrib/gotoSymbol/peek/referencesController.ts b/src/vs/editor/contrib/gotoSymbol/peek/referencesController.ts
index 3b9169e6ce7..c249800baa8 100644
--- a/src/vs/editor/contrib/gotoSymbol/peek/referencesController.ts
+++ b/src/vs/editor/contrib/gotoSymbol/peek/referencesController.ts
@@ -27,7 +27,7 @@ import { KeyCode, KeyMod, KeyChord } from 'vs/base/common/keyCodes';
 import { CommandsRegistry } from 'vs/platform/commands/common/commands';
 import { EditorOption } from 'vs/editor/common/config/editorOptions';
 
-export const ctxReferenceSearchVisible = new RawContextKey<boolean>('referenceSearchVisible', false);
+export const ctxReferenceSearchVisible = new RawContextKey<boolean>('referenceSearchVisible', false, nls.localize('referenceSearchVisible', "Whether reference peek is visible, like 'Peek References' or 'Peek Definition'"));
 
 export abstract class ReferencesController implements IEditorContribution {
 
diff --git a/src/vs/editor/contrib/gotoSymbol/referencesModel.ts b/src/vs/editor/contrib/gotoSymbol/referencesModel.ts
index 44a9dfbe5dd..fe0655baa49 100644
--- a/src/vs/editor/contrib/gotoSymbol/referencesModel.ts
+++ b/src/vs/editor/contrib/gotoSymbol/referencesModel.ts
@@ -11,7 +11,7 @@ import * as strings from 'vs/base/common/strings';
 import { URI } from 'vs/base/common/uri';
 import { defaultGenerator } from 'vs/base/common/idGenerator';
 import { Range, IRange } from 'vs/editor/common/core/range';
-import { Location, LocationLink } from 'vs/editor/common/modes';
+import { LocationLink } from 'vs/editor/common/modes';
 import { ITextModelService, ITextEditorModel } from 'vs/editor/common/services/resolverService';
 import { Position } from 'vs/editor/common/core/position';
 import { IMatch } from 'vs/base/common/filters';
@@ -19,6 +19,8 @@ import { Constants } from 'vs/base/common/uint';
 import { ResourceMap } from 'vs/base/common/map';
 import { onUnexpectedError } from 'vs/base/common/errors';
 
+import { sortAndDeduplicate } from './goToSymbol';
+
 export class OneReference {
 
 	readonly id: string = defaultGenerator.nextId();
@@ -154,9 +156,9 @@ export class ReferencesModel implements IDisposable {
 		this._links = links;
 		this._title = title;
 
-		// grouping and sorting
+		// grouping, sorting, and de-duplicating
 		const [providersFirst] = links;
-		links.sort(ReferencesModel._compareReferences);
+		links = sortAndDeduplicate(links);
 
 		let current: FileReferences | undefined;
 		for (let link of links) {
@@ -166,19 +168,15 @@ export class ReferencesModel implements IDisposable {
 				this.groups.push(current);
 			}
 
-			// append, check for equality first!
-			if (current.children.length === 0 || ReferencesModel._compareReferences(link, current.children[current.children.length - 1]) !== 0) {
-
-				const oneRef = new OneReference(
-					providersFirst === link,
-					current,
-					link.uri,
-					link.targetSelectionRange || link.range,
-					ref => this._onDidChangeReferenceRange.fire(ref)
-				);
-				this.references.push(oneRef);
-				current.children.push(oneRef);
-			}
+			const oneRef = new OneReference(
+				providersFirst === link,
+				current,
+				link.uri,
+				link.targetSelectionRange || link.range,
+				ref => this._onDidChangeReferenceRange.fire(ref)
+			);
+			this.references.push(oneRef);
+			current.children.push(oneRef);
 		}
 	}
 
@@ -287,8 +285,4 @@ export class ReferencesModel implements IDisposable {
 		}
 		return this.references[0];
 	}
-
-	private static _compareReferences(a: Location, b: Location): number {
-		return extUri.compare(a.uri, b.uri) || Range.compareRangesUsingStarts(a.range, b.range);
-	}
 }
diff --git a/src/vs/editor/contrib/gotoSymbol/symbolNavigation.ts b/src/vs/editor/contrib/gotoSymbol/symbolNavigation.ts
index 915aae90522..696856b91a1 100644
--- a/src/vs/editor/contrib/gotoSymbol/symbolNavigation.ts
+++ b/src/vs/editor/contrib/gotoSymbol/symbolNavigation.ts
@@ -21,7 +21,7 @@ import { INotificationService } from 'vs/platform/notification/common/notificati
 import { isEqual } from 'vs/base/common/resources';
 import { TextEditorSelectionRevealType } from 'vs/platform/editor/common/editor';
 
-export const ctxHasSymbols = new RawContextKey('hasSymbols', false);
+export const ctxHasSymbols = new RawContextKey('hasSymbols', false, localize('hasSymbols', "Whether there are symbol locations that can be navigated via keyboard-only."));
 
 export const ISymbolNavigationService = createDecorator<ISymbolNavigationService>('ISymbolNavigationService');
 
diff --git a/src/vs/editor/contrib/hover/hover.ts b/src/vs/editor/contrib/hover/hover.ts
index 071253cbd0c..276ad87a8ff 100644
--- a/src/vs/editor/contrib/hover/hover.ts
+++ b/src/vs/editor/contrib/hover/hover.ts
@@ -312,13 +312,9 @@ class ShowDefinitionPreviewHoverAction extends EditorAction {
 		const range = new Range(position.lineNumber, position.column, position.lineNumber, position.column);
 		const goto = GotoDefinitionAtPositionEditorContribution.get(editor);
 		const promise = goto.startFindDefinitionFromCursor(position);
-		if (promise) {
-			promise.then(() => {
-				controller.showContentHover(range, HoverStartMode.Immediate, true);
-			});
-		} else {
+		promise.then(() => {
 			controller.showContentHover(range, HoverStartMode.Immediate, true);
-		}
+		});
 	}
 }
 
diff --git a/src/vs/editor/contrib/parameterHints/parameterHintsModel.ts b/src/vs/editor/contrib/parameterHints/parameterHintsModel.ts
index d7ea89b532b..2c01d06321b 100644
--- a/src/vs/editor/contrib/parameterHints/parameterHintsModel.ts
+++ b/src/vs/editor/contrib/parameterHints/parameterHintsModel.ts
@@ -74,6 +74,7 @@ export class ParameterHintsModel extends Disposable {
 
 		this.throttledDelayer = new Delayer(delay);
 
+		this._register(this.editor.onDidBlurEditorWidget(() => this.cancel()));
 		this._register(this.editor.onDidChangeConfiguration(() => this.onEditorConfigurationChange()));
 		this._register(this.editor.onDidChangeModel(e => this.onModelChanged()));
 		this._register(this.editor.onDidChangeModelLanguage(_ => this.onModelChanged()));
diff --git a/src/vs/editor/contrib/peekView/peekView.ts b/src/vs/editor/contrib/peekView/peekView.ts
index 36db5b2b3d8..91e8bc41b42 100644
--- a/src/vs/editor/contrib/peekView/peekView.ts
+++ b/src/vs/editor/contrib/peekView/peekView.ts
@@ -56,7 +56,7 @@ registerSingleton(IPeekViewService, class implements IPeekViewService {
 });
 
 export namespace PeekContext {
-	export const inPeekEditor = new RawContextKey<boolean>('inReferenceSearchEditor', true);
+	export const inPeekEditor = new RawContextKey<boolean>('inReferenceSearchEditor', true, nls.localize('inReferenceSearchEditor', "Whether the current code editor is embedded inside peek"));
 	export const notInPeekEditor = inPeekEditor.toNegated();
 }
 
diff --git a/src/vs/editor/contrib/rename/renameInputField.ts b/src/vs/editor/contrib/rename/renameInputField.ts
index a73fab12806..031f13cb3d5 100644
--- a/src/vs/editor/contrib/rename/renameInputField.ts
+++ b/src/vs/editor/contrib/rename/renameInputField.ts
@@ -17,7 +17,7 @@ import { EditorOption } from 'vs/editor/common/config/editorOptions';
 import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
 import { CancellationToken } from 'vs/base/common/cancellation';
 
-export const CONTEXT_RENAME_INPUT_VISIBLE = new RawContextKey<boolean>('renameInputVisible', false);
+export const CONTEXT_RENAME_INPUT_VISIBLE = new RawContextKey<boolean>('renameInputVisible', false, localize('renameInputVisible', "Whether the rename input widget is visible"));
 
 export interface RenameInputFieldResult {
 	newName: string;
diff --git a/src/vs/editor/contrib/snippet/snippetController2.ts b/src/vs/editor/contrib/snippet/snippetController2.ts
index 6459f4402f2..95bd300f063 100644
--- a/src/vs/editor/contrib/snippet/snippetController2.ts
+++ b/src/vs/editor/contrib/snippet/snippetController2.ts
@@ -19,6 +19,7 @@ import { KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegis
 import { ILogService } from 'vs/platform/log/common/log';
 import { SnippetSession } from './snippetSession';
 import { OvertypingCapturer } from 'vs/editor/contrib/suggest/suggestOvertypingCapturer';
+import { localize } from 'vs/nls';
 
 export interface ISnippetInsertOptions {
 	overwriteBefore: number;
@@ -48,9 +49,9 @@ export class SnippetController2 implements IEditorContribution {
 		return editor.getContribution<SnippetController2>(SnippetController2.ID);
 	}
 
-	static readonly InSnippetMode = new RawContextKey('inSnippetMode', false);
-	static readonly HasNextTabstop = new RawContextKey('hasNextTabstop', false);
-	static readonly HasPrevTabstop = new RawContextKey('hasPrevTabstop', false);
+	static readonly InSnippetMode = new RawContextKey('inSnippetMode', false, localize('inSnippetMode', "Whether the editor in current in snippet mode"));
+	static readonly HasNextTabstop = new RawContextKey('hasNextTabstop', false, localize('hasNextTabstop', "Whether there is a next tab stop when in snippet mode"));
+	static readonly HasPrevTabstop = new RawContextKey('hasPrevTabstop', false, localize('hasPrevTabstop', "Whether there is a previous tab stop when in snippet mode"));
 
 	private readonly _inSnippet: IContextKey<boolean>;
 	private readonly _hasNextTabstop: IContextKey<boolean>;
diff --git a/src/vs/editor/contrib/suggest/completionModel.ts b/src/vs/editor/contrib/suggest/completionModel.ts
index 43dd9e1b95c..40ee6005eca 100644
--- a/src/vs/editor/contrib/suggest/completionModel.ts
+++ b/src/vs/editor/contrib/suggest/completionModel.ts
@@ -174,8 +174,6 @@ export class CompletionModel {
 				wordLow = word.toLowerCase();
 			}
 
-			const textLabel = typeof item.completion.label === 'string' ? item.completion.label : item.completion.label.name;
-
 			// remember the word against which this item was
 			// scored
 			item.word = word;
@@ -215,19 +213,19 @@ export class CompletionModel {
 					if (!match) {
 						continue; // NO match
 					}
-					if (compareIgnoreCase(item.completion.filterText, textLabel) === 0) {
+					if (compareIgnoreCase(item.completion.filterText, item.textLabel) === 0) {
 						// filterText and label are actually the same -> use good highlights
 						item.score = match;
 					} else {
 						// re-run the scorer on the label in the hope of a result BUT use the rank
 						// of the filterText-match
-						item.score = anyScore(word, wordLow, wordPos, textLabel, item.labelLow, 0);
+						item.score = anyScore(word, wordLow, wordPos, item.textLabel, item.labelLow, 0);
 						item.score[0] = match[0]; // use score from filterText
 					}
 
 				} else {
 					// by default match `word` against the `label`
-					let match = scoreFn(word, wordLow, wordPos, textLabel, item.labelLow, 0, false);
+					let match = scoreFn(word, wordLow, wordPos, item.textLabel, item.labelLow, 0, false);
 					if (!match) {
 						continue; // NO match
 					}
@@ -240,7 +238,7 @@ export class CompletionModel {
 			target.push(item as StrictCompletionItem);
 
 			// update stats
-			labelLengths.push(textLabel.length);
+			labelLengths.push(item.textLabel.length);
 		}
 
 		this._filteredItems = target.sort(this._snippetCompareFn);
diff --git a/src/vs/editor/contrib/suggest/suggest.ts b/src/vs/editor/contrib/suggest/suggest.ts
index d6c466f335e..c8e46227448 100644
--- a/src/vs/editor/contrib/suggest/suggest.ts
+++ b/src/vs/editor/contrib/suggest/suggest.ts
@@ -21,16 +21,17 @@ import { CommandsRegistry } from 'vs/platform/commands/common/commands';
 import { assertType } from 'vs/base/common/types';
 import { URI } from 'vs/base/common/uri';
 import { ITextModelService } from 'vs/editor/common/services/resolverService';
+import { localize } from 'vs/nls';
 
 export const Context = {
-	Visible: new RawContextKey<boolean>('suggestWidgetVisible', false),
-	DetailsVisible: new RawContextKey<boolean>('suggestWidgetDetailsVisible', false),
-	MultipleSuggestions: new RawContextKey<boolean>('suggestWidgetMultipleSuggestions', false),
-	MakesTextEdit: new RawContextKey('suggestionMakesTextEdit', true),
-	AcceptSuggestionsOnEnter: new RawContextKey<boolean>('acceptSuggestionOnEnter', true),
-	HasInsertAndReplaceRange: new RawContextKey('suggestionHasInsertAndReplaceRange', false),
-	InsertMode: new RawContextKey<'insert' | 'replace'>('suggestionInsertMode', undefined),
-	CanResolve: new RawContextKey('suggestionCanResolve', false),
+	Visible: new RawContextKey<boolean>('suggestWidgetVisible', false, localize('suggestWidgetVisible', "Whether suggestion are visible")),
+	DetailsVisible: new RawContextKey<boolean>('suggestWidgetDetailsVisible', false, localize('suggestWidgetDetailsVisible', "Whether suggestion details are visible")),
+	MultipleSuggestions: new RawContextKey<boolean>('suggestWidgetMultipleSuggestions', false, localize('suggestWidgetMultipleSuggestions', "Whether there are multiple suggestions to pick from")),
+	MakesTextEdit: new RawContextKey('suggestionMakesTextEdit', true, localize('suggestionMakesTextEdit', "Whether inserting the current suggestion yields in a change or has everything already been typed")),
+	AcceptSuggestionsOnEnter: new RawContextKey<boolean>('acceptSuggestionOnEnter', true, localize('acceptSuggestionOnEnter', "Whether suggestions are inserted when pressing Enter")),
+	HasInsertAndReplaceRange: new RawContextKey('suggestionHasInsertAndReplaceRange', false, localize('suggestionHasInsertAndReplaceRange', "Whether the current suggestion has insert and replace behaviour")),
+	InsertMode: new RawContextKey<'insert' | 'replace'>('suggestionInsertMode', undefined, { type: 'string', description: localize('suggestionInsertMode', "Whether the default behaviour is to insert or replace") }),
+	CanResolve: new RawContextKey('suggestionCanResolve', false, localize('suggestionCanResolve', "Whether the current suggestion supports to resolve further details")),
 };
 
 export const suggestWidgetStatusbarMenu = new MenuId('suggestWidgetStatusBar');
diff --git a/src/vs/editor/contrib/suggest/suggestController.ts b/src/vs/editor/contrib/suggest/suggestController.ts
index 887064414ba..bca0fd62557 100644
--- a/src/vs/editor/contrib/suggest/suggestController.ts
+++ b/src/vs/editor/contrib/suggest/suggestController.ts
@@ -440,10 +440,9 @@ export class SuggestController implements IEditorContribution {
 		};
 	}
 
-	private _alertCompletionItem({ completion: suggestion }: CompletionItem): void {
-		const textLabel = typeof suggestion.label === 'string' ? suggestion.label : suggestion.label.name;
-		if (isNonEmptyArray(suggestion.additionalTextEdits)) {
-			let msg = nls.localize('aria.alert.snippet', "Accepting '{0}' made {1} additional edits", textLabel, suggestion.additionalTextEdits.length);
+	private _alertCompletionItem(item: CompletionItem): void {
+		if (isNonEmptyArray(item.completion.additionalTextEdits)) {
+			let msg = nls.localize('aria.alert.snippet', "Accepting '{0}' made {1} additional edits", item.textLabel, item.completion.additionalTextEdits.length);
 			alert(msg);
 		}
 	}
diff --git a/src/vs/editor/contrib/suggest/suggestWidget.ts b/src/vs/editor/contrib/suggest/suggestWidget.ts
index 94135e09b63..515d11efe61 100644
--- a/src/vs/editor/contrib/suggest/suggestWidget.ts
+++ b/src/vs/editor/contrib/suggest/suggestWidget.ts
@@ -223,7 +223,6 @@ export class SuggestWidget implements IDisposable {
 			accessibilityProvider: {
 				getRole: () => 'option',
 				getAriaLabel: (item: CompletionItem) => {
-					const textLabel = typeof item.completion.label === 'string' ? item.completion.label : item.completion.label.name;
 					if (item.isResolved && this._isDetailsVisible()) {
 						const { documentation, detail } = item.completion;
 						const docs = strings.format(
@@ -231,9 +230,9 @@ export class SuggestWidget implements IDisposable {
 							detail || '',
 							documentation ? (typeof documentation === 'string' ? documentation : documentation.value) : '');
 
-						return nls.localize('ariaCurrenttSuggestionReadDetails', "{0}, docs: {1}", textLabel, docs);
+						return nls.localize('ariaCurrenttSuggestionReadDetails', "{0}, docs: {1}", item.textLabel, docs);
 					} else {
-						return textLabel;
+						return item.textLabel;
 					}
 				},
 				getWidgetAriaLabel: () => nls.localize('suggest', "Suggest"),
@@ -670,7 +669,7 @@ export class SuggestWidget implements IDisposable {
 			this._details.hide();
 			this.element.domNode.classList.remove('shows-details');
 
-		} else if (canExpandCompletionItem(this._list.getFocusedElements()[0]) && (this._state === State.Open || this._state === State.Details || this._state === State.Frozen)) {
+		} else if ((canExpandCompletionItem(this._list.getFocusedElements()[0]) || this._explainMode) && (this._state === State.Open || this._state === State.Details || this._state === State.Frozen)) {
 			// show details widget (iff possible)
 			this._ctxSuggestWidgetDetailsVisible.set(true);
 			this._setDetailsVisible(true);
@@ -691,9 +690,13 @@ export class SuggestWidget implements IDisposable {
 	}
 
 	toggleExplainMode(): void {
-		if (this._list.getFocusedElements()[0] && this._isDetailsVisible()) {
+		if (this._list.getFocusedElements()[0]) {
 			this._explainMode = !this._explainMode;
-			this.showDetails(false);
+			if (!this._isDetailsVisible()) {
+				this.toggleDetails();
+			} else {
+				this.showDetails(false);
+			}
 		}
 	}
 
diff --git a/src/vs/editor/contrib/suggest/suggestWidgetDetails.ts b/src/vs/editor/contrib/suggest/suggestWidgetDetails.ts
index 5adcbc39882..403275730b4 100644
--- a/src/vs/editor/contrib/suggest/suggestWidgetDetails.ts
+++ b/src/vs/editor/contrib/suggest/suggestWidgetDetails.ts
@@ -128,10 +128,12 @@ export class SuggestDetailsWidget {
 
 		if (explainMode) {
 			let md = '';
-			md += `score: ${item.score[0]}${item.word ? `, compared '${item.completion.filterText && (item.completion.filterText + ' (filterText)') || typeof item.completion.label === 'string' ? item.completion.label : item.completion.label.name}' with '${item.word}'` : ' (no prefix)'}\n`;
-			md += `distance: ${item.distance}, see localityBonus-setting\n`;
+			md += `score: ${item.score[0]}\n`;
+			md += `prefix: ${item.word ?? '(no prefix)'}\n`;
+			md += `word: ${item.completion.filterText ? item.completion.filterText + ' (filterText)' : item.textLabel}\n`;
+			md += `distance: ${item.distance} (localityBonus-setting)\n`;
 			md += `index: ${item.idx}, based on ${item.completion.sortText && `sortText: "${item.completion.sortText}"` || 'label'}\n`;
-			md += `commit characters: ${item.completion.commitCharacters?.join('')}\n`;
+			md += `commit_chars: ${item.completion.commitCharacters?.join('')}\n`;
 			documentation = new MarkdownString().appendCodeblock('empty', md);
 			detail = `Provider: ${item.provider._debugDisplayName}`;
 		}
diff --git a/src/vs/editor/contrib/suggest/suggestWidgetRenderer.ts b/src/vs/editor/contrib/suggest/suggestWidgetRenderer.ts
index 71098fe0628..a3763880de2 100644
--- a/src/vs/editor/contrib/suggest/suggestWidgetRenderer.ts
+++ b/src/vs/editor/contrib/suggest/suggestWidgetRenderer.ts
@@ -162,8 +162,6 @@ export class ItemRenderer implements IListRenderer<CompletionItem, ISuggestionTe
 
 	renderElement(element: CompletionItem, index: number, data: ISuggestionTemplateData): void {
 		const { completion } = element;
-		const textLabel = typeof completion.label === 'string' ? completion.label : completion.label.name;
-
 		data.root.id = getAriaId(index);
 		data.colorspan.style.backgroundColor = '';
 
@@ -183,7 +181,7 @@ export class ItemRenderer implements IListRenderer<CompletionItem, ISuggestionTe
 			// special logic for 'file' completion items
 			data.icon.className = 'icon hide';
 			data.iconContainer.className = 'icon hide';
-			const labelClasses = getIconClasses(this._modelService, this._modeService, URI.from({ scheme: 'fake', path: textLabel }), FileKind.FILE);
+			const labelClasses = getIconClasses(this._modelService, this._modeService, URI.from({ scheme: 'fake', path: element.textLabel }), FileKind.FILE);
 			const detailClasses = getIconClasses(this._modelService, this._modeService, URI.from({ scheme: 'fake', path: completion.detail }), FileKind.FILE);
 			labelOptions.extraClasses = labelClasses.length > detailClasses.length ? labelClasses : detailClasses;
 
@@ -192,7 +190,7 @@ export class ItemRenderer implements IListRenderer<CompletionItem, ISuggestionTe
 			data.icon.className = 'icon hide';
 			data.iconContainer.className = 'icon hide';
 			labelOptions.extraClasses = flatten([
-				getIconClasses(this._modelService, this._modeService, URI.from({ scheme: 'fake', path: textLabel }), FileKind.FOLDER),
+				getIconClasses(this._modelService, this._modeService, URI.from({ scheme: 'fake', path: element.textLabel }), FileKind.FOLDER),
 				getIconClasses(this._modelService, this._modeService, URI.from({ scheme: 'fake', path: completion.detail }), FileKind.FOLDER)
 			]);
 		} else {
@@ -207,7 +205,7 @@ export class ItemRenderer implements IListRenderer<CompletionItem, ISuggestionTe
 			labelOptions.matches = [];
 		}
 
-		data.iconLabel.setLabel(textLabel, undefined, labelOptions);
+		data.iconLabel.setLabel(element.textLabel, undefined, labelOptions);
 		if (typeof completion.label === 'string') {
 			data.parametersLabel.textContent = '';
 			data.qualifierLabel.textContent = '';
@@ -219,7 +217,7 @@ export class ItemRenderer implements IListRenderer<CompletionItem, ISuggestionTe
 			data.qualifierLabel.textContent = (completion.label.qualifier || '').replace(/\n.*$/m, '');
 			data.detailsLabel.textContent = (completion.label.type || '').replace(/\n.*$/m, '');
 			data.root.classList.remove('string-label');
-			data.root.title = `${textLabel}${completion.label.parameters ?? ''}  ${completion.label.qualifier ?? ''}  ${completion.label.type ?? ''}`;
+			data.root.title = `${element.textLabel}${completion.label.parameters ?? ''}  ${completion.label.qualifier ?? ''}  ${completion.label.type ?? ''}`;
 		}
 
 		if (this._editor.getOption(EditorOption.suggest).showInlineDetails) {
diff --git a/src/vs/editor/contrib/suggest/wordDistance.ts b/src/vs/editor/contrib/suggest/wordDistance.ts
index 85e98536f2b..5226f503f9c 100644
--- a/src/vs/editor/contrib/suggest/wordDistance.ts
+++ b/src/vs/editor/contrib/suggest/wordDistance.ts
@@ -50,14 +50,14 @@ export abstract class WordDistance {
 		delete wordRanges[wordUntilPos.word];
 
 		return new class extends WordDistance {
-			distance(anchor: IPosition, suggestion: CompletionItem) {
+			distance(anchor: IPosition, item: CompletionItem) {
 				if (!position.equals(editor.getPosition())) {
 					return 0;
 				}
-				if (suggestion.kind === CompletionItemKind.Keyword) {
+				if (item.kind === CompletionItemKind.Keyword) {
 					return 2 << 20;
 				}
-				let word = typeof suggestion.label === 'string' ? suggestion.label : suggestion.label.name;
+				let word = typeof item.label === 'string' ? item.label : item.label.name;
 				let wordLines = wordRanges[word];
 				if (isFalsyOrEmpty(wordLines)) {
 					return 2 << 20;
@@ -78,5 +78,3 @@ export abstract class WordDistance {
 
 	abstract distance(anchor: IPosition, suggestion: CompletionItem): number;
 }
-
-
diff --git a/src/vs/platform/actions/browser/menuEntryActionViewItem.ts b/src/vs/platform/actions/browser/menuEntryActionViewItem.ts
index 487329119ef..f87af795f7e 100644
--- a/src/vs/platform/actions/browser/menuEntryActionViewItem.ts
+++ b/src/vs/platform/actions/browser/menuEntryActionViewItem.ts
@@ -19,18 +19,18 @@ import { DropdownMenuActionViewItem } from 'vs/base/browser/ui/dropdown/dropdown
 import { isWindows, isLinux } from 'vs/base/common/platform';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 
-export function createAndFillInContextMenuActions(menu: IMenu, options: IMenuActionOptions | undefined, target: IAction[] | { primary: IAction[]; secondary: IAction[]; }, isPrimaryGroup?: (group: string) => boolean): IDisposable {
+export function createAndFillInContextMenuActions(menu: IMenu, options: IMenuActionOptions | undefined, target: IAction[] | { primary: IAction[]; secondary: IAction[]; }, primaryGroup?: string): IDisposable {
 	const groups = menu.getActions(options);
 	const modifierKeyEmitter = ModifierKeyEmitter.getInstance();
 	const useAlternativeActions = modifierKeyEmitter.keyStatus.altKey || ((isWindows || isLinux) && modifierKeyEmitter.keyStatus.shiftKey);
-	fillInActions(groups, target, useAlternativeActions, isPrimaryGroup);
+	fillInActions(groups, target, useAlternativeActions, primaryGroup);
 	return asDisposable(groups);
 }
 
-export function createAndFillInActionBarActions(menu: IMenu, options: IMenuActionOptions | undefined, target: IAction[] | { primary: IAction[]; secondary: IAction[]; }, isPrimaryGroup?: (group: string) => boolean, primaryMaxCount?: number, shouldInlineSubmenu?: (action: SubmenuAction, group: string, groupSize: number) => boolean): IDisposable {
+export function createAndFillInActionBarActions(menu: IMenu, options: IMenuActionOptions | undefined, target: IAction[] | { primary: IAction[]; secondary: IAction[]; }, primaryGroup?: string, primaryMaxCount?: number, shouldInlineSubmenu?: (action: SubmenuAction, group: string, groupSize: number) => boolean): IDisposable {
 	const groups = menu.getActions(options);
 	// Action bars handle alternative actions on their own so the alternative actions should be ignored
-	fillInActions(groups, target, false, isPrimaryGroup, primaryMaxCount, shouldInlineSubmenu);
+	fillInActions(groups, target, false, primaryGroup, primaryMaxCount, shouldInlineSubmenu);
 	return asDisposable(groups);
 }
 
@@ -48,7 +48,7 @@ function asDisposable(groups: ReadonlyArray<[string, ReadonlyArray<MenuItemActio
 function fillInActions(
 	groups: ReadonlyArray<[string, ReadonlyArray<MenuItemAction | SubmenuItemAction>]>, target: IAction[] | { primary: IAction[]; secondary: IAction[]; },
 	useAlternativeActions: boolean,
-	isPrimaryGroup: (group: string) => boolean = group => group === 'navigation',
+	primaryGroup = 'navigation',
 	primaryMaxCount: number = Number.MAX_SAFE_INTEGER,
 	shouldInlineSubmenu: (action: SubmenuAction, group: string, groupSize: number) => boolean = () => false
 ): void {
@@ -68,7 +68,7 @@ function fillInActions(
 	for (const [group, actions] of groups) {
 
 		let target: IAction[];
-		if (isPrimaryGroup(group)) {
+		if (group === primaryGroup) {
 			target = primaryBucket;
 		} else {
 			target = secondaryBucket;
@@ -92,7 +92,7 @@ function fillInActions(
 	// ask the outside if submenu should be inlined or not. only ask when
 	// there would be enough space
 	for (const { group, action, index } of submenuInfo) {
-		const target = isPrimaryGroup(group) ? primaryBucket : secondaryBucket;
+		const target = group === primaryGroup ? primaryBucket : secondaryBucket;
 
 		// inlining submenus with length 0 or 1 is easy,
 		// larger submenus need to be checked with the overall limit
diff --git a/src/vs/platform/display/electron-main/displayMainService.ts b/src/vs/platform/display/electron-main/displayMainService.ts
deleted file mode 100644
index e360fc48693..00000000000
--- a/src/vs/platform/display/electron-main/displayMainService.ts
+++ /dev/null
@@ -1,47 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-
-import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
-import { IDisplayMainService as ICommonDisplayMainService } from 'vs/platform/display/common/displayMainService';
-import { Emitter } from 'vs/base/common/event';
-import { Disposable, toDisposable } from 'vs/base/common/lifecycle';
-import { app, Display, screen } from 'electron';
-import { RunOnceScheduler } from 'vs/base/common/async';
-
-export const IDisplayMainService = createDecorator<IDisplayMainService>('displayMainService');
-
-export interface IDisplayMainService extends ICommonDisplayMainService { }
-
-export class DisplayMainService extends Disposable implements ICommonDisplayMainService {
-
-	declare readonly _serviceBrand: undefined;
-
-	private readonly _onDidDisplayChanged = this._register(new Emitter<void>());
-	readonly onDidDisplayChanged = this._onDidDisplayChanged.event;
-
-	constructor() {
-		super();
-
-		const displayChangedScheduler = this._register(new RunOnceScheduler(() => {
-			this._onDidDisplayChanged.fire();
-		}, 100));
-
-		app.whenReady().then(() => {
-
-			const displayChangedListener = (event: Event, display: Display, changedMetrics?: string[]) => {
-				displayChangedScheduler.schedule();
-			};
-
-			screen.on('display-metrics-changed', displayChangedListener);
-			this._register(toDisposable(() => screen.removeListener('display-metrics-changed', displayChangedListener)));
-
-			screen.on('display-added', displayChangedListener);
-			this._register(toDisposable(() => screen.removeListener('display-added', displayChangedListener)));
-
-			screen.on('display-removed', displayChangedListener);
-			this._register(toDisposable(() => screen.removeListener('display-removed', displayChangedListener)));
-		});
-	}
-}
diff --git a/src/vs/platform/environment/electron-main/environmentMainService.ts b/src/vs/platform/environment/electron-main/environmentMainService.ts
index 49acc89b969..abb531546cc 100644
--- a/src/vs/platform/environment/electron-main/environmentMainService.ts
+++ b/src/vs/platform/environment/electron-main/environmentMainService.ts
@@ -11,7 +11,7 @@ import { NativeEnvironmentService } from 'vs/platform/environment/node/environme
 import { createStaticIPCHandle } from 'vs/base/parts/ipc/node/ipc.net';
 import product from 'vs/platform/product/common/product';
 
-export const IEnvironmentMainService = createDecorator<IEnvironmentMainService>('nativeEnvironmentService');
+export const IEnvironmentMainService = createDecorator<IEnvironmentMainService>('environmentMainService');
 
 /**
  * A subclass of the `INativeEnvironmentService` to be used only in electron-main
diff --git a/src/vs/platform/environment/test/node/nativeModules.test.ts b/src/vs/platform/environment/test/node/nativeModules.test.ts
index 28013dfcdd9..287f2b91f87 100644
--- a/src/vs/platform/environment/test/node/nativeModules.test.ts
+++ b/src/vs/platform/environment/test/node/nativeModules.test.ts
@@ -37,9 +37,9 @@ suite('Native Modules (all platforms)', () => {
 		assert.ok(typeof spdlog.createRotatingLogger === 'function', testErrorMessage('spdlog'));
 	});
 
-	test('vscode-nsfw', async () => {
-		const nsfWatcher = await import('vscode-nsfw');
-		assert.ok(typeof nsfWatcher === 'function', testErrorMessage('vscode-nsfw'));
+	test('nsfw', async () => {
+		const nsfWatcher = await import('nsfw');
+		assert.ok(typeof nsfWatcher === 'function', testErrorMessage('nsfw'));
 	});
 
 	test('vscode-sqlite3', async () => {
diff --git a/src/vs/platform/files/common/fileService.ts b/src/vs/platform/files/common/fileService.ts
index 3dfc15e444a..d0349187216 100644
--- a/src/vs/platform/files/common/fileService.ts
+++ b/src/vs/platform/files/common/fileService.ts
@@ -6,16 +6,16 @@
 import { localize } from 'vs/nls';
 import { mark } from 'vs/base/common/performance';
 import { Disposable, IDisposable, toDisposable, dispose, DisposableStore } from 'vs/base/common/lifecycle';
-import { IFileService, IResolveFileOptions, FileChangesEvent, FileOperationEvent, IFileSystemProviderRegistrationEvent, IFileSystemProvider, IFileStat, IResolveFileResult, ICreateFileOptions, IFileSystemProviderActivationEvent, FileOperationError, FileOperationResult, FileOperation, FileSystemProviderCapabilities, FileType, toFileSystemProviderErrorCode, FileSystemProviderErrorCode, IStat, IFileStatWithMetadata, IResolveMetadataFileOptions, etag, hasReadWriteCapability, hasFileFolderCopyCapability, hasOpenReadWriteCloseCapability, toFileOperationResult, IFileSystemProviderWithOpenReadWriteCloseCapability, IFileSystemProviderWithFileReadWriteCapability, IResolveFileResultWithMetadata, IWatchOptions, IWriteFileOptions, IReadFileOptions, IFileStreamContent, IFileContent, ETAG_DISABLED, hasFileReadStreamCapability, IFileSystemProviderWithFileReadStreamCapability, ensureFileSystemProviderError, IFileSystemProviderCapabilitiesChangeEvent } from 'vs/platform/files/common/files';
+import { IFileService, IResolveFileOptions, FileChangesEvent, FileOperationEvent, IFileSystemProviderRegistrationEvent, IFileSystemProvider, IFileStat, IResolveFileResult, ICreateFileOptions, IFileSystemProviderActivationEvent, FileOperationError, FileOperationResult, FileOperation, FileSystemProviderCapabilities, FileType, toFileSystemProviderErrorCode, FileSystemProviderErrorCode, IStat, IFileStatWithMetadata, IResolveMetadataFileOptions, etag, hasReadWriteCapability, hasFileFolderCopyCapability, hasOpenReadWriteCloseCapability, toFileOperationResult, IFileSystemProviderWithOpenReadWriteCloseCapability, IFileSystemProviderWithFileReadWriteCapability, IResolveFileResultWithMetadata, IWatchOptions, IWriteFileOptions, IReadFileOptions, IFileStreamContent, IFileContent, ETAG_DISABLED, hasFileReadStreamCapability, IFileSystemProviderWithFileReadStreamCapability, ensureFileSystemProviderError, IFileSystemProviderCapabilitiesChangeEvent, IReadFileStreamOptions } from 'vs/platform/files/common/files';
 import { URI } from 'vs/base/common/uri';
-import { Event, Emitter } from 'vs/base/common/event';
+import { Emitter } from 'vs/base/common/event';
 import { IExtUri, extUri, extUriIgnorePathCase, isAbsolutePath } from 'vs/base/common/resources';
 import { TernarySearchTree } from 'vs/base/common/map';
 import { isNonEmptyArray, coalesce } from 'vs/base/common/arrays';
 import { ILogService } from 'vs/platform/log/common/log';
 import { VSBuffer, VSBufferReadable, readableToBuffer, bufferToReadable, streamToBuffer, VSBufferReadableStream, VSBufferReadableBufferedStream, bufferedStreamToBuffer, newWriteableBufferStream } from 'vs/base/common/buffer';
 import { isReadableStream, transform, peekReadable, peekStream, isReadableBufferedStream, newWriteableStream, listenStream, consumeStream } from 'vs/base/common/stream';
-import { Promises, Queue } from 'vs/base/common/async';
+import { Promises, ResourceQueue } from 'vs/base/common/async';
 import { CancellationTokenSource, CancellationToken } from 'vs/base/common/cancellation';
 import { Schemas } from 'vs/base/common/network';
 import { readFileIntoStream } from 'vs/platform/files/common/io';
@@ -79,9 +79,7 @@ export class FileService extends Disposable implements IFileService {
 		this._onWillActivateFileSystemProvider.fire({
 			scheme,
 			join(promise) {
-				if (promise) {
-					joiners.push(promise);
-				}
+				joiners.push(promise);
 			},
 		});
 
@@ -417,7 +415,28 @@ export class FileService extends Disposable implements IFileService {
 	async readFile(resource: URI, options?: IReadFileOptions): Promise<IFileContent> {
 		const provider = await this.withReadProvider(resource);
 
-		const stream = await this.doReadAsFileStream(provider, resource, {
+		if (options?.atomic) {
+			return this.doReadFileAtomic(provider, resource, options);
+		}
+
+		return this.doReadFile(provider, resource, options);
+	}
+
+	private async doReadFileAtomic(provider: IFileSystemProviderWithFileReadWriteCapability | IFileSystemProviderWithOpenReadWriteCloseCapability | IFileSystemProviderWithFileReadStreamCapability, resource: URI, options?: IReadFileOptions): Promise<IFileContent> {
+		return new Promise<IFileContent>((resolve, reject) => {
+			this.writeQueue.queueFor(resource, this.getExtUri(provider).providerExtUri).queue(async () => {
+				try {
+					const content = await this.doReadFile(provider, resource, options);
+					resolve(content);
+				} catch (error) {
+					reject(error);
+				}
+			});
+		});
+	}
+
+	private async doReadFile(provider: IFileSystemProviderWithFileReadWriteCapability | IFileSystemProviderWithOpenReadWriteCloseCapability | IFileSystemProviderWithFileReadStreamCapability, resource: URI, options?: IReadFileOptions): Promise<IFileContent> {
+		const stream = await this.doReadFileStream(provider, resource, {
 			...options,
 			// optimization: since we know that the caller does not
 			// care about buffering, we indicate this to the reader.
@@ -433,13 +452,13 @@ export class FileService extends Disposable implements IFileService {
 		};
 	}
 
-	async readFileStream(resource: URI, options?: IReadFileOptions): Promise<IFileStreamContent> {
+	async readFileStream(resource: URI, options?: IReadFileStreamOptions): Promise<IFileStreamContent> {
 		const provider = await this.withReadProvider(resource);
 
-		return this.doReadAsFileStream(provider, resource, options);
+		return this.doReadFileStream(provider, resource, options);
 	}
 
-	private async doReadAsFileStream(provider: IFileSystemProviderWithFileReadWriteCapability | IFileSystemProviderWithOpenReadWriteCloseCapability | IFileSystemProviderWithFileReadStreamCapability, resource: URI, options?: IReadFileOptions & { preferUnbuffered?: boolean; }): Promise<IFileStreamContent> {
+	private async doReadFileStream(provider: IFileSystemProviderWithFileReadWriteCapability | IFileSystemProviderWithOpenReadWriteCloseCapability | IFileSystemProviderWithFileReadStreamCapability, resource: URI, options?: IReadFileStreamOptions & { preferUnbuffered?: boolean; }): Promise<IFileStreamContent> {
 
 		// install a cancellation token that gets cancelled
 		// when any error occurs. this allows us to resolve
@@ -499,7 +518,7 @@ export class FileService extends Disposable implements IFileService {
 		}
 	}
 
-	private readFileStreamed(provider: IFileSystemProviderWithFileReadStreamCapability, resource: URI, token: CancellationToken, options: IReadFileOptions = Object.create(null)): VSBufferReadableStream {
+	private readFileStreamed(provider: IFileSystemProviderWithFileReadStreamCapability, resource: URI, token: CancellationToken, options: IReadFileStreamOptions = Object.create(null)): VSBufferReadableStream {
 		const fileStream = provider.readFileStream(resource, options, token);
 
 		return transform(fileStream, {
@@ -508,7 +527,7 @@ export class FileService extends Disposable implements IFileService {
 		}, data => VSBuffer.concat(data));
 	}
 
-	private readFileBuffered(provider: IFileSystemProviderWithOpenReadWriteCloseCapability, resource: URI, token: CancellationToken, options: IReadFileOptions = Object.create(null)): VSBufferReadableStream {
+	private readFileBuffered(provider: IFileSystemProviderWithOpenReadWriteCloseCapability, resource: URI, token: CancellationToken, options: IReadFileStreamOptions = Object.create(null)): VSBufferReadableStream {
 		const stream = newWriteableBufferStream();
 
 		readFileIntoStream(provider, resource, stream, data => data, {
@@ -520,7 +539,7 @@ export class FileService extends Disposable implements IFileService {
 		return stream;
 	}
 
-	private readFileUnbuffered(provider: IFileSystemProviderWithFileReadWriteCapability, resource: URI, options?: IReadFileOptions): VSBufferReadableStream {
+	private readFileUnbuffered(provider: IFileSystemProviderWithFileReadWriteCapability, resource: URI, options?: IReadFileStreamOptions): VSBufferReadableStream {
 		const stream = newWriteableStream<VSBuffer>(data => VSBuffer.concat(data));
 
 		// Read the file into the stream async but do not wait for
@@ -545,14 +564,14 @@ export class FileService extends Disposable implements IFileService {
 				// End stream with data
 				stream.end(VSBuffer.wrap(buffer));
 			} catch (err) {
-				stream.error(err);
+				stream.end(err);
 			}
 		})();
 
 		return stream;
 	}
 
-	private async validateReadFile(resource: URI, options?: IReadFileOptions): Promise<IFileStatWithMetadata> {
+	private async validateReadFile(resource: URI, options?: IReadFileStreamOptions): Promise<IFileStatWithMetadata> {
 		const stat = await this.resolve(resource, { resolveMetadata: true });
 
 		// Throw if resource is a directory
@@ -571,7 +590,7 @@ export class FileService extends Disposable implements IFileService {
 		return stat;
 	}
 
-	private validateReadFileLimits(resource: URI, size: number, options?: IReadFileOptions): void {
+	private validateReadFileLimits(resource: URI, size: number, options?: IReadFileStreamOptions): void {
 		if (options?.limits) {
 			let tooLargeErrorResult: FileOperationResult | undefined = undefined;
 
@@ -983,32 +1002,10 @@ export class FileService extends Disposable implements IFileService {
 
 	//#region Helpers
 
-	private readonly writeQueues: Map<string, Queue<void>> = new Map();
-
-	private ensureWriteQueue(provider: IFileSystemProvider, resource: URI): Queue<void> {
-		const { providerExtUri } = this.getExtUri(provider);
-		const queueKey = providerExtUri.getComparisonKey(resource);
-
-		// ensure to never write to the same resource without finishing
-		// the one write. this ensures a write finishes consistently
-		// (even with error) before another write is done.
-		let writeQueue = this.writeQueues.get(queueKey);
-		if (!writeQueue) {
-			writeQueue = new Queue<void>();
-			this.writeQueues.set(queueKey, writeQueue);
-
-			const onFinish = Event.once(writeQueue.onFinished);
-			onFinish(() => {
-				this.writeQueues.delete(queueKey);
-				dispose(writeQueue);
-			});
-		}
-
-		return writeQueue;
-	}
+	private readonly writeQueue = this._register(new ResourceQueue());
 
 	private async doWriteBuffered(provider: IFileSystemProviderWithOpenReadWriteCloseCapability, resource: URI, readableOrStreamOrBufferedStream: VSBufferReadable | VSBufferReadableStream | VSBufferReadableBufferedStream): Promise<void> {
-		return this.ensureWriteQueue(provider, resource).queue(async () => {
+		return this.writeQueue.queueFor(resource, this.getExtUri(provider).providerExtUri).queue(async () => {
 
 			// open handle
 			const handle = await provider.open(resource, { create: true });
@@ -1107,7 +1104,7 @@ export class FileService extends Disposable implements IFileService {
 	}
 
 	private async doWriteUnbuffered(provider: IFileSystemProviderWithFileReadWriteCapability, resource: URI, bufferOrReadableOrStreamOrBufferedStream: VSBuffer | VSBufferReadable | VSBufferReadableStream | VSBufferReadableBufferedStream): Promise<void> {
-		return this.ensureWriteQueue(provider, resource).queue(() => this.doWriteUnbufferedQueued(provider, resource, bufferOrReadableOrStreamOrBufferedStream));
+		return this.writeQueue.queueFor(resource, this.getExtUri(provider).providerExtUri).queue(() => this.doWriteUnbufferedQueued(provider, resource, bufferOrReadableOrStreamOrBufferedStream));
 	}
 
 	private async doWriteUnbufferedQueued(provider: IFileSystemProviderWithFileReadWriteCapability, resource: URI, bufferOrReadableOrStreamOrBufferedStream: VSBuffer | VSBufferReadable | VSBufferReadableStream | VSBufferReadableBufferedStream): Promise<void> {
@@ -1127,7 +1124,7 @@ export class FileService extends Disposable implements IFileService {
 	}
 
 	private async doPipeBuffered(sourceProvider: IFileSystemProviderWithOpenReadWriteCloseCapability, source: URI, targetProvider: IFileSystemProviderWithOpenReadWriteCloseCapability, target: URI): Promise<void> {
-		return this.ensureWriteQueue(targetProvider, target).queue(() => this.doPipeBufferedQueued(sourceProvider, source, targetProvider, target));
+		return this.writeQueue.queueFor(target, this.getExtUri(targetProvider).providerExtUri).queue(() => this.doPipeBufferedQueued(sourceProvider, source, targetProvider, target));
 	}
 
 	private async doPipeBufferedQueued(sourceProvider: IFileSystemProviderWithOpenReadWriteCloseCapability, source: URI, targetProvider: IFileSystemProviderWithOpenReadWriteCloseCapability, target: URI): Promise<void> {
@@ -1173,7 +1170,7 @@ export class FileService extends Disposable implements IFileService {
 	}
 
 	private async doPipeUnbuffered(sourceProvider: IFileSystemProviderWithFileReadWriteCapability, source: URI, targetProvider: IFileSystemProviderWithFileReadWriteCapability, target: URI): Promise<void> {
-		return this.ensureWriteQueue(targetProvider, target).queue(() => this.doPipeUnbufferedQueued(sourceProvider, source, targetProvider, target));
+		return this.writeQueue.queueFor(target, this.getExtUri(targetProvider).providerExtUri).queue(() => this.doPipeUnbufferedQueued(sourceProvider, source, targetProvider, target));
 	}
 
 	private async doPipeUnbufferedQueued(sourceProvider: IFileSystemProviderWithFileReadWriteCapability, source: URI, targetProvider: IFileSystemProviderWithFileReadWriteCapability, target: URI): Promise<void> {
@@ -1181,7 +1178,7 @@ export class FileService extends Disposable implements IFileService {
 	}
 
 	private async doPipeUnbufferedToBuffered(sourceProvider: IFileSystemProviderWithFileReadWriteCapability, source: URI, targetProvider: IFileSystemProviderWithOpenReadWriteCloseCapability, target: URI): Promise<void> {
-		return this.ensureWriteQueue(targetProvider, target).queue(() => this.doPipeUnbufferedToBufferedQueued(sourceProvider, source, targetProvider, target));
+		return this.writeQueue.queueFor(target, this.getExtUri(targetProvider).providerExtUri).queue(() => this.doPipeUnbufferedToBufferedQueued(sourceProvider, source, targetProvider, target));
 	}
 
 	private async doPipeUnbufferedToBufferedQueued(sourceProvider: IFileSystemProviderWithFileReadWriteCapability, source: URI, targetProvider: IFileSystemProviderWithOpenReadWriteCloseCapability, target: URI): Promise<void> {
diff --git a/src/vs/platform/files/common/files.ts b/src/vs/platform/files/common/files.ts
index 9b91c3dc196..ab585d5df77 100644
--- a/src/vs/platform/files/common/files.ts
+++ b/src/vs/platform/files/common/files.ts
@@ -112,7 +112,7 @@ export interface IFileService {
 	/**
 	 * Read the contents of the provided resource buffered as stream.
 	 */
-	readFileStream(resource: URI, options?: IReadFileOptions): Promise<IFileStreamContent>;
+	readFileStream(resource: URI, options?: IReadFileStreamOptions): Promise<IFileStreamContent>;
 
 	/**
 	 * Updates the content replacing its previous value.
@@ -810,7 +810,7 @@ export interface IFileStreamContent extends IBaseStatWithMetadata {
 	value: VSBufferReadableStream;
 }
 
-export interface IReadFileOptions extends FileReadStreamOptions {
+export interface IBaseReadFileOptions extends FileReadStreamOptions {
 
 	/**
 	 * The optional etag parameter allows to return early from resolving the resource if
@@ -821,6 +821,28 @@ export interface IReadFileOptions extends FileReadStreamOptions {
 	readonly etag?: string;
 }
 
+export interface IReadFileStreamOptions extends IBaseReadFileOptions { }
+
+export interface IReadFileOptions extends IBaseReadFileOptions {
+
+	/**
+	 * The optional `atomic` flag can be used to make sure
+	 * the `readFile` method is not running in parallel with
+	 * any `write` operations in the same process.
+	 *
+	 * Typically you should not need to use this flag but if
+	 * for example you are quickly reading a file right after
+	 * a file event occured and the file changes a lot, there
+	 * is a chance that a read returns an empty or partial file
+	 * because a pending write has not finished yet.
+	 *
+	 * Note: this does not prevent the file from being written
+	 * to from a different process. If you need such atomic
+	 * operations, you better use a real database as storage.
+	 */
+	readonly atomic?: boolean;
+}
+
 export interface IWriteFileOptions {
 
 	/**
diff --git a/src/vs/platform/files/node/watcher/nsfw/nsfwWatcherService.ts b/src/vs/platform/files/node/watcher/nsfw/nsfwWatcherService.ts
index dfc165172f4..a57dc62bc0a 100644
--- a/src/vs/platform/files/node/watcher/nsfw/nsfwWatcherService.ts
+++ b/src/vs/platform/files/node/watcher/nsfw/nsfwWatcherService.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as nsfw from 'vscode-nsfw';
+import * as nsfw from 'nsfw';
 import * as glob from 'vs/base/common/glob';
 import { join } from 'vs/base/common/path';
 import { isMacintosh } from 'vs/base/common/platform';
@@ -247,6 +247,6 @@ export class NsfwWatcherService extends Disposable implements IWatcherService {
 	}
 
 	private debug(message: string) {
-		this._onDidLogMessage.fire({ type: 'debug', message: `[File Watcher (chokidar)] ` + message });
+		this._onDidLogMessage.fire({ type: 'debug', message: `[File Watcher (nsfw)] ` + message });
 	}
 }
diff --git a/src/vs/platform/files/node/watcher/nsfw/test/nsfwWatcherService.test.ts b/src/vs/platform/files/node/watcher/nsfw/test/nsfwWatcherService.test.ts
index 0469c3f63a3..b2f9e4103b0 100644
--- a/src/vs/platform/files/node/watcher/nsfw/test/nsfwWatcherService.test.ts
+++ b/src/vs/platform/files/node/watcher/nsfw/test/nsfwWatcherService.test.ts
@@ -10,7 +10,7 @@ import { IWatcherRequest } from 'vs/platform/files/node/watcher/nsfw/watcher';
 suite('NSFW Watcher Service', async () => {
 
 	// Load `nsfwWatcherService` within the suite to prevent all tests
-	// from failing to start if `vscode-nsfw` was not properly installed
+	// from failing to start if `nsfw` was not properly installed
 	const { NsfwWatcherService } = await import('vs/platform/files/node/watcher/nsfw/nsfwWatcherService');
 
 	class TestNsfwWatcherService extends NsfwWatcherService {
diff --git a/src/vs/platform/files/test/browser/fileService.test.ts b/src/vs/platform/files/test/browser/fileService.test.ts
index ed3729b2a4b..1aad371dfd5 100644
--- a/src/vs/platform/files/test/browser/fileService.test.ts
+++ b/src/vs/platform/files/test/browser/fileService.test.ts
@@ -6,11 +6,13 @@
 import * as assert from 'assert';
 import { FileService } from 'vs/platform/files/common/fileService';
 import { URI } from 'vs/base/common/uri';
-import { IFileSystemProviderRegistrationEvent, FileSystemProviderCapabilities, IFileSystemProviderCapabilitiesChangeEvent } from 'vs/platform/files/common/files';
+import { IFileSystemProviderRegistrationEvent, FileSystemProviderCapabilities, IFileSystemProviderCapabilitiesChangeEvent, FileOpenOptions, FileReadStreamOptions, IStat, FileType } from 'vs/platform/files/common/files';
 import { IDisposable, toDisposable } from 'vs/base/common/lifecycle';
 import { NullLogService } from 'vs/platform/log/common/log';
 import { timeout } from 'vs/base/common/async';
 import { NullFileSystemProvider } from 'vs/platform/files/test/common/nullFileSystemProvider';
+import { consumeStream, newWriteableStream, ReadableStreamEvents } from 'vs/base/common/stream';
+import { CancellationToken } from 'vs/base/common/cancellation';
 
 suite('File Service', () => {
 
@@ -126,4 +128,82 @@ suite('File Service', () => {
 
 		service.dispose();
 	});
+
+	test('error from readFile bubbles through (https://github.com/microsoft/vscode/issues/118060) - async', async () => {
+		testReadErrorBubbles(true);
+	});
+
+	test('error from readFile bubbles through (https://github.com/microsoft/vscode/issues/118060)', async () => {
+		testReadErrorBubbles(false);
+	});
+
+	async function testReadErrorBubbles(async: boolean) {
+		const service = new FileService(new NullLogService());
+
+		const provider = new class extends NullFileSystemProvider {
+			async stat(resource: URI): Promise<IStat> {
+				return {
+					mtime: Date.now(),
+					ctime: Date.now(),
+					size: 100,
+					type: FileType.File
+				};
+			}
+
+			readFile(resource: URI): Promise<Uint8Array> {
+				if (async) {
+					return timeout(5).then(() => { throw new Error('failed'); });
+				}
+
+				throw new Error('failed');
+			}
+
+			open(resource: URI, opts: FileOpenOptions): Promise<number> {
+				if (async) {
+					return timeout(5).then(() => { throw new Error('failed'); });
+				}
+
+				throw new Error('failed');
+			}
+
+			readFileStream(resource: URI, opts: FileReadStreamOptions, token: CancellationToken): ReadableStreamEvents<Uint8Array> {
+				if (async) {
+					const stream = newWriteableStream<Uint8Array>(chunk => chunk[0]);
+					timeout(5).then(() => stream.error(new Error('failed')));
+
+					return stream;
+
+				}
+
+				throw new Error('failed');
+			}
+		};
+
+		const disposable = service.registerProvider('test', provider);
+
+		for (const capabilities of [FileSystemProviderCapabilities.FileReadWrite, FileSystemProviderCapabilities.FileReadStream, FileSystemProviderCapabilities.FileOpenReadWriteClose]) {
+			provider.setCapabilities(capabilities);
+
+			let e1;
+			try {
+				await service.readFile(URI.parse('test://foo/bar'));
+			} catch (error) {
+				e1 = error;
+			}
+
+			assert.ok(e1);
+
+			let e2;
+			try {
+				const stream = await service.readFileStream(URI.parse('test://foo/bar'));
+				await consumeStream(stream.value, chunk => chunk[0]);
+			} catch (error) {
+				e2 = error;
+			}
+
+			assert.ok(e2);
+		}
+
+		disposable.dispose();
+	}
 });
diff --git a/src/vs/platform/files/test/electron-browser/diskFileService.test.ts b/src/vs/platform/files/test/electron-browser/diskFileService.test.ts
index b5dfa9db4d8..43e3c26b70f 100644
--- a/src/vs/platform/files/test/electron-browser/diskFileService.test.ts
+++ b/src/vs/platform/files/test/electron-browser/diskFileService.test.ts
@@ -14,7 +14,7 @@ import { getPathFromAmdModule } from 'vs/base/common/amd';
 import { copy, rimraf, rimrafSync } from 'vs/base/node/pfs';
 import { URI } from 'vs/base/common/uri';
 import { existsSync, statSync, readdirSync, readFileSync, writeFileSync, renameSync, unlinkSync, mkdirSync, createReadStream, promises } from 'fs';
-import { FileOperation, FileOperationEvent, IFileStat, FileOperationResult, FileSystemProviderCapabilities, FileChangeType, IFileChange, FileChangesEvent, FileOperationError, etag, IStat, IFileStatWithMetadata } from 'vs/platform/files/common/files';
+import { FileOperation, FileOperationEvent, IFileStat, FileOperationResult, FileSystemProviderCapabilities, FileChangeType, IFileChange, FileChangesEvent, FileOperationError, etag, IStat, IFileStatWithMetadata, IReadFileOptions } from 'vs/platform/files/common/files';
 import { NullLogService } from 'vs/platform/log/common/log';
 import { isLinux, isWindows } from 'vs/base/common/platform';
 import { DisposableStore } from 'vs/base/common/lifecycle';
@@ -1181,8 +1181,14 @@ flakySuite('Disk File Service', function () {
 		return testReadFile(URI.file(join(testDir, 'lorem.txt')));
 	});
 
-	async function testReadFile(resource: URI): Promise<void> {
-		const content = await service.readFile(resource);
+	test('readFile - atomic', async () => {
+		setCapabilities(fileProvider, FileSystemProviderCapabilities.FileReadStream);
+
+		return testReadFile(URI.file(join(testDir, 'lorem.txt')), { atomic: true });
+	});
+
+	async function testReadFile(resource: URI, options?: IReadFileOptions): Promise<void> {
+		const content = await service.readFile(resource, options);
 
 		assert.strictEqual(content.value.toString(), readFileSync(resource.fsPath).toString());
 	}
@@ -1754,19 +1760,23 @@ flakySuite('Disk File Service', function () {
 		assert.ok(error!);
 	}
 
-	test('writeFile (large file) - multiple parallel writes queue up', async () => {
+	test('writeFile (large file) - multiple parallel writes queue up and atomic read support', async () => {
 		const resource = URI.file(join(testDir, 'lorem.txt'));
 
 		const content = readFileSync(resource.fsPath);
 		const newContent = content.toString() + content.toString();
 
-		await Promise.all(['0', '00', '000', '0000', '00000'].map(async offset => {
+		const writePromises = Promise.all(['0', '00', '000', '0000', '00000'].map(async offset => {
 			const fileStat = await service.writeFile(resource, VSBuffer.fromString(offset + newContent));
 			assert.strictEqual(fileStat.name, 'lorem.txt');
 		}));
 
-		const fileContent = readFileSync(resource.fsPath).toString();
-		assert.ok(['0', '00', '000', '0000', '00000'].some(offset => fileContent === offset + newContent));
+		const readPromises = Promise.all(['0', '00', '000', '0000', '00000'].map(async () => {
+			const fileContent = await service.readFile(resource, { atomic: true });
+			assert.ok(fileContent.value.byteLength > 0); // `atomic: true` ensures we never read a truncated file
+		}));
+
+		await Promise.all([writePromises, readPromises]);
 	});
 
 	test('writeFile (readable) - default', async () => {
diff --git a/src/vs/platform/instantiation/common/instantiation.ts b/src/vs/platform/instantiation/common/instantiation.ts
index dbde5f6332c..ff5fa30546c 100644
--- a/src/vs/platform/instantiation/common/instantiation.ts
+++ b/src/vs/platform/instantiation/common/instantiation.ts
@@ -155,6 +155,10 @@ export function createDecorator<T>(serviceId: string): ServiceIdentifier<T> {
 	return id;
 }
 
+export function refineServiceDecorator<T1, T extends T1>(serviceIdentifier: ServiceIdentifier<T1>): ServiceIdentifier<T> {
+	return <ServiceIdentifier<T>>serviceIdentifier;
+}
+
 /**
  * Mark a service dependency as optional.
  */
diff --git a/src/vs/platform/ipc/electron-sandbox/services.ts b/src/vs/platform/ipc/electron-sandbox/services.ts
index e32ba3b95b1..498136177d8 100644
--- a/src/vs/platform/ipc/electron-sandbox/services.ts
+++ b/src/vs/platform/ipc/electron-sandbox/services.ts
@@ -14,24 +14,37 @@ type Remote = { getChannel(channelName: string): IChannel; };
 abstract class RemoteServiceStub<T> {
 	constructor(
 		channelName: string,
-		channelClientCtor: ChannelClientCtor<T> | undefined,
+		options: IRemoteServiceWithChannelClientOptions<T> | IRemoteServiceWithProxyOptions | undefined,
 		remote: Remote
 	) {
 		const channel = remote.getChannel(channelName);
 
-		if (channelClientCtor) {
-			return new channelClientCtor(channel);
-		} else {
-			return ProxyChannel.toService(channel);
+		if (isRemoteServiceWithChannelClientOptions(options)) {
+			return new options.channelClientCtor(channel);
 		}
+
+		return ProxyChannel.toService(channel, options?.proxyOptions);
 	}
 }
 
-export interface IRemoteServiceOptions<T> {
-	readonly channelClientCtor?: ChannelClientCtor<T>;
+export interface IBaseRemoteServiceOptions {
 	readonly supportsDelayedInstantiation?: boolean;
 }
 
+export interface IRemoteServiceWithChannelClientOptions<T> extends IBaseRemoteServiceOptions {
+	readonly channelClientCtor: ChannelClientCtor<T>;
+}
+
+export interface IRemoteServiceWithProxyOptions extends IBaseRemoteServiceOptions {
+	readonly proxyOptions?: ProxyChannel.ICreateProxyServiceOptions;
+}
+
+function isRemoteServiceWithChannelClientOptions<T>(obj: unknown): obj is IRemoteServiceWithChannelClientOptions<T> {
+	const candidate = obj as IRemoteServiceWithChannelClientOptions<T> | undefined;
+
+	return !!candidate?.channelClientCtor;
+}
+
 //#region Main Process
 
 export const IMainProcessService = createDecorator<IMainProcessService>('mainProcessService');
@@ -43,13 +56,13 @@ export interface IMainProcessService {
 }
 
 class MainProcessRemoteServiceStub<T> extends RemoteServiceStub<T> {
-	constructor(channelName: string, channelClientCtor: ChannelClientCtor<T> | undefined, @IMainProcessService ipcService: IMainProcessService) {
-		super(channelName, channelClientCtor, ipcService);
+	constructor(channelName: string, options: IRemoteServiceWithChannelClientOptions<T> | IRemoteServiceWithProxyOptions | undefined, @IMainProcessService ipcService: IMainProcessService) {
+		super(channelName, options, ipcService);
 	}
 }
 
-export function registerMainProcessRemoteService<T>(id: ServiceIdentifier<T>, channelName: string, options: IRemoteServiceOptions<T> = {}): void {
-	registerSingleton(id, new SyncDescriptor(MainProcessRemoteServiceStub, [channelName, options.channelClientCtor], options.supportsDelayedInstantiation));
+export function registerMainProcessRemoteService<T>(id: ServiceIdentifier<T>, channelName: string, options?: IRemoteServiceWithChannelClientOptions<T> | IRemoteServiceWithProxyOptions): void {
+	registerSingleton(id, new SyncDescriptor(MainProcessRemoteServiceStub, [channelName, options], options?.supportsDelayedInstantiation));
 }
 
 //#endregion
@@ -65,13 +78,13 @@ export interface ISharedProcessService {
 }
 
 class SharedProcessRemoteServiceStub<T> extends RemoteServiceStub<T> {
-	constructor(channelName: string, channelClientCtor: ChannelClientCtor<T> | undefined, @ISharedProcessService ipcService: ISharedProcessService) {
-		super(channelName, channelClientCtor, ipcService);
+	constructor(channelName: string, options: IRemoteServiceWithChannelClientOptions<T> | IRemoteServiceWithProxyOptions | undefined, @ISharedProcessService ipcService: ISharedProcessService) {
+		super(channelName, options, ipcService);
 	}
 }
 
-export function registerSharedProcessRemoteService<T>(id: ServiceIdentifier<T>, channelName: string, options: IRemoteServiceOptions<T> = {}): void {
-	registerSingleton(id, new SyncDescriptor(SharedProcessRemoteServiceStub, [channelName, options.channelClientCtor], options.supportsDelayedInstantiation));
+export function registerSharedProcessRemoteService<T>(id: ServiceIdentifier<T>, channelName: string, options?: IRemoteServiceWithChannelClientOptions<T> | IRemoteServiceWithProxyOptions): void {
+	registerSingleton(id, new SyncDescriptor(SharedProcessRemoteServiceStub, [channelName, options], options?.supportsDelayedInstantiation));
 }
 
 //#endregion
diff --git a/src/vs/platform/lifecycle/electron-main/lifecycleMainService.ts b/src/vs/platform/lifecycle/electron-main/lifecycleMainService.ts
index 82f80545895..89390d4e240 100644
--- a/src/vs/platform/lifecycle/electron-main/lifecycleMainService.ts
+++ b/src/vs/platform/lifecycle/electron-main/lifecycleMainService.ts
@@ -289,9 +289,7 @@ export class LifecycleMainService extends Disposable implements ILifecycleMainSe
 
 		this._onWillShutdown.fire({
 			join(promise) {
-				if (promise) {
-					joiners.push(promise);
-				}
+				joiners.push(promise);
 			}
 		});
 
diff --git a/src/vs/platform/native/common/native.ts b/src/vs/platform/native/common/native.ts
index 2c8414ba871..b07c29774d5 100644
--- a/src/vs/platform/native/common/native.ts
+++ b/src/vs/platform/native/common/native.ts
@@ -45,6 +45,8 @@ export interface ICommonNativeHostService {
 	readonly onDidFocusWindow: Event<number>;
 	readonly onDidBlurWindow: Event<number>;
 
+	readonly onDidChangeDisplay: Event<void>;
+
 	readonly onDidResumeOS: Event<unknown>;
 
 	readonly onDidChangeColorScheme: Event<IColorScheme>;
diff --git a/src/vs/platform/native/electron-main/nativeHostMainService.ts b/src/vs/platform/native/electron-main/nativeHostMainService.ts
index 989cf596f6f..9007e3216da 100644
--- a/src/vs/platform/native/electron-main/nativeHostMainService.ts
+++ b/src/vs/platform/native/electron-main/nativeHostMainService.ts
@@ -5,7 +5,7 @@
 
 import { Emitter, Event } from 'vs/base/common/event';
 import { IWindowsMainService, ICodeWindow, OpenContext } from 'vs/platform/windows/electron-main/windows';
-import { MessageBoxOptions, MessageBoxReturnValue, shell, OpenDevToolsOptions, SaveDialogOptions, SaveDialogReturnValue, OpenDialogOptions, OpenDialogReturnValue, Menu, BrowserWindow, app, clipboard, powerMonitor, nativeTheme } from 'electron';
+import { MessageBoxOptions, MessageBoxReturnValue, shell, OpenDevToolsOptions, SaveDialogOptions, SaveDialogReturnValue, OpenDialogOptions, OpenDialogReturnValue, Menu, BrowserWindow, app, clipboard, powerMonitor, nativeTheme, screen, Display } from 'electron';
 import { ILifecycleMainService } from 'vs/platform/lifecycle/electron-main/lifecycleMainService';
 import { IOpenedWindow, IOpenWindowOptions, IWindowOpenable, IOpenEmptyWindowOptions, IColorScheme } from 'vs/platform/windows/common/windows';
 import { INativeOpenDialogOptions } from 'vs/platform/dialogs/common/dialogs';
@@ -74,6 +74,7 @@ export class NativeHostMainService extends Disposable implements INativeHostMain
 
 	//#endregion
 
+
 	//#region Events
 
 	readonly onDidOpenWindow = Event.map(this.windowsMainService.onDidOpenWindow, window => window.id);
@@ -95,8 +96,20 @@ export class NativeHostMainService extends Disposable implements INativeHostMain
 	private readonly _onDidChangePassword = this._register(new Emitter<{ account: string, service: string }>());
 	readonly onDidChangePassword = this._onDidChangePassword.event;
 
+	readonly onDidChangeDisplay = Event.debounce(Event.any(
+		Event.filter(Event.fromNodeEventEmitter(screen, 'display-metrics-changed', (event: Electron.Event, display: Display, changedMetrics?: string[]) => changedMetrics), changedMetrics => {
+			// Electron will emit 'display-metrics-changed' events even when actually
+			// going fullscreen, because the dock hides. However, we do not want to
+			// react on this event as there is no change in display bounds.
+			return !(Array.isArray(changedMetrics) && changedMetrics.length === 1 && changedMetrics[0] === 'workArea');
+		}),
+		Event.fromNodeEventEmitter(screen, 'display-added'),
+		Event.fromNodeEventEmitter(screen, 'display-removed')
+	), () => { }, 100);
+
 	//#endregion
 
+
 	//#region Window
 
 	async getWindows(): Promise<IOpenedWindow[]> {
@@ -234,6 +247,7 @@ export class NativeHostMainService extends Disposable implements INativeHostMain
 
 	//#endregion
 
+
 	//#region Dialog
 
 	async showMessageBox(windowId: number | undefined, options: MessageBoxOptions): Promise<MessageBoxReturnValue> {
@@ -313,6 +327,7 @@ export class NativeHostMainService extends Disposable implements INativeHostMain
 
 	//#endregion
 
+
 	//#region OS
 
 	async showItemInFolder(windowId: number | undefined, path: string): Promise<void> {
@@ -502,6 +517,7 @@ export class NativeHostMainService extends Disposable implements INativeHostMain
 
 	//#endregion
 
+
 	//#region macOS Touchbar
 
 	async newWindowTab(): Promise<void> {
@@ -537,6 +553,7 @@ export class NativeHostMainService extends Disposable implements INativeHostMain
 
 	//#endregion
 
+
 	//#region Lifecycle
 
 	async notifyReady(windowId: number | undefined): Promise<void> {
@@ -591,6 +608,7 @@ export class NativeHostMainService extends Disposable implements INativeHostMain
 
 	//#endregion
 
+
 	//#region Connectivity
 
 	async resolveProxy(windowId: number | undefined, url: string): Promise<string | undefined> {
@@ -605,6 +623,7 @@ export class NativeHostMainService extends Disposable implements INativeHostMain
 
 	//#endregion
 
+
 	//#region Development
 
 	async openDevTools(windowId: number | undefined, options?: OpenDevToolsOptions): Promise<void> {
@@ -635,6 +654,7 @@ export class NativeHostMainService extends Disposable implements INativeHostMain
 
 	//#endregion
 
+
 	//#region Registry (windows)
 
 	async windowsGetStringRegKey(windowId: number | undefined, hive: 'HKEY_CURRENT_USER' | 'HKEY_LOCAL_MACHINE' | 'HKEY_CLASSES_ROOT' | 'HKEY_USERS' | 'HKEY_CURRENT_CONFIG', path: string, name: string): Promise<string | undefined> {
@@ -652,6 +672,7 @@ export class NativeHostMainService extends Disposable implements INativeHostMain
 
 	//#endregion
 
+
 	//#region Credentials
 
 	private static readonly MAX_PASSWORD_LENGTH = 2500;
diff --git a/src/vs/platform/product/common/product.ts b/src/vs/platform/product/common/product.ts
index 2730ee7e8c6..b7a6596e174 100644
--- a/src/vs/platform/product/common/product.ts
+++ b/src/vs/platform/product/common/product.ts
@@ -20,7 +20,7 @@ if (isWeb || typeof require === 'undefined' || typeof require.__$__nodeRequire !
 	// Running out of sources
 	if (Object.keys(product).length === 0) {
 		Object.assign(product, {
-			version: '1.54.0-dev',
+			version: '1.55.0-dev',
 			nameShort: isWeb ? 'Code Web - OSS Dev' : 'Code - OSS Dev',
 			nameLong: isWeb ? 'Code Web - OSS Dev' : 'Code - OSS Dev',
 			applicationName: 'code-oss',
diff --git a/src/vs/platform/quickinput/browser/quickAccess.ts b/src/vs/platform/quickinput/browser/quickAccess.ts
index cc364f7ec9b..1e580e4ff30 100644
--- a/src/vs/platform/quickinput/browser/quickAccess.ts
+++ b/src/vs/platform/quickinput/browser/quickAccess.ts
@@ -4,10 +4,10 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { IQuickInputService, IQuickPick, IQuickPickItem, ItemActivation } from 'vs/platform/quickinput/common/quickInput';
-import { Disposable, DisposableStore, toDisposable } from 'vs/base/common/lifecycle';
+import { Disposable, DisposableStore, IDisposable, toDisposable } from 'vs/base/common/lifecycle';
 import { IQuickAccessController, IQuickAccessProvider, IQuickAccessRegistry, Extensions, IQuickAccessProviderDescriptor, IQuickAccessOptions, DefaultQuickAccessFilterValue } from 'vs/platform/quickinput/common/quickAccess';
 import { Registry } from 'vs/platform/registry/common/platform';
-import { CancellationTokenSource, CancellationToken } from 'vs/base/common/cancellation';
+import { CancellationTokenSource } from 'vs/base/common/cancellation';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { once } from 'vs/base/common/functional';
 
@@ -100,13 +100,27 @@ export class QuickAccessController extends Disposable implements IQuickAccessCon
 		}
 
 		// Register listeners
-		const cancellationToken = this.registerPickerListeners(picker, provider, descriptor, value, disposables);
+		disposables.add(this.registerPickerListeners(picker, provider, descriptor, value));
 
 		// Ask provider to fill the picker as needed if we have one
+		// and pass over a cancellation token that will indicate when
+		// the picker is hiding without a pick being made.
+		const cts = disposables.add(new CancellationTokenSource());
 		if (provider) {
-			disposables.add(provider.provide(picker, cancellationToken));
+			disposables.add(provider.provide(picker, cts.token));
 		}
 
+		// Finally, trigger disposal and cancellation when the picker
+		// hides depending on items selected or not.
+		once(picker.onDidHide)(() => {
+			if (picker.selectedItems.length === 0) {
+				cts.cancel();
+			}
+
+			// Start to dispose once picker hides
+			disposables.dispose();
+		});
+
 		// Finally, show the picker. This is important because a provider
 		// may not call this and then our disposables would leak that rely
 		// on the onDidHide event.
@@ -129,7 +143,8 @@ export class QuickAccessController extends Disposable implements IQuickAccessCon
 		picker.valueSelection = valueSelection;
 	}
 
-	private registerPickerListeners(picker: IQuickPick<IQuickPickItem>, provider: IQuickAccessProvider | undefined, descriptor: IQuickAccessProviderDescriptor | undefined, value: string, disposables: DisposableStore): CancellationToken {
+	private registerPickerListeners(picker: IQuickPick<IQuickPickItem>, provider: IQuickAccessProvider | undefined, descriptor: IQuickAccessProviderDescriptor | undefined, value: string): IDisposable {
+		const disposables = new DisposableStore();
 
 		// Remember as last visible picker and clean up once picker get's disposed
 		const visibleQuickAccess = this.visibleQuickAccess = { picker, descriptor, value };
@@ -157,19 +172,7 @@ export class QuickAccessController extends Disposable implements IQuickAccessCon
 			}));
 		}
 
-		// Create a cancellation token source that is valid as long as the
-		// picker has not been closed without picking an item
-		const cts = disposables.add(new CancellationTokenSource());
-		once(picker.onDidHide)(() => {
-			if (picker.selectedItems.length === 0) {
-				cts.cancel();
-			}
-
-			// Start to dispose once picker hides
-			disposables.dispose();
-		});
-
-		return cts.token;
+		return disposables;
 	}
 
 	private getOrInstantiateProvider(value: string): [IQuickAccessProvider | undefined, IQuickAccessProviderDescriptor | undefined] {
diff --git a/src/vs/platform/remote/common/tunnel.ts b/src/vs/platform/remote/common/tunnel.ts
index 2352d2a8a27..0be0c057d96 100644
--- a/src/vs/platform/remote/common/tunnel.ts
+++ b/src/vs/platform/remote/common/tunnel.ts
@@ -180,7 +180,7 @@ export abstract class AbstractTunnelService implements ITunnelService {
 	}
 
 	openTunnel(addressProvider: IAddressProvider | undefined, remoteHost: string | undefined, remotePort: number, localPort?: number, elevateIfNeeded: boolean = false, isPublic: boolean = false): Promise<RemoteTunnel | undefined> | undefined {
-		this.logService.trace(`openTunnel request for ${remoteHost}:${remotePort} on local port ${localPort}.`);
+		this.logService.trace(`ForwardedPorts: (TunnelService) openTunnel request for ${remoteHost}:${remotePort} on local port ${localPort}.`);
 		if (!addressProvider) {
 			return undefined;
 		}
@@ -191,20 +191,20 @@ export abstract class AbstractTunnelService implements ITunnelService {
 
 		const resolvedTunnel = this.retainOrCreateTunnel(addressProvider, remoteHost, remotePort, localPort, elevateIfNeeded, isPublic);
 		if (!resolvedTunnel) {
-			this.logService.trace(`Tunnel was not created.`);
+			this.logService.trace(`ForwardedPorts: (TunnelService) Tunnel was not created.`);
 			return resolvedTunnel;
 		}
 
 		return resolvedTunnel.then(tunnel => {
 			if (!tunnel) {
-				this.logService.trace('New tunnel is undefined.');
+				this.logService.trace('ForwardedPorts: (TunnelService) New tunnel is undefined.');
 				this.removeEmptyTunnelFromMap(remoteHost!, remotePort);
 				return undefined;
 			}
-			this.logService.trace('New tunnel established.');
+			this.logService.trace('ForwardedPorts: (TunnelService) New tunnel established.');
 			const newTunnel = this.makeTunnel(tunnel);
 			if (tunnel.tunnelRemoteHost !== remoteHost || tunnel.tunnelRemotePort !== remotePort) {
-				this.logService.warn('Created tunnel does not match requirements of requested tunnel. Host or port mismatch.');
+				this.logService.warn('ForwardedPorts: (TunnelService) Created tunnel does not match requirements of requested tunnel. Host or port mismatch.');
 			}
 			this._onTunnelOpened.fire(newTunnel);
 			return newTunnel;
@@ -219,6 +219,7 @@ export abstract class AbstractTunnelService implements ITunnelService {
 			localAddress: tunnel.localAddress,
 			public: tunnel.public,
 			dispose: async () => {
+				this.logService.trace(`ForwardedPorts: (TunnelService) dispose request for ${tunnel.tunnelRemotePort} `);
 				const existingHost = this._tunnels.get(tunnel.tunnelRemoteHost);
 				if (existingHost) {
 					const existing = existingHost.get(tunnel.tunnelRemotePort);
@@ -233,7 +234,7 @@ export abstract class AbstractTunnelService implements ITunnelService {
 
 	private async tryDisposeTunnel(remoteHost: string, remotePort: number, tunnel: { refcount: number, readonly value: Promise<RemoteTunnel | undefined> }): Promise<void> {
 		if (tunnel.refcount <= 0) {
-			this.logService.trace(`Tunnel is being disposed ${remoteHost}:${remotePort}.`);
+			this.logService.trace(`ForwardedPorts: (TunnelService) Tunnel is being disposed ${remoteHost}:${remotePort}.`);
 			const disposePromise: Promise<void> = tunnel.value.then(async (tunnel) => {
 				if (tunnel) {
 					await tunnel.dispose(true);
@@ -248,6 +249,7 @@ export abstract class AbstractTunnelService implements ITunnelService {
 	}
 
 	async closeTunnel(remoteHost: string, remotePort: number): Promise<void> {
+		this.logService.trace(`ForwardedPorts: (TunnelService) close request for ${remotePort} `);
 		const portMap = this._tunnels.get(remoteHost);
 		if (portMap && portMap.has(remotePort)) {
 			const value = portMap.get(remotePort)!;
@@ -306,13 +308,13 @@ export abstract class AbstractTunnelService implements ITunnelService {
 	protected abstract retainOrCreateTunnel(addressProvider: IAddressProvider, remoteHost: string, remotePort: number, localPort: number | undefined, elevateIfNeeded: boolean, isPublic: boolean): Promise<RemoteTunnel | undefined> | undefined;
 
 	protected createWithProvider(tunnelProvider: ITunnelProvider, remoteHost: string, remotePort: number, localPort: number | undefined, elevateIfNeeded: boolean, isPublic: boolean): Promise<RemoteTunnel | undefined> | undefined {
-		this.logService.trace(`Creating tunnel with provider ${remoteHost}:${remotePort} on local port ${localPort}.`);
+		this.logService.trace(`ForwardedPorts: (TunnelService) Creating tunnel with provider ${remoteHost}:${remotePort} on local port ${localPort}.`);
 
 		const preferredLocalPort = localPort === undefined ? remotePort : localPort;
 		const creationInfo = { elevationRequired: elevateIfNeeded ? isPortPrivileged(preferredLocalPort) : false };
 		const tunnelOptions: TunnelOptions = { remoteAddress: { host: remoteHost, port: remotePort }, localAddressPort: localPort, public: isPublic };
 		const tunnel = tunnelProvider.forwardPort(tunnelOptions, creationInfo);
-		this.logService.trace('Tunnel created by provider.');
+		this.logService.trace('ForwardedPorts: (TunnelService) Tunnel created by provider.');
 		if (tunnel) {
 			this.addTunnelToMap(remoteHost, remotePort, tunnel);
 		}
diff --git a/src/vs/platform/remote/node/tunnelService.ts b/src/vs/platform/remote/node/tunnelService.ts
index 80ef45f229e..0f0bb25118a 100644
--- a/src/vs/platform/remote/node/tunnelService.ts
+++ b/src/vs/platform/remote/node/tunnelService.ts
@@ -150,7 +150,7 @@ export class BaseTunnelService extends AbstractTunnelService {
 		if (this._tunnelProvider) {
 			return this.createWithProvider(this._tunnelProvider, remoteHost, remotePort, localPort, elevateIfNeeded, isPublic);
 		} else {
-			this.logService.trace(`Creating tunnel without provider ${remoteHost}:${remotePort} on local port ${localPort}.`);
+			this.logService.trace(`ForwardedPorts: (TunnelService) Creating tunnel without provider ${remoteHost}:${remotePort} on local port ${localPort}.`);
 			const options: IConnectionOptions = {
 				commit: this.productService.commit,
 				socketFactory: this.socketFactory,
@@ -161,7 +161,7 @@ export class BaseTunnelService extends AbstractTunnelService {
 			};
 
 			const tunnel = createRemoteTunnel(options, remoteHost, remotePort, localPort);
-			this.logService.trace('Tunnel created without provider.');
+			this.logService.trace('ForwardedPorts: (TunnelService) Tunnel created without provider.');
 			this.addTunnelToMap(remoteHost, remotePort, tunnel);
 			return tunnel;
 		}
diff --git a/src/vs/platform/storage/electron-main/storageMainService.ts b/src/vs/platform/storage/electron-main/storageMainService.ts
index 842bee97c24..35ede6a0eab 100644
--- a/src/vs/platform/storage/electron-main/storageMainService.ts
+++ b/src/vs/platform/storage/electron-main/storageMainService.ts
@@ -5,13 +5,11 @@
 
 import { once } from 'vs/base/common/functional';
 import { Disposable } from 'vs/base/common/lifecycle';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
 import { IEnvironmentService } from 'vs/platform/environment/common/environment';
 import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
 import { ILifecycleMainService, LifecycleMainPhase } from 'vs/platform/lifecycle/electron-main/lifecycleMainService';
 import { ILogService } from 'vs/platform/log/common/log';
 import { GlobalStorageMain, IStorageMain, IStorageMainOptions, WorkspaceStorageMain } from 'vs/platform/storage/electron-main/storageMain';
-import { IWindowSettings } from 'vs/platform/windows/common/windows';
 import { IEmptyWorkspaceIdentifier, ISingleFolderWorkspaceIdentifier, IWorkspaceIdentifier } from 'vs/platform/workspaces/common/workspaces';
 
 export const IStorageMainService = createDecorator<IStorageMainService>('storageMainService');
@@ -38,8 +36,7 @@ export class StorageMainService extends Disposable implements IStorageMainServic
 	constructor(
 		@ILogService private readonly logService: ILogService,
 		@IEnvironmentService private readonly environmentService: IEnvironmentService,
-		@ILifecycleMainService private readonly lifecycleMainService: ILifecycleMainService,
-		@IConfigurationService private readonly configurationService: IConfigurationService
+		@ILifecycleMainService private readonly lifecycleMainService: ILifecycleMainService
 	) {
 		super();
 
@@ -52,10 +49,6 @@ export class StorageMainService extends Disposable implements IStorageMainServic
 		};
 	}
 
-	protected enableMainWorkspaceStorage(): boolean {
-		return !!(this.configurationService.getValue<IWindowSettings | undefined>('window')?.enableExperimentalMainProcessWorkspaceStorage);
-	}
-
 	private registerListeners(): void {
 
 		// Global Storage: Warmup when any window opens
@@ -66,13 +59,11 @@ export class StorageMainService extends Disposable implements IStorageMainServic
 		})();
 
 		// Workspace Storage: Warmup when related window with workspace loads
-		if (this.enableMainWorkspaceStorage()) {
-			this._register(this.lifecycleMainService.onWillLoadWindow(async e => {
-				if (e.workspace) {
-					this.workspaceStorage(e.workspace).init();
-				}
-			}));
-		}
+		this._register(this.lifecycleMainService.onWillLoadWindow(async e => {
+			if (e.workspace) {
+				this.workspaceStorage(e.workspace).init();
+			}
+		}));
 
 		// All Storage: Close when shutting down
 		this._register(this.lifecycleMainService.onWillShutdown(e => {
diff --git a/src/vs/platform/storage/electron-sandbox/storageService2.ts b/src/vs/platform/storage/electron-sandbox/storageService.ts
similarity index 97%
rename from src/vs/platform/storage/electron-sandbox/storageService2.ts
rename to src/vs/platform/storage/electron-sandbox/storageService.ts
index f8d6e9ae7c3..10520a87153 100644
--- a/src/vs/platform/storage/electron-sandbox/storageService2.ts
+++ b/src/vs/platform/storage/electron-sandbox/storageService.ts
@@ -14,7 +14,7 @@ import { IMainProcessService } from 'vs/platform/ipc/electron-sandbox/services';
 import { StorageDatabaseChannelClient } from 'vs/platform/storage/common/storageIpc';
 import { joinPath } from 'vs/base/common/resources';
 
-export class NativeStorageService2 extends AbstractStorageService {
+export class NativeStorageService extends AbstractStorageService {
 
 	// Global Storage is readonly and shared across windows
 	private readonly globalStorage: IStorage;
@@ -85,7 +85,7 @@ export class NativeStorageService2 extends AbstractStorageService {
 	}
 
 	protected getLogDetails(scope: StorageScope): string | undefined {
-		return scope === StorageScope.GLOBAL ? this.environmentService.globalStorageHome.fsPath : this.workspaceStorageId ? `${joinPath(this.environmentService.workspaceStorageHome, this.workspaceStorageId, 'state.vscdb').fsPath} [!!! Experimental Main Storage !!!]` : undefined;
+		return scope === StorageScope.GLOBAL ? this.environmentService.globalStorageHome.fsPath : this.workspaceStorageId ? `${joinPath(this.environmentService.workspaceStorageHome, this.workspaceStorageId, 'state.vscdb').fsPath}` : undefined;
 	}
 
 	async close(): Promise<void> {
diff --git a/src/vs/platform/storage/node/storageService.ts b/src/vs/platform/storage/node/storageService.ts
deleted file mode 100644
index 3b33b0ba27b..00000000000
--- a/src/vs/platform/storage/node/storageService.ts
+++ /dev/null
@@ -1,198 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-
-import { promises } from 'fs';
-import { IDisposable, dispose } from 'vs/base/common/lifecycle';
-import { ILogService, LogLevel } from 'vs/platform/log/common/log';
-import { StorageScope, WillSaveStateReason, IS_NEW_KEY, AbstractStorageService } from 'vs/platform/storage/common/storage';
-import { SQLiteStorageDatabase, ISQLiteStorageDatabaseLoggingOptions } from 'vs/base/parts/storage/node/storage';
-import { Storage, IStorageDatabase, IStorage, StorageHint } from 'vs/base/parts/storage/common/storage';
-import { mark } from 'vs/base/common/performance';
-import { join } from 'vs/base/common/path';
-import { copy, exists, writeFile } from 'vs/base/node/pfs';
-import { IEnvironmentService } from 'vs/platform/environment/common/environment';
-import { isSingleFolderWorkspaceIdentifier, isWorkspaceIdentifier, IWorkspaceInitializationPayload } from 'vs/platform/workspaces/common/workspaces';
-import { assertIsDefined } from 'vs/base/common/types';
-import { Promises } from 'vs/base/common/async';
-
-export class NativeStorageService extends AbstractStorageService {
-
-	private static readonly WORKSPACE_STORAGE_NAME = 'state.vscdb';
-	private static readonly WORKSPACE_META_NAME = 'workspace.json';
-
-	private readonly globalStorage = new Storage(this.globalStorageDatabase);
-
-	private workspaceStoragePath: string | undefined;
-	private workspaceStorage: IStorage | undefined;
-	private workspaceStorageListener: IDisposable | undefined;
-
-	constructor(
-		private globalStorageDatabase: IStorageDatabase,
-		private payload: IWorkspaceInitializationPayload | undefined,
-		@ILogService private readonly logService: ILogService,
-		@IEnvironmentService private readonly environmentService: IEnvironmentService
-	) {
-		super();
-
-		this.registerListeners();
-	}
-
-	private registerListeners(): void {
-
-		// Global Storage change events
-		this._register(this.globalStorage.onDidChangeStorage(key => this.emitDidChangeValue(StorageScope.GLOBAL, key)));
-	}
-
-	protected async doInitialize(): Promise<void> {
-
-		// Init all storage locations
-		await Promises.settled([
-			this.initializeGlobalStorage(),
-			this.payload ? this.initializeWorkspaceStorage(this.payload) : Promise.resolve()
-		]);
-	}
-
-	private initializeGlobalStorage(): Promise<void> {
-		return this.globalStorage.init();
-	}
-
-	private async initializeWorkspaceStorage(payload: IWorkspaceInitializationPayload): Promise<void> {
-
-		// Prepare workspace storage folder for DB
-		try {
-			const result = await this.prepareWorkspaceStorageFolder(payload);
-
-			const useInMemoryStorage = !!this.environmentService.extensionTestsLocationURI; // no storage during extension tests!
-
-			// Create workspace storage and initialize
-			mark('code/willInitWorkspaceStorage');
-			try {
-				const workspaceStorage = this.createWorkspaceStorage(
-					useInMemoryStorage ? SQLiteStorageDatabase.IN_MEMORY_PATH : join(result.path, NativeStorageService.WORKSPACE_STORAGE_NAME),
-					result.wasCreated ? StorageHint.STORAGE_DOES_NOT_EXIST : undefined
-				);
-				await workspaceStorage.init();
-
-				// Check to see if this is the first time we are "opening" this workspace
-				const firstWorkspaceOpen = workspaceStorage.getBoolean(IS_NEW_KEY);
-				if (firstWorkspaceOpen === undefined) {
-					workspaceStorage.set(IS_NEW_KEY, result.wasCreated);
-				} else if (firstWorkspaceOpen) {
-					workspaceStorage.set(IS_NEW_KEY, false);
-				}
-			} finally {
-				mark('code/didInitWorkspaceStorage');
-			}
-		} catch (error) {
-			this.logService.error(`[storage] initializeWorkspaceStorage(): Unable to init workspace storage due to ${error}`);
-		}
-	}
-
-	private createWorkspaceStorage(workspaceStoragePath: string, hint?: StorageHint): IStorage {
-
-		// Logger for workspace storage
-		const workspaceLoggingOptions: ISQLiteStorageDatabaseLoggingOptions = {
-			logTrace: (this.logService.getLevel() === LogLevel.Trace) ? msg => this.logService.trace(msg) : undefined,
-			logError: error => this.logService.error(error)
-		};
-
-		// Dispose old (if any)
-		dispose(this.workspaceStorage);
-		dispose(this.workspaceStorageListener);
-
-		// Create new
-		this.workspaceStoragePath = workspaceStoragePath;
-		this.workspaceStorage = new Storage(new SQLiteStorageDatabase(workspaceStoragePath, { logging: workspaceLoggingOptions }), { hint });
-		this.workspaceStorageListener = this.workspaceStorage.onDidChangeStorage(key => this.emitDidChangeValue(StorageScope.WORKSPACE, key));
-
-		return this.workspaceStorage;
-	}
-
-	private getWorkspaceStorageFolderPath(payload: IWorkspaceInitializationPayload): string {
-		return join(this.environmentService.workspaceStorageHome.fsPath, payload.id); // workspace home + workspace id;
-	}
-
-	private async prepareWorkspaceStorageFolder(payload: IWorkspaceInitializationPayload): Promise<{ path: string, wasCreated: boolean }> {
-		const workspaceStorageFolderPath = this.getWorkspaceStorageFolderPath(payload);
-
-		const storageExists = await exists(workspaceStorageFolderPath);
-		if (storageExists) {
-			return { path: workspaceStorageFolderPath, wasCreated: false };
-		}
-
-		await promises.mkdir(workspaceStorageFolderPath, { recursive: true });
-
-		// Write metadata into folder
-		this.ensureWorkspaceStorageFolderMeta(payload);
-
-		return { path: workspaceStorageFolderPath, wasCreated: true };
-	}
-
-	private ensureWorkspaceStorageFolderMeta(payload: IWorkspaceInitializationPayload): void {
-		let meta: object | undefined = undefined;
-		if (isSingleFolderWorkspaceIdentifier(payload)) {
-			meta = { folder: payload.uri.toString() };
-		} else if (isWorkspaceIdentifier(payload)) {
-			meta = { workspace: payload.configPath.toString() };
-		}
-
-		if (meta) {
-			(async () => {
-				try {
-					const workspaceStorageMetaPath = join(this.getWorkspaceStorageFolderPath(payload), NativeStorageService.WORKSPACE_META_NAME);
-					const storageExists = await exists(workspaceStorageMetaPath);
-					if (!storageExists) {
-						await writeFile(workspaceStorageMetaPath, JSON.stringify(meta, undefined, 2));
-					}
-				} catch (error) {
-					this.logService.error(error);
-				}
-			})();
-		}
-	}
-
-	protected getStorage(scope: StorageScope): IStorage | undefined {
-		return scope === StorageScope.GLOBAL ? this.globalStorage : this.workspaceStorage;
-	}
-
-	protected getLogDetails(scope: StorageScope): string | undefined {
-		return scope === StorageScope.GLOBAL ? this.environmentService.globalStorageHome.fsPath : this.workspaceStoragePath;
-	}
-
-	async close(): Promise<void> {
-
-		// Stop periodic scheduler and idle runner as we now collect state normally
-		this.stopFlushWhenIdle();
-
-		// Signal as event so that clients can still store data
-		this.emitWillSaveState(WillSaveStateReason.SHUTDOWN);
-
-		// Do it
-		await Promises.settled([
-			this.globalStorage.close(),
-			this.workspaceStorage ? this.workspaceStorage.close() : Promise.resolve()
-		]);
-	}
-
-	async migrate(toWorkspace: IWorkspaceInitializationPayload): Promise<void> {
-		if (this.workspaceStoragePath === SQLiteStorageDatabase.IN_MEMORY_PATH) {
-			return; // no migration needed if running in memory
-		}
-
-		// Close workspace DB to be able to copy
-		await this.workspaceStorage?.close();
-
-		// Prepare new workspace storage folder
-		const result = await this.prepareWorkspaceStorageFolder(toWorkspace);
-
-		const newWorkspaceStoragePath = join(result.path, NativeStorageService.WORKSPACE_STORAGE_NAME);
-
-		// Copy current storage over to new workspace storage
-		await copy(assertIsDefined(this.workspaceStoragePath), newWorkspaceStoragePath, { preserveSymlinks: false });
-
-		// Recreate and init workspace storage
-		return this.createWorkspaceStorage(newWorkspaceStoragePath).init();
-	}
-}
diff --git a/src/vs/platform/storage/test/electron-main/storageMainService.test.ts b/src/vs/platform/storage/test/electron-main/storageMainService.test.ts
index 2a91d25b5d9..704b785db0e 100644
--- a/src/vs/platform/storage/test/electron-main/storageMainService.test.ts
+++ b/src/vs/platform/storage/test/electron-main/storageMainService.test.ts
@@ -17,7 +17,6 @@ import { Emitter, Event } from 'vs/base/common/event';
 import { NativeParsedArgs } from 'vs/platform/environment/common/argv';
 import { ICodeWindow } from 'vs/platform/windows/electron-main/windows';
 import { Promises } from 'vs/base/common/async';
-import { TestConfigurationService } from 'vs/platform/configuration/test/common/testConfigurationService';
 
 suite('StorageMainService', function () {
 
@@ -28,10 +27,6 @@ suite('StorageMainService', function () {
 				useInMemoryStorage: true
 			};
 		}
-
-		protected enableMainWorkspaceStorage(): boolean {
-			return true;
-		}
 	}
 
 	class StorageTestLifecycleMainService implements ILifecycleMainService {
@@ -48,9 +43,7 @@ suite('StorageMainService', function () {
 
 			this._onWillShutdown.fire({
 				join(promise) {
-					if (promise) {
-						joiners.push(promise);
-					}
+					joiners.push(promise);
 				}
 			});
 
@@ -129,14 +122,14 @@ suite('StorageMainService', function () {
 	}
 
 	test('basics (global)', function () {
-		const storageMainService = new TestStorageMainService(new NullLogService(), new NativeEnvironmentService(parseArgs(process.argv, OPTIONS)), new StorageTestLifecycleMainService(), new TestConfigurationService());
+		const storageMainService = new TestStorageMainService(new NullLogService(), new NativeEnvironmentService(parseArgs(process.argv, OPTIONS)), new StorageTestLifecycleMainService());
 
 		return testStorage(storageMainService.globalStorage, true);
 	});
 
 	test('basics (workspace)', function () {
 		const workspace = { id: generateUuid() };
-		const storageMainService = new TestStorageMainService(new NullLogService(), new NativeEnvironmentService(parseArgs(process.argv, OPTIONS)), new StorageTestLifecycleMainService(), new TestConfigurationService());
+		const storageMainService = new TestStorageMainService(new NullLogService(), new NativeEnvironmentService(parseArgs(process.argv, OPTIONS)), new StorageTestLifecycleMainService());
 
 		return testStorage(storageMainService.workspaceStorage(workspace), false);
 	});
@@ -144,7 +137,7 @@ suite('StorageMainService', function () {
 	test('storage closed onWillShutdown', async function () {
 		const lifecycleMainService = new StorageTestLifecycleMainService();
 		const workspace = { id: generateUuid() };
-		const storageMainService = new TestStorageMainService(new NullLogService(), new NativeEnvironmentService(parseArgs(process.argv, OPTIONS)), lifecycleMainService, new TestConfigurationService());
+		const storageMainService = new TestStorageMainService(new NullLogService(), new NativeEnvironmentService(parseArgs(process.argv, OPTIONS)), lifecycleMainService);
 
 		let workspaceStorage = storageMainService.workspaceStorage(workspace);
 		let didCloseWorkspaceStorage = false;
@@ -175,7 +168,7 @@ suite('StorageMainService', function () {
 	});
 
 	test('storage closed before init works', async function () {
-		const storageMainService = new TestStorageMainService(new NullLogService(), new NativeEnvironmentService(parseArgs(process.argv, OPTIONS)), new StorageTestLifecycleMainService(), new TestConfigurationService());
+		const storageMainService = new TestStorageMainService(new NullLogService(), new NativeEnvironmentService(parseArgs(process.argv, OPTIONS)), new StorageTestLifecycleMainService());
 		const workspace = { id: generateUuid() };
 
 		let workspaceStorage = storageMainService.workspaceStorage(workspace);
@@ -198,7 +191,7 @@ suite('StorageMainService', function () {
 	});
 
 	test('storage closed before init awaits works', async function () {
-		const storageMainService = new TestStorageMainService(new NullLogService(), new NativeEnvironmentService(parseArgs(process.argv, OPTIONS)), new StorageTestLifecycleMainService(), new TestConfigurationService());
+		const storageMainService = new TestStorageMainService(new NullLogService(), new NativeEnvironmentService(parseArgs(process.argv, OPTIONS)), new StorageTestLifecycleMainService());
 		const workspace = { id: generateUuid() };
 
 		let workspaceStorage = storageMainService.workspaceStorage(workspace);
diff --git a/src/vs/platform/storage/test/node/storageService.test.ts b/src/vs/platform/storage/test/node/storageService.test.ts
deleted file mode 100644
index 68ba513e051..00000000000
--- a/src/vs/platform/storage/test/node/storageService.test.ts
+++ /dev/null
@@ -1,77 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-
-import { strictEqual } from 'assert';
-import { StorageScope, StorageTarget } from 'vs/platform/storage/common/storage';
-import { NativeStorageService } from 'vs/platform/storage/node/storageService';
-import { tmpdir } from 'os';
-import { promises } from 'fs';
-import { rimraf } from 'vs/base/node/pfs';
-import { NullLogService } from 'vs/platform/log/common/log';
-import { NativeEnvironmentService } from 'vs/platform/environment/node/environmentService';
-import { parseArgs, OPTIONS } from 'vs/platform/environment/node/argv';
-import { InMemoryStorageDatabase } from 'vs/base/parts/storage/common/storage';
-import { URI } from 'vs/base/common/uri';
-import { flakySuite, getRandomTestPath } from 'vs/base/test/node/testUtils';
-import { createSuite } from 'vs/platform/storage/test/common/storageService.test';
-
-flakySuite('StorageService (native)', function () {
-
-	class StorageTestEnvironmentService extends NativeEnvironmentService {
-
-		constructor(private workspaceStorageFolderPath: URI, private _extensionsPath: string) {
-			super(parseArgs(process.argv, OPTIONS));
-		}
-
-		get workspaceStorageHome(): URI {
-			return this.workspaceStorageFolderPath;
-		}
-
-		get extensionsPath(): string {
-			return this._extensionsPath;
-		}
-	}
-
-	let testDir: string;
-
-	createSuite<NativeStorageService>({
-		setup: async () => {
-			testDir = getRandomTestPath(tmpdir(), 'vsctests', 'storageservice');
-
-			await promises.mkdir(testDir, { recursive: true });
-
-			const storageService = new NativeStorageService(new InMemoryStorageDatabase(), { id: String(Date.now()) }, new NullLogService(), new StorageTestEnvironmentService(URI.file(testDir), testDir));
-			await storageService.initialize();
-
-			return storageService;
-		},
-		teardown: async storageService => {
-			await storageService.close();
-
-			return rimraf(testDir);
-		}
-	});
-
-	test('Migrate Data', async function () {
-		const storage = new NativeStorageService(new InMemoryStorageDatabase(), { id: String(Date.now()) }, new NullLogService(), new StorageTestEnvironmentService(URI.file(testDir), testDir));
-		await storage.initialize();
-
-		storage.store('bar', 'foo', StorageScope.WORKSPACE, StorageTarget.MACHINE);
-		storage.store('barNumber', 55, StorageScope.WORKSPACE, StorageTarget.MACHINE);
-		storage.store('barBoolean', true, StorageScope.GLOBAL, StorageTarget.MACHINE);
-
-		strictEqual(storage.get('bar', StorageScope.WORKSPACE), 'foo');
-		strictEqual(storage.getNumber('barNumber', StorageScope.WORKSPACE), 55);
-		strictEqual(storage.getBoolean('barBoolean', StorageScope.GLOBAL), true);
-
-		await storage.migrate({ id: String(Date.now() + 100) });
-
-		strictEqual(storage.get('bar', StorageScope.WORKSPACE), 'foo');
-		strictEqual(storage.getNumber('barNumber', StorageScope.WORKSPACE), 55);
-		strictEqual(storage.getBoolean('barBoolean', StorageScope.GLOBAL), true);
-
-		await storage.close();
-	});
-});
diff --git a/src/vs/platform/terminal/common/terminal.ts b/src/vs/platform/terminal/common/terminal.ts
index c9292ebdf1b..faa772462cb 100644
--- a/src/vs/platform/terminal/common/terminal.ts
+++ b/src/vs/platform/terminal/common/terminal.ts
@@ -17,7 +17,7 @@ export type ITerminalInstanceLayoutInfo = IRawTerminalInstanceLayoutInfo<IPtyHos
 
 export interface IRawTerminalTabLayoutInfo<T> {
 	isActive: boolean;
-	activePersistentTerminalId: number | undefined;
+	activePersistentProcessId: number | undefined;
 	terminals: IRawTerminalInstanceLayoutInfo<T>[];
 }
 
@@ -189,7 +189,7 @@ export interface IShellLaunchConfig {
 	/**
 	 * Whether an extension is controlling the terminal via a `vscode.Pseudoterminal`.
 	 */
-	isExtensionTerminal?: boolean;
+	isExtensionCustomPtyTerminal?: boolean;
 
 	/**
 	 * A UUID generated by the extension host process for terminals created on the extension host process.
@@ -199,7 +199,7 @@ export interface IShellLaunchConfig {
 	/**
 	 * This is a terminal that attaches to an already running terminal.
 	 */
-	attachPersistentTerminal?: { id: number; pid: number; title: string; cwd: string; };
+	attachPersistentProcess?: { id: number; pid: number; title: string; cwd: string; };
 
 	/**
 	 * Whether the terminal process environment should be exactly as provided in
@@ -224,6 +224,11 @@ export interface IShellLaunchConfig {
 	 * a terminal used to drive some VS Code feature.
 	 */
 	isFeatureTerminal?: boolean;
+
+	/**
+	 * Whether this terminal was created by an extension.
+	 */
+	isExtensionOwnedTerminal?: boolean;
 }
 
 export interface ITerminalEnvironment {
@@ -250,7 +255,7 @@ export interface ITerminalChildProcess {
 	/**
 	 * Whether the process should be persisted across reloads.
 	 */
-	shouldPersist?: boolean;
+	shouldPersist: boolean;
 
 	onProcessData: Event<IProcessDataEvent | string>;
 	onProcessExit: Event<number | undefined>;
diff --git a/src/vs/platform/terminal/electron-browser/localPtyService.ts b/src/vs/platform/terminal/electron-browser/localPtyService.ts
index f12615a5817..011835d2b78 100644
--- a/src/vs/platform/terminal/electron-browser/localPtyService.ts
+++ b/src/vs/platform/terminal/electron-browser/localPtyService.ts
@@ -70,7 +70,7 @@ export class LocalPtyService extends Disposable implements IPtyService {
 	}
 
 	private _startPtyHost(): [Client, IPtyService] {
-		const client = this._register(new Client(
+		const client = new Client(
 			FileAccess.asFileUri('bootstrap-fork', require).fsPath,
 			{
 				serverName: 'Pty Host',
@@ -82,7 +82,7 @@ export class LocalPtyService extends Disposable implements IPtyService {
 					VSCODE_VERBOSE_LOGGING: 'true' // transmit console logs from server to client
 				}
 			}
-		));
+		);
 		this._onPtyHostStart.fire();
 
 		const heartbeatService = ProxyChannel.toService<IHeartbeatService>(client.getChannel(TerminalIpcChannels.Heartbeat));
diff --git a/src/vs/platform/terminal/node/ptyService.ts b/src/vs/platform/terminal/node/ptyService.ts
index 2f70589b672..4d631e3bd74 100644
--- a/src/vs/platform/terminal/node/ptyService.ts
+++ b/src/vs/platform/terminal/node/ptyService.ts
@@ -69,7 +69,7 @@ export class PtyService extends Disposable implements IPtyService {
 		workspaceId: string,
 		workspaceName: string
 	): Promise<number> {
-		if (shellLaunchConfig.attachPersistentTerminal) {
+		if (shellLaunchConfig.attachPersistentProcess) {
 			throw new Error('Attempt to create a process when attach object was provided');
 		}
 		const id = ++this._lastPtyId;
@@ -82,24 +82,24 @@ export class PtyService extends Disposable implements IPtyService {
 		if (process.onProcessResolvedShellLaunchConfig) {
 			process.onProcessResolvedShellLaunchConfig(event => this._onProcessResolvedShellLaunchConfig.fire({ id, event }));
 		}
-		const persistentTerminalProcess = new PersistentTerminalProcess(id, process, workspaceId, workspaceName, shouldPersist, cols, rows, this._logService);
+		const persistentProcess = new PersistentTerminalProcess(id, process, workspaceId, workspaceName, shouldPersist, cols, rows, this._logService);
 		process.onProcessExit(() => {
-			persistentTerminalProcess.dispose();
+			persistentProcess.dispose();
 			this._ptys.delete(id);
 		});
-		persistentTerminalProcess.onProcessReplay(event => this._onProcessReplay.fire({ id, event }));
-		persistentTerminalProcess.onProcessReady(event => this._onProcessReady.fire({ id, event }));
-		persistentTerminalProcess.onProcessTitleChanged(event => this._onProcessTitleChanged.fire({ id, event }));
-		this._ptys.set(id, persistentTerminalProcess);
+		persistentProcess.onProcessReplay(event => this._onProcessReplay.fire({ id, event }));
+		persistentProcess.onProcessReady(event => this._onProcessReady.fire({ id, event }));
+		persistentProcess.onProcessTitleChanged(event => this._onProcessTitleChanged.fire({ id, event }));
+		this._ptys.set(id, persistentProcess);
 		return id;
 	}
 
 	async attachToProcess(id: number): Promise<void> {
 		try {
 			this._throwIfNoPty(id).attach();
-			this._logService.trace(`Persistent terminal reconnection "${id}"`);
+			this._logService.trace(`Persistent process reconnection "${id}"`);
 		} catch (e) {
-			this._logService.trace(`Persistent terminal reconnection "${id}" failed`, e.message);
+			this._logService.trace(`Persistent process reconnection "${id}" failed`, e.message);
 		}
 	}
 
@@ -153,15 +153,15 @@ export class PtyService extends Disposable implements IPtyService {
 		const filtered = expandedTerminals.filter(term => term.terminal !== null) as IRawTerminalInstanceLayoutInfo<IPtyHostDescriptionDto>[];
 		return {
 			isActive: tab.isActive,
-			activePersistentTerminalId: tab.activePersistentTerminalId,
+			activePersistentProcessId: tab.activePersistentProcessId,
 			terminals: filtered
 		};
 	}
 
 	private async _expandTerminalInstance(t: ITerminalInstanceLayoutInfoById): Promise<IRawTerminalInstanceLayoutInfo<IPtyHostDescriptionDto | null>> {
 		try {
-			const persistentTerminalProcess = this._throwIfNoPty(t.terminal);
-			const termDto = persistentTerminalProcess && await this._terminalToDto(t.terminal, persistentTerminalProcess);
+			const persistentProcess = this._throwIfNoPty(t.terminal);
+			const termDto = persistentProcess && await this._terminalToDto(t.terminal, persistentProcess);
 			return {
 				terminal: termDto ?? null,
 				relativeSize: t.relativeSize
@@ -176,14 +176,14 @@ export class PtyService extends Disposable implements IPtyService {
 		}
 	}
 
-	private async _terminalToDto(id: number, persistentTerminalProcess: PersistentTerminalProcess): Promise<IPtyHostDescriptionDto> {
-		const [cwd, isOrphan] = await Promise.all([persistentTerminalProcess.getCwd(), persistentTerminalProcess.isOrphaned()]);
+	private async _terminalToDto(id: number, persistentProcess: PersistentTerminalProcess): Promise<IPtyHostDescriptionDto> {
+		const [cwd, isOrphan] = await Promise.all([persistentProcess.getCwd(), persistentProcess.isOrphaned()]);
 		return {
 			id,
-			title: persistentTerminalProcess.title,
-			pid: persistentTerminalProcess.pid,
-			workspaceId: persistentTerminalProcess.workspaceId,
-			workspaceName: persistentTerminalProcess.workspaceName,
+			title: persistentProcess.title,
+			pid: persistentProcess.pid,
+			workspaceId: persistentProcess.workspaceId,
+			workspaceName: persistentProcess.workspaceName,
 			cwd,
 			isOrphan
 		};
@@ -233,7 +233,7 @@ export class PersistentTerminalProcess extends Disposable {
 	get title(): string { return this._terminalProcess.currentTitle; }
 
 	constructor(
-		private _persistentTerminalId: number,
+		private _persistentProcessId: number,
 		private readonly _terminalProcess: TerminalProcess,
 		public readonly workspaceId: string,
 		public readonly workspaceName: string,
@@ -246,11 +246,11 @@ export class PersistentTerminalProcess extends Disposable {
 		this._orphanQuestionBarrier = null;
 		this._orphanQuestionReplyTime = 0;
 		this._disconnectRunner1 = this._register(new RunOnceScheduler(() => {
-			this._logService.info(`Persistent terminal "${this._persistentTerminalId}": The reconnection grace time of ${printTime(LocalReconnectConstants.ReconnectionGraceTime)} has expired, so the process (pid=${this._pid}) will be shutdown.`);
+			this._logService.info(`Persistent process "${this._persistentProcessId}": The reconnection grace time of ${printTime(LocalReconnectConstants.ReconnectionGraceTime)} has expired, shutting down pid "${this._pid}"`);
 			this.shutdown(true);
 		}, LocalReconnectConstants.ReconnectionGraceTime));
 		this._disconnectRunner2 = this._register(new RunOnceScheduler(() => {
-			this._logService.info(`Persistent terminal "${this._persistentTerminalId}": The short reconnection grace time of ${printTime(LocalReconnectConstants.ReconnectionShortGraceTime)} has expired, so the process (pid=${this._pid}) will be shutdown.`);
+			this._logService.info(`Persistent process "${this._persistentProcessId}": The short reconnection grace time of ${printTime(LocalReconnectConstants.ReconnectionShortGraceTime)} has expired, shutting down pid ${this._pid}`);
 			this.shutdown(true);
 		}, LocalReconnectConstants.ReconnectionShortGraceTime));
 
@@ -271,10 +271,10 @@ export class PersistentTerminalProcess extends Disposable {
 		this._register(this._terminalProcess.onProcessTitleChanged(e => this._onProcessTitleChanged.fire(e)));
 
 		// Buffer data events to reduce the amount of messages going to the renderer
-		// this._register(this._bufferer.startBuffering(this._persistentTerminalId, this._terminalProcess.onProcessData));
+		// this._register(this._bufferer.startBuffering(this._persistentProcessId, this._terminalProcess.onProcessData));
 		this._register(this._terminalProcess.onProcessData(e => this._recorder.recordData(e)));
 		this._register(this._terminalProcess.onProcessExit(exitCode => {
-			// this._bufferer.stopBuffering(this._persistentTerminalId);
+			// this._bufferer.stopBuffering(this._persistentProcessId);
 		}));
 	}
 
@@ -344,7 +344,7 @@ export class PersistentTerminalProcess extends Disposable {
 			dataLength += e.data.length;
 		}
 
-		this._logService.info(`Persistent terminal "${this._persistentTerminalId}": Replaying ${dataLength} chars and ${ev.events.length} size events`);
+		this._logService.info(`Persistent process "${this._persistentProcessId}": Replaying ${dataLength} chars and ${ev.events.length} size events`);
 		this._onProcessReplay.fire(ev);
 		this._terminalProcess.clearUnacknowledgedChars();
 	}
diff --git a/src/vs/platform/terminal/node/terminalProcess.ts b/src/vs/platform/terminal/node/terminalProcess.ts
index 16b6df51daf..aa66c8724f1 100644
--- a/src/vs/platform/terminal/node/terminalProcess.ts
+++ b/src/vs/platform/terminal/node/terminalProcess.ts
@@ -24,8 +24,28 @@ import { localize } from 'vs/nls';
 const WRITE_MAX_CHUNK_SIZE = 50;
 const WRITE_INTERVAL_MS = 5;
 
+const enum ShutdownConstants {
+	/**
+	 * The amount of time that must pass between data events after exit is queued before the actual
+	 * kill call is triggered. This data flush mechanism works around an [issue in node-pty][1]
+	 * where not all data is flushed which causes problems for task problem matchers. Additionally
+	 * on Windows under conpty, killing a process while data is being output will cause the [conhost
+	 * flush to hang the pty host][2] because [conhost should be hosted on another thread][3].
+	 *
+	 * [1]: https://github.com/Tyriar/node-pty/issues/72
+	 * [2]: https://github.com/microsoft/vscode/issues/71966
+	 * [3]: https://github.com/microsoft/node-pty/pull/415
+	 */
+	DataFlushTimeout = 250,
+	/**
+	 * The maximum time to allow after dispose is called because forcefully killing the process.
+	 */
+	MaximumShutdownTime = 5000
+}
+
 export class TerminalProcess extends Disposable implements ITerminalChildProcess {
 	readonly id = 0;
+	readonly shouldPersist = false;
 
 	private _exitCode: number | undefined;
 	private _exitMessage: string | undefined;
@@ -223,7 +243,10 @@ export class TerminalProcess extends Disposable implements ITerminalChildProcess
 		if (this._closeTimeout) {
 			clearTimeout(this._closeTimeout);
 		}
-		this._closeTimeout = setTimeout(() => this._kill(), 250);
+		this._closeTimeout = setTimeout(() => {
+			this._closeTimeout = undefined;
+			this._kill();
+		}, ShutdownConstants.DataFlushTimeout);
 	}
 
 	private async _kill(): Promise<void> {
@@ -263,7 +286,16 @@ export class TerminalProcess extends Disposable implements ITerminalChildProcess
 		if (immediate) {
 			this._kill();
 		} else {
-			this._queueProcessExit();
+			if (!this._closeTimeout && !this._isDisposed) {
+				this._queueProcessExit();
+				// Allow a maximum amount of time for the process to exit, otherwise force kill it
+				setTimeout(() => {
+					if (this._closeTimeout && !this._isDisposed) {
+						this._closeTimeout = undefined;
+						this._kill();
+					}
+				}, ShutdownConstants.MaximumShutdownTime);
+			}
 		}
 	}
 
diff --git a/src/vs/platform/theme/common/colorRegistry.ts b/src/vs/platform/theme/common/colorRegistry.ts
index 0c1d50a0635..fd8b28917ef 100644
--- a/src/vs/platform/theme/common/colorRegistry.ts
+++ b/src/vs/platform/theme/common/colorRegistry.ts
@@ -374,7 +374,7 @@ export const listInactiveFocusBackground = registerColor('list.inactiveFocusBack
 export const listInactiveFocusOutline = registerColor('list.inactiveFocusOutline', { dark: null, light: null, hc: null }, nls.localize('listInactiveFocusOutline', "List/Tree outline color for the focused item when the list/tree is inactive. An active list/tree has keyboard focus, an inactive does not."));
 export const listHoverBackground = registerColor('list.hoverBackground', { dark: '#2A2D2E', light: '#F0F0F0', hc: null }, nls.localize('listHoverBackground', "List/Tree background when hovering over items using the mouse."));
 export const listHoverForeground = registerColor('list.hoverForeground', { dark: null, light: null, hc: null }, nls.localize('listHoverForeground', "List/Tree foreground when hovering over items using the mouse."));
-export const listDropBackground = registerColor('list.dropBackground', { dark: listFocusBackground, light: listFocusBackground, hc: null }, nls.localize('listDropBackground', "List/Tree drag and drop background when moving items around using the mouse."));
+export const listDropBackground = registerColor('list.dropBackground', { dark: '#062F4A', light: '#D6EBFF', hc: null }, nls.localize('listDropBackground', "List/Tree drag and drop background when moving items around using the mouse."));
 export const listHighlightForeground = registerColor('list.highlightForeground', { dark: '#0097fb', light: '#0066BF', hc: focusBorder }, nls.localize('highlight', 'List/Tree foreground color of the match highlights when searching inside the list/tree.'));
 export const listInvalidItemForeground = registerColor('list.invalidItemForeground', { dark: '#B89500', light: '#B89500', hc: '#B89500' }, nls.localize('invalidItemForeground', 'List/Tree foreground color for invalid items, for example an unresolved root in explorer.'));
 export const listErrorForeground = registerColor('list.errorForeground', { dark: '#F88070', light: '#B01011', hc: null }, nls.localize('listErrorForeground', 'Foreground color of list items containing errors.'));
diff --git a/src/vs/platform/windows/common/windows.ts b/src/vs/platform/windows/common/windows.ts
index 053bd4838af..02aeb30e0bc 100644
--- a/src/vs/platform/windows/common/windows.ts
+++ b/src/vs/platform/windows/common/windows.ts
@@ -114,7 +114,6 @@ export interface IWindowSettings {
 	readonly enableMenuBarMnemonics: boolean;
 	readonly closeWhenEmpty: boolean;
 	readonly clickThroughInactive: boolean;
-	readonly enableExperimentalMainProcessWorkspaceStorage: boolean;
 }
 
 export function getTitleBarStyle(configurationService: IConfigurationService): 'native' | 'custom' {
@@ -254,8 +253,6 @@ export interface INativeWindowConfiguration extends IWindowConfiguration, Native
 	filesToWait?: IPathsToWaitFor;
 
 	os: IOSConfiguration;
-
-	enableExperimentalMainProcessWorkspaceStorage: boolean;
 }
 
 /**
diff --git a/src/vs/platform/windows/electron-main/window.ts b/src/vs/platform/windows/electron-main/window.ts
index 7fe996e17c0..0eebc9dc8be 100644
--- a/src/vs/platform/windows/electron-main/window.ts
+++ b/src/vs/platform/windows/electron-main/window.ts
@@ -17,7 +17,7 @@ import { parseArgs, OPTIONS } from 'vs/platform/environment/node/argv';
 import { NativeParsedArgs } from 'vs/platform/environment/common/argv';
 import product from 'vs/platform/product/common/product';
 import { WindowMinimumSize, IWindowSettings, MenuBarVisibility, getTitleBarStyle, getMenuBarVisibility, zoomLevelToZoomFactor, INativeWindowConfiguration } from 'vs/platform/windows/common/windows';
-import { Disposable, toDisposable } from 'vs/base/common/lifecycle';
+import { Disposable } from 'vs/base/common/lifecycle';
 import { browserCodeLoadingCacheStrategy, isLinux, isMacintosh, isWindows } from 'vs/base/common/platform';
 import { defaultWindowState, ICodeWindow, ILoadEvent, IWindowState, WindowError, WindowMode } from 'vs/platform/windows/electron-main/windows';
 import { ISingleFolderWorkspaceIdentifier, isSingleFolderWorkspaceIdentifier, isWorkspaceIdentifier, IWorkspaceIdentifier } from 'vs/platform/workspaces/common/workspaces';
@@ -26,7 +26,6 @@ import { IBackupMainService } from 'vs/platform/backup/electron-main/backup';
 import { ISerializableCommandAction } from 'vs/platform/actions/common/actions';
 import { resolveMarketplaceHeaders } from 'vs/platform/extensionManagement/common/extensionGalleryService';
 import { IThemeMainService } from 'vs/platform/theme/electron-main/themeMainService';
-import { RunOnceScheduler } from 'vs/base/common/async';
 import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
 import { IDialogMainService } from 'vs/platform/dialogs/electron-main/dialogMainService';
 import { mnemonicButtonLabel } from 'vs/base/common/labels';
@@ -37,6 +36,7 @@ import { ByteSize, IFileService } from 'vs/platform/files/common/files';
 import { FileAccess, Schemas } from 'vs/base/common/network';
 import { isLaunchedFromCli } from 'vs/platform/environment/node/argvHelper';
 import { CancellationToken } from 'vs/base/common/cancellation';
+import { INativeHostMainService } from 'vs/platform/native/electron-main/nativeHostMainService';
 
 export interface IWindowCreationOptions {
 	state: IWindowState;
@@ -118,7 +118,8 @@ export class CodeWindow extends Disposable implements ICodeWindow {
 		@IBackupMainService private readonly backupMainService: IBackupMainService,
 		@ITelemetryService private readonly telemetryService: ITelemetryService,
 		@IDialogMainService private readonly dialogMainService: IDialogMainService,
-		@ILifecycleMainService private readonly lifecycleMainService: ILifecycleMainService
+		@ILifecycleMainService private readonly lifecycleMainService: ILifecycleMainService,
+		@INativeHostMainService private readonly nativeHostMainService: INativeHostMainService
 	) {
 		super();
 
@@ -468,7 +469,7 @@ export class CodeWindow extends Disposable implements ICodeWindow {
 		});
 
 		if (isMacintosh) {
-			const displayChangedScheduler = this._register(new RunOnceScheduler(() => {
+			this._register(this.nativeHostMainService.onDidChangeDisplay(() => {
 				if (!this._win) {
 					return; // disposed
 				}
@@ -480,27 +481,7 @@ export class CodeWindow extends Disposable implements ICodeWindow {
 					this.setFullScreen(false);
 					this.setFullScreen(true);
 				}
-			}, 100));
-
-			const displayChangedListener = (event: Event, display: Display, changedMetrics?: string[]) => {
-				if (Array.isArray(changedMetrics) && changedMetrics.length === 1 && changedMetrics[0] === 'workArea') {
-					// Electron will emit 'display-metrics-changed' events even when actually
-					// going fullscreen, because the dock hides. However, we do not want to
-					// react on this event as there is no change in display bounds.
-					return;
-				}
-
-				displayChangedScheduler.schedule();
-			};
-
-			screen.on('display-metrics-changed', displayChangedListener);
-			this._register(toDisposable(() => screen.removeListener('display-metrics-changed', displayChangedListener)));
-
-			screen.on('display-added', displayChangedListener);
-			this._register(toDisposable(() => screen.removeListener('display-added', displayChangedListener)));
-
-			screen.on('display-removed', displayChangedListener);
-			this._register(toDisposable(() => screen.removeListener('display-removed', displayChangedListener)));
+			}));
 		}
 
 		// Window (Un)Maximize
@@ -870,8 +851,6 @@ export class CodeWindow extends Disposable implements ICodeWindow {
 			release: release()
 		};
 
-		windowConfiguration.enableExperimentalMainProcessWorkspaceStorage = !!(windowConfig?.enableExperimentalMainProcessWorkspaceStorage);
-
 		// Config (combination of process.argv and window configuration)
 		const environment = parseArgs(process.argv, OPTIONS);
 		const config = Object.assign(environment, windowConfiguration) as unknown as { [key: string]: unknown };
diff --git a/src/vs/platform/workspace/common/workspaceTrust.ts b/src/vs/platform/workspace/common/workspaceTrust.ts
index d656caecb36..885e6132a0b 100644
--- a/src/vs/platform/workspace/common/workspaceTrust.ts
+++ b/src/vs/platform/workspace/common/workspaceTrust.ts
@@ -44,18 +44,17 @@ export interface IWorkspaceTrustModel {
 	getTrustStateInfo(): IWorkspaceTrustStateInfo;
 }
 
-export interface IWorkspaceTrustRequest {
+export interface WorkspaceTrustRequest {
 	modal: boolean;
-	message?: string;
 }
 
 export interface IWorkspaceTrustRequestModel {
-	readonly trustRequest: IWorkspaceTrustRequest | undefined;
+	readonly trustRequest: WorkspaceTrustRequest | undefined;
 
 	readonly onDidInitiateRequest: Event<void>;
 	readonly onDidCompleteRequest: Event<WorkspaceTrustState | undefined>;
 
-	initiateRequest(request?: IWorkspaceTrustRequest): void;
+	initiateRequest(request?: WorkspaceTrustRequest): void;
 	completeRequest(trustState?: WorkspaceTrustState): void;
 }
 
@@ -76,7 +75,7 @@ export interface IWorkspaceTrustService {
 	onDidChangeTrustState: WorkspaceTrustChangeEvent;
 	getWorkspaceTrustState(): WorkspaceTrustState;
 	isWorkspaceTrustEnabled(): boolean;
-	requireWorkspaceTrust(request: IWorkspaceTrustRequest): Promise<WorkspaceTrustState>;
+	requireWorkspaceTrust(request?: WorkspaceTrustRequest): Promise<WorkspaceTrustState>;
 }
 
 export interface IWorkspaceTrustStateInfo {
diff --git a/src/vs/platform/workspaces/electron-main/workspacesHistoryMainService.ts b/src/vs/platform/workspaces/electron-main/workspacesHistoryMainService.ts
index 22cec5f95ad..fdc711e9afa 100644
--- a/src/vs/platform/workspaces/electron-main/workspacesHistoryMainService.ts
+++ b/src/vs/platform/workspaces/electron-main/workspacesHistoryMainService.ts
@@ -44,8 +44,8 @@ export class WorkspacesHistoryMainService extends Disposable implements IWorkspa
 
 	private static readonly MAX_TOTAL_RECENT_ENTRIES = 100;
 
-	private static readonly MAX_MACOS_DOCK_RECENT_WORKSPACES = 7; // prefer more workspaces...
-	private static readonly MAX_MACOS_DOCK_RECENT_ENTRIES_TOTAL = 10; // ...compared to files
+	private static readonly MAX_MACOS_DOCK_RECENT_WORKSPACES = 7; 		// prefer higher number of workspaces...
+	private static readonly MAX_MACOS_DOCK_RECENT_ENTRIES_TOTAL = 10; 	// ...over number of files
 
 	// Exclude some very common files from the dock/taskbar
 	private static readonly COMMON_FILES_FILTER = [
diff --git a/src/vs/platform/workspaces/electron-main/workspacesManagementMainService.ts b/src/vs/platform/workspaces/electron-main/workspacesManagementMainService.ts
index 73db589c198..5839eb53100 100644
--- a/src/vs/platform/workspaces/electron-main/workspacesManagementMainService.ts
+++ b/src/vs/platform/workspaces/electron-main/workspacesManagementMainService.ts
@@ -151,15 +151,7 @@ export class WorkspacesManagementMainService extends Disposable implements IWork
 		const { workspace, storedWorkspace } = this.newUntitledWorkspace(folders, remoteAuthority);
 		const configPath = workspace.configPath.fsPath;
 
-		const configPathDir = dirname(configPath);
-		if (!existsSync(configPathDir)) {
-			const configPathDirDir = dirname(configPathDir);
-			if (!existsSync(configPathDirDir)) {
-				mkdirSync(configPathDirDir);
-			}
-			mkdirSync(configPathDir);
-		}
-
+		mkdirSync(dirname(configPath), { recursive: true });
 		writeFileSync(configPath, JSON.stringify(storedWorkspace, null, '\t'));
 
 		return workspace;
diff --git a/src/vs/vscode.d.ts b/src/vs/vscode.d.ts
index 2a270489cbb..b8db1d68f61 100644
--- a/src/vs/vscode.d.ts
+++ b/src/vs/vscode.d.ts
@@ -2271,10 +2271,14 @@ declare module 'vscode' {
 		 * there is a currently active editor.
 		 * @param context Context carrying additional information.
 		 * @param token A cancellation token.
-		 * @return An array of commands, quick fixes, or refactorings or a thenable of such. The lack of a result can be
-		 * signaled by returning `undefined`, `null`, or an empty array.
+		 *
+		 * @return An array of code actions, such as quick fixes or refactorings. The lack of a result can be signaled
+		 * by returning `undefined`, `null`, or an empty array.
+		 *
+		 * We also support returning `Command` for legacy reasons, however all new extensions should return
+		 * `CodeAction` object instead.
 		 */
-		provideCodeActions(document: TextDocument, range: Range | Selection, context: CodeActionContext, token: CancellationToken): ProviderResult<(Command | CodeAction)[]>;
+		provideCodeActions(document: TextDocument, range: Range | Selection, context: CodeActionContext, token: CancellationToken): ProviderResult<(Command | T)[]>;
 
 		/**
 		 * Given a code action fill in its [`edit`](#CodeAction.edit)-property. Changes to
@@ -11488,7 +11492,7 @@ declare module 'vscode' {
 		readonly path: string;
 
 		/**
-		 * Create a description for a debug adapter running as a socket based server.
+		 * Create a description for a debug adapter running as a Named Pipe (on Windows)/UNIX Domain Socket (on non-Windows) based server.
 		 */
 		constructor(path: string);
 	}
diff --git a/src/vs/vscode.proposed.d.ts b/src/vs/vscode.proposed.d.ts
index 3f3d581afc7..d66dd7a0bb7 100644
--- a/src/vs/vscode.proposed.d.ts
+++ b/src/vs/vscode.proposed.d.ts
@@ -1134,10 +1134,12 @@ declare module 'vscode' {
 	export interface NotebookCell {
 		readonly index: number;
 		readonly notebook: NotebookDocument;
-		readonly uri: Uri;
 		readonly cellKind: NotebookCellKind;
-		readonly document: TextDocument;
+		// todo@API duplicates #document.uri
+		readonly uri: Uri;
+		// todo@API duplicates #document.languageId
 		readonly language: string;
+		readonly document: TextDocument;
 		readonly outputs: readonly NotebookCellOutput[];
 		readonly metadata: NotebookCellMetadata
 	}
@@ -1165,6 +1167,7 @@ declare module 'vscode' {
 		readonly trusted: boolean;
 
 		// todo@API how does glob apply to mime times?
+		// todo@API remove displayOrder
 		readonly displayOrder: GlobPattern[];
 
 		// todo@API is this a kernel property?
@@ -1351,6 +1354,7 @@ declare module 'vscode' {
 		readonly visibleRanges: ReadonlyArray<NotebookCellRange>;
 	}
 
+	// todo@API make class
 	// todo@API support ids https://github.com/jupyter/enhancement-proposals/blob/master/62-cell-id/cell-id.md
 	export interface NotebookCellData {
 		readonly cellKind: NotebookCellKind;
@@ -1361,6 +1365,7 @@ declare module 'vscode' {
 		readonly metadata: NotebookCellMetadata | undefined;
 	}
 
+	// todo@API make class
 	export interface NotebookData {
 		readonly cells: NotebookCellData[];
 		readonly metadata: NotebookDocumentMetadata;
@@ -1619,14 +1624,18 @@ declare module 'vscode' {
 	// export const onDidStopNotebookCellExecution: Event<any>;
 
 	export interface NotebookKernel {
+
+		// todo@API make this mandatory?
 		readonly id?: string;
+
 		label: string;
 		description?: string;
 		detail?: string;
 		isPreferred?: boolean;
+
+		// todo@API is this maybe an output property?
 		preloads?: Uri[];
 
-		// TODO@API control runnable state of cell
 		/**
 		 * languages supported by kernel
 		 * - first is preferred
@@ -1634,6 +1643,10 @@ declare module 'vscode' {
 		 */
 		supportedLanguages?: string[];
 
+		// todo@API kernel updating itself
+		// fired when properties like the supported languages etc change
+		// onDidChangeProperties?: Event<void>
+
 		// @roblourens
 		// todo@API change to `executeCells(document: NotebookDocument, cells: NotebookCellRange[], context:{isWholeNotebooke: boolean}, token: CancelationToken): void;`
 		// todo@API interrupt vs cancellation, https://github.com/microsoft/vscode/issues/106741
@@ -2049,6 +2062,7 @@ declare module 'vscode' {
 		 */
 		whitespaceAfter?: boolean;
 
+		// todo@API make range first argument
 		constructor(text: string, range: Range, kind?: InlineHintKind);
 	}
 
@@ -2130,9 +2144,7 @@ declare module 'vscode' {
 	*/
 	export namespace test {
 		/**
-		 * Registers a provider that discovers tests for the given document
-		 * selectors. It is activated when either tests need to be enumerated, or
-		 * a document matching the selector is opened.
+		 * Registers a provider that discovers and runs tests.
 		 */
 		export function registerTestProvider<T extends TestItem>(testProvider: TestProvider<T>): Disposable;
 
@@ -2196,7 +2208,7 @@ declare module 'vscode' {
 		readonly onDidChangeTest: Event<TestChangeEvent>;
 
 		/**
-		 * An event the fires when all test providers have signalled that the tests
+		 * An event that fires when all test providers have signalled that the tests
 		 * the observer references have been discovered. Providers may continue to
 		 * watch for changes and cause {@link onDidChangeTest} to fire as files
 		 * change, until the observer is disposed.
@@ -2249,7 +2261,8 @@ declare module 'vscode' {
 		/**
 		 * An event that fires when an existing test `root` changes.  This can be
 		 * a result of a property update, or an update to its children. Changes
-		 * made to tests will not be visible to {@link TestObserver} instances until this event is fired.
+		 * made to tests will not be visible to {@link TestObserver} instances
+		 * until this event is fired.
 		 *
 		 * When a change is signalled, VS Code will check for any new or removed
 		 * direct children of the changed ite, For example, firing the event with
@@ -2271,12 +2284,6 @@ declare module 'vscode' {
 		 * with children will mark the entire subtree as outdated.
 		 */
 		readonly onDidInvalidateTest?: Event<T>;
-
-		/**
-		 * Dispose will be called when there are no longer observers interested
-		 * in the hierarchy.
-		 */
-		dispose(): void;
 	}
 
 	/**
@@ -2294,12 +2301,12 @@ declare module 'vscode' {
 		 * when the user opens the test explorer.
 		 *
 		 * It's guaranteed that this method will not be called again while
-		 * there is a previous undisposed watcher for the given workspace folder.
+		 * there is a previous uncancelled hierarchy for the given workspace folder.
 		 *
 		 * @param workspace The workspace in which to observe tests
+		 * @param cancellationToken Token that signals the used asked to abort the test run.
 		 */
-		// eslint-disable-next-line vscode-dts-provider-naming
-		createWorkspaceTestHierarchy?(workspace: WorkspaceFolder): TestHierarchy<T> | undefined;
+		provideWorkspaceTestHierarchy(workspace: WorkspaceFolder, token: CancellationToken): ProviderResult<TestHierarchy<T>>;
 
 		/**
 		 * Requests that tests be provided for the given document. This will be
@@ -2315,9 +2322,9 @@ declare module 'vscode' {
 		 * Code will request and use the information from the workspace hierarchy.
 		 *
 		 * @param document The document in which to observe tests
+		 * @param cancellationToken Token that signals the used asked to abort the test run.
 		 */
-		// eslint-disable-next-line vscode-dts-provider-naming
-		createDocumentTestHierarchy?(document: TextDocument): TestHierarchy<T> | undefined;
+		provideDocumentTestHierarchy?(document: TextDocument, token: CancellationToken): ProviderResult<TestHierarchy<T>>;
 
 		/**
 		 * Starts a test run. This should cause {@link onDidChangeTest} to
@@ -2327,7 +2334,7 @@ declare module 'vscode' {
 		 * @param cancellationToken Token that signals the used asked to abort the test run.
 		 */
 		// eslint-disable-next-line vscode-dts-provider-naming
-		runTests?(options: TestRun<T>, cancellationToken: CancellationToken): ProviderResult<void>;
+		runTests(options: TestRun<T>, token: CancellationToken): ProviderResult<void>;
 	}
 
 	/**
@@ -2378,8 +2385,7 @@ declare module 'vscode' {
 		/**
 		 * Unique identifier for the TestItem. This is used to correlate
 		 * test results and tests in the document with those in the workspace
-		 * (test explorer). This must not change for the
-		 * lifetime of a test instance.
+		 * (test explorer). This must not change for the lifetime of the TestItem.
 		 */
 		readonly id: string;
 
@@ -2403,8 +2409,11 @@ declare module 'vscode' {
 		runnable?: boolean;
 
 		/**
-		 * Whether this test item can be debugged.
-		 * Defaults to `false` if not provided.
+		 * Whether this test item can be debugged individually, defaults to `false`
+		 * if not provided.
+		 *
+		 * In some cases, like Go's tests, test can have children but these
+		 * children cannot be run independently.
 		 */
 		debuggable?: boolean;
 
@@ -2496,12 +2505,12 @@ declare module 'vscode' {
 		severity?: TestMessageSeverity;
 
 		/**
-		 * Expected test output. If given with `actual`, a diff view will be shown.
+		 * Expected test output. If given with `actualOutput`, a diff view will be shown.
 		 */
 		expectedOutput?: string;
 
 		/**
-		 * Actual test output. If given with `actual`, a diff view will be shown.
+		 * Actual test output. If given with `expectedOutput`, a diff view will be shown.
 		 */
 		actualOutput?: string;
 
@@ -2704,8 +2713,16 @@ declare module 'vscode' {
 		readonly allowContributedOpeners?: boolean | string;
 	}
 
+	//#endregion
+
+	//#region https://github.com/microsoft/vscode/issues/110267
+
 	namespace env {
 		export function openExternal(target: Uri, options?: OpenExternalOptions): Thenable<boolean>;
+
+		export const isTelemetryEnabled: boolean;
+
+		export const onDidChangeTelemetryEnabled: Event<boolean>;
 	}
 
 	//#endregion
@@ -2763,6 +2780,17 @@ declare module 'vscode' {
 		currentTrustState: WorkspaceTrustState;
 	}
 
+	/**
+	 * The object describing the properties of the workspace trust request
+	 */
+	export interface WorkspaceTrustRequest {
+		/**
+		 * When true, a modal dialog will be used to request workspace trust.
+		 * When false, a badge will be displayed on the Setting activity bar item
+		 */
+		modal: boolean;
+	}
+
 	export namespace workspace {
 		/**
 		 * The trust state of the current workspace
@@ -2771,11 +2799,10 @@ declare module 'vscode' {
 
 		/**
 		 * Prompt the user to chose whether to trust the current workspace
-		 * @param modal When true, a modal dialog is used to prompt the user for workspace
-		 * trust, otherwise a badge will be shown on the Settings activity bar item.
-		 * Default value is true.
+		 * @param request Optional object describing the properties of the
+		 * workspace trust request
 		 */
-		export function requireWorkspaceTrust(modal?: boolean): Thenable<WorkspaceTrustState>;
+		export function requireWorkspaceTrust(request?: WorkspaceTrustRequest): Thenable<WorkspaceTrustState>;
 
 		/**
 		 * Event that fires when the trust state of the current workspace changes
@@ -2784,4 +2811,32 @@ declare module 'vscode' {
 	}
 
 	//#endregion
+
+	//#region https://github.com/microsoft/vscode/issues/118084
+
+	/**
+	 * The reason why code actions were requested.
+	 */
+	export enum CodeActionTriggerKind {
+		/**
+		 * Code actions were requested automatically.
+		 *
+		 * This typically happens when current selection in a file changes, but can
+		 * also be triggered when file content changes.
+		 */
+		Automatic = 1,
+
+		/**
+		 * Code actions were requested maually by the user or an extension.
+		 */
+		Manual = 2,
+	}
+
+	export interface CodeActionContext {
+		/**
+		 * The reason why code actions were requested.
+		 */
+		readonly triggerKind: CodeActionTriggerKind;
+	}
+	//#endregion
 }
diff --git a/src/vs/workbench/api/browser/mainThreadAuthentication.ts b/src/vs/workbench/api/browser/mainThreadAuthentication.ts
index f2cc04cd726..3de907b0514 100644
--- a/src/vs/workbench/api/browser/mainThreadAuthentication.ts
+++ b/src/vs/workbench/api/browser/mainThreadAuthentication.ts
@@ -136,12 +136,6 @@ export class MainThreadAuthentication extends Disposable implements MainThreadAu
 		this._register(this.authenticationService.onDidUnregisterAuthenticationProvider(info => {
 			this._proxy.$onDidChangeAuthenticationProviders([], [info]);
 		}));
-
-		this._proxy.$setProviders(this.authenticationService.declaredProviders);
-
-		this._register(this.authenticationService.onDidChangeDeclaredProviders(e => {
-			this._proxy.$setProviders(e);
-		}));
 	}
 
 	async $registerAuthenticationProvider(id: string, label: string, supportsMultipleAccounts: boolean): Promise<void> {
diff --git a/src/vs/workbench/api/browser/mainThreadCustomEditors.ts b/src/vs/workbench/api/browser/mainThreadCustomEditors.ts
index e5f1d3f5700..2489c0b5bc8 100644
--- a/src/vs/workbench/api/browser/mainThreadCustomEditors.ts
+++ b/src/vs/workbench/api/browser/mainThreadCustomEditors.ts
@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { multibyteAwareBtoa } from 'vs/base/browser/dom';
-import { CancelablePromise, createCancelablePromise } from 'vs/base/common/async';
+import { CancelablePromise, createCancelablePromise, timeout } from 'vs/base/common/async';
 import { CancellationToken } from 'vs/base/common/cancellation';
 import { isPromiseCanceledError, onUnexpectedError } from 'vs/base/common/errors';
 import { Emitter, Event } from 'vs/base/common/event';
@@ -16,7 +16,7 @@ import { URI, UriComponents } from 'vs/base/common/uri';
 import * as modes from 'vs/editor/common/modes';
 import { localize } from 'vs/nls';
 import { IFileDialogService } from 'vs/platform/dialogs/common/dialogs';
-import { IFileService } from 'vs/platform/files/common/files';
+import { FileChangesEvent, FileChangeType, FileSystemProviderCapabilities, IFileService } from 'vs/platform/files/common/files';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { ILabelService } from 'vs/platform/label/common/label';
 import { IUndoRedoService, UndoRedoElementType } from 'vs/platform/undoRedo/common/undoRedo';
@@ -274,6 +274,8 @@ namespace HotExitState {
 
 class MainThreadCustomEditorModel extends Disposable implements ICustomEditorModel, IWorkingCopy {
 
+	#isDisposed = false;
+
 	private _fromBackup: boolean = false;
 	private _hotExitState: HotExitState.State = HotExitState.Allowed;
 	private _backupId: string | undefined;
@@ -282,9 +284,13 @@ class MainThreadCustomEditorModel extends Disposable implements ICustomEditorMod
 	private _savePoint: number = -1;
 	private readonly _edits: Array<number> = [];
 	private _isDirtyFromContentChange = false;
+	private _inOrphaned = false;
 
 	private _ongoingSave?: CancelablePromise<void>;
 
+	private readonly _onDidChangeOrphaned = this._register(new Emitter<void>());
+	public readonly onDidChangeOrphaned = this._onDidChangeOrphaned.event;
+
 	public static async create(
 		instantiationService: IInstantiationService,
 		proxy: extHostProtocol.ExtHostCustomEditorsShape,
@@ -321,6 +327,8 @@ class MainThreadCustomEditorModel extends Disposable implements ICustomEditorMod
 		if (_editable) {
 			this._register(workingCopyService.registerWorkingCopy(this));
 		}
+
+		this._register(_fileService.onDidFilesChange(e => this.onDidFilesChange(e)));
 	}
 
 	get editorResource() {
@@ -328,10 +336,14 @@ class MainThreadCustomEditorModel extends Disposable implements ICustomEditorMod
 	}
 
 	dispose() {
+		this.#isDisposed = true;
+
 		if (this._editable) {
 			this._undoService.removeElements(this._editorResource);
 		}
+
 		this._proxy.$disposeCustomDocument(this._editorResource, this._viewType);
+
 		super.dispose();
 	}
 
@@ -371,6 +383,10 @@ class MainThreadCustomEditorModel extends Disposable implements ICustomEditorMod
 		return this._fromBackup;
 	}
 
+	public isOrphaned(): boolean {
+		return this._inOrphaned;
+	}
+
 	private isUntitled() {
 		return this._editorResource.scheme === Schemas.untitled;
 	}
@@ -383,8 +399,64 @@ class MainThreadCustomEditorModel extends Disposable implements ICustomEditorMod
 
 	//#endregion
 
-	public isReadonly() {
-		return !this._editable;
+	private async onDidFilesChange(e: FileChangesEvent): Promise<void> {
+		let fileEventImpactsModel = false;
+		let newInOrphanModeGuess: boolean | undefined;
+
+		// If we are currently orphaned, we check if the model file was added back
+		if (this._inOrphaned) {
+			const modelFileAdded = e.contains(this.editorResource, FileChangeType.ADDED);
+			if (modelFileAdded) {
+				newInOrphanModeGuess = false;
+				fileEventImpactsModel = true;
+			}
+		}
+
+		// Otherwise we check if the model file was deleted
+		else {
+			const modelFileDeleted = e.contains(this.editorResource, FileChangeType.DELETED);
+			if (modelFileDeleted) {
+				newInOrphanModeGuess = true;
+				fileEventImpactsModel = true;
+			}
+		}
+
+		if (fileEventImpactsModel && this._inOrphaned !== newInOrphanModeGuess) {
+			let newInOrphanModeValidated: boolean = false;
+			if (newInOrphanModeGuess) {
+				// We have received reports of users seeing delete events even though the file still
+				// exists (network shares issue: https://github.com/microsoft/vscode/issues/13665).
+				// Since we do not want to mark the model as orphaned, we have to check if the
+				// file is really gone and not just a faulty file event.
+				await timeout(100);
+
+				if (this.#isDisposed) {
+					newInOrphanModeValidated = true;
+				} else {
+					const exists = await this._fileService.exists(this.editorResource);
+					newInOrphanModeValidated = !exists;
+				}
+			}
+
+			if (this._inOrphaned !== newInOrphanModeValidated && !this.#isDisposed) {
+				this.setOrphaned(newInOrphanModeValidated);
+			}
+		}
+	}
+
+	private setOrphaned(orphaned: boolean): void {
+		if (this._inOrphaned !== orphaned) {
+			this._inOrphaned = orphaned;
+			this._onDidChangeOrphaned.fire();
+		}
+	}
+
+	public isEditable(): boolean {
+		return this._editable;
+	}
+
+	public isOnReadonlyFileSystem(): boolean {
+		return this._fileService.hasCapability(this.editorResource, FileSystemProviderCapabilities.Readonly);
 	}
 
 	public get viewType() {
diff --git a/src/vs/workbench/api/browser/mainThreadNotebook.ts b/src/vs/workbench/api/browser/mainThreadNotebook.ts
index a50501f24fe..60994dc5311 100644
--- a/src/vs/workbench/api/browser/mainThreadNotebook.ts
+++ b/src/vs/workbench/api/browser/mainThreadNotebook.ts
@@ -12,21 +12,20 @@ import { ResourceMap } from 'vs/base/common/map';
 import { Schemas } from 'vs/base/common/network';
 import { isEqual } from 'vs/base/common/resources';
 import { URI, UriComponents } from 'vs/base/common/uri';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { EditorActivation, ITextEditorOptions, EditorOverride } from 'vs/platform/editor/common/editor';
+import { EditorActivation, EditorOverride } from 'vs/platform/editor/common/editor';
+import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { ILogService } from 'vs/platform/log/common/log';
 import { BoundModelReferenceCollection } from 'vs/workbench/api/browser/mainThreadDocuments';
 import { extHostNamedCustomer } from 'vs/workbench/api/common/extHostCustomers';
-import { viewColumnToEditorGroup } from 'vs/workbench/common/editor';
-import { INotebookEditor } from 'vs/workbench/contrib/notebook/browser/notebookBrowser';
+import { getNotebookEditorFromEditorPane, INotebookEditor, NotebookEditorOptions } from 'vs/workbench/contrib/notebook/browser/notebookBrowser';
+import { NotebookEditorInput } from 'vs/workbench/contrib/notebook/browser/notebookEditorInput';
 import { NotebookCellTextModel } from 'vs/workbench/contrib/notebook/common/model/notebookCellTextModel';
 import { NotebookTextModel } from 'vs/workbench/contrib/notebook/common/model/notebookTextModel';
 import { INotebookCellStatusBarService } from 'vs/workbench/contrib/notebook/common/notebookCellStatusBarService';
 import { ICellEditOperation, ICellRange, IEditor, IMainCellDto, INotebookDecorationRenderOptions, INotebookDocumentFilter, INotebookExclusiveDocumentFilter, INotebookKernel, NotebookCellsChangeType, TransientMetadata } from 'vs/workbench/contrib/notebook/common/notebookCommon';
 import { INotebookEditorModelResolverService } from 'vs/workbench/contrib/notebook/common/notebookEditorModelResolverService';
 import { IMainNotebookController, INotebookService } from 'vs/workbench/contrib/notebook/common/notebookService';
-import { IEditorGroup, IEditorGroupsService, preferredSideBySideGroupDirection } from 'vs/workbench/services/editor/common/editorGroupsService';
-import { IEditorService, SIDE_GROUP } from 'vs/workbench/services/editor/common/editorService';
+import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
 import { IUriIdentityService } from 'vs/workbench/services/uriIdentity/common/uriIdentity';
 import { IWorkingCopyService } from 'vs/workbench/services/workingCopy/common/workingCopyService';
 import { ExtHostContext, ExtHostNotebookShape, IExtHostContext, INotebookCellStatusBarEntryDto, INotebookDocumentsAndEditorsDelta, INotebookDocumentShowOptions, INotebookEditorAddData, INotebookModelAddedData, MainContext, MainThreadNotebookShape, NotebookEditorRevealType, NotebookExtensionDescription } from '../common/extHost.protocol';
@@ -95,7 +94,7 @@ class DocumentAndEditorState {
 	private static _asEditorAddData(add: IEditor): INotebookEditorAddData {
 		return {
 			id: add.getId(),
-			documentUri: add.uri!,
+			documentUri: add.textModel!.uri,
 			selections: add.getSelections(),
 			visibleRanges: add.visibleRanges
 		};
@@ -118,11 +117,10 @@ export class MainThreadNotebooks extends Disposable implements MainThreadNoteboo
 
 	constructor(
 		extHostContext: IExtHostContext,
+		@IInstantiationService private readonly _instantiationService: IInstantiationService,
 		@IWorkingCopyService private readonly _workingCopyService: IWorkingCopyService,
 		@INotebookService private _notebookService: INotebookService,
-		@IConfigurationService private readonly _configurationService: IConfigurationService,
 		@IEditorService private readonly _editorService: IEditorService,
-		@IEditorGroupsService private readonly _editorGroupsService: IEditorGroupsService,
 		@ILogService private readonly _logService: ILogService,
 		@INotebookCellStatusBarService private readonly _cellStatusBarService: INotebookCellStatusBarService,
 		@INotebookEditorModelResolverService private readonly _notebookModelResolverService: INotebookEditorModelResolverService,
@@ -160,7 +158,10 @@ export class MainThreadNotebooks extends Disposable implements MainThreadNoteboo
 		if (!textModel) {
 			return false;
 		}
-		return textModel.applyEdits(modelVersionId, cellEdits, true, undefined, () => undefined, undefined);
+		if (textModel.versionId !== modelVersionId) {
+			return false;
+		}
+		return textModel.applyEdits(cellEdits, true, undefined, () => undefined, undefined);
 	}
 
 	private _isDeltaEmpty(delta: INotebookDocumentsAndEditorsDelta) {
@@ -220,12 +221,12 @@ export class MainThreadNotebooks extends Disposable implements MainThreadNoteboo
 			this._addNotebookEditor(e);
 		});
 
-		this._register(this._notebookService.onDidChangeActiveEditor(e => {
+		this._register(this._editorService.onDidActiveEditorChange(e => {
 			this._updateState();
 		}));
 
-		this._register(this._notebookService.onDidChangeVisibleEditors(e => {
-			if (this._notebookProviders.size > 0) {
+		this._register(this._editorService.onDidVisibleEditorsChange(e => {
+			if (this._notebookProviders.size > 0) { // TODO@rebornix propably wrong, what about providers from another host
 				if (!this._currentState) {
 					// no current state means we didn't even create editors in ext host yet.
 					return;
@@ -236,7 +237,7 @@ export class MainThreadNotebooks extends Disposable implements MainThreadNoteboo
 			}
 		}));
 
-		const notebookEditorAddedHandler = (editor: IEditor) => {
+		const notebookEditorAddedHandler = (editor: INotebookEditor) => {
 			if (!this._editorEventListenersMapping.has(editor.getId())) {
 				const disposableStore = new DisposableStore();
 				disposableStore.add(editor.onDidChangeVisibleRanges(() => {
@@ -247,12 +248,26 @@ export class MainThreadNotebooks extends Disposable implements MainThreadNoteboo
 					this._proxy.$acceptEditorPropertiesChanged(editor.getId(), { visibleRanges: null, selections: { selections: editor.getSelections() } });
 				}));
 
+				disposableStore.add(editor.onDidChangeKernel(() => {
+					if (!editor.hasModel()) {
+						return;
+					}
+					this._proxy.$acceptNotebookActiveKernelChange({
+						uri: editor.viewModel.uri,
+						providerHandle: editor.activeKernel?.providerHandle,
+						kernelFriendlyId: editor.activeKernel?.friendlyId
+					});
+				}));
+
 				this._editorEventListenersMapping.set(editor.getId(), disposableStore);
 			}
 		};
 
+		this._notebookService.listNotebookEditors().forEach(editor => {
+			notebookEditorAddedHandler(editor as INotebookEditor); //TODO@jrieken IEditor vs INotebookEditor
+		});
 		this._register(this._notebookService.onNotebookEditorAdd(editor => {
-			notebookEditorAddedHandler(editor);
+			notebookEditorAddedHandler(editor as INotebookEditor); //TODO@jrieken IEditor vs INotebookEditor
 			this._addNotebookEditor(editor);
 		}));
 
@@ -265,9 +280,6 @@ export class MainThreadNotebooks extends Disposable implements MainThreadNoteboo
 			});
 		}));
 
-		this._notebookService.listNotebookEditors().forEach(editor => {
-			notebookEditorAddedHandler(editor);
-		});
 
 		const cellToDto = (cell: NotebookCellTextModel): IMainCellDto => {
 			return {
@@ -353,8 +365,7 @@ export class MainThreadNotebooks extends Disposable implements MainThreadNoteboo
 			this._proxy.$acceptModelSaved(e);
 		}));
 
-		const activeEditorPane = this._editorService.activeEditorPane as any | undefined;
-		const notebookEditor = activeEditorPane?.isNotebookEditor ? activeEditorPane.getControl() : undefined;
+		const notebookEditor = getNotebookEditorFromEditorPane(this._editorService.activeEditorPane);
 		this._updateState(notebookEditor);
 	}
 
@@ -366,9 +377,8 @@ export class MainThreadNotebooks extends Disposable implements MainThreadNoteboo
 			}),
 		));
 
-		const activeEditorPane = this._editorService.activeEditorPane as any | undefined;
-		const notebookEditor = activeEditorPane?.isNotebookEditor ? activeEditorPane.getControl() : undefined;
-		this._updateState(notebookEditor);
+		const activeNotebookEditor = getNotebookEditorFromEditorPane(this._editorService.activeEditorPane);
+		this._updateState(activeNotebookEditor);
 	}
 
 	private _removeNotebookEditor(editors: IEditor[]) {
@@ -386,12 +396,8 @@ export class MainThreadNotebooks extends Disposable implements MainThreadNoteboo
 	private async _updateState(focusedNotebookEditor?: IEditor) {
 		let activeEditor: string | null = null;
 
-		const activeEditorPane = this._editorService.activeEditorPane as any | undefined;
-		if (activeEditorPane?.isNotebookEditor) {
-			const notebookEditor = (activeEditorPane.getControl() as INotebookEditor);
-			activeEditor = notebookEditor && notebookEditor.hasModel() ? notebookEditor!.getId() : null;
-		}
-
+		const activeNotebookEditor = getNotebookEditorFromEditorPane(this._editorService.activeEditorPane);
+		activeEditor = activeNotebookEditor && activeNotebookEditor.hasModel() ? activeNotebookEditor.getId() : null;
 		const documentEditorsMap = new Map<string, IEditor>();
 
 		const editors = new Map<string, IEditor>();
@@ -403,12 +409,10 @@ export class MainThreadNotebooks extends Disposable implements MainThreadNoteboo
 		});
 
 		const visibleEditorsMap = new Map<string, IEditor>();
-		this._editorService.visibleEditorPanes.forEach(editor => {
-			if ((editor as any).isNotebookEditor) {
-				const nbEditorWidget = (editor as any).getControl() as INotebookEditor;
-				if (nbEditorWidget && editors.has(nbEditorWidget.getId())) {
-					visibleEditorsMap.set(nbEditorWidget.getId(), nbEditorWidget);
-				}
+		this._editorService.visibleEditorPanes.forEach(editorPane => {
+			const nbEditorWidget = getNotebookEditorFromEditorPane(editorPane);
+			if (nbEditorWidget && editors.has(nbEditorWidget.getId())) {
+				visibleEditorsMap.set(nbEditorWidget.getId(), nbEditorWidget);
 			}
 		});
 
@@ -565,7 +569,7 @@ export class MainThreadNotebooks extends Disposable implements MainThreadNoteboo
 
 	async $postMessage(editorId: string, forRendererId: string | undefined, value: any): Promise<boolean> {
 		const editor = this._notebookService.getNotebookEditor(editorId) as INotebookEditor | undefined;
-		if (editor?.isNotebookEditor) {
+		if (editor) {
 			editor.postMessage(forRendererId, value);
 			return true;
 		}
@@ -574,8 +578,8 @@ export class MainThreadNotebooks extends Disposable implements MainThreadNoteboo
 	}
 
 	async $tryRevealRange(id: string, range: ICellRange, revealType: NotebookEditorRevealType) {
-		const editor = this._notebookService.listNotebookEditors().find(editor => editor.getId() === id);
-		if (editor && editor.isNotebookEditor) {
+		const editor = this._notebookService.listNotebookEditors().find(editor => editor.getId() === id) as INotebookEditor | undefined;
+		if (editor) {
 			const notebookEditor = editor as INotebookEditor;
 			if (!notebookEditor.hasModel()) {
 				return;
@@ -610,8 +614,8 @@ export class MainThreadNotebooks extends Disposable implements MainThreadNoteboo
 	}
 
 	$trySetDecorations(id: string, range: ICellRange, key: string) {
-		const editor = this._notebookService.listNotebookEditors().find(editor => editor.getId() === id);
-		if (editor && editor.isNotebookEditor) {
+		const editor = this._notebookService.listNotebookEditors().find(editor => editor.getId() === id) as INotebookEditor | undefined;
+		if (editor) {
 			const notebookEditor = editor as INotebookEditor;
 			notebookEditor.setEditorDecorations(key, range);
 		}
@@ -652,7 +656,8 @@ export class MainThreadNotebooks extends Disposable implements MainThreadNoteboo
 	}
 
 	async $tryShowNotebookDocument(resource: UriComponents, viewType: string, options: INotebookDocumentShowOptions): Promise<string> {
-		const editorOptions: ITextEditorOptions = {
+		const editorOptions = new NotebookEditorOptions({
+			cellSelections: options.selection && [options.selection],
 			preserveFocus: options.preserveFocus,
 			pinned: options.pinned,
 			// selection: options.selection,
@@ -660,36 +665,13 @@ export class MainThreadNotebooks extends Disposable implements MainThreadNoteboo
 			// but make sure to restore the editor to fix https://github.com/microsoft/vscode/issues/79633
 			activation: options.preserveFocus ? EditorActivation.RESTORE : undefined,
 			override: EditorOverride.DISABLED,
-		};
+		});
 
-		const columnArg = viewColumnToEditorGroup(this._editorGroupsService, options.position);
-
-		let group: IEditorGroup | undefined = undefined;
-
-		if (columnArg === SIDE_GROUP) {
-			const direction = preferredSideBySideGroupDirection(this._configurationService);
-
-			let neighbourGroup = this._editorGroupsService.findGroup({ direction });
-			if (!neighbourGroup) {
-				neighbourGroup = this._editorGroupsService.addGroup(this._editorGroupsService.activeGroup, direction);
-			}
-			group = neighbourGroup;
-		} else {
-			group = this._editorGroupsService.getGroup(viewColumnToEditorGroup(this._editorGroupsService, columnArg)) ?? this._editorGroupsService.activeGroup;
-		}
-
-		const input = this._editorService.createEditorInput({ resource: URI.revive(resource), options: editorOptions });
-
-		// TODO: handle options.selection
-		const editorPane = await this._editorService.openEditor(input, { ...options, override: viewType }, group);
-		const notebookEditor = (editorPane as unknown as { isNotebookEditor?: boolean })?.isNotebookEditor ? (editorPane!.getControl() as INotebookEditor) : undefined;
+		const input = NotebookEditorInput.create(this._instantiationService, URI.revive(resource), viewType);
+		const editorPane = await this._editorService.openEditor(input, editorOptions, options.position);
+		const notebookEditor = getNotebookEditorFromEditorPane(editorPane);
 
 		if (notebookEditor) {
-			if (notebookEditor.viewModel && options.selection && notebookEditor.viewModel.viewCells[options.selection.start]) {
-				const focusedCell = notebookEditor.viewModel.viewCells[options.selection.start];
-				notebookEditor.revealInCenterIfOutsideViewport(focusedCell);
-				notebookEditor.focusElement(focusedCell);
-			}
 			return notebookEditor.getId();
 		} else {
 			throw new Error(`Notebook Editor creation failure for documenet ${resource}`);
diff --git a/src/vs/workbench/api/browser/mainThreadTelemetry.ts b/src/vs/workbench/api/browser/mainThreadTelemetry.ts
index 3b800af7284..99b91ad20a2 100644
--- a/src/vs/workbench/api/browser/mainThreadTelemetry.ts
+++ b/src/vs/workbench/api/browser/mainThreadTelemetry.ts
@@ -4,24 +4,46 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { MainThreadTelemetryShape, MainContext, IExtHostContext } from '../common/extHost.protocol';
+import { MainThreadTelemetryShape, MainContext, IExtHostContext, ExtHostTelemetryShape, ExtHostContext } from '../common/extHost.protocol';
 import { extHostNamedCustomer } from 'vs/workbench/api/common/extHostCustomers';
 import { ClassifiedEvent, StrictPropertyCheck, GDPRClassification } from 'vs/platform/telemetry/common/gdprTypings';
+import { Disposable } from 'vs/base/common/lifecycle';
+import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
+import { IEnvironmentService } from 'vs/platform/environment/common/environment';
 
 @extHostNamedCustomer(MainContext.MainThreadTelemetry)
-export class MainThreadTelemetry implements MainThreadTelemetryShape {
+export class MainThreadTelemetry extends Disposable implements MainThreadTelemetryShape {
+	private readonly _proxy: ExtHostTelemetryShape;
 
 	private static readonly _name = 'pluginHostTelemetry';
 
 	constructor(
 		extHostContext: IExtHostContext,
-		@ITelemetryService private readonly _telemetryService: ITelemetryService
+		@ITelemetryService private readonly _telemetryService: ITelemetryService,
+		@IConfigurationService private readonly _configurationService: IConfigurationService,
+		@IEnvironmentService private readonly _environmenService: IEnvironmentService,
 	) {
-		//
+		super();
+
+		this._proxy = extHostContext.getProxy(ExtHostContext.ExtHostTelemetry);
+
+		if (!this._environmenService.disableTelemetry) {
+			this._register(this._configurationService.onDidChangeConfiguration(e => {
+				if (e.affectedKeys.includes('telemetry.enableTelemetry')) {
+					this._proxy.$onDidChangeTelemetryEnabled(this.telemetryEnabled);
+				}
+			}));
+		}
+
+		this._proxy.$initializeTelemetryEnabled(this.telemetryEnabled);
 	}
 
-	dispose(): void {
-		//
+	private get telemetryEnabled(): boolean {
+		if (this._environmenService.disableTelemetry) {
+			return false;
+		}
+
+		return !!this._configurationService.getValue('telemetry.enableTelemetry');
 	}
 
 	$publicLog(eventName: string, data: any = Object.create(null)): void {
diff --git a/src/vs/workbench/api/browser/mainThreadTerminalService.ts b/src/vs/workbench/api/browser/mainThreadTerminalService.ts
index dc6081e5033..bfe986601f1 100644
--- a/src/vs/workbench/api/browser/mainThreadTerminalService.ts
+++ b/src/vs/workbench/api/browser/mainThreadTerminalService.ts
@@ -63,8 +63,8 @@ export class MainThreadTerminalService implements MainThreadTerminalServiceShape
 		this._toDispose.add(_terminalService.onInstanceDimensionsChanged(instance => this._onInstanceDimensionsChanged(instance)));
 		this._toDispose.add(_terminalService.onInstanceMaximumDimensionsChanged(instance => this._onInstanceMaximumDimensionsChanged(instance)));
 		this._toDispose.add(_terminalService.onInstanceRequestStartExtensionTerminal(e => this._onRequestStartExtensionTerminal(e)));
-		this._toDispose.add(_terminalService.onActiveInstanceChanged(instance => this._onActiveTerminalChanged(instance ? instance.id : null)));
-		this._toDispose.add(_terminalService.onInstanceTitleChanged(instance => instance && this._onTitleChanged(instance.id, instance.title)));
+		this._toDispose.add(_terminalService.onActiveInstanceChanged(instance => this._onActiveTerminalChanged(instance ? instance.instanceId : null)));
+		this._toDispose.add(_terminalService.onInstanceTitleChanged(instance => instance && this._onTitleChanged(instance.instanceId, instance.title)));
 		this._toDispose.add(_terminalService.configHelper.onWorkspacePermissionsChanged(isAllowed => this._onWorkspacePermissionsChanged(isAllowed)));
 		this._toDispose.add(_terminalService.onRequestAvailableShells(e => this._onRequestAvailableShells(e)));
 
@@ -80,7 +80,7 @@ export class MainThreadTerminalService implements MainThreadTerminalServiceShape
 		});
 		const activeInstance = this._terminalService.getActiveInstance();
 		if (activeInstance) {
-			this._proxy.$acceptActiveTerminalChanged(activeInstance.id);
+			this._proxy.$acceptActiveTerminalChanged(activeInstance.instanceId);
 		}
 		if (this._environmentVariableService.collections.size > 0) {
 			const collectionAsArray = [...this._environmentVariableService.collections.entries()];
@@ -127,12 +127,13 @@ export class MainThreadTerminalService implements MainThreadTerminalServiceShape
 			env: launchConfig.env,
 			strictEnv: launchConfig.strictEnv,
 			hideFromUser: launchConfig.hideFromUser,
-			isExtensionTerminal: launchConfig.isExtensionTerminal,
+			isExtensionCustomPtyTerminal: launchConfig.isExtensionCustomPtyTerminal,
 			extHostTerminalId: extHostTerminalId,
-			isFeatureTerminal: launchConfig.isFeatureTerminal
+			isFeatureTerminal: launchConfig.isFeatureTerminal,
+			isExtensionOwnedTerminal: launchConfig.isExtensionOwnedTerminal
 		};
 		const terminal = this._terminalService.createTerminal(shellLaunchConfig);
-		this._extHostTerminalIds.set(extHostTerminalId, terminal.id);
+		this._extHostTerminalIds.set(extHostTerminalId, terminal.instanceId);
 	}
 
 	public $show(id: TerminalIdentifier, preserveFocus: boolean): void {
@@ -146,7 +147,7 @@ export class MainThreadTerminalService implements MainThreadTerminalServiceShape
 	public $hide(id: TerminalIdentifier): void {
 		const rendererId = this._getTerminalId(id);
 		const instance = this._terminalService.getActiveInstance();
-		if (instance && instance.id === rendererId) {
+		if (instance && instance.instanceId === rendererId) {
 			this._terminalService.hidePanel();
 		}
 	}
@@ -172,7 +173,7 @@ export class MainThreadTerminalService implements MainThreadTerminalServiceShape
 			});
 			// Send initial events if they exist
 			this._terminalService.terminalInstances.forEach(t => {
-				t.initialDataEvents?.forEach(d => this._onTerminalData(t.id, d));
+				t.initialDataEvents?.forEach(d => this._onTerminalData(t.instanceId, d));
 			});
 		}
 	}
@@ -215,7 +216,7 @@ export class MainThreadTerminalService implements MainThreadTerminalServiceShape
 	}
 
 	private _onTerminalDisposed(terminalInstance: ITerminalInstance): void {
-		this._proxy.$acceptTerminalClosed(terminalInstance.id, terminalInstance.exitCode);
+		this._proxy.$acceptTerminalClosed(terminalInstance.instanceId, terminalInstance.exitCode);
 	}
 
 	private _onTerminalOpened(terminalInstance: ITerminalInstance): void {
@@ -228,28 +229,28 @@ export class MainThreadTerminalService implements MainThreadTerminalServiceShape
 			env: terminalInstance.shellLaunchConfig.env,
 			hideFromUser: terminalInstance.shellLaunchConfig.hideFromUser
 		};
-		this._proxy.$acceptTerminalOpened(terminalInstance.id, extHostTerminalId, terminalInstance.title, shellLaunchConfigDto);
+		this._proxy.$acceptTerminalOpened(terminalInstance.instanceId, extHostTerminalId, terminalInstance.title, shellLaunchConfigDto);
 	}
 
 	private _onTerminalProcessIdReady(terminalInstance: ITerminalInstance): void {
 		if (terminalInstance.processId === undefined) {
 			return;
 		}
-		this._proxy.$acceptTerminalProcessId(terminalInstance.id, terminalInstance.processId);
+		this._proxy.$acceptTerminalProcessId(terminalInstance.instanceId, terminalInstance.processId);
 	}
 
 	private _onInstanceDimensionsChanged(instance: ITerminalInstance): void {
-		this._proxy.$acceptTerminalDimensions(instance.id, instance.cols, instance.rows);
+		this._proxy.$acceptTerminalDimensions(instance.instanceId, instance.cols, instance.rows);
 	}
 
 	private _onInstanceMaximumDimensionsChanged(instance: ITerminalInstance): void {
-		this._proxy.$acceptTerminalMaximumDimensions(instance.id, instance.maxCols, instance.maxRows);
+		this._proxy.$acceptTerminalMaximumDimensions(instance.instanceId, instance.maxCols, instance.maxRows);
 	}
 
 
 	private _onRequestStartExtensionTerminal(request: IStartExtensionTerminalRequest): void {
 		const proxy = request.proxy;
-		this._terminalProcessProxies.set(proxy.terminalId, proxy);
+		this._terminalProcessProxies.set(proxy.instanceId, proxy);
 
 		// Note that onReisze is not being listened to here as it needs to fire when max dimensions
 		// change, excluding the dimension override
@@ -259,15 +260,15 @@ export class MainThreadTerminalService implements MainThreadTerminalServiceShape
 		} : undefined;
 
 		this._proxy.$startExtensionTerminal(
-			proxy.terminalId,
+			proxy.instanceId,
 			initialDimensions
 		).then(request.callback);
 
-		proxy.onInput(data => this._proxy.$acceptProcessInput(proxy.terminalId, data));
-		proxy.onShutdown(immediate => this._proxy.$acceptProcessShutdown(proxy.terminalId, immediate));
-		proxy.onRequestCwd(() => this._proxy.$acceptProcessRequestCwd(proxy.terminalId));
-		proxy.onRequestInitialCwd(() => this._proxy.$acceptProcessRequestInitialCwd(proxy.terminalId));
-		proxy.onRequestLatency(() => this._onRequestLatency(proxy.terminalId));
+		proxy.onInput(data => this._proxy.$acceptProcessInput(proxy.instanceId, data));
+		proxy.onShutdown(immediate => this._proxy.$acceptProcessShutdown(proxy.instanceId, immediate));
+		proxy.onRequestCwd(() => this._proxy.$acceptProcessRequestCwd(proxy.instanceId));
+		proxy.onRequestInitialCwd(() => this._proxy.$acceptProcessRequestInitialCwd(proxy.instanceId));
+		proxy.onRequestLatency(() => this._onRequestLatency(proxy.instanceId));
 	}
 
 	public $sendProcessTitle(terminalId: number, title: string): void {
@@ -400,12 +401,12 @@ class TerminalDataEventTracker extends Disposable {
 
 		this._terminalService.terminalInstances.forEach(instance => this._registerInstance(instance));
 		this._register(this._terminalService.onInstanceCreated(instance => this._registerInstance(instance)));
-		this._register(this._terminalService.onInstanceDisposed(instance => this._bufferer.stopBuffering(instance.id)));
+		this._register(this._terminalService.onInstanceDisposed(instance => this._bufferer.stopBuffering(instance.instanceId)));
 	}
 
 	private _registerInstance(instance: ITerminalInstance): void {
 		// Buffer data events to reduce the amount of messages going to the extension host
-		this._register(this._bufferer.startBuffering(instance.id, instance.onData));
+		this._register(this._bufferer.startBuffering(instance.instanceId, instance.onData));
 	}
 }
 
@@ -417,13 +418,13 @@ class ExtensionTerminalLinkProvider implements ITerminalExternalLinkProvider {
 
 	async provideLinks(instance: ITerminalInstance, line: string): Promise<ITerminalLink[] | undefined> {
 		const proxy = this._proxy;
-		const extHostLinks = await proxy.$provideLinks(instance.id, line);
+		const extHostLinks = await proxy.$provideLinks(instance.instanceId, line);
 		return extHostLinks.map(dto => ({
 			id: dto.id,
 			startIndex: dto.startIndex,
 			length: dto.length,
 			label: dto.label,
-			activate: () => proxy.$activateLink(instance.id, dto.id)
+			activate: () => proxy.$activateLink(instance.instanceId, dto.id)
 		}));
 	}
 }
diff --git a/src/vs/workbench/api/browser/mainThreadTunnelService.ts b/src/vs/workbench/api/browser/mainThreadTunnelService.ts
index 052f5a24516..e58a00c5f2e 100644
--- a/src/vs/workbench/api/browser/mainThreadTunnelService.ts
+++ b/src/vs/workbench/api/browser/mainThreadTunnelService.ts
@@ -102,26 +102,23 @@ export class MainThreadTunnelService extends Disposable implements MainThreadTun
 		const tunnelProvider: ITunnelProvider = {
 			forwardPort: (tunnelOptions: TunnelOptions, tunnelCreationOptions: TunnelCreationOptions) => {
 				const forward = this._proxy.$forwardPort(tunnelOptions, tunnelCreationOptions);
-				if (forward) {
-					return forward.then(tunnel => {
-						this.logService.trace(`MainThreadTunnelService: New tunnel established by tunnel provider: ${tunnel?.remoteAddress.host}:${tunnel?.remoteAddress.port}`);
-						if (!tunnel) {
-							return undefined;
+				return forward.then(tunnel => {
+					this.logService.trace(`ForwardedPorts: (MainThreadTunnelService) New tunnel established by tunnel provider: ${tunnel?.remoteAddress.host}:${tunnel?.remoteAddress.port}`);
+					if (!tunnel) {
+						return undefined;
+					}
+					return {
+						tunnelRemotePort: tunnel.remoteAddress.port,
+						tunnelRemoteHost: tunnel.remoteAddress.host,
+						localAddress: typeof tunnel.localAddress === 'string' ? tunnel.localAddress : makeAddress(tunnel.localAddress.host, tunnel.localAddress.port),
+						tunnelLocalPort: typeof tunnel.localAddress !== 'string' ? tunnel.localAddress.port : undefined,
+						public: tunnel.public,
+						dispose: async (silent?: boolean) => {
+							this.logService.trace(`ForwardedPorts: (MainThreadTunnelService) Closing tunnel from tunnel provider: ${tunnel?.remoteAddress.host}:${tunnel?.remoteAddress.port}`);
+							return this._proxy.$closeTunnel({ host: tunnel.remoteAddress.host, port: tunnel.remoteAddress.port }, silent);
 						}
-						return {
-							tunnelRemotePort: tunnel.remoteAddress.port,
-							tunnelRemoteHost: tunnel.remoteAddress.host,
-							localAddress: typeof tunnel.localAddress === 'string' ? tunnel.localAddress : makeAddress(tunnel.localAddress.host, tunnel.localAddress.port),
-							tunnelLocalPort: typeof tunnel.localAddress !== 'string' ? tunnel.localAddress.port : undefined,
-							public: tunnel.public,
-							dispose: async (silent?: boolean) => {
-								this.logService.trace(`MainThreadTunnelService: Closing tunnel from tunnel provider: ${tunnel?.remoteAddress.host}:${tunnel?.remoteAddress.port}`);
-								return this._proxy.$closeTunnel({ host: tunnel.remoteAddress.host, port: tunnel.remoteAddress.port }, silent);
-							}
-						};
-					});
-				}
-				return undefined;
+					};
+				});
 			}
 		};
 		this.tunnelService.setTunnelProvider(tunnelProvider, features);
diff --git a/src/vs/workbench/api/browser/mainThreadWorkspace.ts b/src/vs/workbench/api/browser/mainThreadWorkspace.ts
index c2a442bcc52..87735e94efa 100644
--- a/src/vs/workbench/api/browser/mainThreadWorkspace.ts
+++ b/src/vs/workbench/api/browser/mainThreadWorkspace.ts
@@ -16,7 +16,7 @@ import { IInstantiationService } from 'vs/platform/instantiation/common/instanti
 import { ILabelService } from 'vs/platform/label/common/label';
 import { INotificationService } from 'vs/platform/notification/common/notification';
 import { IRequestService } from 'vs/platform/request/common/request';
-import { WorkspaceTrustStateChangeEvent, IWorkspaceTrustService, WorkspaceTrustState } from 'vs/platform/workspace/common/workspaceTrust';
+import { WorkspaceTrustStateChangeEvent, IWorkspaceTrustService, WorkspaceTrustRequest, WorkspaceTrustState } from 'vs/platform/workspace/common/workspaceTrust';
 import { IWorkspace, IWorkspaceContextService, WorkbenchState } from 'vs/platform/workspace/common/workspace';
 import { isUntitledWorkspace } from 'vs/platform/workspaces/common/workspaces';
 import { extHostNamedCustomer } from 'vs/workbench/api/common/extHostCustomers';
@@ -208,8 +208,8 @@ export class MainThreadWorkspace implements MainThreadWorkspaceShape {
 
 	// --- trust ---
 
-	$requireWorkspaceTrust(modal?: boolean): Promise<WorkspaceTrustState> {
-		return this._workspaceTrustService.requireWorkspaceTrust({ modal: modal ?? true });
+	$requireWorkspaceTrust(request?: WorkspaceTrustRequest): Promise<WorkspaceTrustState> {
+		return this._workspaceTrustService.requireWorkspaceTrust(request);
 	}
 
 	private getWorkspaceTrustState(): WorkspaceTrustState {
diff --git a/src/vs/workbench/api/common/extHost.api.impl.ts b/src/vs/workbench/api/common/extHost.api.impl.ts
index ca370ab84b7..21911d59046 100644
--- a/src/vs/workbench/api/common/extHost.api.impl.ts
+++ b/src/vs/workbench/api/common/extHost.api.impl.ts
@@ -85,6 +85,7 @@ import { ExtHostTesting } from 'vs/workbench/api/common/extHostTesting';
 import { ExtHostUriOpeners } from 'vs/workbench/api/common/extHostUriOpener';
 import { IExtHostSecretState } from 'vs/workbench/api/common/exHostSecretState';
 import { ExtHostEditorTabs } from 'vs/workbench/api/common/extHostEditorTabs';
+import { IExtHostTelemetry } from 'vs/workbench/api/common/extHostTelemetry';
 
 export interface IExtensionApiFactory {
 	(extension: IExtensionDescription, registry: ExtensionDescriptionRegistry, configProvider: ExtHostConfigProvider): typeof vscode;
@@ -101,6 +102,7 @@ export function createApiFactoryAndRegisterActors(accessor: ServicesAccessor): I
 	const extHostConsumerFileSystem = accessor.get(IExtHostConsumerFileSystem);
 	const extensionService = accessor.get(IExtHostExtensionService);
 	const extHostWorkspace = accessor.get(IExtHostWorkspace);
+	const extHostTelemetry = accessor.get(IExtHostTelemetry);
 	const extHostConfiguration = accessor.get(IExtHostConfiguration);
 	const uriTransformer = accessor.get(IURITransformerService);
 	const rpcProtocol = accessor.get(IExtHostRpcService);
@@ -122,6 +124,7 @@ export function createApiFactoryAndRegisterActors(accessor: ServicesAccessor): I
 	rpcProtocol.set(ExtHostContext.ExtHostTunnelService, extHostTunnelService);
 	rpcProtocol.set(ExtHostContext.ExtHostWindow, extHostWindow);
 	rpcProtocol.set(ExtHostContext.ExtHostSecretState, extHostSecretState);
+	rpcProtocol.set(ExtHostContext.ExtHostTelemetry, extHostTelemetry);
 
 	// automatically create and register addressable instances
 	const extHostDecorations = rpcProtocol.set(ExtHostContext.ExtHostDecorations, accessor.get(IExtHostDecorations));
@@ -292,6 +295,14 @@ export function createApiFactoryAndRegisterActors(accessor: ServicesAccessor): I
 			get shell() {
 				return extHostTerminalService.getDefaultShell(false, configProvider);
 			},
+			get isTelemetryEnabled() {
+				checkProposedApiEnabled(extension);
+				return extHostTelemetry.getTelemetryEnabled();
+			},
+			get onDidChangeTelemetryEnabled(): Event<boolean> {
+				checkProposedApiEnabled(extension);
+				return extHostTelemetry.onDidChangeTelemetryEnabled;
+			},
 			openExternal(uri: URI, options?: { allowContributedOpeners?: boolean | string; }) {
 				return extHostWindow.openUri(uri, {
 					allowTunneling: !!initData.remote.authority,
@@ -899,10 +910,10 @@ export function createApiFactoryAndRegisterActors(accessor: ServicesAccessor): I
 				checkRequiresWorkspaceTrust(extension);
 				return extHostWorkspace.trustState;
 			},
-			requireWorkspaceTrust: (modal?: boolean) => {
+			requireWorkspaceTrust: (request?: vscode.WorkspaceTrustRequest) => {
 				checkProposedApiEnabled(extension);
 				checkRequiresWorkspaceTrust(extension);
-				return extHostWorkspace.requireWorkspaceTrust(modal);
+				return extHostWorkspace.requireWorkspaceTrust(request);
 			},
 			onDidChangeWorkspaceTrustState: (listener, thisArgs?, disposables?) => {
 				return extHostWorkspace.onDidChangeWorkspaceTrustState(listener, thisArgs, disposables);
@@ -1012,15 +1023,7 @@ export function createApiFactoryAndRegisterActors(accessor: ServicesAccessor): I
 		};
 
 		// namespace: notebook
-		const notebook: (typeof vscode.notebook & {
-			// to ensure that notebook extensions not break before they update APIs.
-			visibleNotebookEditors: vscode.NotebookEditor[];
-			onDidChangeVisibleNotebookEditors: Event<vscode.NotebookEditor[]>;
-			activeNotebookEditor: vscode.NotebookEditor | undefined;
-			onDidChangeActiveNotebookEditor: Event<vscode.NotebookEditor | undefined>;
-			onDidChangeNotebookEditorSelection: Event<vscode.NotebookEditorSelectionChangeEvent>;
-			onDidChangeNotebookEditorVisibleRanges: Event<vscode.NotebookEditorVisibleRangesChangeEvent>;
-		}) = {
+		const notebook: typeof vscode.notebook = {
 			openNotebookDocument: (uriComponents, viewType) => {
 				checkProposedApiEnabled(extension);
 				return extHostNotebook.openNotebookDocument(uriComponents, viewType);
@@ -1041,14 +1044,6 @@ export function createApiFactoryAndRegisterActors(accessor: ServicesAccessor): I
 				checkProposedApiEnabled(extension);
 				return extHostNotebook.notebookDocuments.map(d => d.notebookDocument);
 			},
-			get visibleNotebookEditors(): vscode.NotebookEditor[] {
-				checkProposedApiEnabled(extension);
-				return extHostNotebook.visibleNotebookEditors;
-			},
-			get onDidChangeVisibleNotebookEditors() {
-				checkProposedApiEnabled(extension);
-				return extHostNotebook.onDidChangeVisibleNotebookEditors;
-			},
 			get onDidChangeActiveNotebookKernel() {
 				checkProposedApiEnabled(extension);
 				return extHostNotebook.onDidChangeActiveNotebookKernel;
@@ -1068,14 +1063,6 @@ export function createApiFactoryAndRegisterActors(accessor: ServicesAccessor): I
 				checkProposedApiEnabled(extension);
 				return extHostNotebook.createNotebookEditorDecorationType(options);
 			},
-			get activeNotebookEditor(): vscode.NotebookEditor | undefined {
-				checkProposedApiEnabled(extension);
-				return extHostNotebook.activeNotebookEditor;
-			},
-			onDidChangeActiveNotebookEditor(listener, thisArgs?, disposables?) {
-				checkProposedApiEnabled(extension);
-				return extHostNotebook.onDidChangeActiveNotebookEditor(listener, thisArgs, disposables);
-			},
 			onDidChangeNotebookDocumentMetadata(listener, thisArgs?, disposables?) {
 				checkProposedApiEnabled(extension);
 				return extHostNotebook.onDidChangeNotebookDocumentMetadata(listener, thisArgs, disposables);
@@ -1084,14 +1071,6 @@ export function createApiFactoryAndRegisterActors(accessor: ServicesAccessor): I
 				checkProposedApiEnabled(extension);
 				return extHostNotebook.onDidChangeNotebookCells(listener, thisArgs, disposables);
 			},
-			onDidChangeNotebookEditorSelection(listener, thisArgs?, disposables?) {
-				checkProposedApiEnabled(extension);
-				return extHostNotebook.onDidChangeNotebookEditorSelection(listener, thisArgs, disposables);
-			},
-			onDidChangeNotebookEditorVisibleRanges(listener, thisArgs?, disposables?) {
-				checkProposedApiEnabled(extension);
-				return extHostNotebook.onDidChangeNotebookEditorVisibleRanges(listener, thisArgs, disposables);
-			},
 			onDidChangeCellOutputs(listener, thisArgs?, disposables?) {
 				checkProposedApiEnabled(extension);
 				return extHostNotebook.onDidChangeCellOutputs(listener, thisArgs, disposables);
@@ -1140,7 +1119,7 @@ export function createApiFactoryAndRegisterActors(accessor: ServicesAccessor): I
 			CandidatePortSource: CandidatePortSource,
 			CodeAction: extHostTypes.CodeAction,
 			CodeActionKind: extHostTypes.CodeActionKind,
-			CodeActionTrigger: extHostTypes.CodeActionTrigger,
+			CodeActionTriggerKind: extHostTypes.CodeActionTriggerKind,
 			CodeLens: extHostTypes.CodeLens,
 			Color: extHostTypes.Color,
 			ColorInformation: extHostTypes.ColorInformation,
@@ -1239,85 +1218,27 @@ export function createApiFactoryAndRegisterActors(accessor: ServicesAccessor): I
 			ViewColumn: extHostTypes.ViewColumn,
 			WorkspaceEdit: extHostTypes.WorkspaceEdit,
 			// proposed api types
-			get InlineHint() {
-				return extHostTypes.InlineHint;
-			},
-			get InlineHintKind() {
-				return extHostTypes.InlineHintKind;
-			},
-			get RemoteAuthorityResolverError() {
-				// checkProposedApiEnabled(extension);
-				return extHostTypes.RemoteAuthorityResolverError;
-			},
-			get ResolvedAuthority() {
-				// checkProposedApiEnabled(extension);
-				return extHostTypes.ResolvedAuthority;
-			},
-			get SourceControlInputBoxValidationType() {
-				// checkProposedApiEnabled(extension);
-				return extHostTypes.SourceControlInputBoxValidationType;
-			},
-			get ExtensionRuntime() {
-				// checkProposedApiEnabled(extension);
-				return extHostTypes.ExtensionRuntime;
-			},
-			get TimelineItem() {
-				// checkProposedApiEnabled(extension);
-				return extHostTypes.TimelineItem;
-			},
-			get NotebookCellRange() {
-				return extHostTypes.NotebookCellRange;
-			},
-			get NotebookCellKind() {
-				// checkProposedApiEnabled(extension);
-				return extHostTypes.NotebookCellKind;
-			},
-			get NotebookCellRunState() {
-				// checkProposedApiEnabled(extension);
-				return extHostTypes.NotebookCellRunState;
-			},
-			get NotebookDocumentMetadata() {
-				return extHostTypes.NotebookDocumentMetadata;
-			},
-			get NotebookCellMetadata() {
-				return extHostTypes.NotebookCellMetadata;
-			},
-			get NotebookRunState() {
-				// checkProposedApiEnabled(extension);
-				return extHostTypes.NotebookRunState;
-			},
-			get NotebookCellStatusBarAlignment() {
-				// checkProposedApiEnabled(extension);
-				return extHostTypes.NotebookCellStatusBarAlignment;
-			},
-			get NotebookEditorRevealType() {
-				// checkProposedApiEnabled(extension);
-				return extHostTypes.NotebookEditorRevealType;
-			},
-			get NotebookCellOutput() {
-				// checkProposedApiEnabled(extension);
-				return extHostTypes.NotebookCellOutput;
-			},
-			get NotebookCellOutputItem() {
-				// checkProposedApiEnabled(extension);
-				return extHostTypes.NotebookCellOutputItem;
-			},
-			get LinkedEditingRanges() {
-				// checkProposedApiEnabled(extension);
-				return extHostTypes.LinkedEditingRanges;
-			},
-			get TestRunState() {
-				// checkProposedApiEnabled(extension);
-				return extHostTypes.TestRunState;
-			},
-			get TestMessageSeverity() {
-				// checkProposedApiEnabled(extension);
-				return extHostTypes.TestMessageSeverity;
-			},
-			get WorkspaceTrustState() {
-				// checkProposedApiEnabled(extension);
-				return extHostTypes.WorkspaceTrustState;
-			}
+			InlineHint: extHostTypes.InlineHint,
+			InlineHintKind: extHostTypes.InlineHintKind,
+			RemoteAuthorityResolverError: extHostTypes.RemoteAuthorityResolverError,
+			ResolvedAuthority: extHostTypes.ResolvedAuthority,
+			SourceControlInputBoxValidationType: extHostTypes.SourceControlInputBoxValidationType,
+			ExtensionRuntime: extHostTypes.ExtensionRuntime,
+			TimelineItem: extHostTypes.TimelineItem,
+			NotebookCellRange: extHostTypes.NotebookCellRange,
+			NotebookCellKind: extHostTypes.NotebookCellKind,
+			NotebookCellRunState: extHostTypes.NotebookCellRunState,
+			NotebookDocumentMetadata: extHostTypes.NotebookDocumentMetadata,
+			NotebookCellMetadata: extHostTypes.NotebookCellMetadata,
+			NotebookRunState: extHostTypes.NotebookRunState,
+			NotebookCellStatusBarAlignment: extHostTypes.NotebookCellStatusBarAlignment,
+			NotebookEditorRevealType: extHostTypes.NotebookEditorRevealType,
+			NotebookCellOutput: extHostTypes.NotebookCellOutput,
+			NotebookCellOutputItem: extHostTypes.NotebookCellOutputItem,
+			LinkedEditingRanges: extHostTypes.LinkedEditingRanges,
+			TestRunState: extHostTypes.TestRunState,
+			TestMessageSeverity: extHostTypes.TestMessageSeverity,
+			WorkspaceTrustState: extHostTypes.WorkspaceTrustState
 		};
 	};
 }
diff --git a/src/vs/workbench/api/common/extHost.common.services.ts b/src/vs/workbench/api/common/extHost.common.services.ts
index b1fe830b257..bf894f0cfb4 100644
--- a/src/vs/workbench/api/common/extHost.common.services.ts
+++ b/src/vs/workbench/api/common/extHost.common.services.ts
@@ -22,6 +22,7 @@ import { IExtHostWindow, ExtHostWindow } from 'vs/workbench/api/common/extHostWi
 import { IExtHostConsumerFileSystem, ExtHostConsumerFileSystem } from 'vs/workbench/api/common/extHostFileSystemConsumer';
 import { IExtHostFileSystemInfo, ExtHostFileSystemInfo } from 'vs/workbench/api/common/extHostFileSystemInfo';
 import { IExtHostSecretState, ExtHostSecretState } from 'vs/workbench/api/common/exHostSecretState';
+import { ExtHostTelemetry, IExtHostTelemetry } from 'vs/workbench/api/common/extHostTelemetry';
 
 registerSingleton(IExtensionStoragePaths, ExtensionStoragePaths);
 registerSingleton(IExtHostApiDeprecationService, ExtHostApiDeprecationService);
@@ -41,3 +42,4 @@ registerSingleton(IExtHostTunnelService, ExtHostTunnelService);
 registerSingleton(IExtHostWindow, ExtHostWindow);
 registerSingleton(IExtHostWorkspace, ExtHostWorkspace);
 registerSingleton(IExtHostSecretState, ExtHostSecretState);
+registerSingleton(IExtHostTelemetry, ExtHostTelemetry);
diff --git a/src/vs/workbench/api/common/extHost.protocol.ts b/src/vs/workbench/api/common/extHost.protocol.ts
index 0dcdd01413b..29b6e677e1a 100644
--- a/src/vs/workbench/api/common/extHost.protocol.ts
+++ b/src/vs/workbench/api/common/extHost.protocol.ts
@@ -58,7 +58,7 @@ import { IAccessibilityInformation } from 'vs/platform/accessibility/common/acce
 import { IExtensionIdWithVersion } from 'vs/platform/userDataSync/common/extensionsStorageSync';
 import { InternalTestItem, ITestState, RunTestForProviderRequest, RunTestsRequest, TestIdWithProvider, TestsDiff, ISerializedTestResults } from 'vs/workbench/contrib/testing/common/testCollection';
 import { CandidatePort } from 'vs/workbench/services/remote/common/remoteExplorerService';
-import { WorkspaceTrustStateChangeEvent } from 'vs/platform/workspace/common/workspaceTrust';
+import { WorkspaceTrustRequest, WorkspaceTrustStateChangeEvent } from 'vs/platform/workspace/common/workspaceTrust';
 import { ISerializableEnvironmentVariableCollection } from 'vs/workbench/contrib/terminal/common/environmentVariable';
 import { IShellLaunchConfig, ITerminalDimensions, ITerminalLaunchError } from 'vs/platform/terminal/common/terminal';
 
@@ -457,8 +457,9 @@ export interface TerminalLaunchConfig {
 	waitOnExit?: boolean;
 	strictEnv?: boolean;
 	hideFromUser?: boolean;
-	isExtensionTerminal?: boolean;
+	isExtensionCustomPtyTerminal?: boolean;
 	isFeatureTerminal?: boolean;
+	isExtensionOwnedTerminal?: boolean;
 }
 
 export interface MainThreadTerminalServiceShape extends IDisposable {
@@ -833,7 +834,7 @@ export interface MainThreadWorkspaceShape extends IDisposable {
 	$saveAll(includeUntitled?: boolean): Promise<boolean>;
 	$updateWorkspaceFolders(extensionName: string, index: number, deleteCount: number, workspaceFoldersToAdd: { uri: UriComponents, name?: string; }[]): Promise<void>;
 	$resolveProxy(url: string): Promise<string | undefined>;
-	$requireWorkspaceTrust(modal?: boolean): Promise<WorkspaceTrustState>
+	$requireWorkspaceTrust(request?: WorkspaceTrustRequest): Promise<WorkspaceTrustState>;
 }
 
 export interface IFileChangeDto {
@@ -1140,7 +1141,6 @@ export interface ExtHostAuthenticationShape {
 	$removeSession(id: string, sessionId: string): Promise<void>;
 	$onDidChangeAuthenticationSessions(id: string, label: string): Promise<void>;
 	$onDidChangeAuthenticationProviders(added: modes.AuthenticationProviderInformation[], removed: modes.AuthenticationProviderInformation[]): Promise<void>;
-	$setProviders(providers: modes.AuthenticationProviderInformation[]): Promise<void>;
 }
 
 export interface ExtHostSecretStateShape {
@@ -1382,9 +1382,6 @@ export interface IWorkspaceCellEditDto {
 
 export interface IWorkspaceEditDto {
 	edits: Array<IWorkspaceFileEditDto | IWorkspaceTextEditDto | IWorkspaceCellEditDto>;
-
-	// todo@jrieken reject should go into rename
-	rejectReason?: string;
 }
 
 export function reviveWorkspaceEditDto(data: IWorkspaceEditDto | undefined): modes.WorkspaceEdit {
@@ -1504,7 +1501,7 @@ export interface ExtHostLanguageFeaturesShape {
 	$provideWorkspaceSymbols(handle: number, search: string, token: CancellationToken): Promise<IWorkspaceSymbolsDto>;
 	$resolveWorkspaceSymbol(handle: number, symbol: IWorkspaceSymbolDto, token: CancellationToken): Promise<IWorkspaceSymbolDto | undefined>;
 	$releaseWorkspaceSymbols(handle: number, id: number): void;
-	$provideRenameEdits(handle: number, resource: UriComponents, position: IPosition, newName: string, token: CancellationToken): Promise<IWorkspaceEditDto | undefined>;
+	$provideRenameEdits(handle: number, resource: UriComponents, position: IPosition, newName: string, token: CancellationToken): Promise<IWorkspaceEditDto & { rejectReason?: string } | undefined>;
 	$resolveRenameLocation(handle: number, resource: UriComponents, position: IPosition, token: CancellationToken): Promise<modes.RenameLocation | undefined>;
 	$provideDocumentSemanticTokens(handle: number, resource: UriComponents, previousResultId: number, token: CancellationToken): Promise<VSBuffer | null>;
 	$releaseDocumentSemanticTokens(handle: number, semanticColoringResultId: number): void;
@@ -1540,6 +1537,11 @@ export interface ExtHostQuickOpenShape {
 	$onDidHide(sessionId: number): void;
 }
 
+export interface ExtHostTelemetryShape {
+	$initializeTelemetryEnabled(enabled: boolean): void;
+	$onDidChangeTelemetryEnabled(enabled: boolean): void;
+}
+
 export interface IShellLaunchConfigDto {
 	name?: string;
 	executable?: string;
@@ -1965,4 +1967,5 @@ export const ExtHostContext = {
 	ExtHostAuthentication: createMainId<ExtHostAuthenticationShape>('ExtHostAuthentication'),
 	ExtHostTimeline: createMainId<ExtHostTimelineShape>('ExtHostTimeline'),
 	ExtHostTesting: createMainId<ExtHostTestingShape>('ExtHostTesting'),
+	ExtHostTelemetry: createMainId<ExtHostTelemetryShape>('ExtHostTelemetry'),
 };
diff --git a/src/vs/workbench/api/common/extHostApiCommands.ts b/src/vs/workbench/api/common/extHostApiCommands.ts
index 3e3107b001f..c2a22506700 100644
--- a/src/vs/workbench/api/common/extHostApiCommands.ts
+++ b/src/vs/workbench/api/common/extHostApiCommands.ts
@@ -162,7 +162,7 @@ const newCommands: ApiCommand[] = [
 	new ApiCommand(
 		'vscode.executeDocumentRenameProvider', '_executeDocumentRenameProvider', 'Execute rename provider.',
 		[ApiCommandArgument.Uri, ApiCommandArgument.Position, ApiCommandArgument.String.with('newName', 'The new symbol name')],
-		new ApiCommandResult<IWorkspaceEditDto, types.WorkspaceEdit | undefined>('A promise that resolves to a WorkspaceEdit.', value => {
+		new ApiCommandResult<IWorkspaceEditDto & { rejectReason?: string }, types.WorkspaceEdit | undefined>('A promise that resolves to a WorkspaceEdit.', value => {
 			if (!value) {
 				return undefined;
 			}
diff --git a/src/vs/workbench/api/common/extHostAuthentication.ts b/src/vs/workbench/api/common/extHostAuthentication.ts
index d32ec2ad1dc..aa56c49e43c 100644
--- a/src/vs/workbench/api/common/extHostAuthentication.ts
+++ b/src/vs/workbench/api/common/extHostAuthentication.ts
@@ -39,11 +39,6 @@ export class ExtHostAuthentication implements ExtHostAuthenticationShape {
 		this._proxy = mainContext.getProxy(MainContext.MainThreadAuthentication);
 	}
 
-	$setProviders(providers: vscode.AuthenticationProviderInformation[]): Promise<void> {
-		this._providers = providers;
-		return Promise.resolve();
-	}
-
 	get providers(): ReadonlyArray<vscode.AuthenticationProviderInformation> {
 		return Object.freeze(this._providers.slice());
 	}
diff --git a/src/vs/workbench/api/common/extHostLanguageFeatures.ts b/src/vs/workbench/api/common/extHostLanguageFeatures.ts
index 5d96d713260..7fc9363feb7 100644
--- a/src/vs/workbench/api/common/extHostLanguageFeatures.ts
+++ b/src/vs/workbench/api/common/extHostLanguageFeatures.ts
@@ -412,7 +412,8 @@ class CodeActionAdapter {
 
 		const codeActionContext: vscode.CodeActionContext = {
 			diagnostics: allDiagnostics,
-			only: context.only ? new CodeActionKind(context.only) : undefined
+			only: context.only ? new CodeActionKind(context.only) : undefined,
+			triggerKind: typeConvert.CodeActionTriggerKind.to(context.trigger),
 		};
 
 		return asPromise(() => this._provider.provideCodeActions(doc, ran, codeActionContext, token)).then((commandsOrActions): extHostProtocol.ICodeActionListDto | undefined => {
diff --git a/src/vs/workbench/api/common/extHostTelemetry.ts b/src/vs/workbench/api/common/extHostTelemetry.ts
new file mode 100644
index 00000000000..2d14c450b17
--- /dev/null
+++ b/src/vs/workbench/api/common/extHostTelemetry.ts
@@ -0,0 +1,31 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
+import { Event, Emitter } from 'vs/base/common/event';
+import { ExtHostTelemetryShape } from 'vs/workbench/api/common/extHost.protocol';
+
+export class ExtHostTelemetry implements ExtHostTelemetryShape {
+	private readonly _onDidChangeTelemetryEnabled = new Emitter<boolean>();
+	readonly onDidChangeTelemetryEnabled: Event<boolean> = this._onDidChangeTelemetryEnabled.event;
+
+	private _enabled: boolean = false;
+
+	getTelemetryEnabled(): boolean {
+		return this._enabled;
+	}
+
+	$initializeTelemetryEnabled(enabled: boolean): void {
+		this._enabled = enabled;
+	}
+
+	$onDidChangeTelemetryEnabled(enabled: boolean): void {
+		this._enabled = enabled;
+		this._onDidChangeTelemetryEnabled.fire(enabled);
+	}
+}
+
+export const IExtHostTelemetry = createDecorator<IExtHostTelemetry>('IExtHostTelemetry');
+export interface IExtHostTelemetry extends ExtHostTelemetry, ExtHostTelemetryShape { }
diff --git a/src/vs/workbench/api/common/extHostTerminalService.ts b/src/vs/workbench/api/common/extHostTerminalService.ts
index 014f440346d..714077d7113 100644
--- a/src/vs/workbench/api/common/extHostTerminalService.ts
+++ b/src/vs/workbench/api/common/extHostTerminalService.ts
@@ -120,19 +120,20 @@ export class ExtHostTerminal {
 		waitOnExit?: boolean,
 		strictEnv?: boolean,
 		hideFromUser?: boolean,
-		isFeatureTerminal?: boolean
+		isFeatureTerminal?: boolean,
+		isExtensionOwnedTerminal?: boolean
 	): Promise<void> {
 		if (typeof this._id !== 'string') {
 			throw new Error('Terminal has already been created');
 		}
-		await this._proxy.$createTerminal(this._id, { name: this._name, shellPath, shellArgs, cwd, env, waitOnExit, strictEnv, hideFromUser, isFeatureTerminal });
+		await this._proxy.$createTerminal(this._id, { name: this._name, shellPath, shellArgs, cwd, env, waitOnExit, strictEnv, hideFromUser, isFeatureTerminal, isExtensionOwnedTerminal });
 	}
 
 	public async createExtensionTerminal(): Promise<number> {
 		if (typeof this._id !== 'string') {
 			throw new Error('Terminal has already been created');
 		}
-		await this._proxy.$createTerminal(this._id, { name: this._name, isExtensionTerminal: true });
+		await this._proxy.$createTerminal(this._id, { name: this._name, isExtensionCustomPtyTerminal: true });
 		// At this point, the id has been set via `$acceptTerminalOpened`
 		if (typeof this._id === 'string') {
 			throw new Error('Terminal creation failed');
@@ -185,6 +186,7 @@ export class ExtHostTerminal {
 
 export class ExtHostPseudoterminal implements ITerminalChildProcess {
 	readonly id = 0;
+	readonly shouldPersist = false;
 
 	private readonly _onProcessData = new Emitter<string>();
 	public readonly onProcessData: Event<string> = this._onProcessData.event;
diff --git a/src/vs/workbench/api/common/extHostTesting.ts b/src/vs/workbench/api/common/extHostTesting.ts
index da3c546066d..49e077bfea3 100644
--- a/src/vs/workbench/api/common/extHostTesting.ts
+++ b/src/vs/workbench/api/common/extHostTesting.ts
@@ -5,10 +5,10 @@
 
 import { mapFind } from 'vs/base/common/arrays';
 import { disposableTimeout } from 'vs/base/common/async';
-import { CancellationToken } from 'vs/base/common/cancellation';
+import { CancellationToken, CancellationTokenSource } from 'vs/base/common/cancellation';
 import { Emitter } from 'vs/base/common/event';
 import { once } from 'vs/base/common/functional';
-import { DisposableStore, IDisposable } from 'vs/base/common/lifecycle';
+import { DisposableStore, IDisposable, toDisposable } from 'vs/base/common/lifecycle';
 import { deepFreeze } from 'vs/base/common/objects';
 import { isDefined } from 'vs/base/common/types';
 import { URI, UriComponents } from 'vs/base/common/uri';
@@ -136,7 +136,8 @@ export class ExtHostTesting implements ExtHostTestingShape {
 			return;
 		}
 
-		let method: undefined | ((p: vscode.TestProvider) => vscode.TestHierarchy<vscode.TestItem> | undefined);
+		const cancellation = new CancellationTokenSource();
+		let method: undefined | ((p: vscode.TestProvider) => vscode.ProviderResult<vscode.TestHierarchy<vscode.TestItem>>);
 		if (resource === ExtHostTestingResource.TextDocument) {
 			let document = this.documents.getDocument(uri);
 
@@ -155,14 +156,14 @@ export class ExtHostTesting implements ExtHostTestingShape {
 
 			if (document) {
 				const folder = await this.workspace.getWorkspaceFolder2(uri, false);
-				method = p => p.createDocumentTestHierarchy
-					? p.createDocumentTestHierarchy(document!.document)
-					: this.createDefaultDocumentTestHierarchy(p, document!.document, folder);
+				method = p => p.provideDocumentTestHierarchy
+					? p.provideDocumentTestHierarchy(document!.document, cancellation.token)
+					: this.createDefaultDocumentTestHierarchy(p, document!.document, folder, cancellation.token);
 			}
 		} else {
 			const folder = await this.workspace.getWorkspaceFolder2(uri, false);
 			if (folder) {
-				method = p => p.createWorkspaceTestHierarchy?.(folder);
+				method = p => p.provideWorkspaceTestHierarchy(folder, cancellation.token);
 			}
 		}
 
@@ -170,15 +171,16 @@ export class ExtHostTesting implements ExtHostTestingShape {
 			return;
 		}
 
-		const subscribeFn = (id: string, provider: vscode.TestProvider) => {
+		const subscribeFn = async (id: string, provider: vscode.TestProvider) => {
 			try {
-				const hierarchy = method!(provider);
+				collection.pushDiff([TestDiffOpType.DeltaDiscoverComplete, 1]);
+
+				const hierarchy = await method!(provider);
 				if (!hierarchy) {
+					collection.pushDiff([TestDiffOpType.DeltaDiscoverComplete, -1]);
 					return;
 				}
 
-				collection.pushDiff([TestDiffOpType.DeltaDiscoverComplete, 1]);
-				disposable.add(hierarchy);
 				collection.addRoot(hierarchy.root, id);
 				Promise.resolve(hierarchy.discoveredInitialTests).then(() => collection.pushDiff([TestDiffOpType.DeltaDiscoverComplete, -1]));
 				hierarchy.onDidChangeTest(e => collection.onItemChange(e, id));
@@ -196,7 +198,9 @@ export class ExtHostTesting implements ExtHostTestingShape {
 		};
 
 		const disposable = new DisposableStore();
-		const collection = disposable.add(this.ownedTests.createForHierarchy(diff => this.proxy.$publishDiff(resource, uriComponents, diff)));
+		const collection = disposable.add(this.ownedTests.createForHierarchy(
+			diff => this.proxy.$publishDiff(resource, uriComponents, diff)));
+		disposable.add(toDisposable(() => cancellation.dispose(true)));
 		for (const [id, provider] of this.providers) {
 			subscribeFn(id, provider);
 		}
@@ -239,7 +243,7 @@ export class ExtHostTesting implements ExtHostTestingShape {
 	 */
 	public async $runTestsForProvider(req: RunTestForProviderRequest, cancellation: CancellationToken): Promise<void> {
 		const provider = this.providers.get(req.providerId);
-		if (!provider || !provider.runTests) {
+		if (!provider) {
 			return;
 		}
 
@@ -318,12 +322,17 @@ export class ExtHostTesting implements ExtHostTestingShape {
 			?? this.textDocumentObservers.getMirroredTestDataByReference(test);
 	}
 
-	private createDefaultDocumentTestHierarchy(provider: vscode.TestProvider, document: vscode.TextDocument, folder: vscode.WorkspaceFolder | undefined): vscode.TestHierarchy<vscode.TestItem> | undefined {
+	private async createDefaultDocumentTestHierarchy(
+		provider: vscode.TestProvider,
+		document: vscode.TextDocument,
+		folder: vscode.WorkspaceFolder | undefined,
+		token: CancellationToken,
+	): Promise<vscode.TestHierarchy<vscode.TestItem> | undefined> {
 		if (!folder) {
 			return;
 		}
 
-		const workspaceHierarchy = provider.createWorkspaceTestHierarchy?.(folder);
+		const workspaceHierarchy = await provider.provideWorkspaceTestHierarchy(folder, token);
 		if (!workspaceHierarchy) {
 			return;
 		}
@@ -372,12 +381,13 @@ export class ExtHostTesting implements ExtHostTestingShape {
 			onDidChangeTest.fire(previousParent);
 		});
 
+		token.onCancellationRequested(() => {
+			TestItemFilteredWrapper.removeFilter(document);
+			onDidChangeTest.dispose();
+		});
+
 		return {
 			root: TestItemFilteredWrapper.getWrapperForTestItem(workspaceHierarchy.root, document),
-			dispose: () => {
-				onDidChangeTest.dispose();
-				TestItemFilteredWrapper.removeFilter(document);
-			},
 			discoveredInitialTests: workspaceHierarchy.discoveredInitialTests,
 			onDidInvalidateTest: onDidInvalidateTest.event,
 			onDidChangeTest: onDidChangeTest.event
diff --git a/src/vs/workbench/api/common/extHostTypeConverters.ts b/src/vs/workbench/api/common/extHostTypeConverters.ts
index ae84d8eb41a..f93372ba708 100644
--- a/src/vs/workbench/api/common/extHostTypeConverters.ts
+++ b/src/vs/workbench/api/common/extHostTypeConverters.ts
@@ -790,8 +790,8 @@ export namespace location {
 		};
 	}
 
-	export function to(value: modes.Location): types.Location {
-		return new types.Location(value.uri, Range.to(value.range));
+	export function to(value: extHostProtocol.ILocationDto): types.Location {
+		return new types.Location(URI.revive(value.uri), Range.to(value.range));
 	}
 }
 
@@ -810,9 +810,9 @@ export namespace DefinitionLink {
 				: undefined,
 		};
 	}
-	export function to(value: modes.LocationLink): vscode.LocationLink {
+	export function to(value: extHostProtocol.IDefinitionLinkDto): vscode.LocationLink {
 		return {
-			targetUri: value.uri,
+			targetUri: URI.revive(value.uri),
 			targetRange: Range.to(value.range),
 			targetSelectionRange: value.targetSelectionRange
 				? Range.to(value.targetSelectionRange)
@@ -1712,3 +1712,16 @@ export namespace TestResults {
 		};
 	}
 }
+
+export namespace CodeActionTriggerKind {
+
+	export function to(value: modes.CodeActionTriggerType): types.CodeActionTriggerKind {
+		switch (value) {
+			case modes.CodeActionTriggerType.Auto:
+				return types.CodeActionTriggerKind.Automatic;
+
+			case modes.CodeActionTriggerType.Manual:
+				return types.CodeActionTriggerKind.Manual;
+		}
+	}
+}
diff --git a/src/vs/workbench/api/common/extHostTypes.ts b/src/vs/workbench/api/common/extHostTypes.ts
index 42d11a118cc..81a8415df14 100644
--- a/src/vs/workbench/api/common/extHostTypes.ts
+++ b/src/vs/workbench/api/common/extHostTypes.ts
@@ -1178,7 +1178,7 @@ export class DocumentSymbol {
 }
 
 
-export enum CodeActionTrigger {
+export enum CodeActionTriggerKind {
 	Automatic = 1,
 	Manual = 2,
 }
@@ -2907,13 +2907,12 @@ export class NotebookCellRange {
 	}
 
 	constructor(start: number, end: number) {
-		// todo@rebornix
-		// if (start < 0) {
-		// 	throw illegalArgument('start must be positive');
-		// }
-		// if (end < start) {
-		// 	throw illegalArgument('end cannot be smaller than start');
-		// }
+		if (start < 0) {
+			throw illegalArgument('start must be positive');
+		}
+		if (end < start) {
+			throw illegalArgument('end cannot be smaller than start');
+		}
 		this._start = start;
 		this._end = end;
 	}
diff --git a/src/vs/workbench/api/common/extHostWorkspace.ts b/src/vs/workbench/api/common/extHostWorkspace.ts
index 2b368c67b63..e26905f23f2 100644
--- a/src/vs/workbench/api/common/extHostWorkspace.ts
+++ b/src/vs/workbench/api/common/extHostWorkspace.ts
@@ -563,8 +563,8 @@ export class ExtHostWorkspace implements ExtHostWorkspaceShape, IExtHostWorkspac
 		return this._workspaceTrustState;
 	}
 
-	requireWorkspaceTrust(modal?: boolean): Promise<WorkspaceTrustState> {
-		return this._proxy.$requireWorkspaceTrust(modal);
+	requireWorkspaceTrust(request?: vscode.WorkspaceTrustRequest): Promise<WorkspaceTrustState> {
+		return this._proxy.$requireWorkspaceTrust(request);
 	}
 
 	$onDidChangeWorkspaceTrustState(state: WorkspaceTrustStateChangeEvent): void {
diff --git a/src/vs/workbench/api/node/extHostSearch.ts b/src/vs/workbench/api/node/extHostSearch.ts
index 497f971404b..0dba1956d58 100644
--- a/src/vs/workbench/api/node/extHostSearch.ts
+++ b/src/vs/workbench/api/node/extHostSearch.ts
@@ -35,13 +35,15 @@ export class NativeExtHostSearch extends ExtHostSearch {
 	) {
 		super(extHostRpc, _uriTransformer, _logService);
 
+		const outputChannel = new OutputChannel('RipgrepSearchUD', this._logService);
+		this.registerTextSearchProvider(Schemas.userData, new RipgrepSearchProvider(outputChannel));
 		if (initData.remote.isRemote && initData.remote.authority) {
 			this._registerEHSearchProviders();
 		}
 	}
 
 	private _registerEHSearchProviders(): void {
-		const outputChannel = new OutputChannel(this._logService);
+		const outputChannel = new OutputChannel('RipgrepSearchEH', this._logService);
 		this.registerTextSearchProvider(Schemas.file, new RipgrepSearchProvider(outputChannel));
 		this.registerInternalFileSearchProvider(Schemas.file, new SearchService());
 	}
@@ -101,4 +103,3 @@ export class NativeExtHostSearch extends ExtHostSearch {
 		return new NativeTextSearchManager(query, provider);
 	}
 }
-
diff --git a/src/vs/workbench/api/node/extHostTerminalService.ts b/src/vs/workbench/api/node/extHostTerminalService.ts
index 4b14a68a9b5..d2b9958bfbd 100644
--- a/src/vs/workbench/api/node/extHostTerminalService.ts
+++ b/src/vs/workbench/api/node/extHostTerminalService.ts
@@ -66,7 +66,9 @@ export class ExtHostTerminalService extends BaseExtHostTerminalService {
 			/*options.waitOnExit*/ undefined,
 			withNullAsUndefined(options.strictEnv),
 			withNullAsUndefined(options.hideFromUser),
-			withNullAsUndefined(isFeatureTerminal));
+			withNullAsUndefined(isFeatureTerminal),
+			true
+		);
 		return terminal.value;
 	}
 
diff --git a/src/vs/workbench/api/node/extHostTunnelService.ts b/src/vs/workbench/api/node/extHostTunnelService.ts
index 9b9dd79dc9c..4c2be0c2599 100644
--- a/src/vs/workbench/api/node/extHostTunnelService.ts
+++ b/src/vs/workbench/api/node/extHostTunnelService.ts
@@ -152,6 +152,7 @@ export class ExtHostTunnelService extends Disposable implements IExtHostTunnelSe
 	}
 
 	async openTunnel(extension: IExtensionDescription, forward: TunnelOptions): Promise<vscode.Tunnel | undefined> {
+		this.logService.trace(`ForwardedPorts: (ExtHostTunnelService) ${extension.identifier} called openTunnel API for ${forward.remoteAddress.port}.`);
 		const tunnel = await this._proxy.$openTunnel(forward, extension.displayName);
 		if (tunnel) {
 			const disposableTunnel: vscode.Tunnel = new ExtensionTunnel(tunnel.remoteAddress, tunnel.localAddress, () => {
@@ -184,6 +185,7 @@ export class ExtHostTunnelService extends Disposable implements IExtHostTunnelSe
 		while (this._candidateFindingEnabled) {
 			const startTime = new Date().getTime();
 			const newPorts = await this.findCandidatePorts();
+			this.logService.trace(`ForwardedPorts: (ExtHostTunnelService) found candidate ports ${newPorts.map(port => port.port).join(', ')}`);
 			const timeTaken = new Date().getTime() - startTime;
 			movingAverage.update(timeTaken);
 			if (!oldPorts || (JSON.stringify(oldPorts) !== JSON.stringify(newPorts))) {
@@ -238,23 +240,26 @@ export class ExtHostTunnelService extends Disposable implements IExtHostTunnelSe
 	async $forwardPort(tunnelOptions: TunnelOptions, tunnelCreationOptions: TunnelCreationOptions): Promise<TunnelDto | undefined> {
 		if (this._forwardPortProvider) {
 			try {
-				this.logService.trace('$forwardPort: Getting tunnel from provider.');
+				this.logService.trace('ForwardedPorts: (ExtHostTunnelService) Getting tunnel from provider.');
 				const providedPort = this._forwardPortProvider(tunnelOptions, tunnelCreationOptions);
-				this.logService.trace('$forwardPort: Got tunnel promise from provider.');
+				this.logService.trace('ForwardedPorts: (ExtHostTunnelService) Got tunnel promise from provider.');
 				if (providedPort !== undefined) {
 					const tunnel = await providedPort;
-					this.logService.trace('$forwardPort: Successfully awaited tunnel from provider.');
+					this.logService.trace('ForwardedPorts: (ExtHostTunnelService) Successfully awaited tunnel from provider.');
 					if (!this._extensionTunnels.has(tunnelOptions.remoteAddress.host)) {
 						this._extensionTunnels.set(tunnelOptions.remoteAddress.host, new Map());
 					}
-					const disposeListener = this._register(tunnel.onDidDispose(() => this._proxy.$closeTunnel(tunnel.remoteAddress)));
+					const disposeListener = this._register(tunnel.onDidDispose(() => {
+						this.logService.trace('ForwardedPorts: (ExtHostTunnelService) Extension fired tunnel\'s onDidDispose.');
+						return this._proxy.$closeTunnel(tunnel.remoteAddress);
+					}));
 					this._extensionTunnels.get(tunnelOptions.remoteAddress.host)!.set(tunnelOptions.remoteAddress.port, { tunnel, disposeListener });
 					return TunnelDto.fromApiTunnel(tunnel);
 				} else {
-					this.logService.trace('$forwardPort: Tunnel is undefined');
+					this.logService.trace('ForwardedPorts: (ExtHostTunnelService) Tunnel is undefined');
 				}
 			} catch (e) {
-				this.logService.trace('$forwardPort: tunnel provider error');
+				this.logService.trace('ForwardedPorts: (ExtHostTunnelService) tunnel provider error');
 			}
 		}
 		return undefined;
@@ -262,7 +267,9 @@ export class ExtHostTunnelService extends Disposable implements IExtHostTunnelSe
 
 	async $applyCandidateFilter(candidates: CandidatePort[]): Promise<CandidatePort[]> {
 		const filter = await Promise.all(candidates.map(candidate => this._showCandidatePort(candidate.host, candidate.port, candidate.detail)));
-		return candidates.filter((candidate, index) => filter[index]);
+		const result = candidates.filter((candidate, index) => filter[index]);
+		this.logService.trace(`ForwardedPorts: (ExtHostTunnelService) filtered from ${candidates.map(port => port.port).join(', ')} to ${result.map(port => port.port).join(', ')}`);
+		return result;
 	}
 
 	async findCandidatePorts(): Promise<CandidatePort[]> {
diff --git a/src/vs/workbench/browser/actions/layoutActions.ts b/src/vs/workbench/browser/actions/layoutActions.ts
index 2f3c7c31c6a..75fb709ed6c 100644
--- a/src/vs/workbench/browser/actions/layoutActions.ts
+++ b/src/vs/workbench/browser/actions/layoutActions.ts
@@ -678,7 +678,7 @@ export class MoveFocusedViewAction extends Action {
 			.map(viewletId => {
 				return {
 					id: viewletId,
-					label: this.viewDescriptorService.getViewContainerById(viewletId)!.title
+					label: this.viewDescriptorService.getViewContainerModel(this.viewDescriptorService.getViewContainerById(viewletId)!)!.title
 				};
 			}));
 
@@ -699,7 +699,7 @@ export class MoveFocusedViewAction extends Action {
 			.map(panel => {
 				return {
 					id: panel.id,
-					label: this.viewDescriptorService.getViewContainerById(panel.id)!.title
+					label: this.viewDescriptorService.getViewContainerModel(this.viewDescriptorService.getViewContainerById(panel.id)!)!.title
 				};
 			}));
 
diff --git a/src/vs/workbench/browser/layout.ts b/src/vs/workbench/browser/layout.ts
index 0db35af4625..464059aa6c8 100644
--- a/src/vs/workbench/browser/layout.ts
+++ b/src/vs/workbench/browser/layout.ts
@@ -958,10 +958,6 @@ export abstract class Layout extends Disposable implements IWorkbenchLayoutServi
 		return new Dimension(availableWidth, availableHeight);
 	}
 
-	getWorkbenchContainer(): HTMLElement {
-		return this.parent;
-	}
-
 	toggleZenMode(skipLayout?: boolean, restoring = false): void {
 		this.state.zenMode.active = !this.state.zenMode.active;
 		this.state.zenMode.transitionDisposables.clear();
diff --git a/src/vs/workbench/browser/parts/activitybar/activitybarActions.ts b/src/vs/workbench/browser/parts/activitybar/activitybarActions.ts
index 8b62c5a88de..ceaf2150923 100644
--- a/src/vs/workbench/browser/parts/activitybar/activitybarActions.ts
+++ b/src/vs/workbench/browser/parts/activitybar/activitybarActions.ts
@@ -453,7 +453,7 @@ registerThemingParticipant((theme, collector) => {
 				outline: 1px dashed;
 			}
 
-			.monaco-workbench .activitybar > .content :not(.monaco-menu) > .monaco-action-bar .action-item:focus:before {
+			.monaco-workbench .activitybar > .content :not(.monaco-menu) > .monaco-action-bar .action-item:focus .active-item-indicator:before {
 				border-left-color: ${outline};
 			}
 
@@ -472,7 +472,7 @@ registerThemingParticipant((theme, collector) => {
 		const focusBorderColor = theme.getColor(focusBorder);
 		if (focusBorderColor) {
 			collector.addRule(`
-					.monaco-workbench .activitybar > .content :not(.monaco-menu) > .monaco-action-bar .action-item:focus:before {
+				.monaco-workbench .activitybar > .content :not(.monaco-menu) > .monaco-action-bar .action-item:focus .active-item-indicator:before {
 						border-left-color: ${focusBorderColor};
 					}
 				`);
diff --git a/src/vs/workbench/browser/parts/activitybar/media/activityaction.css b/src/vs/workbench/browser/parts/activitybar/media/activityaction.css
index e72afbea624..c633e22a672 100644
--- a/src/vs/workbench/browser/parts/activitybar/media/activityaction.css
+++ b/src/vs/workbench/browser/parts/activitybar/media/activityaction.css
@@ -76,10 +76,9 @@
 }
 
 .monaco-workbench .activitybar > .content :not(.monaco-menu) > .monaco-action-bar .action-item.checked .active-item-indicator:before,
-.monaco-workbench .activitybar > .content :not(.monaco-menu) > .monaco-action-bar .action-item:focus:before {
+.monaco-workbench .activitybar > .content :not(.monaco-menu) > .monaco-action-bar .action-item:focus .active-item-indicator:before {
 	content: "";
 	position: absolute;
-	top: 0;
 	z-index: 1;
 	top: 0;
 	height: 100%;
@@ -92,12 +91,9 @@
 	height: 100%;
 }
 
-.monaco-workbench .activitybar > .content :not(.monaco-menu) > .monaco-action-bar .action-item.checked:focus .active-item-indicator:before {
-	visibility: hidden; /* don't show active border + focus at the same time, focus takes priority */
-}
 
 /* Hides active elements in high contrast mode */
-.monaco-workbench.hc-black .activitybar > .content :not(.monaco-menu) > .monaco-action-bar .action-item.checked .active-item-indicator {
+.monaco-workbench.hc-black .activitybar > .content :not(.monaco-menu) > .monaco-action-bar .action-item.checked:not(:focus) .active-item-indicator {
 	display: none;
 }
 
@@ -105,13 +101,11 @@
 	border-left: none !important; /* no focus feedback when using mouse */
 }
 
-.monaco-workbench .activitybar.left > .content :not(.monaco-menu) > .monaco-action-bar .action-item:focus:before,
-.monaco-workbench .activitybar.left > .content :not(.monaco-menu) > .monaco-action-bar .action-item.checked .active-item-indicator:before{
+.monaco-workbench .activitybar.left > .content :not(.monaco-menu) > .monaco-action-bar .action-item .active-item-indicator:before{
 	left: 0;
 }
 
-.monaco-workbench .activitybar.right > .content :not(.monaco-menu) > .monaco-action-bar .action-item.checked .active-item-indicator:before,
-.monaco-workbench .activitybar.right > .content :not(.monaco-menu) > .monaco-action-bar .action-item:focus:before {
+.monaco-workbench .activitybar.right > .content :not(.monaco-menu) > .monaco-action-bar .action-item .active-item-indicator:before {
 	right: 0;
 }
 
diff --git a/src/vs/workbench/browser/parts/compositeBar.ts b/src/vs/workbench/browser/parts/compositeBar.ts
index d96f65dff94..b62adf199cd 100644
--- a/src/vs/workbench/browser/parts/compositeBar.ts
+++ b/src/vs/workbench/browser/parts/compositeBar.ts
@@ -277,10 +277,8 @@ export class CompositeBar extends Widget implements ICompositeBar {
 
 		switch (this.options.orientation) {
 			case ActionsOrientation.HORIZONTAL:
-			case ActionsOrientation.HORIZONTAL_REVERSE:
 				return posX < rect.left;
 			case ActionsOrientation.VERTICAL:
-			case ActionsOrientation.VERTICAL_REVERSE:
 				return posY < rect.top;
 		}
 	}
diff --git a/src/vs/workbench/browser/parts/editor/editor.contribution.ts b/src/vs/workbench/browser/parts/editor/editor.contribution.ts
index a1dff0866d2..ddfd40d9d7c 100644
--- a/src/vs/workbench/browser/parts/editor/editor.contribution.ts
+++ b/src/vs/workbench/browser/parts/editor/editor.contribution.ts
@@ -287,7 +287,7 @@ registerEditorContribution(UntitledHintContribution.ID, UntitledHintContribution
 
 // Register Status Actions
 const registry = Registry.as<IWorkbenchActionRegistry>(ActionExtensions.WorkbenchActions);
-registry.registerWorkbenchAction(SyncActionDescriptor.from(ChangeModeAction, { primary: KeyChord(KeyMod.CtrlCmd | KeyCode.KEY_K, KeyCode.KEY_M) }), 'Change Language Mode');
+registry.registerWorkbenchAction(SyncActionDescriptor.from(ChangeModeAction, { primary: KeyChord(KeyMod.CtrlCmd | KeyCode.KEY_K, KeyCode.KEY_M) }), 'Change Language Mode', undefined, ContextKeyExpr.not('notebookEditorFocused'));
 registry.registerWorkbenchAction(SyncActionDescriptor.from(ChangeEOLAction), 'Change End of Line Sequence');
 registry.registerWorkbenchAction(SyncActionDescriptor.from(ChangeEncodingAction), 'Change File Encoding');
 
diff --git a/src/vs/workbench/browser/parts/editor/editorGroupView.ts b/src/vs/workbench/browser/parts/editor/editorGroupView.ts
index db7f6873bfb..edc777558b9 100644
--- a/src/vs/workbench/browser/parts/editor/editorGroupView.ts
+++ b/src/vs/workbench/browser/parts/editor/editorGroupView.ts
@@ -1287,7 +1287,18 @@ export class EditorGroupView extends Themable implements IEditorGroupView {
 		// Open next active if there are more to show
 		const nextActiveEditor = this._group.activeEditor;
 		if (nextActiveEditor) {
-			const options = EditorOptions.create({ preserveFocus: !focusNext });
+			const preserveFocus = !focusNext;
+
+			let activation: EditorActivation | undefined = undefined;
+			if (preserveFocus && this.accessor.activeGroup !== this) {
+				// If we are opening the next editor in an inactive group
+				// without focussing it, ensure we preserve the editor
+				// group sizes in case that group is minimized.
+				// https://github.com/microsoft/vscode/issues/117686
+				activation = EditorActivation.PRESERVE;
+			}
+
+			const options = EditorOptions.create({ preserveFocus, activation });
 
 			// When closing an editor due to an error we can end up in a loop where we continue closing
 			// editors that fail to open (e.g. when the file no longer exists). We do not want to show
diff --git a/src/vs/workbench/browser/parts/editor/editorStatus.ts b/src/vs/workbench/browser/parts/editor/editorStatus.ts
index e27f38c8ddd..adfc7779175 100644
--- a/src/vs/workbench/browser/parts/editor/editorStatus.ts
+++ b/src/vs/workbench/browser/parts/editor/editorStatus.ts
@@ -1064,19 +1064,12 @@ export class ChangeModeAction extends Action {
 		@IPreferencesService private readonly preferencesService: IPreferencesService,
 		@IInstantiationService private readonly instantiationService: IInstantiationService,
 		@ITextFileService private readonly textFileService: ITextFileService,
-		@ICommandService private readonly commandService: ICommandService,
 		@ITelemetryService private readonly telemetryService: ITelemetryService
 	) {
 		super(actionId, actionLabel);
 	}
 
 	async run(event: any, data: ITelemetryData): Promise<void> {
-		const activeEditorPane = this.editorService.activeEditorPane as unknown as { isNotebookEditor?: boolean } | undefined;
-		if (activeEditorPane?.isNotebookEditor) { // TODO@rebornix TODO@jrieken debt: https://github.com/microsoft/vscode/issues/114554
-			// it's inside notebook editor
-			return this.commandService.executeCommand('notebook.cell.changeLanguage');
-		}
-
 		const activeTextEditorControl = getCodeEditor(this.editorService.activeTextEditorControl);
 		if (!activeTextEditorControl) {
 			await this.quickInputService.pick([{ label: localize('noEditor', "No text editor active at this time") }]);
diff --git a/src/vs/workbench/browser/parts/editor/media/tabstitlecontrol.css b/src/vs/workbench/browser/parts/editor/media/tabstitlecontrol.css
index bdc0c5072cb..fdd7368dce8 100644
--- a/src/vs/workbench/browser/parts/editor/media/tabstitlecontrol.css
+++ b/src/vs/workbench/browser/parts/editor/media/tabstitlecontrol.css
@@ -101,6 +101,10 @@
 	margin-right: var(--last-tab-margin-right); /* when tabs wrap, we need a margin away from the absolute positioned editor actions */
 }
 
+.monaco-workbench .part.editor > .content .editor-group-container > .title > .tabs-and-actions-container.wrapping .tabs-container > .tab.last-in-row:not(:last-child) {
+	border-right: 0 !important; /* ensure no border for every last tab in a row except last row (#115046) */
+}
+
 .monaco-workbench .part.editor > .content .editor-group-container > .title .tabs-container > .tab.sizing-shrink.has-icon.tab-actions-right,
 .monaco-workbench .part.editor > .content .editor-group-container > .title .tabs-container > .tab.sizing-shrink.has-icon.tab-actions-off:not(.sticky-compact) {
 	padding-left: 5px; /* reduce padding when we show icons and are in shrinking mode and tab actions is not left (unless sticky-compact) */
@@ -113,8 +117,8 @@
 	flex-shrink: 0;
 }
 
-.monaco-workbench .part.editor > .content .editor-group-container > .title > .tabs-and-actions-container.wrapping .tabs-container > .tab.sizing-fit {
-	flex-grow: 1; /* grow the tabs to fill each row for a more homogeneous look when tabs wrap */
+.monaco-workbench .part.editor > .content .editor-group-container > .title > .tabs-and-actions-container.wrapping .tabs-container > .tab.sizing-fit.last-in-row:not(:last-child) {
+	flex-grow: 1; /* grow the last tab in a row for a more homogeneous look except for last row (#113801) */
 }
 
 .monaco-workbench .part.editor > .content .editor-group-container > .title .tabs-container > .tab.sizing-shrink {
diff --git a/src/vs/workbench/browser/parts/editor/tabsTitleControl.ts b/src/vs/workbench/browser/parts/editor/tabsTitleControl.ts
index 3d56e920f12..1f49ffb2e5e 100644
--- a/src/vs/workbench/browser/parts/editor/tabsTitleControl.ts
+++ b/src/vs/workbench/browser/parts/editor/tabsTitleControl.ts
@@ -1482,6 +1482,48 @@ export class TabsTitleControl extends TitleControl {
 			});
 		}
 
+		// Update the `last-in-row` class on tabs when wrapping
+		// is enabled (it doesn't do any harm otherwise). This
+		// class controls additional properties of tab when it is
+		// the last tab in a row
+		if (tabsWrapMultiLine) {
+
+			// Using a map here to change classes after the for loop is
+			// crucial for performance because changing the class on a
+			// tab can result in layouts of the rendering engine.
+			const tabs = new Map<HTMLElement, boolean /* last in row */>();
+
+			let currentTabsPosY: number | undefined = undefined;
+			let lastTab: HTMLElement | undefined = undefined;
+			for (const child of tabsContainer.children) {
+				const tab = child as HTMLElement;
+				const tabPosY = tab.offsetTop;
+
+				// Marks a new or the first row of tabs
+				if (tabPosY !== currentTabsPosY) {
+					currentTabsPosY = tabPosY;
+					if (lastTab) {
+						tabs.set(lastTab, true); // previous tab must be last in row then
+					}
+				}
+
+				// Always remember last tab and ensure the
+				// last-in-row class is not present until
+				// we know the tab is last
+				lastTab = tab;
+				tabs.set(tab, false);
+			}
+
+			// Last tab overally is always last-in-row
+			if (lastTab) {
+				tabs.set(lastTab, true);
+			}
+
+			for (const [tab, lastInRow] of tabs) {
+				tab.classList.toggle('last-in-row', lastInRow);
+			}
+		}
+
 		return tabsWrapMultiLine;
 	}
 
diff --git a/src/vs/workbench/browser/parts/editor/titleControl.ts b/src/vs/workbench/browser/parts/editor/titleControl.ts
index 91ea2cfb8c9..5aefc9c93f0 100644
--- a/src/vs/workbench/browser/parts/editor/titleControl.ts
+++ b/src/vs/workbench/browser/parts/editor/titleControl.ts
@@ -224,12 +224,11 @@ export abstract class TitleControl extends Themable {
 				this.updateEditorActionsToolbar(); // Update editor toolbar whenever contributed actions change
 			}));
 
-			const isPrimaryGroup = (group: string) => group === 'navigation' || group === '1_run';
-			const shouldInlineGroup = (action: SubmenuAction, group: string) => isPrimaryGroup(group) && action.actions.length <= 1;
+			const shouldInlineGroup = (action: SubmenuAction, group: string) => (group === 'navigation' || group === '1_run') && action.actions.length <= 1;
 
 			this.editorToolBarMenuDisposables.add(createAndFillInActionBarActions(
 				titleBarMenu, { arg: this.resourceContext.get(), shouldForwardArgs: true }, { primary, secondary },
-				isPrimaryGroup, 9, shouldInlineGroup
+				'navigation', 9, shouldInlineGroup
 			));
 		}
 
diff --git a/src/vs/workbench/browser/parts/panel/media/panelpart.css b/src/vs/workbench/browser/parts/panel/media/panelpart.css
index 27fc613ff4e..f1c7734ed7a 100644
--- a/src/vs/workbench/browser/parts/panel/media/panelpart.css
+++ b/src/vs/workbench/browser/parts/panel/media/panelpart.css
@@ -178,15 +178,17 @@
 }
 
 /* Rotate icons when panel is on right */
-.monaco-workbench .part.panel.right .title-actions .codicon-split-horizontal,
-.monaco-workbench .part.panel.right .title-actions .codicon-panel-maximize,
-.monaco-workbench .part.panel.right .title-actions .codicon-panel-restore {
+.monaco-workbench .part.panel.right .title-actions .codicon-split-horizontal::before,
+.monaco-workbench .part.panel.right .title-actions .codicon-panel-maximize::before,
+.monaco-workbench .part.panel.right .title-actions .codicon-panel-restore::before {
+	display: inline-block;
 	transform: rotate(-90deg);
 }
 
 /* Rotate icons when panel is on left */
-.monaco-workbench .part.panel.left .title-actions .codicon-split-horizontal,
-.monaco-workbench .part.panel.left .title-actions .codicon-panel-maximize,
-.monaco-workbench .part.panel.left .title-actions .codicon-panel-restore {
+.monaco-workbench .part.panel.left .title-actions .codicon-split-horizontal::before,
+.monaco-workbench .part.panel.left .title-actions .codicon-panel-maximize::before,
+.monaco-workbench .part.panel.left .title-actions .codicon-panel-restore::before {
+	display: inline-block;
 	transform: rotate(90deg);
 }
diff --git a/src/vs/workbench/browser/parts/titlebar/menubarControl.ts b/src/vs/workbench/browser/parts/titlebar/menubarControl.ts
index 7b4220fdbff..4317f2b9f1a 100644
--- a/src/vs/workbench/browser/parts/titlebar/menubarControl.ts
+++ b/src/vs/workbench/browser/parts/titlebar/menubarControl.ts
@@ -412,7 +412,6 @@ export class CustomMenubarControl extends MenubarControl {
 					.monaco-workbench .menubar > .menubar-menu-button.open,
 					.monaco-workbench .menubar > .menubar-menu-button:focus,
 					.monaco-workbench .menubar > .menubar-menu-button:hover {
-						outline-offset: -1px;
 						outline-color: ${menubarSelectedBorderColor};
 					}
 				`);
diff --git a/src/vs/workbench/browser/parts/views/treeView.ts b/src/vs/workbench/browser/parts/views/treeView.ts
index 04482e7d7f1..c3498b3924c 100644
--- a/src/vs/workbench/browser/parts/views/treeView.ts
+++ b/src/vs/workbench/browser/parts/views/treeView.ts
@@ -205,11 +205,11 @@ export class TreeView extends Disposable implements ITreeView {
 	) {
 		super();
 		this.root = new Root();
-		this.collapseAllContextKey = new RawContextKey<boolean>(`treeView.${this.id}.enableCollapseAll`, false);
+		this.collapseAllContextKey = new RawContextKey<boolean>(`treeView.${this.id}.enableCollapseAll`, false, localize('treeView.enableCollapseAll', "Whether the the tree view with id {0} enables collapse all.", this.id));
 		this.collapseAllContext = this.collapseAllContextKey.bindTo(contextKeyService);
-		this.collapseAllToggleContextKey = new RawContextKey<boolean>(`treeView.${this.id}.toggleCollapseAll`, false);
+		this.collapseAllToggleContextKey = new RawContextKey<boolean>(`treeView.${this.id}.toggleCollapseAll`, false, localize('treeView.toggleCollapseAll', "Whether collapse all is toggled for the tree view with id {0}.", this.id));
 		this.collapseAllToggleContext = this.collapseAllToggleContextKey.bindTo(contextKeyService);
-		this.refreshContextKey = new RawContextKey<boolean>(`treeView.${this.id}.enableRefresh`, false);
+		this.refreshContextKey = new RawContextKey<boolean>(`treeView.${this.id}.enableRefresh`, false, localize('treeView.enableRefresh', "Whether the tree view with id {0} enables refresh.", this.id));
 		this.refreshContext = this.refreshContextKey.bindTo(contextKeyService);
 
 		this._register(this.themeService.onDidFileIconThemeChange(() => this.doRefresh([this.root]) /** soft refresh **/));
@@ -1133,7 +1133,7 @@ class TreeMenus extends Disposable implements IDisposable {
 		const primary: IAction[] = [];
 		const secondary: IAction[] = [];
 		const result = { primary, secondary };
-		createAndFillInContextMenuActions(menu, { shouldForwardArgs: true }, result, g => /^inline/.test(g));
+		createAndFillInContextMenuActions(menu, { shouldForwardArgs: true }, result, 'inline');
 		menu.dispose();
 
 		return result;
diff --git a/src/vs/workbench/browser/parts/views/viewsService.ts b/src/vs/workbench/browser/parts/views/viewsService.ts
index f7dd97aa864..8d1ba53df2f 100644
--- a/src/vs/workbench/browser/parts/views/viewsService.ts
+++ b/src/vs/workbench/browser/parts/views/viewsService.ts
@@ -143,7 +143,7 @@ export class ViewsService extends Disposable implements IViewsService {
 		for (const viewDescriptor of views) {
 			const disposables = new DisposableStore();
 			disposables.add(this.registerOpenViewAction(viewDescriptor));
-			disposables.add(this.registerFocusViewAction(viewDescriptor, composite?.name ?? CATEGORIES.View));
+			disposables.add(this.registerFocusViewAction(viewDescriptor, composite?.name && composite.name !== composite.id ? composite.name : CATEGORIES.View));
 			disposables.add(this.registerResetViewLocationAction(viewDescriptor));
 			this.viewDisposable.set(viewDescriptor, disposables);
 		}
diff --git a/src/vs/workbench/browser/web.main.ts b/src/vs/workbench/browser/web.main.ts
index 9aea863b585..42eeeacd3d7 100644
--- a/src/vs/workbench/browser/web.main.ts
+++ b/src/vs/workbench/browser/web.main.ts
@@ -60,6 +60,7 @@ import { IUriIdentityService } from 'vs/workbench/services/uriIdentity/common/ur
 import { UriIdentityService } from 'vs/workbench/services/uriIdentity/common/uriIdentityService';
 import { BrowserWindow } from 'vs/workbench/browser/window';
 import { ITimerService } from 'vs/workbench/services/timer/browser/timerService';
+import { IEnvironmentService } from 'vs/platform/environment/common/environment';
 
 class BrowserMain extends Disposable {
 
@@ -150,6 +151,7 @@ class BrowserMain extends Disposable {
 		// Environment
 		const logsPath = URI.file(toLocalISOString(new Date()).replace(/-|:|\.\d+Z$/g, '')).with({ scheme: 'vscode-log' });
 		const environmentService = new BrowserWorkbenchEnvironmentService({ workspaceId: payload.id, logsPath, ...this.configuration }, productService);
+		serviceCollection.set(IEnvironmentService, environmentService);
 		serviceCollection.set(IWorkbenchEnvironmentService, environmentService);
 
 		// Log
diff --git a/src/vs/workbench/browser/window.ts b/src/vs/workbench/browser/window.ts
index 337771b2d29..56782daaea3 100644
--- a/src/vs/workbench/browser/window.ts
+++ b/src/vs/workbench/browser/window.ts
@@ -52,13 +52,13 @@ export class BrowserWindow extends Disposable {
 		this._register(addDisposableListener(viewport, EventType.RESIZE, () => this.onWindowResize()));
 
 		// Prevent the back/forward gestures in macOS
-		this._register(addDisposableListener(this.layoutService.getWorkbenchContainer(), EventType.WHEEL, e => e.preventDefault(), { passive: false }));
+		this._register(addDisposableListener(this.layoutService.container, EventType.WHEEL, e => e.preventDefault(), { passive: false }));
 
 		// Prevent native context menus in web
-		this._register(addDisposableListener(this.layoutService.getWorkbenchContainer(), EventType.CONTEXT_MENU, e => EventHelper.stop(e, true)));
+		this._register(addDisposableListener(this.layoutService.container, EventType.CONTEXT_MENU, e => EventHelper.stop(e, true)));
 
 		// Prevent default navigation on drop
-		this._register(addDisposableListener(this.layoutService.getWorkbenchContainer(), EventType.DROP, e => EventHelper.stop(e, true)));
+		this._register(addDisposableListener(this.layoutService.container, EventType.DROP, e => EventHelper.stop(e, true)));
 
 		// Fullscreen (Browser)
 		[EventType.FULLSCREEN_CHANGE, EventType.WK_FULLSCREEN_CHANGE].forEach(event => {
@@ -153,7 +153,7 @@ export class BrowserWindow extends Disposable {
 			scheme: Schemas.userData,
 			priority: true,
 			formatting: {
-				label: '${scheme}:${path}',
+				label: '(Settings) ${path}',
 				separator: '/',
 			}
 		});
diff --git a/src/vs/workbench/browser/workbench.contribution.ts b/src/vs/workbench/browser/workbench.contribution.ts
index 137c89d8bfb..e5c11ae9ce3 100644
--- a/src/vs/workbench/browser/workbench.contribution.ts
+++ b/src/vs/workbench/browser/workbench.contribution.ts
@@ -51,12 +51,12 @@ import { isStandalone } from 'vs/base/browser/browser';
 			'workbench.editor.decorations.badges': {
 				'type': 'boolean',
 				'markdownDescription': localize('decorations.badges', "Controls whether editor file decorations should use badges."),
-				'default': false
+				'default': true
 			},
 			'workbench.editor.decorations.colors': {
 				'type': 'boolean',
 				'markdownDescription': localize('decorations.colors', "Controls whether editor file decorations should use colors."),
-				'default': false
+				'default': true
 			},
 			'workbench.editor.labelFormat': {
 				'type': 'string',
@@ -89,7 +89,7 @@ import { isStandalone } from 'vs/base/browser/browser';
 			'workbench.editor.untitled.hint': {
 				'type': 'string',
 				'enum': ['text', 'button', 'hidden'],
-				'default': 'hidden',
+				'default': 'button',
 				'markdownDescription': localize({ comment: ['This is the description for a setting. Values surrounded by single quotes are not to be translated.'], key: 'untitledHint' }, "Controls if the untitled hint should be inline text in the editor or a floating button or hidden.")
 			},
 			'workbench.editor.tabCloseButton': {
diff --git a/src/vs/workbench/common/views.ts b/src/vs/workbench/common/views.ts
index d8fefe16b64..3fed08b3224 100644
--- a/src/vs/workbench/common/views.ts
+++ b/src/vs/workbench/common/views.ts
@@ -381,6 +381,7 @@ export interface IViewsRegistry {
 
 	readonly onDidChangeViewWelcomeContent: Event<string>;
 	registerViewWelcomeContent(id: string, viewContent: IViewContentDescriptor): IDisposable;
+	registerViewWelcomeContent2<TKey>(id: string, viewContentMap: Map<TKey, IViewContentDescriptor>): Map<TKey, IDisposable>;
 	getViewWelcomeContent(id: string): IViewContentDescriptor[];
 }
 
@@ -473,6 +474,22 @@ class ViewsRegistry extends Disposable implements IViewsRegistry {
 		});
 	}
 
+	registerViewWelcomeContent2<TKey>(id: string, viewContentMap: Map<TKey, IViewContentDescriptor>): Map<TKey, IDisposable> {
+		const disposables = new Map<TKey, IDisposable>();
+
+		for (const [key, content] of viewContentMap) {
+			this._viewWelcomeContents.add(id, content);
+
+			disposables.set(key, toDisposable(() => {
+				this._viewWelcomeContents.delete(id, content);
+				this._onDidChangeViewWelcomeContent.fire(id);
+			}));
+		}
+		this._onDidChangeViewWelcomeContent.fire(id);
+
+		return disposables;
+	}
+
 	getViewWelcomeContent(id: string): IViewContentDescriptor[] {
 		const result: IViewContentDescriptor[] = [];
 		this._viewWelcomeContents.forEach(id, descriptor => result.push(descriptor));
diff --git a/src/vs/workbench/contrib/backup/browser/backupTracker.ts b/src/vs/workbench/contrib/backup/browser/backupTracker.ts
index 6445d41ee84..88f79e72fb9 100644
--- a/src/vs/workbench/contrib/backup/browser/backupTracker.ts
+++ b/src/vs/workbench/contrib/backup/browser/backupTracker.ts
@@ -5,53 +5,22 @@
 
 import { IBackupFileService } from 'vs/workbench/services/backup/common/backup';
 import { IWorkbenchContribution } from 'vs/workbench/common/contributions';
-import { AutoSaveMode, IFilesConfigurationService } from 'vs/workbench/services/filesConfiguration/common/filesConfigurationService';
-import { IWorkingCopy, IWorkingCopyService, WorkingCopyCapabilities } from 'vs/workbench/services/workingCopy/common/workingCopyService';
+import { IFilesConfigurationService } from 'vs/workbench/services/filesConfiguration/common/filesConfigurationService';
+import { IWorkingCopyService } from 'vs/workbench/services/workingCopy/common/workingCopyService';
 import { ILifecycleService, ShutdownReason } from 'vs/workbench/services/lifecycle/common/lifecycle';
 import { ILogService } from 'vs/platform/log/common/log';
 import { BackupTracker } from 'vs/workbench/contrib/backup/common/backupTracker';
 
 export class BrowserBackupTracker extends BackupTracker implements IWorkbenchContribution {
 
-	// Delay creation of backups when content changes to avoid too much
-	// load on the backup service when the user is typing into the editor
-	// Since we always schedule a backup, even when auto save is on (web
-	// only), we have different scheduling delays based on auto save. This
-	// helps to avoid a race between saving (after 1s per default) and making
-	// a backup of the working copy.
-	private static readonly BACKUP_SCHEDULE_DELAYS = {
-		[AutoSaveMode.OFF]: 1000,
-		[AutoSaveMode.ON_FOCUS_CHANGE]: 1000,
-		[AutoSaveMode.ON_WINDOW_CHANGE]: 1000,
-		[AutoSaveMode.AFTER_SHORT_DELAY]: 2000, // explicitly higher to prevent races
-		[AutoSaveMode.AFTER_LONG_DELAY]: 1000
-	};
-
 	constructor(
 		@IBackupFileService backupFileService: IBackupFileService,
-		@IFilesConfigurationService private readonly filesConfigurationService: IFilesConfigurationService,
+		@IFilesConfigurationService filesConfigurationService: IFilesConfigurationService,
 		@IWorkingCopyService workingCopyService: IWorkingCopyService,
 		@ILifecycleService lifecycleService: ILifecycleService,
 		@ILogService logService: ILogService
 	) {
-		super(backupFileService, workingCopyService, logService, lifecycleService);
-	}
-
-	protected shouldScheduleBackup(workingCopy: IWorkingCopy): boolean {
-		// Web: we always want to schedule a backup, even if auto save
-		// is enabled because in web there is no handler on shutdown
-		// to trigger saving so there is a higher chance of dataloss.
-		// See https://github.com/microsoft/vscode/issues/108789
-		return true;
-	}
-
-	protected getBackupScheduleDelay(workingCopy: IWorkingCopy): number {
-		let autoSaveMode = this.filesConfigurationService.getAutoSaveMode();
-		if (workingCopy.capabilities & WorkingCopyCapabilities.Untitled) {
-			autoSaveMode = AutoSaveMode.OFF; // auto-save is never on for untitled working copies
-		}
-
-		return BrowserBackupTracker.BACKUP_SCHEDULE_DELAYS[autoSaveMode];
+		super(backupFileService, workingCopyService, logService, lifecycleService, filesConfigurationService);
 	}
 
 	protected onBeforeShutdown(reason: ShutdownReason): boolean | Promise<boolean> {
diff --git a/src/vs/workbench/contrib/backup/common/backupTracker.ts b/src/vs/workbench/contrib/backup/common/backupTracker.ts
index f9767e53486..6aa29c3259b 100644
--- a/src/vs/workbench/contrib/backup/common/backupTracker.ts
+++ b/src/vs/workbench/contrib/backup/common/backupTracker.ts
@@ -5,10 +5,11 @@
 
 import { IBackupFileService } from 'vs/workbench/services/backup/common/backup';
 import { Disposable, IDisposable, dispose, toDisposable } from 'vs/base/common/lifecycle';
-import { IWorkingCopyService, IWorkingCopy } from 'vs/workbench/services/workingCopy/common/workingCopyService';
+import { IWorkingCopyService, IWorkingCopy, WorkingCopyCapabilities } from 'vs/workbench/services/workingCopy/common/workingCopyService';
 import { ILogService } from 'vs/platform/log/common/log';
 import { ShutdownReason, ILifecycleService } from 'vs/workbench/services/lifecycle/common/lifecycle';
 import { CancellationTokenSource } from 'vs/base/common/cancellation';
+import { AutoSaveMode, IFilesConfigurationService } from 'vs/workbench/services/filesConfiguration/common/filesConfigurationService';
 
 export abstract class BackupTracker extends Disposable {
 
@@ -20,11 +21,26 @@ export abstract class BackupTracker extends Disposable {
 	// A map of scheduled pending backups for working copies
 	protected readonly pendingBackups = new Map<IWorkingCopy, IDisposable>();
 
+	// Delay creation of backups when content changes to avoid too much
+	// load on the backup service when the user is typing into the editor
+	// Since we always schedule a backup, even when auto save is on, we
+	// have different scheduling delays based on auto save. This helps to
+	// avoid a (not critical but also not really wanted) race between saving
+	// (after 1s per default) and making a backup of the working copy.
+	private static readonly BACKUP_SCHEDULE_DELAYS = {
+		[AutoSaveMode.OFF]: 1000,
+		[AutoSaveMode.ON_FOCUS_CHANGE]: 1000,
+		[AutoSaveMode.ON_WINDOW_CHANGE]: 1000,
+		[AutoSaveMode.AFTER_SHORT_DELAY]: 2000, // explicitly higher to prevent races
+		[AutoSaveMode.AFTER_LONG_DELAY]: 1000
+	};
+
 	constructor(
 		protected readonly backupFileService: IBackupFileService,
 		protected readonly workingCopyService: IWorkingCopyService,
 		protected readonly logService: ILogService,
-		protected readonly lifecycleService: ILifecycleService
+		protected readonly lifecycleService: ILifecycleService,
+		protected readonly filesConfigurationService: IFilesConfigurationService
 	) {
 		super();
 
@@ -84,28 +100,11 @@ export abstract class BackupTracker extends Disposable {
 		}
 	}
 
-	/**
-	 * Allows subclasses to conditionally opt-out of doing a backup, e.g. if
-	 * auto save is enabled.
-	 */
-	protected abstract shouldScheduleBackup(workingCopy: IWorkingCopy): boolean;
-
-	/**
-	 * Allows subclasses to control the delay before performing a backup from
-	 * working copy content changes.
-	 */
-	protected abstract getBackupScheduleDelay(workingCopy: IWorkingCopy): number;
-
 	private scheduleBackup(workingCopy: IWorkingCopy): void {
 
 		// Clear any running backup operation
 		this.cancelBackup(workingCopy);
 
-		// subclass prevented backup for working copy
-		if (!this.shouldScheduleBackup(workingCopy)) {
-			return;
-		}
-
 		this.logService.trace(`[backup tracker] scheduling backup`, workingCopy.resource.toString());
 
 		// Schedule new backup
@@ -153,6 +152,15 @@ export abstract class BackupTracker extends Disposable {
 		}));
 	}
 
+	protected getBackupScheduleDelay(workingCopy: IWorkingCopy): number {
+		let autoSaveMode = this.filesConfigurationService.getAutoSaveMode();
+		if (workingCopy.capabilities & WorkingCopyCapabilities.Untitled) {
+			autoSaveMode = AutoSaveMode.OFF; // auto-save is never on for untitled working copies
+		}
+
+		return BackupTracker.BACKUP_SCHEDULE_DELAYS[autoSaveMode];
+	}
+
 	protected getContentVersion(workingCopy: IWorkingCopy): number {
 		return this.mapWorkingCopyToContentVersion.get(workingCopy) || 0;
 	}
diff --git a/src/vs/workbench/contrib/backup/electron-sandbox/backupTracker.ts b/src/vs/workbench/contrib/backup/electron-sandbox/backupTracker.ts
index 7ce8f51bcd0..2eaff5936cc 100644
--- a/src/vs/workbench/contrib/backup/electron-sandbox/backupTracker.ts
+++ b/src/vs/workbench/contrib/backup/electron-sandbox/backupTracker.ts
@@ -26,21 +26,9 @@ import { Promises, raceCancellation } from 'vs/base/common/async';
 
 export class NativeBackupTracker extends BackupTracker implements IWorkbenchContribution {
 
-	// Delay creation of backups when working copy changes to avoid too much
-	// load on the backup service when the user is typing into the editor
-	private static readonly BACKUP_SCHEDULE_DELAY = 1000;
-
-	// Disable backup for when a short auto-save delay is configured with
-	// the rationale that the auto save will trigger a save periodically
-	// anway and thus creating frequent backups is not useful
-	//
-	// This will only apply to working copies that are not untitled where
-	// auto save is actually saving.
-	private static readonly DISABLE_BACKUP_AUTO_SAVE_THRESHOLD = 1500;
-
 	constructor(
 		@IBackupFileService backupFileService: IBackupFileService,
-		@IFilesConfigurationService private readonly filesConfigurationService: IFilesConfigurationService,
+		@IFilesConfigurationService filesConfigurationService: IFilesConfigurationService,
 		@IWorkingCopyService workingCopyService: IWorkingCopyService,
 		@ILifecycleService lifecycleService: ILifecycleService,
 		@IFileDialogService private readonly fileDialogService: IFileDialogService,
@@ -52,24 +40,7 @@ export class NativeBackupTracker extends BackupTracker implements IWorkbenchCont
 		@IEnvironmentService private readonly environmentService: IEnvironmentService,
 		@IProgressService private readonly progressService: IProgressService
 	) {
-		super(backupFileService, workingCopyService, logService, lifecycleService);
-	}
-
-	protected shouldScheduleBackup(workingCopy: IWorkingCopy): boolean {
-		if (workingCopy.capabilities & WorkingCopyCapabilities.Untitled) {
-			return true; // always backup untitled
-		}
-
-		const autoSaveConfiguration = this.filesConfigurationService.getAutoSaveConfiguration();
-		if (typeof autoSaveConfiguration.autoSaveDelay === 'number' && autoSaveConfiguration.autoSaveDelay < NativeBackupTracker.DISABLE_BACKUP_AUTO_SAVE_THRESHOLD) {
-			return false; // skip backup when auto save is already enabled with a low delay
-		}
-
-		return true;
-	}
-
-	protected getBackupScheduleDelay(): number {
-		return NativeBackupTracker.BACKUP_SCHEDULE_DELAY;
+		super(backupFileService, workingCopyService, logService, lifecycleService, filesConfigurationService);
 	}
 
 	protected onBeforeShutdown(reason: ShutdownReason): boolean | Promise<boolean> {
diff --git a/src/vs/workbench/contrib/backup/test/browser/backupRestorer.test.ts b/src/vs/workbench/contrib/backup/test/browser/backupRestorer.test.ts
index 71c20bb2f19..0671325a416 100644
--- a/src/vs/workbench/contrib/backup/test/browser/backupRestorer.test.ts
+++ b/src/vs/workbench/contrib/backup/test/browser/backupRestorer.test.ts
@@ -9,13 +9,12 @@ import { URI } from 'vs/base/common/uri';
 import { createTextBufferFactory } from 'vs/editor/common/model/textModel';
 import { DefaultEndOfLine } from 'vs/editor/common/model';
 import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
-import { EditorPart } from 'vs/workbench/browser/parts/editor/editorPart';
 import { IEditorGroupsService } from 'vs/workbench/services/editor/common/editorGroupsService';
 import { EditorService } from 'vs/workbench/services/editor/browser/editorService';
 import { IBackupFileService } from 'vs/workbench/services/backup/common/backup';
 import { Schemas } from 'vs/base/common/network';
 import { isEqual } from 'vs/base/common/resources';
-import { InMemoryTestBackupFileService, registerTestResourceEditor, TestServiceAccessor, workbenchInstantiationService } from 'vs/workbench/test/browser/workbenchTestServices';
+import { createEditorPart, InMemoryTestBackupFileService, registerTestResourceEditor, TestServiceAccessor, workbenchInstantiationService } from 'vs/workbench/test/browser/workbenchTestServices';
 import { BackupRestorer } from 'vs/workbench/contrib/backup/common/backupRestorer';
 import { BrowserBackupTracker } from 'vs/workbench/contrib/backup/browser/backupTracker';
 import { DisposableStore } from 'vs/base/common/lifecycle';
@@ -49,9 +48,7 @@ suite('BackupRestorer', () => {
 		const instantiationService = workbenchInstantiationService();
 		instantiationService.stub(IBackupFileService, backupFileService);
 
-		const part = disposables.add(instantiationService.createInstance(EditorPart));
-		part.create(document.createElement('div'));
-		part.layout(400, 300);
+		const part = createEditorPart(instantiationService, disposables);
 
 		instantiationService.stub(IEditorGroupsService, part);
 
diff --git a/src/vs/workbench/contrib/backup/test/browser/backupTracker.test.ts b/src/vs/workbench/contrib/backup/test/browser/backupTracker.test.ts
index 593c0a9baaa..17c3e8b56f6 100644
--- a/src/vs/workbench/contrib/backup/test/browser/backupTracker.test.ts
+++ b/src/vs/workbench/contrib/backup/test/browser/backupTracker.test.ts
@@ -19,11 +19,12 @@ import { ILifecycleService } from 'vs/workbench/services/lifecycle/common/lifecy
 import { BackupTracker } from 'vs/workbench/contrib/backup/common/backupTracker';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { UntitledTextEditorInput } from 'vs/workbench/services/untitled/common/untitledTextEditorInput';
-import { InMemoryTestBackupFileService, registerTestResourceEditor, TestServiceAccessor, workbenchInstantiationService } from 'vs/workbench/test/browser/workbenchTestServices';
+import { createEditorPart, InMemoryTestBackupFileService, registerTestResourceEditor, TestServiceAccessor, workbenchInstantiationService } from 'vs/workbench/test/browser/workbenchTestServices';
 import { TestWorkingCopy } from 'vs/workbench/test/common/workbenchTestServices';
 import { CancellationToken } from 'vs/base/common/cancellation';
 import { timeout } from 'vs/base/common/async';
 import { BrowserBackupTracker } from 'vs/workbench/contrib/backup/browser/backupTracker';
+import { DisposableStore } from 'vs/base/common/lifecycle';
 
 suite('BackupTracker (browser)', function () {
 	let accessor: TestServiceAccessor;
@@ -46,15 +47,15 @@ suite('BackupTracker (browser)', function () {
 	}
 
 	async function createTracker(): Promise<{ accessor: TestServiceAccessor, part: EditorPart, tracker: BackupTracker, backupFileService: InMemoryTestBackupFileService, instantiationService: IInstantiationService, cleanup: () => void }> {
+		const disposables = new DisposableStore();
+
 		const backupFileService = new InMemoryTestBackupFileService();
 		const instantiationService = workbenchInstantiationService();
 		instantiationService.stub(IBackupFileService, backupFileService);
 
-		const part = instantiationService.createInstance(EditorPart);
-		part.create(document.createElement('div'));
-		part.layout(400, 300);
+		const part = createEditorPart(instantiationService, disposables);
 
-		const editorRegistration = registerTestResourceEditor();
+		disposables.add(registerTestResourceEditor());
 
 		instantiationService.stub(IEditorGroupsService, part);
 
@@ -65,15 +66,9 @@ suite('BackupTracker (browser)', function () {
 
 		await part.whenRestored;
 
-		const tracker = instantiationService.createInstance(TestBackupTracker);
+		const tracker = disposables.add(instantiationService.createInstance(TestBackupTracker));
 
-		const cleanup = () => {
-			part.dispose();
-			tracker.dispose();
-			editorRegistration.dispose();
-		};
-
-		return { accessor, part, tracker, backupFileService, instantiationService, cleanup };
+		return { accessor, part, tracker, backupFileService, instantiationService, cleanup: () => disposables.dispose() };
 	}
 
 	async function untitledBackupTest(untitled: IUntitledTextResourceEditorInput = {}): Promise<void> {
diff --git a/src/vs/workbench/contrib/backup/test/electron-browser/backupTracker.test.ts b/src/vs/workbench/contrib/backup/test/electron-browser/backupTracker.test.ts
index 6a3caeeda6f..1029ccfd112 100644
--- a/src/vs/workbench/contrib/backup/test/electron-browser/backupTracker.test.ts
+++ b/src/vs/workbench/contrib/backup/test/electron-browser/backupTracker.test.ts
@@ -35,7 +35,7 @@ import { workbenchInstantiationService, TestServiceAccessor } from 'vs/workbench
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { TestConfigurationService } from 'vs/platform/configuration/test/common/testConfigurationService';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { registerTestFileEditor, TestFilesConfigurationService } from 'vs/workbench/test/browser/workbenchTestServices';
+import { createEditorPart, registerTestFileEditor, TestFilesConfigurationService } from 'vs/workbench/test/browser/workbenchTestServices';
 import { MockContextKeyService } from 'vs/platform/keybinding/test/common/mockKeybindingService';
 import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
 import { IEnvironmentService } from 'vs/platform/environment/common/environment';
@@ -135,9 +135,7 @@ flakySuite('BackupTracker (native)', function () {
 			configurationService
 		));
 
-		const part = instantiationService.createInstance(EditorPart);
-		part.create(document.createElement('div'));
-		part.layout(400, 300);
+		const part = createEditorPart(instantiationService, disposables);
 
 		instantiationService.stub(IEditorGroupsService, part);
 
@@ -161,10 +159,17 @@ flakySuite('BackupTracker (native)', function () {
 		return { accessor, part, tracker, instantiationService, cleanup };
 	}
 
-	test('Track backups (file)', async function () {
-		const { accessor, cleanup } = await createTracker();
+	test('Track backups (file, auto save off)', function () {
+		return trackBackupsTest(toResource.call(this, '/path/index.txt'), false);
+	});
+
+	test('Track backups (file, auto save on)', function () {
+		return trackBackupsTest(toResource.call(this, '/path/index.txt'), true);
+	});
+
+	async function trackBackupsTest(resource: URI, autoSave: boolean) {
+		const { accessor, cleanup } = await createTracker(autoSave);
 
-		const resource = toResource.call(this, '/path/index.txt');
 		await accessor.editorService.openEditor({ resource, options: { pinned: true } });
 
 		const fileModel = accessor.textFileService.files.get(resource);
@@ -181,7 +186,7 @@ flakySuite('BackupTracker (native)', function () {
 		assert.strictEqual(accessor.backupFileService.hasBackupSync(resource), false);
 
 		await cleanup();
-	});
+	}
 
 	test('onWillShutdown - no veto if no dirty files', async function () {
 		const { accessor, cleanup } = await createTracker();
diff --git a/src/vs/workbench/contrib/bulkEdit/browser/bulkCellEdits.ts b/src/vs/workbench/contrib/bulkEdit/browser/bulkCellEdits.ts
index 714e459272b..d633df9b24d 100644
--- a/src/vs/workbench/contrib/bulkEdit/browser/bulkCellEdits.ts
+++ b/src/vs/workbench/contrib/bulkEdit/browser/bulkCellEdits.ts
@@ -49,14 +49,14 @@ export class BulkCellEdits {
 			const ref = await this._notebookModelService.resolve(first.resource);
 
 			// check state
-			// if (typeof first.versionId === 'number' && ref.object.notebook.versionId !== first.versionId) {
-			// 	ref.dispose();
-			// 	throw new Error(`Notebook '${first.resource}' has changed in the meantime`);
-			// }
+			if (typeof first.versionId === 'number' && ref.object.notebook.versionId !== first.versionId) {
+				ref.dispose();
+				throw new Error(`Notebook '${first.resource}' has changed in the meantime`);
+			}
 
 			// apply edits
 			const edits = group.map(entry => entry.cellEdit);
-			ref.object.notebook.applyEdits(ref.object.notebook.versionId, edits, true, undefined, () => undefined, this._undoRedoGroup);
+			ref.object.notebook.applyEdits(edits, true, undefined, () => undefined, this._undoRedoGroup);
 			ref.dispose();
 
 			this._progress.report(undefined);
diff --git a/src/vs/workbench/contrib/codeEditor/browser/quickaccess/gotoSymbolQuickAccess.ts b/src/vs/workbench/contrib/codeEditor/browser/quickaccess/gotoSymbolQuickAccess.ts
index 4f76c554788..d3216f61a9b 100644
--- a/src/vs/workbench/contrib/codeEditor/browser/quickaccess/gotoSymbolQuickAccess.ts
+++ b/src/vs/workbench/contrib/codeEditor/browser/quickaccess/gotoSymbolQuickAccess.ts
@@ -162,7 +162,7 @@ export class GotoSymbolQuickAccessProvider extends AbstractGotoSymbolQuickAccess
 				}
 			}));
 
-			const entries = Array.from(outline.config.quickPickDataSource.getQuickPickElements());
+			const entries = outline.config.quickPickDataSource.getQuickPickElements();
 
 			const items: IGotoSymbolQuickPickItem[] = entries.map((entry, idx) => {
 				return {
diff --git a/src/vs/workbench/contrib/codeEditor/electron-sandbox/displayChangeRemeasureFonts.ts b/src/vs/workbench/contrib/codeEditor/electron-sandbox/displayChangeRemeasureFonts.ts
index 94cfd235857..ac3c31c9f3e 100644
--- a/src/vs/workbench/contrib/codeEditor/electron-sandbox/displayChangeRemeasureFonts.ts
+++ b/src/vs/workbench/contrib/codeEditor/electron-sandbox/displayChangeRemeasureFonts.ts
@@ -7,21 +7,19 @@ import { LifecyclePhase } from 'vs/workbench/services/lifecycle/common/lifecycle
 import { Registry } from 'vs/platform/registry/common/platform';
 import { Extensions as WorkbenchExtensions, IWorkbenchContribution, IWorkbenchContributionsRegistry } from 'vs/workbench/common/contributions';
 import { Disposable } from 'vs/base/common/lifecycle';
-import { IMainProcessService } from 'vs/platform/ipc/electron-sandbox/services';
-import { IDisplayMainService } from 'vs/platform/display/common/displayMainService';
-import { ProxyChannel } from 'vs/base/parts/ipc/common/ipc';
+import { INativeHostService } from 'vs/platform/native/electron-sandbox/native';
 import { clearAllFontInfos } from 'vs/editor/browser/config/configuration';
 
 class DisplayChangeRemeasureFonts extends Disposable implements IWorkbenchContribution {
 
 	constructor(
-		@IMainProcessService mainProcessService: IMainProcessService
+		@INativeHostService nativeHostService: INativeHostService
 	) {
 		super();
-		const displayMainService = ProxyChannel.toService<IDisplayMainService>(mainProcessService.getChannel('display'));
-		displayMainService.onDidDisplayChanged(() => {
+
+		this._register(nativeHostService.onDidChangeDisplay(() => {
 			clearAllFontInfos();
-		});
+		}));
 	}
 }
 
diff --git a/src/vs/workbench/contrib/comments/browser/commentMenus.ts b/src/vs/workbench/contrib/comments/browser/commentMenus.ts
index a5351b13023..e8f40224f44 100644
--- a/src/vs/workbench/contrib/comments/browser/commentMenus.ts
+++ b/src/vs/workbench/contrib/comments/browser/commentMenus.ts
@@ -38,7 +38,7 @@ export class CommentMenus implements IDisposable {
 		const secondary: IAction[] = [];
 		const result = { primary, secondary };
 
-		createAndFillInContextMenuActions(menu, { shouldForwardArgs: true }, result, g => /^inline/.test(g));
+		createAndFillInContextMenuActions(menu, { shouldForwardArgs: true }, result, 'inline');
 
 		return menu;
 	}
diff --git a/src/vs/workbench/contrib/customEditor/browser/customEditorInput.ts b/src/vs/workbench/contrib/customEditor/browser/customEditorInput.ts
index 4a0d03d42b3..bddf88a1207 100644
--- a/src/vs/workbench/contrib/customEditor/browser/customEditorInput.ts
+++ b/src/vs/workbench/contrib/customEditor/browser/customEditorInput.ts
@@ -17,6 +17,7 @@ import { ILabelService } from 'vs/platform/label/common/label';
 import { IUndoRedoService } from 'vs/platform/undoRedo/common/undoRedo';
 import { GroupIdentifier, IEditorInput, IRevertOptions, ISaveOptions, Verbosity } from 'vs/workbench/common/editor';
 import { ICustomEditorModel, ICustomEditorService } from 'vs/workbench/contrib/customEditor/common/customEditor';
+import { decorateFileEditorLabel } from 'vs/workbench/contrib/files/common/editors/fileEditorInput';
 import { IWebviewService, WebviewOverlay } from 'vs/workbench/contrib/webview/browser/webview';
 import { IWebviewWorkbenchService, LazilyResolvedWebviewEditorInput } from 'vs/workbench/contrib/webviewPanel/browser/webviewWorkbenchService';
 import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
@@ -63,9 +64,9 @@ export class CustomEditorInput extends LazilyResolvedWebviewEditorInput {
 		return true;
 	}
 
-	@memoize
 	getName(): string {
-		return basename(this.labelService.getUriLabel(this.resource));
+		const name = basename(this.labelService.getUriLabel(this.resource));
+		return this.decorateLabel(name);
 	}
 
 	matches(other: IEditorInput): boolean {
@@ -92,17 +93,30 @@ export class CustomEditorInput extends LazilyResolvedWebviewEditorInput {
 	public getTitle(verbosity?: Verbosity): string {
 		switch (verbosity) {
 			case Verbosity.SHORT:
-				return this.shortTitle;
+				return this.decorateLabel(this.shortTitle);
 			default:
 			case Verbosity.MEDIUM:
-				return this.mediumTitle;
+				return this.decorateLabel(this.mediumTitle);
 			case Verbosity.LONG:
-				return this.longTitle;
+				return this.decorateLabel(this.longTitle);
 		}
 	}
 
+	private decorateLabel(label: string): string {
+		const orphaned = !!this._modelRef?.object.isOrphaned();
+
+		const readonly = this._modelRef
+			? !this._modelRef.object.isEditable() || this._modelRef.object.isOnReadonlyFileSystem()
+			: false;
+
+		return decorateFileEditorLabel(label, {
+			orphaned,
+			readonly
+		});
+	}
+
 	public isReadonly(): boolean {
-		return this._modelRef ? this._modelRef.object.isReadonly() : false;
+		return this._modelRef ? !this._modelRef.object.isEditable() : false;
 	}
 
 	public isUntitled(): boolean {
@@ -169,6 +183,7 @@ export class CustomEditorInput extends LazilyResolvedWebviewEditorInput {
 		if (!this._modelRef) {
 			this._modelRef = this._register(assertIsDefined(await this.customEditorService.models.tryRetain(this.resource, this.viewType)));
 			this._register(this._modelRef.object.onDidChangeDirty(() => this._onDidChangeDirty.fire()));
+			this._register(this._modelRef.object.onDidChangeOrphaned(() => this._onDidChangeLabel.fire()));
 
 			if (this.isDirty()) {
 				this._onDidChangeDirty.fire();
diff --git a/src/vs/workbench/contrib/customEditor/browser/customEditors.ts b/src/vs/workbench/contrib/customEditor/browser/customEditors.ts
index de234c73b66..f0b8960afb1 100644
--- a/src/vs/workbench/contrib/customEditor/browser/customEditors.ts
+++ b/src/vs/workbench/contrib/customEditor/browser/customEditors.ts
@@ -4,34 +4,32 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { coalesce, distinct, firstOrDefault } from 'vs/base/common/arrays';
-import { Codicon } from 'vs/base/common/codicons';
 import { Emitter, Event } from 'vs/base/common/event';
 import { Lazy } from 'vs/base/common/lazy';
 import { Disposable, IDisposable, toDisposable } from 'vs/base/common/lifecycle';
-import { basename, extname, isEqual } from 'vs/base/common/resources';
+import { extname, isEqual } from 'vs/base/common/resources';
 import { URI } from 'vs/base/common/uri';
 import { generateUuid } from 'vs/base/common/uuid';
 import { RedoCommand, UndoCommand } from 'vs/editor/browser/editorExtensions';
-import * as nls from 'vs/nls';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
 import { IContextKey, IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { EditorActivation, IEditorOptions, ITextEditorOptions, EditorOverride } from 'vs/platform/editor/common/editor';
+import { EditorActivation, EditorOverride, IEditorOptions, ITextEditorOptions } from 'vs/platform/editor/common/editor';
 import { FileOperation, IFileService } from 'vs/platform/files/common/files';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { IQuickInputService, IQuickPickItem } from 'vs/platform/quickinput/common/quickInput';
 import { Registry } from 'vs/platform/registry/common/platform';
 import { IStorageService } from 'vs/platform/storage/common/storage';
 import * as colorRegistry from 'vs/platform/theme/common/colorRegistry';
 import { registerThemingParticipant } from 'vs/platform/theme/common/themeService';
-import { Extensions as EditorExtensions, IEditorTypesHandler, IEditorType, IEditorAssociationsRegistry, EditorsAssociations, editorsAssociationsSettingId, EditorAssociation } from 'vs/workbench/browser/editor';
+import { EditorsAssociations, editorsAssociationsSettingId, Extensions as EditorExtensions, IEditorAssociationsRegistry, IEditorType, IEditorTypesHandler } from 'vs/workbench/browser/editor';
 import { IWorkbenchContribution } from 'vs/workbench/common/contributions';
 import { EditorInput, EditorOptions, Extensions as EditorInputExtensions, GroupIdentifier, IEditorInput, IEditorInputFactoryRegistry, IEditorPane } from 'vs/workbench/common/editor';
 import { DiffEditorInput } from 'vs/workbench/common/editor/diffEditorInput';
-import { CONTEXT_CUSTOM_EDITORS, CONTEXT_FOCUSED_CUSTOM_EDITOR_IS_EDITABLE, CustomEditorCapabilities, CustomEditorInfo, CustomEditorInfoCollection, CustomEditorPriority, ICustomEditorService } from 'vs/workbench/contrib/customEditor/common/customEditor';
+import { CONTEXT_ACTIVE_CUSTOM_EDITOR_ID, CONTEXT_FOCUSED_CUSTOM_EDITOR_IS_EDITABLE, CustomEditorCapabilities, CustomEditorInfo, CustomEditorInfoCollection, CustomEditorPriority, ICustomEditorService } from 'vs/workbench/contrib/customEditor/common/customEditor';
 import { CustomEditorModelManager } from 'vs/workbench/contrib/customEditor/common/customEditorModelManager';
 import { IWebviewService } from 'vs/workbench/contrib/webview/browser/webview';
 import { IEditorGroup, IEditorGroupsService } from 'vs/workbench/services/editor/common/editorGroupsService';
 import { IEditorService, IOpenEditorOverride, IOpenEditorOverrideEntry } from 'vs/workbench/services/editor/common/editorService';
+import { IUriIdentityService } from 'vs/workbench/services/uriIdentity/common/uriIdentity';
 import { ContributedCustomEditors, defaultCustomEditor } from '../common/contributedCustomEditors';
 import { CustomEditorInput } from './customEditorInput';
 
@@ -43,10 +41,11 @@ export class CustomEditorService extends Disposable implements ICustomEditorServ
 
 	private readonly _models = new CustomEditorModelManager();
 
-	private readonly _customEditorContextKey: IContextKey<string>;
+	private readonly _activeCustomEditorId: IContextKey<string>;
 	private readonly _focusedCustomEditorIsEditable: IContextKey<boolean>;
+
 	private readonly _onDidChangeEditorTypes = this._register(new Emitter<void>());
-	onDidChangeEditorTypes: Event<void> = this._onDidChangeEditorTypes.event;
+	public readonly onDidChangeEditorTypes: Event<void> = this._onDidChangeEditorTypes.event;
 
 	private readonly _fileEditorInputFactory = Registry.as<IEditorInputFactoryRegistry>(EditorInputExtensions.EditorInputFactories).getFileEditorInputFactory();
 
@@ -58,12 +57,12 @@ export class CustomEditorService extends Disposable implements ICustomEditorServ
 		@IEditorService private readonly editorService: IEditorService,
 		@IEditorGroupsService private readonly editorGroupService: IEditorGroupsService,
 		@IInstantiationService private readonly instantiationService: IInstantiationService,
-		@IQuickInputService private readonly quickInputService: IQuickInputService,
 		@IWebviewService private readonly webviewService: IWebviewService,
+		@IUriIdentityService private readonly uriIdentityService: IUriIdentityService,
 	) {
 		super();
 
-		this._customEditorContextKey = CONTEXT_CUSTOM_EDITORS.bindTo(contextKeyService);
+		this._activeCustomEditorId = CONTEXT_ACTIVE_CUSTOM_EDITOR_ID.bindTo(contextKeyService);
 		this._focusedCustomEditorIsEditable = CONTEXT_FOCUSED_CUSTOM_EDITOR_IS_EDITABLE.bindTo(contextKeyService);
 
 		this._contributedEditors = this._register(new ContributedCustomEditors(storageService));
@@ -76,7 +75,7 @@ export class CustomEditorService extends Disposable implements ICustomEditorServ
 
 		this._register(fileService.onDidRunOperation(e => {
 			if (e.isOperation(FileOperation.MOVE)) {
-				this.handleMovedFileInOpenedFileEditors(e.resource, e.target.resource);
+				this.handleMovedFileInOpenedFileEditors(e.resource, this.uriIdentityService.asCanonicalUri(e.target.resource));
 			}
 		}));
 
@@ -132,84 +131,6 @@ export class CustomEditorService extends Disposable implements ICustomEditorServ
 		]);
 	}
 
-	public async promptOpenWith(
-		resource: URI,
-		options?: ITextEditorOptions,
-		group?: IEditorGroup,
-	): Promise<IEditorPane | undefined> {
-		const pick = await this.showOpenWithPrompt(resource, group);
-		if (!pick) {
-			return;
-		}
-
-		return this.openWith(resource, pick, options, group);
-	}
-
-	private showOpenWithPrompt(
-		resource: URI,
-		group?: IEditorGroup,
-	): Promise<string | undefined> {
-		const customEditors = new CustomEditorInfoCollection([
-			defaultCustomEditor,
-			...this.getAllCustomEditors(resource).allEditors,
-		]);
-
-		const existingEditorForResource = group && firstOrDefault(this.editorService.findEditors(resource, group));
-		const currentlyOpenedEditorType: undefined | string = existingEditorForResource instanceof CustomEditorInput ? existingEditorForResource.viewType : defaultCustomEditor.id;
-
-		const resourceExt = extname(resource);
-
-		const items = customEditors.allEditors.map((editorDescriptor): IQuickPickItem => ({
-			label: editorDescriptor.displayName,
-			id: editorDescriptor.id,
-			description: editorDescriptor.id === currentlyOpenedEditorType
-				? nls.localize('openWithCurrentlyActive', "Currently Active")
-				: undefined,
-			detail: editorDescriptor.providerDisplayName,
-			buttons: resourceExt ? [{
-				iconClass: Codicon.settingsGear.classNames,
-				tooltip: nls.localize('promptOpenWith.setDefaultTooltip', "Set as default editor for '{0}' files", resourceExt)
-			}] : undefined
-		}));
-
-		const picker = this.quickInputService.createQuickPick();
-		picker.items = items;
-		picker.placeholder = nls.localize('promptOpenWith.placeHolder', "Select editor to use for '{0}'...", basename(resource));
-
-		return new Promise<string | undefined>(resolve => {
-			picker.onDidAccept(() => {
-				resolve(picker.selectedItems.length === 1 ? picker.selectedItems[0].id : undefined);
-				picker.dispose();
-			});
-			picker.onDidTriggerItemButton(e => {
-				const pick = e.item.id;
-				resolve(pick); // open the view
-				picker.dispose();
-
-				// And persist the setting
-				if (pick) {
-					const newAssociation: EditorAssociation = { viewType: pick, filenamePattern: '*' + resourceExt };
-					const currentAssociations = [...this.configurationService.getValue<EditorsAssociations>(editorsAssociationsSettingId)];
-
-					// First try updating existing association
-					for (let i = 0; i < currentAssociations.length; ++i) {
-						const existing = currentAssociations[i];
-						if (existing.filenamePattern === newAssociation.filenamePattern) {
-							currentAssociations.splice(i, 1, newAssociation);
-							this.configurationService.updateValue(editorsAssociationsSettingId, currentAssociations);
-							return;
-						}
-					}
-
-					// Otherwise, create a new one
-					currentAssociations.unshift(newAssociation);
-					this.configurationService.updateValue(editorsAssociationsSettingId, currentAssociations);
-				}
-			});
-			picker.show();
-		});
-	}
-
 	public async openWith(
 		resource: URI,
 		viewType: string,
@@ -222,7 +143,9 @@ export class CustomEditorService extends Disposable implements ICustomEditorServ
 		}
 
 		if (!this._contributedEditors.get(viewType)) {
-			return this.promptOpenWith(resource, options, group);
+			// Prompt the user
+			const input = this.editorService.createEditorInput({ resource });
+			return this.editorService.openEditor(input, { override: EditorOverride.PICK });
 		}
 
 		const capabilities = this.getCustomEditorCapabilities(viewType) || {};
@@ -307,19 +230,17 @@ export class CustomEditorService extends Disposable implements ICustomEditorServ
 		const activeEditorPane = this.editorService.activeEditorPane;
 		const resource = activeEditorPane?.input?.resource;
 		if (!resource) {
-			this._customEditorContextKey.reset();
+			this._activeCustomEditorId.reset();
 			this._focusedCustomEditorIsEditable.reset();
 			return;
 		}
 
-		const possibleEditors = this.getAllCustomEditors(resource).allEditors;
-
-		this._customEditorContextKey.set(possibleEditors.map(x => x.id).join(','));
+		this._activeCustomEditorId.set(activeEditorPane?.input instanceof CustomEditorInput ? activeEditorPane.input.viewType : '');
 		this._focusedCustomEditorIsEditable.set(activeEditorPane?.input instanceof CustomEditorInput);
 	}
 
 	private async handleMovedFileInOpenedFileEditors(oldResource: URI, newResource: URI): Promise<void> {
-		if (extname(oldResource) === extname(newResource)) {
+		if (extname(oldResource).toLowerCase() === extname(newResource).toLowerCase()) {
 			return;
 		}
 
@@ -352,25 +273,16 @@ export class CustomEditorService extends Disposable implements ICustomEditorServ
 			return;
 		}
 
-		let viewType: string | undefined;
-		if (possibleEditors.defaultEditor) {
-			viewType = possibleEditors.defaultEditor.id;
-		} else {
-			// If there is, show a single prompt for all editors to see if the user wants to re-open them
-			//
-			// TODO: instead of prompting eagerly, it'd likely be better to replace all the editors with
-			// ones that would prompt when they first become visible
-			await new Promise(resolve => setTimeout(resolve, 50));
-			viewType = await this.showOpenWithPrompt(newResource);
-		}
-
-		if (!viewType) {
-			return;
-		}
-
 		for (const [group, entries] of editorsToReplace) {
 			this.editorService.replaceEditors(entries.map(editor => {
-				const replacement = this.createInput(newResource, viewType!, group);
+				let replacement: IEditorInput;
+				if (possibleEditors.defaultEditor) {
+					const viewType = possibleEditors.defaultEditor.id;
+					replacement = this.createInput(newResource, viewType!, group);
+				} else {
+					replacement = this.editorService.createEditorInput({ resource: newResource });
+				}
+
 				return {
 					editor,
 					replacement,
@@ -577,19 +489,16 @@ export class CustomEditorContribution extends Disposable implements IWorkbenchCo
 		return {
 			override: (async () => {
 				const standardEditor = await this.editorService.openEditor(editor, { ...options, override: EditorOverride.DISABLED }, group);
+				if (!standardEditor?.input) {
+					return;
+				}
+
 				// Give a moment to make sure the editor is showing.
 				// Otherwise the focus shift can cause the prompt to be dismissed right away.
 				await new Promise(resolve => setTimeout(resolve, 20));
-				const selectedEditor = await this.customEditorService.promptOpenWith(resource, options, group);
-				if (selectedEditor && selectedEditor.input) {
-					await group.replaceEditors([{
-						editor,
-						replacement: selectedEditor.input
-					}]);
-					return selectedEditor;
-				}
 
-				return standardEditor;
+				// Prompt the user
+				return this.editorService.openEditor(standardEditor.input, { override: EditorOverride.PICK });
 			})()
 		};
 	}
diff --git a/src/vs/workbench/contrib/customEditor/common/customEditor.ts b/src/vs/workbench/contrib/customEditor/common/customEditor.ts
index 658ca9c5771..6bb68a6a56a 100644
--- a/src/vs/workbench/contrib/customEditor/common/customEditor.ts
+++ b/src/vs/workbench/contrib/customEditor/common/customEditor.ts
@@ -16,10 +16,15 @@ import { ITextEditorOptions } from 'vs/platform/editor/common/editor';
 import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
 import { GroupIdentifier, IEditorInput, IEditorPane, IRevertOptions, ISaveOptions } from 'vs/workbench/common/editor';
 import { IEditorGroup } from 'vs/workbench/services/editor/common/editorGroupsService';
+import * as nls from 'vs/nls';
 
 export const ICustomEditorService = createDecorator<ICustomEditorService>('customEditorService');
 
-export const CONTEXT_CUSTOM_EDITORS = new RawContextKey<string>('customEditors', '');
+export const CONTEXT_ACTIVE_CUSTOM_EDITOR_ID = new RawContextKey<string>('activeCustomEditorId', '', {
+	type: 'string',
+	description: nls.localize('context.customEditor', "The viewType of the currently active custom editor."),
+});
+
 export const CONTEXT_FOCUSED_CUSTOM_EDITOR_IS_EDITABLE = new RawContextKey<boolean>('focusedCustomEditorIsEditable', false);
 
 export interface CustomEditorCapabilities {
@@ -39,7 +44,6 @@ export interface ICustomEditorService {
 	createInput(resource: URI, viewType: string, group: GroupIdentifier | undefined, options?: { readonly customClasses: string }): IEditorInput;
 
 	openWith(resource: URI, customEditorViewType: string, options?: ITextEditorOptions, group?: IEditorGroup): Promise<IEditorPane | undefined>;
-	promptOpenWith(resource: URI, options?: ITextEditorOptions, group?: IEditorGroup): Promise<IEditorPane | undefined>;
 
 	registerCustomEditorCapabilities(viewType: string, options: CustomEditorCapabilities): IDisposable;
 }
@@ -59,7 +63,11 @@ export interface ICustomEditorModel extends IDisposable {
 	readonly resource: URI;
 	readonly backupId: string | undefined;
 
-	isReadonly(): boolean;
+	isEditable(): boolean;
+	isOnReadonlyFileSystem(): boolean;
+
+	isOrphaned(): boolean;
+	readonly onDidChangeOrphaned: Event<void>;
 
 	isDirty(): boolean;
 	readonly onDidChangeDirty: Event<void>;
diff --git a/src/vs/workbench/contrib/customEditor/common/customTextEditorModel.ts b/src/vs/workbench/contrib/customEditor/common/customTextEditorModel.ts
index c1fa3b8a408..c39fa2ce52c 100644
--- a/src/vs/workbench/contrib/customEditor/common/customTextEditorModel.ts
+++ b/src/vs/workbench/contrib/customEditor/common/customTextEditorModel.ts
@@ -8,10 +8,11 @@ import { Disposable, IReference } from 'vs/base/common/lifecycle';
 import { isEqual } from 'vs/base/common/resources';
 import { URI } from 'vs/base/common/uri';
 import { IResolvedTextEditorModel, ITextModelService } from 'vs/editor/common/services/resolverService';
+import { FileSystemProviderCapabilities, IFileService } from 'vs/platform/files/common/files';
+import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { IRevertOptions, ISaveOptions } from 'vs/workbench/common/editor';
 import { ICustomEditorModel } from 'vs/workbench/contrib/customEditor/common/customEditor';
-import { ITextFileService } from 'vs/workbench/services/textfile/common/textfiles';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
+import { ITextFileEditorModel, ITextFileService, TextFileEditorModelState } from 'vs/workbench/services/textfile/common/textfiles';
 
 export class CustomTextEditorModel extends Disposable implements ICustomEditorModel {
 
@@ -22,22 +23,32 @@ export class CustomTextEditorModel extends Disposable implements ICustomEditorMo
 	): Promise<CustomTextEditorModel> {
 		return instantiationService.invokeFunction(async accessor => {
 			const textModelResolverService = accessor.get(ITextModelService);
-			const textFileService = accessor.get(ITextFileService);
 			const model = await textModelResolverService.createModelReference(resource);
-			return new CustomTextEditorModel(viewType, resource, model, textFileService);
+			return instantiationService.createInstance(CustomTextEditorModel, viewType, resource, model);
 		});
 	}
 
-	private constructor(
+	private readonly _textFileModel: ITextFileEditorModel | undefined;
+
+	private readonly _onDidChangeOrphaned = this._register(new Emitter<void>());
+	public readonly onDidChangeOrphaned = this._onDidChangeOrphaned.event;
+
+	constructor(
 		public readonly viewType: string,
 		private readonly _resource: URI,
 		private readonly _model: IReference<IResolvedTextEditorModel>,
 		@ITextFileService private readonly textFileService: ITextFileService,
+		@IFileService private readonly _fileService: IFileService,
 	) {
 		super();
 
 		this._register(_model);
 
+		this._textFileModel = this.textFileService.files.get(_resource);
+		if (this._textFileModel) {
+			this._register(this._textFileModel.onDidChangeOrphaned(() => this._onDidChangeOrphaned.fire()));
+		}
+
 		this._register(this.textFileService.files.onDidChangeDirty(e => {
 			if (isEqual(this.resource, e.resource)) {
 				this._onDidChangeDirty.fire();
@@ -50,8 +61,12 @@ export class CustomTextEditorModel extends Disposable implements ICustomEditorMo
 		return this._resource;
 	}
 
-	public isReadonly(): boolean {
-		return this._model.object.isReadonly();
+	public isEditable(): boolean {
+		return !this._model.object.isReadonly();
+	}
+
+	public isOnReadonlyFileSystem(): boolean {
+		return this._fileService.hasCapability(this._resource, FileSystemProviderCapabilities.Readonly);
 	}
 
 	public get backupId() {
@@ -62,6 +77,10 @@ export class CustomTextEditorModel extends Disposable implements ICustomEditorMo
 		return this.textFileService.isDirty(this.resource);
 	}
 
+	public isOrphaned(): boolean {
+		return !!this._textFileModel?.hasState(TextFileEditorModelState.ORPHAN);
+	}
+
 	private readonly _onDidChangeDirty: Emitter<void> = this._register(new Emitter<void>());
 	readonly onDidChangeDirty: Event<void> = this._onDidChangeDirty.event;
 
diff --git a/src/vs/workbench/contrib/debug/browser/breakpointsView.ts b/src/vs/workbench/contrib/debug/browser/breakpointsView.ts
index 34d036b585f..aae7c537f68 100644
--- a/src/vs/workbench/contrib/debug/browser/breakpointsView.ts
+++ b/src/vs/workbench/contrib/debug/browser/breakpointsView.ts
@@ -218,7 +218,7 @@ export class BreakpointsView extends ViewPane {
 		this.breakpointSupportsCondition.set(conditionSupported);
 
 		const secondary: IAction[] = [];
-		const actionsDisposable = createAndFillInContextMenuActions(this.menu, { arg: e.element, shouldForwardArgs: false }, { primary: [], secondary }, g => /^inline/.test(g));
+		const actionsDisposable = createAndFillInContextMenuActions(this.menu, { arg: e.element, shouldForwardArgs: false }, { primary: [], secondary }, 'inline');
 
 		this.contextMenuService.showContextMenu({
 			getAnchor: () => e.anchor,
@@ -411,7 +411,7 @@ class BreakpointsRenderer implements IListRenderer<IBreakpoint, IBreakpointTempl
 		const session = this.debugService.getViewModel().focusedSession;
 		this.breakpointSupportsCondition.set(!session || !!session.capabilities.supportsConditionalBreakpoints);
 		this.breakpointItemType.set('breakpoint');
-		data.elementDisposable.push(createAndFillInActionBarActions(this.menu, { arg: breakpoint, shouldForwardArgs: true }, { primary, secondary: [] }, g => /^inline/.test(g)));
+		data.elementDisposable.push(createAndFillInActionBarActions(this.menu, { arg: breakpoint, shouldForwardArgs: true }, { primary, secondary: [] }, 'inline'));
 		data.actionBar.clear();
 		data.actionBar.push(primary, { icon: true, label: false });
 	}
@@ -475,7 +475,7 @@ class ExceptionBreakpointsRenderer implements IListRenderer<IExceptionBreakpoint
 		const primary: IAction[] = [];
 		this.breakpointSupportsCondition.set((exceptionBreakpoint as ExceptionBreakpoint).supportsCondition);
 		this.breakpointItemType.set('exceptionBreakpoint');
-		data.elementDisposable.push(createAndFillInActionBarActions(this.menu, { arg: exceptionBreakpoint, shouldForwardArgs: true }, { primary, secondary: [] }, g => /^inline/.test(g)));
+		data.elementDisposable.push(createAndFillInActionBarActions(this.menu, { arg: exceptionBreakpoint, shouldForwardArgs: true }, { primary, secondary: [] }, 'inline'));
 		data.actionBar.clear();
 		data.actionBar.push(primary, { icon: true, label: false });
 	}
@@ -555,7 +555,7 @@ class FunctionBreakpointsRenderer implements IListRenderer<FunctionBreakpoint, I
 		const primary: IAction[] = [];
 		this.breakpointSupportsCondition.set(!session || !!session.capabilities.supportsConditionalBreakpoints);
 		this.breakpointItemType.set('functionBreakpoint');
-		data.elementDisposable.push(createAndFillInActionBarActions(this.menu, { arg: functionBreakpoint, shouldForwardArgs: true }, { primary, secondary: [] }, g => /^inline/.test(g)));
+		data.elementDisposable.push(createAndFillInActionBarActions(this.menu, { arg: functionBreakpoint, shouldForwardArgs: true }, { primary, secondary: [] }, 'inline'));
 		data.actionBar.clear();
 		data.actionBar.push(primary, { icon: true, label: false });
 	}
diff --git a/src/vs/workbench/contrib/debug/browser/callStackView.ts b/src/vs/workbench/contrib/debug/browser/callStackView.ts
index 407671b15e8..216e1c3c4d2 100644
--- a/src/vs/workbench/contrib/debug/browser/callStackView.ts
+++ b/src/vs/workbench/contrib/debug/browser/callStackView.ts
@@ -6,17 +6,17 @@
 import { RunOnceScheduler } from 'vs/base/common/async';
 import * as dom from 'vs/base/browser/dom';
 import { IViewletViewOptions } from 'vs/workbench/browser/parts/views/viewsViewlet';
-import { IDebugService, State, IStackFrame, IDebugSession, IThread, CONTEXT_CALLSTACK_ITEM_TYPE, IDebugModel, CALLSTACK_VIEW_ID, CONTEXT_DEBUG_STATE, getStateLabel, CONTEXT_STACK_FRAME_SUPPORTS_RESTART } from 'vs/workbench/contrib/debug/common/debug';
+import { IDebugService, State, IStackFrame, IDebugSession, IThread, CONTEXT_CALLSTACK_ITEM_TYPE, IDebugModel, CALLSTACK_VIEW_ID, CONTEXT_DEBUG_STATE, getStateLabel, CONTEXT_STACK_FRAME_SUPPORTS_RESTART, CONTEXT_CALLSTACK_SESSION_IS_ATTACH, CONTEXT_CALLSTACK_ITEM_STOPPED, CONTEXT_CALLSTACK_SESSION_HAS_ONE_THREAD } from 'vs/workbench/contrib/debug/common/debug';
 import { Thread, StackFrame, ThreadAndSessionIds } from 'vs/workbench/contrib/debug/common/debugModel';
 import { IContextMenuService } from 'vs/platform/contextview/browser/contextView';
 import { IInstantiationService, ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
-import { MenuId, IMenu, IMenuService, MenuItemAction, SubmenuItemAction, registerAction2 } from 'vs/platform/actions/common/actions';
+import { MenuId, IMenu, IMenuService, MenuItemAction, SubmenuItemAction, registerAction2, MenuRegistry, Icon } from 'vs/platform/actions/common/actions';
 import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
 import { renderViewTree } from 'vs/workbench/contrib/debug/browser/baseDebugView';
 import { IAction, Action } from 'vs/base/common/actions';
 import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { IContextKey, IContextKeyService, ContextKeyEqualsExpr } from 'vs/platform/contextkey/common/contextkey';
+import { IContextKey, IContextKeyService, ContextKeyEqualsExpr, ContextKeyExpr, ContextKeyExpression } from 'vs/platform/contextkey/common/contextkey';
 import { ViewPane, ViewAction } from 'vs/workbench/browser/parts/views/viewPane';
 import { ILabelService } from 'vs/platform/label/common/label';
 import { IListAccessibilityProvider } from 'vs/base/browser/ui/list/listWidget';
@@ -31,7 +31,6 @@ import { dispose, IDisposable } from 'vs/base/common/lifecycle';
 import { ActionBar } from 'vs/base/browser/ui/actionbar/actionbar';
 import { isSessionAttach } from 'vs/workbench/contrib/debug/common/debugUtils';
 import { STOP_ID, STOP_LABEL, DISCONNECT_ID, DISCONNECT_LABEL, RESTART_SESSION_ID, RESTART_LABEL, STEP_OVER_ID, STEP_OVER_LABEL, STEP_INTO_LABEL, STEP_INTO_ID, STEP_OUT_LABEL, STEP_OUT_ID, PAUSE_ID, PAUSE_LABEL, CONTINUE_ID, CONTINUE_LABEL } from 'vs/workbench/contrib/debug/browser/debugCommands';
-import { ICommandService } from 'vs/platform/commands/common/commands';
 import { IViewDescriptorService } from 'vs/workbench/common/views';
 import { textLinkForeground } from 'vs/platform/theme/common/colorRegistry';
 import { IThemeService, ThemeIcon } from 'vs/platform/theme/common/themeService';
@@ -119,7 +118,10 @@ export class CallStackView extends ViewPane {
 	private ignoreSelectionChangedEvent = false;
 	private ignoreFocusStackFrameEvent = false;
 	private callStackItemType: IContextKey<string>;
+	private callStackSessionIsAttach: IContextKey<boolean>;
+	private callStackItemStopped: IContextKey<boolean>;
 	private stackFrameSupportsRestart: IContextKey<boolean>;
+	private sessionHasOneThread: IContextKey<boolean>;
 	private dataSource!: CallStackDataSource;
 	private tree!: WorkbenchCompressibleAsyncDataTree<IDebugModel, CallStackItem, FuzzyScore>;
 	private menu: IMenu;
@@ -143,7 +145,10 @@ export class CallStackView extends ViewPane {
 	) {
 		super(options, keybindingService, contextMenuService, configurationService, contextKeyService, viewDescriptorService, instantiationService, openerService, themeService, telemetryService);
 		this.callStackItemType = CONTEXT_CALLSTACK_ITEM_TYPE.bindTo(contextKeyService);
+		this.callStackSessionIsAttach = CONTEXT_CALLSTACK_SESSION_IS_ATTACH.bindTo(contextKeyService);
 		this.stackFrameSupportsRestart = CONTEXT_STACK_FRAME_SUPPORTS_RESTART.bindTo(contextKeyService);
+		this.callStackItemStopped = CONTEXT_CALLSTACK_ITEM_STOPPED.bindTo(contextKeyService);
+		this.sessionHasOneThread = CONTEXT_CALLSTACK_SESSION_HAS_ONE_THREAD.bindTo(contextKeyService);
 
 		this.menu = menuService.createMenu(MenuId.DebugCallStackContext, contextKeyService);
 		this._register(this.menu);
@@ -214,10 +219,9 @@ export class CallStackView extends ViewPane {
 		const treeContainer = renderViewTree(container);
 
 		this.dataSource = new CallStackDataSource(this.debugService);
-		const sessionsRenderer = this.instantiationService.createInstance(SessionsRenderer, this.menu, this.callStackItemType);
 		this.tree = <WorkbenchCompressibleAsyncDataTree<IDebugModel, CallStackItem, FuzzyScore>>this.instantiationService.createInstance(WorkbenchCompressibleAsyncDataTree, 'CallStackView', treeContainer, new CallStackDelegate(), new CallStackCompressionDelegate(this.debugService), [
-			sessionsRenderer,
-			new ThreadsRenderer(this.callStackItemType, this.instantiationService),
+			new SessionsRenderer(this.menu, this.callStackItemType, this.callStackSessionIsAttach, this.callStackItemStopped, this.sessionHasOneThread, this.instantiationService),
+			new ThreadsRenderer(this.menu, this.callStackItemType, this.callStackItemStopped),
 			this.instantiationService.createInstance(StackFramesRenderer, this.callStackItemType),
 			new ErrorsRenderer(),
 			new LoadAllRenderer(this.themeService),
@@ -441,7 +445,7 @@ export class CallStackView extends ViewPane {
 		const primary: IAction[] = [];
 		const secondary: IAction[] = [];
 		const result = { primary, secondary };
-		const actionsDisposable = createAndFillInContextMenuActions(this.menu, { arg: getContextForContributedActions(element), shouldForwardArgs: true }, result, g => /^inline/.test(g));
+		const actionsDisposable = createAndFillInContextMenuActions(this.menu, { arg: getContextForContributedActions(element), shouldForwardArgs: true }, result, 'inline');
 
 		this.contextMenuService.showContextMenu({
 			getAnchor: () => e.anchor,
@@ -458,6 +462,7 @@ interface IThreadTemplateData {
 	stateLabel: HTMLSpanElement;
 	label: HighlightedLabel;
 	actionBar: ActionBar;
+	elementDisposable: IDisposable[];
 }
 
 interface ISessionTemplateData {
@@ -493,7 +498,10 @@ class SessionsRenderer implements ICompressibleTreeRenderer<IDebugSession, Fuzzy
 	constructor(
 		private menu: IMenu,
 		private callStackItemType: IContextKey<string>,
-		@IInstantiationService private readonly instantiationService: IInstantiationService
+		private callStackSessionIsAttach: IContextKey<boolean>,
+		private callStackItemStopped: IContextKey<boolean>,
+		private sessionHasOneThread: IContextKey<boolean>,
+		private readonly instantiationService: IInstantiationService
 	) { }
 
 	get templateId(): string {
@@ -525,7 +533,7 @@ class SessionsRenderer implements ICompressibleTreeRenderer<IDebugSession, Fuzzy
 		this.doRenderElement(element.element, createMatches(element.filterData), data);
 	}
 
-	renderCompressedElements(node: ITreeNode<ICompressedTreeNode<IDebugSession>, FuzzyScore>, index: number, templateData: ISessionTemplateData, height: number | undefined): void {
+	renderCompressedElements(node: ITreeNode<ICompressedTreeNode<IDebugSession>, FuzzyScore>, _index: number, templateData: ISessionTemplateData): void {
 		const lastElement = node.element.elements[node.element.elements.length - 1];
 		const matches = createMatches(node.filterData);
 		this.doRenderElement(lastElement, matches, templateData);
@@ -535,21 +543,17 @@ class SessionsRenderer implements ICompressibleTreeRenderer<IDebugSession, Fuzzy
 		data.session.title = localize({ key: 'session', comment: ['Session is a noun'] }, "Session");
 		data.label.set(session.getLabel(), matches);
 		const thread = session.getAllThreads().find(t => t.stopped);
+		const primary: IAction[] = [];
+		const secondary: IAction[] = [];
+		const result = { primary, secondary };
+		this.callStackItemType.set('session');
+		this.callStackItemStopped.set(session.state === State.Stopped);
+		this.sessionHasOneThread.set(session.getAllThreads().length === 1);
+		this.callStackSessionIsAttach.set(isSessionAttach(session));
+		data.elementDisposable.push(createAndFillInActionBarActions(this.menu, { arg: getContextForContributedActions(session), shouldForwardArgs: true }, result, 'inline'));
 
-		const setActionBar = () => {
-			const actions = getActions(this.instantiationService, session);
-
-			const primary: IAction[] = actions;
-			const secondary: IAction[] = [];
-			const result = { primary, secondary };
-			this.callStackItemType.set('session');
-			data.elementDisposable.push(createAndFillInActionBarActions(this.menu, { arg: getContextForContributedActions(session), shouldForwardArgs: true }, result, g => /^inline/.test(g)));
-
-			data.actionBar.clear();
-			data.actionBar.push(primary, { icon: true, label: false });
-		};
-		setActionBar();
-		data.elementDisposable.push(this.menu.onDidChange(() => setActionBar()));
+		data.actionBar.clear();
+		data.actionBar.push(primary, { icon: true, label: false });
 		data.stateLabel.style.display = '';
 
 		if (thread && thread.stoppedDetails) {
@@ -575,8 +579,9 @@ class ThreadsRenderer implements ICompressibleTreeRenderer<IThread, FuzzyScore,
 	static readonly ID = 'thread';
 
 	constructor(
+		private menu: IMenu,
 		private callStackItemType: IContextKey<string>,
-		private readonly instantiationService: IInstantiationService
+		private callStackItemStopped: IContextKey<boolean>
 	) { }
 
 	get templateId(): string {
@@ -589,11 +594,12 @@ class ThreadsRenderer implements ICompressibleTreeRenderer<IThread, FuzzyScore,
 		const stateLabel = dom.append(thread, $('span.state.label.monaco-count-badge.long'));
 		const label = new HighlightedLabel(name, false);
 		const actionBar = new ActionBar(thread);
+		const elementDisposable: IDisposable[] = [];
 
-		return { thread, name, stateLabel, label, actionBar };
+		return { thread, name, stateLabel, label, actionBar, elementDisposable };
 	}
 
-	renderElement(element: ITreeNode<IThread, FuzzyScore>, index: number, data: IThreadTemplateData): void {
+	renderElement(element: ITreeNode<IThread, FuzzyScore>, _index: number, data: IThreadTemplateData): void {
 		const thread = element.element;
 		data.thread.title = localize('thread', "Thread");
 		data.label.set(thread.name, createMatches(element.filterData));
@@ -601,14 +607,21 @@ class ThreadsRenderer implements ICompressibleTreeRenderer<IThread, FuzzyScore,
 
 		data.actionBar.clear();
 		this.callStackItemType.set('thread');
-		const actions = getActions(this.instantiationService, thread);
-		data.actionBar.push(actions, { icon: true, label: false });
+		this.callStackItemStopped.set(thread.stopped);
+		const primary: IAction[] = [];
+		const result = { primary, secondary: [] };
+		data.elementDisposable.push(createAndFillInActionBarActions(this.menu, { arg: getContextForContributedActions(thread), shouldForwardArgs: true }, result, 'inline'));
+		data.actionBar.push(primary, { icon: true, label: false });
 	}
 
-	renderCompressedElements(node: ITreeNode<ICompressedTreeNode<IThread>, FuzzyScore>, index: number, templateData: IThreadTemplateData, height: number | undefined): void {
+	renderCompressedElements(_node: ITreeNode<ICompressedTreeNode<IThread>, FuzzyScore>, _index: number, _templateData: IThreadTemplateData, _height: number | undefined): void {
 		throw new Error('Method not implemented.');
 	}
 
+	disposeElement(_element: any, _index: number, templateData: IThreadTemplateData): void {
+		dispose(templateData.elementDisposable);
+	}
+
 	disposeTemplate(templateData: IThreadTemplateData): void {
 		templateData.actionBar.dispose();
 	}
@@ -964,151 +977,6 @@ class CallStackAccessibilityProvider implements IListAccessibilityProvider<CallS
 	}
 }
 
-// TODO@Isidor this function is debt and we shuold get inline actions via menu service
-function getActions(instantiationService: IInstantiationService, element: IDebugSession | IThread): IAction[] {
-	const getThreadActions = (thread: IThread): IAction[] => {
-		return [
-			thread.stopped ? instantiationService.createInstance(ContinueAction, thread) : instantiationService.createInstance(PauseAction, thread),
-			instantiationService.createInstance(StepOverAction, thread),
-			instantiationService.createInstance(StepIntoAction, thread),
-			instantiationService.createInstance(StepOutAction, thread)
-		];
-	};
-
-	if (element instanceof Thread) {
-		return getThreadActions(element);
-	}
-
-	const session = <IDebugSession>element;
-	const stopOrDisconectAction = isSessionAttach(session) ? instantiationService.createInstance(DisconnectAction, session) : instantiationService.createInstance(StopAction, session);
-	const restartAction = instantiationService.createInstance(RestartAction, session);
-	const threads = session.getAllThreads();
-	if (threads.length === 1) {
-		return getThreadActions(threads[0]).concat([
-			restartAction,
-			stopOrDisconectAction
-		]);
-	}
-
-	return [
-		restartAction,
-		stopOrDisconectAction
-	];
-}
-
-
-class StopAction extends Action {
-
-	constructor(
-		private readonly session: IDebugSession,
-		@ICommandService private readonly commandService: ICommandService
-	) {
-		super(`action.${STOP_ID}`, STOP_LABEL, 'debug-action ' + ThemeIcon.asClassName(icons.debugStop));
-	}
-
-	public run(): Promise<any> {
-		return this.commandService.executeCommand(STOP_ID, undefined, getContext(this.session));
-	}
-}
-
-class DisconnectAction extends Action {
-
-	constructor(
-		private readonly session: IDebugSession,
-		@ICommandService private readonly commandService: ICommandService
-	) {
-		super(`action.${DISCONNECT_ID}`, DISCONNECT_LABEL, 'debug-action ' + ThemeIcon.asClassName(icons.debugDisconnect));
-	}
-
-	public run(): Promise<any> {
-		return this.commandService.executeCommand(DISCONNECT_ID, undefined, getContext(this.session));
-	}
-}
-
-class RestartAction extends Action {
-
-	constructor(
-		private readonly session: IDebugSession,
-		@ICommandService private readonly commandService: ICommandService
-	) {
-		super(`action.${RESTART_SESSION_ID}`, RESTART_LABEL, 'debug-action ' + ThemeIcon.asClassName(icons.debugRestart));
-	}
-
-	public run(): Promise<any> {
-		return this.commandService.executeCommand(RESTART_SESSION_ID, undefined, getContext(this.session));
-	}
-}
-
-class StepOverAction extends Action {
-
-	constructor(
-		private readonly thread: IThread,
-		@ICommandService private readonly commandService: ICommandService
-	) {
-		super(`action.${STEP_OVER_ID}`, STEP_OVER_LABEL, 'debug-action ' + ThemeIcon.asClassName(icons.debugStepOver), thread.stopped);
-	}
-
-	public run(): Promise<any> {
-		return this.commandService.executeCommand(STEP_OVER_ID, undefined, getContext(this.thread));
-	}
-}
-
-class StepIntoAction extends Action {
-
-	constructor(
-		private readonly thread: IThread,
-		@ICommandService private readonly commandService: ICommandService
-	) {
-		super(`action.${STEP_INTO_ID}`, STEP_INTO_LABEL, 'debug-action ' + ThemeIcon.asClassName(icons.debugStepInto), thread.stopped);
-	}
-
-	public run(): Promise<any> {
-		return this.commandService.executeCommand(STEP_INTO_ID, undefined, getContext(this.thread));
-	}
-}
-
-class StepOutAction extends Action {
-
-	constructor(
-		private readonly thread: IThread,
-		@ICommandService private readonly commandService: ICommandService
-	) {
-		super(`action.${STEP_OUT_ID}`, STEP_OUT_LABEL, 'debug-action ' + ThemeIcon.asClassName(icons.debugStepOut), thread.stopped);
-	}
-
-	public run(): Promise<any> {
-		return this.commandService.executeCommand(STEP_OUT_ID, undefined, getContext(this.thread));
-	}
-}
-
-class PauseAction extends Action {
-
-	constructor(
-		private readonly thread: IThread,
-		@ICommandService private readonly commandService: ICommandService
-	) {
-		super(`action.${PAUSE_ID}`, PAUSE_LABEL, 'debug-action ' + ThemeIcon.asClassName(icons.debugPause), !thread.stopped);
-	}
-
-	public run(): Promise<any> {
-		return this.commandService.executeCommand(PAUSE_ID, undefined, getContext(this.thread));
-	}
-}
-
-class ContinueAction extends Action {
-
-	constructor(
-		private readonly thread: IThread,
-		@ICommandService private readonly commandService: ICommandService
-	) {
-		super(`action.${CONTINUE_ID}`, CONTINUE_LABEL, 'debug-action ' + ThemeIcon.asClassName(icons.debugContinue), thread.stopped);
-	}
-
-	public run(): Promise<any> {
-		return this.commandService.executeCommand(CONTINUE_ID, undefined, getContext(this.thread));
-	}
-}
-
 class CallStackCompressionDelegate implements ITreeCompressionDelegate<CallStackItem> {
 
 	constructor(private readonly debugService: IDebugService) { }
@@ -1152,3 +1020,22 @@ registerAction2(class Collapse extends ViewAction<CallStackView> {
 		view.collapseAll();
 	}
 });
+
+function registerCallStackInlineMenuItem(id: string, title: string, icon: Icon, when: ContextKeyExpression, order: number): void {
+	MenuRegistry.appendMenuItem(MenuId.DebugCallStackContext, {
+		group: 'inline',
+		order,
+		when,
+		command: { id, title, icon }
+	});
+}
+
+const threadOrSessionWithOneThread = ContextKeyExpr.or(CONTEXT_CALLSTACK_ITEM_TYPE.isEqualTo('thread'), ContextKeyExpr.and(CONTEXT_CALLSTACK_ITEM_TYPE.isEqualTo('session'), CONTEXT_CALLSTACK_SESSION_HAS_ONE_THREAD))!;
+registerCallStackInlineMenuItem(PAUSE_ID, PAUSE_LABEL, icons.debugPause, ContextKeyExpr.and(threadOrSessionWithOneThread, CONTEXT_CALLSTACK_ITEM_STOPPED.toNegated())!, 10);
+registerCallStackInlineMenuItem(CONTINUE_ID, CONTINUE_LABEL, icons.debugContinue, ContextKeyExpr.and(threadOrSessionWithOneThread, CONTEXT_CALLSTACK_ITEM_STOPPED)!, 10);
+registerCallStackInlineMenuItem(STEP_OVER_ID, STEP_OVER_LABEL, icons.debugStepOver, threadOrSessionWithOneThread, 20);
+registerCallStackInlineMenuItem(STEP_INTO_ID, STEP_INTO_LABEL, icons.debugStepInto, threadOrSessionWithOneThread, 30);
+registerCallStackInlineMenuItem(STEP_OUT_ID, STEP_OUT_LABEL, icons.debugStepOut, threadOrSessionWithOneThread, 40);
+registerCallStackInlineMenuItem(RESTART_SESSION_ID, RESTART_LABEL, icons.debugRestart, CONTEXT_CALLSTACK_ITEM_TYPE.isEqualTo('session'), 50);
+registerCallStackInlineMenuItem(STOP_ID, STOP_LABEL, icons.debugStop, ContextKeyExpr.and(CONTEXT_CALLSTACK_SESSION_IS_ATTACH.toNegated(), CONTEXT_CALLSTACK_ITEM_TYPE.isEqualTo('session'))!, 60);
+registerCallStackInlineMenuItem(DISCONNECT_ID, DISCONNECT_LABEL, icons.debugDisconnect, ContextKeyExpr.and(CONTEXT_CALLSTACK_SESSION_IS_ATTACH, CONTEXT_CALLSTACK_ITEM_TYPE.isEqualTo('session'))!, 60);
diff --git a/src/vs/workbench/contrib/debug/browser/debug.contribution.ts b/src/vs/workbench/contrib/debug/browser/debug.contribution.ts
index 94c16305e5b..ce84ce7cf34 100644
--- a/src/vs/workbench/contrib/debug/browser/debug.contribution.ts
+++ b/src/vs/workbench/contrib/debug/browser/debug.contribution.ts
@@ -20,7 +20,7 @@ import {
 } from 'vs/workbench/contrib/debug/common/debug';
 import { DebugToolBar } from 'vs/workbench/contrib/debug/browser/debugToolBar';
 import { DebugService } from 'vs/workbench/contrib/debug/browser/debugService';
-import { registerCommands, ADD_CONFIGURATION_ID, TOGGLE_INLINE_BREAKPOINT_ID, COPY_STACK_TRACE_ID, RESTART_SESSION_ID, TERMINATE_THREAD_ID, STEP_OVER_ID, STEP_INTO_ID, STEP_OUT_ID, PAUSE_ID, DISCONNECT_ID, STOP_ID, RESTART_FRAME_ID, CONTINUE_ID, FOCUS_REPL_ID, JUMP_TO_CURSOR_ID, RESTART_LABEL, STEP_INTO_LABEL, STEP_OVER_LABEL, STEP_OUT_LABEL, PAUSE_LABEL, DISCONNECT_LABEL, STOP_LABEL, CONTINUE_LABEL, DEBUG_START_LABEL, DEBUG_START_COMMAND_ID, DEBUG_RUN_LABEL, DEBUG_RUN_COMMAND_ID, EDIT_EXPRESSION_COMMAND_ID, REMOVE_EXPRESSION_COMMAND_ID, SELECT_AND_START_ID, SELECT_AND_START_LABEL } from 'vs/workbench/contrib/debug/browser/debugCommands';
+import { ADD_CONFIGURATION_ID, TOGGLE_INLINE_BREAKPOINT_ID, COPY_STACK_TRACE_ID, RESTART_SESSION_ID, TERMINATE_THREAD_ID, STEP_OVER_ID, STEP_INTO_ID, STEP_OUT_ID, PAUSE_ID, DISCONNECT_ID, STOP_ID, RESTART_FRAME_ID, CONTINUE_ID, FOCUS_REPL_ID, JUMP_TO_CURSOR_ID, RESTART_LABEL, STEP_INTO_LABEL, STEP_OVER_LABEL, STEP_OUT_LABEL, PAUSE_LABEL, DISCONNECT_LABEL, STOP_LABEL, CONTINUE_LABEL, DEBUG_START_LABEL, DEBUG_START_COMMAND_ID, DEBUG_RUN_LABEL, DEBUG_RUN_COMMAND_ID, EDIT_EXPRESSION_COMMAND_ID, REMOVE_EXPRESSION_COMMAND_ID, SELECT_AND_START_ID, SELECT_AND_START_LABEL } from 'vs/workbench/contrib/debug/browser/debugCommands';
 import { StatusBarColorProvider } from 'vs/workbench/contrib/debug/browser/statusbarColorProvider';
 import { IViewsRegistry, Extensions as ViewExtensions, IViewContainersRegistry, ViewContainerLocation, ViewContainer } from 'vs/workbench/common/views';
 import { isMacintosh, isWeb } from 'vs/base/common/platform';
@@ -30,7 +30,7 @@ import { DebugStatusContribution } from 'vs/workbench/contrib/debug/browser/debu
 import { LifecyclePhase } from 'vs/workbench/services/lifecycle/common/lifecycle';
 import { launchSchemaId } from 'vs/workbench/services/configuration/common/configuration';
 import { LoadedScriptsView } from 'vs/workbench/contrib/debug/browser/loadedScriptsView';
-import { RunToCursorAction, registerEditorActions } from 'vs/workbench/contrib/debug/browser/debugEditorActions';
+import { RunToCursorAction } from 'vs/workbench/contrib/debug/browser/debugEditorActions';
 import { WatchExpressionsView, ADD_WATCH_LABEL, REMOVE_WATCH_EXPRESSIONS_COMMAND_ID, REMOVE_WATCH_EXPRESSIONS_LABEL, ADD_WATCH_ID } from 'vs/workbench/contrib/debug/browser/watchExpressionsView';
 import { VariablesView, SET_VARIABLE_ID, COPY_VALUE_ID, BREAK_WHEN_VALUE_CHANGES_ID, COPY_EVALUATE_PATH_ID, ADD_TO_WATCH_ID } from 'vs/workbench/contrib/debug/browser/variablesView';
 import { Repl } from 'vs/workbench/contrib/debug/browser/repl';
@@ -52,454 +52,428 @@ import { FileAccess } from 'vs/base/common/network';
 import * as icons from 'vs/workbench/contrib/debug/browser/debugIcons';
 
 const debugCategory = nls.localize('debugCategory', "Debug");
-registerWorkbenchContributions();
 registerColors();
-registerCommandsAndActions();
-registerDebugMenu();
-registerEditorActions();
-registerCommands();
-registerDebugPanel();
-
 registerSingleton(IDebugService, DebugService, true);
-registerDebugView();
-registerConfiguration();
-regsiterEditorContributions();
 
-function registerWorkbenchContributions(): void {
-	// Register Debug Workbench Contributions
-	Registry.as<IWorkbenchContributionsRegistry>(WorkbenchExtensions.Workbench).registerWorkbenchContribution(DebugStatusContribution, LifecyclePhase.Eventually);
-	Registry.as<IWorkbenchContributionsRegistry>(WorkbenchExtensions.Workbench).registerWorkbenchContribution(DebugProgressContribution, LifecyclePhase.Eventually);
-	if (isWeb) {
-		Registry.as<IWorkbenchContributionsRegistry>(WorkbenchExtensions.Workbench).registerWorkbenchContribution(DebugTitleContribution, LifecyclePhase.Eventually);
-	}
-	Registry.as<IWorkbenchContributionsRegistry>(WorkbenchExtensions.Workbench).registerWorkbenchContribution(DebugToolBar, LifecyclePhase.Restored);
-	Registry.as<IWorkbenchContributionsRegistry>(WorkbenchExtensions.Workbench).registerWorkbenchContribution(DebugContentProvider, LifecyclePhase.Eventually);
-	Registry.as<IWorkbenchContributionsRegistry>(WorkbenchExtensions.Workbench).registerWorkbenchContribution(StatusBarColorProvider, LifecyclePhase.Eventually);
+// Register Debug Workbench Contributions
+Registry.as<IWorkbenchContributionsRegistry>(WorkbenchExtensions.Workbench).registerWorkbenchContribution(DebugStatusContribution, LifecyclePhase.Eventually);
+Registry.as<IWorkbenchContributionsRegistry>(WorkbenchExtensions.Workbench).registerWorkbenchContribution(DebugProgressContribution, LifecyclePhase.Eventually);
+if (isWeb) {
+	Registry.as<IWorkbenchContributionsRegistry>(WorkbenchExtensions.Workbench).registerWorkbenchContribution(DebugTitleContribution, LifecyclePhase.Eventually);
+}
+Registry.as<IWorkbenchContributionsRegistry>(WorkbenchExtensions.Workbench).registerWorkbenchContribution(DebugToolBar, LifecyclePhase.Restored);
+Registry.as<IWorkbenchContributionsRegistry>(WorkbenchExtensions.Workbench).registerWorkbenchContribution(DebugContentProvider, LifecyclePhase.Eventually);
+Registry.as<IWorkbenchContributionsRegistry>(WorkbenchExtensions.Workbench).registerWorkbenchContribution(StatusBarColorProvider, LifecyclePhase.Eventually);
 
-	// Register Quick Access
-	Registry.as<IQuickAccessRegistry>(QuickAccessExtensions.Quickaccess).registerQuickAccessProvider({
-		ctor: StartDebugQuickAccessProvider,
-		prefix: StartDebugQuickAccessProvider.PREFIX,
-		contextKey: 'inLaunchConfigurationsPicker',
-		placeholder: nls.localize('startDebugPlaceholder', "Type the name of a launch configuration to run."),
-		helpEntries: [{ description: nls.localize('startDebuggingHelp', "Start Debugging"), needsEditor: false }]
+// Register Quick Access
+Registry.as<IQuickAccessRegistry>(QuickAccessExtensions.Quickaccess).registerQuickAccessProvider({
+	ctor: StartDebugQuickAccessProvider,
+	prefix: StartDebugQuickAccessProvider.PREFIX,
+	contextKey: 'inLaunchConfigurationsPicker',
+	placeholder: nls.localize('startDebugPlaceholder', "Type the name of a launch configuration to run."),
+	helpEntries: [{ description: nls.localize('startDebuggingHelp', "Start Debugging"), needsEditor: false }]
+});
+
+
+registerEditorContribution('editor.contrib.callStack', CallStackEditorContribution);
+registerEditorContribution(BREAKPOINT_EDITOR_CONTRIBUTION_ID, BreakpointEditorContribution);
+registerEditorContribution(EDITOR_CONTRIBUTION_ID, DebugEditorContribution);
+
+const registerDebugCommandPaletteItem = (id: string, title: string, when?: ContextKeyExpression, precondition?: ContextKeyExpression) => {
+	MenuRegistry.appendMenuItem(MenuId.CommandPalette, {
+		when: ContextKeyExpr.and(CONTEXT_DEBUGGERS_AVAILABLE, when),
+		group: debugCategory,
+		command: {
+			id,
+			title: `Debug: ${title}`,
+			precondition
+		}
 	});
+};
 
-}
-
-function regsiterEditorContributions(): void {
-	registerEditorContribution('editor.contrib.callStack', CallStackEditorContribution);
-	registerEditorContribution(BREAKPOINT_EDITOR_CONTRIBUTION_ID, BreakpointEditorContribution);
-	registerEditorContribution(EDITOR_CONTRIBUTION_ID, DebugEditorContribution);
-}
-
-function registerCommandsAndActions(): void {
-
-	const registerDebugCommandPaletteItem = (id: string, title: string, when?: ContextKeyExpression, precondition?: ContextKeyExpression) => {
-		MenuRegistry.appendMenuItem(MenuId.CommandPalette, {
-			when: ContextKeyExpr.and(CONTEXT_DEBUGGERS_AVAILABLE, when),
-			group: debugCategory,
-			command: {
-				id,
-				title: `Debug: ${title}`,
-				precondition
-			}
-		});
-	};
-
-	registerDebugCommandPaletteItem(RESTART_SESSION_ID, RESTART_LABEL);
-	registerDebugCommandPaletteItem(TERMINATE_THREAD_ID, nls.localize('terminateThread', "Terminate Thread"), CONTEXT_IN_DEBUG_MODE);
-	registerDebugCommandPaletteItem(STEP_OVER_ID, STEP_OVER_LABEL, CONTEXT_IN_DEBUG_MODE, CONTEXT_DEBUG_STATE.isEqualTo('stopped'));
-	registerDebugCommandPaletteItem(STEP_INTO_ID, STEP_INTO_LABEL, CONTEXT_IN_DEBUG_MODE, CONTEXT_DEBUG_STATE.isEqualTo('stopped'));
-	registerDebugCommandPaletteItem(STEP_OUT_ID, STEP_OUT_LABEL, CONTEXT_IN_DEBUG_MODE, CONTEXT_DEBUG_STATE.isEqualTo('stopped'));
-	registerDebugCommandPaletteItem(PAUSE_ID, PAUSE_LABEL, CONTEXT_IN_DEBUG_MODE, CONTEXT_DEBUG_STATE.isEqualTo('running'));
-	registerDebugCommandPaletteItem(DISCONNECT_ID, DISCONNECT_LABEL, CONTEXT_IN_DEBUG_MODE, CONTEXT_FOCUSED_SESSION_IS_ATTACH);
-	registerDebugCommandPaletteItem(STOP_ID, STOP_LABEL, CONTEXT_IN_DEBUG_MODE, CONTEXT_FOCUSED_SESSION_IS_ATTACH.toNegated());
-	registerDebugCommandPaletteItem(CONTINUE_ID, CONTINUE_LABEL, CONTEXT_IN_DEBUG_MODE, CONTEXT_DEBUG_STATE.isEqualTo('stopped'));
-	registerDebugCommandPaletteItem(FOCUS_REPL_ID, nls.localize({ comment: ['Debug is a noun in this context, not a verb.'], key: 'debugFocusConsole' }, 'Focus on Debug Console View'));
-	registerDebugCommandPaletteItem(JUMP_TO_CURSOR_ID, nls.localize('jumpToCursor', "Jump to Cursor"), CONTEXT_JUMP_TO_CURSOR_SUPPORTED);
-	registerDebugCommandPaletteItem(JUMP_TO_CURSOR_ID, nls.localize('SetNextStatement', "Set Next Statement"), CONTEXT_JUMP_TO_CURSOR_SUPPORTED);
-	registerDebugCommandPaletteItem(RunToCursorAction.ID, RunToCursorAction.LABEL, ContextKeyExpr.and(CONTEXT_IN_DEBUG_MODE, CONTEXT_DEBUG_STATE.isEqualTo('stopped')));
-	registerDebugCommandPaletteItem(TOGGLE_INLINE_BREAKPOINT_ID, nls.localize('inlineBreakpoint', "Inline Breakpoint"));
-	registerDebugCommandPaletteItem(DEBUG_START_COMMAND_ID, DEBUG_START_LABEL, ContextKeyExpr.and(CONTEXT_DEBUGGERS_AVAILABLE, CONTEXT_DEBUG_STATE.notEqualsTo(getStateLabel(State.Initializing))));
-	registerDebugCommandPaletteItem(DEBUG_RUN_COMMAND_ID, DEBUG_RUN_LABEL, ContextKeyExpr.and(CONTEXT_DEBUGGERS_AVAILABLE, CONTEXT_DEBUG_STATE.notEqualsTo(getStateLabel(State.Initializing))));
-	registerDebugCommandPaletteItem(SELECT_AND_START_ID, SELECT_AND_START_LABEL, ContextKeyExpr.and(CONTEXT_DEBUGGERS_AVAILABLE, CONTEXT_DEBUG_STATE.notEqualsTo(getStateLabel(State.Initializing))));
+registerDebugCommandPaletteItem(RESTART_SESSION_ID, RESTART_LABEL);
+registerDebugCommandPaletteItem(TERMINATE_THREAD_ID, nls.localize('terminateThread', "Terminate Thread"), CONTEXT_IN_DEBUG_MODE);
+registerDebugCommandPaletteItem(STEP_OVER_ID, STEP_OVER_LABEL, CONTEXT_IN_DEBUG_MODE, CONTEXT_DEBUG_STATE.isEqualTo('stopped'));
+registerDebugCommandPaletteItem(STEP_INTO_ID, STEP_INTO_LABEL, CONTEXT_IN_DEBUG_MODE, CONTEXT_DEBUG_STATE.isEqualTo('stopped'));
+registerDebugCommandPaletteItem(STEP_OUT_ID, STEP_OUT_LABEL, CONTEXT_IN_DEBUG_MODE, CONTEXT_DEBUG_STATE.isEqualTo('stopped'));
+registerDebugCommandPaletteItem(PAUSE_ID, PAUSE_LABEL, CONTEXT_IN_DEBUG_MODE, CONTEXT_DEBUG_STATE.isEqualTo('running'));
+registerDebugCommandPaletteItem(DISCONNECT_ID, DISCONNECT_LABEL, CONTEXT_IN_DEBUG_MODE, CONTEXT_FOCUSED_SESSION_IS_ATTACH);
+registerDebugCommandPaletteItem(STOP_ID, STOP_LABEL, CONTEXT_IN_DEBUG_MODE, CONTEXT_FOCUSED_SESSION_IS_ATTACH.toNegated());
+registerDebugCommandPaletteItem(CONTINUE_ID, CONTINUE_LABEL, CONTEXT_IN_DEBUG_MODE, CONTEXT_DEBUG_STATE.isEqualTo('stopped'));
+registerDebugCommandPaletteItem(FOCUS_REPL_ID, nls.localize({ comment: ['Debug is a noun in this context, not a verb.'], key: 'debugFocusConsole' }, 'Focus on Debug Console View'));
+registerDebugCommandPaletteItem(JUMP_TO_CURSOR_ID, nls.localize('jumpToCursor', "Jump to Cursor"), CONTEXT_JUMP_TO_CURSOR_SUPPORTED);
+registerDebugCommandPaletteItem(JUMP_TO_CURSOR_ID, nls.localize('SetNextStatement', "Set Next Statement"), CONTEXT_JUMP_TO_CURSOR_SUPPORTED);
+registerDebugCommandPaletteItem(RunToCursorAction.ID, RunToCursorAction.LABEL, ContextKeyExpr.and(CONTEXT_IN_DEBUG_MODE, CONTEXT_DEBUG_STATE.isEqualTo('stopped')));
+registerDebugCommandPaletteItem(TOGGLE_INLINE_BREAKPOINT_ID, nls.localize('inlineBreakpoint', "Inline Breakpoint"));
+registerDebugCommandPaletteItem(DEBUG_START_COMMAND_ID, DEBUG_START_LABEL, ContextKeyExpr.and(CONTEXT_DEBUGGERS_AVAILABLE, CONTEXT_DEBUG_STATE.notEqualsTo(getStateLabel(State.Initializing))));
+registerDebugCommandPaletteItem(DEBUG_RUN_COMMAND_ID, DEBUG_RUN_LABEL, ContextKeyExpr.and(CONTEXT_DEBUGGERS_AVAILABLE, CONTEXT_DEBUG_STATE.notEqualsTo(getStateLabel(State.Initializing))));
+registerDebugCommandPaletteItem(SELECT_AND_START_ID, SELECT_AND_START_LABEL, ContextKeyExpr.and(CONTEXT_DEBUGGERS_AVAILABLE, CONTEXT_DEBUG_STATE.notEqualsTo(getStateLabel(State.Initializing))));
 
 
-	// Debug callstack context menu
-	const registerDebugViewMenuItem = (menuId: MenuId, id: string, title: string, order: number, when?: ContextKeyExpression, precondition?: ContextKeyExpression, group = 'navigation') => {
-		MenuRegistry.appendMenuItem(menuId, {
-			group,
-			when,
-			order,
+// Debug callstack context menu
+const registerDebugViewMenuItem = (menuId: MenuId, id: string, title: string, order: number, when?: ContextKeyExpression, precondition?: ContextKeyExpression, group = 'navigation') => {
+	MenuRegistry.appendMenuItem(menuId, {
+		group,
+		when,
+		order,
+		command: {
+			id,
+			title,
+			precondition
+		}
+	});
+};
+registerDebugViewMenuItem(MenuId.DebugCallStackContext, RESTART_SESSION_ID, RESTART_LABEL, 10, CONTEXT_CALLSTACK_ITEM_TYPE.isEqualTo('session'));
+registerDebugViewMenuItem(MenuId.DebugCallStackContext, STOP_ID, STOP_LABEL, 20, CONTEXT_CALLSTACK_ITEM_TYPE.isEqualTo('session'));
+registerDebugViewMenuItem(MenuId.DebugCallStackContext, PAUSE_ID, PAUSE_LABEL, 10, ContextKeyExpr.and(CONTEXT_CALLSTACK_ITEM_TYPE.isEqualTo('thread'), CONTEXT_DEBUG_STATE.isEqualTo('running')));
+registerDebugViewMenuItem(MenuId.DebugCallStackContext, CONTINUE_ID, CONTINUE_LABEL, 10, ContextKeyExpr.and(CONTEXT_CALLSTACK_ITEM_TYPE.isEqualTo('thread'), CONTEXT_DEBUG_STATE.isEqualTo('stopped')));
+registerDebugViewMenuItem(MenuId.DebugCallStackContext, STEP_OVER_ID, STEP_OVER_LABEL, 20, CONTEXT_CALLSTACK_ITEM_TYPE.isEqualTo('thread'), CONTEXT_DEBUG_STATE.isEqualTo('stopped'));
+registerDebugViewMenuItem(MenuId.DebugCallStackContext, STEP_INTO_ID, STEP_INTO_LABEL, 30, CONTEXT_CALLSTACK_ITEM_TYPE.isEqualTo('thread'), CONTEXT_DEBUG_STATE.isEqualTo('stopped'));
+registerDebugViewMenuItem(MenuId.DebugCallStackContext, STEP_OUT_ID, STEP_OUT_LABEL, 40, CONTEXT_CALLSTACK_ITEM_TYPE.isEqualTo('thread'), CONTEXT_DEBUG_STATE.isEqualTo('stopped'));
+registerDebugViewMenuItem(MenuId.DebugCallStackContext, TERMINATE_THREAD_ID, nls.localize('terminateThread', "Terminate Thread"), 10, CONTEXT_CALLSTACK_ITEM_TYPE.isEqualTo('thread'), undefined, 'termination');
+registerDebugViewMenuItem(MenuId.DebugCallStackContext, RESTART_FRAME_ID, nls.localize('restartFrame', "Restart Frame"), 10, ContextKeyExpr.and(CONTEXT_CALLSTACK_ITEM_TYPE.isEqualTo('stackFrame'), CONTEXT_RESTART_FRAME_SUPPORTED), CONTEXT_STACK_FRAME_SUPPORTS_RESTART);
+registerDebugViewMenuItem(MenuId.DebugCallStackContext, COPY_STACK_TRACE_ID, nls.localize('copyStackTrace', "Copy Call Stack"), 20, CONTEXT_CALLSTACK_ITEM_TYPE.isEqualTo('stackFrame'));
+
+registerDebugViewMenuItem(MenuId.DebugVariablesContext, SET_VARIABLE_ID, nls.localize('setValue', "Set Value"), 10, CONTEXT_SET_VARIABLE_SUPPORTED, undefined, '3_modification');
+registerDebugViewMenuItem(MenuId.DebugVariablesContext, COPY_VALUE_ID, nls.localize('copyValue', "Copy Value"), 10, undefined, undefined, '5_cutcopypaste');
+registerDebugViewMenuItem(MenuId.DebugVariablesContext, COPY_EVALUATE_PATH_ID, nls.localize('copyAsExpression', "Copy as Expression"), 20, CONTEXT_VARIABLE_EVALUATE_NAME_PRESENT, undefined, '5_cutcopypaste');
+registerDebugViewMenuItem(MenuId.DebugVariablesContext, ADD_TO_WATCH_ID, nls.localize('addToWatchExpressions', "Add to Watch"), 100, CONTEXT_VARIABLE_EVALUATE_NAME_PRESENT, undefined, 'z_commands');
+registerDebugViewMenuItem(MenuId.DebugVariablesContext, BREAK_WHEN_VALUE_CHANGES_ID, nls.localize('breakWhenValueChanges', "Break When Value Changes"), 200, CONTEXT_BREAK_WHEN_VALUE_CHANGES_SUPPORTED, undefined, 'z_commands');
+
+registerDebugViewMenuItem(MenuId.DebugWatchContext, ADD_WATCH_ID, ADD_WATCH_LABEL, 10, undefined, undefined, '3_modification');
+registerDebugViewMenuItem(MenuId.DebugWatchContext, EDIT_EXPRESSION_COMMAND_ID, nls.localize('editWatchExpression', "Edit Expression"), 20, CONTEXT_WATCH_ITEM_TYPE.isEqualTo('expression'), undefined, '3_modification');
+registerDebugViewMenuItem(MenuId.DebugWatchContext, COPY_VALUE_ID, nls.localize('copyValue', "Copy Value"), 30, ContextKeyExpr.or(CONTEXT_WATCH_ITEM_TYPE.isEqualTo('expression'), CONTEXT_WATCH_ITEM_TYPE.isEqualTo('variable')), CONTEXT_IN_DEBUG_MODE, '3_modification');
+registerDebugViewMenuItem(MenuId.DebugWatchContext, REMOVE_EXPRESSION_COMMAND_ID, nls.localize('removeWatchExpression', "Remove Expression"), 10, CONTEXT_WATCH_ITEM_TYPE.isEqualTo('expression'), undefined, 'z_commands');
+registerDebugViewMenuItem(MenuId.DebugWatchContext, REMOVE_WATCH_EXPRESSIONS_COMMAND_ID, REMOVE_WATCH_EXPRESSIONS_LABEL, 20, undefined, undefined, 'z_commands');
+
+// Touch Bar
+if (isMacintosh) {
+
+	const registerTouchBarEntry = (id: string, title: string, order: number, when: ContextKeyExpression | undefined, iconUri: URI) => {
+		MenuRegistry.appendMenuItem(MenuId.TouchBarContext, {
 			command: {
 				id,
 				title,
-				precondition
-			}
+				icon: { dark: iconUri }
+			},
+			when: ContextKeyExpr.and(CONTEXT_DEBUGGERS_AVAILABLE, when),
+			group: '9_debug',
+			order
 		});
 	};
-	registerDebugViewMenuItem(MenuId.DebugCallStackContext, RESTART_SESSION_ID, RESTART_LABEL, 10, CONTEXT_CALLSTACK_ITEM_TYPE.isEqualTo('session'));
-	registerDebugViewMenuItem(MenuId.DebugCallStackContext, STOP_ID, STOP_LABEL, 20, CONTEXT_CALLSTACK_ITEM_TYPE.isEqualTo('session'));
-	registerDebugViewMenuItem(MenuId.DebugCallStackContext, PAUSE_ID, PAUSE_LABEL, 10, ContextKeyExpr.and(CONTEXT_CALLSTACK_ITEM_TYPE.isEqualTo('thread'), CONTEXT_DEBUG_STATE.isEqualTo('running')));
-	registerDebugViewMenuItem(MenuId.DebugCallStackContext, CONTINUE_ID, CONTINUE_LABEL, 10, ContextKeyExpr.and(CONTEXT_CALLSTACK_ITEM_TYPE.isEqualTo('thread'), CONTEXT_DEBUG_STATE.isEqualTo('stopped')));
-	registerDebugViewMenuItem(MenuId.DebugCallStackContext, STEP_OVER_ID, STEP_OVER_LABEL, 20, CONTEXT_CALLSTACK_ITEM_TYPE.isEqualTo('thread'), CONTEXT_DEBUG_STATE.isEqualTo('stopped'));
-	registerDebugViewMenuItem(MenuId.DebugCallStackContext, STEP_INTO_ID, STEP_INTO_LABEL, 30, CONTEXT_CALLSTACK_ITEM_TYPE.isEqualTo('thread'), CONTEXT_DEBUG_STATE.isEqualTo('stopped'));
-	registerDebugViewMenuItem(MenuId.DebugCallStackContext, STEP_OUT_ID, STEP_OUT_LABEL, 40, CONTEXT_CALLSTACK_ITEM_TYPE.isEqualTo('thread'), CONTEXT_DEBUG_STATE.isEqualTo('stopped'));
-	registerDebugViewMenuItem(MenuId.DebugCallStackContext, TERMINATE_THREAD_ID, nls.localize('terminateThread', "Terminate Thread"), 10, CONTEXT_CALLSTACK_ITEM_TYPE.isEqualTo('thread'), undefined, 'termination');
-	registerDebugViewMenuItem(MenuId.DebugCallStackContext, RESTART_FRAME_ID, nls.localize('restartFrame', "Restart Frame"), 10, ContextKeyExpr.and(CONTEXT_CALLSTACK_ITEM_TYPE.isEqualTo('stackFrame'), CONTEXT_RESTART_FRAME_SUPPORTED), CONTEXT_STACK_FRAME_SUPPORTS_RESTART);
-	registerDebugViewMenuItem(MenuId.DebugCallStackContext, COPY_STACK_TRACE_ID, nls.localize('copyStackTrace', "Copy Call Stack"), 20, CONTEXT_CALLSTACK_ITEM_TYPE.isEqualTo('stackFrame'));
 
-	registerDebugViewMenuItem(MenuId.DebugVariablesContext, SET_VARIABLE_ID, nls.localize('setValue', "Set Value"), 10, CONTEXT_SET_VARIABLE_SUPPORTED, undefined, '3_modification');
-	registerDebugViewMenuItem(MenuId.DebugVariablesContext, COPY_VALUE_ID, nls.localize('copyValue', "Copy Value"), 10, undefined, undefined, '5_cutcopypaste');
-	registerDebugViewMenuItem(MenuId.DebugVariablesContext, COPY_EVALUATE_PATH_ID, nls.localize('copyAsExpression', "Copy as Expression"), 20, CONTEXT_VARIABLE_EVALUATE_NAME_PRESENT, undefined, '5_cutcopypaste');
-	registerDebugViewMenuItem(MenuId.DebugVariablesContext, ADD_TO_WATCH_ID, nls.localize('addToWatchExpressions', "Add to Watch"), 100, CONTEXT_VARIABLE_EVALUATE_NAME_PRESENT, undefined, 'z_commands');
-	registerDebugViewMenuItem(MenuId.DebugVariablesContext, BREAK_WHEN_VALUE_CHANGES_ID, nls.localize('breakWhenValueChanges', "Break When Value Changes"), 200, CONTEXT_BREAK_WHEN_VALUE_CHANGES_SUPPORTED, undefined, 'z_commands');
+	registerTouchBarEntry(DEBUG_START_COMMAND_ID, DEBUG_START_LABEL, 0, CONTEXT_IN_DEBUG_MODE.toNegated(), FileAccess.asFileUri('vs/workbench/contrib/debug/browser/media/continue-tb.png', require));
+	registerTouchBarEntry(DEBUG_RUN_COMMAND_ID, DEBUG_RUN_LABEL, 1, CONTEXT_IN_DEBUG_MODE.toNegated(), FileAccess.asFileUri('vs/workbench/contrib/debug/browser/media/continue-without-debugging-tb.png', require));
+	registerTouchBarEntry(CONTINUE_ID, CONTINUE_LABEL, 0, CONTEXT_DEBUG_STATE.isEqualTo('stopped'), FileAccess.asFileUri('vs/workbench/contrib/debug/browser/media/continue-tb.png', require));
+	registerTouchBarEntry(PAUSE_ID, PAUSE_LABEL, 1, ContextKeyExpr.and(CONTEXT_IN_DEBUG_MODE, ContextKeyExpr.notEquals('debugState', 'stopped')), FileAccess.asFileUri('vs/workbench/contrib/debug/browser/media/pause-tb.png', require));
+	registerTouchBarEntry(STEP_OVER_ID, STEP_OVER_LABEL, 2, CONTEXT_IN_DEBUG_MODE, FileAccess.asFileUri('vs/workbench/contrib/debug/browser/media/stepover-tb.png', require));
+	registerTouchBarEntry(STEP_INTO_ID, STEP_INTO_LABEL, 3, CONTEXT_IN_DEBUG_MODE, FileAccess.asFileUri('vs/workbench/contrib/debug/browser/media/stepinto-tb.png', require));
+	registerTouchBarEntry(STEP_OUT_ID, STEP_OUT_LABEL, 4, CONTEXT_IN_DEBUG_MODE, FileAccess.asFileUri('vs/workbench/contrib/debug/browser/media/stepout-tb.png', require));
+	registerTouchBarEntry(RESTART_SESSION_ID, RESTART_LABEL, 5, CONTEXT_IN_DEBUG_MODE, FileAccess.asFileUri('vs/workbench/contrib/debug/browser/media/restart-tb.png', require));
+	registerTouchBarEntry(STOP_ID, STOP_LABEL, 6, CONTEXT_IN_DEBUG_MODE, FileAccess.asFileUri('vs/workbench/contrib/debug/browser/media/stop-tb.png', require));
+}
 
-	registerDebugViewMenuItem(MenuId.DebugWatchContext, ADD_WATCH_ID, ADD_WATCH_LABEL, 10, undefined, undefined, '3_modification');
-	registerDebugViewMenuItem(MenuId.DebugWatchContext, EDIT_EXPRESSION_COMMAND_ID, nls.localize('editWatchExpression', "Edit Expression"), 20, CONTEXT_WATCH_ITEM_TYPE.isEqualTo('expression'), undefined, '3_modification');
-	registerDebugViewMenuItem(MenuId.DebugWatchContext, COPY_VALUE_ID, nls.localize('copyValue', "Copy Value"), 30, ContextKeyExpr.or(CONTEXT_WATCH_ITEM_TYPE.isEqualTo('expression'), CONTEXT_WATCH_ITEM_TYPE.isEqualTo('variable')), CONTEXT_IN_DEBUG_MODE, '3_modification');
-	registerDebugViewMenuItem(MenuId.DebugWatchContext, REMOVE_EXPRESSION_COMMAND_ID, nls.localize('removeWatchExpression', "Remove Expression"), 10, CONTEXT_WATCH_ITEM_TYPE.isEqualTo('expression'), undefined, 'z_commands');
-	registerDebugViewMenuItem(MenuId.DebugWatchContext, REMOVE_WATCH_EXPRESSIONS_COMMAND_ID, REMOVE_WATCH_EXPRESSIONS_LABEL, 20, undefined, undefined, 'z_commands');
+// Debug menu
 
-	// Touch Bar
-	if (isMacintosh) {
+MenuRegistry.appendMenuItem(MenuId.MenubarDebugMenu, {
+	group: '1_debug',
+	command: {
+		id: DEBUG_START_COMMAND_ID,
+		title: nls.localize({ key: 'miStartDebugging', comment: ['&& denotes a mnemonic'] }, "&&Start Debugging")
+	},
+	order: 1,
+	when: CONTEXT_DEBUGGERS_AVAILABLE
+});
 
-		const registerTouchBarEntry = (id: string, title: string, order: number, when: ContextKeyExpression | undefined, iconUri: URI) => {
-			MenuRegistry.appendMenuItem(MenuId.TouchBarContext, {
-				command: {
-					id,
-					title,
-					icon: { dark: iconUri }
-				},
-				when: ContextKeyExpr.and(CONTEXT_DEBUGGERS_AVAILABLE, when),
-				group: '9_debug',
-				order
-			});
-		};
+MenuRegistry.appendMenuItem(MenuId.MenubarDebugMenu, {
+	group: '1_debug',
+	command: {
+		id: DEBUG_RUN_COMMAND_ID,
+		title: nls.localize({ key: 'miRun', comment: ['&& denotes a mnemonic'] }, "Run &&Without Debugging")
+	},
+	order: 2,
+	when: CONTEXT_DEBUGGERS_AVAILABLE
+});
 
-		registerTouchBarEntry(DEBUG_START_COMMAND_ID, DEBUG_START_LABEL, 0, CONTEXT_IN_DEBUG_MODE.toNegated(), FileAccess.asFileUri('vs/workbench/contrib/debug/browser/media/continue-tb.png', require));
-		registerTouchBarEntry(DEBUG_RUN_COMMAND_ID, DEBUG_RUN_LABEL, 1, CONTEXT_IN_DEBUG_MODE.toNegated(), FileAccess.asFileUri('vs/workbench/contrib/debug/browser/media/continue-without-debugging-tb.png', require));
-		registerTouchBarEntry(CONTINUE_ID, CONTINUE_LABEL, 0, CONTEXT_DEBUG_STATE.isEqualTo('stopped'), FileAccess.asFileUri('vs/workbench/contrib/debug/browser/media/continue-tb.png', require));
-		registerTouchBarEntry(PAUSE_ID, PAUSE_LABEL, 1, ContextKeyExpr.and(CONTEXT_IN_DEBUG_MODE, ContextKeyExpr.notEquals('debugState', 'stopped')), FileAccess.asFileUri('vs/workbench/contrib/debug/browser/media/pause-tb.png', require));
-		registerTouchBarEntry(STEP_OVER_ID, STEP_OVER_LABEL, 2, CONTEXT_IN_DEBUG_MODE, FileAccess.asFileUri('vs/workbench/contrib/debug/browser/media/stepover-tb.png', require));
-		registerTouchBarEntry(STEP_INTO_ID, STEP_INTO_LABEL, 3, CONTEXT_IN_DEBUG_MODE, FileAccess.asFileUri('vs/workbench/contrib/debug/browser/media/stepinto-tb.png', require));
-		registerTouchBarEntry(STEP_OUT_ID, STEP_OUT_LABEL, 4, CONTEXT_IN_DEBUG_MODE, FileAccess.asFileUri('vs/workbench/contrib/debug/browser/media/stepout-tb.png', require));
-		registerTouchBarEntry(RESTART_SESSION_ID, RESTART_LABEL, 5, CONTEXT_IN_DEBUG_MODE, FileAccess.asFileUri('vs/workbench/contrib/debug/browser/media/restart-tb.png', require));
-		registerTouchBarEntry(STOP_ID, STOP_LABEL, 6, CONTEXT_IN_DEBUG_MODE, FileAccess.asFileUri('vs/workbench/contrib/debug/browser/media/stop-tb.png', require));
+MenuRegistry.appendMenuItem(MenuId.MenubarDebugMenu, {
+	group: '1_debug',
+	command: {
+		id: STOP_ID,
+		title: nls.localize({ key: 'miStopDebugging', comment: ['&& denotes a mnemonic'] }, "&&Stop Debugging"),
+		precondition: CONTEXT_IN_DEBUG_MODE
+	},
+	order: 3,
+	when: CONTEXT_DEBUGGERS_AVAILABLE
+});
+
+MenuRegistry.appendMenuItem(MenuId.MenubarDebugMenu, {
+	group: '1_debug',
+	command: {
+		id: RESTART_SESSION_ID,
+		title: nls.localize({ key: 'miRestart Debugging', comment: ['&& denotes a mnemonic'] }, "&&Restart Debugging"),
+		precondition: CONTEXT_IN_DEBUG_MODE
+	},
+	order: 4,
+	when: CONTEXT_DEBUGGERS_AVAILABLE
+});
+
+// Configuration
+
+MenuRegistry.appendMenuItem(MenuId.MenubarDebugMenu, {
+	group: '2_configuration',
+	command: {
+		id: ADD_CONFIGURATION_ID,
+		title: nls.localize({ key: 'miAddConfiguration', comment: ['&& denotes a mnemonic'] }, "A&&dd Configuration...")
+	},
+	order: 2,
+	when: CONTEXT_DEBUGGERS_AVAILABLE
+});
+
+// Step Commands
+MenuRegistry.appendMenuItem(MenuId.MenubarDebugMenu, {
+	group: '3_step',
+	command: {
+		id: STEP_OVER_ID,
+		title: nls.localize({ key: 'miStepOver', comment: ['&& denotes a mnemonic'] }, "Step &&Over"),
+		precondition: CONTEXT_DEBUG_STATE.isEqualTo('stopped')
+	},
+	order: 1,
+	when: CONTEXT_DEBUGGERS_AVAILABLE
+});
+
+MenuRegistry.appendMenuItem(MenuId.MenubarDebugMenu, {
+	group: '3_step',
+	command: {
+		id: STEP_INTO_ID,
+		title: nls.localize({ key: 'miStepInto', comment: ['&& denotes a mnemonic'] }, "Step &&Into"),
+		precondition: CONTEXT_DEBUG_STATE.isEqualTo('stopped')
+	},
+	order: 2,
+	when: CONTEXT_DEBUGGERS_AVAILABLE
+});
+
+MenuRegistry.appendMenuItem(MenuId.MenubarDebugMenu, {
+	group: '3_step',
+	command: {
+		id: STEP_OUT_ID,
+		title: nls.localize({ key: 'miStepOut', comment: ['&& denotes a mnemonic'] }, "Step O&&ut"),
+		precondition: CONTEXT_DEBUG_STATE.isEqualTo('stopped')
+	},
+	order: 3,
+	when: CONTEXT_DEBUGGERS_AVAILABLE
+});
+
+MenuRegistry.appendMenuItem(MenuId.MenubarDebugMenu, {
+	group: '3_step',
+	command: {
+		id: CONTINUE_ID,
+		title: nls.localize({ key: 'miContinue', comment: ['&& denotes a mnemonic'] }, "&&Continue"),
+		precondition: CONTEXT_DEBUG_STATE.isEqualTo('stopped')
+	},
+	order: 4,
+	when: CONTEXT_DEBUGGERS_AVAILABLE
+});
+
+// New Breakpoints
+
+MenuRegistry.appendMenuItem(MenuId.MenubarNewBreakpointMenu, {
+	group: '1_breakpoints',
+	command: {
+		id: TOGGLE_INLINE_BREAKPOINT_ID,
+		title: nls.localize({ key: 'miInlineBreakpoint', comment: ['&& denotes a mnemonic'] }, "Inline Breakp&&oint")
+	},
+	order: 2,
+	when: CONTEXT_DEBUGGERS_AVAILABLE
+});
+
+MenuRegistry.appendMenuItem(MenuId.MenubarDebugMenu, {
+	group: '4_new_breakpoint',
+	title: nls.localize({ key: 'miNewBreakpoint', comment: ['&& denotes a mnemonic'] }, "&&New Breakpoint"),
+	submenu: MenuId.MenubarNewBreakpointMenu,
+	order: 2,
+	when: CONTEXT_DEBUGGERS_AVAILABLE
+});
+
+// Breakpoint actions are registered from breakpointsView.ts
+
+// Install Debuggers
+MenuRegistry.appendMenuItem(MenuId.MenubarDebugMenu, {
+	group: 'z_install',
+	command: {
+		id: 'debug.installAdditionalDebuggers',
+		title: nls.localize({ key: 'miInstallAdditionalDebuggers', comment: ['&& denotes a mnemonic'] }, "&&Install Additional Debuggers...")
+	},
+	order: 1
+});
+
+// register repl panel
+
+const VIEW_CONTAINER: ViewContainer = Registry.as<IViewContainersRegistry>(ViewExtensions.ViewContainersRegistry).registerViewContainer({
+	id: DEBUG_PANEL_ID,
+	title: nls.localize({ comment: ['Debug is a noun in this context, not a verb.'], key: 'debugPanel' }, 'Debug Console'),
+	icon: icons.debugConsoleViewIcon,
+	ctorDescriptor: new SyncDescriptor(ViewPaneContainer, [DEBUG_PANEL_ID, { mergeViewWithContainerWhenSingleView: true, donotShowContainerTitleWhenMergedWithContainer: true }]),
+	storageId: DEBUG_PANEL_ID,
+	hideIfEmpty: true,
+}, ViewContainerLocation.Panel, { donotRegisterOpenCommand: true });
+
+Registry.as<IViewsRegistry>(ViewExtensions.ViewsRegistry).registerViews([{
+	id: REPL_VIEW_ID,
+	name: nls.localize({ comment: ['Debug is a noun in this context, not a verb.'], key: 'debugPanel' }, 'Debug Console'),
+	containerIcon: icons.debugConsoleViewIcon,
+	canToggleVisibility: false,
+	canMoveView: true,
+	when: CONTEXT_DEBUGGERS_AVAILABLE,
+	ctorDescriptor: new SyncDescriptor(Repl),
+	openCommandActionDescriptor: {
+		id: 'workbench.debug.action.toggleRepl',
+		mnemonicTitle: nls.localize({ key: 'miToggleDebugConsole', comment: ['&& denotes a mnemonic'] }, "De&&bug Console"),
+		keybindings: { primary: KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.KEY_Y },
+		order: 2
 	}
-}
-
-function registerDebugMenu(): void {
-
-	// Debug menu
-
-	MenuRegistry.appendMenuItem(MenuId.MenubarDebugMenu, {
-		group: '1_debug',
-		command: {
-			id: DEBUG_START_COMMAND_ID,
-			title: nls.localize({ key: 'miStartDebugging', comment: ['&& denotes a mnemonic'] }, "&&Start Debugging")
-		},
-		order: 1,
-		when: CONTEXT_DEBUGGERS_AVAILABLE
-	});
-
-	MenuRegistry.appendMenuItem(MenuId.MenubarDebugMenu, {
-		group: '1_debug',
-		command: {
-			id: DEBUG_RUN_COMMAND_ID,
-			title: nls.localize({ key: 'miRun', comment: ['&& denotes a mnemonic'] }, "Run &&Without Debugging")
-		},
-		order: 2,
-		when: CONTEXT_DEBUGGERS_AVAILABLE
-	});
-
-	MenuRegistry.appendMenuItem(MenuId.MenubarDebugMenu, {
-		group: '1_debug',
-		command: {
-			id: STOP_ID,
-			title: nls.localize({ key: 'miStopDebugging', comment: ['&& denotes a mnemonic'] }, "&&Stop Debugging"),
-			precondition: CONTEXT_IN_DEBUG_MODE
-		},
-		order: 3,
-		when: CONTEXT_DEBUGGERS_AVAILABLE
-	});
-
-	MenuRegistry.appendMenuItem(MenuId.MenubarDebugMenu, {
-		group: '1_debug',
-		command: {
-			id: RESTART_SESSION_ID,
-			title: nls.localize({ key: 'miRestart Debugging', comment: ['&& denotes a mnemonic'] }, "&&Restart Debugging"),
-			precondition: CONTEXT_IN_DEBUG_MODE
-		},
-		order: 4,
-		when: CONTEXT_DEBUGGERS_AVAILABLE
-	});
-
-	// Configuration
-
-	MenuRegistry.appendMenuItem(MenuId.MenubarDebugMenu, {
-		group: '2_configuration',
-		command: {
-			id: ADD_CONFIGURATION_ID,
-			title: nls.localize({ key: 'miAddConfiguration', comment: ['&& denotes a mnemonic'] }, "A&&dd Configuration...")
-		},
-		order: 2,
-		when: CONTEXT_DEBUGGERS_AVAILABLE
-	});
-
-	// Step Commands
-	MenuRegistry.appendMenuItem(MenuId.MenubarDebugMenu, {
-		group: '3_step',
-		command: {
-			id: STEP_OVER_ID,
-			title: nls.localize({ key: 'miStepOver', comment: ['&& denotes a mnemonic'] }, "Step &&Over"),
-			precondition: CONTEXT_DEBUG_STATE.isEqualTo('stopped')
-		},
-		order: 1,
-		when: CONTEXT_DEBUGGERS_AVAILABLE
-	});
-
-	MenuRegistry.appendMenuItem(MenuId.MenubarDebugMenu, {
-		group: '3_step',
-		command: {
-			id: STEP_INTO_ID,
-			title: nls.localize({ key: 'miStepInto', comment: ['&& denotes a mnemonic'] }, "Step &&Into"),
-			precondition: CONTEXT_DEBUG_STATE.isEqualTo('stopped')
-		},
-		order: 2,
-		when: CONTEXT_DEBUGGERS_AVAILABLE
-	});
-
-	MenuRegistry.appendMenuItem(MenuId.MenubarDebugMenu, {
-		group: '3_step',
-		command: {
-			id: STEP_OUT_ID,
-			title: nls.localize({ key: 'miStepOut', comment: ['&& denotes a mnemonic'] }, "Step O&&ut"),
-			precondition: CONTEXT_DEBUG_STATE.isEqualTo('stopped')
-		},
-		order: 3,
-		when: CONTEXT_DEBUGGERS_AVAILABLE
-	});
-
-	MenuRegistry.appendMenuItem(MenuId.MenubarDebugMenu, {
-		group: '3_step',
-		command: {
-			id: CONTINUE_ID,
-			title: nls.localize({ key: 'miContinue', comment: ['&& denotes a mnemonic'] }, "&&Continue"),
-			precondition: CONTEXT_DEBUG_STATE.isEqualTo('stopped')
-		},
-		order: 4,
-		when: CONTEXT_DEBUGGERS_AVAILABLE
-	});
-
-	// New Breakpoints
-
-	MenuRegistry.appendMenuItem(MenuId.MenubarNewBreakpointMenu, {
-		group: '1_breakpoints',
-		command: {
-			id: TOGGLE_INLINE_BREAKPOINT_ID,
-			title: nls.localize({ key: 'miInlineBreakpoint', comment: ['&& denotes a mnemonic'] }, "Inline Breakp&&oint")
-		},
-		order: 2,
-		when: CONTEXT_DEBUGGERS_AVAILABLE
-	});
-
-	MenuRegistry.appendMenuItem(MenuId.MenubarDebugMenu, {
-		group: '4_new_breakpoint',
-		title: nls.localize({ key: 'miNewBreakpoint', comment: ['&& denotes a mnemonic'] }, "&&New Breakpoint"),
-		submenu: MenuId.MenubarNewBreakpointMenu,
-		order: 2,
-		when: CONTEXT_DEBUGGERS_AVAILABLE
-	});
-
-	// Breakpoint actions are registered from breakpointsView.ts
-
-	// Install Debuggers
-	MenuRegistry.appendMenuItem(MenuId.MenubarDebugMenu, {
-		group: 'z_install',
-		command: {
-			id: 'debug.installAdditionalDebuggers',
-			title: nls.localize({ key: 'miInstallAdditionalDebuggers', comment: ['&& denotes a mnemonic'] }, "&&Install Additional Debuggers...")
-		},
-		order: 1
-	});
-}
-
-function registerDebugPanel(): void {
-	// register repl panel
-
-	const VIEW_CONTAINER: ViewContainer = Registry.as<IViewContainersRegistry>(ViewExtensions.ViewContainersRegistry).registerViewContainer({
-		id: DEBUG_PANEL_ID,
-		title: nls.localize({ comment: ['Debug is a noun in this context, not a verb.'], key: 'debugPanel' }, 'Debug Console'),
-		icon: icons.debugConsoleViewIcon,
-		ctorDescriptor: new SyncDescriptor(ViewPaneContainer, [DEBUG_PANEL_ID, { mergeViewWithContainerWhenSingleView: true, donotShowContainerTitleWhenMergedWithContainer: true }]),
-		storageId: DEBUG_PANEL_ID,
-		hideIfEmpty: true,
-	}, ViewContainerLocation.Panel, { donotRegisterOpenCommand: true });
-
-	Registry.as<IViewsRegistry>(ViewExtensions.ViewsRegistry).registerViews([{
-		id: REPL_VIEW_ID,
-		name: nls.localize({ comment: ['Debug is a noun in this context, not a verb.'], key: 'debugPanel' }, 'Debug Console'),
-		containerIcon: icons.debugConsoleViewIcon,
-		canToggleVisibility: false,
-		canMoveView: true,
-		when: CONTEXT_DEBUGGERS_AVAILABLE,
-		ctorDescriptor: new SyncDescriptor(Repl),
-		openCommandActionDescriptor: {
-			id: 'workbench.debug.action.toggleRepl',
-			mnemonicTitle: nls.localize({ key: 'miToggleDebugConsole', comment: ['&& denotes a mnemonic'] }, "De&&bug Console"),
-			keybindings: { primary: KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.KEY_Y },
-			order: 2
-		}
-	}], VIEW_CONTAINER);
-}
+}], VIEW_CONTAINER);
 
 
-function registerDebugView(): void {
-	const viewContainer = Registry.as<IViewContainersRegistry>(ViewExtensions.ViewContainersRegistry).registerViewContainer({
+const viewContainer = Registry.as<IViewContainersRegistry>(ViewExtensions.ViewContainersRegistry).registerViewContainer({
+	id: VIEWLET_ID,
+	title: nls.localize('run and debug', "Run and Debug"),
+	openCommandActionDescriptor: {
 		id: VIEWLET_ID,
-		title: nls.localize('run and debug', "Run and Debug"),
-		openCommandActionDescriptor: {
-			id: VIEWLET_ID,
-			mnemonicTitle: nls.localize({ key: 'miViewRun', comment: ['&& denotes a mnemonic'] }, "&&Run"),
-			keybindings: { primary: KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.KEY_D },
-			order: 3
+		mnemonicTitle: nls.localize({ key: 'miViewRun', comment: ['&& denotes a mnemonic'] }, "&&Run"),
+		keybindings: { primary: KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.KEY_D },
+		order: 3
+	},
+	ctorDescriptor: new SyncDescriptor(DebugViewPaneContainer),
+	icon: icons.runViewIcon,
+	alwaysUseContainerInfo: true,
+	order: 3,
+}, ViewContainerLocation.Sidebar);
+
+// Register default debug views
+const viewsRegistry = Registry.as<IViewsRegistry>(ViewExtensions.ViewsRegistry);
+viewsRegistry.registerViews([{ id: VARIABLES_VIEW_ID, name: nls.localize('variables', "Variables"), containerIcon: icons.variablesViewIcon, ctorDescriptor: new SyncDescriptor(VariablesView), order: 10, weight: 40, canToggleVisibility: true, canMoveView: true, focusCommand: { id: 'workbench.debug.action.focusVariablesView' }, when: CONTEXT_DEBUG_UX.isEqualTo('default') }], viewContainer);
+viewsRegistry.registerViews([{ id: WATCH_VIEW_ID, name: nls.localize('watch', "Watch"), containerIcon: icons.watchViewIcon, ctorDescriptor: new SyncDescriptor(WatchExpressionsView), order: 20, weight: 10, canToggleVisibility: true, canMoveView: true, focusCommand: { id: 'workbench.debug.action.focusWatchView' }, when: CONTEXT_DEBUG_UX.isEqualTo('default') }], viewContainer);
+viewsRegistry.registerViews([{ id: CALLSTACK_VIEW_ID, name: nls.localize('callStack', "Call Stack"), containerIcon: icons.callStackViewIcon, ctorDescriptor: new SyncDescriptor(CallStackView), order: 30, weight: 30, canToggleVisibility: true, canMoveView: true, focusCommand: { id: 'workbench.debug.action.focusCallStackView' }, when: CONTEXT_DEBUG_UX.isEqualTo('default') }], viewContainer);
+viewsRegistry.registerViews([{ id: BREAKPOINTS_VIEW_ID, name: nls.localize('breakpoints', "Breakpoints"), containerIcon: icons.breakpointsViewIcon, ctorDescriptor: new SyncDescriptor(BreakpointsView), order: 40, weight: 20, canToggleVisibility: true, canMoveView: true, focusCommand: { id: 'workbench.debug.action.focusBreakpointsView' }, when: ContextKeyExpr.or(CONTEXT_BREAKPOINTS_EXIST, CONTEXT_DEBUG_UX.isEqualTo('default')) }], viewContainer);
+viewsRegistry.registerViews([{ id: WelcomeView.ID, name: WelcomeView.LABEL, containerIcon: icons.runViewIcon, ctorDescriptor: new SyncDescriptor(WelcomeView), order: 1, weight: 40, canToggleVisibility: true, when: CONTEXT_DEBUG_UX.isEqualTo('simple') }], viewContainer);
+viewsRegistry.registerViews([{ id: LOADED_SCRIPTS_VIEW_ID, name: nls.localize('loadedScripts', "Loaded Scripts"), containerIcon: icons.loadedScriptsViewIcon, ctorDescriptor: new SyncDescriptor(LoadedScriptsView), order: 35, weight: 5, canToggleVisibility: true, canMoveView: true, collapsed: true, when: ContextKeyExpr.and(CONTEXT_LOADED_SCRIPTS_SUPPORTED, CONTEXT_DEBUG_UX.isEqualTo('default')) }], viewContainer);
+
+// Register configuration
+const configurationRegistry = Registry.as<IConfigurationRegistry>(ConfigurationExtensions.Configuration);
+configurationRegistry.registerConfiguration({
+	id: 'debug',
+	order: 20,
+	title: nls.localize('debugConfigurationTitle', "Debug"),
+	type: 'object',
+	properties: {
+		'debug.allowBreakpointsEverywhere': {
+			type: 'boolean',
+			description: nls.localize({ comment: ['This is the description for a setting'], key: 'allowBreakpointsEverywhere' }, "Allow setting breakpoints in any file."),
+			default: false
 		},
-		ctorDescriptor: new SyncDescriptor(DebugViewPaneContainer),
-		icon: icons.runViewIcon,
-		alwaysUseContainerInfo: true,
-		order: 3,
-	}, ViewContainerLocation.Sidebar);
-
-	// Register default debug views
-	const viewsRegistry = Registry.as<IViewsRegistry>(ViewExtensions.ViewsRegistry);
-	viewsRegistry.registerViews([{ id: VARIABLES_VIEW_ID, name: nls.localize('variables', "Variables"), containerIcon: icons.variablesViewIcon, ctorDescriptor: new SyncDescriptor(VariablesView), order: 10, weight: 40, canToggleVisibility: true, canMoveView: true, focusCommand: { id: 'workbench.debug.action.focusVariablesView' }, when: CONTEXT_DEBUG_UX.isEqualTo('default') }], viewContainer);
-	viewsRegistry.registerViews([{ id: WATCH_VIEW_ID, name: nls.localize('watch', "Watch"), containerIcon: icons.watchViewIcon, ctorDescriptor: new SyncDescriptor(WatchExpressionsView), order: 20, weight: 10, canToggleVisibility: true, canMoveView: true, focusCommand: { id: 'workbench.debug.action.focusWatchView' }, when: CONTEXT_DEBUG_UX.isEqualTo('default') }], viewContainer);
-	viewsRegistry.registerViews([{ id: CALLSTACK_VIEW_ID, name: nls.localize('callStack', "Call Stack"), containerIcon: icons.callStackViewIcon, ctorDescriptor: new SyncDescriptor(CallStackView), order: 30, weight: 30, canToggleVisibility: true, canMoveView: true, focusCommand: { id: 'workbench.debug.action.focusCallStackView' }, when: CONTEXT_DEBUG_UX.isEqualTo('default') }], viewContainer);
-	viewsRegistry.registerViews([{ id: BREAKPOINTS_VIEW_ID, name: nls.localize('breakpoints', "Breakpoints"), containerIcon: icons.breakpointsViewIcon, ctorDescriptor: new SyncDescriptor(BreakpointsView), order: 40, weight: 20, canToggleVisibility: true, canMoveView: true, focusCommand: { id: 'workbench.debug.action.focusBreakpointsView' }, when: ContextKeyExpr.or(CONTEXT_BREAKPOINTS_EXIST, CONTEXT_DEBUG_UX.isEqualTo('default')) }], viewContainer);
-	viewsRegistry.registerViews([{ id: WelcomeView.ID, name: WelcomeView.LABEL, containerIcon: icons.runViewIcon, ctorDescriptor: new SyncDescriptor(WelcomeView), order: 1, weight: 40, canToggleVisibility: true, when: CONTEXT_DEBUG_UX.isEqualTo('simple') }], viewContainer);
-	viewsRegistry.registerViews([{ id: LOADED_SCRIPTS_VIEW_ID, name: nls.localize('loadedScripts', "Loaded Scripts"), containerIcon: icons.loadedScriptsViewIcon, ctorDescriptor: new SyncDescriptor(LoadedScriptsView), order: 35, weight: 5, canToggleVisibility: true, canMoveView: true, collapsed: true, when: ContextKeyExpr.and(CONTEXT_LOADED_SCRIPTS_SUPPORTED, CONTEXT_DEBUG_UX.isEqualTo('default')) }], viewContainer);
-}
-
-function registerConfiguration(): void {
-	// Register configuration
-	const configurationRegistry = Registry.as<IConfigurationRegistry>(ConfigurationExtensions.Configuration);
-	configurationRegistry.registerConfiguration({
-		id: 'debug',
-		order: 20,
-		title: nls.localize('debugConfigurationTitle', "Debug"),
-		type: 'object',
-		properties: {
-			'debug.allowBreakpointsEverywhere': {
-				type: 'boolean',
-				description: nls.localize({ comment: ['This is the description for a setting'], key: 'allowBreakpointsEverywhere' }, "Allow setting breakpoints in any file."),
-				default: false
-			},
-			'debug.openExplorerOnEnd': {
-				type: 'boolean',
-				description: nls.localize({ comment: ['This is the description for a setting'], key: 'openExplorerOnEnd' }, "Automatically open the explorer view at the end of a debug session."),
-				default: false
-			},
-			'debug.inlineValues': {
-				type: 'boolean',
-				description: nls.localize({ comment: ['This is the description for a setting'], key: 'inlineValues' }, "Show variable values inline in editor while debugging."),
-				default: false
-			},
-			'debug.toolBarLocation': {
-				enum: ['floating', 'docked', 'hidden'],
-				markdownDescription: nls.localize({ comment: ['This is the description for a setting'], key: 'toolBarLocation' }, "Controls the location of the debug toolbar. Either `floating` in all views, `docked` in the debug view, or `hidden`."),
-				default: 'floating'
-			},
-			'debug.showInStatusBar': {
-				enum: ['never', 'always', 'onFirstSessionStart'],
-				enumDescriptions: [nls.localize('never', "Never show debug in status bar"), nls.localize('always', "Always show debug in status bar"), nls.localize('onFirstSessionStart', "Show debug in status bar only after debug was started for the first time")],
-				description: nls.localize({ comment: ['This is the description for a setting'], key: 'showInStatusBar' }, "Controls when the debug status bar should be visible."),
-				default: 'onFirstSessionStart'
-			},
-			'debug.internalConsoleOptions': INTERNAL_CONSOLE_OPTIONS_SCHEMA,
-			'debug.console.closeOnEnd': {
-				type: 'boolean',
-				description: nls.localize('debug.console.closeOnEnd', "Controls if the debug console should be automatically closed when the debug session ends."),
-				default: false
-			},
-			'debug.openDebug': {
-				enum: ['neverOpen', 'openOnSessionStart', 'openOnFirstSessionStart', 'openOnDebugBreak'],
-				default: 'openOnFirstSessionStart',
-				description: nls.localize('openDebug', "Controls when the debug view should open.")
-			},
-			'debug.showSubSessionsInToolBar': {
-				type: 'boolean',
-				description: nls.localize({ comment: ['This is the description for a setting'], key: 'showSubSessionsInToolBar' }, "Controls whether the debug sub-sessions are shown in the debug tool bar. When this setting is false the stop command on a sub-session will also stop the parent session."),
-				default: false
-			},
-			'debug.console.fontSize': {
-				type: 'number',
-				description: nls.localize('debug.console.fontSize', "Controls the font size in pixels in the debug console."),
-				default: isMacintosh ? 12 : 14,
-			},
-			'debug.console.fontFamily': {
-				type: 'string',
-				description: nls.localize('debug.console.fontFamily', "Controls the font family in the debug console."),
-				default: 'default'
-			},
-			'debug.console.lineHeight': {
-				type: 'number',
-				description: nls.localize('debug.console.lineHeight', "Controls the line height in pixels in the debug console. Use 0 to compute the line height from the font size."),
-				default: 0
-			},
-			'debug.console.wordWrap': {
-				type: 'boolean',
-				description: nls.localize('debug.console.wordWrap', "Controls if the lines should wrap in the debug console."),
-				default: true
-			},
-			'debug.console.historySuggestions': {
-				type: 'boolean',
-				description: nls.localize('debug.console.historySuggestions', "Controls if the debug console should suggest previously typed input."),
-				default: true
-			},
-			'debug.console.collapseIdenticalLines': {
-				type: 'boolean',
-				description: nls.localize('debug.console.collapseIdenticalLines', "Controls if the debug console should collapse identical lines and show a number of occurrences with a badge."),
-				default: true
-			},
-			'launch': {
-				type: 'object',
-				description: nls.localize({ comment: ['This is the description for a setting'], key: 'launch' }, "Global debug launch configuration. Should be used as an alternative to 'launch.json' that is shared across workspaces."),
-				default: { configurations: [], compounds: [] },
-				$ref: launchSchemaId
-			},
-			'debug.focusWindowOnBreak': {
-				type: 'boolean',
-				description: nls.localize('debug.focusWindowOnBreak', "Controls whether the workbench window should be focused when the debugger breaks."),
-				default: true
-			},
-			'debug.onTaskErrors': {
-				enum: ['debugAnyway', 'showErrors', 'prompt', 'abort'],
-				enumDescriptions: [nls.localize('debugAnyway', "Ignore task errors and start debugging."), nls.localize('showErrors', "Show the Problems view and do not start debugging."), nls.localize('prompt', "Prompt user."), nls.localize('cancel', "Cancel debugging.")],
-				description: nls.localize('debug.onTaskErrors', "Controls what to do when errors are encountered after running a preLaunchTask."),
-				default: 'prompt'
-			},
-			'debug.showBreakpointsInOverviewRuler': {
-				type: 'boolean',
-				description: nls.localize({ comment: ['This is the description for a setting'], key: 'showBreakpointsInOverviewRuler' }, "Controls whether breakpoints should be shown in the overview ruler."),
-				default: false
-			},
-			'debug.showInlineBreakpointCandidates': {
-				type: 'boolean',
-				description: nls.localize({ comment: ['This is the description for a setting'], key: 'showInlineBreakpointCandidates' }, "Controls whether inline breakpoints candidate decorations should be shown in the editor while debugging."),
-				default: true
-			},
-			'debug.saveBeforeStart': {
-				description: nls.localize('debug.saveBeforeStart', "Controls what editors to save before starting a debug session."),
-				enum: ['allEditorsInActiveGroup', 'nonUntitledEditorsInActiveGroup', 'none'],
-				enumDescriptions: [
-					nls.localize('debug.saveBeforeStart.allEditorsInActiveGroup', "Save all editors in the active group before starting a debug session."),
-					nls.localize('debug.saveBeforeStart.nonUntitledEditorsInActiveGroup', "Save all editors in the active group except untitled ones before starting a debug session."),
-					nls.localize('debug.saveBeforeStart.none', "Don't save any editors before starting a debug session."),
-				],
-				default: 'allEditorsInActiveGroup'
-			}
+		'debug.openExplorerOnEnd': {
+			type: 'boolean',
+			description: nls.localize({ comment: ['This is the description for a setting'], key: 'openExplorerOnEnd' }, "Automatically open the explorer view at the end of a debug session."),
+			default: false
+		},
+		'debug.inlineValues': {
+			type: 'boolean',
+			description: nls.localize({ comment: ['This is the description for a setting'], key: 'inlineValues' }, "Show variable values inline in editor while debugging."),
+			default: false
+		},
+		'debug.toolBarLocation': {
+			enum: ['floating', 'docked', 'hidden'],
+			markdownDescription: nls.localize({ comment: ['This is the description for a setting'], key: 'toolBarLocation' }, "Controls the location of the debug toolbar. Either `floating` in all views, `docked` in the debug view, or `hidden`."),
+			default: 'floating'
+		},
+		'debug.showInStatusBar': {
+			enum: ['never', 'always', 'onFirstSessionStart'],
+			enumDescriptions: [nls.localize('never', "Never show debug in status bar"), nls.localize('always', "Always show debug in status bar"), nls.localize('onFirstSessionStart', "Show debug in status bar only after debug was started for the first time")],
+			description: nls.localize({ comment: ['This is the description for a setting'], key: 'showInStatusBar' }, "Controls when the debug status bar should be visible."),
+			default: 'onFirstSessionStart'
+		},
+		'debug.internalConsoleOptions': INTERNAL_CONSOLE_OPTIONS_SCHEMA,
+		'debug.console.closeOnEnd': {
+			type: 'boolean',
+			description: nls.localize('debug.console.closeOnEnd', "Controls if the debug console should be automatically closed when the debug session ends."),
+			default: false
+		},
+		'debug.openDebug': {
+			enum: ['neverOpen', 'openOnSessionStart', 'openOnFirstSessionStart', 'openOnDebugBreak'],
+			default: 'openOnFirstSessionStart',
+			description: nls.localize('openDebug', "Controls when the debug view should open.")
+		},
+		'debug.showSubSessionsInToolBar': {
+			type: 'boolean',
+			description: nls.localize({ comment: ['This is the description for a setting'], key: 'showSubSessionsInToolBar' }, "Controls whether the debug sub-sessions are shown in the debug tool bar. When this setting is false the stop command on a sub-session will also stop the parent session."),
+			default: false
+		},
+		'debug.console.fontSize': {
+			type: 'number',
+			description: nls.localize('debug.console.fontSize', "Controls the font size in pixels in the debug console."),
+			default: isMacintosh ? 12 : 14,
+		},
+		'debug.console.fontFamily': {
+			type: 'string',
+			description: nls.localize('debug.console.fontFamily', "Controls the font family in the debug console."),
+			default: 'default'
+		},
+		'debug.console.lineHeight': {
+			type: 'number',
+			description: nls.localize('debug.console.lineHeight', "Controls the line height in pixels in the debug console. Use 0 to compute the line height from the font size."),
+			default: 0
+		},
+		'debug.console.wordWrap': {
+			type: 'boolean',
+			description: nls.localize('debug.console.wordWrap', "Controls if the lines should wrap in the debug console."),
+			default: true
+		},
+		'debug.console.historySuggestions': {
+			type: 'boolean',
+			description: nls.localize('debug.console.historySuggestions', "Controls if the debug console should suggest previously typed input."),
+			default: true
+		},
+		'debug.console.collapseIdenticalLines': {
+			type: 'boolean',
+			description: nls.localize('debug.console.collapseIdenticalLines', "Controls if the debug console should collapse identical lines and show a number of occurrences with a badge."),
+			default: true
+		},
+		'launch': {
+			type: 'object',
+			description: nls.localize({ comment: ['This is the description for a setting'], key: 'launch' }, "Global debug launch configuration. Should be used as an alternative to 'launch.json' that is shared across workspaces."),
+			default: { configurations: [], compounds: [] },
+			$ref: launchSchemaId
+		},
+		'debug.focusWindowOnBreak': {
+			type: 'boolean',
+			description: nls.localize('debug.focusWindowOnBreak', "Controls whether the workbench window should be focused when the debugger breaks."),
+			default: true
+		},
+		'debug.onTaskErrors': {
+			enum: ['debugAnyway', 'showErrors', 'prompt', 'abort'],
+			enumDescriptions: [nls.localize('debugAnyway', "Ignore task errors and start debugging."), nls.localize('showErrors', "Show the Problems view and do not start debugging."), nls.localize('prompt', "Prompt user."), nls.localize('cancel', "Cancel debugging.")],
+			description: nls.localize('debug.onTaskErrors', "Controls what to do when errors are encountered after running a preLaunchTask."),
+			default: 'prompt'
+		},
+		'debug.showBreakpointsInOverviewRuler': {
+			type: 'boolean',
+			description: nls.localize({ comment: ['This is the description for a setting'], key: 'showBreakpointsInOverviewRuler' }, "Controls whether breakpoints should be shown in the overview ruler."),
+			default: false
+		},
+		'debug.showInlineBreakpointCandidates': {
+			type: 'boolean',
+			description: nls.localize({ comment: ['This is the description for a setting'], key: 'showInlineBreakpointCandidates' }, "Controls whether inline breakpoints candidate decorations should be shown in the editor while debugging."),
+			default: true
+		},
+		'debug.saveBeforeStart': {
+			description: nls.localize('debug.saveBeforeStart', "Controls what editors to save before starting a debug session."),
+			enum: ['allEditorsInActiveGroup', 'nonUntitledEditorsInActiveGroup', 'none'],
+			enumDescriptions: [
+				nls.localize('debug.saveBeforeStart.allEditorsInActiveGroup', "Save all editors in the active group before starting a debug session."),
+				nls.localize('debug.saveBeforeStart.nonUntitledEditorsInActiveGroup', "Save all editors in the active group except untitled ones before starting a debug session."),
+				nls.localize('debug.saveBeforeStart.none', "Don't save any editors before starting a debug session."),
+			],
+			default: 'allEditorsInActiveGroup'
 		}
-	});
-}
+	}
+});
diff --git a/src/vs/workbench/contrib/debug/browser/debugActionViewItems.ts b/src/vs/workbench/contrib/debug/browser/debugActionViewItems.ts
index c6021398d25..e5197132f80 100644
--- a/src/vs/workbench/contrib/debug/browser/debugActionViewItems.ts
+++ b/src/vs/workbench/contrib/debug/browser/debugActionViewItems.ts
@@ -49,6 +49,7 @@ export class StartDebugActionViewItem extends BaseActionViewItem {
 		super(context, action);
 		this.toDispose = [];
 		this.selectBox = new SelectBox([], -1, contextViewService, undefined, { ariaLabel: nls.localize('debugLaunchConfigurations', 'Debug Launch Configurations') });
+		this.selectBox.setFocusable(false);
 		this.toDispose.push(this.selectBox);
 		this.toDispose.push(attachSelectBoxStyler(this.selectBox, themeService));
 
@@ -98,6 +99,7 @@ export class StartDebugActionViewItem extends BaseActionViewItem {
 				this.actionRunner.run(this.action, this.context);
 			}
 			if (event.equals(KeyCode.RightArrow)) {
+				this.start.tabIndex = -1;
 				this.selectBox.focus();
 				event.stopPropagation();
 			}
@@ -118,6 +120,8 @@ export class StartDebugActionViewItem extends BaseActionViewItem {
 		this.toDispose.push(dom.addDisposableListener(selectBoxContainer, dom.EventType.KEY_DOWN, (e: KeyboardEvent) => {
 			const event = new StandardKeyboardEvent(e);
 			if (event.equals(KeyCode.LeftArrow)) {
+				this.selectBox.setFocusable(false);
+				this.start.tabIndex = 0;
 				this.start.focus();
 				event.stopPropagation();
 			}
@@ -157,9 +161,19 @@ export class StartDebugActionViewItem extends BaseActionViewItem {
 
 	blur(): void {
 		this.start.tabIndex = -1;
+		this.selectBox.blur();
 		this.container.blur();
 	}
 
+	setFocusable(focusable: boolean): void {
+		if (focusable) {
+			this.start.tabIndex = 0;
+		} else {
+			this.start.tabIndex = -1;
+			this.selectBox.setFocusable(false);
+		}
+	}
+
 	dispose(): void {
 		this.toDispose = dispose(this.toDispose);
 	}
@@ -274,7 +288,8 @@ export class FocusSessionActionViewItem extends SelectActionViewItem {
 		});
 		this._register(this.debugService.onDidEndSession(() => this.update()));
 
-		this.update(session);
+		const selectedSession = session ? this.mapFocusedSessionToSelected(session) : undefined;
+		this.update(selectedSession);
 	}
 
 	protected getActionContext(_: string, index: number): any {
diff --git a/src/vs/workbench/contrib/debug/browser/debugColors.ts b/src/vs/workbench/contrib/debug/browser/debugColors.ts
index 476f8571e72..0afeeb754e2 100644
--- a/src/vs/workbench/contrib/debug/browser/debugColors.ts
+++ b/src/vs/workbench/contrib/debug/browser/debugColors.ts
@@ -48,8 +48,6 @@ export function registerColors() {
 	const debugConsoleSourceForeground = registerColor('debugConsole.sourceForeground', { dark: foreground, light: foreground, hc: foreground }, 'Foreground color for source filenames in debug REPL console.');
 	const debugConsoleInputIconForeground = registerColor('debugConsoleInputIcon.foreground', { dark: foreground, light: foreground, hc: foreground }, 'Foreground color for debug console input marker icon.');
 
-
-
 	const debugIconPauseForeground = registerColor('debugIcon.pauseForeground', {
 		dark: '#75BEFF',
 		light: '#007ACC',
diff --git a/src/vs/workbench/contrib/debug/browser/debugCommands.ts b/src/vs/workbench/contrib/debug/browser/debugCommands.ts
index 9268ac626a3..8aef4812c8c 100644
--- a/src/vs/workbench/contrib/debug/browser/debugCommands.ts
+++ b/src/vs/workbench/contrib/debug/browser/debugCommands.ts
@@ -9,7 +9,7 @@ import { List } from 'vs/base/browser/ui/list/listWidget';
 import { KeybindingsRegistry, KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
 import { IListService } from 'vs/platform/list/browser/listService';
 import { IWorkspaceContextService, WorkbenchState } from 'vs/platform/workspace/common/workspace';
-import { IDebugService, IEnablement, CONTEXT_BREAKPOINTS_FOCUSED, CONTEXT_WATCH_EXPRESSIONS_FOCUSED, CONTEXT_VARIABLES_FOCUSED, EDITOR_CONTRIBUTION_ID, IDebugEditorContribution, CONTEXT_IN_DEBUG_MODE, CONTEXT_EXPRESSION_SELECTED, IConfig, IStackFrame, IThread, IDebugSession, CONTEXT_DEBUG_STATE, IDebugConfiguration, CONTEXT_JUMP_TO_CURSOR_SUPPORTED, REPL_VIEW_ID, CONTEXT_DEBUGGERS_AVAILABLE, State, getStateLabel, CONTEXT_BREAKPOINT_INPUT_FOCUSED } from 'vs/workbench/contrib/debug/common/debug';
+import { IDebugService, IEnablement, CONTEXT_BREAKPOINTS_FOCUSED, CONTEXT_WATCH_EXPRESSIONS_FOCUSED, CONTEXT_VARIABLES_FOCUSED, EDITOR_CONTRIBUTION_ID, IDebugEditorContribution, CONTEXT_IN_DEBUG_MODE, CONTEXT_EXPRESSION_SELECTED, IConfig, IStackFrame, IThread, IDebugSession, CONTEXT_DEBUG_STATE, IDebugConfiguration, CONTEXT_JUMP_TO_CURSOR_SUPPORTED, REPL_VIEW_ID, CONTEXT_DEBUGGERS_AVAILABLE, State, getStateLabel, CONTEXT_BREAKPOINT_INPUT_FOCUSED, CONTEXT_FOCUSED_SESSION_IS_ATTACH } from 'vs/workbench/contrib/debug/common/debug';
 import { Expression, Variable, Breakpoint, FunctionBreakpoint, DataBreakpoint } from 'vs/workbench/contrib/debug/common/debugModel';
 import { IExtensionsViewPaneContainer, VIEWLET_ID as EXTENSIONS_VIEWLET_ID } from 'vs/workbench/contrib/extensions/common/extensions';
 import { IViewletService } from 'vs/workbench/services/viewlet/browser/viewlet';
@@ -124,525 +124,519 @@ function isSessionContext(obj: any): obj is CallStackContext {
 	return obj && typeof obj.sessionId === 'string';
 }
 
-export function registerCommands(): void {
 
-	// These commands are used in call stack context menu, call stack inline actions, command palette, debug toolbar, mac native touch bar
-	// When the command is exectued in the context of a thread(context menu on a thread, inline call stack action) we pass the thread id
-	// Otherwise when it is executed "globaly"(using the touch bar, debug toolbar, command palette) we do not pass any id and just take whatever is the focussed thread
-	// Same for stackFrame commands and session commands.
-	CommandsRegistry.registerCommand({
-		id: COPY_STACK_TRACE_ID,
-		handler: async (accessor: ServicesAccessor, _: string, context: CallStackContext | unknown) => {
-			const textResourcePropertiesService = accessor.get(ITextResourcePropertiesService);
-			const clipboardService = accessor.get(IClipboardService);
-			let frame = getFrame(accessor.get(IDebugService), context);
-			if (frame) {
-				const eol = textResourcePropertiesService.getEOL(frame.source.uri);
-				await clipboardService.writeText(frame.thread.getCallStack().map(sf => sf.toString()).join(eol));
+// These commands are used in call stack context menu, call stack inline actions, command palette, debug toolbar, mac native touch bar
+// When the command is exectued in the context of a thread(context menu on a thread, inline call stack action) we pass the thread id
+// Otherwise when it is executed "globaly"(using the touch bar, debug toolbar, command palette) we do not pass any id and just take whatever is the focussed thread
+// Same for stackFrame commands and session commands.
+CommandsRegistry.registerCommand({
+	id: COPY_STACK_TRACE_ID,
+	handler: async (accessor: ServicesAccessor, _: string, context: CallStackContext | unknown) => {
+		const textResourcePropertiesService = accessor.get(ITextResourcePropertiesService);
+		const clipboardService = accessor.get(IClipboardService);
+		let frame = getFrame(accessor.get(IDebugService), context);
+		if (frame) {
+			const eol = textResourcePropertiesService.getEOL(frame.source.uri);
+			await clipboardService.writeText(frame.thread.getCallStack().map(sf => sf.toString()).join(eol));
+		}
+	}
+});
+
+CommandsRegistry.registerCommand({
+	id: REVERSE_CONTINUE_ID,
+	handler: (accessor: ServicesAccessor, _: string, context: CallStackContext | unknown) => {
+		getThreadAndRun(accessor, context, thread => thread.reverseContinue());
+	}
+});
+
+CommandsRegistry.registerCommand({
+	id: STEP_BACK_ID,
+	handler: (accessor: ServicesAccessor, _: string, context: CallStackContext | unknown) => {
+		getThreadAndRun(accessor, context, thread => thread.stepBack());
+	}
+});
+
+CommandsRegistry.registerCommand({
+	id: TERMINATE_THREAD_ID,
+	handler: (accessor: ServicesAccessor, _: string, context: CallStackContext | unknown) => {
+		getThreadAndRun(accessor, context, thread => thread.terminate());
+	}
+});
+
+CommandsRegistry.registerCommand({
+	id: JUMP_TO_CURSOR_ID,
+	handler: async (accessor: ServicesAccessor) => {
+		const debugService = accessor.get(IDebugService);
+		const stackFrame = debugService.getViewModel().focusedStackFrame;
+		const editorService = accessor.get(IEditorService);
+		const activeEditorControl = editorService.activeTextEditorControl;
+		const notificationService = accessor.get(INotificationService);
+		const quickInputService = accessor.get(IQuickInputService);
+
+		if (stackFrame && isCodeEditor(activeEditorControl) && activeEditorControl.hasModel()) {
+			const position = activeEditorControl.getPosition();
+			const resource = activeEditorControl.getModel().uri;
+			const source = stackFrame.thread.session.getSourceForUri(resource);
+			if (source) {
+				const response = await stackFrame.thread.session.gotoTargets(source.raw, position.lineNumber, position.column);
+				const targets = response?.body.targets;
+				if (targets && targets.length) {
+					let id = targets[0].id;
+					if (targets.length > 1) {
+						const picks = targets.map(t => ({ label: t.label, _id: t.id }));
+						const pick = await quickInputService.pick(picks, { placeHolder: nls.localize('chooseLocation', "Choose the specific location") });
+						if (!pick) {
+							return;
+						}
+
+						id = pick._id;
+					}
+
+					return await stackFrame.thread.session.goto(stackFrame.thread.threadId, id).catch(e => notificationService.warn(e));
+				}
 			}
 		}
-	});
 
-	CommandsRegistry.registerCommand({
-		id: REVERSE_CONTINUE_ID,
-		handler: (accessor: ServicesAccessor, _: string, context: CallStackContext | unknown) => {
-			getThreadAndRun(accessor, context, thread => thread.reverseContinue());
-		}
-	});
+		return notificationService.warn(nls.localize('noExecutableCode', "No executable code is associated at the current cursor position."));
+	}
+});
 
-	CommandsRegistry.registerCommand({
-		id: STEP_BACK_ID,
-		handler: (accessor: ServicesAccessor, _: string, context: CallStackContext | unknown) => {
-			getThreadAndRun(accessor, context, thread => thread.stepBack());
-		}
-	});
-
-	CommandsRegistry.registerCommand({
-		id: TERMINATE_THREAD_ID,
-		handler: (accessor: ServicesAccessor, _: string, context: CallStackContext | unknown) => {
-			getThreadAndRun(accessor, context, thread => thread.terminate());
-		}
-	});
-
-	CommandsRegistry.registerCommand({
+MenuRegistry.appendMenuItem(MenuId.EditorContext, {
+	command: {
 		id: JUMP_TO_CURSOR_ID,
-		handler: async (accessor: ServicesAccessor) => {
-			const debugService = accessor.get(IDebugService);
-			const stackFrame = debugService.getViewModel().focusedStackFrame;
-			const editorService = accessor.get(IEditorService);
-			const activeEditorControl = editorService.activeTextEditorControl;
-			const notificationService = accessor.get(INotificationService);
-			const quickInputService = accessor.get(IQuickInputService);
+		title: nls.localize('jumpToCursor', "Jump to Cursor"),
+		category: { value: nls.localize('debug', "Debug"), original: 'Debug' }
+	},
+	when: ContextKeyExpr.and(CONTEXT_JUMP_TO_CURSOR_SUPPORTED, EditorContextKeys.editorTextFocus),
+	group: 'debug',
+	order: 3
+});
 
-			if (stackFrame && isCodeEditor(activeEditorControl) && activeEditorControl.hasModel()) {
-				const position = activeEditorControl.getPosition();
-				const resource = activeEditorControl.getModel().uri;
-				const source = stackFrame.thread.session.getSourceForUri(resource);
-				if (source) {
-					const response = await stackFrame.thread.session.gotoTargets(source.raw, position.lineNumber, position.column);
-					const targets = response?.body.targets;
-					if (targets && targets.length) {
-						let id = targets[0].id;
-						if (targets.length > 1) {
-							const picks = targets.map(t => ({ label: t.label, _id: t.id }));
-							const pick = await quickInputService.pick(picks, { placeHolder: nls.localize('chooseLocation', "Choose the specific location") });
-							if (!pick) {
-								return;
-							}
-
-							id = pick._id;
-						}
-
-						return await stackFrame.thread.session.goto(stackFrame.thread.threadId, id).catch(e => notificationService.warn(e));
-					}
-				}
-			}
-
-			return notificationService.warn(nls.localize('noExecutableCode', "No executable code is associated at the current cursor position."));
+KeybindingsRegistry.registerCommandAndKeybindingRule({
+	id: RESTART_SESSION_ID,
+	weight: KeybindingWeight.WorkbenchContrib,
+	primary: KeyMod.Shift | KeyMod.CtrlCmd | KeyCode.F5,
+	when: CONTEXT_IN_DEBUG_MODE,
+	handler: async (accessor: ServicesAccessor, _: string, context: CallStackContext | unknown) => {
+		const debugService = accessor.get(IDebugService);
+		let session: IDebugSession | undefined;
+		if (isSessionContext(context)) {
+			session = debugService.getModel().getSession(context.sessionId);
+		} else {
+			session = debugService.getViewModel().focusedSession;
 		}
-	});
 
-	MenuRegistry.appendMenuItem(MenuId.EditorContext, {
-		command: {
-			id: JUMP_TO_CURSOR_ID,
-			title: nls.localize('jumpToCursor', "Jump to Cursor"),
-			category: { value: nls.localize('debug', "Debug"), original: 'Debug' }
-		},
-		when: ContextKeyExpr.and(CONTEXT_JUMP_TO_CURSOR_SUPPORTED, EditorContextKeys.editorTextFocus),
-		group: 'debug',
-		order: 3
-	});
+		if (!session) {
+			const { launch, name } = debugService.getConfigurationManager().selectedConfiguration;
+			await debugService.startDebugging(launch, name, { noDebug: false });
+		} else {
+			session.removeReplExpressions();
+			await debugService.restartSession(session);
+		}
+	}
+});
 
-	KeybindingsRegistry.registerCommandAndKeybindingRule({
-		id: RESTART_SESSION_ID,
-		weight: KeybindingWeight.WorkbenchContrib,
-		primary: KeyMod.Shift | KeyMod.CtrlCmd | KeyCode.F5,
-		when: CONTEXT_IN_DEBUG_MODE,
-		handler: async (accessor: ServicesAccessor, _: string, context: CallStackContext | unknown) => {
-			const debugService = accessor.get(IDebugService);
-			let session: IDebugSession | undefined;
-			if (isSessionContext(context)) {
-				session = debugService.getModel().getSession(context.sessionId);
-			} else {
-				session = debugService.getViewModel().focusedSession;
-			}
+KeybindingsRegistry.registerCommandAndKeybindingRule({
+	id: STEP_OVER_ID,
+	weight: KeybindingWeight.WorkbenchContrib,
+	primary: KeyCode.F10,
+	when: CONTEXT_DEBUG_STATE.isEqualTo('stopped'),
+	handler: (accessor: ServicesAccessor, _: string, context: CallStackContext | unknown) => {
+		getThreadAndRun(accessor, context, (thread: IThread) => thread.next());
+	}
+});
 
-			if (!session) {
-				const { launch, name } = debugService.getConfigurationManager().selectedConfiguration;
-				await debugService.startDebugging(launch, name, { noDebug: false });
-			} else {
-				session.removeReplExpressions();
-				await debugService.restartSession(session);
+KeybindingsRegistry.registerCommandAndKeybindingRule({
+	id: STEP_INTO_ID,
+	weight: KeybindingWeight.WorkbenchContrib + 10, // Have a stronger weight to have priority over full screen when debugging
+	primary: KeyCode.F11,
+	// Use a more flexible when clause to not allow full screen command to take over when F11 pressed a lot of times
+	when: CONTEXT_DEBUG_STATE.notEqualsTo('inactive'),
+	handler: (accessor: ServicesAccessor, _: string, context: CallStackContext | unknown) => {
+		getThreadAndRun(accessor, context, (thread: IThread) => thread.stepIn());
+	}
+});
+
+KeybindingsRegistry.registerCommandAndKeybindingRule({
+	id: STEP_OUT_ID,
+	weight: KeybindingWeight.WorkbenchContrib,
+	primary: KeyMod.Shift | KeyCode.F11,
+	when: CONTEXT_DEBUG_STATE.isEqualTo('stopped'),
+	handler: (accessor: ServicesAccessor, _: string, context: CallStackContext | unknown) => {
+		getThreadAndRun(accessor, context, (thread: IThread) => thread.stepOut());
+	}
+});
+
+KeybindingsRegistry.registerCommandAndKeybindingRule({
+	id: PAUSE_ID,
+	weight: KeybindingWeight.WorkbenchContrib + 2, // take priority over focus next part while we are debugging
+	primary: KeyCode.F6,
+	when: CONTEXT_DEBUG_STATE.isEqualTo('running'),
+	handler: (accessor: ServicesAccessor, _: string, context: CallStackContext | unknown) => {
+		getThreadAndRun(accessor, context, thread => thread.pause());
+	}
+});
+
+async function stopHandler(accessor: ServicesAccessor, _: string, context: CallStackContext | unknown): Promise<void> {
+	const debugService = accessor.get(IDebugService);
+	let session: IDebugSession | undefined;
+	if (isSessionContext(context)) {
+		session = debugService.getModel().getSession(context.sessionId);
+	} else {
+		session = debugService.getViewModel().focusedSession;
+	}
+
+	const configurationService = accessor.get(IConfigurationService);
+	const showSubSessions = configurationService.getValue<IDebugConfiguration>('debug').showSubSessionsInToolBar;
+	// Stop should be sent to the root parent session
+	while (!showSubSessions && session && session.parentSession) {
+		session = session.parentSession;
+	}
+
+	await debugService.stopSession(session);
+}
+
+KeybindingsRegistry.registerCommandAndKeybindingRule({
+	id: DISCONNECT_ID,
+	weight: KeybindingWeight.WorkbenchContrib,
+	primary: KeyMod.Shift | KeyCode.F5,
+	when: ContextKeyExpr.and(CONTEXT_FOCUSED_SESSION_IS_ATTACH, CONTEXT_IN_DEBUG_MODE),
+	handler: stopHandler
+});
+
+KeybindingsRegistry.registerCommandAndKeybindingRule({
+	id: STOP_ID,
+	weight: KeybindingWeight.WorkbenchContrib,
+	primary: KeyMod.Shift | KeyCode.F5,
+	when: ContextKeyExpr.and(CONTEXT_FOCUSED_SESSION_IS_ATTACH.toNegated(), CONTEXT_IN_DEBUG_MODE),
+	handler: stopHandler
+});
+
+CommandsRegistry.registerCommand({
+	id: RESTART_FRAME_ID,
+	handler: async (accessor: ServicesAccessor, _: string, context: CallStackContext | unknown) => {
+		const debugService = accessor.get(IDebugService);
+		const notificationService = accessor.get(INotificationService);
+		let frame = getFrame(debugService, context);
+		if (frame) {
+			try {
+				await frame.restart();
+			} catch (e) {
+				notificationService.error(e);
 			}
 		}
-	});
+	}
+});
 
-	KeybindingsRegistry.registerCommandAndKeybindingRule({
-		id: STEP_OVER_ID,
-		weight: KeybindingWeight.WorkbenchContrib,
-		primary: KeyCode.F10,
-		when: CONTEXT_DEBUG_STATE.isEqualTo('stopped'),
-		handler: (accessor: ServicesAccessor, _: string, context: CallStackContext | unknown) => {
-			getThreadAndRun(accessor, context, (thread: IThread) => thread.next());
+KeybindingsRegistry.registerCommandAndKeybindingRule({
+	id: CONTINUE_ID,
+	weight: KeybindingWeight.WorkbenchContrib + 10, // Use a stronger weight to get priority over start debugging F5 shortcut
+	primary: KeyCode.F5,
+	when: CONTEXT_IN_DEBUG_MODE,
+	handler: (accessor: ServicesAccessor, _: string, context: CallStackContext | unknown) => {
+		getThreadAndRun(accessor, context, thread => thread.continue());
+	}
+});
+
+CommandsRegistry.registerCommand({
+	id: FOCUS_REPL_ID,
+	handler: async (accessor) => {
+		const viewsService = accessor.get(IViewsService);
+		await viewsService.openView(REPL_VIEW_ID, true);
+	}
+});
+
+CommandsRegistry.registerCommand({
+	id: 'debug.startFromConfig',
+	handler: async (accessor, config: IConfig) => {
+		const debugService = accessor.get(IDebugService);
+		await debugService.startDebugging(undefined, config);
+	}
+});
+
+CommandsRegistry.registerCommand({
+	id: FOCUS_SESSION_ID,
+	handler: async (accessor: ServicesAccessor, session: IDebugSession) => {
+		const debugService = accessor.get(IDebugService);
+		const editorService = accessor.get(IEditorService);
+		const stoppedChildSession = debugService.getModel().getSessions().find(s => s.parentSession === session && s.state === State.Stopped);
+		if (stoppedChildSession && session.state !== State.Stopped) {
+			session = stoppedChildSession;
 		}
-	});
-
-	KeybindingsRegistry.registerCommandAndKeybindingRule({
-		id: STEP_INTO_ID,
-		weight: KeybindingWeight.WorkbenchContrib + 10, // Have a stronger weight to have priority over full screen when debugging
-		primary: KeyCode.F11,
-		// Use a more flexible when clause to not allow full screen command to take over when F11 pressed a lot of times
-		when: CONTEXT_DEBUG_STATE.notEqualsTo('inactive'),
-		handler: (accessor: ServicesAccessor, _: string, context: CallStackContext | unknown) => {
-			getThreadAndRun(accessor, context, (thread: IThread) => thread.stepIn());
+		await debugService.focusStackFrame(undefined, undefined, session, true);
+		const stackFrame = debugService.getViewModel().focusedStackFrame;
+		if (stackFrame) {
+			await stackFrame.openInEditor(editorService, true);
 		}
-	});
+	}
+});
 
-	KeybindingsRegistry.registerCommandAndKeybindingRule({
-		id: STEP_OUT_ID,
-		weight: KeybindingWeight.WorkbenchContrib,
-		primary: KeyMod.Shift | KeyCode.F11,
-		when: CONTEXT_DEBUG_STATE.isEqualTo('stopped'),
-		handler: (accessor: ServicesAccessor, _: string, context: CallStackContext | unknown) => {
-			getThreadAndRun(accessor, context, (thread: IThread) => thread.stepOut());
-		}
-	});
+CommandsRegistry.registerCommand({
+	id: SELECT_AND_START_ID,
+	handler: async (accessor: ServicesAccessor) => {
+		const quickInputService = accessor.get(IQuickInputService);
+		quickInputService.quickAccess.show('debug ');
+	}
+});
 
-	KeybindingsRegistry.registerCommandAndKeybindingRule({
-		id: PAUSE_ID,
-		weight: KeybindingWeight.WorkbenchContrib + 2, // take priority over focus next part while we are debugging
-		primary: KeyCode.F6,
-		when: CONTEXT_DEBUG_STATE.isEqualTo('running'),
-		handler: (accessor: ServicesAccessor, _: string, context: CallStackContext | unknown) => {
-			getThreadAndRun(accessor, context, thread => thread.pause());
-		}
-	});
+KeybindingsRegistry.registerCommandAndKeybindingRule({
+	id: DEBUG_START_COMMAND_ID,
+	weight: KeybindingWeight.WorkbenchContrib,
+	primary: KeyCode.F5,
+	when: ContextKeyExpr.and(CONTEXT_DEBUGGERS_AVAILABLE, CONTEXT_DEBUG_STATE.notEqualsTo(getStateLabel(State.Initializing))),
+	handler: async (accessor: ServicesAccessor, debugStartOptions?: { noDebug: boolean }) => {
+		const debugService = accessor.get(IDebugService);
+		let { launch, name, getConfig } = debugService.getConfigurationManager().selectedConfiguration;
+		const config = await getConfig();
+		const clonedConfig = deepClone(config);
+		await debugService.startDebugging(launch, clonedConfig || name, { noDebug: debugStartOptions && debugStartOptions.noDebug });
+	}
+});
 
-	CommandsRegistry.registerCommand({
-		id: DISCONNECT_ID,
-		handler: async (accessor: ServicesAccessor, _: string, context: CallStackContext | unknown) => {
-			const debugService = accessor.get(IDebugService);
-			let session: IDebugSession | undefined;
-			if (isSessionContext(context)) {
-				session = debugService.getModel().getSession(context.sessionId);
-			} else {
-				session = debugService.getViewModel().focusedSession;
-			}
-			await debugService.stopSession(session);
-		}
-	});
+KeybindingsRegistry.registerCommandAndKeybindingRule({
+	id: DEBUG_RUN_COMMAND_ID,
+	weight: KeybindingWeight.WorkbenchContrib,
+	primary: KeyMod.CtrlCmd | KeyCode.F5,
+	mac: { primary: KeyMod.WinCtrl | KeyCode.F5 },
+	when: ContextKeyExpr.and(CONTEXT_DEBUGGERS_AVAILABLE, CONTEXT_DEBUG_STATE.notEqualsTo(getStateLabel(State.Initializing))),
+	handler: async (accessor: ServicesAccessor) => {
+		const commandService = accessor.get(ICommandService);
+		await commandService.executeCommand(DEBUG_START_COMMAND_ID, { noDebug: true });
+	}
+});
 
-	KeybindingsRegistry.registerCommandAndKeybindingRule({
-		id: STOP_ID,
-		weight: KeybindingWeight.WorkbenchContrib,
-		primary: KeyMod.Shift | KeyCode.F5,
-		when: CONTEXT_IN_DEBUG_MODE,
-		handler: async (accessor: ServicesAccessor, _: string, context: CallStackContext | unknown) => {
-			const debugService = accessor.get(IDebugService);
-			let session: IDebugSession | undefined;
-			if (isSessionContext(context)) {
-				session = debugService.getModel().getSession(context.sessionId);
-			} else {
-				session = debugService.getViewModel().focusedSession;
-			}
-
-			const configurationService = accessor.get(IConfigurationService);
-			const showSubSessions = configurationService.getValue<IDebugConfiguration>('debug').showSubSessionsInToolBar;
-			// Stop should be sent to the root parent session
-			while (!showSubSessions && session && session.parentSession) {
-				session = session.parentSession;
-			}
-
-			await debugService.stopSession(session);
-		}
-	});
-
-	CommandsRegistry.registerCommand({
-		id: RESTART_FRAME_ID,
-		handler: async (accessor: ServicesAccessor, _: string, context: CallStackContext | unknown) => {
-			const debugService = accessor.get(IDebugService);
-			const notificationService = accessor.get(INotificationService);
-			let frame = getFrame(debugService, context);
-			if (frame) {
-				try {
-					await frame.restart();
-				} catch (e) {
-					notificationService.error(e);
-				}
+KeybindingsRegistry.registerCommandAndKeybindingRule({
+	id: 'debug.toggleBreakpoint',
+	weight: KeybindingWeight.WorkbenchContrib + 5,
+	when: ContextKeyExpr.and(CONTEXT_BREAKPOINTS_FOCUSED, InputFocusedContext.toNegated()),
+	primary: KeyCode.Space,
+	handler: (accessor) => {
+		const listService = accessor.get(IListService);
+		const debugService = accessor.get(IDebugService);
+		const list = listService.lastFocusedList;
+		if (list instanceof List) {
+			const focused = <IEnablement[]>list.getFocusedElements();
+			if (focused && focused.length) {
+				debugService.enableOrDisableBreakpoints(!focused[0].enabled, focused[0]);
 			}
 		}
-	});
+	}
+});
 
-	KeybindingsRegistry.registerCommandAndKeybindingRule({
-		id: CONTINUE_ID,
-		weight: KeybindingWeight.WorkbenchContrib + 10, // Use a stronger weight to get priority over start debugging F5 shortcut
-		primary: KeyCode.F5,
-		when: CONTEXT_IN_DEBUG_MODE,
-		handler: (accessor: ServicesAccessor, _: string, context: CallStackContext | unknown) => {
-			getThreadAndRun(accessor, context, thread => thread.continue());
-		}
-	});
-
-	CommandsRegistry.registerCommand({
-		id: FOCUS_REPL_ID,
-		handler: async (accessor) => {
-			const viewsService = accessor.get(IViewsService);
-			await viewsService.openView(REPL_VIEW_ID, true);
-		}
-	});
-
-	CommandsRegistry.registerCommand({
-		id: 'debug.startFromConfig',
-		handler: async (accessor, config: IConfig) => {
-			const debugService = accessor.get(IDebugService);
-			await debugService.startDebugging(undefined, config);
-		}
-	});
-
-	CommandsRegistry.registerCommand({
-		id: FOCUS_SESSION_ID,
-		handler: async (accessor: ServicesAccessor, session: IDebugSession) => {
-			const debugService = accessor.get(IDebugService);
-			const editorService = accessor.get(IEditorService);
-			const stoppedChildSession = debugService.getModel().getSessions().find(s => s.parentSession === session && s.state === State.Stopped);
-			if (stoppedChildSession && session.state !== State.Stopped) {
-				session = stoppedChildSession;
-			}
-			await debugService.focusStackFrame(undefined, undefined, session, true);
-			const stackFrame = debugService.getViewModel().focusedStackFrame;
-			if (stackFrame) {
-				await stackFrame.openInEditor(editorService, true);
-			}
-		}
-	});
-
-	CommandsRegistry.registerCommand({
-		id: SELECT_AND_START_ID,
-		handler: async (accessor: ServicesAccessor) => {
-			const quickInputService = accessor.get(IQuickInputService);
-			quickInputService.quickAccess.show('debug ');
-		}
-	});
-
-	KeybindingsRegistry.registerCommandAndKeybindingRule({
-		id: DEBUG_START_COMMAND_ID,
-		weight: KeybindingWeight.WorkbenchContrib,
-		primary: KeyCode.F5,
-		when: ContextKeyExpr.and(CONTEXT_DEBUGGERS_AVAILABLE, CONTEXT_DEBUG_STATE.notEqualsTo(getStateLabel(State.Initializing))),
-		handler: async (accessor: ServicesAccessor, debugStartOptions?: { noDebug: boolean }) => {
-			const debugService = accessor.get(IDebugService);
-			let { launch, name, getConfig } = debugService.getConfigurationManager().selectedConfiguration;
-			const config = await getConfig();
-			const clonedConfig = deepClone(config);
-			await debugService.startDebugging(launch, clonedConfig || name, { noDebug: debugStartOptions && debugStartOptions.noDebug });
-		}
-	});
-
-	KeybindingsRegistry.registerCommandAndKeybindingRule({
-		id: DEBUG_RUN_COMMAND_ID,
-		weight: KeybindingWeight.WorkbenchContrib,
-		primary: KeyMod.CtrlCmd | KeyCode.F5,
-		mac: { primary: KeyMod.WinCtrl | KeyCode.F5 },
-		when: ContextKeyExpr.and(CONTEXT_DEBUGGERS_AVAILABLE, CONTEXT_DEBUG_STATE.notEqualsTo(getStateLabel(State.Initializing))),
-		handler: async (accessor: ServicesAccessor) => {
-			const commandService = accessor.get(ICommandService);
-			await commandService.executeCommand(DEBUG_START_COMMAND_ID, { noDebug: true });
-		}
-	});
-
-	KeybindingsRegistry.registerCommandAndKeybindingRule({
-		id: 'debug.toggleBreakpoint',
-		weight: KeybindingWeight.WorkbenchContrib + 5,
-		when: ContextKeyExpr.and(CONTEXT_BREAKPOINTS_FOCUSED, InputFocusedContext.toNegated()),
-		primary: KeyCode.Space,
-		handler: (accessor) => {
-			const listService = accessor.get(IListService);
-			const debugService = accessor.get(IDebugService);
-			const list = listService.lastFocusedList;
-			if (list instanceof List) {
-				const focused = <IEnablement[]>list.getFocusedElements();
-				if (focused && focused.length) {
-					debugService.enableOrDisableBreakpoints(!focused[0].enabled, focused[0]);
-				}
-			}
-		}
-	});
-
-	KeybindingsRegistry.registerCommandAndKeybindingRule({
-		id: 'debug.enableOrDisableBreakpoint',
-		weight: KeybindingWeight.WorkbenchContrib,
-		primary: undefined,
-		when: EditorContextKeys.editorTextFocus,
-		handler: (accessor) => {
-			const debugService = accessor.get(IDebugService);
-			const editorService = accessor.get(IEditorService);
-			const control = editorService.activeTextEditorControl;
-			if (isCodeEditor(control)) {
-				const model = control.getModel();
-				if (model) {
-					const position = control.getPosition();
-					if (position) {
-						const bps = debugService.getModel().getBreakpoints({ uri: model.uri, lineNumber: position.lineNumber });
-						if (bps.length) {
-							debugService.enableOrDisableBreakpoints(!bps[0].enabled, bps[0]);
-						}
-					}
-				}
-			}
-		}
-	});
-
-	KeybindingsRegistry.registerCommandAndKeybindingRule({
-		id: EDIT_EXPRESSION_COMMAND_ID,
-		weight: KeybindingWeight.WorkbenchContrib + 5,
-		when: CONTEXT_WATCH_EXPRESSIONS_FOCUSED,
-		primary: KeyCode.F2,
-		mac: { primary: KeyCode.Enter },
-		handler: (accessor: ServicesAccessor, expression: Expression | unknown) => {
-			const debugService = accessor.get(IDebugService);
-			if (!(expression instanceof Expression)) {
-				const listService = accessor.get(IListService);
-				const focused = listService.lastFocusedList;
-				if (focused) {
-					const elements = focused.getFocus();
-					if (Array.isArray(elements) && elements[0] instanceof Expression) {
-						expression = elements[0];
-					}
-				}
-			}
-
-			if (expression instanceof Expression) {
-				debugService.getViewModel().setSelectedExpression(expression);
-			}
-		}
-	});
-
-	KeybindingsRegistry.registerCommandAndKeybindingRule({
-		id: 'debug.setVariable',
-		weight: KeybindingWeight.WorkbenchContrib + 5,
-		when: CONTEXT_VARIABLES_FOCUSED,
-		primary: KeyCode.F2,
-		mac: { primary: KeyCode.Enter },
-		handler: (accessor) => {
-			const listService = accessor.get(IListService);
-			const debugService = accessor.get(IDebugService);
-			const focused = listService.lastFocusedList;
-
-			if (focused) {
-				const elements = focused.getFocus();
-				if (Array.isArray(elements) && elements[0] instanceof Variable) {
-					debugService.getViewModel().setSelectedExpression(elements[0]);
-				}
-			}
-		}
-	});
-
-	KeybindingsRegistry.registerCommandAndKeybindingRule({
-		id: REMOVE_EXPRESSION_COMMAND_ID,
-		weight: KeybindingWeight.WorkbenchContrib,
-		when: ContextKeyExpr.and(CONTEXT_WATCH_EXPRESSIONS_FOCUSED, CONTEXT_EXPRESSION_SELECTED.toNegated()),
-		primary: KeyCode.Delete,
-		mac: { primary: KeyMod.CtrlCmd | KeyCode.Backspace },
-		handler: (accessor: ServicesAccessor, expression: Expression | unknown) => {
-			const debugService = accessor.get(IDebugService);
-
-			if (expression instanceof Expression) {
-				debugService.removeWatchExpressions(expression.getId());
-				return;
-			}
-
-			const listService = accessor.get(IListService);
-			const focused = listService.lastFocusedList;
-			if (focused) {
-				let elements = focused.getFocus();
-				if (Array.isArray(elements) && elements[0] instanceof Expression) {
-					const selection = focused.getSelection();
-					if (selection && selection.indexOf(elements[0]) >= 0) {
-						elements = selection;
-					}
-					elements.forEach((e: Expression) => debugService.removeWatchExpressions(e.getId()));
-				}
-			}
-		}
-	});
-
-	KeybindingsRegistry.registerCommandAndKeybindingRule({
-		id: 'debug.removeBreakpoint',
-		weight: KeybindingWeight.WorkbenchContrib,
-		when: ContextKeyExpr.and(CONTEXT_BREAKPOINTS_FOCUSED, CONTEXT_BREAKPOINT_INPUT_FOCUSED.toNegated()),
-		primary: KeyCode.Delete,
-		mac: { primary: KeyMod.CtrlCmd | KeyCode.Backspace },
-		handler: (accessor) => {
-			const listService = accessor.get(IListService);
-			const debugService = accessor.get(IDebugService);
-			const list = listService.lastFocusedList;
-
-			if (list instanceof List) {
-				const focused = list.getFocusedElements();
-				const element = focused.length ? focused[0] : undefined;
-				if (element instanceof Breakpoint) {
-					debugService.removeBreakpoints(element.getId());
-				} else if (element instanceof FunctionBreakpoint) {
-					debugService.removeFunctionBreakpoints(element.getId());
-				} else if (element instanceof DataBreakpoint) {
-					debugService.removeDataBreakpoints(element.getId());
-				}
-			}
-		}
-	});
-
-	KeybindingsRegistry.registerCommandAndKeybindingRule({
-		id: 'debug.installAdditionalDebuggers',
-		weight: KeybindingWeight.WorkbenchContrib,
-		when: undefined,
-		primary: undefined,
-		handler: async (accessor) => {
-			const viewletService = accessor.get(IViewletService);
-			const viewlet = (await viewletService.openViewlet(EXTENSIONS_VIEWLET_ID, true))?.getViewPaneContainer() as IExtensionsViewPaneContainer;
-			viewlet.search('tag:debuggers @sort:installs');
-			viewlet.focus();
-		}
-	});
-
-	KeybindingsRegistry.registerCommandAndKeybindingRule({
-		id: ADD_CONFIGURATION_ID,
-		weight: KeybindingWeight.WorkbenchContrib,
-		when: undefined,
-		primary: undefined,
-		handler: async (accessor, launchUri: string) => {
-			const manager = accessor.get(IDebugService).getConfigurationManager();
-			if (accessor.get(IWorkspaceContextService).getWorkbenchState() === WorkbenchState.EMPTY) {
-				accessor.get(INotificationService).info(nls.localize('noFolderDebugConfig', "Please first open a folder in order to do advanced debug configuration."));
-				return;
-			}
-
-			const launch = manager.getLaunches().find(l => l.uri.toString() === launchUri) || manager.selectedConfiguration.launch;
-			if (launch) {
-				const { editor, created } = await launch.openConfigFile(false);
-				if (editor && !created) {
-					const codeEditor = <ICodeEditor>editor.getControl();
-					if (codeEditor) {
-						await codeEditor.getContribution<IDebugEditorContribution>(EDITOR_CONTRIBUTION_ID).addLaunchConfiguration();
-					}
-				}
-			}
-		}
-	});
-
-	const inlineBreakpointHandler = (accessor: ServicesAccessor) => {
+KeybindingsRegistry.registerCommandAndKeybindingRule({
+	id: 'debug.enableOrDisableBreakpoint',
+	weight: KeybindingWeight.WorkbenchContrib,
+	primary: undefined,
+	when: EditorContextKeys.editorTextFocus,
+	handler: (accessor) => {
 		const debugService = accessor.get(IDebugService);
 		const editorService = accessor.get(IEditorService);
 		const control = editorService.activeTextEditorControl;
 		if (isCodeEditor(control)) {
-			const position = control.getPosition();
-			if (position && control.hasModel() && debugService.canSetBreakpointsIn(control.getModel())) {
-				const modelUri = control.getModel().uri;
-				const breakpointAlreadySet = debugService.getModel().getBreakpoints({ lineNumber: position.lineNumber, uri: modelUri })
-					.some(bp => (bp.sessionAgnosticData.column === position.column || (!bp.column && position.column <= 1)));
-
-				if (!breakpointAlreadySet) {
-					debugService.addBreakpoints(modelUri, [{ lineNumber: position.lineNumber, column: position.column > 1 ? position.column : undefined }]);
+			const model = control.getModel();
+			if (model) {
+				const position = control.getPosition();
+				if (position) {
+					const bps = debugService.getModel().getBreakpoints({ uri: model.uri, lineNumber: position.lineNumber });
+					if (bps.length) {
+						debugService.enableOrDisableBreakpoints(!bps[0].enabled, bps[0]);
+					}
 				}
 			}
 		}
-	};
+	}
+});
 
-	KeybindingsRegistry.registerCommandAndKeybindingRule({
-		weight: KeybindingWeight.WorkbenchContrib,
-		primary: KeyMod.Shift | KeyCode.F9,
-		when: EditorContextKeys.editorTextFocus,
-		id: TOGGLE_INLINE_BREAKPOINT_ID,
-		handler: inlineBreakpointHandler
-	});
-
-	MenuRegistry.appendMenuItem(MenuId.EditorContext, {
-		command: {
-			id: TOGGLE_INLINE_BREAKPOINT_ID,
-			title: nls.localize('addInlineBreakpoint', "Add Inline Breakpoint"),
-			category: { value: nls.localize('debug', "Debug"), original: 'Debug' }
-		},
-		when: ContextKeyExpr.and(CONTEXT_IN_DEBUG_MODE, PanelFocusContext.toNegated(), EditorContextKeys.editorTextFocus),
-		group: 'debug',
-		order: 1
-	});
-
-	KeybindingsRegistry.registerCommandAndKeybindingRule({
-		id: 'debug.openBreakpointToSide',
-		weight: KeybindingWeight.WorkbenchContrib,
-		when: CONTEXT_BREAKPOINTS_FOCUSED,
-		primary: KeyMod.CtrlCmd | KeyCode.Enter,
-		secondary: [KeyMod.Alt | KeyCode.Enter],
-		handler: (accessor) => {
+KeybindingsRegistry.registerCommandAndKeybindingRule({
+	id: EDIT_EXPRESSION_COMMAND_ID,
+	weight: KeybindingWeight.WorkbenchContrib + 5,
+	when: CONTEXT_WATCH_EXPRESSIONS_FOCUSED,
+	primary: KeyCode.F2,
+	mac: { primary: KeyCode.Enter },
+	handler: (accessor: ServicesAccessor, expression: Expression | unknown) => {
+		const debugService = accessor.get(IDebugService);
+		if (!(expression instanceof Expression)) {
 			const listService = accessor.get(IListService);
-			const list = listService.lastFocusedList;
-			if (list instanceof List) {
-				const focus = list.getFocusedElements();
-				if (focus.length && focus[0] instanceof Breakpoint) {
-					return openBreakpointSource(focus[0], true, false, true, accessor.get(IDebugService), accessor.get(IEditorService));
+			const focused = listService.lastFocusedList;
+			if (focused) {
+				const elements = focused.getFocus();
+				if (Array.isArray(elements) && elements[0] instanceof Expression) {
+					expression = elements[0];
 				}
 			}
-
-			return undefined;
 		}
-	});
-}
+
+		if (expression instanceof Expression) {
+			debugService.getViewModel().setSelectedExpression(expression);
+		}
+	}
+});
+
+KeybindingsRegistry.registerCommandAndKeybindingRule({
+	id: 'debug.setVariable',
+	weight: KeybindingWeight.WorkbenchContrib + 5,
+	when: CONTEXT_VARIABLES_FOCUSED,
+	primary: KeyCode.F2,
+	mac: { primary: KeyCode.Enter },
+	handler: (accessor) => {
+		const listService = accessor.get(IListService);
+		const debugService = accessor.get(IDebugService);
+		const focused = listService.lastFocusedList;
+
+		if (focused) {
+			const elements = focused.getFocus();
+			if (Array.isArray(elements) && elements[0] instanceof Variable) {
+				debugService.getViewModel().setSelectedExpression(elements[0]);
+			}
+		}
+	}
+});
+
+KeybindingsRegistry.registerCommandAndKeybindingRule({
+	id: REMOVE_EXPRESSION_COMMAND_ID,
+	weight: KeybindingWeight.WorkbenchContrib,
+	when: ContextKeyExpr.and(CONTEXT_WATCH_EXPRESSIONS_FOCUSED, CONTEXT_EXPRESSION_SELECTED.toNegated()),
+	primary: KeyCode.Delete,
+	mac: { primary: KeyMod.CtrlCmd | KeyCode.Backspace },
+	handler: (accessor: ServicesAccessor, expression: Expression | unknown) => {
+		const debugService = accessor.get(IDebugService);
+
+		if (expression instanceof Expression) {
+			debugService.removeWatchExpressions(expression.getId());
+			return;
+		}
+
+		const listService = accessor.get(IListService);
+		const focused = listService.lastFocusedList;
+		if (focused) {
+			let elements = focused.getFocus();
+			if (Array.isArray(elements) && elements[0] instanceof Expression) {
+				const selection = focused.getSelection();
+				if (selection && selection.indexOf(elements[0]) >= 0) {
+					elements = selection;
+				}
+				elements.forEach((e: Expression) => debugService.removeWatchExpressions(e.getId()));
+			}
+		}
+	}
+});
+
+KeybindingsRegistry.registerCommandAndKeybindingRule({
+	id: 'debug.removeBreakpoint',
+	weight: KeybindingWeight.WorkbenchContrib,
+	when: ContextKeyExpr.and(CONTEXT_BREAKPOINTS_FOCUSED, CONTEXT_BREAKPOINT_INPUT_FOCUSED.toNegated()),
+	primary: KeyCode.Delete,
+	mac: { primary: KeyMod.CtrlCmd | KeyCode.Backspace },
+	handler: (accessor) => {
+		const listService = accessor.get(IListService);
+		const debugService = accessor.get(IDebugService);
+		const list = listService.lastFocusedList;
+
+		if (list instanceof List) {
+			const focused = list.getFocusedElements();
+			const element = focused.length ? focused[0] : undefined;
+			if (element instanceof Breakpoint) {
+				debugService.removeBreakpoints(element.getId());
+			} else if (element instanceof FunctionBreakpoint) {
+				debugService.removeFunctionBreakpoints(element.getId());
+			} else if (element instanceof DataBreakpoint) {
+				debugService.removeDataBreakpoints(element.getId());
+			}
+		}
+	}
+});
+
+KeybindingsRegistry.registerCommandAndKeybindingRule({
+	id: 'debug.installAdditionalDebuggers',
+	weight: KeybindingWeight.WorkbenchContrib,
+	when: undefined,
+	primary: undefined,
+	handler: async (accessor) => {
+		const viewletService = accessor.get(IViewletService);
+		const viewlet = (await viewletService.openViewlet(EXTENSIONS_VIEWLET_ID, true))?.getViewPaneContainer() as IExtensionsViewPaneContainer;
+		viewlet.search('tag:debuggers @sort:installs');
+		viewlet.focus();
+	}
+});
+
+KeybindingsRegistry.registerCommandAndKeybindingRule({
+	id: ADD_CONFIGURATION_ID,
+	weight: KeybindingWeight.WorkbenchContrib,
+	when: undefined,
+	primary: undefined,
+	handler: async (accessor, launchUri: string) => {
+		const manager = accessor.get(IDebugService).getConfigurationManager();
+		if (accessor.get(IWorkspaceContextService).getWorkbenchState() === WorkbenchState.EMPTY) {
+			accessor.get(INotificationService).info(nls.localize('noFolderDebugConfig', "Please first open a folder in order to do advanced debug configuration."));
+			return;
+		}
+
+		const launch = manager.getLaunches().find(l => l.uri.toString() === launchUri) || manager.selectedConfiguration.launch;
+		if (launch) {
+			const { editor, created } = await launch.openConfigFile(false);
+			if (editor && !created) {
+				const codeEditor = <ICodeEditor>editor.getControl();
+				if (codeEditor) {
+					await codeEditor.getContribution<IDebugEditorContribution>(EDITOR_CONTRIBUTION_ID).addLaunchConfiguration();
+				}
+			}
+		}
+	}
+});
+
+const inlineBreakpointHandler = (accessor: ServicesAccessor) => {
+	const debugService = accessor.get(IDebugService);
+	const editorService = accessor.get(IEditorService);
+	const control = editorService.activeTextEditorControl;
+	if (isCodeEditor(control)) {
+		const position = control.getPosition();
+		if (position && control.hasModel() && debugService.canSetBreakpointsIn(control.getModel())) {
+			const modelUri = control.getModel().uri;
+			const breakpointAlreadySet = debugService.getModel().getBreakpoints({ lineNumber: position.lineNumber, uri: modelUri })
+				.some(bp => (bp.sessionAgnosticData.column === position.column || (!bp.column && position.column <= 1)));
+
+			if (!breakpointAlreadySet) {
+				debugService.addBreakpoints(modelUri, [{ lineNumber: position.lineNumber, column: position.column > 1 ? position.column : undefined }]);
+			}
+		}
+	}
+};
+
+KeybindingsRegistry.registerCommandAndKeybindingRule({
+	weight: KeybindingWeight.WorkbenchContrib,
+	primary: KeyMod.Shift | KeyCode.F9,
+	when: EditorContextKeys.editorTextFocus,
+	id: TOGGLE_INLINE_BREAKPOINT_ID,
+	handler: inlineBreakpointHandler
+});
+
+MenuRegistry.appendMenuItem(MenuId.EditorContext, {
+	command: {
+		id: TOGGLE_INLINE_BREAKPOINT_ID,
+		title: nls.localize('addInlineBreakpoint', "Add Inline Breakpoint"),
+		category: { value: nls.localize('debug', "Debug"), original: 'Debug' }
+	},
+	when: ContextKeyExpr.and(CONTEXT_IN_DEBUG_MODE, PanelFocusContext.toNegated(), EditorContextKeys.editorTextFocus),
+	group: 'debug',
+	order: 1
+});
+
+KeybindingsRegistry.registerCommandAndKeybindingRule({
+	id: 'debug.openBreakpointToSide',
+	weight: KeybindingWeight.WorkbenchContrib,
+	when: CONTEXT_BREAKPOINTS_FOCUSED,
+	primary: KeyMod.CtrlCmd | KeyCode.Enter,
+	secondary: [KeyMod.Alt | KeyCode.Enter],
+	handler: (accessor) => {
+		const listService = accessor.get(IListService);
+		const list = listService.lastFocusedList;
+		if (list instanceof List) {
+			const focus = list.getFocusedElements();
+			if (focus.length && focus[0] instanceof Breakpoint) {
+				return openBreakpointSource(focus[0], true, false, true, accessor.get(IDebugService), accessor.get(IEditorService));
+			}
+		}
+
+		return undefined;
+	}
+});
diff --git a/src/vs/workbench/contrib/debug/browser/debugConfigurationManager.ts b/src/vs/workbench/contrib/debug/browser/debugConfigurationManager.ts
index 1357826cd28..d26321962a5 100644
--- a/src/vs/workbench/contrib/debug/browser/debugConfigurationManager.ts
+++ b/src/vs/workbench/contrib/debug/browser/debugConfigurationManager.ts
@@ -280,10 +280,10 @@ export class ConfigurationManager implements IConfigurationManager {
 			this.selectConfiguration(undefined);
 			this.setCompoundSchemaValues();
 		}));
-		this.toDispose.push(this.configurationService.onDidChangeConfiguration(e => {
+		this.toDispose.push(this.configurationService.onDidChangeConfiguration(async e => {
 			if (e.affectsConfiguration('launch')) {
 				// A change happen in the launch.json. If there is already a launch configuration selected, do not change the selection.
-				this.selectConfiguration(undefined);
+				await this.selectConfiguration(undefined);
 				this.setCompoundSchemaValues();
 			}
 		}));
diff --git a/src/vs/workbench/contrib/debug/browser/debugEditorActions.ts b/src/vs/workbench/contrib/debug/browser/debugEditorActions.ts
index bb92347d7d7..b3784e6901c 100644
--- a/src/vs/workbench/contrib/debug/browser/debugEditorActions.ts
+++ b/src/vs/workbench/contrib/debug/browser/debugEditorActions.ts
@@ -501,16 +501,14 @@ class CloseExceptionWidgetAction extends EditorAction {
 	}
 }
 
-export function registerEditorActions(): void {
-	registerAction2(ToggleBreakpointAction);
-	registerAction2(ConditionalBreakpointAction);
-	registerAction2(LogPointAction);
-	registerEditorAction(RunToCursorAction);
-	registerEditorAction(StepIntoTargetsAction);
-	registerEditorAction(SelectionToReplAction);
-	registerEditorAction(SelectionToWatchExpressionsAction);
-	registerEditorAction(ShowDebugHoverAction);
-	registerEditorAction(GoToNextBreakpointAction);
-	registerEditorAction(GoToPreviousBreakpointAction);
-	registerEditorAction(CloseExceptionWidgetAction);
-}
+registerAction2(ToggleBreakpointAction);
+registerAction2(ConditionalBreakpointAction);
+registerAction2(LogPointAction);
+registerEditorAction(RunToCursorAction);
+registerEditorAction(StepIntoTargetsAction);
+registerEditorAction(SelectionToReplAction);
+registerEditorAction(SelectionToWatchExpressionsAction);
+registerEditorAction(ShowDebugHoverAction);
+registerEditorAction(GoToNextBreakpointAction);
+registerEditorAction(GoToPreviousBreakpointAction);
+registerEditorAction(CloseExceptionWidgetAction);
diff --git a/src/vs/workbench/contrib/debug/browser/debugToolBar.ts b/src/vs/workbench/contrib/debug/browser/debugToolBar.ts
index 8eef005bada..1445c1540bd 100644
--- a/src/vs/workbench/contrib/debug/browser/debugToolBar.ts
+++ b/src/vs/workbench/contrib/debug/browser/debugToolBar.ts
@@ -92,7 +92,7 @@ export class DebugToolBar extends Themable implements IWorkbenchContribution {
 			}
 
 			const actions: IAction[] = [];
-			const disposable = createAndFillInActionBarActions(this.debugToolBarMenu, { shouldForwardArgs: true }, actions, () => false);
+			const disposable = createAndFillInActionBarActions(this.debugToolBarMenu, { shouldForwardArgs: true }, actions);
 			if (!arrays.equals(actions, this.activeActions, (first, second) => first.id === second.id && first.enabled === second.enabled)) {
 				this.actionBar.clear();
 				this.actionBar.push(actions, { icon: true, label: false });
diff --git a/src/vs/workbench/contrib/debug/browser/rawDebugSession.ts b/src/vs/workbench/contrib/debug/browser/rawDebugSession.ts
index de9ca55bc9f..fb8e25142ad 100644
--- a/src/vs/workbench/contrib/debug/browser/rawDebugSession.ts
+++ b/src/vs/workbench/contrib/debug/browser/rawDebugSession.ts
@@ -464,9 +464,7 @@ export class RawDebugSession implements IDisposable {
 	async stepBack(args: DebugProtocol.StepBackArguments): Promise<DebugProtocol.StepBackResponse | undefined> {
 		if (this.capabilities.supportsStepBack) {
 			const response = await this.send('stepBack', args);
-			if (response && response.body === undefined) {	// TODO@AW why this check?
-				this.fireSimulatedContinuedEvent(args.threadId);
-			}
+			this.fireSimulatedContinuedEvent(args.threadId);
 			return response;
 		}
 		return Promise.reject(new Error('stepBack not supported'));
@@ -475,9 +473,7 @@ export class RawDebugSession implements IDisposable {
 	async reverseContinue(args: DebugProtocol.ReverseContinueArguments): Promise<DebugProtocol.ReverseContinueResponse | undefined> {
 		if (this.capabilities.supportsStepBack) {
 			const response = await this.send('reverseContinue', args);
-			if (response && response.body === undefined) {	// TODO@AW why this check?
-				this.fireSimulatedContinuedEvent(args.threadId);
-			}
+			this.fireSimulatedContinuedEvent(args.threadId);
 			return response;
 		}
 		return Promise.reject(new Error('reverseContinue not supported'));
diff --git a/src/vs/workbench/contrib/debug/common/debug.ts b/src/vs/workbench/contrib/debug/common/debug.ts
index 3f666dc6138..44d6007bd70 100644
--- a/src/vs/workbench/contrib/debug/common/debug.ts
+++ b/src/vs/workbench/contrib/debug/common/debug.ts
@@ -52,8 +52,11 @@ export const CONTEXT_WATCH_EXPRESSIONS_EXIST = new RawContextKey<boolean>('watch
 export const CONTEXT_VARIABLES_FOCUSED = new RawContextKey<boolean>('variablesFocused', true, { type: 'boolean', description: nls.localize('variablesFocused', "True when the VARIABLES views is focused, false otherwsie") });
 export const CONTEXT_EXPRESSION_SELECTED = new RawContextKey<boolean>('expressionSelected', false, { type: 'boolean', description: nls.localize('expressionSelected', "True when an expression input box is open in either the WATCH or the VARIABLES view, false otherwise.") });
 export const CONTEXT_BREAKPOINT_INPUT_FOCUSED = new RawContextKey<boolean>('breakpointInputFocused', false, { type: 'boolean', description: nls.localize('breakpointInputFocused', "True when the input box has focus in the BREAKPOINTS view.") });
-export const CONTEXT_CALLSTACK_ITEM_TYPE = new RawContextKey<string>('callStackItemType', undefined, { type: 'string', description: nls.localize('callStackItemType', "") });
-export const CONTEXT_WATCH_ITEM_TYPE = new RawContextKey<string>('watchItemType', undefined, { type: 'string', description: nls.localize('watchItemType', "") });
+export const CONTEXT_CALLSTACK_ITEM_TYPE = new RawContextKey<string>('callStackItemType', undefined, { type: 'string', description: nls.localize('callStackItemType', "Represents the item type of the focused element in the CALL STACK view. For example: 'session', 'thread', 'stackFrame'") });
+export const CONTEXT_CALLSTACK_SESSION_IS_ATTACH = new RawContextKey<boolean>('callStackSessionIsAttach', false, { type: 'boolean', description: nls.localize('callStackSessionIsAttach', "True when the session in the CALL STACK view is attach, false otherwise. Used internally for inline menus in the CALL STACK view.") });
+export const CONTEXT_CALLSTACK_ITEM_STOPPED = new RawContextKey<boolean>('callStackItemStopped', false, { type: 'boolean', description: nls.localize('callStackItemStopped', "True when the focused item in the CALL STACK is stopped. Used internaly for inline menus in the CALL STACK view.") });
+export const CONTEXT_CALLSTACK_SESSION_HAS_ONE_THREAD = new RawContextKey<boolean>('callStackSessionHasOneThread', false, { type: 'boolean', description: nls.localize('callStackSessionHasOneThread', "True when the focused session in the CALL STACK view has exactly one thread. Used internally for inline menus in the CALL STACK view.") });
+export const CONTEXT_WATCH_ITEM_TYPE = new RawContextKey<string>('watchItemType', undefined, { type: 'string', description: nls.localize('watchItemType', "Represents the item type of the focused element in the WATCH view. For example: 'expression', 'variable'") });
 export const CONTEXT_BREAKPOINT_ITEM_TYPE = new RawContextKey<string>('breakpointItemType', undefined, { type: 'string', description: nls.localize('breakpointItemType', "Represents the item type of the focused element in the BREAKPOINTS view. For example: 'breakpoint', 'exceptionBreakppint', 'functionBreakpoint', 'dataBreakpoint'") });
 export const CONTEXT_BREAKPOINT_SUPPORTS_CONDITION = new RawContextKey<boolean>('breakpointSupportsCondition', false, { type: 'boolean', description: nls.localize('breakpointSupportsCondition', "True when the focused breakpoint supports conditions.") });
 export const CONTEXT_LOADED_SCRIPTS_SUPPORTED = new RawContextKey<boolean>('loadedScriptsSupported', false, { type: 'boolean', description: nls.localize('loadedScriptsSupported', "True when the focused sessions supports the LOADED SCRIPTS view") });
diff --git a/src/vs/workbench/contrib/debug/electron-sandbox/extensionHostDebugService.ts b/src/vs/workbench/contrib/debug/electron-sandbox/extensionHostDebugService.ts
index 5eafc40d532..25f6a365a31 100644
--- a/src/vs/workbench/contrib/debug/electron-sandbox/extensionHostDebugService.ts
+++ b/src/vs/workbench/contrib/debug/electron-sandbox/extensionHostDebugService.ts
@@ -3,18 +3,8 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { registerSingleton } from 'vs/platform/instantiation/common/extensions';
 import { IExtensionHostDebugService } from 'vs/platform/debug/common/extensionHostDebug';
-import { IMainProcessService } from 'vs/platform/ipc/electron-sandbox/services';
+import { registerMainProcessRemoteService } from 'vs/platform/ipc/electron-sandbox/services';
 import { ExtensionHostDebugChannelClient, ExtensionHostDebugBroadcastChannel } from 'vs/platform/debug/common/extensionHostDebugIpc';
 
-export class ExtensionHostDebugService extends ExtensionHostDebugChannelClient {
-
-	constructor(
-		@IMainProcessService readonly mainProcessService: IMainProcessService
-	) {
-		super(mainProcessService.getChannel(ExtensionHostDebugBroadcastChannel.ChannelName));
-	}
-}
-
-registerSingleton(IExtensionHostDebugService, ExtensionHostDebugService, true);
+registerMainProcessRemoteService(IExtensionHostDebugService, ExtensionHostDebugBroadcastChannel.ChannelName, { supportsDelayedInstantiation: true, channelClientCtor: ExtensionHostDebugChannelClient });
diff --git a/src/vs/workbench/contrib/extensions/browser/extensionEditor.ts b/src/vs/workbench/contrib/extensions/browser/extensionEditor.ts
index f86a5b421a5..7ef2377e598 100644
--- a/src/vs/workbench/contrib/extensions/browser/extensionEditor.ts
+++ b/src/vs/workbench/contrib/extensions/browser/extensionEditor.ts
@@ -78,7 +78,8 @@ function removeEmbeddedSVGs(documentContent: string): string {
 		allowedAttributes: {
 			'*': [
 				'align',
-			]
+			],
+			img: ['src', 'alt', 'title', 'aria-label', 'width', 'height'],
 		},
 		filter(token: { tag: string, attrs: { readonly [key: string]: string } }): boolean {
 			return token.tag !== 'svg';
diff --git a/src/vs/workbench/contrib/extensions/browser/extensionsViewer.ts b/src/vs/workbench/contrib/extensions/browser/extensionsViewer.ts
index d6436bc993f..94fdc443a78 100644
--- a/src/vs/workbench/contrib/extensions/browser/extensionsViewer.ts
+++ b/src/vs/workbench/contrib/extensions/browser/extensionsViewer.ts
@@ -272,7 +272,7 @@ export class ExtensionsTree extends WorkbenchAsyncDataTree<IExtensionData, IExte
 				accessibilityProvider: <IListAccessibilityProvider<IExtensionData>>{
 					getAriaLabel(extensionData: IExtensionData): string {
 						const extension = extensionData.extension;
-						return localize('extension-arialabel', "{0}, {1}, {2}, press enter for extension details.", extension.displayName, extension.version, extension.publisherDisplayName);
+						return localize('extension-arialabel', "{0}, {1}, {2}, {3}", extension.displayName, extension.version, extension.publisherDisplayName, extension.description);
 					},
 					getWidgetAriaLabel(): string {
 						return localize('extensions', "Extensions");
diff --git a/src/vs/workbench/contrib/extensions/browser/extensionsViews.ts b/src/vs/workbench/contrib/extensions/browser/extensionsViews.ts
index 535acebdcd7..88785d96cce 100644
--- a/src/vs/workbench/contrib/extensions/browser/extensionsViews.ts
+++ b/src/vs/workbench/contrib/extensions/browser/extensionsViews.ts
@@ -165,7 +165,7 @@ export class ExtensionsListView extends ViewPane {
 			horizontalScrolling: false,
 			accessibilityProvider: <IListAccessibilityProvider<IExtension | null>>{
 				getAriaLabel(extension: IExtension | null): string {
-					return extension ? localize('extension-arialabel', "{0}, {1}, {2}, press enter for extension details.", extension.displayName, extension.version, extension.publisherDisplayName) : '';
+					return extension ? localize('extension-arialabel', "{0}, {1}, {2}, {3}", extension.displayName, extension.version, extension.publisherDisplayName, extension.description) : '';
 				},
 				getWidgetAriaLabel(): string {
 					return localize('extensions', "Extensions");
diff --git a/src/vs/workbench/contrib/extensions/electron-browser/extensionsSlowActions.ts b/src/vs/workbench/contrib/extensions/electron-browser/extensionsSlowActions.ts
index 55547a8c67a..d025c2e1316 100644
--- a/src/vs/workbench/contrib/extensions/electron-browser/extensionsSlowActions.ts
+++ b/src/vs/workbench/contrib/extensions/electron-browser/extensionsSlowActions.ts
@@ -144,7 +144,7 @@ class ReportExtensionSlowAction extends Action {
 - Extension Name: \`${this.extension.name}\`
 - Extension Version: \`${this.extension.version}\`
 - OS Version: \`${osVersion}\`
-- VSCode version: \`${this._productService.version}\`\n\n${message}`);
+- VS Code version: \`${this._productService.version}\`\n\n${message}`);
 
 		const url = `${this.repoInfo.base}/${this.repoInfo.owner}/${this.repoInfo.repo}/issues/new/?body=${body}&title=${title}`;
 		this._openerService.open(URI.parse(url));
diff --git a/src/vs/workbench/contrib/extensions/electron-browser/reportExtensionIssueAction.ts b/src/vs/workbench/contrib/extensions/electron-browser/reportExtensionIssueAction.ts
index 762b07c457f..bd4331a381d 100644
--- a/src/vs/workbench/contrib/extensions/electron-browser/reportExtensionIssueAction.ts
+++ b/src/vs/workbench/contrib/extensions/electron-browser/reportExtensionIssueAction.ts
@@ -76,7 +76,7 @@ export class ReportExtensionIssueAction extends Action {
 - Extension Name: \`${extension.description.name}\`
 - Extension Version: \`${extension.description.version}\`
 - OS Version: \`${osVersion}\`
-- VSCode version: \`${this.productService.version}\`\n\n${message}`
+- VS Code version: \`${this.productService.version}\`\n\n${message}`
 		);
 
 		return `${baseUrl}${queryStringPrefix}body=${body}&title=${encodeURIComponent(title)}`;
diff --git a/src/vs/workbench/contrib/extensions/test/electron-browser/extensionsActions.test.ts b/src/vs/workbench/contrib/extensions/test/electron-browser/extensionsActions.test.ts
index 0c5e51b8469..d83e4d420da 100644
--- a/src/vs/workbench/contrib/extensions/test/electron-browser/extensionsActions.test.ts
+++ b/src/vs/workbench/contrib/extensions/test/electron-browser/extensionsActions.test.ts
@@ -26,7 +26,7 @@ import { NullTelemetryService } from 'vs/platform/telemetry/common/telemetryUtil
 import { IExtensionService, toExtensionDescription } from 'vs/workbench/services/extensions/common/extensions';
 import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
 import { TestContextService } from 'vs/workbench/test/common/workbenchTestServices';
-import { TestSharedProcessService } from 'vs/workbench/test/electron-browser/workbenchTestServices';
+import { TestSharedProcessService, TestEnvironmentService } from 'vs/workbench/test/electron-browser/workbenchTestServices';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
 import { ILogService, NullLogService } from 'vs/platform/log/common/log';
 import { NativeURLService } from 'vs/platform/url/common/urlService';
@@ -57,6 +57,7 @@ import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
 import { MockContextKeyService } from 'vs/platform/keybinding/test/common/mockKeybindingService';
 import { IWorkspaceTrustService } from 'vs/platform/workspace/common/workspaceTrust';
 import { TestWorkspaceTrustService } from 'vs/workbench/services/workspaces/test/common/testWorkspaceTrustService';
+import { IEnvironmentService, INativeEnvironmentService } from 'vs/platform/environment/common/environment';
 
 let instantiationService: TestInstantiationService;
 let installEvent: Emitter<InstallExtensionEvent>,
@@ -74,6 +75,12 @@ async function setupTest() {
 	didUninstallEvent = new Emitter<DidUninstallExtensionEvent>();
 
 	instantiationService = new TestInstantiationService();
+
+	instantiationService.stub(IEnvironmentService, TestEnvironmentService);
+	instantiationService.stub(INativeEnvironmentService, TestEnvironmentService);
+	instantiationService.stub(IWorkbenchEnvironmentService, TestEnvironmentService);
+	instantiationService.stub(INativeWorkbenchEnvironmentService, TestEnvironmentService);
+
 	instantiationService.stub(ITelemetryService, NullTelemetryService);
 	instantiationService.stub(ILogService, NullLogService);
 
@@ -1715,8 +1722,11 @@ suite('RemoteInstallAction', () => {
 		// multi server setup
 		const localWorkspaceExtension = aLocalExtension('a', { extensionKind: ['workspace'] }, { location: URI.file(`pub.a`) });
 		const extensionManagementServerService = aMultiExtensionManagementServerService(instantiationService, createExtensionManagementService([localWorkspaceExtension]));
-		instantiationService.stub(IWorkbenchEnvironmentService, { disableExtensions: true } as IWorkbenchEnvironmentService);
-		instantiationService.stub(INativeWorkbenchEnvironmentService, { disableExtensions: true } as INativeWorkbenchEnvironmentService);
+		const environmentService = { disableExtensions: true } as INativeWorkbenchEnvironmentService;
+		instantiationService.stub(IEnvironmentService, environmentService);
+		instantiationService.stub(INativeEnvironmentService, environmentService);
+		instantiationService.stub(IWorkbenchEnvironmentService, environmentService);
+		instantiationService.stub(INativeWorkbenchEnvironmentService, environmentService);
 		instantiationService.stub(IExtensionManagementServerService, extensionManagementServerService);
 		instantiationService.stub(IWorkbenchExtensionEnablementService, new TestExtensionEnablementService(instantiationService));
 		const workbenchService: IExtensionsWorkbenchService = instantiationService.createInstance(ExtensionsWorkbenchService);
@@ -2095,8 +2105,11 @@ suite('LocalInstallAction', () => {
 	test('Test local install action is disabled for remote ui extension which is disabled in env', async () => {
 		// multi server setup
 		const remoteUIExtension = aLocalExtension('a', { extensionKind: ['ui'] }, { location: URI.file(`pub.a`).with({ scheme: Schemas.vscodeRemote }) });
-		instantiationService.stub(IWorkbenchEnvironmentService, { disableExtensions: true } as IWorkbenchEnvironmentService);
-		instantiationService.stub(INativeWorkbenchEnvironmentService, { disableExtensions: true } as INativeWorkbenchEnvironmentService);
+		const environmentService = { disableExtensions: true } as INativeWorkbenchEnvironmentService;
+		instantiationService.stub(IEnvironmentService, environmentService);
+		instantiationService.stub(INativeEnvironmentService, environmentService);
+		instantiationService.stub(IWorkbenchEnvironmentService, environmentService);
+		instantiationService.stub(INativeWorkbenchEnvironmentService, environmentService);
 		const extensionManagementServerService = aMultiExtensionManagementServerService(instantiationService, createExtensionManagementService(), createExtensionManagementService([remoteUIExtension]));
 		instantiationService.stub(IExtensionManagementServerService, extensionManagementServerService);
 		instantiationService.stub(IWorkbenchExtensionEnablementService, new TestExtensionEnablementService(instantiationService));
diff --git a/src/vs/workbench/contrib/files/browser/editors/textFileEditorTracker.ts b/src/vs/workbench/contrib/files/browser/editors/textFileEditorTracker.ts
index 3d309a9d9b9..460ba3e2da3 100644
--- a/src/vs/workbench/contrib/files/browser/editors/textFileEditorTracker.ts
+++ b/src/vs/workbench/contrib/files/browser/editors/textFileEditorTracker.ts
@@ -59,8 +59,10 @@ export class TextFileEditorTracker extends Disposable implements IWorkbenchContr
 				return false; // resource must not be pending to save
 			}
 
-			if (this.filesConfigurationService.getAutoSaveMode() === AutoSaveMode.AFTER_SHORT_DELAY) {
-				return false; // resource must not be pending to be auto saved
+			if (this.filesConfigurationService.getAutoSaveMode() === AutoSaveMode.AFTER_SHORT_DELAY && !model?.hasState(TextFileEditorModelState.ERROR)) {
+				// leave models auto saved after short delay unless
+				// the save resulted in an error
+				return false;
 			}
 
 			if (this.editorService.isOpen({ resource })) {
diff --git a/src/vs/workbench/contrib/files/browser/fileActions.ts b/src/vs/workbench/contrib/files/browser/fileActions.ts
index 908574c09f3..02ebcee8765 100644
--- a/src/vs/workbench/contrib/files/browser/fileActions.ts
+++ b/src/vs/workbench/contrib/files/browser/fileActions.ts
@@ -1211,7 +1211,6 @@ export const pasteFileHandler = async (accessor: ServicesAccessor) => {
 	const explorerService = accessor.get(IExplorerService);
 	const fileService = accessor.get(IFileService);
 	const notificationService = accessor.get(INotificationService);
-	const editorService = accessor.get(IEditorService);
 	const configurationService = accessor.get(IConfigurationService);
 	const uriIdentityService = accessor.get(IUriIdentityService);
 
@@ -1266,12 +1265,6 @@ export const pasteFileHandler = async (accessor: ServicesAccessor) => {
 
 			const pair = sourceTargetPairs[0];
 			await explorerService.select(pair.target);
-			if (sourceTargetPairs.length === 1) {
-				const item = explorerService.findClosest(pair.target);
-				if (item && !item.isDirectory) {
-					await editorService.openEditor({ resource: item.resource, options: { pinned: true, preserveFocus: true } });
-				}
-			}
 		}
 	} catch (e) {
 		onError(notificationService, new Error(nls.localize('fileDeleted', "The file(s) to paste have been deleted or moved since you copied them. {0}", getErrorMessage(e))));
diff --git a/src/vs/workbench/contrib/files/common/editors/fileEditorInput.ts b/src/vs/workbench/contrib/files/common/editors/fileEditorInput.ts
index 421c8d35abb..20c39532a98 100644
--- a/src/vs/workbench/contrib/files/common/editors/fileEditorInput.ts
+++ b/src/vs/workbench/contrib/files/common/editors/fileEditorInput.ts
@@ -188,20 +188,7 @@ export class FileEditorInput extends AbstractTextResourceEditorInput implements
 	private decorateLabel(label: string): string {
 		const orphaned = this.model?.hasState(TextFileEditorModelState.ORPHAN);
 		const readonly = this.isReadonly();
-
-		if (orphaned && readonly) {
-			return localize('orphanedReadonlyFile', "{0} (deleted, read-only)", label);
-		}
-
-		if (orphaned) {
-			return localize('orphanedFile', "{0} (deleted)", label);
-		}
-
-		if (readonly) {
-			return localize('readonlyFile', "{0} (read-only)", label);
-		}
-
-		return label;
+		return decorateFileEditorLabel(label, { orphaned: !!orphaned, readonly });
 	}
 
 	getEncoding(): string | undefined {
@@ -400,3 +387,19 @@ export class FileEditorInput extends AbstractTextResourceEditorInput implements
 		this.cachedTextFileModelReference = undefined;
 	}
 }
+
+export function decorateFileEditorLabel(label: string, state: { orphaned: boolean, readonly: boolean }): string {
+	if (state.orphaned && state.readonly) {
+		return localize('orphanedReadonlyFile', "{0} (deleted, read-only)", label);
+	}
+
+	if (state.orphaned) {
+		return localize('orphanedFile', "{0} (deleted)", label);
+	}
+
+	if (state.readonly) {
+		return localize('readonlyFile', "{0} (read-only)", label);
+	}
+
+	return label;
+}
diff --git a/src/vs/workbench/contrib/files/test/browser/editorAutoSave.test.ts b/src/vs/workbench/contrib/files/test/browser/editorAutoSave.test.ts
index 59aefd2cab8..9bb8ebf0634 100644
--- a/src/vs/workbench/contrib/files/test/browser/editorAutoSave.test.ts
+++ b/src/vs/workbench/contrib/files/test/browser/editorAutoSave.test.ts
@@ -7,12 +7,11 @@ import * as assert from 'assert';
 import { Event } from 'vs/base/common/event';
 import { toResource } from 'vs/base/test/common/utils';
 import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
-import { TestFilesConfigurationService, workbenchInstantiationService, TestServiceAccessor, registerTestFileEditor } from 'vs/workbench/test/browser/workbenchTestServices';
+import { TestFilesConfigurationService, workbenchInstantiationService, TestServiceAccessor, registerTestFileEditor, createEditorPart } from 'vs/workbench/test/browser/workbenchTestServices';
 import { IResolvedTextFileEditorModel, ITextFileEditorModel } from 'vs/workbench/services/textfile/common/textfiles';
 import { IEditorGroupsService } from 'vs/workbench/services/editor/common/editorGroupsService';
 import { DisposableStore } from 'vs/base/common/lifecycle';
 import { TextFileEditorModelManager } from 'vs/workbench/services/textfile/common/textFileEditorModelManager';
-import { EditorPart } from 'vs/workbench/browser/parts/editor/editorPart';
 import { EditorService } from 'vs/workbench/services/editor/browser/editorService';
 import { EditorAutoSave } from 'vs/workbench/browser/parts/editor/editorAutoSave';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
@@ -45,9 +44,7 @@ suite('EditorAutoSave', () => {
 			configurationService
 		));
 
-		const part = disposables.add(instantiationService.createInstance(EditorPart));
-		part.create(document.createElement('div'));
-		part.layout(400, 300);
+		const part = createEditorPart(instantiationService, disposables);
 
 		instantiationService.stub(IEditorGroupsService, part);
 
diff --git a/src/vs/workbench/contrib/files/test/browser/fileEditorInput.test.ts b/src/vs/workbench/contrib/files/test/browser/fileEditorInput.test.ts
index 8dbf1810ec2..018ec3e332f 100644
--- a/src/vs/workbench/contrib/files/test/browser/fileEditorInput.test.ts
+++ b/src/vs/workbench/contrib/files/test/browser/fileEditorInput.test.ts
@@ -209,7 +209,7 @@ suite('Files - FileEditorInput', () => {
 	test('resolve handles binary files', async function () {
 		const input = createFileInput(toResource.call(this, '/foo/bar/updatefile.js'));
 
-		accessor.textFileService.setResolveTextContentErrorOnce(new TextFileOperationError('error', TextFileOperationResult.FILE_IS_BINARY));
+		accessor.textFileService.setReadStreamErrorOnce(new TextFileOperationError('error', TextFileOperationResult.FILE_IS_BINARY));
 
 		const resolved = await input.resolve();
 		assert.ok(resolved);
@@ -219,7 +219,7 @@ suite('Files - FileEditorInput', () => {
 	test('resolve handles too large files', async function () {
 		const input = createFileInput(toResource.call(this, '/foo/bar/updatefile.js'));
 
-		accessor.textFileService.setResolveTextContentErrorOnce(new FileOperationError('error', FileOperationResult.FILE_TOO_LARGE));
+		accessor.textFileService.setReadStreamErrorOnce(new FileOperationError('error', FileOperationResult.FILE_TOO_LARGE));
 
 		const resolved = await input.resolve();
 		assert.ok(resolved);
diff --git a/src/vs/workbench/contrib/files/test/browser/textFileEditorTracker.test.ts b/src/vs/workbench/contrib/files/test/browser/textFileEditorTracker.test.ts
index d5ced8871b1..c959c634dab 100644
--- a/src/vs/workbench/contrib/files/test/browser/textFileEditorTracker.test.ts
+++ b/src/vs/workbench/contrib/files/test/browser/textFileEditorTracker.test.ts
@@ -8,14 +8,13 @@ import { Event } from 'vs/base/common/event';
 import { TextFileEditorTracker } from 'vs/workbench/contrib/files/browser/editors/textFileEditorTracker';
 import { toResource } from 'vs/base/test/common/utils';
 import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
-import { workbenchInstantiationService, TestServiceAccessor, TestFilesConfigurationService, registerTestFileEditor, registerTestResourceEditor } from 'vs/workbench/test/browser/workbenchTestServices';
+import { workbenchInstantiationService, TestServiceAccessor, TestFilesConfigurationService, registerTestFileEditor, registerTestResourceEditor, createEditorPart } from 'vs/workbench/test/browser/workbenchTestServices';
 import { IResolvedTextFileEditorModel, snapshotToString, ITextFileService } from 'vs/workbench/services/textfile/common/textfiles';
-import { FileChangesEvent, FileChangeType } from 'vs/platform/files/common/files';
+import { FileChangesEvent, FileChangeType, FileOperationError, FileOperationResult } from 'vs/platform/files/common/files';
 import { IEditorGroupsService } from 'vs/workbench/services/editor/common/editorGroupsService';
 import { timeout } from 'vs/base/common/async';
 import { DisposableStore } from 'vs/base/common/lifecycle';
 import { TextFileEditorModelManager } from 'vs/workbench/services/textfile/common/textFileEditorModelManager';
-import { EditorPart } from 'vs/workbench/browser/parts/editor/editorPart';
 import { EditorService } from 'vs/workbench/services/editor/browser/editorService';
 import { UntitledTextEditorInput } from 'vs/workbench/services/untitled/common/untitledTextEditorInput';
 import { isEqual } from 'vs/base/common/resources';
@@ -54,9 +53,7 @@ suite('Files - TextFileEditorTracker', () => {
 			));
 		}
 
-		const part = disposables.add(instantiationService.createInstance(EditorPart));
-		part.create(document.createElement('div'));
-		part.layout(400, 300);
+		const part = createEditorPart(instantiationService, disposables);
 
 		instantiationService.stub(IEditorGroupsService, part);
 
@@ -96,27 +93,48 @@ suite('Files - TextFileEditorTracker', () => {
 	test('dirty text file model opens as editor', async function () {
 		const resource = toResource.call(this, '/path/index.txt');
 
-		await testDirtyTextFileModelOpensEditorDependingOnAutoSaveSetting(resource, false);
+		await testDirtyTextFileModelOpensEditorDependingOnAutoSaveSetting(resource, false, false);
 	});
 
 	test('dirty text file model does not open as editor if autosave is ON', async function () {
 		const resource = toResource.call(this, '/path/index.txt');
 
-		await testDirtyTextFileModelOpensEditorDependingOnAutoSaveSetting(resource, true);
+		await testDirtyTextFileModelOpensEditorDependingOnAutoSaveSetting(resource, true, false);
 	});
 
-	async function testDirtyTextFileModelOpensEditorDependingOnAutoSaveSetting(resource: URI, autoSave: boolean): Promise<void> {
+	test('dirty text file model opens as editor when save fails', async function () {
+		const resource = toResource.call(this, '/path/index.txt');
+
+		await testDirtyTextFileModelOpensEditorDependingOnAutoSaveSetting(resource, false, true);
+	});
+
+	test('dirty text file model opens as editor when save fails if autosave is ON', async function () {
+		const resource = toResource.call(this, '/path/index.txt');
+
+		await testDirtyTextFileModelOpensEditorDependingOnAutoSaveSetting(resource, true, true);
+	});
+
+	async function testDirtyTextFileModelOpensEditorDependingOnAutoSaveSetting(resource: URI, autoSave: boolean, error: boolean): Promise<void> {
 		const accessor = await createTracker(autoSave);
 
 		assert.ok(!accessor.editorService.isOpen(accessor.editorService.createEditorInput({ resource, forceFile: true })));
 
+		if (error) {
+			accessor.textFileService.setWriteErrorOnce(new FileOperationError('fail to write', FileOperationResult.FILE_OTHER_ERROR));
+		}
+
 		const model = await accessor.textFileService.files.resolve(resource) as IResolvedTextFileEditorModel;
 
 		model.textEditorModel.setValue('Super Good');
 
 		if (autoSave) {
+			await model.save();
 			await timeout(100);
-			assert.ok(!accessor.editorService.isOpen(accessor.editorService.createEditorInput({ resource, forceFile: true })));
+			if (error) {
+				assert.ok(accessor.editorService.isOpen(accessor.editorService.createEditorInput({ resource, forceFile: true })));
+			} else {
+				assert.ok(!accessor.editorService.isOpen(accessor.editorService.createEditorInput({ resource, forceFile: true })));
+			}
 		} else {
 			await awaitEditorOpening(accessor.editorService);
 			assert.ok(accessor.editorService.isOpen(accessor.editorService.createEditorInput({ resource, forceFile: true })));
diff --git a/src/vs/workbench/contrib/markers/browser/markersViewActions.ts b/src/vs/workbench/contrib/markers/browser/markersViewActions.ts
index 2653e238d6f..708f6d6eaad 100644
--- a/src/vs/workbench/contrib/markers/browser/markersViewActions.ts
+++ b/src/vs/workbench/contrib/markers/browser/markersViewActions.ts
@@ -244,6 +244,7 @@ export class MarkersFilterActionViewItem extends BaseActionViewItem {
 	private filterBadge: HTMLElement | null = null;
 	private focusContextKey: IContextKey<boolean>;
 	private readonly filtersAction: IAction;
+	private actionbar: ActionBar | null = null;
 
 	constructor(
 		action: IAction,
@@ -367,7 +368,7 @@ export class MarkersFilterActionViewItem extends BaseActionViewItem {
 	}
 
 	private createFilters(container: HTMLElement): void {
-		const actionbar = this._register(new ActionBar(container, {
+		this.actionbar = this._register(new ActionBar(container, {
 			actionViewItemProvider: action => {
 				if (action.id === this.filtersAction.id) {
 					return this.instantiationService.createInstance(FiltersDropdownMenuActionViewItem, action, this.markersView.filters, this.actionRunner);
@@ -375,7 +376,7 @@ export class MarkersFilterActionViewItem extends BaseActionViewItem {
 				return undefined;
 			}
 		}));
-		actionbar.push(this.filtersAction, { icon: true, label: false });
+		this.actionbar.push(this.filtersAction, { icon: true, label: false });
 	}
 
 	private onDidInputChange(inputbox: HistoryInputBox) {
@@ -416,6 +417,10 @@ export class MarkersFilterActionViewItem extends BaseActionViewItem {
 			this.clearFilterText();
 			handled = true;
 		}
+		if (event.equals(KeyCode.Tab)) {
+			this.actionbar?.focus();
+			handled = true;
+		}
 		if (handled) {
 			event.stopPropagation();
 			event.preventDefault();
diff --git a/src/vs/workbench/contrib/notebook/browser/contrib/clipboard/notebookClipboard.ts b/src/vs/workbench/contrib/notebook/browser/contrib/clipboard/notebookClipboard.ts
new file mode 100644
index 00000000000..39f7ff2face
--- /dev/null
+++ b/src/vs/workbench/contrib/notebook/browser/contrib/clipboard/notebookClipboard.ts
@@ -0,0 +1,200 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { Disposable } from 'vs/base/common/lifecycle';
+import { LifecyclePhase } from 'vs/workbench/services/lifecycle/common/lifecycle';
+import { Registry } from 'vs/platform/registry/common/platform';
+import { Extensions as WorkbenchExtensions, IWorkbenchContributionsRegistry } from 'vs/workbench/common/contributions';
+import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
+import { getNotebookEditorFromEditorPane, ICellViewModel } from 'vs/workbench/contrib/notebook/browser/notebookBrowser';
+import * as UUID from 'vs/base/common/uuid';
+import { CopyAction, CutAction, PasteAction } from 'vs/editor/contrib/clipboard/clipboard';
+import { IClipboardService } from 'vs/platform/clipboard/common/clipboardService';
+import { CellViewModel } from 'vs/workbench/contrib/notebook/browser/viewModel/notebookViewModel';
+import { NotebookCellTextModel } from 'vs/workbench/contrib/notebook/common/model/notebookCellTextModel';
+import { CellEditType, ICellEditOperation, SelectionStateType } from 'vs/workbench/contrib/notebook/common/notebookCommon';
+import { INotebookService } from 'vs/workbench/contrib/notebook/common/notebookService';
+
+class NotebookClipboardContribution extends Disposable {
+
+	constructor(@IEditorService private readonly _editorService: IEditorService) {
+		super();
+
+		const getContext = () => {
+			const editor = getNotebookEditorFromEditorPane(this._editorService.activeEditorPane);
+			const activeCell = editor?.getActiveCell();
+
+			return {
+				editor,
+				activeCell
+			};
+		};
+
+		const PRIORITY = 105;
+
+		if (CopyAction) {
+			this._register(CopyAction.addImplementation(PRIORITY, accessor => {
+				const activeElement = <HTMLElement>document.activeElement;
+				if (activeElement && ['input', 'textarea'].indexOf(activeElement.tagName.toLowerCase()) >= 0) {
+					return false;
+				}
+
+				const { editor } = getContext();
+				if (!editor) {
+					return false;
+				}
+
+				if (editor.hasOutputTextSelection()) {
+					document.execCommand('copy');
+					return true;
+				}
+
+				const clipboardService = accessor.get<IClipboardService>(IClipboardService);
+				const notebookService = accessor.get<INotebookService>(INotebookService);
+				const selectedCells = editor.getSelectionViewModels();
+
+				if (!selectedCells.length) {
+					return false;
+				}
+
+				clipboardService.writeText(selectedCells.map(cell => cell.getText()).join('\n'));
+				notebookService.setToCopy(selectedCells.map(cell => cell.model), true);
+
+				return true;
+			}));
+		}
+
+		if (PasteAction) {
+			PasteAction.addImplementation(PRIORITY, accessor => {
+				const activeElement = <HTMLElement>document.activeElement;
+				if (activeElement && ['input', 'textarea'].indexOf(activeElement.tagName.toLowerCase()) >= 0) {
+					return false;
+				}
+
+				const notebookService = accessor.get<INotebookService>(INotebookService);
+				const pasteCells = notebookService.getToCopy();
+
+				if (!pasteCells) {
+					return false;
+				}
+
+				const { editor, activeCell } = getContext();
+				if (!editor) {
+					return false;
+				}
+
+				const viewModel = editor.viewModel;
+
+				if (!viewModel || !viewModel.metadata.editable) {
+					return false;
+				}
+
+				const cloneMetadata = (cell: NotebookCellTextModel) => {
+					return {
+						editable: cell.metadata?.editable,
+						runnable: cell.metadata?.runnable,
+						breakpointMargin: cell.metadata?.breakpointMargin,
+						hasExecutionOrder: cell.metadata?.hasExecutionOrder,
+						inputCollapsed: cell.metadata?.inputCollapsed,
+						outputCollapsed: cell.metadata?.outputCollapsed,
+						custom: cell.metadata?.custom
+					};
+				};
+
+				const cloneCell = (cell: NotebookCellTextModel) => {
+					return {
+						source: cell.getValue(),
+						language: cell.language,
+						cellKind: cell.cellKind,
+						outputs: cell.outputs.map(output => ({
+							outputs: output.outputs,
+							/* paste should generate new outputId */ outputId: UUID.generateUuid()
+						})),
+						metadata: cloneMetadata(cell)
+					};
+				};
+
+				if (activeCell) {
+					const currCellIndex = viewModel.getCellIndex(activeCell);
+
+					let topPastedCell: CellViewModel | undefined = undefined;
+					pasteCells.items.reverse().map(cell => cloneCell(cell)).forEach(pasteCell => {
+						const newIdx = typeof currCellIndex === 'number' ? currCellIndex + 1 : 0;
+						topPastedCell = viewModel.createCell(newIdx, pasteCell.source, pasteCell.language, pasteCell.cellKind, pasteCell.metadata, pasteCell.outputs, true);
+					});
+
+					if (topPastedCell) {
+						editor.focusNotebookCell(topPastedCell, 'container');
+					}
+				} else {
+					if (viewModel.length !== 0) {
+						return false;
+					}
+
+					let topPastedCell: CellViewModel | undefined = undefined;
+					pasteCells.items.reverse().map(cell => cloneCell(cell)).forEach(pasteCell => {
+						topPastedCell = viewModel.createCell(0, pasteCell.source, pasteCell.language, pasteCell.cellKind, pasteCell.metadata, pasteCell.outputs, true);
+					});
+
+					if (topPastedCell) {
+						editor.focusNotebookCell(topPastedCell, 'container');
+					}
+				}
+
+
+				return true;
+			});
+		}
+
+		if (CutAction) {
+			CutAction.addImplementation(PRIORITY, accessor => {
+				const activeElement = <HTMLElement>document.activeElement;
+				if (activeElement && ['input', 'textarea'].indexOf(activeElement.tagName.toLowerCase()) >= 0) {
+					return false;
+				}
+
+				const { editor } = getContext();
+				if (!editor) {
+					return false;
+				}
+
+				const viewModel = editor.viewModel;
+
+				if (!viewModel || !viewModel.metadata.editable) {
+					return false;
+				}
+
+				const clipboardService = accessor.get<IClipboardService>(IClipboardService);
+				const notebookService = accessor.get<INotebookService>(INotebookService);
+				const selectedCells = editor.getSelectionViewModels();
+
+				if (!selectedCells.length) {
+					return false;
+				}
+
+				clipboardService.writeText(selectedCells.map(cell => cell.getText()).join('\n'));
+				const selectionIndexes = selectedCells.map(cell => [cell, viewModel.getCellIndex(cell)] as [ICellViewModel, number]).sort((a, b) => b[1] - a[1]);
+				const edits: ICellEditOperation[] = selectionIndexes.map(value => ({ editType: CellEditType.Replace, index: value[1], count: 1, cells: [] }));
+				const firstSelectIndex = selectionIndexes.sort((a, b) => a[1] - b[1])[0][1];
+				const newFocusedCellIndex = firstSelectIndex < viewModel.notebookDocument.cells.length
+					? firstSelectIndex
+					: viewModel.notebookDocument.cells.length - 1;
+
+				viewModel.notebookDocument.applyEdits(edits, true, { kind: SelectionStateType.Index, selections: viewModel.getSelections() }, () => {
+					return {
+						kind: SelectionStateType.Index,
+						selections: [{ start: newFocusedCellIndex, end: newFocusedCellIndex + 1 }]
+					};
+				}, undefined, true);
+				notebookService.setToCopy(selectedCells.map(cell => cell.model), false);
+
+				return true;
+			});
+		}
+	}
+}
+
+const workbenchContributionsRegistry = Registry.as<IWorkbenchContributionsRegistry>(WorkbenchExtensions.Workbench);
+workbenchContributionsRegistry.registerWorkbenchContribution(NotebookClipboardContribution, LifecyclePhase.Ready);
diff --git a/src/vs/workbench/contrib/notebook/browser/contrib/coreActions.ts b/src/vs/workbench/contrib/notebook/browser/contrib/coreActions.ts
index 61e55c38886..68406857123 100644
--- a/src/vs/workbench/contrib/notebook/browser/contrib/coreActions.ts
+++ b/src/vs/workbench/contrib/notebook/browser/contrib/coreActions.ts
@@ -21,7 +21,7 @@ import { ServicesAccessor } from 'vs/platform/instantiation/common/instantiation
 import { KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
 import { IQuickInputService, IQuickPickItem, QuickPickInput } from 'vs/platform/quickinput/common/quickInput';
 import { CATEGORIES } from 'vs/workbench/common/actions';
-import { BaseCellRenderTemplate, CellEditState, CellFocusMode, EXECUTE_CELL_COMMAND_ID, EXPAND_CELL_CONTENT_COMMAND_ID, IActiveNotebookEditor, ICellViewModel, INotebookEditor, NOTEBOOK_CELL_EDITABLE, NOTEBOOK_CELL_EDITOR_FOCUSED, NOTEBOOK_CELL_HAS_OUTPUTS, NOTEBOOK_CELL_INPUT_COLLAPSED, NOTEBOOK_CELL_LIST_FOCUSED, NOTEBOOK_CELL_MARKDOWN_EDIT_MODE, NOTEBOOK_CELL_OUTPUT_COLLAPSED, NOTEBOOK_CELL_TYPE, NOTEBOOK_EDITOR_EDITABLE, NOTEBOOK_EDITOR_EXECUTING_NOTEBOOK, NOTEBOOK_EDITOR_FOCUSED, NOTEBOOK_EDITOR_RUNNABLE, NOTEBOOK_IS_ACTIVE_EDITOR, NOTEBOOK_KERNEL_COUNT, NOTEBOOK_OUTPUT_FOCUSED } from 'vs/workbench/contrib/notebook/browser/notebookBrowser';
+import { BaseCellRenderTemplate, CellEditState, CellFocusMode, EXECUTE_CELL_COMMAND_ID, EXPAND_CELL_CONTENT_COMMAND_ID, getNotebookEditorFromEditorPane, IActiveNotebookEditor, ICellViewModel, NOTEBOOK_CELL_EDITABLE, NOTEBOOK_CELL_EDITOR_FOCUSED, NOTEBOOK_CELL_HAS_OUTPUTS, NOTEBOOK_CELL_INPUT_COLLAPSED, NOTEBOOK_CELL_LIST_FOCUSED, NOTEBOOK_CELL_MARKDOWN_EDIT_MODE, NOTEBOOK_CELL_OUTPUT_COLLAPSED, NOTEBOOK_CELL_TYPE, NOTEBOOK_EDITOR_EDITABLE, NOTEBOOK_EDITOR_EXECUTING_NOTEBOOK, NOTEBOOK_EDITOR_FOCUSED, NOTEBOOK_EDITOR_RUNNABLE, NOTEBOOK_IS_ACTIVE_EDITOR, NOTEBOOK_KERNEL_COUNT, NOTEBOOK_OUTPUT_FOCUSED } from 'vs/workbench/contrib/notebook/browser/notebookBrowser';
 import { CellViewModel } from 'vs/workbench/contrib/notebook/browser/viewModel/notebookViewModel';
 import { CellEditType, CellKind, ICellEditOperation, ICellRange, INotebookDocumentFilter, isDocumentExcludePattern, NotebookCellMetadata, NotebookCellRunState, NOTEBOOK_EDITOR_CURSOR_BEGIN_END, NOTEBOOK_EDITOR_CURSOR_BOUNDARY, TransientMetadata } from 'vs/workbench/contrib/notebook/common/notebookCommon';
 import { INotebookService } from 'vs/workbench/contrib/notebook/common/notebookService';
@@ -117,6 +117,61 @@ export interface INotebookCellActionContext extends INotebookActionContext {
 	cell: ICellViewModel;
 }
 
+function getContextFromActiveEditor(editorService: IEditorService) {
+	const editor = getNotebookEditorFromEditorPane(editorService.activeEditorPane);
+	if (!editor) {
+		return;
+	}
+
+	if (!editor.hasModel()) {
+		return;
+	}
+
+	const activeCell = editor.getActiveCell();
+	return {
+		cell: activeCell,
+		notebookEditor: editor
+	};
+}
+
+function getWidgetFromUri(accessor: ServicesAccessor, uri: URI) {
+	const editorService = accessor.get(IEditorService);
+	const notebookWidgetService = accessor.get(INotebookEditorWidgetService);
+	const editorId = editorService.getEditors(EditorsOrder.SEQUENTIAL).find(editorId => editorId.editor instanceof NotebookEditorInput && editorId.editor.resource?.toString() === uri.toString());
+	if (!editorId) {
+		return undefined;
+	}
+
+	const notebookEditorInput = editorId.editor as NotebookEditorInput;
+	if (!notebookEditorInput.resource) {
+		return undefined;
+	}
+
+	const widget = notebookWidgetService.widgets.find(widget => widget.textModel?.viewType === notebookEditorInput.viewType && widget.textModel?.uri.toString() === notebookEditorInput.resource.toString());
+
+	if (widget && widget.hasModel()) {
+		return widget;
+	}
+
+	return undefined;
+}
+
+function getContextFromUri(accessor: ServicesAccessor, context?: any) {
+	const uri = URI.revive(context);
+
+	if (uri) {
+		const widget = getWidgetFromUri(accessor, uri);
+
+		if (widget) {
+			return {
+				notebookEditor: widget,
+			};
+		}
+	}
+
+	return undefined;
+}
+
 abstract class NotebookAction extends Action2 {
 	constructor(desc: IAction2Options) {
 		if (desc.f1 !== false) {
@@ -164,22 +219,7 @@ abstract class NotebookAction extends Action2 {
 	}
 
 	protected getEditorContextFromArgsOrActive(accessor: ServicesAccessor, context?: any): INotebookActionContext | undefined {
-		const editorService = accessor.get(IEditorService);
-
-		const editor = getActiveNotebookEditor(editorService);
-		if (!editor) {
-			return;
-		}
-
-		if (!editor.hasModel()) {
-			return;
-		}
-
-		const activeCell = editor.getActiveCell();
-		return {
-			cell: activeCell,
-			notebookEditor: editor
-		};
+		return getContextFromActiveEditor(accessor.get(IEditorService));
 	}
 }
 
@@ -212,22 +252,6 @@ abstract class NotebookCellAction<T = INotebookCellActionContext> extends Notebo
 	abstract runWithContext(accessor: ServicesAccessor, context: INotebookCellActionContext): Promise<void>;
 }
 
-export function getWidgetFromUri(accessor: ServicesAccessor, uri: URI) {
-	const editorService = accessor.get(IEditorService);
-	const notebookWidgetService = accessor.get(INotebookEditorWidgetService);
-	const editorId = editorService.getEditors(EditorsOrder.SEQUENTIAL).find(editorId => editorId.editor instanceof NotebookEditorInput && editorId.editor.resource?.toString() === uri.toString());
-
-	if (editorId) {
-		const widget = notebookWidgetService.widgets.find(widget => widget.textModel?.viewType === (editorId.editor as NotebookEditorInput).viewType && widget.uri?.toString() === editorId.editor.resource!.toString());
-
-		if (widget && widget.hasModel()) {
-			return widget;
-		}
-	}
-
-	return undefined;
-}
-
 registerAction2(class ExecuteCell extends NotebookCellAction<ICellRange> {
 	constructor() {
 		super({
@@ -443,6 +467,7 @@ export class DeleteCellAction extends MenuItemAction {
 				id: DELETE_CELL_COMMAND_ID,
 				title: localize('notebookActions.deleteCell', "Delete Cell"),
 				icon: icons.deleteCellIcon,
+				precondition: NOTEBOOK_EDITOR_EDITABLE.isEqualTo(true)
 			},
 			undefined,
 			{ shouldForwardArgs: true },
@@ -547,35 +572,7 @@ registerAction2(class extends NotebookAction {
 	}
 
 	getEditorContextFromArgsOrActive(accessor: ServicesAccessor, context?: UriComponents): INotebookActionContext | undefined {
-		if (context) {
-			const uri = URI.revive(context);
-
-			if (uri) {
-				const widget = getWidgetFromUri(accessor, uri);
-
-				if (widget) {
-					return {
-						notebookEditor: widget,
-					};
-				}
-			}
-		}
-
-		const editorService = accessor.get(IEditorService);
-		const editor = getActiveNotebookEditor(editorService);
-		if (!editor) {
-			return;
-		}
-
-		if (!editor.hasModel()) {
-			return;
-		}
-
-		const activeCell = editor.getActiveCell();
-		return {
-			cell: activeCell,
-			notebookEditor: editor
-		};
+		return getContextFromUri(accessor, context) ?? getContextFromActiveEditor(accessor.get(IEditorService));
 	}
 
 	async runWithContext(accessor: ServicesAccessor, context: INotebookActionContext): Promise<void> {
@@ -622,35 +619,7 @@ registerAction2(class extends NotebookAction {
 	}
 
 	getEditorContextFromArgsOrActive(accessor: ServicesAccessor, context?: UriComponents): INotebookActionContext | undefined {
-		if (context) {
-			const uri = URI.revive(context);
-
-			if (uri) {
-				const widget = getWidgetFromUri(accessor, uri);
-
-				if (widget) {
-					return {
-						notebookEditor: widget,
-					};
-				}
-			}
-		}
-
-		const editorService = accessor.get(IEditorService);
-		const editor = getActiveNotebookEditor(editorService);
-		if (!editor) {
-			return;
-		}
-
-		if (!editor.hasModel()) {
-			return;
-		}
-
-		const activeCell = editor.getActiveCell();
-		return {
-			cell: activeCell,
-			notebookEditor: editor
-		};
+		return getContextFromUri(accessor, context) ?? getContextFromActiveEditor(accessor.get(IEditorService));
 	}
 
 	async runWithContext(accessor: ServicesAccessor, context: INotebookActionContext): Promise<void> {
@@ -661,7 +630,8 @@ registerAction2(class extends NotebookAction {
 MenuRegistry.appendMenuItem(MenuId.NotebookCellTitle, {
 	submenu: MenuId.NotebookCellInsert,
 	title: localize('notebookMenu.insertCell', "Insert Cell"),
-	group: CellOverflowToolbarGroups.Insert
+	group: CellOverflowToolbarGroups.Insert,
+	when: NOTEBOOK_EDITOR_EDITABLE.isEqualTo(true)
 });
 
 MenuRegistry.appendMenuItem(MenuId.EditorContext, {
@@ -741,12 +711,6 @@ registerAction2(class extends NotebookCellAction {
 	}
 });
 
-export function getActiveNotebookEditor(editorService: IEditorService): INotebookEditor | undefined {
-	// TODO@roblourens can `isNotebookEditor` be on INotebookEditor to avoid a circular dependency?
-	const activeEditorPane = editorService.activeEditorPane as unknown as { isNotebookEditor?: boolean; } | undefined;
-	return activeEditorPane?.isNotebookEditor ? (editorService.activeEditorPane?.getControl() as INotebookEditor) : undefined;
-}
-
 async function runCell(accessor: ServicesAccessor, context: INotebookCellActionContext): Promise<void> {
 	if (context.cell.metadata?.runState === NotebookCellRunState.Running) {
 		return;
@@ -777,7 +741,7 @@ export async function changeCellToKind(kind: CellKind, context: INotebookCellAct
 
 	const text = cell.getText();
 	const idx = notebookEditor.viewModel.getCellIndex(cell);
-	notebookEditor.viewModel.notebookDocument.applyEdits(notebookEditor.viewModel.notebookDocument.versionId, [
+	notebookEditor.viewModel.notebookDocument.applyEdits([
 		{
 			editType: CellEditType.Replace,
 			index: idx,
@@ -918,7 +882,8 @@ MenuRegistry.appendMenuItem(MenuId.NotebookCellBetween, {
 		tooltip: localize('notebookActions.menu.insertCode.tooltip', "Add Code Cell")
 	},
 	order: 0,
-	group: 'inline'
+	group: 'inline',
+	when: NOTEBOOK_EDITOR_EDITABLE.isEqualTo(true)
 });
 
 MenuRegistry.appendMenuItem(MenuId.NotebookCellListTop, {
@@ -928,7 +893,8 @@ MenuRegistry.appendMenuItem(MenuId.NotebookCellListTop, {
 		tooltip: localize('notebookActions.menu.insertCode.tooltip', "Add Code Cell")
 	},
 	order: 0,
-	group: 'inline'
+	group: 'inline',
+	when: NOTEBOOK_EDITOR_EDITABLE.isEqualTo(true)
 });
 
 registerAction2(class extends InsertCellCommand {
@@ -970,7 +936,8 @@ MenuRegistry.appendMenuItem(MenuId.NotebookCellBetween, {
 		tooltip: localize('notebookActions.menu.insertMarkdown.tooltip', "Add Markdown Cell")
 	},
 	order: 1,
-	group: 'inline'
+	group: 'inline',
+	when: NOTEBOOK_EDITOR_EDITABLE.isEqualTo(true)
 });
 
 MenuRegistry.appendMenuItem(MenuId.NotebookCellListTop, {
@@ -980,7 +947,8 @@ MenuRegistry.appendMenuItem(MenuId.NotebookCellListTop, {
 		tooltip: localize('notebookActions.menu.insertMarkdown.tooltip', "Add Markdown Cell")
 	},
 	order: 1,
-	group: 'inline'
+	group: 'inline',
+	when: NOTEBOOK_EDITOR_EDITABLE.isEqualTo(true)
 });
 
 registerAction2(class extends NotebookCellAction {
@@ -1567,12 +1535,12 @@ registerAction2(class extends NotebookCellAction {
 			title: localize('clearCellOutputs', 'Clear Cell Outputs'),
 			menu: {
 				id: MenuId.NotebookCellTitle,
-				when: ContextKeyExpr.and(NOTEBOOK_CELL_TYPE.isEqualTo('code'), NOTEBOOK_EDITOR_RUNNABLE, NOTEBOOK_CELL_HAS_OUTPUTS),
+				when: ContextKeyExpr.and(NOTEBOOK_CELL_TYPE.isEqualTo('code'), NOTEBOOK_EDITOR_RUNNABLE, NOTEBOOK_CELL_HAS_OUTPUTS, NOTEBOOK_EDITOR_EDITABLE, NOTEBOOK_CELL_EDITABLE),
 				order: CellToolbarOrder.ClearCellOutput,
 				group: CELL_TITLE_OUTPUT_GROUP_ID
 			},
 			keybinding: {
-				when: ContextKeyExpr.and(NOTEBOOK_EDITOR_FOCUSED, ContextKeyExpr.not(InputFocusedContextKey), NOTEBOOK_CELL_HAS_OUTPUTS),
+				when: ContextKeyExpr.and(NOTEBOOK_EDITOR_FOCUSED, ContextKeyExpr.not(InputFocusedContextKey), NOTEBOOK_CELL_HAS_OUTPUTS, NOTEBOOK_EDITOR_EDITABLE, NOTEBOOK_CELL_EDITABLE),
 				primary: KeyMod.Alt | KeyCode.Delete,
 				weight: KeybindingWeight.WorkbenchContrib
 			},
@@ -1593,10 +1561,10 @@ registerAction2(class extends NotebookCellAction {
 			return;
 		}
 
-		editor.viewModel.notebookDocument.applyEdits(editor.viewModel.notebookDocument.versionId, [{ editType: CellEditType.Output, index, outputs: [] }], true, undefined, () => undefined, undefined);
+		editor.viewModel.notebookDocument.applyEdits([{ editType: CellEditType.Output, index, outputs: [] }], true, undefined, () => undefined, undefined);
 
 		if (context.cell.metadata && context.cell.metadata?.runState !== NotebookCellRunState.Running) {
-			context.notebookEditor.viewModel.notebookDocument.applyEdits(context.notebookEditor.viewModel.notebookDocument.versionId, [{
+			context.notebookEditor.viewModel.notebookDocument.applyEdits([{
 				editType: CellEditType.Metadata, index, metadata: {
 					...context.cell.metadata,
 					runState: NotebookCellRunState.Idle,
@@ -1756,7 +1724,6 @@ export class ChangeCellLanguageAction extends NotebookCellAction<ICellRange> {
 		} else {
 			const index = context.notebookEditor.viewModel.notebookDocument.cells.indexOf(context.cell.model);
 			context.notebookEditor.viewModel.notebookDocument.applyEdits(
-				context.notebookEditor.viewModel.notebookDocument.versionId,
 				[{ editType: CellEditType.CellLanguage, index, language: languageId }],
 				true, undefined, () => undefined, undefined
 			);
@@ -1805,7 +1772,7 @@ registerAction2(class extends NotebookAction {
 			return;
 		}
 
-		editor.viewModel.notebookDocument.applyEdits(editor.viewModel.notebookDocument.versionId,
+		editor.viewModel.notebookDocument.applyEdits(
 			editor.viewModel.notebookDocument.cells.map((cell, index) => ({
 				editType: CellEditType.Output, index, outputs: []
 			})), true, undefined, () => undefined, undefined);
@@ -1827,7 +1794,7 @@ registerAction2(class extends NotebookAction {
 			}
 		}).filter(edit => !!edit) as ICellEditOperation[];
 		if (clearExecutionMetadataEdits.length) {
-			context.notebookEditor.viewModel.notebookDocument.applyEdits(context.notebookEditor.viewModel.notebookDocument.versionId, clearExecutionMetadataEdits, true, undefined, () => undefined, undefined);
+			context.notebookEditor.viewModel.notebookDocument.applyEdits(clearExecutionMetadataEdits, true, undefined, () => undefined, undefined);
 		}
 	}
 });
@@ -1962,7 +1929,7 @@ abstract class ChangeNotebookCellMetadataAction extends NotebookCellAction {
 			return;
 		}
 
-		textModel.applyEdits(textModel.versionId, [{ editType: CellEditType.Metadata, index, metadata: { ...context.cell.metadata, ...this.getMetadataDelta() } }], true, undefined, () => undefined, undefined);
+		textModel.applyEdits([{ editType: CellEditType.Metadata, index, metadata: { ...context.cell.metadata, ...this.getMetadataDelta() } }], true, undefined, () => undefined, undefined);
 	}
 
 	abstract getMetadataDelta(): NotebookCellMetadata;
@@ -2073,7 +2040,7 @@ registerAction2(class extends Action2 {
 	protected getActiveEditorContext(accessor: ServicesAccessor): INotebookActionContext | undefined {
 		const editorService = accessor.get(IEditorService);
 
-		const editor = getActiveNotebookEditor(editorService);
+		const editor = getNotebookEditorFromEditorPane(editorService.activeEditorPane);
 		if (!editor) {
 			return;
 		}
@@ -2116,7 +2083,7 @@ CommandsRegistry.registerCommand('notebook.trust', (accessor, args) => {
 	const document = notebookService.listNotebookDocuments().find(document => document.uri.toString() === uri.toString());
 
 	if (document) {
-		document.applyEdits(document.versionId, [{ editType: CellEditType.DocumentMetadata, metadata: { ...document.metadata, ...{ trusted: true } } }], true, undefined, () => undefined, undefined, false);
+		document.applyEdits([{ editType: CellEditType.DocumentMetadata, metadata: { ...document.metadata, ...{ trusted: true } } }], true, undefined, () => undefined, undefined, false);
 	}
 });
 
diff --git a/src/vs/workbench/contrib/notebook/browser/contrib/find/findController.ts b/src/vs/workbench/contrib/notebook/browser/contrib/find/findController.ts
index baab6d97611..da478b8b431 100644
--- a/src/vs/workbench/contrib/notebook/browser/contrib/find/findController.ts
+++ b/src/vs/workbench/contrib/notebook/browser/contrib/find/findController.ts
@@ -6,7 +6,7 @@
 import 'vs/css!./media/notebookFind';
 import { IContextViewService } from 'vs/platform/contextview/browser/contextView';
 import { IContextKeyService, IContextKey, ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey';
-import { KEYBINDING_CONTEXT_NOTEBOOK_FIND_WIDGET_FOCUSED, INotebookEditor, CellFindMatch, CellEditState, INotebookEditorContribution, NOTEBOOK_EDITOR_FOCUSED, NOTEBOOK_EDITOR_OPEN } from 'vs/workbench/contrib/notebook/browser/notebookBrowser';
+import { KEYBINDING_CONTEXT_NOTEBOOK_FIND_WIDGET_FOCUSED, INotebookEditor, CellFindMatch, CellEditState, INotebookEditorContribution, NOTEBOOK_EDITOR_FOCUSED, NOTEBOOK_EDITOR_OPEN, getNotebookEditorFromEditorPane } from 'vs/workbench/contrib/notebook/browser/notebookBrowser';
 import { FindDecorations } from 'vs/editor/contrib/find/findDecorations';
 import { ModelDecorationOptions } from 'vs/editor/common/model/textModel';
 import { IModelDeltaDecoration } from 'vs/editor/common/model';
@@ -23,7 +23,6 @@ import { localize } from 'vs/nls';
 import { KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
 import { ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
 import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
-import { getActiveNotebookEditor } from 'vs/workbench/contrib/notebook/browser/contrib/coreActions';
 import { FindReplaceState } from 'vs/editor/contrib/find/findState';
 import { INotebookSearchOptions } from 'vs/workbench/contrib/notebook/common/notebookCommon';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
@@ -161,7 +160,7 @@ export class NotebookFindWidget extends SimpleFindReplaceWidget implements INote
 	private revealCellRange(cellIndex: number, matchIndex: number) {
 		this._findMatches[cellIndex].cell.editState = CellEditState.Editing;
 		this._notebookEditor.focusElement(this._findMatches[cellIndex].cell);
-		this._notebookEditor.setCellSelection(this._findMatches[cellIndex].cell, this._findMatches[cellIndex].matches[matchIndex].range);
+		this._notebookEditor.setCellEditorSelection(this._findMatches[cellIndex].cell, this._findMatches[cellIndex].matches[matchIndex].range);
 		this._notebookEditor.revealRangeInCenterIfOutsideViewportAsync(this._findMatches[cellIndex].cell, this._findMatches[cellIndex].matches[matchIndex].range);
 	}
 
@@ -367,7 +366,7 @@ registerAction2(class extends Action2 {
 
 	async run(accessor: ServicesAccessor): Promise<void> {
 		const editorService = accessor.get(IEditorService);
-		const editor = getActiveNotebookEditor(editorService);
+		const editor = getNotebookEditorFromEditorPane(editorService.activeEditorPane);
 
 		if (!editor) {
 			return;
@@ -394,7 +393,7 @@ registerAction2(class extends Action2 {
 
 	async run(accessor: ServicesAccessor): Promise<void> {
 		const editorService = accessor.get(IEditorService);
-		const editor = getActiveNotebookEditor(editorService);
+		const editor = getNotebookEditorFromEditorPane(editorService.activeEditorPane);
 
 		if (!editor) {
 			return;
@@ -407,7 +406,7 @@ registerAction2(class extends Action2 {
 
 EditorStartFindAction.addImplementation(100, (accessor: ServicesAccessor, args: any) => {
 	const editorService = accessor.get(IEditorService);
-	const editor = getActiveNotebookEditor(editorService);
+	const editor = getNotebookEditorFromEditorPane(editorService.activeEditorPane);
 
 	if (!editor) {
 		return false;
@@ -420,7 +419,7 @@ EditorStartFindAction.addImplementation(100, (accessor: ServicesAccessor, args:
 
 EditorStartFindReplaceAction.addImplementation(100, (accessor: ServicesAccessor, args: any) => {
 	const editorService = accessor.get(IEditorService);
-	const editor = getActiveNotebookEditor(editorService);
+	const editor = getNotebookEditorFromEditorPane(editorService.activeEditorPane);
 
 	if (!editor) {
 		return false;
diff --git a/src/vs/workbench/contrib/notebook/browser/contrib/fold/folding.ts b/src/vs/workbench/contrib/notebook/browser/contrib/fold/folding.ts
index 548bc3f3bb3..8ffae23eec0 100644
--- a/src/vs/workbench/contrib/notebook/browser/contrib/fold/folding.ts
+++ b/src/vs/workbench/contrib/notebook/browser/contrib/fold/folding.ts
@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { Disposable, DisposableStore } from 'vs/base/common/lifecycle';
-import { INotebookEditor, INotebookEditorMouseEvent, INotebookEditorContribution, NOTEBOOK_EDITOR_FOCUSED, NOTEBOOK_IS_ACTIVE_EDITOR } from 'vs/workbench/contrib/notebook/browser/notebookBrowser';
+import { INotebookEditor, INotebookEditorMouseEvent, INotebookEditorContribution, NOTEBOOK_EDITOR_FOCUSED, NOTEBOOK_IS_ACTIVE_EDITOR, getNotebookEditorFromEditorPane } from 'vs/workbench/contrib/notebook/browser/notebookBrowser';
 import { CellFoldingState, FoldingModel } from 'vs/workbench/contrib/notebook/browser/contrib/fold/foldingModel';
 import { CellKind, ICellRange } from 'vs/workbench/contrib/notebook/common/notebookCommon';
 import { registerNotebookContribution } from 'vs/workbench/contrib/notebook/browser/notebookEditorExtensions';
@@ -15,7 +15,7 @@ import { KeyCode, KeyMod } from 'vs/base/common/keyCodes';
 import { KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
 import { ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
 import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
-import { getActiveNotebookEditor, NOTEBOOK_ACTIONS_CATEGORY } from 'vs/workbench/contrib/notebook/browser/contrib/coreActions';
+import { NOTEBOOK_ACTIONS_CATEGORY } from 'vs/workbench/contrib/notebook/browser/contrib/coreActions';
 import { localize } from 'vs/nls';
 import { FoldingRegion } from 'vs/editor/contrib/folding/foldingRanges';
 
@@ -196,7 +196,7 @@ registerAction2(class extends Action2 {
 	async run(accessor: ServicesAccessor, args?: { index: number, levels: number, direction: 'up' | 'down' }): Promise<void> {
 		const editorService = accessor.get(IEditorService);
 
-		const editor = getActiveNotebookEditor(editorService);
+		const editor = getNotebookEditorFromEditorPane(editorService.activeEditorPane);
 		if (!editor) {
 			return;
 		}
@@ -280,7 +280,7 @@ registerAction2(class extends Action2 {
 	async run(accessor: ServicesAccessor, args?: { index: number, levels: number, direction: 'up' | 'down' }): Promise<void> {
 		const editorService = accessor.get(IEditorService);
 
-		const editor = getActiveNotebookEditor(editorService);
+		const editor = getNotebookEditorFromEditorPane(editorService.activeEditorPane);
 		if (!editor) {
 			return;
 		}
diff --git a/src/vs/workbench/contrib/notebook/browser/contrib/fold/foldingModel.ts b/src/vs/workbench/contrib/notebook/browser/contrib/fold/foldingModel.ts
index d8aea00b48f..766b6907ac6 100644
--- a/src/vs/workbench/contrib/notebook/browser/contrib/fold/foldingModel.ts
+++ b/src/vs/workbench/contrib/notebook/browser/contrib/fold/foldingModel.ts
@@ -147,7 +147,12 @@ export class FoldingModel {
 	}
 
 	recompute() {
-		const cells = this._viewModel!.viewCells;
+		if (!this._viewModel) {
+			return;
+		}
+
+		const viewModel = this._viewModel;
+		const cells = viewModel.viewCells;
 		const stack: { index: number, level: number, endIndex: number }[] = [];
 
 		for (let i = 0; i < cells.length; i++) {
@@ -214,7 +219,7 @@ export class FoldingModel {
 
 		while (collapsedIndex !== -1 && k < newRegions.length) {
 			// get the latest range
-			const decRange = this._viewModel!.getTrackedRange(this._foldingRangeDecorationIds[collapsedIndex]);
+			const decRange = viewModel.getTrackedRange(this._foldingRangeDecorationIds[collapsedIndex]);
 			if (decRange) {
 				const collasedStartIndex = decRange.start;
 
@@ -244,8 +249,8 @@ export class FoldingModel {
 
 		// remove old tracked ranges and add new ones
 		// TODO@rebornix, implement delta
-		this._foldingRangeDecorationIds.forEach(id => this._viewModel!.setTrackedRange(id, null, TrackedRangeStickiness.GrowsOnlyWhenTypingAfter));
-		this._foldingRangeDecorationIds = cellRanges.map(region => this._viewModel!.setTrackedRange(null, region, TrackedRangeStickiness.GrowsOnlyWhenTypingAfter)).filter(str => str !== null) as string[];
+		this._foldingRangeDecorationIds.forEach(id => viewModel.setTrackedRange(id, null, TrackedRangeStickiness.GrowsOnlyWhenTypingAfter));
+		this._foldingRangeDecorationIds = cellRanges.map(region => viewModel.setTrackedRange(null, region, TrackedRangeStickiness.GrowsOnlyWhenTypingAfter)).filter(str => str !== null) as string[];
 
 		this._regions = newRegions;
 		this._onDidFoldingRegionChanges.fire();
@@ -269,12 +274,16 @@ export class FoldingModel {
 	}
 
 	public applyMemento(state: ICellRange[]): boolean {
+		if (!this._viewModel) {
+			return false;
+		}
+
 		let i = 0;
 		let k = 0;
 
 		while (k < state.length && i < this._regions.length) {
 			// get the latest range
-			const decRange = this._viewModel!.getTrackedRange(this._foldingRangeDecorationIds[i]);
+			const decRange = this._viewModel.getTrackedRange(this._foldingRangeDecorationIds[i]);
 			if (decRange) {
 				const collasedStartIndex = state[k].start;
 
@@ -310,3 +319,8 @@ export interface EditorFoldingStateDelegate {
 	getCellIndex(cell: CellViewModel): number;
 	getFoldingState(index: number): CellFoldingState;
 }
+
+export function updateFoldingStateAtIndex(foldingModel: FoldingModel, index: number, collapsed: boolean) {
+	const range = foldingModel.regions.findRange(index + 1);
+	foldingModel.setCollapsed(range, collapsed);
+}
diff --git a/src/vs/workbench/contrib/notebook/browser/contrib/fold/test/notebookFolding.test.ts b/src/vs/workbench/contrib/notebook/browser/contrib/fold/test/notebookFolding.test.ts
index 51d77a18fbd..9d21ca69de5 100644
--- a/src/vs/workbench/contrib/notebook/browser/contrib/fold/test/notebookFolding.test.ts
+++ b/src/vs/workbench/contrib/notebook/browser/contrib/fold/test/notebookFolding.test.ts
@@ -6,26 +6,15 @@
 import * as assert from 'assert';
 import { CellKind } from 'vs/workbench/contrib/notebook/common/notebookCommon';
 import { setupInstantiationService, withTestNotebook } from 'vs/workbench/contrib/notebook/test/testNotebookEditor';
-import { IBulkEditService } from 'vs/editor/browser/services/bulkEditService';
 import { IUndoRedoService } from 'vs/platform/undoRedo/common/undoRedo';
-import { FoldingModel } from 'vs/workbench/contrib/notebook/browser/contrib/fold/foldingModel';
-
-function updateFoldingStateAtIndex(foldingModel: FoldingModel, index: number, collapsed: boolean) {
-	const range = foldingModel.regions.findRange(index + 1);
-	foldingModel.setCollapsed(range, collapsed);
-}
+import { FoldingModel, updateFoldingStateAtIndex } from 'vs/workbench/contrib/notebook/browser/contrib/fold/foldingModel';
 
 suite('Notebook Folding', () => {
 	const instantiationService = setupInstantiationService();
-	const blukEditService = instantiationService.get(IBulkEditService);
-	const undoRedoService = instantiationService.stub(IUndoRedoService, () => { });
 	instantiationService.spy(IUndoRedoService, 'pushElement');
 
 	test('Folding based on markdown cells', function () {
-		withTestNotebook(
-			instantiationService,
-			blukEditService,
-			undoRedoService,
+		withTestNotebook(instantiationService,
 			[
 				['# header 1', 'markdown', CellKind.Markdown, [], {}],
 				['body', 'markdown', CellKind.Markdown, [], {}],
@@ -53,8 +42,6 @@ suite('Notebook Folding', () => {
 	test('Top level header in a cell wins', function () {
 		withTestNotebook(
 			instantiationService,
-			blukEditService,
-			undoRedoService,
 			[
 				['# header 1', 'markdown', CellKind.Markdown, [], {}],
 				['body', 'markdown', CellKind.Markdown, [], {}],
@@ -87,8 +74,6 @@ suite('Notebook Folding', () => {
 	test('Folding', function () {
 		withTestNotebook(
 			instantiationService,
-			blukEditService,
-			undoRedoService,
 			[
 				['# header 1', 'markdown', CellKind.Markdown, [], {}],
 				['body', 'markdown', CellKind.Markdown, [], {}],
@@ -111,8 +96,6 @@ suite('Notebook Folding', () => {
 
 		withTestNotebook(
 			instantiationService,
-			blukEditService,
-			undoRedoService,
 			[
 				['# header 1', 'markdown', CellKind.Markdown, [], {}],
 				['body', 'markdown', CellKind.Markdown, [], {}],
@@ -136,8 +119,6 @@ suite('Notebook Folding', () => {
 
 		withTestNotebook(
 			instantiationService,
-			blukEditService,
-			undoRedoService,
 			[
 				['# header 1', 'markdown', CellKind.Markdown, [], {}],
 				['body', 'markdown', CellKind.Markdown, [], {}],
@@ -163,8 +144,6 @@ suite('Notebook Folding', () => {
 	test('Nested Folding', function () {
 		withTestNotebook(
 			instantiationService,
-			blukEditService,
-			undoRedoService,
 			[
 				['# header 1', 'markdown', CellKind.Markdown, [], {}],
 				['body', 'markdown', CellKind.Markdown, [], {}],
@@ -220,8 +199,6 @@ suite('Notebook Folding', () => {
 	test('Folding Memento', function () {
 		withTestNotebook(
 			instantiationService,
-			blukEditService,
-			undoRedoService,
 			[
 				['# header 1', 'markdown', CellKind.Markdown, [], {}],
 				['body', 'markdown', CellKind.Markdown, [], {}],
@@ -251,8 +228,6 @@ suite('Notebook Folding', () => {
 
 		withTestNotebook(
 			instantiationService,
-			blukEditService,
-			undoRedoService,
 			[
 				['# header 1', 'markdown', CellKind.Markdown, [], {}],
 				['body', 'markdown', CellKind.Markdown, [], {}],
@@ -286,8 +261,6 @@ suite('Notebook Folding', () => {
 
 		withTestNotebook(
 			instantiationService,
-			blukEditService,
-			undoRedoService,
 			[
 				['# header 1', 'markdown', CellKind.Markdown, [], {}],
 				['body', 'markdown', CellKind.Markdown, [], {}],
@@ -323,8 +296,6 @@ suite('Notebook Folding', () => {
 	test('View Index', function () {
 		withTestNotebook(
 			instantiationService,
-			blukEditService,
-			undoRedoService,
 			[
 				['# header 1', 'markdown', CellKind.Markdown, [], {}],
 				['body', 'markdown', CellKind.Markdown, [], {}],
@@ -362,8 +333,6 @@ suite('Notebook Folding', () => {
 
 		withTestNotebook(
 			instantiationService,
-			blukEditService,
-			undoRedoService,
 			[
 				['# header 1', 'markdown', CellKind.Markdown, [], {}],
 				['body', 'markdown', CellKind.Markdown, [], {}],
diff --git a/src/vs/workbench/contrib/notebook/browser/contrib/format/formatting.ts b/src/vs/workbench/contrib/notebook/browser/contrib/format/formatting.ts
index b16e6f07410..5525fbc5c61 100644
--- a/src/vs/workbench/contrib/notebook/browser/contrib/format/formatting.ts
+++ b/src/vs/workbench/contrib/notebook/browser/contrib/format/formatting.ts
@@ -6,11 +6,11 @@
 import { registerAction2, Action2, MenuId } from 'vs/platform/actions/common/actions';
 import { ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey';
 import { localize } from 'vs/nls';
-import { NOTEBOOK_IS_ACTIVE_EDITOR, NOTEBOOK_EDITOR_EDITABLE } from 'vs/workbench/contrib/notebook/browser/notebookBrowser';
+import { NOTEBOOK_IS_ACTIVE_EDITOR, NOTEBOOK_EDITOR_EDITABLE, getNotebookEditorFromEditorPane } from 'vs/workbench/contrib/notebook/browser/notebookBrowser';
 import { KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
 import { KeyCode, KeyMod } from 'vs/base/common/keyCodes';
 import { ServicesAccessor, IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { getActiveNotebookEditor, NOTEBOOK_ACTIONS_CATEGORY } from 'vs/workbench/contrib/notebook/browser/contrib/coreActions';
+import { NOTEBOOK_ACTIONS_CATEGORY } from 'vs/workbench/contrib/notebook/browser/contrib/coreActions';
 import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
 import { ITextModelService } from 'vs/editor/common/services/resolverService';
 import { DisposableStore } from 'vs/base/common/lifecycle';
@@ -53,7 +53,7 @@ registerAction2(class extends Action2 {
 		const editorWorkerService = accessor.get(IEditorWorkerService);
 		const bulkEditService = accessor.get(IBulkEditService);
 
-		const editor = getActiveNotebookEditor(editorService);
+		const editor = getNotebookEditorFromEditorPane(editorService.activeEditorPane);
 		if (!editor || !editor.viewModel) {
 			return;
 		}
diff --git a/src/vs/workbench/contrib/notebook/browser/contrib/outline/notebookOutline.ts b/src/vs/workbench/contrib/notebook/browser/contrib/outline/notebookOutline.ts
index 26dcdb5ab7f..1d789cf6d59 100644
--- a/src/vs/workbench/contrib/notebook/browser/contrib/outline/notebookOutline.ts
+++ b/src/vs/workbench/contrib/notebook/browser/contrib/outline/notebookOutline.ts
@@ -237,7 +237,7 @@ class NotebookQuickPickProvider implements IQuickPickDataSource<OutlineEntry> {
 		@IThemeService private readonly _themeService: IThemeService
 	) { }
 
-	getQuickPickElements(): Iterable<IQuickPickOutlineElement<OutlineEntry>> {
+	getQuickPickElements(): IQuickPickOutlineElement<OutlineEntry>[] {
 		const bucket: OutlineEntry[] = [];
 		for (let entry of this._getEntries()) {
 			entry.asFlatList(bucket);
@@ -273,7 +273,7 @@ class NotebookComparator implements IOutlineComparator<OutlineEntry> {
 	}
 }
 
-class NotebookCellOutline implements IOutline<OutlineEntry> {
+export class NotebookCellOutline implements IOutline<OutlineEntry> {
 
 	private readonly _dispoables = new DisposableStore();
 
@@ -401,36 +401,41 @@ class NotebookCellOutline implements IOutline<OutlineEntry> {
 				continue;
 			}
 
-			// anaslse cell text but cap it 10000 characters
+			// The cap the amount of characters that we look at and use the following logic
+			// - for MD prefer headings (each header is an entry)
+			// - otherwise use the first none-empty line of the cell (MD or code)
 			let content = cell.getText().substr(0, 10_000);
-			let level = 7;
+			let hasHeader = false;
 
 			if (isMarkdown) {
-				// MD cell: "render" as plain text, find highest header
 				for (const token of marked.lexer(content, { gfm: true })) {
 					if (token.type === 'heading') {
-						level = Math.min(level, token.depth);
+						hasHeader = true;
+						entries.push(new OutlineEntry(entries.length, token.depth, cell, renderMarkdownAsPlaintext({ value: token.text }).trim(), Codicon.markdown));
 					}
 				}
-				content = renderMarkdownAsPlaintext({ value: content });
-			}
-
-			// find first none empty line or use default text
-			const lineMatch = content.match(/^.*\w+.*\w*$/m);
-			let preview: string;
-			if (!lineMatch) {
-				preview = localize('empty', "empty cell");
-			} else {
-				preview = lineMatch[0].trim();
-				if (preview.length >= 64) {
-					preview = preview.slice(0, 64) + '…';
+				if (!hasHeader) {
+					content = renderMarkdownAsPlaintext({ value: content });
 				}
 			}
 
-			const entry = new OutlineEntry(i, level, cell, preview, isMarkdown ? Codicon.markdown : Codicon.code);
-			entries.push(entry);
+			if (!hasHeader) {
+				const lineMatch = content.match(/^.*\w+.*\w*$/m);
+				let preview: string;
+				if (!lineMatch) {
+					preview = localize('empty', "empty cell");
+				} else {
+					preview = lineMatch[0].trim();
+					if (preview.length >= 64) {
+						preview = preview.slice(0, 64) + '…';
+					}
+				}
+
+				entries.push(new OutlineEntry(entries.length, 7, cell, preview, isMarkdown ? Codicon.markdown : Codicon.code));
+			}
+
 			if (cell.handle === selected) {
-				this._activeEntry = entry;
+				this._activeEntry = entries[entries.length - 1];
 			}
 
 			// send an event whenever any of the cells change
@@ -513,7 +518,7 @@ class NotebookCellOutline implements IOutline<OutlineEntry> {
 		const { viewModel } = this._editor;
 
 		if (viewModel) {
-			const cell = viewModel.getCellByIndex(viewModel.getSelection()?.start);
+			const cell = viewModel.getCellByIndex(viewModel.getSelection().start);
 			if (cell) {
 				for (let entry of this._entries) {
 					newActive = entry.find(cell, []);
diff --git a/src/vs/workbench/contrib/notebook/browser/contrib/outline/test/notebookOutline.test.ts b/src/vs/workbench/contrib/notebook/browser/contrib/outline/test/notebookOutline.test.ts
new file mode 100644
index 00000000000..14423e6d2d9
--- /dev/null
+++ b/src/vs/workbench/contrib/notebook/browser/contrib/outline/test/notebookOutline.test.ts
@@ -0,0 +1,98 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import * as assert from 'assert';
+import { setupInstantiationService, withTestNotebook } from 'vs/workbench/contrib/notebook/test/testNotebookEditor';
+import { OutlineTarget } from 'vs/workbench/services/outline/browser/outline';
+import { NotebookCellOutline } from 'vs/workbench/contrib/notebook/browser/contrib/outline/notebookOutline';
+import { IFileIconTheme, IThemeService } from 'vs/platform/theme/common/themeService';
+import { mock } from 'vs/base/test/common/mock';
+import { Event } from 'vs/base/common/event';
+import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
+import { IMarkerService } from 'vs/platform/markers/common/markers';
+import { MarkerService } from 'vs/platform/markers/common/markerService';
+import { CellKind, IOutputDto, NotebookCellMetadata } from 'vs/workbench/contrib/notebook/common/notebookCommon';
+import { IActiveNotebookEditor } from 'vs/workbench/contrib/notebook/browser/notebookBrowser';
+
+
+suite('Notebook Outline', function () {
+
+	const instantiationService = setupInstantiationService();
+	instantiationService.set(IEditorService, new class extends mock<IEditorService>() { });
+	instantiationService.set(IMarkerService, new MarkerService());
+	instantiationService.set(IThemeService, new class extends mock<IThemeService>() {
+		onDidFileIconThemeChange = Event.None;
+		getFileIconTheme(): IFileIconTheme {
+			return { hasFileIcons: true, hasFolderIcons: true, hidesExplorerArrows: false };
+		}
+	});
+
+	function withNotebookOutline<R = any>(cells: [source: string, lang: string, kind: CellKind, output?: IOutputDto[], metadata?: NotebookCellMetadata][], callback: (outline: NotebookCellOutline, editor: IActiveNotebookEditor) => R): R {
+		return withTestNotebook(instantiationService, cells, (editor) => {
+			if (!editor.hasModel()) {
+				assert.ok(false, 'MUST have active text editor');
+			}
+			const outline = instantiationService.createInstance(NotebookCellOutline, editor, OutlineTarget.OutlinePane);
+			return callback(outline, editor);
+		});
+
+	}
+
+	test('basic', function () {
+		withNotebookOutline([], outline => {
+			assert.ok(outline instanceof NotebookCellOutline);
+			assert.deepStrictEqual(outline.config.quickPickDataSource.getQuickPickElements(), []);
+		});
+	});
+
+	test('special characters in heading', function () {
+		withNotebookOutline([
+			['# Hellö & Hällo', 'md', CellKind.Markdown]
+		], outline => {
+			assert.ok(outline instanceof NotebookCellOutline);
+			assert.deepStrictEqual(outline.config.quickPickDataSource.getQuickPickElements().length, 1);
+			assert.deepStrictEqual(outline.config.quickPickDataSource.getQuickPickElements()[0].label, 'Hellö & Hällo');
+		});
+
+		withNotebookOutline([
+			['# bo<i>ld</i>', 'md', CellKind.Markdown]
+		], outline => {
+			assert.ok(outline instanceof NotebookCellOutline);
+			assert.deepStrictEqual(outline.config.quickPickDataSource.getQuickPickElements().length, 1);
+			assert.deepStrictEqual(outline.config.quickPickDataSource.getQuickPickElements()[0].label, 'bold');
+		});
+	});
+
+	test('Heading text defines entry label', function () {
+		return withNotebookOutline([
+			['foo\n # h1', 'md', CellKind.Markdown]
+		], outline => {
+			assert.ok(outline instanceof NotebookCellOutline);
+			assert.deepStrictEqual(outline.config.quickPickDataSource.getQuickPickElements().length, 1);
+			assert.deepStrictEqual(outline.config.quickPickDataSource.getQuickPickElements()[0].label, 'h1');
+		});
+	});
+
+	test('Notebook outline ignores markdown headings #115200', function () {
+		withNotebookOutline([
+			['## h2 \n# h1', 'md', CellKind.Markdown]
+		], outline => {
+			assert.ok(outline instanceof NotebookCellOutline);
+			assert.deepStrictEqual(outline.config.quickPickDataSource.getQuickPickElements().length, 2);
+			assert.deepStrictEqual(outline.config.quickPickDataSource.getQuickPickElements()[0].label, 'h2');
+			assert.deepStrictEqual(outline.config.quickPickDataSource.getQuickPickElements()[1].label, 'h1');
+		});
+
+		withNotebookOutline([
+			['## h2', 'md', CellKind.Markdown],
+			['# h1', 'md', CellKind.Markdown]
+		], outline => {
+			assert.ok(outline instanceof NotebookCellOutline);
+			assert.deepStrictEqual(outline.config.quickPickDataSource.getQuickPickElements().length, 2);
+			assert.deepStrictEqual(outline.config.quickPickDataSource.getQuickPickElements()[0].label, 'h2');
+			assert.deepStrictEqual(outline.config.quickPickDataSource.getQuickPickElements()[1].label, 'h1');
+		});
+	});
+});
diff --git a/src/vs/workbench/contrib/notebook/browser/contrib/status/editorStatus.ts b/src/vs/workbench/contrib/notebook/browser/contrib/status/editorStatus.ts
index ff8d4927418..2ed6547fc1a 100644
--- a/src/vs/workbench/contrib/notebook/browser/contrib/status/editorStatus.ts
+++ b/src/vs/workbench/contrib/notebook/browser/contrib/status/editorStatus.ts
@@ -8,8 +8,8 @@ import { Registry } from 'vs/platform/registry/common/platform';
 import { Action2, registerAction2 } from 'vs/platform/actions/common/actions';
 import { ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
 import { IQuickInputService, IQuickPickItem, QuickPickInput } from 'vs/platform/quickinput/common/quickInput';
-import { NOTEBOOK_ACTIONS_CATEGORY, getActiveNotebookEditor } from 'vs/workbench/contrib/notebook/browser/contrib/coreActions';
-import { INotebookEditor, NOTEBOOK_IS_ACTIVE_EDITOR } from 'vs/workbench/contrib/notebook/browser/notebookBrowser';
+import { NOTEBOOK_ACTIONS_CATEGORY } from 'vs/workbench/contrib/notebook/browser/contrib/coreActions';
+import { getNotebookEditorFromEditorPane, NOTEBOOK_IS_ACTIVE_EDITOR } from 'vs/workbench/contrib/notebook/browser/notebookBrowser';
 
 import { INotebookService } from 'vs/workbench/contrib/notebook/common/notebookService';
 import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
@@ -64,11 +64,15 @@ registerAction2(class extends Action2 {
 		const quickInputService = accessor.get<IQuickInputService>(IQuickInputService);
 		const configurationService = accessor.get<IConfigurationService>(IConfigurationService);
 
-		const activeEditorPane = editorService.activeEditorPane as unknown as { isNotebookEditor?: boolean } | undefined;
-		if (!activeEditorPane?.isNotebookEditor) {
+		const editor = getNotebookEditorFromEditorPane(editorService.activeEditorPane);
+		if (!editor) {
 			return;
 		}
-		const editor = editorService.activeEditorPane?.getControl() as INotebookEditor;
+
+		if (!editor.hasModel()) {
+			return;
+		}
+
 		const activeKernel = editor.activeKernel;
 
 		const picker = quickInputService.createQuickPick<(IQuickPickItem & { run(): void; kernelProviderId?: string })>();
@@ -92,7 +96,7 @@ registerAction2(class extends Action2 {
 
 		if (selectedKernel) {
 			editor.activeKernel = selectedKernel;
-			return selectedKernel.resolve(editor.uri!, editor.getId(), tokenSource.token);
+			return selectedKernel.resolve(editor.viewModel.uri, editor.getId(), tokenSource.token);
 		} else {
 			picker.show();
 		}
@@ -112,11 +116,11 @@ registerAction2(class extends Action2 {
 				kernelProviderId: a.extension.value,
 				run: async () => {
 					editor.activeKernel = a;
-					a.resolve(editor.uri!, editor.getId(), tokenSource.token);
+					a.resolve(editor.viewModel.uri, editor.getId(), tokenSource.token);
 				},
 				buttons: [{
 					iconClass: ThemeIcon.asClassName(configureKernelIcon),
-					tooltip: nls.localize('notebook.promptKernel.setDefaultTooltip', "Set as default kernel provider for '{0}'", editor.viewModel!.viewType)
+					tooltip: nls.localize('notebook.promptKernel.setDefaultTooltip', "Set as default kernel provider for '{0}'", editor.viewModel.viewType)
 				}]
 			};
 		});
@@ -139,7 +143,7 @@ registerAction2(class extends Action2 {
 
 				// And persist the setting
 				if (pick && id && pick.kernelProviderId) {
-					const newAssociation: NotebookKernelProviderAssociation = { viewType: editor.viewModel!.viewType, kernelProvider: pick.kernelProviderId };
+					const newAssociation: NotebookKernelProviderAssociation = { viewType: editor.viewModel.viewType, kernelProvider: pick.kernelProviderId };
 					const currentAssociations = [...configurationService.getValue<NotebookKernelProviderAssociations>(notebookKernelProviderAssociationsSettingId)];
 
 					// First try updating existing association
@@ -179,14 +183,12 @@ export class KernelStatus extends Disposable implements IWorkbenchContribution {
 
 	registerListeners() {
 		this._register(this._editorService.onDidActiveEditorChange(() => this.updateStatusbar()));
-		this._register(this._notebookService.onDidChangeActiveEditor(() => this.updateStatusbar()));
 		this._register(this._notebookService.onDidChangeKernels(() => this.updateStatusbar()));
 	}
 
 	updateStatusbar() {
 		this._editorDisposable.clear();
-
-		const activeEditor = getActiveNotebookEditor(this._editorService);
+		const activeEditor = getNotebookEditorFromEditorPane(this._editorService.activeEditorPane);
 
 		if (activeEditor) {
 			this._editorDisposable.add(activeEditor.onDidChangeKernel(() => {
diff --git a/src/vs/workbench/contrib/notebook/browser/contrib/undoRedo/notebookUndoRedo.ts b/src/vs/workbench/contrib/notebook/browser/contrib/undoRedo/notebookUndoRedo.ts
new file mode 100644
index 00000000000..2187040c60e
--- /dev/null
+++ b/src/vs/workbench/contrib/notebook/browser/contrib/undoRedo/notebookUndoRedo.ts
@@ -0,0 +1,62 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { Disposable } from 'vs/base/common/lifecycle';
+import { LifecyclePhase } from 'vs/workbench/services/lifecycle/common/lifecycle';
+import { Registry } from 'vs/platform/registry/common/platform';
+import { Extensions as WorkbenchExtensions, IWorkbenchContributionsRegistry } from 'vs/workbench/common/contributions';
+import { CellKind } from 'vs/workbench/contrib/notebook/common/notebookCommon';
+import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
+import { CellEditState, getNotebookEditorFromEditorPane, NotebookEditorOptions } from 'vs/workbench/contrib/notebook/browser/notebookBrowser';
+import { RedoCommand, UndoCommand } from 'vs/editor/browser/editorExtensions';
+
+class NotebookUndoRedoContribution extends Disposable {
+
+	constructor(@IEditorService private readonly _editorService: IEditorService) {
+		super();
+
+		const PRIORITY = 105;
+		this._register(UndoCommand.addImplementation(PRIORITY, () => {
+			const editor = getNotebookEditorFromEditorPane(this._editorService.activeEditorPane);
+			if (editor?.viewModel) {
+				return editor.viewModel.undo().then(cellResources => {
+					if (cellResources?.length) {
+						editor?.viewModel?.viewCells.forEach(cell => {
+							if (cell.cellKind === CellKind.Markdown && cellResources.find(resource => resource.fragment === cell.model.uri.fragment)) {
+								cell.editState = CellEditState.Editing;
+							}
+						});
+
+						editor?.setOptions(new NotebookEditorOptions({ cellOptions: { resource: cellResources[0] }, preserveFocus: true }));
+					}
+				});
+			}
+
+			return false;
+		}));
+
+		this._register(RedoCommand.addImplementation(PRIORITY, () => {
+			const editor = getNotebookEditorFromEditorPane(this._editorService.activeEditorPane);
+			if (editor?.viewModel) {
+				return editor.viewModel.redo().then(cellResources => {
+					if (cellResources?.length) {
+						editor?.viewModel?.viewCells.forEach(cell => {
+							if (cell.cellKind === CellKind.Markdown && cellResources.find(resource => resource.fragment === cell.model.uri.fragment)) {
+								cell.editState = CellEditState.Editing;
+							}
+						});
+
+						editor?.setOptions(new NotebookEditorOptions({ cellOptions: { resource: cellResources[0] }, preserveFocus: true }));
+					}
+				});
+			}
+
+			return false;
+		}));
+	}
+}
+
+const workbenchContributionsRegistry = Registry.as<IWorkbenchContributionsRegistry>(WorkbenchExtensions.Workbench);
+workbenchContributionsRegistry.registerWorkbenchContribution(NotebookUndoRedoContribution, LifecyclePhase.Ready);
diff --git a/src/vs/workbench/contrib/notebook/browser/diff/diffComponents.ts b/src/vs/workbench/contrib/notebook/browser/diff/diffComponents.ts
index 235dd429996..f2b9c409f97 100644
--- a/src/vs/workbench/contrib/notebook/browser/diff/diffComponents.ts
+++ b/src/vs/workbench/contrib/notebook/browser/diff/diffComponents.ts
@@ -440,7 +440,6 @@ abstract class AbstractElementRenderer extends Disposable {
 			if (newLangauge !== undefined && newLangauge !== this.cell.modified!.language) {
 				const index = this.notebookEditor.textModel!.cells.indexOf(this.cell.modified!.textModel);
 				this.notebookEditor.textModel!.applyEdits(
-					this.notebookEditor.textModel!.versionId,
 					[{ editType: CellEditType.CellLanguage, index, language: newLangauge }],
 					true,
 					undefined,
@@ -455,7 +454,7 @@ abstract class AbstractElementRenderer extends Disposable {
 				return;
 			}
 
-			this.notebookEditor.textModel!.applyEdits(this.notebookEditor.textModel!.versionId, [
+			this.notebookEditor.textModel!.applyEdits([
 				{ editType: CellEditType.Metadata, index, metadata: result }
 			], true, undefined, () => undefined, undefined);
 		} catch {
diff --git a/src/vs/workbench/contrib/notebook/browser/diff/notebookTextDiffEditor.ts b/src/vs/workbench/contrib/notebook/browser/diff/notebookTextDiffEditor.ts
index 8112dbcedc2..341b9652742 100644
--- a/src/vs/workbench/contrib/notebook/browser/diff/notebookTextDiffEditor.ts
+++ b/src/vs/workbench/contrib/notebook/browser/diff/notebookTextDiffEditor.ts
@@ -23,7 +23,7 @@ import { IConfigurationService } from 'vs/platform/configuration/common/configur
 import { IEditorOptions } from 'vs/editor/common/config/editorOptions';
 import { BareFontInfo } from 'vs/editor/common/config/fontInfo';
 import { getPixelRatio, getZoomLevel } from 'vs/base/browser/browser';
-import { CellEditState, ICellOutputViewModel, IDisplayOutputLayoutUpdateRequest, IGenericCellViewModel, IInsetRenderOutput, NotebookLayoutInfo } from 'vs/workbench/contrib/notebook/browser/notebookBrowser';
+import { CellEditState, ICellOutputViewModel, IDisplayOutputLayoutUpdateRequest, IGenericCellViewModel, IInsetRenderOutput, NotebookLayoutInfo, NOTEBOOK_DIFF_EDITOR_ID } from 'vs/workbench/contrib/notebook/browser/notebookBrowser';
 import { DiffSide, DIFF_CELL_MARGIN, IDiffCellInfo, INotebookTextDiffEditor } from 'vs/workbench/contrib/notebook/browser/diff/notebookDiffEditorBrowser';
 import { Emitter } from 'vs/base/common/event';
 import { DisposableStore, IDisposable, toDisposable } from 'vs/base/common/lifecycle';
@@ -41,13 +41,13 @@ import { generateUuid } from 'vs/base/common/uuid';
 import { IMouseWheelEvent, StandardMouseEvent } from 'vs/base/browser/mouseEvent';
 import { DiffNestedCellViewModel } from 'vs/workbench/contrib/notebook/browser/diff/diffNestedCellViewModel';
 import { BackLayerWebView } from 'vs/workbench/contrib/notebook/browser/view/renderers/backLayerWebView';
-import { CELL_OUTPUT_PADDING } from 'vs/workbench/contrib/notebook/browser/constants';
+import { CELL_MARGIN, CELL_OUTPUT_PADDING, CELL_RUN_GUTTER, CODE_CELL_LEFT_MARGIN } from 'vs/workbench/contrib/notebook/browser/constants';
 import { NotebookDiffEditorEventDispatcher, NotebookDiffLayoutChangedEvent } from 'vs/workbench/contrib/notebook/browser/diff/eventDispatcher';
 
 const $ = DOM.$;
 
 export class NotebookTextDiffEditor extends EditorPane implements INotebookTextDiffEditor {
-	static readonly ID: string = 'workbench.editor.notebookTextDiffEditor';
+	static readonly ID: string = NOTEBOOK_DIFF_EDITOR_ID;
 
 	private _rootElement!: HTMLElement;
 	private _overflowContainer!: HTMLElement;
@@ -389,8 +389,16 @@ export class NotebookTextDiffEditor extends EditorPane implements INotebookTextD
 		}));
 	}
 
+	private readonly webviewOptions = {
+		outputNodePadding: CELL_OUTPUT_PADDING,
+		outputNodeLeftPadding: 32,
+		leftMargin: CODE_CELL_LEFT_MARGIN,
+		cellMargin: CELL_MARGIN,
+		runGutter: CELL_RUN_GUTTER
+	};
+
 	private async _createModifiedWebview(id: string, resource: URI): Promise<void> {
-		this._modifiedWebview = this.instantiationService.createInstance(BackLayerWebView, this, id, resource, { outputNodePadding: CELL_OUTPUT_PADDING, outputNodeLeftPadding: 32 }) as BackLayerWebView<IDiffCellInfo>;
+		this._modifiedWebview = this.instantiationService.createInstance(BackLayerWebView, this, id, resource, this.webviewOptions) as BackLayerWebView<IDiffCellInfo>;
 		// attach the webview container to the DOM tree first
 		this._list.rowsContainer.insertAdjacentElement('afterbegin', this._modifiedWebview.element);
 		await this._modifiedWebview.createWebview();
@@ -399,7 +407,7 @@ export class NotebookTextDiffEditor extends EditorPane implements INotebookTextD
 	}
 
 	private async _createOriginalWebview(id: string, resource: URI): Promise<void> {
-		this._originalWebview = this.instantiationService.createInstance(BackLayerWebView, this, id, resource, { outputNodePadding: CELL_OUTPUT_PADDING, outputNodeLeftPadding: 32 }) as BackLayerWebView<IDiffCellInfo>;
+		this._originalWebview = this.instantiationService.createInstance(BackLayerWebView, this, id, resource, this.webviewOptions) as BackLayerWebView<IDiffCellInfo>;
 		// attach the webview container to the DOM tree first
 		this._list.rowsContainer.insertAdjacentElement('afterbegin', this._originalWebview.element);
 		await this._originalWebview.createWebview();
diff --git a/src/vs/workbench/contrib/notebook/browser/notebook.contribution.ts b/src/vs/workbench/contrib/notebook/browser/notebook.contribution.ts
index bfcdf2ec114..73ef130aada 100644
--- a/src/vs/workbench/contrib/notebook/browser/notebook.contribution.ts
+++ b/src/vs/workbench/contrib/notebook/browser/notebook.contribution.ts
@@ -35,7 +35,7 @@ import { IEditorGroup, IEditorGroupsService } from 'vs/workbench/services/editor
 import { IEditorService, IOpenEditorOverride } from 'vs/workbench/services/editor/common/editorService';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
 import { CustomEditorInfo } from 'vs/workbench/contrib/customEditor/common/customEditor';
-import { INotebookEditor, IN_NOTEBOOK_TEXT_DIFF_EDITOR, NotebookEditorOptions, NOTEBOOK_EDITOR_OPEN } from 'vs/workbench/contrib/notebook/browser/notebookBrowser';
+import { IN_NOTEBOOK_TEXT_DIFF_EDITOR, NotebookEditorOptions, NOTEBOOK_DIFF_EDITOR_ID, NOTEBOOK_EDITOR_ID, NOTEBOOK_EDITOR_OPEN } from 'vs/workbench/contrib/notebook/browser/notebookBrowser';
 import { IUndoRedoService } from 'vs/platform/undoRedo/common/undoRedo';
 import { INotebookEditorModelResolverService, NotebookModelResolverService } from 'vs/workbench/contrib/notebook/common/notebookEditorModelResolverService';
 import { ResourceEditorInput } from 'vs/workbench/common/editor/resourceEditorInput';
@@ -57,15 +57,16 @@ import { IContextKey, IContextKeyService } from 'vs/platform/contextkey/common/c
 import { getFormatedMetadataJSON } from 'vs/workbench/contrib/notebook/browser/diff/diffElementViewModel';
 
 // Editor Contribution
-
+import 'vs/workbench/contrib/notebook/browser/contrib/clipboard/notebookClipboard';
 import 'vs/workbench/contrib/notebook/browser/contrib/coreActions';
 import 'vs/workbench/contrib/notebook/browser/contrib/find/findController';
 import 'vs/workbench/contrib/notebook/browser/contrib/fold/folding';
 import 'vs/workbench/contrib/notebook/browser/contrib/format/formatting';
-import 'vs/workbench/contrib/notebook/browser/contrib/outline/notebookOutline';
 import 'vs/workbench/contrib/notebook/browser/contrib/marker/markerProvider';
+import 'vs/workbench/contrib/notebook/browser/contrib/outline/notebookOutline';
 import 'vs/workbench/contrib/notebook/browser/contrib/status/editorStatus';
-// import 'vs/workbench/contrib/notebook/browser/contrib/scm/scm';
+import 'vs/workbench/contrib/notebook/browser/contrib/undoRedo/notebookUndoRedo';
+
 
 // Diff Editor Contribution
 import 'vs/workbench/contrib/notebook/browser/diff/notebookDiffActions';
@@ -144,22 +145,22 @@ class NotebookEditorFactory implements IEditorInputFactory {
 		assertType(input instanceof NotebookEditorInput);
 		return JSON.stringify({
 			resource: input.resource,
-			name: input.name,
+			name: input.getName(),
 			viewType: input.viewType,
 		});
 	}
 	deserialize(instantiationService: IInstantiationService, raw: string) {
-		type Data = { resource: URI, name: string, viewType: string, group: number };
+		type Data = { resource: URI, viewType: string, group: number };
 		const data = <Data>parse(raw);
 		if (!data) {
 			return undefined;
 		}
-		const { resource, name, viewType } = data;
-		if (!data || !URI.isUri(resource) || typeof name !== 'string' || typeof viewType !== 'string') {
+		const { resource, viewType } = data;
+		if (!data || !URI.isUri(resource) || typeof viewType !== 'string') {
 			return undefined;
 		}
 
-		const input = NotebookEditorInput.create(instantiationService, resource, name, viewType);
+		const input = NotebookEditorInput.create(instantiationService, resource, viewType);
 		return input;
 	}
 }
@@ -181,7 +182,7 @@ Registry.as<IEditorInputFactoryRegistry>(EditorInputExtensions.EditorInputFactor
 					throw new Error(`No backup found for Notebook editor: ${resource}`);
 				}
 
-				const input = NotebookEditorInput.create(instantiationService, resource, backup.meta.name, backup.meta.viewType, { startDirty: true });
+				const input = NotebookEditorInput.create(instantiationService, resource, backup.meta.viewType, { startDirty: true });
 				return input;
 			});
 		}
@@ -268,26 +269,6 @@ export class NotebookContribution extends Disposable implements IWorkbenchContri
 			}
 		}));
 
-		this._register(this.editorService.onDidVisibleEditorsChange(() => {
-			const visibleNotebookEditors = editorService.visibleEditorPanes
-				.filter(pane => (pane as unknown as { isNotebookEditor?: boolean }).isNotebookEditor)
-				.map(pane => pane.getControl() as INotebookEditor)
-				.filter(control => !!control)
-				.map(editor => editor.getId());
-
-			this.notebookService.updateVisibleNotebookEditor(visibleNotebookEditors);
-		}));
-
-		this._register(this.editorService.onDidActiveEditorChange(() => {
-			const activeEditorPane = editorService.activeEditorPane as { isNotebookEditor?: boolean } | undefined;
-			const notebookEditor = activeEditorPane?.isNotebookEditor ? (editorService.activeEditorPane?.getControl() as INotebookEditor) : undefined;
-			if (notebookEditor) {
-				this.notebookService.updateActiveNotebookEditor(notebookEditor);
-			} else {
-				this.notebookService.updateActiveNotebookEditor(null);
-			}
-		}));
-
 		this.editorGroupService.whenRestored.then(() => this._updateContextKeys());
 		this._register(this.editorService.onDidActiveEditorChange(() => this._updateContextKeys()));
 		this._register(this.editorService.onDidVisibleEditorsChange(() => this._updateContextKeys()));
@@ -297,9 +278,8 @@ export class NotebookContribution extends Disposable implements IWorkbenchContri
 	}
 
 	private _updateContextKeys() {
-		const activeEditorPane = this.editorService.activeEditorPane as { isNotebookEditor?: boolean } | undefined;
-		this._notebookEditorIsOpen.set(!!activeEditorPane?.isNotebookEditor);
-		this._notebookDiffEditorIsOpen.set(this.editorService.activeEditorPane?.getId() === 'workbench.editor.notebookTextDiffEditor');
+		this._notebookEditorIsOpen.set(this.editorService.activeEditorPane?.getId() === NOTEBOOK_EDITOR_ID);
+		this._notebookDiffEditorIsOpen.set(this.editorService.activeEditorPane?.getId() === NOTEBOOK_DIFF_EDITOR_ID);
 	}
 
 	getUserAssociatedEditors(resource: URI) {
@@ -346,7 +326,7 @@ export class NotebookContribution extends Disposable implements IWorkbenchContri
 				} else {
 					return {
 						override: (async () => {
-							const notebookInput = NotebookEditorInput.create(this.instantiationService, originalInput.resource, originalInput.getName(), id);
+							const notebookInput = NotebookEditorInput.create(this.instantiationService, originalInput.resource, id);
 							const originalEditorIndex = group.getIndexOfEditor(originalInput);
 
 							await group.closeEditor(originalInput);
@@ -377,7 +357,7 @@ export class NotebookContribution extends Disposable implements IWorkbenchContri
 
 								await group.closeEditor(firstEditor);
 								firstEditor.dispose();
-								const notebookInput = NotebookEditorInput.create(this.instantiationService, originalInput.resource!, originalInput.getName(), id);
+								const notebookInput = NotebookEditorInput.create(this.instantiationService, originalInput.resource!, id);
 								const newEditor = await group.openEditor(notebookInput, { ...options, index: originalEditorIndex, override: EditorOverride.DISABLED });
 
 								if (newEditor) {
@@ -472,7 +452,7 @@ export class NotebookContribution extends Disposable implements IWorkbenchContri
 			index = group.isPinned(originalInput) ? originalEditorIndex + 1 : originalEditorIndex;
 		}
 
-		const notebookInput = NotebookEditorInput.create(this.instantiationService, notebookUri, originalInput.getName(), info.id);
+		const notebookInput = NotebookEditorInput.create(this.instantiationService, notebookUri, info.id);
 		const notebookOptions = new NotebookEditorOptions({ ...options, cellOptions, override: EditorOverride.DISABLED, index });
 		return { override: this.editorService.openEditor(notebookInput, notebookOptions, group) };
 	}
diff --git a/src/vs/workbench/contrib/notebook/browser/notebookBrowser.ts b/src/vs/workbench/contrib/notebook/browser/notebookBrowser.ts
index 48c2b0c18f0..d83a537dd62 100644
--- a/src/vs/workbench/contrib/notebook/browser/notebookBrowser.ts
+++ b/src/vs/workbench/contrib/notebook/browser/notebookBrowser.ts
@@ -26,8 +26,7 @@ import { CellKind, NotebookCellMetadata, NotebookDocumentMetadata, IEditor, INot
 import { Webview } from 'vs/workbench/contrib/webview/browser/webview';
 import { NotebookTextModel } from 'vs/workbench/contrib/notebook/common/model/notebookTextModel';
 import { IMenu } from 'vs/platform/actions/common/actions';
-import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
-import { EditorOptions } from 'vs/workbench/common/editor';
+import { EditorOptions, IEditorPane } from 'vs/workbench/common/editor';
 import { IResourceEditorInput } from 'vs/platform/editor/common/editor';
 import { IConstructorSignature1 } from 'vs/platform/instantiation/common/instantiation';
 import { CellEditorStatusBar } from 'vs/workbench/contrib/notebook/browser/view/renderers/cellWidgets';
@@ -297,6 +296,7 @@ export interface INotebookDeltaDecoration {
 export class NotebookEditorOptions extends EditorOptions {
 
 	readonly cellOptions?: IResourceEditorInput;
+	readonly cellSelections?: ICellRange[];
 
 	constructor(options: Partial<NotebookEditorOptions>) {
 		super();
@@ -323,11 +323,14 @@ export interface INotebookEditorCreationOptions {
 
 export interface IActiveNotebookEditor extends INotebookEditor {
 	viewModel: NotebookViewModel;
-	uri: URI;
 	// selection is never undefined when the editor is attached to a document.
 	getSelection(): ICellRange;
 }
 
+export const NOTEBOOK_EDITOR_ID = 'workbench.editor.notebook';
+
+export const NOTEBOOK_DIFF_EDITOR_ID = 'workbench.editor.notebookTextDiffEditor';
+
 export interface INotebookEditor extends IEditor, ICommonNotebookEditor {
 	isEmbedded: boolean;
 
@@ -345,15 +348,11 @@ export interface INotebookEditor extends IEditor, ICommonNotebookEditor {
 	 */
 	readonly onDidChangeModel: Event<NotebookTextModel | undefined>;
 	readonly onDidFocusEditorWidget: Event<void>;
-	readonly isNotebookEditor: boolean;
 	activeKernel: INotebookKernel | undefined;
 	multipleKernelsAvailable: boolean;
 	readonly onDidChangeAvailableKernels: Event<void>;
 	readonly onDidChangeKernel: Event<void>;
 	readonly onDidChangeActiveCell: Event<void>;
-	readonly onDidScroll: Event<ScrollEvent>;
-	readonly onWillDispose: Event<void>;
-
 	isDisposed: boolean;
 
 	getId(): string;
@@ -423,12 +422,6 @@ export interface INotebookEditor extends IEditor, ICommonNotebookEditor {
 	 */
 	moveCellDown(cell: ICellViewModel): Promise<ICellViewModel | null>;
 
-	/**
-	 * @deprecated Note that this method doesn't support batch operations, use #moveCellToIdx instead.
-	 * Move a cell above or below another cell
-	 */
-	moveCell(cell: ICellViewModel, relativeToCell: ICellViewModel, direction: 'above' | 'below'): Promise<ICellViewModel | null>;
-
 	/**
 	 * Move a cell to a specific position
 	 */
@@ -496,11 +489,6 @@ export interface INotebookEditor extends IEditor, ICommonNotebookEditor {
 	 */
 	postMessage(forRendererId: string | undefined, message: any): void;
 
-	/**
-	 * Toggle class name on the notebook editor root DOM node.
-	 */
-	toggleClassName(className: string): void;
-
 	/**
 	 * Remove class name on the notebook editor root DOM node.
 	 */
@@ -578,7 +566,7 @@ export interface INotebookEditor extends IEditor, ICommonNotebookEditor {
 	 */
 	setHiddenAreas(_ranges: ICellRange[]): boolean;
 
-	setCellSelection(cell: ICellViewModel, selection: Range): void;
+	setCellEditorSelection(cell: ICellViewModel, selection: Range): void;
 
 	deltaCellDecorations(oldDecorations: string[], newDecorations: INotebookDeltaDecoration[]): string[];
 
@@ -634,6 +622,7 @@ export interface INotebookCellList {
 	rowsContainer: HTMLElement;
 	readonly onDidRemoveOutput: Event<ICellOutputViewModel>;
 	readonly onDidHideOutput: Event<ICellOutputViewModel>;
+	readonly onDidRemoveCellFromView: Event<ICellViewModel>;
 	readonly onMouseUp: Event<IListMouseEvent<CellViewModel>>;
 	readonly onMouseDown: Event<IListMouseEvent<CellViewModel>>;
 	readonly onContextMenu: Event<IListContextMenuEvent<CellViewModel>>;
@@ -864,10 +853,8 @@ export function getVisibleCells(cells: CellViewModel[], hiddenRanges: ICellRange
 	return result;
 }
 
-export function getActiveNotebookEditor(editorService: IEditorService): INotebookEditor | undefined {
-	// TODO@rebornix can `isNotebookEditor` be on INotebookEditor to avoid a circular dependency?
-	const activeEditorPane = editorService.activeEditorPane as unknown as { isNotebookEditor?: boolean } | undefined;
-	return activeEditorPane?.isNotebookEditor ? (editorService.activeEditorPane?.getControl() as INotebookEditor) : undefined;
+export function getNotebookEditorFromEditorPane(editorPane?: IEditorPane): INotebookEditor | undefined {
+	return editorPane?.getId() === NOTEBOOK_EDITOR_ID ? editorPane.getControl() as INotebookEditor | undefined : undefined;
 }
 
 let EDITOR_TOP_PADDING = 12;
diff --git a/src/vs/workbench/contrib/notebook/browser/notebookEditor.ts b/src/vs/workbench/contrib/notebook/browser/notebookEditor.ts
index df46d1d7a8e..2aeb3a12221 100644
--- a/src/vs/workbench/contrib/notebook/browser/notebookEditor.ts
+++ b/src/vs/workbench/contrib/notebook/browser/notebookEditor.ts
@@ -24,14 +24,14 @@ import { INotebookEditorViewState, NotebookViewModel } from 'vs/workbench/contri
 import { IEditorDropService } from 'vs/workbench/services/editor/browser/editorDropService';
 import { IEditorGroup, IEditorGroupsService, GroupsOrder } from 'vs/workbench/services/editor/common/editorGroupsService';
 import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
-import { NotebookEditorOptions } from 'vs/workbench/contrib/notebook/browser/notebookBrowser';
+import { NotebookEditorOptions, NOTEBOOK_EDITOR_ID } from 'vs/workbench/contrib/notebook/browser/notebookBrowser';
 import { INotebookService } from 'vs/workbench/contrib/notebook/common/notebookService';
 import { IBorrowValue, INotebookEditorWidgetService } from 'vs/workbench/contrib/notebook/browser/notebookEditorWidgetService';
 
 const NOTEBOOK_EDITOR_VIEW_STATE_PREFERENCE_KEY = 'NotebookEditorViewState';
 
 export class NotebookEditor extends EditorPane {
-	static readonly ID: string = 'workbench.editor.notebook';
+	static readonly ID: string = NOTEBOOK_EDITOR_ID;
 
 	private readonly _editorMemento: IEditorMemento<INotebookEditorViewState>;
 	private readonly _groupListener = this._register(new DisposableStore());
@@ -76,11 +76,6 @@ export class NotebookEditor extends EditorPane {
 	set maximumWidth(value: number) { /*noop*/ }
 
 	//#region Editor Core
-
-	get isNotebookEditor() {
-		return true;
-	}
-
 	get scopedContextKeyService(): IContextKeyService | undefined {
 		return this._widget.value?.scopedContextKeyService;
 	}
diff --git a/src/vs/workbench/contrib/notebook/browser/notebookEditorDecorations.ts b/src/vs/workbench/contrib/notebook/browser/notebookEditorDecorations.ts
new file mode 100644
index 00000000000..a89025aad55
--- /dev/null
+++ b/src/vs/workbench/contrib/notebook/browser/notebookEditorDecorations.ts
@@ -0,0 +1,205 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import * as DOM from 'vs/base/browser/dom';
+import { URI } from 'vs/base/common/uri';
+import * as strings from 'vs/base/common/strings';
+import { IContentDecorationRenderOptions, isThemeColor } from 'vs/editor/common/editorCommon';
+import { IColorTheme, IThemeService, ThemeColor } from 'vs/platform/theme/common/themeService';
+import { INotebookDecorationRenderOptions } from 'vs/workbench/contrib/notebook/common/notebookCommon';
+import { _CSS_MAP } from 'vs/editor/browser/services/codeEditorServiceImpl';
+
+export class NotebookRefCountedStyleSheet {
+	private readonly _key: string;
+	private readonly _styleSheet: HTMLStyleElement;
+	private _refCount: number;
+
+	constructor(readonly widget: { removeEditorStyleSheets: (key: string) => void; }, key: string, styleSheet: HTMLStyleElement) {
+		this._key = key;
+		this._styleSheet = styleSheet;
+		this._refCount = 0;
+	}
+
+	public ref(): void {
+		this._refCount++;
+	}
+
+	public unref(): void {
+		this._refCount--;
+		if (this._refCount === 0) {
+			this._styleSheet.parentNode?.removeChild(this._styleSheet);
+			this.widget.removeEditorStyleSheets(this._key);
+		}
+	}
+
+	public insertRule(rule: string, index?: number): void {
+		const sheet = <CSSStyleSheet>this._styleSheet.sheet;
+		sheet.insertRule(rule, index);
+	}
+}
+
+interface ProviderArguments {
+	styleSheet: NotebookRefCountedStyleSheet;
+	key: string;
+	options: INotebookDecorationRenderOptions;
+}
+
+export class NotebookDecorationCSSRules {
+	private _theme: IColorTheme;
+	private _className: string;
+	private _topClassName: string;
+
+	get className() {
+		return this._className;
+	}
+
+	get topClassName() {
+		return this._topClassName;
+	}
+
+	constructor(
+		private readonly _themeService: IThemeService,
+		private readonly _styleSheet: NotebookRefCountedStyleSheet,
+		private readonly _providerArgs: ProviderArguments
+	) {
+		this._styleSheet.ref();
+		this._theme = this._themeService.getColorTheme();
+		this._className = CSSNameHelper.getClassName(this._providerArgs.key, CellDecorationCSSRuleType.ClassName);
+		this._topClassName = CSSNameHelper.getClassName(this._providerArgs.key, CellDecorationCSSRuleType.TopClassName);
+		this._buildCSS();
+	}
+
+	private _buildCSS() {
+		if (this._providerArgs.options.backgroundColor) {
+			const backgroundColor = this._resolveValue(this._providerArgs.options.backgroundColor);
+			this._styleSheet.insertRule(`.monaco-workbench .notebookOverlay .monaco-list .monaco-list-row.code-cell-row.${this.className} .cell-focus-indicator,
+			.monaco-workbench .notebookOverlay .monaco-list .monaco-list-row.markdown-cell-row.${this.className} {
+				background-color: ${backgroundColor} !important;
+			}`);
+		}
+
+		if (this._providerArgs.options.borderColor) {
+			const borderColor = this._resolveValue(this._providerArgs.options.borderColor);
+
+			this._styleSheet.insertRule(`.monaco-workbench .notebookOverlay .monaco-list .monaco-list-row.${this.className} .cell-focus-indicator-top:before,
+					.monaco-workbench .notebookOverlay .monaco-list .monaco-list-row.${this.className} .cell-focus-indicator-bottom:before {
+						border-color: ${borderColor} !important;
+					}`);
+
+			this._styleSheet.insertRule(`
+					.monaco-workbench .notebookOverlay .monaco-list .monaco-list-row.${this.className} .cell-focus-indicator-bottom:before {
+						content: "";
+						position: absolute;
+						width: 100%;
+						height: 1px;
+						border-bottom: 1px solid ${borderColor};
+						bottom: 0px;
+					`);
+
+			this._styleSheet.insertRule(`
+					.monaco-workbench .notebookOverlay .monaco-list .monaco-list-row.${this.className} .cell-focus-indicator-top:before {
+						content: "";
+						position: absolute;
+						width: 100%;
+						height: 1px;
+						border-top: 1px solid ${borderColor};
+					`);
+
+			// more specific rule for `.focused` can override existing rules
+			this._styleSheet.insertRule(`.monaco-workbench .notebookOverlay .monaco-list:focus-within .monaco-list-row.focused.${this.className} .cell-focus-indicator-top:before,
+				.monaco-workbench .notebookOverlay .monaco-list:focus-within .monaco-list-row.focused.${this.className} .cell-focus-indicator-bottom:before {
+					border-color: ${borderColor} !important;
+				}`);
+		}
+
+		if (this._providerArgs.options.top) {
+			const unthemedCSS = this._getCSSTextForModelDecorationContentClassName(this._providerArgs.options.top);
+			this._styleSheet.insertRule(`.monaco-workbench .notebookOverlay .monaco-list .monaco-list-row.${this.className} .cell-decoration .${this.topClassName} {
+				height: 1rem;
+				display: block;
+			}`);
+
+			this._styleSheet.insertRule(`.monaco-workbench .notebookOverlay .monaco-list .monaco-list-row.${this.className} .cell-decoration .${this.topClassName}::before {
+				display: block;
+				${unthemedCSS}
+			}`);
+		}
+	}
+
+	/**
+ * Build the CSS for decorations styled before or after content.
+ */
+	private _getCSSTextForModelDecorationContentClassName(opts: IContentDecorationRenderOptions | undefined): string {
+		if (!opts) {
+			return '';
+		}
+		const cssTextArr: string[] = [];
+
+		if (typeof opts !== 'undefined') {
+			this._collectBorderSettingsCSSText(opts, cssTextArr);
+			if (typeof opts.contentIconPath !== 'undefined') {
+				cssTextArr.push(strings.format(_CSS_MAP.contentIconPath, DOM.asCSSUrl(URI.revive(opts.contentIconPath))));
+			}
+			if (typeof opts.contentText === 'string') {
+				const truncated = opts.contentText.match(/^.*$/m)![0]; // only take first line
+				const escaped = truncated.replace(/['\\]/g, '\\$&');
+
+				cssTextArr.push(strings.format(_CSS_MAP.contentText, escaped));
+			}
+			this._collectCSSText(opts, ['fontStyle', 'fontWeight', 'textDecoration', 'color', 'opacity', 'backgroundColor', 'margin'], cssTextArr);
+			if (this._collectCSSText(opts, ['width', 'height'], cssTextArr)) {
+				cssTextArr.push('display:inline-block;');
+			}
+		}
+
+		return cssTextArr.join('');
+	}
+
+	private _collectBorderSettingsCSSText(opts: any, cssTextArr: string[]): boolean {
+		if (this._collectCSSText(opts, ['border', 'borderColor', 'borderRadius', 'borderSpacing', 'borderStyle', 'borderWidth'], cssTextArr)) {
+			cssTextArr.push(strings.format('box-sizing: border-box;'));
+			return true;
+		}
+		return false;
+	}
+
+	private _collectCSSText(opts: any, properties: string[], cssTextArr: string[]): boolean {
+		const lenBefore = cssTextArr.length;
+		for (let property of properties) {
+			const value = this._resolveValue(opts[property]);
+			if (typeof value === 'string') {
+				cssTextArr.push(strings.format(_CSS_MAP[property], value));
+			}
+		}
+		return cssTextArr.length !== lenBefore;
+	}
+
+	private _resolveValue(value: string | ThemeColor): string {
+		if (isThemeColor(value)) {
+			const color = this._theme.getColor(value.id);
+			if (color) {
+				return color.toString();
+			}
+			return 'transparent';
+		}
+		return value;
+	}
+
+	dispose() {
+		this._styleSheet.unref();
+	}
+}
+
+const enum CellDecorationCSSRuleType {
+	ClassName = 0,
+	TopClassName = 0,
+}
+
+class CSSNameHelper {
+
+	public static getClassName(key: string, type: CellDecorationCSSRuleType): string {
+		return 'nb-' + key + '-' + type;
+	}
+}
diff --git a/src/vs/workbench/contrib/notebook/browser/notebookEditorInput.ts b/src/vs/workbench/contrib/notebook/browser/notebookEditorInput.ts
index 6aa804c4c60..1389dd43f71 100644
--- a/src/vs/workbench/contrib/notebook/browser/notebookEditorInput.ts
+++ b/src/vs/workbench/contrib/notebook/browser/notebookEditorInput.ts
@@ -7,12 +7,13 @@ import * as glob from 'vs/base/common/glob';
 import { EditorInput, IEditorInput, GroupIdentifier, ISaveOptions, IMoveResult, IRevertOptions } from 'vs/workbench/common/editor';
 import { INotebookService } from 'vs/workbench/contrib/notebook/common/notebookService';
 import { URI } from 'vs/base/common/uri';
-import { isEqual, basename, joinPath } from 'vs/base/common/resources';
+import { isEqual, joinPath } from 'vs/base/common/resources';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { IFileDialogService } from 'vs/platform/dialogs/common/dialogs';
 import { INotebookEditorModelResolverService } from 'vs/workbench/contrib/notebook/common/notebookEditorModelResolverService';
 import { IReference } from 'vs/base/common/lifecycle';
 import { IResolvedNotebookEditorModel } from 'vs/workbench/contrib/notebook/common/notebookCommon';
+import { ILabelService } from 'vs/platform/label/common/label';
 
 interface NotebookEditorInputOptions {
 	startDirty?: boolean;
@@ -20,27 +21,30 @@ interface NotebookEditorInputOptions {
 
 export class NotebookEditorInput extends EditorInput {
 
-	static create(instantiationService: IInstantiationService, resource: URI, name: string, viewType: string, options: NotebookEditorInputOptions = {}) {
-		return instantiationService.createInstance(NotebookEditorInput, resource, name, viewType, options);
+	static create(instantiationService: IInstantiationService, resource: URI, viewType: string, options: NotebookEditorInputOptions = {}) {
+		return instantiationService.createInstance(NotebookEditorInput, resource, viewType, options);
 	}
 
 	static readonly ID: string = 'workbench.input.notebook';
 
+	private readonly _name: string;
+
 	private _textModel: IReference<IResolvedNotebookEditorModel> | null = null;
 	private _defaultDirtyState: boolean = false;
 
 	constructor(
 		public readonly resource: URI,
-		public readonly name: string,
 		public readonly viewType: string,
 		public readonly options: NotebookEditorInputOptions,
 		@INotebookService private readonly _notebookService: INotebookService,
 		@INotebookEditorModelResolverService private readonly _notebookModelResolverService: INotebookEditorModelResolverService,
 		@IFileDialogService private readonly _fileDialogService: IFileDialogService,
-		@IInstantiationService private readonly _instantiationService: IInstantiationService
+		@IInstantiationService private readonly _instantiationService: IInstantiationService,
+		@ILabelService labelService: ILabelService,
 	) {
 		super();
 		this._defaultDirtyState = !!options.startDirty;
+		this._name = labelService.getUriBasenameLabel(resource);
 	}
 
 	getTypeId(): string {
@@ -48,7 +52,7 @@ export class NotebookEditorInput extends EditorInput {
 	}
 
 	getName(): string {
-		return this.name;
+		return this._name;
 	}
 
 	isDirty() {
@@ -92,7 +96,7 @@ export class NotebookEditorInput extends EditorInput {
 			return undefined;
 		}
 
-		const dialogPath = this.isUntitled() ? await this.suggestName(this.name) : this._textModel.object.resource;
+		const dialogPath = this.isUntitled() ? await this._suggestName(this._name) : this._textModel.object.resource;
 
 		const target = await this._fileDialogService.pickFileToSave(dialogPath, options?.availableFileSystems);
 		if (!target) {
@@ -125,7 +129,7 @@ ${patterns}
 		return this._move(group, target)?.editor;
 	}
 
-	async suggestName(suggestedFilename: string) {
+	private async _suggestName(suggestedFilename: string) {
 		return joinPath(await this._fileDialogService.defaultFilePath(), suggestedFilename);
 	}
 
@@ -142,7 +146,7 @@ ${patterns}
 	}
 
 	private _move(group: GroupIdentifier, newResource: URI): { editor: IEditorInput } | undefined {
-		const editorInput = NotebookEditorInput.create(this._instantiationService, newResource, basename(newResource), this.viewType);
+		const editorInput = NotebookEditorInput.create(this._instantiationService, newResource, this.viewType);
 		return { editor: editorInput };
 	}
 
diff --git a/src/vs/workbench/contrib/notebook/browser/notebookEditorKernelManager.ts b/src/vs/workbench/contrib/notebook/browser/notebookEditorKernelManager.ts
new file mode 100644
index 00000000000..cc917cbaa3c
--- /dev/null
+++ b/src/vs/workbench/contrib/notebook/browser/notebookEditorKernelManager.ts
@@ -0,0 +1,430 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import * as nls from 'vs/nls';
+import { IQuickInputService, IQuickPickItem, QuickPickInput } from 'vs/platform/quickinput/common/quickInput';
+import { CancelablePromise, createCancelablePromise } from 'vs/base/common/async';
+import { CancellationToken, CancellationTokenSource } from 'vs/base/common/cancellation';
+import { Emitter, Event } from 'vs/base/common/event';
+import { Disposable } from 'vs/base/common/lifecycle';
+import { URI } from 'vs/base/common/uri';
+import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
+import { IContextKey, IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
+import { IStorageService, StorageScope, StorageTarget } from 'vs/platform/storage/common/storage';
+import { ThemeIcon } from 'vs/platform/theme/common/themeService';
+import { Memento } from 'vs/workbench/common/memento';
+import { ICellViewModel, NOTEBOOK_EDITOR_EXECUTING_NOTEBOOK, NOTEBOOK_EDITOR_RUNNABLE, NOTEBOOK_HAS_MULTIPLE_KERNELS, NOTEBOOK_KERNEL_COUNT } from 'vs/workbench/contrib/notebook/browser/notebookBrowser';
+import { configureKernelIcon } from 'vs/workbench/contrib/notebook/browser/notebookIcons';
+import { NotebookKernelProviderAssociation, NotebookKernelProviderAssociations, notebookKernelProviderAssociationsSettingId } from 'vs/workbench/contrib/notebook/browser/notebookKernelAssociation';
+import { NotebookViewModel } from 'vs/workbench/contrib/notebook/browser/viewModel/notebookViewModel';
+import { CellKind, INotebookKernel, NotebookCellRunState, NotebookRunState } from 'vs/workbench/contrib/notebook/common/notebookCommon';
+import { NotebookProviderInfo } from 'vs/workbench/contrib/notebook/common/notebookProvider';
+
+const NotebookEditorActiveKernelCache = 'workbench.editor.notebook.activeKernel';
+
+export interface IKernelManagerDelegate {
+	viewModel: NotebookViewModel | undefined;
+	getId(): string;
+	getContributedNotebookProviders(resource?: URI): readonly NotebookProviderInfo[];
+	getContributedNotebookProvider(viewType: string): NotebookProviderInfo | undefined;
+	getNotebookKernels(viewType: string, resource: URI, token: CancellationToken): Promise<INotebookKernel[]>;
+	loadKernelPreloads(extensionLocation: URI, kernel: INotebookKernel): Promise<void>;
+}
+
+export class NotebookEditorKernelManager extends Disposable {
+	private _isDisposed: boolean = false;
+
+	private _activeKernelExecuted: boolean = false;
+	private _activeKernel: INotebookKernel | undefined = undefined;
+	private readonly _onDidChangeKernel = this._register(new Emitter<void>());
+	readonly onDidChangeKernel: Event<void> = this._onDidChangeKernel.event;
+	private readonly _onDidChangeAvailableKernels = this._register(new Emitter<void>());
+	readonly onDidChangeAvailableKernels: Event<void> = this._onDidChangeAvailableKernels.event;
+
+	private _contributedKernelsComputePromise: CancelablePromise<INotebookKernel[]> | null = null;
+	private _initialKernelComputationDone: boolean = false;
+
+	private readonly _editorRunnable: IContextKey<boolean>;
+	private readonly _notebookExecuting: IContextKey<boolean>;
+	private readonly _notebookHasMultipleKernels: IContextKey<boolean>;
+	private readonly _notebookKernelCount: IContextKey<number>;
+
+	get activeKernel() {
+		return this._activeKernel;
+	}
+
+	set activeKernel(kernel: INotebookKernel | undefined) {
+		if (this._isDisposed) {
+			return;
+		}
+
+		if (!this._delegate.viewModel) {
+			return;
+		}
+
+		if (this._activeKernel === kernel) {
+			return;
+		}
+
+		this._activeKernel = kernel;
+		this._activeKernelResolvePromise = undefined;
+
+		const memento = this._activeKernelMemento.getMemento(StorageScope.GLOBAL, StorageTarget.MACHINE);
+		memento[this._delegate.viewModel.viewType] = this._activeKernel?.friendlyId;
+		this._activeKernelMemento.saveMemento();
+		this._onDidChangeKernel.fire();
+		if (this._activeKernel) {
+			this._delegate.loadKernelPreloads(this._activeKernel.extensionLocation, this._activeKernel);
+		}
+	}
+
+	private _activeKernelResolvePromise: Promise<void> | undefined = undefined;
+
+	private _multipleKernelsAvailable: boolean = false;
+
+	get multipleKernelsAvailable() {
+		return this._multipleKernelsAvailable;
+	}
+
+	set multipleKernelsAvailable(state: boolean) {
+		this._multipleKernelsAvailable = state;
+		this._onDidChangeAvailableKernels.fire();
+	}
+
+	private readonly _activeKernelMemento: Memento;
+
+	constructor(
+		private readonly _delegate: IKernelManagerDelegate,
+		@IStorageService storageService: IStorageService,
+		@IContextKeyService contextKeyService: IContextKeyService,
+		@IQuickInputService private readonly _quickInputService: IQuickInputService,
+		@IConfigurationService private readonly _configurationService: IConfigurationService,) {
+		super();
+
+		this._activeKernelMemento = new Memento(NotebookEditorActiveKernelCache, storageService);
+
+		this._editorRunnable = NOTEBOOK_EDITOR_RUNNABLE.bindTo(contextKeyService);
+		this._notebookExecuting = NOTEBOOK_EDITOR_EXECUTING_NOTEBOOK.bindTo(contextKeyService);
+		this._notebookHasMultipleKernels = NOTEBOOK_HAS_MULTIPLE_KERNELS.bindTo(contextKeyService);
+		this._notebookKernelCount = NOTEBOOK_KERNEL_COUNT.bindTo(contextKeyService);
+
+	}
+
+	public async setKernels(tokenSource: CancellationTokenSource) {
+		if (!this._delegate.viewModel) {
+			return;
+		}
+
+		if (this._activeKernel !== undefined && this._activeKernelExecuted) {
+			// kernel already executed, we should not change it automatically
+			return;
+		}
+
+		const provider = this._delegate.getContributedNotebookProvider(this._delegate.viewModel.viewType) || this._delegate.getContributedNotebookProviders(this._delegate.viewModel.uri)[0];
+		const availableKernels = await this.beginComputeContributedKernels();
+
+		if (tokenSource.token.isCancellationRequested) {
+			return;
+		}
+
+		this._notebookKernelCount.set(availableKernels.length);
+		if (availableKernels.length > 1) {
+			this._notebookHasMultipleKernels.set(true);
+			this.multipleKernelsAvailable = true;
+		} else {
+			this._notebookHasMultipleKernels.set(false);
+			this.multipleKernelsAvailable = false;
+		}
+
+		const activeKernelStillExist = [...availableKernels].find(kernel => kernel.friendlyId === this.activeKernel?.friendlyId && this.activeKernel?.friendlyId !== undefined);
+
+		if (activeKernelStillExist) {
+			// the kernel still exist, we don't want to modify the selection otherwise user's temporary preference is lost
+			return;
+		}
+
+		if (availableKernels.length) {
+			return this._setKernelsFromProviders(provider, availableKernels, tokenSource);
+		}
+
+		this._initialKernelComputationDone = true;
+
+		tokenSource.dispose();
+	}
+
+	async beginComputeContributedKernels() {
+		if (this._contributedKernelsComputePromise) {
+			return this._contributedKernelsComputePromise;
+		}
+
+		this._contributedKernelsComputePromise = createCancelablePromise(token => {
+			return this._delegate.getNotebookKernels(this._delegate.viewModel!.viewType, this._delegate.viewModel!.uri, token);
+		});
+
+		const result = await this._contributedKernelsComputePromise;
+		this._initialKernelComputationDone = true;
+		this._contributedKernelsComputePromise = null;
+
+		return result;
+	}
+
+	updateForMetadata(): void {
+		if (!this._delegate.viewModel) {
+			return;
+		}
+
+		const notebookMetadata = this._delegate.viewModel.metadata;
+		this._editorRunnable.set(this._delegate.viewModel.runnable);
+		this._notebookExecuting.set(notebookMetadata.runState === NotebookRunState.Running);
+	}
+
+	private async _setKernelsFromProviders(provider: NotebookProviderInfo, kernels: INotebookKernel[], tokenSource: CancellationTokenSource) {
+		const rawAssociations = this._configurationService.getValue<NotebookKernelProviderAssociations>(notebookKernelProviderAssociationsSettingId) || [];
+		const userSetKernelProvider = rawAssociations.filter(e => e.viewType === this._delegate.viewModel?.viewType)[0]?.kernelProvider;
+		const memento = this._activeKernelMemento.getMemento(StorageScope.GLOBAL, StorageTarget.MACHINE);
+
+		if (userSetKernelProvider) {
+			const filteredKernels = kernels.filter(kernel => kernel.extension.value === userSetKernelProvider);
+
+			if (filteredKernels.length) {
+				const cachedKernelId = memento[provider.id];
+				this.activeKernel =
+					filteredKernels.find(kernel => kernel.isPreferred)
+					|| filteredKernels.find(kernel => kernel.friendlyId === cachedKernelId)
+					|| filteredKernels[0];
+			} else {
+				this.activeKernel = undefined;
+			}
+
+			if (this.activeKernel) {
+				await this._delegate.loadKernelPreloads(this.activeKernel.extensionLocation, this.activeKernel);
+
+				if (tokenSource.token.isCancellationRequested) {
+					return;
+				}
+
+				this._activeKernelResolvePromise = this.activeKernel.resolve(this._delegate.viewModel!.uri, this._delegate.getId(), tokenSource.token);
+				await this._activeKernelResolvePromise;
+
+				if (tokenSource.token.isCancellationRequested) {
+					return;
+				}
+			}
+
+			memento[provider.id] = this._activeKernel?.friendlyId;
+			this._activeKernelMemento.saveMemento();
+
+			tokenSource.dispose();
+			return;
+		}
+
+		// choose a preferred kernel
+		const kernelsFromSameExtension = kernels.filter(kernel => kernel.extension.value === provider.providerExtensionId);
+		if (kernelsFromSameExtension.length) {
+			const cachedKernelId = memento[provider.id];
+
+			const preferedKernel = kernelsFromSameExtension.find(kernel => kernel.isPreferred)
+				|| kernelsFromSameExtension.find(kernel => kernel.friendlyId === cachedKernelId)
+				|| kernelsFromSameExtension[0];
+			this.activeKernel = preferedKernel;
+			if (this.activeKernel) {
+				await this._delegate.loadKernelPreloads(this.activeKernel.extensionLocation, this.activeKernel);
+			}
+
+			if (tokenSource.token.isCancellationRequested) {
+				return;
+			}
+
+			await preferedKernel.resolve(this._delegate.viewModel!.uri, this._delegate.getId(), tokenSource.token);
+
+			if (tokenSource.token.isCancellationRequested) {
+				return;
+			}
+
+			memento[provider.id] = this._activeKernel?.friendlyId;
+			this._activeKernelMemento.saveMemento();
+			tokenSource.dispose();
+			return;
+		}
+
+		// the provider doesn't have a builtin kernel, choose a kernel
+		this.activeKernel = kernels[0];
+		if (this.activeKernel) {
+			await this._delegate.loadKernelPreloads(this.activeKernel.extensionLocation, this.activeKernel);
+			if (tokenSource.token.isCancellationRequested) {
+				return;
+			}
+
+			await this.activeKernel.resolve(this._delegate.viewModel!.uri, this._delegate.getId(), tokenSource.token);
+			if (tokenSource.token.isCancellationRequested) {
+				return;
+			}
+		}
+
+		tokenSource.dispose();
+	}
+
+	private async _ensureActiveKernel() {
+		if (this._activeKernel) {
+			return;
+		}
+
+		if (this._activeKernelResolvePromise) {
+			await this._activeKernelResolvePromise;
+
+			if (this._activeKernel) {
+				return;
+			}
+		}
+
+
+		if (!this._initialKernelComputationDone) {
+			await this.setKernels(new CancellationTokenSource());
+
+			if (this._activeKernel) {
+				return;
+			}
+		}
+
+		// pick active kernel
+
+		const picker = this._quickInputService.createQuickPick<(IQuickPickItem & { run(): void; kernelProviderId?: string })>();
+		picker.placeholder = nls.localize('notebook.runCell.selectKernel', "Select a notebook kernel to run this notebook");
+		picker.matchOnDetail = true;
+
+		const tokenSource = new CancellationTokenSource();
+		const availableKernels = await this.beginComputeContributedKernels();
+		const picks: QuickPickInput<IQuickPickItem & { run(): void; kernelProviderId?: string; }>[] = availableKernels.map((a) => {
+			return {
+				id: a.friendlyId,
+				label: a.label,
+				picked: false,
+				description:
+					a.description
+						? a.description
+						: a.extension.value,
+				detail: a.detail,
+				kernelProviderId: a.extension.value,
+				run: async () => {
+					this.activeKernel = a;
+					this._activeKernelResolvePromise = this.activeKernel.resolve(this._delegate.viewModel!.uri, this._delegate.getId(), tokenSource.token);
+				},
+				buttons: [{
+					iconClass: ThemeIcon.asClassName(configureKernelIcon),
+					tooltip: nls.localize('notebook.promptKernel.setDefaultTooltip', "Set as default kernel provider for '{0}'", this._delegate.viewModel!.viewType)
+				}]
+			};
+		});
+
+		picker.items = picks;
+		picker.busy = false;
+
+		const pickedItem = await new Promise<(IQuickPickItem & { run(): void; kernelProviderId?: string; }) | undefined>(resolve => {
+			picker.onDidAccept(() => {
+				resolve(picker.selectedItems.length === 1 ? picker.selectedItems[0] : undefined);
+				picker.dispose();
+			});
+
+			picker.onDidTriggerItemButton(e => {
+				const pick = e.item;
+				const id = pick.id;
+				resolve(pick); // open the view
+				picker.dispose();
+
+				// And persist the setting
+				if (pick && id && pick.kernelProviderId) {
+					const newAssociation: NotebookKernelProviderAssociation = { viewType: this._delegate.viewModel!.viewType, kernelProvider: pick.kernelProviderId };
+					const currentAssociations = [...this._configurationService.getValue<NotebookKernelProviderAssociations>(notebookKernelProviderAssociationsSettingId)];
+
+					// First try updating existing association
+					for (let i = 0; i < currentAssociations.length; ++i) {
+						const existing = currentAssociations[i];
+						if (existing.viewType === newAssociation.viewType) {
+							currentAssociations.splice(i, 1, newAssociation);
+							this._configurationService.updateValue(notebookKernelProviderAssociationsSettingId, currentAssociations);
+							return;
+						}
+					}
+
+					// Otherwise, create a new one
+					currentAssociations.unshift(newAssociation);
+					this._configurationService.updateValue(notebookKernelProviderAssociationsSettingId, currentAssociations);
+				}
+			});
+
+		});
+
+		tokenSource.dispose();
+
+		if (pickedItem) {
+			await pickedItem.run();
+		}
+
+		return;
+	}
+
+	async cancelNotebookExecution(): Promise<void> {
+		if (!this._delegate.viewModel) {
+			return;
+		}
+
+		if (this._delegate.viewModel.metadata.runState !== NotebookRunState.Running) {
+			return;
+		}
+
+		await this._ensureActiveKernel();
+		await this._activeKernel?.cancelNotebookCell!(this._delegate.viewModel.uri, undefined);
+	}
+
+	async executeNotebook(): Promise<void> {
+		if (!this._delegate.viewModel) {
+			return;
+		}
+
+		if (!this._delegate.viewModel.runnable) {
+			return;
+		}
+
+		await this._ensureActiveKernel();
+		this._activeKernelExecuted = true;
+		await this._activeKernel?.executeNotebookCell!(this._delegate.viewModel.uri, undefined);
+	}
+
+	async cancelNotebookCellExecution(cell: ICellViewModel): Promise<void> {
+		if (!this._delegate.viewModel) {
+			return;
+		}
+
+		if (cell.cellKind !== CellKind.Code) {
+			return;
+		}
+
+		const metadata = cell.getEvaluatedMetadata(this._delegate.viewModel.metadata);
+		if (!metadata.runnable) {
+			return;
+		}
+
+		if (metadata.runState !== NotebookCellRunState.Running) {
+			return;
+		}
+
+		await this._ensureActiveKernel();
+		await this._activeKernel?.cancelNotebookCell!(this._delegate.viewModel.uri, cell.handle);
+	}
+
+	async executeNotebookCell(cell: ICellViewModel): Promise<void> {
+		if (!this._delegate.viewModel) {
+			return;
+		}
+
+		if (!cell.getEvaluatedMetadata(this._delegate.viewModel.metadata).runnable) {
+			return;
+		}
+
+		await this._ensureActiveKernel();
+		this._activeKernelExecuted = true;
+		await this._activeKernel?.executeNotebookCell!(this._delegate.viewModel.uri, cell.handle);
+	}
+}
diff --git a/src/vs/workbench/contrib/notebook/browser/notebookEditorWidget.ts b/src/vs/workbench/contrib/notebook/browser/notebookEditorWidget.ts
index 6a067b8e005..672582caac6 100644
--- a/src/vs/workbench/contrib/notebook/browser/notebookEditorWidget.ts
+++ b/src/vs/workbench/contrib/notebook/browser/notebookEditorWidget.ts
@@ -5,17 +5,16 @@
 
 import { getPixelRatio, getZoomLevel } from 'vs/base/browser/browser';
 import * as DOM from 'vs/base/browser/dom';
-import * as strings from 'vs/base/common/strings';
 import { IMouseWheelEvent, StandardMouseEvent } from 'vs/base/browser/mouseEvent';
 import { IListContextMenuEvent } from 'vs/base/browser/ui/list/list';
 import { IAction, Separator } from 'vs/base/common/actions';
-import { CancelablePromise, createCancelablePromise, SequencerByKey } from 'vs/base/common/async';
-import { CancellationTokenSource } from 'vs/base/common/cancellation';
+import { SequencerByKey } from 'vs/base/common/async';
+import { CancellationToken, CancellationTokenSource } from 'vs/base/common/cancellation';
 import { Color, RGBA } from 'vs/base/common/color';
 import { onUnexpectedError } from 'vs/base/common/errors';
 import { Emitter, Event } from 'vs/base/common/event';
 import { combinedDisposable, Disposable, DisposableStore, dispose, IDisposable, toDisposable } from 'vs/base/common/lifecycle';
-import { ScrollEvent } from 'vs/base/common/scrollable';
+import { extname } from 'vs/base/common/resources';
 import { URI } from 'vs/base/common/uri';
 import { generateUuid } from 'vs/base/common/uuid';
 import 'vs/css!./media/notebook';
@@ -23,7 +22,8 @@ import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
 import { IEditorOptions } from 'vs/editor/common/config/editorOptions';
 import { BareFontInfo } from 'vs/editor/common/config/fontInfo';
 import { Range } from 'vs/editor/common/core/range';
-import { IContentDecorationRenderOptions, IEditor, isThemeColor } from 'vs/editor/common/editorCommon';
+import { IEditor } from 'vs/editor/common/editorCommon';
+import { IModeService } from 'vs/editor/common/services/modeService';
 import * as nls from 'vs/nls';
 import { IMenuService, MenuId } from 'vs/platform/actions/common/actions';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
@@ -32,53 +32,47 @@ import { IContextMenuService } from 'vs/platform/contextview/browser/contextView
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { ServiceCollection } from 'vs/platform/instantiation/common/serviceCollection';
 import { ILayoutService } from 'vs/platform/layout/browser/layoutService';
-import { IQuickInputService, IQuickPickItem, QuickPickInput } from 'vs/platform/quickinput/common/quickInput';
 import { IStorageService, StorageScope, StorageTarget } from 'vs/platform/storage/common/storage';
+import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
 import { contrastBorder, diffInserted, diffRemoved, editorBackground, errorForeground, focusBorder, foreground, listInactiveSelectionBackground, registerColor, scrollbarSliderActiveBackground, scrollbarSliderBackground, scrollbarSliderHoverBackground, textBlockQuoteBackground, textBlockQuoteBorder, textLinkActiveForeground, textLinkForeground, textPreformatForeground, transparent } from 'vs/platform/theme/common/colorRegistry';
-import { IColorTheme, IThemeService, registerThemingParticipant, ThemeColor, ThemeIcon } from 'vs/platform/theme/common/themeService';
+import { IThemeService, registerThemingParticipant, ThemeIcon } from 'vs/platform/theme/common/themeService';
 import { EditorMemento } from 'vs/workbench/browser/parts/editor/editorPane';
 import { IEditorMemento } from 'vs/workbench/common/editor';
 import { Memento, MementoObject } from 'vs/workbench/common/memento';
 import { PANEL_BORDER } from 'vs/workbench/common/theme';
+import { debugIconStartForeground } from 'vs/workbench/contrib/debug/browser/debugColors';
 import { BOTTOM_CELL_TOOLBAR_GAP, BOTTOM_CELL_TOOLBAR_HEIGHT, CELL_BOTTOM_MARGIN, CELL_MARGIN, CELL_OUTPUT_PADDING, CELL_RUN_GUTTER, CELL_TOP_MARGIN, CODE_CELL_LEFT_MARGIN, COLLAPSED_INDICATOR_HEIGHT, MARKDOWN_CELL_BOTTOM_MARGIN, MARKDOWN_CELL_TOP_MARGIN, SCROLLABLE_ELEMENT_PADDING_TOP } from 'vs/workbench/contrib/notebook/browser/constants';
-import { CellEditState, CellFocusMode, IActiveNotebookEditor, ICellOutputViewModel, ICellViewModel, ICommonCellInfo, IDisplayOutputLayoutUpdateRequest, IFocusNotebookCellOptions, IGenericCellViewModel, IInsetRenderOutput, INotebookCellList, INotebookCellOutputLayoutInfo, INotebookDeltaDecoration, INotebookEditor, INotebookEditorContribution, INotebookEditorContributionDescription, INotebookEditorCreationOptions, INotebookEditorMouseEvent, NotebookEditorOptions, NotebookLayoutInfo, NOTEBOOK_EDITOR_EDITABLE, NOTEBOOK_EDITOR_EXECUTING_NOTEBOOK, NOTEBOOK_EDITOR_FOCUSED, NOTEBOOK_EDITOR_RUNNABLE, NOTEBOOK_HAS_MULTIPLE_KERNELS, NOTEBOOK_KERNEL_COUNT, NOTEBOOK_OUTPUT_FOCUSED } from 'vs/workbench/contrib/notebook/browser/notebookBrowser';
+import { CellEditState, CellFocusMode, IActiveNotebookEditor, ICellOutputViewModel, ICellViewModel, ICommonCellInfo, IDisplayOutputLayoutUpdateRequest, IFocusNotebookCellOptions, IGenericCellViewModel, IInsetRenderOutput, INotebookCellList, INotebookCellOutputLayoutInfo, INotebookDeltaDecoration, INotebookEditor, INotebookEditorContribution, INotebookEditorContributionDescription, INotebookEditorCreationOptions, INotebookEditorMouseEvent, NotebookEditorOptions, NotebookLayoutInfo, NOTEBOOK_EDITOR_EDITABLE, NOTEBOOK_EDITOR_FOCUSED, NOTEBOOK_EDITOR_ID, NOTEBOOK_OUTPUT_FOCUSED } from 'vs/workbench/contrib/notebook/browser/notebookBrowser';
+import { NotebookDecorationCSSRules, NotebookRefCountedStyleSheet } from 'vs/workbench/contrib/notebook/browser/notebookEditorDecorations';
 import { NotebookEditorExtensionsRegistry } from 'vs/workbench/contrib/notebook/browser/notebookEditorExtensions';
-import { NotebookKernelProviderAssociation, NotebookKernelProviderAssociations, notebookKernelProviderAssociationsSettingId } from 'vs/workbench/contrib/notebook/browser/notebookKernelAssociation';
+import { IKernelManagerDelegate, NotebookEditorKernelManager } from 'vs/workbench/contrib/notebook/browser/notebookEditorKernelManager';
+import { errorStateIcon, successStateIcon } from 'vs/workbench/contrib/notebook/browser/notebookIcons';
 import { NotebookCellList } from 'vs/workbench/contrib/notebook/browser/view/notebookCellList';
 import { OutputRenderer } from 'vs/workbench/contrib/notebook/browser/view/output/outputRenderer';
 import { BackLayerWebView } from 'vs/workbench/contrib/notebook/browser/view/renderers/backLayerWebView';
 import { CellContextKeyManager } from 'vs/workbench/contrib/notebook/browser/view/renderers/cellContextKeys';
-import { CodeCellRenderer, ListTopCellToolbar, MarkdownCellRenderer, NotebookCellListDelegate } from 'vs/workbench/contrib/notebook/browser/view/renderers/cellRenderer';
 import { CellDragAndDropController } from 'vs/workbench/contrib/notebook/browser/view/renderers/cellDnd';
+import { CodeCellRenderer, ListTopCellToolbar, MarkdownCellRenderer, NotebookCellListDelegate } from 'vs/workbench/contrib/notebook/browser/view/renderers/cellRenderer';
 import { CodeCellViewModel } from 'vs/workbench/contrib/notebook/browser/viewModel/codeCellViewModel';
 import { NotebookEventDispatcher, NotebookLayoutChangedEvent } from 'vs/workbench/contrib/notebook/browser/viewModel/eventDispatcher';
+import { MarkdownCellViewModel } from 'vs/workbench/contrib/notebook/browser/viewModel/markdownCellViewModel';
 import { CellViewModel, IModelDecorationsChangeAccessor, INotebookEditorViewState, NotebookViewModel } from 'vs/workbench/contrib/notebook/browser/viewModel/notebookViewModel';
 import { NotebookTextModel } from 'vs/workbench/contrib/notebook/common/model/notebookTextModel';
-import { CellKind, CellToolbarLocKey, ICellRange, INotebookDecorationRenderOptions, INotebookKernel, NotebookCellRunState, NotebookRunState, SelectionStateType, ShowCellStatusBarKey } from 'vs/workbench/contrib/notebook/common/notebookCommon';
+import { CellKind, CellToolbarLocKey, ICellRange, INotebookKernel, SelectionStateType, ShowCellStatusBarKey } from 'vs/workbench/contrib/notebook/common/notebookCommon';
 import { NotebookProviderInfo } from 'vs/workbench/contrib/notebook/common/notebookProvider';
 import { INotebookService } from 'vs/workbench/contrib/notebook/common/notebookService';
 import { editorGutterModifiedBackground } from 'vs/workbench/contrib/scm/browser/dirtydiffDecorator';
 import { Webview } from 'vs/workbench/contrib/webview/browser/webview';
 import { IEditorGroupsService } from 'vs/workbench/services/editor/common/editorGroupsService';
-import { configureKernelIcon, errorStateIcon, successStateIcon } from 'vs/workbench/contrib/notebook/browser/notebookIcons';
-import { debugIconStartForeground } from 'vs/workbench/contrib/debug/browser/debugColors';
-import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { extname } from 'vs/base/common/resources';
-import { IModeService } from 'vs/editor/common/services/modeService';
-import { MarkdownCellViewModel } from 'vs/workbench/contrib/notebook/browser/viewModel/markdownCellViewModel';
 
 const $ = DOM.$;
 
-const NotebookEditorActiveKernelCache = 'workbench.editor.notebook.activeKernel';
-
 export class NotebookEditorWidget extends Disposable implements INotebookEditor {
-	static readonly ID: string = 'workbench.editor.notebook';
 	private static readonly EDITOR_MEMENTOS = new Map<string, EditorMemento<unknown>>();
 	private _overlayContainer!: HTMLElement;
 	private _body!: HTMLElement;
 	private _overflowContainer!: HTMLElement;
 	private _webview: BackLayerWebView<ICommonCellInfo> | null = null;
-	private _webviewResolved: boolean = false;
 	private _webviewResolvePromise: Promise<BackLayerWebView<ICommonCellInfo> | null> | null = null;
 	private _webviewTransparentCover: HTMLElement | null = null;
 	private _list!: INotebookCellList;
@@ -95,29 +89,15 @@ export class NotebookEditorWidget extends Disposable implements INotebookEditor
 	private readonly _editorFocus: IContextKey<boolean>;
 	private readonly _outputFocus: IContextKey<boolean>;
 	private readonly _editorEditable: IContextKey<boolean>;
-	private readonly _editorRunnable: IContextKey<boolean>;
-	private readonly _notebookExecuting: IContextKey<boolean>;
-	private readonly _notebookHasMultipleKernels: IContextKey<boolean>;
-	private readonly _notebookKernelCount: IContextKey<number>;
 
 	private _outputRenderer: OutputRenderer;
 	protected readonly _contributions = new Map<string, INotebookEditorContribution>();
 	private _scrollBeyondLastLine: boolean;
 	private readonly _memento: Memento;
-	private readonly _activeKernelMemento: Memento;
 	private readonly _onDidFocusEmitter = this._register(new Emitter<void>());
 	public readonly onDidFocus = this._onDidFocusEmitter.event;
-	private readonly _onWillScroll = this._register(new Emitter<ScrollEvent>());
-	public readonly onWillScroll: Event<ScrollEvent> = this._onWillScroll.event;
-	private readonly _onWillDispose = this._register(new Emitter<void>());
-	public readonly onWillDispose: Event<void> = this._onWillDispose.event;
-
 	private readonly _insetModifyQueueByOutputId = new SequencerByKey<string>();
-
-	set scrollTop(top: number) {
-		this._list.scrollTop = top;
-	}
-
+	private _kernelManger: NotebookEditorKernelManager;
 	private _cellContextKeyManager: CellContextKeyManager | null = null;
 	private _isVisible = false;
 	private readonly _uuid = generateUuid();
@@ -144,65 +124,33 @@ export class NotebookEditorWidget extends Disposable implements INotebookEditor
 		return this._notebookViewModel;
 	}
 
-	get uri() {
-		return this._notebookViewModel?.uri;
-	}
-
 	get textModel() {
 		return this._notebookViewModel?.notebookDocument;
 	}
 
-	private _activeKernelExecuted: boolean = false;
-	private _activeKernel: INotebookKernel | undefined = undefined;
-	private readonly _onDidChangeKernel = this._register(new Emitter<void>());
-	readonly onDidChangeKernel: Event<void> = this._onDidChangeKernel.event;
-	private readonly _onDidChangeAvailableKernels = this._register(new Emitter<void>());
-	readonly onDidChangeAvailableKernels: Event<void> = this._onDidChangeAvailableKernels.event;
-
-	private _contributedKernelsComputePromise: CancelablePromise<INotebookKernel[]> | null = null;
-	private _initialKernelComputationDone: boolean = false;
+	get onDidChangeKernel(): Event<void> {
+		return this._kernelManger.onDidChangeKernel;
+	}
+	get onDidChangeAvailableKernels(): Event<void> {
+		return this._kernelManger.onDidChangeAvailableKernels;
+	}
 
 	get activeKernel() {
-		return this._activeKernel;
+		return this._kernelManger.activeKernel;
 	}
 
 	set activeKernel(kernel: INotebookKernel | undefined) {
-		if (this._isDisposed) {
-			return;
-		}
-
-		if (!this.viewModel) {
-			return;
-		}
-
-		if (this._activeKernel === kernel) {
-			return;
-		}
-
-		this._activeKernel = kernel;
-		this._activeKernelResolvePromise = undefined;
-
-		const memento = this._activeKernelMemento.getMemento(StorageScope.GLOBAL, StorageTarget.MACHINE);
-		memento[this.viewModel.viewType] = this._activeKernel?.friendlyId;
-		this._activeKernelMemento.saveMemento();
-		this._onDidChangeKernel.fire();
-		if (this._activeKernel) {
-			this._loadKernelPreloads(this._activeKernel.extensionLocation, this._activeKernel);
-		}
+		this._kernelManger.activeKernel = kernel;
 	}
 
-	private _activeKernelResolvePromise: Promise<void> | undefined = undefined;
-
 	private _currentKernelTokenSource: CancellationTokenSource | undefined = undefined;
-	private _multipleKernelsAvailable: boolean = false;
 
 	get multipleKernelsAvailable() {
-		return this._multipleKernelsAvailable;
+		return this._kernelManger.multipleKernelsAvailable;
 	}
 
 	set multipleKernelsAvailable(state: boolean) {
-		this._multipleKernelsAvailable = state;
-		this._onDidChangeAvailableKernels.fire();
+		this._kernelManger.multipleKernelsAvailable = state;
 	}
 
 	private readonly _onDidChangeActiveEditor = this._register(new Emitter<this>());
@@ -219,11 +167,6 @@ export class NotebookEditorWidget extends Disposable implements INotebookEditor
 
 	private readonly _onDidChangeActiveCell = this._register(new Emitter<void>());
 	readonly onDidChangeActiveCell: Event<void> = this._onDidChangeActiveCell.event;
-
-	private readonly _onDidScroll = this._register(new Emitter<ScrollEvent>());
-
-	readonly onDidScroll: Event<ScrollEvent> = this._onDidScroll.event;
-
 	private _cursorNavigationMode: boolean = false;
 	get cursorNavigationMode(): boolean {
 		return this._cursorNavigationMode;
@@ -258,7 +201,6 @@ export class NotebookEditorWidget extends Disposable implements INotebookEditor
 		@ILayoutService private readonly layoutService: ILayoutService,
 		@IContextMenuService private readonly contextMenuService: IContextMenuService,
 		@IMenuService private readonly menuService: IMenuService,
-		@IQuickInputService private readonly quickInputService: IQuickInputService,
 		@IThemeService private readonly themeService: IThemeService,
 		@ITelemetryService private readonly telemetryService: ITelemetryService,
 		@IModeService private readonly modeService: IModeService,
@@ -270,8 +212,23 @@ export class NotebookEditorWidget extends Disposable implements INotebookEditor
 		this.scopedContextKeyService = contextKeyService.createScoped(this._overlayContainer);
 		this.instantiationService = instantiationService.createChild(new ServiceCollection([IContextKeyService, this.scopedContextKeyService]));
 
-		this._memento = new Memento(NotebookEditorWidget.ID, storageService);
-		this._activeKernelMemento = new Memento(NotebookEditorActiveKernelCache, storageService);
+		const that = this;
+		this._kernelManger = instantiationService.createInstance(NotebookEditorKernelManager, <IKernelManagerDelegate>{
+			getId() { return that.getId(); },
+			loadKernelPreloads: that._loadKernelPreloads.bind(that),
+			get viewModel() { return that.viewModel; },
+			getContributedNotebookProviders(resource?: URI) {
+				return that.notebookService.getContributedNotebookProviders(resource);
+			},
+			getContributedNotebookProvider(viewType: string): NotebookProviderInfo | undefined {
+				return that.notebookService.getContributedNotebookProvider(viewType);
+			},
+			getNotebookKernels(viewType: string, resource: URI, token: CancellationToken): Promise<INotebookKernel[]> {
+				return that.notebookService.getNotebookKernels(viewType, resource, token);
+			}
+		});
+
+		this._memento = new Memento(NOTEBOOK_EDITOR_ID, storageService);
 
 		this._outputRenderer = new OutputRenderer(this, this.instantiationService);
 		this._scrollBeyondLastLine = this.configurationService.getValue<boolean>('editor.scrollBeyondLastLine');
@@ -304,10 +261,6 @@ export class NotebookEditorWidget extends Disposable implements INotebookEditor
 		this._editorFocus = NOTEBOOK_EDITOR_FOCUSED.bindTo(this.scopedContextKeyService);
 		this._outputFocus = NOTEBOOK_OUTPUT_FOCUSED.bindTo(this.scopedContextKeyService);
 		this._editorEditable = NOTEBOOK_EDITOR_EDITABLE.bindTo(this.scopedContextKeyService);
-		this._editorRunnable = NOTEBOOK_EDITOR_RUNNABLE.bindTo(this.scopedContextKeyService);
-		this._notebookExecuting = NOTEBOOK_EDITOR_EXECUTING_NOTEBOOK.bindTo(this.scopedContextKeyService);
-		this._notebookHasMultipleKernels = NOTEBOOK_HAS_MULTIPLE_KERNELS.bindTo(this.scopedContextKeyService);
-		this._notebookKernelCount = NOTEBOOK_KERNEL_COUNT.bindTo(this.scopedContextKeyService);
 
 		let contributions: INotebookEditorContributionDescription[];
 		if (Array.isArray(this.creationOptions.contributions)) {
@@ -368,11 +321,11 @@ export class NotebookEditorWidget extends Disposable implements INotebookEditor
 	//#region Editor Core
 
 	protected getEditorMemento<T>(editorGroupService: IEditorGroupsService, key: string, limit: number = 10): IEditorMemento<T> {
-		const mementoKey = `${NotebookEditorWidget.ID}${key}`;
+		const mementoKey = `${NOTEBOOK_EDITOR_ID}${key}`;
 
 		let editorMemento = NotebookEditorWidget.EDITOR_MEMENTOS.get(mementoKey);
 		if (!editorMemento) {
-			editorMemento = new EditorMemento(NotebookEditorWidget.ID, key, this.getMemento(StorageScope.WORKSPACE), limit, editorGroupService);
+			editorMemento = new EditorMemento(NOTEBOOK_EDITOR_ID, key, this.getMemento(StorageScope.WORKSPACE), limit, editorGroupService);
 			NotebookEditorWidget.EDITOR_MEMENTOS.set(mementoKey, editorMemento);
 		}
 
@@ -383,10 +336,6 @@ export class NotebookEditorWidget extends Disposable implements INotebookEditor
 		return this._memento.getMemento(scope, StorageTarget.MACHINE);
 	}
 
-	public get isNotebookEditor() {
-		return true;
-	}
-
 	private _updateForNotebookConfiguration() {
 		if (!this._overlayContainer) {
 			return;
@@ -405,56 +354,6 @@ export class NotebookEditorWidget extends Disposable implements INotebookEditor
 		this._overlayContainer.classList.toggle('cell-statusbar-hidden', !showCellStatusBar);
 	}
 
-	updateEditorFocus() {
-		// Note - focus going to the webview will fire 'blur', but the webview element will be
-		// a descendent of the notebook editor root.
-		const focused = DOM.isAncestor(document.activeElement, this._overlayContainer);
-		this._editorFocus.set(focused);
-		this.viewModel?.setFocus(focused);
-	}
-
-	hasFocus() {
-		return this._editorFocus.get() || false;
-	}
-
-	hasWebviewFocus() {
-		return this._webiewFocused;
-	}
-
-	hasOutputTextSelection() {
-		if (!this.hasFocus()) {
-			return false;
-		}
-
-		const windowSelection = window.getSelection();
-		if (windowSelection?.rangeCount !== 1) {
-			return false;
-		}
-
-		const activeSelection = windowSelection.getRangeAt(0);
-		if (activeSelection.endOffset - activeSelection.startOffset === 0) {
-			return false;
-		}
-
-		let container: any = activeSelection.commonAncestorContainer;
-
-		if (!this._body.contains(container)) {
-			return false;
-		}
-
-		while (container
-			&&
-			container !== this._body) {
-			if ((container as HTMLElement).classList && (container as HTMLElement).classList.contains('output')) {
-				return true;
-			}
-
-			container = container.parentNode;
-		}
-
-		return false;
-	}
-
 	private _generateFontInfo(): void {
 		const editorOptions = this.configurationService.getValue<IEditorOptions>('editor');
 		this._fontInfo = BareFontInfo.createFromRawSettings(editorOptions, getZoomLevel(), getPixelRatio());
@@ -579,10 +478,6 @@ export class NotebookEditorWidget extends Disposable implements INotebookEditor
 			this.showListContextMenu(e);
 		}));
 
-		this._register(this._list.onDidScroll((e) => {
-			this._onDidScroll.fire(e);
-		}));
-
 		this._register(this._list.onDidChangeVisibleRanges(() => {
 			this._onDidChangeVisibleRanges.fire();
 		}));
@@ -638,42 +533,10 @@ export class NotebookEditorWidget extends Disposable implements INotebookEditor
 		return this._overflowContainer;
 	}
 
-	onWillHide() {
-		this._isVisible = false;
-		this._editorFocus.set(false);
-		this._overlayContainer.style.visibility = 'hidden';
-		this._overlayContainer.style.left = '-50000px';
-	}
-
 	getInnerWebview(): Webview | undefined {
 		return this._webview?.webview;
 	}
 
-	focus() {
-		this._isVisible = true;
-		this._editorFocus.set(true);
-
-		if (this._webiewFocused) {
-			this._webview?.focusWebview();
-		} else {
-			const focus = this._list.getFocus()[0];
-			if (typeof focus === 'number' && this.viewModel) {
-				const element = this.viewModel.viewCells[focus];
-
-				if (element.focusMode === CellFocusMode.Editor) {
-					element.editState = CellEditState.Editing;
-					element.focusMode = CellFocusMode.Editor;
-					this._onDidFocusEditorWidget.fire();
-					return;
-				}
-
-			}
-			this._list.domFocus();
-		}
-
-		this._onDidFocusEditorWidget.fire();
-	}
-
 	setParentContextKeyService(parentContextKeyService: IContextKeyService): void {
 		this.scopedContextKeyService.updateParent(parentContextKeyService);
 	}
@@ -763,6 +626,15 @@ export class NotebookEditorWidget extends Disposable implements INotebookEditor
 				}
 			}
 		}
+
+		// select cells if options tell to do so
+		// todo@rebornix https://github.com/microsoft/vscode/issues/118108 support selections not just focus
+		// todo@rebornix support multipe selections
+		if (options?.cellSelections && this.viewModel) {
+			const focusedCell = this.viewModel.viewCells[options.cellSelections[0].start];
+			this.revealInCenterIfOutsideViewport(focusedCell);
+			this.focusElement(focusedCell);
+		}
 	}
 
 	private _detachModel() {
@@ -771,30 +643,14 @@ export class NotebookEditorWidget extends Disposable implements INotebookEditor
 		this.viewModel?.dispose();
 		// avoid event
 		this.viewModel = undefined;
-		// this.webview?.clearInsets();
-		// this.webview?.clearPreloadsCache();
 		this._webview?.dispose();
 		this._webview?.element.remove();
 		this._webview = null;
 		this._list.clear();
-		this._activeKernel = undefined;
-		this._activeKernelExecuted = false;
 	}
 
 	async beginComputeContributedKernels() {
-		if (this._contributedKernelsComputePromise) {
-			return this._contributedKernelsComputePromise;
-		}
-
-		this._contributedKernelsComputePromise = createCancelablePromise(token => {
-			return this.notebookService.getNotebookKernels(this.viewModel!.viewType, this.viewModel!.uri, token);
-		});
-
-		const result = await this._contributedKernelsComputePromise;
-		this._initialKernelComputationDone = true;
-		this._contributedKernelsComputePromise = null;
-
-		return result;
+		return this._kernelManger.beginComputeContributedKernels();
 	}
 
 	private async _setKernels(tokenSource: CancellationTokenSource) {
@@ -802,127 +658,7 @@ export class NotebookEditorWidget extends Disposable implements INotebookEditor
 			return;
 		}
 
-		if (this._activeKernel !== undefined && this._activeKernelExecuted) {
-			// kernel already executed, we should not change it automatically
-			return;
-		}
-
-		const provider = this.notebookService.getContributedNotebookProvider(this.viewModel.viewType) || this.notebookService.getContributedNotebookProviders(this.viewModel.uri)[0];
-		const availableKernels = await this.beginComputeContributedKernels();
-
-		if (tokenSource.token.isCancellationRequested) {
-			return;
-		}
-
-		this._notebookKernelCount.set(availableKernels.length);
-		if (availableKernels.length > 1) {
-			this._notebookHasMultipleKernels.set(true);
-			this.multipleKernelsAvailable = true;
-		} else {
-			this._notebookHasMultipleKernels.set(false);
-			this.multipleKernelsAvailable = false;
-		}
-
-		const activeKernelStillExist = [...availableKernels].find(kernel => kernel.friendlyId === this.activeKernel?.friendlyId && this.activeKernel?.friendlyId !== undefined);
-
-		if (activeKernelStillExist) {
-			// the kernel still exist, we don't want to modify the selection otherwise user's temporary preference is lost
-			return;
-		}
-
-		if (availableKernels.length) {
-			return this._setKernelsFromProviders(provider, availableKernels, tokenSource);
-		}
-
-		this._initialKernelComputationDone = true;
-
-		tokenSource.dispose();
-	}
-
-	private async _setKernelsFromProviders(provider: NotebookProviderInfo, kernels: INotebookKernel[], tokenSource: CancellationTokenSource) {
-		const rawAssociations = this.configurationService.getValue<NotebookKernelProviderAssociations>(notebookKernelProviderAssociationsSettingId) || [];
-		const userSetKernelProvider = rawAssociations.filter(e => e.viewType === this.viewModel?.viewType)[0]?.kernelProvider;
-		const memento = this._activeKernelMemento.getMemento(StorageScope.GLOBAL, StorageTarget.MACHINE);
-
-		if (userSetKernelProvider) {
-			const filteredKernels = kernels.filter(kernel => kernel.extension.value === userSetKernelProvider);
-
-			if (filteredKernels.length) {
-				const cachedKernelId = memento[provider.id];
-				this.activeKernel =
-					filteredKernels.find(kernel => kernel.isPreferred)
-					|| filteredKernels.find(kernel => kernel.friendlyId === cachedKernelId)
-					|| filteredKernels[0];
-			} else {
-				this.activeKernel = undefined;
-			}
-
-			if (this.activeKernel) {
-				await this._loadKernelPreloads(this.activeKernel.extensionLocation, this.activeKernel);
-
-				if (tokenSource.token.isCancellationRequested) {
-					return;
-				}
-
-				this._activeKernelResolvePromise = this.activeKernel.resolve(this.viewModel!.uri, this.getId(), tokenSource.token);
-				await this._activeKernelResolvePromise;
-
-				if (tokenSource.token.isCancellationRequested) {
-					return;
-				}
-			}
-
-			memento[provider.id] = this._activeKernel?.friendlyId;
-			this._activeKernelMemento.saveMemento();
-
-			tokenSource.dispose();
-			return;
-		}
-
-		// choose a preferred kernel
-		const kernelsFromSameExtension = kernels.filter(kernel => kernel.extension.value === provider.providerExtensionId);
-		if (kernelsFromSameExtension.length) {
-			const cachedKernelId = memento[provider.id];
-
-			const preferedKernel = kernelsFromSameExtension.find(kernel => kernel.isPreferred)
-				|| kernelsFromSameExtension.find(kernel => kernel.friendlyId === cachedKernelId)
-				|| kernelsFromSameExtension[0];
-			this.activeKernel = preferedKernel;
-			if (this.activeKernel) {
-				await this._loadKernelPreloads(this.activeKernel.extensionLocation, this.activeKernel);
-			}
-
-			if (tokenSource.token.isCancellationRequested) {
-				return;
-			}
-
-			await preferedKernel.resolve(this.viewModel!.uri, this.getId(), tokenSource.token);
-
-			if (tokenSource.token.isCancellationRequested) {
-				return;
-			}
-
-			memento[provider.id] = this._activeKernel?.friendlyId;
-			this._activeKernelMemento.saveMemento();
-			tokenSource.dispose();
-			return;
-		}
-
-		// the provider doesn't have a builtin kernel, choose a kernel
-		this.activeKernel = kernels[0];
-		if (this.activeKernel) {
-			await this._loadKernelPreloads(this.activeKernel.extensionLocation, this.activeKernel);
-			if (tokenSource.token.isCancellationRequested) {
-				return;
-			}
-
-			await this.activeKernel.resolve(this.viewModel!.uri, this.getId(), tokenSource.token);
-			if (tokenSource.token.isCancellationRequested) {
-				return;
-			}
-		}
-
-		tokenSource.dispose();
+		this._kernelManger.setKernels(tokenSource);
 	}
 
 	private async _loadKernelPreloads(extensionLocation: URI, kernel: INotebookKernel) {
@@ -939,11 +675,10 @@ export class NotebookEditorWidget extends Disposable implements INotebookEditor
 
 		const notebookMetadata = this.viewModel.metadata;
 		this._editorEditable.set(!!notebookMetadata?.editable);
-		this._editorRunnable.set(this.viewModel.runnable);
 		this._overflowContainer.classList.toggle('notebook-editor-editable', !!notebookMetadata?.editable);
 		this.getDomNode().classList.toggle('notebook-editor-editable', !!notebookMetadata?.editable);
 
-		this._notebookExecuting.set(notebookMetadata.runState === NotebookRunState.Running);
+		this._kernelManger.updateForMetadata();
 	}
 
 	private async _resolveWebview(): Promise<BackLayerWebView<ICommonCellInfo> | null> {
@@ -956,12 +691,7 @@ export class NotebookEditorWidget extends Disposable implements INotebookEditor
 		}
 
 		if (!this._webview) {
-			this._webview = this.instantiationService.createInstance(BackLayerWebView, this, this.getId(), this.textModel!.uri, { outputNodePadding: CELL_OUTPUT_PADDING, outputNodeLeftPadding: CELL_OUTPUT_PADDING });
-			this._webview.element.style.width = `calc(100% - ${CODE_CELL_LEFT_MARGIN + (CELL_MARGIN * 2) + CELL_RUN_GUTTER}px)`;
-			this._webview.element.style.margin = `0px 0 0px ${CODE_CELL_LEFT_MARGIN + CELL_RUN_GUTTER}px`;
-
-			// attach the webview container to the DOM tree first
-			this._list.rowsContainer.insertAdjacentElement('afterbegin', this._webview.element);
+			this._createWebview(this.getId(), this.textModel.uri);
 		}
 
 		this._webviewResolvePromise = new Promise(async resolve => {
@@ -998,8 +728,6 @@ export class NotebookEditorWidget extends Disposable implements INotebookEditor
 				}
 			}));
 
-			this._webviewResolved = true;
-
 			resolve(this._webview);
 		});
 
@@ -1007,9 +735,15 @@ export class NotebookEditorWidget extends Disposable implements INotebookEditor
 	}
 
 	private async _createWebview(id: string, resource: URI): Promise<void> {
-		this._webview = this.instantiationService.createInstance(BackLayerWebView, this, id, resource, { outputNodePadding: CELL_OUTPUT_PADDING, outputNodeLeftPadding: CELL_OUTPUT_PADDING });
-		this._webview.element.style.width = `calc(100% - ${CODE_CELL_LEFT_MARGIN + (CELL_MARGIN * 2) + CELL_RUN_GUTTER}px)`;
-		this._webview.element.style.margin = `0px 0 0px ${CODE_CELL_LEFT_MARGIN + CELL_RUN_GUTTER}px`;
+		this._webview = this.instantiationService.createInstance(BackLayerWebView, this, id, resource, {
+			outputNodePadding: CELL_OUTPUT_PADDING,
+			outputNodeLeftPadding: CELL_OUTPUT_PADDING,
+			leftMargin: CODE_CELL_LEFT_MARGIN,
+			cellMargin: CELL_MARGIN,
+			runGutter: CELL_RUN_GUTTER,
+		});
+		this._webview.element.style.width = '100%';
+
 		// attach the webview container to the DOM tree first
 		this._list.rowsContainer.insertAdjacentElement('afterbegin', this._webview.element);
 	}
@@ -1060,13 +794,10 @@ export class NotebookEditorWidget extends Disposable implements INotebookEditor
 		}));
 
 		this._localStore.add(this._list.onWillScroll(e => {
-			this._onWillScroll.fire(e);
-			if (!this._webviewResolved) {
-				return;
+			if (this._webview?.isResolved()) {
+				this._webview.updateViewScrollTop(-e.scrollTop, true, []);
+				this._webviewTransparentCover!.style.top = `${e.scrollTop}px`;
 			}
-
-			this._webview?.updateViewScrollTop(-e.scrollTop, true, []);
-			this._webviewTransparentCover!.style.top = `${e.scrollTop}px`;
 		}));
 
 		this._localStore.add(this._list.onDidChangeContentHeight(() => {
@@ -1078,7 +809,7 @@ export class NotebookEditorWidget extends Disposable implements INotebookEditor
 				const scrollTop = this._list.scrollTop;
 				const scrollHeight = this._list.scrollHeight;
 
-				if (!this._webviewResolved) {
+				if (!this._webview?.isResolved()) {
 					return;
 				}
 
@@ -1140,13 +871,19 @@ export class NotebookEditorWidget extends Disposable implements INotebookEditor
 			});
 		}));
 
-		this._list.attachViewModel(this.viewModel);
 		this._localStore.add(this._list.onDidRemoveOutput(output => {
 			this.removeInset(output);
 		}));
 		this._localStore.add(this._list.onDidHideOutput(output => {
 			this.hideInset(output);
 		}));
+		this._localStore.add(this._list.onDidRemoveCellFromView(cell => {
+			if (cell.cellKind === CellKind.Markdown) {
+				this.removeMarkdownPreview(cell as MarkdownCellViewModel);
+			}
+		}));
+
+		this._list.attachViewModel(this.viewModel);
 
 		if (this._dimension) {
 			this._list.layout(this._dimension.height - SCROLLABLE_ELEMENT_PADDING_TOP, this._dimension.width);
@@ -1173,14 +910,14 @@ export class NotebookEditorWidget extends Disposable implements INotebookEditor
 		if (focusIdx < this._list.length) {
 			const element = this._list.element(focusIdx);
 			if (element) {
-				this.viewModel?.updateSelectionsFromEdits({
+				this.viewModel?.updateSelectionsState({
 					kind: SelectionStateType.Handle,
 					primary: element.handle,
 					selections: [element.handle]
 				});
 			}
 		} else if (this._list.length > 0) {
-			this.viewModel?.updateSelectionsFromEdits({
+			this.viewModel?.updateSelectionsState({
 				kind: SelectionStateType.Index,
 				selections: [{ start: 0, end: 1 }]
 			});
@@ -1242,15 +979,6 @@ export class NotebookEditorWidget extends Disposable implements INotebookEditor
 		return state;
 	}
 
-	// private saveEditorViewState(input: NotebookEditorInput): void {
-	// 	if (this.group && this.notebookViewModel) {
-	// 	}
-	// }
-
-	// private loadTextEditorViewState(): INotebookEditorViewState | undefined {
-	// 	return this.editorMemento.loadEditorState(this.group, input.resource);
-	// }
-
 	layout(dimension: DOM.Dimension, shadowElement?: HTMLElement): void {
 		if (!shadowElement && this._shadowElementViewInfo === null) {
 			this._dimension = dimension;
@@ -1290,21 +1018,97 @@ export class NotebookEditorWidget extends Disposable implements INotebookEditor
 
 		this._eventDispatcher?.emit([new NotebookLayoutChangedEvent({ width: true, fontInfo: true }, this.getLayoutInfo())]);
 	}
+	//#endregion
 
-	// protected saveState(): void {
-	// 	if (this.input instanceof NotebookEditorInput) {
-	// 		this.saveEditorViewState(this.input);
-	// 	}
+	//#region Focus tracker
+	focus() {
+		this._isVisible = true;
+		this._editorFocus.set(true);
 
-	// 	super.saveState();
-	// }
+		if (this._webiewFocused) {
+			this._webview?.focusWebview();
+		} else {
+			const focus = this._list.getFocus()[0];
+			if (typeof focus === 'number' && this.viewModel) {
+				const element = this.viewModel.viewCells[focus];
+
+				if (element.focusMode === CellFocusMode.Editor) {
+					element.editState = CellEditState.Editing;
+					element.focusMode = CellFocusMode.Editor;
+					this._onDidFocusEditorWidget.fire();
+					return;
+				}
+
+			}
+			this._list.domFocus();
+		}
+
+		this._onDidFocusEditorWidget.fire();
+	}
+
+	onWillHide() {
+		this._isVisible = false;
+		this._editorFocus.set(false);
+		this._overlayContainer.style.visibility = 'hidden';
+		this._overlayContainer.style.left = '-50000px';
+	}
+
+	updateEditorFocus() {
+		// Note - focus going to the webview will fire 'blur', but the webview element will be
+		// a descendent of the notebook editor root.
+		const focused = DOM.isAncestor(document.activeElement, this._overlayContainer);
+		this._editorFocus.set(focused);
+		this.viewModel?.setFocus(focused);
+	}
+
+	hasFocus() {
+		return this._editorFocus.get() || false;
+	}
+
+	hasWebviewFocus() {
+		return this._webiewFocused;
+	}
+
+	hasOutputTextSelection() {
+		if (!this.hasFocus()) {
+			return false;
+		}
+
+		const windowSelection = window.getSelection();
+		if (windowSelection?.rangeCount !== 1) {
+			return false;
+		}
+
+		const activeSelection = windowSelection.getRangeAt(0);
+		if (activeSelection.endOffset - activeSelection.startOffset === 0) {
+			return false;
+		}
+
+		let container: any = activeSelection.commonAncestorContainer;
+
+		if (!this._body.contains(container)) {
+			return false;
+		}
+
+		while (container
+			&&
+			container !== this._body) {
+			if ((container as HTMLElement).classList && (container as HTMLElement).classList.contains('output')) {
+				return true;
+			}
+
+			container = container.parentNode;
+		}
+
+		return false;
+	}
 
 	//#endregion
 
 	//#region Editor Features
 
 	focusElement(cell: ICellViewModel) {
-		this.viewModel?.updateSelectionsFromEdits({
+		this.viewModel?.updateSelectionsState({
 			kind: SelectionStateType.Handle,
 			primary: cell.handle,
 			selections: [cell.handle]
@@ -1359,7 +1163,7 @@ export class NotebookEditorWidget extends Disposable implements INotebookEditor
 		return this._list.revealElementRangeInCenterIfOutsideViewportAsync(cell, range);
 	}
 
-	setCellSelection(cell: ICellViewModel, range: Range): void {
+	setCellEditorSelection(cell: ICellViewModel, range: Range): void {
 		this._list.setCellSelection(cell, range);
 	}
 
@@ -1371,22 +1175,25 @@ export class NotebookEditorWidget extends Disposable implements INotebookEditor
 		return this._list.setHiddenAreas(_ranges, true);
 	}
 
-	private _editorStyleSheets = new Map<string, RefCountedStyleSheet>();
-	private _decorationRules = new Map<string, DecorationCSSRules>();
-	private _decortionKeyToIds = new Map<string, string[]>();
+	//#endregion
 
-	_removeEditorStyleSheets(key: string): void {
-		this._editorStyleSheets.delete(key);
-	}
+	//#region Decorations
+	private _editorStyleSheets = new Map<string, NotebookRefCountedStyleSheet>();
+	private _decorationRules = new Map<string, NotebookDecorationCSSRules>();
+	private _decortionKeyToIds = new Map<string, string[]>();
 
 	private _registerDecorationType(key: string) {
 		const options = this.notebookService.resolveEditorDecorationOptions(key);
 
 		if (options) {
 			const styleElement = DOM.createStyleSheet(this._body);
-			const styleSheet = new RefCountedStyleSheet(this, key, styleElement);
+			const styleSheet = new NotebookRefCountedStyleSheet({
+				removeEditorStyleSheets: (key) => {
+					this._editorStyleSheets.delete(key);
+				}
+			}, key, styleElement);
 			this._editorStyleSheets.set(key, styleSheet);
-			this._decorationRules.set(key, new DecorationCSSRules(this.themeService, styleSheet, {
+			this._decorationRules.set(key, new NotebookDecorationCSSRules(this.themeService, styleSheet, {
 				key,
 				options,
 				styleSheet
@@ -1418,7 +1225,6 @@ export class NotebookEditorWidget extends Disposable implements INotebookEditor
 		this._decortionKeyToIds.set(key, this.deltaCellDecorations(existingDecorations, newDecorations));
 	}
 
-
 	removeEditorDecorations(key: string): void {
 		if (this._decorationRules.has(key)) {
 			this._decorationRules.get(key)?.dispose();
@@ -1428,6 +1234,15 @@ export class NotebookEditorWidget extends Disposable implements INotebookEditor
 		this.deltaCellDecorations(cellDecorations || [], []);
 	}
 
+
+	deltaCellDecorations(oldDecorations: string[], newDecorations: INotebookDeltaDecoration[]): string[] {
+		return this.viewModel?.deltaCellDecorations(oldDecorations, newDecorations) || [];
+	}
+
+	deltaCellOutputContainerClassNames(cellId: string, added: string[], removed: string[]) {
+		this._webview?.deltaCellOutputContainerClassNames(cellId, added, removed);
+	}
+
 	//#endregion
 
 	//#region Mouse Events
@@ -1437,11 +1252,39 @@ export class NotebookEditorWidget extends Disposable implements INotebookEditor
 	private readonly _onMouseDown: Emitter<INotebookEditorMouseEvent> = this._register(new Emitter<INotebookEditorMouseEvent>());
 	public readonly onMouseDown: Event<INotebookEditorMouseEvent> = this._onMouseDown.event;
 
-	private pendingLayouts = new WeakMap<ICellViewModel, IDisposable>();
+	//#endregion
+
+	//#region Kernel/Execution
+	async cancelNotebookExecution(): Promise<void> {
+		return this._kernelManger.cancelNotebookExecution();
+	}
+
+	async executeNotebook(): Promise<void> {
+		return this._kernelManger.executeNotebook();
+	}
+
+	async cancelNotebookCellExecution(cell: ICellViewModel): Promise<void> {
+		return this._kernelManger.cancelNotebookCellExecution(cell);
+	}
+
+	async executeNotebookCell(cell: ICellViewModel): Promise<void> {
+		if (!this.viewModel) {
+			return;
+		}
+
+		// TODO@roblourens, don't use the "execute" command for this
+		if (cell.cellKind === CellKind.Markdown) {
+			this.focusNotebookCell(cell, 'container');
+			return;
+		}
+
+		return this._kernelManger.executeNotebookCell(cell);
+	}
 
 	//#endregion
 
-	//#region Cell operations
+	//#region Cell operations/layout API
+	private _pendingLayouts = new WeakMap<ICellViewModel, IDisposable>();
 	async layoutNotebookCell(cell: ICellViewModel, height: number): Promise<void> {
 		const viewIndex = this._list.getViewIndex(cell);
 		if (viewIndex === undefined) {
@@ -1457,8 +1300,8 @@ export class NotebookEditorWidget extends Disposable implements INotebookEditor
 			this._list.updateElementHeight2(cell, height);
 		};
 
-		if (this.pendingLayouts.has(cell)) {
-			this.pendingLayouts.get(cell)!.dispose();
+		if (this._pendingLayouts.has(cell)) {
+			this._pendingLayouts.get(cell)!.dispose();
 		}
 
 		let r: () => void;
@@ -1467,13 +1310,13 @@ export class NotebookEditorWidget extends Disposable implements INotebookEditor
 				return;
 			}
 
-			this.pendingLayouts.delete(cell);
+			this._pendingLayouts.delete(cell);
 
 			relayout(cell, height);
 			r();
 		});
 
-		this.pendingLayouts.set(cell, toDisposable(() => {
+		this._pendingLayouts.set(cell, toDisposable(() => {
 			layoutDisposable.dispose();
 			r();
 		}));
@@ -1511,7 +1354,7 @@ export class NotebookEditorWidget extends Disposable implements INotebookEditor
 		const nextIndex = ui ? this.viewModel.getNextVisibleCellIndex(index) : index + 1;
 		let language;
 		if (type === CellKind.Code) {
-			const supportedLanguages = this._activeKernel?.supportedLanguages ?? this.modeService.getRegisteredModes();
+			const supportedLanguages = this._kernelManger.activeKernel?.supportedLanguages ?? this.modeService.getRegisteredModes();
 			const defaultLanguage = supportedLanguages[0] || 'plaintext';
 			if (cell?.cellKind === CellKind.Code) {
 				language = cell.language;
@@ -1575,8 +1418,8 @@ export class NotebookEditorWidget extends Disposable implements INotebookEditor
 
 		if (ret) {
 			ret.deletedCells.forEach(cell => {
-				if (this.pendingLayouts.has(cell)) {
-					this.pendingLayouts.get(cell)!.dispose();
+				if (this._pendingLayouts.has(cell)) {
+					this._pendingLayouts.get(cell)!.dispose();
 				}
 			});
 
@@ -1595,8 +1438,8 @@ export class NotebookEditorWidget extends Disposable implements INotebookEditor
 			return false;
 		}
 
-		if (this.pendingLayouts.has(cell)) {
-			this.pendingLayouts.get(cell)!.dispose();
+		if (this._pendingLayouts.has(cell)) {
+			this._pendingLayouts.get(cell)!.dispose();
 		}
 
 		const index = this.viewModel.getCellIndex(cell);
@@ -1640,26 +1483,6 @@ export class NotebookEditorWidget extends Disposable implements INotebookEditor
 		return this._moveCellToIndex(index, 1, newIdx);
 	}
 
-	async moveCell(cell: ICellViewModel, relativeToCell: ICellViewModel, direction: 'above' | 'below'): Promise<ICellViewModel | null> {
-		if (!this.viewModel) {
-			return null;
-		}
-
-		if (!this.viewModel.metadata.editable) {
-			return null;
-		}
-
-		if (cell === relativeToCell) {
-			return null;
-		}
-
-		const originalIdx = this.viewModel.getCellIndex(cell);
-		const relativeToIndex = this.viewModel.getCellIndex(relativeToCell);
-
-		const newIdx = direction === 'above' ? relativeToIndex : relativeToIndex + 1;
-		return this._moveCellToIndex(originalIdx, 1, newIdx);
-	}
-
 	async moveCellsToIdx(index: number, length: number, toIdx: number): Promise<ICellViewModel | null> {
 		if (!this.viewModel) {
 			return null;
@@ -1715,20 +1538,6 @@ export class NotebookEditorWidget extends Disposable implements INotebookEditor
 		return new Promise(resolve => { r = resolve; });
 	}
 
-	editNotebookCell(cell: CellViewModel): void {
-		if (!this.viewModel) {
-			return;
-		}
-
-		if (!cell.getEvaluatedMetadata(this.viewModel.metadata).editable) {
-			return;
-		}
-
-		cell.editState = CellEditState.Editing;
-
-		this._renderedEditors.get(cell)?.focus();
-	}
-
 	getActiveCell() {
 		const elements = this._list.getFocusedElements();
 
@@ -1739,173 +1548,6 @@ export class NotebookEditorWidget extends Disposable implements INotebookEditor
 		return undefined;
 	}
 
-	private async _ensureActiveKernel() {
-		if (this._activeKernel) {
-			return;
-		}
-
-		if (this._activeKernelResolvePromise) {
-			await this._activeKernelResolvePromise;
-
-			if (this._activeKernel) {
-				return;
-			}
-		}
-
-
-		if (!this._initialKernelComputationDone) {
-			await this._setKernels(new CancellationTokenSource());
-
-			if (this._activeKernel) {
-				return;
-			}
-		}
-
-		// pick active kernel
-
-		const picker = this.quickInputService.createQuickPick<(IQuickPickItem & { run(): void; kernelProviderId?: string })>();
-		picker.placeholder = nls.localize('notebook.runCell.selectKernel', "Select a notebook kernel to run this notebook");
-		picker.matchOnDetail = true;
-
-		const tokenSource = new CancellationTokenSource();
-		const availableKernels = await this.beginComputeContributedKernels();
-		const picks: QuickPickInput<IQuickPickItem & { run(): void; kernelProviderId?: string; }>[] = availableKernels.map((a) => {
-			return {
-				id: a.friendlyId,
-				label: a.label,
-				picked: false,
-				description:
-					a.description
-						? a.description
-						: a.extension.value,
-				detail: a.detail,
-				kernelProviderId: a.extension.value,
-				run: async () => {
-					this.activeKernel = a;
-					this._activeKernelResolvePromise = this.activeKernel.resolve(this.viewModel!.uri, this.getId(), tokenSource.token);
-				},
-				buttons: [{
-					iconClass: ThemeIcon.asClassName(configureKernelIcon),
-					tooltip: nls.localize('notebook.promptKernel.setDefaultTooltip', "Set as default kernel provider for '{0}'", this.viewModel!.viewType)
-				}]
-			};
-		});
-
-		picker.items = picks;
-		picker.busy = false;
-
-		const pickedItem = await new Promise<(IQuickPickItem & { run(): void; kernelProviderId?: string; }) | undefined>(resolve => {
-			picker.onDidAccept(() => {
-				resolve(picker.selectedItems.length === 1 ? picker.selectedItems[0] : undefined);
-				picker.dispose();
-			});
-
-			picker.onDidTriggerItemButton(e => {
-				const pick = e.item;
-				const id = pick.id;
-				resolve(pick); // open the view
-				picker.dispose();
-
-				// And persist the setting
-				if (pick && id && pick.kernelProviderId) {
-					const newAssociation: NotebookKernelProviderAssociation = { viewType: this.viewModel!.viewType, kernelProvider: pick.kernelProviderId };
-					const currentAssociations = [...this.configurationService.getValue<NotebookKernelProviderAssociations>(notebookKernelProviderAssociationsSettingId)];
-
-					// First try updating existing association
-					for (let i = 0; i < currentAssociations.length; ++i) {
-						const existing = currentAssociations[i];
-						if (existing.viewType === newAssociation.viewType) {
-							currentAssociations.splice(i, 1, newAssociation);
-							this.configurationService.updateValue(notebookKernelProviderAssociationsSettingId, currentAssociations);
-							return;
-						}
-					}
-
-					// Otherwise, create a new one
-					currentAssociations.unshift(newAssociation);
-					this.configurationService.updateValue(notebookKernelProviderAssociationsSettingId, currentAssociations);
-				}
-			});
-
-		});
-
-		tokenSource.dispose();
-
-		if (pickedItem) {
-			await pickedItem.run();
-		}
-
-		return;
-	}
-
-	async cancelNotebookExecution(): Promise<void> {
-		if (!this.viewModel) {
-			return;
-		}
-
-		if (this.viewModel.metadata.runState !== NotebookRunState.Running) {
-			return;
-		}
-
-		await this._ensureActiveKernel();
-		await this._activeKernel?.cancelNotebookCell!(this.viewModel.uri, undefined);
-	}
-
-	async executeNotebook(): Promise<void> {
-		if (!this.viewModel) {
-			return;
-		}
-
-		if (!this.viewModel.runnable) {
-			return;
-		}
-
-		await this._ensureActiveKernel();
-		this._activeKernelExecuted = true;
-		await this._activeKernel?.executeNotebookCell!(this.viewModel.uri, undefined);
-	}
-
-	async cancelNotebookCellExecution(cell: ICellViewModel): Promise<void> {
-		if (!this.viewModel) {
-			return;
-		}
-
-		if (cell.cellKind !== CellKind.Code) {
-			return;
-		}
-
-		const metadata = cell.getEvaluatedMetadata(this.viewModel.metadata);
-		if (!metadata.runnable) {
-			return;
-		}
-
-		if (metadata.runState !== NotebookCellRunState.Running) {
-			return;
-		}
-
-		await this._ensureActiveKernel();
-		await this._activeKernel?.cancelNotebookCell!(this.viewModel.uri, cell.handle);
-	}
-
-	async executeNotebookCell(cell: ICellViewModel): Promise<void> {
-		if (!this.viewModel) {
-			return;
-		}
-
-		if (cell.cellKind === CellKind.Markdown) {
-			this.focusNotebookCell(cell, 'container');
-			return;
-		}
-
-		if (!cell.getEvaluatedMetadata(this.viewModel.metadata).runnable) {
-			return;
-		}
-
-		await this._ensureActiveKernel();
-		this._activeKernelExecuted = true;
-		await this._activeKernel?.executeNotebookCell!(this.viewModel.uri, cell.handle);
-	}
-
 	focusNotebookCell(cell: ICellViewModel, focusItem: 'editor' | 'container' | 'output', options?: IFocusNotebookCellOptions) {
 		if (this._isDisposed) {
 			return;
@@ -1969,14 +1611,6 @@ export class NotebookEditorWidget extends Disposable implements INotebookEditor
 
 	//#region MISC
 
-	deltaCellDecorations(oldDecorations: string[], newDecorations: INotebookDeltaDecoration[]): string[] {
-		return this.viewModel?.deltaCellDecorations(oldDecorations, newDecorations) || [];
-	}
-
-	deltaCellOutputContainerClassNames(cellId: string, added: string[], removed: string[]) {
-		this._webview?.deltaCellOutputContainerClassNames(cellId, added, removed);
-	}
-
 	getLayoutInfo(): NotebookLayoutInfo {
 		if (!this._list) {
 			throw new Error('Editor is not initalized successfully');
@@ -2078,21 +1712,18 @@ export class NotebookEditorWidget extends Disposable implements INotebookEditor
 
 	removeInset(output: ICellOutputViewModel) {
 		this._insetModifyQueueByOutputId.queue(output.model.outputId, async () => {
-			if (!this._webview || !this._webviewResolved) {
-				return;
+			if (this._webview?.isResolved()) {
+				this._webview.removeInset(output);
 			}
-			this._webview!.removeInset(output);
 		});
 	}
 
 	hideInset(output: ICellOutputViewModel) {
-		if (!this._webview || !this._webviewResolved) {
-			return;
+		if (this._webview?.isResolved()) {
+			this._insetModifyQueueByOutputId.queue(output.model.outputId, async () => {
+				this._webview!.hideInset(output);
+			});
 		}
-
-		this._insetModifyQueueByOutputId.queue(output.model.outputId, async () => {
-			this._webview!.hideInset(output);
-		});
 	}
 
 	getOutputRenderer(): OutputRenderer {
@@ -2100,19 +1731,13 @@ export class NotebookEditorWidget extends Disposable implements INotebookEditor
 	}
 
 	postMessage(forRendererId: string | undefined, message: any) {
-		if (!this._webview || !this._webviewResolved) {
-			return;
+		if (this._webview?.isResolved()) {
+			if (forRendererId === undefined) {
+				this._webview.webview.postMessage(message);
+			} else {
+				this._webview.postRendererMessage(forRendererId, message);
+			}
 		}
-
-		if (forRendererId === undefined) {
-			this._webview.webview?.postMessage(message);
-		} else {
-			this._webview.postRendererMessage(forRendererId, message);
-		}
-	}
-
-	toggleClassName(className: string) {
-		this._overlayContainer.classList.toggle(className);
 	}
 
 	addClassName(className: string) {
@@ -2189,7 +1814,6 @@ export class NotebookEditorWidget extends Disposable implements INotebookEditor
 
 	dispose() {
 		this._isDisposed = true;
-		this._onWillDispose.fire();
 		// dispose webview first
 		this._webview?.dispose();
 		this._webview = null;
@@ -2204,9 +1828,6 @@ export class NotebookEditorWidget extends Disposable implements INotebookEditor
 
 		this._overlayContainer.remove();
 		this.viewModel?.dispose();
-
-		// this._layoutService.container.removeChild(this.overlayContainer);
-
 		super.dispose();
 	}
 
@@ -2582,233 +2203,3 @@ registerThemingParticipant((theme, collector) => {
 	collector.addRule(`.monaco-workbench .notebookOverlay > .cell-list-container > .monaco-list > .monaco-scrollable-element > .monaco-list-rows > .cell-list-top-cell-toolbar-container { height: ${BOTTOM_CELL_TOOLBAR_HEIGHT}px }`);
 	collector.addRule(`.monaco-workbench .notebookOverlay .monaco-list .monaco-list-row.code-cell-row.focused .cell-focus-indicator-left:before, .monaco-workbench .notebookOverlay .monaco-list .monaco-list-row.code-cell-row.focused .cell-focus-indicator-right:before { top: -${CELL_TOP_MARGIN}px; height: calc(100% + ${CELL_TOP_MARGIN + CELL_BOTTOM_MARGIN}px)}`);
 });
-
-
-export class RefCountedStyleSheet {
-	private readonly _widget: NotebookEditorWidget;
-	private readonly _key: string;
-	private readonly _styleSheet: HTMLStyleElement;
-	private _refCount: number;
-
-	constructor(widget: NotebookEditorWidget, key: string, styleSheet: HTMLStyleElement) {
-		this._widget = widget;
-		this._key = key;
-		this._styleSheet = styleSheet;
-		this._refCount = 0;
-	}
-
-	public ref(): void {
-		this._refCount++;
-	}
-
-	public unref(): void {
-		this._refCount--;
-		if (this._refCount === 0) {
-			this._styleSheet.parentNode?.removeChild(this._styleSheet);
-			this._widget._removeEditorStyleSheets(this._key);
-		}
-	}
-
-	public insertRule(rule: string, index?: number): void {
-		const sheet = <CSSStyleSheet>this._styleSheet.sheet;
-		sheet.insertRule(rule, index);
-	}
-}
-
-interface ProviderArguments {
-	styleSheet: RefCountedStyleSheet;
-	key: string;
-	options: INotebookDecorationRenderOptions;
-}
-
-class DecorationCSSRules {
-	private _theme: IColorTheme;
-	private _className: string;
-	private _topClassName: string;
-
-	get className() {
-		return this._className;
-	}
-
-	get topClassName() {
-		return this._topClassName;
-	}
-
-	constructor(
-		private readonly _themeService: IThemeService,
-		private readonly _styleSheet: RefCountedStyleSheet,
-		private readonly _providerArgs: ProviderArguments
-	) {
-		this._styleSheet.ref();
-		this._theme = this._themeService.getColorTheme();
-		this._className = CSSNameHelper.getClassName(this._providerArgs.key, CellDecorationCSSRuleType.ClassName);
-		this._topClassName = CSSNameHelper.getClassName(this._providerArgs.key, CellDecorationCSSRuleType.TopClassName);
-		this._buildCSS();
-	}
-
-	private _buildCSS() {
-		if (this._providerArgs.options.backgroundColor) {
-			const backgroundColor = this._resolveValue(this._providerArgs.options.backgroundColor);
-			this._styleSheet.insertRule(`.monaco-workbench .notebookOverlay .monaco-list .monaco-list-row.code-cell-row.${this.className} .cell-focus-indicator,
-			.monaco-workbench .notebookOverlay .monaco-list .monaco-list-row.markdown-cell-row.${this.className} {
-				background-color: ${backgroundColor} !important;
-			}`);
-		}
-
-		if (this._providerArgs.options.borderColor) {
-			const borderColor = this._resolveValue(this._providerArgs.options.borderColor);
-
-			this._styleSheet.insertRule(`.monaco-workbench .notebookOverlay .monaco-list .monaco-list-row.${this.className} .cell-focus-indicator-top:before,
-					.monaco-workbench .notebookOverlay .monaco-list .monaco-list-row.${this.className} .cell-focus-indicator-bottom:before {
-						border-color: ${borderColor} !important;
-					}`);
-
-			this._styleSheet.insertRule(`
-					.monaco-workbench .notebookOverlay .monaco-list .monaco-list-row.${this.className} .cell-focus-indicator-bottom:before {
-						content: "";
-						position: absolute;
-						width: 100%;
-						height: 1px;
-						border-bottom: 1px solid ${borderColor};
-						bottom: 0px;
-					`);
-
-			this._styleSheet.insertRule(`
-					.monaco-workbench .notebookOverlay .monaco-list .monaco-list-row.${this.className} .cell-focus-indicator-top:before {
-						content: "";
-						position: absolute;
-						width: 100%;
-						height: 1px;
-						border-top: 1px solid ${borderColor};
-					`);
-
-			// more specific rule for `.focused` can override existing rules
-			this._styleSheet.insertRule(`.monaco-workbench .notebookOverlay .monaco-list:focus-within .monaco-list-row.focused.${this.className} .cell-focus-indicator-top:before,
-				.monaco-workbench .notebookOverlay .monaco-list:focus-within .monaco-list-row.focused.${this.className} .cell-focus-indicator-bottom:before {
-					border-color: ${borderColor} !important;
-				}`);
-		}
-
-		if (this._providerArgs.options.top) {
-			const unthemedCSS = this._getCSSTextForModelDecorationContentClassName(this._providerArgs.options.top);
-			this._styleSheet.insertRule(`.monaco-workbench .notebookOverlay .monaco-list .monaco-list-row.${this.className} .cell-decoration .${this.topClassName} {
-				height: 1rem;
-				display: block;
-			}`);
-
-			this._styleSheet.insertRule(`.monaco-workbench .notebookOverlay .monaco-list .monaco-list-row.${this.className} .cell-decoration .${this.topClassName}::before {
-				display: block;
-				${unthemedCSS}
-			}`);
-		}
-	}
-
-	/**
- * Build the CSS for decorations styled before or after content.
- */
-	private _getCSSTextForModelDecorationContentClassName(opts: IContentDecorationRenderOptions | undefined): string {
-		if (!opts) {
-			return '';
-		}
-		const cssTextArr: string[] = [];
-
-		if (typeof opts !== 'undefined') {
-			this._collectBorderSettingsCSSText(opts, cssTextArr);
-			if (typeof opts.contentIconPath !== 'undefined') {
-				cssTextArr.push(strings.format(_CSS_MAP.contentIconPath, DOM.asCSSUrl(URI.revive(opts.contentIconPath))));
-			}
-			if (typeof opts.contentText === 'string') {
-				const truncated = opts.contentText.match(/^.*$/m)![0]; // only take first line
-				const escaped = truncated.replace(/['\\]/g, '\\$&');
-
-				cssTextArr.push(strings.format(_CSS_MAP.contentText, escaped));
-			}
-			this._collectCSSText(opts, ['fontStyle', 'fontWeight', 'textDecoration', 'color', 'opacity', 'backgroundColor', 'margin'], cssTextArr);
-			if (this._collectCSSText(opts, ['width', 'height'], cssTextArr)) {
-				cssTextArr.push('display:inline-block;');
-			}
-		}
-
-		return cssTextArr.join('');
-	}
-
-	private _collectBorderSettingsCSSText(opts: any, cssTextArr: string[]): boolean {
-		if (this._collectCSSText(opts, ['border', 'borderColor', 'borderRadius', 'borderSpacing', 'borderStyle', 'borderWidth'], cssTextArr)) {
-			cssTextArr.push(strings.format('box-sizing: border-box;'));
-			return true;
-		}
-		return false;
-	}
-
-	private _collectCSSText(opts: any, properties: string[], cssTextArr: string[]): boolean {
-		const lenBefore = cssTextArr.length;
-		for (let property of properties) {
-			const value = this._resolveValue(opts[property]);
-			if (typeof value === 'string') {
-				cssTextArr.push(strings.format(_CSS_MAP[property], value));
-			}
-		}
-		return cssTextArr.length !== lenBefore;
-	}
-
-	private _resolveValue(value: string | ThemeColor): string {
-		if (isThemeColor(value)) {
-			const color = this._theme.getColor(value.id);
-			if (color) {
-				return color.toString();
-			}
-			return 'transparent';
-		}
-		return value;
-	}
-
-	dispose() {
-		this._styleSheet.unref();
-	}
-}
-
-const _CSS_MAP: { [prop: string]: string; } = {
-	color: 'color:{0} !important;',
-	opacity: 'opacity:{0};',
-	backgroundColor: 'background-color:{0};',
-
-	outline: 'outline:{0};',
-	outlineColor: 'outline-color:{0};',
-	outlineStyle: 'outline-style:{0};',
-	outlineWidth: 'outline-width:{0};',
-
-	border: 'border:{0};',
-	borderColor: 'border-color:{0};',
-	borderRadius: 'border-radius:{0};',
-	borderSpacing: 'border-spacing:{0};',
-	borderStyle: 'border-style:{0};',
-	borderWidth: 'border-width:{0};',
-
-	fontStyle: 'font-style:{0};',
-	fontWeight: 'font-weight:{0};',
-	textDecoration: 'text-decoration:{0};',
-	cursor: 'cursor:{0};',
-	letterSpacing: 'letter-spacing:{0};',
-
-	gutterIconPath: 'background:{0} center center no-repeat;',
-	gutterIconSize: 'background-size:{0};',
-
-	contentText: 'content:\'{0}\';',
-	contentIconPath: 'content:{0};',
-	margin: 'margin:{0};',
-	width: 'width:{0};',
-	height: 'height:{0};'
-};
-
-
-const enum CellDecorationCSSRuleType {
-	ClassName = 0,
-	TopClassName = 0,
-}
-
-class CSSNameHelper {
-
-	public static getClassName(key: string, type: CellDecorationCSSRuleType): string {
-		return 'nb-' + key + '-' + type;
-	}
-}
diff --git a/src/vs/workbench/contrib/notebook/browser/notebookServiceImpl.ts b/src/vs/workbench/contrib/notebook/browser/notebookServiceImpl.ts
index 177c781dbc3..77c4ff5c78d 100644
--- a/src/vs/workbench/contrib/notebook/browser/notebookServiceImpl.ts
+++ b/src/vs/workbench/contrib/notebook/browser/notebookServiceImpl.ts
@@ -12,31 +12,25 @@ import { Iterable } from 'vs/base/common/iterator';
 import { Disposable, DisposableStore, IDisposable, toDisposable } from 'vs/base/common/lifecycle';
 import { ResourceMap } from 'vs/base/common/map';
 import { URI } from 'vs/base/common/uri';
-import * as UUID from 'vs/base/common/uuid';
-import { RedoCommand, UndoCommand } from 'vs/editor/browser/editorExtensions';
 import { ICodeEditorService } from 'vs/editor/browser/services/codeEditorService';
 import { IEditorOptions } from 'vs/editor/common/config/editorOptions';
 import { BareFontInfo } from 'vs/editor/common/config/fontInfo';
-import { CopyAction, CutAction, PasteAction } from 'vs/editor/contrib/clipboard/clipboard';
 import { IAccessibilityService } from 'vs/platform/accessibility/common/accessibility';
-import { IClipboardService } from 'vs/platform/clipboard/common/clipboardService';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { IStorageService, StorageScope, StorageTarget } from 'vs/platform/storage/common/storage';
 import { NotebookExtensionDescription } from 'vs/workbench/api/common/extHost.protocol';
 import { Memento } from 'vs/workbench/common/memento';
 import { INotebookEditorContribution, notebookMarkdownRendererExtensionPoint, notebookProviderExtensionPoint, notebookRendererExtensionPoint } from 'vs/workbench/contrib/notebook/browser/extensionPoint';
-import { CellEditState, getActiveNotebookEditor, ICellViewModel, INotebookEditor, NotebookEditorOptions, updateEditorTopPadding } from 'vs/workbench/contrib/notebook/browser/notebookBrowser';
+import { INotebookEditor, updateEditorTopPadding } from 'vs/workbench/contrib/notebook/browser/notebookBrowser';
 import { NotebookKernelProviderAssociationRegistry, NotebookViewTypesExtensionRegistry, updateNotebookKernelProvideAssociationSchema } from 'vs/workbench/contrib/notebook/browser/notebookKernelAssociation';
-import { CellViewModel } from 'vs/workbench/contrib/notebook/browser/viewModel/notebookViewModel';
 import { NotebookCellTextModel } from 'vs/workbench/contrib/notebook/common/model/notebookCellTextModel';
 import { NotebookTextModel } from 'vs/workbench/contrib/notebook/common/model/notebookTextModel';
-import { ACCESSIBLE_NOTEBOOK_DISPLAY_ORDER, BUILTIN_RENDERER_ID, CellEditType, CellKind, DisplayOrderKey, ICellEditOperation, INotebookDecorationRenderOptions, INotebookKernel, INotebookKernelProvider, INotebookMarkdownRendererInfo, INotebookRendererInfo, INotebookTextModel, IOrderedMimeType, IOutputDto, mimeTypeIsAlwaysSecure, mimeTypeSupportedByCore, NotebookDataDto, notebookDocumentFilterMatch, NotebookEditorPriority, NOTEBOOK_DISPLAY_ORDER, RENDERER_NOT_AVAILABLE, SelectionStateType, sortMimeTypes, TransientOptions } from 'vs/workbench/contrib/notebook/common/notebookCommon';
+import { ACCESSIBLE_NOTEBOOK_DISPLAY_ORDER, BUILTIN_RENDERER_ID, DisplayOrderKey, INotebookDecorationRenderOptions, INotebookKernel, INotebookKernelProvider, INotebookMarkdownRendererInfo, INotebookRendererInfo, INotebookTextModel, IOrderedMimeType, IOutputDto, mimeTypeIsAlwaysSecure, mimeTypeSupportedByCore, NotebookDataDto, notebookDocumentFilterMatch, NotebookEditorPriority, NOTEBOOK_DISPLAY_ORDER, RENDERER_NOT_AVAILABLE, sortMimeTypes, TransientOptions } from 'vs/workbench/contrib/notebook/common/notebookCommon';
 import { NotebookMarkdownRendererInfo } from 'vs/workbench/contrib/notebook/common/notebookMarkdownRenderer';
 import { NotebookOutputRendererInfo } from 'vs/workbench/contrib/notebook/common/notebookOutputRenderer';
 import { NotebookEditorDescriptor, NotebookProviderInfo } from 'vs/workbench/contrib/notebook/common/notebookProvider';
 import { IMainNotebookController, INotebookService } from 'vs/workbench/contrib/notebook/common/notebookService';
-import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
 import { IExtensionService } from 'vs/workbench/services/extensions/common/extensions';
 import { IExtensionPointUser } from 'vs/workbench/services/extensions/common/extensionsRegistry';
 import { Extensions as EditorExtensions, IEditorTypesHandler, IEditorType, IEditorAssociationsRegistry } from 'vs/workbench/browser/editor';
@@ -194,7 +188,7 @@ export class NotebookProviderInfoStore extends Disposable {
 		return [...Iterable.filter(this._contributedEditors.values(), customEditor => resource.scheme === 'untitled' || customEditor.matches(resource))];
 	}
 
-	public [Symbol.iterator](): Iterator<NotebookProviderInfo> {
+	[Symbol.iterator](): Iterator<NotebookProviderInfo> {
 		return this._contributedEditors.values();
 	}
 }
@@ -227,7 +221,7 @@ class ModelData implements IDisposable {
 	private readonly _modelEventListeners = new DisposableStore();
 
 	constructor(
-		public model: NotebookTextModel,
+		readonly model: NotebookTextModel,
 		onWillDispose: (model: INotebookTextModel) => void
 	) {
 		this._modelEventListeners.add(model.onWillDispose(() => onWillDispose(model)));
@@ -238,23 +232,26 @@ class ModelData implements IDisposable {
 	}
 }
 
+interface INotebookProviderData {
+	controller: IMainNotebookController;
+	extensionData: NotebookExtensionDescription;
+}
+
 export class NotebookService extends Disposable implements INotebookService, IEditorTypesHandler {
+
 	declare readonly _serviceBrand: undefined;
-	private readonly _notebookProviders = new Map<string, { controller: IMainNotebookController, extensionData: NotebookExtensionDescription; }>();
-	notebookProviderInfoStore: NotebookProviderInfoStore;
-	notebookRenderersInfoStore: NotebookOutputRendererInfoStore = new NotebookOutputRendererInfoStore();
-	private readonly markdownRenderersInfos = new Set<INotebookMarkdownRendererInfo>();
-	notebookKernelProviderInfoStore: NotebookKernelProviderInfoStore = new NotebookKernelProviderInfoStore();
+
+	private readonly _notebookProviders = new Map<string, INotebookProviderData>();
+	private readonly _notebookProviderInfoStore: NotebookProviderInfoStore;
+	private readonly _notebookRenderersInfoStore: NotebookOutputRendererInfoStore = new NotebookOutputRendererInfoStore();
+	private readonly _markdownRenderersInfos = new Set<INotebookMarkdownRendererInfo>();
+	private readonly _notebookKernelProviderInfoStore: NotebookKernelProviderInfoStore = new NotebookKernelProviderInfoStore();
 	private readonly _models = new ResourceMap<ModelData>();
-	private _onDidChangeActiveEditor = this._register(new Emitter<string | null>());
-	onDidChangeActiveEditor: Event<string | null> = this._onDidChangeActiveEditor.event;
-	private _activeEditorDisposables = new DisposableStore();
-	private _onDidChangeVisibleEditors = this._register(new Emitter<string[]>());
-	onDidChangeVisibleEditors: Event<string[]> = this._onDidChangeVisibleEditors.event;
+
 	private readonly _onNotebookEditorAdd: Emitter<INotebookEditor> = this._register(new Emitter<INotebookEditor>());
-	public readonly onNotebookEditorAdd: Event<INotebookEditor> = this._onNotebookEditorAdd.event;
+	readonly onNotebookEditorAdd: Event<INotebookEditor> = this._onNotebookEditorAdd.event;
 	private readonly _onNotebookEditorsRemove: Emitter<INotebookEditor[]> = this._register(new Emitter<INotebookEditor[]>());
-	public readonly onNotebookEditorsRemove: Event<INotebookEditor[]> = this._onNotebookEditorsRemove.event;
+	readonly onNotebookEditorsRemove: Event<INotebookEditor[]> = this._onNotebookEditorsRemove.event;
 
 	private readonly _onDidAddNotebookDocument = this._register(new Emitter<NotebookTextModel>());
 	private readonly _onDidRemoveNotebookDocument = this._register(new Emitter<URI>());
@@ -262,7 +259,7 @@ export class NotebookService extends Disposable implements INotebookService, IEd
 	readonly onDidRemoveNotebookDocument = this._onDidRemoveNotebookDocument.event;
 
 	private readonly _onNotebookDocumentSaved: Emitter<URI> = this._register(new Emitter<URI>());
-	public readonly onNotebookDocumentSaved: Event<URI> = this._onNotebookDocumentSaved.event;
+	readonly onNotebookDocumentSaved: Event<URI> = this._onNotebookDocumentSaved.event;
 	private readonly _notebookEditors = new Map<string, INotebookEditor>();
 
 	private readonly _onDidChangeEditorTypes = this._register(new Emitter<void>());
@@ -272,7 +269,7 @@ export class NotebookService extends Disposable implements INotebookService, IEd
 	onDidChangeKernels: Event<URI | undefined> = this._onDidChangeKernels.event;
 	private readonly _onDidChangeNotebookActiveKernel = this._register(new Emitter<{ uri: URI, providerHandle: number | undefined, kernelFriendlyId: string | undefined; }>());
 	onDidChangeNotebookActiveKernel: Event<{ uri: URI, providerHandle: number | undefined, kernelFriendlyId: string | undefined; }> = this._onDidChangeNotebookActiveKernel.event;
-	private cutItems: NotebookCellTextModel[] | undefined;
+	private _cutItems: NotebookCellTextModel[] | undefined;
 	private _lastClipboardIsCopy: boolean = true;
 
 	private _displayOrder: { userOrder: string[], defaultOrder: string[]; } = Object.create(null);
@@ -280,7 +277,6 @@ export class NotebookService extends Disposable implements INotebookService, IEd
 
 	constructor(
 		@IExtensionService private readonly _extensionService: IExtensionService,
-		@IEditorService private readonly _editorService: IEditorService,
 		@IConfigurationService private readonly _configurationService: IConfigurationService,
 		@IAccessibilityService private readonly _accessibilityService: IAccessibilityService,
 		@IStorageService private readonly _storageService: IStorageService,
@@ -290,15 +286,15 @@ export class NotebookService extends Disposable implements INotebookService, IEd
 	) {
 		super();
 
-		this.notebookProviderInfoStore = new NotebookProviderInfoStore(this._storageService, this._extensionService);
-		this._register(this.notebookProviderInfoStore);
+		this._notebookProviderInfoStore = new NotebookProviderInfoStore(this._storageService, this._extensionService);
+		this._register(this._notebookProviderInfoStore);
 
 		notebookProviderExtensionPoint.setHandler((extensions) => {
-			this.notebookProviderInfoStore.setupHandler(extensions);
+			this._notebookProviderInfoStore.setupHandler(extensions);
 		});
 
 		notebookRendererExtensionPoint.setHandler((renderers) => {
-			this.notebookRenderersInfoStore.clear();
+			this._notebookRenderersInfoStore.clear();
 
 			for (const extension of renderers) {
 				for (const notebookContribution of extension.value) {
@@ -313,7 +309,7 @@ export class NotebookService extends Disposable implements INotebookService, IEd
 						continue;
 					}
 
-					this.notebookRenderersInfoStore.add(new NotebookOutputRendererInfo({
+					this._notebookRenderersInfoStore.add(new NotebookOutputRendererInfo({
 						id,
 						extension: extension.description,
 						entrypoint: notebookContribution.entrypoint,
@@ -325,7 +321,7 @@ export class NotebookService extends Disposable implements INotebookService, IEd
 		});
 
 		notebookMarkdownRendererExtensionPoint.setHandler((renderers) => {
-			this.markdownRenderersInfos.clear();
+			this._markdownRenderersInfos.clear();
 
 			for (const extension of renderers) {
 				if (!extension.description.enableProposedApi && !extension.description.isBuiltin) {
@@ -345,7 +341,7 @@ export class NotebookService extends Disposable implements INotebookService, IEd
 						continue;
 					}
 
-					this.markdownRenderersInfos.add(new NotebookMarkdownRendererInfo({
+					this._markdownRenderersInfos.add(new NotebookMarkdownRendererInfo({
 						id,
 						extension: extension.description,
 						entrypoint: notebookContribution.entrypoint,
@@ -411,215 +407,6 @@ export class NotebookService extends Disposable implements INotebookService, IEd
 
 			decorationCheckSet.add(e);
 		}));
-
-		const getContext = () => {
-			const editor = getActiveNotebookEditor(this._editorService);
-			const activeCell = editor?.getActiveCell();
-
-			return {
-				editor,
-				activeCell
-			};
-		};
-
-		const PRIORITY = 105;
-		this._register(UndoCommand.addImplementation(PRIORITY, () => {
-			const { editor } = getContext();
-			if (editor?.viewModel) {
-				return editor.viewModel.undo().then(cellResources => {
-					if (cellResources?.length) {
-						editor?.viewModel?.viewCells.forEach(cell => {
-							if (cell.cellKind === CellKind.Markdown && cellResources.find(resource => resource.fragment === cell.model.uri.fragment)) {
-								cell.editState = CellEditState.Editing;
-							}
-						});
-
-						editor?.setOptions(new NotebookEditorOptions({ cellOptions: { resource: cellResources[0] }, preserveFocus: true }));
-					}
-				});
-			}
-
-			return false;
-		}));
-
-		this._register(RedoCommand.addImplementation(PRIORITY, () => {
-			const { editor } = getContext();
-			if (editor?.viewModel) {
-				return editor.viewModel.redo().then(cellResources => {
-					if (cellResources?.length) {
-						editor?.viewModel?.viewCells.forEach(cell => {
-							if (cell.cellKind === CellKind.Markdown && cellResources.find(resource => resource.fragment === cell.model.uri.fragment)) {
-								cell.editState = CellEditState.Editing;
-							}
-						});
-
-						editor?.setOptions(new NotebookEditorOptions({ cellOptions: { resource: cellResources[0] }, preserveFocus: true }));
-					}
-				});
-			}
-
-			return false;
-		}));
-
-		if (CopyAction) {
-			this._register(CopyAction.addImplementation(PRIORITY, accessor => {
-				const activeElement = <HTMLElement>document.activeElement;
-				if (activeElement && ['input', 'textarea'].indexOf(activeElement.tagName.toLowerCase()) >= 0) {
-					return false;
-				}
-
-				const { editor } = getContext();
-				if (!editor) {
-					return false;
-				}
-
-				if (editor.hasOutputTextSelection()) {
-					document.execCommand('copy');
-					return true;
-				}
-
-				const clipboardService = accessor.get<IClipboardService>(IClipboardService);
-				const notebookService = accessor.get<INotebookService>(INotebookService);
-				const selectedCells = editor.getSelectionViewModels();
-
-				if (!selectedCells.length) {
-					return false;
-				}
-
-				clipboardService.writeText(selectedCells.map(cell => cell.getText()).join('\n'));
-				notebookService.setToCopy(selectedCells.map(cell => cell.model), true);
-
-				return true;
-			}));
-		}
-
-		if (PasteAction) {
-			PasteAction.addImplementation(PRIORITY, () => {
-				const activeElement = <HTMLElement>document.activeElement;
-				if (activeElement && ['input', 'textarea'].indexOf(activeElement.tagName.toLowerCase()) >= 0) {
-					return false;
-				}
-
-				const pasteCells = this.getToCopy();
-
-				if (!pasteCells) {
-					return false;
-				}
-
-				const { editor, activeCell } = getContext();
-				if (!editor) {
-					return false;
-				}
-
-				const viewModel = editor.viewModel;
-
-				if (!viewModel || !viewModel.metadata.editable) {
-					return false;
-				}
-
-				const cloneMetadata = (cell: NotebookCellTextModel) => {
-					return {
-						editable: cell.metadata?.editable,
-						runnable: cell.metadata?.runnable,
-						breakpointMargin: cell.metadata?.breakpointMargin,
-						hasExecutionOrder: cell.metadata?.hasExecutionOrder,
-						inputCollapsed: cell.metadata?.inputCollapsed,
-						outputCollapsed: cell.metadata?.outputCollapsed,
-						custom: cell.metadata?.custom
-					};
-				};
-
-				const cloneCell = (cell: NotebookCellTextModel) => {
-					return {
-						source: cell.getValue(),
-						language: cell.language,
-						cellKind: cell.cellKind,
-						outputs: cell.outputs.map(output => ({
-							outputs: output.outputs,
-							/* paste should generate new outputId */ outputId: UUID.generateUuid()
-						})),
-						metadata: cloneMetadata(cell)
-					};
-				};
-
-				if (activeCell) {
-					const currCellIndex = viewModel.getCellIndex(activeCell);
-
-					let topPastedCell: CellViewModel | undefined = undefined;
-					pasteCells.items.reverse().map(cell => cloneCell(cell)).forEach(pasteCell => {
-						const newIdx = typeof currCellIndex === 'number' ? currCellIndex + 1 : 0;
-						topPastedCell = viewModel.createCell(newIdx, pasteCell.source, pasteCell.language, pasteCell.cellKind, pasteCell.metadata, pasteCell.outputs, true);
-					});
-
-					if (topPastedCell) {
-						editor.focusNotebookCell(topPastedCell, 'container');
-					}
-				} else {
-					if (viewModel.length !== 0) {
-						return false;
-					}
-
-					let topPastedCell: CellViewModel | undefined = undefined;
-					pasteCells.items.reverse().map(cell => cloneCell(cell)).forEach(pasteCell => {
-						topPastedCell = viewModel.createCell(0, pasteCell.source, pasteCell.language, pasteCell.cellKind, pasteCell.metadata, pasteCell.outputs, true);
-					});
-
-					if (topPastedCell) {
-						editor.focusNotebookCell(topPastedCell, 'container');
-					}
-				}
-
-
-				return true;
-			});
-		}
-
-		if (CutAction) {
-			CutAction.addImplementation(PRIORITY, accessor => {
-				const activeElement = <HTMLElement>document.activeElement;
-				if (activeElement && ['input', 'textarea'].indexOf(activeElement.tagName.toLowerCase()) >= 0) {
-					return false;
-				}
-
-				const { editor } = getContext();
-				if (!editor) {
-					return false;
-				}
-
-				const viewModel = editor.viewModel;
-
-				if (!viewModel || !viewModel.metadata.editable) {
-					return false;
-				}
-
-				const clipboardService = accessor.get<IClipboardService>(IClipboardService);
-				const notebookService = accessor.get<INotebookService>(INotebookService);
-				const selectedCells = editor.getSelectionViewModels();
-
-				if (!selectedCells.length) {
-					return false;
-				}
-
-				clipboardService.writeText(selectedCells.map(cell => cell.getText()).join('\n'));
-				const selectionIndexes = selectedCells.map(cell => [cell, viewModel.getCellIndex(cell)] as [ICellViewModel, number]).sort((a, b) => b[1] - a[1]);
-				const edits: ICellEditOperation[] = selectionIndexes.map(value => ({ editType: CellEditType.Replace, index: value[1], count: 1, cells: [] }));
-				const firstSelectIndex = selectionIndexes.sort((a, b) => a[1] - b[1])[0][1];
-				const newFocusedCellIndex = firstSelectIndex < viewModel.notebookDocument.cells.length
-					? firstSelectIndex
-					: viewModel.notebookDocument.cells.length - 1;
-
-				viewModel.notebookDocument.applyEdits(viewModel.notebookDocument.versionId, edits, true, { kind: SelectionStateType.Index, selections: viewModel.getSelections() }, () => {
-					return {
-						kind: SelectionStateType.Index,
-						selections: [{ start: newFocusedCellIndex, end: newFocusedCellIndex + 1 }]
-					};
-				}, undefined, true);
-				notebookService.setToCopy(selectedCells.map(cell => cell.model), false);
-
-				return true;
-			});
-		}
-
 	}
 
 	registerEditorDecorationType(key: string, options: INotebookDecorationRenderOptions): void {
@@ -641,7 +428,7 @@ export class NotebookService extends Disposable implements INotebookService, IEd
 	}
 
 	getEditorTypes(): IEditorType[] {
-		return [...this.notebookProviderInfoStore].map(info => ({
+		return [...this._notebookProviderInfoStore].map(info => ({
 			id: info.id,
 			displayName: info.displayName,
 			providerDisplayName: info.providerDisplayName
@@ -672,7 +459,7 @@ export class NotebookService extends Disposable implements INotebookService, IEd
 		}
 		this._notebookProviders.set(viewType, { extensionData, controller });
 
-		if (controller.viewOptions && !this.notebookProviderInfoStore.get(viewType)) {
+		if (controller.viewOptions && !this._notebookProviderInfoStore.get(viewType)) {
 			// register this content provider to the static contribution, if it does not exist
 			const info = new NotebookProviderInfo({
 				displayName: controller.viewOptions.displayName,
@@ -689,10 +476,10 @@ export class NotebookService extends Disposable implements INotebookService, IEd
 
 			info.update({ selectors: controller.viewOptions.filenamePattern });
 			info.update({ options: controller.options });
-			this.notebookProviderInfoStore.add(info);
+			this._notebookProviderInfoStore.add(info);
 		}
 
-		this.notebookProviderInfoStore.get(viewType)?.update({ options: controller.options });
+		this._notebookProviderInfoStore.get(viewType)?.update({ options: controller.options });
 
 		this._onDidChangeEditorTypes.fire();
 		return toDisposable(() => {
@@ -702,7 +489,7 @@ export class NotebookService extends Disposable implements INotebookService, IEd
 	}
 
 	registerNotebookKernelProvider(provider: INotebookKernelProvider): IDisposable {
-		const d = this.notebookKernelProviderInfoStore.add(provider);
+		const d = this._notebookKernelProviderInfoStore.add(provider);
 		const kernelChangeEventListener = provider.onDidChangeKernels((e) => {
 			this._onDidChangeKernels.fire(e);
 		});
@@ -716,7 +503,7 @@ export class NotebookService extends Disposable implements INotebookService, IEd
 	}
 
 	async getNotebookKernels(viewType: string, resource: URI, token: CancellationToken): Promise<INotebookKernel[]> {
-		const filteredProvider = this.notebookKernelProviderInfoStore.get(viewType, resource);
+		const filteredProvider = this._notebookKernelProviderInfoStore.get(viewType, resource);
 		const result = new Array<INotebookKernel[]>(filteredProvider.length);
 		const promises = filteredProvider.map(async (provider, index) => {
 			const data = await provider.provideKernels(resource, token);
@@ -727,26 +514,61 @@ export class NotebookService extends Disposable implements INotebookService, IEd
 	}
 
 	async getContributedNotebookKernelProviders(): Promise<INotebookKernelProvider[]> {
-		const kernelProviders = this.notebookKernelProviderInfoStore.getContributedKernelProviders();
+		const kernelProviders = this._notebookKernelProviderInfoStore.getContributedKernelProviders();
 		return kernelProviders;
 	}
 
 	getRendererInfo(id: string): INotebookRendererInfo | undefined {
-		return this.notebookRenderersInfoStore.get(id);
+		return this._notebookRenderersInfoStore.get(id);
 	}
 
 	getMarkdownRendererInfo(): INotebookMarkdownRendererInfo[] {
-		return Array.from(this.markdownRenderersInfos);
+		return Array.from(this._markdownRenderersInfos);
+	}
+
+	// --- notebook documents: IO
+
+	private _withProvider(viewType: string): INotebookProviderData {
+		const result = this._notebookProviders.get(viewType);
+		if (!result) {
+			throw new Error(`having NO provider for ${viewType}`);
+		}
+		return result;
 	}
 
 	async fetchNotebookRawData(viewType: string, uri: URI, backupId?: string): Promise<{ data: NotebookDataDto, transientOptions: TransientOptions }> {
 		if (!await this.canResolve(viewType)) {
 			throw new Error(`CANNOT fetch notebook data, there is NO provider for '${viewType}'`);
 		}
-		const provider = this._notebookProviders.get(viewType)!;
+		const provider = this._withProvider(viewType)!;
 		return await provider.controller.openNotebook(viewType, uri, backupId);
 	}
 
+	async save(viewType: string, resource: URI, token: CancellationToken): Promise<boolean> {
+		const provider = this._withProvider(viewType);
+		const ret = await provider.controller.save(resource, token);
+		if (ret) {
+			this._onNotebookDocumentSaved.fire(resource);
+		}
+		return ret;
+	}
+
+	async saveAs(viewType: string, resource: URI, target: URI, token: CancellationToken): Promise<boolean> {
+		const provider = this._withProvider(viewType);
+		const ret = await provider.controller.saveAs(resource, target, token);
+		if (ret) {
+			this._onNotebookDocumentSaved.fire(resource);
+		}
+		return ret;
+	}
+
+	async backup(viewType: string, uri: URI, token: CancellationToken): Promise<string | undefined> {
+		const provider = this._withProvider(viewType);
+		return provider.controller.backup(uri, token);
+	}
+
+	// --- notebook documents: create, destory, retrieve, enumerate
+
 	createNotebookTextModel(viewType: string, uri: URI, data: NotebookDataDto, transientOptions: TransientOptions): NotebookTextModel {
 		if (this._models.has(uri)) {
 			throw new Error(`notebook for ${uri} already exists`);
@@ -765,6 +587,37 @@ export class NotebookService extends Disposable implements INotebookService, IEd
 		return Iterable.map(this._models.values(), data => data.model);
 	}
 
+	listNotebookDocuments(): NotebookTextModel[] {
+		return [...this._models].map(e => e[1].model);
+	}
+
+	destoryNotebookDocument(viewType: string, notebook: INotebookTextModel): void {
+		this._onWillDisposeDocument(notebook);
+	}
+
+	private _onWillDisposeDocument(model: INotebookTextModel): void {
+
+		const modelData = this._models.get(model.uri);
+		this._models.delete(model.uri);
+
+		if (modelData) {
+			// delete editors and documents
+			const willRemovedEditors: INotebookEditor[] = [];
+			for (const editor of this._notebookEditors.values()) {
+				if (editor.textModel === modelData.model) {
+					willRemovedEditors.push(editor);
+				}
+			}
+
+			modelData.model.dispose();
+			modelData.dispose();
+
+			willRemovedEditors.forEach(e => this._notebookEditors.delete(e.getId()));
+			this._onNotebookEditorsRemove.fire(willRemovedEditors.map(e => e));
+			this._onDidRemoveNotebookDocument.fire(modelData.model.uri);
+		}
+	}
+
 	getMimeTypeInfo(textModel: NotebookTextModel, output: IOutputDto): readonly IOrderedMimeType[] {
 		// TODO@rebornix no string[] casting
 		return this._getOrderedMimeTypes(textModel, output, textModel.metadata.displayOrder as string[] ?? []);
@@ -832,23 +685,23 @@ export class NotebookService extends Disposable implements INotebookService, IEd
 	}
 
 	private _findBestMatchedRenderer(mimeType: string): readonly NotebookOutputRendererInfo[] {
-		return this.notebookRenderersInfoStore.getContributedRenderer(mimeType);
+		return this._notebookRenderersInfoStore.getContributedRenderer(mimeType);
 	}
 
 	getContributedNotebookProviders(resource?: URI): readonly NotebookProviderInfo[] {
 		if (resource) {
-			return this.notebookProviderInfoStore.getContributedNotebook(resource);
+			return this._notebookProviderInfoStore.getContributedNotebook(resource);
 		}
 
-		return [...this.notebookProviderInfoStore];
+		return [...this._notebookProviderInfoStore];
 	}
 
 	getContributedNotebookProvider(viewType: string): NotebookProviderInfo | undefined {
-		return this.notebookProviderInfoStore.get(viewType);
+		return this._notebookProviderInfoStore.get(viewType);
 	}
 
 	getContributedNotebookOutputRenderers(viewType: string): NotebookOutputRendererInfo | undefined {
-		return this.notebookRenderersInfoStore.get(viewType);
+		return this._notebookRenderersInfoStore.get(viewType);
 	}
 
 	getNotebookProviderResourceRoots(): URI[] {
@@ -889,95 +742,6 @@ export class NotebookService extends Disposable implements INotebookService, IEd
 		return [...this._notebookEditors].map(e => e[1]);
 	}
 
-	listVisibleNotebookEditors(): INotebookEditor[] {
-		return this._editorService.visibleEditorPanes
-			.filter(pane => (pane as unknown as { isNotebookEditor?: boolean; }).isNotebookEditor)
-			.map(pane => pane.getControl() as INotebookEditor)
-			.filter(editor => !!editor)
-			.filter(editor => this._notebookEditors.has(editor.getId()));
-	}
-
-	listNotebookDocuments(): NotebookTextModel[] {
-		return [...this._models].map(e => e[1].model);
-	}
-
-	destoryNotebookDocument(viewType: string, notebook: INotebookTextModel): void {
-		this._onWillDisposeDocument(notebook);
-	}
-
-	updateActiveNotebookEditor(editor: INotebookEditor | null) {
-		this._activeEditorDisposables.clear();
-
-		if (editor) {
-			this._activeEditorDisposables.add(editor.onDidChangeKernel(() => {
-				this._onDidChangeNotebookActiveKernel.fire({
-					uri: editor.uri!,
-					providerHandle: editor.activeKernel?.providerHandle,
-					kernelFriendlyId: editor.activeKernel?.friendlyId
-				});
-			}));
-		}
-		this._onDidChangeActiveEditor.fire(editor ? editor.getId() : null);
-	}
-
-	updateVisibleNotebookEditor(editors: string[]) {
-		const alreadyCreated = editors.filter(editorId => this._notebookEditors.has(editorId));
-		this._onDidChangeVisibleEditors.fire(alreadyCreated);
-	}
-
-	setToCopy(items: NotebookCellTextModel[], isCopy: boolean) {
-		this.cutItems = items;
-		this._lastClipboardIsCopy = isCopy;
-	}
-
-	getToCopy(): { items: NotebookCellTextModel[], isCopy: boolean; } | undefined {
-		if (this.cutItems) {
-			return { items: this.cutItems, isCopy: this._lastClipboardIsCopy };
-		}
-
-		return undefined;
-	}
-
-	async save(viewType: string, resource: URI, token: CancellationToken): Promise<boolean> {
-		const provider = this._notebookProviders.get(viewType);
-
-		if (provider) {
-			const ret = await provider.controller.save(resource, token);
-			if (ret) {
-				this._onNotebookDocumentSaved.fire(resource);
-			}
-
-			return ret;
-		}
-
-		return false;
-	}
-
-	async saveAs(viewType: string, resource: URI, target: URI, token: CancellationToken): Promise<boolean> {
-		const provider = this._notebookProviders.get(viewType);
-
-		if (provider) {
-			const ret = await provider.controller.saveAs(resource, target, token);
-			if (ret) {
-				this._onNotebookDocumentSaved.fire(resource);
-			}
-
-			return ret;
-		}
-
-		return false;
-	}
-
-	async backup(viewType: string, uri: URI, token: CancellationToken): Promise<string | undefined> {
-		const provider = this._notebookProviders.get(viewType);
-
-		if (provider) {
-			return provider.controller.backup(uri, token);
-		}
-
-		return;
-	}
-
 	onDidReceiveMessage(viewType: string, editorId: string, rendererType: string | undefined, message: any): void {
 		const provider = this._notebookProviders.get(viewType);
 
@@ -986,26 +750,19 @@ export class NotebookService extends Disposable implements INotebookService, IEd
 		}
 	}
 
-	private _onWillDisposeDocument(model: INotebookTextModel): void {
+	// --- copy & paste
 
-		const modelData = this._models.get(model.uri);
-		this._models.delete(model.uri);
-
-		if (modelData) {
-			// delete editors and documents
-			const willRemovedEditors: INotebookEditor[] = [];
-			for (const editor of this._notebookEditors.values()) {
-				if (editor.textModel === modelData.model) {
-					willRemovedEditors.push(editor);
-				}
-			}
-
-			modelData.model.dispose();
-			modelData.dispose();
-
-			willRemovedEditors.forEach(e => this._notebookEditors.delete(e.getId()));
-			this._onNotebookEditorsRemove.fire(willRemovedEditors.map(e => e));
-			this._onDidRemoveNotebookDocument.fire(modelData.model.uri);
-		}
+	setToCopy(items: NotebookCellTextModel[], isCopy: boolean) {
+		this._cutItems = items;
+		this._lastClipboardIsCopy = isCopy;
 	}
+
+	getToCopy(): { items: NotebookCellTextModel[], isCopy: boolean; } | undefined {
+		if (this._cutItems) {
+			return { items: this._cutItems, isCopy: this._lastClipboardIsCopy };
+		}
+
+		return undefined;
+	}
+
 }
diff --git a/src/vs/workbench/contrib/notebook/browser/view/notebookCellList.ts b/src/vs/workbench/contrib/notebook/browser/view/notebookCellList.ts
index aa8db754c99..67381a6fdba 100644
--- a/src/vs/workbench/contrib/notebook/browser/view/notebookCellList.ts
+++ b/src/vs/workbench/contrib/notebook/browser/view/notebookCellList.ts
@@ -49,7 +49,8 @@ export class NotebookCellList extends WorkbenchList<CellViewModel> implements ID
 	readonly onDidRemoveOutput: Event<ICellOutputViewModel> = this._onDidRemoveOutput.event;
 	private readonly _onDidHideOutput = new Emitter<ICellOutputViewModel>();
 	readonly onDidHideOutput: Event<ICellOutputViewModel> = this._onDidHideOutput.event;
-
+	private readonly _onDidRemoveCellFromView = new Emitter<ICellViewModel>();
+	readonly onDidRemoveCellFromView: Event<ICellViewModel> = this._onDidRemoveCellFromView.event;
 	private _viewModel: NotebookViewModel | null = null;
 	private _hiddenRangeIds: string[] = [];
 	private hiddenRangesPrefixSum: PrefixSumComputer | null = null;
@@ -383,7 +384,10 @@ export class NotebookCellList extends WorkbenchList<CellViewModel> implements ID
 		const newRanges = reduceCellRanges(hiddenRanges);
 		const viewCells = model.viewCells.slice(0) as CellViewModel[];
 		newRanges.reverse().forEach(range => {
-			viewCells.splice(range.start, range.end - range.start + 1);
+			const removedCells = viewCells.splice(range.start, range.end - range.start + 1);
+			removedCells.forEach(cell => {
+				this._onDidRemoveCellFromView.fire(cell);
+			});
 		});
 
 		this.splice2(0, 0, viewCells);
@@ -473,6 +477,7 @@ export class NotebookCellList extends WorkbenchList<CellViewModel> implements ID
 			// remove output in the webview
 			const hideOutputs: ICellOutputViewModel[] = [];
 			const deletedOutputs: ICellOutputViewModel[] = [];
+			const removedMarkdownCells: ICellViewModel[] = [];
 
 			for (let i = diff.start; i < diff.start + diff.deleteCount; i++) {
 				const cell = this.element(i);
@@ -482,6 +487,8 @@ export class NotebookCellList extends WorkbenchList<CellViewModel> implements ID
 					} else {
 						deletedOutputs.push(...cell?.outputsViewModels);
 					}
+				} else {
+					removedMarkdownCells.push(cell);
 				}
 			}
 
@@ -489,6 +496,7 @@ export class NotebookCellList extends WorkbenchList<CellViewModel> implements ID
 
 			hideOutputs.forEach(output => this._onDidHideOutput.fire(output));
 			deletedOutputs.forEach(output => this._onDidRemoveOutput.fire(output));
+			removedMarkdownCells.forEach(cell => this._onDidRemoveCellFromView.fire(cell));
 		});
 	}
 
@@ -513,7 +521,7 @@ export class NotebookCellList extends WorkbenchList<CellViewModel> implements ID
 
 		if (!selectionsLeft.length && this._viewModel!.viewCells.length) {
 			// after splice, the selected cells are deleted
-			this._viewModel!.updateSelectionsFromEdits({ kind: SelectionStateType.Index, selections: [{ start: 0, end: 1 }] });
+			this._viewModel!.updateSelectionsState({ kind: SelectionStateType.Index, selections: [{ start: 0, end: 1 }] });
 		}
 	}
 
@@ -580,7 +588,11 @@ export class NotebookCellList extends WorkbenchList<CellViewModel> implements ID
 		if (index >= 0 && this._viewModel) {
 			// update view model first, which will update both `focus` and `selection` in a single transaction
 			const focusedElementHandle = this.element(index).handle;
-			this._viewModel.updateSelectionsFromView(focusedElementHandle, [focusedElementHandle]);
+			this._viewModel.updateSelectionsState({
+				kind: SelectionStateType.Handle,
+				primary: focusedElementHandle,
+				selections: [focusedElementHandle]
+			}, 'view');
 
 			// update the view as previous model update will not trigger event
 			this.setFocus([index], undefined, false);
@@ -600,7 +612,11 @@ export class NotebookCellList extends WorkbenchList<CellViewModel> implements ID
 			const focus = this.getFocus();
 			if (focus.length) {
 				const focusedElementHandle = this.element(focus[0]).handle;
-				this._viewModel?.updateSelectionsFromView(focusedElementHandle, [focusedElementHandle]);
+				this._viewModel?.updateSelectionsState({
+					kind: SelectionStateType.Handle,
+					primary: focusedElementHandle,
+					selections: [focusedElementHandle]
+				}, 'view');
 			}
 		});
 	}
@@ -611,7 +627,11 @@ export class NotebookCellList extends WorkbenchList<CellViewModel> implements ID
 			const focus = this.getFocus();
 			if (focus.length) {
 				const focusedElementHandle = this.element(focus[0]).handle;
-				this._viewModel?.updateSelectionsFromView(focusedElementHandle, [focusedElementHandle]);
+				this._viewModel?.updateSelectionsState({
+					kind: SelectionStateType.Handle,
+					primary: focusedElementHandle,
+					selections: [focusedElementHandle]
+				}, 'view');
 			}
 		});
 	}
@@ -624,12 +644,20 @@ export class NotebookCellList extends WorkbenchList<CellViewModel> implements ID
 
 		if (!indexes.length) {
 			if (this._viewModel) {
-				this._viewModel.updateSelectionsFromView(null, []);
+				this._viewModel.updateSelectionsState({
+					kind: SelectionStateType.Handle,
+					primary: null,
+					selections: []
+				}, 'view');
 			}
 		} else {
 			if (this._viewModel) {
 				const focusedElementHandle = this.element(indexes[0]).handle;
-				this._viewModel.updateSelectionsFromView(focusedElementHandle, this.getSelection().map(selection => this.element(selection).handle));
+				this._viewModel.updateSelectionsState({
+					kind: SelectionStateType.Handle,
+					primary: focusedElementHandle,
+					selections: this.getSelection().map(selection => this.element(selection).handle)
+				}, 'view');
 			}
 		}
 
@@ -644,11 +672,19 @@ export class NotebookCellList extends WorkbenchList<CellViewModel> implements ID
 
 		if (!indexes.length) {
 			if (this._viewModel) {
-				this._viewModel.updateSelectionsFromView(this.getFocusedElements()[0]?.handle ?? null, []);
+				this._viewModel.updateSelectionsState({
+					kind: SelectionStateType.Handle,
+					primary: this.getFocusedElements()[0]?.handle ?? null,
+					selections: []
+				}, 'view');
 			}
 		} else {
 			if (this._viewModel) {
-				this._viewModel.updateSelectionsFromView(this.getFocusedElements()[0]?.handle ?? null, indexes.map(index => this.element(index)).map(cell => cell.handle));
+				this._viewModel.updateSelectionsState({
+					kind: SelectionStateType.Handle,
+					primary: this.getFocusedElements()[0]?.handle ?? null,
+					selections: indexes.map(index => this.element(index)).map(cell => cell.handle)
+				}, 'view');
 			}
 		}
 
diff --git a/src/vs/workbench/contrib/notebook/browser/view/renderers/backLayerWebView.ts b/src/vs/workbench/contrib/notebook/browser/view/renderers/backLayerWebView.ts
index 79bf5b18006..bd50e00b474 100644
--- a/src/vs/workbench/contrib/notebook/browser/view/renderers/backLayerWebView.ts
+++ b/src/vs/workbench/contrib/notebook/browser/view/renderers/backLayerWebView.ts
@@ -26,13 +26,15 @@ import { IWebviewService, WebviewContentPurpose, WebviewElement } from 'vs/workb
 import { asWebviewUri } from 'vs/workbench/contrib/webview/common/webviewUri';
 import { IWorkbenchEnvironmentService } from 'vs/workbench/services/environment/common/environmentService';
 
-export interface WebviewIntialized {
+interface BaseToWebviewMessage {
 	readonly __vscode_notebook_message: true;
-	type: 'initialized'
 }
 
-export interface IDimensionMessage {
-	readonly __vscode_notebook_message: true;
+export interface WebviewIntialized extends BaseToWebviewMessage {
+	type: 'initialized';
+}
+
+export interface IDimensionMessage extends BaseToWebviewMessage {
 	type: 'dimension';
 	id: string;
 	init?: boolean;
@@ -40,86 +42,72 @@ export interface IDimensionMessage {
 	isOutput?: boolean;
 }
 
-export interface IMouseEnterMessage {
-	readonly __vscode_notebook_message: true;
+export interface IMouseEnterMessage extends BaseToWebviewMessage {
 	type: 'mouseenter';
 	id: string;
 }
 
-export interface IMouseLeaveMessage {
-	readonly __vscode_notebook_message: true;
+export interface IMouseLeaveMessage extends BaseToWebviewMessage {
 	type: 'mouseleave';
 	id: string;
 }
 
-export interface IWheelMessage {
-	readonly __vscode_notebook_message: true;
+export interface IWheelMessage extends BaseToWebviewMessage {
 	type: 'did-scroll-wheel';
 	payload: any;
 }
 
-
-export interface IScrollAckMessage {
-	readonly __vscode_notebook_message: true;
+export interface IScrollAckMessage extends BaseToWebviewMessage {
 	type: 'scroll-ack';
 	data: { top: number };
 	version: number;
 }
 
-export interface IBlurOutputMessage {
-	readonly __vscode_notebook_message: true;
+export interface IBlurOutputMessage extends BaseToWebviewMessage {
 	type: 'focus-editor';
 	id: string;
 	focusNext?: boolean;
 }
 
-export interface IClickedDataUrlMessage {
-	readonly __vscode_notebook_message: true;
+export interface IClickedDataUrlMessage extends BaseToWebviewMessage {
 	type: 'clicked-data-url';
 	data: string | ArrayBuffer | null;
 	downloadName?: string;
 }
 
-export interface IFocusMarkdownPreviewMessage {
-	readonly __vscode_notebook_message: true;
+export interface IFocusMarkdownPreviewMessage extends BaseToWebviewMessage {
 	type: 'focusMarkdownPreview';
 	cellId: string;
 }
 
-export interface IMouseEnterMarkdownPreviewMessage {
-	readonly __vscode_notebook_message: true;
+export interface IMouseEnterMarkdownPreviewMessage extends BaseToWebviewMessage {
 	type: 'mouseEnterMarkdownPreview';
 	cellId: string;
 }
 
-export interface IMouseLeaveMarkdownPreviewMessage {
-	readonly __vscode_notebook_message: true;
+export interface IMouseLeaveMarkdownPreviewMessage extends BaseToWebviewMessage {
 	type: 'mouseLeaveMarkdownPreview';
 	cellId: string;
 }
 
-export interface IToggleMarkdownPreviewMessage {
-	readonly __vscode_notebook_message: true;
+export interface IToggleMarkdownPreviewMessage extends BaseToWebviewMessage {
 	type: 'toggleMarkdownPreview';
 	cellId: string;
 }
 
-export interface ICellDragStartMessage {
-	readonly __vscode_notebook_message: true;
+export interface ICellDragStartMessage extends BaseToWebviewMessage {
 	type: 'cell-drag-start';
 	cellId: string;
 	position: { clientX: number, clientY: number };
 }
 
-export interface ICellDragMessage {
-	readonly __vscode_notebook_message: true;
+export interface ICellDragMessage extends BaseToWebviewMessage {
 	type: 'cell-drag';
 	cellId: string;
 	position: { clientX: number, clientY: number };
 }
 
-export interface ICellDragEndMessage {
-	readonly __vscode_notebook_message: true;
+export interface ICellDragEndMessage extends BaseToWebviewMessage {
 	readonly type: 'cell-drag-end';
 	readonly cellId: string;
 	readonly ctrlKey: boolean
@@ -129,8 +117,7 @@ export interface ICellDragEndMessage {
 		readonly clientY: number;
 	};
 }
-export interface IInitializedMarkdownPreviewMessage {
-	readonly __vscode_notebook_message: true;
+export interface IInitializedMarkdownPreviewMessage extends BaseToWebviewMessage {
 	readonly type: 'initializedMarkdownPreview';
 }
 
@@ -240,8 +227,7 @@ export interface IUpdateDecorationsMessage {
 	removedClassNames: string[];
 }
 
-export interface ICustomRendererMessage {
-	readonly __vscode_notebook_message: true;
+export interface ICustomRendererMessage extends BaseToWebviewMessage {
 	type: 'customRendererMessage';
 	rendererId: string;
 	message: unknown;
@@ -341,6 +327,10 @@ export interface INotebookWebviewMessage {
 	forRenderer?: string;
 }
 
+export interface IResolvedBackLayerWebview {
+	webview: WebviewElement;
+}
+
 let version = 0;
 export class BackLayerWebView<T extends ICommonCellInfo> extends Disposable {
 	element: HTMLElement;
@@ -365,7 +355,10 @@ export class BackLayerWebView<T extends ICommonCellInfo> extends Disposable {
 		public documentUri: URI,
 		public options: {
 			outputNodePadding: number,
-			outputNodeLeftPadding: number
+			outputNodeLeftPadding: number,
+			leftMargin: number,
+			cellMargin: number,
+			runGutter: number,
 		},
 		@IWebviewService readonly webviewService: IWebviewService,
 		@IOpenerService readonly openerService: IOpenerService,
@@ -391,7 +384,8 @@ export class BackLayerWebView<T extends ICommonCellInfo> extends Disposable {
 				<base href="${baseUrl}/"/>
 				<style>
 					#container > div > div.output {
-						width: 100%;
+						width: calc(100% - ${this.options.leftMargin + (this.options.cellMargin * 2) + this.options.runGutter}px);
+						margin-left: ${this.options.leftMargin + this.options.runGutter}px;
 						padding: ${this.options.outputNodePadding}px ${this.options.outputNodePadding}px ${this.options.outputNodePadding}px ${this.options.outputNodeLeftPadding}px;
 						box-sizing: border-box;
 						background-color: var(--vscode-notebook-outputContainerBackgroundColor);
@@ -406,13 +400,14 @@ export class BackLayerWebView<T extends ICommonCellInfo> extends Disposable {
 						-webkit-user-select: text;
 						-ms-user-select: text;
 						white-space: initial;
-						padding-left: 0px !important;
 						cursor: grab;
 					}
 
 					/* markdown */
 					#container > div > div.preview {
 						color: var(--vscode-foreground);
+						width: calc(100% - ${this.options.leftMargin + this.options.cellMargin}px);
+						padding-left: ${this.options.leftMargin}px;
 					}
 
 					#container > div > div.preview img {
@@ -611,7 +606,12 @@ export class BackLayerWebView<T extends ICommonCellInfo> extends Disposable {
 				</script>
 				${coreDependencies}
 				<div id='container' class="widgetarea" style="position: absolute;width:100%;top: 0px"></div>
-				<script>${preloadsScriptStr(this.options.outputNodePadding, this.options.outputNodeLeftPadding, 8)}</script>
+				<script>${preloadsScriptStr({
+			outputNodePadding: this.options.outputNodePadding,
+			outputNodeLeftPadding: this.options.outputNodeLeftPadding,
+			previewNodePadding: 8,
+			leftMargin: this.options.leftMargin
+		})}</script>
 				${markdownRenderersSrc}
 			</body>
 		</html>`;
@@ -654,6 +654,10 @@ export class BackLayerWebView<T extends ICommonCellInfo> extends Disposable {
 		return { cellInfo, output };
 	}
 
+	isResolved(): this is IResolvedBackLayerWebview {
+		return !!this.webview;
+	}
+
 	async createWebview(): Promise<void> {
 		let coreDependencies = '';
 		let resolveFunc: () => void;
diff --git a/src/vs/workbench/contrib/notebook/browser/view/renderers/cellContextKeys.ts b/src/vs/workbench/contrib/notebook/browser/view/renderers/cellContextKeys.ts
index bd6cacbaead..3055b549096 100644
--- a/src/vs/workbench/contrib/notebook/browser/view/renderers/cellContextKeys.ts
+++ b/src/vs/workbench/contrib/notebook/browser/view/renderers/cellContextKeys.ts
@@ -25,7 +25,7 @@ export class CellContextKeyManager extends Disposable {
 
 	private markdownEditMode!: IContextKey<boolean>;
 
-	private elementDisposables = new DisposableStore();
+	private readonly elementDisposables = this._register(new DisposableStore());
 
 	constructor(
 		private readonly contextKeyService: IContextKeyService,
diff --git a/src/vs/workbench/contrib/notebook/browser/view/renderers/cellRenderer.ts b/src/vs/workbench/contrib/notebook/browser/view/renderers/cellRenderer.ts
index 0150a7d7cb0..189080075ad 100644
--- a/src/vs/workbench/contrib/notebook/browser/view/renderers/cellRenderer.ts
+++ b/src/vs/workbench/contrib/notebook/browser/view/renderers/cellRenderer.ts
@@ -341,11 +341,11 @@ abstract class AbstractCellRenderer {
 			}
 
 			if (templateData.currentRenderedCell.metadata?.inputCollapsed) {
-				textModel.applyEdits(textModel.versionId, [
+				textModel.applyEdits([
 					{ editType: CellEditType.Metadata, index, metadata: { ...templateData.currentRenderedCell.metadata, inputCollapsed: false } }
 				], true, undefined, () => undefined, undefined);
 			} else if (templateData.currentRenderedCell.metadata?.outputCollapsed) {
-				textModel.applyEdits(textModel.versionId, [
+				textModel.applyEdits([
 					{ editType: CellEditType.Metadata, index, metadata: { ...templateData.currentRenderedCell.metadata, outputCollapsed: false } }
 				], true, undefined, () => undefined, undefined);
 			}
@@ -467,10 +467,12 @@ export class MarkdownCellRenderer extends AbstractCellRenderer implements IListR
 		DOM.reset(dragImageContainer, templateData.container.cloneNode(true));
 
 		// Remove all rendered content nodes after the
-		const markdownContent = dragImageContainer.querySelector('.cell.markdown')!;
-		const contentNodes = markdownContent.children[0].children;
-		for (let i = contentNodes.length - 1; i >= 1; i--) {
-			contentNodes.item(i)!.remove();
+		const markdownContent = dragImageContainer.querySelector('.cell.markdown');
+		const contentNodes = markdownContent?.children[0].children;
+		if (contentNodes) {
+			for (let i = contentNodes.length - 1; i >= 1; i--) {
+				contentNodes.item(i)!.remove();
+			}
 		}
 
 		return dragImageContainer;
diff --git a/src/vs/workbench/contrib/notebook/browser/view/renderers/markdownCell.ts b/src/vs/workbench/contrib/notebook/browser/view/renderers/markdownCell.ts
index badc10243fe..29da5e1adf8 100644
--- a/src/vs/workbench/contrib/notebook/browser/view/renderers/markdownCell.ts
+++ b/src/vs/workbench/contrib/notebook/browser/view/renderers/markdownCell.ts
@@ -36,20 +36,21 @@ class WebviewMarkdownRenderer extends Disposable implements IMarkdownRenderStrat
 	) {
 		super();
 	}
+
 	update(): void {
 		this.notebookEditor.createMarkdownPreview(this.viewCell);
 	}
 }
 
 class BuiltinMarkdownRenderer extends Disposable implements IMarkdownRenderStrategy {
-	private localDisposables = new DisposableStore();
+	private readonly localDisposables = this._register(new DisposableStore());
 
 	constructor(
-		readonly notebookEditor: IActiveNotebookEditor,
-		readonly viewCell: MarkdownCellViewModel,
-		readonly container: HTMLElement,
-		readonly markdownContainer: HTMLElement,
-		readonly dataSource: { codeEditor: CodeEditorWidget | null; }
+		private readonly notebookEditor: IActiveNotebookEditor,
+		private readonly viewCell: MarkdownCellViewModel,
+		private readonly container: HTMLElement,
+		private readonly markdownContainer: HTMLElement,
+		private readonly editorAccessor: () => CodeEditorWidget | null
 	) {
 		super();
 
@@ -68,12 +69,12 @@ class BuiltinMarkdownRenderer extends Disposable implements IMarkdownRenderStrat
 			this.markdownContainer.appendChild(renderedHTML);
 		}
 
-		if (this.dataSource.codeEditor) {
+		if (this.editorAccessor()) {
 			// switch from editing mode
 			this.viewCell.renderedMarkdownHeight = this.container.clientHeight;
 			this.relayoutCell();
 		} else {
-			// first time, readonly mode
+			this.localDisposables.clear();
 			this.localDisposables.add(markdownRenderer.onDidRenderAsync(() => {
 				this.viewCell.renderedMarkdownHeight = this.container.clientHeight;
 				this.relayoutCell();
@@ -102,18 +103,14 @@ export class StatefulMarkdownCell extends Disposable {
 
 	private editor: CodeEditorWidget | null = null;
 
-	get codeEditor() {
-		return this.editor;
-	}
-
 	private markdownContainer: HTMLElement;
 	private editorPart: HTMLElement;
 
-	private localDisposables = new DisposableStore();
+	private readonly localDisposables = new DisposableStore();
 	private foldingState: CellFoldingState;
-	private _activeCellRunPlaceholder: IDisposable | null = null;
-	private _useRenderer: boolean = false;
-	private _renderStrategy: IMarkdownRenderStrategy;
+	private activeCellRunPlaceholder: IDisposable | null = null;
+	private useRenderer: boolean = false;
+	private renderStrategy: IMarkdownRenderStrategy;
 
 	constructor(
 		private readonly notebookEditor: IActiveNotebookEditor,
@@ -131,21 +128,19 @@ export class StatefulMarkdownCell extends Disposable {
 		this.markdownContainer = templateData.cellContainer;
 		this.editorPart = templateData.editorPart;
 
-		this._useRenderer = !!(this.configurationSerivce.getValue<string>('notebook.experimental.useMarkdownRenderer'));
-		if (this._useRenderer) {
+		this.useRenderer = !!(this.configurationSerivce.getValue<string>('notebook.experimental.useMarkdownRenderer'));
+		if (this.useRenderer) {
 			this.templateData.container.classList.toggle('webview-backed-markdown-cell', true);
-			this._renderStrategy = new WebviewMarkdownRenderer(this.notebookEditor, this.viewCell);
+			this.renderStrategy = new WebviewMarkdownRenderer(this.notebookEditor, this.viewCell);
 		} else {
-			this._renderStrategy = new BuiltinMarkdownRenderer(this.notebookEditor, this.viewCell, this.templateData.container, this.markdownContainer, this);
+			this.renderStrategy = new BuiltinMarkdownRenderer(this.notebookEditor, this.viewCell, this.templateData.container, this.markdownContainer, () => this.editor);
 		}
 
-		this._register(this._renderStrategy);
-		this._register(this.localDisposables);
+		this._register(this.renderStrategy);
 		this._register(toDisposable(() => renderedEditors.delete(this.viewCell)));
 
 		this._register(viewCell.onDidChangeState((e) => {
 			if (e.editStateChanged) {
-				this.localDisposables.clear();
 				this.viewUpdate();
 			} else if (e.contentChanged) {
 				this.viewUpdate();
@@ -227,20 +222,20 @@ export class StatefulMarkdownCell extends Disposable {
 				&& !!this.notebookEditor.viewModel.metadata.trusted
 			) {
 				// active cell and no run status
-				if (this._activeCellRunPlaceholder === null) {
+				if (this.activeCellRunPlaceholder === null) {
 					// const keybinding = this._keybindingService.lookupKeybinding(EXECUTE_CELL_COMMAND_ID);
 					const placeholder = getExecuteCellPlaceholder(this.viewCell);
 					if (!this.notebookCellStatusBarService.getEntries(this.viewCell.uri).find(entry => entry.text === placeholder.text && entry.command === placeholder.command)) {
-						this._activeCellRunPlaceholder = this.notebookCellStatusBarService.addEntry(placeholder);
-						this._register(this._activeCellRunPlaceholder);
+						this.activeCellRunPlaceholder = this.notebookCellStatusBarService.addEntry(placeholder);
+						this._register(this.activeCellRunPlaceholder);
 					}
 				}
 
 				return;
 			}
 
-			this._activeCellRunPlaceholder?.dispose();
-			this._activeCellRunPlaceholder = null;
+			this.activeCellRunPlaceholder?.dispose();
+			this.activeCellRunPlaceholder = null;
 		};
 
 		this._register(this.notebookEditor.onDidChangeActiveCell(() => {
@@ -260,6 +255,13 @@ export class StatefulMarkdownCell extends Disposable {
 		updatePlaceholder();
 	}
 
+	dispose() {
+		this.notebookEditor.removeMarkdownPreview(this.viewCell);
+		this.localDisposables.dispose();
+		this.viewCell.detachTextEditor();
+		super.dispose();
+	}
+
 	private viewUpdate(): void {
 		if (this.viewCell.metadata?.inputCollapsed) {
 			this.viewUpdateCollapsed();
@@ -373,7 +375,7 @@ export class StatefulMarkdownCell extends Disposable {
 		this.markdownContainer.innerText = '';
 		this.viewCell.clearHTML();
 
-		this._renderStrategy.update();
+		this.renderStrategy.update();
 	}
 
 	private focusEditorIfNeeded() {
@@ -430,6 +432,9 @@ export class StatefulMarkdownCell extends Disposable {
 	}
 
 	private bindEditorListeners(editor: CodeEditorWidget) {
+
+		this.localDisposables.clear();
+
 		this.localDisposables.add(editor.onDidContentSizeChange(e => {
 			const viewLayout = editor.getLayoutInfo();
 
@@ -477,10 +482,4 @@ export class StatefulMarkdownCell extends Disposable {
 
 		updateFocusMode();
 	}
-
-	dispose() {
-		this.notebookEditor.removeMarkdownPreview(this.viewCell);
-		this.viewCell.detachTextEditor();
-		super.dispose();
-	}
 }
diff --git a/src/vs/workbench/contrib/notebook/browser/view/renderers/webviewPreloads.ts b/src/vs/workbench/contrib/notebook/browser/view/renderers/webviewPreloads.ts
index 89b8a23413f..8842d08897d 100644
--- a/src/vs/workbench/contrib/notebook/browser/view/renderers/webviewPreloads.ts
+++ b/src/vs/workbench/contrib/notebook/browser/view/renderers/webviewPreloads.ts
@@ -29,6 +29,7 @@ declare class ResizeObserver {
 declare const __outputNodePadding__: number;
 declare const __outputNodeLeftPadding__: number;
 declare const __previewNodePadding__: number;
+declare const __leftMargin__: number;
 
 type Listener<T> = { fn: (evt: T) => void; thisArg: unknown; };
 
@@ -145,9 +146,8 @@ function webviewPreloads() {
 				if (entry.target.id === id && entry.contentRect) {
 					if (entry.contentRect.height !== 0) {
 						const padding = output ? __outputNodePadding__ : __previewNodePadding__;
-						const paddingLeft = output ? __outputNodeLeftPadding__ : 0;
 
-						entry.target.style.padding = `${padding}px ${padding}px ${padding}px ${paddingLeft}px`;
+						entry.target.style.padding = `${padding}px ${padding}px ${padding}px ${output ? __outputNodeLeftPadding__ : __leftMargin__}px`;
 						postNotebookMessage<IDimensionMessage>('dimension', {
 							id: id,
 							data: {
@@ -479,7 +479,7 @@ function webviewPreloads() {
 					outputNode.style.position = 'absolute';
 					outputNode.style.top = data.top + 'px';
 					outputNode.style.left = data.left + 'px';
-					outputNode.style.width = 'calc(100% - ' + data.left + 'px)';
+					// outputNode.style.width = 'calc(100% - ' + data.left + 'px)';
 					// outputNode.style.minHeight = '32px';
 					outputNode.style.padding = '0px';
 					outputNode.id = outputId;
@@ -777,8 +777,15 @@ function webviewPreloads() {
 	}
 }
 
-export const preloadsScriptStr = (outputNodePadding: number, outputNodeLeftPadding: number, previewNodePadding: number) =>
-	`(${webviewPreloads})()`
-		.replace(/__outputNodePadding__/g, `${outputNodePadding}`)
-		.replace(/__outputNodeLeftPadding__/g, `${outputNodeLeftPadding}`)
-		.replace(/__previewNodePadding__/g, `${previewNodePadding}`);
+export function preloadsScriptStr(values: {
+	outputNodePadding: number;
+	outputNodeLeftPadding: number;
+	previewNodePadding: number;
+	leftMargin: number;
+}) {
+	return `(${webviewPreloads})()`
+		.replace(/__outputNodePadding__/g, `${values.outputNodePadding}`)
+		.replace(/__outputNodeLeftPadding__/g, `${values.outputNodeLeftPadding}`)
+		.replace(/__previewNodePadding__/g, `${values.previewNodePadding}`)
+		.replace(/__leftMargin__/g, `${values.leftMargin}`);
+}
diff --git a/src/vs/workbench/contrib/notebook/browser/viewModel/cellSelectionCollection.ts b/src/vs/workbench/contrib/notebook/browser/viewModel/cellSelectionCollection.ts
index 666b41e8300..9d2d5e1d98a 100644
--- a/src/vs/workbench/contrib/notebook/browser/viewModel/cellSelectionCollection.ts
+++ b/src/vs/workbench/contrib/notebook/browser/viewModel/cellSelectionCollection.ts
@@ -42,7 +42,7 @@ export class NotebookCellSelectionCollection extends Disposable {
 		return this._selections[0];
 	}
 
-	setState(primary: ICellRange | null, selections: ICellRange[], forceEventEmit: boolean, source: 'view' | 'edit') {
+	setState(primary: ICellRange | null, selections: ICellRange[], forceEventEmit: boolean, source: 'view' | 'model') {
 		if (primary !== null) {
 			const primaryRange = primary;
 			// TODO@rebornix deal with overlap
@@ -75,11 +75,11 @@ export class NotebookCellSelectionCollection extends Disposable {
 		}
 	}
 
-	setFocus(selection: ICellRange | null, forceEventEmit: boolean, source: 'view' | 'edit') {
+	setFocus(selection: ICellRange | null, forceEventEmit: boolean, source: 'view' | 'model') {
 		this.setState(selection, this._selections, forceEventEmit, source);
 	}
 
-	setSelections(selections: ICellRange[], forceEventEmit: boolean, source: 'view' | 'edit') {
+	setSelections(selections: ICellRange[], forceEventEmit: boolean, source: 'view' | 'model') {
 		this.setState(this._primary, selections, forceEventEmit, source);
 	}
 }
diff --git a/src/vs/workbench/contrib/notebook/browser/viewModel/notebookViewModel.ts b/src/vs/workbench/contrib/notebook/browser/viewModel/notebookViewModel.ts
index 47f60132a7a..b9cf9f594ec 100644
--- a/src/vs/workbench/contrib/notebook/browser/viewModel/notebookViewModel.ts
+++ b/src/vs/workbench/contrib/notebook/browser/viewModel/notebookViewModel.ts
@@ -6,6 +6,7 @@
 import { onUnexpectedError } from 'vs/base/common/errors';
 import { Emitter, Event } from 'vs/base/common/event';
 import { Disposable, DisposableStore } from 'vs/base/common/lifecycle';
+import { clamp } from 'vs/base/common/numbers';
 import * as strings from 'vs/base/common/strings';
 import { URI } from 'vs/base/common/uri';
 import { IBulkEditService, ResourceEdit, ResourceTextEdit } from 'vs/editor/browser/services/bulkEditService';
@@ -202,7 +203,7 @@ export class NotebookViewModel extends Disposable implements EditorFoldingStateD
 
 	private set selectionHandles(selectionHandles: number[]) {
 		const indexes = selectionHandles.map(handle => this._viewCells.findIndex(cell => cell.handle === handle));
-		this._selectionCollection.setSelections(cellIndexesToRanges(indexes), true, 'edit');
+		this._selectionCollection.setSelections(cellIndexesToRanges(indexes), true, 'model');
 	}
 
 	private _decorationsTree = new DecorationsTree();
@@ -282,7 +283,7 @@ export class NotebookViewModel extends Disposable implements EditorFoldingStateD
 						break;
 					}
 
-					if (diff[0] + diff[1] > primaryHandle) {
+					if (diff[0] + diff[1] > primarySelectionIndex) {
 						endSelectionHandles = [this._viewCells[diff[0] + delta].handle];
 						break;
 					}
@@ -319,7 +320,7 @@ export class NotebookViewModel extends Disposable implements EditorFoldingStateD
 			});
 
 			if (contentChanges.endSelectionState) {
-				this.updateSelectionsFromEdits(contentChanges.endSelectionState);
+				this.updateSelectionsState(contentChanges.endSelectionState);
 			}
 		}));
 
@@ -364,20 +365,44 @@ export class NotebookViewModel extends Disposable implements EditorFoldingStateD
 		this._focused = focused;
 	}
 
-	updateSelectionsFromView(primary: number | null, selections: number[]) {
-		const primaryIndex = primary !== null ? this.getCellIndexByHandle(primary) : null;
-		const selectionIndexes = selections.map(sel => this.getCellIndexByHandle(sel));
-		this._selectionCollection.setState(primaryIndex !== null ? { start: primaryIndex, end: primaryIndex + 1 } : null, cellIndexesToRanges(selectionIndexes), false, 'view');
+	/**
+	 * Empty selection will be turned to `null`
+	 */
+	validateRange(cellRange: ICellRange | null | undefined): ICellRange | null {
+		if (!cellRange) {
+			return null;
+		}
+
+		const start = clamp(cellRange.start, 0, this.length);
+		const end = clamp(cellRange.end, 0, this.length);
+
+		if (start === end) {
+			return null;
+		}
+
+		if (start < end) {
+			return { start, end };
+		} else {
+			return { start: end, end: start };
+		}
 	}
 
-	updateSelectionsFromEdits(state: ISelectionState) {
+	// selection change from list view's `setFocus` and `setSelection` should always use `source: view` to prevent events breaking the list view focus/selection change transaction
+	updateSelectionsState(state: ISelectionState, source: 'view' | 'model' = 'model') {
 		if (this._focused) {
 			if (state.kind === SelectionStateType.Handle) {
 				const primaryIndex = state.primary !== null ? this.getCellIndexByHandle(state.primary) : null;
-				const selectionIndexes = state.selections.map(sel => this.getCellIndexByHandle(sel));
-				this._selectionCollection.setState(primaryIndex !== null ? { start: primaryIndex, end: primaryIndex + 1 } : null, cellIndexesToRanges(selectionIndexes), true, 'edit');
+				const primarySelection = primaryIndex !== null ? this.validateRange({ start: primaryIndex, end: primaryIndex + 1 }) : null;
+				const selections = cellIndexesToRanges(state.selections.map(sel => this.getCellIndexByHandle(sel)))
+					.map(range => this.validateRange(range))
+					.filter(range => range !== null) as ICellRange[];
+				this._selectionCollection.setState(primarySelection, selections, true, source);
 			} else {
-				this._selectionCollection.setState(state.selections[0] ?? null, state.selections, true, 'edit');
+				const primarySelection = this.validateRange(state.selections[0]);
+				const selections = state.selections
+					.map(range => this.validateRange(range))
+					.filter(range => range !== null) as ICellRange[];
+				this._selectionCollection.setState(primarySelection, selections, true, source);
 			}
 		}
 	}
@@ -670,7 +695,7 @@ export class NotebookViewModel extends Disposable implements EditorFoldingStateD
 
 	createCell(index: number, source: string, language: string, type: CellKind, metadata: NotebookCellMetadata | undefined, outputs: IOutputDto[], synchronous: boolean, pushUndoStop: boolean = true, previouslyPrimary: number | null = null, previouslyFocused: ICellViewModel[] = []): CellViewModel {
 		const beforeSelections = previouslyFocused.map(e => e.handle);
-		this._notebook.applyEdits(this._notebook.versionId, [
+		this._notebook.applyEdits([
 			{
 				editType: CellEditType.Replace,
 				index,
@@ -701,9 +726,9 @@ export class NotebookViewModel extends Disposable implements EditorFoldingStateD
 			}
 		}
 
-		let endSelections: number[] = this.selectionHandles.filter(handle => handle !== endPrimarySelection);
+		let endSelections: number[] = this.selectionHandles.filter(handle => handle !== endPrimarySelection && handle !== this._viewCells[index]?.handle);
 
-		this._notebook.applyEdits(this._notebook.versionId, [
+		this._notebook.applyEdits([
 			{
 				editType: CellEditType.Replace,
 				index: index,
@@ -732,7 +757,7 @@ export class NotebookViewModel extends Disposable implements EditorFoldingStateD
 			return false;
 		}
 
-		this._notebook.applyEdits(this._notebook.versionId, [
+		this._notebook.applyEdits([
 			{
 				editType: CellEditType.Move,
 				index,
@@ -891,7 +916,7 @@ export class NotebookViewModel extends Disposable implements EditorFoldingStateD
 				return null;
 			}
 
-			const endSelections = [cell.handle];
+			const endSelections = [above.handle];
 			const insertContent = (cell.textModel?.getEOL() ?? '') + cell.getText();
 			const aboveCellLineCount = above.textModel.getLineCount();
 			const aboveCellLastLineEndColumn = above.textModel.getLineLength(aboveCellLineCount);
diff --git a/src/vs/workbench/contrib/notebook/common/model/notebookTextModel.ts b/src/vs/workbench/contrib/notebook/common/model/notebookTextModel.ts
index 6422841aab1..0246e87346e 100644
--- a/src/vs/workbench/contrib/notebook/common/model/notebookTextModel.ts
+++ b/src/vs/workbench/contrib/notebook/common/model/notebookTextModel.ts
@@ -283,10 +283,7 @@ export class NotebookTextModel extends Disposable implements INotebookTextModel
 		this._operationManager.pushStackElement(label, selectionState, undoRedoGroup);
 	}
 
-	applyEdits(modelVersionId: number, rawEdits: ICellEditOperation[], synchronous: boolean, beginSelectionState: ISelectionState | undefined, endSelectionsComputer: () => ISelectionState | undefined, undoRedoGroup: UndoRedoGroup | undefined, computeUndoRedo: boolean = true): boolean {
-		if (modelVersionId !== this._versionId) {
-			return false;
-		}
+	applyEdits(rawEdits: ICellEditOperation[], synchronous: boolean, beginSelectionState: ISelectionState | undefined, endSelectionsComputer: () => ISelectionState | undefined, undoRedoGroup: UndoRedoGroup | undefined, computeUndoRedo: boolean = true): boolean {
 
 		this._eventEmitter.beginDeferredEmit();
 		this.pushStackElement('edit', beginSelectionState, undoRedoGroup);
diff --git a/src/vs/workbench/contrib/notebook/common/notebookCommon.ts b/src/vs/workbench/contrib/notebook/common/notebookCommon.ts
index 934568101c5..e3a06ba89dd 100644
--- a/src/vs/workbench/contrib/notebook/common/notebookCommon.ts
+++ b/src/vs/workbench/contrib/notebook/common/notebookCommon.ts
@@ -655,7 +655,6 @@ export interface INotebookTextModelBackup {
 
 export interface NotebookDocumentBackupData {
 	readonly viewType: string;
-	readonly name: string;
 	readonly backupId?: string;
 	readonly mtime?: number;
 }
@@ -682,9 +681,7 @@ export interface IEditor extends editorCommon.ICompositeCodeEditor {
 	readonly onDidChangeSelection: Event<void>;
 	getSelection(): ICellRange | undefined;
 	getSelections(): ICellRange[];
-	isNotebookEditor: boolean;
 	visibleRanges: ICellRange[];
-	uri?: URI;
 	textModel?: NotebookTextModel;
 	getId(): string;
 	hasFocus(): boolean;
diff --git a/src/vs/workbench/contrib/notebook/common/notebookEditorModel.ts b/src/vs/workbench/contrib/notebook/common/notebookEditorModel.ts
index dd58e663194..13748942e86 100644
--- a/src/vs/workbench/contrib/notebook/common/notebookEditorModel.ts
+++ b/src/vs/workbench/contrib/notebook/common/notebookEditorModel.ts
@@ -126,7 +126,6 @@ export class NotebookEditorModel extends EditorModel implements INotebookEditorM
 		return {
 			meta: {
 				mtime: stats?.mtime ?? Date.now(),
-				name: this._name,
 				viewType: this.notebook.viewType,
 				backupId: backupId
 			}
@@ -224,7 +223,7 @@ export class NotebookEditorModel extends EditorModel implements INotebookEditorM
 			this.notebook.metadata = data.data.metadata;
 			this.notebook.transientOptions = data.transientOptions;
 			const edits: ICellEditOperation[] = [{ editType: CellEditType.Replace, index: 0, count: this.notebook.cells.length, cells: data.data.cells }];
-			this.notebook.applyEdits(this.notebook.versionId, edits, true, undefined, () => undefined, undefined);
+			this.notebook.applyEdits(edits, true, undefined, () => undefined, undefined);
 		}
 
 		if (backupId) {
diff --git a/src/vs/workbench/contrib/notebook/common/notebookService.ts b/src/vs/workbench/contrib/notebook/common/notebookService.ts
index 3a92084613b..e3617fd1bcf 100644
--- a/src/vs/workbench/contrib/notebook/common/notebookService.ts
+++ b/src/vs/workbench/contrib/notebook/common/notebookService.ts
@@ -39,8 +39,7 @@ export interface INotebookRawData {
 export interface INotebookService {
 	readonly _serviceBrand: undefined;
 	canResolve(viewType: string): Promise<boolean>;
-	onDidChangeActiveEditor: Event<string | null>;
-	onDidChangeVisibleEditors: Event<string[]>;
+
 	onNotebookEditorAdd: Event<IEditor>;
 	onNotebookEditorsRemove: Event<IEditor[]>;
 	onDidRemoveNotebookDocument: Event<URI>;
@@ -62,12 +61,12 @@ export interface INotebookService {
 	createNotebookTextModel(viewType: string, uri: URI, data: NotebookDataDto, transientOptions: TransientOptions): NotebookTextModel;
 	getNotebookTextModel(uri: URI): NotebookTextModel | undefined;
 	getNotebookTextModels(): Iterable<NotebookTextModel>;
+	listNotebookDocuments(): readonly NotebookTextModel[];
+
 	getContributedNotebookProviders(resource?: URI): readonly NotebookProviderInfo[];
 	getContributedNotebookProvider(viewType: string): NotebookProviderInfo | undefined;
 	getNotebookProviderResourceRoots(): URI[];
 	destoryNotebookDocument(viewType: string, notebook: INotebookTextModel): void;
-	updateActiveNotebookEditor(editor: IEditor | null): void;
-	updateVisibleNotebookEditor(editors: string[]): void;
 
 	fetchNotebookRawData(viewType: string, uri: URI, backupId?: string): Promise<INotebookRawData>;
 	save(viewType: string, resource: URI, token: CancellationToken): Promise<boolean>;
@@ -79,13 +78,13 @@ export interface INotebookService {
 	getToCopy(): { items: NotebookCellTextModel[], isCopy: boolean; } | undefined;
 
 	// editor events
+
 	resolveNotebookEditor(viewType: string, uri: URI, editorId: string): Promise<void>;
+
 	addNotebookEditor(editor: IEditor): void;
 	removeNotebookEditor(editor: IEditor): void;
 	getNotebookEditor(editorId: string): IEditor | undefined;
 	listNotebookEditors(): readonly IEditor[];
-	listVisibleNotebookEditors(): readonly IEditor[];
-	listNotebookDocuments(): readonly NotebookTextModel[];
 	registerEditorDecorationType(key: string, options: INotebookDecorationRenderOptions): void;
 	removeEditorDecorationType(key: string): void;
 	resolveEditorDecorationOptions(key: string): INotebookDecorationRenderOptions | undefined;
diff --git a/src/vs/workbench/contrib/notebook/electron-browser/notebook.contribution.ts b/src/vs/workbench/contrib/notebook/electron-browser/notebook.contribution.ts
index 7f8c507b3ab..7499926090b 100644
--- a/src/vs/workbench/contrib/notebook/electron-browser/notebook.contribution.ts
+++ b/src/vs/workbench/contrib/notebook/electron-browser/notebook.contribution.ts
@@ -5,14 +5,14 @@
 
 import { CopyAction, CutAction, PasteAction } from 'vs/editor/contrib/clipboard/clipboard';
 import { ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
-import { getActiveNotebookEditor } from 'vs/workbench/contrib/notebook/browser/contrib/coreActions';
 import { ElectronWebviewBasedWebview } from 'vs/workbench/contrib/webview/electron-browser/webviewElement';
 import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
 import { UndoCommand, RedoCommand } from 'vs/editor/browser/editorExtensions';
+import { getNotebookEditorFromEditorPane } from 'vs/workbench/contrib/notebook/browser/notebookBrowser';
 
 function getFocusedElectronBasedWebviewDelegate(accessor: ServicesAccessor): ElectronWebviewBasedWebview | undefined {
 	const editorService = accessor.get(IEditorService);
-	const editor = getActiveNotebookEditor(editorService);
+	const editor = getNotebookEditorFromEditorPane(editorService.activeEditorPane);
 	if (!editor?.hasFocus()) {
 		return;
 	}
diff --git a/src/vs/workbench/contrib/notebook/test/notebookEditorModel.test.ts b/src/vs/workbench/contrib/notebook/test/notebookEditorModel.test.ts
new file mode 100644
index 00000000000..ea4b8103f36
--- /dev/null
+++ b/src/vs/workbench/contrib/notebook/test/notebookEditorModel.test.ts
@@ -0,0 +1,54 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import * as assert from 'assert';
+import { Event } from 'vs/base/common/event';
+import { Disposable } from 'vs/base/common/lifecycle';
+import { isEqual } from 'vs/base/common/resources';
+import { URI } from 'vs/base/common/uri';
+import { mock } from 'vs/base/test/common/mock';
+import { IFileService } from 'vs/platform/files/common/files';
+import { ILabelService } from 'vs/platform/label/common/label';
+import { NullLogService } from 'vs/platform/log/common/log';
+import { INotificationService } from 'vs/platform/notification/common/notification';
+import { NotebookEditorModel } from 'vs/workbench/contrib/notebook/common/notebookEditorModel';
+import { INotebookService } from 'vs/workbench/contrib/notebook/common/notebookService';
+import { IBackupFileService } from 'vs/workbench/services/backup/common/backup';
+import { IWorkingCopy, IWorkingCopyService } from 'vs/workbench/services/workingCopy/common/workingCopyService';
+
+suite('NotebookEditorModel', function () {
+
+	const notebokService = new class extends mock<INotebookService>() { };
+	const backupService = new class extends mock<IBackupFileService>() { };
+	const notificationService = new class extends mock<INotificationService>() { };
+	const fileService = new class extends mock<IFileService>() {
+		onDidFilesChange = Event.None;
+	};
+	const labelService = new class extends mock<ILabelService>() {
+		getUriBasenameLabel(uri: URI) { return uri.toString(); }
+	};
+
+	test('working copy uri', function () {
+		if (1) {
+			this.skip();
+		}
+		const r1 = URI.parse('foo-files:///my.nb');
+		const r2 = URI.parse('bar-files:///my.nb');
+
+		const copies: IWorkingCopy[] = [];
+		const workingCopyService = new class extends mock<IWorkingCopyService>() {
+			registerWorkingCopy(copy: IWorkingCopy) {
+				copies.push(copy);
+				return Disposable.None;
+			}
+		};
+
+		new NotebookEditorModel(r1, 'fff', notebokService, workingCopyService, backupService, fileService, notificationService, new NullLogService(), labelService);
+		new NotebookEditorModel(r2, 'fff', notebokService, workingCopyService, backupService, fileService, notificationService, new NullLogService(), labelService);
+
+		assert.strictEqual(copies.length, 2);
+		assert.strictEqual(!isEqual(copies[0].resource, copies[1].resource), true);
+	});
+});
diff --git a/src/vs/workbench/contrib/notebook/test/notebookSelection.test.ts b/src/vs/workbench/contrib/notebook/test/notebookSelection.test.ts
index d1cb17fbf6e..4e77f4b4ad9 100644
--- a/src/vs/workbench/contrib/notebook/test/notebookSelection.test.ts
+++ b/src/vs/workbench/contrib/notebook/test/notebookSelection.test.ts
@@ -4,30 +4,171 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as assert from 'assert';
+import { FoldingModel, updateFoldingStateAtIndex } from 'vs/workbench/contrib/notebook/browser/contrib/fold/foldingModel';
 import { NotebookCellSelectionCollection } from 'vs/workbench/contrib/notebook/browser/viewModel/cellSelectionCollection';
+import { CellKind, SelectionStateType } from 'vs/workbench/contrib/notebook/common/notebookCommon';
+import { createNotebookCellList, setupInstantiationService, withTestNotebook } from 'vs/workbench/contrib/notebook/test/testNotebookEditor';
 
 suite('NotebookSelection', () => {
 	test('selection is never empty', function () {
 		const selectionCollection = new NotebookCellSelectionCollection();
 		assert.deepStrictEqual(selectionCollection.selections, [{ start: 0, end: 0 }]);
 
-		selectionCollection.setState(null, [], true, 'edit');
+		selectionCollection.setState(null, [], true, 'model');
 		assert.deepStrictEqual(selectionCollection.selections, [{ start: 0, end: 0 }]);
 	});
 
 	test('selections[0] is primary selection', function () {
 		const selectionCollection = new NotebookCellSelectionCollection();
-		selectionCollection.setState(null, [{ start: 0, end: 1 }, { start: 3, end: 5 }], true, 'edit');
+		selectionCollection.setState(null, [{ start: 0, end: 1 }, { start: 3, end: 5 }], true, 'model');
 		assert.deepStrictEqual(selectionCollection.selection, { start: 0, end: 1 });
 		assert.deepStrictEqual(selectionCollection.selections, [{ start: 0, end: 1 }, { start: 3, end: 5 }]);
 
-		selectionCollection.setState({ start: 0, end: 1 }, [{ start: 3, end: 5 }], true, 'edit');
+		selectionCollection.setState({ start: 0, end: 1 }, [{ start: 3, end: 5 }], true, 'model');
 		assert.deepStrictEqual(selectionCollection.selection, { start: 0, end: 1 });
 		assert.deepStrictEqual(selectionCollection.selections, [{ start: 0, end: 1 }, { start: 3, end: 5 }]);
 
-		selectionCollection.setState({ start: 0, end: 1 }, [], true, 'edit');
+		selectionCollection.setState({ start: 0, end: 1 }, [], true, 'model');
 		assert.deepStrictEqual(selectionCollection.selection, { start: 0, end: 1 });
 		assert.deepStrictEqual(selectionCollection.selections, [{ start: 0, end: 1 }]);
 
 	});
 });
+
+suite('NotebookCellList focus/selection', () => {
+	const instantiationService = setupInstantiationService();
+
+	test('notebook cell list setFocus', function () {
+		withTestNotebook(
+			instantiationService,
+			[
+				['var a = 1;', 'javascript', CellKind.Code, [], {}],
+				['var b = 2;', 'javascript', CellKind.Code, [], {}]
+			],
+			(editor, viewModel) => {
+				const cellList = createNotebookCellList(instantiationService);
+				cellList.attachViewModel(viewModel);
+
+				assert.strictEqual(cellList.length, 2);
+				cellList.setFocus([0]);
+				assert.deepStrictEqual(viewModel.getSelection(), { start: 0, end: 1 });
+
+				cellList.setFocus([1]);
+				assert.deepStrictEqual(viewModel.getSelection(), { start: 1, end: 2 });
+				cellList.detachViewModel();
+			});
+	});
+
+	test('notebook cell list setSelections', function () {
+		withTestNotebook(
+			instantiationService,
+			[
+				['var a = 1;', 'javascript', CellKind.Code, [], {}],
+				['var b = 2;', 'javascript', CellKind.Code, [], {}]
+			],
+			(editor, viewModel) => {
+				const cellList = createNotebookCellList(instantiationService);
+				cellList.attachViewModel(viewModel);
+
+				assert.strictEqual(cellList.length, 2);
+				cellList.setSelection([0]);
+				// the only selection is also the focus
+				assert.deepStrictEqual(viewModel.getSelection(), { start: 0, end: 1 });
+
+				// set selection does not modify focus
+				cellList.setSelection([1]);
+				assert.deepStrictEqual(viewModel.getSelection(), { start: 0, end: 1 });
+				// `getSelections()` now returns all focus/selection ranges
+				assert.deepStrictEqual(viewModel.getSelections(), [{ start: 0, end: 1 }, { start: 1, end: 2 }]);
+			});
+	});
+
+	test('notebook cell list focus/selection with folding regions', function () {
+		withTestNotebook(
+			instantiationService,
+			[
+				['# header a', 'markdown', CellKind.Markdown, [], {}],
+				['var b = 1;', 'javascript', CellKind.Code, [], {}],
+				['# header b', 'markdown', CellKind.Markdown, [], {}],
+				['var b = 2;', 'javascript', CellKind.Code, [], {}],
+				['# header c', 'markdown', CellKind.Markdown, [], {}]
+			],
+			(editor, viewModel) => {
+				const foldingModel = new FoldingModel();
+				foldingModel.attachViewModel(viewModel);
+
+				const cellList = createNotebookCellList(instantiationService);
+				cellList.attachViewModel(viewModel);
+				assert.strictEqual(cellList.length, 5);
+				cellList.setFocus([0]);
+
+				updateFoldingStateAtIndex(foldingModel, 0, true);
+				updateFoldingStateAtIndex(foldingModel, 2, true);
+				viewModel.updateFoldingRanges(foldingModel.regions);
+				cellList.setHiddenAreas(viewModel.getHiddenRanges(), true);
+				assert.strictEqual(cellList.length, 3);
+
+				// currently, focus on a folded cell will only select the cell itself, excluding its "inner" cells
+				assert.deepStrictEqual(viewModel.getSelection(), { start: 0, end: 1 });
+
+				cellList.focusNext(1, false);
+				// focus next should skip the folded items
+				assert.deepStrictEqual(viewModel.getSelection(), { start: 2, end: 3 });
+				assert.deepStrictEqual(viewModel.getSelections(), [{ start: 2, end: 3 }]);
+
+				// unfold
+				updateFoldingStateAtIndex(foldingModel, 2, false);
+				viewModel.updateFoldingRanges(foldingModel.regions);
+				cellList.setHiddenAreas(viewModel.getHiddenRanges(), true);
+				assert.strictEqual(cellList.length, 4);
+				assert.deepStrictEqual(viewModel.getSelection(), { start: 2, end: 3 });
+			});
+	});
+
+	test('notebook validate range', () => {
+		withTestNotebook(
+			instantiationService,
+			[
+				['# header a', 'markdown', CellKind.Markdown, [], {}],
+				['var b = 1;', 'javascript', CellKind.Code, [], {}]
+			],
+			(editor, viewModel) => {
+				assert.deepStrictEqual(viewModel.validateRange(null), null);
+				assert.deepStrictEqual(viewModel.validateRange(undefined), null);
+				assert.deepStrictEqual(viewModel.validateRange({ start: 0, end: 0 }), null);
+				assert.deepStrictEqual(viewModel.validateRange({ start: 0, end: 2 }), { start: 0, end: 2 });
+				assert.deepStrictEqual(viewModel.validateRange({ start: 0, end: 3 }), { start: 0, end: 2 });
+				assert.deepStrictEqual(viewModel.validateRange({ start: -1, end: 3 }), { start: 0, end: 2 });
+				assert.deepStrictEqual(viewModel.validateRange({ start: -1, end: 1 }), { start: 0, end: 1 });
+				assert.deepStrictEqual(viewModel.validateRange({ start: 2, end: 1 }), { start: 1, end: 2 });
+				assert.deepStrictEqual(viewModel.validateRange({ start: 2, end: -1 }), { start: 0, end: 2 });
+			});
+	});
+
+	test('notebook updateSelectionState', function () {
+		withTestNotebook(
+			instantiationService,
+			[
+				['# header a', 'markdown', CellKind.Markdown, [], {}],
+				['var b = 1;', 'javascript', CellKind.Code, [], {}]
+			],
+			(editor, viewModel) => {
+				viewModel.updateSelectionsState({ kind: SelectionStateType.Index, selections: [{ start: 1, end: 2 }, { start: -1, end: 0 }] });
+				assert.deepStrictEqual(viewModel.getSelections(), [{ start: 1, end: 2 }]);
+			});
+	});
+
+	test('notebook cell selection w/ cell deletion', function () {
+		withTestNotebook(
+			instantiationService,
+			[
+				['# header a', 'markdown', CellKind.Markdown, [], {}],
+				['var b = 1;', 'javascript', CellKind.Code, [], {}]
+			],
+			(editor, viewModel) => {
+				viewModel.updateSelectionsState({ kind: SelectionStateType.Index, selections: [{ start: 1, end: 2 }] });
+				viewModel.deleteCell(1, true, false);
+				assert.deepStrictEqual(viewModel.getSelections(), [{ start: 0, end: 1 }]);
+			});
+	});
+});
diff --git a/src/vs/workbench/contrib/notebook/test/notebookTextModel.test.ts b/src/vs/workbench/contrib/notebook/test/notebookTextModel.test.ts
index 6caa4fd6624..86bf2faf9c8 100644
--- a/src/vs/workbench/contrib/notebook/test/notebookTextModel.test.ts
+++ b/src/vs/workbench/contrib/notebook/test/notebookTextModel.test.ts
@@ -6,22 +6,17 @@
 import * as assert from 'assert';
 import { CellKind, CellEditType, NotebookTextModelChangedEvent, SelectionStateType } from 'vs/workbench/contrib/notebook/common/notebookCommon';
 import { withTestNotebook, TestCell, setupInstantiationService } from 'vs/workbench/contrib/notebook/test/testNotebookEditor';
-import { IBulkEditService } from 'vs/editor/browser/services/bulkEditService';
 import { IUndoRedoService } from 'vs/platform/undoRedo/common/undoRedo';
 import { ITextModelService } from 'vs/editor/common/services/resolverService';
 
 suite('NotebookTextModel', () => {
 	const instantiationService = setupInstantiationService();
 	const textModelService = instantiationService.get(ITextModelService);
-	const blukEditService = instantiationService.get(IBulkEditService);
-	const undoRedoService = instantiationService.stub(IUndoRedoService, () => { });
 	instantiationService.spy(IUndoRedoService, 'pushElement');
 
 	test('insert', function () {
 		withTestNotebook(
 			instantiationService,
-			blukEditService,
-			undoRedoService,
 			[
 				['var a = 1;', 'javascript', CellKind.Code, [], { editable: true }],
 				['var b = 2;', 'javascript', CellKind.Code, [], { editable: false }],
@@ -29,7 +24,7 @@ suite('NotebookTextModel', () => {
 				['var d = 4;', 'javascript', CellKind.Code, [], { editable: false }]
 			],
 			(editor, viewModel, textModel) => {
-				textModel.applyEdits(textModel.versionId, [
+				textModel.applyEdits([
 					{ editType: CellEditType.Replace, index: 1, count: 0, cells: [new TestCell(viewModel.viewType, 5, 'var e = 5;', 'javascript', CellKind.Code, [], textModelService)] },
 					{ editType: CellEditType.Replace, index: 3, count: 0, cells: [new TestCell(viewModel.viewType, 6, 'var f = 6;', 'javascript', CellKind.Code, [], textModelService)] },
 				], true, undefined, () => undefined, undefined);
@@ -45,8 +40,6 @@ suite('NotebookTextModel', () => {
 	test('multiple inserts at same position', function () {
 		withTestNotebook(
 			instantiationService,
-			blukEditService,
-			undoRedoService,
 			[
 				['var a = 1;', 'javascript', CellKind.Code, [], { editable: true }],
 				['var b = 2;', 'javascript', CellKind.Code, [], { editable: false }],
@@ -54,7 +47,7 @@ suite('NotebookTextModel', () => {
 				['var d = 4;', 'javascript', CellKind.Code, [], { editable: false }]
 			],
 			(editor, viewModel, textModel) => {
-				textModel.applyEdits(textModel.versionId, [
+				textModel.applyEdits([
 					{ editType: CellEditType.Replace, index: 1, count: 0, cells: [new TestCell(viewModel.viewType, 5, 'var e = 5;', 'javascript', CellKind.Code, [], textModelService)] },
 					{ editType: CellEditType.Replace, index: 1, count: 0, cells: [new TestCell(viewModel.viewType, 6, 'var f = 6;', 'javascript', CellKind.Code, [], textModelService)] },
 				], true, undefined, () => undefined, undefined);
@@ -70,8 +63,6 @@ suite('NotebookTextModel', () => {
 	test('delete', function () {
 		withTestNotebook(
 			instantiationService,
-			blukEditService,
-			undoRedoService,
 			[
 				['var a = 1;', 'javascript', CellKind.Code, [], { editable: true }],
 				['var b = 2;', 'javascript', CellKind.Code, [], { editable: false }],
@@ -79,7 +70,7 @@ suite('NotebookTextModel', () => {
 				['var d = 4;', 'javascript', CellKind.Code, [], { editable: false }]
 			],
 			(editor, viewModel, textModel) => {
-				textModel.applyEdits(textModel.versionId, [
+				textModel.applyEdits([
 					{ editType: CellEditType.Replace, index: 1, count: 1, cells: [] },
 					{ editType: CellEditType.Replace, index: 3, count: 1, cells: [] },
 				], true, undefined, () => undefined, undefined);
@@ -93,8 +84,6 @@ suite('NotebookTextModel', () => {
 	test('delete + insert', function () {
 		withTestNotebook(
 			instantiationService,
-			blukEditService,
-			undoRedoService,
 			[
 				['var a = 1;', 'javascript', CellKind.Code, [], { editable: true }],
 				['var b = 2;', 'javascript', CellKind.Code, [], { editable: false }],
@@ -102,7 +91,7 @@ suite('NotebookTextModel', () => {
 				['var d = 4;', 'javascript', CellKind.Code, [], { editable: false }]
 			],
 			(editor, viewModel, textModel) => {
-				textModel.applyEdits(textModel.versionId, [
+				textModel.applyEdits([
 					{ editType: CellEditType.Replace, index: 1, count: 1, cells: [] },
 					{ editType: CellEditType.Replace, index: 3, count: 0, cells: [new TestCell(viewModel.viewType, 5, 'var e = 5;', 'javascript', CellKind.Code, [], textModelService)] },
 				], true, undefined, () => undefined, undefined);
@@ -118,8 +107,6 @@ suite('NotebookTextModel', () => {
 	test('delete + insert at same position', function () {
 		withTestNotebook(
 			instantiationService,
-			blukEditService,
-			undoRedoService,
 			[
 				['var a = 1;', 'javascript', CellKind.Code, [], { editable: true }],
 				['var b = 2;', 'javascript', CellKind.Code, [], { editable: false }],
@@ -127,7 +114,7 @@ suite('NotebookTextModel', () => {
 				['var d = 4;', 'javascript', CellKind.Code, [], { editable: false }]
 			],
 			(editor, viewModel, textModel) => {
-				textModel.applyEdits(textModel.versionId, [
+				textModel.applyEdits([
 					{ editType: CellEditType.Replace, index: 1, count: 1, cells: [] },
 					{ editType: CellEditType.Replace, index: 1, count: 0, cells: [new TestCell(viewModel.viewType, 5, 'var e = 5;', 'javascript', CellKind.Code, [], textModelService)] },
 				], true, undefined, () => undefined, undefined);
@@ -143,8 +130,6 @@ suite('NotebookTextModel', () => {
 	test('(replace) delete + insert at same position', function () {
 		withTestNotebook(
 			instantiationService,
-			blukEditService,
-			undoRedoService,
 			[
 				['var a = 1;', 'javascript', CellKind.Code, [], { editable: true }],
 				['var b = 2;', 'javascript', CellKind.Code, [], { editable: false }],
@@ -152,7 +137,7 @@ suite('NotebookTextModel', () => {
 				['var d = 4;', 'javascript', CellKind.Code, [], { editable: false }]
 			],
 			(editor, viewModel, textModel) => {
-				textModel.applyEdits(textModel.versionId, [
+				textModel.applyEdits([
 					{ editType: CellEditType.Replace, index: 1, count: 1, cells: [new TestCell(viewModel.viewType, 5, 'var e = 5;', 'javascript', CellKind.Code, [], textModelService)] },
 				], true, undefined, () => undefined, undefined);
 
@@ -167,8 +152,6 @@ suite('NotebookTextModel', () => {
 	test('output', function () {
 		withTestNotebook(
 			instantiationService,
-			blukEditService,
-			undoRedoService,
 			[
 				['var a = 1;', 'javascript', CellKind.Code, [], { editable: true }],
 			],
@@ -176,7 +159,7 @@ suite('NotebookTextModel', () => {
 
 				// invalid index 1
 				assert.throws(() => {
-					textModel.applyEdits(textModel.versionId, [{
+					textModel.applyEdits([{
 						index: Number.MAX_VALUE,
 						editType: CellEditType.Output,
 						outputs: []
@@ -185,14 +168,14 @@ suite('NotebookTextModel', () => {
 
 				// invalid index 2
 				assert.throws(() => {
-					textModel.applyEdits(textModel.versionId, [{
+					textModel.applyEdits([{
 						index: -1,
 						editType: CellEditType.Output,
 						outputs: []
 					}], true, undefined, () => undefined, undefined);
 				});
 
-				textModel.applyEdits(textModel.versionId, [{
+				textModel.applyEdits([{
 					index: 0,
 					editType: CellEditType.Output,
 					outputs: [{
@@ -205,7 +188,7 @@ suite('NotebookTextModel', () => {
 				assert.strictEqual(textModel.cells[0].outputs.length, 1);
 
 				// append
-				textModel.applyEdits(textModel.versionId, [{
+				textModel.applyEdits([{
 					index: 0,
 					editType: CellEditType.Output,
 					append: true,
@@ -222,7 +205,7 @@ suite('NotebookTextModel', () => {
 				assert.strictEqual(second.outputId, 'someId2');
 
 				// replace all
-				textModel.applyEdits(textModel.versionId, [{
+				textModel.applyEdits([{
 					index: 0,
 					editType: CellEditType.Output,
 					outputs: [{
@@ -242,8 +225,6 @@ suite('NotebookTextModel', () => {
 	test('metadata', function () {
 		withTestNotebook(
 			instantiationService,
-			blukEditService,
-			undoRedoService,
 			[
 				['var a = 1;', 'javascript', CellKind.Code, [], { editable: true }],
 			],
@@ -251,7 +232,7 @@ suite('NotebookTextModel', () => {
 
 				// invalid index 1
 				assert.throws(() => {
-					textModel.applyEdits(textModel.versionId, [{
+					textModel.applyEdits([{
 						index: Number.MAX_VALUE,
 						editType: CellEditType.Metadata,
 						metadata: { editable: false }
@@ -260,14 +241,14 @@ suite('NotebookTextModel', () => {
 
 				// invalid index 2
 				assert.throws(() => {
-					textModel.applyEdits(textModel.versionId, [{
+					textModel.applyEdits([{
 						index: -1,
 						editType: CellEditType.Metadata,
 						metadata: { editable: false }
 					}], true, undefined, () => undefined, undefined);
 				});
 
-				textModel.applyEdits(textModel.versionId, [{
+				textModel.applyEdits([{
 					index: 0,
 					editType: CellEditType.Metadata,
 					metadata: { editable: false },
@@ -282,8 +263,6 @@ suite('NotebookTextModel', () => {
 	test('multiple inserts in one edit', function () {
 		withTestNotebook(
 			instantiationService,
-			blukEditService,
-			undoRedoService,
 			[
 				['var a = 1;', 'javascript', CellKind.Code, [], { editable: true }],
 				['var b = 2;', 'javascript', CellKind.Code, [], { editable: false }],
@@ -297,7 +276,7 @@ suite('NotebookTextModel', () => {
 				});
 				const version = textModel.versionId;
 
-				textModel.applyEdits(textModel.versionId, [
+				textModel.applyEdits([
 					{ editType: CellEditType.Replace, index: 1, count: 1, cells: [] },
 					{ editType: CellEditType.Replace, index: 1, count: 0, cells: [new TestCell(viewModel.viewType, 5, 'var e = 5;', 'javascript', CellKind.Code, [], textModelService)] },
 				], true, undefined, () => ({ kind: SelectionStateType.Index, selections: [{ start: 0, end: 1 }] }), undefined);
@@ -319,8 +298,6 @@ suite('NotebookTextModel', () => {
 	test('insert and metadata change in one edit', function () {
 		withTestNotebook(
 			instantiationService,
-			blukEditService,
-			undoRedoService,
 			[
 				['var a = 1;', 'javascript', CellKind.Code, [], { editable: true }],
 				['var b = 2;', 'javascript', CellKind.Code, [], { editable: false }],
@@ -334,7 +311,7 @@ suite('NotebookTextModel', () => {
 				});
 				const version = textModel.versionId;
 
-				textModel.applyEdits(textModel.versionId, [
+				textModel.applyEdits([
 					{ editType: CellEditType.Replace, index: 1, count: 1, cells: [] },
 					{
 						index: 0,
@@ -354,7 +331,7 @@ suite('NotebookTextModel', () => {
 
 
 	test('Updating appending/updating output in Notebooks does not work as expected #117273', function () {
-		withTestNotebook(instantiationService, blukEditService, undoRedoService, [
+		withTestNotebook(instantiationService, [
 			['var a = 1;', 'javascript', CellKind.Code, [], { editable: true }]
 		], (_editor, _view, model) => {
 
@@ -362,7 +339,6 @@ suite('NotebookTextModel', () => {
 			assert.strictEqual(model.cells[0].outputs.length, 0);
 
 			const success1 = model.applyEdits(
-				model.versionId,
 				[{
 					editType: CellEditType.Output, index: 0, outputs: [
 						{ outputId: 'out1', outputs: [{ mime: 'application/x.notebook.stream', value: 1 }] }
@@ -375,7 +351,6 @@ suite('NotebookTextModel', () => {
 			assert.strictEqual(model.cells[0].outputs.length, 1);
 
 			const success2 = model.applyEdits(
-				model.versionId,
 				[{
 					editType: CellEditType.Output, index: 0, outputs: [
 						{ outputId: 'out2', outputs: [{ mime: 'application/x.notebook.stream', value: 1 }] }
diff --git a/src/vs/workbench/contrib/notebook/test/notebookViewModel.test.ts b/src/vs/workbench/contrib/notebook/test/notebookViewModel.test.ts
index b8af391edaf..d72288773b5 100644
--- a/src/vs/workbench/contrib/notebook/test/notebookViewModel.test.ts
+++ b/src/vs/workbench/contrib/notebook/test/notebookViewModel.test.ts
@@ -33,8 +33,6 @@ suite('NotebookViewModel', () => {
 	test('insert/delete', function () {
 		withTestNotebook(
 			instantiationService,
-			blukEditService,
-			undoRedoService,
 			[
 				['var a = 1;', 'javascript', CellKind.Code, [], { editable: true }],
 				['var b = 2;', 'javascript', CellKind.Code, [], { editable: false }]
@@ -59,8 +57,6 @@ suite('NotebookViewModel', () => {
 	test('move cells down', function () {
 		withTestNotebook(
 			instantiationService,
-			blukEditService,
-			undoRedoService,
 			[
 				['//a', 'javascript', CellKind.Code, [], { editable: true }],
 				['//b', 'javascript', CellKind.Code, [], { editable: true }],
@@ -90,8 +86,6 @@ suite('NotebookViewModel', () => {
 	test('move cells up', function () {
 		withTestNotebook(
 			instantiationService,
-			blukEditService,
-			undoRedoService,
 			[
 				['//a', 'javascript', CellKind.Code, [], { editable: true }],
 				['//b', 'javascript', CellKind.Code, [], { editable: true }],
@@ -115,8 +109,6 @@ suite('NotebookViewModel', () => {
 	test('index', function () {
 		withTestNotebook(
 			instantiationService,
-			blukEditService,
-			undoRedoService,
 			[
 				['var a = 1;', 'javascript', CellKind.Code, [], { editable: true }],
 				['var b = 2;', 'javascript', CellKind.Code, [], { editable: true }]
@@ -144,8 +136,6 @@ suite('NotebookViewModel', () => {
 	test('metadata', function () {
 		withTestNotebook(
 			instantiationService,
-			blukEditService,
-			undoRedoService,
 			[
 				['var a = 1;', 'javascript', CellKind.Code, [], {}],
 				['var b = 2;', 'javascript', CellKind.Code, [], { editable: true, runnable: true }],
@@ -259,14 +249,10 @@ function getVisibleCells<T>(cells: T[], hiddenRanges: ICellRange[]) {
 
 suite('NotebookViewModel Decorations', () => {
 	const instantiationService = setupInstantiationService();
-	const blukEditService = instantiationService.get(IBulkEditService);
-	const undoRedoService = instantiationService.get(IUndoRedoService);
 
 	test('tracking range', function () {
 		withTestNotebook(
 			instantiationService,
-			blukEditService,
-			undoRedoService,
 			[
 				['var a = 1;', 'javascript', CellKind.Code, [], {}],
 				['var b = 2;', 'javascript', CellKind.Code, [], { editable: true, runnable: true }],
@@ -323,8 +309,6 @@ suite('NotebookViewModel Decorations', () => {
 	test('tracking range 2', function () {
 		withTestNotebook(
 			instantiationService,
-			blukEditService,
-			undoRedoService,
 			[
 				['var a = 1;', 'javascript', CellKind.Code, [], {}],
 				['var b = 2;', 'javascript', CellKind.Code, [], { editable: true, runnable: true }],
diff --git a/src/vs/workbench/contrib/notebook/test/testNotebookEditor.ts b/src/vs/workbench/contrib/notebook/test/testNotebookEditor.ts
index 0a4a677bad6..f4f709a36fe 100644
--- a/src/vs/workbench/contrib/notebook/test/testNotebookEditor.ts
+++ b/src/vs/workbench/contrib/notebook/test/testNotebookEditor.ts
@@ -3,28 +3,33 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
+import * as DOM from 'vs/base/browser/dom';
 import { IMouseWheelEvent } from 'vs/base/browser/mouseEvent';
+import { IListRenderer, IListVirtualDelegate } from 'vs/base/browser/ui/list/list';
+import { NotImplementedError } from 'vs/base/common/errors';
 import { Emitter, Event } from 'vs/base/common/event';
 import { IDisposable } from 'vs/base/common/lifecycle';
+import { Schemas } from 'vs/base/common/network';
 import { URI } from 'vs/base/common/uri';
 import { IBulkEditService } from 'vs/editor/browser/services/bulkEditService';
 import { BareFontInfo } from 'vs/editor/common/config/fontInfo';
 import { Range } from 'vs/editor/common/core/range';
+import { ICompositeCodeEditor, IEditor } from 'vs/editor/common/editorCommon';
+import { ITextModelService } from 'vs/editor/common/services/resolverService';
+import { ContextKeyService } from 'vs/platform/contextkey/browser/contextKeyService';
+import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
+import { TestInstantiationService } from 'vs/platform/instantiation/test/common/instantiationServiceMock';
+import { IListService, ListService } from 'vs/platform/list/browser/listService';
 import { IUndoRedoService } from 'vs/platform/undoRedo/common/undoRedo';
 import { EditorModel } from 'vs/workbench/common/editor';
-import { ICellViewModel, INotebookEditor, INotebookEditorContribution, INotebookEditorMouseEvent, NotebookLayoutInfo, INotebookDeltaDecoration, INotebookEditorCreationOptions, NotebookEditorOptions, ICellOutputViewModel, IInsetRenderOutput, ICommonCellInfo, IGenericCellViewModel, INotebookCellOutputLayoutInfo, CellEditState } from 'vs/workbench/contrib/notebook/browser/notebookBrowser';
+import { ICellViewModel, INotebookEditor, INotebookEditorContribution, INotebookEditorMouseEvent, NotebookLayoutInfo, INotebookDeltaDecoration, INotebookEditorCreationOptions, NotebookEditorOptions, ICellOutputViewModel, IInsetRenderOutput, ICommonCellInfo, IGenericCellViewModel, INotebookCellOutputLayoutInfo, CellEditState, IActiveNotebookEditor } from 'vs/workbench/contrib/notebook/browser/notebookBrowser';
 import { OutputRenderer } from 'vs/workbench/contrib/notebook/browser/view/output/outputRenderer';
 import { NotebookEventDispatcher } from 'vs/workbench/contrib/notebook/browser/viewModel/eventDispatcher';
 import { CellViewModel, IModelDecorationsChangeAccessor, NotebookViewModel } from 'vs/workbench/contrib/notebook/browser/viewModel/notebookViewModel';
 import { NotebookCellTextModel } from 'vs/workbench/contrib/notebook/common/model/notebookCellTextModel';
 import { NotebookTextModel } from 'vs/workbench/contrib/notebook/common/model/notebookTextModel';
-import { CellKind, CellUri, INotebookEditorModel, NotebookCellMetadata, ICellRange, INotebookKernel, notebookDocumentMetadataDefaults, IOutputDto, IResolvedNotebookEditorModel } from 'vs/workbench/contrib/notebook/common/notebookCommon';
+import { CellKind, CellUri, ICellRange, INotebookEditorModel, INotebookKernel, IOutputDto, IResolvedNotebookEditorModel, NotebookCellMetadata, notebookDocumentMetadataDefaults } from 'vs/workbench/contrib/notebook/common/notebookCommon';
 import { Webview } from 'vs/workbench/contrib/webview/browser/webview';
-import { ICompositeCodeEditor, IEditor } from 'vs/editor/common/editorCommon';
-import { NotImplementedError } from 'vs/base/common/errors';
-import { Schemas } from 'vs/base/common/network';
-import { ITextModelService } from 'vs/editor/common/services/resolverService';
-import { TestInstantiationService } from 'vs/platform/instantiation/test/common/instantiationServiceMock';
 import { TextModelResolverService } from 'vs/workbench/services/textmodelResolver/common/textModelResolverService';
 import { IModelService } from 'vs/editor/common/services/modelService';
 import { ModelServiceImpl } from 'vs/editor/common/services/modelServiceImpl';
@@ -33,8 +38,9 @@ import { IConfigurationService } from 'vs/platform/configuration/common/configur
 import { TestConfigurationService } from 'vs/platform/configuration/test/common/testConfigurationService';
 import { IThemeService } from 'vs/platform/theme/common/themeService';
 import { TestThemeService } from 'vs/platform/theme/test/common/testThemeService';
-import { ScrollEvent } from 'vs/base/common/scrollable';
 import { IFileStatWithMetadata } from 'vs/platform/files/common/files';
+import { IInstantiationService, ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
+import { NotebookCellList } from 'vs/workbench/contrib/notebook/browser/view/notebookCellList';
 
 export class TestCell extends NotebookCellTextModel {
 	constructor(
@@ -58,13 +64,10 @@ export class TestNotebookEditor implements INotebookEditor {
 		return this._isDisposed;
 	}
 
-	get viewModel() {
-		return undefined;
-	}
 	creationOptions: INotebookEditorCreationOptions = { isEmbedded: false };
 
-	constructor(
-	) { }
+	constructor(readonly viewModel: NotebookViewModel) { }
+
 	getSelection(): ICellRange | undefined {
 		throw new Error('Method not implemented.');
 	}
@@ -128,15 +131,12 @@ export class TestNotebookEditor implements INotebookEditor {
 	multipleKernelsAvailable: boolean = false;
 	onDidChangeAvailableKernels: Event<void> = new Emitter<void>().event;
 	onDidChangeActiveCell: Event<void> = new Emitter<void>().event;
-	onDidScroll = new Emitter<ScrollEvent>().event;
-	onWillDispose = new Emitter<void>().event;
 	onDidChangeVisibleRanges: Event<void> = new Emitter<void>().event;
 	onDidChangeSelection: Event<void> = new Emitter<void>().event;
 	visibleRanges: ICellRange[] = [];
-	uri?: URI | undefined;
 	textModel?: NotebookTextModel | undefined;
 
-	hasModel(): boolean {
+	hasModel(): this is IActiveNotebookEditor {
 		return true;
 	}
 
@@ -206,16 +206,10 @@ export class TestNotebookEditor implements INotebookEditor {
 		throw new Error('Method not implemented.');
 	}
 
-	isNotebookEditor = true;
-
 	postMessage(): void {
 		throw new Error('Method not implemented.');
 	}
 
-	toggleClassName(className: string): void {
-		throw new Error('Method not implemented.');
-	}
-
 	addClassName(className: string): void {
 		throw new Error('Method not implemented.');
 	}
@@ -224,7 +218,7 @@ export class TestNotebookEditor implements INotebookEditor {
 		throw new Error('Method not implemented.');
 	}
 
-	setCellSelection(cell: CellViewModel, selection: Range): void {
+	setCellEditorSelection(cell: CellViewModel, selection: Range): void {
 		throw new Error('Method not implemented.');
 	}
 
@@ -244,10 +238,6 @@ export class TestNotebookEditor implements INotebookEditor {
 		throw new Error('Method not implemented.');
 	}
 
-	moveCell(cell: ICellViewModel, relativeToCell: ICellViewModel, direction: 'above' | 'below'): Promise<ICellViewModel | null> {
-		throw new Error('Method not implemented.');
-	}
-
 	splitNotebookCell(cell: ICellViewModel): Promise<CellViewModel[] | null> {
 		throw new Error('Method not implemented.');
 	}
@@ -452,30 +442,74 @@ export function setupInstantiationService() {
 	instantiationService.stub(IThemeService, new TestThemeService());
 	instantiationService.stub(IModelService, instantiationService.createInstance(ModelServiceImpl));
 	instantiationService.stub(ITextModelService, <ITextModelService>instantiationService.createInstance(TextModelResolverService));
+	instantiationService.stub(IContextKeyService, instantiationService.createInstance(ContextKeyService));
+	instantiationService.stub(IListService, instantiationService.createInstance(ListService));
 
 	return instantiationService;
 }
 
-export function withTestNotebook(instantiationService: TestInstantiationService, blukEditService: IBulkEditService, undoRedoService: IUndoRedoService, cells: [string, string, CellKind, IOutputDto[], NotebookCellMetadata][], callback: (editor: TestNotebookEditor, viewModel: NotebookViewModel, textModel: NotebookTextModel) => void) {
-	const textModelService = instantiationService.get(ITextModelService);
+export function withTestNotebook<R = any>(accessor: ServicesAccessor, cells: [source: string, lang: string, kind: CellKind, output?: IOutputDto[], metadata?: NotebookCellMetadata][], callback: (editor: TestNotebookEditor, viewModel: NotebookViewModel, textModel: NotebookTextModel) => R): R {
+
+	const instantiationService = accessor.get(IInstantiationService);
+	const undoRedoService = accessor.get(IUndoRedoService);
+	const textModelService = accessor.get(ITextModelService);
+	const bulkEditService = accessor.get(IBulkEditService);
 
 	const viewType = 'notebook';
-	const editor = new TestNotebookEditor();
 	const notebook = new NotebookTextModel(viewType, URI.parse('test'), cells.map(cell => {
 		return {
 			source: cell[0],
 			language: cell[1],
 			cellKind: cell[2],
-			outputs: cell[3],
+			outputs: cell[3] ?? [],
 			metadata: cell[4]
 		};
 	}), notebookDocumentMetadataDefaults, { transientMetadata: {}, transientOutputs: false }, undoRedoService, textModelService);
 	const model = new NotebookEditorTestModel(notebook);
 	const eventDispatcher = new NotebookEventDispatcher();
-	const viewModel = new NotebookViewModel(viewType, model.notebook, eventDispatcher, null, instantiationService, blukEditService, undoRedoService);
+	const viewModel = new NotebookViewModel(viewType, model.notebook, eventDispatcher, null, instantiationService, bulkEditService, undoRedoService);
+	const editor = new TestNotebookEditor(viewModel);
 
-	callback(editor, viewModel, notebook);
-
-	viewModel.dispose();
-	return;
+	const res = callback(editor, viewModel, notebook);
+	if (res instanceof Promise) {
+		res.finally(() => viewModel.dispose());
+	} else {
+		viewModel.dispose();
+	}
+	return res;
+}
+
+export function createNotebookCellList(instantiationService: TestInstantiationService) {
+	const delegate: IListVirtualDelegate<number> = {
+		getHeight() { return 20; },
+		getTemplateId() { return 'template'; }
+	};
+
+	const renderer: IListRenderer<number, void> = {
+		templateId: 'template',
+		renderTemplate() { },
+		renderElement() { },
+		disposeTemplate() { }
+	};
+
+	const cellList: NotebookCellList = instantiationService.createInstance(
+		NotebookCellList,
+		'NotebookCellList',
+		DOM.$('container'),
+		DOM.$('body'),
+		delegate,
+		[renderer],
+		instantiationService.get<IContextKeyService>(IContextKeyService),
+		{
+			supportDynamicHeights: true,
+			multipleSelectionSupport: true,
+			enableKeyboardNavigation: true,
+			focusNextPreviousDelegate: {
+				onFocusNext: (applyFocusNext: () => void) => { applyFocusNext(); },
+				onFocusPrevious: (applyFocusPrevious: () => void) => { applyFocusPrevious(); },
+			}
+		}
+	);
+
+	return cellList;
 }
diff --git a/src/vs/workbench/contrib/performance/browser/perfviewEditor.ts b/src/vs/workbench/contrib/performance/browser/perfviewEditor.ts
index 26435f80802..219a673c370 100644
--- a/src/vs/workbench/contrib/performance/browser/perfviewEditor.ts
+++ b/src/vs/workbench/contrib/performance/browser/perfviewEditor.ts
@@ -175,7 +175,6 @@ class PerfModelContentProvider implements ITextModelContentProvider {
 		table.push(['require(workbench.desktop.main.js)', metrics.timers.ellapsedRequire, '[renderer]', `cached data: ${(metrics.didUseCachedData ? 'YES' : 'NO')}${stats ? `, node_modules took ${stats.nodeRequireTotal}ms` : ''}`]);
 		table.push(['wait for shell environment', metrics.timers.ellapsedWaitForShellEnv, '[renderer]', undefined]);
 		table.push(['init storage (global & workspace)', metrics.timers.ellapsedStorageInit, '[renderer]', undefined]);
-		table.push(['require & init workspace storage', metrics.timers.ellapsedWorkspaceStorageInit, '[renderer]', undefined]);
 		table.push(['init workspace service', metrics.timers.ellapsedWorkspaceServiceInit, '[renderer]', undefined]);
 		if (isWeb) {
 			table.push(['init settings and global state from settings sync service', metrics.timers.ellapsedRequiredUserDataInit, '[renderer]', undefined]);
diff --git a/src/vs/workbench/contrib/preferences/browser/preferencesRenderers.ts b/src/vs/workbench/contrib/preferences/browser/preferencesRenderers.ts
index 6fdb4aa51c6..bba5ee88334 100644
--- a/src/vs/workbench/contrib/preferences/browser/preferencesRenderers.ts
+++ b/src/vs/workbench/contrib/preferences/browser/preferencesRenderers.ts
@@ -1107,7 +1107,7 @@ class WorkspaceConfigurationRenderer extends Disposable {
 									endColumn: setting.valueRange.endColumn
 								});
 							}
-						} else if (setting.key !== 'settings') {
+						} else if (setting.key !== 'settings' && setting.key !== 'remoteAuthority') {
 							markerData.push({
 								severity: MarkerSeverity.Hint,
 								tags: [MarkerTag.Unnecessary],
diff --git a/src/vs/workbench/contrib/remote/browser/tunnelView.ts b/src/vs/workbench/contrib/remote/browser/tunnelView.ts
index 07301daaafc..cbdb5d86200 100644
--- a/src/vs/workbench/contrib/remote/browser/tunnelView.ts
+++ b/src/vs/workbench/contrib/remote/browser/tunnelView.ts
@@ -47,7 +47,7 @@ import { ITableColumn, ITableContextMenuEvent, ITableMouseEvent, ITableRenderer,
 import { WorkbenchTable } from 'vs/platform/list/browser/listService';
 import { Button } from 'vs/base/browser/ui/button/button';
 
-export const forwardedPortsViewEnabled = new RawContextKey<boolean>('forwardedPortsViewEnabled', false);
+export const forwardedPortsViewEnabled = new RawContextKey<boolean>('forwardedPortsViewEnabled', false, nls.localize('tunnel.forwardedPortsViewEnabled', "Whether the Ports view is enabled."));
 
 class TunnelTreeVirtualDelegate implements ITableVirtualDelegate<ITunnelItem> {
 
@@ -74,8 +74,7 @@ export class TunnelViewModel implements ITunnelViewModel {
 	private _candidates: Map<string, CandidatePort> = new Map();
 
 	readonly input = {
-		name: nls.localize('remote.tunnelsView.addPort', "Add Port"),
-		label: nls.localize('remote.tunnelsView.add', "Forward a Port..."),
+		label: nls.localize('remote.tunnelsView.addPort', "Add Port"),
 		icon: forwardPortIcon,
 		tunnelType: TunnelType.Add,
 		remoteHost: '',
@@ -161,18 +160,12 @@ class IconColumn implements ITableColumn<ITunnelItem, ActionBarCell> {
 	project(row: ITunnelItem): ActionBarCell {
 		const isAdd = row.tunnelType === TunnelType.Add;
 		const icon = isAdd ? undefined : (row.processDescription ? forwardedPortWithProcessIcon : forwardedPortWithoutProcessIcon);
-		const context: [string, any][] =
-			[
-				['view', TUNNEL_VIEW_ID],
-				['tunnelType', row.tunnelType],
-				['tunnelCloseable', row.closeable]
-			];
 		let tooltip: string = '';
 		if (row instanceof TunnelItem && !isAdd) {
 			tooltip = `${row.iconTooltip} ${row.tooltipPostfix}`;
 		}
 		return {
-			label: '', icon, tunnel: row, context, editId: TunnelEditId.None, tooltip
+			label: '', icon, tunnel: row, editId: TunnelEditId.None, tooltip
 		};
 	}
 }
@@ -184,13 +177,7 @@ class PortColumn implements ITableColumn<ITunnelItem, ActionBarCell> {
 	readonly templateId: string = 'actionbar';
 	project(row: ITunnelItem): ActionBarCell {
 		const isAdd = row.tunnelType === TunnelType.Add;
-		const label = isAdd ? row.name! : (row.name ? `${row.name} (${row.remotePort})` : `${row.remotePort}`);
-		const context: [string, any][] =
-			[
-				['view', TUNNEL_VIEW_ID],
-				['tunnelType', row.tunnelType],
-				['tunnelCloseable', row.closeable]
-			];
+		const label = row.label;
 		let tooltip: string = '';
 		if (row instanceof TunnelItem && !isAdd) {
 			tooltip = `${row.portTooltip} ${row.tooltipPostfix}`;
@@ -198,7 +185,7 @@ class PortColumn implements ITableColumn<ITunnelItem, ActionBarCell> {
 			tooltip = label;
 		}
 		return {
-			label, tunnel: row, context, menuId: MenuId.TunnelPortInline,
+			label, tunnel: row, menuId: MenuId.TunnelPortInline,
 			editId: row.tunnelType === TunnelType.Add ? TunnelEditId.New : TunnelEditId.Label, tooltip
 		};
 	}
@@ -210,12 +197,6 @@ class LocalAddressColumn implements ITableColumn<ITunnelItem, ActionBarCell> {
 	readonly weight: number = 1;
 	readonly templateId: string = 'actionbar';
 	project(row: ITunnelItem): ActionBarCell {
-		const context: [string, any][] =
-			[
-				['view', TUNNEL_VIEW_ID],
-				['tunnelType', row.tunnelType],
-				['tunnelCloseable', row.closeable]
-			];
 		const label = row.localAddress ?? '';
 		let tooltip: string;
 		if (row instanceof TunnelItem) {
@@ -223,7 +204,7 @@ class LocalAddressColumn implements ITableColumn<ITunnelItem, ActionBarCell> {
 		} else {
 			tooltip = label;
 		}
-		return { label, menuId: MenuId.TunnelLocalAddressInline, context, tunnel: row, editId: TunnelEditId.LocalPort, tooltip };
+		return { label, menuId: MenuId.TunnelLocalAddressInline, tunnel: row, editId: TunnelEditId.LocalPort, tooltip };
 	}
 }
 
@@ -234,7 +215,7 @@ class RunningProcessColumn implements ITableColumn<ITunnelItem, ActionBarCell> {
 	readonly templateId: string = 'actionbar';
 	project(row: ITunnelItem): ActionBarCell {
 		const label = row.processDescription ?? '';
-		return { label, tunnel: row, context: [], editId: TunnelEditId.None, tooltip: row instanceof TunnelItem ? row.processTooltip : '' };
+		return { label, tunnel: row, editId: TunnelEditId.None, tooltip: row instanceof TunnelItem ? row.processTooltip : '' };
 	}
 }
 
@@ -244,15 +225,9 @@ class OriginColumn implements ITableColumn<ITunnelItem, ActionBarCell> {
 	readonly weight: number = 1;
 	readonly templateId: string = 'actionbar';
 	project(row: ITunnelItem): ActionBarCell {
-		const context: [string, any][] =
-			[
-				['view', TUNNEL_VIEW_ID],
-				['tunnelType', row.tunnelType],
-				['tunnelCloseable', row.closeable]
-			];
 		const label = row.source;
 		const tooltip = `${row instanceof TunnelItem ? row.originTooltip : ''}. ${row instanceof TunnelItem ? row.tooltipPostfix : ''}`;
-		return { label, context, menuId: MenuId.TunnelOriginInline, tunnel: row, editId: TunnelEditId.None, tooltip };
+		return { label, menuId: MenuId.TunnelOriginInline, tunnel: row, editId: TunnelEditId.None, tooltip };
 	}
 }
 
@@ -262,18 +237,18 @@ class PrivacyColumn implements ITableColumn<ITunnelItem, ActionBarCell> {
 	readonly weight: number = 1;
 	readonly templateId: string = 'actionbar';
 	project(row: ITunnelItem): ActionBarCell {
-		const context: [string, any][] =
-			[
-				['view', TUNNEL_VIEW_ID],
-				['tunnelType', row.tunnelType],
-				['tunnelCloseable', row.closeable]
-			];
-		const label = row.privacy === TunnelPrivacy.Public ? nls.localize('tunnel.privacyPublic', "Public") : nls.localize('tunnel.privacyPrivate', "Private");
+		let label: string = '';
+		if (row.privacy === TunnelPrivacy.Public) {
+			label = nls.localize('tunnel.privacyPublic', "Public");
+		} else if (row.tunnelType !== TunnelType.Add) {
+			label = nls.localize('tunnel.privacyPrivate', "Private");
+		}
+
 		let tooltip: string = '';
-		if (row instanceof TunnelItem) {
+		if (row instanceof TunnelItem && row.tunnelType !== TunnelType.Add) {
 			tooltip = `${row.privacyTooltip} ${row.tooltipPostfix}`;
 		}
-		return { label, context, tunnel: row, icon: row.icon, editId: TunnelEditId.None, tooltip };
+		return { label, tunnel: row, icon: row.icon, editId: TunnelEditId.None, tooltip };
 	}
 }
 
@@ -308,7 +283,6 @@ interface ActionBarCell {
 	icon?: ThemeIcon;
 	tooltip: string;
 	menuId?: MenuId;
-	context: [string, any][];
 	tunnel: ITunnelItem;
 	editId: TunnelEditId;
 }
@@ -384,7 +358,13 @@ class ActionBarRenderer extends Disposable implements ITableRenderer<ActionBarCe
 		templateData.label.element.style.display = 'flex';
 		templateData.label.setLabel(element.label, undefined, { title: element.tooltip });
 		templateData.actionBar.context = element.tunnel;
-		const contextKeyService = this.contextKeyService.createOverlay(element.context);
+		const context: [string, any][] =
+			[
+				['view', TUNNEL_VIEW_ID],
+				['tunnelType', element.tunnel.tunnelType],
+				['tunnelCloseable', element.tunnel.closeable]
+			];
+		const contextKeyService = this.contextKeyService.createOverlay(context);
 		const disposableStore = new DisposableStore();
 		templateData.elementDisposable = disposableStore;
 		if (element.menuId) {
@@ -515,10 +495,12 @@ class TunnelItem implements ITunnelItem {
 	) { }
 
 	get label(): string {
-		if (this.name) {
-			return nls.localize('remote.tunnelsView.forwardedPortLabel0', "{0}", this.name);
+		if (this.tunnelType === TunnelType.Add && this.name) {
+			return this.name;
+		} else if (this.name) {
+			return `${this.name} (${this.remotePort})`;
 		} else {
-			return nls.localize('remote.tunnelsView.forwardedPortLabel2', "{0}", this.remotePort);
+			return `${this.remotePort}`;
 		}
 	}
 
@@ -546,8 +528,13 @@ class TunnelItem implements ITunnelItem {
 	get icon(): ThemeIcon | undefined {
 		switch (this.privacy) {
 			case TunnelPrivacy.Public: return publicPortIcon;
-			default: return privatePortIcon;
-
+			default: {
+				if (this.tunnelType !== TunnelType.Add) {
+					return privatePortIcon;
+				} else {
+					return undefined;
+				}
+			}
 		}
 	}
 
@@ -595,14 +582,14 @@ class TunnelItem implements ITunnelItem {
 	}
 }
 
-export const TunnelTypeContextKey = new RawContextKey<TunnelType>('tunnelType', TunnelType.Add);
-export const TunnelCloseableContextKey = new RawContextKey<boolean>('tunnelCloseable', false);
-const TunnelPrivacyContextKey = new RawContextKey<TunnelPrivacy | undefined>('tunnelPrivacy', undefined);
-const TunnelViewFocusContextKey = new RawContextKey<boolean>('tunnelViewFocus', false);
+export const TunnelTypeContextKey = new RawContextKey<TunnelType>('tunnelType', TunnelType.Add, true);
+export const TunnelCloseableContextKey = new RawContextKey<boolean>('tunnelCloseable', false, true);
+const TunnelPrivacyContextKey = new RawContextKey<TunnelPrivacy | undefined>('tunnelPrivacy', undefined, true);
+const TunnelViewFocusContextKey = new RawContextKey<boolean>('tunnelViewFocus', false, nls.localize('tunnel.focusContext', "Whether the Ports view has focus."));
 const TunnelViewSelectionKeyName = 'tunnelViewSelection';
-const TunnelViewSelectionContextKey = new RawContextKey<ITunnelItem | undefined>(TunnelViewSelectionKeyName, undefined);
-const PortChangableContextKey = new RawContextKey<boolean>('portChangable', false);
-const WebContextKey = new RawContextKey<boolean>('isWeb', isWeb);
+const TunnelViewSelectionContextKey = new RawContextKey<ITunnelItem | undefined>(TunnelViewSelectionKeyName, undefined, true);
+const PortChangableContextKey = new RawContextKey<boolean>('portChangable', false, true);
+const WebContextKey = new RawContextKey<boolean>('isWeb', isWeb, true);
 
 export class TunnelPanel extends ViewPane {
 
@@ -948,7 +935,7 @@ export namespace ForwardPortAction {
 			await viewsService.openView(TunnelPanel.ID, true);
 			const value = await quickInputService.input({
 				prompt: forwardPrompt,
-				validateInput: (value) => Promise.resolve(validateInput(value, tunnelService.canElevate)?.content)
+				validateInput: (value) => Promise.resolve(validateInput(value, tunnelService.canElevate))
 			});
 			let parsed: { host: string, port: number } | undefined;
 			if (value && (parsed = parseAddress(value))) {
diff --git a/src/vs/workbench/contrib/scm/browser/dirtydiffDecorator.ts b/src/vs/workbench/contrib/scm/browser/dirtydiffDecorator.ts
index a728a5af0bc..385bbbaabe0 100644
--- a/src/vs/workbench/contrib/scm/browser/dirtydiffDecorator.ts
+++ b/src/vs/workbench/contrib/scm/browser/dirtydiffDecorator.ts
@@ -34,7 +34,7 @@ import { KeybindingsRegistry, KeybindingWeight } from 'vs/platform/keybinding/co
 import { EmbeddedDiffEditorWidget } from 'vs/editor/browser/widget/embeddedCodeEditorWidget';
 import { IDiffEditorOptions, EditorOption } from 'vs/editor/common/config/editorOptions';
 import { Action, IAction, ActionRunner } from 'vs/base/common/actions';
-import { IActionBarOptions, ActionsOrientation } from 'vs/base/browser/ui/actionbar/actionbar';
+import { IActionBarOptions } from 'vs/base/browser/ui/actionbar/actionbar';
 import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
 import { basename, isEqualOrParent } from 'vs/base/common/resources';
 import { MenuId, IMenuService, IMenu, MenuItemAction, MenuRegistry } from 'vs/platform/actions/common/actions';
@@ -49,6 +49,7 @@ import { createStyleSheet } from 'vs/base/browser/dom';
 import { ITextFileEditorModel, IResolvedTextFileEditorModel, ITextFileService, isTextFileEditorModel } from 'vs/workbench/services/textfile/common/textfiles';
 import { EncodingMode } from 'vs/workbench/common/editor';
 import { gotoNextLocation, gotoPreviousLocation } from 'vs/platform/theme/common/iconRegistry';
+import { Codicon } from 'vs/base/common/codicons';
 
 class DiffActionRunner extends ActionRunner {
 
@@ -245,18 +246,21 @@ class DirtyDiffWidget extends PeekViewWidget {
 	}
 
 	protected _fillHead(container: HTMLElement): void {
-		super._fillHead(container);
+		super._fillHead(container, true);
 
 		const previous = this.instantiationService.createInstance(UIEditorAction, this.editor, new ShowPreviousChangeAction(), ThemeIcon.asClassName(gotoPreviousLocation));
 		const next = this.instantiationService.createInstance(UIEditorAction, this.editor, new ShowNextChangeAction(), ThemeIcon.asClassName(gotoNextLocation));
 
 		this._disposables.add(previous);
 		this._disposables.add(next);
-		this._actionbarWidget!.push([previous, next], { label: false, icon: true });
 
 		const actions: IAction[] = [];
 		this._disposables.add(createAndFillInActionBarActions(this.menu, { shouldForwardArgs: true }, actions));
-		this._actionbarWidget!.push(actions, { label: false, icon: true });
+		this._actionbarWidget!.push(actions.reverse(), { label: false, icon: true });
+		this._actionbarWidget!.push([next, previous], { label: false, icon: true });
+		this._actionbarWidget!.push(new Action('peekview.close', nls.localize('label.close', "Close"), Codicon.close.classNames, true, async () => {
+			this.dispose();
+		}), { label: false, icon: true });
 	}
 
 	protected _getActionBarOptions(): IActionBarOptions {
@@ -271,8 +275,7 @@ class DirtyDiffWidget extends PeekViewWidget {
 
 		return {
 			...super._getActionBarOptions(),
-			actionRunner,
-			orientation: ActionsOrientation.HORIZONTAL_REVERSE
+			actionRunner
 		};
 	}
 
diff --git a/src/vs/workbench/contrib/scm/browser/scmViewPane.ts b/src/vs/workbench/contrib/scm/browser/scmViewPane.ts
index f0bb38ed9f7..3f7447cd3d5 100644
--- a/src/vs/workbench/contrib/scm/browser/scmViewPane.ts
+++ b/src/vs/workbench/contrib/scm/browser/scmViewPane.ts
@@ -80,6 +80,7 @@ import { LabelFuzzyScore } from 'vs/base/browser/ui/tree/abstractTree';
 import { Selection } from 'vs/editor/common/core/selection';
 import { API_OPEN_DIFF_EDITOR_COMMAND_ID, API_OPEN_EDITOR_COMMAND_ID } from 'vs/workbench/browser/parts/editor/editorCommands';
 import { createAndFillInContextMenuActions } from 'vs/platform/actions/browser/menuEntryActionViewItem';
+import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
 
 type TreeElement = ISCMRepository | ISCMInput | ISCMResourceGroup | IResourceNode<ISCMResource, ISCMResourceGroup> | ISCMResource;
 
@@ -686,7 +687,10 @@ class SCMResourceIdentityProvider implements IIdentityProvider<TreeElement> {
 
 export class SCMAccessibilityProvider implements IListAccessibilityProvider<TreeElement> {
 
-	constructor(@ILabelService private readonly labelService: ILabelService) { }
+	constructor(
+		@ILabelService private readonly labelService: ILabelService,
+		@IWorkspaceContextService private readonly workspaceContextService: IWorkspaceContextService
+	) { }
 
 	getWidgetAriaLabel(): string {
 		return localize('scm', "Source Control Management");
@@ -696,7 +700,17 @@ export class SCMAccessibilityProvider implements IListAccessibilityProvider<Tree
 		if (ResourceTree.isResourceNode(element)) {
 			return this.labelService.getUriLabel(element.uri, { relative: true, noPrefix: true }) || element.name;
 		} else if (isSCMRepository(element)) {
-			return element.provider.label;
+			let folderName = '';
+			if (element.provider.rootUri) {
+				const folder = this.workspaceContextService.getWorkspaceFolder(element.provider.rootUri);
+
+				if (folder?.uri.toString() === element.provider.rootUri.toString()) {
+					folderName = folder.name;
+				} else {
+					folderName = basename(element.provider.rootUri);
+				}
+			}
+			return `${folderName} ${element.provider.label}`;
 		} else if (isSCMInput(element)) {
 			return localize('input', "Source Control Input");
 		} else if (isSCMResourceGroup(element)) {
diff --git a/src/vs/workbench/contrib/scm/browser/util.ts b/src/vs/workbench/contrib/scm/browser/util.ts
index 007d674bac3..7ba4c62ec4d 100644
--- a/src/vs/workbench/contrib/scm/browser/util.ts
+++ b/src/vs/workbench/contrib/scm/browser/util.ts
@@ -35,7 +35,7 @@ export function isSCMResource(element: any): element is ISCMResource {
 
 const compareActions = (a: IAction, b: IAction) => a.id === b.id;
 
-export function connectPrimaryMenu(menu: IMenu, callback: (primary: IAction[], secondary: IAction[]) => void, isPrimaryGroup?: (group: string) => boolean): IDisposable {
+export function connectPrimaryMenu(menu: IMenu, callback: (primary: IAction[], secondary: IAction[]) => void, primaryGroup?: string): IDisposable {
 	let cachedDisposable: IDisposable = Disposable.None;
 	let cachedPrimary: IAction[] = [];
 	let cachedSecondary: IAction[] = [];
@@ -44,7 +44,7 @@ export function connectPrimaryMenu(menu: IMenu, callback: (primary: IAction[], s
 		const primary: IAction[] = [];
 		const secondary: IAction[] = [];
 
-		const disposable = createAndFillInActionBarActions(menu, { shouldForwardArgs: true }, { primary, secondary }, isPrimaryGroup);
+		const disposable = createAndFillInActionBarActions(menu, { shouldForwardArgs: true }, { primary, secondary }, primaryGroup);
 
 		if (equals(cachedPrimary, primary, compareActions) && equals(cachedSecondary, secondary, compareActions)) {
 			disposable.dispose();
@@ -70,13 +70,13 @@ export function connectPrimaryMenuToInlineActionBar(menu: IMenu, actionBar: Acti
 	return connectPrimaryMenu(menu, (primary) => {
 		actionBar.clear();
 		actionBar.push(primary, { icon: true, label: false });
-	}, g => /^inline/.test(g));
+	}, 'inline');
 }
 
 export function collectContextMenuActions(menu: IMenu): [IAction[], IDisposable] {
 	const primary: IAction[] = [];
 	const actions: IAction[] = [];
-	const disposable = createAndFillInContextMenuActions(menu, { shouldForwardArgs: true }, { primary, secondary: actions }, g => /^inline/.test(g));
+	const disposable = createAndFillInContextMenuActions(menu, { shouldForwardArgs: true }, { primary, secondary: actions }, 'inline');
 	return [actions, disposable];
 }
 
diff --git a/src/vs/workbench/contrib/search/browser/anythingQuickAccess.ts b/src/vs/workbench/contrib/search/browser/anythingQuickAccess.ts
index d677b9e6afd..3ea89e9870a 100644
--- a/src/vs/workbench/contrib/search/browser/anythingQuickAccess.ts
+++ b/src/vs/workbench/contrib/search/browser/anythingQuickAccess.ts
@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import 'vs/css!./media/anythingQuickAccess';
-import { IQuickInputButton, IKeyMods, quickPickItemScorerAccessor, QuickPickItemScorerAccessor, IQuickPick, IQuickPickItemWithResource } from 'vs/platform/quickinput/common/quickInput';
+import { IQuickInputButton, IKeyMods, quickPickItemScorerAccessor, QuickPickItemScorerAccessor, IQuickPick, IQuickPickItemWithResource, QuickInputHideReason } from 'vs/platform/quickinput/common/quickInput';
 import { IPickerQuickAccessItem, PickerQuickAccessProvider, TriggerAction, FastAndSlowPicks, Picks, PicksWithActive } from 'vs/platform/quickinput/browser/pickerQuickAccess';
 import { prepareQuery, IPreparedQuery, compareItemsByFuzzyScore, scoreItemFuzzy, FuzzyScorerCache } from 'vs/base/common/fuzzyScorer';
 import { IFileQueryBuilderOptions, QueryBuilder } from 'vs/workbench/contrib/search/common/queryBuilder';
@@ -221,7 +221,14 @@ export class AnythingQuickAccessProvider extends PickerQuickAccessProvider<IAnyt
 		}));
 
 		// Restore view state upon cancellation if we changed it
-		disposables.add(once(token.onCancellationRequested)(() => this.pickState.restoreEditorViewState()));
+		// but only when the picker was closed via explicit user
+		// gesture and not e.g. when focus was lost because that
+		// could mean the user clicked into the editor directly.
+		disposables.add(once(picker.onDidHide)(({ reason }) => {
+			if (reason === QuickInputHideReason.Gesture) {
+				this.pickState.restoreEditorViewState();
+			}
+		}));
 
 		// Start picker
 		disposables.add(super.provide(picker, token));
diff --git a/src/vs/workbench/contrib/search/common/queryBuilder.ts b/src/vs/workbench/contrib/search/common/queryBuilder.ts
index e0035ce5e88..d0a732a4bb6 100644
--- a/src/vs/workbench/contrib/search/common/queryBuilder.ts
+++ b/src/vs/workbench/contrib/search/common/queryBuilder.ts
@@ -211,8 +211,7 @@ export class QueryBuilder {
 
 			const providerExists = isAbsolutePath(file);
 			// Special case userdata as we don't have a search provider for it, but it can be searched.
-			const isUserdata = file.scheme === Schemas.userData;
-			if (providerExists && !isUserdata) {
+			if (providerExists) {
 				const searchRoot = this.workspaceContextService.getWorkspaceFolder(file)?.uri ?? file.with({ path: path.dirname(file.fsPath) });
 
 				let folderQuery = foldersToSearch.get(searchRoot);
diff --git a/src/vs/workbench/contrib/tasks/browser/terminalTaskSystem.ts b/src/vs/workbench/contrib/tasks/browser/terminalTaskSystem.ts
index 4a8ebd59358..77ac8bcc030 100644
--- a/src/vs/workbench/contrib/tasks/browser/terminalTaskSystem.ts
+++ b/src/vs/workbench/contrib/tasks/browser/terminalTaskSystem.ts
@@ -296,7 +296,7 @@ export class TerminalTaskSystem implements ITaskSystem {
 		}
 		const activeTerminalInstance = this.terminalService.getActiveInstance();
 		const isPanelShowingTerminal = !!this.viewsService.getActiveViewWithId(TERMINAL_VIEW_ID);
-		return isPanelShowingTerminal && (activeTerminalInstance?.id === terminalData.terminal.id);
+		return isPanelShowingTerminal && (activeTerminalInstance?.instanceId === terminalData.terminal.instanceId);
 	}
 
 
@@ -782,7 +782,7 @@ export class TerminalTaskSystem implements ITaskSystem {
 			}, (_error) => {
 				this.logService.error('Task terminal process never got ready');
 			});
-			this._onDidStateChange.fire(TaskEvent.create(TaskEventKind.Start, task, terminal.id));
+			this._onDidStateChange.fire(TaskEvent.create(TaskEventKind.Start, task, terminal.instanceId));
 			let skipLine: boolean = (!!task.command.presentation && task.command.presentation.echo);
 			const onData = terminal.onLineData((line) => {
 				if (skipLine) {
@@ -812,10 +812,10 @@ export class TerminalTaskSystem implements ITaskSystem {
 						// Only keep a reference to the terminal if it is not being disposed.
 						switch (task.command.presentation!.panel) {
 							case PanelKind.Dedicated:
-								this.sameTaskTerminals[key] = terminal!.id.toString();
+								this.sameTaskTerminals[key] = terminal!.instanceId.toString();
 								break;
 							case PanelKind.Shared:
-								this.idleTaskTerminals.set(key, terminal!.id.toString(), Touch.AsOld);
+								this.idleTaskTerminals.set(key, terminal!.instanceId.toString(), Touch.AsOld);
 								break;
 						}
 					}
@@ -868,7 +868,7 @@ export class TerminalTaskSystem implements ITaskSystem {
 			}, (_error) => {
 				// The process never got ready. Need to think how to handle this.
 			});
-			this._onDidStateChange.fire(TaskEvent.create(TaskEventKind.Start, task, terminal.id, resolver.values));
+			this._onDidStateChange.fire(TaskEvent.create(TaskEventKind.Start, task, terminal.instanceId, resolver.values));
 			const mapKey = task.getMapKey();
 			this.busyTasks[mapKey] = task;
 			this._onDidStateChange.fire(TaskEvent.create(TaskEventKind.Active, task));
@@ -892,10 +892,10 @@ export class TerminalTaskSystem implements ITaskSystem {
 						// Only keep a reference to the terminal if it is not being disposed.
 						switch (task.command.presentation!.panel) {
 							case PanelKind.Dedicated:
-								this.sameTaskTerminals[key] = terminal!.id.toString();
+								this.sameTaskTerminals[key] = terminal!.instanceId.toString();
 								break;
 							case PanelKind.Shared:
-								this.idleTaskTerminals.set(key, terminal!.id.toString(), Touch.AsOld);
+								this.idleTaskTerminals.set(key, terminal!.instanceId.toString(), Touch.AsOld);
 								break;
 						}
 					}
@@ -1155,7 +1155,7 @@ export class TerminalTaskSystem implements ITaskSystem {
 
 		if (task.command.runtime === RuntimeType.CustomExecution) {
 			this.currentTask.shellLaunchConfig = launchConfigs = {
-				isExtensionTerminal: true,
+				isExtensionCustomPtyTerminal: true,
 				waitOnExit,
 				name: this.createTerminalName(task),
 				initialText: task.command.presentation && task.command.presentation.echo ? `\x1b[1m> Executing task: ${task._label} <\x1b[0m\n` : undefined,
@@ -1215,7 +1215,7 @@ export class TerminalTaskSystem implements ITaskSystem {
 			if (task.command.presentation && task.command.presentation.clear) {
 				terminalToReuse.terminal.clear();
 			}
-			this.terminals[terminalToReuse.terminal.id.toString()].lastTask = taskKey;
+			this.terminals[terminalToReuse.terminal.instanceId.toString()].lastTask = taskKey;
 			return [terminalToReuse.terminal, commandExecutable, undefined];
 		}
 
@@ -1239,7 +1239,7 @@ export class TerminalTaskSystem implements ITaskSystem {
 			result = this.terminalService.createTerminal(launchConfigs);
 		}
 
-		const terminalKey = result.id.toString();
+		const terminalKey = result.instanceId.toString();
 		result.onDisposed((terminal) => {
 			let terminalData = this.terminals[terminalKey];
 			if (terminalData) {
diff --git a/src/vs/workbench/contrib/tasks/common/taskService.ts b/src/vs/workbench/contrib/tasks/common/taskService.ts
index 8b38d041acc..16c528f041a 100644
--- a/src/vs/workbench/contrib/tasks/common/taskService.ts
+++ b/src/vs/workbench/contrib/tasks/common/taskService.ts
@@ -3,6 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
+import * as nls from 'vs/nls';
 import { Action } from 'vs/base/common/actions';
 import { Event } from 'vs/base/common/event';
 import { LinkedMap } from 'vs/base/common/map';
@@ -17,9 +18,9 @@ import { RawContextKey } from 'vs/platform/contextkey/common/contextkey';
 
 export { ITaskSummary, Task, TaskTerminateResponse };
 
-export const CustomExecutionSupportedContext = new RawContextKey<boolean>('customExecutionSupported', true);
-export const ShellExecutionSupportedContext = new RawContextKey<boolean>('shellExecutionSupported', false);
-export const ProcessExecutionSupportedContext = new RawContextKey<boolean>('processExecutionSupported', false);
+export const CustomExecutionSupportedContext = new RawContextKey<boolean>('customExecutionSupported', true, nls.localize('tasks.customExecutionSupported', "Whether CustomExecution tasks are supported. Consider using in the when clause of a \'taskDefinition\' contribution."));
+export const ShellExecutionSupportedContext = new RawContextKey<boolean>('shellExecutionSupported', false, nls.localize('tasks.shellExecutionSupported', "Whether ShellExecution tasks are supported. Consider using in the when clause of a \'taskDefinition\' contribution."));
+export const ProcessExecutionSupportedContext = new RawContextKey<boolean>('processExecutionSupported', false, nls.localize('tasks.processExecutionSupported', "Whether ProcessExecution tasks are supported. Consider using in the when clause of a \'taskDefinition\' contribution."));
 
 export const ITaskService = createDecorator<ITaskService>('taskService');
 
diff --git a/src/vs/workbench/contrib/tasks/common/tasks.ts b/src/vs/workbench/contrib/tasks/common/tasks.ts
index f066f65d0d0..c8ca3c4fa9f 100644
--- a/src/vs/workbench/contrib/tasks/common/tasks.ts
+++ b/src/vs/workbench/contrib/tasks/common/tasks.ts
@@ -18,7 +18,7 @@ import { IExtensionDescription } from 'vs/platform/extensions/common/extensions'
 import { ConfigurationTarget } from 'vs/platform/configuration/common/configuration';
 import { USER_TASKS_GROUP_KEY } from 'vs/workbench/contrib/tasks/common/taskService';
 
-export const TASK_RUNNING_STATE = new RawContextKey<boolean>('taskRunning', false);
+export const TASK_RUNNING_STATE = new RawContextKey<boolean>('taskRunning', false, nls.localize('tasks.taskRunningContext', "Whether a task is currently running."));
 export const TASKS_CATEGORY = { value: nls.localize('tasksCategory', "Tasks"), original: 'Tasks' };
 
 export enum ShellQuoting {
diff --git a/src/vs/workbench/contrib/terminal/browser/remoteTerminalService.ts b/src/vs/workbench/contrib/terminal/browser/remoteTerminalService.ts
index 29035c0c009..8bc7d3dd0a9 100644
--- a/src/vs/workbench/contrib/terminal/browser/remoteTerminalService.ts
+++ b/src/vs/workbench/contrib/terminal/browser/remoteTerminalService.ts
@@ -17,6 +17,7 @@ import { IRemoteTerminalProcessExecCommandEvent, IShellLaunchConfigDto, RemoteTe
 import { IRemoteTerminalAttachTarget, ITerminalConfigHelper } from 'vs/workbench/contrib/terminal/common/terminal';
 import { IRemoteAgentService } from 'vs/workbench/services/remote/common/remoteAgentService';
 import { IProcessDataEvent, IShellLaunchConfig, ITerminalChildProcess, ITerminalDimensionsOverride, ITerminalLaunchError, ITerminalsLayoutInfo, ITerminalsLayoutInfoById } from 'vs/platform/terminal/common/terminal';
+
 export class RemoteTerminalService extends Disposable implements IRemoteTerminalService {
 	public _serviceBrand: undefined;
 
@@ -39,7 +40,7 @@ export class RemoteTerminalService extends Disposable implements IRemoteTerminal
 		}
 	}
 
-	public async createRemoteTerminalProcess(terminalId: number, shellLaunchConfig: IShellLaunchConfig, activeWorkspaceRootUri: URI | undefined, cols: number, rows: number, configHelper: ITerminalConfigHelper,): Promise<ITerminalChildProcess> {
+	public async createRemoteTerminalProcess(instanceId: number, shellLaunchConfig: IShellLaunchConfig, activeWorkspaceRootUri: URI | undefined, cols: number, rows: number, shouldPersist: boolean, configHelper: ITerminalConfigHelper): Promise<ITerminalChildProcess> {
 		if (!this._remoteTerminalChannel) {
 			throw new Error(`Cannot create remote terminal when there is no remote!`);
 		}
@@ -52,7 +53,7 @@ export class RemoteTerminalService extends Disposable implements IRemoteTerminal
 			});
 		}
 
-		return new RemoteTerminalProcess(terminalId, shellLaunchConfig, activeWorkspaceRootUri, cols, rows, configHelper, isPreconnectionTerminal, this._remoteTerminalChannel, this._remoteAgentService, this._logService, this._commandService);
+		return new RemoteTerminalProcess(instanceId, shouldPersist, shellLaunchConfig, activeWorkspaceRootUri, cols, rows, configHelper, isPreconnectionTerminal, this._remoteTerminalChannel, this._remoteAgentService, this._logService, this._commandService);
 	}
 
 	public async listTerminals(isInitialization = false): Promise<IRemoteTerminalAttachTarget[]> {
@@ -102,12 +103,14 @@ export class RemoteTerminalProcess extends Disposable implements ITerminalChildP
 	public get onProcessResolvedShellLaunchConfig(): Event<IShellLaunchConfig> { return this._onProcessResolvedShellLaunchConfig.event; }
 
 	private _startBarrier: Barrier;
-	private _persistentTerminalId: number;
+	private _persistentProcessId: number;
+	public get id(): number { return this._persistentProcessId; }
 
 	private _inReplay = false;
 
 	constructor(
-		readonly id: number,
+		private readonly _instanceId: number,
+		readonly shouldPersist: boolean,
 		private readonly _shellLaunchConfig: IShellLaunchConfig,
 		private readonly _activeWorkspaceRootUri: URI | undefined,
 		private readonly _cols: number,
@@ -121,7 +124,7 @@ export class RemoteTerminalProcess extends Disposable implements ITerminalChildP
 	) {
 		super();
 		this._startBarrier = new Barrier();
-		this._persistentTerminalId = 0;
+		this._persistentProcessId = 0;
 
 		if (this._isPreconnectionTerminal) {
 			// Add a loading title only if this terminal is
@@ -138,7 +141,7 @@ export class RemoteTerminalProcess extends Disposable implements ITerminalChildP
 			throw new Error('Could not fetch remote environment');
 		}
 
-		if (!this._shellLaunchConfig.attachPersistentTerminal) {
+		if (!this._shellLaunchConfig.attachPersistentProcess) {
 			const isWorkspaceShellAllowed = this._configHelper.checkWorkspaceShellPermissions(env.os);
 
 			const shellLaunchConfigDto: IShellLaunchConfigDto = {
@@ -149,34 +152,34 @@ export class RemoteTerminalProcess extends Disposable implements ITerminalChildP
 				env: this._shellLaunchConfig.env
 			};
 
-			this._logService.trace('Spawning remote agent process', { terminalId: this.id, shellLaunchConfigDto });
+			this._logService.trace('Spawning remote agent process', { terminalId: this._instanceId, shellLaunchConfigDto });
 
 			const result = await this._remoteTerminalChannel.createTerminalProcess(
 				shellLaunchConfigDto,
 				this._activeWorkspaceRootUri,
-				!this._shellLaunchConfig.isFeatureTerminal && this._configHelper.config.enablePersistentSessions,
+				this.shouldPersist,
 				this._cols,
 				this._rows,
 				isWorkspaceShellAllowed,
 			);
 
-			this._persistentTerminalId = result.terminalId;
+			this._persistentProcessId = result.terminalId;
 			this.setupTerminalEventListener();
 			this._onProcessResolvedShellLaunchConfig.fire(reviveIShellLaunchConfig(result.resolvedShellLaunchConfig));
 
-			const startResult = await this._remoteTerminalChannel.startTerminalProcess(this._persistentTerminalId);
+			const startResult = await this._remoteTerminalChannel.startTerminalProcess(this._persistentProcessId);
 
 			if (typeof startResult !== 'undefined') {
 				// An error occurred
 				return startResult;
 			}
 		} else {
-			this._persistentTerminalId = this._shellLaunchConfig.attachPersistentTerminal.id;
-			this._onProcessReady.fire({ pid: this._shellLaunchConfig.attachPersistentTerminal.pid, cwd: this._shellLaunchConfig.attachPersistentTerminal.cwd });
+			this._persistentProcessId = this._shellLaunchConfig.attachPersistentProcess.id;
+			this._onProcessReady.fire({ pid: this._shellLaunchConfig.attachPersistentProcess.pid, cwd: this._shellLaunchConfig.attachPersistentProcess.cwd });
 			this.setupTerminalEventListener();
 
 			setTimeout(() => {
-				this._onProcessTitleChanged.fire(this._shellLaunchConfig.attachPersistentTerminal!.title);
+				this._onProcessTitleChanged.fire(this._shellLaunchConfig.attachPersistentProcess!.title);
 			}, 0);
 		}
 
@@ -186,7 +189,7 @@ export class RemoteTerminalProcess extends Disposable implements ITerminalChildP
 
 	public shutdown(immediate: boolean): void {
 		this._startBarrier.wait().then(_ => {
-			this._remoteTerminalChannel.shutdownTerminalProcess(this._persistentTerminalId, immediate);
+			this._remoteTerminalChannel.shutdownTerminalProcess(this._persistentProcessId, immediate);
 		});
 	}
 
@@ -196,12 +199,12 @@ export class RemoteTerminalProcess extends Disposable implements ITerminalChildP
 		}
 
 		this._startBarrier.wait().then(_ => {
-			this._remoteTerminalChannel.sendInputToTerminalProcess(this._persistentTerminalId, data);
+			this._remoteTerminalChannel.sendInputToTerminalProcess(this._persistentProcessId, data);
 		});
 	}
 
 	private setupTerminalEventListener(): void {
-		this._register(this._remoteTerminalChannel.onTerminalProcessEvent(this._persistentTerminalId)(event => {
+		this._register(this._remoteTerminalChannel.onTerminalProcessEvent(this._persistentProcessId)(event => {
 			switch (event.type) {
 				case 'ready':
 					return this._onProcessReady.fire({ pid: event.pid, cwd: event.cwd });
@@ -234,7 +237,7 @@ export class RemoteTerminalProcess extends Disposable implements ITerminalChildP
 				case 'execCommand':
 					return this._execCommand(event);
 				case 'orphan?': {
-					this._remoteTerminalChannel.orphanQuestionReply(this._persistentTerminalId);
+					this._remoteTerminalChannel.orphanQuestionReply(this._persistentProcessId);
 					return;
 				}
 			}
@@ -247,7 +250,7 @@ export class RemoteTerminalProcess extends Disposable implements ITerminalChildP
 		}
 		this._startBarrier.wait().then(_ => {
 
-			this._remoteTerminalChannel.resizeTerminalProcess(this._persistentTerminalId, cols, rows);
+			this._remoteTerminalChannel.resizeTerminalProcess(this._persistentProcessId, cols, rows);
 		});
 	}
 
@@ -258,18 +261,18 @@ export class RemoteTerminalProcess extends Disposable implements ITerminalChildP
 		}
 
 		this._startBarrier.wait().then(_ => {
-			this._remoteTerminalChannel.sendCharCountToTerminalProcess(this._persistentTerminalId, charCount);
+			this._remoteTerminalChannel.sendCharCountToTerminalProcess(this._persistentProcessId, charCount);
 		});
 	}
 
 	public async getInitialCwd(): Promise<string> {
 		await this._startBarrier.wait();
-		return this._remoteTerminalChannel.getTerminalInitialCwd(this._persistentTerminalId);
+		return this._remoteTerminalChannel.getTerminalInitialCwd(this._persistentProcessId);
 	}
 
 	public async getCwd(): Promise<string> {
 		await this._startBarrier.wait();
-		return this._remoteTerminalChannel.getTerminalCwd(this._persistentTerminalId);
+		return this._remoteTerminalChannel.getTerminalCwd(this._persistentProcessId);
 	}
 
 	/**
@@ -284,9 +287,9 @@ export class RemoteTerminalProcess extends Disposable implements ITerminalChildP
 		const commandArgs = event.commandArgs.map(arg => revive(arg));
 		try {
 			const result = await this._commandService.executeCommand(event.commandId, ...commandArgs);
-			this._remoteTerminalChannel.sendCommandResultToTerminalProcess(this._persistentTerminalId, reqId, false, result);
+			this._remoteTerminalChannel.sendCommandResultToTerminalProcess(this._persistentProcessId, reqId, false, result);
 		} catch (err) {
-			this._remoteTerminalChannel.sendCommandResultToTerminalProcess(this._persistentTerminalId, reqId, true, err);
+			this._remoteTerminalChannel.sendCommandResultToTerminalProcess(this._persistentProcessId, reqId, true, err);
 		}
 	}
 }
diff --git a/src/vs/workbench/contrib/terminal/browser/terminal.ts b/src/vs/workbench/contrib/terminal/browser/terminal.ts
index 164eaa63472..ddaea338a86 100644
--- a/src/vs/workbench/contrib/terminal/browser/terminal.ts
+++ b/src/vs/workbench/contrib/terminal/browser/terminal.ts
@@ -200,7 +200,7 @@ export interface IRemoteTerminalService {
 	readonly _serviceBrand: undefined;
 	dispose(): void;
 	listTerminals(isInitialization?: boolean): Promise<IRemoteTerminalAttachTarget[]>;
-	createRemoteTerminalProcess(terminalId: number, shellLaunchConfig: IShellLaunchConfig, activeWorkspaceRootUri: URI | undefined, cols: number, rows: number, configHelper: ITerminalConfigHelper,): Promise<ITerminalChildProcess>;
+	createRemoteTerminalProcess(instanceId: number, shellLaunchConfig: IShellLaunchConfig, activeWorkspaceRootUri: URI | undefined, cols: number, rows: number, shouldPersist: boolean, configHelper: ITerminalConfigHelper,): Promise<ITerminalChildProcess>;
 
 	setTerminalLayoutInfo(layout: ITerminalsLayoutInfoById): Promise<void>;
 	getTerminalLayoutInfo(): Promise<ITerminalsLayoutInfo | undefined>;
@@ -258,10 +258,10 @@ export interface ITerminalBeforeHandleLinkEvent {
 
 export interface ITerminalInstance {
 	/**
-	 * The ID of the terminal instance, this is an arbitrary number only used to identify the
-	 * terminal instance.
+	 * The ID of the terminal instance, this is an arbitrary number only used to uniquely identify
+	 * terminal instances within a window.
 	 */
-	readonly id: number;
+	readonly instanceId: number;
 
 	readonly cols: number;
 	readonly rows: number;
@@ -275,10 +275,10 @@ export interface ITerminalInstance {
 	processId: number | undefined;
 
 	/**
-	 * The id of a persistent terminal. Defined if this is a terminal created
-	 * by the RemoteTerminalService or LocalPtyService.
+	 * The id of a persistent process. This is defined if this is a terminal created by a pty host
+	 * that supports reconnection.
 	 */
-	readonly persistentTerminalId: number | undefined;
+	readonly persistentProcessId: number | undefined;
 
 	/**
 	 * Whether the process should be persisted across reloads.
diff --git a/src/vs/workbench/contrib/terminal/browser/terminalActions.ts b/src/vs/workbench/contrib/terminal/browser/terminalActions.ts
index 140aa69c41f..e62b748f49b 100644
--- a/src/vs/workbench/contrib/terminal/browser/terminalActions.ts
+++ b/src/vs/workbench/contrib/terminal/browser/terminalActions.ts
@@ -687,7 +687,7 @@ export function registerTerminalActions() {
 			});
 			const selected = await quickInputService.pick<IRemoteTerminalPick>(items, { canPickMany: false });
 			if (selected) {
-				const instance = terminalService.createTerminal({ attachPersistentTerminal: selected.term });
+				const instance = terminalService.createTerminal({ attachPersistentProcess: selected.term });
 				terminalService.setActiveInstance(instance);
 				terminalService.showPanel(true);
 			}
diff --git a/src/vs/workbench/contrib/terminal/browser/terminalInstance.ts b/src/vs/workbench/contrib/terminal/browser/terminalInstance.ts
index 4e4abf0a72f..8c21350edcb 100644
--- a/src/vs/workbench/contrib/terminal/browser/terminalInstance.ts
+++ b/src/vs/workbench/contrib/terminal/browser/terminalInstance.ts
@@ -71,12 +71,12 @@ export class TerminalInstance extends Disposable implements ITerminalInstance {
 
 	private static _lastKnownCanvasDimensions: ICanvasDimensions | undefined;
 	private static _lastKnownGridDimensions: IGridDimensions | undefined;
-	private static _idCounter = 1;
+	private static _instanceIdCounter = 1;
 
 	private _processManager!: ITerminalProcessManager;
 	private _pressAnyKeyToCloseListener: IDisposable | undefined;
 
-	private _id: number;
+	private _instanceId: number;
 	private _latestXtermWriteData: number = 0;
 	private _latestXtermParseData: number = 0;
 	private _isExiting: boolean;
@@ -120,7 +120,7 @@ export class TerminalInstance extends Disposable implements ITerminalInstance {
 	private hasHadInput: boolean;
 
 	public disableLayout: boolean;
-	public get id(): number { return this._id; }
+	public get instanceId(): number { return this._instanceId; }
 	public get cols(): number {
 		if (this._dimensionsOverride && this._dimensionsOverride.cols) {
 			if (this._dimensionsOverride.forceExactSize) {
@@ -211,7 +211,7 @@ export class TerminalInstance extends Disposable implements ITerminalInstance {
 		this._hadFocusOnExit = false;
 		this._isVisible = false;
 		this._isDisposed = false;
-		this._id = TerminalInstance._idCounter++;
+		this._instanceId = TerminalInstance._instanceIdCounter++;
 
 		this.hasHadInput = false;
 
@@ -224,7 +224,7 @@ export class TerminalInstance extends Disposable implements ITerminalInstance {
 		this._terminalAltBufferActiveContextKey = KEYBINDING_CONTEXT_TERMINAL_ALT_BUFFER_ACTIVE.bindTo(this._contextKeyService);
 		this.disableLayout = false;
 
-		this._logService.trace(`terminalInstance#ctor (id: ${this.id})`, this._shellLaunchConfig);
+		this._logService.trace(`terminalInstance#ctor (instanceId: ${this.instanceId})`, this._shellLaunchConfig);
 
 		this._initDimensions();
 		this._createProcessManager();
@@ -373,7 +373,7 @@ export class TerminalInstance extends Disposable implements ITerminalInstance {
 		return TerminalInstance._lastKnownCanvasDimensions;
 	}
 
-	public get persistentTerminalId(): number | undefined { return this._processManager.persistentTerminalId; }
+	public get persistentProcessId(): number | undefined { return this._processManager.persistentProcessId; }
 	public get shouldPersist(): boolean { return this._processManager.shouldPersist; }
 
 	private async _getXtermConstructor(): Promise<typeof XTermTerminal> {
@@ -531,7 +531,7 @@ export class TerminalInstance extends Disposable implements ITerminalInstance {
 			throw new Error('xterm elements not set after open');
 		}
 
-		this._setAriaLabel(xterm, this._id, this._title);
+		this._setAriaLabel(xterm, this._instanceId, this._title);
 
 		xterm.textarea.addEventListener('focus', () => this._onFocus.fire(this));
 		xterm.attachCustomKeyEventHandler((event: KeyboardEvent): boolean => {
@@ -644,18 +644,6 @@ export class TerminalInstance extends Disposable implements ITerminalInstance {
 			this._terminalFocusContextKey.reset();
 			this._refreshSelectionContextKey();
 		}));
-		this._register(dom.addDisposableListener(xterm.element, 'focus', () => {
-			this._terminalFocusContextKey.set(true);
-			if (this.shellType) {
-				this._terminalShellTypeContextKey.set(this.shellType.toString());
-			} else {
-				this._terminalShellTypeContextKey.reset();
-			}
-		}));
-		this._register(dom.addDisposableListener(xterm.element, 'blur', () => {
-			this._terminalFocusContextKey.reset();
-			this._refreshSelectionContextKey();
-		}));
 
 		this._widgetManager.attachToElement(xterm.element);
 		this._processManager.onProcessReady(() => this._linkManager?.setWidgetManager(this._widgetManager));
@@ -784,7 +772,7 @@ export class TerminalInstance extends Disposable implements ITerminalInstance {
 	}
 
 	public dispose(immediate?: boolean): void {
-		this._logService.trace(`terminalInstance#dispose (id: ${this.id})`);
+		this._logService.trace(`terminalInstance#dispose (instanceId: ${this.instanceId})`);
 
 		dispose(this._windowsShellHelper);
 		this._windowsShellHelper = undefined;
@@ -945,7 +933,7 @@ export class TerminalInstance extends Disposable implements ITerminalInstance {
 	}
 
 	protected _createProcessManager(): void {
-		this._processManager = this._instantiationService.createInstance(TerminalProcessManager, this._id, this._configHelper);
+		this._processManager = this._instantiationService.createInstance(TerminalProcessManager, this._instanceId, this._configHelper);
 		this._processManager.onProcessReady(() => this._onProcessIdReady.fire(this));
 		this._processManager.onProcessExit(exitCode => this._onProcessExit(exitCode));
 		this._processManager.onProcessData(ev => {
@@ -1058,7 +1046,7 @@ export class TerminalInstance extends Disposable implements ITerminalInstance {
 		this._isExiting = true;
 
 		await this._flushXtermData();
-		this._logService.debug(`Terminal process exit (id: ${this.id}) with code ${this._exitCode}`);
+		this._logService.debug(`Terminal process exit (instanceId: ${this.instanceId}) with code ${this._exitCode}`);
 
 		let exitCodeMessage: string | undefined;
 
@@ -1101,7 +1089,7 @@ export class TerminalInstance extends Disposable implements ITerminalInstance {
 				break;
 		}
 
-		this._logService.debug(`Terminal process exit (id: ${this.id}) state ${this._processManager.processState}`);
+		this._logService.debug(`Terminal process exit (instanceId: ${this.instanceId}) state ${this._processManager.processState}`);
 
 		// Only trigger wait on exit when the exit was *not* triggered by the
 		// user (via the `workbench.action.terminal.kill` command).
@@ -1541,7 +1529,7 @@ export class TerminalInstance extends Disposable implements ITerminalInstance {
 		const didTitleChange = title !== this._title;
 		this._title = title;
 		if (didTitleChange) {
-			this._setAriaLabel(this._xterm, this._id, this._title);
+			this._setAriaLabel(this._xterm, this._instanceId, this._title);
 
 			if (this._titleReadyComplete) {
 				this._titleReadyComplete(title);
@@ -1584,7 +1572,7 @@ export class TerminalInstance extends Disposable implements ITerminalInstance {
 
 	private _onEnvironmentVariableInfoChanged(info: IEnvironmentVariableInfo): void {
 		if (info.requiresAction) {
-			this._xterm?.textarea?.setAttribute('aria-label', nls.localize('terminalStaleTextBoxAriaLabel', "Terminal {0} environment is stale, run the 'Show Environment Information' command for more information", this._id));
+			this._xterm?.textarea?.setAttribute('aria-label', nls.localize('terminalStaleTextBoxAriaLabel', "Terminal {0} environment is stale, run the 'Show Environment Information' command for more information", this._instanceId));
 		}
 		this._refreshEnvironmentVariableInfoWidgetState(info);
 	}
@@ -1601,7 +1589,7 @@ export class TerminalInstance extends Disposable implements ITerminalInstance {
 
 		// Recreate the process if the terminal has not yet been interacted with and it's not a
 		// special terminal (eg. task, extension terminal)
-		if (info.requiresAction && !this._processManager.hasWrittenData && !this._shellLaunchConfig.isFeatureTerminal && !this._shellLaunchConfig.isExtensionTerminal && !this._shellLaunchConfig.attachPersistentTerminal) {
+		if (info.requiresAction && !this._processManager.hasWrittenData && !this._shellLaunchConfig.isFeatureTerminal && !this._shellLaunchConfig.isExtensionCustomPtyTerminal && !this._shellLaunchConfig.isExtensionOwnedTerminal && !this._shellLaunchConfig.attachPersistentProcess) {
 			this.relaunch();
 			return;
 		}
diff --git a/src/vs/workbench/contrib/terminal/browser/terminalProcessExtHostProxy.ts b/src/vs/workbench/contrib/terminal/browser/terminalProcessExtHostProxy.ts
index feb0f931674..e96ac8ccbe5 100644
--- a/src/vs/workbench/contrib/terminal/browser/terminalProcessExtHostProxy.ts
+++ b/src/vs/workbench/contrib/terminal/browser/terminalProcessExtHostProxy.ts
@@ -11,6 +11,7 @@ import { ITerminalProcessExtHostProxy } from 'vs/workbench/contrib/terminal/comm
 
 export class TerminalProcessExtHostProxy extends Disposable implements ITerminalChildProcess, ITerminalProcessExtHostProxy {
 	readonly id = 0;
+	readonly shouldPersist = false;
 
 	private readonly _onProcessData = this._register(new Emitter<string>());
 	public readonly onProcessData: Event<string> = this._onProcessData.event;
@@ -47,7 +48,7 @@ export class TerminalProcessExtHostProxy extends Disposable implements ITerminal
 	private _pendingLatencyRequests: ((value: number | PromiseLike<number>) => void)[] = [];
 
 	constructor(
-		public terminalId: number,
+		public instanceId: number,
 		private _shellLaunchConfig: IShellLaunchConfig,
 		private _cols: number,
 		private _rows: number,
@@ -100,7 +101,7 @@ export class TerminalProcessExtHostProxy extends Disposable implements ITerminal
 	}
 
 	public async start(): Promise<ITerminalLaunchError | undefined> {
-		if (!this._shellLaunchConfig.isExtensionTerminal) {
+		if (!this._shellLaunchConfig.isExtensionCustomPtyTerminal) {
 			throw new Error('Attempt to start an ext host process that is not an extension terminal');
 		}
 		return this._terminalService.requestStartExtensionTerminal(this, this._cols, this._rows);
diff --git a/src/vs/workbench/contrib/terminal/browser/terminalProcessManager.ts b/src/vs/workbench/contrib/terminal/browser/terminalProcessManager.ts
index f1ecf214bb3..8f87174b1c1 100644
--- a/src/vs/workbench/contrib/terminal/browser/terminalProcessManager.ts
+++ b/src/vs/workbench/contrib/terminal/browser/terminalProcessManager.ts
@@ -89,15 +89,15 @@ export class TerminalProcessManager extends Disposable implements ITerminalProce
 	public get onEnvironmentVariableInfoChanged(): Event<IEnvironmentVariableInfo> { return this._onEnvironmentVariableInfoChange.event; }
 
 	public get environmentVariableInfo(): IEnvironmentVariableInfo | undefined { return this._environmentVariableInfo; }
-	public get persistentTerminalId(): number | undefined { return this._process?.id; }
-	public get shouldPersist(): boolean { return this._process?.shouldPersist || false; }
+	public get persistentProcessId(): number | undefined { return this._process?.id; }
+	public get shouldPersist(): boolean { return this._process ? this._process.shouldPersist : false; }
 
 	public get hasWrittenData(): boolean {
 		return this._hasWrittenData;
 	}
 
 	constructor(
-		private readonly _terminalId: number,
+		private readonly _instanceId: number,
 		private readonly _configHelper: ITerminalConfigHelper,
 		@IHistoryService private readonly _historyService: IHistoryService,
 		@IInstantiationService private readonly _instantiationService: IInstantiationService,
@@ -148,9 +148,9 @@ export class TerminalProcessManager extends Disposable implements ITerminalProce
 		rows: number,
 		isScreenReaderModeEnabled: boolean
 	): Promise<ITerminalLaunchError | undefined> {
-		if (shellLaunchConfig.isExtensionTerminal) {
+		if (shellLaunchConfig.isExtensionCustomPtyTerminal) {
 			this._processType = ProcessType.ExtensionTerminal;
-			this._process = this._instantiationService.createInstance(TerminalProcessExtHostProxy, this._terminalId, shellLaunchConfig, cols, rows);
+			this._process = this._instantiationService.createInstance(TerminalProcessExtHostProxy, this._instanceId, shellLaunchConfig, cols, rows);
 		} else {
 			const forceExtHostProcess = (this._configHelper.config as any).extHostProcess;
 			if (shellLaunchConfig.cwd && typeof shellLaunchConfig.cwd === 'object') {
@@ -182,16 +182,17 @@ export class TerminalProcessManager extends Disposable implements ITerminalProce
 				// this is a copy of what the merged environment collection is on the remote side
 				await this._setupEnvVariableInfo(activeWorkspaceRootUri, shellLaunchConfig);
 
-				this._process = await this._remoteTerminalService.createRemoteTerminalProcess(this._terminalId, shellLaunchConfig, activeWorkspaceRootUri, cols, rows, this._configHelper);
+				const shouldPersist = !shellLaunchConfig.isFeatureTerminal && this._configHelper.config.enablePersistentSessions;
+				this._process = await this._remoteTerminalService.createRemoteTerminalProcess(this._instanceId, shellLaunchConfig, activeWorkspaceRootUri, cols, rows, shouldPersist, this._configHelper);
 			} else {
 				// Flow control is not needed for ptys hosted in the same process (ie. the electron
 				// renderer).
-				if (shellLaunchConfig.attachPersistentTerminal) {
-					const result = await this._terminalInstanceService.attachToProcess(shellLaunchConfig.attachPersistentTerminal.id);
+				if (shellLaunchConfig.attachPersistentProcess) {
+					const result = await this._terminalInstanceService.attachToProcess(shellLaunchConfig.attachPersistentProcess.id);
 					if (result) {
 						this._process = result;
 					} else {
-						this._logService.trace(`Attach to process failed for terminal ${shellLaunchConfig.attachPersistentTerminal}`);
+						this._logService.trace(`Attach to process failed for terminal ${shellLaunchConfig.attachPersistentProcess}`);
 						return undefined;
 					}
 				} else {
@@ -404,7 +405,7 @@ export class TerminalProcessManager extends Disposable implements ITerminalProce
 		if (diff === undefined) {
 			return;
 		}
-		this._environmentVariableInfo = this._instantiationService.createInstance(EnvironmentVariableInfoStale, diff, this._terminalId);
+		this._environmentVariableInfo = this._instantiationService.createInstance(EnvironmentVariableInfoStale, diff, this._instanceId);
 		this._onEnvironmentVariableInfoChange.fire(this._environmentVariableInfo);
 	}
 }
diff --git a/src/vs/workbench/contrib/terminal/browser/terminalService.ts b/src/vs/workbench/contrib/terminal/browser/terminalService.ts
index 0a301d99774..a78ec1748ad 100644
--- a/src/vs/workbench/contrib/terminal/browser/terminalService.ts
+++ b/src/vs/workbench/contrib/terminal/browser/terminalService.ts
@@ -200,18 +200,18 @@ export class TerminalService implements ITerminalService {
 					terminalLayouts.forEach((terminalLayout) => {
 						if (!terminalInstance) {
 							// create tab and terminal
-							terminalInstance = this.createTerminal({ attachPersistentTerminal: terminalLayout.terminal! });
+							terminalInstance = this.createTerminal({ attachPersistentProcess: terminalLayout.terminal! });
 							tab = this._getTabForInstance(terminalInstance);
 							if (tabLayout.isActive) {
 								activeTab = tab;
 							}
 						} else {
 							// add split terminals to this tab
-							this.splitInstance(terminalInstance, { attachPersistentTerminal: terminalLayout.terminal! });
+							this.splitInstance(terminalInstance, { attachPersistentProcess: terminalLayout.terminal! });
 						}
 					});
 					const activeInstance = this.terminalInstances.find(t => {
-						return t.shellLaunchConfig.attachPersistentTerminal?.id === tabLayout.activePersistentTerminalId;
+						return t.shellLaunchConfig.attachPersistentProcess?.id === tabLayout.activePersistentProcessId;
 					});
 					if (activeInstance) {
 						this.setActiveInstance(activeInstance);
@@ -230,6 +230,9 @@ export class TerminalService implements ITerminalService {
 		this.onActiveTabChanged(() => isRemote ? this._updateRemoteState() : this._updateLocalState());
 		this.onActiveInstanceChanged(() => isRemote ? this._updateRemoteState() : this._updateLocalState());
 		this.onInstancesChanged(() => isRemote ? this._updateRemoteState() : this._updateLocalState());
+		// The state must be updated when the terminal is relaunched, otherwise the persistent
+		// terminal ID will be stale and the process will be leaked.
+		this.onInstanceProcessIdReady(() => isRemote ? this._updateRemoteState() : this._updateLocalState());
 	}
 
 	public setNativeWindowsDelegate(delegate: ITerminalNativeWindowsDelegate): void {
@@ -308,8 +311,12 @@ export class TerminalService implements ITerminalService {
 			return;
 		}
 
-		// Force dispose of all terminal instances
-		this.terminalInstances.forEach(instance => instance.dispose(true));
+		// Force dispose of all terminal instances, don't force immediate disposal of the terminal
+		// processes on Windows as an additional mitigation for https://github.com/microsoft/vscode/issues/71966
+		// which causes the pty host to become unresponsive, disconnecting all terminals across all
+		// windows
+		this.terminalInstances.forEach(instance => instance.dispose(!isWindows));
+
 		this._terminalInstanceService.setTerminalLayoutInfo(undefined);
 	}
 
@@ -409,7 +416,7 @@ export class TerminalService implements ITerminalService {
 	public getInstanceFromId(terminalId: number): ITerminalInstance | undefined {
 		let bgIndex = -1;
 		this._backgroundedTerminalInstances.forEach((terminalInstance, i) => {
-			if (terminalInstance.id === terminalId) {
+			if (terminalInstance.instanceId === terminalId) {
 				bgIndex = i;
 			}
 		});
@@ -433,7 +440,7 @@ export class TerminalService implements ITerminalService {
 		if (terminalInstance.shellLaunchConfig.hideFromUser) {
 			this._showBackgroundTerminal(terminalInstance);
 		}
-		this.setActiveInstanceByIndex(this._getIndexFromId(terminalInstance.id));
+		this.setActiveInstanceByIndex(this._getIndexFromId(terminalInstance.instanceId));
 	}
 
 	public setActiveTabByIndex(tabIndex: number): void {
@@ -618,7 +625,7 @@ export class TerminalService implements ITerminalService {
 	private _getIndexFromId(terminalId: number): number {
 		let terminalIndex = -1;
 		this.terminalInstances.forEach((terminalInstance, i) => {
-			if (terminalInstance.id === terminalId) {
+			if (terminalInstance.instanceId === terminalId) {
 				terminalIndex = i;
 			}
 		});
diff --git a/src/vs/workbench/contrib/terminal/browser/terminalTab.ts b/src/vs/workbench/contrib/terminal/browser/terminalTab.ts
index 6dbc6883940..e3925e1059c 100644
--- a/src/vs/workbench/contrib/terminal/browser/terminalTab.ts
+++ b/src/vs/workbench/contrib/terminal/browser/terminalTab.ts
@@ -265,7 +265,7 @@ export class TerminalTab extends Disposable implements ITerminalTab {
 
 	public addInstance(shellLaunchConfigOrInstance: IShellLaunchConfig | ITerminalInstance): void {
 		let instance: ITerminalInstance;
-		if ('id' in shellLaunchConfigOrInstance) {
+		if ('instanceId' in shellLaunchConfigOrInstance) {
 			instance = shellLaunchConfigOrInstance;
 		} else {
 			instance = this._terminalService.createInstance(undefined, shellLaunchConfigOrInstance);
@@ -299,15 +299,15 @@ export class TerminalTab extends Disposable implements ITerminalTab {
 
 	public getLayoutInfo(isActive: boolean): ITerminalTabLayoutInfoById {
 		const isHorizontal = this.splitPaneContainer?.orientation === Orientation.HORIZONTAL;
-		const instances = this.terminalInstances.filter(instance => typeof instance.persistentTerminalId === 'number' && instance.shouldPersist);
+		const instances = this.terminalInstances.filter(instance => typeof instance.persistentProcessId === 'number' && instance.shouldPersist);
 		const totalSize = instances.map(instance => isHorizontal ? instance.cols : instance.rows).reduce((totalValue, currentValue) => totalValue + currentValue, 0);
 		return {
 			isActive: isActive,
-			activePersistentTerminalId: this.activeInstance ? this.activeInstance.persistentTerminalId : undefined,
+			activePersistentProcessId: this.activeInstance ? this.activeInstance.persistentProcessId : undefined,
 			terminals: instances.map(t => {
 				return {
 					relativeSize: isHorizontal ? t.cols / totalSize : t.rows / totalSize,
-					terminal: t.persistentTerminalId ? t.persistentTerminalId : t.id
+					terminal: t.persistentProcessId || 0
 				};
 			})
 		};
@@ -350,13 +350,13 @@ export class TerminalTab extends Disposable implements ITerminalTab {
 	}
 
 	private _setActiveInstance(instance: ITerminalInstance): void {
-		this.setActiveInstanceByIndex(this._getIndexFromId(instance.id));
+		this.setActiveInstanceByIndex(this._getIndexFromId(instance.instanceId));
 	}
 
 	private _getIndexFromId(terminalId: number): number {
 		let terminalIndex = -1;
 		this.terminalInstances.forEach((terminalInstance, i) => {
-			if (terminalInstance.id === terminalId) {
+			if (terminalInstance.instanceId === terminalId) {
 				terminalIndex = i;
 			}
 		});
diff --git a/src/vs/workbench/contrib/terminal/common/terminal.ts b/src/vs/workbench/contrib/terminal/common/terminal.ts
index 77bc0fa1b54..dd3eb31b2a9 100644
--- a/src/vs/workbench/contrib/terminal/common/terminal.ts
+++ b/src/vs/workbench/contrib/terminal/common/terminal.ts
@@ -243,7 +243,7 @@ export interface ITerminalProcessManager extends IDisposable {
 	readonly os: OperatingSystem | undefined;
 	readonly userHome: string | undefined;
 	readonly environmentVariableInfo: IEnvironmentVariableInfo | undefined;
-	readonly persistentTerminalId: number | undefined;
+	readonly persistentProcessId: number | undefined;
 	readonly shouldPersist: boolean;
 	/** Whether the process has had data written to it yet. */
 	readonly hasWrittenData: boolean;
@@ -290,7 +290,7 @@ export const enum ProcessState {
 }
 
 export interface ITerminalProcessExtHostProxy extends IDisposable {
-	readonly terminalId: number;
+	readonly instanceId: number;
 
 	emitData(data: string): void;
 	emitTitle(title: string): void;
diff --git a/src/vs/workbench/contrib/terminal/common/terminalConfiguration.ts b/src/vs/workbench/contrib/terminal/common/terminalConfiguration.ts
index b3b1fcd9587..d275d0afa00 100644
--- a/src/vs/workbench/contrib/terminal/common/terminalConfiguration.ts
+++ b/src/vs/workbench/contrib/terminal/common/terminalConfiguration.ts
@@ -91,7 +91,7 @@ export const terminalConfiguration: IConfigurationNode = {
 			default: false
 		},
 		'terminal.integrated.altClickMovesCursor': {
-			description: localize('terminal.integrated.altClickMovesCursor', "If enabled, alt/option + click will reposition the prompt cursor to underneath the mouse when `#editor.multiCursorModifier#` is set to `'alt'` (the default value). This may not work reliably depending on your shell."),
+			markdownDescription: localize('terminal.integrated.altClickMovesCursor', "If enabled, alt/option + click will reposition the prompt cursor to underneath the mouse when `#editor.multiCursorModifier#` is set to `'alt'` (the default value). This may not work reliably depending on your shell."),
 			type: 'boolean',
 			default: true
 		},
diff --git a/src/vs/workbench/contrib/terminal/common/terminalEnvironment.ts b/src/vs/workbench/contrib/terminal/common/terminalEnvironment.ts
index 48b4f7fe15e..ccaad9b7a20 100644
--- a/src/vs/workbench/contrib/terminal/common/terminalEnvironment.ts
+++ b/src/vs/workbench/contrib/terminal/common/terminalEnvironment.ts
@@ -237,9 +237,6 @@ export function escapeNonWindowsPath(path: string): string {
 	if (newPath.indexOf('\\') !== 0) {
 		newPath = newPath.replace(/\\/g, '\\\\');
 	}
-	if (newPath.indexOf(' ') !== -1) {
-		newPath = newPath.replace(/ /g, '\\ ');
-	}
 	const bannedChars = /[\`\$\|\&\>\~\#\!\^\*\;\<\"\']/g;
 	newPath = newPath.replace(bannedChars, '');
 	return `'${newPath}'`;
diff --git a/src/vs/workbench/contrib/terminal/test/browser/terminalProcessManager.test.ts b/src/vs/workbench/contrib/terminal/test/browser/terminalProcessManager.test.ts
new file mode 100644
index 00000000000..90b0b89f15f
--- /dev/null
+++ b/src/vs/workbench/contrib/terminal/test/browser/terminalProcessManager.test.ts
@@ -0,0 +1,79 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { strictEqual } from 'assert';
+import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
+import { TerminalConfigHelper } from 'vs/workbench/contrib/terminal/browser/terminalConfigHelper';
+import { TerminalProcessManager } from 'vs/workbench/contrib/terminal/browser/terminalProcessManager';
+import { TestConfigurationService } from 'vs/platform/configuration/test/common/testConfigurationService';
+import { ITestInstantiationService, TestProductService, workbenchInstantiationService } from 'vs/workbench/test/browser/workbenchTestServices';
+import { IProductService } from 'vs/platform/product/common/productService';
+import { IEnvironmentVariableService } from 'vs/workbench/contrib/terminal/common/environmentVariable';
+import { EnvironmentVariableService } from 'vs/workbench/contrib/terminal/common/environmentVariableService';
+import { Schemas } from 'vs/base/common/network';
+import { URI } from 'vs/base/common/uri';
+
+suite('Workbench - TerminalProcessManager', () => {
+	let instantiationService: ITestInstantiationService;
+	let manager: TerminalProcessManager;
+
+	setup(async () => {
+		instantiationService = workbenchInstantiationService();
+		const configurationService = new TestConfigurationService();
+		await configurationService.setUserConfiguration('editor', { fontFamily: 'foo' });
+		await configurationService.setUserConfiguration('terminal', {
+			integrated: {
+				fontFamily: 'bar',
+				enablePersistentSessions: true
+			}
+		});
+		instantiationService.stub(IConfigurationService, configurationService);
+		instantiationService.stub(IProductService, TestProductService);
+		instantiationService.stub(IEnvironmentVariableService, instantiationService.createInstance(EnvironmentVariableService));
+
+		const configHelper = instantiationService.createInstance(TerminalConfigHelper);
+		manager = instantiationService.createInstance(TerminalProcessManager, 1, configHelper);
+	});
+
+	suite('process persistence', () => {
+		suite('local', () => {
+			test('regular terminal should persist', async () => {
+				const p = await manager.createProcess({
+				}, 1, 1, false);
+				strictEqual(p, undefined);
+				strictEqual(manager.shouldPersist, true);
+			});
+			test('task terminal should not persist', async () => {
+				const p = await manager.createProcess({
+					isFeatureTerminal: true
+				}, 1, 1, false);
+				strictEqual(p, undefined);
+				strictEqual(manager.shouldPersist, false);
+			});
+		});
+		suite('remote', () => {
+			const remoteCwd = URI.from({
+				scheme: Schemas.vscodeRemote,
+				path: 'test/cwd'
+			});
+
+			test('regular terminal should persist', async () => {
+				const p = await manager.createProcess({
+					cwd: remoteCwd
+				}, 1, 1, false);
+				strictEqual(p, undefined);
+				strictEqual(manager.shouldPersist, true);
+			});
+			test('task terminal should not persist', async () => {
+				const p = await manager.createProcess({
+					isFeatureTerminal: true,
+					cwd: remoteCwd
+				}, 1, 1, false);
+				strictEqual(p, undefined);
+				strictEqual(manager.shouldPersist, false);
+			});
+		});
+	});
+});
diff --git a/src/vs/workbench/contrib/testing/browser/explorerProjections/hierarchalNodes.ts b/src/vs/workbench/contrib/testing/browser/explorerProjections/hierarchalNodes.ts
index 148bc267c77..bd02e7a8b72 100644
--- a/src/vs/workbench/contrib/testing/browser/explorerProjections/hierarchalNodes.ts
+++ b/src/vs/workbench/contrib/testing/browser/explorerProjections/hierarchalNodes.ts
@@ -4,6 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { Iterable } from 'vs/base/common/iterator';
+import { generateUuid } from 'vs/base/common/uuid';
 import { IWorkspaceFolder } from 'vs/platform/workspace/common/workspace';
 import { TestRunState } from 'vs/workbench/api/common/extHostTypes';
 import { ITestTreeElement } from 'vs/workbench/contrib/testing/browser/explorerProjections';
@@ -17,7 +18,7 @@ export class HierarchicalElement implements ITestTreeElement {
 	public readonly depth: number = this.parentItem.depth + 1;
 
 	public get treeId() {
-		return `hitest:${this.test.item.extId}`;
+		return generateUuid();
 	}
 
 	public get label() {
@@ -63,7 +64,7 @@ export class HierarchicalFolder implements ITestTreeElement {
 	public computedState: TestRunState | undefined;
 
 	public get treeId() {
-		return `hifolder:${this.folder.index}`;
+		return generateUuid();
 	}
 
 	public get runnable() {
diff --git a/src/vs/workbench/contrib/testing/browser/icons.ts b/src/vs/workbench/contrib/testing/browser/icons.ts
index b89c7382b08..102479d70f8 100644
--- a/src/vs/workbench/contrib/testing/browser/icons.ts
+++ b/src/vs/workbench/contrib/testing/browser/icons.ts
@@ -16,7 +16,8 @@ export const testingRunAllIcon = registerIcon('testing-run-all-icon', Codicon.ru
 export const testingDebugIcon = registerIcon('testing-debug-icon', Codicon.debugAlt, localize('testingDebugIcon', 'Icon of the "debug test" action.'));
 export const testingCancelIcon = registerIcon('testing-cancel-icon', Codicon.close, localize('testingCancelIcon', 'Icon to cancel ongoing test runs.'));
 export const testingFilterIcon = registerIcon('testing-filter', Codicon.filter, localize('filterIcon', 'Icon for the \'Filter\' action in the testing view.'));
-export const testingAutorunIcon = registerIcon('testing-autorun', Codicon.symbolEvent, localize('autoRunIcon', 'Icon for the \'Autorun\' toggle in the testing view.'));
+export const testingAutorunIcon = registerIcon('testing-autorun', Codicon.debugRerun, localize('autoRunIcon', 'Icon for the \'Autorun\' toggle in the testing view.'));
+export const testingHiddenIcon = registerIcon('testing-hidden', Codicon.eyeClosed, localize('hiddenIcon', 'Icon shown beside hidden tests, when they\'ve been shown.'));
 
 export const testingShowAsList = registerIcon('testing-show-as-list-icon', Codicon.listTree, localize('testingShowAsList', 'Icon shown when the test explorer is disabled as a tree.'));
 export const testingShowAsTree = registerIcon('testing-show-as-list-icon', Codicon.listFlat, localize('testingShowAsTree', 'Icon shown when the test explorer is disabled as a list.'));
diff --git a/src/vs/workbench/contrib/testing/browser/media/testing.css b/src/vs/workbench/contrib/testing/browser/media/testing.css
index 87eb3e28436..21892dc75a9 100644
--- a/src/vs/workbench/contrib/testing/browser/media/testing.css
+++ b/src/vs/workbench/contrib/testing/browser/media/testing.css
@@ -20,16 +20,28 @@
 	align-items: center;
 }
 
-.test-explorer .monaco-list-row .monaco-action-bar {
+.test-explorer .monaco-list-row .monaco-action-bar,
+.test-explorer .monaco-list-row .codicon-testing-hidden {
 	display: none;
 	flex-shrink: 0;
 	margin-right: 1px;
 }
 
-.test-explorer .monaco-list-row:hover .monaco-action-bar {
+.test-explorer .monaco-list-row:hover .monaco-action-bar,
+.test-explorer .monaco-list-row:focus .monaco-action-bar {
 	display: initial;
 }
 
+.test-explorer .monaco-list-row .test-is-hidden .codicon-testing-hidden {
+	display: block;
+	margin-right: 9px;
+}
+
+.test-explorer .monaco-list-row:hover .codicon-testing-hidden,
+.test-explorer .monaco-list-row:focus .codicon-testing-hidden {
+	display: none;
+}
+
 .test-explorer .name {
 	overflow: hidden;
 	text-overflow: ellipsis;
diff --git a/src/vs/workbench/contrib/testing/browser/testExplorerActions.ts b/src/vs/workbench/contrib/testing/browser/testExplorerActions.ts
index 989401cf552..b8ff392b1e7 100644
--- a/src/vs/workbench/contrib/testing/browser/testExplorerActions.ts
+++ b/src/vs/workbench/contrib/testing/browser/testExplorerActions.ts
@@ -23,7 +23,7 @@ import { IExtensionsViewPaneContainer, VIEWLET_ID as EXTENSIONS_VIEWLET_ID } fro
 import * as icons from 'vs/workbench/contrib/testing/browser/icons';
 import { TestingExplorerView, TestingExplorerViewModel } from 'vs/workbench/contrib/testing/browser/testingExplorerView';
 import { TestExplorerViewMode, TestExplorerViewSorting, Testing } from 'vs/workbench/contrib/testing/common/constants';
-import { InternalTestItem, TestIdWithProvider } from 'vs/workbench/contrib/testing/common/testCollection';
+import { IncrementalTestCollectionItem, InternalTestItem, TestIdWithProvider } from 'vs/workbench/contrib/testing/common/testCollection';
 import { ITestingAutoRun } from 'vs/workbench/contrib/testing/common/testingAutoRun';
 import { TestingContextKeys } from 'vs/workbench/contrib/testing/common/testingContextKeys';
 import { isFailedState } from 'vs/workbench/contrib/testing/common/testingStates';
@@ -668,16 +668,33 @@ abstract class RunOrDebugCurrentFile extends Action2 {
 		const testService = accessor.get(ITestService);
 		const collection = testService.subscribeToDiffs(ExtHostTestingResource.TextDocument, model.uri);
 
+		// the gather function builds the first nodes in the tree who have a
+		// location in the file. Ideally we could just request to run the roots,
+		// but in the case where they're polyfilled from a workspace heirarchy,
+		// the "root" test actually refers to the workspace root.
+		const expectedUri = model.uri.toString();
+		const tests: IncrementalTestCollectionItem[] = [];
+		const gather = (testIds: Iterable<string>) => {
+			for (const id of testIds) {
+				const node = collection.object.getNodeById(id);
+				if (!node) {
+					// no-op
+				} else if (node.item.location?.uri.toString() === expectedUri) {
+					if (this.filter(node)) {
+						tests.push(node);
+					}
+				} else if (node.children) {
+					gather(node.children);
+				}
+			}
+		};
+
 		try {
 			await showDiscoveringWhile(accessor.get(IProgressService), waitForAllTests(collection.object));
+			gather(collection.object.rootIds);
 
-			const roots = [...collection.object.rootIds]
-				.map(r => collection.object.getNodeById(r))
-				.filter(isDefined)
-				.filter(n => this.filter(n));
-
-			if (roots.length) {
-				await this.runTest(testService, roots);
+			if (tests.length) {
+				await this.runTest(testService, tests);
 			}
 		} finally {
 			collection.dispose();
diff --git a/src/vs/workbench/contrib/testing/browser/testing.contribution.ts b/src/vs/workbench/contrib/testing/browser/testing.contribution.ts
index 6c089b06659..5e6e9c34182 100644
--- a/src/vs/workbench/contrib/testing/browser/testing.contribution.ts
+++ b/src/vs/workbench/contrib/testing/browser/testing.contribution.ts
@@ -108,7 +108,8 @@ registerAction2(Action.DebugLastRun);
 registerAction2(Action.SearchForTestExtension);
 registerAction2(CloseTestPeek);
 
-Registry.as<IWorkbenchContributionsRegistry>(WorkbenchExtensions.Workbench).registerWorkbenchContribution(TestingContentProvider, LifecyclePhase.Eventually);
+Registry.as<IWorkbenchContributionsRegistry>(WorkbenchExtensions.Workbench).registerWorkbenchContribution(TestingContentProvider, LifecyclePhase.Restored);
+Registry.as<IWorkbenchContributionsRegistry>(WorkbenchExtensions.Workbench).registerWorkbenchContribution(TestingPeekOpener, LifecyclePhase.Eventually);
 
 registerEditorContribution(Testing.OutputPeekContributionId, TestingOutputPeekController);
 registerEditorContribution(Testing.DecorationsContributionId, TestingDecorations);
diff --git a/src/vs/workbench/contrib/testing/browser/testingExplorerView.ts b/src/vs/workbench/contrib/testing/browser/testingExplorerView.ts
index f6fe7fc1b42..a6a8909acf1 100644
--- a/src/vs/workbench/contrib/testing/browser/testingExplorerView.ts
+++ b/src/vs/workbench/contrib/testing/browser/testingExplorerView.ts
@@ -53,7 +53,7 @@ import { IViewDescriptorService, ViewContainerLocation } from 'vs/workbench/comm
 import { ITestTreeElement, ITestTreeProjection } from 'vs/workbench/contrib/testing/browser/explorerProjections';
 import { HierarchicalByLocationProjection } from 'vs/workbench/contrib/testing/browser/explorerProjections/hierarchalByLocation';
 import { HierarchicalByNameProjection } from 'vs/workbench/contrib/testing/browser/explorerProjections/hierarchalByName';
-import { testingStatesToIcons } from 'vs/workbench/contrib/testing/browser/icons';
+import { testingHiddenIcon, testingStatesToIcons } from 'vs/workbench/contrib/testing/browser/icons';
 import { ITestExplorerFilterState, TestExplorerFilterState, TestingExplorerFilter } from 'vs/workbench/contrib/testing/browser/testingExplorerFilter';
 import { ITestingPeekOpener, TestingOutputPeekController } from 'vs/workbench/contrib/testing/browser/testingOutputPeek';
 import { TestExplorerStateFilter, TestExplorerViewMode, TestExplorerViewSorting, Testing, testStateNames } from 'vs/workbench/contrib/testing/common/constants';
@@ -376,8 +376,8 @@ export class TestingExplorerViewModel extends Disposable {
 	/**
 	 * Re-layout the tree.
 	 */
-	public layout(height: number, width: number): void {
-		this.tree.layout(height, width);
+	public layout(_height: number, _width: number): void {
+		this.tree.layout(); // The tree will measure its container
 	}
 
 	/**
@@ -858,6 +858,7 @@ class TestsRenderer extends Disposable implements ITreeRenderer<ITestTreeElement
 		const name = dom.append(wrapper, dom.$('.name'));
 		const label = this.labels.create(name, { supportHighlights: true });
 
+		dom.append(wrapper, dom.$(ThemeIcon.asCSSSelector(testingHiddenIcon)));
 		const actionBar = new ActionBar(wrapper, {
 			actionViewItemProvider: action =>
 				action instanceof MenuItemAction
@@ -899,10 +900,6 @@ class TestsRenderer extends Disposable implements ITreeRenderer<ITestTreeElement
 			options.title = title;
 			options.fileKind = FileKind.FILE;
 			label.description = element.description;
-			if (testHidden) {
-				const hidden = localize('testHidden', 'hidden');
-				label.description = label.description ? `${label.description} (${hidden})` : hidden;
-			}
 		} else {
 			options.fileKind = FileKind.ROOT_FOLDER;
 		}
@@ -967,7 +964,7 @@ const getTestItemActions = (
 		const actionsDisposable = createAndFillInActionBarActions(menu, {
 			arg: element.test?.item.extId,
 			shouldForwardArgs: true,
-		}, result, g => /^inline/.test(g));
+		}, result, 'inline');
 
 		return { value: result, dispose: () => actionsDisposable.dispose };
 	} finally {
@@ -996,6 +993,8 @@ const getProgressText = ({ passed, runSoFar, skipped, failed }: CountSummary) =>
 	if (failed > 0) {
 		// fix: prevent from rounding to 100 if there's any failed test
 		percent = Math.min(percent, 99.9);
+	} else if (runSoFar === 0) {
+		percent = 0;
 	}
 
 	if (skipped === 0) {
diff --git a/src/vs/workbench/contrib/testing/browser/testingOutputPeek.ts b/src/vs/workbench/contrib/testing/browser/testingOutputPeek.ts
index a62ea201ab8..6a7fe11f7ff 100644
--- a/src/vs/workbench/contrib/testing/browser/testingOutputPeek.ts
+++ b/src/vs/workbench/contrib/testing/browser/testingOutputPeek.ts
@@ -35,7 +35,7 @@ import { ITestItem, ITestMessage, ITestState, TestResultItem } from 'vs/workbenc
 import { TestingContextKeys } from 'vs/workbench/contrib/testing/common/testingContextKeys';
 import { isFailedState } from 'vs/workbench/contrib/testing/common/testingStates';
 import { buildTestUri, parseTestUri, TestUriType } from 'vs/workbench/contrib/testing/common/testingUri';
-import { ITestResult, ITestResultService, TestResultItemChange, TestResultItemChangeReason } from 'vs/workbench/contrib/testing/common/testResultService';
+import { ITestResult, ITestResultService, ResultChangeEvent, TestResultItemChange, TestResultItemChangeReason } from 'vs/workbench/contrib/testing/common/testResultService';
 import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
 
 interface ITestDto {
@@ -176,7 +176,8 @@ export class TestingOutputPeekController extends Disposable implements IEditorCo
 		super();
 		this.visible = TestingContextKeys.isPeekVisible.bindTo(contextKeyService);
 		this._register(editor.onDidChangeModel(() => this.peek.clear()));
-		this._register(testResults.onTestChanged((evt) => this.closePeekOnTestChange(evt)));
+		this._register(testResults.onResultsChanged(this.closePeekOnRunStart, this));
+		this._register(testResults.onTestChanged(this.closePeekOnTestChange, this));
 	}
 
 	/**
@@ -248,6 +249,12 @@ export class TestingOutputPeekController extends Disposable implements IEditorCo
 		}
 	}
 
+	private closePeekOnRunStart(evt: ResultChangeEvent) {
+		if ('started' in evt) {
+			this.peek.clear();
+		}
+	}
+
 	private retrieveTest(uri: URI): ITestDto | undefined {
 		const parts = parseTestUri(uri);
 		if (!parts) {
diff --git a/src/vs/workbench/contrib/testing/common/testServiceImpl.ts b/src/vs/workbench/contrib/testing/common/testServiceImpl.ts
index 279eb3fc359..8e6e601e9fe 100644
--- a/src/vs/workbench/contrib/testing/common/testServiceImpl.ts
+++ b/src/vs/workbench/contrib/testing/common/testServiceImpl.ts
@@ -159,6 +159,9 @@ export class TestService extends Disposable implements ITestService {
 	 */
 	public updateRootProviderCount(delta: number) {
 		this.rootProviderCount += delta;
+		for (const { collection } of this.testSubscriptions.values()) {
+			collection.updatePendingRoots(delta);
+		}
 	}
 
 
@@ -406,8 +409,8 @@ export class MainThreadTestCollection extends AbstractIncrementalTestCollection<
 	/**
 	 * @override
 	 */
-	protected updatePendingRoots(delta: number) {
-		this._pendingRootProviders += delta;
+	public updatePendingRoots(delta: number) {
+		this._pendingRootProviders = Math.max(0, this._pendingRootProviders + delta);
 		this.pendingRootChangeEmitter.fire(this._pendingRootProviders);
 	}
 
diff --git a/src/vs/workbench/contrib/timeline/browser/timelinePane.ts b/src/vs/workbench/contrib/timeline/browser/timelinePane.ts
index d98dba05b91..4644330e7e6 100644
--- a/src/vs/workbench/contrib/timeline/browser/timelinePane.ts
+++ b/src/vs/workbench/contrib/timeline/browser/timelinePane.ts
@@ -1246,7 +1246,7 @@ class TimelinePaneCommands extends Disposable {
 		const primary: IAction[] = [];
 		const secondary: IAction[] = [];
 		const result = { primary, secondary };
-		createAndFillInContextMenuActions(menu, { shouldForwardArgs: true }, result, g => /^inline/.test(g));
+		createAndFillInContextMenuActions(menu, { shouldForwardArgs: true }, result, 'inline');
 
 		menu.dispose();
 
diff --git a/src/vs/workbench/contrib/webview/browser/webviewElement.ts b/src/vs/workbench/contrib/webview/browser/webviewElement.ts
index f6ff3b6e7be..f228247cdb0 100644
--- a/src/vs/workbench/contrib/webview/browser/webviewElement.ts
+++ b/src/vs/workbench/contrib/webview/browser/webviewElement.ts
@@ -4,6 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { addDisposableListener } from 'vs/base/browser/dom';
+import { ThrottledDelayer } from 'vs/base/common/async';
 import { streamToBuffer } from 'vs/base/common/buffer';
 import { CancellationToken } from 'vs/base/common/cancellation';
 import { IDisposable } from 'vs/base/common/lifecycle';
@@ -25,9 +26,13 @@ import { Webview, WebviewContentOptions, WebviewExtensionDescription, WebviewOpt
 import { IWorkbenchEnvironmentService } from 'vs/workbench/services/environment/common/environmentService';
 
 export class IFrameWebview extends BaseWebview<HTMLIFrameElement> implements Webview {
+
 	private readonly _portMappingManager: WebviewPortMappingManager;
 	private _confirmBeforeClose: string;
 
+	private readonly _focusDelayer = this._register(new ThrottledDelayer(10));
+	private _elementFocusImpl!: (options?: FocusOptions | undefined) => void;
+
 	constructor(
 		id: string,
 		options: WebviewOptions,
@@ -96,6 +101,12 @@ export class IFrameWebview extends BaseWebview<HTMLIFrameElement> implements Web
 		element.style.border = 'none';
 		element.style.width = '100%';
 		element.style.height = '100%';
+
+		this._elementFocusImpl = () => element.contentWindow?.focus();
+		element.focus = () => {
+			this.doFocus();
+		};
+
 		return element;
 	}
 
@@ -156,12 +167,6 @@ export class IFrameWebview extends BaseWebview<HTMLIFrameElement> implements Web
 		};
 	}
 
-	focus(): void {
-		if (this.element) {
-			this._send('focus');
-		}
-	}
-
 	showFind(): void {
 		throw new Error('Method not implemented.');
 	}
@@ -276,4 +281,51 @@ export class IFrameWebview extends BaseWebview<HTMLIFrameElement> implements Web
 			}
 		});
 	}
+
+	public focus(): void {
+		this.doFocus();
+
+		// Handle focus change programmatically (do not rely on event from <webview>)
+		this.handleFocusChange(true);
+	}
+
+	private doFocus() {
+		if (!this.element) {
+			return;
+		}
+
+		// Clear the existing focus first if not already on the webview.
+		// This is required because the next part where we set the focus is async.
+		if (document.activeElement && document.activeElement instanceof HTMLElement && document.activeElement !== this.element) {
+			// Don't blur if on the webview because this will also happen async and may unset the focus
+			// after the focus trigger fires below.
+			document.activeElement.blur();
+		}
+
+		// Workaround for https://github.com/microsoft/vscode/issues/75209
+		// Electron's webview.focus is async so for a sequence of actions such as:
+		//
+		// 1. Open webview
+		// 1. Show quick pick from command palette
+		//
+		// We end up focusing the webview after showing the quick pick, which causes
+		// the quick pick to instantly dismiss.
+		//
+		// Workaround this by debouncing the focus and making sure we are not focused on an input
+		// when we try to re-focus.
+		this._focusDelayer.trigger(async () => {
+			if (!this.isFocused || !this.element) {
+				return;
+			}
+			if (document.activeElement && document.activeElement?.tagName !== 'BODY') {
+				return;
+			}
+			try {
+				this._elementFocusImpl();
+			} catch {
+				// noop
+			}
+			this._send('focus');
+		});
+	}
 }
diff --git a/src/vs/workbench/contrib/webview/electron-sandbox/iframeWebviewElement.ts b/src/vs/workbench/contrib/webview/electron-sandbox/iframeWebviewElement.ts
index 5321866d575..46208491e70 100644
--- a/src/vs/workbench/contrib/webview/electron-sandbox/iframeWebviewElement.ts
+++ b/src/vs/workbench/contrib/webview/electron-sandbox/iframeWebviewElement.ts
@@ -3,7 +3,6 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { ThrottledDelayer } from 'vs/base/common/async';
 import { Schemas } from 'vs/base/common/network';
 import { URI } from 'vs/base/common/uri';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
@@ -33,9 +32,6 @@ export class ElectronIframeWebview extends IFrameWebview {
 	private readonly _resourceRequestManager: WebviewResourceRequestManager;
 	private _messagePromise = Promise.resolve();
 
-	private readonly _focusDelayer = this._register(new ThrottledDelayer(10));
-	private _elementFocusImpl!: (options?: FocusOptions | undefined) => void;
-
 	private readonly _webviewKeyboardHandler: WindowIgnoreMenuShortcutsManager;
 
 	constructor(
@@ -73,15 +69,6 @@ export class ElectronIframeWebview extends IFrameWebview {
 		}));
 	}
 
-	protected createElement(options: WebviewOptions, contentOptions: WebviewContentOptions) {
-		const element = super.createElement(options, contentOptions);
-		this._elementFocusImpl = () => element.contentWindow?.focus();
-		element.focus = () => {
-			this.doFocus();
-		};
-		return element;
-	}
-
 	protected initElement(extension: WebviewExtensionDescription | undefined, options: WebviewOptions) {
 		// The extensionId and purpose in the URL are used for filtering in js-debug:
 		this.element!.setAttribute('src', `${Schemas.vscodeWebview}://${this.id}/index.html?id=${this.id}&platform=electron&extensionId=${extension?.id.value ?? ''}&purpose=${options.purpose}`);
@@ -115,51 +102,4 @@ export class ElectronIframeWebview extends IFrameWebview {
 	protected preprocessHtml(value: string): string {
 		return rewriteVsCodeResourceUrls(this.id, value);
 	}
-
-	public focus(): void {
-		this.doFocus();
-
-		// Handle focus change programmatically (do not rely on event from <webview>)
-		this.handleFocusChange(true);
-	}
-
-	private doFocus() {
-		if (!this.element) {
-			return;
-		}
-
-		// Clear the existing focus first if not already on the webview.
-		// This is required because the next part where we set the focus is async.
-		if (document.activeElement && document.activeElement instanceof HTMLElement && document.activeElement !== this.element) {
-			// Don't blur if on the webview because this will also happen async and may unset the focus
-			// after the focus trigger fires below.
-			document.activeElement.blur();
-		}
-
-		// Workaround for https://github.com/microsoft/vscode/issues/75209
-		// Electron's webview.focus is async so for a sequence of actions such as:
-		//
-		// 1. Open webview
-		// 1. Show quick pick from command palette
-		//
-		// We end up focusing the webview after showing the quick pick, which causes
-		// the quick pick to instantly dismiss.
-		//
-		// Workaround this by debouncing the focus and making sure we are not focused on an input
-		// when we try to re-focus.
-		this._focusDelayer.trigger(async () => {
-			if (!this.isFocused || !this.element) {
-				return;
-			}
-			if (document.activeElement && document.activeElement?.tagName !== 'BODY') {
-				return;
-			}
-			try {
-				this._elementFocusImpl();
-			} catch {
-				// noop
-			}
-			this._send('focus');
-		});
-	}
 }
diff --git a/src/vs/workbench/contrib/welcome/common/viewsWelcomeContribution.ts b/src/vs/workbench/contrib/welcome/common/viewsWelcomeContribution.ts
index ff54b32e0e8..f07c1184d4e 100644
--- a/src/vs/workbench/contrib/welcome/common/viewsWelcomeContribution.ts
+++ b/src/vs/workbench/contrib/welcome/common/viewsWelcomeContribution.ts
@@ -10,7 +10,7 @@ import { IWorkbenchContribution } from 'vs/workbench/common/contributions';
 import { IExtensionPoint, IExtensionPointUser } from 'vs/workbench/services/extensions/common/extensionsRegistry';
 import { ViewsWelcomeExtensionPoint, ViewWelcome, ViewIdentifierMap } from './viewsWelcomeExtensionPoint';
 import { Registry } from 'vs/platform/registry/common/platform';
-import { Extensions as ViewContainerExtensions, IViewsRegistry } from 'vs/workbench/common/views';
+import { Extensions as ViewContainerExtensions, IViewContentDescriptor, IViewsRegistry } from 'vs/workbench/common/views';
 
 const viewsRegistry = Registry.as<IViewsRegistry>(ViewContainerExtensions.ViewsRegistry);
 
@@ -32,19 +32,34 @@ export class ViewsWelcomeContribution extends Disposable implements IWorkbenchCo
 				}
 			}
 
+			const welcomesByViewId = new Map<string, Map<ViewWelcome, IViewContentDescriptor>>();
+
 			for (const contribution of added) {
 				for (const welcome of contribution.value) {
-					const id = ViewIdentifierMap[welcome.view] ?? welcome.view;
 					const { group, order } = parseGroupAndOrder(welcome, contribution);
 					const precondition = ContextKeyExpr.deserialize(welcome.enablement);
-					const disposable = viewsRegistry.registerViewWelcomeContent(id, {
+
+					const id = ViewIdentifierMap[welcome.view] ?? welcome.view;
+					let viewContentMap = welcomesByViewId.get(id);
+					if (!viewContentMap) {
+						viewContentMap = new Map();
+						welcomesByViewId.set(id, viewContentMap);
+					}
+
+					viewContentMap.set(welcome, {
 						content: welcome.contents,
 						when: ContextKeyExpr.deserialize(welcome.when),
 						precondition,
 						group,
 						order
 					});
+				}
+			}
 
+			for (const [id, viewContentMap] of welcomesByViewId) {
+				const disposables = viewsRegistry.registerViewWelcomeContent2(id, viewContentMap);
+
+				for (const [welcome, disposable] of disposables) {
 					this.viewWelcomeContents.set(welcome, disposable);
 				}
 			}
diff --git a/src/vs/workbench/contrib/welcome/gettingStarted/browser/gettingStarted.ts b/src/vs/workbench/contrib/welcome/gettingStarted/browser/gettingStarted.ts
index ec87f8a0c03..d99270242a9 100644
--- a/src/vs/workbench/contrib/welcome/gettingStarted/browser/gettingStarted.ts
+++ b/src/vs/workbench/contrib/welcome/gettingStarted/browser/gettingStarted.ts
@@ -565,7 +565,6 @@ export class GettingStartedPage extends EditorPane {
 			this.editorInput.selectedTask = undefined;
 			this.selectTask(undefined);
 			this.setSlide('categories');
-			this.focusFirstUncompletedCategory();
 		});
 	}
 
@@ -623,7 +622,7 @@ export class GettingStartedPage extends EditorPane {
 			slideManager.classList.add('showCategories');
 			this.container.querySelector('.gettingStartedSlideDetails')!.querySelectorAll('button').forEach(button => button.disabled = true);
 			this.container.querySelector('.gettingStartedSlideCategory')!.querySelectorAll('button').forEach(button => button.disabled = false);
-			(this.container.querySelector('.welcomePageFocusElement') as HTMLElement)?.focus();
+			this.focusFirstUncompletedCategory();
 		} else {
 			slideManager.classList.add('showDetails');
 			slideManager.classList.remove('showCategories');
diff --git a/src/vs/workbench/contrib/welcome/page/browser/welcomePage.css b/src/vs/workbench/contrib/welcome/page/browser/welcomePage.css
index 738ce140c1a..76546c30d4e 100644
--- a/src/vs/workbench/contrib/welcome/page/browser/welcomePage.css
+++ b/src/vs/workbench/contrib/welcome/page/browser/welcomePage.css
@@ -111,6 +111,14 @@
 	text-overflow: ellipsis;
 }
 
+.monaco-workbench .part.editor > .content .welcomePage .splash .recent {
+	min-height: 160px;
+}
+
+.monaco-workbench .part.editor > .content .welcomePageContainer.max-height-685px .splash .recent {
+	min-height: unset;
+}
+
 .monaco-workbench .part.editor > .content .welcomePage.emptyRecent .splash .recent .list {
 	display: none;
 }
diff --git a/src/vs/workbench/contrib/workspace/browser/workspaceTrustEditor.css b/src/vs/workbench/contrib/workspace/browser/workspaceTrustEditor.css
index 45ec02a5da4..6f715f842a1 100644
--- a/src/vs/workbench/contrib/workspace/browser/workspaceTrustEditor.css
+++ b/src/vs/workbench/contrib/workspace/browser/workspaceTrustEditor.css
@@ -24,9 +24,15 @@
 .workspace-trust-editor.settings-editor .workspace-trust-header .workspace-trust-title {
 	font-size: 24px;
 	font-weight: 600;
+	line-height: 32px;
 	padding: 10px 0px;
 }
 
+.workspace-trust-editor.settings-editor .workspace-trust-header .workspace-trust-description {
+	cursor: default;
+	user-select: text;
+}
+
 /** Buttons Container */
 .workspace-trust-editor.settings-editor .workspace-trust-header .workspace-trust-buttons-row {
 	display: flex;
@@ -71,16 +77,31 @@
 	border-color: #327E36;
 }
 
+/** Features List */
+.workspace-trust-editor.settings-editor > .workspace-trust-features-list {
+	padding: 14px;
+	cursor: default;
+	user-select: text;
+}
+
+.workspace-trust-editor.settings-editor > .workspace-trust-features-list  .workspace-trust-extensions-list-header {
+	font-size: 16px;
+	font-weight: 600;
+	line-height: 32px;
+}
+
 /** Settings */
+.workspace-trust-editor.settings-editor > .settings-body > .settings-tree-container .shadow.top {
+	left: initial;
+	margin-left: initial;
+	max-width: initial;
+}
+
 .workspace-trust-editor.settings-editor > .settings-body .settings-tree-container .monaco-list-row .monaco-tl-contents {
 	padding-left: 0;
 	padding-right: 0;
 }
 
-.workspace-trust-editor.settings-editor > .settings-body .settings-tree-container .monaco-list-row .monaco-tl-contents .setting-list-edit-row {
-	margin-top: 4px;
-}
-
 .workspace-trust-editor.settings-editor > .settings-body .settings-tree-container .monaco-list-row .monaco-tl-contents .setting-list-edit-row > .setting-list-valueInput {
 	width: 100%;
 	max-width: 100%;
diff --git a/src/vs/workbench/contrib/workspace/browser/workspaceTrustEditor.ts b/src/vs/workbench/contrib/workspace/browser/workspaceTrustEditor.ts
index 58998a1e731..644f0e352f1 100644
--- a/src/vs/workbench/contrib/workspace/browser/workspaceTrustEditor.ts
+++ b/src/vs/workbench/contrib/workspace/browser/workspaceTrustEditor.ts
@@ -10,15 +10,17 @@ import { Iterable } from 'vs/base/common/iterator';
 import { isArray } from 'vs/base/common/types';
 import { URI } from 'vs/base/common/uri';
 import { localize } from 'vs/nls';
-import { ICommandService } from 'vs/platform/commands/common/commands';
+import { IExtensionDescription } from 'vs/platform/extensions/common/extensions';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { IStorageService } from 'vs/platform/storage/common/storage';
 import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
 import { IThemeService } from 'vs/platform/theme/common/themeService';
+import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
 import { WorkspaceTrustState } from 'vs/platform/workspace/common/workspaceTrust';
 import { EditorPane } from 'vs/workbench/browser/parts/editor/editorPane';
 import { EditorOptions, IEditorOpenContext } from 'vs/workbench/common/editor';
 import { IWorkspaceTrustSettingChangeEvent, WorkspaceTrustSettingArrayRenderer, WorkspaceTrustTree, WorkspaceTrustTreeModel } from 'vs/workbench/contrib/workspace/browser/workspaceTrustTree';
+import { IExtensionService } from 'vs/workbench/services/extensions/common/extensions';
 import { WorkspaceTrustEditorInput } from 'vs/workbench/services/workspaces/browser/workspaceTrustEditorInput';
 import { WorkspaceTrustEditorModel } from 'vs/workbench/services/workspaces/common/workspaceTrust';
 
@@ -29,16 +31,19 @@ export class WorkspaceTrustEditor extends EditorPane {
 	private headerTitle!: HTMLElement;
 	private headerDescription!: HTMLElement;
 	private headerButtons!: HTMLElement;
+	private extensionsListEntriesContainer!: HTMLElement;
 	private configurationContainer!: HTMLElement;
 	private trustSettingsTree!: WorkspaceTrustTree;
 	private workspaceTrustSettingsTreeModel!: WorkspaceTrustTreeModel;
 	private workspaceTrustEditorModel!: WorkspaceTrustEditorModel;
+	private extensionsRequiringTrust: IExtensionDescription[] = [];
 
 	constructor(
 		@ITelemetryService telemetryService: ITelemetryService,
 		@IThemeService themeService: IThemeService,
 		@IStorageService storageService: IStorageService,
-		@ICommandService private readonly commandService: ICommandService,
+		@IWorkspaceContextService private readonly workspaceService: IWorkspaceContextService,
+		@IExtensionService private readonly extensionService: IExtensionService,
 		@IInstantiationService private readonly instantiationService: IInstantiationService
 	) { super(WorkspaceTrustEditor.ID, telemetryService, themeService, storageService); }
 
@@ -46,6 +51,7 @@ export class WorkspaceTrustEditor extends EditorPane {
 		this.rootElement = append(parent, $('.workspace-trust-editor.settings-editor', { tabindex: '-1' }));
 
 		this.createHeaderElement(this.rootElement);
+		this.createFeatureListElement(this.rootElement);
 		this.createConfigurationElement(this.rootElement);
 	}
 
@@ -63,6 +69,8 @@ export class WorkspaceTrustEditor extends EditorPane {
 			this.render(model);
 		}));
 
+		this.extensionsRequiringTrust = (await this.extensionService.getExtensions()).filter(ext => ext.requiresWorkspaceTrust);
+
 		this.render(model);
 
 		this.workspaceTrustEditorModel = model;
@@ -82,26 +90,27 @@ export class WorkspaceTrustEditor extends EditorPane {
 	private getHeaderTitleText(trustState: WorkspaceTrustState): string {
 		switch (trustState) {
 			case WorkspaceTrustState.Trusted:
-				return localize('trustedHeader', "This Workspace is Trusted");
+				return localize('trustedHeader', "This Workspace Is Trusted");
 			case WorkspaceTrustState.Untrusted:
-				return localize('untrustedHeader', "This Workspace is Not Trusted");
+				return localize('untrustedHeader', "This Workspace Is Not Trusted");
 			case WorkspaceTrustState.Unknown:
-				return localize('unknownHeader', "This Workspace has Not Been Trusted");
+				return localize('unknownHeader', "This Workspace Has Not Been Trusted");
 		}
 	}
 
 	private getHeaderDescriptionText(trustState: WorkspaceTrustState): string {
 		switch (trustState) {
 			case WorkspaceTrustState.Trusted:
-				return localize('trustedHeaderDescription', "All features requiring trust in this workspace are enabled. Below is the current list of features that will be disabled you grant trust to the workspace. Note that after trust is given, new features requiring trust will automatically inheret the current workspace trust status.");
+				return localize('trustedHeaderDescription', "All features requiring trust in this workspace are enabled. Below is the current list of features that will be disabled until you grant trust to the workspace. Note that after trust is given, new features requiring trust will automatically inheret the current workspace trust status.");
 			case WorkspaceTrustState.Untrusted:
-				return localize('untrustedHeaderDescription', "This workspace has limited functionality as some features will not work until trust is given to the current workspace. Below is the current list of features that will be disabled you grant trust to the workspace. Note that after trust is given, new features requiring trust will automatically inherit the current workspace trust status.");
+				return localize('untrustedHeaderDescription', "This workspace has limited functionality as some features will not work until trust is given to the current workspace. Below is the current list of features that will be disabled until you grant trust to the workspace. Note that after trust is given, new features requiring trust will automatically inherit the current workspace trust status.");
 			case WorkspaceTrustState.Unknown:
-				return localize('unknownHeaderDescription', "This workspace has limited functionality as some features will not work until trust is given to the current workspace. Below is the current list of features that will be disabled you grant trust to the workspace. Note that after trust is given, new features requiring trust will automatically inherit the current workspace trust status.");
+				return localize('unknownHeaderDescription', "This workspace has limited functionality as some features will not work until trust is given to the current workspace. Below is the current list of features that will be disabled until you grant trust to the workspace. Note that after trust is given, new features requiring trust will automatically inherit the current workspace trust status.");
 		}
 	}
 
 	private render(model: WorkspaceTrustEditorModel): void {
+		// Header Section
 		this.headerTitle.innerText = this.getHeaderTitleText(model.currentWorkspaceTrustState);
 		this.headerDescription.innerText = this.getHeaderDescriptionText(model.currentWorkspaceTrustState);
 		this.headerContainer.className = this.getHeaderContainerClass(model.currentWorkspaceTrustState);
@@ -109,30 +118,44 @@ export class WorkspaceTrustEditor extends EditorPane {
 		clearNode(this.headerButtons);
 		const buttonBar = this._register(new ButtonBar(this.headerButtons));
 
-		const createButton = (label: string, command: string) => {
-			const button = buttonBar.addButton({ title: true });
+		const createButton = (label: string, callback: () => void) => {
+			const button = buttonBar.addButton();
 			button.label = label;
 			this._register(button.onDidClick(e => {
 				if (e) {
 					EventHelper.stop(e);
 				}
 
-				this.commandService.executeCommand(command);
+				callback();
 			}));
 		};
 
+
+		const setTrustState = (state: WorkspaceTrustState) => {
+			this.workspaceService.getWorkspace().folders.forEach(folder => {
+				this.workspaceTrustEditorModel.dataModel.setFolderTrustState(folder.uri, state);
+			});
+		};
+
 		if (model.currentWorkspaceTrustState !== WorkspaceTrustState.Trusted) {
-			createButton(localize('trustButton', "Trust"), 'workbench.trust.grant');
+			createButton(localize('trustButton', "Trust"), () => setTrustState(WorkspaceTrustState.Trusted));
 		}
 
 		if (model.currentWorkspaceTrustState !== WorkspaceTrustState.Untrusted) {
-			createButton(localize('doNotTrustButton', "Don't Trust"), 'workbench.trust.deny');
+			createButton(localize('doNotTrustButton', "Don't Trust"), () => setTrustState(WorkspaceTrustState.Untrusted));
 		}
 
-		createButton(localize('learnMore', "Learn More"), 'workbench.trust.learnMore');
+		createButton(localize('learnMore', "Learn More"), () => { });
 
+		// Features List
+		clearNode(this.extensionsListEntriesContainer);
+		this.extensionsRequiringTrust.forEach(ext => {
+			const extensionListItem = append(this.extensionsListEntriesContainer, $('.workspace-trust-extension'));
+			extensionListItem.innerText = ext.displayName || ext.name;
+		});
+
+		// Configuration Tree
 		this.workspaceTrustSettingsTreeModel.update(model.dataModel.getTrustStateInfo());
-
 		this.trustSettingsTree.setChildren(null, Iterable.map(this.workspaceTrustSettingsTreeModel.settings, s => { return { element: s }; }));
 	}
 
@@ -160,6 +183,14 @@ export class WorkspaceTrustEditor extends EditorPane {
 		this._register(renderer.onDidChangeSetting(e => this.onDidChangeSetting(e)));
 	}
 
+	private createFeatureListElement(parent: HTMLElement): void {
+		const featuresListContainer = append(parent, $('.workspace-trust-features-list'));
+		const extensionsListContainer = append(featuresListContainer, $('.workspace-trust-extensions-list'));
+		const extensionsListHeader = append(extensionsListContainer, $('.workspace-trust-extensions-list-header'));
+		extensionsListHeader.innerText = localize('extListHeader', "Extensions Requiring Workspace Trust");
+		this.extensionsListEntriesContainer = append(extensionsListContainer, $('.workspace-trust-extensions-list-entries'));
+	}
+
 	private onDidChangeSetting(change: IWorkspaceTrustSettingChangeEvent) {
 		if (this.workspaceTrustEditorModel) {
 			if (isArray(change.value)) {
diff --git a/src/vs/workbench/electron-browser/desktop.main.ts b/src/vs/workbench/electron-browser/desktop.main.ts
index 8ffa5670f52..93f8bd5bd88 100644
--- a/src/vs/workbench/electron-browser/desktop.main.ts
+++ b/src/vs/workbench/electron-browser/desktop.main.ts
@@ -20,10 +20,8 @@ import { INativeWorkbenchConfiguration, INativeWorkbenchEnvironmentService } fro
 import { ServiceCollection } from 'vs/platform/instantiation/common/serviceCollection';
 import { isSingleFolderWorkspaceIdentifier, isWorkspaceIdentifier, IWorkspaceInitializationPayload, reviveIdentifier } from 'vs/platform/workspaces/common/workspaces';
 import { ILoggerService, ILogService } from 'vs/platform/log/common/log';
-import { NativeStorageService } from 'vs/platform/storage/node/storageService';
-import { NativeStorageService2 } from 'vs/platform/storage/electron-sandbox/storageService2';
+import { NativeStorageService } from 'vs/platform/storage/electron-sandbox/storageService';
 import { Schemas } from 'vs/base/common/network';
-import { StorageDatabaseChannelClient } from 'vs/platform/storage/common/storageIpc';
 import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
 import { IWorkbenchConfigurationService } from 'vs/workbench/services/configuration/common/configuration';
 import { IStorageService } from 'vs/platform/storage/common/storage';
@@ -54,6 +52,7 @@ import { KeyboardLayoutService } from 'vs/workbench/services/keybinding/electron
 import { IKeyboardLayoutService } from 'vs/platform/keyboardLayout/common/keyboardLayout';
 import { ElectronIPCMainProcessService } from 'vs/platform/ipc/electron-sandbox/mainProcessService';
 import { LoggerChannelClient } from 'vs/platform/log/common/logIpc';
+import { IEnvironmentService, INativeEnvironmentService } from 'vs/platform/environment/common/environment';
 
 class DesktopMain extends Disposable {
 
@@ -134,14 +133,14 @@ class DesktopMain extends Disposable {
 		services.logService.trace('workbench configuration', JSON.stringify(this.configuration));
 	}
 
-	private registerListeners(workbench: Workbench, storageService: NativeStorageService | NativeStorageService2): void {
+	private registerListeners(workbench: Workbench, storageService: NativeStorageService): void {
 
 		// Workbench Lifecycle
 		this._register(workbench.onWillShutdown(event => event.join(storageService.close(), 'join.closeStorage')));
 		this._register(workbench.onShutdown(() => this.dispose()));
 	}
 
-	private async initServices(): Promise<{ serviceCollection: ServiceCollection, logService: ILogService, storageService: NativeStorageService | NativeStorageService2 }> {
+	private async initServices(): Promise<{ serviceCollection: ServiceCollection, logService: ILogService, storageService: NativeStorageService }> {
 		const serviceCollection = new ServiceCollection();
 
 
@@ -163,6 +162,8 @@ class DesktopMain extends Disposable {
 		serviceCollection.set(IMainProcessService, mainProcessService);
 
 		// Environment
+		serviceCollection.set(IEnvironmentService, this.environmentService);
+		serviceCollection.set(INativeEnvironmentService, this.environmentService);
 		serviceCollection.set(IWorkbenchEnvironmentService, this.environmentService);
 		serviceCollection.set(INativeWorkbenchEnvironmentService, this.environmentService);
 
@@ -323,14 +324,8 @@ class DesktopMain extends Disposable {
 		}
 	}
 
-	private async createStorageService(payload: IWorkspaceInitializationPayload, logService: ILogService, mainProcessService: IMainProcessService): Promise<NativeStorageService | NativeStorageService2> {
-		let storageService: NativeStorageService | NativeStorageService2;
-		if (this.configuration.enableExperimentalMainProcessWorkspaceStorage) {
-			storageService = new NativeStorageService2(payload, mainProcessService, this.environmentService);
-		} else {
-			const storageDataBaseClient = new StorageDatabaseChannelClient(mainProcessService.getChannel('storage'), payload);
-			storageService = new NativeStorageService(storageDataBaseClient.globalStorage, payload, logService, this.environmentService);
-		}
+	private async createStorageService(payload: IWorkspaceInitializationPayload, logService: ILogService, mainProcessService: IMainProcessService): Promise<NativeStorageService> {
+		const storageService = new NativeStorageService(payload, mainProcessService, this.environmentService);
 
 		try {
 			await storageService.initialize();
diff --git a/src/vs/workbench/electron-sandbox/desktop.contribution.ts b/src/vs/workbench/electron-sandbox/desktop.contribution.ts
index 1b1971fd14e..299561eb5e1 100644
--- a/src/vs/workbench/electron-sandbox/desktop.contribution.ts
+++ b/src/vs/workbench/electron-sandbox/desktop.contribution.ts
@@ -273,12 +273,6 @@ import { IJSONSchema } from 'vs/base/common/jsonSchema';
 				'scope': ConfigurationScope.APPLICATION,
 				'description': localize('window.clickThroughInactive', "If enabled, clicking on an inactive window will both activate the window and trigger the element under the mouse if it is clickable. If disabled, clicking anywhere on an inactive window will activate it only and a second click is required on the element."),
 				'included': isMacintosh
-			},
-			'window.enableExperimentalMainProcessWorkspaceStorage': {
-				'type': 'boolean',
-				'default': false,
-				'scope': ConfigurationScope.APPLICATION,
-				'description': localize('window.localize', "Enables workspace storage access from the main process. Requires a restart to take effect."),
 			}
 		}
 	});
diff --git a/src/vs/workbench/electron-sandbox/desktop.main.ts b/src/vs/workbench/electron-sandbox/desktop.main.ts
index 2eb3a45d7a7..02389b6b1c7 100644
--- a/src/vs/workbench/electron-sandbox/desktop.main.ts
+++ b/src/vs/workbench/electron-sandbox/desktop.main.ts
@@ -16,7 +16,7 @@ import { INativeWorkbenchConfiguration, INativeWorkbenchEnvironmentService } fro
 import { ServiceCollection } from 'vs/platform/instantiation/common/serviceCollection';
 import { isSingleFolderWorkspaceIdentifier, isWorkspaceIdentifier, IWorkspaceInitializationPayload, reviveIdentifier } from 'vs/platform/workspaces/common/workspaces';
 import { ILoggerService, ILogService } from 'vs/platform/log/common/log';
-import { NativeStorageService2 } from 'vs/platform/storage/electron-sandbox/storageService2';
+import { NativeStorageService } from 'vs/platform/storage/electron-sandbox/storageService';
 import { Schemas } from 'vs/base/common/network';
 import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
 import { IWorkbenchConfigurationService } from 'vs/workbench/services/configuration/common/configuration';
@@ -44,6 +44,7 @@ import { IKeyboardLayoutService } from 'vs/platform/keyboardLayout/common/keyboa
 import { ElectronIPCMainProcessService } from 'vs/platform/ipc/electron-sandbox/mainProcessService';
 import { SimpleConfigurationService, simpleFileSystemProvider, SimpleSignService, SimpleNativeWorkbenchEnvironmentService, SimpleWorkspaceService, SimpleLogService } from 'vs/workbench/electron-sandbox/sandbox.simpleservices';
 import { LoggerChannelClient } from 'vs/platform/log/common/logIpc';
+import { IEnvironmentService, INativeEnvironmentService } from 'vs/platform/environment/common/environment';
 
 class DesktopMain extends Disposable {
 
@@ -116,14 +117,14 @@ class DesktopMain extends Disposable {
 		services.logService.trace('workbench configuration', JSON.stringify(this.configuration));
 	}
 
-	private registerListeners(workbench: Workbench, storageService: NativeStorageService2): void {
+	private registerListeners(workbench: Workbench, storageService: NativeStorageService): void {
 
 		// Workbench Lifecycle
 		this._register(workbench.onWillShutdown(event => event.join(storageService.close(), 'join.closeStorage')));
 		this._register(workbench.onShutdown(() => this.dispose()));
 	}
 
-	private async initServices(): Promise<{ serviceCollection: ServiceCollection, logService: ILogService, storageService: NativeStorageService2 }> {
+	private async initServices(): Promise<{ serviceCollection: ServiceCollection, logService: ILogService, storageService: NativeStorageService }> {
 		const serviceCollection = new ServiceCollection();
 
 
@@ -145,6 +146,8 @@ class DesktopMain extends Disposable {
 		serviceCollection.set(IMainProcessService, mainProcessService);
 
 		// Environment
+		serviceCollection.set(IEnvironmentService, this.environmentService);
+		serviceCollection.set(INativeEnvironmentService, this.environmentService);
 		serviceCollection.set(IWorkbenchEnvironmentService, this.environmentService);
 		serviceCollection.set(INativeWorkbenchEnvironmentService, this.environmentService);
 
@@ -294,8 +297,8 @@ class DesktopMain extends Disposable {
 		return new SimpleWorkspaceService();
 	}
 
-	private async createStorageService(payload: IWorkspaceInitializationPayload, mainProcessService: IMainProcessService): Promise<NativeStorageService2> {
-		const storageService = new NativeStorageService2(payload, mainProcessService, this.environmentService);
+	private async createStorageService(payload: IWorkspaceInitializationPayload, mainProcessService: IMainProcessService): Promise<NativeStorageService> {
+		const storageService = new NativeStorageService(payload, mainProcessService, this.environmentService);
 
 		try {
 			await storageService.initialize();
diff --git a/src/vs/workbench/electron-sandbox/window.ts b/src/vs/workbench/electron-sandbox/window.ts
index dcdfd690171..6238f5c5a21 100644
--- a/src/vs/workbench/electron-sandbox/window.ts
+++ b/src/vs/workbench/electron-sandbox/window.ts
@@ -534,8 +534,10 @@ export class NativeWindow extends Disposable {
 						} : undefined;
 						const tunnel = await this.tunnelService.openTunnel(addressProvider, portMappingRequest.address, portMappingRequest.port);
 						if (tunnel) {
+							const addressAsUri = URI.parse(tunnel.localAddress);
+							const resolved = addressAsUri.scheme.startsWith(uri.scheme) ? addressAsUri : uri.with({ authority: tunnel.localAddress });
 							return {
-								resolved: uri.with({ authority: tunnel.localAddress }),
+								resolved,
 								dispose: () => tunnel.dispose(),
 							};
 						}
diff --git a/src/vs/workbench/services/authentication/browser/authenticationService.ts b/src/vs/workbench/services/authentication/browser/authenticationService.ts
index 8bf1a1dd45f..1ac5f662b31 100644
--- a/src/vs/workbench/services/authentication/browser/authenticationService.ts
+++ b/src/vs/workbench/services/authentication/browser/authenticationService.ts
@@ -18,10 +18,6 @@ import { IStorageService, StorageScope, StorageTarget } from 'vs/platform/storag
 import { IWorkbenchEnvironmentService } from 'vs/workbench/services/environment/common/environmentService';
 import { IProductService } from 'vs/platform/product/common/productService';
 import { isString } from 'vs/base/common/types';
-import { ExtensionsRegistry } from 'vs/workbench/services/extensions/common/extensionsRegistry';
-import { IJSONSchema } from 'vs/base/common/jsonSchema';
-import { flatten } from 'vs/base/common/arrays';
-import { isFalsyOrWhitespace } from 'vs/base/common/strings';
 import { ActivationKind, IExtensionService } from 'vs/workbench/services/extensions/common/extensions';
 import { IDialogService } from 'vs/platform/dialogs/common/dialogs';
 import { Severity } from 'vs/platform/notification/common/notification';
@@ -121,11 +117,6 @@ export interface IAuthenticationService {
 	readonly onDidUnregisterAuthenticationProvider: Event<AuthenticationProviderInformation>;
 
 	readonly onDidChangeSessions: Event<{ providerId: string, label: string, event: AuthenticationSessionsChangeEvent }>;
-
-	// TODO @RMacfarlane completely remove this property
-	declaredProviders: AuthenticationProviderInformation[];
-	readonly onDidChangeDeclaredProviders: Event<AuthenticationProviderInformation[]>;
-
 	getSessions(id: string, scopes?: string[], activateImmediate?: boolean): Promise<ReadonlyArray<AuthenticationSession>>;
 	getLabel(providerId: string): string;
 	supportsMultipleAccounts(providerId: string): boolean;
@@ -168,29 +159,6 @@ CommandsRegistry.registerCommand('workbench.getCodeExchangeProxyEndpoints', func
 	return environmentService.options?.codeExchangeProxyEndpoints;
 });
 
-const authenticationDefinitionSchema: IJSONSchema = {
-	type: 'object',
-	additionalProperties: false,
-	properties: {
-		id: {
-			type: 'string',
-			description: nls.localize('authentication.id', 'The id of the authentication provider.')
-		},
-		label: {
-			type: 'string',
-			description: nls.localize('authentication.label', 'The human readable name of the authentication provider.'),
-		}
-	}
-};
-
-const authenticationExtPoint = ExtensionsRegistry.registerExtensionPoint<AuthenticationProviderInformation[]>({
-	extensionPoint: 'authentication',
-	jsonSchema: {
-		description: nls.localize({ key: 'authenticationExtensionPoint', comment: [`'Contributes' means adds here`] }, 'Contributes authentication'),
-		type: 'array',
-		items: authenticationDefinitionSchema
-	}
-});
 
 export class AuthenticationService extends Disposable implements IAuthenticationService {
 	declare readonly _serviceBrand: undefined;
@@ -201,11 +169,6 @@ export class AuthenticationService extends Disposable implements IAuthentication
 
 	private _authenticationProviders: Map<string, MainThreadAuthenticationProvider> = new Map<string, MainThreadAuthenticationProvider>();
 
-	/**
-	 * All providers that have been statically declared by extensions. These may not be registered.
-	 */
-	declaredProviders: AuthenticationProviderInformation[] = [];
-
 	private _onDidRegisterAuthenticationProvider: Emitter<AuthenticationProviderInformation> = this._register(new Emitter<AuthenticationProviderInformation>());
 	readonly onDidRegisterAuthenticationProvider: Event<AuthenticationProviderInformation> = this._onDidRegisterAuthenticationProvider.event;
 
@@ -215,9 +178,6 @@ export class AuthenticationService extends Disposable implements IAuthentication
 	private _onDidChangeSessions: Emitter<{ providerId: string, label: string, event: AuthenticationSessionsChangeEvent }> = this._register(new Emitter<{ providerId: string, label: string, event: AuthenticationSessionsChangeEvent }>());
 	readonly onDidChangeSessions: Event<{ providerId: string, label: string, event: AuthenticationSessionsChangeEvent }> = this._onDidChangeSessions.event;
 
-	private _onDidChangeDeclaredProviders: Emitter<AuthenticationProviderInformation[]> = this._register(new Emitter<AuthenticationProviderInformation[]>());
-	readonly onDidChangeDeclaredProviders: Event<AuthenticationProviderInformation[]> = this._onDidChangeDeclaredProviders.event;
-
 	constructor(
 		@IActivityService private readonly activityService: IActivityService,
 		@IExtensionService private readonly extensionService: IExtensionService,
@@ -234,38 +194,6 @@ export class AuthenticationService extends Disposable implements IAuthentication
 				precondition: ContextKeyExpr.false()
 			},
 		});
-
-		authenticationExtPoint.setHandler((extensions, { added, removed }) => {
-			added.forEach(point => {
-				for (const provider of point.value) {
-					if (isFalsyOrWhitespace(provider.id)) {
-						point.collector.error(nls.localize('authentication.missingId', 'An authentication contribution must specify an id.'));
-						continue;
-					}
-
-					if (isFalsyOrWhitespace(provider.label)) {
-						point.collector.error(nls.localize('authentication.missingLabel', 'An authentication contribution must specify a label.'));
-						continue;
-					}
-
-					if (!this.declaredProviders.some(p => p.id === provider.id)) {
-						this.declaredProviders.push(provider);
-					} else {
-						point.collector.error(nls.localize('authentication.idConflict', "This authentication id '{0}' has already been registered", provider.id));
-					}
-				}
-			});
-
-			const removedExtPoints = flatten(removed.map(r => r.value));
-			removedExtPoints.forEach(point => {
-				const index = this.declaredProviders.findIndex(provider => provider.id === point.id);
-				if (index > -1) {
-					this.declaredProviders.splice(index, 1);
-				}
-			});
-
-			this._onDidChangeDeclaredProviders.fire(this.declaredProviders);
-		});
 	}
 
 	getProviderIds(): string[] {
diff --git a/src/vs/workbench/services/configuration/browser/configuration.ts b/src/vs/workbench/services/configuration/browser/configuration.ts
index c37f6a2bc67..d9f5edd03ed 100644
--- a/src/vs/workbench/services/configuration/browser/configuration.ts
+++ b/src/vs/workbench/services/configuration/browser/configuration.ts
@@ -7,7 +7,7 @@ import { URI } from 'vs/base/common/uri';
 import { Event, Emitter } from 'vs/base/common/event';
 import * as errors from 'vs/base/common/errors';
 import { Disposable, IDisposable, dispose, toDisposable, MutableDisposable, combinedDisposable, DisposableStore } from 'vs/base/common/lifecycle';
-import { RunOnceScheduler, timeout } from 'vs/base/common/async';
+import { RunOnceScheduler } from 'vs/base/common/async';
 import { FileChangeType, FileChangesEvent, IFileService, whenProviderRegistered, FileOperationError, FileOperationResult } from 'vs/platform/files/common/files';
 import { ConfigurationModel, ConfigurationModelParser, UserSettings } from 'vs/platform/configuration/common/configurationModels';
 import { WorkspaceConfigurationModelParser, StandaloneConfigurationModelParser } from 'vs/workbench/services/configuration/common/configurationModels';
@@ -23,7 +23,6 @@ import { IRemoteAgentService } from 'vs/workbench/services/remote/common/remoteA
 import { hash } from 'vs/base/common/hash';
 import { IUriIdentityService } from 'vs/workbench/services/uriIdentity/common/uriIdentity';
 import { ILogService } from 'vs/platform/log/common/log';
-import { ResourceMap } from 'vs/base/common/map';
 
 export class UserConfiguration extends Disposable {
 
@@ -86,10 +85,6 @@ class FileServiceBasedConfiguration extends Disposable {
 	private readonly _onDidChange: Emitter<void> = this._register(new Emitter<void>());
 	readonly onDidChange: Event<void> = this._onDidChange.event;
 
-	private readonly resourcesContentMap = new ResourceMap<boolean>(uri => this.uriIdentityService.extUri.getComparisonKey(uri));
-
-	private disposed: boolean = false;
-
 	constructor(
 		name: string,
 		private readonly settingsResources: URI[],
@@ -107,31 +102,18 @@ class FileServiceBasedConfiguration extends Disposable {
 		this._cache = new ConfigurationModel();
 
 		this._register(Event.debounce(Event.filter(this.fileService.onDidFilesChange, e => this.handleFileEvents(e)), () => undefined, 100)(() => this._onDidChange.fire()));
-		this._register(toDisposable(() => this.disposed = true));
 	}
 
 	async loadConfiguration(): Promise<ConfigurationModel> {
 		const resolveContents = async (resources: URI[]): Promise<(string | undefined)[]> => {
 			return Promise.all(resources.map(async resource => {
 				try {
-					let content = (await this.fileService.readFile(resource)).value.toString();
-
-					// If file is empty and had content before then file would have been truncated by node because of parallel writes and reads
-					// To prevent such case, retry reading the file in 20ms intervals until file has content or max 5 trials or disposed.
-					// https://github.com/microsoft/vscode/issues/115740
-					for (let trial = 1; !content && this.resourcesContentMap.get(resource) && !this.disposed && trial <= 5; trial++) {
-						await timeout(20);
-						this.logService.debug(`Retry (${trial}): Reading the configuration file`, resource.toString());
-						content = (await this.fileService.readFile(resource)).value.toString();
-					}
-
-					this.resourcesContentMap.set(resource, !!content);
+					const content = (await this.fileService.readFile(resource, { atomic: true })).value.toString();
 					if (!content) {
 						this.logService.debug(`Configuration file '${resource.toString()}' is empty`);
 					}
 					return content;
 				} catch (error) {
-					this.resourcesContentMap.delete(resource);
 					this.logService.trace(`Error while resolving configuration file '${resource.toString()}': ${errors.getErrorMessage(error)}`);
 					if ((<FileOperationError>error).fileOperationResult !== FileOperationResult.FILE_NOT_FOUND
 						&& (<FileOperationError>error).fileOperationResult !== FileOperationResult.FILE_NOT_DIRECTORY) {
diff --git a/src/vs/platform/display/common/displayMainService.ts b/src/vs/workbench/services/configuration/test/common/testServices.ts
similarity index 52%
rename from src/vs/platform/display/common/displayMainService.ts
rename to src/vs/workbench/services/configuration/test/common/testServices.ts
index 44d79f8d545..3771f39ba66 100644
--- a/src/vs/platform/display/common/displayMainService.ts
+++ b/src/vs/workbench/services/configuration/test/common/testServices.ts
@@ -3,9 +3,11 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Event } from 'vs/base/common/event';
+import { URI } from 'vs/base/common/uri';
+import { IJSONEditingService, IJSONValue } from 'vs/workbench/services/configuration/common/jsonEditing';
 
-export interface IDisplayMainService {
-	readonly _serviceBrand: undefined;
-	readonly onDidDisplayChanged: Event<void>;
+export class TestJSONEditingService implements IJSONEditingService {
+	_serviceBrand: any;
+
+	async write(resource: URI, values: IJSONValue[], save: boolean): Promise<void> { }
 }
diff --git a/src/vs/workbench/services/configurationResolver/browser/configurationResolverService.ts b/src/vs/workbench/services/configurationResolver/browser/configurationResolverService.ts
index c041953c116..1f77581456a 100644
--- a/src/vs/workbench/services/configurationResolver/browser/configurationResolverService.ts
+++ b/src/vs/workbench/services/configurationResolver/browser/configurationResolverService.ts
@@ -17,9 +17,8 @@ import { IEditorService } from 'vs/workbench/services/editor/common/editorServic
 import { AbstractVariableResolverService } from 'vs/workbench/services/configurationResolver/common/variableResolver';
 import { isCodeEditor } from 'vs/editor/browser/editorBrowser';
 import { IQuickInputService, IInputOptions, IQuickPickItem, IPickOptions } from 'vs/platform/quickinput/common/quickInput';
-import { ConfiguredInput, IConfigurationResolverService } from 'vs/workbench/services/configurationResolver/common/configurationResolver';
+import { ConfiguredInput } from 'vs/workbench/services/configurationResolver/common/configurationResolver';
 import { IProcessEnvironment } from 'vs/base/common/platform';
-import { registerSingleton } from 'vs/platform/instantiation/common/extensions';
 import { ILabelService } from 'vs/platform/label/common/label';
 
 export abstract class BaseConfigurationResolverService extends AbstractVariableResolverService {
@@ -373,5 +372,3 @@ export class ConfigurationResolverService extends BaseConfigurationResolverServi
 		super({ getAppRoot: () => undefined, getExecPath: () => undefined }, Object.create(null), editorService, configurationService, commandService, workspaceContextService, quickInputService, labelService);
 	}
 }
-
-registerSingleton(IConfigurationResolverService, ConfigurationResolverService, true);
diff --git a/src/vs/workbench/services/contextmenu/electron-sandbox/contextmenuService.ts b/src/vs/workbench/services/contextmenu/electron-sandbox/contextmenuService.ts
index 09ea04d89b6..deefcdc30ba 100644
--- a/src/vs/workbench/services/contextmenu/electron-sandbox/contextmenuService.ts
+++ b/src/vs/workbench/services/contextmenu/electron-sandbox/contextmenuService.ts
@@ -193,12 +193,10 @@ class NativeContextMenuService extends Disposable implements IContextMenuService
 		const context = delegate.getActionsContext ? delegate.getActionsContext(event) : undefined;
 
 		const runnable = actionRunner.run(actionToRun, context);
-		if (runnable) {
-			try {
-				await runnable;
-			} catch (error) {
-				this.notificationService.error(error);
-			}
+		try {
+			await runnable;
+		} catch (error) {
+			this.notificationService.error(error);
 		}
 	}
 }
diff --git a/src/vs/workbench/services/credentials/browser/credentialsService.ts b/src/vs/workbench/services/credentials/browser/credentialsService.ts
index 8dd3d74ee49..1ec5f3f6565 100644
--- a/src/vs/workbench/services/credentials/browser/credentialsService.ts
+++ b/src/vs/workbench/services/credentials/browser/credentialsService.ts
@@ -40,9 +40,7 @@ export class BrowserCredentialsService extends Disposable implements ICredential
 
 	deletePassword(service: string, account: string): Promise<boolean> {
 		const didDelete = this.credentialsProvider.deletePassword(service, account);
-		if (didDelete) {
-			this._onDidChangePassword.fire({ service, account });
-		}
+		this._onDidChangePassword.fire({ service, account });
 
 		return didDelete;
 	}
diff --git a/src/vs/workbench/services/dialogs/browser/simpleFileDialog.ts b/src/vs/workbench/services/dialogs/browser/simpleFileDialog.ts
index 72ddb2972d1..2db31b9aa70 100644
--- a/src/vs/workbench/services/dialogs/browser/simpleFileDialog.ts
+++ b/src/vs/workbench/services/dialogs/browser/simpleFileDialog.ts
@@ -614,6 +614,7 @@ export class SimpleFileDialog {
 		} else {
 			this.userEnteredPathSegment = inputBasename;
 			this.autoCompletePathSegment = '';
+			this.filePickBox.activeItems = [];
 		}
 	}
 
diff --git a/src/vs/workbench/services/editor/common/editorService.ts b/src/vs/workbench/services/editor/common/editorService.ts
index ce8ab561373..a376590071f 100644
--- a/src/vs/workbench/services/editor/common/editorService.ts
+++ b/src/vs/workbench/services/editor/common/editorService.ts
@@ -28,10 +28,10 @@ export const SIDE_GROUP = -2;
 export type SIDE_GROUP_TYPE = typeof SIDE_GROUP;
 
 export interface IOpenEditorOverrideEntry {
-	id: string;
-	label: string;
-	active: boolean;
-	detail?: string;
+	readonly id: string;
+	readonly label: string;
+	readonly active: boolean;
+	readonly detail?: string;
 }
 
 export interface IOpenEditorOverrideHandler {
diff --git a/src/vs/workbench/services/editor/test/browser/editorGroupsService.test.ts b/src/vs/workbench/services/editor/test/browser/editorGroupsService.test.ts
index 54c9f367b4a..d59915a21b0 100644
--- a/src/vs/workbench/services/editor/test/browser/editorGroupsService.test.ts
+++ b/src/vs/workbench/services/editor/test/browser/editorGroupsService.test.ts
@@ -5,7 +5,7 @@
 
 import * as assert from 'assert';
 import { Event } from 'vs/base/common/event';
-import { workbenchInstantiationService, registerTestEditor, TestFileEditorInput, TestEditorPart, ITestInstantiationService, TestServiceAccessor } from 'vs/workbench/test/browser/workbenchTestServices';
+import { workbenchInstantiationService, registerTestEditor, TestFileEditorInput, TestEditorPart, ITestInstantiationService, TestServiceAccessor, createEditorPart } from 'vs/workbench/test/browser/workbenchTestServices';
 import { GroupDirection, GroupsOrder, MergeGroupMode, GroupOrientation, GroupChangeKind, GroupLocation, OpenEditorContext } from 'vs/workbench/services/editor/common/editorGroupsService';
 import { EditorOptions, CloseDirection, IEditorPartOptions, EditorsOrder } from 'vs/workbench/common/editor';
 import { URI } from 'vs/base/common/uri';
@@ -30,9 +30,7 @@ suite('EditorGroupsService', () => {
 	});
 
 	function createPart(instantiationService = workbenchInstantiationService()): [TestEditorPart, ITestInstantiationService] {
-		const part = disposables.add(instantiationService.createInstance(TestEditorPart));
-		part.create(document.createElement('div'));
-		part.layout(400, 300);
+		const part = createEditorPart(instantiationService, disposables);
 
 		return [part, instantiationService];
 	}
diff --git a/src/vs/workbench/services/editor/test/browser/editorService.test.ts b/src/vs/workbench/services/editor/test/browser/editorService.test.ts
index 2215f11e1f9..b2edff9eaed 100644
--- a/src/vs/workbench/services/editor/test/browser/editorService.test.ts
+++ b/src/vs/workbench/services/editor/test/browser/editorService.test.ts
@@ -9,7 +9,7 @@ import { URI } from 'vs/base/common/uri';
 import { Event } from 'vs/base/common/event';
 import { EditorPane } from 'vs/workbench/browser/parts/editor/editorPane';
 import { EditorInput, EditorsOrder, SideBySideEditorInput } from 'vs/workbench/common/editor';
-import { workbenchInstantiationService, TestServiceAccessor, registerTestEditor, TestFileEditorInput, ITestInstantiationService, registerTestResourceEditor, registerTestSideBySideEditor } from 'vs/workbench/test/browser/workbenchTestServices';
+import { workbenchInstantiationService, TestServiceAccessor, registerTestEditor, TestFileEditorInput, ITestInstantiationService, registerTestResourceEditor, registerTestSideBySideEditor, createEditorPart } from 'vs/workbench/test/browser/workbenchTestServices';
 import { ResourceEditorInput } from 'vs/workbench/common/editor/resourceEditorInput';
 import { TestThemeService } from 'vs/platform/theme/test/common/testThemeService';
 import { EditorService, DelegatingEditorService } from 'vs/workbench/services/editor/browser/editorService';
@@ -57,9 +57,7 @@ suite('EditorService', () => {
 	});
 
 	function createEditorService(instantiationService: ITestInstantiationService = workbenchInstantiationService()): [EditorPart, EditorService, TestServiceAccessor] {
-		const part = disposables.add(instantiationService.createInstance(EditorPart));
-		part.create(document.createElement('div'));
-		part.layout(400, 300);
+		const part = createEditorPart(instantiationService, disposables);
 
 		instantiationService.stub(IEditorGroupsService, part);
 
@@ -498,6 +496,32 @@ suite('EditorService', () => {
 		assert.strictEqual(part.activeGroup, sideGroup);
 	});
 
+	test('inactive editor group does not activate when closing editor (#117686)', async () => {
+		const [part, service] = createEditorService();
+
+		const input1 = new TestFileEditorInput(URI.parse('my://resource1-openside'), TEST_EDITOR_INPUT_ID);
+		const input2 = new TestFileEditorInput(URI.parse('my://resource2-openside'), TEST_EDITOR_INPUT_ID);
+
+		const rootGroup = part.activeGroup;
+
+		await part.whenRestored;
+
+		await service.openEditor(input1, { pinned: true }, rootGroup);
+		await service.openEditor(input2, { pinned: true }, rootGroup);
+
+		const sideGroup = (await service.openEditor(input2, { pinned: true }, SIDE_GROUP))?.group;
+		assert.strictEqual(part.activeGroup, sideGroup);
+		assert.notStrictEqual(rootGroup, sideGroup);
+
+		part.arrangeGroups(GroupsArrangement.MINIMIZE_OTHERS, part.activeGroup);
+
+		await rootGroup.closeEditor(input2);
+		assert.strictEqual(part.activeGroup, sideGroup);
+
+		assert.strictEqual(rootGroup.isMinimized, true);
+		assert.strictEqual(part.activeGroup.isMinimized, false);
+	});
+
 	test('active editor change / visible editor change events', async function () {
 		const [part, service] = createEditorService();
 
diff --git a/src/vs/workbench/services/editor/test/browser/editorsObserver.test.ts b/src/vs/workbench/services/editor/test/browser/editorsObserver.test.ts
index 37e651eb607..8516a4d4b81 100644
--- a/src/vs/workbench/services/editor/test/browser/editorsObserver.test.ts
+++ b/src/vs/workbench/services/editor/test/browser/editorsObserver.test.ts
@@ -6,7 +6,7 @@
 import * as assert from 'assert';
 import { EditorOptions, IEditorInputFactoryRegistry, Extensions as EditorExtensions } from 'vs/workbench/common/editor';
 import { URI } from 'vs/base/common/uri';
-import { workbenchInstantiationService, TestFileEditorInput, registerTestEditor, TestEditorPart } from 'vs/workbench/test/browser/workbenchTestServices';
+import { workbenchInstantiationService, TestFileEditorInput, registerTestEditor, TestEditorPart, createEditorPart } from 'vs/workbench/test/browser/workbenchTestServices';
 import { Registry } from 'vs/platform/registry/common/platform';
 import { EditorPart } from 'vs/workbench/browser/parts/editor/editorPart';
 import { SyncDescriptor } from 'vs/platform/instantiation/common/descriptors';
@@ -38,10 +38,8 @@ suite('EditorsObserver', function () {
 		const instantiationService = workbenchInstantiationService();
 		instantiationService.invokeFunction(accessor => Registry.as<IEditorInputFactoryRegistry>(EditorExtensions.EditorInputFactories).start(accessor));
 
-		const part = disposables.add(instantiationService.createInstance(TestEditorPart));
+		const part = createEditorPart(instantiationService, disposables);
 		disposables.add(toDisposable(() => part.clearState()));
-		part.create(document.createElement('div'));
-		part.layout(400, 300);
 
 		await part.whenRestored;
 
diff --git a/src/vs/workbench/services/encryption/electron-sandbox/encryptionService.ts b/src/vs/workbench/services/encryption/electron-sandbox/encryptionService.ts
index 046649b6b63..bdc5ff1de4e 100644
--- a/src/vs/workbench/services/encryption/electron-sandbox/encryptionService.ts
+++ b/src/vs/workbench/services/encryption/electron-sandbox/encryptionService.ts
@@ -3,18 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IMainProcessService } from 'vs/platform/ipc/electron-sandbox/services';
-import { ProxyChannel } from 'vs/base/parts/ipc/common/ipc';
-import { registerSingleton } from 'vs/platform/instantiation/common/extensions';
+import { registerMainProcessRemoteService } from 'vs/platform/ipc/electron-sandbox/services';
 import { IEncryptionService } from 'vs/workbench/services/encryption/common/encryptionService';
 
-export class EncryptionService {
-
-	declare readonly _serviceBrand: undefined;
-
-	constructor(@IMainProcessService mainProcessService: IMainProcessService) {
-		return ProxyChannel.toService<IEncryptionService>(mainProcessService.getChannel('encryption'));
-	}
-}
-
-registerSingleton(IEncryptionService, EncryptionService, true);
+registerMainProcessRemoteService(IEncryptionService, 'encryption', { supportsDelayedInstantiation: true });
diff --git a/src/vs/workbench/services/environment/common/environmentService.ts b/src/vs/workbench/services/environment/common/environmentService.ts
index 61725bf15b5..f08de335ece 100644
--- a/src/vs/workbench/services/environment/common/environmentService.ts
+++ b/src/vs/workbench/services/environment/common/environmentService.ts
@@ -9,7 +9,7 @@ import { IEnvironmentService } from 'vs/platform/environment/common/environment'
 import type { IWorkbenchConstructionOptions as IWorkbenchOptions } from 'vs/workbench/workbench.web.api';
 import { URI } from 'vs/base/common/uri';
 
-export const IWorkbenchEnvironmentService = createDecorator<IWorkbenchEnvironmentService>('environmentService');
+export const IWorkbenchEnvironmentService = createDecorator<IWorkbenchEnvironmentService>('workbenchEnvironmentService');
 
 export interface IWorkbenchConfiguration extends IWindowConfiguration { }
 
@@ -25,8 +25,6 @@ export interface IWorkbenchEnvironmentService extends IEnvironmentService {
 	//       ENVIRONMENT SERVICE
 	// !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
-	readonly _serviceBrand: undefined;
-
 	readonly options?: IWorkbenchOptions;
 
 	readonly remoteAuthority?: string;
diff --git a/src/vs/workbench/services/environment/electron-browser/environmentService.ts b/src/vs/workbench/services/environment/electron-browser/environmentService.ts
index 6746e75b0c6..411502b6398 100644
--- a/src/vs/workbench/services/environment/electron-browser/environmentService.ts
+++ b/src/vs/workbench/services/environment/electron-browser/environmentService.ts
@@ -14,8 +14,6 @@ import { IOSConfiguration } from 'vs/platform/windows/common/windows';
 
 export class NativeWorkbenchEnvironmentService extends NativeEnvironmentService implements INativeWorkbenchEnvironmentService {
 
-	declare readonly _serviceBrand: undefined;
-
 	@memoize
 	get machineId() { return this.configuration.machineId; }
 
diff --git a/src/vs/workbench/services/environment/electron-sandbox/environmentService.ts b/src/vs/workbench/services/environment/electron-sandbox/environmentService.ts
index 4f1ef89cff2..932ab448e54 100644
--- a/src/vs/workbench/services/environment/electron-sandbox/environmentService.ts
+++ b/src/vs/workbench/services/environment/electron-sandbox/environmentService.ts
@@ -8,7 +8,7 @@ import { INativeWindowConfiguration, IOSConfiguration } from 'vs/platform/window
 import { INativeEnvironmentService } from 'vs/platform/environment/common/environment';
 import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
 
-export const INativeWorkbenchEnvironmentService = createDecorator<INativeWorkbenchEnvironmentService>('nativeEnvironmentService');
+export const INativeWorkbenchEnvironmentService = createDecorator<INativeWorkbenchEnvironmentService>('nativeWorkbenchEnvironmentService');
 
 export interface INativeWorkbenchConfiguration extends IWorkbenchConfiguration, INativeWindowConfiguration { }
 
diff --git a/src/vs/workbench/services/extensionManagement/browser/extensionEnablementService.ts b/src/vs/workbench/services/extensionManagement/browser/extensionEnablementService.ts
index e0fa8953b67..a165e2a4326 100644
--- a/src/vs/workbench/services/extensionManagement/browser/extensionEnablementService.ts
+++ b/src/vs/workbench/services/extensionManagement/browser/extensionEnablementService.ts
@@ -25,7 +25,7 @@ import { ILifecycleService, LifecyclePhase } from 'vs/workbench/services/lifecyc
 import { INotificationService, Severity } from 'vs/platform/notification/common/notification';
 import { IHostService } from 'vs/workbench/services/host/browser/host';
 import { IExtensionBisectService } from 'vs/workbench/services/extensionManagement/browser/extensionBisect';
-import { WorkspaceTrustStateChangeEvent, IWorkspaceTrustService, WorkspaceTrustState } from 'vs/platform/workspace/common/workspaceTrust';
+import { IWorkspaceTrustService, WorkspaceTrustState } from 'vs/platform/workspace/common/workspaceTrust';
 import { Promises } from 'vs/base/common/async';
 
 const SOURCE = 'IWorkbenchExtensionEnablementService';
@@ -53,7 +53,7 @@ export class ExtensionEnablementService extends Disposable implements IWorkbench
 		@IUserDataSyncAccountService private readonly userDataSyncAccountService: IUserDataSyncAccountService,
 		@ILifecycleService private readonly lifecycleService: ILifecycleService,
 		@INotificationService private readonly notificationService: INotificationService,
-		@IHostService private readonly hostService: IHostService,
+		@IHostService readonly hostService: IHostService,
 		@IExtensionBisectService private readonly extensionBisectService: IExtensionBisectService,
 		@IWorkspaceTrustService private readonly workspaceTrustService: IWorkspaceTrustService
 	) {
@@ -62,13 +62,18 @@ export class ExtensionEnablementService extends Disposable implements IWorkbench
 		this._register(this.globalExtensionEnablementService.onDidChangeEnablement(({ extensions, source }) => this.onDidChangeExtensions(extensions, source)));
 		this._register(extensionManagementService.onDidInstallExtension(this._onDidInstallExtension, this));
 		this._register(extensionManagementService.onDidUninstallExtension(this._onDidUninstallExtension, this));
-		this._register(this.workspaceTrustService.onDidChangeTrustState(this._onDidChangeTrustState, this));
 
 		// Trusted extensions notification
 		// TODO: Confirm that this is the right lifecycle phase
 		this.lifecycleService.when(LifecyclePhase.Eventually).then(() => {
 			if (this.extensionsDisabledByTrustRequirement.length > 0) {
-				this.workspaceTrustService.requireWorkspaceTrust({ modal: false });
+				this.workspaceTrustService.requireWorkspaceTrust({ modal: false })
+					.then(trustState => {
+						if (trustState === WorkspaceTrustState.Trusted) {
+							this._onEnablementChanged.fire(this.extensionsDisabledByTrustRequirement);
+							this.extensionsDisabledByTrustRequirement = [];
+						}
+					});
 			}
 		});
 
@@ -165,16 +170,14 @@ export class ExtensionEnablementService extends Disposable implements IWorkbench
 
 		const result = await Promises.settled(extensions.map(e => {
 			if (this._isDisabledByTrustRequirement(e)) {
-				return this.workspaceTrustService.requireWorkspaceTrust({
-					modal: true,
-					message: 'Enabling this extension requires you to trust the contents of this workspace.'
-				}).then(trustState => {
-					if (trustState === WorkspaceTrustState.Trusted) {
-						return this._setEnablement(e, newState);
-					} else {
-						return Promise.resolve(false);
-					}
-				});
+				return this.workspaceTrustService.requireWorkspaceTrust()
+					.then(trustState => {
+						if (trustState === WorkspaceTrustState.Trusted) {
+							return this._setEnablement(e, newState);
+						} else {
+							return Promise.resolve(false);
+						}
+					});
 			} else {
 				return this._setEnablement(e, newState);
 			}
@@ -438,27 +441,9 @@ export class ExtensionEnablementService extends Disposable implements IWorkbench
 		}
 	}
 
-	private async _onDidChangeTrustState(state: WorkspaceTrustStateChangeEvent): Promise<void> {
-		if (state.previousTrustState === WorkspaceTrustState.Trusted && (
-			state.currentTrustState === WorkspaceTrustState.Untrusted ||
-			state.currentTrustState === WorkspaceTrustState.Unknown)) {
-			// Reload window
-			this.hostService.reload();
-			return;
-		}
-		if (state.currentTrustState === WorkspaceTrustState.Trusted) {
-			// Enable extensions
-			this._onEnablementChanged.fire(this.extensionsDisabledByTrustRequirement);
-			this.extensionsDisabledByTrustRequirement = [];
-		}
-	}
-
 	private _onDidInstallExtension({ local, error }: DidInstallExtensionEvent): void {
 		if (local && !error && this._isDisabledByTrustRequirement(local)) {
-			this.workspaceTrustService.requireWorkspaceTrust({
-				modal: true,
-				message: 'Enabling this extension requires you to trust the contents of this workspace.'
-			});
+			this.workspaceTrustService.requireWorkspaceTrust();
 		}
 	}
 
diff --git a/src/vs/workbench/services/extensionManagement/common/extensionManagementService.ts b/src/vs/workbench/services/extensionManagement/common/extensionManagementService.ts
index 20ca3fd0562..c3f3a323b18 100644
--- a/src/vs/workbench/services/extensionManagement/common/extensionManagementService.ts
+++ b/src/vs/workbench/services/extensionManagement/common/extensionManagementService.ts
@@ -358,11 +358,7 @@ export class ExtensionManagementService extends Disposable implements IWorkbench
 
 	protected async checkForWorkspaceTrust(manifest: IExtensionManifest): Promise<void> {
 		if (manifest.requiresWorkspaceTrust === 'onStart') {
-			const trustState = await this.workspaceTrustService.requireWorkspaceTrust(
-				{
-					modal: true,
-					message: 'Installing this extension requires you to trust the contents of this workspace.'
-				});
+			const trustState = await this.workspaceTrustService.requireWorkspaceTrust();
 			return trustState === WorkspaceTrustState.Trusted ? Promise.resolve() : Promise.reject(canceled());
 		}
 		return Promise.resolve();
diff --git a/src/vs/workbench/services/extensionManagement/electron-sandbox/extensionUrlTrustService.ts b/src/vs/workbench/services/extensionManagement/electron-sandbox/extensionUrlTrustService.ts
index 0bf4ab120dd..3fa5f8a599a 100644
--- a/src/vs/workbench/services/extensionManagement/electron-sandbox/extensionUrlTrustService.ts
+++ b/src/vs/workbench/services/extensionManagement/electron-sandbox/extensionUrlTrustService.ts
@@ -3,18 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { ProxyChannel } from 'vs/base/parts/ipc/common/ipc';
 import { IExtensionUrlTrustService } from 'vs/platform/extensionManagement/common/extensionUrlTrust';
-import { registerSingleton } from 'vs/platform/instantiation/common/extensions';
-import { IMainProcessService } from 'vs/platform/ipc/electron-sandbox/services';
+import { registerMainProcessRemoteService } from 'vs/platform/ipc/electron-sandbox/services';
 
-class ExtensionUrlTrustService {
-
-	declare readonly _serviceBrand: undefined;
-
-	constructor(@IMainProcessService mainProcessService: IMainProcessService) {
-		return ProxyChannel.toService<IExtensionUrlTrustService>(mainProcessService.getChannel('extensionUrlTrust'));
-	}
-}
-
-registerSingleton(IExtensionUrlTrustService, ExtensionUrlTrustService);
+registerMainProcessRemoteService(IExtensionUrlTrustService, 'extensionUrlTrust');
diff --git a/src/vs/workbench/services/history/browser/history.ts b/src/vs/workbench/services/history/browser/history.ts
index 27ab52f5836..f43ce56c406 100644
--- a/src/vs/workbench/services/history/browser/history.ts
+++ b/src/vs/workbench/services/history/browser/history.ts
@@ -241,12 +241,12 @@ export class HistoryService extends Disposable implements IHistoryService {
 		else {
 
 			// Delete
-			if (event.operation === FileOperation.DELETE) {
+			if (event.isOperation(FileOperation.DELETE)) {
 				this.remove(event);
 			}
 
 			// Move
-			else if (event.operation === FileOperation.MOVE) {
+			else if (event.isOperation(FileOperation.MOVE) && event.target.isFile) {
 				this.move(event);
 			}
 		}
diff --git a/src/vs/workbench/services/history/test/browser/history.test.ts b/src/vs/workbench/services/history/test/browser/history.test.ts
index b6f61cab583..3af981dbd48 100644
--- a/src/vs/workbench/services/history/test/browser/history.test.ts
+++ b/src/vs/workbench/services/history/test/browser/history.test.ts
@@ -6,7 +6,7 @@
 import * as assert from 'assert';
 import { EditorOptions } from 'vs/workbench/common/editor';
 import { URI } from 'vs/base/common/uri';
-import { workbenchInstantiationService, TestFileEditorInput, registerTestEditor } from 'vs/workbench/test/browser/workbenchTestServices';
+import { workbenchInstantiationService, TestFileEditorInput, registerTestEditor, createEditorPart } from 'vs/workbench/test/browser/workbenchTestServices';
 import { EditorPart } from 'vs/workbench/browser/parts/editor/editorPart';
 import { SyncDescriptor } from 'vs/platform/instantiation/common/descriptors';
 import { IEditorGroupsService, GroupDirection } from 'vs/workbench/services/editor/common/editorGroupsService';
@@ -25,9 +25,7 @@ suite('HistoryService', function () {
 	async function createServices(): Promise<[EditorPart, HistoryService, EditorService]> {
 		const instantiationService = workbenchInstantiationService();
 
-		const part = disposables.add(instantiationService.createInstance(EditorPart));
-		part.create(document.createElement('div'));
-		part.layout(400, 300);
+		const part = createEditorPart(instantiationService, disposables);
 
 		await part.whenRestored;
 
diff --git a/src/vs/workbench/services/issue/electron-sandbox/issueService.ts b/src/vs/workbench/services/issue/electron-sandbox/issueService.ts
index 8a6dc3619e9..aaf43a5ece2 100644
--- a/src/vs/workbench/services/issue/electron-sandbox/issueService.ts
+++ b/src/vs/workbench/services/issue/electron-sandbox/issueService.ts
@@ -4,18 +4,6 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { IIssueService } from 'vs/platform/issue/electron-sandbox/issue';
-import { IMainProcessService } from 'vs/platform/ipc/electron-sandbox/services';
-import { ProxyChannel } from 'vs/base/parts/ipc/common/ipc';
-import { registerSingleton } from 'vs/platform/instantiation/common/extensions';
+import { registerMainProcessRemoteService } from 'vs/platform/ipc/electron-sandbox/services';
 
-// @ts-ignore: interface is implemented via proxy
-export class IssueService implements IIssueService {
-
-	declare readonly _serviceBrand: undefined;
-
-	constructor(@IMainProcessService mainProcessService: IMainProcessService) {
-		return ProxyChannel.toService<IIssueService>(mainProcessService.getChannel('issue'));
-	}
-}
-
-registerSingleton(IIssueService, IssueService, true);
+registerMainProcessRemoteService(IIssueService, 'issue', { supportsDelayedInstantiation: true });
diff --git a/src/vs/workbench/services/keybinding/test/browser/keybindingEditing.test.ts b/src/vs/workbench/services/keybinding/test/browser/keybindingEditing.test.ts
index 4ed82cbc745..e93988e6675 100644
--- a/src/vs/workbench/services/keybinding/test/browser/keybindingEditing.test.ts
+++ b/src/vs/workbench/services/keybinding/test/browser/keybindingEditing.test.ts
@@ -56,6 +56,7 @@ import { joinPath } from 'vs/base/common/resources';
 import { InMemoryFileSystemProvider } from 'vs/platform/files/common/inMemoryFilesystemProvider';
 import { DisposableStore } from 'vs/base/common/lifecycle';
 import { VSBuffer } from 'vs/base/common/buffer';
+import { IWorkbenchEnvironmentService } from 'vs/workbench/services/environment/common/environmentService';
 
 interface Modifiers {
 	metaKey?: boolean;
@@ -88,6 +89,7 @@ suite('KeybindingsEditing', () => {
 		configService.setUserConfiguration('files', { 'eol': '\n' });
 
 		instantiationService.stub(IEnvironmentService, environmentService);
+		instantiationService.stub(IWorkbenchEnvironmentService, environmentService);
 		instantiationService.stub(IPathService, new TestPathService());
 		instantiationService.stub(IConfigurationService, configService);
 		instantiationService.stub(IWorkspaceContextService, new TestContextService());
diff --git a/src/vs/workbench/services/layout/browser/layoutService.ts b/src/vs/workbench/services/layout/browser/layoutService.ts
index 9f0392908a6..551797a825d 100644
--- a/src/vs/workbench/services/layout/browser/layoutService.ts
+++ b/src/vs/workbench/services/layout/browser/layoutService.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
+import { refineServiceDecorator } from 'vs/platform/instantiation/common/instantiation';
 import { Event } from 'vs/base/common/event';
 import { MenuBarVisibility } from 'vs/platform/windows/common/windows';
 import { ILayoutService } from 'vs/platform/layout/browser/layoutService';
@@ -11,7 +11,7 @@ import { Part } from 'vs/workbench/browser/part';
 import { Dimension } from 'vs/base/browser/dom';
 import { Direction } from 'vs/base/browser/ui/grid/grid';
 
-export const IWorkbenchLayoutService = createDecorator<IWorkbenchLayoutService>('layoutService');
+export const IWorkbenchLayoutService = refineServiceDecorator<ILayoutService, IWorkbenchLayoutService>(ILayoutService);
 
 export const enum Parts {
 	TITLEBAR_PART = 'workbench.parts.titlebar',
@@ -111,6 +111,11 @@ export interface IWorkbenchLayoutService extends ILayoutService {
 	 */
 	readonly onDidChangeNotificationsVisibility: Event<boolean>;
 
+	/**
+	 * True if a default layout with default editors was applied at startup
+	 */
+	readonly openedDefaultEditors: boolean;
+
 	/**
 	 * Run a layout of the workbench.
 	 */
@@ -224,11 +229,6 @@ export interface IWorkbenchLayoutService extends ILayoutService {
 	 */
 	getMaximumEditorDimensions(): Dimension;
 
-	/**
-	 * Returns the element that is parent of the workbench element.
-	 */
-	getWorkbenchContainer(): HTMLElement;
-
 	/**
 	 * Toggles the workbench in and out of zen mode - parts get hidden and window goes fullscreen.
 	 */
@@ -268,9 +268,4 @@ export interface IWorkbenchLayoutService extends ILayoutService {
 	 * Returns the next visible view part in a given direction
 	 */
 	getVisibleNeighborPart(part: Parts, direction: Direction): Parts | undefined;
-
-	/**
-	 * True if a default layout with default editors was applied at startup
-	 */
-	readonly openedDefaultEditors: boolean;
 }
diff --git a/src/vs/workbench/services/lifecycle/electron-sandbox/lifecycleService.ts b/src/vs/workbench/services/lifecycle/electron-sandbox/lifecycleService.ts
index 2d747614f9b..1741a9f870a 100644
--- a/src/vs/workbench/services/lifecycle/electron-sandbox/lifecycleService.ts
+++ b/src/vs/workbench/services/lifecycle/electron-sandbox/lifecycleService.ts
@@ -148,13 +148,11 @@ export class NativeLifecycleService extends AbstractLifecycleService {
 
 		this._onWillShutdown.fire({
 			join(promise, id) {
-				if (promise) {
-					joiners.push(promise);
+				joiners.push(promise);
 
-					// Track promise completion
-					pendingJoiners.add(id);
-					promise.finally(() => pendingJoiners.delete(id));
-				}
+				// Track promise completion
+				pendingJoiners.add(id);
+				promise.finally(() => pendingJoiners.delete(id));
 			},
 			reason
 		});
diff --git a/src/vs/workbench/services/localizations/electron-sandbox/localizationsService.ts b/src/vs/workbench/services/localizations/electron-sandbox/localizationsService.ts
index 7c59c49ee4b..5b716004793 100644
--- a/src/vs/workbench/services/localizations/electron-sandbox/localizationsService.ts
+++ b/src/vs/workbench/services/localizations/electron-sandbox/localizationsService.ts
@@ -3,21 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { ProxyChannel } from 'vs/base/parts/ipc/common/ipc';
 import { ILocalizationsService } from 'vs/platform/localizations/common/localizations';
-import { ISharedProcessService } from 'vs/platform/ipc/electron-sandbox/services';
-import { registerSingleton } from 'vs/platform/instantiation/common/extensions';
+import { registerSharedProcessRemoteService } from 'vs/platform/ipc/electron-sandbox/services';
 
-// @ts-ignore: interface is implemented via proxy
-export class LocalizationsService implements ILocalizationsService {
-
-	declare readonly _serviceBrand: undefined;
-
-	constructor(
-		@ISharedProcessService sharedProcessService: ISharedProcessService,
-	) {
-		return ProxyChannel.toService<ILocalizationsService>(sharedProcessService.getChannel('localizations'));
-	}
-}
-
-registerSingleton(ILocalizationsService, LocalizationsService, true);
+registerSharedProcessRemoteService(ILocalizationsService, 'localizations', { supportsDelayedInstantiation: true });
diff --git a/src/vs/workbench/services/menubar/electron-sandbox/menubarService.ts b/src/vs/workbench/services/menubar/electron-sandbox/menubarService.ts
index a4a49297e75..98db7afba13 100644
--- a/src/vs/workbench/services/menubar/electron-sandbox/menubarService.ts
+++ b/src/vs/workbench/services/menubar/electron-sandbox/menubarService.ts
@@ -4,18 +4,6 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { IMenubarService } from 'vs/platform/menubar/electron-sandbox/menubar';
-import { IMainProcessService } from 'vs/platform/ipc/electron-sandbox/services';
-import { ProxyChannel } from 'vs/base/parts/ipc/common/ipc';
-import { registerSingleton } from 'vs/platform/instantiation/common/extensions';
+import { registerMainProcessRemoteService } from 'vs/platform/ipc/electron-sandbox/services';
 
-// @ts-ignore: interface is implemented via proxy
-export class MenubarService implements IMenubarService {
-
-	declare readonly _serviceBrand: undefined;
-
-	constructor(@IMainProcessService mainProcessService: IMainProcessService) {
-		return ProxyChannel.toService<IMenubarService>(mainProcessService.getChannel('menubar'));
-	}
-}
-
-registerSingleton(IMenubarService, MenubarService, true);
+registerMainProcessRemoteService(IMenubarService, 'menubar', { supportsDelayedInstantiation: true });
diff --git a/src/vs/workbench/services/outline/browser/outline.ts b/src/vs/workbench/services/outline/browser/outline.ts
index b88bc02c6f1..1511850d7dc 100644
--- a/src/vs/workbench/services/outline/browser/outline.ts
+++ b/src/vs/workbench/services/outline/browser/outline.ts
@@ -54,7 +54,7 @@ export interface IQuickPickOutlineElement<E> {
 }
 
 export interface IQuickPickDataSource<E> {
-	getQuickPickElements(): Iterable<IQuickPickOutlineElement<E>>;
+	getQuickPickElements(): IQuickPickOutlineElement<E>[];
 }
 
 export interface IOutlineListConfig<E> {
diff --git a/src/vs/workbench/services/preferences/browser/preferencesService.ts b/src/vs/workbench/services/preferences/browser/preferencesService.ts
index 2ab7ac2b6f7..b0daf44675e 100644
--- a/src/vs/workbench/services/preferences/browser/preferencesService.ts
+++ b/src/vs/workbench/services/preferences/browser/preferencesService.ts
@@ -221,7 +221,7 @@ export class PreferencesService extends Disposable implements IPreferencesServic
 			...options,
 			focusSearch: true
 		};
-		return this.editorService.openEditor(input, options ? { ...SettingsEditorOptions.create(options), override: EditorOverride.DISABLED } : { override: EditorOverride.DISABLED })
+		return this.editorService.openEditor(input, options ? SettingsEditorOptions.create(options) : { override: EditorOverride.DISABLED })
 			.then(() => this.editorGroupService.activeGroup.activeEditorPane!);
 	}
 
@@ -364,7 +364,7 @@ export class PreferencesService extends Disposable implements IPreferencesServic
 						this.editorService.openEditor(editableSettingsEditorInput, { pinned: true, revealIfOpened: true, override: EditorOverride.DISABLED }, sideEditorGroup.id)
 					]).then(([defaultEditor, editor]) => withNullAsUndefined(editor));
 				} else {
-					return this.editorService.openEditor(editableSettingsEditorInput, { ...SettingsEditorOptions.create(options), override: EditorOverride.DISABLED }, group);
+					return this.editorService.openEditor(editableSettingsEditorInput, SettingsEditorOptions.create(options), group);
 				}
 			});
 	}
@@ -381,7 +381,7 @@ export class PreferencesService extends Disposable implements IPreferencesServic
 				const defaultPreferencesEditorInput = this.instantiationService.createInstance(DefaultPreferencesEditorInput, this.getDefaultSettingsResource(configurationTarget));
 				const preferencesEditorInput = new PreferencesEditorInput(this.getPreferencesEditorInputName(configurationTarget, resource), editableSettingsEditorInput.getDescription(), defaultPreferencesEditorInput, <EditorInput>editableSettingsEditorInput);
 				this.lastOpenedSettingsInput = preferencesEditorInput;
-				return this.editorService.openEditor(preferencesEditorInput, { ...SettingsEditorOptions.create(options), override: EditorOverride.DISABLED }, group);
+				return this.editorService.openEditor(preferencesEditorInput, SettingsEditorOptions.create(options), group);
 			});
 	}
 
diff --git a/src/vs/workbench/services/preferences/common/preferences.ts b/src/vs/workbench/services/preferences/common/preferences.ts
index 8ef182a14d6..a3386ef5bd5 100644
--- a/src/vs/workbench/services/preferences/common/preferences.ts
+++ b/src/vs/workbench/services/preferences/common/preferences.ts
@@ -12,7 +12,7 @@ import { ITextModel } from 'vs/editor/common/model';
 import { localize } from 'vs/nls';
 import { ConfigurationTarget } from 'vs/platform/configuration/common/configuration';
 import { ConfigurationScope, IConfigurationExtensionInfo } from 'vs/platform/configuration/common/configurationRegistry';
-import { IEditorOptions } from 'vs/platform/editor/common/editor';
+import { EditorOverride, IEditorOptions } from 'vs/platform/editor/common/editor';
 import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
 import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
 import { EditorOptions, IEditorPane } from 'vs/workbench/common/editor';
@@ -183,18 +183,24 @@ export class SettingsEditorOptions extends EditorOptions implements ISettingsEdi
 	};
 	focusSearch?: boolean;
 
-	static create(settings: ISettingsEditorOptions): SettingsEditorOptions {
-		const options = new SettingsEditorOptions();
-		options.overwrite(settings);
+	static create(options: ISettingsEditorOptions): SettingsEditorOptions {
+		const newOptions = new SettingsEditorOptions();
+		options = {
+			...<IEditorOptions>{
+				override: EditorOverride.DISABLED,
+				pinned: true
+			},
+			...options
+		};
+		newOptions.overwrite(options);
 
-		options.target = settings.target;
-		options.folderUri = settings.folderUri;
-		options.query = settings.query;
-		options.revealSetting = settings.revealSetting;
-		options.pinned = true;
-		options.focusSearch = settings.focusSearch;
+		newOptions.target = options.target;
+		newOptions.folderUri = options.folderUri;
+		newOptions.query = options.query;
+		newOptions.revealSetting = options.revealSetting;
+		newOptions.focusSearch = options.focusSearch;
 
-		return options;
+		return newOptions;
 	}
 }
 
diff --git a/src/vs/workbench/services/preferences/test/browser/preferencesService.test.ts b/src/vs/workbench/services/preferences/test/browser/preferencesService.test.ts
new file mode 100644
index 00000000000..79c20bb4b4f
--- /dev/null
+++ b/src/vs/workbench/services/preferences/test/browser/preferencesService.test.ts
@@ -0,0 +1,65 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import * as assert from 'assert';
+import { TestCommandService } from 'vs/editor/test/browser/editorTestServices';
+import { ICommandService } from 'vs/platform/commands/common/commands';
+import { EditorOverride } from 'vs/platform/editor/common/editor';
+import { SyncDescriptor } from 'vs/platform/instantiation/common/descriptors';
+import { ServiceCollection } from 'vs/platform/instantiation/common/serviceCollection';
+import { IJSONEditingService } from 'vs/workbench/services/configuration/common/jsonEditing';
+import { TestJSONEditingService } from 'vs/workbench/services/configuration/test/common/testServices';
+import { PreferencesService } from 'vs/workbench/services/preferences/browser/preferencesService';
+import { IPreferencesService, SettingsEditorOptions } from 'vs/workbench/services/preferences/common/preferences';
+import { IRemoteAgentService } from 'vs/workbench/services/remote/common/remoteAgentService';
+import { TestRemoteAgentService } from 'vs/workbench/services/remote/test/common/testServices';
+import { ITestInstantiationService, TestEditorService, workbenchInstantiationService } from 'vs/workbench/test/browser/workbenchTestServices';
+
+suite('PreferencesService', () => {
+
+	let testInstantiationService: ITestInstantiationService;
+	let testObject: PreferencesService;
+	let editorService: TestEditorService2;
+
+	setup(() => {
+		editorService = new TestEditorService2();
+		testInstantiationService = workbenchInstantiationService({
+			editorService: () => editorService
+		});
+
+		testInstantiationService.stub(IJSONEditingService, TestJSONEditingService);
+		testInstantiationService.stub(IRemoteAgentService, TestRemoteAgentService);
+		testInstantiationService.stub(ICommandService, TestCommandService);
+
+		// PreferencesService creates a PreferencesEditorInput which depends on IPreferencesService, add the real one, not a stub
+		const collection = new ServiceCollection();
+		collection.set(IPreferencesService, new SyncDescriptor(PreferencesService));
+		const instantiationService = testInstantiationService.createChild(collection);
+		testObject = instantiationService.createInstance(PreferencesService);
+	});
+
+	test('openEditor is called with a SettingsEditorOptions instance', async () => {
+		testObject.openSettings(false, undefined);
+		const options = editorService.lastOpenEditorOptions as SettingsEditorOptions;
+		assert.strictEqual(options instanceof SettingsEditorOptions, true);
+	});
+
+	test('options are preserved when calling openEditor', async () => {
+		testObject.openSettings(false, 'test query');
+		const options = editorService.lastOpenEditorOptions as SettingsEditorOptions;
+		assert.strictEqual(options.focusSearch, true);
+		assert.strictEqual(options.override, EditorOverride.DISABLED);
+		assert.strictEqual(options.query, 'test query');
+	});
+});
+
+class TestEditorService2 extends TestEditorService {
+	lastOpenEditorOptions: any;
+
+	async openEditor(editor: any, optionsOrGroup?: any): Promise<any | undefined> {
+		this.lastOpenEditorOptions = optionsOrGroup;
+		return undefined;
+	}
+}
diff --git a/src/vs/workbench/services/remote/browser/tunnelServiceImpl.ts b/src/vs/workbench/services/remote/browser/tunnelServiceImpl.ts
index 4879d4b606a..2f88ae5e1d8 100644
--- a/src/vs/workbench/services/remote/browser/tunnelServiceImpl.ts
+++ b/src/vs/workbench/services/remote/browser/tunnelServiceImpl.ts
@@ -4,9 +4,10 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { URI } from 'vs/base/common/uri';
+import { registerSingleton } from 'vs/platform/instantiation/common/extensions';
 import { ILogService } from 'vs/platform/log/common/log';
 import { IAddressProvider } from 'vs/platform/remote/common/remoteAgentConnection';
-import { AbstractTunnelService, RemoteTunnel } from 'vs/platform/remote/common/tunnel';
+import { AbstractTunnelService, ITunnelService, RemoteTunnel } from 'vs/platform/remote/common/tunnel';
 import { IWorkbenchEnvironmentService } from 'vs/workbench/services/environment/common/environmentService';
 
 export class TunnelService extends AbstractTunnelService {
@@ -34,3 +35,5 @@ export class TunnelService extends AbstractTunnelService {
 		return super.canTunnel(uri) && !!this.environmentService.remoteAuthority;
 	}
 }
+
+registerSingleton(ITunnelService, TunnelService, true);
diff --git a/src/vs/workbench/services/remote/common/remoteExplorerService.ts b/src/vs/workbench/services/remote/common/remoteExplorerService.ts
index 39fe22bfbd4..717528fa2df 100644
--- a/src/vs/workbench/services/remote/common/remoteExplorerService.ts
+++ b/src/vs/workbench/services/remote/common/remoteExplorerService.ts
@@ -18,6 +18,7 @@ import { ThemeIcon } from 'vs/platform/theme/common/themeService';
 import { isNumber, isObject, isString } from 'vs/base/common/types';
 import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
 import { hash } from 'vs/base/common/hash';
+import { ILogService } from 'vs/platform/log/common/log';
 
 export const IRemoteExplorerService = createDecorator<IRemoteExplorerService>('remoteExplorerService');
 export const REMOTE_EXPLORER_TYPE_KEY: string = 'remote.explorerType';
@@ -269,7 +270,8 @@ export class TunnelModel extends Disposable {
 		@IConfigurationService private readonly configurationService: IConfigurationService,
 		@IWorkbenchEnvironmentService private readonly environmentService: IWorkbenchEnvironmentService,
 		@IRemoteAuthorityResolverService private readonly remoteAuthorityResolverService: IRemoteAuthorityResolverService,
-		@IWorkspaceContextService private readonly workspaceContextService: IWorkspaceContextService
+		@IWorkspaceContextService private readonly workspaceContextService: IWorkspaceContextService,
+		@ILogService private readonly logService: ILogService
 	) {
 		super();
 		this.portsAttributes = new PortsAttributes(configurationService);
@@ -355,6 +357,7 @@ export class TunnelModel extends Disposable {
 			const tunnelRestoreValue = await this.tunnelRestoreValue;
 			if (tunnelRestoreValue) {
 				const tunnels = <Tunnel[] | undefined>JSON.parse(tunnelRestoreValue) ?? [];
+				this.logService.trace(`ForwardedPorts: (TunnelModel) restoring ports ${tunnels.map(tunnel => tunnel.remotePort).join(', ')}`);
 				for (let tunnel of tunnels) {
 					if (!mapHasAddressLocalhostOrAllInterfaces(this.detected, tunnel.remoteHost, tunnel.remotePort)) {
 						await this.forward({ host: tunnel.remoteHost, port: tunnel.remotePort }, tunnel.localPort, tunnel.name, undefined, undefined, tunnel.privacy === TunnelPrivacy.Public);
@@ -482,6 +485,7 @@ export class TunnelModel extends Disposable {
 			processedCandidates = await this._candidateFilter(candidates);
 		}
 		const removedCandidates = this.updateInResponseToCandidates(processedCandidates);
+		this.logService.trace(`ForwardedPorts: (TunnelModel) removed candidates ${Array.from(removedCandidates.values()).map(candidate => candidate.port).join(', ')}`);
 		this._onCandidatesChanged.fire(removedCandidates);
 	}
 
@@ -592,9 +596,10 @@ class RemoteExplorerService implements IRemoteExplorerService {
 		@IConfigurationService configurationService: IConfigurationService,
 		@IWorkbenchEnvironmentService environmentService: IWorkbenchEnvironmentService,
 		@IRemoteAuthorityResolverService remoteAuthorityResolverService: IRemoteAuthorityResolverService,
-		@IWorkspaceContextService workspaceContextService: IWorkspaceContextService
+		@IWorkspaceContextService workspaceContextService: IWorkspaceContextService,
+		@ILogService logService: ILogService
 	) {
-		this._tunnelModel = new TunnelModel(tunnelService, storageService, configurationService, environmentService, remoteAuthorityResolverService, workspaceContextService);
+		this._tunnelModel = new TunnelModel(tunnelService, storageService, configurationService, environmentService, remoteAuthorityResolverService, workspaceContextService, logService);
 	}
 
 	set targetType(name: string[]) {
diff --git a/src/vs/workbench/services/remote/electron-browser/tunnelServiceImpl.ts b/src/vs/workbench/services/remote/electron-browser/tunnelServiceImpl.ts
index 92f51dc00d7..e3c74cd9f82 100644
--- a/src/vs/workbench/services/remote/electron-browser/tunnelServiceImpl.ts
+++ b/src/vs/workbench/services/remote/electron-browser/tunnelServiceImpl.ts
@@ -11,6 +11,8 @@ import { BaseTunnelService } from 'vs/platform/remote/node/tunnelService';
 import { nodeSocketFactory } from 'vs/platform/remote/node/nodeSocketFactory';
 import { IWorkbenchEnvironmentService } from 'vs/workbench/services/environment/common/environmentService';
 import { URI } from 'vs/base/common/uri';
+import { registerSingleton } from 'vs/platform/instantiation/common/extensions';
+import { ITunnelService } from 'vs/platform/remote/common/tunnel';
 
 export class TunnelService extends BaseTunnelService {
 	public constructor(
@@ -27,3 +29,5 @@ export class TunnelService extends BaseTunnelService {
 		return super.canTunnel(uri) && !!this.environmentService.remoteAuthority;
 	}
 }
+
+registerSingleton(ITunnelService, TunnelService);
diff --git a/src/vs/workbench/services/remote/test/common/testServices.ts b/src/vs/workbench/services/remote/test/common/testServices.ts
new file mode 100644
index 00000000000..1637e19d71b
--- /dev/null
+++ b/src/vs/workbench/services/remote/test/common/testServices.ts
@@ -0,0 +1,50 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { URI } from 'vs/base/common/uri';
+import { IDiagnosticInfoOptions, IDiagnosticInfo } from 'vs/platform/diagnostics/common/diagnostics';
+import { ExtensionIdentifier, IExtensionDescription } from 'vs/platform/extensions/common/extensions';
+import { ISocketFactory } from 'vs/platform/remote/common/remoteAgentConnection';
+import { IRemoteAgentEnvironment } from 'vs/platform/remote/common/remoteAgentEnvironment';
+import { ITelemetryData } from 'vs/platform/telemetry/common/telemetry';
+import { IRemoteAgentConnection, IRemoteAgentService } from 'vs/workbench/services/remote/common/remoteAgentService';
+
+export class TestRemoteAgentService implements IRemoteAgentService {
+	_serviceBrand: undefined;
+	socketFactory: ISocketFactory = {
+		connect() { }
+	};
+	getConnection(): IRemoteAgentConnection | null {
+		throw new Error('Method not implemented.');
+	}
+	getEnvironment(): Promise<IRemoteAgentEnvironment | null> {
+		throw new Error('Method not implemented.');
+	}
+	getRawEnvironment(): Promise<IRemoteAgentEnvironment | null> {
+		throw new Error('Method not implemented.');
+	}
+	whenExtensionsReady(): Promise<void> {
+		throw new Error('Method not implemented.');
+	}
+	scanExtensions(skipExtensions?: ExtensionIdentifier[]): Promise<IExtensionDescription[]> {
+		throw new Error('Method not implemented.');
+	}
+	scanSingleExtension(extensionLocation: URI, isBuiltin: boolean): Promise<IExtensionDescription | null> {
+		throw new Error('Method not implemented.');
+	}
+	getDiagnosticInfo(options: IDiagnosticInfoOptions): Promise<IDiagnosticInfo | undefined> {
+		throw new Error('Method not implemented.');
+	}
+	disableTelemetry(): Promise<void> {
+		throw new Error('Method not implemented.');
+	}
+	logTelemetry(eventName: string, data?: ITelemetryData): Promise<void> {
+		throw new Error('Method not implemented.');
+	}
+	flushTelemetry(): Promise<void> {
+		throw new Error('Method not implemented.');
+	}
+
+}
diff --git a/src/vs/workbench/services/search/browser/searchService.ts b/src/vs/workbench/services/search/browser/searchService.ts
new file mode 100644
index 00000000000..e916fee5021
--- /dev/null
+++ b/src/vs/workbench/services/search/browser/searchService.ts
@@ -0,0 +1,29 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { IModelService } from 'vs/editor/common/services/modelService';
+import { IFileService } from 'vs/platform/files/common/files';
+import { registerSingleton } from 'vs/platform/instantiation/common/extensions';
+import { ILogService } from 'vs/platform/log/common/log';
+import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
+import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
+import { IExtensionService } from 'vs/workbench/services/extensions/common/extensions';
+import { ISearchService } from 'vs/workbench/services/search/common/search';
+import { SearchService } from 'vs/workbench/services/search/common/searchService';
+
+export class RemoteSearchService extends SearchService {
+	constructor(
+		@IModelService modelService: IModelService,
+		@IEditorService editorService: IEditorService,
+		@ITelemetryService telemetryService: ITelemetryService,
+		@ILogService logService: ILogService,
+		@IExtensionService extensionService: IExtensionService,
+		@IFileService fileService: IFileService
+	) {
+		super(modelService, editorService, telemetryService, logService, extensionService, fileService);
+	}
+}
+
+registerSingleton(ISearchService, RemoteSearchService, true);
diff --git a/src/vs/workbench/services/search/common/searchService.ts b/src/vs/workbench/services/search/common/searchService.ts
index daf00408cab..8322fb69937 100644
--- a/src/vs/workbench/services/search/common/searchService.ts
+++ b/src/vs/workbench/services/search/common/searchService.ts
@@ -14,7 +14,6 @@ import { StopWatch } from 'vs/base/common/stopwatch';
 import { URI as uri } from 'vs/base/common/uri';
 import { IModelService } from 'vs/editor/common/services/modelService';
 import { IFileService } from 'vs/platform/files/common/files';
-import { registerSingleton } from 'vs/platform/instantiation/common/extensions';
 import { ILogService } from 'vs/platform/log/common/log';
 import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
 import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
@@ -500,18 +499,3 @@ export class SearchService extends Disposable implements ISearchService {
 			.then(() => { });
 	}
 }
-
-export class RemoteSearchService extends SearchService {
-	constructor(
-		@IModelService modelService: IModelService,
-		@IEditorService editorService: IEditorService,
-		@ITelemetryService telemetryService: ITelemetryService,
-		@ILogService logService: ILogService,
-		@IExtensionService extensionService: IExtensionService,
-		@IFileService fileService: IFileService
-	) {
-		super(modelService, editorService, telemetryService, logService, extensionService, fileService);
-	}
-}
-
-registerSingleton(ISearchService, RemoteSearchService, true);
diff --git a/src/vs/workbench/services/search/node/ripgrepSearchProvider.ts b/src/vs/workbench/services/search/node/ripgrepSearchProvider.ts
index 37e27f49eb4..7fdbc01fc50 100644
--- a/src/vs/workbench/services/search/node/ripgrepSearchProvider.ts
+++ b/src/vs/workbench/services/search/node/ripgrepSearchProvider.ts
@@ -8,6 +8,7 @@ import { OutputChannel } from 'vs/workbench/services/search/node/ripgrepSearchUt
 import { RipgrepTextSearchEngine } from 'vs/workbench/services/search/node/ripgrepTextSearchEngine';
 import { TextSearchProvider, TextSearchComplete, TextSearchResult, TextSearchQuery, TextSearchOptions } from 'vs/workbench/services/search/common/searchExtTypes';
 import { Progress } from 'vs/platform/progress/common/progress';
+import { Schemas } from 'vs/base/common/network';
 
 export class RipgrepSearchProvider implements TextSearchProvider {
 	private inProgress: Set<CancellationTokenSource> = new Set();
@@ -18,7 +19,15 @@ export class RipgrepSearchProvider implements TextSearchProvider {
 
 	provideTextSearchResults(query: TextSearchQuery, options: TextSearchOptions, progress: Progress<TextSearchResult>, token: CancellationToken): Promise<TextSearchComplete> {
 		const engine = new RipgrepTextSearchEngine(this.outputChannel);
-		return this.withToken(token, token => engine.provideTextSearchResults(query, options, progress, token));
+		if (options.folder.scheme === Schemas.userData) {
+			// Ripgrep search engine can only provide file-scheme results, but we want to use it to search some schemes that are backed by the filesystem, but with some other provider as the frontend,
+			// case in point vscode-userdata. In these cases we translate the query to a file, and translate the results back to the frontend scheme.
+			const translatedOptions = { ...options, folder: options.folder.with({ scheme: Schemas.file }) };
+			const progressTranslator = new Progress<TextSearchResult>(data => progress.report({ ...data, uri: data.uri.with({ scheme: options.folder.scheme }) }));
+			return this.withToken(token, token => engine.provideTextSearchResults(query, translatedOptions, progressTranslator, token));
+		} else {
+			return this.withToken(token, token => engine.provideTextSearchResults(query, options, progress, token));
+		}
 	}
 
 	private async withToken<T>(token: CancellationToken, fn: (token: CancellationToken) => Promise<T>): Promise<T> {
@@ -40,4 +49,4 @@ function mergedTokenSource(token: CancellationToken): CancellationTokenSource {
 	token.onCancellationRequested(() => tokenSource.cancel());
 
 	return tokenSource;
-}
\ No newline at end of file
+}
diff --git a/src/vs/workbench/services/search/node/ripgrepSearchUtils.ts b/src/vs/workbench/services/search/node/ripgrepSearchUtils.ts
index 0b2f1643537..f9901923001 100644
--- a/src/vs/workbench/services/search/node/ripgrepSearchUtils.ts
+++ b/src/vs/workbench/services/search/node/ripgrepSearchUtils.ts
@@ -46,9 +46,9 @@ export interface IOutputChannel {
 }
 
 export class OutputChannel implements IOutputChannel {
-	constructor(@ILogService private readonly logService: ILogService) { }
+	constructor(private prefix: string, @ILogService private readonly logService: ILogService) { }
 
 	appendLine(msg: string): void {
-		this.logService.debug('RipgrepSearchEH#search', msg);
+		this.logService.debug(`${this.prefix}#search`, msg);
 	}
 }
diff --git a/src/vs/workbench/services/textfile/common/textFileEditorModel.ts b/src/vs/workbench/services/textfile/common/textFileEditorModel.ts
index ee202e4231d..d4cad64bb70 100644
--- a/src/vs/workbench/services/textfile/common/textFileEditorModel.ts
+++ b/src/vs/workbench/services/textfile/common/textFileEditorModel.ts
@@ -783,17 +783,6 @@ export class TextFileEditorModel extends BaseTextEditorModel implements ITextFil
 				return;
 			}
 
-			// Under certain conditions we do a short-cut of flushing contents to disk when we can assume that
-			// the file has not changed and as such was not dirty before.
-			// The conditions are all of:
-			// - a forced, explicit save (Ctrl+S)
-			// - the model is not dirty (otherwise we know there are changed which needs to go to the file)
-			// - the model is not in orphan mode (because in that case we know the file does not exist on disk)
-			// - the model version did not change due to save participants running
-			if (options.force && !this.dirty && !this.inOrphanMode && options.reason === SaveReason.EXPLICIT && versionId === this.versionId) {
-				return this.doTouch(this.versionId, options);
-			}
-
 			// update versionId with its new value (if pre-save changes happened)
 			versionId = this.versionId;
 
@@ -805,14 +794,14 @@ export class TextFileEditorModel extends BaseTextEditorModel implements ITextFil
 			// participant triggering
 			this.logService.trace(`[text file model] doSave(${versionId}) - before write()`, this.resource.toString(true));
 			const lastResolvedFileStat = assertIsDefined(this.lastResolvedFileStat);
-			const textFileEditorModel = this;
+			const resolvedTextFileEditorModel = this;
 			return this.saveSequentializer.setPending(versionId, (async () => {
 				try {
-					const stat = await this.textFileService.write(lastResolvedFileStat.resource, textFileEditorModel.createSnapshot(), {
+					const stat = await this.textFileService.write(lastResolvedFileStat.resource, resolvedTextFileEditorModel.createSnapshot(), {
 						overwriteReadonly: options.overwriteReadonly,
 						mtime: lastResolvedFileStat.mtime,
 						encoding: this.getEncoding(),
-						etag: (options.ignoreModifiedSince || !this.filesConfigurationService.preventSaveConflicts(lastResolvedFileStat.resource, textFileEditorModel.getMode())) ? ETAG_DISABLED : lastResolvedFileStat.etag,
+						etag: (options.ignoreModifiedSince || !this.filesConfigurationService.preventSaveConflicts(lastResolvedFileStat.resource, resolvedTextFileEditorModel.getMode())) ? ETAG_DISABLED : lastResolvedFileStat.etag,
 						writeElevated: options.writeElevated
 					});
 
@@ -853,6 +842,12 @@ export class TextFileEditorModel extends BaseTextEditorModel implements ITextFil
 			throw error;
 		}
 
+		// In any case of an error, we mark the model as dirty to prevent data loss
+		// It could be possible that the write corrupted the file on disk (e.g. when
+		// an error happened after truncating the file) and as such we want to preserve
+		// the model contents to prevent data loss.
+		this.setDirty(true);
+
 		// Flag as error state in the model
 		this.inErrorMode = true;
 
@@ -868,41 +863,6 @@ export class TextFileEditorModel extends BaseTextEditorModel implements ITextFil
 		this._onDidSaveError.fire();
 	}
 
-	private doTouch(this: TextFileEditorModel & IResolvedTextFileEditorModel, versionId: number, options: ITextFileSaveOptions): Promise<void> {
-		const lastResolvedFileStat = assertIsDefined(this.lastResolvedFileStat);
-
-		return this.saveSequentializer.setPending(versionId, (async () => {
-			try {
-
-				// Write contents to touch: we used to simply update the mtime of the file
-				// but this lead to weird results, either for external watchers or even for
-				// us where we thought the file has changed on disk. As such, we let the OS
-				// handle the increment of mtime and not deal with it ourselves.
-				const stat = await this.textFileService.write(lastResolvedFileStat.resource, this.createSnapshot(), {
-					mtime: lastResolvedFileStat.mtime,
-					encoding: this.getEncoding(),
-					etag: lastResolvedFileStat.etag
-				});
-
-				// Updated resolved stat with updated stat since touching it might have changed mtime
-				this.updateLastResolvedFileStat(stat);
-
-				// Emit File Saved Event
-				this._onDidSave.fire(options.reason ?? SaveReason.EXPLICIT);
-			} catch (error) {
-
-				// In any case of an error, we mark the model as dirty to prevent data loss
-				// It could be possible that the touch corrupted the file on disk (e.g. when
-				// an error happened after truncating the file) and as such we want to preserve
-				// the model contents to prevent data loss
-				this.setDirty(true);
-
-				// Notify user to handle this save error
-				this.handleSaveError(error, versionId, options);
-			}
-		})());
-	}
-
 	private updateSavedVersionId(): void {
 		// we remember the models alternate version id to remember when the version
 		// of the model matches with the saved version on disk. we need to keep this
diff --git a/src/vs/workbench/services/textfile/common/textfiles.ts b/src/vs/workbench/services/textfile/common/textfiles.ts
index eeb5ac44699..a0b8c0b02e8 100644
--- a/src/vs/workbench/services/textfile/common/textfiles.ts
+++ b/src/vs/workbench/services/textfile/common/textfiles.ts
@@ -7,7 +7,7 @@ import { URI } from 'vs/base/common/uri';
 import { Event } from 'vs/base/common/event';
 import { IDisposable } from 'vs/base/common/lifecycle';
 import { IEncodingSupport, IModeSupport, ISaveOptions, IRevertOptions, SaveReason } from 'vs/workbench/common/editor';
-import { IBaseStatWithMetadata, IFileStatWithMetadata, IReadFileOptions, IWriteFileOptions, FileOperationError, FileOperationResult } from 'vs/platform/files/common/files';
+import { IBaseStatWithMetadata, IFileStatWithMetadata, IWriteFileOptions, FileOperationError, FileOperationResult, IReadFileStreamOptions } from 'vs/platform/files/common/files';
 import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
 import { ITextEditorModel } from 'vs/editor/common/services/resolverService';
 import { ITextBufferFactory, ITextModel, ITextSnapshot } from 'vs/editor/common/model';
@@ -103,7 +103,7 @@ export interface ITextFileService extends IDisposable {
 	getEncodedReadable(resource: URI, value?: string | ITextSnapshot, options?: IWriteTextFileOptions): Promise<VSBuffer | VSBufferReadable | undefined>;
 }
 
-export interface IReadTextFileOptions extends IReadFileOptions {
+export interface IReadTextFileOptions extends IReadFileStreamOptions {
 
 	/**
 	 * The optional acceptTextOnly parameter allows to fail this request early if the file
diff --git a/src/vs/workbench/services/textfile/test/browser/textFileEditorModel.test.ts b/src/vs/workbench/services/textfile/test/browser/textFileEditorModel.test.ts
index 0c59ba92113..f2d701164f7 100644
--- a/src/vs/workbench/services/textfile/test/browser/textFileEditorModel.test.ts
+++ b/src/vs/workbench/services/textfile/test/browser/textFileEditorModel.test.ts
@@ -512,7 +512,7 @@ suite('Files - TextFileEditorModel', () => {
 		await model.load();
 
 		const mtime = getLastModifiedTime(model);
-		accessor.textFileService.setResolveTextContentErrorOnce(new FileOperationError('error', FileOperationResult.FILE_NOT_MODIFIED_SINCE));
+		accessor.textFileService.setReadStreamErrorOnce(new FileOperationError('error', FileOperationResult.FILE_NOT_MODIFIED_SINCE));
 
 		model = await model.load() as TextFileEditorModel;
 
@@ -525,7 +525,7 @@ suite('Files - TextFileEditorModel', () => {
 		let model: TextFileEditorModel = instantiationService.createInstance(TextFileEditorModel, toResource.call(this, '/path/index_async.txt'), 'utf8', undefined);
 
 		await model.load();
-		accessor.textFileService.setResolveTextContentErrorOnce(new FileOperationError('error', FileOperationResult.FILE_NOT_FOUND));
+		accessor.textFileService.setReadStreamErrorOnce(new FileOperationError('error', FileOperationResult.FILE_NOT_FOUND));
 
 		model = await model.load() as TextFileEditorModel;
 		assert.ok(model);
diff --git a/src/vs/workbench/services/themes/common/workbenchThemeService.ts b/src/vs/workbench/services/themes/common/workbenchThemeService.ts
index ab7072398d4..f290b5264a9 100644
--- a/src/vs/workbench/services/themes/common/workbenchThemeService.ts
+++ b/src/vs/workbench/services/themes/common/workbenchThemeService.ts
@@ -3,14 +3,14 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
+import { refineServiceDecorator } from 'vs/platform/instantiation/common/instantiation';
 import { Event } from 'vs/base/common/event';
 import { Color } from 'vs/base/common/color';
 import { IColorTheme, IThemeService, IFileIconTheme } from 'vs/platform/theme/common/themeService';
 import { ConfigurationTarget } from 'vs/platform/configuration/common/configuration';
 import { isBoolean, isString } from 'vs/base/common/types';
 
-export const IWorkbenchThemeService = createDecorator<IWorkbenchThemeService>('themeService');
+export const IWorkbenchThemeService = refineServiceDecorator<IThemeService, IWorkbenchThemeService>(IThemeService);
 
 export const VS_LIGHT_THEME = 'vs';
 export const VS_DARK_THEME = 'vs-dark';
diff --git a/src/vs/workbench/services/timer/browser/timerService.ts b/src/vs/workbench/services/timer/browser/timerService.ts
index 15620e50c88..534cc553e97 100644
--- a/src/vs/workbench/services/timer/browser/timerService.ts
+++ b/src/vs/workbench/services/timer/browser/timerService.ts
@@ -48,7 +48,6 @@ export interface IMemoryInfo {
 		"timers.ellapsedRequire" : { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth", "isMeasurement": true },
 		"timers.ellapsedStorageInit" : { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth", "isMeasurement": true },
 		"timers.ellapsedSharedProcesConnected" : { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth", "isMeasurement": true },
-		"timers.ellapsedWorkspaceStorageInit" : { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth", "isMeasurement": true },
 		"timers.ellapsedWorkspaceServiceInit" : { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth", "isMeasurement": true },
 		"timers.ellapsedRequiredUserDataInit" : { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth", "isMeasurement": true },
 		"timers.ellapsedOtherUserDataInit" : { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth", "isMeasurement": true },
@@ -208,15 +207,6 @@ export interface IStartupMetrics {
 		 */
 		readonly ellapsedWaitForShellEnv: number;
 
-		/**
-		 * The time it took to require the workspace storage DB, connect to it
-		 * and load the initial set of values.
-		 *
-		 * * Happens in the renderer-process
-		 * * Measured with the `code/willInitWorkspaceStorage` and `code/didInitWorkspaceStorage` performance marks.
-		 */
-		readonly ellapsedWorkspaceStorageInit: number;
-
 		/**
 		 * The time it took to init the storage database connection from the workbench.
 		 *
@@ -534,7 +524,6 @@ export abstract class AbstractTimerService implements ITimerService {
 				ellapsedWaitForShellEnv: this._marks.getDuration('code/willWaitForShellEnv', 'code/didWaitForShellEnv'),
 				ellapsedStorageInit: this._marks.getDuration('code/willInitStorage', 'code/didInitStorage'),
 				ellapsedSharedProcesConnected: this._marks.getDuration('code/willConnectSharedProcess', 'code/didConnectSharedProcess'),
-				ellapsedWorkspaceStorageInit: this._marks.getDuration('code/willInitWorkspaceStorage', 'code/didInitWorkspaceStorage'),
 				ellapsedWorkspaceServiceInit: this._marks.getDuration('code/willInitWorkspaceService', 'code/didInitWorkspaceService'),
 				ellapsedRequiredUserDataInit: this._marks.getDuration('code/willInitRequiredUserData', 'code/didInitRequiredUserData'),
 				ellapsedOtherUserDataInit: this._marks.getDuration('code/willInitOtherUserData', 'code/didInitOtherUserData'),
diff --git a/src/vs/workbench/services/timer/electron-sandbox/timerService.ts b/src/vs/workbench/services/timer/electron-sandbox/timerService.ts
index cfd5a044410..82a46bf6627 100644
--- a/src/vs/workbench/services/timer/electron-sandbox/timerService.ts
+++ b/src/vs/workbench/services/timer/electron-sandbox/timerService.ts
@@ -13,9 +13,10 @@ import { IViewletService } from 'vs/workbench/services/viewlet/browser/viewlet';
 import { IPanelService } from 'vs/workbench/services/panel/common/panelService';
 import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
 import { IAccessibilityService } from 'vs/platform/accessibility/common/accessibility';
-import { IStartupMetrics, AbstractTimerService, Writeable } from 'vs/workbench/services/timer/browser/timerService';
+import { IStartupMetrics, AbstractTimerService, Writeable, ITimerService } from 'vs/workbench/services/timer/browser/timerService';
 import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
 import { context, process } from 'vs/base/parts/sandbox/electron-sandbox/globals';
+import { registerSingleton } from 'vs/platform/instantiation/common/extensions';
 
 export class TimerService extends AbstractTimerService {
 
@@ -80,6 +81,8 @@ export class TimerService extends AbstractTimerService {
 	}
 }
 
+registerSingleton(ITimerService, TimerService);
+
 //#region cached data logic
 
 export function didUseCachedData(): boolean {
diff --git a/src/vs/workbench/services/userDataSync/browser/userDataAutoSyncEnablementService.ts b/src/vs/workbench/services/userDataSync/browser/userDataAutoSyncEnablementService.ts
index 41540b10fc8..9684c842da2 100644
--- a/src/vs/workbench/services/userDataSync/browser/userDataAutoSyncEnablementService.ts
+++ b/src/vs/workbench/services/userDataSync/browser/userDataAutoSyncEnablementService.ts
@@ -3,7 +3,9 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
+import { registerSingleton } from 'vs/platform/instantiation/common/extensions';
 import { UserDataAutoSyncEnablementService } from 'vs/platform/userDataSync/common/userDataAutoSyncService';
+import { IUserDataAutoSyncEnablementService } from 'vs/platform/userDataSync/common/userDataSync';
 import { IWorkbenchEnvironmentService } from 'vs/workbench/services/environment/common/environmentService';
 
 export class WebUserDataAutoSyncEnablementService extends UserDataAutoSyncEnablementService {
@@ -44,5 +46,6 @@ export class WebUserDataAutoSyncEnablementService extends UserDataAutoSyncEnable
 	private isTrusted(): boolean {
 		return !!this.workbenchEnvironmentService.options?.workspaceProvider?.trusted;
 	}
-
 }
+
+registerSingleton(IUserDataAutoSyncEnablementService, WebUserDataAutoSyncEnablementService);
diff --git a/src/vs/workbench/services/userDataSync/browser/userDataSyncWorkbenchService.ts b/src/vs/workbench/services/userDataSync/browser/userDataSyncWorkbenchService.ts
index 48602a7f767..587b70283f3 100644
--- a/src/vs/workbench/services/userDataSync/browser/userDataSyncWorkbenchService.ts
+++ b/src/vs/workbench/services/userDataSync/browser/userDataSyncWorkbenchService.ts
@@ -132,7 +132,7 @@ export class UserDataSyncWorkbenchService extends Disposable implements IUserDat
 	}
 
 	private updateAuthenticationProviders(): void {
-		this._authenticationProviders = (this.userDataSyncStoreManagementService.userDataSyncStore?.authenticationProviders || []).filter(({ id }) => this.authenticationService.declaredProviders.some(provider => provider.id === id));
+		this._authenticationProviders = (this.userDataSyncStoreManagementService.userDataSyncStore?.authenticationProviders || []).filter(({ id }) => this.authenticationService.getProviderIds().some(providerId => providerId === id));
 	}
 
 	private isSupportedAuthenticationProviderId(authenticationProviderId: string): boolean {
@@ -167,8 +167,6 @@ export class UserDataSyncWorkbenchService extends Disposable implements IUserDat
 
 		await this.update();
 
-		this._register(this.authenticationService.onDidChangeDeclaredProviders(() => this.updateAuthenticationProviders()));
-
 		this._register(
 			Event.any(
 				Event.filter(
diff --git a/src/vs/workbench/services/workspaces/common/workspaceTrust.ts b/src/vs/workbench/services/workspaces/common/workspaceTrust.ts
index 351b00a6ce5..bde1de62e3a 100644
--- a/src/vs/workbench/services/workspaces/common/workspaceTrust.ts
+++ b/src/vs/workbench/services/workspaces/common/workspaceTrust.ts
@@ -11,7 +11,7 @@ import { IContextKey, IContextKeyService, RawContextKey } from 'vs/platform/cont
 import { registerSingleton } from 'vs/platform/instantiation/common/extensions';
 import { IStorageService, StorageScope, StorageTarget } from 'vs/platform/storage/common/storage';
 import { IWorkspace, IWorkspaceContextService, WorkbenchState } from 'vs/platform/workspace/common/workspace';
-import { IWorkspaceTrustModel, IWorkspaceTrustRequest, IWorkspaceTrustRequestModel, IWorkspaceTrustService, IWorkspaceTrustStateInfo, WorkspaceTrustState, WorkspaceTrustStateChangeEvent } from 'vs/platform/workspace/common/workspaceTrust';
+import { IWorkspaceTrustModel, WorkspaceTrustRequest, IWorkspaceTrustRequestModel, IWorkspaceTrustService, IWorkspaceTrustStateInfo, WorkspaceTrustState, WorkspaceTrustStateChangeEvent } from 'vs/platform/workspace/common/workspaceTrust';
 import { isEqual, isEqualOrParent } from 'vs/base/common/extpath';
 import { EditorModel } from 'vs/workbench/common/editor';
 
@@ -178,7 +178,7 @@ export class WorkspaceTrustModel extends Disposable implements IWorkspaceTrustMo
 }
 
 export class WorkspaceTrustRequestModel extends Disposable implements IWorkspaceTrustRequestModel {
-	trustRequest: IWorkspaceTrustRequest | undefined;
+	trustRequest: WorkspaceTrustRequest | undefined;
 
 	private readonly _onDidInitiateRequest = this._register(new Emitter<void>());
 	readonly onDidInitiateRequest: Event<void> = this._onDidInitiateRequest.event;
@@ -186,7 +186,7 @@ export class WorkspaceTrustRequestModel extends Disposable implements IWorkspace
 	private readonly _onDidCompleteRequest = this._register(new Emitter<WorkspaceTrustState | undefined>());
 	readonly onDidCompleteRequest = this._onDidCompleteRequest.event;
 
-	initiateRequest(request: IWorkspaceTrustRequest): void {
+	initiateRequest(request: WorkspaceTrustRequest): void {
 		if (this.trustRequest && (!request.modal || this.trustRequest.modal)) {
 			return;
 		}
@@ -319,16 +319,16 @@ export class WorkspaceTrustService extends Disposable implements IWorkspaceTrust
 		return this.configurationService.getValue<boolean>(WORKSPACE_TRUST_ENABLED) ?? false;
 	}
 
-	async requireWorkspaceTrust(request?: IWorkspaceTrustRequest): Promise<WorkspaceTrustState> {
+	async requireWorkspaceTrust(request: WorkspaceTrustRequest = { modal: true }): Promise<WorkspaceTrustState> {
 		if (this.currentTrustState === WorkspaceTrustState.Trusted) {
 			return this.currentTrustState;
 		}
-		if (this.currentTrustState === WorkspaceTrustState.Untrusted && !request?.modal) {
+		if (this.currentTrustState === WorkspaceTrustState.Untrusted && !request.modal) {
 			return this.currentTrustState;
 		}
 
 		if (this._trustRequestPromise) {
-			if (request?.modal &&
+			if (request.modal &&
 				this.requestModel.trustRequest &&
 				!this.requestModel.trustRequest.modal) {
 				this.requestModel.initiateRequest(request);
diff --git a/src/vs/workbench/services/workspaces/electron-sandbox/workspaceEditingService.ts b/src/vs/workbench/services/workspaces/electron-sandbox/workspaceEditingService.ts
index 82b6a3254fe..496af760bcc 100644
--- a/src/vs/workbench/services/workspaces/electron-sandbox/workspaceEditingService.ts
+++ b/src/vs/workbench/services/workspaces/electron-sandbox/workspaceEditingService.ts
@@ -65,9 +65,7 @@ export class NativeWorkspaceEditingService extends AbstractWorkspaceEditingServi
 	private registerListeners(): void {
 		this.lifecycleService.onBeforeShutdown(e => {
 			const saveOperation = this.saveUntitledBeforeShutdown(e.reason);
-			if (saveOperation) {
-				e.veto(saveOperation, 'veto.untitledWorkspace');
-			}
+			e.veto(saveOperation, 'veto.untitledWorkspace');
 		});
 	}
 
diff --git a/src/vs/workbench/services/workspaces/test/browser/workspaces.test.ts b/src/vs/workbench/services/workspaces/test/browser/workspaces.test.ts
index fdfcf9e336f..5ea5db35ce0 100644
--- a/src/vs/workbench/services/workspaces/test/browser/workspaces.test.ts
+++ b/src/vs/workbench/services/workspaces/test/browser/workspaces.test.ts
@@ -5,7 +5,11 @@
 
 import * as assert from 'assert';
 import { URI } from 'vs/base/common/uri';
+import { TestInstantiationService } from 'vs/platform/instantiation/test/common/instantiationServiceMock';
+import { IWorkspaceTrustService, workspaceTrustStateToString } from 'vs/platform/workspace/common/workspaceTrust';
 import { getWorkspaceIdentifier, getSingleFolderWorkspaceIdentifier } from 'vs/workbench/services/workspaces/browser/workspaces';
+import { WorkspaceTrustService } from 'vs/workbench/services/workspaces/common/workspaceTrust';
+import { workbenchInstantiationService } from 'vs/workbench/test/browser/workbenchTestServices';
 
 suite('Workspaces', () => {
 	test('workspace identifiers are stable', function () {
@@ -17,3 +21,19 @@ suite('Workspaces', () => {
 		assert.strictEqual(getSingleFolderWorkspaceIdentifier(URI.parse('vscode-remote:/hello/test'))?.id, '474434e4');
 	});
 });
+
+suite('Workspace Trust', () => {
+	let workspaceTrustService: IWorkspaceTrustService;
+	setup(() => {
+		const instantiationService: TestInstantiationService = <TestInstantiationService>workbenchInstantiationService();
+		workspaceTrustService = instantiationService.createInstance(WorkspaceTrustService);
+	});
+
+	teardown(() => {
+
+	});
+
+	test('Sample Test', function () {
+		assert.strictEqual(workspaceTrustStateToString(workspaceTrustService.getWorkspaceTrustState()), 'Trusted');
+	});
+});
diff --git a/src/vs/workbench/services/workspaces/test/common/testWorkspaceTrustService.ts b/src/vs/workbench/services/workspaces/test/common/testWorkspaceTrustService.ts
index 2afa1277f07..f861677ebf0 100644
--- a/src/vs/workbench/services/workspaces/test/common/testWorkspaceTrustService.ts
+++ b/src/vs/workbench/services/workspaces/test/common/testWorkspaceTrustService.ts
@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { Event } from 'vs/base/common/event';
-import { IWorkspaceTrustRequest, IWorkspaceTrustRequestModel, IWorkspaceTrustService, WorkspaceTrustChangeEvent, WorkspaceTrustState } from 'vs/platform/workspace/common/workspaceTrust';
+import { WorkspaceTrustRequest, IWorkspaceTrustRequestModel, IWorkspaceTrustService, WorkspaceTrustChangeEvent, WorkspaceTrustState } from 'vs/platform/workspace/common/workspaceTrust';
 import { WorkspaceTrustRequestModel } from 'vs/workbench/services/workspaces/common/workspaceTrust';
 
 export class TestWorkspaceTrustService implements IWorkspaceTrustService {
@@ -22,7 +22,7 @@ export class TestWorkspaceTrustService implements IWorkspaceTrustService {
 		return true;
 	}
 
-	requireWorkspaceTrust(request: IWorkspaceTrustRequest): Promise<WorkspaceTrustState> {
+	requireWorkspaceTrust(request: WorkspaceTrustRequest): Promise<WorkspaceTrustState> {
 		return Promise.resolve(WorkspaceTrustState.Trusted);
 	}
 }
diff --git a/src/vs/workbench/test/browser/api/extHostApiCommands.test.ts b/src/vs/workbench/test/browser/api/extHostApiCommands.test.ts
index f6b271f0760..ee9db602dd4 100644
--- a/src/vs/workbench/test/browser/api/extHostApiCommands.test.ts
+++ b/src/vs/workbench/test/browser/api/extHostApiCommands.test.ts
@@ -280,15 +280,21 @@ suite('ExtHostLanguageFeatureCommands', function () {
 
 		disposables.push(extHost.registerDefinitionProvider(nullExtensionDescription, defaultSelector, <vscode.DefinitionProvider>{
 			provideDefinition(doc: any): any {
-				return new types.Location(doc.uri, new types.Range(0, 0, 0, 0));
+				return new types.Location(doc.uri, new types.Range(1, 0, 0, 0));
+			}
+		}));
+		disposables.push(extHost.registerDefinitionProvider(nullExtensionDescription, defaultSelector, <vscode.DefinitionProvider>{
+			provideDefinition(doc: any): any {
+				// duplicate result will get removed
+				return new types.Location(doc.uri, new types.Range(1, 0, 0, 0));
 			}
 		}));
 		disposables.push(extHost.registerDefinitionProvider(nullExtensionDescription, defaultSelector, <vscode.DefinitionProvider>{
 			provideDefinition(doc: any): any {
 				return [
-					new types.Location(doc.uri, new types.Range(0, 0, 0, 0)),
-					new types.Location(doc.uri, new types.Range(0, 0, 0, 0)),
-					new types.Location(doc.uri, new types.Range(0, 0, 0, 0)),
+					new types.Location(doc.uri, new types.Range(2, 0, 0, 0)),
+					new types.Location(doc.uri, new types.Range(3, 0, 0, 0)),
+					new types.Location(doc.uri, new types.Range(4, 0, 0, 0)),
 				];
 			}
 		}));
@@ -309,7 +315,7 @@ suite('ExtHostLanguageFeatureCommands', function () {
 			provideDefinition(doc: any): (vscode.Location | vscode.LocationLink)[] {
 				return [
 					new types.Location(doc.uri, new types.Range(0, 0, 0, 0)),
-					{ targetUri: doc.uri, targetRange: new types.Range(0, 0, 0, 0), targetSelectionRange: new types.Range(1, 1, 1, 1), originSelectionRange: new types.Range(2, 2, 2, 2) }
+					{ targetUri: doc.uri, targetRange: new types.Range(1, 0, 0, 0), targetSelectionRange: new types.Range(1, 1, 1, 1), originSelectionRange: new types.Range(2, 2, 2, 2) }
 				];
 			}
 		}));
@@ -338,15 +344,21 @@ suite('ExtHostLanguageFeatureCommands', function () {
 
 		disposables.push(extHost.registerDeclarationProvider(nullExtensionDescription, defaultSelector, <vscode.DeclarationProvider>{
 			provideDeclaration(doc: any): any {
-				return new types.Location(doc.uri, new types.Range(0, 0, 0, 0));
+				return new types.Location(doc.uri, new types.Range(1, 0, 0, 0));
+			}
+		}));
+		disposables.push(extHost.registerDeclarationProvider(nullExtensionDescription, defaultSelector, <vscode.DeclarationProvider>{
+			provideDeclaration(doc: any): any {
+				// duplicate result will get removed
+				return new types.Location(doc.uri, new types.Range(1, 0, 0, 0));
 			}
 		}));
 		disposables.push(extHost.registerDeclarationProvider(nullExtensionDescription, defaultSelector, <vscode.DeclarationProvider>{
 			provideDeclaration(doc: any): any {
 				return [
-					new types.Location(doc.uri, new types.Range(0, 0, 0, 0)),
-					new types.Location(doc.uri, new types.Range(0, 0, 0, 0)),
-					new types.Location(doc.uri, new types.Range(0, 0, 0, 0)),
+					new types.Location(doc.uri, new types.Range(2, 0, 0, 0)),
+					new types.Location(doc.uri, new types.Range(3, 0, 0, 0)),
+					new types.Location(doc.uri, new types.Range(4, 0, 0, 0)),
 				];
 			}
 		}));
@@ -367,7 +379,7 @@ suite('ExtHostLanguageFeatureCommands', function () {
 			provideDeclaration(doc: any): (vscode.Location | vscode.LocationLink)[] {
 				return [
 					new types.Location(doc.uri, new types.Range(0, 0, 0, 0)),
-					{ targetUri: doc.uri, targetRange: new types.Range(0, 0, 0, 0), targetSelectionRange: new types.Range(1, 1, 1, 1), originSelectionRange: new types.Range(2, 2, 2, 2) }
+					{ targetUri: doc.uri, targetRange: new types.Range(1, 0, 0, 0), targetSelectionRange: new types.Range(1, 1, 1, 1), originSelectionRange: new types.Range(2, 2, 2, 2) }
 				];
 			}
 		}));
@@ -407,15 +419,21 @@ suite('ExtHostLanguageFeatureCommands', function () {
 
 		disposables.push(extHost.registerTypeDefinitionProvider(nullExtensionDescription, defaultSelector, <vscode.TypeDefinitionProvider>{
 			provideTypeDefinition(doc: any): any {
-				return new types.Location(doc.uri, new types.Range(0, 0, 0, 0));
+				return new types.Location(doc.uri, new types.Range(1, 0, 0, 0));
+			}
+		}));
+		disposables.push(extHost.registerTypeDefinitionProvider(nullExtensionDescription, defaultSelector, <vscode.TypeDefinitionProvider>{
+			provideTypeDefinition(doc: any): any {
+				// duplicate result will get removed
+				return new types.Location(doc.uri, new types.Range(1, 0, 0, 0));
 			}
 		}));
 		disposables.push(extHost.registerTypeDefinitionProvider(nullExtensionDescription, defaultSelector, <vscode.TypeDefinitionProvider>{
 			provideTypeDefinition(doc: any): any {
 				return [
-					new types.Location(doc.uri, new types.Range(0, 0, 0, 0)),
-					new types.Location(doc.uri, new types.Range(0, 0, 0, 0)),
-					new types.Location(doc.uri, new types.Range(0, 0, 0, 0)),
+					new types.Location(doc.uri, new types.Range(2, 0, 0, 0)),
+					new types.Location(doc.uri, new types.Range(3, 0, 0, 0)),
+					new types.Location(doc.uri, new types.Range(4, 0, 0, 0)),
 				];
 			}
 		}));
@@ -436,7 +454,7 @@ suite('ExtHostLanguageFeatureCommands', function () {
 			provideTypeDefinition(doc: any): (vscode.Location | vscode.LocationLink)[] {
 				return [
 					new types.Location(doc.uri, new types.Range(0, 0, 0, 0)),
-					{ targetUri: doc.uri, targetRange: new types.Range(0, 0, 0, 0), targetSelectionRange: new types.Range(1, 1, 1, 1), originSelectionRange: new types.Range(2, 2, 2, 2) }
+					{ targetUri: doc.uri, targetRange: new types.Range(1, 0, 0, 0), targetSelectionRange: new types.Range(1, 1, 1, 1), originSelectionRange: new types.Range(2, 2, 2, 2) }
 				];
 			}
 		}));
@@ -476,15 +494,21 @@ suite('ExtHostLanguageFeatureCommands', function () {
 
 		disposables.push(extHost.registerImplementationProvider(nullExtensionDescription, defaultSelector, <vscode.ImplementationProvider>{
 			provideImplementation(doc: any): any {
-				return new types.Location(doc.uri, new types.Range(0, 0, 0, 0));
+				return new types.Location(doc.uri, new types.Range(1, 0, 0, 0));
+			}
+		}));
+		disposables.push(extHost.registerImplementationProvider(nullExtensionDescription, defaultSelector, <vscode.ImplementationProvider>{
+			provideImplementation(doc: any): any {
+				// duplicate result will get removed
+				return new types.Location(doc.uri, new types.Range(1, 0, 0, 0));
 			}
 		}));
 		disposables.push(extHost.registerImplementationProvider(nullExtensionDescription, defaultSelector, <vscode.ImplementationProvider>{
 			provideImplementation(doc: any): any {
 				return [
-					new types.Location(doc.uri, new types.Range(0, 0, 0, 0)),
-					new types.Location(doc.uri, new types.Range(0, 0, 0, 0)),
-					new types.Location(doc.uri, new types.Range(0, 0, 0, 0)),
+					new types.Location(doc.uri, new types.Range(2, 0, 0, 0)),
+					new types.Location(doc.uri, new types.Range(3, 0, 0, 0)),
+					new types.Location(doc.uri, new types.Range(4, 0, 0, 0)),
 				];
 			}
 		}));
@@ -505,7 +529,7 @@ suite('ExtHostLanguageFeatureCommands', function () {
 			provideImplementation(doc: any): (vscode.Location | vscode.LocationLink)[] {
 				return [
 					new types.Location(doc.uri, new types.Range(0, 0, 0, 0)),
-					{ targetUri: doc.uri, targetRange: new types.Range(0, 0, 0, 0), targetSelectionRange: new types.Range(1, 1, 1, 1), originSelectionRange: new types.Range(2, 2, 2, 2) }
+					{ targetUri: doc.uri, targetRange: new types.Range(1, 0, 0, 0), targetSelectionRange: new types.Range(1, 1, 1, 1), originSelectionRange: new types.Range(2, 2, 2, 2) }
 				];
 			}
 		}));
diff --git a/src/vs/workbench/test/browser/api/extHostLanguageFeatures.test.ts b/src/vs/workbench/test/browser/api/extHostLanguageFeatures.test.ts
index 44aec4a9030..b40a45b3539 100644
--- a/src/vs/workbench/test/browser/api/extHostLanguageFeatures.test.ts
+++ b/src/vs/workbench/test/browser/api/extHostLanguageFeatures.test.ts
@@ -259,7 +259,7 @@ suite('ExtHostLanguageFeatures', function () {
 		}));
 		disposables.push(extHost.registerDefinitionProvider(defaultExtension, defaultSelector, new class implements vscode.DefinitionProvider {
 			provideDefinition(): any {
-				return new types.Location(model.uri, new types.Range(1, 1, 1, 1));
+				return new types.Location(model.uri, new types.Range(2, 1, 1, 1));
 			}
 		}));
 
@@ -268,7 +268,7 @@ suite('ExtHostLanguageFeatures', function () {
 		assert.strictEqual(value.length, 2);
 	});
 
-	test('Definition, registration order', async () => {
+	test('Definition, registration order ignored (results are sorted)', async () => {
 
 		disposables.push(extHost.registerDefinitionProvider(defaultExtension, defaultSelector, new class implements vscode.DefinitionProvider {
 			provideDefinition(): any {
@@ -286,8 +286,8 @@ suite('ExtHostLanguageFeatures', function () {
 		const value = await getDefinitionsAtPosition(model, new EditorPosition(1, 1), CancellationToken.None);
 		assert.strictEqual(value.length, 2);
 		// let [first, second] = value;
-		assert.strictEqual(value[0].uri.authority, 'second');
-		assert.strictEqual(value[1].uri.authority, 'first');
+		assert.strictEqual(value[0].uri.authority, 'first');
+		assert.strictEqual(value[1].uri.authority, 'second');
 	});
 
 	test('Definition, evil provider', async () => {
@@ -521,7 +521,7 @@ suite('ExtHostLanguageFeatures', function () {
 
 	// --- references
 
-	test('References, registration order', async () => {
+	test('References, registration order ignored (results are sorted)', async () => {
 
 		disposables.push(extHost.registerReferenceProvider(defaultExtension, defaultSelector, new class implements vscode.ReferenceProvider {
 			provideReferences(): any {
@@ -539,8 +539,8 @@ suite('ExtHostLanguageFeatures', function () {
 		let value = await getReferencesAtPosition(model, new EditorPosition(1, 2), false, CancellationToken.None);
 		assert.strictEqual(value.length, 2);
 		let [first, second] = value;
-		assert.strictEqual(first.uri.path, '/second');
-		assert.strictEqual(second.uri.path, '/first');
+		assert.strictEqual(first.uri.path, '/first');
+		assert.strictEqual(second.uri.path, '/second');
 	});
 
 	test('References, data conversion', async () => {
diff --git a/src/vs/workbench/test/browser/api/mainThreadEditors.test.ts b/src/vs/workbench/test/browser/api/mainThreadEditors.test.ts
index cace30fd333..bd8224ef67d 100644
--- a/src/vs/workbench/test/browser/api/mainThreadEditors.test.ts
+++ b/src/vs/workbench/test/browser/api/mainThreadEditors.test.ts
@@ -53,6 +53,7 @@ import { extUri } from 'vs/base/common/resources';
 import { ITextSnapshot } from 'vs/editor/common/model';
 import { VSBuffer, VSBufferReadable } from 'vs/base/common/buffer';
 import { ILifecycleService } from 'vs/workbench/services/lifecycle/common/lifecycle';
+import { IEnvironmentService } from 'vs/platform/environment/common/environment';
 
 suite('MainThreadEditors', () => {
 
@@ -86,6 +87,7 @@ suite('MainThreadEditors', () => {
 		services.set(ILabelService, new SyncDescriptor(LabelService));
 		services.set(ILogService, new NullLogService());
 		services.set(IWorkspaceContextService, new TestContextService());
+		services.set(IEnvironmentService, TestEnvironmentService);
 		services.set(IWorkbenchEnvironmentService, TestEnvironmentService);
 		services.set(IConfigurationService, configService);
 		services.set(IDialogService, dialogService);
diff --git a/src/vs/workbench/test/browser/workbenchTestServices.ts b/src/vs/workbench/test/browser/workbenchTestServices.ts
index 9cbf40cfea6..3b8b6c6ce8f 100644
--- a/src/vs/workbench/test/browser/workbenchTestServices.ts
+++ b/src/vs/workbench/test/browser/workbenchTestServices.ts
@@ -22,11 +22,11 @@ import { IUntitledTextEditorService, UntitledTextEditorService } from 'vs/workbe
 import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
 import { ILifecycleService, BeforeShutdownEvent, ShutdownReason, StartupKind, LifecyclePhase, WillShutdownEvent } from 'vs/workbench/services/lifecycle/common/lifecycle';
 import { ServiceCollection } from 'vs/platform/instantiation/common/serviceCollection';
-import { FileOperationEvent, IFileService, IFileStat, IResolveFileResult, FileChangesEvent, IResolveFileOptions, ICreateFileOptions, IFileSystemProvider, FileSystemProviderCapabilities, IFileChange, IWatchOptions, IStat, FileType, FileDeleteOptions, FileOverwriteOptions, FileWriteOptions, FileOpenOptions, IFileStatWithMetadata, IResolveMetadataFileOptions, IWriteFileOptions, IReadFileOptions, IFileContent, IFileStreamContent, FileOperationError, IFileSystemProviderWithFileReadStreamCapability, FileReadStreamOptions } from 'vs/platform/files/common/files';
+import { FileOperationEvent, IFileService, IFileStat, IResolveFileResult, FileChangesEvent, IResolveFileOptions, ICreateFileOptions, IFileSystemProvider, FileSystemProviderCapabilities, IFileChange, IWatchOptions, IStat, FileType, FileDeleteOptions, FileOverwriteOptions, FileWriteOptions, FileOpenOptions, IFileStatWithMetadata, IResolveMetadataFileOptions, IWriteFileOptions, IReadFileOptions, IFileContent, IFileStreamContent, FileOperationError, IFileSystemProviderWithFileReadStreamCapability, FileReadStreamOptions, IReadFileStreamOptions } from 'vs/platform/files/common/files';
 import { IModelService } from 'vs/editor/common/services/modelService';
 import { ModeServiceImpl } from 'vs/editor/common/services/modeServiceImpl';
 import { ModelServiceImpl } from 'vs/editor/common/services/modelServiceImpl';
-import { IResourceEncoding, ITextFileService, IReadTextFileOptions, ITextFileStreamContent } from 'vs/workbench/services/textfile/common/textfiles';
+import { IResourceEncoding, ITextFileService, IReadTextFileOptions, ITextFileStreamContent, IWriteTextFileOptions } from 'vs/workbench/services/textfile/common/textfiles';
 import { IModeService } from 'vs/editor/common/services/modeService';
 import { IHistoryService } from 'vs/workbench/services/history/common/history';
 import { IInstantiationService, ServiceIdentifier } from 'vs/platform/instantiation/common/instantiation';
@@ -63,7 +63,7 @@ import { IViewletService } from 'vs/workbench/services/viewlet/browser/viewlet';
 import { ViewletDescriptor, Viewlet } from 'vs/workbench/browser/viewlet';
 import { IViewlet } from 'vs/workbench/common/viewlet';
 import { IStorageService, StorageScope, StorageTarget } from 'vs/platform/storage/common/storage';
-import { isLinux, isWindows } from 'vs/base/common/platform';
+import { IProcessEnvironment, isLinux, isWindows, Platform } from 'vs/base/common/platform';
 import { LabelService } from 'vs/workbench/services/label/common/labelService';
 import { Part } from 'vs/workbench/browser/part';
 import { IPanelService } from 'vs/workbench/services/panel/common/panelService';
@@ -126,6 +126,9 @@ import { SideBySideEditor } from 'vs/workbench/browser/parts/editor/sideBySideEd
 import { IEnterWorkspaceResult, IRecent, IRecentlyOpened, IWorkspaceFolderCreationData, IWorkspaceIdentifier, IWorkspacesService } from 'vs/platform/workspaces/common/workspaces';
 import { IWorkspaceTrustService } from 'vs/platform/workspace/common/workspaceTrust';
 import { TestWorkspaceTrustService } from 'vs/workbench/services/workspaces/test/common/testWorkspaceTrustService';
+import { ITerminalInstanceService } from 'vs/workbench/contrib/terminal/browser/terminal';
+import { IShellLaunchConfig, ITerminalChildProcess, ITerminalsLayoutInfo, ITerminalsLayoutInfoById } from 'vs/platform/terminal/common/terminal';
+import { ISetTerminalLayoutInfoArgs } from 'vs/platform/terminal/common/terminalProcess';
 
 export function createFileEditorInput(instantiationService: IInstantiationService, resource: URI): FileEditorInput {
 	return instantiationService.createInstance(FileEditorInput, resource, undefined, undefined, undefined, undefined, undefined);
@@ -173,6 +176,7 @@ export function workbenchInstantiationService(
 
 	instantiationService.stub(IWorkingCopyService, disposables.add(new TestWorkingCopyService()));
 	instantiationService.stub(IEnvironmentService, TestEnvironmentService);
+	instantiationService.stub(IWorkbenchEnvironmentService, TestEnvironmentService);
 	const contextKeyService = overrides?.contextKeyService ? overrides.contextKeyService(instantiationService) : instantiationService.createInstance(MockContextKeyService);
 	instantiationService.stub(IContextKeyService, contextKeyService);
 	instantiationService.stub(IProgressService, new TestProgressService());
@@ -226,6 +230,7 @@ export function workbenchInstantiationService(
 	instantiationService.stub(IQuickInputService, disposables.add(new QuickInputService(configService, instantiationService, keybindingService, contextKeyService, themeService, accessibilityService, layoutService)));
 	instantiationService.stub(IWorkspacesService, new TestWorkspacesService());
 	instantiationService.stub(IWorkspaceTrustService, new TestWorkspaceTrustService());
+	instantiationService.stub(ITerminalInstanceService, new TestTerminalInstanceService());
 
 	return instantiationService;
 }
@@ -254,7 +259,8 @@ export class TestServiceAccessor {
 }
 
 export class TestTextFileService extends BrowserTextFileService {
-	private resolveTextContentError!: FileOperationError | null;
+	private readStreamError: FileOperationError | undefined = undefined;
+	private writeError: FileOperationError | undefined = undefined;
 
 	constructor(
 		@IFileService protected fileService: IFileService,
@@ -297,14 +303,14 @@ export class TestTextFileService extends BrowserTextFileService {
 		);
 	}
 
-	setResolveTextContentErrorOnce(error: FileOperationError): void {
-		this.resolveTextContentError = error;
+	setReadStreamErrorOnce(error: FileOperationError): void {
+		this.readStreamError = error;
 	}
 
 	async readStream(resource: URI, options?: IReadTextFileOptions): Promise<ITextFileStreamContent> {
-		if (this.resolveTextContentError) {
-			const error = this.resolveTextContentError;
-			this.resolveTextContentError = null;
+		if (this.readStreamError) {
+			const error = this.readStreamError;
+			this.readStreamError = undefined;
 
 			throw error;
 		}
@@ -321,6 +327,21 @@ export class TestTextFileService extends BrowserTextFileService {
 			size: 10
 		};
 	}
+
+	setWriteErrorOnce(error: FileOperationError): void {
+		this.writeError = error;
+	}
+
+	async write(resource: URI, value: string | ITextSnapshot, options?: IWriteTextFileOptions): Promise<IFileStatWithMetadata> {
+		if (this.writeError) {
+			const error = this.writeError;
+			this.writeError = undefined;
+
+			throw error;
+		}
+
+		return super.write(resource, value, options);
+	}
 }
 
 export class TestBrowserTextFileServiceWithEncodingOverrides extends BrowserTextFileService {
@@ -501,7 +522,6 @@ export class TestLayoutService implements IWorkbenchLayoutService {
 	addClass(_clazz: string): void { }
 	removeClass(_clazz: string): void { }
 	getMaximumEditorDimensions(): Dimension { throw new Error('not implemented'); }
-	getWorkbenchContainer(): HTMLElement { throw new Error('not implemented'); }
 	toggleZenMode(): void { }
 	isEditorLayoutCentered(): boolean { return false; }
 	centerEditorLayout(_active: boolean): void { }
@@ -830,7 +850,7 @@ export class TestFileService implements IFileService {
 		});
 	}
 
-	readFileStream(resource: URI, options?: IReadFileOptions | undefined): Promise<IFileStreamContent> {
+	readFileStream(resource: URI, options?: IReadFileStreamOptions | undefined): Promise<IFileStreamContent> {
 		this.lastReadFileUri = resource;
 
 		return Promise.resolve({
@@ -1373,6 +1393,14 @@ export class TestEditorPart extends EditorPart {
 	}
 }
 
+export function createEditorPart(instantiationService: IInstantiationService, disposables: DisposableStore): TestEditorPart {
+	const part = disposables.add(instantiationService.createInstance(TestEditorPart));
+	part.create(document.createElement('div'));
+	part.layout(1080, 800);
+
+	return part;
+}
+
 export class TestListService implements IListService {
 	declare readonly _serviceBrand: undefined;
 
@@ -1427,3 +1455,55 @@ export class TestWorkspacesService implements IWorkspacesService {
 	async enterWorkspace(path: URI): Promise<IEnterWorkspaceResult | null> { throw new Error('Method not implemented.'); }
 	async getWorkspaceIdentifier(workspacePath: URI): Promise<IWorkspaceIdentifier> { throw new Error('Method not implemented.'); }
 }
+
+export class TestTerminalInstanceService implements ITerminalInstanceService {
+	declare readonly _serviceBrand: undefined;
+
+	onPtyHostExit = Event.None;
+	onPtyHostUnresponsive = Event.None;
+
+	async createTerminalProcess(shellLaunchConfig: IShellLaunchConfig, cwd: string, cols: number, rows: number, env: IProcessEnvironment, windowsEnableConpty: boolean, shouldPersist: boolean): Promise<ITerminalChildProcess> {
+		return new TestTerminalChildProcess(shouldPersist);
+	}
+	async getDefaultShellAndArgs(useAutomationShell: boolean, platformOverride?: Platform): Promise<{ shell: string, args: string[] | string | undefined }> {
+		return {
+			shell: 'bash',
+			args: undefined
+		};
+	}
+	async getMainProcessParentEnv(): Promise<IProcessEnvironment> {
+		return {};
+	}
+
+	async getXtermConstructor(): Promise<any> { throw new Error('Method not implemented.'); }
+	async getXtermSearchConstructor(): Promise<any> { throw new Error('Method not implemented.'); }
+	async getXtermUnicode11Constructor(): Promise<any> { throw new Error('Method not implemented.'); }
+	async getXtermWebglConstructor(): Promise<any> { throw new Error('Method not implemented.'); }
+	createWindowsShellHelper(shellProcessId: number, xterm: any): any { throw new Error('Method not implemented.'); }
+	async attachToProcess(id: number): Promise<ITerminalChildProcess | undefined> { throw new Error('Method not implemented.'); }
+	setTerminalLayoutInfo(argsOrLayout?: ISetTerminalLayoutInfoArgs | ITerminalsLayoutInfoById): void { throw new Error('Method not implemented.'); }
+	async getTerminalLayoutInfo(): Promise<ITerminalsLayoutInfo | undefined> { throw new Error('Method not implemented.'); }
+}
+
+class TestTerminalChildProcess implements ITerminalChildProcess {
+	id: number = 0;
+
+	constructor(
+		readonly shouldPersist: boolean
+	) {
+	}
+
+	onProcessData = Event.None;
+	onProcessExit = Event.None;
+	onProcessReady = Event.None;
+	onProcessTitleChanged = Event.None;
+
+	async start(): Promise<undefined> { return undefined; }
+	shutdown(immediate: boolean): void { }
+	input(data: string): void { }
+	resize(cols: number, rows: number): void { }
+	acknowledgeDataEvent(charCount: number): void { }
+	async getInitialCwd(): Promise<string> { return ''; }
+	async getCwd(): Promise<string> { return ''; }
+	async getLatency(): Promise<number> { return 0; }
+}
diff --git a/src/vs/workbench/test/electron-browser/workbenchTestServices.ts b/src/vs/workbench/test/electron-browser/workbenchTestServices.ts
index 6dbb50fa818..d19572db1a9 100644
--- a/src/vs/workbench/test/electron-browser/workbenchTestServices.ts
+++ b/src/vs/workbench/test/electron-browser/workbenchTestServices.ts
@@ -41,6 +41,8 @@ import { MouseInputEvent } from 'vs/base/parts/sandbox/common/electronTypes';
 import { IModeService } from 'vs/editor/common/services/modeService';
 import { IOSProperties, IOSStatistics } from 'vs/platform/native/common/native';
 import { homedir, release } from 'os';
+import { IEnvironmentService, INativeEnvironmentService } from 'vs/platform/environment/common/environment';
+import { IWorkbenchEnvironmentService } from 'vs/workbench/services/environment/common/environmentService';
 
 export const TestWorkbenchConfiguration: INativeWorkbenchConfiguration = {
 	windowId: 0,
@@ -55,7 +57,6 @@ export const TestWorkbenchConfiguration: INativeWorkbenchConfiguration = {
 	perfMarks: [],
 	colorScheme: { dark: true, highContrast: false },
 	os: { release: release() },
-	enableExperimentalMainProcessWorkspaceStorage: false,
 	...parseArgs(process.argv, OPTIONS)
 };
 
@@ -168,6 +169,7 @@ export class TestNativeHostService implements INativeHostService {
 	onDidResumeOS: Event<unknown> = Event.None;
 	onDidChangeColorScheme = Event.None;
 	onDidChangePassword = Event.None;
+	onDidChangeDisplay = Event.None;
 
 	windowCount = Promise.resolve(1);
 	getWindowCount(): Promise<number> { return this.windowCount; }
@@ -248,6 +250,9 @@ export function workbenchInstantiationService(): ITestInstantiationService {
 	});
 
 	instantiationService.stub(INativeHostService, new TestNativeHostService());
+	instantiationService.stub(IEnvironmentService, TestEnvironmentService);
+	instantiationService.stub(INativeEnvironmentService, TestEnvironmentService);
+	instantiationService.stub(IWorkbenchEnvironmentService, TestEnvironmentService);
 	instantiationService.stub(INativeWorkbenchEnvironmentService, TestEnvironmentService);
 
 	return instantiationService;
diff --git a/src/vs/workbench/workbench.desktop.main.ts b/src/vs/workbench/workbench.desktop.main.ts
index a1215064ddf..8d6b15d63c6 100644
--- a/src/vs/workbench/workbench.desktop.main.ts
+++ b/src/vs/workbench/workbench.desktop.main.ts
@@ -62,6 +62,8 @@ import 'vs/workbench/services/search/electron-browser/searchService';
 import 'vs/workbench/services/textfile/electron-browser/nativeTextFileService';
 import 'vs/workbench/services/extensions/electron-browser/extensionService';
 import 'vs/workbench/services/backup/electron-browser/backupFileService';
+import 'vs/workbench/services/remote/electron-browser/tunnelServiceImpl';
+
 
 // !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 //
@@ -75,12 +77,6 @@ import 'vs/workbench/services/backup/electron-browser/backupFileService';
 // !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 
-import { registerSingleton } from 'vs/platform/instantiation/common/extensions';
-import { ITunnelService } from 'vs/platform/remote/common/tunnel';
-import { TunnelService } from 'vs/workbench/services/remote/electron-browser/tunnelServiceImpl';
-
-registerSingleton(ITunnelService, TunnelService);
-
 //#endregion
 
 
diff --git a/src/vs/workbench/workbench.sandbox.main.ts b/src/vs/workbench/workbench.sandbox.main.ts
index 7d3cf785102..4df18d0c519 100644
--- a/src/vs/workbench/workbench.sandbox.main.ts
+++ b/src/vs/workbench/workbench.sandbox.main.ts
@@ -60,15 +60,13 @@ import 'vs/workbench/services/userDataSync/electron-sandbox/userDataSyncAccountS
 import 'vs/workbench/services/userDataSync/electron-sandbox/userDataSyncStoreManagementService';
 import 'vs/workbench/services/userDataSync/electron-sandbox/userDataAutoSyncService';
 import 'vs/workbench/services/ipc/electron-sandbox/sharedProcessService';
+import 'vs/workbench/services/timer/electron-sandbox/timerService';
 
 import { registerSingleton } from 'vs/platform/instantiation/common/extensions';
-import { ITimerService } from 'vs/workbench/services/timer/browser/timerService';
-import { TimerService } from 'vs/workbench/services/timer/electron-sandbox/timerService';
 import { IUserDataInitializationService, UserDataInitializationService } from 'vs/workbench/services/userData/browser/userDataInit';
 import { IUserDataAutoSyncEnablementService } from 'vs/platform/userDataSync/common/userDataSync';
 import { UserDataAutoSyncEnablementService } from 'vs/platform/userDataSync/common/userDataAutoSyncService';
 
-registerSingleton(ITimerService, TimerService);
 registerSingleton(IUserDataInitializationService, UserDataInitializationService);
 registerSingleton(IUserDataAutoSyncEnablementService, UserDataAutoSyncEnablementService);
 
diff --git a/src/vs/workbench/workbench.web.main.ts b/src/vs/workbench/workbench.web.main.ts
index 1b3c3349b82..03fd37e720b 100644
--- a/src/vs/workbench/workbench.web.main.ts
+++ b/src/vs/workbench/workbench.web.main.ts
@@ -36,14 +36,13 @@ import 'vs/workbench/browser/web.main';
 
 import 'vs/workbench/services/integrity/browser/integrityService';
 import 'vs/workbench/services/textMate/browser/textMateService';
-import 'vs/workbench/services/search/common/searchService';
+import 'vs/workbench/services/search/browser/searchService';
 import 'vs/workbench/services/textfile/browser/browserTextFileService';
 import 'vs/workbench/services/keybinding/browser/keyboardLayoutService';
 import 'vs/workbench/services/extensions/browser/extensionService';
 import 'vs/workbench/services/extensionManagement/common/extensionManagementServerService';
 import 'vs/workbench/services/extensionManagement/browser/extensionUrlTrustService';
 import 'vs/workbench/services/telemetry/browser/telemetryService';
-import 'vs/workbench/services/configurationResolver/browser/configurationResolverService';
 import 'vs/workbench/services/credentials/browser/credentialsService';
 import 'vs/workbench/services/url/browser/urlService';
 import 'vs/workbench/services/update/browser/updateService';
@@ -58,6 +57,8 @@ import 'vs/workbench/services/path/browser/pathService';
 import 'vs/workbench/services/themes/browser/browserHostColorSchemeService';
 import 'vs/workbench/services/encryption/browser/encryptionService';
 import 'vs/workbench/services/backup/browser/backupFileService';
+import 'vs/workbench/services/remote/browser/tunnelServiceImpl';
+import 'vs/workbench/services/userDataSync/browser/userDataAutoSyncEnablementService';
 
 import { registerSingleton } from 'vs/platform/instantiation/common/extensions';
 import { IAccessibilityService } from 'vs/platform/accessibility/common/accessibility';
@@ -67,28 +68,26 @@ import { IExtensionTipsService } from 'vs/platform/extensionManagement/common/ex
 import { ExtensionTipsService } from 'vs/platform/extensionManagement/common/extensionTipsService';
 import { IWorkbenchExtensioManagementService } from 'vs/workbench/services/extensionManagement/common/extensionManagement';
 import { ExtensionManagementService } from 'vs/workbench/services/extensionManagement/common/extensionManagementService';
-import { ITunnelService } from 'vs/platform/remote/common/tunnel';
-import { TunnelService } from 'vs/workbench/services/remote/browser/tunnelServiceImpl';
 import { ILoggerService } from 'vs/platform/log/common/log';
 import { FileLoggerService } from 'vs/platform/log/common/fileLog';
 import { UserDataSyncMachinesService, IUserDataSyncMachinesService } from 'vs/platform/userDataSync/common/userDataSyncMachines';
-import { IUserDataSyncStoreService, IUserDataSyncService, IUserDataSyncLogService, IUserDataAutoSyncService, IUserDataSyncBackupStoreService, IUserDataAutoSyncEnablementService } from 'vs/platform/userDataSync/common/userDataSync';
+import { IUserDataSyncStoreService, IUserDataSyncService, IUserDataSyncLogService, IUserDataAutoSyncService, IUserDataSyncBackupStoreService } from 'vs/platform/userDataSync/common/userDataSync';
 import { UserDataSyncLogService } from 'vs/platform/userDataSync/common/userDataSyncLog';
 import { UserDataSyncStoreService } from 'vs/platform/userDataSync/common/userDataSyncStoreService';
 import { UserDataSyncBackupStoreService } from 'vs/platform/userDataSync/common/userDataSyncBackupStoreService';
 import { UserDataSyncService } from 'vs/platform/userDataSync/common/userDataSyncService';
 import { IUserDataSyncAccountService, UserDataSyncAccountService } from 'vs/platform/userDataSync/common/userDataSyncAccount';
 import { UserDataAutoSyncService } from 'vs/platform/userDataSync/common/userDataAutoSyncService';
-import { WebUserDataAutoSyncEnablementService } from 'vs/workbench/services/userDataSync/browser/userDataAutoSyncEnablementService';
 import { AccessibilityService } from 'vs/platform/accessibility/common/accessibilityService';
 import { ITitleService } from 'vs/workbench/services/title/common/titleService';
 import { TitlebarPart } from 'vs/workbench/browser/parts/titlebar/titlebarPart';
 import { ITimerService, TimerService } from 'vs/workbench/services/timer/browser/timerService';
+import { IConfigurationResolverService } from 'vs/workbench/services/configurationResolver/common/configurationResolver';
+import { ConfigurationResolverService } from 'vs/workbench/services/configurationResolver/browser/configurationResolverService';
 
 registerSingleton(IWorkbenchExtensioManagementService, ExtensionManagementService);
 registerSingleton(IAccessibilityService, AccessibilityService, true);
 registerSingleton(IContextMenuService, ContextMenuService);
-registerSingleton(ITunnelService, TunnelService, true);
 registerSingleton(ILoggerService, FileLoggerService);
 registerSingleton(IUserDataSyncLogService, UserDataSyncLogService);
 registerSingleton(IUserDataSyncStoreService, UserDataSyncStoreService);
@@ -96,11 +95,11 @@ registerSingleton(IUserDataSyncMachinesService, UserDataSyncMachinesService);
 registerSingleton(IUserDataSyncBackupStoreService, UserDataSyncBackupStoreService);
 registerSingleton(IUserDataSyncAccountService, UserDataSyncAccountService);
 registerSingleton(IUserDataSyncService, UserDataSyncService);
-registerSingleton(IUserDataAutoSyncEnablementService, WebUserDataAutoSyncEnablementService);
 registerSingleton(IUserDataAutoSyncService, UserDataAutoSyncService);
 registerSingleton(ITitleService, TitlebarPart);
 registerSingleton(IExtensionTipsService, ExtensionTipsService);
 registerSingleton(ITimerService, TimerService);
+registerSingleton(IConfigurationResolverService, ConfigurationResolverService, true);
 
 //#endregion
 
diff --git a/test/automation/src/application.ts b/test/automation/src/application.ts
index 809b3c2b2e4..35ee19cc0c5 100644
--- a/test/automation/src/application.ts
+++ b/test/automation/src/application.ts
@@ -73,12 +73,7 @@ export class Application {
 		await this.code.waitForElement('.explorer-folders-view');
 
 		if (expectWalkthroughPart) {
-			if (this.quality === Quality.Stable) {
-				// TODO@bpasero remove me in March 2021
-				await this.code.waitForActiveElement(`.editor-instance[data-editor-id="workbench.editor.walkThroughPart"] > div > div[tabIndex="0"]`);
-			} else {
-				await this.code.waitForElement(`.editor-instance > div > div.welcomePageFocusElement[tabIndex="0"]`);
-			}
+			await this.code.waitForElement(`.editor-instance > div > div.welcomePageFocusElement[tabIndex="0"]`);
 		}
 	}
 
diff --git a/test/integration/electron/testrunner.js b/test/integration/electron/testrunner.js
index 47007fe8002..8a64744321b 100644
--- a/test/integration/electron/testrunner.js
+++ b/test/integration/electron/testrunner.js
@@ -17,7 +17,7 @@ const Mocha = require('mocha');
 
 let mocha = new Mocha({
 	ui: 'tdd',
-	useColors: true
+	color: true
 });
 
 exports.configure = function configure(opts) {
diff --git a/yarn.lock b/yarn.lock
index 0ca9d1b2885..93cc257da08 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4001,15 +4001,6 @@ fs-constants@^1.0.0:
   resolved "https://registry.yarnpkg.com/fs-constants/-/fs-constants-1.0.0.tgz#6be0de9be998ce16af8afc24497b9ee9b7ccd9ad"
   integrity sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==
 
-fs-extra@^7.0.0:
-  version "7.0.1"
-  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-7.0.1.tgz#4f189c44aa123b895f722804f55ea23eadc348e9"
-  integrity sha512-YJDaCJZEnBmcbw13fvdAM9AwNOJwOzrE4pqMqBq5nFiEqXUqHwlK4B+3pUw6JNvfSPtX05xFHtYy/1ni01eGCw==
-  dependencies:
-    graceful-fs "^4.1.2"
-    jsonfile "^4.0.0"
-    universalify "^0.1.0"
-
 fs-extra@^8.1.0:
   version "8.1.0"
   resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-8.1.0.tgz#49d43c45a88cd9677668cb7be1b46efdb8d2e1c0"
@@ -4650,10 +4641,10 @@ gulp-symdest@^1.1.1:
     queue "^3.1.0"
     vinyl-fs "^2.4.3"
 
-gulp-tsb@4.0.5:
-  version "4.0.5"
-  resolved "https://registry.yarnpkg.com/gulp-tsb/-/gulp-tsb-4.0.5.tgz#2c4b41c5049de374934ca0fdb90dd713638af17a"
-  integrity sha512-zzjLZZBByrtljBhTbDBsScMVB10TYMXiMUV6FUKogs/hpHyTWdkqtMW/5nDPfsDA1xA+HFLgB19FAgWuPE0ZYw==
+gulp-tsb@4.0.6:
+  version "4.0.6"
+  resolved "https://registry.yarnpkg.com/gulp-tsb/-/gulp-tsb-4.0.6.tgz#526f07a2c74e1d2f8932b1500316f2a64b33363c"
+  integrity sha512-55HSu1zvOOq7D+OqPScvGQaJPKveLbM1T5jEnSJUhbcbwX1Kx0SWv4UVe7MfFcBwFe3wMiWSkKoajNONEv5E9g==
   dependencies:
     ansi-colors "^1.0.1"
     fancy-log "^1.3.2"
@@ -5932,16 +5923,6 @@ lodash.isequal@^4.0.0:
   resolved "https://registry.yarnpkg.com/lodash.isequal/-/lodash.isequal-4.5.0.tgz#415c4478f2bcc30120c22ce10ed3226f7d3e18e0"
   integrity sha1-QVxEePK8wwEgwizhDtMib30+GOA=
 
-lodash.isinteger@^4.0.4:
-  version "4.0.4"
-  resolved "https://registry.yarnpkg.com/lodash.isinteger/-/lodash.isinteger-4.0.4.tgz#619c0af3d03f8b04c31f5882840b77b11cd68343"
-  integrity sha1-YZwK89A/iwTDH1iChAt3sRzWg0M=
-
-lodash.isundefined@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/lodash.isundefined/-/lodash.isundefined-3.0.1.tgz#23ef3d9535565203a66cefd5b830f848911afb48"
-  integrity sha1-I+89lTVWUgOmbO/VuDD4SJEa+0g=
-
 lodash.memoize@^4.1.2:
   version "4.1.2"
   resolved "https://registry.yarnpkg.com/lodash.memoize/-/lodash.memoize-4.1.2.tgz#bcc6c49a42a2840ed997f323eada5ecd182e0bfe"
@@ -6533,7 +6514,7 @@ mute-stream@0.0.8:
   resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.8.tgz#1630c42b2251ff81e2a283de96a5497ea92e5e0d"
   integrity sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==
 
-nan@^2.10.0, nan@^2.12.1:
+nan@^2.12.1:
   version "2.14.2"
   resolved "https://registry.yarnpkg.com/nan/-/nan-2.14.2.tgz#f5376400695168f4cc694ac9393d0c9585eeea19"
   integrity sha512-M2ufzIiINKCuDfBSAUr1vWQ+vuVcA9kqx8JJUsbQi6yf1uGRyb7HfpdfUr5qLXf3B/t8dPvcjhKMmlfnP47EzQ==
@@ -6617,6 +6598,11 @@ node-abi@^2.19.1, node-abi@^2.7.0:
   dependencies:
     semver "^5.4.1"
 
+node-addon-api@*:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-3.1.0.tgz#98b21931557466c6729e51cb77cd39c965f42239"
+  integrity sha512-flmrDNB06LIl5lywUz7YlNGZH/5p0M7W28k8hzd9Lshtdh1wshD2Y+U4h9LD6KObOy1f+fEVdgprPrEymjM5uw==
+
 node-addon-api@^3.0.0, node-addon-api@^3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-3.0.2.tgz#04bc7b83fd845ba785bb6eae25bc857e1ef75681"
@@ -6797,6 +6783,13 @@ npmlog@^4.0.1, npmlog@^4.1.2:
     gauge "~2.7.3"
     set-blocking "~2.0.0"
 
+nsfw@^2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/nsfw/-/nsfw-2.1.1.tgz#3cc8cc9ebf567c0121364cd42bb26167242b4be0"
+  integrity sha512-DvkPpsIkw/DogPxI4vQugtrSc0AtuCoxiprLxTLVZrZuEe8H++0DHpV/081q0LOtUc+96yW3FBl0pEKiyMOfJg==
+  dependencies:
+    node-addon-api "*"
+
 nth-check@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/nth-check/-/nth-check-1.0.2.tgz#b2bd295c37e3dd58a3bf0700376663ba4d9cf05c"
@@ -9698,10 +9691,10 @@ typescript@^3.0.1:
   resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.9.7.tgz#98d600a5ebdc38f40cb277522f12dc800e9e25fa"
   integrity sha512-BLbiRkiBzAwsjut4x/dsibSTB6yWpwT5qWmC2OfuCg3GgVQCSgMs4vEctYPhsaGtd0AeuuHMkjZ2h2WG8MSzRw==
 
-typescript@^4.3.0-dev.20210216:
-  version "4.3.0-dev.20210216"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.3.0-dev.20210216.tgz#233327e6094008c02265ba140f8d9ece9133421e"
-  integrity sha512-pJLcC/kqnE+0rftTRc2/gYBkz9nl+kJfaU8sSOLYnzUvD8p+LOZMzXfaLoKPdGFJ6U9+Ox/sYV9HBTJVEjSTYg==
+typescript@^4.3.0-dev.20210226:
+  version "4.3.0-dev.20210226"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.3.0-dev.20210226.tgz#e754283dfaa01d79cea9df6d0f8a18114ace41ec"
+  integrity sha512-jxqKjVQsHkEMbyacr5CFpWnU3pv7H9QBljjORr3ct7qq+Q7ynHHmmFd5zQjU8HgHZYOMapIBhLsZSeqUeduQGQ==
 
 typical@^4.0.0:
   version "4.0.0"
@@ -10098,16 +10091,6 @@ vscode-nls-dev@^3.3.1:
     xml2js "^0.4.19"
     yargs "^13.2.4"
 
-vscode-nsfw@1.2.9:
-  version "1.2.9"
-  resolved "https://registry.yarnpkg.com/vscode-nsfw/-/vscode-nsfw-1.2.9.tgz#87def7c538ae713d08c88592a8a043d2b2009951"
-  integrity sha512-VwaB8H1fS0ngl9eAHgFqtF/q3N3J/ZWfI17zvC8Gfj33cL4UrIW/XxdoFYptBZR/MIA6Qj8FZyYu9D/JvlKWXg==
-  dependencies:
-    fs-extra "^7.0.0"
-    lodash.isinteger "^4.0.4"
-    lodash.isundefined "^3.0.1"
-    nan "^2.10.0"
-
 vscode-oniguruma@1.3.1:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/vscode-oniguruma/-/vscode-oniguruma-1.3.1.tgz#e2383879c3485b19f533ec34efea9d7a2b14be8f"