diff --git a/CODEOWNERS b/CODEOWNERS
new file mode 100644
index 0000000000000..35ca87584b213
--- /dev/null
+++ b/CODEOWNERS
@@ -0,0 +1 @@
+packages/gatsby/src/utils/source-nodes-api-runner.ts @gatsbyjs/integrations-collaboration
diff --git a/packages/gatsby-plugin-remove-trailing-slashes/.babelrc b/deprecated-packages/gatsby-plugin-remove-trailing-slashes/.babelrc
similarity index 100%
rename from packages/gatsby-plugin-remove-trailing-slashes/.babelrc
rename to deprecated-packages/gatsby-plugin-remove-trailing-slashes/.babelrc
diff --git a/packages/gatsby-plugin-remove-trailing-slashes/.gitignore b/deprecated-packages/gatsby-plugin-remove-trailing-slashes/.gitignore
similarity index 100%
rename from packages/gatsby-plugin-remove-trailing-slashes/.gitignore
rename to deprecated-packages/gatsby-plugin-remove-trailing-slashes/.gitignore
diff --git a/packages/gatsby-plugin-remove-trailing-slashes/.npmignore b/deprecated-packages/gatsby-plugin-remove-trailing-slashes/.npmignore
similarity index 100%
rename from packages/gatsby-plugin-remove-trailing-slashes/.npmignore
rename to deprecated-packages/gatsby-plugin-remove-trailing-slashes/.npmignore
diff --git a/packages/gatsby-plugin-remove-trailing-slashes/CHANGELOG.md b/deprecated-packages/gatsby-plugin-remove-trailing-slashes/CHANGELOG.md
similarity index 100%
rename from packages/gatsby-plugin-remove-trailing-slashes/CHANGELOG.md
rename to deprecated-packages/gatsby-plugin-remove-trailing-slashes/CHANGELOG.md
diff --git a/packages/gatsby-plugin-remove-trailing-slashes/README.md b/deprecated-packages/gatsby-plugin-remove-trailing-slashes/README.md
similarity index 91%
rename from packages/gatsby-plugin-remove-trailing-slashes/README.md
rename to deprecated-packages/gatsby-plugin-remove-trailing-slashes/README.md
index 7a7bf42f62a42..de2dd6b142789 100644
--- a/packages/gatsby-plugin-remove-trailing-slashes/README.md
+++ b/deprecated-packages/gatsby-plugin-remove-trailing-slashes/README.md
@@ -1,6 +1,6 @@
 # gatsby-plugin-remove-trailing-slashes
 
-**Please Note:** This plugin will soon be **deprecated**, please use Gatsby's `trailingSlash` option. Read the [documentation](https://gatsby.dev/trailing-slash) to learn more.
+**Please Note:** This plugin is **deprecated**, please use Gatsby's `trailingSlash` option. Read the [documentation](https://gatsby.dev/trailing-slash) to learn more.
 
 This plugin removes trailing slashes from your project's paths. For
 example, `yoursite.com/about/` becomes `yoursite.com/about`.
