diff --git a/package.json b/package.json
index 39a7ab93e251f..9c08b11f0c0f0 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "code-oss-dev",
   "version": "1.96.0",
-  "distro": "f656a837bb4aa14329dbe98d58c178615e959ae1",
+  "distro": "7d14bf7e9a283e1c9ca8b18ccb0c13274a3757cf",
   "author": {
     "name": "Microsoft Corporation"
   },
diff --git a/src/vs/base/common/product.ts b/src/vs/base/common/product.ts
index 3cf230772d624..459ffb75a1021 100644
--- a/src/vs/base/common/product.ts
+++ b/src/vs/base/common/product.ts
@@ -310,6 +310,7 @@ export interface IDefaultChatAgent {
 	readonly chatWelcomeTitle: string;
 	readonly documentationUrl: string;
 	readonly privacyStatementUrl: string;
+	readonly collectionDocumentationUrl: string;
 	readonly providerId: string;
 	readonly providerName: string;
 	readonly providerScopes: string[];
diff --git a/src/vs/workbench/contrib/chat/browser/chatSetup.contribution.ts b/src/vs/workbench/contrib/chat/browser/chatSetup.contribution.ts
index affafca838a8c..8a24d1e2dd104 100644
--- a/src/vs/workbench/contrib/chat/browser/chatSetup.contribution.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatSetup.contribution.ts
@@ -6,7 +6,7 @@
 import { IWorkbenchContribution, registerWorkbenchContribution2, WorkbenchPhase } from '../../../common/contributions.js';
 import { Disposable, toDisposable } from '../../../../base/common/lifecycle.js';
 import { ContextKeyExpr, IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
-import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.js';
+import { ITelemetryService, TelemetryLevel } from '../../../../platform/telemetry/common/telemetry.js';
 import { AuthenticationSession, IAuthenticationService } from '../../../services/authentication/common/authentication.js';
 import { IProductService } from '../../../../platform/product/common/productService.js';
 import { IExtensionManagementService } from '../../../../platform/extensionManagement/common/extensionManagement.js';
@@ -47,6 +47,7 @@ const defaultChat = {
 	chatWelcomeTitle: product.defaultChatAgent?.chatWelcomeTitle ?? '',
 	documentationUrl: product.defaultChatAgent?.documentationUrl ?? '',
 	privacyStatementUrl: product.defaultChatAgent?.privacyStatementUrl ?? '',
+	collectionDocumentationUrl: product.defaultChatAgent?.collectionDocumentationUrl ?? '',
 	providerId: product.defaultChatAgent?.providerId ?? '',
 	providerName: product.defaultChatAgent?.providerName ?? '',
 	providerScopes: product.defaultChatAgent?.providerScopes ?? [],
@@ -102,7 +103,7 @@ class ChatSetupContribution extends Disposable implements IWorkbenchContribution
 		@IProductService private readonly productService: IProductService,
 		@IExtensionManagementService private readonly extensionManagementService: IExtensionManagementService,
 		@IExtensionService private readonly extensionService: IExtensionService,
-		@IInstantiationService private readonly instantiationService: IInstantiationService
+		@IInstantiationService private readonly instantiationService: IInstantiationService,
 	) {
 		super();
 
@@ -119,8 +120,10 @@ class ChatSetupContribution extends Disposable implements IWorkbenchContribution
 	}
 
 	private registerChatWelcome(): void {
-		const header = localize('setupPreamble1', "{0} is your AI pair programmer that helps you write code faster and smarter.", defaultChat.name);
-		const footer = localize('setupPreamble2', "By proceeding you agree to the [Privacy Statement]({0}).", defaultChat.privacyStatementUrl);
+		const header = localize('setupPreamble1', "{0} is your AI pair programmer.", defaultChat.name);
+		const footer = this.telemetryService.telemetryLevel !== TelemetryLevel.NONE ?
+			localize({ key: 'setupPreambleWithOptOut', comment: ['{Locked="]({0})"}'] }, "{0} may use your code snippets for product improvements. Read our [privacy statement]({1}) and learn how to [opt out]({2}).", defaultChat.name, defaultChat.privacyStatementUrl, defaultChat.collectionDocumentationUrl) :
+			localize({ key: 'setupPreambleWithoutOptOut', comment: ['{Locked="]({0})"}'] }, "By proceeding you agree to our [privacy statement]({0}).", defaultChat.privacyStatementUrl);
 
 		// Setup: Triggered (signed-out)
 		Registry.as<IChatViewsWelcomeContributionRegistry>(ChatViewsWelcomeExtensions.ChatViewsWelcomeRegistry).register({
diff --git a/src/vs/workbench/contrib/chat/browser/media/chatViewWelcome.css b/src/vs/workbench/contrib/chat/browser/media/chatViewWelcome.css
index 4e54182995cc0..e7024c5ba1746 100644
--- a/src/vs/workbench/contrib/chat/browser/media/chatViewWelcome.css
+++ b/src/vs/workbench/contrib/chat/browser/media/chatViewWelcome.css
@@ -62,7 +62,6 @@ div.chat-welcome-view {
 	& > .chat-welcome-view-progress {
 		display: flex;
 		gap: 6px;
-		color: var(--vscode-descriptionForeground);
 		text-align: center;
 		max-width: 350px;
 		padding: 0 20px;
@@ -70,7 +69,6 @@ div.chat-welcome-view {
 	}
 
 	& > .chat-welcome-view-message {
-		color: var(--vscode-descriptionForeground);
 		text-align: center;
 		max-width: 350px;
 		padding: 0 20px;
@@ -88,7 +86,6 @@ div.chat-welcome-view {
 	}
 
 	& > .chat-welcome-view-tips {
-		color: var(--vscode-descriptionForeground);
 		max-width: 250px;
 		margin-top: 10px;