diff --git a/.github/workflows/prod-build-deploy.yml b/.github/workflows/prod-build-deploy.yml
index e79204d34e..c4230e96d4 100644
--- a/.github/workflows/prod-build-deploy.yml
+++ b/.github/workflows/prod-build-deploy.yml
@@ -143,6 +143,7 @@ jobs:
           HYDRO_SECRET: ${{ secrets.HYDRO_SECRET }}
           SOURCE_BLOB_URL: ${{ steps.build-source.outputs.download_url }}
           DELAY_FOR_PREBOOT: 'true'
+          ALLOWED_POLLING_FAILURES_PER_PHASE: '15'
         with:
           script: |
             const {
diff --git a/.github/workflows/staging-deploy-pr.yml b/.github/workflows/staging-deploy-pr.yml
index ca3a18bbd1..099059c61c 100644
--- a/.github/workflows/staging-deploy-pr.yml
+++ b/.github/workflows/staging-deploy-pr.yml
@@ -472,6 +472,7 @@ jobs:
           CONTEXT_NAME: ${{ env.CONTEXT_NAME }}
           ACTIONS_RUN_LOG: ${{ env.ACTIONS_RUN_LOG }}
           HEAD_SHA: ${{ needs.pr-metadata.outputs.head_sha }}
+          ALLOWED_POLLING_FAILURES_PER_PHASE: '15'
         with:
           script: |
             const { GITHUB_TOKEN, HEROKU_API_TOKEN } = process.env
diff --git a/components/DefaultLayout.tsx b/components/DefaultLayout.tsx
index 26f46627bc..d8a4c66888 100644
--- a/components/DefaultLayout.tsx
+++ b/components/DefaultLayout.tsx
@@ -92,7 +92,7 @@ export const DefaultLayout = (props: Props) => {
         <SupportSection />
         <SmallFooter />
         <ScrollButton
-          className="position-fixed bottom-0 mb-3 right-0 mr-3"
+          className="position-fixed bottom-0 mb-4 right-0 mr-4"
           ariaLabel={t('scroll_to_top')}
         />
       </main>
diff --git a/components/page-footer/Contribution.tsx b/components/page-footer/Contribution.tsx
index 5c7c87781f..0dc7812b8a 100644
--- a/components/page-footer/Contribution.tsx
+++ b/components/page-footer/Contribution.tsx
@@ -12,9 +12,9 @@ export const Contribution = () => {
 
   return (
     <div className="f5 contribution">
-      <h2 className="f4">{t`title`}</h2>
-      <p className="color-text-secondary f6">{t`body`}</p>
-      <a className="btn btn-outline" href={contributionHref}>
+      <h2 className="f4 mb-3">{t`title`}</h2>
+      <p className="max-w-xs color-text-secondary mb-3">{t`body`}</p>
+      <a className="btn" href={contributionHref}>
         <GitPullRequestIcon size="small" className="octicon mr-1" />
         {t`button`}
       </a>
diff --git a/components/page-footer/SmallFooter.tsx b/components/page-footer/SmallFooter.tsx
index 72b10cb862..4e0892dda0 100644
--- a/components/page-footer/SmallFooter.tsx
+++ b/components/page-footer/SmallFooter.tsx
@@ -4,45 +4,59 @@ import { useTranslation } from 'components/hooks/useTranslation'
 export const SmallFooter = () => {
   const { t } = useTranslation('footer')
   return (
-    <footer className="py-6 text-small">
-      <div className="container-xl d-flex px-3 px-md-6">
-        <ul className="d-flex list-style-none flex-wrap flex-justify-center flex-xl-justify-start">
-          <li className="d-flex mr-xl-3 color-text-secondary">
-            <MarkGithubIcon className="mr-2 mr-xl-3" size={20} />
-            <span>&copy; {new Date().getFullYear()} GitHub, Inc.</span>
-          </li>
-          <li className="ml-3">
-            <a href="/github/site-policy/github-terms-of-service">{t`terms`}</a>
-          </li>
-          <li className="ml-3">
-            <a href="/github/site-policy/github-privacy-statement">{t`privacy`} </a>
-          </li>
-          <li className="ml-3">
-            <a href="https://github.com/security">{t`product.links.security`}</a>
-          </li>
-          <li className="ml-3">
-            <a href="https://www.githubstatus.com/">{t`support.links.status`}</a>
-          </li>
-          <li className="ml-3">
-            <a href="/">{t`support.links.help`}</a>
-          </li>
-          <li className="ml-3">
-            <a href="https://support.github.com">{t`support.links.contact_github`}</a>
-          </li>
-          <li className="ml-3">
-            <a href="https://github.com/pricing">{t`product.links.pricing`}</a>
-          </li>
-          <li className="ml-3">
-            <a href="/developers">{t`platform.links.developer_api`}</a>
-          </li>
-          <li className="ml-3">
-            <a href="https://services.github.com/">{t`support.links.training`}</a>
-          </li>
-          <li className="ml-3">
-            <a href="https://github.com/about">{t`company.links.about`}</a>
-          </li>
-        </ul>
-      </div>
+    <footer className="container-xl px-3 mt-6 mb-8 px-md-6 position-relative d-flex flex-row-reverse flex-xl-row flex-wrap flex-xl-nowrap flex-justify-center flex-xl-justify-between f6 color-text-secondary">
+      <ul className="list-style-none d-flex flex-wrap col-12 col-xl-5 flex-justify-center flex-xl-justify-between mb-2 mb-xl-0">
+        <li className="mr-3 mr-xl-0">&copy; {new Date().getFullYear()} GitHub, Inc.</li>
+        <li className="mr-3 mr-xl-0">
+          <a href="https://docs.github.com/en/github/site-policy/github-terms-of-service">
+            {t('terms')}
+          </a>
+        </li>
+        <li className="mr-3 mr-xl-0">
+          <a href="https://docs.github.com/en/github/site-policy/github-privacy-statement">
+            {t('privacy')}
+          </a>
+        </li>
+        <li className="mr-3 mr-xl-0">
+          <a href="https://github.com/security">{t('product.links.security')}</a>
+        </li>
+        <li className="mr-3 mr-xl-0">
+          <a href="https://www.githubstatus.com/">{t('support.links.status')}</a>
+        </li>
+        <li>
+          <a href="/">{t('support.links.help')}</a>
+        </li>
+      </ul>
+
+      <a
+        aria-label="Homepage"
+        title="GitHub"
+        className="d-none d-xl-block color-text-secondary"
+        href="https://github.com"
+      >
+        <MarkGithubIcon size={24} />
+      </a>
+
+      <ul className="list-style-none d-flex flex-wrap col-12 col-xl-5 flex-justify-center flex-xl-justify-between mb-2 mb-xl-0">
+        <li className="mr-3 mr-xl-0">
+          <a href="https://support.github.com">{t('support.links.contact_github')}</a>
+        </li>
+        <li className="mr-3 mr-xl-0">
+          <a href="https://github.com/pricing">{t('product.links.pricing')}</a>
+        </li>
+        <li className="mr-3 mr-xl-0">
+          <a href="https://docs.github.com">{t('platform.links.developer_api')}</a>
+        </li>
+        <li className="mr-3 mr-xl-0">
+          <a href="https://services.github.com">{t('support.links.training')}</a>
+        </li>
+        <li className="mr-3 mr-xl-0">
+          <a href="https://github.blog">{t('company.links.blog')}</a>
+        </li>
+        <li>
+          <a href="https://github.com/about">{t('company.links.about')}</a>
+        </li>
+      </ul>
     </footer>
   )
 }
diff --git a/components/page-footer/Support.tsx b/components/page-footer/Support.tsx
index fbbd3690ed..284ca5eda3 100644
--- a/components/page-footer/Support.tsx
+++ b/components/page-footer/Support.tsx
@@ -22,27 +22,31 @@ export const Support = () => {
 
   return (
     <div>
-      <h3 className="mb-2 f4">{t`still_need_help`}</h3>
-      <a
-        id="ask-community"
-        href={updatedCommunityLink === '' ? 'https://github.community/' : updatedCommunityLink}
-        className="btn btn-outline mr-4 mt-2"
-      >
-        <PeopleIcon size="small" className="octicon mr-1" />
-        {updatedCommunityLink === '' ? t`ask_community` : 'Provide GitHub Feedback'}
-      </a>
-      <a
-        id="contact-us"
-        href={
-          isEnterprise
-            ? 'https://enterprise.github.com/support'
-            : 'https://support.github.com/contact'
-        }
-        className="btn btn-outline mt-2"
-      >
-        <CommentDiscussionIcon size="small" className="octicon mr-1" />
-        {t`contact_support`}
-      </a>
+      <h2 className="mb-3 f4">{t`still_need_help`}</h2>
+      <div className="mb-2">
+        <a
+          id="ask-community"
+          href={updatedCommunityLink === '' ? 'https://github.community/' : updatedCommunityLink}
+          className="Link—secondary text-bold"
+        >
+          <PeopleIcon size="small" className="octicon mr-1" />
+          {updatedCommunityLink === '' ? t`ask_community` : 'Provide GitHub Feedback'}
+        </a>
+      </div>
+      <div>
+        <a
+          id="contact-us"
+          href={
+            isEnterprise
+              ? 'https://enterprise.github.com/support'
+              : 'https://support.github.com/contact'
+          }
+          className="Link—secondary text-bold"
+        >
+          <CommentDiscussionIcon size="small" className="octicon mr-1" />
+          {t`contact_support`}
+        </a>
+      </div>
     </div>
   )
 }
diff --git a/components/page-footer/SupportSection.tsx b/components/page-footer/SupportSection.tsx
index 288a41da32..3188654441 100644
--- a/components/page-footer/SupportSection.tsx
+++ b/components/page-footer/SupportSection.tsx
@@ -1,3 +1,5 @@
+import cx from 'classnames'
+
 import { Survey } from 'components/page-footer/Survey'
 import { Contribution } from 'components/page-footer/Contribution'
 import { Support } from 'components/page-footer/Support'
@@ -13,15 +15,24 @@ export const SupportSection = () => {
     currentVersion.includes(enterpriseServerReleases.oldestSupported)
 
   return (
-    <section className="mt-lg-9 py-7 px-3 px-md-6 no-print color-bg-tertiary">
-      <div className="container-xl gutter-lg-spacious clearfix">
-        <div className="col-12 col-lg-6 col-xl-4 mb-6 mb-xl-0 float-left">
-          {!isDeprecated && <Survey />}
-        </div>
-        <div className="col-12 col-lg-6 col-xl-4 mb-6 mb-xl-0 float-left">
-          {!isDeprecated && <Contribution />}
-        </div>
-        <div className="col-12 col-lg-12 col-xl-4 float-left">
+    <section className="container-xl mt-lg-8 mt-6 px-3 px-md-6 no-print mx-auto">
+      <div className="container-xl mx-auto py-6 py-lg-6 clearfix border-top border-color-secondary">
+        {!isDeprecated && (
+          <div className="col-12 col-lg-6 col-xl-3 mb-6 mb-xl-0 float-left pr-4">
+            <Survey />
+          </div>
+        )}
+        {!isDeprecated && (
+          <div className="col-12 col-lg-6 col-xl-4 mb-6 mb-xl-0 float-left pr-4 offset-xl-1">
+            <Contribution />
+          </div>
+        )}
+        <div
+          className={cx(
+            'col-12 col-lg-12 col-xl-3 float-left pr-4',
+            !isDeprecated && 'offset-xl-1'
+          )}
+        >
           <Support />
         </div>
       </div>
diff --git a/components/page-footer/Survey.tsx b/components/page-footer/Survey.tsx
index 777afae186..c7433fa04d 100644
--- a/components/page-footer/Survey.tsx
+++ b/components/page-footer/Survey.tsx
@@ -36,24 +36,14 @@ export const Survey = () => {
   }
 
   return (
-    <form className="f5 js-survey" onSubmit={submit} ref={formRef} data-testid="survey-form">
-      <h2 className="mb-1 f4">
-        {t`able_to_find`}
-
-        <Link
-          className="f6 text-normal ml-3 color-text-link"
-          href="/github/site-policy/github-privacy-statement"
-          target="_blank"
-        >
-          {t`privacy_policy`}
-        </Link>
-      </h2>
+    <form className="f5" onSubmit={submit} ref={formRef} data-testid="survey-form">
+      <h2 className="f4 mb-3">{t`able_to_find`}</h2>
 
       {/* Honeypot: token isn't a real field */}
       <input type="text" className="d-none" name="survey-token" aria-hidden="true" />
 
       {state !== ViewState.END && (
-        <p className="radio-group">
+        <div className="radio-group mb-2">
           <input
             id="survey-yes"
             type="radio"
@@ -69,8 +59,8 @@ export const Survey = () => {
             htmlFor="survey-yes"
           >
             <ThumbsupIcon
-              size={24}
-              className={state === ViewState.YES ? 'color-text-primary' : 'color-text-tertiary'}
+              size={16}
+              className={state === ViewState.YES ? 'color-text-white' : 'color-text-tertiary'}
             />
           </label>
           <input
@@ -88,11 +78,11 @@ export const Survey = () => {
             htmlFor="survey-no"
           >
             <ThumbsdownIcon
-              size={24}
-              className={state === ViewState.NO ? 'color-text-primary' : 'color-text-tertiary'}
+              size={16}
+              className={state === ViewState.NO ? 'color-text-white' : 'color-text-tertiary'}
             />
           </label>
-        </p>
+        </div>
       )}
 
       {[ViewState.YES, ViewState.NO].includes(state) && (
@@ -147,6 +137,14 @@ export const Survey = () => {
       {state === ViewState.END && (
         <p className="color-text-secondary f6" data-testid="survey-end">{t`feedback`}</p>
       )}
+
+      <Link
+        className="f6 text-normal color-text-link"
+        href="/github/site-policy/github-privacy-statement"
+        target="_blank"
+      >
+        {t`privacy_policy`}
+      </Link>
     </form>
   )
 }
diff --git a/lib/search/indexes/github-docs-2.22-cn-records.json.br b/lib/search/indexes/github-docs-2.22-cn-records.json.br
index 606a08416f..563229c3b8 100644
--- a/lib/search/indexes/github-docs-2.22-cn-records.json.br
+++ b/lib/search/indexes/github-docs-2.22-cn-records.json.br
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d114c7b22367d93102a06e51c16671fe9cb68eb57b46fd458af625b4e13f02b0
-size 525486
+oid sha256:06cc47c4d2d55945a02aebf0e5fbd78b54d28225d68d94f53b61cf581d3efce2
+size 525310
diff --git a/lib/search/indexes/github-docs-2.22-cn.json.br b/lib/search/indexes/github-docs-2.22-cn.json.br
index 3b973e8b02..55762d408c 100644
--- a/lib/search/indexes/github-docs-2.22-cn.json.br
+++ b/lib/search/indexes/github-docs-2.22-cn.json.br
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:bc585436bcd959d4cb4bea79ec3813aa236086178b730eeaa7ea86253dcccd20
-size 868661
+oid sha256:a2b6e86c96764f6838907d6f07c043d02822dd4e5455493ed4f74384c7c5575e
+size 868806
diff --git a/lib/search/indexes/github-docs-2.22-de-records.json.br b/lib/search/indexes/github-docs-2.22-de-records.json.br
index a729a5ab8b..c10c7128da 100644
--- a/lib/search/indexes/github-docs-2.22-de-records.json.br
+++ b/lib/search/indexes/github-docs-2.22-de-records.json.br
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:bcdd3c52ce0c9bef3470189d7115bb67f323d7b9c61a50b57ddae3d3aeeab5e4
-size 479335
+oid sha256:52ce8e1b4b36691a7aba19d79502de70696d058c770e84d4068a1ac1001171bd
+size 479344
diff --git a/lib/search/indexes/github-docs-2.22-de.json.br b/lib/search/indexes/github-docs-2.22-de.json.br
index b138815546..04211e6fbd 100644
--- a/lib/search/indexes/github-docs-2.22-de.json.br
+++ b/lib/search/indexes/github-docs-2.22-de.json.br
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d859ff65c917ca7f602f394b81f969bd0dac338d16c80c51e508db5c7b6389f1
-size 2126741
+oid sha256:2ddd473d742251b96f29306ffeb2d109c47cd1d5ecf3895286f6134f1552fa6b
+size 2127523
diff --git a/lib/search/indexes/github-docs-2.22-en-records.json.br b/lib/search/indexes/github-docs-2.22-en-records.json.br
index 6ebfaade83..e91d71951e 100644
--- a/lib/search/indexes/github-docs-2.22-en-records.json.br
+++ b/lib/search/indexes/github-docs-2.22-en-records.json.br
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:14dd9ade966816ac9871f455f7467a35e20c0ce21a4c5763a660e945603bab87
-size 434002
+oid sha256:0be7f063f66801b4c32f3ca0fb38540a316ac1a57425653f394cf1343929e845
+size 433890
diff --git a/lib/search/indexes/github-docs-2.22-en.json.br b/lib/search/indexes/github-docs-2.22-en.json.br
index d4d9944750..15ad7dc0bd 100644
--- a/lib/search/indexes/github-docs-2.22-en.json.br
+++ b/lib/search/indexes/github-docs-2.22-en.json.br
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:582e57c5b7b9c8569d191bff9604e002f86a6af6f5ebdb64d334f8cb3d84e1d5
-size 1694431
+oid sha256:5f5a40abdaae5a8514a80729eb48df2a3ea4191dee53d59239240187c8d0113a
+size 1694773
diff --git a/lib/search/indexes/github-docs-2.22-es-records.json.br b/lib/search/indexes/github-docs-2.22-es-records.json.br
index 53bfd89090..7ca1a32ada 100644
--- a/lib/search/indexes/github-docs-2.22-es-records.json.br
+++ b/lib/search/indexes/github-docs-2.22-es-records.json.br
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c3abc8d6b3fccfac1f63c7a1ee556a3df68c40d7c3501ae033b2580da28212e3
-size 194947
+oid sha256:2f566b0c7c3138662fb845b4e0771628afccb2e27874f6f046b3d877e3f4a0c9
+size 195021
diff --git a/lib/search/indexes/github-docs-2.22-es.json.br b/lib/search/indexes/github-docs-2.22-es.json.br
index bda882ef64..d2672b9e49 100644
--- a/lib/search/indexes/github-docs-2.22-es.json.br
+++ b/lib/search/indexes/github-docs-2.22-es.json.br
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5ebfa8fa87f8983ad1d0bb11650bb0b24c8729a3a12505ff94c2ef4096f61f35
-size 702808
+oid sha256:63be452654acd57a919ae27d1aaaf9c85408f208e4d93b34cf5e880f8c80f75c
+size 702540
diff --git a/lib/search/indexes/github-docs-2.22-ja-records.json.br b/lib/search/indexes/github-docs-2.22-ja-records.json.br
index 3915a57287..2b7d2ffa8b 100644
--- a/lib/search/indexes/github-docs-2.22-ja-records.json.br
+++ b/lib/search/indexes/github-docs-2.22-ja-records.json.br
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:88f551ef41760e565eb549c4a5bdc5cf70f39b45c4e85d774e90c8fd4bbd7ca9
-size 545371
+oid sha256:dffc9b54f43e03f1130f847d2199020c6ac2fafd513885fd87ce7fd54e288d55
+size 545283
diff --git a/lib/search/indexes/github-docs-2.22-ja.json.br b/lib/search/indexes/github-docs-2.22-ja.json.br
index da15bb55b2..37faa34da3 100644
--- a/lib/search/indexes/github-docs-2.22-ja.json.br
+++ b/lib/search/indexes/github-docs-2.22-ja.json.br
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:63e10625085871114846e24be09fb4d947bd70e8c300ed7489975b963162b484
-size 2881066
+oid sha256:69eb9033c993e6ad49b1d9a1a0c2d8f266765ced9f402fc5caa5b87359becab4
+size 2881553
diff --git a/lib/search/indexes/github-docs-2.22-pt-records.json.br b/lib/search/indexes/github-docs-2.22-pt-records.json.br
index 385a35a55f..be5757f614 100644
--- a/lib/search/indexes/github-docs-2.22-pt-records.json.br
+++ b/lib/search/indexes/github-docs-2.22-pt-records.json.br
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:39219dc530ddb49f3bb89bac713b598b56c944d0cb640e23c4bb1992baaca18f
-size 456869
+oid sha256:68516075ef93a0df6eb0180745c1c32517b410a947b5c0dd44bdeb71e0fcce9b
+size 456978
diff --git a/lib/search/indexes/github-docs-2.22-pt.json.br b/lib/search/indexes/github-docs-2.22-pt.json.br
index b24b26dca4..e879b177c5 100644
--- a/lib/search/indexes/github-docs-2.22-pt.json.br
+++ b/lib/search/indexes/github-docs-2.22-pt.json.br
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3e79dab7b004505fffd0b62aa35d91c696d24e970da5edbc6d6d0591db9929fb
-size 1905314
+oid sha256:13697373a3040a9be3ae1c20d0ebc6d9949875a26ec92dd316838608702c9c62
+size 1906082
diff --git a/lib/search/indexes/github-docs-3.0-cn-records.json.br b/lib/search/indexes/github-docs-3.0-cn-records.json.br
index b9badbd15d..7954659a0c 100644
--- a/lib/search/indexes/github-docs-3.0-cn-records.json.br
+++ b/lib/search/indexes/github-docs-3.0-cn-records.json.br
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c3024b43540554ca461df3785180daae860b7598149a153d409939238c06c434
-size 544816
+oid sha256:f21a4a2ba19394595d3219a28a6bbbb4994ed2cb3e10b3e1bc5d7ea7f6977885
+size 544809
diff --git a/lib/search/indexes/github-docs-3.0-cn.json.br b/lib/search/indexes/github-docs-3.0-cn.json.br
index a9b3c768ea..5d5739ca8b 100644
--- a/lib/search/indexes/github-docs-3.0-cn.json.br
+++ b/lib/search/indexes/github-docs-3.0-cn.json.br
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6f296eb87fcd2df9ab89ca8790dbb988a2c324fd9b6f75930c7738590e95c8e2
-size 906964
+oid sha256:ac471542bcd9b36a366838657158788954b6af43d9d93642db3e3e749524d269
+size 907147
diff --git a/lib/search/indexes/github-docs-3.0-de-records.json.br b/lib/search/indexes/github-docs-3.0-de-records.json.br
index 0d7c8c7ff6..1f89a68c9e 100644
--- a/lib/search/indexes/github-docs-3.0-de-records.json.br
+++ b/lib/search/indexes/github-docs-3.0-de-records.json.br
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0c20a895354c773031bef46c1a778ad71880dc42e7d37955609f56e9e40f9578
-size 499831
+oid sha256:4ad0c37c43ea63b49c8a7d34c569bf922d419e22b3f6769e9873cedf32a75768
+size 499851
diff --git a/lib/search/indexes/github-docs-3.0-de.json.br b/lib/search/indexes/github-docs-3.0-de.json.br
index 7139172c0c..95c4b5d9b1 100644
--- a/lib/search/indexes/github-docs-3.0-de.json.br
+++ b/lib/search/indexes/github-docs-3.0-de.json.br
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8a2d152430503fee662621371dd12284298a51f9c1b2bb9bb84323673ee3da71
-size 2233318
+oid sha256:b1f3c4bed99dca7fdcb8ec3d0cfdded1d1e968c9869fde1b0a0b54c07dbcdf30
+size 2233677
diff --git a/lib/search/indexes/github-docs-3.0-en-records.json.br b/lib/search/indexes/github-docs-3.0-en-records.json.br
index cceb321940..72499e5d49 100644
--- a/lib/search/indexes/github-docs-3.0-en-records.json.br
+++ b/lib/search/indexes/github-docs-3.0-en-records.json.br
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0b65336727234510f1853750584cc7e646b222207c9e1064273843ce7949b26e
-size 454366
+oid sha256:fbd1e8af31898b128af4f756c72e3d0f71d08799ffa0098917a1bbe834814fc2
+size 454134
diff --git a/lib/search/indexes/github-docs-3.0-en.json.br b/lib/search/indexes/github-docs-3.0-en.json.br
index 88076113cd..6b2f83a34b 100644
--- a/lib/search/indexes/github-docs-3.0-en.json.br
+++ b/lib/search/indexes/github-docs-3.0-en.json.br
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:99d22e830d9eb19417dc853899b7622a775a2515f260213dfed8cd1556ef45c9
-size 1770358
+oid sha256:8f7d01630ae14ba726d287fcab9944144e52ab1315dc6757904b64787939896b
+size 1770402
diff --git a/lib/search/indexes/github-docs-3.0-es-records.json.br b/lib/search/indexes/github-docs-3.0-es-records.json.br
index 0b9e0bf292..4084c2b35f 100644
--- a/lib/search/indexes/github-docs-3.0-es-records.json.br
+++ b/lib/search/indexes/github-docs-3.0-es-records.json.br
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:381887558a887ab88eeee2ea6f065d9de8121cbbb52d0a9f7598351bab86f6ee
-size 193643
+oid sha256:3301f6f7b7d29850e8a55b5a394643013b99cdaf13ac6f7b2f925f5aa3bb37df
+size 193550
diff --git a/lib/search/indexes/github-docs-3.0-es.json.br b/lib/search/indexes/github-docs-3.0-es.json.br
index e6b5e0862b..1a5c69a807 100644
--- a/lib/search/indexes/github-docs-3.0-es.json.br
+++ b/lib/search/indexes/github-docs-3.0-es.json.br
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:75ff34c5ac0dfb233a58633235e94567055d6b485b079e12fd7c04e8e1b31963
-size 694141
+oid sha256:de0bd9d824c33d9fb11392186544f48337cc86b853620f854ba370298cfeeb6e
+size 694218
diff --git a/lib/search/indexes/github-docs-3.0-ja-records.json.br b/lib/search/indexes/github-docs-3.0-ja-records.json.br
index 4a6ae8746f..d5e19a3e9b 100644
--- a/lib/search/indexes/github-docs-3.0-ja-records.json.br
+++ b/lib/search/indexes/github-docs-3.0-ja-records.json.br
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:13db5065563e7c411417ce929f12a5b8e1a7e0cc496d9625d5d7edcfc9f9fd7b
-size 567793
+oid sha256:657a3c1c800b3648ada29c9e95f0782e550af716860b9cbb1f79f2f4617556c1
+size 567889
diff --git a/lib/search/indexes/github-docs-3.0-ja.json.br b/lib/search/indexes/github-docs-3.0-ja.json.br
index 9950749a1f..25767868c6 100644
--- a/lib/search/indexes/github-docs-3.0-ja.json.br
+++ b/lib/search/indexes/github-docs-3.0-ja.json.br
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:830257244057a240973d359a65c6d158c8cbae3ba19c258a96ad1ab5b639f519
-size 3006791
+oid sha256:9ee96f0af51f56d46a219095a5019db4910a26e0e681a94f942f37b96e787607
+size 3007250
diff --git a/lib/search/indexes/github-docs-3.0-pt-records.json.br b/lib/search/indexes/github-docs-3.0-pt-records.json.br
index 0e170cbd78..300dfc1016 100644
--- a/lib/search/indexes/github-docs-3.0-pt-records.json.br
+++ b/lib/search/indexes/github-docs-3.0-pt-records.json.br
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:da8a07bac1f10ffb60faade6dd75d463fc44adaf6531a9e512535bb9b1c38a9e
-size 477774
+oid sha256:b21454e527862a9006e6900a79316fdf8b9b9124156019ab78820573d6a69570
+size 477497
diff --git a/lib/search/indexes/github-docs-3.0-pt.json.br b/lib/search/indexes/github-docs-3.0-pt.json.br
index 83dbfd1fcd..c28d15bfd5 100644
--- a/lib/search/indexes/github-docs-3.0-pt.json.br
+++ b/lib/search/indexes/github-docs-3.0-pt.json.br
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9b42e4655d11f80a00fb3fb4eb240f1374ccc250236a2fe854d80067604bcd94
-size 1992967
+oid sha256:31d5b385f5717d3d194720fb27755fb3dc8fb84218a578f8e539767d57d9b2f4
+size 1993201
diff --git a/lib/search/indexes/github-docs-3.1-cn-records.json.br b/lib/search/indexes/github-docs-3.1-cn-records.json.br
index fad1384afb..0938cca98f 100644
--- a/lib/search/indexes/github-docs-3.1-cn-records.json.br
+++ b/lib/search/indexes/github-docs-3.1-cn-records.json.br
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1d512b1586e7941b60676c79f45c15448d3fbdf3e83fb9223a26efffab2d5b52
-size 557226
+oid sha256:bbfa76ccf9a1914552afa55fd8c0f1227a7a7016c5d412cb2a634be050fd7d59
+size 557521
diff --git a/lib/search/indexes/github-docs-3.1-cn.json.br b/lib/search/indexes/github-docs-3.1-cn.json.br
index 2887707f6a..731a34f7d9 100644
--- a/lib/search/indexes/github-docs-3.1-cn.json.br
+++ b/lib/search/indexes/github-docs-3.1-cn.json.br
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8ff0910c159473bcbd81b0e2d3d5570f965014fefac70407c24ceccb26210575
-size 929514
+oid sha256:839560e9730f39696979ab42a4b207f760f0aa1c6ee180182a164b80868cb1cb
+size 929854
diff --git a/lib/search/indexes/github-docs-3.1-de-records.json.br b/lib/search/indexes/github-docs-3.1-de-records.json.br
index f005d47874..e67e360878 100644
--- a/lib/search/indexes/github-docs-3.1-de-records.json.br
+++ b/lib/search/indexes/github-docs-3.1-de-records.json.br
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:94c902ad1041c8c7ebfd51ae7cb5b46a3dde2b001015cd6a20ba97955a691768
-size 508442
+oid sha256:b4a9cb9857a96233dda8db17b91d26bc8e91a976d13a831a342e39e3a2e4d417
+size 508690
diff --git a/lib/search/indexes/github-docs-3.1-de.json.br b/lib/search/indexes/github-docs-3.1-de.json.br
index f3382ad3cd..6f6249e053 100644
--- a/lib/search/indexes/github-docs-3.1-de.json.br
+++ b/lib/search/indexes/github-docs-3.1-de.json.br
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:872f680f8c046ccb4343a7c898b34da2cfbb9895d287455a1be5ad61246c9718
-size 2284994
+oid sha256:3fb88e1431b850fdd190c98b32e461e4131c0e2b4cc675298e4a039b8ae08b57
+size 2285066
diff --git a/lib/search/indexes/github-docs-3.1-en-records.json.br b/lib/search/indexes/github-docs-3.1-en-records.json.br
index 28c7bbdbc9..4a76facfb6 100644
--- a/lib/search/indexes/github-docs-3.1-en-records.json.br
+++ b/lib/search/indexes/github-docs-3.1-en-records.json.br
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:03d369d4bd85ec18910eb860d55177c1c3774dd6e7a4c69f9fcef294d96aaa48
-size 463859
+oid sha256:d87a601eda072fa07412d7ff6ad5ac8177bbdfd3e5f19d5dee2ffdc881d42145
+size 464344
diff --git a/lib/search/indexes/github-docs-3.1-en.json.br b/lib/search/indexes/github-docs-3.1-en.json.br
index 33e9b93803..c81913125e 100644
--- a/lib/search/indexes/github-docs-3.1-en.json.br
+++ b/lib/search/indexes/github-docs-3.1-en.json.br
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:21e93451edfd6e0259708ebf5019c4ab3961a86d27b476be7f3abc174f1e9527
-size 1812535
+oid sha256:3d7097d6923cb9fef33220aa1be349a1a1c1a3e8a8393c79d9643fc9a549fba8
+size 1812626
diff --git a/lib/search/indexes/github-docs-3.1-es-records.json.br b/lib/search/indexes/github-docs-3.1-es-records.json.br
index 6fffc5bbf1..d839b2691e 100644
--- a/lib/search/indexes/github-docs-3.1-es-records.json.br
+++ b/lib/search/indexes/github-docs-3.1-es-records.json.br
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:896e15b7efeb807130a22783de6e558e67201c193ce0fde2386923a4d5184b95
-size 193540
+oid sha256:1dd3f250dbc4167965d0f437c58fbc928a1c69803ab1b728d520f010ff26a5d3
+size 193595
diff --git a/lib/search/indexes/github-docs-3.1-es.json.br b/lib/search/indexes/github-docs-3.1-es.json.br
index 73c08128e5..7acf988432 100644
--- a/lib/search/indexes/github-docs-3.1-es.json.br
+++ b/lib/search/indexes/github-docs-3.1-es.json.br
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a015714ec55e3e4821b0923a0216020c818288698435879d1cc3d4dfa3e8b50a
-size 694423
+oid sha256:ede52ab79904cc456226d79145906a6732a71b9738ddbadcb29e777bfea95de5
+size 694546
diff --git a/lib/search/indexes/github-docs-3.1-ja-records.json.br b/lib/search/indexes/github-docs-3.1-ja-records.json.br
index 2fa8fea8d6..321d591e87 100644
--- a/lib/search/indexes/github-docs-3.1-ja-records.json.br
+++ b/lib/search/indexes/github-docs-3.1-ja-records.json.br
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a770adc6824f5d4566565ba357b5a7a378f147d841066752e73844ecfeacd586
-size 580094
+oid sha256:3995399464a3201948b933a492cdf80c6791b7bf6159caddebd4dbb2c25d038b
+size 580055
diff --git a/lib/search/indexes/github-docs-3.1-ja.json.br b/lib/search/indexes/github-docs-3.1-ja.json.br
index 5380d33e76..cc0b5cef02 100644
--- a/lib/search/indexes/github-docs-3.1-ja.json.br
+++ b/lib/search/indexes/github-docs-3.1-ja.json.br
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ceeec88fda25e7c3f310ff1990baf58823741824ceab10ba8d6c9d2cdb34edc7
-size 3072510
+oid sha256:36245c9343ea12c0b3db8098be258c8723acf7fb81202495b28c1850f3184188
+size 3074694
diff --git a/lib/search/indexes/github-docs-3.1-pt-records.json.br b/lib/search/indexes/github-docs-3.1-pt-records.json.br
index ae743f63c2..fc5a788e97 100644
--- a/lib/search/indexes/github-docs-3.1-pt-records.json.br
+++ b/lib/search/indexes/github-docs-3.1-pt-records.json.br
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f0aa4cb115f2ab08c24756c2ce5e38e542b7371d0bc11a911e6362f7c1ede9f5
-size 487123
+oid sha256:8ad3992e32a8308ebe8729620658dd94fa4035ab496f0581be346ff5fd08452d
+size 487301
diff --git a/lib/search/indexes/github-docs-3.1-pt.json.br b/lib/search/indexes/github-docs-3.1-pt.json.br
index 6b2713ffd7..ae7eb0946a 100644
--- a/lib/search/indexes/github-docs-3.1-pt.json.br
+++ b/lib/search/indexes/github-docs-3.1-pt.json.br
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1e6ed5430ca7aa77ee13adb3404686c86d54881c992fc088506e8c4d61ad96a7
-size 2036578
+oid sha256:31e177f5f1a7e031854daaa8e5b66667b00d22ffeefc604a524e311a68c815e9
+size 2037572
diff --git a/lib/search/indexes/github-docs-3.2-cn-records.json.br b/lib/search/indexes/github-docs-3.2-cn-records.json.br
index e2cdc5cf9f..433b9a2bdb 100644
--- a/lib/search/indexes/github-docs-3.2-cn-records.json.br
+++ b/lib/search/indexes/github-docs-3.2-cn-records.json.br
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:95b0dea98634e73a367c5a996efee5d074ea4c9532e995324859934f10fdfa77
-size 567912
+oid sha256:2cfd35096b59cc29e49e200d2ffa91645b1cb8855ba8811036a9fd7193c48ad3
+size 568154
diff --git a/lib/search/indexes/github-docs-3.2-cn.json.br b/lib/search/indexes/github-docs-3.2-cn.json.br
index 3714fdb488..08dd90720d 100644
--- a/lib/search/indexes/github-docs-3.2-cn.json.br
+++ b/lib/search/indexes/github-docs-3.2-cn.json.br
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:53965723cf3eb62717258ba27b13852883883644ace994c09f0aa3cb15d4b92f
-size 949327
+oid sha256:6fcac92ee2fbb86e4f2114fa09508da7814e141a6552928498c1adda78d859a2
+size 949266
diff --git a/lib/search/indexes/github-docs-3.2-de-records.json.br b/lib/search/indexes/github-docs-3.2-de-records.json.br
index ef5066fee2..7d111ee52f 100644
--- a/lib/search/indexes/github-docs-3.2-de-records.json.br
+++ b/lib/search/indexes/github-docs-3.2-de-records.json.br
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3b02c6f44d094d3ec613c0446f7b89a9847543739cc4ccc6cc810546ec81dd3b
-size 517551
+oid sha256:bb25ca533bd2b31e71c37f2e649a777effa991f6924b5b920bf2b158beed9ed1
+size 517704
diff --git a/lib/search/indexes/github-docs-3.2-de.json.br b/lib/search/indexes/github-docs-3.2-de.json.br
index 9e24d03f5b..5dd5de4562 100644
--- a/lib/search/indexes/github-docs-3.2-de.json.br
+++ b/lib/search/indexes/github-docs-3.2-de.json.br
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:da9c6d7c6d466c873fbf77a1693558bff9c7a7de1336965bd78aedb8dceab87b
-size 2333338
+oid sha256:2845dafc721b7d385e5430e125875fb91ea4e106948017a5dd542e915e7df73c
+size 2333634
diff --git a/lib/search/indexes/github-docs-3.2-en-records.json.br b/lib/search/indexes/github-docs-3.2-en-records.json.br
index 2953cd75b1..a8af1ced38 100644
--- a/lib/search/indexes/github-docs-3.2-en-records.json.br
+++ b/lib/search/indexes/github-docs-3.2-en-records.json.br
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d1c7b5d13418d044092a7417d9b81210f36097bd9030046ca2aaac9ec5a13ccb
-size 473061
+oid sha256:278d83a3f9e5f4ca89e495da18ca6c71ee73756c068ec98af2d2fa23e768e0aa
+size 472699
diff --git a/lib/search/indexes/github-docs-3.2-en.json.br b/lib/search/indexes/github-docs-3.2-en.json.br
index 0ac59d92ad..1e707c538a 100644
--- a/lib/search/indexes/github-docs-3.2-en.json.br
+++ b/lib/search/indexes/github-docs-3.2-en.json.br
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e75e80c234cbfb133a07e96d047e440e3cd7ef368193db8483a90e0f94ad5ee7
-size 1845906
+oid sha256:df091c08a47c278632d3086cd293419acdff2b3228bb662a3eedead61065a467
+size 1845534
diff --git a/lib/search/indexes/github-docs-3.2-es-records.json.br b/lib/search/indexes/github-docs-3.2-es-records.json.br
index 66b6b278cf..d368705365 100644
--- a/lib/search/indexes/github-docs-3.2-es-records.json.br
+++ b/lib/search/indexes/github-docs-3.2-es-records.json.br
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c5f429c0eff0d728ec86c2784ec19de96f6f760dda78d37f8259508fa952e66a
-size 193583
+oid sha256:95113ec2db40e16d0e6f2832085ca766577882077fd837c484c7f2347823f913
+size 193610
diff --git a/lib/search/indexes/github-docs-3.2-es.json.br b/lib/search/indexes/github-docs-3.2-es.json.br
index 7bcde23a92..b6fd564619 100644
--- a/lib/search/indexes/github-docs-3.2-es.json.br
+++ b/lib/search/indexes/github-docs-3.2-es.json.br
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f083c61311a0ae26db97c28585fb686126445928d3f6e68986680592974d40d4
-size 694093
+oid sha256:71de92816ce0634171fa90f3972d1142ba3b8674477d5453b7f2623ad4ec5841
+size 694120
diff --git a/lib/search/indexes/github-docs-3.2-ja-records.json.br b/lib/search/indexes/github-docs-3.2-ja-records.json.br
index 7a97ee02bf..e2055f7161 100644
--- a/lib/search/indexes/github-docs-3.2-ja-records.json.br
+++ b/lib/search/indexes/github-docs-3.2-ja-records.json.br
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:bd9253aa403d5c6324cd5838da73a28bab808d62cd07922bb8a0eb94ee5e4da3
-size 590355
+oid sha256:9d73e1536ebcf7aca216f9a4ebf5fd28288ff8b2f228e6dd220f6d61d2d52f79
+size 590367
diff --git a/lib/search/indexes/github-docs-3.2-ja.json.br b/lib/search/indexes/github-docs-3.2-ja.json.br
index bb276cac6b..8586426213 100644
--- a/lib/search/indexes/github-docs-3.2-ja.json.br
+++ b/lib/search/indexes/github-docs-3.2-ja.json.br
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:60c29f7b7b1e2730d5063f48c6eaedcaae2b38e2fec5789e80cc16a22ac2d982
-size 3140788
+oid sha256:c5e33144aabe92534a97f10920a8d70eb5df44b0f870b2044e7f5f31b894bb1a
+size 3140704
diff --git a/lib/search/indexes/github-docs-3.2-pt-records.json.br b/lib/search/indexes/github-docs-3.2-pt-records.json.br
index 0ec532309d..e366eed9ad 100644
--- a/lib/search/indexes/github-docs-3.2-pt-records.json.br
+++ b/lib/search/indexes/github-docs-3.2-pt-records.json.br
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:37a9b2c8f18a2d8163041648f73285fa9e065efb9474fedea78c8e0a0d0aa748
-size 496782
+oid sha256:dd5cc4d0202192ad24bd4986b325d1926427cb188599c87c7bca8bb487737e94
+size 496661
diff --git a/lib/search/indexes/github-docs-3.2-pt.json.br b/lib/search/indexes/github-docs-3.2-pt.json.br
index c5fb9c3461..5928d1e483 100644
--- a/lib/search/indexes/github-docs-3.2-pt.json.br
+++ b/lib/search/indexes/github-docs-3.2-pt.json.br
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e78bfd1a0489d427e4fe10ae0b66be7fecf2c82cc70c7dbc20306c507602c88c
-size 2078189
+oid sha256:e0d63a7a6359520b51b28e823caed11ee301a53c4b6738d6e415d9c0a592d9d9
+size 2078792
diff --git a/lib/search/indexes/github-docs-dotcom-cn-records.json.br b/lib/search/indexes/github-docs-dotcom-cn-records.json.br
index ca940e3676..46a91e927a 100644
--- a/lib/search/indexes/github-docs-dotcom-cn-records.json.br
+++ b/lib/search/indexes/github-docs-dotcom-cn-records.json.br
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:dbba76510532bcca514a0571b873266e3173c34d3a80fc6e69105bda4d8e235a
-size 770677
+oid sha256:742d93699f7dd3dacee42f848973108b957de015264c1c50dd0e44b80d8432bb
+size 771151
diff --git a/lib/search/indexes/github-docs-dotcom-cn.json.br b/lib/search/indexes/github-docs-dotcom-cn.json.br
index 106a9715dc..7ede542e59 100644
--- a/lib/search/indexes/github-docs-dotcom-cn.json.br
+++ b/lib/search/indexes/github-docs-dotcom-cn.json.br
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:af5261366dfc8064f5f7c24e93daa6bd9b2b4608f509403ddb4b3e3f9f3c5e3a
-size 1171668
+oid sha256:969834b982054859dd92e341ad80728222c0f681a2592e1c5331f916a42d86d6
+size 1171615
diff --git a/lib/search/indexes/github-docs-dotcom-de-records.json.br b/lib/search/indexes/github-docs-dotcom-de-records.json.br
index 78bf80982c..45d23df00e 100644
--- a/lib/search/indexes/github-docs-dotcom-de-records.json.br
+++ b/lib/search/indexes/github-docs-dotcom-de-records.json.br
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:435f9b7f25680d018be16e203d1a8d1a9a74b62e7e1f5da42da5b663a3e6a960
-size 690829
+oid sha256:cbe2f290224010cb42a3274737ce2666866cb5bed94c4e2548945166e461021c
+size 690709
diff --git a/lib/search/indexes/github-docs-dotcom-de.json.br b/lib/search/indexes/github-docs-dotcom-de.json.br
index 53725154ce..31aab527f8 100644
--- a/lib/search/indexes/github-docs-dotcom-de.json.br
+++ b/lib/search/indexes/github-docs-dotcom-de.json.br
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7e75aed9fd4784ea18f0563e3645f64175a02a4f0cb1032a9d39cc9fcbcd1a93
-size 3124197
+oid sha256:e421f236384b5412eef497ef82807ce5971d5b161091e41bf4fb3ff089bf7667
+size 3126179
diff --git a/lib/search/indexes/github-docs-dotcom-en-records.json.br b/lib/search/indexes/github-docs-dotcom-en-records.json.br
index b0461c434b..075c0367cd 100644
--- a/lib/search/indexes/github-docs-dotcom-en-records.json.br
+++ b/lib/search/indexes/github-docs-dotcom-en-records.json.br
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:18cf61a2a93ac5ab8c95bb09b0ebbc1f5e0a6b78ea8f982e0d46635e3c289225
-size 638388
+oid sha256:f7d0478bd8575714f212214e4462c2c562df67f36ccc58affa2ffc1b113cdc6d
+size 638414
diff --git a/lib/search/indexes/github-docs-dotcom-en.json.br b/lib/search/indexes/github-docs-dotcom-en.json.br
index ff2641e28c..456c641e61 100644
--- a/lib/search/indexes/github-docs-dotcom-en.json.br
+++ b/lib/search/indexes/github-docs-dotcom-en.json.br
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2820521d662d1faf21c08fe8e6d4fd39ad3697c057b667224678ca214de47d88
-size 2425532
+oid sha256:4d16ea611be1b2f124bde654ae065d0672a414366c41043e2e405fa1d4e7297c
+size 2426535
diff --git a/lib/search/indexes/github-docs-dotcom-es-records.json.br b/lib/search/indexes/github-docs-dotcom-es-records.json.br
index 4296dd130e..00f68cb532 100644
--- a/lib/search/indexes/github-docs-dotcom-es-records.json.br
+++ b/lib/search/indexes/github-docs-dotcom-es-records.json.br
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:20d70f7b63ea7753e68286568eb1054dcb7579781258aeb45dedab6f076f7222
-size 205293
+oid sha256:d909d720e09094a747151fb42eb84755d1183f960cd62d646e0c368bffd3c916
+size 205330
diff --git a/lib/search/indexes/github-docs-dotcom-es.json.br b/lib/search/indexes/github-docs-dotcom-es.json.br
index ea9e3d49fa..e2c12a103e 100644
--- a/lib/search/indexes/github-docs-dotcom-es.json.br
+++ b/lib/search/indexes/github-docs-dotcom-es.json.br
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a04ffde15e4536b740b02ec316e4b210d20161983ad51e82820062f77c10bd61
-size 651203
+oid sha256:dc51a52c717439e5e05fc4ed78e5a13aa6e7e19b990158eb968a271e8794a725
+size 651179
diff --git a/lib/search/indexes/github-docs-dotcom-ja-records.json.br b/lib/search/indexes/github-docs-dotcom-ja-records.json.br
index e60fae11da..287ee52f10 100644
--- a/lib/search/indexes/github-docs-dotcom-ja-records.json.br
+++ b/lib/search/indexes/github-docs-dotcom-ja-records.json.br
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:572858cc3fc8f8193941590d32452a67b6b6bd4898367f604362ad0abb3d7330
-size 795275
+oid sha256:4173b2818c13c175a085e21aa1c5efc04edf9ab4552b6f7d71f2ef2cbc02780e
+size 795495
diff --git a/lib/search/indexes/github-docs-dotcom-ja.json.br b/lib/search/indexes/github-docs-dotcom-ja.json.br
index d55f7a92e3..156d0d9e90 100644
--- a/lib/search/indexes/github-docs-dotcom-ja.json.br
+++ b/lib/search/indexes/github-docs-dotcom-ja.json.br
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:812e58710708c3284778207e2957bb46d723ff4cdc3659cfc668387d46fe48e7
-size 4152194
+oid sha256:e436ac9995fd900a01fd774a066efefd6dd1744850d250b9eeefebfed16ae602
+size 4152774
diff --git a/lib/search/indexes/github-docs-dotcom-pt-records.json.br b/lib/search/indexes/github-docs-dotcom-pt-records.json.br
index f009c6fcca..2301177b94 100644
--- a/lib/search/indexes/github-docs-dotcom-pt-records.json.br
+++ b/lib/search/indexes/github-docs-dotcom-pt-records.json.br
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0b285fc56dc2458f5d9f99f1123efa3e56fb2a7350b796a380ca701a88db5547
-size 669547
+oid sha256:7822bcf5e5a0721ed50823ac39b2950b14b8b6d2d90481c25fa28f15a10e6b09
+size 670040
diff --git a/lib/search/indexes/github-docs-dotcom-pt.json.br b/lib/search/indexes/github-docs-dotcom-pt.json.br
index d4d7b5c126..045f359ae3 100644
--- a/lib/search/indexes/github-docs-dotcom-pt.json.br
+++ b/lib/search/indexes/github-docs-dotcom-pt.json.br
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:094cd6dfcd6d1316d656ae5a338f65c2bc122509a3100144d7358edcbf313bfe
-size 2750654
+oid sha256:ee30eba71cf574e7cc6c1dedfdf470457c629cc2da1070db9905f9d9c03c9155
+size 2752494
diff --git a/lib/search/indexes/github-docs-ghae-cn-records.json.br b/lib/search/indexes/github-docs-ghae-cn-records.json.br
index ba723e24b0..256b9887cb 100644
--- a/lib/search/indexes/github-docs-ghae-cn-records.json.br
+++ b/lib/search/indexes/github-docs-ghae-cn-records.json.br
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:03b2de718fdfbd38eca4e51923c46a7853e00fbd206e3cbba000b42cdffbe0ee
-size 433784
+oid sha256:36d833ec5513198c4542e7803ed0cb5caebb0b61782b979ce2a4d5b187a686d0
+size 433698
diff --git a/lib/search/indexes/github-docs-ghae-cn.json.br b/lib/search/indexes/github-docs-ghae-cn.json.br
index 8dfda342c7..651e21ce1c 100644
--- a/lib/search/indexes/github-docs-ghae-cn.json.br
+++ b/lib/search/indexes/github-docs-ghae-cn.json.br
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:562edbd618b30aa2ddd9a79f8ef97f4517d70a5f66225131dcab46e8a3a7db1c
-size 691775
+oid sha256:4369a3ab9b010f1108c3d9ce1eb08c952d03a9bc3cfd9e792134b3520d281f44
+size 691861
diff --git a/lib/search/indexes/github-docs-ghae-de-records.json.br b/lib/search/indexes/github-docs-ghae-de-records.json.br
index 5370bfd14e..71e1282107 100644
--- a/lib/search/indexes/github-docs-ghae-de-records.json.br
+++ b/lib/search/indexes/github-docs-ghae-de-records.json.br
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c4aa25ada1d941f08ec2667534d59ba011cf460a97243aa3082be59d1105abfe
-size 400733
+oid sha256:e1bf637051f8db1e387b5320d999b2261faf44aac87938aa2e95afcf7c5c8d01
+size 400803
diff --git a/lib/search/indexes/github-docs-ghae-de.json.br b/lib/search/indexes/github-docs-ghae-de.json.br
index 154a0b81ba..e0a3470afb 100644
--- a/lib/search/indexes/github-docs-ghae-de.json.br
+++ b/lib/search/indexes/github-docs-ghae-de.json.br
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:23b5804a2a0a61d9c44069361d76ba6fab20acacc6df748bf4d8e91c001ab6be
-size 1741615
+oid sha256:348c50dc526f576238c8ce6b02255028791cb9bb07d025d79f840ce34ca34ec7
+size 1742110
diff --git a/lib/search/indexes/github-docs-ghae-en-records.json.br b/lib/search/indexes/github-docs-ghae-en-records.json.br
index 7612efd3fb..5d9df98a2c 100644
--- a/lib/search/indexes/github-docs-ghae-en-records.json.br
+++ b/lib/search/indexes/github-docs-ghae-en-records.json.br
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ccfb09dd97f0967068399a54475e75f9bac5a414c1e3137fb5f0dc0b6a9bb4a7
-size 365156
+oid sha256:9e33262b78c4cff4ff6707c54f396f8e082a056a102f45f76630d696a7d699f4
+size 365796
diff --git a/lib/search/indexes/github-docs-ghae-en.json.br b/lib/search/indexes/github-docs-ghae-en.json.br
index 59e204f6dc..5bf0cdeb23 100644
--- a/lib/search/indexes/github-docs-ghae-en.json.br
+++ b/lib/search/indexes/github-docs-ghae-en.json.br
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d5cdbbe6a933aabaa47f612e0e1fbc51285342909bd7c71709a7e79ae79722c4
-size 1357180
+oid sha256:9167807d452a42b9efecd31fdaba958190fef21eb5fe27fcffbc3f349420517f
+size 1358270
diff --git a/lib/search/indexes/github-docs-ghae-es-records.json.br b/lib/search/indexes/github-docs-ghae-es-records.json.br
index 57f8cba730..8898783783 100644
--- a/lib/search/indexes/github-docs-ghae-es-records.json.br
+++ b/lib/search/indexes/github-docs-ghae-es-records.json.br
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1eee233fee9d4b39d047fcbe78de25572dc79b2130ee5acd92f156b29eb618a4
-size 130844
+oid sha256:dab4a4e98e2b065251f74f0126eab6f9de488b7eb8e7a34e94d2d580153cda4d
+size 130845
diff --git a/lib/search/indexes/github-docs-ghae-es.json.br b/lib/search/indexes/github-docs-ghae-es.json.br
index c136424517..b6c1692fb7 100644
--- a/lib/search/indexes/github-docs-ghae-es.json.br
+++ b/lib/search/indexes/github-docs-ghae-es.json.br
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:30e8db1adde46c43a1a2a3b1b9812cbf579372239d77b0c56aa1e0f06c870ef2
-size 420194
+oid sha256:41d5d96b8039f28ae8e4b718a615e76e0aaa2b99ee228dfd2644d5754c632299
+size 420280
diff --git a/lib/search/indexes/github-docs-ghae-ja-records.json.br b/lib/search/indexes/github-docs-ghae-ja-records.json.br
index 578347a0ae..aae41c22f5 100644
--- a/lib/search/indexes/github-docs-ghae-ja-records.json.br
+++ b/lib/search/indexes/github-docs-ghae-ja-records.json.br
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ce4a3e7f15f97a15fd8003e87a31df96f7c777f02913fb715309479d0124fd3b
-size 453267
+oid sha256:ead74ea292986f9330c3883e5b81945efd088f769accd1c5eb3fce7f411989e9
+size 453329
diff --git a/lib/search/indexes/github-docs-ghae-ja.json.br b/lib/search/indexes/github-docs-ghae-ja.json.br
index 90e68c0cbc..4a4af5b098 100644
--- a/lib/search/indexes/github-docs-ghae-ja.json.br
+++ b/lib/search/indexes/github-docs-ghae-ja.json.br
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6cb4067faa93f9eff4f77cb58f3100074d1a69b7553441d507c82a4df22aa9af
-size 2296599
+oid sha256:d01f849b9795d137faf2b45762cb3ea607f3f12ee562d7284428d2ee72f5275f
+size 2296975
diff --git a/lib/search/indexes/github-docs-ghae-pt-records.json.br b/lib/search/indexes/github-docs-ghae-pt-records.json.br
index aaec192b20..9c926c0a20 100644
--- a/lib/search/indexes/github-docs-ghae-pt-records.json.br
+++ b/lib/search/indexes/github-docs-ghae-pt-records.json.br
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:beaec88c733fd136f5be4b66e69de1f8bba9b3984a64d34ed2ae18d48708498f
-size 384998
+oid sha256:6e8553a7a691414128379bae724f8144ed74a54bf5ede0190043a95213e4d13f
+size 384984
diff --git a/lib/search/indexes/github-docs-ghae-pt.json.br b/lib/search/indexes/github-docs-ghae-pt.json.br
index 36a8476da8..99c96e49c9 100644
--- a/lib/search/indexes/github-docs-ghae-pt.json.br
+++ b/lib/search/indexes/github-docs-ghae-pt.json.br
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f619a27417bfef3dfb63fbfdf196f4c8594c32262a19109adc948e5330983103
-size 1536994
+oid sha256:bc437f30eb82893ffa4a9364d21a3199ff97eb03f9c1579a958387edd7879a0f
+size 1537131
diff --git a/script/deploy.js b/script/deploy.js
index 98eea665d9..184785da65 100755
--- a/script/deploy.js
+++ b/script/deploy.js
@@ -234,7 +234,7 @@ async function deployStaging({ owner, repo, pullNumber, forceRebuild = false, de
         pullRequest,
       })
     } else {
-      await octokit.repos.createStatus({
+      await octokit.repos.createCommitStatus({
         owner,
         repo,
         sha: pullRequest.head.sha,
@@ -249,7 +249,7 @@ async function deployStaging({ owner, repo, pullNumber, forceRebuild = false, de
         forceRebuild,
       })
 
-      await octokit.repos.createStatus({
+      await octokit.repos.createCommitStatus({
         owner,
         repo,
         sha: pullRequest.head.sha,
@@ -264,7 +264,7 @@ async function deployStaging({ owner, repo, pullNumber, forceRebuild = false, de
     console.error(error)
 
     if (!destroy) {
-      await octokit.repos.createStatus({
+      await octokit.repos.createCommitStatus({
         owner,
         repo,
         sha: pullRequest.head.sha,
diff --git a/script/deployment/deploy-to-production.js b/script/deployment/deploy-to-production.js
index 4014ed4226..14d8990bd0 100755
--- a/script/deployment/deploy-to-production.js
+++ b/script/deployment/deploy-to-production.js
@@ -10,7 +10,8 @@ const DELAY_FOR_PREBOOT_SWAP = 135000 // 2:15
 
 // Allow for a few 404 (Not Found), 429 (Too Many Requests), etc. responses from
 // the semi-unreliable Heroku API when we're polling for status updates
-const ALLOWED_MISSING_RESPONSE_COUNT = 5
+const ALLOWED_MISSING_RESPONSE_COUNT =
+  parseInt(process.env.ALLOWED_POLLING_FAILURES_PER_PHASE, 10) || 10
 const ALLOWABLE_ERROR_CODES = [404, 429, 500, 503]
 
 export default async function deployToProduction({
@@ -175,7 +176,7 @@ export default async function deployToProduction({
 
     // Poll until the Build's status changes from "pending" to "succeeded" or "failed".
     let buildAcceptableErrorCount = 0
-    while (!build || build.status === 'pending' || !build.release || !build.release.id) {
+    while (!build || !build.release || !build.release.id) {
       await sleep(SLEEP_INTERVAL)
       try {
         build = await heroku.get(`/apps/${appName}/builds/${buildId}`)
@@ -184,6 +185,9 @@ export default async function deployToProduction({
         if (isAllowableHerokuError(error)) {
           buildAcceptableErrorCount += 1
           if (buildAcceptableErrorCount <= ALLOWED_MISSING_RESPONSE_COUNT) {
+            console.warn(
+              `Ignoring allowable Heroku error #${buildAcceptableErrorCount}: ${error.statusCode}`
+            )
             continue
           }
         }
@@ -210,6 +214,7 @@ export default async function deployToProduction({
       `Finished Heroku build after ${Math.round((Date.now() - buildStartTime) / 1000)} seconds.`,
       build
     )
+    console.log('Heroku release detected', build.release)
 
     const releaseStartTime = Date.now() // Close enough...
     const releaseId = build.release.id
@@ -237,6 +242,9 @@ export default async function deployToProduction({
         if (isAllowableHerokuError(error)) {
           releaseAcceptableErrorCount += 1
           if (releaseAcceptableErrorCount <= ALLOWED_MISSING_RESPONSE_COUNT) {
+            console.warn(
+              `Ignoring allowable Heroku error #${releaseAcceptableErrorCount}: ${error.statusCode}`
+            )
             continue
           }
         }
@@ -296,6 +304,9 @@ export default async function deployToProduction({
         if (isAllowableHerokuError(error)) {
           dynoAcceptableErrorCount += 1
           if (dynoAcceptableErrorCount <= ALLOWED_MISSING_RESPONSE_COUNT) {
+            console.warn(
+              `Ignoring allowable Heroku error #${dynoAcceptableErrorCount}: ${error.statusCode}`
+            )
             continue
           }
         }
diff --git a/script/deployment/deploy-to-staging.js b/script/deployment/deploy-to-staging.js
index c1f2b79b86..f2d200beec 100644
--- a/script/deployment/deploy-to-staging.js
+++ b/script/deployment/deploy-to-staging.js
@@ -10,7 +10,8 @@ const HEROKU_LOG_LINES_TO_SHOW = 25
 
 // Allow for a few 404 (Not Found), 429 (Too Many Requests), etc. responses from
 // the semi-unreliable Heroku API when we're polling for status updates
-const ALLOWED_MISSING_RESPONSE_COUNT = 5
+const ALLOWED_MISSING_RESPONSE_COUNT =
+  parseInt(process.env.ALLOWED_POLLING_FAILURES_PER_PHASE, 10) || 10
 const ALLOWABLE_ERROR_CODES = [404, 429, 500, 503]
 
 export default async function deployToStaging({
@@ -233,7 +234,7 @@ export default async function deployToStaging({
       // A new Build is created as a by-product of creating an AppSetup.
       // Poll until there is a Build object attached to the AppSetup.
       let setupAcceptableErrorCount = 0
-      while (!appSetup || appSetup.status === 'pending' || !build || !build.id) {
+      while (!appSetup || !build || !build.id) {
         await sleep(SLEEP_INTERVAL)
         try {
           appSetup = await heroku.get(`/app-setups/${appSetup.id}`)
@@ -243,6 +244,9 @@ export default async function deployToStaging({
           if (isAllowableHerokuError(error)) {
             setupAcceptableErrorCount += 1
             if (setupAcceptableErrorCount <= ALLOWED_MISSING_RESPONSE_COUNT) {
+              console.warn(
+                `Ignoring allowable Heroku error #${setupAcceptableErrorCount}: ${error.statusCode}`
+              )
               continue
             }
           }
@@ -272,6 +276,7 @@ See Heroku logs for more information:\n${logUrl}`
         )
       }
 
+      console.log('Heroku AppSetup finished', appSetup)
       console.log('Heroku build detected', build)
     } else {
       // If the app does exist, just manually trigger a new build
@@ -317,7 +322,7 @@ See Heroku logs for more information:\n${logUrl}`
 
     // Poll until the Build's status changes from "pending" to "succeeded" or "failed".
     let buildAcceptableErrorCount = 0
-    while (!build || build.status === 'pending' || !build.release || !build.release.id) {
+    while (!build || !build.release || !build.release.id) {
       await sleep(SLEEP_INTERVAL)
       try {
         build = await heroku.get(`/apps/${appName}/builds/${buildId}`)
@@ -326,6 +331,9 @@ See Heroku logs for more information:\n${logUrl}`
         if (isAllowableHerokuError(error)) {
           buildAcceptableErrorCount += 1
           if (buildAcceptableErrorCount <= ALLOWED_MISSING_RESPONSE_COUNT) {
+            console.warn(
+              `Ignoring allowable Heroku error #${buildAcceptableErrorCount}: ${error.statusCode}`
+            )
             continue
           }
         }
@@ -352,6 +360,7 @@ See Heroku logs for more information:\n${logUrl}`
       `Finished Heroku build after ${Math.round((Date.now() - buildStartTime) / 1000)} seconds.`,
       build
     )
+    console.log('Heroku release detected', build.release)
 
     const releaseStartTime = Date.now() // Close enough...
     let releaseId = build.release.id
@@ -379,6 +388,9 @@ See Heroku logs for more information:\n${logUrl}`
         if (isAllowableHerokuError(error)) {
           releaseAcceptableErrorCount += 1
           if (releaseAcceptableErrorCount <= ALLOWED_MISSING_RESPONSE_COUNT) {
+            console.warn(
+              `Ignoring allowable Heroku error #${releaseAcceptableErrorCount}: ${error.statusCode}`
+            )
             continue
           }
         }
@@ -485,6 +497,9 @@ See Heroku logs for more information:\n${logUrl}`
         if (isAllowableHerokuError(error)) {
           dynoAcceptableErrorCount += 1
           if (dynoAcceptableErrorCount <= ALLOWED_MISSING_RESPONSE_COUNT) {
+            console.warn(
+              `Ignoring allowable Heroku error #${dynoAcceptableErrorCount}: ${error.statusCode}`
+            )
             continue
           }
         }
diff --git a/stylesheets/utilities.scss b/stylesheets/utilities.scss
index 5f13884331..22b646396a 100644
--- a/stylesheets/utilities.scss
+++ b/stylesheets/utilities.scss
@@ -14,10 +14,6 @@
   transform: rotateX(180deg);
 }
 
-.min-h-screen {
-  min-height: 100vh;
-}
-
 .outline-none {
   outline: none;
 }
@@ -91,3 +87,13 @@
 .color-border-transparent {
   border-color: transparent !important;
 }
+
+/* Widths / Heights
+------------------------------------------------------------------------------*/
+.max-w-xs {
+  max-width: 20rem;
+}
+
+.min-h-screen {
+  min-height: 100vh;
+}
diff --git a/tests/routing/deprecated-enterprise-versions.js b/tests/routing/deprecated-enterprise-versions.js
index f6cb6428cf..90c5cf31b9 100644
--- a/tests/routing/deprecated-enterprise-versions.js
+++ b/tests/routing/deprecated-enterprise-versions.js
@@ -130,7 +130,7 @@ describe('does not render survey prompt or contribution button', () => {
     if (enterpriseServerReleases.isOldestReleaseDeprecated) {
       expect($('.contribution').length).toBe(0)
     } else {
-      expect($('.js-survey').length).toBeGreaterThan(0)
+      expect($('[data-testid=survey-form]').length).toBeGreaterThan(0)
     }
   })
 })