diff --git a/packages/gatsby-plugin-remove-trailing-slashes/index.js b/deprecated-packages/gatsby-plugin-remove-trailing-slashes/index.js
similarity index 100%
rename from packages/gatsby-plugin-remove-trailing-slashes/index.js
rename to deprecated-packages/gatsby-plugin-remove-trailing-slashes/index.js
diff --git a/packages/gatsby-plugin-remove-trailing-slashes/package.json b/deprecated-packages/gatsby-plugin-remove-trailing-slashes/package.json
similarity index 100%
rename from packages/gatsby-plugin-remove-trailing-slashes/package.json
rename to deprecated-packages/gatsby-plugin-remove-trailing-slashes/package.json
diff --git a/packages/gatsby-plugin-remove-trailing-slashes/src/__tests__/gatsby-node.js b/deprecated-packages/gatsby-plugin-remove-trailing-slashes/src/__tests__/gatsby-node.js
similarity index 100%
rename from packages/gatsby-plugin-remove-trailing-slashes/src/__tests__/gatsby-node.js
rename to deprecated-packages/gatsby-plugin-remove-trailing-slashes/src/__tests__/gatsby-node.js
diff --git a/packages/gatsby-plugin-remove-trailing-slashes/src/gatsby-node.js b/deprecated-packages/gatsby-plugin-remove-trailing-slashes/src/gatsby-node.js
similarity index 100%
rename from packages/gatsby-plugin-remove-trailing-slashes/src/gatsby-node.js
rename to deprecated-packages/gatsby-plugin-remove-trailing-slashes/src/gatsby-node.js
diff --git a/docs/docs/debugging-html-builds.md b/docs/docs/debugging-html-builds.md
index 6833c58aa146d..915980b30cabf 100644
--- a/docs/docs/debugging-html-builds.md
+++ b/docs/docs/debugging-html-builds.md
@@ -50,7 +50,7 @@ const isBrowser = typeof window !== "undefined"
 export default function MyComponent() {
   let loggedIn = false
   if (isBrowser) {
-    window.localstorage.getItem("isLoggedIn") === "true"
+    window.localStorage.getItem("isLoggedIn") === "true"
   }
 
   return <div>Am I logged in? {loggedIn}</div>
diff --git a/docs/docs/how-to/styling/using-local-fonts.md b/docs/docs/how-to/styling/using-local-fonts.md
index dc45361dbb157..160ad93962f51 100644
--- a/docs/docs/how-to/styling/using-local-fonts.md
+++ b/docs/docs/how-to/styling/using-local-fonts.md
@@ -12,7 +12,7 @@ This guide uses the Gatsby [default starter](https://github.com/gatsbyjs/gatsby-
 
 Get started by using local fonts by adding them to your project. Copy the font file into your Gatsby project, for example, `src/fonts/fontname.woff2`.
 
-**NOTE:** It’s recommended to limit custom font usage to only the essential needed for performance.
+**NOTE:** For performance reasons, it’s recommended to limit the number of custom fonts added.
 
 The Gatsby default starter project adds [browser safe font](https://developer.mozilla.org/en-US/docs/Learn/CSS/Styling_text/Fundamentals#Default_fonts) styling in the `layout.css` file.
 
diff --git a/docs/docs/how-to/testing/end-to-end-testing.md b/docs/docs/how-to/testing/end-to-end-testing.md
index 61aaaa64e3070..fa2c422a2447c 100644
--- a/docs/docs/how-to/testing/end-to-end-testing.md
+++ b/docs/docs/how-to/testing/end-to-end-testing.md
@@ -13,15 +13,20 @@ To run Gatsby's development server and Cypress at the same time, you'll use the
 npm install --save-dev cypress start-server-and-test
 ```
 
-We also want the URLs used by `cy.visit()` or `cy.request()` to be prefixed, hence you have to create the file `cypress.json` at the root of your project with the following content:
+You need to create a config file for Cypress at the root of the project called `cypress.config.js`. You can use it to preface the URLs used by `cy.visit()` or `cy.request` as well as set the folder the tests are in by adding the following:
 
-```json:title=cypress.json
-{
-  "baseUrl": "http://localhost:8000/"
-}
+```js:title=cypress.config.js
+const { defineConfig } = require('cypress')
+
+module.exports = defineConfig({
+  e2e: {
+    baseUrl: 'http://localhost:8000',
+    specPattern: "cypress/e2e"
+  }
+})
 ```
 
-Last but not least you add additional scripts to your `package.json` to run Cypress:
+You also need to add additional scripts to your `package.json` to run Cypress:
 
 ```json:title=package.json
 {
@@ -37,7 +42,7 @@ Last but not least you add additional scripts to your `package.json` to run Cypr
 
 Type `npm run test:e2e` in your command line and see Cypress running for the first time. A folder named `cypress` will be created at the root of your project and a new application window will pop up. [Cypress' getting started guide](https://docs.cypress.io/guides/getting-started/writing-your-first-test.html#) is a good start to learn how to write tests!
 
-_Important note_: If you are running Gatsby with the `--https` flag, whether using your own or automatically generated certificates, you will also need to tell `start-server-and-test` to disable HTTPS certificate checks (otherwise it will wait forever and never actually launch Cypress. You do this by passing in an environmental variable: `START_SERVER_AND_TEST_INSECURE=1`. [start-server-and-test docs](https://github.com/bahmutov/start-server-and-test#disable-https-certificate-checks)).
+**Please note:** If you are running Gatsby with the `--https` flag, whether using your own or automatically generated certificates, you will also need to tell `start-server-and-test` to disable HTTPS certificate checks (otherwise it will wait forever and never actually launch Cypress. You do this by passing in an environmental variable: `START_SERVER_AND_TEST_INSECURE=1`. [start-server-and-test docs](https://github.com/bahmutov/start-server-and-test#disable-https-certificate-checks)).
 
 This means your `test:e2e` script would look like this:
 
@@ -75,26 +80,16 @@ To use cypress-axe, you have to install the `cypress-axe` and [axe-core](https:/
 npm install --save-dev cypress-axe axe-core @testing-library/cypress
 ```
 
-Then you add the `cypress-axe` and `@testing-library/cypress` commands in `cypress/support/index.js`:
+Then you add the `cypress-axe` and `@testing-library/cypress` commands in `cypress/support/e2e.js`:
 
-```js:title=cypress/support/index.js
-import "./commands"
+```js:title=cypress/support/e2e.js
 //highlight-start
 import "cypress-axe"
 import "@testing-library/cypress/add-commands"
 //highlight-end
 ```
 
-Cypress will look for tests inside the `cypress/integration` folder, but you can change the default test folder if you want. Because you're writing end-to-end tests, create a new folder called `cypress/e2e`, and use it as your `integrationFolder` in your `cypress.json`:
-
-```json:title=cypress.json
-{
-  "baseUrl": "http://localhost:8000/",
-  "integrationFolder": "cypress/e2e" // highlight-line
-}
-```
-
-Create a new file inside `cypress/e2e` folder and name it `accessibility.test.js`.
+Create a folder inside the cypress folder and a new file inside `cypress/e2e` folder and name it `accessibility.test.js`.
 
 You'll use the `beforeEach` hook to run some commands before each test. This is what they do:
 
@@ -109,7 +104,8 @@ Finally, inside the first test, you'll use the `checkA11y` command from `cypress
 
 describe("Accessibility tests", () => {
   beforeEach(() => {
-    cy.visit("/").get("main").injectAxe()
+      cy.visit("/").get("main")
+      cy.injectAxe()
   })
   it("Has no detectable accessibility violations on load", () => {
     cy.checkA11y()
@@ -132,7 +128,8 @@ The following test is for the [gatsby-default-starter](https://github.com/gatsby
 
 describe("Accessibility tests", () => {
   beforeEach(() => {
-    cy.visit("/").get("main").injectAxe()
+      cy.visit("/").get("main")
+      cy.injectAxe()
   })
   it("Has no detectable accessibility violations on load", () => {
     cy.checkA11y()
@@ -156,11 +153,13 @@ You'll now write another test for the `gatsby-default-starter` homepage. In this
 
 describe("Accessibility tests", () => {
   beforeEach(() => {
-    cy.visit("/").get("main").injectAxe()
+      cy.visit("/").get("main")
+      cy.injectAxe()
   })
   it("Has no detectable accessibility violations on load", () => {
     cy.checkA11y()
   })
+
   it("Navigates to page 2 and checks for accessibility violations", () => {
     cy.findByText(/go to page 2/i)
       .click()
diff --git a/docs/docs/how-to/testing/unit-testing.md b/docs/docs/how-to/testing/unit-testing.md
index 1f7582bb464b7..5505169e71539 100644
--- a/docs/docs/how-to/testing/unit-testing.md
+++ b/docs/docs/how-to/testing/unit-testing.md
@@ -237,7 +237,7 @@ If you are using TypeScript, you need to install typings packages and make
 two changes to your config.
 
 ```shell
-npm install --save-dev @types/jest @types/react-test-renderer
+npm install --save-dev @types/jest @types/react-test-renderer @babel/preset-typescript
 ```
 
 Update the transform in `jest.config.js` to run `jest-preprocess` on files in your project's root directory.
diff --git a/docs/docs/reference/built-in-components/gatsby-head.md b/docs/docs/reference/built-in-components/gatsby-head.md
index 1b0c7abbf356d..5304406ba5915 100644
--- a/docs/docs/reference/built-in-components/gatsby-head.md
+++ b/docs/docs/reference/built-in-components/gatsby-head.md
@@ -88,6 +88,7 @@ You'll need to be aware of these things when using Gatsby Head:
 - The `Head` function needs to return valid JSX.
 - Valid tags inside the `Head` function are: `link`, `meta`, `style`, `title`, `base`, `script`, and `noscript`.
 - Data block `<script>` tags such as `<script type="application/ld+json">` can go in the `Head` function, but dynamic scripts are better loaded with the [Gatsby Script Component](/docs/reference/built-in-components/gatsby-script/) in your pages or components.
+- Using the Head API and [react-helmet](https://github.com/nfl/react-helmet) in the same page is not supported as it can generate unexpected results.
 
 ## Properties
 
diff --git a/docs/docs/tutorial/part-1/index.mdx b/docs/docs/tutorial/part-1/index.mdx
index 52062338c353c..b1ca895d414d6 100644
--- a/docs/docs/tutorial/part-1/index.mdx
+++ b/docs/docs/tutorial/part-1/index.mdx
@@ -309,7 +309,7 @@ To connect your code on GitHub to your Gatsby Cloud account, do the following:
 
    ![The new fields. "Base Branch" is set to "main", "Base Directory" is set to "/", and "Site Name" is set to "my-first-gatsby-site-main".](./05-add-site-details.png)
 
-1. Gatsby Cloud will ask you if you want to add any integrations to your site. For future projects, this might be useful if you want to use a CMS. Gatsby Cloud will also ask if you want to add any environment variables. Again, this may useful for future projects, but for now, scroll past and click the **"Build Site"** button.
+1. Gatsby Cloud will ask you if you want to add any integrations to your site. For future projects, this might be useful if you want to use a CMS. Gatsby Cloud will also ask if you want to add any environment variables. Again, this may be useful for future projects, but for now, scroll past and click the **"Build Site"** button.
 
    ![The "Integrations" tab of the "Add a site" screen.](./06-integrations-and-environment-variables.png)
 
diff --git a/docs/tutorial/remark-plugin-tutorial.md b/docs/tutorial/remark-plugin-tutorial.md
index f4bbe8b1e2a92..ffda091fae469 100644
--- a/docs/tutorial/remark-plugin-tutorial.md
+++ b/docs/tutorial/remark-plugin-tutorial.md
@@ -189,7 +189,7 @@ However, if the sub-plugin is published and installed via npm, simply refer to i
 
 When modifying nodes, you'll want to walk the tree and then implement new functionality on specific nodes.
 
-A node module to help with is [unist-util-visit](https://github.com/syntax-tree/unist-util-visit), a walker for `unist` nodes. For reference, Unist (Unified Syntax Tree) is a standard for Markdown syntax trees and parsers that include well known parsers in the Gatsby world like Remark and MDX.
+A node module to help with this is [unist-util-visit](https://github.com/syntax-tree/unist-util-visit), a walker for `unist` nodes. For reference, Unist (Unified Syntax Tree) is a standard for Markdown syntax trees and parsers that include well known parsers in the Gatsby world like Remark and MDX.
 
 As an example from `unist-util-visit`'s README file, it allows for an interface to visit particular nodes based on a particular type:
 
@@ -208,6 +208,14 @@ function visitor(node) {
 
 Here, it finds all text nodes and will `console.log` the nodes. The second argument can be replaced with any type described in Unist's [Markdown AST (mdast) specification](https://github.com/syntax-tree/mdast#nodes) including types such as `paragraph`, `blockquote`, `link`, `image` or in our usecase, `heading`.
 
+To be able to use `unist-util-visit`, install it into your plugin:
+
+```shell
+npm install unist-util-visit@^2
+```
+
+**Please note**: You're installing v2 of `unist-util-visit` as newer major versions are ESM and Gatsby doesn't fully support that yet.
+
 With this technique in mind, you can similarly traverse the AST from your plugin and add additional functionality, like so:
 
 ```js:title=plugins/gatsby-remark-purple-headers/index.js
diff --git a/e2e-tests/contentful/snapshots.js b/e2e-tests/contentful/snapshots.js
index c7626ba18be77..2aeca7312618f 100644
--- a/e2e-tests/contentful/snapshots.js
+++ b/e2e-tests/contentful/snapshots.js
@@ -1,5 +1,5 @@
 module.exports = {
-  "__version": "9.5.4",
+  "__version": "9.6.1",
   "content-reference": {
     "content-reference-many-2nd-level-loop": {
       "1": "<div data-cy-id=\"default-content-reference-many-2nd-level-loop\">\n  <h2>Content Reference: Many (2nd level loop)</h2>\n  <p data-cy-id=\"integer\">[ContentfulNumber]\n    <!-- -->42</p>\n  <p data-cy-id=\"text\">[ContentfulText]\n    <!-- -->The quick brown fox jumps over the lazy dog.</p>\n  <p data-cy-id=\"reference\">[ContentfulReference]\n    <!-- -->Content Reference: One (Loop A -&gt; B)\n    <!-- -->: [\n    <!-- -->Content Reference: One (Loop B -&gt; A)\n    <!-- -->]</p>\n</div>"
diff --git a/e2e-tests/path-prefix/cypress/integration/navigate.js b/e2e-tests/path-prefix/cypress/integration/navigate.js
index c7bb2d59787c4..92f32673c1e72 100644
--- a/e2e-tests/path-prefix/cypress/integration/navigate.js
+++ b/e2e-tests/path-prefix/cypress/integration/navigate.js
@@ -58,6 +58,16 @@ describe(`navigate`, () => {
         .location(`pathname`)
         .should(`eq`, `${pathPrefix}/subdirectory/page-2`)
     })
+
+    it(`can navigate to SSR page`, () => {
+      cy.getTestElement(`page-ssr-button-link`)
+        .click()
+        .waitForRouteChange()
+        .location(`pathname`)
+        .should(`eq`, withTrailingSlash(`${pathPrefix}/ssr`))
+
+      cy.getTestElement(`server-data`).contains(`foo`)
+    })
   })
 
   it(`can navigate to 404`, () => {
diff --git a/e2e-tests/path-prefix/cypress/integration/path-prefix.js b/e2e-tests/path-prefix/cypress/integration/path-prefix.js
index b0ae7ef7f11ac..690a1008bbb56 100644
--- a/e2e-tests/path-prefix/cypress/integration/path-prefix.js
+++ b/e2e-tests/path-prefix/cypress/integration/path-prefix.js
@@ -3,39 +3,43 @@ const { pathPrefix } = require(`../../gatsby-config`)
 const withTrailingSlash = url => `${url}/`
 
 describe(`Production pathPrefix`, () => {
-  beforeEach(() => {
-    cy.visit(`/`).waitForRouteChange()
-  })
+  describe(`navigation`, () => {
+    beforeEach(() => {
+      cy.visit(`/`).waitForRouteChange()
+    })
 
-  it(`returns 200 on base route`, () => {
-    cy.location(`pathname`).should(`eq`, withTrailingSlash(pathPrefix))
-  })
+    it(`returns 200 on base route`, () => {
+      cy.location(`pathname`).should(`eq`, withTrailingSlash(pathPrefix))
+    })
 
-  it(`renders static image`, () => {
-    cy.getTestElement(`static-image`)
-      .should(`have.attr`, `srcset`)
-      .and(srcset => {
-        srcset.split(/\s*,\s*/).forEach(part => {
-          expect(part).to.contain(`/blog`)
+    it(`renders static image`, () => {
+      cy.getTestElement(`static-image`)
+        .should(`have.attr`, `srcset`)
+        .and(srcset => {
+          srcset.split(/\s*,\s*/).forEach(part => {
+            expect(part).to.contain(`/blog`)
+          })
         })
-      })
-  })
+    })
 
-  it(`renders dynamic image`, () => {
-    cy.getTestElement(`gatsby-image`)
-      .should(`have.attr`, `srcset`)
-      .and(srcset => {
-        srcset.split(/\s*,\s*/).forEach(part => {
-          expect(part).to.contain(`/blog`)
+    it(`renders dynamic image`, () => {
+      cy.getTestElement(`gatsby-image`)
+        .should(`have.attr`, `srcset`)
+        .and(srcset => {
+          srcset.split(/\s*,\s*/).forEach(part => {
+            expect(part).to.contain(`/blog`)
+          })
         })
-      })
-  })
+    })
 
-  describe(`navigation`, () => {
     it(`prefixes link with /blog`, () => {
       cy.getTestElement(`page-2-link`)
         .should(`have.attr`, `href`)
         .and(`include`, `/blog`)
+
+      cy.getTestElement(`page-ssr-link`)
+        .should(`have.attr`, `href`)
+        .and(`include`, `/blog`)
     })
 
     it(`can navigate to secondary page`, () => {
@@ -73,5 +77,24 @@ describe(`Production pathPrefix`, () => {
         withTrailingSlash(`${pathPrefix}/blogtest`)
       )
     })
+
+    it(`can navigate to ssr page`, () => {
+      cy.getTestElement(`page-ssr-link`).click()
+
+      cy.location(`pathname`).should(
+        `eq`,
+        withTrailingSlash(`${pathPrefix}/ssr`)
+      )
+
+      cy.getTestElement(`server-data`).contains(`foo`)
+    })
+  })
+
+  it(`can visit ssr page`, () => {
+    cy.visit(`/ssr/`).waitForRouteChange()
+
+    cy.location(`pathname`).should(`eq`, withTrailingSlash(`${pathPrefix}/ssr`))
+
+    cy.getTestElement(`server-data`).contains(`foo`)
   })
 })
diff --git a/e2e-tests/path-prefix/package.json b/e2e-tests/path-prefix/package.json
index 45a09bd94c189..da5d85ebae653 100644
--- a/e2e-tests/path-prefix/package.json
+++ b/e2e-tests/path-prefix/package.json
@@ -15,6 +15,7 @@
     "gatsby-plugin-sitemap": "next",
     "gatsby-source-filesystem": "next",
     "gatsby-transformer-sharp": "next",
+    "http-proxy": "^1.18.1",
     "react": "^17.0.2",
     "react-dom": "^17.0.2",
     "react-helmet": "^5.2.0"
@@ -25,11 +26,11 @@
   "license": "MIT",
   "scripts": {
     "prebuild": "del-cli -f assets && make-dir assets/blog",
-    "build": "gatsby build --prefix-paths",
+    "build": "cross-env CYPRESS_SUPPORT=y gatsby build --prefix-paths",
     "postbuild": "cpy --cwd=./public --parents '**/*' '../assets/blog'",
     "develop": "gatsby develop",
     "format": "prettier --write '**/*.js'",
-    "test": "cross-env CYPRESS_SUPPORT=y npm run build && npm run start-server-and-test",
+    "test": "npm run build && npm run start-server-and-test",
     "start-server-and-test": "start-server-and-test serve \"http://localhost:9000/blog/|http://localhost:9001/blog/\" cy:run",
     "serve": "npm-run-all --parallel serve:*",
     "serve:site": "gatsby serve --prefix-paths",
@@ -46,11 +47,11 @@
     "make-dir-cli": "^2.0.0",
     "npm-run-all": "^4.1.5",
     "prettier": "2.0.4",
-    "serve-handler": "^6.0.0",
-    "start-server-and-test": "^1.7.1"
+    "start-server-and-test": "^1.7.1",
+    "wait-on": "^6.0.0"
   },
   "repository": {
     "type": "git",
     "url": "https://github.com/gatsbyjs/gatsby-starter-default"
   }
-}
\ No newline at end of file
+}
diff --git a/e2e-tests/path-prefix/scripts/serve.js b/e2e-tests/path-prefix/scripts/serve.js
index 62eef37e84e71..ddfa92cf6e1c5 100644
--- a/e2e-tests/path-prefix/scripts/serve.js
+++ b/e2e-tests/path-prefix/scripts/serve.js
@@ -1,24 +1,24 @@
-const handler = require(`serve-handler`)
 const http = require(`http`)
-const path = require(`path`)
+const httpProxy = require("http-proxy")
+const waitOn = require("wait-on")
 
-const server = http.createServer((request, response) =>
-  handler(request, response, {
-    public: path.resolve(`assets`),
-    headers: [
-      {
-        source: `**/*`,
-        headers: [
-          {
-            key: `Access-Control-Allow-Origin`,
-            value: `*`,
-          },
-        ],
-      },
-    ],
-  })
-)
+waitOn(
+  {
+    resources: [`http://localhost:9000/blog/`],
+  },
+  function (err) {
+    if (err) {
+      console.error(err)
+      process.exit(1)
+    }
+
+    const proxy = httpProxy.createProxyServer()
+    const server = http.createServer((request, response) =>
+      proxy.web(request, response, { target: "http://localhost:9000" })
+    )
 
-server.listen(9001, () => {
-  console.log(`Running at http://localhost:9001`)
-})
+    server.listen(9001, () => {
+      console.log(`Assets server running at http://localhost:9001`)
+    })
+  }
+)
diff --git a/e2e-tests/path-prefix/src/pages/index.js b/e2e-tests/path-prefix/src/pages/index.js
index f5bb4b74b3565..7961c85849f1f 100644
--- a/e2e-tests/path-prefix/src/pages/index.js
+++ b/e2e-tests/path-prefix/src/pages/index.js
@@ -40,6 +40,15 @@ const IndexPage = ({ data }) => {
       <Link data-testid="subdir-link" to="subdirectory/page-1">
         Go to subdirectory
       </Link>
+      <Link data-testid="page-ssr-link" to="/ssr/">
+        Go to SSR page
+      </Link>
+      <button
+        data-testid="page-ssr-button-link"
+        onClick={() => navigate(`/ssr/`)}
+      >
+        Go to SSR page with navigate()
+      </button>
     </Layout>
   )
 }
diff --git a/e2e-tests/path-prefix/src/pages/ssr.js b/e2e-tests/path-prefix/src/pages/ssr.js
new file mode 100644
index 0000000000000..89c0f41dad72a
--- /dev/null
+++ b/e2e-tests/path-prefix/src/pages/ssr.js
@@ -0,0 +1,25 @@
+import * as React from "react"
+import { Link } from "gatsby"
+
+import Layout from "../components/layout"
+
+const SSRPage = ({ serverData }) => (
+  <Layout>
+    <h1>Hi from the SSR page</h1>
+    <p>Welcome to SSR page</p>
+    <Link data-testid="index-link" to="/">
+      Go back to the homepage
+    </Link>
+    <code data-testid="server-data">{serverData?.dataFromServer}</code>
+  </Layout>
+)
+
+export default SSRPage
+
+export function getServerData() {
+  return {
+    props: {
+      dataFromServer: `foo`,
+    },
+  }
+}
diff --git a/examples/using-cypress/README.md b/examples/using-cypress/README.md
index c38115d942927..7b5a4824da509 100644
--- a/examples/using-cypress/README.md
+++ b/examples/using-cypress/README.md
@@ -7,4 +7,4 @@ Gatsby example site that shows how to write accessibility tests with Cypress and
 - `npm install`
 - `npm run test:e2e`
 
-See the [End-to-End Testing](https://www.gatsbyjs.com/docs/end-to-end-testing/) guide for a walkthrough and more details.
+See the [End-to-End Testing](https://www.gatsbyjs.com/docs/how-to/testing/end-to-end-testing/) guide for a walkthrough and more details.
diff --git a/examples/using-cypress/cypress.config.js b/examples/using-cypress/cypress.config.js
new file mode 100644
index 0000000000000..1498823c30e88
--- /dev/null
+++ b/examples/using-cypress/cypress.config.js
@@ -0,0 +1,8 @@
+const { defineConfig } = require('cypress')
+
+module.exports = defineConfig({
+  e2e: {
+    baseUrl: 'http://localhost:8000',
+    specPattern: "cypress/e2e"
+  }
+})
diff --git a/examples/using-cypress/cypress.json b/examples/using-cypress/cypress.json
deleted file mode 100644
index b3fa4e0598cc1..0000000000000
--- a/examples/using-cypress/cypress.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "baseUrl": "http://localhost:8000/",
-  "integrationFolder": "cypress/e2e"
-}
diff --git a/examples/using-cypress/cypress/e2e/accessibility.test.js b/examples/using-cypress/cypress/e2e/accessibility.test.js
index ff755ba7cee8f..d510182690318 100644
--- a/examples/using-cypress/cypress/e2e/accessibility.test.js
+++ b/examples/using-cypress/cypress/e2e/accessibility.test.js
@@ -1,8 +1,7 @@
-/// <reference types="Cypress" />
-
 describe("Accessibility tests", () => {
   beforeEach(() => {
-    cy.visit("/").get("main").injectAxe()
+      cy.visit("/").get("main")
+      cy.injectAxe()
   })
   it("Has no detectable accessibility violations on load", () => {
     cy.checkA11y()
diff --git a/examples/using-cypress/cypress/plugins/index.js b/examples/using-cypress/cypress/plugins/index.js
deleted file mode 100644
index aa9918d215305..0000000000000
--- a/examples/using-cypress/cypress/plugins/index.js
+++ /dev/null
@@ -1,21 +0,0 @@
-/// <reference types="cypress" />
-// ***********************************************************
-// This example plugins/index.js can be used to load plugins
-//
-// You can change the location of this file or turn off loading
-// the plugins file with the 'pluginsFile' configuration option.
-//
-// You can read more here:
-// https://on.cypress.io/plugins-guide
-// ***********************************************************
-
-// This function is called when a project is opened or re-opened (e.g. due to
-// the project's config changing)
-
-/**
- * @type {Cypress.PluginConfig}
- */
-module.exports = (on, config) => {
-  // `on` is used to hook into various events Cypress emits
-  // `config` is the resolved Cypress config
-}
diff --git a/examples/using-cypress/cypress/support/index.js b/examples/using-cypress/cypress/support/e2e.js
similarity index 100%
rename from examples/using-cypress/cypress/support/index.js
rename to examples/using-cypress/cypress/support/e2e.js
diff --git a/examples/using-cypress/gatsby-config.js b/examples/using-cypress/gatsby-config.js
index 999bd3d349f97..41974db097195 100644
--- a/examples/using-cypress/gatsby-config.js
+++ b/examples/using-cypress/gatsby-config.js
@@ -4,31 +4,5 @@ module.exports = {
     description: `Kick off your next, great Gatsby project with this default starter. This barebones starter ships with the main Gatsby configuration files you might need.`,
     author: `@gatsbyjs`,
   },
-  plugins: [
-    `gatsby-plugin-react-helmet`,
-    {
-      resolve: `gatsby-source-filesystem`,
-      options: {
-        name: `images`,
-        path: `${__dirname}/src/images`,
-      },
-    },
-    `gatsby-transformer-sharp`,
-    `gatsby-plugin-sharp`,
-    {
-      resolve: `gatsby-plugin-manifest`,
-      options: {
-        name: `gatsby-starter-default`,
-        short_name: `starter`,
-        start_url: `/`,
-        background_color: `#663399`,
-        theme_color: `#663399`,
-        display: `minimal-ui`,
-        icon: `src/images/gatsby-icon.png`, // This path is relative to the root of the site.
-      },
-    },
-    // this (optional) plugin enables Progressive Web App + Offline functionality
-    // To learn more, visit: https://gatsby.dev/offline
-    // `gatsby-plugin-offline`,
-  ],
+  plugins: [],
 }
diff --git a/examples/using-cypress/gatsby-ssr.js b/examples/using-cypress/gatsby-ssr.js
new file mode 100644
index 0000000000000..3a9b76c385f65
--- /dev/null
+++ b/examples/using-cypress/gatsby-ssr.js
@@ -0,0 +1,3 @@
+exports.onRenderBody = ({ setHtmlAttributes }) => {
+  setHtmlAttributes({ lang: `en` })
+}
\ No newline at end of file
diff --git a/examples/using-cypress/package.json b/examples/using-cypress/package.json
index 4185b26bef8fb..26bf4324531da 100644
--- a/examples/using-cypress/package.json
+++ b/examples/using-cypress/package.json
@@ -7,8 +7,6 @@
   "scripts": {
     "build": "gatsby build",
     "develop": "gatsby develop",
-    "format": "prettier --write \"**/*.{js,jsx,json,md}\"",
-    "start": "npm run develop",
     "serve": "gatsby serve",
     "clean": "gatsby clean",
     "cy:open": "cypress open",
@@ -18,25 +16,16 @@
   },
   "dependencies": {
     "gatsby": "next",
-    "gatsby-image": "next",
-    "gatsby-plugin-manifest": "next",
-    "gatsby-plugin-offline": "next",
-    "gatsby-plugin-react-helmet": "next",
-    "gatsby-plugin-sharp": "next",
-    "gatsby-source-filesystem": "next",
-    "gatsby-transformer-sharp": "next",
-    "prop-types": "^15.7.2",
-    "react": "^16.12.0",
-    "react-dom": "^16.12.0",
-    "react-helmet": "^5.2.1"
+    "prop-types": "^15.8.1",
+    "react": "^18.2.0",
+    "react-dom": "^18.2.0"
   },
   "devDependencies": {
-    "@testing-library/cypress": "^5.3.1",
-    "axe-core": "^3.5.5",
-    "cypress": "^4.12.1",
-    "cypress-axe": "^0.8.1",
-    "prettier": "2.1.1",
-    "start-server-and-test": "^1.11.3"
+    "@testing-library/cypress": "^8.0.3",
+    "axe-core": "^4.4.3",
+    "cypress": "^10.3.1",
+    "cypress-axe": "^1.0.0",
+    "start-server-and-test": "^1.14.0"
   },
   "keywords": [
     "gatsby"
diff --git a/examples/using-cypress/src/components/image.js b/examples/using-cypress/src/components/image.js
deleted file mode 100644
index b134a7b80be74..0000000000000
--- a/examples/using-cypress/src/components/image.js
+++ /dev/null
@@ -1,32 +0,0 @@
-import React from "react"
-import { useStaticQuery, graphql } from "gatsby"
-import Img from "gatsby-image"
-
-/*
- * This component is built using `gatsby-image` to automatically serve optimized
- * images with lazy loading and reduced file sizes. The image is loaded using a
- * `useStaticQuery`, which allows us to load the image from directly within this
- * component, rather than having to pass the image data down from pages.
- *
- * For more information, see the docs:
- * - `gatsby-image`: https://gatsby.dev/gatsby-image
- * - `useStaticQuery`: https://www.gatsbyjs.com/docs/use-static-query/
- */
-
-const Image = () => {
-  const data = useStaticQuery(graphql`
-    query {
-      placeholderImage: file(relativePath: { eq: "gatsby-astronaut.png" }) {
-        childImageSharp {
-          fluid(maxWidth: 300) {
-            ...GatsbyImageSharpFluid
-          }
-        }
-      }
-    }
-  `)
-
-  return <Img fluid={data.placeholderImage.childImageSharp.fluid} />
-}
-
-export default Image
diff --git a/examples/using-cypress/src/components/layout.js b/examples/using-cypress/src/components/layout.js
index 67ae709096747..15a5e9382daf3 100644
--- a/examples/using-cypress/src/components/layout.js
+++ b/examples/using-cypress/src/components/layout.js
@@ -1,10 +1,3 @@
-/**
- * Layout component that queries for data
- * with Gatsby's useStaticQuery component
- *
- * See: https://www.gatsbyjs.com/docs/use-static-query/
- */
-
 import React from "react"
 import PropTypes from "prop-types"
 import { useStaticQuery, graphql } from "gatsby"
diff --git a/examples/using-cypress/src/components/seo.js b/examples/using-cypress/src/components/seo.js
deleted file mode 100644
index b40a909ae8c8b..0000000000000
--- a/examples/using-cypress/src/components/seo.js
+++ /dev/null
@@ -1,88 +0,0 @@
-/**
- * SEO component that queries for data with
- *  Gatsby's useStaticQuery React hook
- *
- * See: https://www.gatsbyjs.com/docs/use-static-query/
- */
-
-import React from "react"
-import PropTypes from "prop-types"
-import Helmet from "react-helmet"
-import { useStaticQuery, graphql } from "gatsby"
-
-function SEO({ description, lang, meta, title }) {
-  const { site } = useStaticQuery(
-    graphql`
-      query {
-        site {
-          siteMetadata {
-            title
-            description
-            author
-          }
-        }
-      }
-    `
-  )
-
-  const metaDescription = description || site.siteMetadata.description
-
-  return (
-    <Helmet
-      htmlAttributes={{
-        lang,
-      }}
-      title={title}
-      titleTemplate={`%s | ${site.siteMetadata.title}`}
-      meta={[
-        {
-          name: `description`,
-          content: metaDescription,
-        },
-        {
-          property: `og:title`,
-          content: title,
-        },
-        {
-          property: `og:description`,
-          content: metaDescription,
-        },
-        {
-          property: `og:type`,
-          content: `website`,
-        },
-        {
-          name: `twitter:card`,
-          content: `summary`,
-        },
-        {
-          name: `twitter:creator`,
-          content: site.siteMetadata.author,
-        },
-        {
-          name: `twitter:title`,
-          content: title,
-        },
-        {
-          name: `twitter:description`,
-          content: metaDescription,
-        },
-      ].concat(meta)}
-    />
-  )
-}
-
-SEO.defaultProps = {
-  lang: `en`,
-  meta: [],
-  description: ``,
-}
-
-SEO.propTypes = {
-  description: PropTypes.string,
-  lang: PropTypes.string,
-  meta: PropTypes.arrayOf(PropTypes.object),
-  title: PropTypes.string.isRequired,
-}
-
-export default SEO
diff --git a/examples/using-cypress/src/images/gatsby-astronaut.png b/examples/using-cypress/src/images/gatsby-astronaut.png
deleted file mode 100644
index da58ece0a8c5b..0000000000000
Binary files a/examples/using-cypress/src/images/gatsby-astronaut.png and /dev/null differ
diff --git a/examples/using-cypress/src/images/gatsby-icon.png b/examples/using-cypress/src/images/gatsby-icon.png
deleted file mode 100644
index 908bc78a7f559..0000000000000
Binary files a/examples/using-cypress/src/images/gatsby-icon.png and /dev/null differ
diff --git a/examples/using-cypress/src/pages/404.js b/examples/using-cypress/src/pages/404.js
index bc4c31d79353c..876a75e44ab88 100644
--- a/examples/using-cypress/src/pages/404.js
+++ b/examples/using-cypress/src/pages/404.js
@@ -1,14 +1,13 @@
 import React from "react"
-
 import Layout from "../components/layout"
-import SEO from "../components/seo"
 
 const NotFoundPage = () => (
   <Layout>
-    <SEO title="404: Not found" />
     <h1>NOT FOUND</h1>
     <p>You just hit a route that doesn&#39;t exist... the sadness.</p>
   </Layout>
 )
 
 export default NotFoundPage
+
+export const Head = () => <title>404: Not found</title>
diff --git a/examples/using-cypress/src/pages/index.js b/examples/using-cypress/src/pages/index.js
index 7eb6257d2e022..285edc99ff622 100644
--- a/examples/using-cypress/src/pages/index.js
+++ b/examples/using-cypress/src/pages/index.js
@@ -1,21 +1,16 @@
 import React from "react"
 import { Link } from "gatsby"
-
 import Layout from "../components/layout"
-import Image from "../components/image"
-import SEO from "../components/seo"
 
 const IndexPage = () => (
   <Layout>
-    <SEO title="Home" />
     <h1>Hi people</h1>
     <p>Welcome to your new Gatsby site.</p>
     <p>Now go build something great.</p>
-    <div style={{ maxWidth: `300px`, marginBottom: `1.45rem` }}>
-      <Image />
-    </div>
     <Link to="/page-2/">Go to page 2</Link>
   </Layout>
 )
 
 export default IndexPage
+
+export const Head = () => <title>Home</title>
diff --git a/examples/using-cypress/src/pages/page-2.js b/examples/using-cypress/src/pages/page-2.js
index 666c23ef30f9d..d00575fa98f44 100644
--- a/examples/using-cypress/src/pages/page-2.js
+++ b/examples/using-cypress/src/pages/page-2.js
@@ -1,12 +1,9 @@
 import React from "react"
 import { Link } from "gatsby"
-
 import Layout from "../components/layout"
-import SEO from "../components/seo"
 
 const SecondPage = () => (
   <Layout>
-    <SEO title="Page two" />
     <h1>Hi from the second page</h1>
     <p>Welcome to page 2</p>
     <Link to="/">Go back to the homepage</Link>
@@ -14,3 +11,5 @@ const SecondPage = () => (
 )
 
 export default SecondPage
+
+export const Head = () => <title>Page two</title>
diff --git a/package.json b/package.json
index aefa0d7c7f4e1..7851edd536891 100644
--- a/package.json
+++ b/package.json
@@ -1,4 +1,5 @@
 {
+  "packageManager": "yarn@1.21.0",
   "devDependencies": {
     "@babel/core": "^7.15.5",
     "@babel/eslint-parser": "^7.15.4",
diff --git a/packages/babel-plugin-remove-graphql-queries/package.json b/packages/babel-plugin-remove-graphql-queries/package.json
index d5bb1d52a2cc6..301edbdd0220c 100644
--- a/packages/babel-plugin-remove-graphql-queries/package.json
+++ b/packages/babel-plugin-remove-graphql-queries/package.json
@@ -1,6 +1,6 @@
 {
   "name": "babel-plugin-remove-graphql-queries",
-  "version": "4.20.0-next.0",
+  "version": "4.20.0-next.1",
   "author": "Jason Quense <monastic.panic@gmail.com>",
   "repository": {
     "type": "git",
@@ -10,6 +10,7 @@
   "homepage": "https://github.com/gatsbyjs/gatsby/tree/master/packages/babel-plugin-remove-graphql-queries#readme",
   "dependencies": {
     "@babel/runtime": "^7.15.4",
+    "@babel/types": "^7.15.4",
     "gatsby-core-utils": "^3.20.0-next.0"
   },
   "devDependencies": {
diff --git a/packages/create-gatsby/package.json b/packages/create-gatsby/package.json
index f4d64e32ef3b7..af18ade958039 100644
--- a/packages/create-gatsby/package.json
+++ b/packages/create-gatsby/package.json
@@ -1,6 +1,6 @@
 {
   "name": "create-gatsby",
-  "version": "2.20.0-next.0",
+  "version": "2.20.0-next.2",
   "main": "lib/index.js",
   "bin": "cli.js",
   "license": "MIT",
@@ -28,7 +28,7 @@
     "eslint": "^7.32.0",
     "execa": "^5.1.1",
     "fs-extra": "^10.1.0",
-    "gatsby-plugin-utils": "^3.14.0-next.0",
+    "gatsby-plugin-utils": "^3.14.0-next.2",
     "joi": "^17.4.2",
     "microbundle": "^0.15.0",
     "node-fetch": "^2.6.6",
diff --git a/packages/create-gatsby/src/questions/features.json b/packages/create-gatsby/src/questions/features.json
index 4ed7eb46b8440..4cd79b023acaa 100644
--- a/packages/create-gatsby/src/questions/features.json
+++ b/packages/create-gatsby/src/questions/features.json
@@ -16,10 +16,6 @@
       }
     }
   },
-  "gatsby-plugin-react-helmet": {
-    "message": "Add page meta tags with React Helmet",
-    "dependencies": ["react-helmet"]
-  },
   "gatsby-plugin-sitemap": { "message": "Add an automatic sitemap" },
   "gatsby-plugin-manifest": {
     "message": "Generate a manifest file",
diff --git a/packages/gatsby-cli/package.json b/packages/gatsby-cli/package.json
index 76d16ad916b5f..7ea963de4663f 100644
--- a/packages/gatsby-cli/package.json
+++ b/packages/gatsby-cli/package.json
@@ -1,7 +1,7 @@
 {
   "name": "gatsby-cli",
   "description": "Gatsby command-line interface for creating new sites and running Gatsby commands",
-  "version": "4.20.0-next.0",
+  "version": "4.20.0-next.2",
   "author": "Kyle Mathews <mathews.kyle@gmail.com>",
   "bin": {
     "gatsby": "cli.js"
@@ -27,7 +27,7 @@
     "common-tags": "^1.8.2",
     "configstore": "^5.0.1",
     "convert-hrtime": "^3.0.0",
-    "create-gatsby": "^2.20.0-next.0",
+    "create-gatsby": "^2.20.0-next.2",
     "envinfo": "^7.8.1",
     "execa": "^5.1.1",
     "fs-exists-cached": "^1.0.0",
diff --git a/packages/gatsby-link/package.json b/packages/gatsby-link/package.json
index 8825d52564e87..ae2494e143df3 100644
--- a/packages/gatsby-link/package.json
+++ b/packages/gatsby-link/package.json
@@ -1,7 +1,7 @@
 {
   "name": "gatsby-link",
   "description": "An enhanced Link component for Gatsby sites with support for resource prefetching",
-  "version": "4.20.0-next.1",
+  "version": "4.20.0-next.2",
   "author": "Kyle Mathews <mathews.kyle@gmail.com>",
   "bugs": {
     "url": "https://github.com/gatsbyjs/gatsby/issues"
diff --git a/packages/gatsby-link/src/rewrite-link-path.js b/packages/gatsby-link/src/rewrite-link-path.js
index 6ac57ee203264..75a572855429b 100644
--- a/packages/gatsby-link/src/rewrite-link-path.js
+++ b/packages/gatsby-link/src/rewrite-link-path.js
@@ -1,4 +1,4 @@
-import { resolve } from "@gatsbyjs/reach-router/lib/utils"
+import { resolve } from "@gatsbyjs/reach-router"
 // Specific import to treeshake Node.js stuff
 import { applyTrailingSlashOption } from "gatsby-page-utils/apply-trailing-slash-option"
 import { parsePath } from "./parse-path"
diff --git a/packages/gatsby-plugin-cxs/package.json b/packages/gatsby-plugin-cxs/package.json
index 3c9aa69d3c289..eb0c2409248d9 100644
--- a/packages/gatsby-plugin-cxs/package.json
+++ b/packages/gatsby-plugin-cxs/package.json
@@ -1,7 +1,7 @@
 {
   "name": "gatsby-plugin-cxs",
   "description": "Gatsby plugin to add SSR support for ctx",
-  "version": "4.20.0-next.0",
+  "version": "4.20.0-next.2",
   "author": "Chen-Tai Hou <ctxhou@gmail.com>",
   "bugs": {
     "url": "https://github.com/gatsbyjs/gatsby/issues"
@@ -15,7 +15,7 @@
     "babel-preset-gatsby-package": "^2.20.0-next.0",
     "cross-env": "^7.0.3",
     "cxs": "^6.2.0",
-    "gatsby-plugin-utils": "^3.14.0-next.0"
+    "gatsby-plugin-utils": "^3.14.0-next.2"
   },
   "homepage": "https://github.com/gatsbyjs/gatsby/tree/master/packages/gatsby-plugin-cxs#readme",
   "keywords": [
diff --git a/packages/gatsby-plugin-feed/package.json b/packages/gatsby-plugin-feed/package.json
index b6351f9bfefa0..e02d59555b4fe 100644
--- a/packages/gatsby-plugin-feed/package.json
+++ b/packages/gatsby-plugin-feed/package.json
@@ -1,7 +1,7 @@
 {
   "name": "gatsby-plugin-feed",
   "description": "Creates an RSS feed for your Gatsby site.",
-  "version": "4.20.0-next.0",
+  "version": "4.20.0-next.2",
   "author": "Nicholas Young <nicholas@nicholaswyoung.com>",
   "bugs": {
     "url": "https://github.com/gatsbyjs/gatsby/issues"
@@ -11,7 +11,7 @@
     "@hapi/joi": "^15.1.1",
     "common-tags": "^1.8.2",
     "fs-extra": "^10.1.0",
-    "gatsby-plugin-utils": "^3.14.0-next.0",
+    "gatsby-plugin-utils": "^3.14.0-next.2",
     "lodash.merge": "^4.6.2",
     "rss": "^1.2.2"
   },
diff --git a/packages/gatsby-plugin-flow/package.json b/packages/gatsby-plugin-flow/package.json
index c5cdb681794bd..b51c0ef7ae6bf 100644
--- a/packages/gatsby-plugin-flow/package.json
+++ b/packages/gatsby-plugin-flow/package.json
@@ -1,6 +1,6 @@
 {
   "name": "gatsby-plugin-flow",
-  "version": "3.20.0-next.0",
+  "version": "3.20.0-next.2",
   "description": "Provides drop-in support for Flow by adding @babel/preset-flow.",
   "main": "index.js",
   "scripts": {
@@ -32,7 +32,7 @@
     "@babel/core": "^7.15.5",
     "babel-preset-gatsby-package": "^2.20.0-next.0",
     "cross-env": "^7.0.3",
-    "gatsby-plugin-utils": "^3.14.0-next.0"
+    "gatsby-plugin-utils": "^3.14.0-next.2"
   },
   "peerDependencies": {
     "gatsby": "^4.0.0-next"
diff --git a/packages/gatsby-plugin-google-tagmanager/package.json b/packages/gatsby-plugin-google-tagmanager/package.json
index a99db8af1d3ae..ec2dceb2f2716 100644
--- a/packages/gatsby-plugin-google-tagmanager/package.json
+++ b/packages/gatsby-plugin-google-tagmanager/package.json
@@ -1,7 +1,7 @@
 {
   "name": "gatsby-plugin-google-tagmanager",
   "description": "Gatsby plugin to add google tagmanager onto a site",
-  "version": "4.20.0-next.0",
+  "version": "4.20.0-next.2",
   "author": "Thijs Koerselman <thijs@vauxlab.com>",
   "bugs": {
     "url": "https://github.com/gatsbyjs/gatsby/issues"
@@ -15,7 +15,7 @@
     "@babel/core": "^7.15.5",
     "babel-preset-gatsby-package": "^2.20.0-next.0",
     "cross-env": "^7.0.3",
-    "gatsby-plugin-utils": "^3.14.0-next.0"
+    "gatsby-plugin-utils": "^3.14.0-next.2"
   },
   "homepage": "https://github.com/gatsbyjs/gatsby/tree/master/packages/gatsby-plugin-google-tagmanager#readme",
   "keywords": [
diff --git a/packages/gatsby-plugin-image/package.json b/packages/gatsby-plugin-image/package.json
index f5cd1b320b725..2afa2edfb50b0 100644
--- a/packages/gatsby-plugin-image/package.json
+++ b/packages/gatsby-plugin-image/package.json
@@ -1,6 +1,6 @@
 {
   "name": "gatsby-plugin-image",
-  "version": "2.20.0-next.1",
+  "version": "2.20.0-next.3",
   "scripts": {
     "build": "npm-run-all --npm-path npm -s clean -p build:*",
     "build:gatsby-node": "tsc --jsx react --downlevelIteration true --skipLibCheck true --esModuleInterop true --outDir dist/ src/gatsby-node.ts src/babel-plugin-parse-static-images.ts src/resolver-utils.ts src/types.d.ts -d --declarationDir dist/src",
@@ -77,13 +77,13 @@
     "@babel/runtime": "^7.15.4",
     "@babel/traverse": "^7.15.4",
     "babel-jsx-utils": "^1.1.0",
-    "babel-plugin-remove-graphql-queries": "^4.20.0-next.0",
+    "babel-plugin-remove-graphql-queries": "^4.20.0-next.1",
     "camelcase": "^5.3.1",
     "chokidar": "^3.5.3",
     "common-tags": "^1.8.2",
     "fs-extra": "^10.1.0",
     "gatsby-core-utils": "^3.20.0-next.0",
-    "gatsby-plugin-utils": "^3.14.0-next.0",
+    "gatsby-plugin-utils": "^3.14.0-next.2",
     "objectFitPolyfill": "^2.3.5",
     "prop-types": "^15.8.1"
   },
diff --git a/packages/gatsby-plugin-manifest/package.json b/packages/gatsby-plugin-manifest/package.json
index 037f023f811d2..b3f30034b84b6 100644
--- a/packages/gatsby-plugin-manifest/package.json
+++ b/packages/gatsby-plugin-manifest/package.json
@@ -1,7 +1,7 @@
 {
   "name": "gatsby-plugin-manifest",
   "description": "Gatsby plugin which adds a manifest.webmanifest to make sites progressive web apps",
-  "version": "4.20.0-next.0",
+  "version": "4.20.0-next.2",
   "author": "Kyle Mathews <mathews.kyle@gmail.com>",
   "bugs": {
     "url": "https://github.com/gatsbyjs/gatsby/issues"
@@ -9,7 +9,7 @@
   "dependencies": {
     "@babel/runtime": "^7.15.4",
     "gatsby-core-utils": "^3.20.0-next.0",
-    "gatsby-plugin-utils": "^3.14.0-next.0",
+    "gatsby-plugin-utils": "^3.14.0-next.2",
     "semver": "^7.3.7",
     "sharp": "^0.30.3"
   },
diff --git a/packages/gatsby-plugin-mdx/package.json b/packages/gatsby-plugin-mdx/package.json
index 4afe7f37a72a1..568f5aad150aa 100644
--- a/packages/gatsby-plugin-mdx/package.json
+++ b/packages/gatsby-plugin-mdx/package.json
@@ -1,6 +1,6 @@
 {
   "name": "gatsby-plugin-mdx",
-  "version": "3.20.0-next.0",
+  "version": "3.20.0-next.2",
   "description": "MDX integration for Gatsby",
   "main": "index.js",
   "license": "MIT",
@@ -63,7 +63,7 @@
   "devDependencies": {
     "@mdx-js/mdx": "^1.6.16",
     "@mdx-js/react": "^1.6.16",
-    "gatsby-plugin-utils": "^3.14.0-next.0",
+    "gatsby-plugin-utils": "^3.14.0-next.2",
     "js-combinatorics": "^1.4.5",
     "react-test-renderer": "^16.13.1"
   },
diff --git a/packages/gatsby-plugin-netlify/CHANGELOG.md b/packages/gatsby-plugin-netlify/CHANGELOG.md
deleted file mode 100644
index 6dd7e91e651b9..0000000000000
--- a/packages/gatsby-plugin-netlify/CHANGELOG.md
+++ /dev/null
@@ -1,686 +0,0 @@
-# Changelog: `gatsby-plugin-netlify`
-
-All notable changes to this project will be documented in this file.
-See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
-
-## [3.13.0](https://github.com/gatsbyjs/gatsby/commits/gatsby-plugin-netlify@3.13.0/packages/gatsby-plugin-netlify) (2021-09-01)
-
-[🧾 Release notes](https://www.gatsbyjs.com/docs/reference/release-notes/v3.13)
-
-#### Features
-
-- Move page-data & HTML utils to package [#32861](https://github.com/gatsbyjs/gatsby/issues/32861) ([114e3d3](https://github.com/gatsbyjs/gatsby/commit/114e3d39695bd96b8c477a413f5927317a19b4cb))
-
-#### Chores
-
-- re-generate changelogs [#32886](https://github.com/gatsbyjs/gatsby/issues/32886) ([417df15](https://github.com/gatsbyjs/gatsby/commit/417df15230be368a9db91f2ad1a9bc0442733177))
-
-## [3.12.0](https://github.com/gatsbyjs/gatsby/commits/gatsby-plugin-netlify@3.12.0/packages/gatsby-plugin-netlify) (2021-08-18)
-
-[🧾 Release notes](https://www.gatsbyjs.com/docs/reference/release-notes/v3.12)
-
-#### Bug Fixes
-
-- update dependency webpack-assets-manifest to ^5.0.6 for gatsby-plugin-netlify [#32593](https://github.com/gatsbyjs/gatsby/issues/32593) ([fa0f286](https://github.com/gatsbyjs/gatsby/commit/fa0f2863a7dfd51c0323032e80aa9f1868d2e506))
-
-#### Chores
-
-- update formatting & linting [#32626](https://github.com/gatsbyjs/gatsby/issues/32626) ([4a765b5](https://github.com/gatsbyjs/gatsby/commit/4a765b5c62208d58f0bd7fd59558160c0b9feed3))
-- update babel monorepo [#32564](https://github.com/gatsbyjs/gatsby/issues/32564) ([a554998](https://github.com/gatsbyjs/gatsby/commit/a554998b4f6765103b650813cf52dbfcc575fecf))
-
-## [3.11.0](https://github.com/gatsbyjs/gatsby/commits/gatsby-plugin-netlify@3.11.0/packages/gatsby-plugin-netlify) (2021-08-04)
-
-[🧾 Release notes](https://www.gatsbyjs.com/docs/reference/release-notes/v3.11)
-
-**Note:** Version bump only for package gatsby-plugin-netlify
-
-## [3.10.0](https://github.com/gatsbyjs/gatsby/commits/gatsby-plugin-netlify@3.10.0/packages/gatsby-plugin-netlify) (2021-07-20)
-
-[🧾 Release notes](https://www.gatsbyjs.com/docs/reference/release-notes/v3.10)
-
-#### Chores
-
-- update babel monorepo [#32238](https://github.com/gatsbyjs/gatsby/issues/32238) ([466d4c0](https://github.com/gatsbyjs/gatsby/commit/466d4c087bbc96abb942a02c67243bcc9a4f2a0a))
-
-## [3.9.0](https://github.com/gatsbyjs/gatsby/commits/gatsby-plugin-netlify@3.9.0/packages/gatsby-plugin-netlify) (2021-07-07)
-
-[🧾 Release notes](https://www.gatsbyjs.com/docs/reference/release-notes/v3.9)
-
-**Note:** Version bump only for package gatsby-plugin-netlify
-
-## [3.8.0](https://github.com/gatsbyjs/gatsby/commits/gatsby-plugin-netlify@3.8.0/packages/gatsby-plugin-netlify) (2021-06-23)
-
-[🧾 Release notes](https://www.gatsbyjs.com/docs/reference/release-notes/v3.8)
-
-#### Chores
-
-- bump babel minor [#31857](https://github.com/gatsbyjs/gatsby/issues/31857) ([7d42e8d](https://github.com/gatsbyjs/gatsby/commit/7d42e8d866e46e9c39838d812d080d06433f7060))
-
-### [3.7.1](https://github.com/gatsbyjs/gatsby/commits/gatsby-plugin-netlify@3.7.1/packages/gatsby-plugin-netlify) (2021-06-10)
-
-#### Chores
-
-- bump babel minor [#31857](https://github.com/gatsbyjs/gatsby/issues/31857) [#31859](https://github.com/gatsbyjs/gatsby/issues/31859) ([8636025](https://github.com/gatsbyjs/gatsby/commit/863602567930a39142ed33d9d1f1813b7dec8686))
-
-## [3.7.0](https://github.com/gatsbyjs/gatsby/commits/gatsby-plugin-netlify@3.7.0/packages/gatsby-plugin-netlify) (2021-06-09)
-
-[🧾 Release notes](https://www.gatsbyjs.com/docs/reference/release-notes/v3.7)
-
-#### Bug Fixes
-
-- add componentChunkName to components list so don't need to loop over pages [#31547](https://github.com/gatsbyjs/gatsby/issues/31547) ([783b937](https://github.com/gatsbyjs/gatsby/commit/783b937c8f70478796bce37808bf8bf967bb4252))
-
-#### Chores
-
-- update babel monorepo [#31143](https://github.com/gatsbyjs/gatsby/issues/31143) ([701ab2f](https://github.com/gatsbyjs/gatsby/commit/701ab2f6690c3f1bbaf60cf572513ea566cc9ec9))
-
-### [3.6.1](https://github.com/gatsbyjs/gatsby/commits/gatsby-plugin-netlify@3.6.1/packages/gatsby-plugin-netlify) (2021-05-27)
-
-#### Bug Fixes
-
-- add componentChunkName to components list so don't need to loop over pages [#31547](https://github.com/gatsbyjs/gatsby/issues/31547) [#31606](https://github.com/gatsbyjs/gatsby/issues/31606) ([1f26765](https://github.com/gatsbyjs/gatsby/commit/1f2676513a22e3acf283e6b2ef0cf5797c17818b))
-
-## [3.6.0](https://github.com/gatsbyjs/gatsby/commits/gatsby-plugin-netlify@3.6.0/packages/gatsby-plugin-netlify) (2021-05-25)
-
-[🧾 Release notes](https://www.gatsbyjs.com/docs/reference/release-notes/v3.6)
-
-**Note:** Version bump only for package gatsby-plugin-netlify
-
-## [3.5.0](https://github.com/gatsbyjs/gatsby/commits/gatsby-plugin-netlify@3.5.0/packages/gatsby-plugin-netlify) (2021-05-12)
-
-[🧾 Release notes](https://www.gatsbyjs.com/docs/reference/release-notes/v3.5)
-
-**Note:** Version bump only for package gatsby-plugin-netlify
-
-## [3.4.0](https://github.com/gatsbyjs/gatsby/commits/gatsby-plugin-netlify@3.4.0/packages/gatsby-plugin-netlify) (2021-04-28)
-
-[🧾 Release notes](https://www.gatsbyjs.com/docs/reference/release-notes/v3.4)
-
-#### Bug Fixes
-
-- update minor and patch for gatsby-plugin-netlify [#30680](https://github.com/gatsbyjs/gatsby/issues/30680) ([118105b](https://github.com/gatsbyjs/gatsby/commit/118105bbd9849b3ca263d0bd8cc37f93f78b658e))
-
-## [3.3.0](https://github.com/gatsbyjs/gatsby/commits/gatsby-plugin-netlify@3.3.0/packages/gatsby-plugin-netlify) (2021-04-14)
-
-[🧾 Release notes](https://www.gatsbyjs.com/docs/reference/release-notes/v3.3)
-
-**Note:** Version bump only for package gatsby-plugin-netlify
-
-## [3.2.0](https://github.com/gatsbyjs/gatsby/commits/gatsby-plugin-netlify@3.2.0/packages/gatsby-plugin-netlify) (2021-03-30)
-
-[🧾 Release notes](https://www.gatsbyjs.com/docs/reference/release-notes/v3.2)
-
-#### Bug Fixes
-
-- upgrade webpack-assets-manifest for compatibility with webpack@5 [#30217](https://github.com/gatsbyjs/gatsby/issues/30217) ([ca44a9e](https://github.com/gatsbyjs/gatsby/commit/ca44a9eb04878919ee52874a5e879a1a29ee0463))
-
-## [3.1.0](https://github.com/gatsbyjs/gatsby/commits/gatsby-plugin-netlify@3.1.0/packages/gatsby-plugin-netlify) (2021-03-16)
-
-[🧾 Release notes](https://www.gatsbyjs.com/docs/reference/release-notes/v3.1)
-
-#### Bug Fixes
-
-- Add an allow list for redirect options [#30155](https://github.com/gatsbyjs/gatsby/issues/30155) ([962c4a1](https://github.com/gatsbyjs/gatsby/commit/962c4a1d3d8a5c952ec88957bdc20352bbeb151c))
-- update lodash monorepo to ^4.17.21 [#29382](https://github.com/gatsbyjs/gatsby/issues/29382) ([9fd287b](https://github.com/gatsbyjs/gatsby/commit/9fd287ba89eacd55652d468b18f6e1526230e7c6))
-
-#### Chores
-
-- update eslint to fix linting issues fix [#29988](https://github.com/gatsbyjs/gatsby/issues/29988) ([5636389](https://github.com/gatsbyjs/gatsby/commit/5636389e8fa626c644e90abc14589e9961d98c68))
-
-### [3.0.1](https://github.com/gatsbyjs/gatsby/commits/gatsby-plugin-netlify@3.0.1/packages/gatsby-plugin-netlify) (2021-03-16)
-
-#### Bug Fixes
-
-- Add an allow list for redirect options [#30155](https://github.com/gatsbyjs/gatsby/issues/30155) [#30261](https://github.com/gatsbyjs/gatsby/issues/30261) ([a258996](https://github.com/gatsbyjs/gatsby/commit/a258996976914696396d9f15136de9462ea1d376))
-
-## [3.0.0](https://github.com/gatsbyjs/gatsby/commits/gatsby-plugin-netlify@3.0.0/packages/gatsby-plugin-netlify) (2021-03-02)
-
-[🧾 Release notes](https://www.gatsbyjs.com/docs/reference/release-notes/v3.0)
-
-#### Other Changes
-
-- Update readme [#29168](https://github.com/gatsbyjs/gatsby/issues/29168) Fixes [#28693](https://github.com/gatsbyjs/gatsby/issues/28693) ([f82678f](https://github.com/gatsbyjs/gatsby/commit/f82678f1b9f4c07306a5742269839d79aefd4e89))
-- todos part 2 [#29414](https://github.com/gatsbyjs/gatsby/issues/29414) ([ae12e63](https://github.com/gatsbyjs/gatsby/commit/ae12e6320c42279549dfe980863b7a29c3e7e4ce))
-
-### [2.11.1](https://github.com/gatsbyjs/gatsby/commits/gatsby-plugin-netlify@2.11.1/packages/gatsby-plugin-netlify) (2021-03-18)
-
-#### Bug Fixes
-
-- Add an allow list for redirect options [#30155](https://github.com/gatsbyjs/gatsby/issues/30155) [#30215](https://github.com/gatsbyjs/gatsby/issues/30215) ([ebbb41b](https://github.com/gatsbyjs/gatsby/commit/ebbb41b56300dc0cfde15ee5d7cec4dd4b4091f8))
-
-## [2.11.0](https://github.com/gatsbyjs/gatsby/commits/gatsby-plugin-netlify@2.11.0/packages/gatsby-plugin-netlify) (2021-02-02)
-
-[🧾 Release notes](https://www.gatsbyjs.com/docs/reference/release-notes/v2.32)
-
-**Note:** Version bump only for package gatsby-plugin-netlify
-
-## [2.10.0](https://github.com/gatsbyjs/gatsby/commits/gatsby-plugin-netlify@2.10.0/packages/gatsby-plugin-netlify) (2021-01-20)
-
-[🧾 Release notes](https://www.gatsbyjs.com/docs/reference/release-notes/v2.31)
-
-#### Bug Fixes
-
-- fix typo fix [#28907](https://github.com/gatsbyjs/gatsby/issues/28907) ([0e20f01](https://github.com/gatsbyjs/gatsby/commit/0e20f012be72f13f20b782b5f0b8939244b7cd7a))
-
-## [2.9.0](https://github.com/gatsbyjs/gatsby/commits/gatsby-plugin-netlify@2.9.0/packages/gatsby-plugin-netlify) (2021-01-06)
-
-[🧾 Release notes](https://www.gatsbyjs.com/docs/reference/release-notes/v2.30)
-
-**Note:** Version bump only for package gatsby-plugin-netlify
-
-## [2.8.0](https://github.com/gatsbyjs/gatsby/commits/gatsby-plugin-netlify@2.8.0/packages/gatsby-plugin-netlify) (2020-12-15)
-
-[🧾 Release notes](https://www.gatsbyjs.com/docs/reference/release-notes/v2.29)
-
-#### Chores
-
-- update dependency cross-env to ^7.0.3 [#28505](https://github.com/gatsbyjs/gatsby/issues/28505) ([a819b9b](https://github.com/gatsbyjs/gatsby/commit/a819b9bfb663139f7b06c3ed7d6d6069a2382b2c))
-
-## [2.7.0](https://github.com/gatsbyjs/gatsby/commits/gatsby-plugin-netlify@2.7.0/packages/gatsby-plugin-netlify) (2020-12-02)
-
-[🧾 Release notes](https://www.gatsbyjs.com/docs/reference/release-notes/v2.28)
-
-**Note:** Version bump only for package gatsby-plugin-netlify
-
-## [2.6.0](https://github.com/gatsbyjs/gatsby/commits/gatsby-plugin-netlify@2.6.0/packages/gatsby-plugin-netlify) (2020-11-20)
-
-[🧾 Release notes](https://www.gatsbyjs.com/docs/reference/release-notes/v2.27)
-
-#### Chores
-
-- update babel monorepo [#27528](https://github.com/gatsbyjs/gatsby/issues/27528) ([539dbb0](https://github.com/gatsbyjs/gatsby/commit/539dbb09166e346a6cee568973d2de3d936e8ef3))
-
-## [2.5.0](https://github.com/gatsbyjs/gatsby/commits/gatsby-plugin-netlify@2.5.0/packages/gatsby-plugin-netlify) (2020-11-12)
-
-[🧾 Release notes](https://www.gatsbyjs.com/docs/reference/release-notes/v2.26)
-
-**Note:** Version bump only for package gatsby-plugin-netlify
-
-<a name="before-release-process"></a>
-
-# [2.4.0](https://github.com/gatsbyjs/gatsby/compare/gatsby-plugin-netlify@2.3.25...gatsby-plugin-netlify@2.4.0) (2020-11-02)
-
-### Features
-
-- **gatsby:** release plugin option validation ([#27437](https://github.com/gatsbyjs/gatsby/issues/27437)) ([41ae1c0](https://github.com/gatsbyjs/gatsby/commit/41ae1c07ad9919655782ef17feed8cf4f14f12d8))
-
-## [2.3.25](https://github.com/gatsbyjs/gatsby/compare/gatsby-plugin-netlify@2.3.24...gatsby-plugin-netlify@2.3.25) (2020-10-28)
-
-**Note:** Version bump only for package gatsby-plugin-netlify
-
-## [2.3.24](https://github.com/gatsbyjs/gatsby/compare/gatsby-plugin-netlify@2.3.23...gatsby-plugin-netlify@2.3.24) (2020-10-22)
-
-**Note:** Version bump only for package gatsby-plugin-netlify
-
-## [2.3.23](https://github.com/gatsbyjs/gatsby/compare/gatsby-plugin-netlify@2.3.22...gatsby-plugin-netlify@2.3.23) (2020-10-21)
-
-### Bug Fixes
-
-- Update plugin schema testing util and associated tests ([#27574](https://github.com/gatsbyjs/gatsby/issues/27574)) ([6d81283](https://github.com/gatsbyjs/gatsby/commit/6d81283e4f47ae2cb571626bf4d02fcd2c9d1af4))
-
-## [2.3.22](https://github.com/gatsbyjs/gatsby/compare/gatsby-plugin-netlify@2.3.21...gatsby-plugin-netlify@2.3.22) (2020-10-20)
-
-**Note:** Version bump only for package gatsby-plugin-netlify
-
-## [2.3.21](https://github.com/gatsbyjs/gatsby/compare/gatsby-plugin-netlify@2.3.20...gatsby-plugin-netlify@2.3.21) (2020-10-19)
-
-**Note:** Version bump only for package gatsby-plugin-netlify
-
-## [2.3.20](https://github.com/gatsbyjs/gatsby/compare/gatsby-plugin-netlify@2.3.19...gatsby-plugin-netlify@2.3.20) (2020-10-16)
-
-**Note:** Version bump only for package gatsby-plugin-netlify
-
-## [2.3.19](https://github.com/gatsbyjs/gatsby/compare/gatsby-plugin-netlify@2.3.18...gatsby-plugin-netlify@2.3.19) (2020-10-15)
-
-**Note:** Version bump only for package gatsby-plugin-netlify
-
-## [2.3.18](https://github.com/gatsbyjs/gatsby/compare/gatsby-plugin-netlify@2.3.17...gatsby-plugin-netlify@2.3.18) (2020-10-14)
-
-**Note:** Version bump only for package gatsby-plugin-netlify
-
-## [2.3.17](https://github.com/gatsbyjs/gatsby/compare/gatsby-plugin-netlify@2.3.16...gatsby-plugin-netlify@2.3.17) (2020-10-06)
-
-**Note:** Version bump only for package gatsby-plugin-netlify
-
-## [2.3.16](https://github.com/gatsbyjs/gatsby/compare/gatsby-plugin-netlify@2.3.15...gatsby-plugin-netlify@2.3.16) (2020-09-28)
-
-**Note:** Version bump only for package gatsby-plugin-netlify
-
-## [2.3.15](https://github.com/gatsbyjs/gatsby/compare/gatsby-plugin-netlify@2.3.14...gatsby-plugin-netlify@2.3.15) (2020-09-15)
-
-**Note:** Version bump only for package gatsby-plugin-netlify
-
-## [2.3.14](https://github.com/gatsbyjs/gatsby/compare/gatsby-plugin-netlify@2.3.13...gatsby-plugin-netlify@2.3.14) (2020-09-07)
-
-**Note:** Version bump only for package gatsby-plugin-netlify
-
-## [2.3.13](https://github.com/gatsbyjs/gatsby/compare/gatsby-plugin-netlify@2.3.12...gatsby-plugin-netlify@2.3.13) (2020-08-10)
-
-**Note:** Version bump only for package gatsby-plugin-netlify
-
-## [2.3.12](https://github.com/gatsbyjs/gatsby/compare/gatsby-plugin-netlify@2.3.11...gatsby-plugin-netlify@2.3.12) (2020-08-06)
-
-**Note:** Version bump only for package gatsby-plugin-netlify
-
-## [2.3.11](https://github.com/gatsbyjs/gatsby/compare/gatsby-plugin-netlify@2.3.10...gatsby-plugin-netlify@2.3.11) (2020-07-09)
-
-**Note:** Version bump only for package gatsby-plugin-netlify
-
-## [2.3.10](https://github.com/gatsbyjs/gatsby/compare/gatsby-plugin-netlify@2.3.9...gatsby-plugin-netlify@2.3.10) (2020-07-02)
-
-**Note:** Version bump only for package gatsby-plugin-netlify
-
-## [2.3.9](https://github.com/gatsbyjs/gatsby/compare/gatsby-plugin-netlify@2.3.8...gatsby-plugin-netlify@2.3.9) (2020-07-01)
-
-**Note:** Version bump only for package gatsby-plugin-netlify
-
-## [2.3.8](https://github.com/gatsbyjs/gatsby/compare/gatsby-plugin-netlify@2.3.7...gatsby-plugin-netlify@2.3.8) (2020-07-01)
-
-**Note:** Version bump only for package gatsby-plugin-netlify
-
-## [2.3.7](https://github.com/gatsbyjs/gatsby/compare/gatsby-plugin-netlify@2.3.6...gatsby-plugin-netlify@2.3.7) (2020-06-24)
-
-**Note:** Version bump only for package gatsby-plugin-netlify
-
-## [2.3.6](https://github.com/gatsbyjs/gatsby/compare/gatsby-plugin-netlify@2.3.5...gatsby-plugin-netlify@2.3.6) (2020-06-22)
-
-**Note:** Version bump only for package gatsby-plugin-netlify
-
-## [2.3.5](https://github.com/gatsbyjs/gatsby/compare/gatsby-plugin-netlify@2.3.4...gatsby-plugin-netlify@2.3.5) (2020-06-09)
-
-**Note:** Version bump only for package gatsby-plugin-netlify
-
-## [2.3.4](https://github.com/gatsbyjs/gatsby/compare/gatsby-plugin-netlify@2.3.3...gatsby-plugin-netlify@2.3.4) (2020-06-02)
-
-**Note:** Version bump only for package gatsby-plugin-netlify
-
-## [2.3.3](https://github.com/gatsbyjs/gatsby/compare/gatsby-plugin-netlify@2.3.2...gatsby-plugin-netlify@2.3.3) (2020-05-20)
-
-**Note:** Version bump only for package gatsby-plugin-netlify
-
-## [2.3.2](https://github.com/gatsbyjs/gatsby/compare/gatsby-plugin-netlify@2.3.1...gatsby-plugin-netlify@2.3.2) (2020-05-05)
-
-**Note:** Version bump only for package gatsby-plugin-netlify
-
-## [2.3.1](https://github.com/gatsbyjs/gatsby/compare/gatsby-plugin-netlify@2.3.0...gatsby-plugin-netlify@2.3.1) (2020-05-04)
-
-### Bug Fixes
-
-- **gatsby-plugin-netlify:** Add missing space in error message ([#23722](https://github.com/gatsbyjs/gatsby/issues/23722)) ([f6a48cf](https://github.com/gatsbyjs/gatsby/commit/f6a48cf))
-- **gatsby-plugin-netlify:** Fix heuristic for appending redirects ([#23743](https://github.com/gatsbyjs/gatsby/issues/23743)) ([ff0f7cf](https://github.com/gatsbyjs/gatsby/commit/ff0f7cf))
-
-# [2.3.0](https://github.com/gatsbyjs/gatsby/compare/gatsby-plugin-netlify@2.2.4...gatsby-plugin-netlify@2.3.0) (2020-04-27)
-
-**Note:** Version bump only for package gatsby-plugin-netlify
-
-## [2.2.4](https://github.com/gatsbyjs/gatsby/compare/gatsby-plugin-netlify@2.2.3...gatsby-plugin-netlify@2.2.4) (2020-04-24)
-
-**Note:** Version bump only for package gatsby-plugin-netlify
-
-## [2.2.3](https://github.com/gatsbyjs/gatsby/compare/gatsby-plugin-netlify@2.2.2...gatsby-plugin-netlify@2.2.3) (2020-04-17)
-
-### Bug Fixes
-
-- wrap ignore pattern in quotes ([#23176](https://github.com/gatsbyjs/gatsby/issues/23176)) ([7563db6](https://github.com/gatsbyjs/gatsby/commit/7563db6))
-
-## [2.2.2](https://github.com/gatsbyjs/gatsby/compare/gatsby-plugin-netlify@2.2.1...gatsby-plugin-netlify@2.2.2) (2020-04-16)
-
-**Note:** Version bump only for package gatsby-plugin-netlify
-
-## [2.2.1](https://github.com/gatsbyjs/gatsby/compare/gatsby-plugin-netlify@2.2.0...gatsby-plugin-netlify@2.2.1) (2020-03-23)
-
-**Note:** Version bump only for package gatsby-plugin-netlify
-
-# [2.2.0](https://github.com/gatsbyjs/gatsby/compare/gatsby-plugin-netlify@2.1.35...gatsby-plugin-netlify@2.2.0) (2020-03-20)
-
-### Features
-
-- **gatsby:** bump node min version to 10.13.0 ([#22400](https://github.com/gatsbyjs/gatsby/issues/22400)) ([83d681a](https://github.com/gatsbyjs/gatsby/commit/83d681a))
-
-## [2.1.35](https://github.com/gatsbyjs/gatsby/compare/gatsby-plugin-netlify@2.1.34...gatsby-plugin-netlify@2.1.35) (2020-03-16)
-
-**Note:** Version bump only for package gatsby-plugin-netlify
-
-## [2.1.34](https://github.com/gatsbyjs/gatsby/compare/gatsby-plugin-netlify@2.1.33...gatsby-plugin-netlify@2.1.34) (2020-03-06)
-
-**Note:** Version bump only for package gatsby-plugin-netlify
-
-## [2.1.33](https://github.com/gatsbyjs/gatsby/compare/gatsby-plugin-netlify@2.1.32...gatsby-plugin-netlify@2.1.33) (2020-02-25)
-
-### Bug Fixes
-
-- **gatsby-plugin-netlify:** add page-data & app-data to preload list ([#21552](https://github.com/gatsbyjs/gatsby/issues/21552)) ([bf3fabd](https://github.com/gatsbyjs/gatsby/commit/bf3fabd))
-
-## [2.1.32](https://github.com/gatsbyjs/gatsby/compare/gatsby-plugin-netlify@2.1.31...gatsby-plugin-netlify@2.1.32) (2020-02-01)
-
-**Note:** Version bump only for package gatsby-plugin-netlify
-
-## [2.1.31](https://github.com/gatsbyjs/gatsby/compare/gatsby-plugin-netlify@2.1.30...gatsby-plugin-netlify@2.1.31) (2020-01-09)
-
-**Note:** Version bump only for package gatsby-plugin-netlify
-
-## [2.1.30](https://github.com/gatsbyjs/gatsby/compare/gatsby-plugin-netlify@2.1.28...gatsby-plugin-netlify@2.1.30) (2019-12-10)
-
-**Note:** Version bump only for package gatsby-plugin-netlify
-
-## [2.1.29](https://github.com/gatsbyjs/gatsby/compare/gatsby-plugin-netlify@2.1.28...gatsby-plugin-netlify@2.1.29) (2019-12-10)
-
-**Note:** Version bump only for package gatsby-plugin-netlify
-
-## [2.1.28](https://github.com/gatsbyjs/gatsby/compare/gatsby-plugin-netlify@2.1.27...gatsby-plugin-netlify@2.1.28) (2019-12-09)
-
-**Note:** Version bump only for package gatsby-plugin-netlify
-
-## [2.1.27](https://github.com/gatsbyjs/gatsby/compare/gatsby-plugin-netlify@2.1.26...gatsby-plugin-netlify@2.1.27) (2019-11-26)
-
-**Note:** Version bump only for package gatsby-plugin-netlify
-
-## [2.1.26](https://github.com/gatsbyjs/gatsby/compare/gatsby-plugin-netlify@2.1.25...gatsby-plugin-netlify@2.1.26) (2019-11-25)
-
-**Note:** Version bump only for package gatsby-plugin-netlify
-
-## [2.1.25](https://github.com/gatsbyjs/gatsby/compare/gatsby-plugin-netlify@2.1.24...gatsby-plugin-netlify@2.1.25) (2019-11-15)
-
-**Note:** Version bump only for package gatsby-plugin-netlify
-
-## [2.1.24](https://github.com/gatsbyjs/gatsby/compare/gatsby-plugin-netlify@2.1.23...gatsby-plugin-netlify@2.1.24) (2019-11-10)
-
-**Note:** Version bump only for package gatsby-plugin-netlify
-
-## [2.1.23](https://github.com/gatsbyjs/gatsby/compare/gatsby-plugin-netlify@2.1.22...gatsby-plugin-netlify@2.1.23) (2019-10-28)
-
-### Bug Fixes
-
-- **gatsby-plugin-netlify:** don't add `/undefined` in generated `_headers` file ([#18925](https://github.com/gatsbyjs/gatsby/issues/18925)) ([d83a5a2](https://github.com/gatsbyjs/gatsby/commit/d83a5a2))
-
-## [2.1.22](https://github.com/gatsbyjs/gatsby/compare/gatsby-plugin-netlify@2.1.21...gatsby-plugin-netlify@2.1.22) (2019-10-16)
-
-### Bug Fixes
-
-- **gatsby-plugin-netlify:** cast `status` to string ([#18726](https://github.com/gatsbyjs/gatsby/issues/18726)) ([3c8623c](https://github.com/gatsbyjs/gatsby/commit/3c8623c))
-
-## [2.1.21](https://github.com/gatsbyjs/gatsby/compare/gatsby-plugin-netlify@2.1.20...gatsby-plugin-netlify@2.1.21) (2019-10-14)
-
-**Note:** Version bump only for package gatsby-plugin-netlify
-
-## [2.1.20](https://github.com/gatsbyjs/gatsby/compare/gatsby-plugin-netlify@2.1.19...gatsby-plugin-netlify@2.1.20) (2019-10-14)
-
-**Note:** Version bump only for package gatsby-plugin-netlify
-
-## [2.1.19](https://github.com/gatsbyjs/gatsby/compare/gatsby-plugin-netlify@2.1.18...gatsby-plugin-netlify@2.1.19) (2019-10-09)
-
-### Bug Fixes
-
-- **gatsby-plugin-netlify:** add warning instead for invalid he… ([#18326](https://github.com/gatsbyjs/gatsby/issues/18326)) ([24ccbfd](https://github.com/gatsbyjs/gatsby/commit/24ccbfd))
-
-## [2.1.18](https://github.com/gatsbyjs/gatsby/compare/gatsby-plugin-netlify@2.1.17...gatsby-plugin-netlify@2.1.18) (2019-10-08)
-
-### Bug Fixes
-
-- **gatsby-plugin-netlify:** fix merging of path headers ([#18203](https://github.com/gatsbyjs/gatsby/issues/18203)) ([5cbb741](https://github.com/gatsbyjs/gatsby/commit/5cbb741))
-
-## [2.1.17](https://github.com/gatsbyjs/gatsby/compare/gatsby-plugin-netlify@2.1.15...gatsby-plugin-netlify@2.1.17) (2019-09-26)
-
-**Note:** Version bump only for package gatsby-plugin-netlify
-
-## [2.1.16](https://github.com/gatsbyjs/gatsby/compare/gatsby-plugin-netlify@2.1.15...gatsby-plugin-netlify@2.1.16) (2019-09-26)
-
-**Note:** Version bump only for package gatsby-plugin-netlify
-
-## [2.1.15](https://github.com/gatsbyjs/gatsby/compare/gatsby-plugin-netlify@2.1.14...gatsby-plugin-netlify@2.1.15) (2019-09-20)
-
-**Note:** Version bump only for package gatsby-plugin-netlify
-
-## [2.1.14](https://github.com/gatsbyjs/gatsby/compare/gatsby-plugin-netlify@2.1.13...gatsby-plugin-netlify@2.1.14) (2019-09-18)
-
-**Note:** Version bump only for package gatsby-plugin-netlify
-
-## [2.1.13](https://github.com/gatsbyjs/gatsby/compare/gatsby-plugin-netlify@2.1.12...gatsby-plugin-netlify@2.1.13) (2019-09-13)
-
-### Bug Fixes
-
-- **gatsby-plugin-netlify:** security headers merging ([#17538](https://github.com/gatsbyjs/gatsby/issues/17538)) ([8420626](https://github.com/gatsbyjs/gatsby/commit/8420626))
-
-## [2.1.12](https://github.com/gatsbyjs/gatsby/compare/gatsby-plugin-netlify@2.1.11...gatsby-plugin-netlify@2.1.12) (2019-09-09)
-
-**Note:** Version bump only for package gatsby-plugin-netlify
-
-## [2.1.11](https://github.com/gatsbyjs/gatsby/compare/gatsby-plugin-netlify@2.1.10...gatsby-plugin-netlify@2.1.11) (2019-09-01)
-
-### Bug Fixes
-
-- update minor updates in packages except react, babel and eslint ([#17254](https://github.com/gatsbyjs/gatsby/issues/17254)) ([252d867](https://github.com/gatsbyjs/gatsby/commit/252d867))
-
-## [2.1.10](https://github.com/gatsbyjs/gatsby/compare/gatsby-plugin-netlify@2.1.9...gatsby-plugin-netlify@2.1.10) (2019-08-24)
-
-### Bug Fixes
-
-- update dependency fs-extra to v8 ([#17031](https://github.com/gatsbyjs/gatsby/issues/17031)) ([d891a19](https://github.com/gatsbyjs/gatsby/commit/d891a19))
-
-## [2.1.9](https://github.com/gatsbyjs/gatsby/compare/gatsby-plugin-netlify@2.1.8...gatsby-plugin-netlify@2.1.9) (2019-08-23)
-
-**Note:** Version bump only for package gatsby-plugin-netlify
-
-## [2.1.8](https://github.com/gatsbyjs/gatsby/compare/gatsby-plugin-netlify@2.1.7...gatsby-plugin-netlify@2.1.8) (2019-08-22)
-
-**Note:** Version bump only for package gatsby-plugin-netlify
-
-## [2.1.7](https://github.com/gatsbyjs/gatsby/compare/gatsby-plugin-netlify@2.1.6...gatsby-plugin-netlify@2.1.7) (2019-08-21)
-
-### Bug Fixes
-
-- update dependency fs-extra to ^4.0.3 ([#16876](https://github.com/gatsbyjs/gatsby/issues/16876)) ([2cc762d](https://github.com/gatsbyjs/gatsby/commit/2cc762d))
-
-## [2.1.6](https://github.com/gatsbyjs/gatsby/compare/gatsby-plugin-netlify@2.1.5...gatsby-plugin-netlify@2.1.6) (2019-08-20)
-
-**Note:** Version bump only for package gatsby-plugin-netlify
-
-## [2.1.5](https://github.com/gatsbyjs/gatsby/compare/gatsby-plugin-netlify@2.1.4...gatsby-plugin-netlify@2.1.5) (2019-08-15)
-
-**Note:** Version bump only for package gatsby-plugin-netlify
-
-## [2.1.4](https://github.com/gatsbyjs/gatsby/compare/gatsby-plugin-netlify@2.1.3...gatsby-plugin-netlify@2.1.4) (2019-08-08)
-
-**Note:** Version bump only for package gatsby-plugin-netlify
-
-## [2.1.3](https://github.com/gatsbyjs/gatsby/compare/gatsby-plugin-netlify@2.1.2...gatsby-plugin-netlify@2.1.3) (2019-07-13)
-
-**Note:** Version bump only for package gatsby-plugin-netlify
-
-## [2.1.2](https://github.com/gatsbyjs/gatsby/compare/gatsby-plugin-netlify@2.1.1...gatsby-plugin-netlify@2.1.2) (2019-07-12)
-
-### Bug Fixes
-
-- correct links in package changelogs ([#15630](https://github.com/gatsbyjs/gatsby/issues/15630)) ([d07b9dd](https://github.com/gatsbyjs/gatsby/commit/d07b9dd))
-
-## [2.1.1](https://github.com/gatsbyjs/gatsby/compare/gatsby-plugin-netlify@2.1.0...gatsby-plugin-netlify@2.1.1) (2019-07-11)
-
-**Note:** Version bump only for package gatsby-plugin-netlify
-
-# [2.1.0](https://github.com/gatsbyjs/gatsby/compare/gatsby-plugin-netlify@2.0.17...gatsby-plugin-netlify@2.1.0) (2019-06-20)
-
-**Note:** Version bump only for package gatsby-plugin-netlify
-
-## [2.0.17](https://github.com/gatsbyjs/gatsby/compare/gatsby-plugin-netlify@2.0.16...gatsby-plugin-netlify@2.0.17) (2019-05-14)
-
-### Features
-
-- **gatsby-plugin-netlify:** Add caching headers for immutable assets ([#14000](https://github.com/gatsbyjs/gatsby/issues/14000)) ([e5a4c3d](https://github.com/gatsbyjs/gatsby/commit/e5a4c3d))
-
-## [2.0.16](https://github.com/gatsbyjs/gatsby/compare/gatsby-plugin-netlify@2.0.15...gatsby-plugin-netlify@2.0.16) (2019-05-01)
-
-**Note:** Version bump only for package gatsby-plugin-netlify
-
-## [2.0.15](https://github.com/gatsbyjs/gatsby/compare/gatsby-plugin-netlify@2.0.14...gatsby-plugin-netlify@2.0.15) (2019-04-23)
-
-### Bug Fixes
-
-- **gatsby-plugin-netlify:** add all .js files from webpack.stats.json to \_headers ([#12521](https://github.com/gatsbyjs/gatsby/issues/12521)) ([983dbd9](https://github.com/gatsbyjs/gatsby/commit/983dbd9)), closes [#9828](https://github.com/gatsbyjs/gatsby/issues/9828)
-
-## [2.0.14](https://github.com/gatsbyjs/gatsby/compare/gatsby-plugin-netlify@2.0.13...gatsby-plugin-netlify@2.0.14) (2019-04-18)
-
-### Bug Fixes
-
-- **gatsby-plugin-netlify:** Add Referrer-Policy to security headers ([#13452](https://github.com/gatsbyjs/gatsby/issues/13452)) ([871923a](https://github.com/gatsbyjs/gatsby/commit/871923a))
-
-## [2.0.13](https://github.com/gatsbyjs/gatsby/compare/gatsby-plugin-netlify@2.0.12...gatsby-plugin-netlify@2.0.13) (2019-03-15)
-
-**Note:** Version bump only for package gatsby-plugin-netlify
-
-## [2.0.12](https://github.com/gatsbyjs/gatsby/compare/gatsby-plugin-netlify@2.0.11...gatsby-plugin-netlify@2.0.12) (2019-03-11)
-
-**Note:** Version bump only for package gatsby-plugin-netlify
-
-## [2.0.11](https://github.com/gatsbyjs/gatsby/compare/gatsby-plugin-netlify@2.0.10...gatsby-plugin-netlify@2.0.11) (2019-02-15)
-
-**Note:** Version bump only for package gatsby-plugin-netlify
-
-## [2.0.10](https://github.com/gatsbyjs/gatsby/compare/gatsby-plugin-netlify@2.0.9...gatsby-plugin-netlify@2.0.10) (2019-02-08)
-
-**Note:** Version bump only for package gatsby-plugin-netlify
-
-## [2.0.9](https://github.com/gatsbyjs/gatsby/compare/gatsby-plugin-netlify@2.0.8...gatsby-plugin-netlify@2.0.9) (2019-02-06)
-
-### Features
-
-- **gatsby-plugin-netlify:** Allow status codes in redirects ([#11255](https://github.com/gatsbyjs/gatsby/issues/11255)) ([#11484](https://github.com/gatsbyjs/gatsby/issues/11484)) ([024f6f4](https://github.com/gatsbyjs/gatsby/commit/024f6f4))
-
-## [2.0.8](https://github.com/gatsbyjs/gatsby/compare/gatsby-plugin-netlify@2.0.7...gatsby-plugin-netlify@2.0.8) (2019-02-01)
-
-**Note:** Version bump only for package gatsby-plugin-netlify
-
-## [2.0.7](https://github.com/gatsbyjs/gatsby/compare/gatsby-plugin-netlify@2.0.6...gatsby-plugin-netlify@2.0.7) (2019-01-25)
-
-**Note:** Version bump only for package gatsby-plugin-netlify
-
-<a name="2.0.6"></a>
-
-## [2.0.6](https://github.com/gatsbyjs/gatsby/compare/gatsby-plugin-netlify@2.0.5...gatsby-plugin-netlify@2.0.6) (2018-11-29)
-
-**Note:** Version bump only for package gatsby-plugin-netlify
-
-<a name="2.0.5"></a>
-
-## [2.0.5](https://github.com/gatsbyjs/gatsby/compare/gatsby-plugin-netlify@2.0.4...gatsby-plugin-netlify@2.0.5) (2018-11-15)
-
-### Bug Fixes
-
-- **gatsby-plugin-netlify:** do not cache service worker file on Netlify ([#9680](https://github.com/gatsbyjs/gatsby/issues/9680)) ([9280fd7](https://github.com/gatsbyjs/gatsby/commit/9280fd7)), closes [/www.netlify.com/blog/2018/06/28/5-pro-tips-and-plugins-for-optimizing-your-gatsby---netlify-site/#4](https://github.com/gatsbyjs/gatsby/issues/4)
-
-<a name="2.0.4"></a>
-
-## [2.0.4](https://github.com/gatsbyjs/gatsby/compare/gatsby-plugin-netlify@2.0.3...gatsby-plugin-netlify@2.0.4) (2018-11-08)
-
-**Note:** Version bump only for package gatsby-plugin-netlify
-
-<a name="2.0.3"></a>
-
-## [2.0.3](https://github.com/gatsbyjs/gatsby/compare/gatsby-plugin-netlify@2.0.2...gatsby-plugin-netlify@2.0.3) (2018-10-29)
-
-**Note:** Version bump only for package gatsby-plugin-netlify
-
-<a name="2.0.2"></a>
-
-## [2.0.2](https://github.com/gatsbyjs/gatsby/compare/gatsby-plugin-netlify@2.0.1...gatsby-plugin-netlify@2.0.2) (2018-10-23)
-
-### Bug Fixes
-
-- **gatsby-plugin-netlify:** Broken links updated ([#9286](https://github.com/gatsbyjs/gatsby/issues/9286)) ([21830b4](https://github.com/gatsbyjs/gatsby/commit/21830b4))
-
-<a name="2.0.1"></a>
-
-## [2.0.1](https://github.com/gatsbyjs/gatsby/compare/gatsby-plugin-netlify@2.0.0...gatsby-plugin-netlify@2.0.1) (2018-10-02)
-
-### Features
-
-- **gatsby-plugin-netlify:** add force option to createRedirect ([#8521](https://github.com/gatsbyjs/gatsby/issues/8521)) ([e1d354e](https://github.com/gatsbyjs/gatsby/commit/e1d354e))
-
-<a name="2.0.0"></a>
-
-# [2.0.0](https://github.com/gatsbyjs/gatsby/compare/gatsby-plugin-netlify@2.0.0-rc.6...gatsby-plugin-netlify@2.0.0) (2018-09-17)
-
-**Note:** Version bump only for package gatsby-plugin-netlify
-
-<a name="2.0.0-rc.6"></a>
-
-# [2.0.0-rc.6](https://github.com/gatsbyjs/gatsby/compare/gatsby-plugin-netlify@2.0.0-rc.5...gatsby-plugin-netlify@2.0.0-rc.6) (2018-09-11)
-
-**Note:** Version bump only for package gatsby-plugin-netlify
-
-<a name="2.0.0-rc.5"></a>
-
-# [2.0.0-rc.5](https://github.com/gatsbyjs/gatsby/compare/gatsby-plugin-netlify@2.0.0-rc.4...gatsby-plugin-netlify@2.0.0-rc.5) (2018-09-11)
-
-**Note:** Version bump only for package gatsby-plugin-netlify
-
-<a name="2.0.0-rc.4"></a>
-
-# [2.0.0-rc.4](https://github.com/gatsbyjs/gatsby/compare/gatsby-plugin-netlify@2.0.0-rc.3...gatsby-plugin-netlify@2.0.0-rc.4) (2018-09-11)
-
-**Note:** Version bump only for package gatsby-plugin-netlify
-
-<a name="2.0.0-rc.3"></a>
-
-# [2.0.0-rc.3](https://github.com/gatsbyjs/gatsby/compare/gatsby-plugin-netlify@2.0.0-rc.2...gatsby-plugin-netlify@2.0.0-rc.3) (2018-09-11)
-
-**Note:** Version bump only for package gatsby-plugin-netlify
-
-<a name="2.0.0-rc.2"></a>
-
-# [2.0.0-rc.2](https://github.com/gatsbyjs/gatsby/compare/gatsby-plugin-netlify@2.0.0-rc.1...gatsby-plugin-netlify@2.0.0-rc.2) (2018-09-05)
-
-**Note:** Version bump only for package gatsby-plugin-netlify
-
-<a name="2.0.0-rc.1"></a>
-
-# [2.0.0-rc.1](https://github.com/gatsbyjs/gatsby/compare/gatsby-plugin-netlify@2.0.0-rc.0...gatsby-plugin-netlify@2.0.0-rc.1) (2018-08-29)
-
-**Note:** Version bump only for package gatsby-plugin-netlify
-
-<a name="2.0.0-rc.0"></a>
-
-# [2.0.0-rc.0](https://github.com/gatsbyjs/gatsby/compare/gatsby-plugin-netlify@2.0.0-beta.6...gatsby-plugin-netlify@2.0.0-rc.0) (2018-08-21)
-
-**Note:** Version bump only for package gatsby-plugin-netlify
-
-<a name="2.0.0-beta.6"></a>
-
-# [2.0.0-beta.6](https://github.com/gatsbyjs/gatsby/compare/gatsby-plugin-netlify@2.0.0-beta.5...gatsby-plugin-netlify@2.0.0-beta.6) (2018-08-08)
-
-**Note:** Version bump only for package gatsby-plugin-netlify
-
-<a name="2.0.0-beta.5"></a>
-
-# [2.0.0-beta.5](https://github.com/gatsbyjs/gatsby/compare/gatsby-plugin-netlify@2.0.0-beta.4...gatsby-plugin-netlify@2.0.0-beta.5) (2018-08-02)
-
-**Note:** Version bump only for package gatsby-plugin-netlify
-
-<a name="2.0.0-beta.4"></a>
-
-# [2.0.0-beta.4](https://github.com/gatsbyjs/gatsby/compare/gatsby-plugin-netlify@2.0.0-beta.3...gatsby-plugin-netlify@2.0.0-beta.4) (2018-07-21)
-
-**Note:** Version bump only for package gatsby-plugin-netlify
-
-<a name="2.0.0-beta.3"></a>
-
-# [2.0.0-beta.3](https://github.com/gatsbyjs/gatsby/compare/gatsby-plugin-netlify@2.0.0-beta.2...gatsby-plugin-netlify@2.0.0-beta.3) (2018-07-11)
-
-**Note:** Version bump only for package gatsby-plugin-netlify
-
-<a name="2.0.0-beta.2"></a>
-
-# [2.0.0-beta.2](https://github.com/gatsbyjs/gatsby/compare/gatsby-plugin-netlify@2.0.0-beta.1...gatsby-plugin-netlify@2.0.0-beta.2) (2018-06-20)
-
-**Note:** Version bump only for package gatsby-plugin-netlify
-
-<a name="2.0.0-beta.1"></a>
-
-# [2.0.0-beta.1](https://github.com/gatsbyjs/gatsby/compare/gatsby-plugin-netlify@2.0.0-beta.0...gatsby-plugin-netlify@2.0.0-beta.1) (2018-06-17)
-
-**Note:** Version bump only for package gatsby-plugin-netlify
-
-<a name="2.0.0-beta.0"></a>
-
-# [2.0.0-beta.0](https://github.com/gatsbyjs/gatsby/compare/gatsby-plugin-netlify@1.0.21...gatsby-plugin-netlify@2.0.0-beta.0) (2018-06-17)
-
-**Note:** Version bump only for package gatsby-plugin-netlify
diff --git a/packages/gatsby-plugin-netlify/README.md b/packages/gatsby-plugin-netlify/README.md
deleted file mode 100644
index 5d065bf7d5908..0000000000000
--- a/packages/gatsby-plugin-netlify/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# gatsby-plugin-netlify
-
-Hey there 👋, gatsby-plugin-netlify has a new home. Go to https://github.com/netlify/gatsby-plugin-netlify to find the latest source code.
diff --git a/packages/gatsby-plugin-offline/package.json b/packages/gatsby-plugin-offline/package.json
index cc6bb1792bb74..1a7902a2f4d53 100644
--- a/packages/gatsby-plugin-offline/package.json
+++ b/packages/gatsby-plugin-offline/package.json
@@ -1,7 +1,7 @@
 {
   "name": "gatsby-plugin-offline",
   "description": "Gatsby plugin which sets up a site to be able to run offline",
-  "version": "5.20.0-next.0",
+  "version": "5.20.0-next.2",
   "author": "Kyle Mathews <mathews.kyle@gmail.com>",
   "bugs": {
     "url": "https://github.com/gatsbyjs/gatsby/issues"
@@ -21,7 +21,7 @@
     "babel-preset-gatsby-package": "^2.20.0-next.0",
     "cpy-cli": "^3.1.1",
     "cross-env": "^7.0.3",
-    "gatsby-plugin-utils": "^3.14.0-next.0",
+    "gatsby-plugin-utils": "^3.14.0-next.2",
     "rewire": "^6.0.0"
   },
   "homepage": "https://github.com/gatsbyjs/gatsby/tree/master/packages/gatsby-plugin-offline#readme",
diff --git a/packages/gatsby-plugin-page-creator/package.json b/packages/gatsby-plugin-page-creator/package.json
index 8dd2cc64367f5..3a332f547e458 100644
--- a/packages/gatsby-plugin-page-creator/package.json
+++ b/packages/gatsby-plugin-page-creator/package.json
@@ -1,6 +1,6 @@
 {
   "name": "gatsby-plugin-page-creator",
-  "version": "4.20.0-next.0",
+  "version": "4.20.0-next.2",
   "description": "Gatsby plugin that automatically creates pages from React components in specified directories",
   "main": "index.js",
   "scripts": {
@@ -29,9 +29,10 @@
     "@sindresorhus/slugify": "^1.1.2",
     "chokidar": "^3.5.3",
     "fs-exists-cached": "^1.0.0",
+    "fs-extra": "^10.1.0",
     "gatsby-core-utils": "^3.20.0-next.0",
     "gatsby-page-utils": "^2.20.0-next.0",
-    "gatsby-plugin-utils": "^3.14.0-next.0",
+    "gatsby-plugin-utils": "^3.14.0-next.2",
     "gatsby-telemetry": "^3.20.0-next.0",
     "globby": "^11.1.0",
     "lodash": "^4.17.21"
diff --git a/packages/gatsby-plugin-sass/package.json b/packages/gatsby-plugin-sass/package.json
index 6d441e0bc115d..7a4c293b6f66c 100644
--- a/packages/gatsby-plugin-sass/package.json
+++ b/packages/gatsby-plugin-sass/package.json
@@ -1,7 +1,7 @@
 {
   "name": "gatsby-plugin-sass",
   "description": "Gatsby plugin to handle SCSS/Sass files",
-  "version": "5.20.0-next.1",
+  "version": "5.20.0-next.3",
   "author": "Daniel Farrell <daniel@mobelux.com>",
   "bugs": {
     "url": "https://github.com/gatsbyjs/gatsby/issues"
@@ -17,7 +17,7 @@
     "autoprefixer": "^10.4.7",
     "babel-preset-gatsby-package": "^2.20.0-next.0",
     "cross-env": "^7.0.3",
-    "gatsby-plugin-utils": "^3.14.0-next.0"
+    "gatsby-plugin-utils": "^3.14.0-next.2"
   },
   "homepage": "https://github.com/gatsbyjs/gatsby/tree/master/packages/gatsby-plugin-sass#readme",
   "keywords": [
diff --git a/packages/gatsby-plugin-sharp/package.json b/packages/gatsby-plugin-sharp/package.json
index 63720a943d855..3598ba433d834 100644
--- a/packages/gatsby-plugin-sharp/package.json
+++ b/packages/gatsby-plugin-sharp/package.json
@@ -1,7 +1,7 @@
 {
   "name": "gatsby-plugin-sharp",
   "description": "Wrapper of the Sharp image manipulation library for Gatsby plugins",
-  "version": "4.20.0-next.1",
+  "version": "4.20.0-next.3",
   "author": "Kyle Mathews <mathews.kyle@gmail.com>",
   "bugs": {
     "url": "https://github.com/gatsbyjs/gatsby/issues"
@@ -15,7 +15,7 @@
     "filenamify": "^4.3.0",
     "fs-extra": "^10.1.0",
     "gatsby-core-utils": "^3.20.0-next.0",
-    "gatsby-plugin-utils": "^3.14.0-next.0",
+    "gatsby-plugin-utils": "^3.14.0-next.2",
     "gatsby-telemetry": "^3.20.0-next.0",
     "got": "^11.8.5",
     "lodash": "^4.17.21",
@@ -32,7 +32,7 @@
     "@types/sharp": "^0.30.0",
     "babel-preset-gatsby-package": "^2.20.0-next.0",
     "cross-env": "^7.0.3",
-    "gatsby-plugin-image": "^2.20.0-next.1"
+    "gatsby-plugin-image": "^2.20.0-next.3"
   },
   "homepage": "https://github.com/gatsbyjs/gatsby/tree/master/packages/gatsby-plugin-sharp#readme",
   "keywords": [
diff --git a/packages/gatsby-plugin-sharp/src/__tests__/images/wide-aspect-ratio.png b/packages/gatsby-plugin-sharp/src/__tests__/images/wide-aspect-ratio.png
new file mode 100644
index 0000000000000..c63a28149ffab
Binary files /dev/null and b/packages/gatsby-plugin-sharp/src/__tests__/images/wide-aspect-ratio.png differ
diff --git a/packages/gatsby-plugin-sharp/src/__tests__/index.js b/packages/gatsby-plugin-sharp/src/__tests__/index.js
index 7f8400615b81d..e0713939fa4d2 100644
--- a/packages/gatsby-plugin-sharp/src/__tests__/index.js
+++ b/packages/gatsby-plugin-sharp/src/__tests__/index.js
@@ -549,6 +549,20 @@ describe(`gatsby-plugin-sharp`, () => {
         }
       `)
     })
+
+    it(`handles really wide aspect ratios for blurred placeholder`, async () => {
+      const result = await base64({
+        file: getFileObject(
+          path.join(__dirname, `images/wide-aspect-ratio.png`),
+          `wide-aspect-ratio`,
+          `1000x10`
+        ),
+        args,
+      })
+
+      expect(result.width).toEqual(20)
+      expect(result.height).toEqual(1)
+    })
   })
 
   describe(`tracedSVG`, () => {
diff --git a/packages/gatsby-plugin-sharp/src/image-data.ts b/packages/gatsby-plugin-sharp/src/image-data.ts
index 01b3e454e778f..5b6de4cf2e1d3 100644
--- a/packages/gatsby-plugin-sharp/src/image-data.ts
+++ b/packages/gatsby-plugin-sharp/src/image-data.ts
@@ -375,7 +375,10 @@ export async function generateImageData({
         ...options,
         toFormatBase64: args.blurredOptions?.toFormat,
         width: placeholderWidth,
-        height: Math.round(placeholderWidth / imageSizes.aspectRatio),
+        height: Math.max(
+          1,
+          Math.round(placeholderWidth / imageSizes.aspectRatio)
+        ),
       },
       reporter,
     })
diff --git a/packages/gatsby-plugin-sitemap/package.json b/packages/gatsby-plugin-sitemap/package.json
index 22c4b302df647..a210137d44be7 100644
--- a/packages/gatsby-plugin-sitemap/package.json
+++ b/packages/gatsby-plugin-sitemap/package.json
@@ -1,7 +1,7 @@
 {
   "name": "gatsby-plugin-sitemap",
   "description": "Gatsby plugin that automatically creates a sitemap for your site",
-  "version": "5.20.0-next.0",
+  "version": "5.20.0-next.2",
   "contributors": [
     "Alex Moon <alex.jared.moon@gmail.com>",
     "Nicholas Young <nicholas@nicholaswyoung.com>"
@@ -20,7 +20,7 @@
     "@babel/core": "^7.15.5",
     "babel-preset-gatsby-package": "^2.20.0-next.0",
     "cross-env": "^7.0.3",
-    "gatsby-plugin-utils": "^3.14.0-next.0"
+    "gatsby-plugin-utils": "^3.14.0-next.2"
   },
   "homepage": "https://github.com/gatsbyjs/gatsby/tree/master/packages/gatsby-plugin-sitemap#readme",
   "keywords": [
diff --git a/packages/gatsby-plugin-twitter/package.json b/packages/gatsby-plugin-twitter/package.json
index 93cc8f4d3c530..15740717d5644 100644
--- a/packages/gatsby-plugin-twitter/package.json
+++ b/packages/gatsby-plugin-twitter/package.json
@@ -1,7 +1,7 @@
 {
   "name": "gatsby-plugin-twitter",
   "description": "Loads the Twitter JavaScript for embedding tweets.",
-  "version": "4.20.0-next.0",
+  "version": "4.20.0-next.2",
   "author": "Kyle Mathews <mathews.kyle@gmail.com>",
   "bugs": {
     "url": "https://github.com/gatsbyjs/gatsby/issues"
@@ -14,7 +14,7 @@
     "@babel/core": "^7.15.5",
     "babel-preset-gatsby-package": "^2.20.0-next.0",
     "cross-env": "^7.0.3",
-    "gatsby-plugin-utils": "^3.14.0-next.0"
+    "gatsby-plugin-utils": "^3.14.0-next.2"
   },
   "homepage": "https://github.com/gatsbyjs/gatsby/tree/master/packages/gatsby-plugin-twitter#readme",
   "keywords": [
diff --git a/packages/gatsby-plugin-typescript/package.json b/packages/gatsby-plugin-typescript/package.json
index a9caf84b3a7d1..bef297d15fd55 100644
--- a/packages/gatsby-plugin-typescript/package.json
+++ b/packages/gatsby-plugin-typescript/package.json
@@ -1,7 +1,7 @@
 {
   "name": "gatsby-plugin-typescript",
   "description": "Adds TypeScript support to Gatsby",
-  "version": "4.20.0-next.0",
+  "version": "4.20.0-next.1",
   "author": "Kyle Mathews <mathews.kyle@gmail.com>",
   "bugs": {
     "url": "https://github.com/gatsbyjs/gatsby/issues"
@@ -16,7 +16,7 @@
     "@babel/plugin-proposal-optional-chaining": "^7.14.5",
     "@babel/preset-typescript": "^7.15.0",
     "@babel/runtime": "^7.15.4",
-    "babel-plugin-remove-graphql-queries": "^4.20.0-next.0"
+    "babel-plugin-remove-graphql-queries": "^4.20.0-next.1"
   },
   "devDependencies": {
     "@babel/cli": "^7.15.4",
diff --git a/packages/gatsby-plugin-utils/package.json b/packages/gatsby-plugin-utils/package.json
index 3ec86f86cdee9..0e0d8c98a8974 100644
--- a/packages/gatsby-plugin-utils/package.json
+++ b/packages/gatsby-plugin-utils/package.json
@@ -1,6 +1,6 @@
 {
   "name": "gatsby-plugin-utils",
-  "version": "3.14.0-next.0",
+  "version": "3.14.0-next.2",
   "description": "Gatsby utils that help creating plugins",
   "main": "dist/index.js",
   "exports": {
@@ -48,6 +48,7 @@
   "dependencies": {
     "@babel/runtime": "^7.15.4",
     "@gatsbyjs/potrace": "^2.2.0",
+    "fastq": "^1.13.0",
     "fs-extra": "^10.1.0",
     "gatsby-core-utils": "^3.20.0-next.0",
     "gatsby-sharp": "^0.14.0-next.0",
@@ -68,7 +69,8 @@
     "typescript": "^4.7.2"
   },
   "peerDependencies": {
-    "gatsby": "^4.0.0-next"
+    "gatsby": "^4.0.0-next",
+    "graphql": "^15.0.0"
   },
   "files": [
     "dist/"
diff --git a/packages/gatsby-remark-autolink-headers/package.json b/packages/gatsby-remark-autolink-headers/package.json
index 79a3fe0a502ff..7a9789f0087e3 100644
--- a/packages/gatsby-remark-autolink-headers/package.json
+++ b/packages/gatsby-remark-autolink-headers/package.json
@@ -1,7 +1,7 @@
 {
   "name": "gatsby-remark-autolink-headers",
   "description": "Gatsby plugin to autolink headers in markdown processed by Remark",
-  "version": "5.20.0-next.0",
+  "version": "5.20.0-next.2",
   "author": "Kyle Mathews <mathews.kyle@gmail.com>",
   "bugs": {
     "url": "https://github.com/gatsbyjs/gatsby/issues"
@@ -18,7 +18,7 @@
     "@babel/core": "^7.15.5",
     "babel-preset-gatsby-package": "^2.20.0-next.0",
     "cross-env": "^7.0.3",
-    "gatsby-plugin-utils": "^3.14.0-next.0"
+    "gatsby-plugin-utils": "^3.14.0-next.2"
   },
   "homepage": "https://github.com/gatsbyjs/gatsby/tree/master/packages/gatsby-remark-autolink-headers#readme",
   "keywords": [
diff --git a/packages/gatsby-remark-images/package.json b/packages/gatsby-remark-images/package.json
index dd2aee28c03b2..63d2d87cd2d00 100644
--- a/packages/gatsby-remark-images/package.json
+++ b/packages/gatsby-remark-images/package.json
@@ -1,7 +1,7 @@
 {
   "name": "gatsby-remark-images",
   "description": "Processes images in markdown so they can be used in the production build.",
-  "version": "6.20.0-next.0",
+  "version": "6.20.0-next.2",
   "author": "Kyle Mathews <mathews.kyle@gmail.com>",
   "bugs": {
     "url": "https://github.com/gatsbyjs/gatsby/issues"
@@ -24,7 +24,7 @@
     "@babel/core": "^7.15.5",
     "babel-preset-gatsby-package": "^2.20.0-next.0",
     "cross-env": "^7.0.3",
-    "gatsby-plugin-utils": "^3.14.0-next.0",
+    "gatsby-plugin-utils": "^3.14.0-next.2",
     "hast-util-to-html": "^7.1.3",
     "mdast-util-to-hast": "^10.2.0"
   },
diff --git a/packages/gatsby-source-contentful/package.json b/packages/gatsby-source-contentful/package.json
index 61d3315b2f214..e8785966fab36 100644
--- a/packages/gatsby-source-contentful/package.json
+++ b/packages/gatsby-source-contentful/package.json
@@ -1,7 +1,7 @@
 {
   "name": "gatsby-source-contentful",
   "description": "Gatsby source plugin for building websites using the Contentful CMS as a data source",
-  "version": "7.18.0-next.1",
+  "version": "7.18.0-next.4",
   "author": "Marcus Ericsson <mericsson@gmail.com> (mericsson.com)",
   "bugs": {
     "url": "https://github.com/gatsbyjs/gatsby/issues"
@@ -12,20 +12,17 @@
     "@contentful/rich-text-types": "^15.12.1",
     "@hapi/joi": "^15.1.1",
     "@vercel/fetch-retry": "^5.1.3",
-    "axios": "^0.21.1",
     "chalk": "^4.1.2",
     "common-tags": "^1.8.2",
-    "contentful": "^8.5.8",
+    "contentful": "^9.1.33",
     "fs-extra": "^10.1.0",
     "gatsby-core-utils": "^3.20.0-next.0",
-    "gatsby-plugin-utils": "^3.14.0-next.0",
+    "gatsby-plugin-utils": "^3.14.0-next.2",
     "gatsby-source-filesystem": "^4.20.0-next.0",
     "is-online": "^8.5.1",
     "json-stringify-safe": "^5.0.1",
     "lodash": "^4.17.21",
     "node-fetch": "^2.6.7",
-    "p-queue": "^6.6.2",
-    "retry-axios": "^2.6.0",
     "semver": "^7.3.7",
     "url": "^0.11.0"
   },
diff --git a/packages/gatsby-source-contentful/src/__tests__/fetch-network-errors.js b/packages/gatsby-source-contentful/src/__tests__/fetch-network-errors.js
index d629c5966cbce..623402d38d2fb 100644
--- a/packages/gatsby-source-contentful/src/__tests__/fetch-network-errors.js
+++ b/packages/gatsby-source-contentful/src/__tests__/fetch-network-errors.js
@@ -108,13 +108,11 @@ describe(`fetch-retry`, () => {
       const msg = expect(e.context.sourceMessage)
       msg.toEqual(
         expect.stringContaining(
-          `Fetching contentful data failed: 500 MockedContentfulError`
+          `Fetching contentful data failed: ERR_BAD_RESPONSE 500 MockedContentfulError`
         )
       )
       msg.toEqual(expect.stringContaining(`Request ID: 123abc`))
-      msg.toEqual(
-        expect.stringContaining(`The request was sent with 3 attempts`)
-      )
+      msg.toEqual(expect.stringContaining(`Attempts: 3`))
     }
     expect(reporter.panic).toBeCalled()
     expect(scope.isDone()).toBeTruthy()
@@ -149,34 +147,6 @@ describe(`fetch-network-errors`, () => {
     expect(scope.isDone()).toBeTruthy()
   })
 
-  test(`catches error with response string`, async () => {
-    const scope = nock(baseURI)
-      // Space
-      .get(`/spaces/${options.spaceId}/`)
-      .reply(502, `Bad Gateway`)
-
-    try {
-      await fetchContent({
-        pluginConfig: createPluginConfig({
-          ...options,
-          contentfulClientConfig: { retryOnError: false },
-        }),
-        reporter,
-        syncToken: null,
-      })
-      throw new Error(`fetchContent should throw an error`)
-    } catch (e) {
-      expect(e.context.sourceMessage).toEqual(
-        expect.stringContaining(
-          `Accessing your Contentful space failed: Bad Gateway`
-        )
-      )
-    }
-
-    expect(reporter.panic).toBeCalled()
-    expect(scope.isDone()).toBeTruthy()
-  })
-
   test(`catches error with response object`, async () => {
     const scope = nock(baseURI)
       // Space
diff --git a/packages/gatsby-source-contentful/src/fetch.js b/packages/gatsby-source-contentful/src/fetch.js
index 209153198fefa..d38dba1ebbee4 100644
--- a/packages/gatsby-source-contentful/src/fetch.js
+++ b/packages/gatsby-source-contentful/src/fetch.js
@@ -9,68 +9,90 @@ import { CODES } from "./report"
  * Generate a user friendly error message.
  *
  * Contentful's API has its own error message structure, which might change depending of internal server or authentification errors.
- *
- * Additionally the SDK strips the error object, sometimes:
- * https://github.com/contentful/contentful.js/blob/b67b77ac8c919c4ec39203f8cac2043854ab0014/lib/create-contentful-api.js#L89-L99
- *
- * This code tries to work around this.
  */
 const createContentfulErrorMessage = e => {
-  if (typeof e === `string`) {
-    return e
-  }
-  // If we got a response, it is very likely that it is a Contentful API error.
-  if (e.response) {
-    let parsedContentfulErrorData = null
+  // Handle axios error messages
+  if (e.isAxiosError) {
+    const axiosErrorMessage = [e.code, e.status]
+    const axiosErrorDetails = []
 
-    // Parse JSON response data, and add it to the object.
-    if (typeof e.response.data === `string`) {
-      try {
-        parsedContentfulErrorData = JSON.parse(e.response.data)
-      } catch (err) {
-        e.message = e.response.data
+    if (e.response) {
+      axiosErrorMessage.push(e.response.status)
+
+      // Parse Contentful API error data
+      if (e.response?.data) {
+        axiosErrorMessage.push(e.response.data.sys?.id, e.response.data.message)
+      }
+
+      // Get request ID from headers
+      const requestId =
+        e.response.headers &&
+        typeof e.response.headers === `object` &&
+        e.response.headers[`x-contentful-request-id`]
+
+      if (requestId) {
+        axiosErrorDetails.push(`Request ID: ${requestId}`)
       }
-      // If response data was parsed already, just add it.
-    } else if (typeof e.response.data === `object`) {
-      parsedContentfulErrorData = e.response.data
     }
 
-    e = { ...e, ...e.response, ...parsedContentfulErrorData }
-  }
+    if (e.attempts) {
+      axiosErrorDetails.push(`Attempts: ${e.attempts}`)
+    }
 
-  let errorMessage = [
-    // Generic error values
-    e.code && String(e.code),
-    e.status && String(e.status),
-    e.statusText,
-    // Contentful API error response values
-    e.sys?.id,
-  ]
-    .filter(Boolean)
-    .join(` `)
-
-  // Add message if it exists. Usually error default or Contentful's error message
-  if (e.message) {
-    errorMessage += `\n\n${e.message}`
-  }
+    if (axiosErrorDetails.length) {
+      axiosErrorMessage.push(
+        `\n\n---\n${axiosErrorDetails.join(`\n\n`)}\n\n---\n`
+      )
+    }
 
-  // Get request ID from headers or Contentful's error data
-  const requestId =
-    (e.headers &&
-      typeof e.headers === `object` &&
-      e.headers[`x-contentful-request-id`]) ||
-    e.requestId
+    return axiosErrorMessage.filter(Boolean).join(` `)
+  }
 
-  if (requestId) {
-    errorMessage += `\n\nRequest ID: ${requestId}`
+  // If it is not an axios error, we assume that we got a Contentful SDK error and try to parse it
+  const errorMessage = [e.name]
+  const errorDetails = []
+  try {
+    /**
+     * Parse stringified error data from message
+     * https://github.com/contentful/contentful-sdk-core/blob/4cfcd452ba0752237a26ce6b79d72a50af84d84e/src/error-handler.ts#L71-L75
+     *
+     * @todo properly type this with TS
+     * type {
+     *    status?: number
+     *    statusText?: string
+     *    requestId?: string
+     *    message: string
+     *    !details: Record<string, unknown>
+     *    !request?: Record<string, unknown>
+     *  }
+     */
+    const errorData = JSON.parse(e.message)
+    errorMessage.push(errorData.status && String(errorData.status))
+    errorMessage.push(errorData.statusText)
+    errorMessage.push(errorData.message)
+    if (errorData.requestId) {
+      errorDetails.push(`Request ID: ${errorData.requestId}`)
+    }
+    if (errorData.request) {
+      errorDetails.push(
+        `Request:\n${JSON.stringify(errorData.request, null, 2)}`
+      )
+    }
+    if (errorData.details && Object.keys(errorData.details).length) {
+      errorDetails.push(
+        `Details:\n${JSON.stringify(errorData.details, null, 2)}`
+      )
+    }
+  } catch (err) {
+    // If we can't parse it, we assume its a human readable string
+    errorMessage.push(e.message)
   }
 
-  // Tell the user about how many request attempts Contentful SDK made
-  if (e.attempts) {
-    errorMessage += `\n\nThe request was sent with ${e.attempts} attempts`
+  if (errorDetails.length) {
+    errorMessage.push(`\n\n---\n${errorDetails.join(`\n\n`)}\n\n---\n`)
   }
 
-  return errorMessage
+  return errorMessage.filter(Boolean).join(` `)
 }
 
 function createContentfulClientOptions({
diff --git a/packages/gatsby-source-drupal/package.json b/packages/gatsby-source-drupal/package.json
index 5faf08dc55d2f..21e1f2bcdf588 100644
--- a/packages/gatsby-source-drupal/package.json
+++ b/packages/gatsby-source-drupal/package.json
@@ -1,7 +1,7 @@
 {
   "name": "gatsby-source-drupal",
   "description": "Gatsby source plugin for building websites using the Drupal CMS as a data source",
-  "version": "5.21.0-next.1",
+  "version": "5.21.0-next.3",
   "author": "Kyle Mathews <mathews.kyle@gmail.com>",
   "bugs": {
     "url": "https://github.com/gatsbyjs/gatsby/issues"
@@ -13,7 +13,7 @@
     "bluebird": "^3.7.2",
     "body-parser": "^1.20.0",
     "fastq": "^1.13.0",
-    "gatsby-plugin-utils": "^3.14.0-next.0",
+    "gatsby-plugin-utils": "^3.14.0-next.2",
     "gatsby-source-filesystem": "^4.20.0-next.0",
     "got": "^11.8.5",
     "http2-wrapper": "^2.1.11",
diff --git a/packages/gatsby-source-shopify/package.json b/packages/gatsby-source-shopify/package.json
index 6dfd5228d38de..3313cdb60542f 100644
--- a/packages/gatsby-source-shopify/package.json
+++ b/packages/gatsby-source-shopify/package.json
@@ -1,6 +1,6 @@
 {
   "name": "gatsby-source-shopify",
-  "version": "7.9.0-next.1",
+  "version": "7.9.0-next.3",
   "description": "Gatsby source plugin for building websites using Shopify as a data source.",
   "scripts": {
     "watch": "tsc-watch --outDir .",
@@ -25,7 +25,7 @@
   "dependencies": {
     "@babel/runtime": "^7.15.4",
     "gatsby-core-utils": "^3.20.0-next.0",
-    "gatsby-plugin-utils": "^3.14.0-next.0",
+    "gatsby-plugin-utils": "^3.14.0-next.2",
     "gatsby-source-filesystem": "^4.20.0-next.0",
     "node-fetch": "^2.6.7",
     "sharp": "^0.30.3",
@@ -36,7 +36,7 @@
     "@types/node-fetch": "^2.5.12",
     "@types/sharp": "^0.30.0",
     "cross-env": "^7.0.3",
-    "gatsby-plugin-image": "^2.20.0-next.1",
+    "gatsby-plugin-image": "^2.20.0-next.3",
     "msw": "^0.38.2",
     "prettier": "^2.7.1",
     "prettier-check": "^2.0.0",
diff --git a/packages/gatsby-source-wordpress/package.json b/packages/gatsby-source-wordpress/package.json
index 65c8c8c7fbd0b..427c487fb471c 100644
--- a/packages/gatsby-source-wordpress/package.json
+++ b/packages/gatsby-source-wordpress/package.json
@@ -2,7 +2,7 @@
   "name": "gatsby-source-wordpress",
   "description": "Source data from WordPress in an efficient and scalable way.",
   "author": "Tyler Barnes <tylerdbarnes@gmail.com>",
-  "version": "6.20.0-next.1",
+  "version": "6.20.0-next.3",
   "bugs": {
     "url": "https://github.com/gatsbyjs/gatsby/issues"
   },
@@ -29,7 +29,7 @@
     "fs-extra": "^10.1.0",
     "gatsby-core-utils": "^3.20.0-next.0",
     "gatsby-plugin-catch-links": "^4.20.0-next.0",
-    "gatsby-plugin-utils": "^3.14.0-next.0",
+    "gatsby-plugin-utils": "^3.14.0-next.2",
     "gatsby-source-filesystem": "^4.20.0-next.0",
     "glob": "^7.2.3",
     "got": "^11.8.5",
@@ -56,7 +56,7 @@
     "babel-preset-gatsby": "^2.20.0-next.0",
     "babel-preset-gatsby-package": "^2.20.0-next.0",
     "cross-env": "^7.0.3",
-    "gatsby-plugin-image": "^2.20.0-next.1",
+    "gatsby-plugin-image": "^2.20.0-next.3",
     "identity-obj-proxy": "^3.0.0",
     "react-test-renderer": "^16.14.0",
     "rimraf": "^3.0.2",
diff --git a/packages/gatsby-transformer-remark/package.json b/packages/gatsby-transformer-remark/package.json
index 247d82e317832..489aa202d51cf 100644
--- a/packages/gatsby-transformer-remark/package.json
+++ b/packages/gatsby-transformer-remark/package.json
@@ -1,7 +1,7 @@
 {
   "name": "gatsby-transformer-remark",
   "description": "Gatsby transformer plugin for Markdown using the Remark library and ecosystem",
-  "version": "5.20.0-next.0",
+  "version": "5.20.0-next.2",
   "author": "Kyle Mathews <mathews.kyle@gmail.com>",
   "bugs": {
     "url": "https://github.com/gatsbyjs/gatsby/issues"
@@ -35,7 +35,7 @@
     "@babel/core": "^7.15.5",
     "babel-preset-gatsby-package": "^2.20.0-next.0",
     "cross-env": "^7.0.3",
-    "gatsby-plugin-utils": "^3.14.0-next.0"
+    "gatsby-plugin-utils": "^3.14.0-next.2"
   },
   "homepage": "https://github.com/gatsbyjs/gatsby/tree/master/packages/gatsby-transformer-remark#readme",
   "keywords": [
diff --git a/packages/gatsby-transformer-sharp/package.json b/packages/gatsby-transformer-sharp/package.json
index 606856825cdf4..b8fb6d26fb023 100644
--- a/packages/gatsby-transformer-sharp/package.json
+++ b/packages/gatsby-transformer-sharp/package.json
@@ -1,7 +1,7 @@
 {
   "name": "gatsby-transformer-sharp",
   "description": "Gatsby transformer plugin for images using Sharp",
-  "version": "4.20.0-next.0",
+  "version": "4.20.0-next.2",
   "author": "Kyle Mathews <mathews.kyle@gmail.com>",
   "bugs": {
     "url": "https://github.com/gatsbyjs/gatsby/issues"
@@ -12,7 +12,7 @@
     "bluebird": "^3.7.2",
     "common-tags": "^1.8.2",
     "fs-extra": "^10.1.0",
-    "gatsby-plugin-utils": "^3.14.0-next.0",
+    "gatsby-plugin-utils": "^3.14.0-next.2",
     "probe-image-size": "^7.2.3",
     "semver": "^7.3.7",
     "sharp": "^0.30.3"
diff --git a/packages/gatsby-transformer-sqip/package.json b/packages/gatsby-transformer-sqip/package.json
index 1ac0db6e3d618..bccce860b5852 100644
--- a/packages/gatsby-transformer-sqip/package.json
+++ b/packages/gatsby-transformer-sqip/package.json
@@ -1,7 +1,7 @@
 {
   "name": "gatsby-transformer-sqip",
   "description": "Generates geometric primitive version of images",
-  "version": "4.20.0-next.1",
+  "version": "4.20.0-next.3",
   "author": "Benedikt Rötsch <roetsch.beni@gmail.com>",
   "bugs": {
     "url": "https://github.com/gatsbyjs/gatsby/issues"
@@ -10,7 +10,7 @@
     "@babel/runtime": "^7.15.4",
     "fs-extra": "^10.1.0",
     "gatsby-core-utils": "^3.20.0-next.0",
-    "gatsby-plugin-sharp": "^4.20.0-next.1",
+    "gatsby-plugin-sharp": "^4.20.0-next.3",
     "md5-file": "^5.0.0",
     "mini-svg-data-uri": "^1.4.4",
     "p-queue": "^6.6.2",
diff --git a/packages/gatsby/package.json b/packages/gatsby/package.json
index c628c7373af84..551e3bd6b549a 100644
--- a/packages/gatsby/package.json
+++ b/packages/gatsby/package.json
@@ -1,7 +1,7 @@
 {
   "name": "gatsby",
   "description": "Blazing fast modern site generator for React",
-  "version": "4.20.0-next.3",
+  "version": "4.20.0-next.6",
   "author": "Kyle Mathews <mathews.kyle@gmail.com>",
   "bin": {
     "gatsby": "./cli.js"
@@ -19,7 +19,7 @@
     "@babel/traverse": "^7.15.4",
     "@babel/types": "^7.15.4",
     "@builder.io/partytown": "^0.5.2",
-    "@gatsbyjs/reach-router": "^1.3.6",
+    "@gatsbyjs/reach-router": "^1.3.9",
     "@gatsbyjs/webpack-hot-middleware": "^2.25.2",
     "@graphql-codegen/add": "^3.1.1",
     "@graphql-codegen/core": "^2.5.1",
@@ -44,7 +44,7 @@
     "babel-plugin-add-module-exports": "^1.0.4",
     "babel-plugin-dynamic-import-node": "^2.3.3",
     "babel-plugin-lodash": "^3.3.4",
-    "babel-plugin-remove-graphql-queries": "^4.20.0-next.0",
+    "babel-plugin-remove-graphql-queries": "^4.20.0-next.1",
     "babel-preset-gatsby": "^2.20.0-next.0",
     "better-opn": "^2.1.1",
     "bluebird": "^3.7.2",
@@ -87,16 +87,16 @@
     "find-cache-dir": "^3.3.2",
     "fs-exists-cached": "1.0.0",
     "fs-extra": "^10.1.0",
-    "gatsby-cli": "^4.20.0-next.0",
+    "gatsby-cli": "^4.20.0-next.2",
     "gatsby-core-utils": "^3.20.0-next.0",
     "gatsby-graphiql-explorer": "^2.20.0-next.0",
     "gatsby-legacy-polyfills": "^2.20.0-next.0",
-    "gatsby-link": "^4.20.0-next.1",
+    "gatsby-link": "^4.20.0-next.2",
     "gatsby-page-utils": "^2.20.0-next.0",
     "gatsby-parcel-config": "0.11.0-next.1",
-    "gatsby-plugin-page-creator": "^4.20.0-next.0",
-    "gatsby-plugin-typescript": "^4.20.0-next.0",
-    "gatsby-plugin-utils": "^3.14.0-next.0",
+    "gatsby-plugin-page-creator": "^4.20.0-next.2",
+    "gatsby-plugin-typescript": "^4.20.0-next.1",
+    "gatsby-plugin-utils": "^3.14.0-next.2",
     "gatsby-react-router-scroll": "^5.20.0-next.0",
     "gatsby-script": "^1.5.0-next.0",
     "gatsby-telemetry": "^3.20.0-next.0",
diff --git a/packages/gatsby/src/commands/develop.ts b/packages/gatsby/src/commands/develop.ts
index 5339b6b3de9ae..937e86b11d400 100644
--- a/packages/gatsby/src/commands/develop.ts
+++ b/packages/gatsby/src/commands/develop.ts
@@ -236,8 +236,6 @@ module.exports = async (program: IProgram): Promise<void> => {
       port: developPort,
       // TODO(v5): remove
       proxyPort: developPort,
-      // Don't pass SSL options down to the develop process, it should always use HTTP
-      ssl: null,
       debugInfo,
     })};
     cmd(args);
diff --git a/packages/gatsby/src/commands/serve.ts b/packages/gatsby/src/commands/serve.ts
index af5bae64a9790..8daeb0c3ed6fb 100644
--- a/packages/gatsby/src/commands/serve.ts
+++ b/packages/gatsby/src/commands/serve.ts
@@ -202,7 +202,7 @@ module.exports = async (program: IServeProgram): Promise<void> => {
         dbPath: path.join(program.directory, `.cache`, `data`, `datastore`),
       })
 
-      app.get(
+      router.get(
         `/page-data/:pagePath(*)/page-data.json`,
         async (req, res, next) => {
           const requestedPagePath = req.params.pagePath
diff --git a/packages/gatsby/src/commands/types.ts b/packages/gatsby/src/commands/types.ts
index f495700bac099..08ad4b9341976 100644
--- a/packages/gatsby/src/commands/types.ts
+++ b/packages/gatsby/src/commands/types.ts
@@ -3,8 +3,8 @@ import { Store, AnyAction } from "redux"
 import { IGatsbyState } from "../redux/types"
 
 export interface ICert {
-  key: Buffer
-  cert: Buffer
+  key: string
+  cert: string
 }
 
 export interface IDebugInfo {
diff --git a/packages/gatsby/src/utils/eslint-rules/__tests__/limited-exports-page-templates.ts b/packages/gatsby/src/utils/eslint-rules/__tests__/limited-exports-page-templates.ts
index 6789f8b73dafd..d351df15ada85 100644
--- a/packages/gatsby/src/utils/eslint-rules/__tests__/limited-exports-page-templates.ts
+++ b/packages/gatsby/src/utils/eslint-rules/__tests__/limited-exports-page-templates.ts
@@ -52,6 +52,18 @@ describe(`no-anonymous-exports-page-templates`, () => {
       test({
         code: `import { graphql } from "gatsby"\nconst Template = () => {}\nconst query = graphql\`test\`\nexport { query }\nexport default Template`,
       }),
+      test({
+        code: `import { graphql } from "gatsby"\nimport Template from './Template'\nconst query = graphql\`test\`\nexport { query }\nexport default Template`,
+      }),
+      test({
+        code: `import { graphql } from "gatsby"\nexport { default } from './Template'\nexport const query = graphql\`test\``,
+      }),
+      test({
+        code: `import { graphql } from "gatsby"\nconst query = graphql\`test\`\nexport { query }\nexport { default } from './Template'`,
+      }),
+      test({
+        code: `import { graphql } from "gatsby"\nexport { Template as default } from './Template'\nexport const query = graphql\`test\``,
+      }),
       // getServerData
       test({
         code: `import { graphql, Link } from "gatsby"\nconst Template = () => {}\nexport const query = graphql\`test\`\nexport default Template\nexport function getServerData() { return { props: { foo: "bar" }}}`,
@@ -121,6 +133,18 @@ describe(`no-anonymous-exports-page-templates`, () => {
         code: `import { graphql } from "gatsby"\nconst Template = () => {}\nexport const hello = 10, query = graphql\`test\`\nexport default Template`,
         errors: [{ messageId: `limitedExportsPageTemplates` }],
       }),
+      test({
+        code: `import { graphql } from "gatsby"\nexport { default } from './Template'\nexport const hello = 10, query = graphql\`test\``,
+        errors: [{ messageId: `limitedExportsPageTemplates` }],
+      }),
+      test({
+        code: `import { graphql } from "gatsby"\nconst query = graphql\`test\`\nexport { query }\nexport { default } from './Template'\nexport function Test() {}`,
+        errors: [{ messageId: `limitedExportsPageTemplates` }],
+      }),
+      test({
+        code: `import { graphql } from "gatsby"\nexport { Template as default } from './Template'\nexport const query = graphql\`test\`\nexport function Test() {}`,
+        errors: [{ messageId: `limitedExportsPageTemplates` }],
+      }),
       test({
         code: `import { graphql, Link } from "gatsby"\nconst Template = () => {}\nexport const query = graphql\`test\`\nexport default Template\nexport class NotHead extends React.Component { render() { return null } }`,
         errors: [{ messageId: `limitedExportsPageTemplates` }],
diff --git a/packages/gatsby/src/utils/eslint-rules/limited-exports-page-templates.ts b/packages/gatsby/src/utils/eslint-rules/limited-exports-page-templates.ts
index 7cabcbcce82ff..2fad780ffe59c 100644
--- a/packages/gatsby/src/utils/eslint-rules/limited-exports-page-templates.ts
+++ b/packages/gatsby/src/utils/eslint-rules/limited-exports-page-templates.ts
@@ -75,15 +75,14 @@ function hasOneValidNamedDeclaration(
   // Checks for:
   // const query = graphql``
   // export { query }
-  if (
-    node.type === `ExportNamedDeclaration` &&
-    node.declaration === null &&
-    varName
-  ) {
+  if (node.type === `ExportNamedDeclaration` && node.declaration === null) {
     // For export { foobar, query } the declaration will be null and specifiers exists
     // For { foobar, query } it'll return true, for { query } it'll return false
-    const nonQueryExports = node.specifiers.some(
-      e => e.exported.name !== varName
+    // It will ignore any { default } declarations since these are allowed
+    const nonQueryExports = node.specifiers.some(e =>
+      varName
+        ? e.exported.name !== varName && e.exported.name !== `default`
+        : e.exported.name !== `default`
     )
     return !nonQueryExports
   }
diff --git a/packages/gatsby/src/utils/get-ssl-cert.ts b/packages/gatsby/src/utils/get-ssl-cert.ts
index e97b51bd47e21..ac9db95f114ee 100644
--- a/packages/gatsby/src/utils/get-ssl-cert.ts
+++ b/packages/gatsby/src/utils/get-ssl-cert.ts
@@ -66,8 +66,8 @@ export async function getSslCert({
       ? absoluteOrDirectory(directory, caFile)
       : certPath
     return {
-      key: fs.readFileSync(keyPath),
-      cert: fs.readFileSync(certPath),
+      key: fs.readFileSync(keyPath, `utf-8`),
+      cert: fs.readFileSync(certPath, `utf-8`),
     }
   }
 
@@ -98,8 +98,8 @@ export async function getSslCert({
       process.env.NODE_EXTRA_CA_CERTS = caPath
     }
     return {
-      key,
-      cert,
+      key: key.toString(),
+      cert: cert.toString(),
     }
   } catch (err) {
     report.panic({
diff --git a/packages/gatsby/src/utils/source-nodes-api-runner.ts b/packages/gatsby/src/utils/source-nodes-api-runner.ts
new file mode 100644
index 0000000000000..34dc44d336018
--- /dev/null
+++ b/packages/gatsby/src/utils/source-nodes-api-runner.ts
@@ -0,0 +1,25 @@
+import { Span } from "opentracing"
+import apiRunner from "./api-runner-node"
+
+export function sourceNodesApiRunner({
+  traceId,
+  deferNodeMutation,
+  parentSpan,
+  webhookBody,
+  pluginName,
+}: {
+  traceId: string
+  webhookBody: unknown
+  pluginName?: string
+  parentSpan?: Span
+  deferNodeMutation?: boolean
+}): Promise<void> {
+  return apiRunner(`sourceNodes`, {
+    traceId,
+    waitForCascadingActions: true,
+    deferNodeMutation,
+    parentSpan,
+    webhookBody: webhookBody || {},
+    pluginName,
+  })
+}
diff --git a/packages/gatsby/src/utils/source-nodes.ts b/packages/gatsby/src/utils/source-nodes.ts
index ebdbcaf6b51bb..a748cf3a268f3 100644
--- a/packages/gatsby/src/utils/source-nodes.ts
+++ b/packages/gatsby/src/utils/source-nodes.ts
@@ -1,6 +1,6 @@
 import report from "gatsby-cli/lib/reporter"
 import { Span } from "opentracing"
-import apiRunner from "./api-runner-node"
+import { sourceNodesApiRunner } from "./source-nodes-api-runner"
 import { store } from "../redux"
 import { getDataStore, getNode } from "../datastore"
 import { actions } from "../redux/actions"
@@ -106,12 +106,11 @@ export default async ({
   const traceId = isInitialSourcing
     ? `initial-sourceNodes`
     : `sourceNodes #${sourcingCount}`
-  await apiRunner(`sourceNodes`, {
+  await sourceNodesApiRunner({
     traceId,
-    waitForCascadingActions: true,
     deferNodeMutation,
     parentSpan,
-    webhookBody: webhookBody || {},
+    webhookBody,
     pluginName,
   })
 
diff --git a/packages/gatsby/src/utils/start-server.ts b/packages/gatsby/src/utils/start-server.ts
index 80e8c8d92b27f..e6b3270a5b1fd 100644
--- a/packages/gatsby/src/utils/start-server.ts
+++ b/packages/gatsby/src/utils/start-server.ts
@@ -15,6 +15,7 @@ import {
 } from "graphql"
 import { slash, uuid } from "gatsby-core-utils"
 import http from "http"
+import https from "https"
 import cors from "cors"
 import telemetry from "gatsby-telemetry"
 import launchEditor from "react-dev-utils/launchEditor"
@@ -59,7 +60,7 @@ type ActivityTracker = any // TODO: Replace this with proper type once reporter
 
 interface IServer {
   compiler: webpack.Compiler
-  listener: http.Server
+  listener: http.Server | https.Server
   webpackActivity: ActivityTracker
   websocketManager: WebsocketManager
   workerPool: WorkerPool.GatsbyWorkerPool
@@ -799,7 +800,9 @@ export async function startServer(
   /**
    * Set up the HTTP server and socket.io.
    **/
-  const server = new http.Server(app)
+  const server = program.ssl
+    ? new https.Server(program.ssl, app)
+    : new http.Server(app)
   const socket = websocketManager.init({ server })
   const listener = server.listen(program.port, program.host)
 
diff --git a/peril.settings.json b/peril.settings.json
index 12d237f89d0fe..fc41f0081cb3f 100644
--- a/peril.settings.json
+++ b/peril.settings.json
@@ -54,6 +54,21 @@
       "pull_request.opened": [
         "gatsbyjs/gatsby@peril/rules/pull-request-on-starter.ts"
       ]
+    },
+    "gatsbyjs/gatsby-starter-wordpress-blog": {
+      "pull_request.opened": [
+        "gatsbyjs/gatsby@peril/rules/pull-request-on-starter.ts"
+      ]
+    },
+    "gatsbyjs/gatsby-starter-minimal": {
+      "pull_request.opened": [
+        "gatsbyjs/gatsby@peril/rules/pull-request-on-starter.ts"
+      ]
+    },
+    "gatsbyjs/gatsby-starter-minimal-ts": {
+      "pull_request.opened": [
+        "gatsbyjs/gatsby@peril/rules/pull-request-on-starter.ts"
+      ]
     }
   }
 }
diff --git a/starters/blog/gatsby-config.js b/starters/blog/gatsby-config.js
index 0c25b5c259a92..799682b0d9180 100644
--- a/starters/blog/gatsby-config.js
+++ b/starters/blog/gatsby-config.js
@@ -124,7 +124,6 @@ module.exports = {
         icon: `src/images/gatsby-icon.png`, // This path is relative to the root of the site.
       },
     },
-    `gatsby-plugin-react-helmet`,
     // this (optional) plugin enables Progressive Web App + Offline functionality
     // To learn more, visit: https://gatsby.dev/offline
     // `gatsby-plugin-offline`,
diff --git a/starters/blog/gatsby-ssr.js b/starters/blog/gatsby-ssr.js
new file mode 100644
index 0000000000000..5500b627a86c4
--- /dev/null
+++ b/starters/blog/gatsby-ssr.js
@@ -0,0 +1,9 @@
+/**
+ * Implement Gatsby's SSR (Server Side Rendering) APIs in this file.
+ *
+ * See: https://www.gatsbyjs.com/docs/ssr-apis/
+ */
+
+exports.onRenderBody = ({ setHtmlAttributes }) => {
+  setHtmlAttributes({ lang: `en` })
+}
diff --git a/starters/blog/package-lock.json b/starters/blog/package-lock.json
index b3911ec27866a..cbe836992743e 100644
--- a/starters/blog/package-lock.json
+++ b/starters/blog/package-lock.json
@@ -7643,14 +7643,6 @@
         "lodash": "^4.17.21"
       }
     },
-    "gatsby-plugin-react-helmet": {
-      "version": "5.19.0",
-      "resolved": "https://registry.npmjs.org/gatsby-plugin-react-helmet/-/gatsby-plugin-react-helmet-5.19.0.tgz",
-      "integrity": "sha512-XXrJYfHqoaUe57oAF+/ljPHncrvYk0UonES3aUwynbWsR8UXhQpdbwqIOYZPGQgPsc1X55Kzdo+/3pU1gA9ajQ==",
-      "requires": {
-        "@babel/runtime": "^7.15.4"
-      }
-    },
     "gatsby-plugin-sharp": {
       "version": "4.19.0",
       "resolved": "https://registry.npmjs.org/gatsby-plugin-sharp/-/gatsby-plugin-sharp-4.19.0.tgz",
@@ -12159,22 +12151,6 @@
       "resolved": "https://registry.npmjs.org/react-error-overlay/-/react-error-overlay-6.0.9.tgz",
       "integrity": "sha512-nQTTcUu+ATDbrSD1BZHr5kgSD4oF8OFjxun8uAaL8RwPBacGBNPf/yAuVVdx17N8XNzRDMrZ9XcKZHCjPW+9ew=="
     },
-    "react-fast-compare": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/react-fast-compare/-/react-fast-compare-3.2.0.tgz",
-      "integrity": "sha512-rtGImPZ0YyLrscKI9xTpV8psd6I8VAtjKCzQDlzyDvqJA8XOW78TXYQwNRNd8g8JZnDu8q9Fu/1v4HPAVwVdHA=="
-    },
-    "react-helmet": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/react-helmet/-/react-helmet-6.1.0.tgz",
-      "integrity": "sha512-4uMzEY9nlDlgxr61NL3XbKRy1hEkXmKNXhjbAIOVw5vcFrsdYbH2FEwcNyWvWinl103nXgzYNlns9ca+8kFiWw==",
-      "requires": {
-        "object-assign": "^4.1.1",
-        "prop-types": "^15.7.2",
-        "react-fast-compare": "^3.1.1",
-        "react-side-effect": "^2.1.0"
-      }
-    },
     "react-is": {
       "version": "16.13.1",
       "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz",
@@ -12190,11 +12166,6 @@
       "resolved": "https://registry.npmjs.org/react-refresh/-/react-refresh-0.9.0.tgz",
       "integrity": "sha512-Gvzk7OZpiqKSkxsQvO/mbTN1poglhmAV7gR/DdIrRrSMXraRQQlfikRJOr3Nb9GTMPC5kof948Zy6jJZIFtDvQ=="
     },
-    "react-side-effect": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/react-side-effect/-/react-side-effect-2.1.1.tgz",
-      "integrity": "sha512-2FoTQzRNTncBVtnzxFOk2mCpcfxQpenBMbk5kSVBg5UcPqV9fRbgY2zhb7GTWWOlpFmAxhClBDlIq8Rsubz1yQ=="
-    },
     "read": {
       "version": "1.0.7",
       "resolved": "https://registry.npmjs.org/read/-/read-1.0.7.tgz",
diff --git a/starters/blog/package.json b/starters/blog/package.json
index 77fc11a00342c..140a4af9e90c3 100644
--- a/starters/blog/package.json
+++ b/starters/blog/package.json
@@ -15,7 +15,6 @@
     "gatsby-plugin-image": "^2.19.0",
     "gatsby-plugin-manifest": "^4.19.0",
     "gatsby-plugin-offline": "^5.19.0",
-    "gatsby-plugin-react-helmet": "^5.19.0",
     "gatsby-plugin-sharp": "^4.19.0",
     "gatsby-remark-copy-linked-files": "^5.19.0",
     "gatsby-remark-images": "^6.19.0",
@@ -28,7 +27,6 @@
     "prismjs": "^1.28.0",
     "react": "^18.1.0",
     "react-dom": "^18.1.0",
-    "react-helmet": "^6.1.0",
     "typeface-merriweather": "0.0.72",
     "typeface-montserrat": "0.0.75"
   },
diff --git a/starters/blog/src/components/seo.js b/starters/blog/src/components/seo.js
index 40fe5ea2d4308..0f1cfe10096ab 100644
--- a/starters/blog/src/components/seo.js
+++ b/starters/blog/src/components/seo.js
@@ -7,10 +7,9 @@
 
 import * as React from "react"
 import PropTypes from "prop-types"
-import { Helmet } from "react-helmet"
 import { useStaticQuery, graphql } from "gatsby"
 
-const Seo = ({ description, lang, meta, title }) => {
+const Seo = ({ description, lang, title, children }) => {
   const { site } = useStaticQuery(
     graphql`
       query {
@@ -31,60 +30,30 @@ const Seo = ({ description, lang, meta, title }) => {
   const defaultTitle = site.siteMetadata?.title
 
   return (
-    <Helmet
-      htmlAttributes={{
-        lang,
-      }}
-      title={title}
-      titleTemplate={defaultTitle ? `%s | ${defaultTitle}` : null}
-      meta={[
-        {
-          name: `description`,
-          content: metaDescription,
-        },
-        {
-          property: `og:title`,
-          content: title,
-        },
-        {
-          property: `og:description`,
-          content: metaDescription,
-        },
-        {
-          property: `og:type`,
-          content: `website`,
-        },
-        {
-          name: `twitter:card`,
-          content: `summary`,
-        },
-        {
-          name: `twitter:creator`,
-          content: site.siteMetadata?.social?.twitter || ``,
-        },
-        {
-          name: `twitter:title`,
-          content: title,
-        },
-        {
-          name: `twitter:description`,
-          content: metaDescription,
-        },
-      ].concat(meta)}
-    />
+    <>
+      <title>{defaultTitle ? `${title} | ${defaultTitle}` : title}</title>
+      <meta name="description" content={metaDescription} />
+      <meta property="og:title" content={title} />
+      <meta property="og:description" content={metaDescription} />
+      <meta property="og:type" content="website" />
+      <meta name="twitter:card" content="summary" />
+      <meta
+        name="twitter:creator"
+        content={site.siteMetadata?.social?.twitter || ``}
+      />
+      <meta name="twitter:title" content={title} />
+      <meta name="twitter:description" content={metaDescription} />
+      {children}
+    </>
   )
 }
 
 Seo.defaultProps = {
-  lang: `en`,
-  meta: [],
   description: ``,
 }
 
 Seo.propTypes = {
   description: PropTypes.string,
-  lang: PropTypes.string,
-  meta: PropTypes.arrayOf(PropTypes.object),
   title: PropTypes.string.isRequired,
 }
 
diff --git a/starters/blog/src/pages/404.js b/starters/blog/src/pages/404.js
index 1df09ff33c45d..4eeb14ce4c8f1 100644
--- a/starters/blog/src/pages/404.js
+++ b/starters/blog/src/pages/404.js
@@ -9,13 +9,14 @@ const NotFoundPage = ({ data, location }) => {
 
   return (
     <Layout location={location} title={siteTitle}>
-      <Seo title="404: Not Found" />
       <h1>404: Not Found</h1>
       <p>You just hit a route that doesn&#39;t exist... the sadness.</p>
     </Layout>
   )
 }
 
+export const Head = () => <Seo title="404: Not Found" />
+
 export default NotFoundPage
 
 export const pageQuery = graphql`
diff --git a/starters/blog/src/pages/index.js b/starters/blog/src/pages/index.js
index 0e1cb233effa7..b8393b38a52a3 100644
--- a/starters/blog/src/pages/index.js
+++ b/starters/blog/src/pages/index.js
@@ -12,7 +12,6 @@ const BlogIndex = ({ data, location }) => {
   if (posts.length === 0) {
     return (
       <Layout location={location} title={siteTitle}>
-        <Seo title="All posts" />
         <Bio />
         <p>
           No blog posts found. Add markdown posts to "content/blog" (or the
@@ -25,7 +24,6 @@ const BlogIndex = ({ data, location }) => {
 
   return (
     <Layout location={location} title={siteTitle}>
-      <Seo title="All posts" />
       <Bio />
       <ol style={{ listStyle: `none` }}>
         {posts.map(post => {
@@ -65,6 +63,8 @@ const BlogIndex = ({ data, location }) => {
 
 export default BlogIndex
 
+export const Head = () => <Seo title="All posts" />
+
 export const pageQuery = graphql`
   query {
     site {
diff --git a/starters/blog/src/pages/using-typescript.tsx b/starters/blog/src/pages/using-typescript.tsx
index fedd7c898d5ef..bdec46c05091f 100644
--- a/starters/blog/src/pages/using-typescript.tsx
+++ b/starters/blog/src/pages/using-typescript.tsx
@@ -1,6 +1,6 @@
 // If you don't want to use TypeScript you can delete this file!
 import * as React from "react"
-import { PageProps, Link, graphql } from "gatsby"
+import { PageProps, Link, graphql, HeadFC } from "gatsby"
 
 import Layout from "../components/layout"
 import Seo from "../components/seo"
@@ -17,7 +17,6 @@ const UsingTypescript: React.FC<PageProps<DataProps>> = ({
   location,
 }) => (
   <Layout title="Using TypeScript" location={location}>
-    <Seo title="Using TypeScript" />
     <h1>Gatsby supports TypeScript by default!</h1>
     <p>
       This means that you can create and write <em>.ts/.tsx</em> files for your
@@ -43,6 +42,8 @@ const UsingTypescript: React.FC<PageProps<DataProps>> = ({
   </Layout>
 )
 
+export const Head: HeadFC<DataProps> = () => <Seo title="Using TypeScript" />
+
 export default UsingTypescript
 
 export const query = graphql`
diff --git a/starters/blog/src/templates/blog-post.js b/starters/blog/src/templates/blog-post.js
index 5794890ba3e27..ce425ce18f954 100644
--- a/starters/blog/src/templates/blog-post.js
+++ b/starters/blog/src/templates/blog-post.js
@@ -5,17 +5,14 @@ import Bio from "../components/bio"
 import Layout from "../components/layout"
 import Seo from "../components/seo"
 
-const BlogPostTemplate = ({ data, location }) => {
-  const post = data.markdownRemark
-  const siteTitle = data.site.siteMetadata?.title || `Title`
-  const { previous, next } = data
+const BlogPostTemplate = ({
+  data: { previous, next, site, markdownRemark: post },
+  location,
+}) => {
+  const siteTitle = site.siteMetadata?.title || `Title`
 
   return (
     <Layout location={location} title={siteTitle}>
-      <Seo
-        title={post.frontmatter.title}
-        description={post.frontmatter.description || post.excerpt}
-      />
       <article
         className="blog-post"
         itemScope
@@ -64,6 +61,15 @@ const BlogPostTemplate = ({ data, location }) => {
   )
 }
 
+export const Head = ({ data: { markdownRemark: post } }) => {
+  return (
+    <Seo
+      title={post.frontmatter.title}
+      description={post.frontmatter.description || post.excerpt}
+    />
+  )
+}
+
 export default BlogPostTemplate
 
 export const pageQuery = graphql`
diff --git a/starters/default/gatsby-config.js b/starters/default/gatsby-config.js
index 9678eccb1dc19..0d70c8ccde116 100644
--- a/starters/default/gatsby-config.js
+++ b/starters/default/gatsby-config.js
@@ -6,7 +6,6 @@ module.exports = {
     siteUrl: `https://gatsbystarterdefaultsource.gatsbyjs.io/`,
   },
   plugins: [
-    `gatsby-plugin-react-helmet`,
     `gatsby-plugin-image`,
     {
       resolve: `gatsby-source-filesystem`,
diff --git a/starters/default/gatsby-ssr.js b/starters/default/gatsby-ssr.js
index 01d83255f4f2c..5500b627a86c4 100644
--- a/starters/default/gatsby-ssr.js
+++ b/starters/default/gatsby-ssr.js
@@ -4,4 +4,6 @@
  * See: https://www.gatsbyjs.com/docs/ssr-apis/
  */
 
-// You can delete this file if you're not using it
+exports.onRenderBody = ({ setHtmlAttributes }) => {
+  setHtmlAttributes({ lang: `en` })
+}
diff --git a/starters/default/package-lock.json b/starters/default/package-lock.json
index 0824c25c6b1aa..c09fc3ed98f83 100644
--- a/starters/default/package-lock.json
+++ b/starters/default/package-lock.json
@@ -7469,14 +7469,6 @@
         "lodash": "^4.17.21"
       }
     },
-    "gatsby-plugin-react-helmet": {
-      "version": "5.19.0",
-      "resolved": "https://registry.npmjs.org/gatsby-plugin-react-helmet/-/gatsby-plugin-react-helmet-5.19.0.tgz",
-      "integrity": "sha512-XXrJYfHqoaUe57oAF+/ljPHncrvYk0UonES3aUwynbWsR8UXhQpdbwqIOYZPGQgPsc1X55Kzdo+/3pU1gA9ajQ==",
-      "requires": {
-        "@babel/runtime": "^7.15.4"
-      }
-    },
     "gatsby-plugin-sharp": {
       "version": "4.19.0",
       "resolved": "https://registry.npmjs.org/gatsby-plugin-sharp/-/gatsby-plugin-sharp-4.19.0.tgz",
@@ -11360,22 +11352,6 @@
       "resolved": "https://registry.npmjs.org/react-error-overlay/-/react-error-overlay-6.0.9.tgz",
       "integrity": "sha512-nQTTcUu+ATDbrSD1BZHr5kgSD4oF8OFjxun8uAaL8RwPBacGBNPf/yAuVVdx17N8XNzRDMrZ9XcKZHCjPW+9ew=="
     },
-    "react-fast-compare": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/react-fast-compare/-/react-fast-compare-3.2.0.tgz",
-      "integrity": "sha512-rtGImPZ0YyLrscKI9xTpV8psd6I8VAtjKCzQDlzyDvqJA8XOW78TXYQwNRNd8g8JZnDu8q9Fu/1v4HPAVwVdHA=="
-    },
-    "react-helmet": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/react-helmet/-/react-helmet-6.1.0.tgz",
-      "integrity": "sha512-4uMzEY9nlDlgxr61NL3XbKRy1hEkXmKNXhjbAIOVw5vcFrsdYbH2FEwcNyWvWinl103nXgzYNlns9ca+8kFiWw==",
-      "requires": {
-        "object-assign": "^4.1.1",
-        "prop-types": "^15.7.2",
-        "react-fast-compare": "^3.1.1",
-        "react-side-effect": "^2.1.0"
-      }
-    },
     "react-is": {
       "version": "16.13.1",
       "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz",
@@ -11391,11 +11367,6 @@
       "resolved": "https://registry.npmjs.org/react-refresh/-/react-refresh-0.9.0.tgz",
       "integrity": "sha512-Gvzk7OZpiqKSkxsQvO/mbTN1poglhmAV7gR/DdIrRrSMXraRQQlfikRJOr3Nb9GTMPC5kof948Zy6jJZIFtDvQ=="
     },
-    "react-side-effect": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/react-side-effect/-/react-side-effect-2.1.1.tgz",
-      "integrity": "sha512-2FoTQzRNTncBVtnzxFOk2mCpcfxQpenBMbk5kSVBg5UcPqV9fRbgY2zhb7GTWWOlpFmAxhClBDlIq8Rsubz1yQ=="
-    },
     "read": {
       "version": "1.0.7",
       "resolved": "https://registry.npmjs.org/read/-/read-1.0.7.tgz",
diff --git a/starters/default/package.json b/starters/default/package.json
index 5a6b703d9f0c1..ac4385564e084 100644
--- a/starters/default/package.json
+++ b/starters/default/package.json
@@ -10,14 +10,12 @@
     "gatsby-plugin-image": "^2.19.0",
     "gatsby-plugin-manifest": "^4.19.0",
     "gatsby-plugin-offline": "^5.19.0",
-    "gatsby-plugin-react-helmet": "^5.19.0",
     "gatsby-plugin-sharp": "^4.19.0",
     "gatsby-source-filesystem": "^4.19.0",
     "gatsby-transformer-sharp": "^4.19.0",
     "prop-types": "^15.8.1",
     "react": "^18.1.0",
-    "react-dom": "^18.1.0",
-    "react-helmet": "^6.1.0"
+    "react-dom": "^18.1.0"
   },
   "devDependencies": {
     "prettier": "^2.7.1"
diff --git a/starters/default/src/components/seo.js b/starters/default/src/components/seo.js
index d2dad201a9c28..b336df2076819 100644
--- a/starters/default/src/components/seo.js
+++ b/starters/default/src/components/seo.js
@@ -7,10 +7,9 @@
 
 import * as React from "react"
 import PropTypes from "prop-types"
-import { Helmet } from "react-helmet"
 import { useStaticQuery, graphql } from "gatsby"
 
-function Seo({ description, lang, meta, title }) {
+function Seo({ description, title, children }) {
   const { site } = useStaticQuery(
     graphql`
       query {
@@ -29,60 +28,27 @@ function Seo({ description, lang, meta, title }) {
   const defaultTitle = site.siteMetadata?.title
 
   return (
-    <Helmet
-      htmlAttributes={{
-        lang,
-      }}
-      title={title}
-      titleTemplate={defaultTitle ? `%s / ${defaultTitle}` : null}
-      meta={[
-        {
-          name: `description`,
-          content: metaDescription,
-        },
-        {
-          property: `og:title`,
-          content: title,
-        },
-        {
-          property: `og:description`,
-          content: metaDescription,
-        },
-        {
-          property: `og:type`,
-          content: `website`,
-        },
-        {
-          name: `twitter:card`,
-          content: `summary`,
-        },
-        {
-          name: `twitter:creator`,
-          content: site.siteMetadata?.author || ``,
-        },
-        {
-          name: `twitter:title`,
-          content: title,
-        },
-        {
-          name: `twitter:description`,
-          content: metaDescription,
-        },
-      ].concat(meta)}
-    />
+    <>
+      <title>{defaultTitle ? `${title} | ${defaultTitle}` : title}</title>
+      <meta name="description" content={metaDescription} />
+      <meta property="og:title" content={title} />
+      <meta property="og:description" content={metaDescription} />
+      <meta property="og:type" content="website" />
+      <meta name="twitter:card" content="summary" />
+      <meta name="twitter:creator" content={site.siteMetadata?.author || ``} />
+      <meta name="twitter:title" content={title} />
+      <meta name="twitter:description" content={metaDescription} />
+      {children}
+    </>
   )
 }
 
 Seo.defaultProps = {
-  lang: `en`,
-  meta: [],
   description: ``,
 }
 
 Seo.propTypes = {
   description: PropTypes.string,
-  lang: PropTypes.string,
-  meta: PropTypes.arrayOf(PropTypes.object),
   title: PropTypes.string.isRequired,
 }
 
diff --git a/starters/default/src/pages/404.js b/starters/default/src/pages/404.js
index b98b1ba58f303..bd7de997c1ba0 100644
--- a/starters/default/src/pages/404.js
+++ b/starters/default/src/pages/404.js
@@ -5,10 +5,11 @@ import Seo from "../components/seo"
 
 const NotFoundPage = () => (
   <Layout>
-    <Seo title="404: Not found" />
     <h1>404: Not Found</h1>
     <p>You just hit a route that doesn&#39;t exist... the sadness.</p>
   </Layout>
 )
 
+export const Head = () => <Seo title="404: Not Found" />
+
 export default NotFoundPage
diff --git a/starters/default/src/pages/index.js b/starters/default/src/pages/index.js
index c02863ee9093f..707496b07ae97 100644
--- a/starters/default/src/pages/index.js
+++ b/starters/default/src/pages/index.js
@@ -119,4 +119,6 @@ const IndexPage = () => (
   </Layout>
 )
 
+export const Head = () => <Seo title="Home" />
+
 export default IndexPage
diff --git a/starters/default/src/pages/page-2.js b/starters/default/src/pages/page-2.js
index 74b96e08c0ff8..aecc925549730 100644
--- a/starters/default/src/pages/page-2.js
+++ b/starters/default/src/pages/page-2.js
@@ -6,11 +6,12 @@ import Seo from "../components/seo"
 
 const SecondPage = () => (
   <Layout>
-    <Seo title="Page two" />
     <h1>Hi from the second page</h1>
     <p>Welcome to page 2</p>
     <Link to="/">Go back to the homepage</Link>
   </Layout>
 )
 
+export const Head = () => <Seo title="Page two" />
+
 export default SecondPage
diff --git a/starters/default/src/pages/using-ssr.js b/starters/default/src/pages/using-ssr.js
index 6bbcff16eefd1..f89080d14662c 100644
--- a/starters/default/src/pages/using-ssr.js
+++ b/starters/default/src/pages/using-ssr.js
@@ -7,7 +7,6 @@ import Seo from "../components/seo"
 const UsingSSR = ({ serverData }) => {
   return (
     <Layout>
-      <Seo title="Using SSR" />
       <h1>
         This page is <b>rendered server-side</b>
       </h1>
@@ -33,6 +32,8 @@ const UsingSSR = ({ serverData }) => {
   )
 }
 
+export const Head = () => <Seo title="Using SSR" />
+
 export default UsingSSR
 
 export async function getServerData() {
diff --git a/starters/default/src/pages/using-typescript.tsx b/starters/default/src/pages/using-typescript.tsx
index 8018c1c905cbd..3f174786ca6a0 100644
--- a/starters/default/src/pages/using-typescript.tsx
+++ b/starters/default/src/pages/using-typescript.tsx
@@ -1,6 +1,6 @@
 // If you don't want to use TypeScript you can delete this file!
 import * as React from "react"
-import { PageProps, Link, graphql } from "gatsby"
+import { PageProps, Link, graphql, HeadFC } from "gatsby"
 
 import Layout from "../components/layout"
 import Seo from "../components/seo"
@@ -16,7 +16,6 @@ const UsingTypescript: React.FC<PageProps<DataProps>> = ({
   location,
 }) => (
   <Layout>
-    <Seo title="Using TypeScript" />
     <h1>
       Gatsby supports <b>TypeScript by default</b>
     </h1>
@@ -44,6 +43,8 @@ const UsingTypescript: React.FC<PageProps<DataProps>> = ({
   </Layout>
 )
 
+export const Head: HeadFC<DataProps> = () => <Seo title="Using TypeScript" />
+
 export default UsingTypescript
 
 export const query = graphql`
diff --git a/starters/default/src/templates/using-dsg.js b/starters/default/src/templates/using-dsg.js
index f2306afec4ddd..9a84c728815c9 100644
--- a/starters/default/src/templates/using-dsg.js
+++ b/starters/default/src/templates/using-dsg.js
@@ -6,7 +6,6 @@ import Seo from "../components/seo"
 
 const UsingDSG = () => (
   <Layout>
-    <Seo title="Using DSG" />
     <h1>
       Hello from a <b>DSG Page</b>
     </h1>
@@ -22,4 +21,6 @@ const UsingDSG = () => (
   </Layout>
 )
 
+export const Head = () => <Seo title="Using DSG" />
+
 export default UsingDSG
diff --git a/starters/gatsby-starter-minimal-ts/src/pages/index.tsx b/starters/gatsby-starter-minimal-ts/src/pages/index.tsx
index fc1b356c06b5d..1299e9e7b02e7 100644
--- a/starters/gatsby-starter-minimal-ts/src/pages/index.tsx
+++ b/starters/gatsby-starter-minimal-ts/src/pages/index.tsx
@@ -154,7 +154,7 @@ const IndexPage = () => {
       </p>
       <ul style={doclistStyles}>
         {docLinks.map(doc => (
-          <li style={docLinkStyle}>
+          <li key={doc.url} style={docLinkStyle}>
             <a
               style={linkStyle}
               href={`${doc.url}?utm_source=starter&utm_medium=ts-docs&utm_campaign=minimal-starter-ts`}
diff --git a/starters/gatsby-starter-wordpress-blog/gatsby-config.js b/starters/gatsby-starter-wordpress-blog/gatsby-config.js
index 9f71aecf17353..bc7f644210eb1 100644
--- a/starters/gatsby-starter-wordpress-blog/gatsby-config.js
+++ b/starters/gatsby-starter-wordpress-blog/gatsby-config.js
@@ -54,9 +54,6 @@ module.exports = {
       },
     },
 
-    // See https://www.gatsbyjs.com/plugins/gatsby-plugin-react-helmet/?=gatsby-plugin-react-helmet
-    `gatsby-plugin-react-helmet`,
-
     /**
      * this (optional) plugin enables Progressive Web App + Offline functionality
      * To learn more, visit: https://gatsby.dev/offline
diff --git a/starters/gatsby-starter-wordpress-blog/gatsby-ssr.js b/starters/gatsby-starter-wordpress-blog/gatsby-ssr.js
new file mode 100644
index 0000000000000..5500b627a86c4
--- /dev/null
+++ b/starters/gatsby-starter-wordpress-blog/gatsby-ssr.js
@@ -0,0 +1,9 @@
+/**
+ * Implement Gatsby's SSR (Server Side Rendering) APIs in this file.
+ *
+ * See: https://www.gatsbyjs.com/docs/ssr-apis/
+ */
+
+exports.onRenderBody = ({ setHtmlAttributes }) => {
+  setHtmlAttributes({ lang: `en` })
+}
diff --git a/starters/gatsby-starter-wordpress-blog/package-lock.json b/starters/gatsby-starter-wordpress-blog/package-lock.json
index 2b1cd439cb09b..cec99d30d67e6 100644
--- a/starters/gatsby-starter-wordpress-blog/package-lock.json
+++ b/starters/gatsby-starter-wordpress-blog/package-lock.json
@@ -10284,14 +10284,6 @@
         "lodash": "^4.17.21"
       }
     },
-    "gatsby-plugin-react-helmet": {
-      "version": "5.19.0",
-      "resolved": "https://registry.npmjs.org/gatsby-plugin-react-helmet/-/gatsby-plugin-react-helmet-5.19.0.tgz",
-      "integrity": "sha512-XXrJYfHqoaUe57oAF+/ljPHncrvYk0UonES3aUwynbWsR8UXhQpdbwqIOYZPGQgPsc1X55Kzdo+/3pU1gA9ajQ==",
-      "requires": {
-        "@babel/runtime": "^7.15.4"
-      }
-    },
     "gatsby-plugin-sharp": {
       "version": "4.19.0",
       "resolved": "https://registry.npmjs.org/gatsby-plugin-sharp/-/gatsby-plugin-sharp-4.19.0.tgz",
@@ -14713,22 +14705,6 @@
       "resolved": "https://registry.npmjs.org/react-error-overlay/-/react-error-overlay-6.0.9.tgz",
       "integrity": "sha512-nQTTcUu+ATDbrSD1BZHr5kgSD4oF8OFjxun8uAaL8RwPBacGBNPf/yAuVVdx17N8XNzRDMrZ9XcKZHCjPW+9ew=="
     },
-    "react-fast-compare": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/react-fast-compare/-/react-fast-compare-2.0.4.tgz",
-      "integrity": "sha512-suNP+J1VU1MWFKcyt7RtjiSWUjvidmQSlqu+eHslq+342xCbGTYmC0mEhPCOHxlW0CywylOC1u2DFAT+bv4dBw=="
-    },
-    "react-helmet": {
-      "version": "5.2.1",
-      "resolved": "https://registry.npmjs.org/react-helmet/-/react-helmet-5.2.1.tgz",
-      "integrity": "sha512-CnwD822LU8NDBnjCpZ4ySh8L6HYyngViTZLfBBb3NjtrpN8m49clH8hidHouq20I51Y6TpCTISCBbqiY5GamwA==",
-      "requires": {
-        "object-assign": "^4.1.1",
-        "prop-types": "^15.5.4",
-        "react-fast-compare": "^2.0.2",
-        "react-side-effect": "^1.1.0"
-      }
-    },
     "react-is": {
       "version": "17.0.2",
       "resolved": "https://registry.npmjs.org/react-is/-/react-is-17.0.2.tgz",
@@ -14767,14 +14743,6 @@
       "resolved": "https://registry.npmjs.org/react-resize-aware/-/react-resize-aware-3.1.1.tgz",
       "integrity": "sha512-M8IyVLBN8D6tEUss+bxQlWte3ZYtNEGhg7rBxtCVG8yEBjUlZwUo5EFLq6tnvTZXcgAbCLjsQn+NCoTJKumRYg=="
     },
-    "react-side-effect": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/react-side-effect/-/react-side-effect-1.2.0.tgz",
-      "integrity": "sha512-v1ht1aHg5k/thv56DRcjw+WtojuuDHFUgGfc+bFHOWsF4ZK6C2V57DO0Or0GPsg6+LSTE0M6Ry/gfzhzSwbc5w==",
-      "requires": {
-        "shallowequal": "^1.0.1"
-      }
-    },
     "react-spring": {
       "version": "8.0.27",
       "resolved": "https://registry.npmjs.org/react-spring/-/react-spring-8.0.27.tgz",
@@ -15465,11 +15433,6 @@
       "resolved": "https://registry.npmjs.org/shallow-compare/-/shallow-compare-1.2.2.tgz",
       "integrity": "sha512-LUMFi+RppPlrHzbqmFnINTrazo0lPNwhcgzuAXVVcfy/mqPDrQmHAyz5bvV0gDAuRFrk804V0HpQ6u9sZ0tBeg=="
     },
-    "shallowequal": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/shallowequal/-/shallowequal-1.1.0.tgz",
-      "integrity": "sha512-y0m1JoUZSlPAjXVtPPW70aZWfIL/dSP7AFkRnniLCrK/8MDKog3TySTBmckD+RObVxH0v4Tox67+F14PdED2oQ=="
-    },
     "sharp": {
       "version": "0.30.7",
       "resolved": "https://registry.npmjs.org/sharp/-/sharp-0.30.7.tgz",
diff --git a/starters/gatsby-starter-wordpress-blog/package.json b/starters/gatsby-starter-wordpress-blog/package.json
index 70b875b306511..f157ed4d8e5d6 100644
--- a/starters/gatsby-starter-wordpress-blog/package.json
+++ b/starters/gatsby-starter-wordpress-blog/package.json
@@ -1,7 +1,7 @@
 {
   "name": "gatsby-starter-wordpress-blog",
   "private": true,
-  "description": "A starter for a blog powered by Gatsby and Markdown",
+  "description": "A starter for a blog powered by Gatsby and WordPress",
   "version": "1.0.0",
   "author": "Kyle Mathews <mathews.kyle@gmail.com> and Tyler Barnes <tylerdbarnes@gmail.com>",
   "bugs": {
@@ -14,7 +14,6 @@
     "gatsby-plugin-image": "^2.19.0",
     "gatsby-plugin-manifest": "^4.19.0",
     "gatsby-plugin-offline": "^5.19.0",
-    "gatsby-plugin-react-helmet": "^5.19.0",
     "gatsby-plugin-sharp": "^4.19.0",
     "gatsby-source-wordpress": "^6.19.0",
     "gatsby-transformer-sharp": "^4.19.0",
@@ -22,7 +21,6 @@
     "lodash": "^4.17.21",
     "react": "^16.12.0",
     "react-dom": "^16.12.0",
-    "react-helmet": "^5.2.1",
     "typeface-merriweather": "0.0.72",
     "typeface-montserrat": "0.0.75"
   },
@@ -30,14 +28,15 @@
     "dumper.js": "^1.3.1",
     "prettier": "2.7.1"
   },
-  "homepage": "https://github.com/gatsbyjs/gatsby-starter-blog#readme",
+  "homepage": "https://github.com/gatsbyjs/gatsby-starter-wordpress-blog#readme",
   "keywords": [
-    "gatsby"
+    "gatsby",
+    "wordpress"
   ],
   "license": "0BSD",
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/gatsbyjs/gatsby-starter-blog.git"
+    "url": "git+https://github.com/gatsbyjs/gatsby-starter-wordpress-blog.git"
   },
   "scripts": {
     "build": "gatsby build",
diff --git a/starters/gatsby-starter-wordpress-blog/src/components/seo.js b/starters/gatsby-starter-wordpress-blog/src/components/seo.js
index 1a8798c5f25b6..457bad6c34ec5 100644
--- a/starters/gatsby-starter-wordpress-blog/src/components/seo.js
+++ b/starters/gatsby-starter-wordpress-blog/src/components/seo.js
@@ -7,10 +7,9 @@
 
 import React from "react"
 import PropTypes from "prop-types"
-import { Helmet } from "react-helmet"
 import { useStaticQuery, graphql } from "gatsby"
 
-const SEO = ({ description, lang, meta, title }) => {
+const SEO = ({ description, title, children }) => {
   const { wp, wpUser } = useStaticQuery(
     graphql`
       query {
@@ -33,60 +32,27 @@ const SEO = ({ description, lang, meta, title }) => {
   const defaultTitle = wp.generalSettings?.title
 
   return (
-    <Helmet
-      htmlAttributes={{
-        lang,
-      }}
-      title={title}
-      titleTemplate={defaultTitle ? `%s | ${defaultTitle}` : null}
-      meta={[
-        {
-          name: `description`,
-          content: metaDescription,
-        },
-        {
-          property: `og:title`,
-          content: title,
-        },
-        {
-          property: `og:description`,
-          content: metaDescription,
-        },
-        {
-          property: `og:type`,
-          content: `website`,
-        },
-        {
-          name: `twitter:card`,
-          content: `summary`,
-        },
-        {
-          name: `twitter:creator`,
-          content: wpUser?.twitter || ``,
-        },
-        {
-          name: `twitter:title`,
-          content: title,
-        },
-        {
-          name: `twitter:description`,
-          content: metaDescription,
-        },
-      ].concat(meta)}
-    />
+    <>
+      <title> {defaultTitle ? `${title} | ${defaultTitle}` : title} </title>
+      <meta name="description" content={metaDescription} />
+      <meta property="og:title" content={title} />
+      <meta property="og:description" content={metaDescription} />
+      <meta property="og:type" content="website" />
+      <meta name="twitter:card" content="summary" />
+      <meta name="twitter:creator" content={wpUser?.twitter || ``} />
+      <meta name="twitter:title" content={title} />
+      <meta name="twitter:description" content={metaDescription} />
+      {children}
+    </>
   )
 }
 
 SEO.defaultProps = {
-  lang: `en`,
-  meta: [],
   description: ``,
 }
 
 SEO.propTypes = {
   description: PropTypes.string,
-  lang: PropTypes.string,
-  meta: PropTypes.arrayOf(PropTypes.object),
   title: PropTypes.string.isRequired,
 }
 
diff --git a/starters/gatsby-starter-wordpress-blog/src/pages/404.js b/starters/gatsby-starter-wordpress-blog/src/pages/404.js
index 606eacb497e89..2db590a94c12b 100644
--- a/starters/gatsby-starter-wordpress-blog/src/pages/404.js
+++ b/starters/gatsby-starter-wordpress-blog/src/pages/404.js
@@ -9,13 +9,14 @@ const NotFoundPage = ({ data, location }) => {
 
   return (
     <Layout location={location} title={siteTitle}>
-      <SEO title="404: Not Found" />
       <h1>404: Not Found</h1>
       <p>You just hit a route that doesn&#39;t exist... the sadness.</p>
     </Layout>
   )
 }
 
+const Head = () => <SEO title="404: Not Found" />
+
 export default NotFoundPage
 
 export const pageQuery = graphql`
diff --git a/starters/gatsby-starter-wordpress-blog/src/templates/Page.js b/starters/gatsby-starter-wordpress-blog/src/templates/Page.js
index 9a92889661181..a8125bf91545b 100644
--- a/starters/gatsby-starter-wordpress-blog/src/templates/Page.js
+++ b/starters/gatsby-starter-wordpress-blog/src/templates/Page.js
@@ -19,8 +19,6 @@ const PageTemplate = ({ data: { previous, next, post } }) => {
 
   return (
     <Layout>
-      <SEO title={post.title} description={post.excerpt} />
-
       <article
         className="blog-post"
         itemScope
@@ -83,6 +81,10 @@ const PageTemplate = ({ data: { previous, next, post } }) => {
   )
 }
 
+export const Head = ({ data: { post } }) => (
+  <SEO title={post.title} description={post.excerpt} />
+)
+
 export default PageTemplate
 
 export const pageQuery = graphql`
diff --git a/starters/gatsby-starter-wordpress-blog/src/templates/Post.js b/starters/gatsby-starter-wordpress-blog/src/templates/Post.js
index f11b1ad28a5dc..3f926988ad65d 100644
--- a/starters/gatsby-starter-wordpress-blog/src/templates/Post.js
+++ b/starters/gatsby-starter-wordpress-blog/src/templates/Post.js
@@ -19,8 +19,6 @@ const BlogPostTemplate = ({ data: { previous, next, post } }) => {
 
   return (
     <Layout>
-      <SEO title={post.title} description={post.excerpt} />
-
       <article
         className="blog-post"
         itemScope
@@ -83,6 +81,10 @@ const BlogPostTemplate = ({ data: { previous, next, post } }) => {
   )
 }
 
+export const Head = ({ data: { post } }) => (
+  <SEO title={post.title} description={post.excerpt} />
+)
+
 export default BlogPostTemplate
 
 export const pageQuery = graphql`
diff --git a/starters/gatsby-starter-wordpress-blog/src/templates/blog-post-archive.js b/starters/gatsby-starter-wordpress-blog/src/templates/blog-post-archive.js
index 42e5bcf217ced..d59cc66b9aa00 100644
--- a/starters/gatsby-starter-wordpress-blog/src/templates/blog-post-archive.js
+++ b/starters/gatsby-starter-wordpress-blog/src/templates/blog-post-archive.js
@@ -15,7 +15,6 @@ const BlogIndex = ({
   if (!posts.length) {
     return (
       <Layout isHomePage>
-        <SEO title="All posts" />
         <Bio />
         <p>
           No blog posts found. Add posts to your WordPress site and they'll
@@ -27,8 +26,6 @@ const BlogIndex = ({
 
   return (
     <Layout isHomePage>
-      <SEO title="All posts" />
-
       <Bio />
 
       <ol style={{ listStyle: `none` }}>
@@ -68,6 +65,8 @@ const BlogIndex = ({
   )
 }
 
+export const Head = () => <SEO title="All posts" />
+
 export default BlogIndex
 
 export const pageQuery = graphql`
diff --git a/yarn.lock b/yarn.lock
index a30366ce6b9a2..027d5650b4f1f 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1686,10 +1686,10 @@
   dependencies:
     jimp "^0.16.1"
 
-"@gatsbyjs/reach-router@^1.3.6":
-  version "1.3.6"
-  resolved "https://registry.yarnpkg.com/@gatsbyjs/reach-router/-/reach-router-1.3.6.tgz#4e8225836959be247890b66f21a3198a0589e34d"
-  integrity sha512-RW9ZBir9kqtw4IWm+Z+DLWGOeoJxoaTvNVrnR5fV9zD8EmfAhbBN/hS6i6VnTMFZ7rdd6mnpx2/XtnMvYfsaVQ==
+"@gatsbyjs/reach-router@^1.3.9":
+  version "1.3.9"
+  resolved "https://registry.yarnpkg.com/@gatsbyjs/reach-router/-/reach-router-1.3.9.tgz#305c3c4c5041f27e53fc33e344a08ee2c4b985af"
+  integrity sha512-/354IaUSM54xb7K/TxpLBJB94iEAJ3P82JD38T8bLnIDWF+uw8+W/82DKnQ7y24FJcKxtVmG43aiDLG88KSuYQ==
   dependencies:
     invariant "^2.2.3"
     prop-types "^15.6.1"
@@ -6153,6 +6153,14 @@ axios@^0.21.1:
   dependencies:
     follow-redirects "^1.10.0"
 
+axios@^0.27.0:
+  version "0.27.2"
+  resolved "https://registry.yarnpkg.com/axios/-/axios-0.27.2.tgz#207658cc8621606e586c85db4b41a750e756d972"
+  integrity sha512-t+yRIyySRTp/wua5xEr+z1q60QmLq8ABsS5O9Me1AsE5dfKqgnCFzwiCZZ/cGNd1lq4/7akDWMxdhVlucjmnOQ==
+  dependencies:
+    follow-redirects "^1.14.9"
+    form-data "^4.0.0"
+
 axobject-query@^2.2.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/axobject-query/-/axobject-query-2.2.0.tgz#943d47e10c0b704aa42275e20edf3722648989be"
@@ -7958,25 +7966,25 @@ contentful-resolve-response@^1.3.0:
   dependencies:
     fast-copy "^2.1.0"
 
-contentful-sdk-core@^6.8.5:
-  version "6.10.3"
-  resolved "https://registry.yarnpkg.com/contentful-sdk-core/-/contentful-sdk-core-6.10.3.tgz#983fd69257c239881c43cb83e3ce9f501acfbe4a"
-  integrity sha512-IUBkAU1sJuVaEa2Nv1NKK5ImqpBZ5Q3EmaCFmMZx/UHKa+i98nDCSTUBOL1aJnpZ/s3AaSramsh73VQ4aK2kyA==
+contentful-sdk-core@^7.0.1:
+  version "7.0.2"
+  resolved "https://registry.yarnpkg.com/contentful-sdk-core/-/contentful-sdk-core-7.0.2.tgz#5585880f546772246209de25256635ce31fd8d8e"
+  integrity sha512-HkBzzzJ3UGqOIJiTd4qMEMvn44ccrN7a75gEej28X1srGn05myRgJ/pWbmXJhtgpq/5gU7IURnynyKx/ecsOfg==
   dependencies:
-    fast-copy "^2.1.0"
+    fast-copy "^2.1.3"
     lodash.isplainobject "^4.0.6"
     lodash.isstring "^4.0.1"
     p-throttle "^4.1.1"
     qs "^6.9.4"
 
-contentful@^8.5.8:
-  version "8.5.8"
-  resolved "https://registry.yarnpkg.com/contentful/-/contentful-8.5.8.tgz#ad2f3549d1795310e104a6c33325352524f7bd77"
-  integrity sha512-6YyE95uDJYTyGKQYtqYrMzdDZe3sLkrC0UEnpXuIOeciGACRQP9ouTjRJnLMa5ONUPt0+UJh7JH3epNouPZWIw==
+contentful@^9.1.33:
+  version "9.1.33"
+  resolved "https://registry.yarnpkg.com/contentful/-/contentful-9.1.33.tgz#1305254c647578ad981eae59fae1abdb07b50b6a"
+  integrity sha512-iiu2cC/9JvDrTK6cfSHhZ1iW6dOq+NmYMA2p5Thpv+9h2pEOyoHm1Un9Xir5XZSB11bu4POmo6JazGAn9N0tqg==
   dependencies:
-    axios "^0.21.1"
+    axios "^0.27.0"
     contentful-resolve-response "^1.3.0"
-    contentful-sdk-core "^6.8.5"
+    contentful-sdk-core "^7.0.1"
     fast-copy "^2.1.0"
     json-stringify-safe "^5.0.1"
 
@@ -10885,6 +10893,11 @@ fast-copy@^2.1.0:
   resolved "https://registry.yarnpkg.com/fast-copy/-/fast-copy-2.1.1.tgz#f5cbcf2df64215e59b8e43f0b2caabc19848083a"
   integrity sha512-Qod3DdRgFZ8GUIM6ygeoZYpQ0QLW9cf/FS9KhhjlYggcSZXWAemAw8BOCO5LuYCrR3Uj3qXDVTUzOUwG8C7beQ==
 
+fast-copy@^2.1.3:
+  version "2.1.3"
+  resolved "https://registry.yarnpkg.com/fast-copy/-/fast-copy-2.1.3.tgz#bf6e05ac3cb7a9d66fbf12c51dd4440e9ddd4afb"
+  integrity sha512-LDzYKNTHhD+XOp8wGMuCkY4eTxFZOOycmpwLBiuF3r3OjOmZnURRD8t2dUAbmKuXGbo/MGggwbSjcBdp8QT0+g==
+
 fast-deep-equal@^3.1.1, fast-deep-equal@^3.1.3:
   version "3.1.3"
   resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz#3a7d56b559d6cbc3eb512325244e619a65c6c525"
@@ -11257,6 +11270,11 @@ follow-redirects@^1.10.0:
   resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.13.0.tgz#b42e8d93a2a7eea5ed88633676d6597bc8e384db"
   integrity sha512-aq6gF1BEKje4a9i9+5jimNFIpq4Q1WiwBToeRK5NvZBd/TRsmW8BsJfOEGkr76TbOyPVD3OVDN910EcUNtRYEA==
 
+follow-redirects@^1.14.9:
+  version "1.14.9"
+  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.14.9.tgz#dd4ea157de7bfaf9ea9b3fbd85aa16951f78d8d7"
+  integrity sha512-MQDfihBQYMcyy5dhRDJUHcw7lb2Pv/TuE6xP1vyraLukNDHKbDxDNaOE3NbCAdKQApno+GPRyo1YAp89yCjK4w==
+
 font-family-papandreou@^0.2.0-patch1, font-family-papandreou@^0.2.0-patch2:
   version "0.2.0-patch2"
   resolved "https://registry.yarnpkg.com/font-family-papandreou/-/font-family-papandreou-0.2.0-patch2.tgz#c75b659e96ffbc7ab2af651cf7b4910b334e8dd2"
@@ -21815,11 +21833,6 @@ retext@^7.0.1:
     retext-stringify "^2.0.0"
     unified "^8.0.0"
 
-retry-axios@^2.6.0:
-  version "2.6.0"
-  resolved "https://registry.yarnpkg.com/retry-axios/-/retry-axios-2.6.0.tgz#d4dc5c8a8e73982e26a705e46a33df99a28723e0"
-  integrity sha512-pOLi+Gdll3JekwuFjXO3fTq+L9lzMQGcSq7M5gIjExcl3Gu1hd4XXuf5o3+LuSBsaULQH7DiNbsqPd1chVpQGQ==
-
 retry@0.12.0, retry@^0.12.0:
   version "0.12.0"
   resolved "https://registry.yarnpkg.com/retry/-/retry-0.12.0.tgz#1b42a6266a21f07421d1b0b54b7dc167b01c013b"