diff --git a/content/admin/managing-iam/using-saml-for-enterprise-iam/troubleshooting-saml-authentication.md b/content/admin/managing-iam/using-saml-for-enterprise-iam/troubleshooting-saml-authentication.md
index 450714d49a2f..793b08433c45 100644
--- a/content/admin/managing-iam/using-saml-for-enterprise-iam/troubleshooting-saml-authentication.md
+++ b/content/admin/managing-iam/using-saml-for-enterprise-iam/troubleshooting-saml-authentication.md
@@ -99,6 +99,14 @@ Ensure that you set the value for `Audience` on your IdP to the `EntityId` for {
 
 {% data reusables.saml.current-time-earlier-than-notbefore-condition %}
 
+{% ifversion ghes > 3.16 %}
+
+## Error: "failure - Updated SAML validation returned an invalid result"
+
+This error can occur in version 3.17.0 or later of {% data variables.location.product_location %}. It indicates that {% data variables.product.github %} is unable to properly process the SAML response it received from the identity provider. Please open a {% data variables.product.github %} support ticket so that the {% data variables.product.github %} Support and Engineering teams can investigate and address the issue.
+
+{% endif %}
+
 {% ifversion ghec %}
 {% data reusables.saml.authentication-loop %}
 {% endif %}
diff --git a/src/events/components/experiments/experiments.ts b/src/events/components/experiments/experiments.ts
index 6d4e1b87df1f..710ed6cfd567 100644
--- a/src/events/components/experiments/experiments.ts
+++ b/src/events/components/experiments/experiments.ts
@@ -21,7 +21,7 @@ export const EXPERIMENTS = {
   ai_search_experiment: {
     key: 'ai_search_experiment',
     isActive: true, // Set to false when the experiment is over
-    percentOfUsersToGetExperiment: 0, // 10% of users will get the experiment
+    percentOfUsersToGetExperiment: 1, // 10% of users will get the experiment
     includeVariationInContext: true, // All events will include the `experiment_variation` of the `ai_search_experiment`
     limitToLanguages: ['en'], // Only users with the `en` language will be included in the experiment
     alwaysShowForStaff: true, // When set to true, staff will always see the experiment (determined by the `staffonly` cookie)
diff --git a/src/graphql/data/fpt/changelog.json b/src/graphql/data/fpt/changelog.json
index a5bdf224b7d6..60c57d7f96cd 100644
--- a/src/graphql/data/fpt/changelog.json
+++ b/src/graphql/data/fpt/changelog.json
@@ -1,4 +1,17 @@
 [
+  {
+    "schemaChanges": [
+      {
+        "title": "The GraphQL schema includes these changes:",
+        "changes": [
+          "<p>Type <code>BotOrUser</code> was added</p>"
+        ]
+      }
+    ],
+    "previewChanges": [],
+    "upcomingChanges": [],
+    "date": "2025-05-06"
+  },
   {
     "schemaChanges": [
       {
diff --git a/src/graphql/data/fpt/schema.docs.graphql b/src/graphql/data/fpt/schema.docs.graphql
index 97ced127c698..2daa472101a0 100644
--- a/src/graphql/data/fpt/schema.docs.graphql
+++ b/src/graphql/data/fpt/schema.docs.graphql
@@ -2413,6 +2413,11 @@ type Bot implements Actor & Node & UniformResourceLocatable {
   url: URI!
 }
 
+"""
+Used when either Bot or User are accepted.
+"""
+union BotOrUser = Bot | User
+
 """
 Types which can be actors for `BranchActorAllowance` objects.
 """
diff --git a/src/graphql/data/fpt/schema.json b/src/graphql/data/fpt/schema.json
index 12784f3e76e1..ce4f01a4272b 100644
--- a/src/graphql/data/fpt/schema.json
+++ b/src/graphql/data/fpt/schema.json
@@ -94718,6 +94718,25 @@
         }
       ]
     },
+    {
+      "name": "BotOrUser",
+      "kind": "unions",
+      "id": "botoruser",
+      "href": "/graphql/reference/unions#botoruser",
+      "description": "<p>Used when either Bot or User are accepted.</p>",
+      "possibleTypes": [
+        {
+          "name": "Bot",
+          "id": "bot",
+          "href": "/graphql/reference/objects#bot"
+        },
+        {
+          "name": "User",
+          "id": "user",
+          "href": "/graphql/reference/objects#user"
+        }
+      ]
+    },
     {
       "name": "BranchActorAllowanceActor",
       "kind": "unions",
diff --git a/src/graphql/data/ghec/schema.docs.graphql b/src/graphql/data/ghec/schema.docs.graphql
index 97ced127c698..2daa472101a0 100644
--- a/src/graphql/data/ghec/schema.docs.graphql
+++ b/src/graphql/data/ghec/schema.docs.graphql
@@ -2413,6 +2413,11 @@ type Bot implements Actor & Node & UniformResourceLocatable {
   url: URI!
 }
 
+"""
+Used when either Bot or User are accepted.
+"""
+union BotOrUser = Bot | User
+
 """
 Types which can be actors for `BranchActorAllowance` objects.
 """
diff --git a/src/graphql/data/ghec/schema.json b/src/graphql/data/ghec/schema.json
index 12784f3e76e1..ce4f01a4272b 100644
--- a/src/graphql/data/ghec/schema.json
+++ b/src/graphql/data/ghec/schema.json
@@ -94718,6 +94718,25 @@
         }
       ]
     },
+    {
+      "name": "BotOrUser",
+      "kind": "unions",
+      "id": "botoruser",
+      "href": "/graphql/reference/unions#botoruser",
+      "description": "<p>Used when either Bot or User are accepted.</p>",
+      "possibleTypes": [
+        {
+          "name": "Bot",
+          "id": "bot",
+          "href": "/graphql/reference/objects#bot"
+        },
+        {
+          "name": "User",
+          "id": "user",
+          "href": "/graphql/reference/objects#user"
+        }
+      ]
+    },
     {
       "name": "BranchActorAllowanceActor",
       "kind": "unions",
diff --git a/src/search/components/input/SearchOverlay.tsx b/src/search/components/input/SearchOverlay.tsx
index f8da03d76149..57130b9beb81 100644
--- a/src/search/components/input/SearchOverlay.tsx
+++ b/src/search/components/input/SearchOverlay.tsx
@@ -794,8 +794,8 @@ export function SearchOverlay({
                   // Hubbers users use an internal discussion for feedback
                   window.open('https://github.com/github/docs-team/discussions/5172', '_blank')
                 } else {
-                  // TODO: On ship date set this value
-                  // window.open('TODO', '_blank')
+                  // public discussion for feedback
+                  window.open('https://github.com/orgs/community/discussions/158488', '_blank')
                 }
               }}
               as="button"