diff --git a/.changeset/afraid-trainers-know.md b/.changeset/afraid-trainers-know.md
new file mode 100644
index 0000000000..5df3d3eced
--- /dev/null
+++ b/.changeset/afraid-trainers-know.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-auth-backend': patch
+---
+
+Fix a bug preventing an access token to be refreshed a second time with the GitLab provider.
diff --git a/.changeset/angry-ghosts-report.md b/.changeset/angry-ghosts-report.md
deleted file mode 100644
index dfa83663a9..0000000000
--- a/.changeset/angry-ghosts-report.md
+++ /dev/null
@@ -1,16 +0,0 @@
----
-'@backstage/backend-common': patch
----
-
-Support a `ensureExists` config option to skip ensuring a configured database exists. This allows deployment scenarios where
-limited permissions are given for provisioned databases without privileges to create new databases. If set to `false`, the
-database connection will not be validated prior to use which means the backend will not attempt to create the database if it
-doesn't exist. You can configure this in your app-config.yaml:
-
-```yaml
-backend:
-  database:
-    ensureExists: false
-```
-
-This defaults to `true` if unspecified. You can also configure this per plugin connection and will override the base option.
diff --git a/.changeset/angry-rules-fail.md b/.changeset/angry-rules-fail.md
deleted file mode 100644
index cc52d4478e..0000000000
--- a/.changeset/angry-rules-fail.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@backstage/plugin-catalog': patch
----
-
-Add unstable prop for disabling unregister entity menu
diff --git a/.changeset/brave-eggs-rush.md b/.changeset/brave-eggs-rush.md
new file mode 100644
index 0000000000..8e1a7ca86d
--- /dev/null
+++ b/.changeset/brave-eggs-rush.md
@@ -0,0 +1,6 @@
+---
+'@backstage/core-components': patch
+---
+
+Change the styling of the `<DependencyGraph>` to have more contrast in light
+mode. Nodes now have a design similar to material UI buttons.
diff --git a/.changeset/cuddly-rabbits-look.md b/.changeset/cuddly-rabbits-look.md
new file mode 100644
index 0000000000..421c97bbff
--- /dev/null
+++ b/.changeset/cuddly-rabbits-look.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-scaffolder-backend': patch
+---
+
+Action needed: If you are using the templates located at https://github.com/backstage/backstage/tree/master/ in your Backstage app directly using the URL via the `app-config.yaml`, you should copy over the templates inside your org and import from there. The templates have now been moved to https://github.com/backstage/software-templates. See https://github.com/backstage/backstage/issues/6415 for explanation.
diff --git a/.changeset/curly-badgers-sit.md b/.changeset/curly-badgers-sit.md
deleted file mode 100644
index ca740e907a..0000000000
--- a/.changeset/curly-badgers-sit.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@backstage/plugin-catalog-react': patch
----
-
-Store filter values set in `EntityListProvider` in query parameters. This allows selected filters to be restored when returning to pages that list catalog entities.
diff --git a/.changeset/curvy-timers-sit.md b/.changeset/curvy-timers-sit.md
new file mode 100644
index 0000000000..346fae9098
--- /dev/null
+++ b/.changeset/curvy-timers-sit.md
@@ -0,0 +1,5 @@
+---
+'@backstage/cli': patch
+---
+
+replace the deprecated file-loader for fonts with assets module
diff --git a/.changeset/fast-actors-grow.md b/.changeset/fast-actors-grow.md
new file mode 100644
index 0000000000..c1da84f744
--- /dev/null
+++ b/.changeset/fast-actors-grow.md
@@ -0,0 +1,16 @@
+---
+'@backstage/plugin-auth-backend': minor
+---
+
+Bump `passport-saml` to version 3. This is a breaking change, in that it [now requires](https://github.com/node-saml/passport-saml/pull/548) the `auth.saml.cert` parameter to be set. If you are not using SAML auth, you can ignore this.
+
+To update your settings, add something similar to the following to your app-config:
+
+```yaml
+auth:
+  saml:
+    # ... other settings ...
+    cert: 'MIICizCCAfQCCQCY8tKaMc0BMjANBgkqh ... W=='
+```
+
+For more information, see the [library README](https://github.com/node-saml/passport-saml#security-and-signatures).
diff --git a/.changeset/gorgeous-pugs-deliver.md b/.changeset/gorgeous-pugs-deliver.md
new file mode 100644
index 0000000000..82820baa67
--- /dev/null
+++ b/.changeset/gorgeous-pugs-deliver.md
@@ -0,0 +1,5 @@
+---
+'@backstage/cli': patch
+---
+
+Set the default TZ (Timezone) env for the test command to be UTC so any date related tests are consistent across timezones.
diff --git a/.changeset/green-vans-peel.md b/.changeset/green-vans-peel.md
deleted file mode 100644
index cd4d30139a..0000000000
--- a/.changeset/green-vans-peel.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@backstage/plugin-catalog-react': patch
----
-
-Fix `EntityTypeFilter` so it produces unique case-insensitive set of available types
diff --git a/.changeset/grumpy-beds-design.md b/.changeset/grumpy-beds-design.md
new file mode 100644
index 0000000000..afca4e0eb3
--- /dev/null
+++ b/.changeset/grumpy-beds-design.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-user-settings': patch
+---
+
+Fix import for `createPlugin` in example snippet
diff --git a/.changeset/grumpy-dolls-call.md b/.changeset/grumpy-dolls-call.md
deleted file mode 100644
index 13d96ecb1f..0000000000
--- a/.changeset/grumpy-dolls-call.md
+++ /dev/null
@@ -1,10 +0,0 @@
----
-'@backstage/plugin-catalog-react': minor
-'@backstage/plugin-scaffolder': patch
----
-
-Updated the software templates list page (`ScaffolderPage`) to use the `useEntityListProvider` hook from #5643. This reduces the code footprint, making it easier to customize the display of this page, and consolidates duplicate approaches to querying the catalog with filters.
-
-- The `useEntityTypeFilter` hook has been updated along with the underlying `EntityTypeFilter` to work with multiple values, to allow more flexibility for different user interfaces. It's unlikely that this change affects you; however, if you're using either of these directly, you'll need to update your usage.
-- `SearchToolbar` was renamed to `EntitySearchBar` and moved to `catalog-react` to be usable by other entity list pages
-- `UserListPicker` now has an `availableTypes` prop to restrict which user-related options to present
diff --git a/.changeset/hot-otters-taste.md b/.changeset/hot-otters-taste.md
new file mode 100644
index 0000000000..1e41f980f1
--- /dev/null
+++ b/.changeset/hot-otters-taste.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-newrelic': patch
+---
+
+Added pagination and searching to the table
diff --git a/.changeset/late-mangos-allow.md b/.changeset/late-mangos-allow.md
new file mode 100644
index 0000000000..e1e4fe1d56
--- /dev/null
+++ b/.changeset/late-mangos-allow.md
@@ -0,0 +1,28 @@
+---
+'@backstage/plugin-home': minor
+---
+
+The homepage `<Header />` is now part of the composable canvas (allowing you to add the <HomepageTimer />, for example).
+
+You will need to wrap your existing composed `<HomePage />` component in `<Page />`, `<Header />`, and `<Content />` components, like this:
+
+```diff
+// app/src/components/home/HomePage.tsx
+
++ import { Content, Header, Page, HomePageTimer } from '@backstage/core-components';
+
+export const HomePage = () => (
++  <Page themeId="home">
++    <Header title="Home">
++      <HomepageTimer />
++    </Header>
++    <Content>
+  <Grid container spacing={3}>
+    <Grid item xs={12}>
+      <HomePageSearchBar />
+    </Grid>
+    // ...
++    </Content>
++  </Page>
+);
+```
diff --git a/.changeset/lemon-crabs-confess.md b/.changeset/lemon-crabs-confess.md
deleted file mode 100644
index 0d87843df5..0000000000
--- a/.changeset/lemon-crabs-confess.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@backstage/plugin-scaffolder-backend': patch
----
-
-Updating fs-extra to 10.0.0 to handle broken symbolic links correctly
diff --git a/.changeset/lemon-dancers-taste.md b/.changeset/lemon-dancers-taste.md
deleted file mode 100644
index 0542fe4a54..0000000000
--- a/.changeset/lemon-dancers-taste.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-'@backstage/plugin-catalog-backend': patch
----
-
-The codeowners processor extracts the username of the primary owner and uses this as the owner field.
-Given the kind isn't specified this is assumed to be a group and so the link to the owner in the about card
-doesn't work. This change specifies the kind where the entity is a user. e.g:
-
-`@iain-b` -> `user:iain-b`
diff --git a/.changeset/neat-mugs-add.md b/.changeset/neat-mugs-add.md
new file mode 100644
index 0000000000..b90c95440d
--- /dev/null
+++ b/.changeset/neat-mugs-add.md
@@ -0,0 +1,7 @@
+---
+'@backstage/integration': patch
+---
+
+Fix Azure URL handling to properly support both repo shorthand (`/owner/_git/project`) and full URLs (`/owner/project/_git/repo`).
+
+Fix Azure DevOps Server URL handling by being able to parse URLs with hosts other than `dev.azure.com`. Note that the `api-version` used for API requests is currently `6.0`, meaning you need to support at least this version in your Azure DevOps Server instance.
diff --git a/.changeset/nice-bugs-beg.md b/.changeset/nice-bugs-beg.md
deleted file mode 100644
index c41b54b220..0000000000
--- a/.changeset/nice-bugs-beg.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@backstage/plugin-user-settings': minor
----
-
-Exported and renamed components from the `@backstage/plugin-user-settings` plugin , to be able to use it in the consumer side and customize the `SettingPage`
diff --git a/.changeset/perfect-keys-hide.md b/.changeset/perfect-keys-hide.md
new file mode 100644
index 0000000000..cab9967363
--- /dev/null
+++ b/.changeset/perfect-keys-hide.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-catalog-backend': patch
+---
+
+Fill in most missing type exports.
diff --git a/.changeset/polite-dragons-allow.md b/.changeset/polite-dragons-allow.md
new file mode 100644
index 0000000000..05eac53a1f
--- /dev/null
+++ b/.changeset/polite-dragons-allow.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-auth-backend': patch
+---
+
+Use a more informative error message if the configured OIDC identity provider does not provide a `userinfo_endpoint` in its metadata.
diff --git a/.changeset/polite-spies-judge.md b/.changeset/polite-spies-judge.md
deleted file mode 100644
index 075bcf1598..0000000000
--- a/.changeset/polite-spies-judge.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@backstage/plugin-scaffolder-backend-module-rails': patch
----
-
-updated paths to consider differences between platform (windows corrected)
diff --git a/.changeset/poor-otters-buy.md b/.changeset/poor-otters-buy.md
deleted file mode 100644
index b60cbddc1b..0000000000
--- a/.changeset/poor-otters-buy.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@backstage/plugin-scaffolder-backend': patch
----
-
-Add new `fetch:template` action which handles the same responsibilities as `fetch:cookiecutter` without the external dependency on `cookiecutter`. For information on migrating from `fetch:cookiecutter` to `fetch:template`, see the [migration guide](https://backstage.io/docs/features/software-templates/builtin-actions#migrating-from-fetch-cookiecutter-to-fetch-template) in the docs.
diff --git a/.changeset/poor-weeks-act.md b/.changeset/poor-weeks-act.md
new file mode 100644
index 0000000000..152ce4bfc6
--- /dev/null
+++ b/.changeset/poor-weeks-act.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-scaffolder': patch
+---
+
+Change the Categories filter to a dropdown component
diff --git a/.changeset/pretty-drinks-serve.md b/.changeset/pretty-drinks-serve.md
deleted file mode 100644
index a012aba11f..0000000000
--- a/.changeset/pretty-drinks-serve.md
+++ /dev/null
@@ -1,12 +0,0 @@
----
-'@backstage/plugin-scaffolder-backend': patch
----
-
-Scaffolder: Added an 'eq' handlebars helper for use in software template YAML files. This can be used to execute a step depending on the value of an input, e.g.:
-
-```yaml
-steps:
-  id: 'conditional-step'
-  action: 'custom-action'
-  if: '{{ eq parameters.myvalue "custom" }}',
-```
diff --git a/.changeset/real-beans-collect.md b/.changeset/real-beans-collect.md
new file mode 100644
index 0000000000..43dae9cd9a
--- /dev/null
+++ b/.changeset/real-beans-collect.md
@@ -0,0 +1,5 @@
+---
+'@backstage/backend-common': patch
+---
+
+Fix Azure `readTree` and `search` handling to properly support paths.
diff --git a/.changeset/real-plums-vanish.md b/.changeset/real-plums-vanish.md
deleted file mode 100644
index a653a6bdf2..0000000000
--- a/.changeset/real-plums-vanish.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@backstage/plugin-auth-backend': patch
----
-
-Add Sign In and Handler resolver for Microsoft provider
diff --git a/.changeset/rotten-pears-live.md b/.changeset/rotten-pears-live.md
new file mode 100644
index 0000000000..4353341c2e
--- /dev/null
+++ b/.changeset/rotten-pears-live.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-search-backend-module-elasticsearch': patch
+---
+
+Added rejectUnauthorized config option
diff --git a/.changeset/search-mighty-mice-collect.md b/.changeset/search-mighty-mice-collect.md
deleted file mode 100644
index bad91ff853..0000000000
--- a/.changeset/search-mighty-mice-collect.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-'@backstage/plugin-search-backend-node': minor
----
-
-Change return value of `SearchEngine.index` to `Promise<void>` to support
-implementation of external search engines.
diff --git a/.changeset/short-eggs-confess.md b/.changeset/short-eggs-confess.md
deleted file mode 100644
index 3fa240a347..0000000000
--- a/.changeset/short-eggs-confess.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@backstage/plugin-catalog-backend-module-ldap': patch
----
-
-Expose missing types used by the custom transformers
diff --git a/.changeset/short-mugs-drive.md b/.changeset/short-mugs-drive.md
new file mode 100644
index 0000000000..f2b34fd2c4
--- /dev/null
+++ b/.changeset/short-mugs-drive.md
@@ -0,0 +1,5 @@
+---
+'@backstage/core-components': patch
+---
+
+Improve UX for Login pop-up
diff --git a/.changeset/shy-rules-design.md b/.changeset/shy-rules-design.md
deleted file mode 100644
index 4f009e5aa8..0000000000
--- a/.changeset/shy-rules-design.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-'@backstage/plugin-scaffolder-backend': minor
----
-
-Updated inputs for the `publish:github:pull-request` action.
-
-Now requires a `repoUrl` instead of separate `owner` and `repo` inputs. This aligns with the output of the `RepoUrlPicker` ui field used by the pull-request sample template.
diff --git a/.changeset/silly-trainers-clean.md b/.changeset/silly-trainers-clean.md
new file mode 100644
index 0000000000..b4690a0e8f
--- /dev/null
+++ b/.changeset/silly-trainers-clean.md
@@ -0,0 +1,6 @@
+---
+'@backstage/core-app-api': patch
+'@backstage/core-plugin-api': patch
+---
+
+Switch to using utilities from `@backstage/version-bridge'.
diff --git a/.changeset/six-crabs-sit.md b/.changeset/six-crabs-sit.md
new file mode 100644
index 0000000000..9389906ee9
--- /dev/null
+++ b/.changeset/six-crabs-sit.md
@@ -0,0 +1,5 @@
+---
+'@backstage/core-components': patch
+---
+
+remove hard coded min height in page header
diff --git a/.changeset/strong-geese-hope.md b/.changeset/strong-geese-hope.md
new file mode 100644
index 0000000000..27da35743a
--- /dev/null
+++ b/.changeset/strong-geese-hope.md
@@ -0,0 +1,13 @@
+---
+'@backstage/backend-common': patch
+'@backstage/integration': patch
+'@backstage/techdocs-common': patch
+'@backstage/plugin-catalog': patch
+'@backstage/plugin-catalog-backend': patch
+'@backstage/plugin-catalog-import': patch
+'@backstage/plugin-scaffolder': patch
+'@backstage/plugin-scaffolder-backend': patch
+'@backstage/plugin-techdocs': patch
+---
+
+Upgrade git-parse-url to v11.6.0
diff --git a/.changeset/techdocs-small-bugs-exist.md b/.changeset/techdocs-small-bugs-exist.md
new file mode 100644
index 0000000000..5e7c01c1a4
--- /dev/null
+++ b/.changeset/techdocs-small-bugs-exist.md
@@ -0,0 +1,6 @@
+---
+'@backstage/plugin-home': patch
+---
+
+Adjust dependencies to `@types/react` and `react-router` to follow the pattern
+used by all other Backstage packages.
diff --git a/.changeset/techdocs-typescript-isnt-fun.md b/.changeset/techdocs-typescript-isnt-fun.md
deleted file mode 100644
index 9341c1c14a..0000000000
--- a/.changeset/techdocs-typescript-isnt-fun.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-'@backstage/plugin-techdocs-backend': patch
----
-
-It is no longer required to provide a generator and a preparer to the TechDocs
-router factory when running TechDocs in the "recommended" (e.g. externally
-prepared and generated docs) configuration.
diff --git a/.changeset/ten-dolls-ring.md b/.changeset/ten-dolls-ring.md
new file mode 100644
index 0000000000..8142d1f3c8
--- /dev/null
+++ b/.changeset/ten-dolls-ring.md
@@ -0,0 +1,6 @@
+---
+'@backstage/plugin-explore': patch
+---
+
+Make styling of groups tab in the explore page use the Backstage theme instead
+of hard coded colors. Change the layout to be full screen.
diff --git a/.changeset/tidy-shoes-occur.md b/.changeset/tidy-shoes-occur.md
new file mode 100644
index 0000000000..9ffac60f56
--- /dev/null
+++ b/.changeset/tidy-shoes-occur.md
@@ -0,0 +1,5 @@
+---
+'@backstage/integration': patch
+---
+
+Handle pagination on return results when fetch GitHub API to list selected repos
diff --git a/.changeset/unlucky-tables-repair.md b/.changeset/unlucky-tables-repair.md
new file mode 100644
index 0000000000..ed1222b6d6
--- /dev/null
+++ b/.changeset/unlucky-tables-repair.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-catalog': patch
+---
+
+Display entity titles on `EntityLayout` if defined
diff --git a/.changeset/wicked-jars-move.md b/.changeset/wicked-jars-move.md
new file mode 100644
index 0000000000..d2e9bc5446
--- /dev/null
+++ b/.changeset/wicked-jars-move.md
@@ -0,0 +1,6 @@
+---
+'@backstage/plugin-cloudbuild': patch
+---
+
+- Swaps over the plugin CloudBuild from using MomentJS to using Luxon for date formatting.
+- Fixes some React warnings generated by nested <p> elements.
diff --git a/.changeset/wise-rockets-smoke.md b/.changeset/wise-rockets-smoke.md
deleted file mode 100644
index c81d20519d..0000000000
--- a/.changeset/wise-rockets-smoke.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@backstage/backend-common': patch
----
-
-Document the default behavior of `statusCheck` option in `createStatusCheckRouter`.
diff --git a/.changeset/young-tables-reply.md b/.changeset/young-tables-reply.md
deleted file mode 100644
index e08a875c14..0000000000
--- a/.changeset/young-tables-reply.md
+++ /dev/null
@@ -1,16 +0,0 @@
----
-'@backstage/backend-common': patch
-'@backstage/cli': patch
-'@backstage/config-loader': patch
-'@backstage/create-app': patch
-'@backstage/techdocs-common': patch
-'@backstage/plugin-app-backend': patch
-'@backstage/plugin-auth-backend': patch
-'@backstage/plugin-catalog-backend': patch
-'@backstage/plugin-kubernetes-backend': patch
-'@backstage/plugin-rollbar-backend': patch
-'@backstage/plugin-scaffolder-backend': patch
-'@backstage/plugin-techdocs-backend': patch
----
-
-Revert the upgrade to `fs-extra@10.0.0` as that seemed to have broken all installs inexplicably.
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index fda500ed02..0854635a2b 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -8,17 +8,18 @@
 /docs/features/techdocs                     @backstage/techdocs-core
 /docs/features/search                       @backstage/techdocs-core
 /docs/assets/search                         @backstage/techdocs-core
-/plugins/code-coverage                      @alde @nissayeva
-/plugins/code-coverage-backend              @alde @nissayeva
+/plugins/code-coverage                      @backstage/reviewers @alde @nissayeva
+/plugins/code-coverage-backend              @backstage/reviewers @alde @nissayeva
 /plugins/cost-insights                      @backstage/silver-lining
-/plugins/cloudbuild                         @trivago/ebarrios
+/plugins/cloudbuild                         @backstage/reviewers @trivago/ebarrios
 /plugins/search                             @backstage/techdocs-core
 /plugins/search-*                           @backstage/techdocs-core
 /plugins/techdocs                           @backstage/techdocs-core
 /plugins/techdocs-backend                   @backstage/techdocs-core
-/plugins/ilert                              @yacut
+/plugins/ilert                              @backstage/reviewers @yacut
+/plugins/home                               @backstage/techdocs-core
 /packages/search-common                     @backstage/techdocs-core
 /packages/techdocs-common                   @backstage/techdocs-core
-/.changeset/cost-insights-*                 @backstage/silver-lining
+/.changeset/cost-insights-*                 @backstage/reviewers @backstage/silver-lining
 /.changeset/search-*                        @backstage/techdocs-core
 /.changeset/techdocs-*                      @backstage/techdocs-core
diff --git a/.github/styles/vocab.txt b/.github/styles/vocab.txt
index e6af881f1e..5c9d46ea8a 100644
--- a/.github/styles/vocab.txt
+++ b/.github/styles/vocab.txt
@@ -1,5 +1,6 @@
 abc
 accessors
+Anddddd
 Apdex
 api
 Api
@@ -14,6 +15,7 @@ Avro
 backrub
 Bigtable
 Billett
+Bitbucket
 Bitrise
 Blackbox
 bool
@@ -66,7 +68,6 @@ devs
 discoverability
 Discoverability
 dls
-docgen
 Dockerfile
 dockerfiles
 Dockerize
@@ -74,6 +75,7 @@ dockerode
 Docusaurus
 env
 Env
+elasticsearch
 esbuild
 eslint
 etag
@@ -82,6 +84,8 @@ facto
 failover
 Fargate
 Figma
+firehydrant
+FireHydrant
 Firekube
 Fiverr
 gitbeaker
@@ -137,6 +141,7 @@ maintainership
 makefile
 md
 memcache
+memoize
 memoized
 microservice
 microservices
@@ -210,8 +215,10 @@ repo
 Repo
 repos
 rerender
+rerenders
 Reusability
 reusability
+roadmaps
 rollbar
 Rollbar
 Rollup
@@ -220,6 +227,7 @@ Routable
 rst
 rsync
 ruleset
+runbook
 sam
 sanitization
 scaffolded
diff --git a/.github/workflows/chromatic-storybook-test.yml b/.github/workflows/chromatic-storybook-test.yml
index d189236987..4c64db309d 100644
--- a/.github/workflows/chromatic-storybook-test.yml
+++ b/.github/workflows/chromatic-storybook-test.yml
@@ -5,6 +5,7 @@ on:
       - '.github/workflows/chromatic-storybook-test.yml'
       - 'packages/storybook/**'
       - 'packages/core-components/src/**'
+      - '**/*.stories.tsx'
 
 jobs:
   chromatic:
@@ -50,4 +51,5 @@ jobs:
           # projetToken intentionally shared to allow collaborators to run Chromatic on forks
           # https://www.chromatic.com/docs/custom-ci-provider#run-chromatic-on-external-forks-of-open-source-projects
           projectToken: 9tzak77m9nj
-          storybookBuildDir: 'packages/storybook/dist'
+          workingDir: 'packages/storybook'
+          storybookBuildDir: 'dist'
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 7f013d10f8..d203fafa2c 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -105,11 +105,8 @@ jobs:
         run: git diff --quiet origin/master HEAD -- yarn.lock
         continue-on-error: true
 
-      - name: verify doc links
-        run: node scripts/verify-links.js
-
       - name: prettier
-        run: yarn prettier:check
+        run: yarn prettier:check '!ADOPTERS.md'
 
       - name: lock
         run: yarn lock:check
@@ -123,8 +120,12 @@ jobs:
       - name: type checking and declarations
         run: yarn tsc:full
 
-      - name: check api reports
-        run: yarn build:api-reports:only --ci
+        # We need to generate the API references as well, so that we can verify the doc links
+      - name: check api reports and generate API reference
+        run: yarn build:api-reports:only --ci --docs
+
+      - name: verify doc links
+        run: node scripts/verify-links.js
 
       - name: build changed packages
         if: ${{ steps.yarn-lock.outcome == 'success' }}
diff --git a/.github/workflows/e2e-win.yml b/.github/workflows/e2e-win.yml
index 1844700cea..3e2fbe0863 100644
--- a/.github/workflows/e2e-win.yml
+++ b/.github/workflows/e2e-win.yml
@@ -25,6 +25,13 @@ jobs:
 
     name: Node ${{ matrix.node-version }} on ${{ matrix.os }}
     steps:
+      # In order to have the create-app template function as if it was downloaded from NPM
+      # we need to make sure we checkout files with LF line endings only
+      - name: Set git to use LF
+        run: |
+          git config --global core.autocrlf false
+          git config --global core.eol lf
+
       - uses: actions/checkout@v2
 
       - name: use node.js ${{ matrix.node-version }}
diff --git a/.github/workflows/microsite-build-check.yml b/.github/workflows/microsite-build-check.yml
index 68a6c08cd9..73f63ed63a 100644
--- a/.github/workflows/microsite-build-check.yml
+++ b/.github/workflows/microsite-build-check.yml
@@ -27,9 +27,6 @@ jobs:
         with:
           node-version: ${{ matrix.node-version }}
 
-      - name: verify doc links
-        run: node scripts/verify-links.js
-
         # Skip caching of microsite dependencies, it keeps the global cache size
         # smaller, which make Windows builds a lot faster for the rest of the project.
       - name: yarn install
diff --git a/.github/workflows/microsite-with-storybook-deploy.yml b/.github/workflows/microsite-with-storybook-deploy.yml
index e8886b7d6b..47e18340eb 100644
--- a/.github/workflows/microsite-with-storybook-deploy.yml
+++ b/.github/workflows/microsite-with-storybook-deploy.yml
@@ -4,12 +4,6 @@ on:
   push:
     branches:
       - master
-    paths:
-      - '.github/workflows/microsite-with-storybook-deploy.yml'
-      - 'packages/storybook/**'
-      - 'packages/core-components/src/**'
-      - 'microsite/**'
-      - 'docs/**'
 
 jobs:
   deploy-microsite-and-storybook:
@@ -41,6 +35,9 @@ jobs:
         run: yarn install --frozen-lockfile
         working-directory: microsite
 
+      - name: build API reference
+        run: yarn build:api-docs
+
       - name: build microsite
         run: yarn build
         working-directory: microsite
diff --git a/.github/workflows/prettify.yml b/.github/workflows/prettify.yml
new file mode 100644
index 0000000000..4a34ff0c88
--- /dev/null
+++ b/.github/workflows/prettify.yml
@@ -0,0 +1,54 @@
+name: Prettier
+
+on:
+  push:
+    branches:
+      - master
+
+jobs:
+  autofix-markdown:
+    name: Autofix Markdown files using Prettier
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          # Fetch changes to previous commit - required for 'only_changed' in Prettier action
+          fetch-depth: 0
+
+      # Beginning of yarn setup, keep in sync between all workflows, see ci.yml
+      - name: use node.js ${{ matrix.node-version }}
+        uses: actions/setup-node@v1
+        with:
+          node-version: ${{ matrix.node-version }}
+          registry-url: https://registry.npmjs.org/ # Needed for auth
+      - name: cache all node_modules
+        id: cache-modules
+        uses: actions/cache@v2
+        with:
+          path: '**/node_modules'
+          key: ${{ runner.os }}-v${{ matrix.node-version }}-node_modules-${{ hashFiles('yarn.lock', '**/package.json') }}
+      - name: find location of global yarn cache
+        id: yarn-cache
+        if: steps.cache-modules.outputs.cache-hit != 'true'
+        run: echo "::set-output name=dir::$(yarn cache dir)"
+      - name: cache global yarn cache
+        uses: actions/cache@v2
+        if: steps.cache-modules.outputs.cache-hit != 'true'
+        with:
+          path: ${{ steps.yarn-cache.outputs.dir }}
+          key: ${{ runner.os }}-yarn-${{ hashFiles('yarn.lock') }}
+          restore-keys: |
+            ${{ runner.os }}-yarn-
+      - name: yarn install
+        run: yarn install --frozen-lockfile
+      # End of yarn setup
+
+      - name: Run Prettier on ADOPTERS.md
+        uses: creyD/prettier_action@v3.1
+        with:
+          # Modifies commit only if prettier autofixed the ADOPTERS.md
+          prettier_options: --config docs/prettier.config.js --write ADOPTERS.md
+          only_changed: true
+          commit_message: 'Autofix ADOPTERS.md using Prettier'
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/snyk-monitor.yml b/.github/workflows/snyk-monitor.yml
new file mode 100644
index 0000000000..0adb6c5bcb
--- /dev/null
+++ b/.github/workflows/snyk-monitor.yml
@@ -0,0 +1,51 @@
+name: Snyk Monitoring
+
+on:
+  workflow_dispatch:
+  push:
+    branches: [master]
+    paths:
+      - '.github/workflows/snyk-monitor.yml'
+      - '**/.snyk'
+      - '**/package.json'
+      - 'yarn.lock'
+
+# This workflow synchronizes the packages in this repo along with policies in
+# each .snyk file with the remote state in our snyk org. It allows us to define
+# ignore policies in the .snyk files and then have them show up in the snyk web
+# UI, and also automatically adds any new packages that are created.
+
+jobs:
+  sync:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - name: Monitor and Synchronize Snyk Policies
+        uses: snyk/actions/node@master
+        with:
+          command: monitor
+          args: >
+            --yarn-workspaces
+            --org=backstage-dgh
+            --strict-out-of-sync=false
+            --remote-repo-url=https://github.com/backstage/backstage
+        env:
+          SNYK_TOKEN: ${{ secrets.SNYK_TOKEN }}
+
+      # Above we run the `monitor` command, this runs the `test` command which is
+      # the one that generates the SARIF report that we can upload to GitHub.
+      - name: Create Snyk report
+        uses: snyk/actions/node@master
+        continue-on-error: true # To make sure that SARIF upload gets called
+        with:
+          args: >
+            --yarn-workspaces
+            --org=backstage-dgh
+            --strict-out-of-sync=false
+            --sarif-file-output=snyk.sarif
+        env:
+          SNYK_TOKEN: ${{ secrets.SNYK_TOKEN }}
+      - name: Upload Snyk report
+        uses: github/codeql-action/upload-sarif@v1
+        with:
+          sarif_file: snyk.sarif
diff --git a/.imgbotconfig b/.imgbotconfig
index f337e087dc..2f4af2ed5e 100644
--- a/.imgbotconfig
+++ b/.imgbotconfig
@@ -1,5 +1,3 @@
 {
-  "ignoredFiles": [
-    "docs/assets/**/*.svg"
-  ]
+  "ignoredFiles": ["docs/assets/**/*.svg"]
 }
diff --git a/ADOPTERS.md b/ADOPTERS.md
index 1dcd4a774f..18d1388936 100644
--- a/ADOPTERS.md
+++ b/ADOPTERS.md
@@ -1,39 +1,47 @@
-| Organization                                      | Contact                                                                                                                                                                                             | Description of Use                                                                                                                                                                                    |
-| ------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| [Spotify](https://www.spotify.com)                | [@leemills83](https://github.com/leemills83)                                                                                                                                                        | Main interface towards all of Spotify's infrastructure and technical documentation.                                                                                                                   |
-| [bol.com](https://www.bol.com)                    | [@sagacity](https://github.com/sagacity)                                                                                                                                                            | Initial work being done to unify platform tooling.                                                                                                                                                    |
-| [DFDS](https://www.dfds.com)                      | [@carlsendk](https://github.com/carlsendk)                                                                                                                                                          | V2 self-service platform.                                                                                                                                                                             |
-| [Roadie](https://roadie.io)                       | [@dtuite](https://github.com/dtuite)                                                                                                                                                                | Hosted, managed Backstage with easy set-up                                                                                                                                                            |
-| [Roku](https://www.roku.com)                      | [@timurista](https://github.com/timurista)                                                                                                                                                          | Initial work on Cloud engineering service platform.                                                                                                                                                   |
-| [SDA SE](https://sda.se)                          | [@Fox32](https://github.com/Fox32)                                                                                                                                                                  | Central place for developing and sharing services in our insurance ecosystem.                                                                                                                         |
-| [H-E-B](https://www.heb.com)                      | [@german-j-rodriguez](https://github.com/german-j-rodriguez)                                                                                                                                        | Initial work on Engineering Portal service platform.                                                                                                                                                  |
-| [American Airlines](https://www.aa.com)           | [@paulpach](https://github.com/paulpach)                                                                                                                                                            | Central place for developers to develop and maintain applications                                                                                                                                     |
-| [Kiwi.com](https://kiwi.com)                      | [@aexvir](https://github.com/aexvir)                                                                                                                                                                | Replacing the frontend of [The Zoo](https://github.com/kiwicom/the-zoo), their service registry.                                                                                                      |
-| [Voi](https://www.voiscooters.com/)               | [@K-Phoen](https://github.com/K-Phoen)                                                                                                                                                              | Developer portal, main gateway to our infrastructure, documentation and internal tooling.                                                                                                             |
-| [Talkdesk](https://www.talkdesk.com)              | [@jaime-talkdesk](https://github.com/jaime-talkdesk)                                                                                                                                                | Initial work for Engineering Portal and Self Provisioning to R&D                                                                                                                                      |
-| [Wealthsimple](https://www.wealthsimple.com)      | [@andrewthauer](https://github.com/andrewthauer)                                                                                                                                                    | Developer portal, service catalog, documentation and tooling                                                                                                                                          |
-| [Grab](https://www.grab.com)                      | [@althafh](https://github.com/althafh)                                                                                                                                                              | Initial work as a unified interface for all of Grab's internal tooling                                                                                                                                |
-| [Telenor Sweden](https://www.telenor.se)          | [@O5ten](https://github.com/O5ten)                                                                                                                                                                  | Building a developer portal for scaffolding projects towards our unified build environment and microservice stacks                                                                                    |
-| [Fiverr](https://www.fiverr.com)                  | [@nirga](https://github.com/nirga)                                                                                                                                                                  | Unifying separate tools that developers are using today (i.e. monitoring, dead letter queues management, etc.) into a single platform.                                                                |
-| [Zalando SE](https://www.zalando.de)              | [@leviferreira](https://github.com/leviferreira)                                                                                                                                                    | Building V2 of the Internal Development Portal.                                                                                                                                                       |
-| [LegalZoom](https://legalzoom.com)                | [@backjo](https://github.com/backjo)                                                                                                                                                                | Developer portal - hub for all engineering projects and metadata.                                                                                                                                     |
-| [Expedia Group](https://www.expediagroup.com)     | [Mike Turner](mailto:miturner@expediagroup.com), [Sneha Kumar](mailto:snkumar@expediagroup.com), [@guillermomanzo](https://github.com/guillermomanzo), [Erik Lindgren](https://github.com/lindgren) | EG Common Developer Toolkit                                                                                                                                                                           |
-| [Paddle.com](https://paddle.com)                  | [Ioannis Georgoulas](https://github.com/geototti21)                                                                                                                                                 | Developer portal (Tech Docs, Service Catalog, Internal Tooling), we use vanilla Backstage FE and custom BE implementation in Go                                                                       |
-| [Acast.com](https://acast.com)                    | [Olle Lundberg](https://github.com/lndbrg)                                                                                                                                                          | Developer portal with tech docs, service catalog and a bunch of other internal tooling                                                                                                                |
-| [Lunar](https://lunar.app)                        | [Jacob Valdemar](https://github.com/JacobValdemar)                                                                                                                                                  | Internal developer portal for service overview and insights, API documentation, technical guides, onboarding guides and RFC's.                                                                        |
-| [Trendyol](https://trendyol.com)                  | [Erdogan Oksuz](https://github.com/erdoganoksuz)                                                                                                                                                    | The Developer Portal has been called `Pandora`. Provides an overview of Trendyol tech ecosystem. TechDocs, Catalog, Custom Plugins and Theme.                                                         |
-| [Peloton](https://www.onepeloton.com/)            | [Jim Haughwout](https://github.com/JimHaughwout)                                                                                                                                                    | Creating our first developer portal and tech-docs. Exploring Service Catalog, Tech Insights and Cost Insights as well.                                                                                |
-| [TELUS](https://telus.com)                        | [Seb Barre](https://github.com/sbarre)                                                                                                                                                              | The Go-to place to find answers about development and delivery at TELUS.                                                                                                                              |
-| [Brex](https://www.brex.com/)                     | [Vamsi Chitters](https://github.com/vamsikc)                                                                                                                                                        | A centralized UI to understand how a service fits in the whole Brex architecture and manage a team’s engineering dependencies.                                                                        |
-| [Oriflame](https://www.oriflame.com/)             | [Oriflame](https://github.com/oriflame)                                                                                                                                                             | Internal developer portal for services, single page apps and packages overview, API documentation, technical guides, tech-radar and more.                                                             |
-| [Booz Allen Hamilton](https://www.boozallen.com/) | [Jason Miller](https://github.com/JasonMiller-BAH)                                                                                                                                                  | Developer portal for a full-stack software development ecosystem that accelerates consistent and repeatable Modern Software Development practices for internal innovation and investments.            |
-| [Netflix](https://www.netflix.com/)               | [bleathem](https://github.com/bleathem)                                                                                                                                                             | Our Backstage implementation will be the front door to a unified experience connecting our internal platform products across important workflows with integrated knowledge and support.               |
-| [b.well](https://www.icanbwell.com/)              | [Jacob Rosales](https://github.com/jrosales)                                                                                                                                                        | Foundation for our engineering portal and cloud insights.                                                                                                                                             |
-| [PagerDuty](https://www.pagerduty.com/)           | [Mark Shaw](https://github.com/markshawtoronto)                                                                                                                                                     | Developer portal, initially focused on software templates and tech-docs.                                                                                                                              |
-| [MoonShiner](https://moonshiner.at)               | [Fabian Hippmann](https://github.com/FabianHippmann)                                                                                                                                                | Developer portal - helps us keep track of our customer projects, onboard new developers & improve our development process 🌕🚀🧑‍🚀                                                                   |
-| [FundApps](https://www.fundapps.co/)              | [Elliot Greenwood](https://github.com/egnwd)                                                                                                                                                        | Developer Portal - A place for us to keep track of our projects and documentation for all services and processes                                                                                      |
-| [DAZN](https://dazn.com/)                         | [Lou Bichard](https://twitter.com/loujaybee), [Marco Crivellaro](https://github.com/crivetechie), [Alex Hollerith](mailto:alex.hollerith@dazn.com)                                                  | Ingesting all of DAZN's repos for the catalog, migrating our internal platform apps (pull request boards, release information, inner source marketplace etc) to Backstage plugins (where applicable). |
-| [HelloFresh](https://www.hellofresh.de/)          | [@iammuho](https://github.com/iammuho), [@ElenaForester](https://github.com/ElenaForester), [@diegomarangoni](https://github.com/diegomarangoni)                                                    | Our developer portal at HelloFresh - Spread across an organisation of 500+ engineers globally.                                                                                                        |
-| [FactSet](https://www.factset.com/)               | [@kuangp](https://github.com/kuangp)                                                                                                                                                                | Developer portal to provide discoverability to all internal components, APIs, documentation, and scaffold templates with integrations to our internal infrastructure tools.                           |
-| [Workrise](https://www.workrise.com/)             | [Michael Rode](https://github.com/michaelrode)                                                                                                                                                      | Developer portal, main gateway to our infrastructure, documentation and internal tooling.                                                                                                             |
-| [RedVentures](https://www.redventures.com/)       | [Chris Diaz](https://github.com/codingdiaz)                                                                                                                                                         | Developer portal that brings everything an engineer needs to provide value into a single pane of glass.                                                                                               |
+| Organization                                                             | Contact                                                                                                                                                                                             | Description of Use                                                                                                                                                                                    |
+| ------------------------------------------------------------------------ | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| [Spotify](https://www.spotify.com)                                       | [@leemills83](https://github.com/leemills83)                                                                                                                                                        | Main interface towards all of Spotify's infrastructure and technical documentation.                                                                                                                   |
+| [bol.com](https://www.bol.com)                                           | [@sagacity](https://github.com/sagacity)                                                                                                                                                            | Initial work being done to unify platform tooling.                                                                                                                                                    |
+| [DFDS](https://www.dfds.com)                                             | [@carlsendk](https://github.com/carlsendk)                                                                                                                                                          | V2 self-service platform.                                                                                                                                                                             |
+| [Roadie](https://roadie.io)                                              | [@dtuite](https://github.com/dtuite)                                                                                                                                                                | Hosted, managed Backstage with easy set-up                                                                                                                                                            |
+| [Roku](https://www.roku.com)                                             | [@timurista](https://github.com/timurista)                                                                                                                                                          | Initial work on Cloud engineering service platform.                                                                                                                                                   |
+| [SDA SE](https://sda.se)                                                 | [@Fox32](https://github.com/Fox32)                                                                                                                                                                  | Central place for developing and sharing services in our insurance ecosystem.                                                                                                                         |
+| [H-E-B](https://www.heb.com)                                             | [@german-j-rodriguez](https://github.com/german-j-rodriguez)                                                                                                                                        | Initial work on Engineering Portal service platform.                                                                                                                                                  |
+| [American Airlines](https://www.aa.com)                                  | [@paulpach](https://github.com/paulpach)                                                                                                                                                            | Central place for developers to develop and maintain applications                                                                                                                                     |
+| [Kiwi.com](https://kiwi.com)                                             | [@aexvir](https://github.com/aexvir)                                                                                                                                                                | Replacing the frontend of [The Zoo](https://github.com/kiwicom/the-zoo), their service registry.                                                                                                      |
+| [Voi](https://www.voiscooters.com/)                                      | [@K-Phoen](https://github.com/K-Phoen)                                                                                                                                                              | Developer portal, main gateway to our infrastructure, documentation and internal tooling.                                                                                                             |
+| [Talkdesk](https://www.talkdesk.com)                                     | [@jaime-talkdesk](https://github.com/jaime-talkdesk)                                                                                                                                                | Initial work for Engineering Portal and Self Provisioning to R&D                                                                                                                                      |
+| [Wealthsimple](https://www.wealthsimple.com)                             | [@andrewthauer](https://github.com/andrewthauer)                                                                                                                                                    | Developer portal, service catalog, documentation and tooling                                                                                                                                          |
+| [Grab](https://www.grab.com)                                             | [@althafh](https://github.com/althafh)                                                                                                                                                              | Initial work as a unified interface for all of Grab's internal tooling                                                                                                                                |
+| [Telenor Sweden](https://www.telenor.se)                                 | [@O5ten](https://github.com/O5ten)                                                                                                                                                                  | Building a developer portal for scaffolding projects towards our unified build environment and microservice stacks                                                                                    |
+| [Fiverr](https://www.fiverr.com)                                         | [@nirga](https://github.com/nirga)                                                                                                                                                                  | Unifying separate tools that developers are using today (i.e. monitoring, dead letter queues management, etc.) into a single platform.                                                                |
+| [Zalando SE](https://www.zalando.de)                                     | [@leviferreira](https://github.com/leviferreira)                                                                                                                                                    | Building V2 of the Internal Development Portal.                                                                                                                                                       |
+| [LegalZoom](https://legalzoom.com)                                       | [@backjo](https://github.com/backjo)                                                                                                                                                                | Developer portal - hub for all engineering projects and metadata.                                                                                                                                     |
+| [Expedia Group](https://www.expediagroup.com)                            | [Mike Turner](mailto:miturner@expediagroup.com), [Sneha Kumar](mailto:snkumar@expediagroup.com), [@guillermomanzo](https://github.com/guillermomanzo), [Erik Lindgren](https://github.com/lindgren) | EG Common Developer Toolkit                                                                                                                                                                           |
+| [Paddle.com](https://paddle.com)                                         | [Ioannis Georgoulas](https://github.com/geototti21)                                                                                                                                                 | Developer portal (Tech Docs, Service Catalog, Internal Tooling), we use vanilla Backstage FE and custom BE implementation in Go                                                                       |
+| [Acast.com](https://acast.com)                                           | [Olle Lundberg](https://github.com/lndbrg)                                                                                                                                                          | Developer portal with tech docs, service catalog and a bunch of other internal tooling                                                                                                                |
+| [Lunar](https://lunar.app)                                               | [Jacob Valdemar](https://github.com/JacobValdemar)                                                                                                                                                  | Internal developer portal for service overview and insights, API documentation, technical guides, onboarding guides and RFC's.                                                                        |
+| [Trendyol](https://trendyol.com)                                         | [Gamze Senturk](https://github.com/gmzsenturk), [Mert Can Bilgic](https://github.com/mertcb)                                                                                                        | The Developer Portal has been called `Pandora`. Provides an overview of Trendyol tech ecosystem. TechDocs, Catalog, Custom Plugins and Theme.                                                         |
+| [Peloton](https://www.onepeloton.com/)                                   | [Jim Haughwout](https://github.com/JimHaughwout)                                                                                                                                                    | Creating our first developer portal and tech-docs. Exploring Service Catalog, Tech Insights and Cost Insights as well.                                                                                |
+| [TELUS](https://telus.com)                                               | [Seb Barre](https://github.com/sbarre)                                                                                                                                                              | The Go-to place to find answers about development and delivery at TELUS.                                                                                                                              |
+| [Brex](https://www.brex.com/)                                            | [Vamsi Chitters](https://github.com/vamsikc)                                                                                                                                                        | A centralized UI to understand how a service fits in the whole Brex architecture and manage a team’s engineering dependencies.                                                                        |
+| [Oriflame](https://www.oriflame.com/)                                    | [Oriflame](https://github.com/oriflame)                                                                                                                                                             | Internal developer portal for services, single page apps and packages overview, API documentation, technical guides, tech-radar and more.                                                             |
+| [Booz Allen Hamilton](https://www.boozallen.com/)                        | [Jason Miller](https://github.com/JasonMiller-BAH)                                                                                                                                                  | Developer portal for a full-stack software development ecosystem that accelerates consistent and repeatable Modern Software Development practices for internal innovation and investments.            |
+| [Netflix](https://www.netflix.com/)                                      | [bleathem](https://github.com/bleathem)                                                                                                                                                             | Our Backstage implementation will be the front door to a unified experience connecting our internal platform products across important workflows with integrated knowledge and support.               |
+| [b.well](https://www.icanbwell.com/)                                     | [Jacob Rosales](https://github.com/jrosales)                                                                                                                                                        | Foundation for our engineering portal and cloud insights.                                                                                                                                             |
+| [PagerDuty](https://www.pagerduty.com/)                                  | [Mark Shaw](https://github.com/markshawtoronto)                                                                                                                                                     | Developer portal, initially focused on software templates and tech-docs.                                                                                                                              |
+| [MoonShiner](https://moonshiner.at)                                      | [Fabian Hippmann](https://github.com/FabianHippmann)                                                                                                                                                | Developer portal - helps us keep track of our customer projects, onboard new developers & improve our development process 🌕🚀🧑‍🚀                                                                   |
+| [FundApps](https://www.fundapps.co/)                                     | [Elliot Greenwood](https://github.com/egnwd)                                                                                                                                                        | Developer Portal - A place for us to keep track of our projects and documentation for all services and processes                                                                                      |
+| [DAZN](https://dazn.com/)                                                | [Lou Bichard](https://twitter.com/loujaybee), [Marco Crivellaro](https://github.com/crivetechie), [Alex Hollerith](mailto:alex.hollerith@dazn.com)                                                  | Ingesting all of DAZN's repos for the catalog, migrating our internal platform apps (pull request boards, release information, inner source marketplace etc) to Backstage plugins (where applicable). |
+| [HelloFresh](https://www.hellofresh.de/)                                 | [@iammuho](https://github.com/iammuho), [@ElenaForester](https://github.com/ElenaForester), [@diegomarangoni](https://github.com/diegomarangoni)                                                    | Our developer portal at HelloFresh - Spread across an organisation of 500+ engineers globally.                                                                                                        |
+| [FactSet](https://www.factset.com/)                                      | [@kuangp](https://github.com/kuangp)                                                                                                                                                                | Developer portal to provide discoverability to all internal components, APIs, documentation, and scaffold templates with integrations to our internal infrastructure tools.                           |
+| [Workrise](https://www.workrise.com/)                                    | [Michael Rode](https://github.com/michaelrode)                                                                                                                                                      | Developer portal, main gateway to our infrastructure, documentation and internal tooling.                                                                                                             |
+| [RedVentures](https://www.redventures.com/)                              | [Chris Diaz](https://github.com/codingdiaz)                                                                                                                                                         | Developer portal that brings everything an engineer needs to provide value into a single pane of glass.                                                                                               |
+| [MavTek](https://www.mavtek.com/)                                        | [@fgascon](https://github.com/fgascon)                                                                                                                                                              | Developer portal focused on standardizing practices, centralizing documentation and streamlining developer practices.                                                                                 |
+| [QuintoAndar](https://www.quintoandar.com.br/)                           | [@quintoandar](https://github.com/quintoandar)                                                                                                                                                      | Developer portal, services catalog and centralization of service metrics.                                                                                                                             |
+| [empathy.co](https://empathy.co/)                                        | [@guillermotti](https://github.com/guillermotti)                                                                                                                                                    | Developer portal for tech docs, service catalog, plugin discovery and much more.                                                                                                                      |
+| [creditas.com](https://creditas.com/)                                    | [@aureliosaraiva](https://github.com/aureliosaraiva) [@Creditas](https://github.com/creditas)                                                                                                       | Centralization of all services, standards, documentation, etc. We started the deployment process.                                                                                                     |
+| [Prisjakt](https://www.prisjakt.nu) / [PriceSpy](https://pricespy.co.uk) | [@kennylindahl](https://github.com/kennylindahl)                                                                                                                                                    | Internal developer portal - Documentation, scaffolding, software catalog, TechRadar, Gitlab org data integration                                                                                      |
+| [Powerspike](https://powerspike.tv/)                                     | [@trelore](https://github.com/trelore)                                                                                                                                                              | Developer portal for documentation of core libraries and repositories.                                                                                                                                |
+| [2U](https://2u.com)                                                     | [Andrew Thal](https://github.com/athal7)      | Development team home-base, promoting service discoverability, resource dependencies, and tech radar |
+| [Taxfix](https://taxfix.de/)                                                     | [Sami Ur Rehman](https://github.com/samiurrehman92)      | Developer's portal with software catalog at it's core. Hosts API Specs, Tech Docs, Tech Radar and some custom plugins.  |
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 2caa8c9c9c..466c77c575 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -116,7 +116,7 @@ In general, changesets are not needed for the documentation, build utilities, co
 
 1. Run `yarn changeset`
 2. Select which packages you want to include a changeset for
-3. Select impact of change that you're introducing (patch, minor, or major)
+3. Select impact of change that you're introducing, using `minor` for breaking changes and `patch` otherwise. We do not use `major` changes while packages are at version `0.x`.
 4. Add generated changeset to Git
 5. Push the commit with your changeset to the branch associated with your PR
 6. Accept our gratitude for making the release process easier on the maintainers
diff --git a/README.md b/README.md
index 98da194c1b..1078631926 100644
--- a/README.md
+++ b/README.md
@@ -2,8 +2,6 @@
 
 # [Backstage](https://backstage.io)
 
-_During the month of July the majority of the maintainers will be on summer vacation 🏖️ Development will continue as usual, but expect a slower pace for discussions and PR reviews. Why not take this opportunity to [build a plugin](https://backstage.io/docs/plugins/)?_
-
 [![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://opensource.org/licenses/Apache-2.0)
 [![CNCF Status](https://img.shields.io/badge/cncf%20status-sandbox-blue.svg)](https://www.cncf.io/projects)
 [![Main CI Build](https://github.com/backstage/backstage/workflows/Main%20Master%20Build/badge.svg)](https://github.com/backstage/backstage/actions?query=workflow%3A%22Main+Master+Build%22)
@@ -63,3 +61,9 @@ Check out [the documentation](https://backstage.io/docs/getting-started) on how
 Copyright 2020-2021 © The Backstage Authors. All rights reserved. The Linux Foundation has registered trademarks and uses trademarks. For a list of trademarks of The Linux Foundation, please see our Trademark Usage page: https://www.linuxfoundation.org/trademark-usage
 
 Licensed under the Apache License, Version 2.0: http://www.apache.org/licenses/LICENSE-2.0
+
+## Security
+
+Please report sensitive security issues via Spotify's [bug-bounty program](https://hackerone.com/spotify) rather than GitHub.
+
+For further details please see our complete [security release process](SECURITY.md).
diff --git a/SECURITY.md b/SECURITY.md
index 3ec51b4210..ba96c694ee 100644
--- a/SECURITY.md
+++ b/SECURITY.md
@@ -9,3 +9,30 @@
 ## Reporting a Vulnerability
 
 Please report sensitive security issues via Spotify's [bug-bounty program](https://hackerone.com/spotify) rather than GitHub.
+
+If you have questions about a potential vulnerability, please reach out on Discord by asking for a maintainer in the `#support` channel, or via direct message to a maintainer.
+
+## Remediation and Notification Process
+
+Vulnerabilities are handled and published through [GitHub Security Advisories](https://docs.github.com/en/code-security/security-advisories/about-github-security-advisories).
+
+In the event of a vulnerability the runbook for the maintainers is as follows:
+
+1. Create a [new draft security advisory](https://github.com/backstage/backstage/security/advisories/new). The values and descriptions don't need to be perfect to begin with as they can be edited later. For severity, use the "Assess severity using CVSS" and refer to [the guide](https://www.first.org/cvss/v3.1/user-guide) for help.
+2. Request a CVE identification number. It can take up to 72h for one to be assigned so be sure to do this early on.
+3. If there is not already a patch for the vulnerability, collaborate on one in a private fork:
+   1. Head to the security advisory on GitHub and [create a private fork](https://docs.github.com/en/code-security/security-advisories/collaborating-in-a-temporary-private-fork-to-resolve-a-security-vulnerability)
+   1. [Invite any collaborators](https://docs.github.com/en/code-security/security-advisories/adding-a-collaborator-to-a-security-advisory) from outside the maintainer team that should be part of creating a fix.
+   1. Create one or multiple Pull Requests with fixes towards the fork. Note that these PRs will not have CI checks run on them, so more care should be taken to run local validation. The PRs are also not merged like normal PRs, but are instead merged straight into the main repo all at once when the merge button is hit on the security advisory.
+4. Once the fix is ready in a PR or private fork and it is time to release it, there are a couple of options. Either merge into the main branch with a changeset and wait for a regular release, or do a quick release by manually bumping the version in `package.json` of the affected package, along with a manual `CHANGELOG.md` entry. Note that a quick release will only work if the package does not have any other pending changes that depend on pending changes in other packages, so be sure to manually check that first, and fall back to an early regular release if needed. In general it's best to stick with the regular release flow, with the quick release being used only for time sensitive fixes.
+5. Finalize and publish the security advisory. Note that once you hit the publish button it's no longer possible to edit the advisory. Just like the CVE number this can take up to 72h, and expect it to be slower than the CVE number request.
+
+## Vulnerability Policies
+
+Backstage uses Snyk vulnerability scans in order to make sure we minimize vulnerabilities in our dependencies and get notified of new vulnerabilities.
+
+There are many situations where a vulnerability does not affect a particular dependency because of how the vulnerable package is used. In that situation the package authors may choose to stay at the current version rather than bumping the dependency, leading to a warning in the vulnerability scans but no actual vulnerability.
+
+To work around this and other similar issues, Snyk provides a method to ignore vulnerabilities. In order to provide the best visibility and most utility to adopters of Backstage, we store these ignore rules in `.snyk` policy files. This allows adopters to rely on our ignore policies if they wish to do so.
+
+Adding a new ignore policy is done by creating or modifying an existing `.snyk` file within a package root. See the [Snyk Documentation](https://support.snyk.io/hc/en-us/articles/360007487097-The-snyk-file) for details on the syntax. Always include a description, full path, and time limit of the ignore policy.
diff --git a/app-config.yaml b/app-config.yaml
index b50de963ed..2fb75f718e 100644
--- a/app-config.yaml
+++ b/app-config.yaml
@@ -101,8 +101,10 @@ organization:
 # https://backstage.io/docs/features/techdocs/how-to-guides#how-to-migrate-from-techdocs-basic-to-recommended-deployment-approach
 techdocs:
   builder: 'local' # Alternatives - 'external'
-  generators:
-    techdocs: 'docker' # Alternatives - 'local'
+  generator:
+    runIn: 'docker'
+    # dockerImage: my-org/techdocs # use a custom docker image
+    # pullImage: true # or false to disable automatic pulling of image (e.g. if custom docker login is required)
   publisher:
     type: 'local' # Alternatives - 'googleGcs' or 'awsS3' or 'azureBlobStorage' or 'openStackSwift'. Read documentation for using alternatives.
 
@@ -131,6 +133,9 @@ kafka:
       brokers:
         - localhost:9092
 
+allure:
+  baseUrl: http://localhost:5050/allure-docker-service
+
 integrations:
   github:
     - host: github.com
@@ -150,12 +155,21 @@ integrations:
     - host: bitbucket.org
       username: ${BITBUCKET_USERNAME}
       appPassword: ${BITBUCKET_APP_PASSWORD}
+    ### Example for how to add your bitbucket server instance using the API:
+    # - host: server.bitbucket.com
+    #   apiBaseUrl: server.bitbucket.com
+    #   username: ${BITBUCKET_SERVER_USERNAME}
+    #   appPassword: ${BITBUCKET_SERVER_APP_PASSWORD}
   azure:
     - host: dev.azure.com
       token: ${AZURE_TOKEN}
-#  googleGcs:
-#    clientEmail: 'example@example.com'
-#    privateKey: ${GCS_PRIVATE_KEY}
+  #  googleGcs:
+  #    clientEmail: 'example@example.com'
+  #    privateKey: ${GCS_PRIVATE_KEY}
+  awsS3:
+    - host: amazonaws.com
+      accessKeyId: ${AWS_ACCESS_KEY_ID}
+      secretAccessKey: ${AWS_SECRET_ACCESS_KEY}
 
 catalog:
   rules:
@@ -254,6 +268,8 @@ scaffolder:
   # defaultAuthor:
   #   name: Scaffolder
   #   email: scaffolder@backstage.io
+  # Use to customize the default commit message when new components are created
+  # defaultCommitMessage: 'Initial commit'
   github:
     token: ${GITHUB_TOKEN}
     visibility: public # or 'internal' or 'private'
@@ -296,6 +312,7 @@ auth:
     saml:
       entryPoint: 'http://localhost:7001/'
       issuer: 'passport-saml'
+      cert: 'fake-cert-base64'
     okta:
       development:
         clientId: ${AUTH_OKTA_CLIENT_ID}
@@ -312,13 +329,20 @@ auth:
         #
         # scope: saml-login-selector openid profile email
     oidc:
+      # Note that you must define a session secret (see above) since the oidc provider requires session support.
+      # Note that by default, this provider will use the 'none' prompt which assumes that your are already logged on in the IDP.
+      # You should set prompt to:
+      # - auto: will let the IDP decide if you need to log on or if you can skip login when you have an active SSO session
+      # - login: will force the IDP to always present a login form to the user
       development:
         metadataUrl: ${AUTH_OIDC_METADATA_URL}
         clientId: ${AUTH_OIDC_CLIENT_ID}
         clientSecret: ${AUTH_OIDC_CLIENT_SECRET}
         authorizationUrl: ${AUTH_OIDC_AUTH_URL}
         tokenUrl: ${AUTH_OIDC_TOKEN_URL}
-        tokenSignedResponseAlg: ${AUTH_OIDC_TOKEN_SIGNED_RESPONSE_ALG}
+        tokenSignedResponseAlg: ${AUTH_OIDC_TOKEN_SIGNED_RESPONSE_ALG} # default='RS256'
+        scope: ${AUTH_OIDC_SCOPE} # default='openid profile email'
+        prompt: ${AUTH_OIDC_PROMPT} # default=none (allowed values: auto, none, consent, login)
     auth0:
       development:
         clientId: ${AUTH_AUTH0_CLIENT_ID}
@@ -370,3 +394,9 @@ homepage:
       timezone: 'Asia/Tokyo'
 pagerduty:
   eventsBaseUrl: 'https://events.pagerduty.com/v2'
+jenkins:
+  instances:
+    - name: default
+      baseUrl: https://jenkins.example.com
+      username: backstage-bot
+      apiKey: 123456789abcdef0123456789abcedf012
diff --git a/catalog-info.yaml b/catalog-info.yaml
index 0cab0c558a..6de6fd3426 100644
--- a/catalog-info.yaml
+++ b/catalog-info.yaml
@@ -15,7 +15,7 @@ metadata:
       url: https://discord.com/invite/EBHEGzX
   annotations:
     github.com/project-slug: backstage/backstage
-    backstage.io/techdocs-ref: url:https://github.com/backstage/backstage
+    backstage.io/techdocs-ref: dir:.
     lighthouse.com/website-url: https://backstage.io
 spec:
   type: library
diff --git a/contrib/docker/frontend-with-nginx/Dockerfile.hostbuild b/contrib/docker/frontend-with-nginx/Dockerfile.hostbuild
index 1e0134017f..f0fa4a034b 100644
--- a/contrib/docker/frontend-with-nginx/Dockerfile.hostbuild
+++ b/contrib/docker/frontend-with-nginx/Dockerfile.hostbuild
@@ -8,7 +8,6 @@
 # simply copies in the build output into the image. If you want to also perform
 # the build itself inside docker, use Dockerfile.build in this folder instead.
 
-
 # USAGE:
 #
 # - Copy this file and the "docker" folder from this directory to your project
@@ -23,7 +22,7 @@
 #
 #       yarn install
 #       yarn tsc
-#       yarn build --config <config1> --config <config2> ...
+#       yarn workspace app build --config <config1> --config <config2> ...
 #       docker build -t backstage-frontend -f Dockerfile.hostbuild .
 
 
@@ -38,4 +37,3 @@ COPY docker/default.conf.template /etc/nginx/templates/default.conf.template
 COPY docker/inject-config.sh /docker-entrypoint.d/40-inject-config.sh
 
 ENV PORT 80
-
diff --git a/contrib/docs/tutorials/aws-deployment.md b/contrib/docs/tutorials/aws-deployment.md
index 47170658a3..3a76da2ed3 100644
--- a/contrib/docs/tutorials/aws-deployment.md
+++ b/contrib/docs/tutorials/aws-deployment.md
@@ -5,7 +5,7 @@ image](https://backstage.io/docs/getting-started/deployment-docker); this
 tutorial shows how to deploy that Docker image to AWS using Elastic Container
 Registry (ECR) and Elastic Kubernetes Service (EKS). Amazon also supports
 deployments with Helm, covered in the [Helm
-Kubernetes](../kubernetes/basic_kubernetes_example_with_helm) example.
+Kubernetes](../../kubernetes/basic_kubernetes_example_with_helm) example.
 
 The basic workflow for this method is to build a Backstage Docker image, upload
 the new version to a container registry, and update a Kubernetes deployment with
diff --git a/docs/.gitignore b/docs/.gitignore
new file mode 100644
index 0000000000..90b1e2c7ef
--- /dev/null
+++ b/docs/.gitignore
@@ -0,0 +1,2 @@
+# This is generated by build:api-docs in the root
+reference
diff --git a/docs/api/utility-apis.md b/docs/api/utility-apis.md
index f04202b79b..1b364bcdae 100644
--- a/docs/api/utility-apis.md
+++ b/docs/api/utility-apis.md
@@ -12,25 +12,32 @@ however always be a need for plugins to communicate outside of its boundaries,
 both with other plugins and the app itself.
 
 Backstage provides two primary methods for plugins to communicate across their
-boundaries in client-side code. The first one being the `createPlugin` API and
-the registration hooks passed to the `register` method, and the second one being
-Utility APIs. While the `createPlugin` API is focused on the initialization
-plugins and the app, the Utility APIs provide ways for plugins to communicate
-during their entire life cycle.
+boundaries in client-side code. The first one being the
+[createPlugin](../reference/core-plugin-api.createplugin.md) API along with the
+extensions that it can provide, and the second one being Utility APIs. While the
+[createPlugin](../reference/core-plugin-api.createplugin.md) API is focused on
+the initialization plugins and the app, the Utility APIs provide ways for
+plugins to communicate during their entire life cycle.
 
 ## Consuming APIs
 
-Each Utility API is tied to an `ApiRef` instance, which is a global singleton
-object without any additional state or functionality, its only purpose is to
-reference Utility APIs. `ApiRef`s are created using `createApiRef`, which is
-exported by `@backstage/core-plugin-api`. There are many
-[predefined Utility APIs](../reference/utility-apis/README.md) defined in
-`@backstage/core-plugin-api`, and they're all exported with a name of the
-pattern `*ApiRef`, for example `errorApiRef`.
+Each Utility API is tied to an [ApiRef](../reference/core-plugin-api.apiref.md)
+instance, which is a global singleton object without any additional state or
+functionality, its only purpose is to reference Utility APIs.
+[ApiRef](../reference/core-plugin-api.apiref.md)s are created using
+[createApiRef](../reference/core-plugin-api.createapiref.md), which is exported
+by [@backstage/core-plugin-api](../reference/core-plugin-api.md). There are also
+many predefined Utility APIs in
+[@backstage/core-plugin-api](../reference/core-plugin-api.md), and they're all
+exported with a name of the pattern `*ApiRef`, for example
+[errorApiRef](../reference/core-plugin-api.errorapiref.md).
 
-To access one of the Utility APIs inside a React component, use the `useApi`
-hook exported by `@backstage/core-plugin-api`, or the `withApis` HOC if you
-prefer class components. For example, the `ErrorApi` can be accessed like this:
+To access one of the Utility APIs inside a React component, use the
+[useApi](../reference/core-plugin-api.useapi.md) hook exported by
+[@backstage/core-plugin-api](../reference/core-plugin-api.md), or the
+[withApis](../reference/core-plugin-api.withapis.md) HOC if you prefer class
+components. For example, the
+[ErrorApi](../reference/core-plugin-api.errorapi.md) can be accessed like this:
 
 ```tsx
 import React from 'react';
@@ -48,24 +55,31 @@ export const MyComponent = () => {
 };
 ```
 
-Note that there is no explicit type given for `ErrorApi`. This is because the
-`errorApiRef` has the type embedded, and `useApi` is able to infer the type.
+Note that there is no explicit type given for
+[ErrorApi](../reference/core-plugin-api.errorapi.md). This is because the
+[errorApiRef](../reference/core-plugin-api.errorapiref.md) has the type
+embedded, and [useApi](../reference/core-plugin-api.useapi.md) is able to infer
+the type.
 
 Also note that consuming Utility APIs is not limited to plugins, it can be done
 from any component inside Backstage, including the ones in
-`@backstage/core-plugin-api`. The only requirement is that they are beneath the
-`AppProvider` in the react tree.
+[@backstage/core-plugin-api](../reference/core-plugin-api.md). The only
+requirement is that they are beneath the `AppProvider` in the react tree.
 
 ## Supplying APIs
 
 ### API Factories
 
-APIs are registered in the form of `ApiFactories`, which encapsulate the process
-of instantiating an API. It is a collection of three things: the `ApiRef` of the
-API to instantiate, a list of all required dependencies, and a factory function
-that returns a new API instance.
+APIs are registered in the form of
+[ApiFactories](../reference/core-plugin-api.apifactory.md), which encapsulate
+the process of instantiating an API. It is a collection of three things: the
+[ApiRef](../reference/core-plugin-api.apiref.md) of the API to instantiate, a
+list of all required dependencies, and a factory function that returns a new API
+instance.
 
-For example, this is the default `ApiFactory` for the `ErrorApi`:
+For example, this is the default
+[ApiFactory](../reference/core-plugin-api.apifactory.md) for the
+[ErrorApi](../reference/core-plugin-api.errorapi.md):
 
 ```ts
 createApiFactory({
@@ -79,18 +93,25 @@ createApiFactory({
 });
 ```
 
-In this example the `errorApiRef` is our API, which encapsulates the `ErrorApi`
-type. The `alertApiRef` is our single dependency, which we give the name
-`alertApi`, and is then passed on to the factory function, which returns an
-implementation of the `ErrorApi`.
+In this example the [errorApiRef](../reference/core-plugin-api.errorapiref.md)
+is our API, which encapsulates the
+[ErrorApi](../reference/core-plugin-api.errorapi.md) type. The
+[alertApiRef](../reference/core-plugin-api.alertapiref.md) is our single
+dependency, which we give the name `alertApi`, and is then passed on to the
+factory function, which returns an implementation of the
+[ErrorApi](../reference/core-plugin-api.errorapi.md).
 
-The `createApiFactory` function is a thin wrapper that enables TypeScript type
-inference. You may notice that there are no type annotations in the above
-example, and that is because we're able to infer all types from the `ApiRef`s.
-TypeScript will make sure that the return value of the `factory` function
-matches the type embedded in `api`'s `ApiRef`, in this case the `ErrorApi`. It
-will also match the types between the `deps` and the parameters of the `factory`
-function, again using the type embedded within the `ApiRef`s.
+The [createApiFactory](../reference/core-plugin-api.createapifactory.md)
+function is a thin wrapper that enables TypeScript type inference. You may
+notice that there are no type annotations in the above example, and that is
+because we're able to infer all types from the
+[ApiRef](../reference/core-plugin-api.apiref.md)s. TypeScript will make sure
+that the return value of the `factory` function matches the type embedded in
+`api`'s [ApiRef](../reference/core-plugin-api.apiref.md), in this case the
+[ErrorApi](../reference/core-plugin-api.errorapi.md). It will also match the
+types between the `deps` and the parameters of the `factory` function, again
+using the type embedded within the
+[ApiRef](../reference/core-plugin-api.apiref.md)s.
 
 ## Registering API Factories
 
@@ -102,24 +123,27 @@ app, and the app itself.
 
 Starting with the Backstage core library, it provides implementations for all of
 the core APIs. The core APIs are the ones exported by
-`@backstage/core-plugin-api`, such as the `errorApiRef` and `configApiRef`. You
-can find a full list of them [here](../reference/utility-apis/README.md).
+[@backstage/core-plugin-api](../reference/core-plugin-api.md), such as the
+[errorApiRef](../reference/core-plugin-api.errorapiref.md) and
+[configApiRef](../reference/core-plugin-api.configapiref.md).
 
-The core APIs are loaded for any app created with `createApp` from
-`@backstage/core-plugin-api`, which means that there is no step that needs to be
-taken to include these APIs in an app.
+The core APIs are loaded for any app created with
+[createApp](../reference/core-app-api.createapp.md) from
+[@backstage/core-plugin-api](../reference/core-plugin-api.md), which means that
+there is no step that needs to be taken to include these APIs in an app.
 
 ### Plugin APIs
 
 In addition to the core APIs, plugins can define and export their own APIs.
 While doing so they should usually also provide default implementations of their
 own APIs, for example, the `catalog` plugin exports `catalogApiRef`, and also
-supplies a default `ApiFactory` of that API using the `CatalogClient`. There is
-one restriction to plugin-provided API Factories: plugins may not supply
-factories for core APIs, trying to do so will cause the app to refuse to start.
+supplies a default [ApiFactory](../reference/core-plugin-api.apifactory.md) of
+that API using the `CatalogClient`. There is one restriction to plugin-provided
+API Factories: plugins may not supply factories for core APIs, trying to do so
+will cause the app to refuse to start.
 
-Plugins supply their APIs through the `apis` option of `createPlugin`, for
-example:
+Plugins supply their APIs through the `apis` option of
+[createPlugin](../reference/core-plugin-api.createplugin.md), for example:
 
 ```ts
 export const techdocsPlugin = createPlugin({
@@ -144,7 +168,8 @@ Lastly, the app itself is the final point where APIs can be added, and what has
 the final say in what APIs will be loaded at runtime. The app may override the
 factories for any of the core or plugin APIs, with the exception of the config,
 app theme, and identity APIs. These are static APIs that are tied into the
-`createApp` implementation, and therefore not possible to override.
+[createApp](../reference/core-app-api.createapp.md) implementation, and
+therefore not possible to override.
 
 Overriding APIs is useful for apps that want to switch out behavior to tailor it
 to their environment. In some cases plugins may also export multiple
@@ -206,16 +231,19 @@ const app = createApp({
 ```
 
 Note that the above line will cause an error if `IgnoreErrorApi` does not fully
-implement the `ErrorApi`, as it is checked by the type embedded in the
-`errorApiRef` at compile time.
+implement the [ErrorApi](../reference/core-plugin-api.errorapi.md), as it is
+checked by the type embedded in the
+[errorApiRef](../reference/core-plugin-api.errorapiref.md) at compile time.
 
 ## Defining custom Utility APIs
 
 Plugins are free to define their own Utility APIs. Simply define the TypeScript
-interface for the API, and create an `ApiRef` using `createApiRef` exported from
-`@backstage/core-plugin-api`. Also be sure to provide at least one
-implementation of the API, and to declare a default factory for the API in
-`createPlugin`.
+interface for the API, and create an
+[ApiRef](../reference/core-plugin-api.apiref.md) using
+[createApiRef](../reference/core-plugin-api.createapiref.md) exported from
+[@backstage/core-plugin-api](../reference/core-plugin-api.md). Also be sure to
+provide at least one implementation of the API, and to declare a default factory
+for the API in [createPlugin](../reference/core-plugin-api.createplugin.md).
 
 Custom Utility APIs can be either public or private, which is up to the plugin
 to choose. Private APIs do not expose an external API surface, and it's
@@ -226,15 +254,18 @@ plugin to override the API in the app. It is however important to maintain
 backwards compatibility of public APIs, as you may otherwise break apps that are
 using your plugin.
 
-To make an API public, simply export the `ApiRef` of the API, and any associated
-types. To make an API private, just avoid exporting the `ApiRef`, but still be
-sure to supply a default factory to `createPlugin`.
+To make an API public, simply export the
+[ApiRef](../reference/core-plugin-api.apiref.md) of the API, and any associated
+types. To make an API private, just avoid exporting the
+[ApiRef](../reference/core-plugin-api.apiref.md), but still be sure to supply a
+default factory to [createPlugin](../reference/core-plugin-api.createplugin.md).
 
 Private APIs are useful for plugins that want to depend on other APIs outside of
 React components, but not have to expose an entire API surface to maintain. When
 using private APIs, it is fine to use the `typeof` of an implementing class as
-the type parameter passed to `createApiRef`, while public APIs should always
-define a separate TypeScript interface type.
+the type parameter passed to
+[createApiRef](../reference/core-plugin-api.createapiref.md), while public APIs
+should always define a separate TypeScript interface type.
 
 Plugins may depend on APIs from other plugins, both in React components and as
 dependencies to API factories. Do however be sure to not cause circular
@@ -242,13 +273,14 @@ dependencies between plugins.
 
 ## Architecture
 
-The `ApiRef` instances mentioned above provide a point of indirection between
-consumers and producers of Utility APIs. It allows for plugins and components to
-depend on APIs in a type-safe way, without having a direct reference to a
-concrete implementation of the APIs. The Apps are also given a lot of
-flexibility in what implementations to provide. As long as they adhere to the
-contract established by an `ApiRef`, they are free to choose any implementation
-they want.
+The [ApiRef](../reference/core-plugin-api.apiref.md) instances mentioned above
+provide a point of indirection between consumers and producers of Utility APIs.
+It allows for plugins and components to depend on APIs in a type-safe way,
+without having a direct reference to a concrete implementation of the APIs. The
+Apps are also given a lot of flexibility in what implementations to provide. As
+long as they adhere to the contract established by an
+[ApiRef](../reference/core-plugin-api.apiref.md), they are free to choose any
+implementation they want.
 
 The figure below shows the relationship between
 <span style="color: #82b366">different Apps</span>, that provide
@@ -271,14 +303,17 @@ directly tied to React.
 The indirection provided by Utility APIs also makes it straightforward to test
 components that depend on APIs, and to provide a standard common development
 environment for plugins. A proper test wrapper with mocked API implementations
-is not yet ready, but it will be provided as a part of `@backstage/test-utils`.
-It will provide mocked variants of APIs, with additional methods for asserting a
-component's interaction with the API.
+is not yet ready, but it will be provided as a part of
+[@backstage/test-utils](../reference/test-utils.md). It will provide mocked
+variants of APIs, with additional methods for asserting a component's
+interaction with the API.
 
 The common development environment for plugins is included in
-`@backstage/dev-utils`, where the exported `createDevApp` function creates an
+[@backstage/dev-utils](../reference/dev-utils.md), where the exported
+[createDevApp](../reference/dev-utils.createdevapp.md) function creates an
 application with implementations for all core APIs already present. Contrary to
 the method for wiring up Utility API implementations in an app created with
-`createApp`, `createDevApp` uses automatic dependency injection. This is to make
-it possible to replace any API implementation, and having that be reflected in
-dependents of that API.
+[createApp](../reference/core-app-api.createapp.md),
+[createDevApp](../reference/dev-utils.createdevapp.md) uses automatic dependency
+injection. This is to make it possible to replace any API implementation, and
+having that be reflected in dependents of that API.
diff --git a/docs/assets/features/catalog/life-of-an-entity_ingestion.svg b/docs/assets/features/catalog/life-of-an-entity_ingestion.svg
new file mode 100644
index 0000000000..b250744fcd
--- /dev/null
+++ b/docs/assets/features/catalog/life-of-an-entity_ingestion.svg
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="451px" height="321px" viewBox="-0.5 -0.5 451 321" content="&lt;mxfile host=&quot;app.diagrams.net&quot; modified=&quot;2021-08-30T07:58:22.063Z&quot; agent=&quot;5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/92.0.4515.159 Safari/537.36&quot; etag=&quot;JQdt2U1OCyaNFYmrhq2o&quot; version=&quot;15.0.3&quot; type=&quot;google&quot;&gt;&lt;diagram name=&quot;Page-1&quot; id=&quot;c7558073-3199-34d8-9f00-42111426c3f3&quot;&gt;7ZrLcpswFIafxst0AAEhy8RxmkU66Uym08tOBgFqZOQR8i1P3yNLAnNx4rZO7NbJJuggDuj/xPklkgEaTpYfBZ7mn3hC2MBzkuUAXQ88z/UDF36pyMpEnHNPRzJBExOrAw/0idiOJjqjCSkbHSXnTNJpMxjzoiCxbMSwEHzR7JZy1rzrFGekE3iIMetGv9JE5joaeWEdvyU0y+2d3fBCnxnj+DETfFaY+xW8IPrMBNs0ZoxljhO+2Aih0QANBedSH02WQ8KUrlYxfd3NlrPVIwtSyF0uoGfRwhles9t7dPkjJI/hzd3VmRngHLOZkeJLMRU8JmVJEjgxKiSVFNDoIciVVWyRU0kepjhW7QVMiwG6yuWEQcuFwzkRkoK+l4xmBcQkVx2wacXwyERAoIQEtMjuSKqGEKocXNAnXkisMjkQSCljQ864WN8XpWnqxbG6VAr+SDbOJOE4DFQKMyR4ArLcqpVbEYBZTfiESLGCLvaCwEAzExpZiIt6dvi2T745M0ITxGZGZlXuGg0cGDq/Qcq+KhsMSAKT2DS5kDnPeIHZqI5erWcmSYyUdZ87rnisSf0kUq7MG4lnkjc5gl5i9U1d/yGwze+b566XJrlurapWcqneSwWb4bKksQ7eUGZT6+GoMTwPCYbMZyImz2hjio3EIiPymX5+P3RBGJZ03nyO/QP0jgmg808CPD8kQM/vFMs4xwUMH1SYw5i7VVKJc4fHYJcNKLYOCl04OtVyQpNE4yclfcLjdTpFZcqpug3kDq4GwXVdQU313Fr6jHGaVLUpbcJ6ZtZuLZRnzgcEPzrZzhhMus9qNBtdeJqWgL/NqbrrX6DrkFsbmxrIZ8HnsPgQHXbg11N1aOwQ1H3B8+q1wP1MMloQE285WBKQKPH7HCzyxihUGEv9Njv7MbMKtjEzz++amev1mJn/al7mdtR+9zKjDdqxFAYH9TJ0TACPy8t2BRgd1MvQvr2MrdfwR21l6CUrcysrWzVu+afGZjO7jaR20/X6tteFfEK257vHZnvd9eNoCftgKIEDL2Tq7RkDjzBTRw+6zPzmtru9WY5i0r9ZHkeB2r/uZ33hN4Wu9sAbQkdvqXPwf+rsoyPT+byjc0fH2vPdlyvJC1aivyEluMyrhHtQ1b1oferpKxN9sla1Y++6Rv+Drig6Ol3dnsJg/HCrvM7u8lZfNbeugdqWiEmU9paNMI7IOG2sibw9FWunhSXo+bLZQ+X1oHQ/QZ8elPbn5vNDQ+mW9tOD0vpsUq0nDwal6wsnBwW1ypff94eZN4Vy8Q7Fb3tKdGAoNvFJQ2mva3t2C28LxX2H4gdHVr7s1uKUoSC7L7BvysWrQYFm/Q8f+itf/R81aPQL&lt;/diagram&gt;&lt;/mxfile&gt;" style="background-color: rgb(255, 255, 255);"><defs/><g><rect x="0" y="160" width="450" height="160" fill="#fff2cc" stroke="#d6b656" pointer-events="all"/><g transform="translate(-0.5 -0.5)rotate(-90 7 237)"><switch><foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe flex-start; justify-content: unsafe center; width: 152px; height: 1px; padding-top: 237px; margin-left: -69px;"><div style="box-sizing: border-box; font-size: 0; text-align: center; "><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: #000000; line-height: 1.2; pointer-events: all; white-space: normal; word-wrap: normal; ">Unprocessed Entities</div></div></div></foreignObject><text x="7" y="249" fill="#000000" font-family="Helvetica" font-size="12px" text-anchor="middle">Unprocessed Entities</text></switch></g><path d="M 130 80 L 130 46.37" fill="none" stroke="#000000" stroke-miterlimit="10" pointer-events="stroke"/><path d="M 130 41.12 L 133.5 48.12 L 130 46.37 L 126.5 48.12 Z" fill="#000000" stroke="#000000" stroke-miterlimit="10" pointer-events="all"/><path d="M 130 120 L 130 173.63" fill="none" stroke="#000000" stroke-miterlimit="10" pointer-events="stroke"/><path d="M 130 178.88 L 126.5 171.88 L 130 173.63 L 133.5 171.88 Z" fill="#000000" stroke="#000000" stroke-miterlimit="10" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe flex-end; width: 1px; height: 1px; padding-top: 141px; margin-left: 125px;"><div style="box-sizing: border-box; font-size: 0; text-align: right; "><div style="display: inline-block; font-size: 11px; font-family: Helvetica; color: #000000; line-height: 1.2; pointer-events: all; background-color: #ffffff; white-space: nowrap; ">change events</div></div></div></foreignObject><text x="125" y="144" fill="#000000" font-family="Helvetica" font-size="11px" text-anchor="end">change events</text></switch></g><rect x="70" y="80" width="120" height="40" fill="#d5e8d4" stroke="#82b366" pointer-events="all"/><path d="M 70 80 L 70 120 M 190 80 L 190 120" fill="none" stroke="#82b366" stroke-miterlimit="10" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 118px; height: 1px; padding-top: 100px; margin-left: 71px;"><div style="box-sizing: border-box; font-size: 0; text-align: center; "><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: #000000; line-height: 1.2; pointer-events: all; white-space: normal; word-wrap: normal; ">Entity Provider</div></div></div></foreignObject><text x="130" y="104" fill="#000000" font-family="Helvetica" font-size="12px" text-anchor="middle">Entity Provider</text></switch></g><path d="M 320 80 L 320 46.37" fill="none" stroke="#000000" stroke-miterlimit="10" pointer-events="stroke"/><path d="M 320 41.12 L 323.5 48.12 L 320 46.37 L 316.5 48.12 Z" fill="#000000" stroke="#000000" stroke-miterlimit="10" pointer-events="all"/><path d="M 320 120 L 320 173.63" fill="none" stroke="#000000" stroke-miterlimit="10" pointer-events="stroke"/><path d="M 320 178.88 L 316.5 171.88 L 320 173.63 L 323.5 171.88 Z" fill="#000000" stroke="#000000" stroke-miterlimit="10" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe flex-start; width: 1px; height: 1px; padding-top: 141px; margin-left: 326px;"><div style="box-sizing: border-box; font-size: 0; text-align: left; "><div style="display: inline-block; font-size: 11px; font-family: Helvetica; color: #000000; line-height: 1.2; pointer-events: all; background-color: #ffffff; white-space: nowrap; ">change events</div></div></div></foreignObject><text x="326" y="144" fill="#000000" font-family="Helvetica" font-size="11px">change events</text></switch></g><rect x="260" y="80" width="120" height="40" fill="#d5e8d4" stroke="#82b366" pointer-events="all"/><path d="M 260 80 L 260 120 M 380 80 L 380 120" fill="none" stroke="#82b366" stroke-miterlimit="10" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 118px; height: 1px; padding-top: 100px; margin-left: 261px;"><div style="box-sizing: border-box; font-size: 0; text-align: center; "><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: #000000; line-height: 1.2; pointer-events: all; white-space: normal; word-wrap: normal; ">Entity Provider</div></div></div></foreignObject><text x="320" y="104" fill="#000000" font-family="Helvetica" font-size="12px" text-anchor="middle">Entity Provider</text></switch></g><rect x="90" y="0" width="80" height="40" fill="#f8cecc" stroke="#b85450" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 78px; height: 1px; padding-top: 20px; margin-left: 91px;"><div style="box-sizing: border-box; font-size: 0; text-align: center; "><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: #000000; line-height: 1.2; pointer-events: all; white-space: normal; word-wrap: normal; ">External<br />Source</div></div></div></foreignObject><text x="130" y="24" fill="#000000" font-family="Helvetica" font-size="12px" text-anchor="middle">External...</text></switch></g><rect x="280" y="0" width="80" height="40" fill="#f8cecc" stroke="#b85450" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 78px; height: 1px; padding-top: 20px; margin-left: 281px;"><div style="box-sizing: border-box; font-size: 0; text-align: center; "><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: #000000; line-height: 1.2; pointer-events: all; white-space: normal; word-wrap: normal; ">External<br />Source</div></div></div></foreignObject><text x="320" y="24" fill="#000000" font-family="Helvetica" font-size="12px" text-anchor="middle">External...</text></switch></g><rect x="40" y="180" width="180" height="120" rx="18" ry="18" fill="#ffffff" stroke="#000000" stroke-dasharray="3 3" pointer-events="all"/><rect x="230" y="180" width="180" height="120" rx="18" ry="18" fill="#ffffff" stroke="#000000" stroke-dasharray="3 3" pointer-events="all"/><rect x="50" y="190" width="40" height="20" fill="#dae8fc" stroke="#6c8ebf" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 38px; height: 1px; padding-top: 200px; margin-left: 51px;"><div style="box-sizing: border-box; font-size: 0; text-align: center; "><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: #000000; line-height: 1.2; pointer-events: all; white-space: normal; word-wrap: normal; ">Entity</div></div></div></foreignObject><text x="70" y="204" fill="#000000" font-family="Helvetica" font-size="12px" text-anchor="middle">Entity</text></switch></g><rect x="100" y="210" width="40" height="20" fill="#dae8fc" stroke="#6c8ebf" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 38px; height: 1px; padding-top: 220px; margin-left: 101px;"><div style="box-sizing: border-box; font-size: 0; text-align: center; "><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: #000000; line-height: 1.2; pointer-events: all; white-space: normal; word-wrap: normal; ">Entity</div></div></div></foreignObject><text x="120" y="224" fill="#000000" font-family="Helvetica" font-size="12px" text-anchor="middle">Entity</text></switch></g><rect x="70" y="250" width="40" height="20" fill="#dae8fc" stroke="#6c8ebf" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 38px; height: 1px; padding-top: 260px; margin-left: 71px;"><div style="box-sizing: border-box; font-size: 0; text-align: center; "><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: #000000; line-height: 1.2; pointer-events: all; white-space: normal; word-wrap: normal; ">Entity</div></div></div></foreignObject><text x="90" y="264" fill="#000000" font-family="Helvetica" font-size="12px" text-anchor="middle">Entity</text></switch></g><rect x="150" y="260" width="40" height="20" fill="#dae8fc" stroke="#6c8ebf" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 38px; height: 1px; padding-top: 270px; margin-left: 151px;"><div style="box-sizing: border-box; font-size: 0; text-align: center; "><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: #000000; line-height: 1.2; pointer-events: all; white-space: normal; word-wrap: normal; ">Entity</div></div></div></foreignObject><text x="170" y="274" fill="#000000" font-family="Helvetica" font-size="12px" text-anchor="middle">Entity</text></switch></g><rect x="250" y="220" width="40" height="20" fill="#dae8fc" stroke="#6c8ebf" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 38px; height: 1px; padding-top: 230px; margin-left: 251px;"><div style="box-sizing: border-box; font-size: 0; text-align: center; "><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: #000000; line-height: 1.2; pointer-events: all; white-space: normal; word-wrap: normal; ">Entity</div></div></div></foreignObject><text x="270" y="234" fill="#000000" font-family="Helvetica" font-size="12px" text-anchor="middle">Entity</text></switch></g><rect x="340" y="200" width="40" height="20" fill="#dae8fc" stroke="#6c8ebf" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 38px; height: 1px; padding-top: 210px; margin-left: 341px;"><div style="box-sizing: border-box; font-size: 0; text-align: center; "><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: #000000; line-height: 1.2; pointer-events: all; white-space: normal; word-wrap: normal; ">Entity</div></div></div></foreignObject><text x="360" y="214" fill="#000000" font-family="Helvetica" font-size="12px" text-anchor="middle">Entity</text></switch></g><rect x="300" y="260" width="40" height="20" fill="#dae8fc" stroke="#6c8ebf" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 38px; height: 1px; padding-top: 270px; margin-left: 301px;"><div style="box-sizing: border-box; font-size: 0; text-align: center; "><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: #000000; line-height: 1.2; pointer-events: all; white-space: normal; word-wrap: normal; ">Entity</div></div></div></foreignObject><text x="320" y="274" fill="#000000" font-family="Helvetica" font-size="12px" text-anchor="middle">Entity</text></switch></g><rect x="165" y="230" width="40" height="20" fill="#dae8fc" stroke="#6c8ebf" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 38px; height: 1px; padding-top: 240px; margin-left: 166px;"><div style="box-sizing: border-box; font-size: 0; text-align: center; "><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: #000000; line-height: 1.2; pointer-events: all; white-space: normal; word-wrap: normal; ">Entity</div></div></div></foreignObject><text x="185" y="244" fill="#000000" font-family="Helvetica" font-size="12px" text-anchor="middle">Entity</text></switch></g></g><switch><g requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"/><a transform="translate(0,-5)" xlink:href="https://www.diagrams.net/doc/faq/svg-export-text-problems" target="_blank"><text text-anchor="middle" font-size="10px" x="50%" y="100%">Viewer does not support full SVG 1.1</text></a></switch></svg>
\ No newline at end of file
diff --git a/docs/assets/features/catalog/life-of-an-entity_overview.svg b/docs/assets/features/catalog/life-of-an-entity_overview.svg
new file mode 100644
index 0000000000..3fc35b4775
--- /dev/null
+++ b/docs/assets/features/catalog/life-of-an-entity_overview.svg
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="442px" height="621px" viewBox="-0.5 -0.5 442 621" content="&lt;mxfile host=&quot;app.diagrams.net&quot; modified=&quot;2021-08-30T06:48:48.032Z&quot; agent=&quot;5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/92.0.4515.159 Safari/537.36&quot; etag=&quot;hHhhmKG2AaxT-2zBWbgZ&quot; version=&quot;15.0.3&quot; type=&quot;google&quot;&gt;&lt;diagram name=&quot;Page-1&quot; id=&quot;c7558073-3199-34d8-9f00-42111426c3f3&quot;&gt;7Vxbc6M2FP41eWwGcfdjknW2md7SejrtPioggzYYeYQc2/31FSCuwhgHG2Ovk4eggyTE+c5dInfa02LzlcKl/xtxUXCnKu7mTvtyp6pANwD/E1O2ggLUSUrxKHYFrSDM8H9IEBVBXWEXRZWOjJCA4WWV6JAwRA6r0CClZF3tNidB9alL6CGJMHNgIFP/wS7zU6qtmgX9Z4Q9P3syMMX7vUHn3aNkFYrnhSRE6Z0FzKYR7xj50CXrEkmb3mlPlBCWXi02TyiI+ZpxLB33vONuvmSKQtZlgAN/Cf/Ufn9HrxHzXxZouiCPP4EMgYhtM2Ygl/NGNAllPvFICINpQX1MXhjF8yq8VfT5lZAlJwJO/I4Y2wqg4YoRTvLZIhB3+ZLp9t94/L2RNb+J6ZLGl02ltRUt+Z0FGyKyog5qedGJgJJB6iHWxhFFT3vGbCg9QzD1KyILxJfEO1AUQIY/qiIEhSR6eb986CvBfNWqItRGA0Y6RCiNaivVKdKlilEFsPyitIyClMB9APQZRz5gsBLv8He4pMRBUcSxVZVpyDDDXC3rAlKFf+1jhmZLmLB/zQ1EFeo5DoInEhCajNXm87nqOJweMUreUemOa76ZhtkG8geiDG1aMRF3VV2p8lYR7XWh3cAQNL+k2bqyG8YKAIdyGwCrl6KBYRUNhe5DbFd50wlgFGEnJT7jIJu6hy5anXXROLYu9gIxW3hJZV6vU2E08/wKY1+ZwqANZqWZeetb6U4xb9w4gsOzz6dkyVDODrgtdVjGjiza7Q91reoPda0Wz+zxn7X+/CJdwXGdpi1ZgL8SrpDwEtVeV/arvTWs1mtniUcz1SwppnKvGq26mZsKUDEUYlg3W5HkC2VD0VPpJx2VPgv+RuJYAdDHA7v1OditG+wHW9OJZE1jfK/BkjZlHPagllQBEnOfMdeO6wpUDe3sgaqiSoyeIUgd/wLZWxfjJvYOK8ZqvwLV+NKAz5t5oGgd7fxYYnqjPUYfR0yfs7XshjiI9BLto26PLaJXLqrw1Uc79a5RmDWqKAwol1VpGbSMcgCq9shQnVwSqkMglBv6U2/t1N2eVreuO7Z2DnWvdXeZPWeXe921rtO6V7O9pIOCN7LeLYPfV4tl1pUH1QdIZTIxb8bOEzs88dkhqNU0/oAs/hQRXmdrc/RM/lMSmO/gZ2mv2S6Bar3gOEyAp0sBnti3aQryIh8u40uxF7o/0CsOAfyxYgGOSztNAaBrINvVmwJAW33TzFNtfdpnT5Bz8b+IMwYnVnCjs7MC44onVPWS4onRoKiOwk7XIwUDtNtpvV5mA4PYaUOy0zOGmeMjeuVWWjfObqXBRVnpPsrb9SjYyHZLgGmMMpBuzMfzFLx9D62GOjivVe98RtA8+hnBnrm+fJYv2eOJl8Aj3Q/soqsPdPOdgvOZUFPOM6Ybhmiy62YGLGYh92SmF1/NEnlsqzGDw2vMtoOaa8xvthH7mONw3qpV6c+9R2S2l7puhrGnYTS7nyUbWdJite8e3iRjOMkYSSJk1RKbySAlUPnY4BNkMCCe7BceXl+uwCeYDd54WKdgyedfZFsgHclyYeTnjG5hqhH/NjHVTH7amLpXA0osa4pfMlrPTYp6KRYoNShS7Zc2KaSJzHogVp/oxB+yAEu9IX0I0lmRvjfS0kQnR1o+qXFDugVpXT0S0tJEJ0daTqVuSLcgbUwm95PSj30c3PdMe3IpkAvCYuMOh54kDzxUYVXcq/gKIYEB9kLepCkoj1mM/iDoC+y6STLQFGdVC55zErJyeUOJf48TUOmTHbZ2X3mjrqlHjKjkKlNanv/hwNC71ppOCIb8LeJL6KEo/hTpxwIDdP249xNg8GbxhX5q1op/gaBN/wc=&lt;/diagram&gt;&lt;/mxfile&gt;" style="background-color: rgb(255, 255, 255);"><defs/><g><path d="M 115 200 L 115 233.63" fill="none" stroke="#000000" stroke-miterlimit="10" pointer-events="stroke"/><path d="M 115 238.88 L 111.5 231.88 L 115 233.63 L 118.5 231.88 Z" fill="#000000" stroke="#000000" stroke-miterlimit="10" pointer-events="all"/><rect x="40" y="160" width="150" height="40" fill="#fff2cc" stroke="#d6b656" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 148px; height: 1px; padding-top: 180px; margin-left: 41px;"><div style="box-sizing: border-box; font-size: 0; text-align: center; "><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: #000000; line-height: 1.2; pointer-events: all; white-space: normal; word-wrap: normal; ">Unprocessed Entities</div></div></div></foreignObject><text x="115" y="184" fill="#000000" font-family="Helvetica" font-size="12px" text-anchor="middle">Unprocessed Entities</text></switch></g><path d="M 115 360 L 115 403.63" fill="none" stroke="#000000" stroke-miterlimit="10" pointer-events="stroke"/><path d="M 115 408.88 L 111.5 401.88 L 115 403.63 L 118.5 401.88 Z" fill="#000000" stroke="#000000" stroke-miterlimit="10" pointer-events="all"/><rect x="40" y="320" width="150" height="40" fill="#fff2cc" stroke="#d6b656" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 148px; height: 1px; padding-top: 340px; margin-left: 41px;"><div style="box-sizing: border-box; font-size: 0; text-align: center; "><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: #000000; line-height: 1.2; pointer-events: all; white-space: normal; word-wrap: normal; ">Processed Entities</div></div></div></foreignObject><text x="115" y="344" fill="#000000" font-family="Helvetica" font-size="12px" text-anchor="middle">Processed Entities</text></switch></g><path d="M 235 360 L 235 380 Q 235 390 225 390 L 125 390 Q 115 390 115 396.82 L 115 403.63" fill="none" stroke="#000000" stroke-miterlimit="10" pointer-events="stroke"/><path d="M 115 408.88 L 111.5 401.88 L 115 403.63 L 118.5 401.88 Z" fill="#000000" stroke="#000000" stroke-miterlimit="10" pointer-events="all"/><rect x="200" y="320" width="70" height="40" fill="#fff2cc" stroke="#d6b656" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 68px; height: 1px; padding-top: 340px; margin-left: 201px;"><div style="box-sizing: border-box; font-size: 0; text-align: center; "><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: #000000; line-height: 1.2; pointer-events: all; white-space: normal; word-wrap: normal; ">Relations</div></div></div></foreignObject><text x="235" y="344" fill="#000000" font-family="Helvetica" font-size="12px" text-anchor="middle">Relations</text></switch></g><path d="M 200 170 L 190 170" fill="none" stroke="#000000" stroke-miterlimit="10" pointer-events="stroke"/><path d="M 200 190 L 190 190" fill="none" stroke="#000000" stroke-miterlimit="10" pointer-events="stroke"/><rect x="200" y="160" width="80" height="40" fill="#fff2cc" stroke="#d6b656" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 78px; height: 1px; padding-top: 180px; margin-left: 201px;"><div style="box-sizing: border-box; font-size: 0; text-align: center; "><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: #000000; line-height: 1.2; pointer-events: all; white-space: normal; word-wrap: normal; ">Edges</div></div></div></foreignObject><text x="240" y="184" fill="#000000" font-family="Helvetica" font-size="12px" text-anchor="middle">Edges</text></switch></g><rect x="40" y="490" width="150" height="40" fill="#fff2cc" stroke="#d6b656" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 148px; height: 1px; padding-top: 510px; margin-left: 41px;"><div style="box-sizing: border-box; font-size: 0; text-align: center; "><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: #000000; line-height: 1.2; pointer-events: all; white-space: normal; word-wrap: normal; ">Final Entities</div></div></div></foreignObject><text x="115" y="514" fill="#000000" font-family="Helvetica" font-size="12px" text-anchor="middle">Final Entities</text></switch></g><rect x="200" y="490" width="80" height="40" fill="#fff2cc" stroke="#d6b656" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 78px; height: 1px; padding-top: 510px; margin-left: 201px;"><div style="box-sizing: border-box; font-size: 0; text-align: center; "><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: #000000; line-height: 1.2; pointer-events: all; white-space: normal; word-wrap: normal; ">Search</div></div></div></foreignObject><text x="240" y="514" fill="#000000" font-family="Helvetica" font-size="12px" text-anchor="middle">Search</text></switch></g><path d="M 315 360 L 315 380 Q 315 390 305 390 L 125 390 Q 115 390 115 396.82 L 115 403.63" fill="none" stroke="#000000" stroke-miterlimit="10" pointer-events="stroke"/><path d="M 115 408.88 L 111.5 401.88 L 115 403.63 L 118.5 401.88 Z" fill="#000000" stroke="#000000" stroke-miterlimit="10" pointer-events="all"/><rect x="280" y="320" width="70" height="40" fill="#fff2cc" stroke="#d6b656" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 68px; height: 1px; padding-top: 340px; margin-left: 281px;"><div style="box-sizing: border-box; font-size: 0; text-align: center; "><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: #000000; line-height: 1.2; pointer-events: all; white-space: normal; word-wrap: normal; ">Errors</div></div></div></foreignObject><text x="315" y="344" fill="#000000" font-family="Helvetica" font-size="12px" text-anchor="middle">Errors</text></switch></g><path d="M 115 280 L 115 313.63" fill="none" stroke="#000000" stroke-miterlimit="10" pointer-events="stroke"/><path d="M 115 318.88 L 111.5 311.88 L 115 313.63 L 118.5 311.88 Z" fill="#000000" stroke="#000000" stroke-miterlimit="10" pointer-events="all"/><path d="M 115 280 L 115 290 Q 115 300 125 300 L 225 300 Q 235 300 235 306.82 L 235 313.63" fill="none" stroke="#000000" stroke-miterlimit="10" pointer-events="stroke"/><path d="M 235 318.88 L 231.5 311.88 L 235 313.63 L 238.5 311.88 Z" fill="#000000" stroke="#000000" stroke-miterlimit="10" pointer-events="all"/><path d="M 115 280 L 115 290 Q 115 300 125 300 L 305 300 Q 315 300 315 306.82 L 315 313.63" fill="none" stroke="#000000" stroke-miterlimit="10" pointer-events="stroke"/><path d="M 315 318.88 L 311.5 311.88 L 315 313.63 L 318.5 311.88 Z" fill="#000000" stroke="#000000" stroke-miterlimit="10" pointer-events="all"/><path d="M 40 260 L 20 260 Q 10 260 10 250 L 10 190 Q 10 180 20 180 L 33.63 180" fill="none" stroke="#000000" stroke-miterlimit="10" pointer-events="stroke"/><path d="M 38.88 180 L 31.88 183.5 L 33.63 180 L 31.88 176.5 Z" fill="#000000" stroke="#000000" stroke-miterlimit="10" pointer-events="all"/><rect x="40" y="240" width="150" height="40" fill="#d5e8d4" stroke="#82b366" pointer-events="all"/><path d="M 55 240 L 55 280 M 175 240 L 175 280" fill="none" stroke="#82b366" stroke-miterlimit="10" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 118px; height: 1px; padding-top: 260px; margin-left: 56px;"><div style="box-sizing: border-box; font-size: 0; text-align: center; "><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: #000000; line-height: 1.2; pointer-events: all; white-space: normal; word-wrap: normal; ">Processors</div></div></div></foreignObject><text x="115" y="264" fill="#000000" font-family="Helvetica" font-size="12px" text-anchor="middle">Processors</text></switch></g><path d="M 115 450 L 115 483.63" fill="none" stroke="#000000" stroke-miterlimit="10" pointer-events="stroke"/><path d="M 115 488.88 L 111.5 481.88 L 115 483.63 L 118.5 481.88 Z" fill="#000000" stroke="#000000" stroke-miterlimit="10" pointer-events="all"/><path d="M 115 450 L 115 460 Q 115 470 125 470 L 230 470 Q 240 470 240 476.82 L 240 483.63" fill="none" stroke="#000000" stroke-miterlimit="10" pointer-events="stroke"/><path d="M 240 488.88 L 236.5 481.88 L 240 483.63 L 243.5 481.88 Z" fill="#000000" stroke="#000000" stroke-miterlimit="10" pointer-events="all"/><rect x="40" y="410" width="150" height="40" fill="#d5e8d4" stroke="#82b366" pointer-events="all"/><path d="M 55 410 L 55 450 M 175 410 L 175 450" fill="none" stroke="#82b366" stroke-miterlimit="10" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 118px; height: 1px; padding-top: 430px; margin-left: 56px;"><div style="box-sizing: border-box; font-size: 0; text-align: center; "><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: #000000; line-height: 1.2; pointer-events: all; white-space: normal; word-wrap: normal; ">Stitcher</div></div></div></foreignObject><text x="115" y="434" fill="#000000" font-family="Helvetica" font-size="12px" text-anchor="middle">Stitcher</text></switch></g><path d="M 115 120 L 115 153.63" fill="none" stroke="#000000" stroke-miterlimit="10" pointer-events="stroke"/><path d="M 115 158.88 L 111.5 151.88 L 115 153.63 L 118.5 151.88 Z" fill="#000000" stroke="#000000" stroke-miterlimit="10" pointer-events="all"/><path d="M 115 80 L 115 46.37" fill="none" stroke="#000000" stroke-miterlimit="10" pointer-events="stroke"/><path d="M 115 41.12 L 118.5 48.12 L 115 46.37 L 111.5 48.12 Z" fill="#000000" stroke="#000000" stroke-miterlimit="10" pointer-events="all"/><rect x="40" y="80" width="150" height="40" fill="#d5e8d4" stroke="#82b366" pointer-events="all"/><path d="M 55 80 L 55 120 M 175 80 L 175 120" fill="none" stroke="#82b366" stroke-miterlimit="10" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 118px; height: 1px; padding-top: 100px; margin-left: 56px;"><div style="box-sizing: border-box; font-size: 0; text-align: center; "><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: #000000; line-height: 1.2; pointer-events: all; white-space: normal; word-wrap: normal; ">Entity Providers</div></div></div></foreignObject><text x="115" y="104" fill="#000000" font-family="Helvetica" font-size="12px" text-anchor="middle">Entity Providers</text></switch></g><rect x="75" y="0" width="80" height="40" rx="6" ry="6" fill="#f8cecc" stroke="#b85450" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 78px; height: 1px; padding-top: 20px; margin-left: 76px;"><div style="box-sizing: border-box; font-size: 0; text-align: center; "><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: #000000; line-height: 1.2; pointer-events: all; white-space: normal; word-wrap: normal; ">External<br />Sources</div></div></div></foreignObject><text x="115" y="24" fill="#000000" font-family="Helvetica" font-size="12px" text-anchor="middle">External...</text></switch></g><path d="M 115 580 L 115 536.37" fill="none" stroke="#000000" stroke-miterlimit="10" pointer-events="stroke"/><path d="M 115 531.12 L 118.5 538.12 L 115 536.37 L 111.5 538.12 Z" fill="#000000" stroke="#000000" stroke-miterlimit="10" pointer-events="all"/><path d="M 115 580 L 115 560 Q 115 550 125 550 L 230 550 Q 240 550 240 543.18 L 240 536.37" fill="none" stroke="#000000" stroke-miterlimit="10" pointer-events="stroke"/><path d="M 240 531.12 L 243.5 538.12 L 240 536.37 L 236.5 538.12 Z" fill="#000000" stroke="#000000" stroke-miterlimit="10" pointer-events="all"/><rect x="75" y="580" width="80" height="40" rx="6" ry="6" fill="#f8cecc" stroke="#b85450" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 78px; height: 1px; padding-top: 600px; margin-left: 76px;"><div style="box-sizing: border-box; font-size: 0; text-align: center; "><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: #000000; line-height: 1.2; pointer-events: all; white-space: normal; word-wrap: normal; ">Catalog<br />API</div></div></div></foreignObject><text x="115" y="604" fill="#000000" font-family="Helvetica" font-size="12px" text-anchor="middle">Catalog...</text></switch></g><path d="M 0 60 L 440 60" fill="none" stroke="#666666" stroke-miterlimit="10" stroke-dasharray="3 3" pointer-events="stroke"/><path d="M 0 220 L 440 220" fill="none" stroke="#666666" stroke-miterlimit="10" stroke-dasharray="3 3" pointer-events="stroke"/><path d="M 0 380 L 440 380" fill="none" stroke="#666666" stroke-miterlimit="10" stroke-dasharray="3 3" pointer-events="stroke"/><path d="M 0 560 L 440 560" fill="none" stroke="#666666" stroke-miterlimit="10" stroke-dasharray="3 3" pointer-events="stroke"/><rect x="290" y="220" width="150" height="20" fill="none" stroke="none" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe flex-end; width: 148px; height: 1px; padding-top: 230px; margin-left: 290px;"><div style="box-sizing: border-box; font-size: 0; text-align: right; "><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: #808080; line-height: 1.2; pointer-events: all; white-space: normal; word-wrap: normal; ">Processing</div></div></div></foreignObject><text x="438" y="234" fill="#808080" font-family="Helvetica" font-size="12px" text-anchor="end">Processing</text></switch></g><rect x="290" y="380" width="150" height="20" fill="none" stroke="none" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe flex-end; width: 148px; height: 1px; padding-top: 390px; margin-left: 290px;"><div style="box-sizing: border-box; font-size: 0; text-align: right; "><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: #808080; line-height: 1.2; pointer-events: all; white-space: normal; word-wrap: normal; ">Stitching</div></div></div></foreignObject><text x="438" y="394" fill="#808080" font-family="Helvetica" font-size="12px" text-anchor="end">Stitching</text></switch></g><rect x="290" y="60" width="150" height="20" fill="none" stroke="none" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe flex-end; width: 148px; height: 1px; padding-top: 70px; margin-left: 290px;"><div style="box-sizing: border-box; font-size: 0; text-align: right; "><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: #808080; line-height: 1.2; pointer-events: all; white-space: normal; word-wrap: normal; ">Ingestion</div></div></div></foreignObject><text x="438" y="74" fill="#808080" font-family="Helvetica" font-size="12px" text-anchor="end">Ingestion</text></switch></g></g><switch><g requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"/><a transform="translate(0,-5)" xlink:href="https://www.diagrams.net/doc/faq/svg-export-text-problems" target="_blank"><text text-anchor="middle" font-size="10px" x="50%" y="100%">Viewer does not support full SVG 1.1</text></a></switch></svg>
\ No newline at end of file
diff --git a/docs/assets/features/catalog/life-of-an-entity_processing.svg b/docs/assets/features/catalog/life-of-an-entity_processing.svg
new file mode 100644
index 0000000000..da3c4c7dba
--- /dev/null
+++ b/docs/assets/features/catalog/life-of-an-entity_processing.svg
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="442px" height="451px" viewBox="-0.5 -0.5 442 451" content="&lt;mxfile host=&quot;app.diagrams.net&quot; modified=&quot;2021-09-03T09:36:31.052Z&quot; agent=&quot;5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/92.0.4515.159 Safari/537.36&quot; etag=&quot;fw01D3IrGl6r49ubuzkp&quot; version=&quot;15.0.4&quot; type=&quot;google&quot;&gt;&lt;diagram name=&quot;Page-1&quot; id=&quot;c7558073-3199-34d8-9f00-42111426c3f3&quot;&gt;7VzLcuI4FP0aqmYW6bLlB/YyIcnMorvSVZmp6ay6DBagibE8tgjQXz8ylvBDNpgYrEC0wnpYNtI591xdXRgYo8X6j9iL5t+wD4MB0Pz1wLgfAKBrDqAfac0mq7GBmVXMYuSzTnnFM/oF+Z2sdol8mJQ6EowDgqJy5QSHIZyQUp0Xx3hV7jbFQfmpkTeDQsXzxAvE2n+QT+ZZrQPsvP5PiGZz/mTddrOWsTd5ncV4GbLnhTiEWcvC48Ow75jMPR+vClXGw8AYxRiT7GqxHsEgnVY+Y9l9jw2tu1eOYUja3DC6Ietvzsv9o/7k/4Ra8LoCzzfsCyZkw6cC+nRmWBHHZI5nOPSCh7z2bvt1YTqqTkt5n68YR6zyX0jIhi2ztySYVs3JImCt9IXjzQ9a0HjhJS18sXjxfl1svN/w0hqRH3wMep3dBSxWzO9KC7ubQv82RQgtbhdnW/OIgoC1T+nlCAc43n59w7eg45u0PiExfoWFFgeMDdumLdmUpfPUuBKsKsHLeAL3TD/HuhfPINnTz9zhhVIQ4gWk00Lvi2HgEfRWfg+PcWG267e79TtG9A2BxnhrGAyajLWOpZWHyN6f3ZVDi86ntyl0i9IOyZ7ngMpzzApSD/XXS/3pRfYGvFSYk7xqi/4jmKAPpVChFtLDQ5B+H3+mOCTsTXRwLdTQ7Y7cKMDqHajJxn3zgiV70vcYT2CS0KkB2hMXgwKoqAxE6WWU9aOTtpojAp8jbzsdKyqwZYjkEvO0JAEKIat/7+q8wZjA9f71EaeT32BXqMlNyCqXTZ2bkXlBMk3tTCsgh7ZKwdj0g5Y0tU6hYF2Fxx0eJzyu1oPwgL0m5K8VvnIT4tqyTYgr14TkVuOlZDTqTcgJuWv05H12WhxDoMffIQM+nX6gPYQEkY2wgvn6aIf5UeWBB53ppI4H9sSB4+lpeGAMyzwYghoeaH3ygO/GC3P9SZlhtmSGI5UZH2jH0vuGZRJ4SYImJWdIlwMCHchEgWnXkNYOCJu+Ej7s/5aYN9wk24m9pR2G0Tpvo1ez9BMuEOED0RfLxsqaamH31RvDoAwVL0CzMF0rOvWQWtC71F6iiRfcsoYF8v0MlZC+jTfejpcuPHPs6ODW3cC6r4FCQo05Cmcl6teYYxYwZEMPdsG4Ih72kKvReGtfTBMwaeoYhbnR9ZIO7MwwHwJPpwkkAlBO4HqaAnSiGHKv8gN5nY24qaLiFLJc3eFqNbIMamQZnEuWdwFkKXY+t+0vhZZDdv445T42MHVCI2+1NfKuTCPPHTHJnplcPb6MpbIa5Tiq1eLUMN5wO5Kq8da4WKIgF03zTpajRk2WaK5banMHm+zKtslcsz/dzshpScKu8b5Oq+N0dokd6hKn86aJ9NS29NzyssLQ31Dq5y6gjzwCf2/rPJ85UtHoO5VZKvjqcxyjX/S9vRrj75yI1m6F1qZIa7uG1cbZPC3nklgtV411u6UlAHIP6MTtMb1EPmXoR5JMmTsc15GtpuCi1FQy79y2brBc3rlKgy9Rg92aA/1eNdhQtqD94XvbELWh1YOgp+iFGGc81Z4YJ0RtillvbShdxy3F3dbcbe0/nyf50wRN8OFjZG8mZH+eLO+l+8GV8hAkeAi6VpOo0O82XXLCTsnIvDPn72CK7xXk/J3JcglZek4FaA1p6+JAlQwct3ry2mABj05DrOTZu+6BNESjyjinhzxE/lAxETHNs8qs5DjmBvJq0q50vS6Fude8K7P5zOgYJQTafjEUlFBcVaWGh+BjmWX4DIdWOzG0zgWe5s2VAs9HA0/FsA9rIq+9gkcHcsCTeQA4pKI5EoEEqecT1zdhMqeLRf2YVH4QTBQK34FCUEWhbBOmElm7hBoOn8U34KFrBMGpuLVaOz/8ZNmL3Y/5VeZrExuvPfP1NMdTymuS4HI7tmS9ssSdsgLPRwVP9T8Oag5J+gWP+JNx5XJfPQqr/2ghO2pgAeVyn9Xl7pp809Lldvt1uS3x17jK5e7ucmdsvHKX21KBysvRq4rL7Vqy9UodkVwOeKrHnTV/8NEveE6TaaJc7otCYTVLQHrUQEW5z+py2/1EuXfJGL353CrMfRaf+zOEuS0V5r4cwTKrhsaUrFi2inNfDnqEnEFLstdtq0D3J4Sh8KuC80UOaDH/9/RMMfN/pzce/gc=&lt;/diagram&gt;&lt;/mxfile&gt;" style="background-color: rgb(255, 255, 255);"><defs/><g><path d="M 150 120 L 155 120 Q 160 120 160 110 L 160 100 Q 160 90 170 90 L 200 90" fill="none" stroke="#82b366" stroke-miterlimit="10" pointer-events="stroke"/><path d="M 150 140 L 165 140 Q 175 140 175 150 L 175 260 Q 175 270 185 270 L 200 270" fill="none" stroke="#82b366" stroke-miterlimit="10" pointer-events="stroke"/><rect x="0" y="110" width="150" height="40" fill="#d5e8d4" stroke="#82b366" pointer-events="all"/><path d="M 15 110 L 15 150 M 135 110 L 135 150" fill="none" stroke="#82b366" stroke-miterlimit="10" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 118px; height: 1px; padding-top: 130px; margin-left: 16px;"><div style="box-sizing: border-box; font-size: 0; text-align: center; "><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: #000000; line-height: 1.2; pointer-events: all; white-space: normal; word-wrap: normal; ">Processor One</div></div></div></foreignObject><text x="75" y="134" fill="#000000" font-family="Helvetica" font-size="12px" text-anchor="middle">Processor One</text></switch></g><path d="M 150 250 L 155 250 Q 160 250 160 240 L 160 190 Q 160 180 170 180 L 200 180" fill="none" stroke="#82b366" stroke-miterlimit="10" pointer-events="stroke"/><rect x="0" y="240" width="150" height="40" fill="#d5e8d4" stroke="#82b366" pointer-events="all"/><path d="M 15 240 L 15 280 M 135 240 L 135 280" fill="none" stroke="#82b366" stroke-miterlimit="10" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 118px; height: 1px; padding-top: 260px; margin-left: 16px;"><div style="box-sizing: border-box; font-size: 0; text-align: center; "><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: #000000; line-height: 1.2; pointer-events: all; white-space: normal; word-wrap: normal; ">Processor Two</div></div></div></foreignObject><text x="75" y="264" fill="#000000" font-family="Helvetica" font-size="12px" text-anchor="middle">Processor Two</text></switch></g><path d="M 260 40 L 260 73.63" fill="none" stroke="#000000" stroke-miterlimit="10" pointer-events="stroke"/><path d="M 260 78.88 L 256.5 71.88 L 260 73.63 L 263.5 71.88 Z" fill="#000000" stroke="#000000" stroke-miterlimit="10" pointer-events="all"/><rect x="210" y="0" width="100" height="40" fill="#dae8fc" stroke="#6c8ebf" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 98px; height: 1px; padding-top: 20px; margin-left: 211px;"><div style="box-sizing: border-box; font-size: 0; text-align: center; "><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: #000000; line-height: 1.2; pointer-events: all; white-space: normal; word-wrap: normal; ">Unprocessed Entity</div></div></div></foreignObject><text x="260" y="24" fill="#000000" font-family="Helvetica" font-size="12px" text-anchor="middle">Unprocessed Enti...</text></switch></g><path d="M 260 100 L 260 110 Q 260 120 260 110 L 260 105 Q 260 100 260 106.82 L 260 113.63" fill="none" stroke="#000000" stroke-miterlimit="10" pointer-events="stroke"/><path d="M 260 118.88 L 256.5 111.88 L 260 113.63 L 263.5 111.88 Z" fill="#000000" stroke="#000000" stroke-miterlimit="10" pointer-events="all"/><path d="M 320 90 L 330 90 Q 340 90 340 86.25 L 340 84.38 Q 340 82.5 346.82 82.5 L 353.63 82.5" fill="none" stroke="#000000" stroke-miterlimit="10" pointer-events="stroke"/><path d="M 358.88 82.5 L 351.88 86 L 353.63 82.5 L 351.88 79 Z" fill="#000000" stroke="#000000" stroke-miterlimit="10" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 1px; height: 1px; padding-top: 73px; margin-left: 336px;"><div style="box-sizing: border-box; font-size: 0; text-align: center; "><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: #000000; line-height: 1.2; pointer-events: all; background-color: #ffffff; white-space: nowrap; "><font style="font-size: 7px">emit</font></div></div></div></foreignObject><text x="336" y="77" fill="#000000" font-family="Helvetica" font-size="12px" text-anchor="middle">e...</text></switch></g><rect x="200" y="80" width="120" height="20" fill="#d5e8d4" stroke="#82b366" pointer-events="all"/><path d="M 212 80 L 212 100 M 308 80 L 308 100" fill="none" stroke="#82b366" stroke-miterlimit="10" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 94px; height: 1px; padding-top: 90px; margin-left: 213px;"><div style="box-sizing: border-box; font-size: 0; text-align: center; "><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: #000000; line-height: 1.2; pointer-events: all; white-space: normal; word-wrap: normal; ">preprocess</div></div></div></foreignObject><text x="260" y="94" fill="#000000" font-family="Helvetica" font-size="12px" text-anchor="middle">preprocess</text></switch></g><path d="M 260 190 L 260 210" fill="none" stroke="#000000" stroke-miterlimit="10" pointer-events="stroke"/><path d="M 260 190 L 260 200 Q 260 210 260 200 L 260 195 Q 260 190 260 196.82 L 260 203.63" fill="none" stroke="#000000" stroke-miterlimit="10" pointer-events="stroke"/><path d="M 260 208.88 L 256.5 201.88 L 260 203.63 L 263.5 201.88 Z" fill="#000000" stroke="#000000" stroke-miterlimit="10" pointer-events="all"/><rect x="200" y="170" width="120" height="20" fill="#d5e8d4" stroke="#82b366" pointer-events="all"/><path d="M 212 170 L 212 190 M 308 170 L 308 190" fill="none" stroke="#82b366" stroke-miterlimit="10" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 98px; height: 1px; padding-top: 180px; margin-left: 211px;"><div style="box-sizing: border-box; font-size: 0; text-align: center; "><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: #000000; line-height: 1.2; pointer-events: all; white-space: normal; word-wrap: normal; "><p style="line-height: 120%">preprocess</p></div></div></div></foreignObject><text x="260" y="184" fill="#000000" font-family="Helvetica" font-size="12px" text-anchor="middle">preprocess</text></switch></g><path d="M 260 150 L 260 160 Q 260 170 260 160 L 260 155 Q 260 150 260 156.82 L 260 163.63" fill="none" stroke="#000000" stroke-miterlimit="10" pointer-events="stroke"/><path d="M 260 168.88 L 256.5 161.88 L 260 163.63 L 263.5 161.88 Z" fill="#000000" stroke="#000000" stroke-miterlimit="10" pointer-events="all"/><rect x="230" y="120" width="60" height="30" fill="#dae8fc" stroke="#6c8ebf" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 62px; height: 1px; padding-top: 135px; margin-left: 229px;"><div style="box-sizing: border-box; font-size: 0; text-align: center; "><div style="display: inline-block; font-size: 8px; font-family: Helvetica; color: #000000; line-height: 1.2; pointer-events: all; white-space: normal; word-wrap: normal; "><font style="font-size: 8px ; line-height: 100%">(intermediate)</font></div></div></div></foreignObject><text x="260" y="137" fill="#000000" font-family="Helvetica" font-size="8px" text-anchor="middle">(intermediate)</text></switch></g><path d="M 260 280 L 260 290 Q 260 300 260 290 L 260 285 Q 260 280 260 286.82 L 260 293.63" fill="none" stroke="#000000" stroke-miterlimit="10" pointer-events="stroke"/><path d="M 260 298.88 L 256.5 291.88 L 260 293.63 L 263.5 291.88 Z" fill="#000000" stroke="#000000" stroke-miterlimit="10" pointer-events="all"/><rect x="200" y="260" width="120" height="20" fill="#d5e8d4" stroke="#82b366" pointer-events="all"/><path d="M 212 260 L 212 280 M 308 260 L 308 280" fill="none" stroke="#82b366" stroke-miterlimit="10" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 94px; height: 1px; padding-top: 270px; margin-left: 213px;"><div style="box-sizing: border-box; font-size: 0; text-align: center; "><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: #000000; line-height: 1.2; pointer-events: all; white-space: normal; word-wrap: normal; ">validate</div></div></div></foreignObject><text x="260" y="274" fill="#000000" font-family="Helvetica" font-size="12px" text-anchor="middle">validate</text></switch></g><path d="M 260 240 L 260 250 Q 260 260 260 250 L 260 245 Q 260 240 260 246.82 L 260 253.63" fill="none" stroke="#000000" stroke-miterlimit="10" pointer-events="stroke"/><path d="M 260 258.88 L 256.5 251.88 L 260 253.63 L 263.5 251.88 Z" fill="#000000" stroke="#000000" stroke-miterlimit="10" pointer-events="all"/><rect x="230" y="210" width="60" height="30" fill="#dae8fc" stroke="#6c8ebf" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 62px; height: 1px; padding-top: 225px; margin-left: 229px;"><div style="box-sizing: border-box; font-size: 0; text-align: center; "><div style="display: inline-block; font-size: 8px; font-family: Helvetica; color: #000000; line-height: 1.2; pointer-events: all; white-space: normal; word-wrap: normal; "><font style="font-size: 8px ; line-height: 100%">(intermediate)</font></div></div></div></foreignObject><text x="260" y="227" fill="#000000" font-family="Helvetica" font-size="8px" text-anchor="middle">(intermediate)</text></switch></g><path d="M 260 370 L 260 403.63" fill="none" stroke="#000000" stroke-miterlimit="10" pointer-events="stroke"/><path d="M 260 408.88 L 256.5 401.88 L 260 403.63 L 263.5 401.88 Z" fill="#000000" stroke="#000000" stroke-miterlimit="10" pointer-events="all"/><rect x="200" y="350" width="120" height="20" fill="#d5e8d4" stroke="#82b366" pointer-events="all"/><path d="M 212 350 L 212 370 M 308 350 L 308 370" fill="none" stroke="#82b366" stroke-miterlimit="10" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 98px; height: 1px; padding-top: 360px; margin-left: 211px;"><div style="box-sizing: border-box; font-size: 0; text-align: center; "><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: #000000; line-height: 1.2; pointer-events: all; white-space: normal; word-wrap: normal; "><p style="line-height: 120%">postprocess</p></div></div></div></foreignObject><text x="260" y="364" fill="#000000" font-family="Helvetica" font-size="12px" text-anchor="middle">postprocess</text></switch></g><path d="M 260 330 L 260 340 Q 260 350 260 340 L 260 335 Q 260 330 260 336.82 L 260 343.63" fill="none" stroke="#000000" stroke-miterlimit="10" pointer-events="stroke"/><path d="M 260 348.88 L 256.5 341.88 L 260 343.63 L 263.5 341.88 Z" fill="#000000" stroke="#000000" stroke-miterlimit="10" pointer-events="all"/><rect x="230" y="300" width="60" height="30" fill="#dae8fc" stroke="#6c8ebf" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 62px; height: 1px; padding-top: 315px; margin-left: 229px;"><div style="box-sizing: border-box; font-size: 0; text-align: center; "><div style="display: inline-block; font-size: 8px; font-family: Helvetica; color: #000000; line-height: 1.2; pointer-events: all; white-space: normal; word-wrap: normal; "><font style="font-size: 8px ; line-height: 100%">(intermediate)</font></div></div></div></foreignObject><text x="260" y="317" fill="#000000" font-family="Helvetica" font-size="8px" text-anchor="middle">(intermediate)</text></switch></g><path d="M 150 270 L 160 270 Q 170 270 170 280 L 170 350 Q 170 360 180 360 L 200 360" fill="none" stroke="#82b366" stroke-miterlimit="10" pointer-events="stroke"/><rect x="210" y="410" width="100" height="40" fill="#dae8fc" stroke="#6c8ebf" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 98px; height: 1px; padding-top: 430px; margin-left: 211px;"><div style="box-sizing: border-box; font-size: 0; text-align: center; "><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: #000000; line-height: 1.2; pointer-events: all; white-space: normal; word-wrap: normal; ">Processed<br />Entity</div></div></div></foreignObject><text x="260" y="434" fill="#000000" font-family="Helvetica" font-size="12px" text-anchor="middle">Processed...</text></switch></g><rect x="380" y="55" width="60" height="35" fill="#dae8fc" stroke="#6c8ebf" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 62px; height: 1px; padding-top: 73px; margin-left: 379px;"><div style="box-sizing: border-box; font-size: 0; text-align: center; "><div style="display: inline-block; font-size: 8px; font-family: Helvetica; color: #000000; line-height: 1.2; pointer-events: all; white-space: normal; word-wrap: normal; "><font style="font-size: 8px ; line-height: 100%"><br /></font></div></div></div></foreignObject><text x="410" y="75" fill="#000000" font-family="Helvetica" font-size="8px" text-anchor="middle"></text></switch></g><rect x="370" y="60" width="60" height="35" fill="#dae8fc" stroke="#6c8ebf" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 62px; height: 1px; padding-top: 78px; margin-left: 369px;"><div style="box-sizing: border-box; font-size: 0; text-align: center; "><div style="display: inline-block; font-size: 8px; font-family: Helvetica; color: #000000; line-height: 1.2; pointer-events: all; white-space: normal; word-wrap: normal; "><font style="font-size: 8px ; line-height: 100%"><br /></font></div></div></div></foreignObject><text x="400" y="80" fill="#000000" font-family="Helvetica" font-size="8px" text-anchor="middle"></text></switch></g><rect x="360" y="65" width="60" height="35" fill="#dae8fc" stroke="#6c8ebf" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 62px; height: 1px; padding-top: 83px; margin-left: 359px;"><div style="box-sizing: border-box; font-size: 0; text-align: center; "><div style="display: inline-block; font-size: 8px; font-family: Helvetica; color: #000000; line-height: 1.2; pointer-events: all; white-space: normal; word-wrap: normal; "><font style="font-size: 8px ; line-height: 100%">relations,<br />errors,<br />other entities<br /></font></div></div></div></foreignObject><text x="390" y="85" fill="#000000" font-family="Helvetica" font-size="8px" text-anchor="middle">relations,...</text></switch></g><path d="M 320 180 L 330 180 Q 340 180 340 176.25 L 340 174.38 Q 340 172.5 346.82 172.5 L 353.63 172.5" fill="none" stroke="#000000" stroke-miterlimit="10" pointer-events="stroke"/><path d="M 358.88 172.5 L 351.88 176 L 353.63 172.5 L 351.88 169 Z" fill="#000000" stroke="#000000" stroke-miterlimit="10" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 1px; height: 1px; padding-top: 163px; margin-left: 336px;"><div style="box-sizing: border-box; font-size: 0; text-align: center; "><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: #000000; line-height: 1.2; pointer-events: all; background-color: #ffffff; white-space: nowrap; "><font style="font-size: 7px">emit</font></div></div></div></foreignObject><text x="336" y="167" fill="#000000" font-family="Helvetica" font-size="12px" text-anchor="middle">e...</text></switch></g><rect x="380" y="145" width="60" height="35" fill="#dae8fc" stroke="#6c8ebf" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 62px; height: 1px; padding-top: 163px; margin-left: 379px;"><div style="box-sizing: border-box; font-size: 0; text-align: center; "><div style="display: inline-block; font-size: 8px; font-family: Helvetica; color: #000000; line-height: 1.2; pointer-events: all; white-space: normal; word-wrap: normal; "><font style="font-size: 8px ; line-height: 100%"><br /></font></div></div></div></foreignObject><text x="410" y="165" fill="#000000" font-family="Helvetica" font-size="8px" text-anchor="middle"></text></switch></g><rect x="370" y="150" width="60" height="35" fill="#dae8fc" stroke="#6c8ebf" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 62px; height: 1px; padding-top: 168px; margin-left: 369px;"><div style="box-sizing: border-box; font-size: 0; text-align: center; "><div style="display: inline-block; font-size: 8px; font-family: Helvetica; color: #000000; line-height: 1.2; pointer-events: all; white-space: normal; word-wrap: normal; "><font style="font-size: 8px ; line-height: 100%"><br /></font></div></div></div></foreignObject><text x="400" y="170" fill="#000000" font-family="Helvetica" font-size="8px" text-anchor="middle"></text></switch></g><rect x="360" y="155" width="60" height="35" fill="#dae8fc" stroke="#6c8ebf" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 62px; height: 1px; padding-top: 173px; margin-left: 359px;"><div style="box-sizing: border-box; font-size: 0; text-align: center; "><div style="display: inline-block; font-size: 8px; font-family: Helvetica; color: #000000; line-height: 1.2; pointer-events: all; white-space: normal; word-wrap: normal; "><font style="font-size: 8px ; line-height: 100%">relations,<br />errors,<br />other entities<br /></font></div></div></div></foreignObject><text x="390" y="175" fill="#000000" font-family="Helvetica" font-size="8px" text-anchor="middle">relations,...</text></switch></g><path d="M 320 270 L 330 270 Q 340 270 340 266.25 L 340 264.38 Q 340 262.5 346.82 262.5 L 353.63 262.5" fill="none" stroke="#000000" stroke-miterlimit="10" pointer-events="stroke"/><path d="M 358.88 262.5 L 351.88 266 L 353.63 262.5 L 351.88 259 Z" fill="#000000" stroke="#000000" stroke-miterlimit="10" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 1px; height: 1px; padding-top: 253px; margin-left: 336px;"><div style="box-sizing: border-box; font-size: 0; text-align: center; "><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: #000000; line-height: 1.2; pointer-events: all; background-color: #ffffff; white-space: nowrap; "><font style="font-size: 7px">emit</font></div></div></div></foreignObject><text x="336" y="257" fill="#000000" font-family="Helvetica" font-size="12px" text-anchor="middle">e...</text></switch></g><rect x="380" y="235" width="60" height="35" fill="#dae8fc" stroke="#6c8ebf" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 62px; height: 1px; padding-top: 253px; margin-left: 379px;"><div style="box-sizing: border-box; font-size: 0; text-align: center; "><div style="display: inline-block; font-size: 8px; font-family: Helvetica; color: #000000; line-height: 1.2; pointer-events: all; white-space: normal; word-wrap: normal; "><font style="font-size: 8px ; line-height: 100%"><br /></font></div></div></div></foreignObject><text x="410" y="255" fill="#000000" font-family="Helvetica" font-size="8px" text-anchor="middle"></text></switch></g><rect x="370" y="240" width="60" height="35" fill="#dae8fc" stroke="#6c8ebf" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 62px; height: 1px; padding-top: 258px; margin-left: 369px;"><div style="box-sizing: border-box; font-size: 0; text-align: center; "><div style="display: inline-block; font-size: 8px; font-family: Helvetica; color: #000000; line-height: 1.2; pointer-events: all; white-space: normal; word-wrap: normal; "><font style="font-size: 8px ; line-height: 100%"><br /></font></div></div></div></foreignObject><text x="400" y="260" fill="#000000" font-family="Helvetica" font-size="8px" text-anchor="middle"></text></switch></g><rect x="360" y="245" width="60" height="35" fill="#dae8fc" stroke="#6c8ebf" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 62px; height: 1px; padding-top: 263px; margin-left: 359px;"><div style="box-sizing: border-box; font-size: 0; text-align: center; "><div style="display: inline-block; font-size: 8px; font-family: Helvetica; color: #000000; line-height: 1.2; pointer-events: all; white-space: normal; word-wrap: normal; "><font style="font-size: 8px ; line-height: 100%">relations,<br />errors,<br />other entities<br /></font></div></div></div></foreignObject><text x="390" y="265" fill="#000000" font-family="Helvetica" font-size="8px" text-anchor="middle">relations,...</text></switch></g><path d="M 320 360 L 330 360 Q 340 360 340 356.25 L 340 354.38 Q 340 352.5 346.82 352.5 L 353.63 352.5" fill="none" stroke="#000000" stroke-miterlimit="10" pointer-events="stroke"/><path d="M 358.88 352.5 L 351.88 356 L 353.63 352.5 L 351.88 349 Z" fill="#000000" stroke="#000000" stroke-miterlimit="10" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 1px; height: 1px; padding-top: 343px; margin-left: 336px;"><div style="box-sizing: border-box; font-size: 0; text-align: center; "><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: #000000; line-height: 1.2; pointer-events: all; background-color: #ffffff; white-space: nowrap; "><font style="font-size: 7px">emit</font></div></div></div></foreignObject><text x="336" y="347" fill="#000000" font-family="Helvetica" font-size="12px" text-anchor="middle">e...</text></switch></g><rect x="380" y="325" width="60" height="35" fill="#dae8fc" stroke="#6c8ebf" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 62px; height: 1px; padding-top: 343px; margin-left: 379px;"><div style="box-sizing: border-box; font-size: 0; text-align: center; "><div style="display: inline-block; font-size: 8px; font-family: Helvetica; color: #000000; line-height: 1.2; pointer-events: all; white-space: normal; word-wrap: normal; "><font style="font-size: 8px ; line-height: 100%"><br /></font></div></div></div></foreignObject><text x="410" y="345" fill="#000000" font-family="Helvetica" font-size="8px" text-anchor="middle"></text></switch></g><rect x="370" y="330" width="60" height="35" fill="#dae8fc" stroke="#6c8ebf" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 62px; height: 1px; padding-top: 348px; margin-left: 369px;"><div style="box-sizing: border-box; font-size: 0; text-align: center; "><div style="display: inline-block; font-size: 8px; font-family: Helvetica; color: #000000; line-height: 1.2; pointer-events: all; white-space: normal; word-wrap: normal; "><font style="font-size: 8px ; line-height: 100%"><br /></font></div></div></div></foreignObject><text x="400" y="350" fill="#000000" font-family="Helvetica" font-size="8px" text-anchor="middle"></text></switch></g><rect x="360" y="335" width="60" height="35" fill="#dae8fc" stroke="#6c8ebf" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 62px; height: 1px; padding-top: 353px; margin-left: 359px;"><div style="box-sizing: border-box; font-size: 0; text-align: center; "><div style="display: inline-block; font-size: 8px; font-family: Helvetica; color: #000000; line-height: 1.2; pointer-events: all; white-space: normal; word-wrap: normal; "><font style="font-size: 8px ; line-height: 100%">relations,<br />errors,<br />other entities<br /></font></div></div></div></foreignObject><text x="390" y="355" fill="#000000" font-family="Helvetica" font-size="8px" text-anchor="middle">relations,...</text></switch></g></g><switch><g requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"/><a transform="translate(0,-5)" xlink:href="https://www.diagrams.net/doc/faq/svg-export-text-problems" target="_blank"><text text-anchor="middle" font-size="10px" x="50%" y="100%">Viewer does not support full SVG 1.1</text></a></switch></svg>
\ No newline at end of file
diff --git a/docs/assets/features/catalog/life-of-an-entity_stitching.svg b/docs/assets/features/catalog/life-of-an-entity_stitching.svg
new file mode 100644
index 0000000000..3b232a361c
--- /dev/null
+++ b/docs/assets/features/catalog/life-of-an-entity_stitching.svg
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="512px" height="542px" viewBox="-0.5 -0.5 512 542" content="&lt;mxfile host=&quot;app.diagrams.net&quot; modified=&quot;2021-09-04T14:02:37.071Z&quot; agent=&quot;5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/92.0.4515.159 Safari/537.36&quot; etag=&quot;lrYE7mvcvFKD3bc075jp&quot; version=&quot;15.0.4&quot; type=&quot;google&quot;&gt;&lt;diagram name=&quot;Page-1&quot; id=&quot;c7558073-3199-34d8-9f00-42111426c3f3&quot;&gt;7VtLc5s6FP41XqYD4r2sHaddtNNMvbjt6o4CMqiRkUfIsd1fXwHiZWGXxo6xiZ1FpINefN95iIMYGZPF5hODy+grDRAZAS3YjIz7EQC65gLxL5Vsc8mdZVq5JGQ4kK0qwQz/RkVXKV3hACWNhpxSwvGyKfRpHCOfN2SQMbpuNptT0px1CUOkCGY+JKr0PxzwKJe6wK7knxEOo2Jm3fbyK0/Qfw4ZXcVyvpjGKL+ygMUw8h6TCAZ0XRMZ05ExYZTyvLTYTBBJcS0Qy/s97LlaLpmhmHfpMLnjm6/uz/sH/VvwP9LI8xrM7lw3H+YFkpXEQq6WbwtwsttD6SjayBivI8zRbAn99Opa6IOQRXxBRE0XxTmNueRXF7c4fkGMYwH0R4LDWAgXOAjSgccJZ/QZTSihLJvGsLOfuBLAJMqm02XlEXKOWJxJgJaOOseE1LrOrfRPzl6T5z8hlzcp1oI2e+HTS1KEoiO6QJxtRZOigy15lDquW6YUrCuNKRtFdW1xpBBKLQ3LwSu6REEy9i/sOTf2Xsme4XZlz3wz9uwbe69kT/d6tz0bKOw9MuqjJBH4AZuIBYyfmCiFaWkac8y3R9LbBD6AyJ37rWz6LnqanwZ6oO1AX8bsOvRaC/RvZjeOo+CIAhHOZZUyHtGQxpBMK+m4QjqFsmrzhdKlFP5CnG+l/cAVp030BV5s+0MylVV+ppUPVlG939Qv3m9lbdcoURx8THcsou4TmCTYz4UPmBRT5beX3tNh0gQEdMV8dEhLDbmbgixE/FBDr10NGCKQ45fmSk5vTMb7NCZT69uYbPN9Im/ZvSNvKcg/YOGRBoS65ezuupy+UXfcW/DoHDzs6wge6j56KkBiyRVaTJktKCOEpVqM22Iw4M3clPqMORx0QUsUOC+6av5lOOjaLd7+rOgW89+cfQdn73V19lafzt4zb5SenFLP6DV+e4oPnIkNrx8hpnCdRHCZFpf5M8rfPWGVoP+24gTHaI+HtJAbmG0e0gVPRpYaO4GHLJOOB5//rLPuh3UF/O8Z6zQeQggCLYnCs4Yg9xaCOvsrB3QNQb0+b7jGJVEKjuA0e1tZJzTrvcH8R61c0xxRqyZJK+Uce94JdHzR0IsO9RrzimUO1O0aoO+dv3dJNnrhbte6CrfrqPnSIZmM2fJC+rw7lYt6snIuIaw1gtS/x7hT2mjnVGyvYc21LkmHLtztXkd23VGz60Nyu3bLcYbzut1edirv7KFgj1J0tiDZ9ZFiMXWlTMbuttfwPni1n9scMV+nHKRSG2VcfTdNVAqKkXKfoYyUKWB5f0ckWYeStGjV5SOjerspgMO2cEJlLk5s/DVuOMcm6tu109xRTsvTXqfm5Umycgu8m+Xco+aCXbitNVumDZL9Ky5PC5ZLdrSDK1M6mF6jgyjkazit1Q07FWu3nJc+a6T1wFAj7eU8p3hnirS28Uqno8RWZ1ff3jq2qkcdZwgyP7pCG1fOd5lt30Sc6HyXqFYfy+RsVF8jGdM/&lt;/diagram&gt;&lt;/mxfile&gt;" style="background-color: rgb(255, 255, 255);"><defs/><g><rect x="0" y="360" width="160" height="170" fill="#f5f5f5" stroke="#666666" stroke-dasharray="1 2" pointer-events="all"/><rect x="0" y="200" width="160" height="140" fill="#f5f5f5" stroke="#666666" stroke-dasharray="1 2" pointer-events="all"/><rect x="0" y="10" width="160" height="170" fill="#f5f5f5" stroke="#666666" stroke-dasharray="1 2" pointer-events="all"/><rect x="40" y="30" width="100" height="40" fill="#dae8fc" stroke="#6c8ebf" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 98px; height: 1px; padding-top: 50px; margin-left: 41px;"><div style="box-sizing: border-box; font-size: 0; text-align: center; "><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: #000000; line-height: 1.2; pointer-events: all; white-space: normal; word-wrap: normal; ">Processed<br />Entity</div></div></div></foreignObject><text x="90" y="54" fill="#000000" font-family="Helvetica" font-size="12px" text-anchor="middle">Processed...</text></switch></g><path d="M 140 240 L 213.63 240" fill="none" stroke="#000000" stroke-miterlimit="10" pointer-events="stroke"/><path d="M 218.88 240 L 211.88 243.5 L 213.63 240 L 211.88 236.5 Z" fill="#000000" stroke="#000000" stroke-miterlimit="10" pointer-events="all"/><rect x="40" y="220" width="100" height="40" fill="#dae8fc" stroke="#6c8ebf" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 98px; height: 1px; padding-top: 240px; margin-left: 41px;"><div style="box-sizing: border-box; font-size: 0; text-align: center; "><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: #000000; line-height: 1.2; pointer-events: all; white-space: normal; word-wrap: normal; ">Processed<br />Entity</div></div></div></foreignObject><text x="90" y="244" fill="#000000" font-family="Helvetica" font-size="12px" text-anchor="middle">Processed...</text></switch></g><rect x="40" y="380" width="100" height="40" fill="#dae8fc" stroke="#6c8ebf" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 98px; height: 1px; padding-top: 400px; margin-left: 41px;"><div style="box-sizing: border-box; font-size: 0; text-align: center; "><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: #000000; line-height: 1.2; pointer-events: all; white-space: normal; word-wrap: normal; ">Processed<br />Entity</div></div></div></foreignObject><text x="90" y="404" fill="#000000" font-family="Helvetica" font-size="12px" text-anchor="middle">Processed...</text></switch></g><rect x="410" y="190" width="100" height="40" fill="#dae8fc" stroke="#6c8ebf" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 98px; height: 1px; padding-top: 210px; margin-left: 411px;"><div style="box-sizing: border-box; font-size: 0; text-align: center; "><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: #000000; line-height: 1.2; pointer-events: all; white-space: normal; word-wrap: normal; ">Final<br />Entity</div></div></div></foreignObject><text x="460" y="214" fill="#000000" font-family="Helvetica" font-size="12px" text-anchor="middle">Final...</text></switch></g><path d="M 140 280 L 170 280 Q 180 280 180 270 L 180 250 Q 180 240 190 240 L 213.63 240" fill="none" stroke="#000000" stroke-miterlimit="10" pointer-events="stroke"/><path d="M 218.88 240 L 211.88 243.5 L 213.63 240 L 211.88 236.5 Z" fill="#000000" stroke="#000000" stroke-miterlimit="10" pointer-events="all"/><rect x="60" y="270" width="80" height="20" fill="#dae8fc" stroke="#6c8ebf" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 78px; height: 1px; padding-top: 280px; margin-left: 61px;"><div style="box-sizing: border-box; font-size: 0; text-align: center; "><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: #000000; line-height: 1.2; pointer-events: all; white-space: normal; word-wrap: normal; ">Errors</div></div></div></foreignObject><text x="100" y="284" fill="#000000" font-family="Helvetica" font-size="12px" text-anchor="middle">Errors</text></switch></g><rect x="60" y="80" width="80" height="20" fill="#dae8fc" stroke="#6c8ebf" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 78px; height: 1px; padding-top: 90px; margin-left: 61px;"><div style="box-sizing: border-box; font-size: 0; text-align: center; "><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: #000000; line-height: 1.2; pointer-events: all; white-space: normal; word-wrap: normal; ">Errors</div></div></div></foreignObject><text x="100" y="94" fill="#000000" font-family="Helvetica" font-size="12px" text-anchor="middle">Errors</text></switch></g><rect x="60" y="490" width="80" height="20" fill="#dae8fc" stroke="#6c8ebf" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 78px; height: 1px; padding-top: 500px; margin-left: 61px;"><div style="box-sizing: border-box; font-size: 0; text-align: center; "><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: #000000; line-height: 1.2; pointer-events: all; white-space: normal; word-wrap: normal; ">Errors</div></div></div></foreignObject><text x="100" y="504" fill="#000000" font-family="Helvetica" font-size="12px" text-anchor="middle">Errors</text></switch></g><path d="M 370 240 L 380 240 Q 390 240 390 230 L 390 220 Q 390 210 396.82 210 L 403.63 210" fill="none" stroke="#000000" stroke-miterlimit="10" pointer-events="stroke"/><path d="M 408.88 210 L 401.88 213.5 L 403.63 210 L 401.88 206.5 Z" fill="#000000" stroke="#000000" stroke-miterlimit="10" pointer-events="all"/><path d="M 370 240 L 380 240 Q 390 240 390 250 L 390 270 Q 390 280 396.82 280 L 403.63 280" fill="none" stroke="#000000" stroke-miterlimit="10" pointer-events="stroke"/><path d="M 408.88 280 L 401.88 283.5 L 403.63 280 L 401.88 276.5 Z" fill="#000000" stroke="#000000" stroke-miterlimit="10" pointer-events="all"/><rect x="220" y="220" width="150" height="40" fill="#d5e8d4" stroke="#82b366" pointer-events="all"/><path d="M 235 220 L 235 260 M 355 220 L 355 260" fill="none" stroke="#82b366" stroke-miterlimit="10" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 118px; height: 1px; padding-top: 240px; margin-left: 236px;"><div style="box-sizing: border-box; font-size: 0; text-align: center; "><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: #000000; line-height: 1.2; pointer-events: all; white-space: normal; word-wrap: normal; ">Stitcher</div></div></div></foreignObject><text x="295" y="244" fill="#000000" font-family="Helvetica" font-size="12px" text-anchor="middle">Stitcher</text></switch></g><rect x="60" y="110" width="80" height="20" fill="#dae8fc" stroke="#6c8ebf" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 78px; height: 1px; padding-top: 120px; margin-left: 61px;"><div style="box-sizing: border-box; font-size: 0; text-align: center; "><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: #000000; line-height: 1.2; pointer-events: all; white-space: normal; word-wrap: normal; ">Relation</div></div></div></foreignObject><text x="100" y="124" fill="#000000" font-family="Helvetica" font-size="12px" text-anchor="middle">Relation</text></switch></g><path d="M 140 150 L 170 150 Q 180 150 180 160 L 180 230 Q 180 240 190 240 L 213.63 240" fill="none" stroke="#000000" stroke-miterlimit="10" pointer-events="stroke"/><path d="M 218.88 240 L 211.88 243.5 L 213.63 240 L 211.88 236.5 Z" fill="#000000" stroke="#000000" stroke-miterlimit="10" pointer-events="all"/><path d="M 60 150 L 30 150 Q 20 150 20 160 L 20 220 Q 20 230 30 230 L 40 230" fill="none" stroke="#666666" stroke-miterlimit="10" stroke-dasharray="3 3" pointer-events="stroke"/><rect x="60" y="140" width="80" height="20" fill="#dae8fc" stroke="#6c8ebf" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 78px; height: 1px; padding-top: 150px; margin-left: 61px;"><div style="box-sizing: border-box; font-size: 0; text-align: center; "><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: #000000; line-height: 1.2; pointer-events: all; white-space: normal; word-wrap: normal; ">Relation</div></div></div></foreignObject><text x="100" y="154" fill="#000000" font-family="Helvetica" font-size="12px" text-anchor="middle">Relation</text></switch></g><path d="M 140 310 L 170 310 Q 180 310 180 300 L 180 250 Q 180 240 190 240 L 213.63 240" fill="none" stroke="#000000" stroke-miterlimit="10" pointer-events="stroke"/><path d="M 218.88 240 L 211.88 243.5 L 213.63 240 L 211.88 236.5 Z" fill="#000000" stroke="#000000" stroke-miterlimit="10" pointer-events="all"/><rect x="60" y="300" width="80" height="20" fill="#dae8fc" stroke="#6c8ebf" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 78px; height: 1px; padding-top: 310px; margin-left: 61px;"><div style="box-sizing: border-box; font-size: 0; text-align: center; "><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: #000000; line-height: 1.2; pointer-events: all; white-space: normal; word-wrap: normal; ">Relation</div></div></div></foreignObject><text x="100" y="314" fill="#000000" font-family="Helvetica" font-size="12px" text-anchor="middle">Relation</text></switch></g><path d="M 60 440 L 30 440 Q 20 440 20 430 L 20 260 Q 20 250 30 250 L 40 250" fill="none" stroke="#666666" stroke-miterlimit="10" stroke-dasharray="3 3" pointer-events="stroke"/><path d="M 140 440 L 170 440 Q 180 440 180 430 L 180 250 Q 180 240 190 240 L 213.63 240" fill="none" stroke="#000000" stroke-miterlimit="10" pointer-events="stroke"/><path d="M 218.88 240 L 211.88 243.5 L 213.63 240 L 211.88 236.5 Z" fill="#000000" stroke="#000000" stroke-miterlimit="10" pointer-events="all"/><rect x="60" y="430" width="80" height="20" fill="#dae8fc" stroke="#6c8ebf" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 78px; height: 1px; padding-top: 440px; margin-left: 61px;"><div style="box-sizing: border-box; font-size: 0; text-align: center; "><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: #000000; line-height: 1.2; pointer-events: all; white-space: normal; word-wrap: normal; ">Relation</div></div></div></foreignObject><text x="100" y="444" fill="#000000" font-family="Helvetica" font-size="12px" text-anchor="middle">Relation</text></switch></g><path d="M 60 120 L 30 120 Q 20 120 20 110 L 20 0" fill="none" stroke="#666666" stroke-miterlimit="10" stroke-dasharray="3 3" pointer-events="stroke"/><path d="M 40 390 L 35 390 Q 30 390 30 380 L 30 320 Q 30 310 40 310 L 60 310" fill="none" stroke="#666666" stroke-miterlimit="10" stroke-dasharray="3 3" pointer-events="stroke"/><rect x="60" y="460" width="80" height="20" fill="#dae8fc" stroke="#6c8ebf" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 78px; height: 1px; padding-top: 470px; margin-left: 61px;"><div style="box-sizing: border-box; font-size: 0; text-align: center; "><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: #000000; line-height: 1.2; pointer-events: all; white-space: normal; word-wrap: normal; ">Relation</div></div></div></foreignObject><text x="100" y="474" fill="#000000" font-family="Helvetica" font-size="12px" text-anchor="middle">Relation</text></switch></g><path d="M 60 470 L 30 470 Q 20 470 20 480 L 20 540" fill="none" stroke="#666666" stroke-miterlimit="10" stroke-dasharray="3 3" pointer-events="stroke"/><rect x="410" y="260" width="100" height="40" fill="#dae8fc" stroke="#6c8ebf" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 98px; height: 1px; padding-top: 280px; margin-left: 411px;"><div style="box-sizing: border-box; font-size: 0; text-align: center; "><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: #000000; line-height: 1.2; pointer-events: all; white-space: normal; word-wrap: normal; ">Search</div></div></div></foreignObject><text x="460" y="284" fill="#000000" font-family="Helvetica" font-size="12px" text-anchor="middle">Search</text></switch></g></g><switch><g requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"/><a transform="translate(0,-5)" xlink:href="https://www.diagrams.net/doc/faq/svg-export-text-problems" target="_blank"><text text-anchor="middle" font-size="10px" x="50%" y="100%">Viewer does not support full SVG 1.1</text></a></switch></svg>
\ No newline at end of file
diff --git a/docs/auth/add-auth-provider.md b/docs/auth/add-auth-provider.md
index 56586cbfc6..472a6a0abc 100644
--- a/docs/auth/add-auth-provider.md
+++ b/docs/auth/add-auth-provider.md
@@ -244,9 +244,7 @@ export interface OAuthProviderHandlers {
     req: express.Request,
     options: Record<string, string>,
   ): Promise<RedirectInfo>;
-  handler(
-    req: express.Request,
-  ): Promise<{
+  handler(req: express.Request): Promise<{
     response: AuthResponse<OAuthProviderInfo>;
     refreshToken?: string;
   }>;
diff --git a/docs/auth/github/provider.md b/docs/auth/github/provider.md
index 4b65c8c3c2..81b2e98f2c 100644
--- a/docs/auth/github/provider.md
+++ b/docs/auth/github/provider.md
@@ -10,11 +10,16 @@ that can authenticate users using GitHub or GitHub Enterprise OAuth.
 
 ## Create an OAuth App on GitHub
 
-To add GitHub authentication, you must create an OAuth App from the GitHub
+To add GitHub authentication, you must create either a GitHub App, or an OAuth
+App from the GitHub
 [developer settings](https://github.com/settings/developers). The `Homepage URL`
 should point to Backstage's frontend, while the `Authorization callback URL`
 will point to the auth backend.
 
+Note that if you're using a GitHub App, the allowed scopes are configured as
+part of that app. This means you need to verify what scopes the plugins you use
+require, so be sure to check the plugin READMEs for that information.
+
 Settings for local development:
 
 - Application name: Backstage (or your custom app name)
@@ -51,3 +56,11 @@ The GitHub provider is a structure with three configuration keys:
 To add the provider to the frontend, add the `githubAuthApi` reference and
 `SignInPage` component as shown in
 [Adding the provider to the sign-in page](../index.md#adding-the-provider-to-the-sign-in-page).
+
+## Difference between GitHub Apps and GitHub OAuth Apps
+
+GitHub Apps handle OAuth scope at the app installation level, meaning that the
+`scope` parameter for the call to `getAccessToken` in the frontend has no
+effect. When calling `getAccessToken` in open source plugins, one should still
+include the appropriate scope, but also document in the plugin README what
+scopes are required for GitHub Apps.
diff --git a/docs/auth/identity-resolver.md b/docs/auth/identity-resolver.md
index 814ff63729..2c36ddcd7f 100644
--- a/docs/auth/identity-resolver.md
+++ b/docs/auth/identity-resolver.md
@@ -111,6 +111,48 @@ export default async function createPlugin({
 ...
 ```
 
+## Resolving membership through the catalog
+
+If you want to provide additional claims through Sign-In resolvers but still
+have the software catalog handle group (and transitive group) membership, you
+can do this using the `CatalogIdentityClient` provided as context to Sign-In
+resolvers:
+
+```ts
+export default async function createPlugin({
+  ...
+}: PluginEnvironment): Promise<Router> {
+  return await createRouter({
+    ...
+    providerFactories: {
+      google: createGoogleProvider({
+        signIn: {
+          resolver: async ({ profile: { email } }, ctx) => {
+            const [id] = email?.split('@') ?? '';
+            // Fetch from an external system that returns entity claims like:
+            // ['user:default/breanna.davison', ...]
+            const ent = await externalSystemClient.getUsernames(email);
+
+            // Resolve group membership from the Backstage catalog
+            const fullEnt = await ctx.catalogIdentityClient.resolveCatalogMembership({
+              entityRefs: [id].concat(ent),
+              logger: ctx.logger,
+            });
+            const token = await ctx.tokenIssuer.issueToken({
+              claims: { sub: id, ent: fullEnt },
+            });
+            return { id, token };
+          },
+        },
+      }),
+      ...
+```
+
+The `resolveCatalogMembership` method will retrieve the referenced entities from
+the catalog, if possible, and check for
+[memberOf](../features/software-catalog/well-known-relations.md#memberof-and-hasmember)
+relations to add additional entity claims.
+
 ## AuthHandler
 
 Similar to a custom sign-in resolver, you can also write a custom auth handler
diff --git a/docs/auth/index.md b/docs/auth/index.md
index 76cd79b0fd..0c03e33900 100644
--- a/docs/auth/index.md
+++ b/docs/auth/index.md
@@ -60,9 +60,8 @@ small update to show this provider as a login option. The `SignInPage` component
 handles this, and takes either a `provider` or `providers` (array) prop of
 `SignInProviderConfig` definitions.
 
-These reference the [ApiRef](../reference/utility-apis/README.md) exported by
-the provider. Again, an example using GitHub that can be adapted to any of the
-built-in providers:
+These reference the `ApiRef` exported by the provider. Again, an example using
+GitHub that can be adapted to any of the built-in providers:
 
 ```diff
 # packages/app/src/App.tsx
diff --git a/docs/auth/microsoft/provider.md b/docs/auth/microsoft/provider.md
index b64f9b1902..52f463bab4 100644
--- a/docs/auth/microsoft/provider.md
+++ b/docs/auth/microsoft/provider.md
@@ -44,7 +44,7 @@ The Microsoft provider is a structure with three configuration keys:
 
 - `clientId`: Application (client) ID, found on App Registration > Overview
 - `clientSecret`: Secret, found on App Registration > Certificates & secrets
-- `tenentId`: Directory (tenant) ID, found on App Registration > Overview
+- `tenantId`: Directory (tenant) ID, found on App Registration > Overview
 
 ## Adding the provider to the Backstage frontend
 
diff --git a/docs/auth/using-auth.md b/docs/auth/using-auth.md
index e4f87a12f9..067c43e8a0 100644
--- a/docs/auth/using-auth.md
+++ b/docs/auth/using-auth.md
@@ -28,7 +28,8 @@ OAuth helps in that regard.
 The method with which frontend plugins request access to third party services is
 through [Utility APIs](../api/utility-apis.md) for each service provider. For a
 full list of providers, see the
-[Utility API References](../reference/utility-apis/README.md).
+[@backstage/core-plugin-api](../reference/core-plugin-api.md#variables)
+reference.
 
 ### Identity - WIP
 
diff --git a/docs/conf/reading.md b/docs/conf/reading.md
index 6ac10a8c8b..fd1ce4c7a6 100644
--- a/docs/conf/reading.md
+++ b/docs/conf/reading.md
@@ -7,7 +7,7 @@ description: Documentation on Reading Backstage Configuration
 ## Config API
 
 There's a common configuration API for by both frontend and backend plugins. An
-API reference can be found [here](../reference/utility-apis/Config.md).
+API reference can be found [here](../reference/config.config.md).
 
 The configuration API is tailored towards failing fast in case of missing or bad
 config. That's because configuration errors can always be considered programming
@@ -110,9 +110,18 @@ example `getString`. These will throw an error if there is no value available.
 
 ## Accessing ConfigApi in Frontend Plugins
 
-The [ConfigApi](../reference/utility-apis/Config.md) in the frontend is a
+The [ConfigApi](../reference/core-plugin-api.configapi.md) in the frontend is a
 [UtilityApi](../api/utility-apis.md). It's accessible as usual via the
-`configApiRef` exported from `@backstage/core-plugin-api`.
+`configApiRef` exported from `@backstage/core-plugin-api`:
+
+```
+import { useApi, configApiRef } from '@backstage/core-plugin-api';
+...
+const MyReactComponent = (...) => {
+  const config = useApi(configApiRef);
+  ...
+}
+```
 
 Depending on the config api in another API is slightly different though, as the
 `ConfigApi` implementation is supplied via the App itself and not instantiated
diff --git a/docs/deployment/docker.md b/docs/deployment/docker.md
index e542b02ebf..599c01a0ce 100644
--- a/docs/deployment/docker.md
+++ b/docs/deployment/docker.md
@@ -113,6 +113,9 @@ browser at `http://localhost:7000`
 
 ## Multi-stage Build
 
+> NOTE: The `.dockerignore` is different in this setup, read on for more
+> details.
+
 This section describes how to set up a multi-stage Docker build that builds the
 entire project within Docker. This is typically slower than a host build, but is
 sometimes desired because Docker in Docker is not available in the build
@@ -137,6 +140,7 @@ WORKDIR /app
 COPY package.json yarn.lock ./
 
 COPY packages packages
+# Comment this out if you don't have any internal plugins
 COPY plugins plugins
 
 RUN find packages \! -name "package.json" -mindepth 2 -maxdepth 2 -exec rm -rf {} \+
@@ -182,8 +186,9 @@ end up being properly installed.
 
 To speed up the build when not running in a fresh clone of the repo you should
 set up a `.dockerignore`. This one is different than the host build one, because
-we want to have access to the source code of all packages for the build, but can
-ignore any existing build output or dependencies:
+we want to have access to the source code of all packages for the build. We can
+however ignore any existing build output or dependencies on the host. For our
+new `.dockerignore`, replace the contents of your existing one with this:
 
 ```text
 node_modules
diff --git a/docs/features/search/architecture.md b/docs/features/search/architecture.md
index 0a1ebea4b0..4fac0e7cff 100644
--- a/docs/features/search/architecture.md
+++ b/docs/features/search/architecture.md
@@ -4,8 +4,6 @@ title: Search Architecture
 description: Documentation on Search Architecture
 ---
 
-# Search Architecture
-
 > _This architecture has not been fully implemented yet. Find our milestones to
 > follow our progress and help contribute on the
 > [Search Roadmap](./README.md#project-roadmap)._
diff --git a/docs/features/search/concepts.md b/docs/features/search/concepts.md
index 5da7c9c58f..8cb17b12e6 100644
--- a/docs/features/search/concepts.md
+++ b/docs/features/search/concepts.md
@@ -4,8 +4,6 @@ title: Search Concepts
 description: Documentation on Backstage Search Concepts
 ---
 
-# Search Concepts
-
 Backstage Search lets you find the right information you are looking for in the
 Backstage ecosystem.
 
diff --git a/docs/features/search/getting-started.md b/docs/features/search/getting-started.md
index 2bd26faf8b..aa40c1e539 100644
--- a/docs/features/search/getting-started.md
+++ b/docs/features/search/getting-started.md
@@ -4,8 +4,6 @@ title: Getting Started with Search
 description: How to set up and install Backstage Search
 ---
 
-# Getting Started
-
 Search functions as a plugin to Backstage, so you will need to use Backstage to
 use Search.
 
@@ -252,13 +250,9 @@ an example:
 Backstage Search isn't a search engine itself, rather, it provides an interface
 between your Backstage instance and a
 [Search Engine](./concepts.md#search-engines) of your choice. Currently, we only
-support one, an in-memory search Engine called Lunr. It can be instantiated like
-this:
-
-```typescript
-const searchEngine = new LunrSearchEngine({ logger });
-const indexBuilder = new IndexBuilder({ logger, searchEngine });
-```
+support two engines, an in-memory search Engine called Lunr and ElasticSearch.
+See [Search Engines](./search-engines.md) documentation for more information how
+to configure these in your Backstage instance.
 
 Backstage Search can be used to power search of anything! Plugins like the
 Catalog offer default [collators](./concepts.md#collators) (e.g.
diff --git a/docs/features/search/search-engines.md b/docs/features/search/search-engines.md
new file mode 100644
index 0000000000..a0302ce279
--- /dev/null
+++ b/docs/features/search/search-engines.md
@@ -0,0 +1,158 @@
+---
+id: search-engines
+title: Search Engines
+description: Choosing and configuring your search engine for Backstage
+---
+
+Backstage supports 2 search engines by default, an in-memory engine called Lunr
+and ElasticSearch. You can configure your own search engines by implementing the
+provided interface as mentioned in the
+[search backend documentation.](./getting-started.md#Backend)
+
+Provided search engine implementations have their own way of constructing
+queries, which may be something you want to modify. Alterations to the querying
+logic of a search engine can be made by providing your own implementation of a
+QueryTranslator interface. This modification can be done without touching
+provided search engines by using the exposed setter to set the modified query
+translator into the instance.
+
+```typescript
+const searchEngine = new LunrSearchEngine({ logger });
+searchEngine.setTranslator(new MyNewAndBetterQueryTranslator());
+```
+
+## Lunr
+
+Lunr search engine is enabled by default for your backstage instance if you have
+not done additional changes to the scaffolded app.
+
+Lunr can be instantiated like this:
+
+```typescript
+// app/backend/src/plugins/search.ts
+const searchEngine = new LunrSearchEngine({ logger });
+const indexBuilder = new IndexBuilder({ logger, searchEngine });
+```
+
+## Postgres
+
+The Postgres based search engine only requires that postgres being configured as
+the database engine for Backstage. Therefore it targets setups that want to
+avoid maintaining another external service like elastic search. The search
+provides decent results and performs well with ten thousands of indexed
+documents. The connection to postgres is established via the database manager
+also used by other plugins.
+
+> **Important**: The search plugin requires at least Postgres 12!
+
+To use the `PgSearchEngine`, make sure that you have a Postgres database
+configured and make the following changes to your backend:
+
+1. Add a dependency on `@backstage/plugin-search-backend-module-pg` to your
+   backend's `package.json`.
+2. Initialize the search engine. It is recommended to initialize it with a
+   fallback to the lunr search engine if you are running Backstage for
+   development locally with SQLite:
+
+```typescript
+// In packages/backend/src/plugins/search.ts
+
+// Initialize a connection to a search engine.
+const searchEngine = (await PgSearchEngine.supported(database))
+  ? await PgSearchEngine.from({ database })
+  : new LunrSearchEngine({ logger });
+```
+
+## ElasticSearch
+
+Backstage supports ElasticSearch search engine connections, indexing and
+querying out of the box. Available configuration options enable usage of either
+AWS or Elastic.co hosted solutions, or a custom self-hosted solution.
+
+Similarly to Lunr above, ElasticSearch can be set up like this:
+
+```typescript
+// app/backend/src/plugins/search.ts
+const searchEngine = await ElasticSearchSearchEngine.initialize({
+  logger,
+  config,
+});
+const indexBuilder = new IndexBuilder({ logger, searchEngine });
+```
+
+For the engine to be available, your backend package needs a dependency into
+package `@backstage/plugin-search-backend-module-elasticsearch`.
+
+ElasticSearch needs some additional configuration before it is ready to use
+within your instance. The configuration options are documented in the
+[configuration schema definition file.](https://github.com/backstage/backstage/blob/master/plugins/search-backend-module-elasticsearch/config.d.ts)
+
+The underlying functionality is using official ElasticSearch client version 7.x,
+meaning that ElasticSearch version 7 is the only one confirmed to be supported.
+
+## Example configurations
+
+### AWS
+
+Using AWS hosted ElasticSearch the only configuration option needed is the URL
+to the ElasticSearch service. The implementation assumes that environment
+variables for AWS access key id and secret access key are defined in accordance
+to the
+[default AWS credential chain.](https://docs.aws.amazon.com/sdk-for-javascript/v2/developer-guide/setting-credentials-node.html).
+
+```yaml
+search:
+  elasticsearch:
+    provider: aws
+    node: https://my-backstage-search-asdfqwerty.eu-west-1.es.amazonaws.com
+```
+
+### Elastic.co
+
+Elastic Cloud hosted ElasticSearch uses a Cloud ID to determine the instance of
+hosted ElasticSearch to connect to. Additionally, username and password needs to
+be provided either directly or using environment variables like defined in
+[Backstage documentation.](https://backstage.io/docs/conf/writing#includes-and-dynamic-data)
+
+```yaml
+search:
+  elasticsearch:
+    provider: elastic
+    cloudId: backstage-elastic:asdfqwertyasdfqwertyasdfqwertyasdfqwerty==
+    auth:
+      username: elastic
+      password: changeme
+```
+
+### Others
+
+Other ElasticSearch instances can be connected to by using standard
+ElasticSearch authentication methods and exposed URL, provided that the cluster
+supports that. The configuration options needed are the URL to the node and
+authentication information. Authentication can be handled by either providing
+username/password or an API key. For more information how to create an API key,
+see
+[Elastic documentation on API keys](https://www.elastic.co/guide/en/elasticsearch/reference/current/security-api-create-api-key.html).
+
+#### Configuration examples
+
+##### With username and password
+
+```yaml
+search:
+  elasticsearch:
+    node: http://localhost:9200
+    auth:
+      username: elastic
+      password: changeme
+```
+
+##### With API key
+
+```yaml
+search:
+  elasticsearch:
+    node: http://localhost:9200
+    auth:
+      apiKey: base64EncodedKey
+```
diff --git a/docs/features/software-catalog/catalog-customization.md b/docs/features/software-catalog/catalog-customization.md
index e0228bf7d0..8f855776a0 100644
--- a/docs/features/software-catalog/catalog-customization.md
+++ b/docs/features/software-catalog/catalog-customization.md
@@ -27,27 +27,32 @@ default catalog page and create a component in a
 ```tsx
 // imports, etc omitted for brevity. for full source see:
 // https://github.com/backstage/backstage/blob/master/plugins/catalog/src/components/CatalogPage/CatalogPage.tsx
-export const CustomCatalogPage = () => {
+export const CustomCatalogPage = ({
+  columns,
+  actions,
+  initiallySelectedFilter = 'owned',
+}: CatalogPageProps) => {
   return (
-    <CatalogLayout>
-      <Content>
-        <ContentHeader title="Components">
-          <CreateComponentButton />
-          <SupportButton>All your software catalog entities</SupportButton>
-        </ContentHeader>
-        <div className={styles.contentWrapper}>
-          <EntityListProvider>
-            <div>
-              <EntityKindPicker initialFilter="component" hidden />
+    <PageWithHeader title={`${orgName} Catalog`} themeId="home">
+      <EntityListProvider>
+        <Content>
+          <ContentHeader titleComponent={<CatalogKindHeader />}>
+            <CreateButton title="Create Component" to={link} />
+            <SupportButton>All your software catalog entities</SupportButton>
+          </ContentHeader>
+          <FilteredEntityLayout>
+            <FilterContainer>
               <EntityTypePicker />
-              <UserListPicker />
+              <UserListPicker initialFilter={initiallySelectedFilter} />
               <EntityTagPicker />
-            </div>
-            <CatalogTable />
-          </EntityListProvider>
-        </div>
-      </Content>
-    </CatalogLayout>
+            </FilterContainer>
+            <EntityListContainer>
+              <CatalogTable columns={columns} actions={actions} />
+            </EntityListContainer>
+          </FilteredEntityLayout>
+        </Content>
+      </EntityListProvider>
+    </PageWithHeader>
   );
 };
 ```
@@ -137,19 +142,27 @@ export const EntitySecurityTierPicker = () => {
 Now we can add the component to `CustomCatalogPage`:
 
 ```diff
-export const CustomCatalogPage = () => {
+export const CustomCatalogPage = ({
+  columns,
+  actions,
+  initiallySelectedFilter = 'owned',
+}: CatalogPageProps) => {
   return (
     ...
-          <EntityListProvider>
-            <div>
+        <EntityListProvider>
+          <FilteredEntityLayout>
+            <FilterContainer>
               <EntityKindPicker initialFilter="component" hidden />
               <EntityTypePicker />
-              <UserListPicker />
-+              <EntitySecurityTierPicker />
+              <UserListPicker initialFilter={initiallySelectedFilter} />
++             <EntitySecurityTierPicker />
               <EntityTagPicker />
-            </div>
-            <CatalogTable />
-          </EntityListProvider>
+            <FilterContainer>
+            <EntityListContainer>
+              <CatalogTable columns={columns} actions={actions} />
+            </EntityListContainer>
+          </FilteredEntityLayout>
+        </EntityListProvider>
     ...
 };
 ```
@@ -173,7 +186,7 @@ new `CustomCatalogIndexPage`.
 # packages/app/src/App.tsx
 const routes = (
   <FlatRoutes>
-    <Navigate key="/" to="/catalog" />
+    <Navigate key="/" to="catalog" />
 -    <Route path="/catalog" element={<CatalogIndexPage />} />
 +    <Route path="/catalog" element={<CustomCatalogIndexPage />} />
 ```
diff --git a/docs/features/software-catalog/descriptor-format.md b/docs/features/software-catalog/descriptor-format.md
index fb17f4a434..7a9aa099e9 100644
--- a/docs/features/software-catalog/descriptor-format.md
+++ b/docs/features/software-catalog/descriptor-format.md
@@ -245,6 +245,22 @@ the entity belongs to the `"default"` namespace.
 Namespaces may also be part of the catalog, and are `v1` / `Namespace` entities,
 i.e. not Backstage specific but the same as in Kubernetes.
 
+### `title` [optional]
+
+A display name of the entity, to be presented in user interfaces instead of the
+`name` property above, when available.
+
+This field is sometimes useful when the `name` is cumbersome or ends up being
+perceived as overly technical. The title generally does not have as stringent
+format requirements on it, so it may contain special characters and be more
+explanatory. Do keep it very short though, and avoid situations where a title
+can be confused with the name of another entity, or where two entities share a
+title.
+
+Note that this is only for display purposes, and may be ignored by some parts of
+the code. [Entity references](references.md) still always make use of the `name`
+property for example, not the title.
+
 ### `description` [optional]
 
 A human readable description of the entity, to be shown in Backstage. Should be
@@ -531,8 +547,8 @@ The current set of well-known and common values for this field is:
 
 ### `spec.owner` [required]
 
-An [entity reference](#string-references) to the owner of the component, e.g.
-`artist-relations-team`. This field is required.
+An [entity reference](references.md#string-references) to the owner of the
+component, e.g. `artist-relations-team`. This field is required.
 
 In Backstage, the owner of a component is the singular entity (commonly a team)
 that bears ultimate responsibility for the component, and has the authority and
@@ -550,8 +566,8 @@ component, but there will always be one ultimate owner.
 
 ### `spec.system` [optional]
 
-An [entity reference](#string-references) to the system that the component
-belongs to, e.g. `artist-engagement-portal`. This field is optional.
+An [entity reference](references.md#string-references) to the system that the
+component belongs to, e.g. `artist-engagement-portal`. This field is optional.
 
 | [`kind`](#apiversion-and-kind-required) | Default [`namespace`](#namespace-optional) | Generated [relation](well-known-relations.md) type                            |
 | --------------------------------------- | ------------------------------------------ | ----------------------------------------------------------------------------- |
@@ -559,8 +575,8 @@ belongs to, e.g. `artist-engagement-portal`. This field is optional.
 
 ### `spec.subcomponentOf` [optional]
 
-An [entity reference](#string-references) to another component of which the
-component is a part, e.g. `spotify-ios-app`. This field is optional.
+An [entity reference](references.md#string-references) to another component of
+which the component is a part, e.g. `spotify-ios-app`. This field is optional.
 
 | [`kind`](#apiversion-and-kind-required)  | Default [`namespace`](#namespace-optional) | Generated [relation](well-known-relations.md) type                            |
 | ---------------------------------------- | ------------------------------------------ | ----------------------------------------------------------------------------- |
@@ -568,8 +584,8 @@ component is a part, e.g. `spotify-ios-app`. This field is optional.
 
 ### `spec.providesApis` [optional]
 
-An array of [entity references](#string-references) to the APIs that are
-provided by the component, e.g. `artist-api`. This field is optional.
+An array of [entity references](references.md#string-references) to the APIs
+that are provided by the component, e.g. `artist-api`. This field is optional.
 
 | [`kind`](#apiversion-and-kind-required) | Default [`namespace`](#namespace-optional) | Generated [relation](well-known-relations.md) type                                                  |
 | --------------------------------------- | ------------------------------------------ | --------------------------------------------------------------------------------------------------- |
@@ -577,8 +593,8 @@ provided by the component, e.g. `artist-api`. This field is optional.
 
 ### `spec.consumesApis` [optional]
 
-An array of [entity references](#string-references) to the APIs that are
-consumed by the component, e.g. `artist-api`. This field is optional.
+An array of [entity references](references.md#string-references) to the APIs
+that are consumed by the component, e.g. `artist-api`. This field is optional.
 
 | [`kind`](#apiversion-and-kind-required) | Default [`namespace`](#namespace-optional) | Generated [relation](well-known-relations.md) type                                                  |
 | --------------------------------------- | ------------------------------------------ | --------------------------------------------------------------------------------------------------- |
@@ -586,9 +602,9 @@ consumed by the component, e.g. `artist-api`. This field is optional.
 
 ### `spec.dependsOn` [optional]
 
-An array of [entity references](#string-references) to the components and
-resources that the component depends on, e.g. `artists-db`. This field is
-optional.
+An array of [entity references](references.md#string-references) to the
+components and resources that the component depends on, e.g. `artists-db`. This
+field is optional.
 
 | [`kind`](#apiversion-and-kind-required) | Default [`namespace`](#namespace-optional) | Generated [relation](well-known-relations.md) type                                            |
 | --------------------------------------- | ------------------------------------------ | --------------------------------------------------------------------------------------------- |
@@ -690,12 +706,6 @@ shape, this kind has the following structure.
 
 Exactly equal to `backstage.io/v1beta2` and `Template`, respectively.
 
-### `metadata.title` [required]
-
-The nice display name for the template as a string, e.g. `React SSR Template`.
-This field is required as is used to reference the template to the user instead
-of the `metadata.name` field.
-
 ### `metadata.tags` [optional]
 
 A list of strings that can be associated with the template, e.g.
@@ -722,8 +732,8 @@ You can find out more about the `steps` key
 
 ### `spec.owner` [optional]
 
-An [entity reference](#string-references) to the owner of the template, e.g.
-`artist-relations-team`. This field is required.
+An [entity reference](references.md#string-references) to the owner of the
+template, e.g. `artist-relations-team`. This field is required.
 
 In Backstage, the owner of a Template is the singular entity (commonly a team)
 that bears ultimate responsibility for the Template, and has the authority and
@@ -832,8 +842,8 @@ The current set of well-known and common values for this field is:
 
 ### `spec.owner` [required]
 
-An [entity reference](#string-references) to the owner of the component, e.g.
-`artist-relations-team`. This field is required.
+An [entity reference](references.md#string-references) to the owner of the
+component, e.g. `artist-relations-team`. This field is required.
 
 In Backstage, the owner of an API is the singular entity (commonly a team) that
 bears ultimate responsibility for the API, and has the authority and capability
@@ -851,8 +861,8 @@ one ultimate owner.
 
 ### `spec.system` [optional]
 
-An [entity reference](#string-references) to the system that the API belongs to,
-e.g. `artist-engagement-portal`. This field is optional.
+An [entity reference](references.md#string-references) to the system that the
+API belongs to, e.g. `artist-engagement-portal`. This field is optional.
 
 | [`kind`](#apiversion-and-kind-required) | Default [`namespace`](#namespace-optional) | Generated [relation](well-known-relations.md) type                            |
 | --------------------------------------- | ------------------------------------------ | ----------------------------------------------------------------------------- |
@@ -1059,8 +1069,8 @@ Exactly equal to `backstage.io/v1alpha1` and `Resource`, respectively.
 
 ### `spec.owner` [required]
 
-An [entity reference](#string-references) to the owner of the resource, e.g.
-`artist-relations-team`. This field is required.
+An [entity reference](references.md#string-references) to the owner of the
+resource, e.g. `artist-relations-team`. This field is required.
 
 In Backstage, the owner of a resource is the singular entity (commonly a team)
 that bears ultimate responsibility for the resource, and has the authority and
@@ -1091,8 +1101,8 @@ Some common values for this field could be:
 
 ### `spec.system` [optional]
 
-An [entity reference](#string-references) to the system that the resource
-belongs to, e.g. `artist-engagement-portal`. This field is optional.
+An [entity reference](references.md#string-references) to the system that the
+resource belongs to, e.g. `artist-engagement-portal`. This field is optional.
 
 | [`kind`](#apiversion-and-kind-required) | Default [`namespace`](#namespace-optional) | Generated [relation](well-known-relations.md) type                            |
 | --------------------------------------- | ------------------------------------------ | ----------------------------------------------------------------------------- |
@@ -1100,9 +1110,9 @@ belongs to, e.g. `artist-engagement-portal`. This field is optional.
 
 ### `spec.dependsOn` [optional]
 
-An array of [entity references](#string-references) to the components and
-resources that the resource depends on, e.g. `artist-lookup`. This field is
-optional.
+An array of [entity references](references.md#string-references) to the
+components and resources that the resource depends on, e.g. `artist-lookup`.
+This field is optional.
 
 | [`kind`](#apiversion-and-kind-required) | Default [`namespace`](#namespace-optional) | Generated [relation](well-known-relations.md) type                                            |
 | --------------------------------------- | ------------------------------------------ | --------------------------------------------------------------------------------------------- |
@@ -1146,8 +1156,8 @@ Exactly equal to `backstage.io/v1alpha1` and `System`, respectively.
 
 ### `spec.owner` [required]
 
-An [entity reference](#string-references) to the owner of the system, e.g.
-`artist-relations-team`. This field is required.
+An [entity reference](references.md#string-references) to the owner of the
+system, e.g. `artist-relations-team`. This field is required.
 
 In Backstage, the owner of a system is the singular entity (commonly a team)
 that bears ultimate responsibility for the system, and has the authority and
@@ -1165,8 +1175,8 @@ but there will always be one ultimate owner.
 
 ### `spec.domain` [optional]
 
-An [entity reference](#string-references) to the domain that the system belongs
-to, e.g. `artists`. This field is optional.
+An [entity reference](references.md#string-references) to the domain that the
+system belongs to, e.g. `artists`. This field is optional.
 
 | [`kind`](#apiversion-and-kind-required) | Default [`namespace`](#namespace-optional) | Generated [relation](well-known-relations.md) type                            |
 | --------------------------------------- | ------------------------------------------ | ----------------------------------------------------------------------------- |
@@ -1205,8 +1215,8 @@ Exactly equal to `backstage.io/v1alpha1` and `Domain`, respectively.
 
 ### `spec.owner` [required]
 
-An [entity reference](#string-references) to the owner of the domain, e.g.
-`artist-relations-team`. This field is required.
+An [entity reference](references.md#string-references) to the owner of the
+domain, e.g. `artist-relations-team`. This field is required.
 
 In Backstage, the owner of a domain is the singular entity (commonly a team)
 that bears ultimate responsibility for the domain, and has the authority and
diff --git a/docs/features/software-catalog/extending-the-model.md b/docs/features/software-catalog/extending-the-model.md
index aa5aed0540..ed106bb5dd 100644
--- a/docs/features/software-catalog/extending-the-model.md
+++ b/docs/features/software-catalog/extending-the-model.md
@@ -393,3 +393,39 @@ of interest to you, you might consider contacting the maintainers on Discord or
 my making a GitHub issue describing your use case.
 [This issue](https://github.com/backstage/backstage/issues/2292) also contains
 more context.
+
+## Referencing different environments with the model
+
+Example intent:
+
+> "I have multiple versions of my API deployed in different environments so I
+> want to have `mytool-dev` and `mytool-prod` as different entities."
+
+While it's possible to have different versions of the same thing represented as
+separate entities, it's something we generally recommend against. We believe
+that a developer should be able to just find for example one `Component`
+representing a service, and to be able to see the different code versions that
+are deployed throughout your stack within its view. This reasoning works
+similarly for other kinds as well, such as `API`.
+
+That being said - sometimes the differences between versions are so large, that
+they represent what is for all intents and purposes an entirely new entity as
+seen from the consumer's point of view. This can happen for example for
+different _significant_ major versions of an API, and in particular if the two
+major versions coexist in the ecosystem for some time. In those cases, it can be
+motivated to have one `my-api-v2` and one `my-api-v3` named entity. This matches
+the end user's expectations when searching for the API, and matches the desire
+to maybe have separate documentation for the two and similar. But use this
+sparingly - only do it if the extra modelling burden is outweighed by any
+potential better clarity for users.
+
+When writing your custom plugins, we encourage designing them such that they can
+show all the different variations through environments etc under one canonical
+reference to your software in the catalog. For example for a continuous
+deployment plugin, a user is likely to be greatly helped by being able to see
+the entity's versions deployed in all different environments next to each other
+in one view. That is also where they might be offered the ability to promote
+from one environment to the other, do rollbacks, see their relative performance
+metrics, and similar. This coherency and collection of tooling in one place is
+where something like Backstage can offer the most value and effectiveness of
+use. Splitting your entities apart into small islands makes this harder.
diff --git a/docs/features/software-catalog/index.md b/docs/features/software-catalog/index.md
index a502c2aee5..f5296f38e1 100644
--- a/docs/features/software-catalog/index.md
+++ b/docs/features/software-catalog/index.md
@@ -8,12 +8,11 @@ description: The Backstage Software Catalog
 
 ## What is a Software Catalog?
 
-The Backstage Software Catalog — actually, a software catalog, since it includes
-more than just services — is a centralized system that keeps track of ownership
-and metadata for all the software in your ecosystem (services, websites,
-libraries, data pipelines, etc). The catalog is built around the concept of
-[metadata YAML files](descriptor-format.md) stored together with the code, which
-are then harvested and visualized in Backstage.
+The Backstage Software Catalog is a centralized system that keeps track of
+ownership and metadata for all the software in your ecosystem (services,
+websites, libraries, data pipelines, etc). The catalog is built around the
+concept of [metadata YAML files](descriptor-format.md) stored together with the
+code, which are then harvested and visualized in Backstage.
 
 ![software-catalog](https://backstage.io/blog/assets/6/header.png)
 
diff --git a/docs/features/software-catalog/life-of-an-entity.md b/docs/features/software-catalog/life-of-an-entity.md
new file mode 100644
index 0000000000..9e8a3f0563
--- /dev/null
+++ b/docs/features/software-catalog/life-of-an-entity.md
@@ -0,0 +1,246 @@
+---
+id: life-of-an-entity
+title: The Life of an Entity
+sidebar_label: The Life of an Entity
+# prettier-ignore
+description: The life cycle of entities, from being introduced into the catalog, through processing, to being removed again
+---
+
+This document gives a high level overview of the catalog backend, and the
+technical processes involved in making entities flow through it. It is mainly
+aimed at developers who want to understand the internals while installing or
+extending the catalog. However, it can be informative for other personas too.
+
+## Key Concepts
+
+The catalog forms a hub of sorts, where entities are ingested from various
+authoritative sources and held in a database, subject to automated processing,
+and then presented through an API for quick and easy access by Backstage and
+others. The most common source is [YAML files](descriptor-format.md) on a
+standard format, living in version control systems near the source code of
+systems that they describe. Those files are registered with the catalog and
+maintained by the respective owners. The catalog makes sure to keep itself up to
+date with changes to those files.
+
+The main extension points where developers can customize the catalog are:
+
+- _Entity providers_, that feed initial raw entity data into the catalog,
+- _Policies_, that establish baseline rules about the shape of entities,
+- _Processors_, that validate, analyze, and mutate the raw entity data into its
+  final form.
+
+The high level processes involved are:
+
+- _Ingestion_, where entity providers fetch raw entity data from external
+  sources and seed it into the database,
+- _Processing_, where the policies and processors continually treat the ingested
+  data and may emit both other raw entities (that are also subject to
+  processing), errors, relations to other entities, etc.,
+- _Stitching_, where all of the data emitted by various processors are assembled
+  together into the final output entity.
+
+An entity is not visible to the outside world (through the catalog API), until
+it has passed through the last process and landed among the final entities.
+
+![General overview](../../assets/features/catalog/life-of-an-entity_overview.svg)
+
+The details of these processes are described below.
+
+## Ingestion
+
+Each catalog deployment has a number of entity providers installed. They are
+responsible for fetching data from external authoritative sources in any way
+that they see fit, to translate those into entity objects, and to notify the
+database when those entities are added or removed. These are the _unprocessed
+entities_ that will be subject to later processing (see below), and they form
+the very basis of existence for entities. If there were no entity providers, no
+entities would ever enter the system.
+
+The database always keeps track of the set of entities that belong to each
+provider; no two providers can try to output the same entity. And when a
+provider signals the removal of an entity, then that leads to an _eager
+deletion_: the entity and all auxiliary data that it has led to in the database
+is immediately purged.
+
+![Ingestion overview](../../assets/features/catalog/life-of-an-entity_ingestion.svg)
+
+There are two providers installed by default: the one that deals with user
+registered locations (e.g. URLs to YAML files), and the one that deals with
+static locations in the app-config. You can add more third party providers by
+passing them to the catalog builder in your backend initialization code, and you
+can easily write your own.
+
+An entity provider is a class that implements the `EntityProvider` interface. It
+has three main parts:
+
+- The identity: Each provider instance has a unique, stable identifier that the
+  database can use to keep track of the originator of each unprocessed entity.
+- The connection: During backend startup, each provider is attached to the
+  catalog runtime.
+- The stream of events: During its lifetime, the provider can issue change
+  events to the runtime at any point in time, to modify its set of unprocessed
+  entities.
+
+It is entirely up to the provider to choose how and when it produces these
+change events. For example, the app-config provider only fires off an update at
+startup and then lies dormant. The location database provider does an initial
+update at startup, and then small delta updates every time a location database
+change is detected. The LDAP provider is driven externally by a timer loop that
+occasionally triggers a full update. Some future provider may be entirely event
+driven, feeding off an event bus or web hook. There is no magic coordination
+among providers; if they need to arrange synchronization or locking among
+themselves for example to avoid duplicate work across multiple catalog service
+machines, they need to handle that out-of-band.
+
+The entities that are emitted get some coarse validation applied to them, to
+ensure that they at least adhere to the most basic schema rules about how an
+entity should be shaped. For example, they need to have a `kind`, a
+`metadata.name`, and optionally a `metadata.namespace`, among others. Apart from
+that, the ingestion stage considers its work done, and stores the unprocessed
+entities to be picked up at a later time by the processing system. This means
+that the more precise validation rules that you put in place on entities are
+_not_ yet applied at this stage.
+
+## Processing
+
+Every unprocessed entity comes with a timestamp, which tells at what time that
+the processing loop should next try to process it. When the entity first
+appears, this timestamp is set to "now" - asking for it to be picked up as soon
+as possible.
+
+Each catalog deployment has a number of processors installed. They are
+responsible for receiving unprocessed entities that the catalog decided are due
+for processing, and then running that data through a number of processing
+stages, mutating the entity and emitting auxiliary data about it. When all of
+that is done, the catalog takes all of that information and stores it as the
+processed entity, and errors and relations to other entities separately. Then,
+the catalog checks to see what entities are touched by that output, and triggers
+the final assembly of those (see Stitching below).
+
+![Processing overview](../../assets/features/catalog/life-of-an-entity_processing.svg)
+
+Entities are always processed one by one, but all of your catalog service hosts
+collaborate in doing so to distribute the load. Note how each processor can
+contribute to one or more of the fixed steps in the processing pipeline. First
+all of the processors' contributions to one step are run in the order that the
+processors were registered, then all of their contributions to the next step in
+the same order, and so on.
+
+Each step has the opportunity to optionally modify the entity, and to optionally
+emit other information. For example, the processor might look at information in
+the `spec` field of the entity, and emit relations that correspond to those
+declarations. If the processor emits an entity, then that entity gets stored
+verbatim with a timestamp saying that it, too, should be processed as soon as
+possible. If errors are emitted, then that signals that something is wrong with
+the entity and that it should not replace whatever previously error-free version
+we had among the final entities. If relations are emitted, then they are put in
+a dedicated relations table to be picked up by the stitching process below.
+
+> Optional low level detail note: When entities are emitted, the catalog keeps
+> track of the edges between the emitting entity and the ones emitted. This
+> happens behind the scenes, hidden from the outside, and is used to form a
+> graph. This is _not_ the same thing as relations! The purpose of these edges,
+> is to be able to detect when an entity becomes orphaned (see below), and to be
+> able to perform eager deletions throughout the graph when a root is explicitly
+> unregistered and nothing else is keeping lower nodes alive. We will talk more
+> about orphaning and deletions later on in this article.
+
+When the final step has completed, and no errors were encountered, the processed
+entity and all of the relations are finally persisted in the database. Then the
+catalog considers this entity, and all of the entities it had relations to,
+subject for stitching.
+
+It is worth noting here that the processing does not lead to deletion or
+unregistration of entities; it can only call new entities into existence or
+update entities that it has previously called into existence. More about that
+later.
+
+## Stitching
+
+Stitching finalizes the entity, by gathering all of the output from the previous
+steps and merging them into the final object which is what is visible from the
+catalog API. As the final entity itself gets updated, the stitcher makes sure
+that the search table gets refreshed accordingly as well.
+
+> Note: The search table mentioned here is not related to the core Search
+> feature of Backstage. It's rather the table that backs the ability to filter
+> catalog API query results.
+
+![Stitching overview](../../assets/features/catalog/life-of-an-entity_stitching.svg)
+
+The diagram shows how the stitcher reads from several sources:
+
+- The processed entity, as returned from the processing step
+- The errors, if any, that were emitted by the processing step
+- All relations that were emitted by the processing step, as well as any
+  relations emitted by _other_ entity processing steps that happen to point at
+  the current entity
+
+The last part is noteworthy: This is how the stitcher is able to collect all of
+the relation edges, both incoming and outgoing, no matter who produced them.
+
+The stitching is currently a fixed process, that cannot be modified or extended.
+This means that any modifications you want to make on the final result, has to
+happen during ingestion or processing.
+
+## Errors
+
+> TODO: Describe how errors are exposed through entities
+
+## Orphaning
+
+As mentioned earlier, entities internally form a graph. The edges go from
+processed parent entities, to child entities emitted while processing the
+parent.
+
+The processing loop runs continuously, so these edges are reconsidered over
+time. If processing a parent entity no longer emits a given child entity, then
+that former edge is severed. If that child has no other edges pointing at it
+either, it becomes _orphaned_. The end result is as follows:
+
+- The stitching process injects a `backstage.io/orphan: 'true'` annotation on
+  the child entity.
+- The child entity is _not_ removed from the catalog, but stays around until
+  explicitly deleted via the catalog API, or "reclaimed" by the original parent
+  or another parent starting to reference it.
+- The catalog page in Backstage for the child entity detects the new annotation
+  and informs users about the orphan status.
+
+Orphaning can occur in several different scenarios. One common cause is that the
+end user edited a corresponding catalog catalog-info YAML file removing the
+entity's entry. In the case of a `Location` parent entity, orphaning can happen
+if removing the target line pointing to the file containing the child entity.
+Another common cause is large batch processors such as the ones that crawl
+through remote systems looking for entities, no longer finding something that it
+used to find before. Maybe the data was moved, or deleted, in the remote system.
+So for example when a person leaves the company an LDAP org discovery processor
+might leave an orphaned `User` entity behind. Note that this only applies to
+processors - ingestion that happens using entity providers work differently,
+described below.
+
+> Note that removing a file, or accidentally corrupting a file so that it cannot
+> be read successfully, does _not_ lead to orphaning. Hard errors, including the
+> inability to find or read a distinct remote, are marked as such on the entity
+> to inform the owner that something is wrong. But processing and other
+> behaviors continue as usual.
+
+The reason that the orphaning mechanism exists instead of having an eager
+deletion triggered, is safety. Scenarios like these can happen purely by
+accident, due to the asynchronous nature of the system and the fallible nature
+of humans. In particular when external systems start consuming and relying on
+the catalog, there could be substantial consequences to suddenly dropping
+entities without explicit owner consent. The catalog therefore takes the stance
+that entities that often were added by direct user action should also be deleted
+only by direct user action.
+
+It is possible to use the catalog API to build automated "reaper" systems that
+finally delete entities that are orphaned. This is however not something that's
+provided out of the box.
+
+## Implicit Deletion
+
+> TODO: Describe the process of entity providers eagerly deleting entities
+
+## Explicit Deletion
+
+> TODO: Describe direct deletion via the catalog API
diff --git a/docs/features/software-catalog/well-known-annotations.md b/docs/features/software-catalog/well-known-annotations.md
index 67b92bd941..c3af6caf2d 100644
--- a/docs/features/software-catalog/well-known-annotations.md
+++ b/docs/features/software-catalog/well-known-annotations.md
@@ -57,18 +57,48 @@ if the original location delegates to another location. A common case is, that a
 location is registered as `bootstrap:bootstrap` which means that it is part of
 the `app-config.yaml` of a Backstage installation.
 
+### backstage.io/orphan
+
+This annotation is either absent, or present with the exact _string_ value
+`"true"`. It should never be added manually. Instead, the catalog itself injects
+the annotation as part of its processing loops, on entities that are found to
+have no registered locations or config locations that keep them "active" /
+"alive".
+
+For example, suppose that the user first registers a location URL pointing to a
+`Location` kind entity, which in turn refers to two `Component` kind entities in
+two other files nearby. The end result is that the catalog contains those three
+entities. Now suppose that the user edits the original `Location` entity to only
+refer to the first of the `Component` kind entities. This will intentionally
+_not_ lead to the other `Component` entity to be removed from the catalog (for
+safety reasons). Instead, it gains this orphan marker annotation, to make it
+clear that user action is required to completely remove it, if desired.
+
+```yaml
+# Example:
+metadata:
+  annotations:
+    backstage.io/orphan: 'true'
+```
+
 ### backstage.io/techdocs-ref
 
 ```yaml
 # Example:
 metadata:
   annotations:
-    backstage.io/techdocs-ref: url:https://github.com/backstage/backstage/tree/master
+    backstage.io/techdocs-ref: dir:.
 ```
 
-The value of this annotation is a location reference string (see above). If this
-annotation is specified, it is expected to point to a repository that the
-TechDocs system can read and generate docs from.
+The value of this annotation informs _where_ TechDocs source content is stored
+so that it can be read and docs can be generated from it. Most commonly, it's
+written as a path, relative to the location of the `catalog-info.yaml` itself,
+where the associated `mkdocs.yml` file can be found.
+
+In unusual situations where the documentation for a catalog entity does not live
+alongside the entity's source code, the value of this annotation can point to an
+absolute URL, matching the location reference string format outlined above, for
+example: `url:https://github.com/backstage/backstage/tree/master`
 
 ### backstage.io/view-url, backstage.io/edit-url
 
@@ -101,18 +131,22 @@ repository itself. If the URL points to a folder, it is important that it is
 suffixed with a `'/'` in order for relative path resolution to work
 consistently.
 
-### jenkins.io/github-folder
+### jenkins.io/job-full-name
 
 ```yaml
 # Example:
 metadata:
   annotations:
-    jenkins.io/github-folder: folder-name/job-name
+    jenkins.io/job-full-name: folder-name/job-name
 ```
 
 The value of this annotation is the path to a job on Jenkins, that builds this
 entity.
 
+The value can be the format of just `[folder-path]` or
+`[instanceName]:[folder-path]`, if multiple instances are configured in
+`app-config.yaml`
+
 Specifying this annotation may enable Jenkins related features in Backstage for
 that entity.
 
@@ -304,6 +338,10 @@ This annotation allowed to load the API definition from another location. Use
 [substitution](./descriptor-format.md#substitutions-in-the-descriptor-format)
 instead.
 
+### jenkins.io/github-folder
+
+Use the `jenkins.io/job-full-name` instead.
+
 ## Links
 
 - [Descriptor Format: annotations](descriptor-format.md#annotations-optional)
diff --git a/docs/features/software-templates/configuration.md b/docs/features/software-templates/configuration.md
index cdd8166889..737f77f67b 100644
--- a/docs/features/software-templates/configuration.md
+++ b/docs/features/software-templates/configuration.md
@@ -33,9 +33,12 @@ scaffolder:
 
 ### Disabling Docker in Docker situation (Optional)
 
-Software Templates use
-[Cookiecutter](https://github.com/cookiecutter/cookiecutter) as a templating
-library. By default it will use the
+Software templates use the `fetch:template` action by default, which requires no
+external dependencies and offers a
+[Cookiecutter-compatible mode](https://backstage.io/docs/features/software-templates/builtin-actions#using-cookiecuttercompat-mode).
+There is also a `fetch:cookiecutter` action, which uses
+[Cookiecutter](https://github.com/cookiecutter/cookiecutter) directly for
+templating. By default, the `fetch:cookiecutter` action will use the
 [scaffolder-backend/Cookiecutter](https://github.com/backstage/backstage/blob/master/plugins/scaffolder-backend/scripts/Cookiecutter.dockerfile)
 docker image.
 
diff --git a/docs/features/software-templates/migrating-from-v1alpha1-to-v1beta2.md b/docs/features/software-templates/migrating-from-v1alpha1-to-v1beta2.md
index 25ff2a2f3a..28001cce0b 100644
--- a/docs/features/software-templates/migrating-from-v1alpha1-to-v1beta2.md
+++ b/docs/features/software-templates/migrating-from-v1alpha1-to-v1beta2.md
@@ -325,7 +325,7 @@ spec:
   output:
     links:
       - url: '{{steps.publish.output.remoteUrl}}'
-        text: 'Go to Repo'
+        title: 'Go to Repo'
 ```
 
 ## Questions?
diff --git a/docs/features/software-templates/writing-custom-actions.md b/docs/features/software-templates/writing-custom-actions.md
index 53a90e2954..a5773a6aff 100644
--- a/docs/features/software-templates/writing-custom-actions.md
+++ b/docs/features/software-templates/writing-custom-actions.md
@@ -131,6 +131,9 @@ want to have those as well as your new one, you'll need to do the following:
 
 ```ts
 import { createBuiltinActions } from '@backstage/plugin-scaffolder-backend';
+import { ScmIntegrations } from '@backstage/integration';
+
+const integrations = ScmIntegrations.fromConfig(config);
 
 const builtInActions = createBuiltinActions({
   containerRunner,
diff --git a/docs/features/software-templates/writing-templates.md b/docs/features/software-templates/writing-templates.md
index 7b475f2fa1..02bb698f64 100644
--- a/docs/features/software-templates/writing-templates.md
+++ b/docs/features/software-templates/writing-templates.md
@@ -227,6 +227,33 @@ spec:
             inputType: tel
 ```
 
+#### Hide or mask sensitive data on Review step
+
+Sometimes, specially in custom fields, you collect some data on Create form that
+must not be shown to the user on Review step. To hide or mask this data, you can
+use `ui:widget: password` or set some properties of `ui:backstage`:
+
+```yaml
+- title: Hide or mask values
+  properties:
+    password:
+      title: Password
+      type: string
+      ui:widget: password # will print '******' as value for property 'password' on Review Step
+    masked:
+      title: Masked
+      type: string
+      ui:backstage:
+        review:
+          mask: '<some-value-to-show>' # will print '<some-value-to-show>' as value for property 'Masked' on Review Step
+    hidden:
+      title: Hidden
+      type: string
+      ui:backstage:
+        review:
+          show: false # wont print any info about 'hidden' property on Review Step
+```
+
 #### The Repository Picker
 
 So in order to make working with repository providers easier, we've built a
diff --git a/docs/features/techdocs/README.md b/docs/features/techdocs/README.md
index 6732b3ab18..b798742463 100644
--- a/docs/features/techdocs/README.md
+++ b/docs/features/techdocs/README.md
@@ -29,7 +29,7 @@ about TechDocs and the philosophy in its
 - Explore and take advantage of the large ecosystem of
   [MkDocs plugins](https://www.mkdocs.org/user-guide/plugins/) to create a rich
   reading experience.
-- Search for and find docs (coming soon).
+- Search for and find docs.
 - Highlight text and raise an Issue to create feedback loop to drive quality
   documentation (future).
 - Contribute to and deploy from a marketplace of TechDocs widgets (future).
@@ -54,23 +54,12 @@ providers are used.
 | Google Cloud Storage (GCS)        | Yes ✅         |
 | Amazon Web Services (AWS) S3      | Yes ✅         |
 | Azure Blob Storage                | Yes ✅         |
-| OpenStack Swift                   | Yes ✅         |
+| OpenStack Swift                   | Community ✅   |
 
 [Reach out to us](#feedback) if you want to request more platforms.
 
 ## Project roadmap
 
-### **Ongoing work 🚧**
-
-**Beta release** -
-[Milestone](https://github.com/backstage/backstage/milestone/29)
-
-- It should be possible and easy to use TechDocs in most environments across
-  organizations.
-- Minimal bugs, better error handling and scalable backend and frontend.
-- Documentation Search
-- TechDocs Homepage with basic features
-
 ### **Future work 🔮**
 
 **General Availability (GA) release** -
diff --git a/docs/features/techdocs/configuration.md b/docs/features/techdocs/configuration.md
index aa38dd42b1..46cbc2a8a2 100644
--- a/docs/features/techdocs/configuration.md
+++ b/docs/features/techdocs/configuration.md
@@ -13,14 +13,29 @@ configuration options for TechDocs.
 # File: app-config.yaml
 
 techdocs:
-  # generators.techdocs can have two values: 'docker' or 'local'. This is to determine how to run the generator - whether to
-  # spin up the techdocs-container docker image or to run mkdocs locally (assuming all the dependencies are taken care of).
-  # You want to change this to 'local' if you are running Backstage using your own custom Docker setup and want to avoid running
-  # into Docker in Docker situation. Read more here
-  # https://backstage.io/docs/features/techdocs/getting-started#disable-docker-in-docker-situation-optional
+  # techdocs.generator is used to configure how documentation sites are generated using MkDocs.
 
-  generators:
-    techdocs: 'docker'
+  generator:
+    # techdocs.generator.runIn can be either 'docker' or 'local'. This is to determine how to run the generator - whether to
+    # spin up the techdocs-container docker image or to run mkdocs locally (assuming all the dependencies are taken care of).
+    # You want to change this to 'local' if you are running Backstage using your own custom Docker setup and want to avoid running
+    # into Docker in Docker situation. Read more here
+    # https://backstage.io/docs/features/techdocs/getting-started#disable-docker-in-docker-situation-optional
+
+    runIn: 'docker'
+
+    # (Optional) techdocs.generator.dockerImage can be used to control the docker image used during documentation generation. This can be useful
+    # if you want to use MkDocs plugins or other packages that are not included in the default techdocs-container (spotify/techdocs).
+    # NOTE: This setting is only used when techdocs.generator.runIn is set to 'docker'.
+
+    dockerImage: 'spotify/techdocs'
+
+    # (Optional) techdocs.generator.pullImage can be used to disable pulling the latest docker image by default. This can be useful when you are
+    # using a custom techdocs.generator.dockerImage and you have a custom docker login requirement. For example, you need to login to
+    # AWS ECR to pull the docker image.
+    # NOTE: Disabling this requires the docker image was pulled by other means before running the techdocs generator.
+
+    pullImage: true
 
   # techdocs.builder can be either 'local' or 'external.
   # If builder is set to 'local' and you open a TechDocs page, techdocs-backend will try to generate the docs, publish to storage
@@ -98,6 +113,14 @@ techdocs:
         # https://docs.microsoft.com/en-us/azure/storage/common/storage-auth?toc=/azure/storage/blobs/toc.json
         accountKey: ${TECHDOCS_AZURE_BLOB_STORAGE_ACCOUNT_KEY}
 
+  # (Optional and not recommended) Prior to version [0.x.y] of TechDocs, docs
+  # sites could only be accessed over paths with case-sensitive entity triplets
+  # e.g. (namespace/Kind/name). If you are upgrading from an older version of
+  # TechDocs and are unable to perform the necessary migration of files in your
+  # external storage, you can set this value to `true` to temporarily revert to
+  # the old, case-sensitive entity triplet behavior.
+  legacyUseCaseSensitiveTripletPaths: false
+
   # (Optional and Legacy) TechDocs makes API calls to techdocs-backend using this URL. e.g. get docs of an entity, get metadata, etc.
   # You don't have to specify this anymore.
 
diff --git a/docs/features/techdocs/creating-and-publishing.md b/docs/features/techdocs/creating-and-publishing.md
index 3fdc942ac4..93ce3ad4d9 100644
--- a/docs/features/techdocs/creating-and-publishing.md
+++ b/docs/features/techdocs/creating-and-publishing.md
@@ -66,9 +66,7 @@ Update your component's entity description by adding the following lines to its
 ```yaml
 metadata:
   annotations:
-    backstage.io/techdocs-ref: url:https://github.com/org/repo
-    # Or
-    # backstage.io/techdocs-ref: url:https://github.com/org/repo/tree/branchName/subFolder
+    backstage.io/techdocs-ref: dir:.
 ```
 
 The
diff --git a/docs/features/techdocs/getting-started.md b/docs/features/techdocs/getting-started.md
index cf0bbb0de1..0b1809dc22 100644
--- a/docs/features/techdocs/getting-started.md
+++ b/docs/features/techdocs/getting-started.md
@@ -33,14 +33,24 @@ In `packages/app/src/App.tsx`, import `TechDocsPage` and add the following to
 `FlatRoutes`:
 
 ```tsx
-import { TechDocsPage } from '@backstage/plugin-techdocs';
+import {
+  DefaultTechDocsHome,
+  TechDocsIndexPage,
+  TechDocsReaderPage,
+} from '@backstage/plugin-techdocs';
 
 // ...
 
 const AppRoutes = () => {
   <FlatRoutes>
     // ... other plugin routes
-    <Route path="/docs" element={<TechdocsPage />} />
+    <Route path="/docs" element={<TechDocsIndexPage />}>
+      <DefaultTechDocsHome />
+    </Route>
+    <Route
+      path="/docs/:namespace/:kind/:name/*"
+      element={<TechDocsReaderPage />}
+    />
   </FlatRoutes>;
 };
 ```
@@ -204,7 +214,7 @@ techdocs:
   builder: 'local'
   publisher:
     type: 'local'
-  generators:
+  generator:
     techdocs: local
 ```
 
diff --git a/docs/features/techdocs/how-to-guides.md b/docs/features/techdocs/how-to-guides.md
index 3f3c92d0de..326ac02969 100644
--- a/docs/features/techdocs/how-to-guides.md
+++ b/docs/features/techdocs/how-to-guides.md
@@ -35,38 +35,64 @@ In your Backstage instance's `app-config.yaml`, set `techdocs.builder` from
 `'local'` to `'external'`. By doing this, TechDocs will not try to generate
 docs. Look at [TechDocs configuration](configuration.md) for reference.
 
-## How to use URL Reader in TechDocs Prepare step?
+## How to understand techdocs-ref annotation values
 
-If TechDocs is configured to generate docs, it will first download the
-repository associated with the `backstage.io/techdocs-ref` annotation defined in
-the Entity's `catalog-info.yaml` file. This is also called the
+If TechDocs is configured to generate docs, it will first download source files
+based on the value of the `backstage.io/techdocs-ref` annotation defined in the
+Entity's `catalog-info.yaml` file. This is also called the
 [Prepare](./concepts.md#techdocs-preparer) step.
 
-There are two kinds of preparers or two ways of downloading these source files
+We strongly recommend that the `backstage.io/techdocs-ref` annotation in each
+documented catalog entity's `catalog-info.yaml` be set to `dir:.` in almost all
+situations. This is because TechDocs is aligned with the "docs like code"
+philosophy, whereby documentation should be authored and managed alongside the
+source code of the underlying software itself.
 
-- Preparer 1: Doing a `git clone` of the repository (also known as Common Git
-  Preparer)
-- Preparer 2: Downloading an archive.zip or equivalent of the repository (also
-  known as URL Reader)
+When you see `dir:.`, you can translate it to mean:
 
-If `backstage.io/techdocs-ref` is equal to any of these -
+- That the documentation source code lives in the same location as the
+  `catalog-info.yaml` file.
+- That, in particular, the `mkdocs.yml` file is a sibling of `catalog-info.yaml`
+  (meaning, it is in the same directory)
+- And that all of the source content of the documentation would be available if
+  one were to download the directory containing those two files (as well as all
+  sub-directories).
 
-1. `github:https://githubhost.com/org/repo`
-2. `gitlab:https://gitlabhost.com/org/repo`
-3. `bitbucket:https://bitbuckethost.com/project/repo`
-4. `azure/api:https://azurehost.com/org/project`
+The directory tree of the entity would look something like this:
 
-Then Common Git Preparer will be used i.e. a `git clone`. But the URL Reader is
-a much faster way to do this step. Convert the `backstage.io/techdocs-ref`
-values to the following -
+```
+├── catalog-info.yaml
+├── mkdocs.yml
+└── docs
+    └── index.md
+```
 
-1. `url:https://githubhost.com/org/repo/tree/<branch_name>`
-2. `url:https://gitlabhost.com/org/repo/tree/<branch_name>`
-3. `url:https://bitbuckethost.com/project/repo/src/<branch_name>`
-4. `url:https://azurehost.com/organization/project/_git/repository`
+If, for example, you wanted to keep a lean root directory, you could place your
+`mkdocs.yml` file in a subdirectory and update the `backstage.io/techdocs-ref`
+annotation value accordingly, e.g. to `dir:./sub-folder`:
 
-Note that you can also provide a path to a non-root directory inside the
-repository which contains the `docs/` directory.
+```
+├── catalog-info.yaml
+└── sub-folder
+    ├── mkdocs.yml
+    └── docs
+        └── index.md
+```
+
+In rare situations where your TechDocs source content is managed and stored in a
+location completely separate from your `catalog-info.yaml`, you can instead
+specify a URL location reference, the exact value of which will vary based on
+the source code hosting provider. Notice that instead of the `dir:` prefix, the
+`url:` prefix is used instead. For example:
+
+- **GitHub**: `url:https://githubhost.com/org/repo/tree/<branch_name>`
+- **GitLab**: `url:https://gitlabhost.com/org/repo/tree/<branch_name>`
+- **Bitbucket**: `url:https://bitbuckethost.com/project/repo/src/<branch_name>`
+- **Azure**: `url:https://azurehost.com/organization/project/_git/repository`
+
+Note, just as it's possible to specify a subdirectory with the `dir:` prefix,
+you can also provide a path to a non-root directory inside the repository which
+contains the `mkdocs.yml` file and `docs/` directory.
 
 e.g.
 `url:https://github.com/backstage/backstage/tree/master/plugins/techdocs-backend/examples/documented-component`
@@ -78,83 +104,116 @@ the repository. The archive does not have any git history attached to it. Also
 it is a compressed file. Hence the file size is significantly smaller than how
 much data git clone has to transfer.
 
-## How to use a custom TechDocs home page?
+## How to customize the TechDocs home page?
 
-### 1st way: TechDocsCustomHome with a custom configuration
+TechDocs uses a composability pattern similar to the Search and Catalog plugins
+in Backstage. While a default table experience, similar to the one provided by
+the Catalog plugin, is made available for ease-of-use, it's possible for you to
+provide a completely custom experience, tailored to the needs of your
+organization.
 
-As an example, in your main App.tsx:
+This is done in your `app` package. By default, you might see something like
+this in your `App.tsx`:
 
 ```tsx
-import {
-  TechDocsCustomHome,
-  PanelType,
-  TechDocsReaderPage,
-} from '@backstage/plugin-techdocs';
-import { Entity } from '@backstage/catalog-model';
-
-const tabsConfig = [
-  {
-    label: 'Custom Tab',
-    panels: [
-      {
-        title: 'Custom Documents Cards 1',
-        description:
-          'Explore your internal technical ecosystem through documentation.',
-        panelType: 'DocsCardGrid' as PanelType,
-        // optional, is applied to a container of the panel (excludes header of panel)
-        panelCSS: { maxHeight: '400px', overflow:'auto' },
-        filterPredicate: (entity: Entity) => !!entity.metadata.annotations?.['customCardAnnotationOne'];
-    },
-      {
-        title: 'Custom Documents Cards 2',
-        description:
-          'Explore your internal technical ecosystem through documentation.',
-        panelType: 'DocsCardGrid' as PanelType,
-        panelCSS: { maxHeight: '400px', overflow:'auto' },
-        filterPredicate: (entity: Entity) => !!entity.metadata.annotations?.['customCardAnnotationTwo'];
-      },
-    ],
-  },
-  {
-    label: 'Overview',
-    panels: [
-      {
-        title: 'Overview',
-        description:
-          'Explore your internal technical ecosystem through documentation.',
-        panelType: 'DocsTable' as PanelType,
-        filterPredicate: () => true,
-      },
-    ],
-  },
-];
-
-const routes = (
+const AppRoutes = () => {
   <FlatRoutes>
-    <Route
-      path="/docs"
-      element={<TechDocsCustomHome tabsConfig={tabsConfig} />}
-    />
-    <Route
-      path="/docs/:namespace/:kind/:name/*"
-      element={<TechDocsReaderPage />}
-    />
-  </FlatRoutes>
+    <Route path="/docs" element={<TechDocsIndexPage />}>
+      <DefaultTechDocsHome />
+    </Route>
+  </FlatRoutes>;
+};
 ```
 
-An example of tabsConfig that corresponds to the default documentation home page
-can be found at `plugins/techdocs/src/home/components/TechDocsHome.tsx`.
+But you can replace `<DefaultTechDocsHome />` with any React component, which
+will be rendered in its place. Most likely, you would want to create and
+maintain such a component in a new directory at
+`packages/app/src/components/techdocs`, and import and use it in `App.tsx`:
 
-Currently `panelType` has DocsCardGrid and DocsTable available. We currently
-recommend that DocsCardGrid can be optionally vertically stacked by setting a
-maxHeight using `panelCSS`, and DocsTable to be in a tab by itself.
+```tsx
+import { CustomTechDocsHome } from './components/techdocs/CustomTechDocsHome';
+// ...
+const AppRoutes = () => {
+  <FlatRoutes>
+    <Route path="/docs" element={<TechDocsIndexPage />}>
+      <CustomTechDocsHome />
+    </Route>
+  </FlatRoutes>;
+};
+```
 
-### 2nd way: Custom home page plugin
+## How to migrate from TechDocs Alpha to Beta
 
-A custom home page plugin can be built that uses the components extensions
-DocsCardGrid and DocsTable, exported from @backstage/techdocs. They both take a
-array of documentation entities ( i.e.have a 'backstage.io/techdocs-ref'
-annotation ) as an 'entities' attribute.
+> This guide only applies to the "recommended" TechDocs deployment method (where
+> an external storage provider and external CI/CD is used). If you use the
+> "basic" or "out-of-the-box" setup, you can stop here! No action needed.
 
-For a reference to the React structure of the default home page, please refer to
-`plugins/techdocs/src/home/components/TechDocsCustomHome.tsx`.
+For the purposes of this guide, TechDocs Beta version is defined as:
+
+- **TechDocs Plugin**: At least `v0.11.0`
+- **TechDocs Backend Plugin**: At least `v0.10.0`
+- **TechDocs CLI**: At least `v0.7.0`
+
+The beta version of TechDocs made a breaking change to the way TechDocs content
+was accessed and stored, allowing pages to be accessed with case-insensitive
+entity triplet paths (e.g. `/docs/namespace/kind/name` whereas in prior
+versions, they could only be accessed at `/docs/namespace/Kind/name`). In order
+to enable this change, documentation has to be stored in an external storage
+provider using an object key whose entity triplet is lower-cased.
+
+New installations of TechDocs since the beta version will work fine with no
+action, but for those who were running TechDocs prior to this version, a
+migration will need to be performed so that all existing content in your storage
+bucket matches this lower-case entity triplet expectation.
+
+1. **Ensure you have the right permissions on your storage provider**: In order
+   to migrate files in your storage provider, the `techdocs-cli` needs to be
+   able to read/copy/rename/move/delete files. The exact instructions vary by
+   storage provider, but check the [using cloud storage][using-cloud-storage]
+   page for details.
+
+2. **Run a non-destructive migration of files**: Ensure you have the latest
+   version of `techdocs-cli` installed. Then run the following command, using
+   the details relevant for your provider / configuration. This will copy all
+   files from, e.g. `namespace/Kind/name/index.html` to
+   `namespace/kind/name/index.html`, without removing the original files.
+
+```sh
+techdocs-cli migrate --publisher-type <awsS3|googleGcs|azureBlobStorage> --storage-name <bucket/container name> --verbose
+```
+
+3. **Deploy the updated versions of the TechDocs plugins**: Once the migration
+   above has been run, you can deploy the beta versions of the TechDocs backend
+   and frontend plugins to your Backstage instance.
+
+4. **Verify that your TechDocs sites are still loading/accessible**: Try
+   accessing a TechDocs site using different entity-triplet case variants, e.g.
+   `/docs/namespace/KIND/name` or `/docs/namespace/kind/name`. Your TechDocs
+   site should load regardless of the URL path casing you use.
+
+5. **Clean up the old objects from storage**: Once you've verified that your
+   TechDocs site is accessible, you can clean up your storage bucket by
+   re-running the `migrate` command on the TechDocs CLI, but with an additional
+   `removeOriginal` flag passed:
+
+```sh
+techdocs-cli migrate --publisher-type <awsS3|googleGcs|azureBlobStorage> --storage-name <bucket/container name> --removeOriginal --verbose
+```
+
+6. **Update your CI/CD pipelines to use the beta version of the TechDocs CLI**:
+   Finally, you can update all of your CI/CD pipelines to use at least v0.x.y of
+   the TechDocs CLI, ensuring that all sites are published to the new,
+   lower-cased entity triplet paths going forward.
+
+If you encounter problems running this migration, please [report the
+issue][beta-migrate-bug]. You can temporarily revert to pre-beta storage
+expectations with a configuration change:
+
+```yaml
+techdocs:
+  legacyUseCaseSensitiveTripletPaths: true
+```
+
+[beta-migrate-bug]:
+https://github.com/backstage/backstage/issues/new?assignees=&labels=bug&template=bug_template.md&title=[TechDocs]%20Unable%20to%20run%20beta%20migration
+[using-cloud-storage]: ./using-cloud-storage.md
diff --git a/docs/features/techdocs/using-cloud-storage.md b/docs/features/techdocs/using-cloud-storage.md
index 119629915e..66eaf00663 100644
--- a/docs/features/techdocs/using-cloud-storage.md
+++ b/docs/features/techdocs/using-cloud-storage.md
@@ -61,7 +61,7 @@ If you do not prefer (3a) and optionally like to use a service account, you can
 follow these steps.
 
 Create a new Service Account and a key associated with it. In roles of the
-service account, use "Storage Admin".
+service account, use "Storage Object Admin".
 
 If you want to create a custom role, make sure to include both `get` and
 `create` permissions for both "Objects" and "Buckets". See
@@ -143,6 +143,8 @@ permissions to:
 
 - `s3:ListBucket` to retrieve bucket metadata
 - `s3:PutObject` to upload files to the bucket
+- `s3:DeleteObject` and `s3:DeleteObjectVersion` to delete stale content during
+  re-publishing
 
 To _read_ TechDocs from the S3 bucket the IAM policy needs to have at a minimum
 permissions to:
@@ -150,6 +152,39 @@ permissions to:
 - `s3:ListBucket` - To retrieve bucket metadata
 - `s3:GetObject` - To retrieve files from the bucket
 
+> Note: If you need to migrate documentation objects from an older-style path
+> format including case-sensitive entity metadata, you will need to add some
+> additional permissions to be able to perform the migration, including:
+>
+> - `s3:PutBucketAcl` (for copying files,
+>   [more info here](https://docs.aws.amazon.com/AmazonS3/latest/API/API_PutObjectAcl.html))
+> - `s3:DeleteObject` and `s3:DeleteObjectVersion` (for deleting migrated files,
+>   [more info here](https://docs.aws.amazon.com/AmazonS3/latest/API/API_DeleteObject.html))
+>
+> ...And you will need to ensure the permissions apply to the bucket itself, as
+> well as all resources under the bucket. See the example policy below.
+
+```json
+{
+  "Version": "2012-10-17",
+  "Statement": [
+    {
+      "Sid": "TechDocsWithMigration",
+      "Effect": "Allow",
+      "Action": [
+        "s3:PutObject",
+        "s3:GetObject",
+        "s3:DeleteObjectVersion",
+        "s3:ListBucket",
+        "s3:DeleteObject",
+        "s3:PutObjectAcl"
+      ],
+      "Resource": ["arn:aws:s3:::your-bucket", "arn:aws:s3:::your-bucket/*"]
+    }
+  ]
+}
+```
+
 **4a. (Recommended) Setup authentication the AWS way, using environment
 variables**
 
@@ -312,6 +347,10 @@ techdocs:
         accountKey: ${TECHDOCS_AZURE_BLOB_STORAGE_ACCOUNT_KEY}
 ```
 
+In either case, the account or credentials used to access your container and all
+TechDocs objects underneath it should have the `Storage Blog Data Owner` role
+applied, in order to read, write, and delete objects as needed.
+
 **4. That's it!**
 
 Your Backstage app is now ready to use Azure Blob Storage for TechDocs, to store
@@ -360,9 +399,34 @@ techdocs:
 
 Set the configs in your `app-config.yaml` to point to your container name.
 
-https://docs.openstack.org/api-ref/identity/v3/?expanded=password-authentication-with-unscoped-authorization-detail#password-authentication-with-unscoped-authorization
+https://docs.openstack.org/api-ref/identity/v3/?expanded=password-authentication-with-unscoped-authorization-detail,authenticating-with-an-application-credential-detail#authenticating-with-an-application-credential
 for more details.
 
+```yaml
+techdocs:
+  publisher:
+    type: 'openStackSwift'
+    openStackSwift:
+      containerName: 'name-of-techdocs-storage-bucket'
+      credentials:
+        id: ${OPENSTACK_SWIFT_STORAGE_APPLICATION_CREDENTIALS_ID}
+        secret: ${OPENSTACK_SWIFT_STORAGE_APPLICATION_CREDENTIALS_SECRET}
+      authUrl: ${OPENSTACK_SWIFT_STORAGE_AUTH_URL}
+      swiftUrl: ${OPENSTACK_SWIFT_STORAGE_SWIFT_URL}
+```
+
+**4. That's it!**
+
+Your Backstage app is now ready to use OpenStack Swift Storage for TechDocs, to
+store and read the static generated documentation files. When you start the
+backend of the app, you should be able to see
+`techdocs info Successfully connected to the OpenStack Swift Storage container`
+in the logs.
+
+## Bonus: Migration from old OpenStack Swift Configuration
+
+Let's assume we have the old OpenStack Swift configuration here.
+
 ```yaml
 techdocs:
   publisher:
@@ -379,10 +443,40 @@ techdocs:
       region: ${OPENSTACK_SWIFT_STORAGE_REGION}
 ```
 
-**4. That's it!**
+##### Step 1: Change the credential keys
 
-Your Backstage app is now ready to use OpenStack Swift Storage for TechDocs, to
-store and read the static generated documentation files. When you start the
-backend of the app, you should be able to see
-`techdocs info Successfully connected to the OpenStack Swift Storage container`
-in the logs.
+Since the new SDK uses _Application Credentials_ to authenticate OpenStack, we
+need to change the keys `credentials.username` to `credentials.id`,
+`credentials.password` to `credentials.secret` and use Application Credential ID
+and secret here. For more detail about credentials look
+[here](https://docs.openstack.org/api-ref/identity/v3/?expanded=password-authentication-with-unscoped-authorization-detail,authenticating-with-an-application-credential-detail#authenticating-with-an-application-credential).
+
+##### Step 2: Remove the unused keys
+
+Since the new SDK doesn't use the old way authentication, we don't need the keys
+`openStackSwift.keystoneAuthVersion`, `openStackSwift.domainId`,
+`openStackSwift.domainName` and `openStackSwift.region`. So you can remove them.
+
+##### Step 3: Add Swift URL
+
+The new SDK needs the OpenStack Swift connection URL for connecting the Swift.
+So you need to add a new key called `openStackSwift.swiftUrl` and give the
+OpenStack Swift url here. Example url should look like that:
+`https://example.com:6780/swift/v1`
+
+##### That's it!
+
+Your new configuration should look like that!
+
+```yaml
+techdocs:
+  publisher:
+    type: 'openStackSwift'
+    openStackSwift:
+      containerName: 'name-of-techdocs-storage-bucket'
+      credentials:
+        id: ${OPENSTACK_SWIFT_STORAGE_APPLICATION_CREDENTIALS_ID}
+        secret: ${OPENSTACK_SWIFT_STORAGE_APPLICATION_CREDENTIALS_SECRET}
+      authUrl: ${OPENSTACK_SWIFT_STORAGE_AUTH_URL}
+      swiftUrl: ${OPENSTACK_SWIFT_STORAGE_SWIFT_URL}
+```
diff --git a/docs/getting-started/app-custom-theme.md b/docs/getting-started/app-custom-theme.md
index aa3851463f..862c3c0cb6 100644
--- a/docs/getting-started/app-custom-theme.md
+++ b/docs/getting-started/app-custom-theme.md
@@ -35,7 +35,7 @@ If you want more control over the theme, and for example customize font sizes
 and margins, you can use the lower-level `createThemeOverrides` function
 exported by [@backstage/theme](https://www.npmjs.com/package/@backstage/theme)
 in combination with
-[createMuiTheme](https://material-ui.com/customization/theming/#createmuitheme-options-args-theme)
+[createTheme](https://material-ui.com/customization/theming/#createmuitheme-options-args-theme)
 from [@material-ui/core](https://www.npmjs.com/package/@material-ui/core). See
 the
 [@backstage/theme source](https://github.com/backstage/backstage/tree/master/packages/theme/src)
@@ -128,7 +128,7 @@ const themeOptions = createThemeOptions({
     tool: genPageTheme(['#123456','#123456'], shapes.round),
     service: genPageTheme(['#123456','#123456'], shapes.wave),
     website: genPageTheme(['#123456','#123456'], shapes.wave),
-    library: genPageTheme(['#123456','#123456'] shapes.wave),
+    library: genPageTheme(['#123456','#123456'], shapes.wave),
     other: genPageTheme(['#123456','#123456'], shapes.wave),
     app: genPageTheme(['#123456','#123456'], shapes.wave),
     apis: genPageTheme(['#123456','#123456'], shapes.wave),
diff --git a/docs/getting-started/index.md b/docs/getting-started/index.md
index 13b52181df..b01afac5c3 100644
--- a/docs/getting-started/index.md
+++ b/docs/getting-started/index.md
@@ -24,11 +24,9 @@ an easier path to make Pull Requests.
 Backstage provides the `@backstage/create-app` package to scaffold standalone
 instances of Backstage. You will need to have
 [Node.js](https://nodejs.org/en/download/) Active LTS Release installed
-(currently v14), [Yarn](https://classic.yarnpkg.com/en/docs/install) and
-[Python](https://www.python.org/downloads/) (although you likely have it
-already). You will also need to have
-[Docker](https://docs.docker.com/engine/install/) installed to use some features
-like Software Templates and TechDocs.
+(currently v14) and [Yarn](https://classic.yarnpkg.com/en/docs/install). You
+will also need to have [Docker](https://docs.docker.com/engine/install/)
+installed to use some features like Software Templates and TechDocs.
 
 Using `npx` you can then run the following to create an app in a chosen
 subdirectory of your current working directory:
diff --git a/docs/getting-started/project-structure.md b/docs/getting-started/project-structure.md
index 1d5d58c2c9..bf2cc93ea5 100644
--- a/docs/getting-started/project-structure.md
+++ b/docs/getting-started/project-structure.md
@@ -147,11 +147,6 @@ are separated out into their own folder, see further down.
   Helps you setup a plugin for isolated development so that it can be served
   separately.
 
-- [`docgen/`](https://github.com/backstage/backstage/tree/master/packages/docgen) -
-  Uses the
-  [TypeScript Compiler API](https://github.com/microsoft/TypeScript/wiki/Using-the-Compiler-API)
-  to read out definitions and generate documentation for it.
-
 - [`e2e-test/`](https://github.com/backstage/backstage/tree/master/packages/e2e-test) -
   Another CLI that can be run to try out what would happen if you build all the
   packages, publish them, create a new app, and then run them. CI uses this for
diff --git a/docs/integrations/aws-s3/locations.md b/docs/integrations/aws-s3/locations.md
new file mode 100644
index 0000000000..fe1c6050c2
--- /dev/null
+++ b/docs/integrations/aws-s3/locations.md
@@ -0,0 +1,42 @@
+---
+id: locations
+sidebar_label: Locations
+title: Amazon Web Services S3 Locations
+# prettier-ignore
+description: Setting up an integration with Amazon Web Services S3
+---
+
+The AWS S3 integration supports loading catalog entities from an S3 Bucket.
+Entities can be added to
+[static catalog configuration](../../features/software-catalog/configuration.md),
+or registered with the
+[catalog-import](https://github.com/backstage/backstage/tree/master/plugins/catalog-import)
+plugin.
+
+## Configuration
+
+To use this integration, add configuration to your `app-config.yaml`:
+
+```yaml
+integrations:
+  awsS3:
+    - host: amazonaws.com
+      accessKeyId: ${AWS_ACCESS_KEY_ID}
+      secretAccessKey: ${AWS_SECRET_ACCESS_KEY}
+```
+
+Then make sure the environment variables `AWS_ACCESS_KEY_ID` and
+`AWS_SECRET_ACCESS_KEY` are set when you run Backstage.
+
+Users with multiple AWS accounts may want to use a role for S3 storage that is
+in a different AWS account. Using the `roleArn` parameter as seen below, you can
+instruct the AWS S3 reader to assume a role before accessing S3:
+
+```yaml
+integrations:
+  awsS3:
+    - host: amazonaws.com
+      accessKeyId: ${AWS_ACCESS_KEY_ID}
+      secretAccessKey: ${AWS_SECRET_ACCESS_KEY}
+      roleArn: 'arn:aws:iam::xxxxxxxxxxxx:role/example-role'
+```
diff --git a/docs/integrations/bitbucket/discovery.md b/docs/integrations/bitbucket/discovery.md
index fadb7c9f06..708acd8db2 100644
--- a/docs/integrations/bitbucket/discovery.md
+++ b/docs/integrations/bitbucket/discovery.md
@@ -38,7 +38,11 @@ The target is composed of four parts:
   repositories prefixed with `service-`.
 - The path within each repository to find the catalog YAML file. This will
   usually be `/catalog-info.yaml` or a similar variation for catalog files
-  stored in the root directory of each repository.
+  stored in the root directory of each repository. If omitted, the default value
+  `catalog-info.yaml` will be used. E.g. given that `my-project`and `service-a`
+  exists, `https://bitbucket.mycompany.com/projects/my-project/repos/service-*/`
+  will result in:
+  `https://bitbucket.mycompany.com/projects/my-project/repos/service-a/catalog-info.yaml`.
 
 ## Custom repository processing
 
@@ -52,13 +56,11 @@ matching repository is processed.
 repository.
 
 ```typescript
-const customRepositoryParser: BitbucketRepositoryParser = async function* customRepositoryParser({
-  client,
-  repository,
-}) {
-  // Custom logic for interpret the matching repository.
-  // See defaultRepositoryParser for an example
-};
+const customRepositoryParser: BitbucketRepositoryParser =
+  async function* customRepositoryParser({ client, repository }) {
+    // Custom logic for interpret the matching repository.
+    // See defaultRepositoryParser for an example
+  };
 
 const processor = BitbucketDiscoveryProcessor.fromConfig(env.config, {
   parser: customRepositoryParser,
diff --git a/docs/integrations/gitlab/discovery.md b/docs/integrations/gitlab/discovery.md
new file mode 100644
index 0000000000..ade575b74d
--- /dev/null
+++ b/docs/integrations/gitlab/discovery.md
@@ -0,0 +1,36 @@
+---
+id: discovery
+title: GitLab Discovery
+sidebar_label: Discovery
+# prettier-ignore
+description: Automatically discovering catalog entities from repositories in GitLab
+---
+
+The GitLab integration has a special discovery processor for discovering catalog
+entities from GitLab. The processor will crawl the GitLab instance and register
+entities matching the configured path. This can be useful as an alternative to
+static locations or manually adding things to the catalog.
+
+To use the discovery processor, you'll need a GitLab integration
+[set up](locations.md) with a `token`. Then you can add a location target to the
+catalog configuration:
+
+```yaml
+catalog:
+  locations:
+    - type: gitlab-discovery
+      target: https://gitlab.com/group/subgroup/blob/main/catalog-info.yaml
+```
+
+Note the `gitlab-discovery` type, as this is not a regular `url` processor.
+
+The target is composed of three parts:
+
+- The base URL, `https://gitlab.com` in this case
+- The group path, `group/subgroup` in this case. This is optional: If you omit
+  this path the processor will scan the entire GitLab instance instead.
+- The path within each repository to find the catalog YAML file. This will
+  usually be `/blob/main/catalog-info.yaml`, `/blob/master/catalog-info.yaml` or
+  a similar variation for catalog files stored in the root directory of each
+  repository. If you want to use the repository's default branch use the `*`
+  wildcard, e.g.: `/blob/*/catalog-info.yaml`
diff --git a/docs/overview/roadmap.md b/docs/overview/roadmap.md
index 0013c99c6b..fa34ca3d9a 100644
--- a/docs/overview/roadmap.md
+++ b/docs/overview/roadmap.md
@@ -1,116 +1,185 @@
 ---
 id: roadmap
-title: Project roadmap
-description: Roadmap of Backstage Project
+title: Roadmap
+description: Roadmap of Backstage
 ---
 
-## Current status
+## The Backstage Roadmap
 
-> Backstage is currently under rapid development. This means that you can expect
-> APIs and features to evolve. It is also recommended that teams who adopt
-> Backstage today [upgrade their installation](../cli/commands.md#versionsbump)
-> as new [releases](https://github.com/backstage/backstage/releases) become
-> available, as Backwards compatibility is not yet guaranteed.
+Backstage is currently under rapid development. This page details the project’s
+public roadmap, the result of ongoing collaboration between the core maintainers
+and the broader Backstage community. Treat the roadmap as an ever-evolving guide
+to keep us aligned as a community on:
 
-## Phases
+- Upcoming enhancements and benefits,
+- Planning contributions and support,
+- Planning the project’s adoption,
+- Understanding what things are coming soon,
+- Avoiding duplication of work
 
-We have divided the project into three high-level _phases_:
+### How to influence the roadmap
 
-- 🐣 **Phase 1:** Extensible frontend platform (Done ✅) - You will be able to
-  easily create a single consistent UI layer for your internal infrastructure
-  and tools. A set of reusable
-  [UX patterns and components](https://backstage.io/storybook) help ensure a
-  consistent experience between tools.
+As we evolve Backstage, we want you to contribute actively in the journey to
+define the most effective developer experience in the world.
 
-- 🐢 **Phase 2:** Software Catalog
-  ([alpha released](https://backstage.io/blog/2020/06/22/backstage-service-catalog-alpha)) -
-  With a single catalog, Backstage makes it easy for a team to manage ten
-  services — and makes it possible for your company to manage thousands of them.
+A roadmap is only useful if it captures real needs. If you have success stories,
+feedback, or ideas, we want to hear from you! If you plan to work (or are
+already working) on a new or existing feature, please let us know, so that we
+can update the roadmap accordingly. We are also happy to share knowledge and
+context that will help your feature land successfully.
 
-- 🐇 **Phase 3:** Ecosystem (ongoing, see
-  [Plugin Marketplace](https://backstage.io/plugins)) - Everyone's
-  infrastructure stack is different. By fostering a vibrant community of
-  contributors we hope to provide an ecosystem of Open Source
-  plugins/integrations that allows you to pick the tools that match your stack.
-
-## Detailed roadmap
-
-If you have questions about the roadmap or want to provide feedback, we would
-love to hear from you! Please create an
-[Issue](https://github.com/backstage/backstage/issues/new/choose), ping us on
-[Discord](https://discord.gg/EBHEGzX) or reach out directly at
-[backstage-interest@spotify.com](mailto:backstage-interest@spotify.com).
-
-Want to help out? Awesome ❤️ Head over to
+You can also head over to the
 [CONTRIBUTING](https://github.com/backstage/backstage/blob/master/CONTRIBUTING.md)
 guidelines to get started.
 
-### Ongoing work 🚧
+If you have specific questions about the roadmap, please create an
+[issue](https://github.com/backstage/backstage/issues/new/choose), ping us on
+[Discord](https://discord.gg/awD6SxgQ), or
+[book time](http://calendly.com/spotify-backstage) with the Spotify team.
 
-- **[Platform stabilization](https://github.com/backstage/backstage/milestone/19)** -
-  Stabilize the core of Backstage, including its core features, so that the
-  platform can be depended on for production use. After this, plugins will
-  require little-to-no maintenance.
+### How to read the roadmap
 
-- **[Kubernetes plugin for service owners](https://github.com/backstage/backstage/issues/2857)** -
-  Improve native support for Kubernetes, making it easier for service owners to
-  see and manage their services running in K8s, regardless if that's locally, in
-  AWS, GCS, Azure, or elsewhere.
+The Backstage roadmap lays out both [“what’s next”](#whats-next) and
+[“future work”](#future-work). With "next" we mean features planned for release
+within the ongoing quarter starting in July until September 2021 included. With
+"future" we mean features in the radar, but not yet scheduled.
 
-- **[Search platform](../features/search/README.md)** - Evolve the basic search
-  functionality currently available into a platform that **a)** enables search
-  across the software catalog, TechDocs, and any other information exposed by
-  plugins, and **b)** supports a variety of search engine technologies.
+The long-term roadmap (12 - 36 months) is not detailed in the public roadmap.
+Third-party contributions are also not currently included in the roadmap. Let us
+know about any ongoing developments and we’re happy to include it here as well.
 
-- **[Software Templates V2](https://github.com/backstage/backstage/issues/2771)** -
-  Expand the templates to make the steps more composable by adding the ability
-  to add more steps for custom logic, including webhooks and using authorization
-  from integrations.
+### Roadmap evolution
 
-### Future work 🔮
+Will this roadmap change? Obviously!
 
-- **Golden Path for Plugin Development** - Create an easy, standardized way for
-  developers to build plugins that will encourage contributions and lead to a
-  richer ecosystem for everyone.
+Roadmap are always evolving and ours is no different; you can expect to see this
+updated roughly every month.
 
-- **[GraphQL API](https://github.com/backstage/backstage/milestone/13)** - A
-  GraphQL API will open up the rich metadata provided by Backstage in a single
-  query. Plugins can easily query this API as well as extend the model where
-  needed.
+## What’s next
 
-- **Inter-Plugin Communication** - **[Under consideration]** Establish more
-  clearly defined patterns for plugins to communicate.
+The feature set below is planned for the ongoing quarter, and grouped by theme.
+The list order doesn’t necessarily reflect priority, and the development/release
+cycle will vary based on maintainer schedules.
 
-- **Improved Access Control** - **[Under consideration]** Provide finer grained
-  access controls and management for better control of the platform user
-  experience.
+### Backstage Core
 
-### Plugins
+The following features are planned for release:
 
-Building and maintaining [plugins](https://backstage.io/plugins) is the work of
-the entire Backstage community.
+- **Composable homepage:** We’re seeing lots of interest from the community in
+  reusable components to build a homepage experience where users can easily
+  surface what they might find useful to start their tasks. Check out the
+  [milestone](https://github.com/backstage/backstage/milestone/34) for further
+  details.
+- **Improved responsiveness:** Check out the
+  [RFC here](https://github.com/backstage/backstage/issues/6318) for further
+  details on how to improve the responsiveness for Backstage's UI.
 
-A list of plugins that are in development is
-[available here](https://github.com/backstage/backstage/issues?q=is%3Aissue+is%3Aopen+label%3Aplugin+sort%3Areactions-%2B1-desc).
-We strongly recommend to upvote 👍 plugins you are interested in. This helps us
-and the community prioritize what plugins to build.
+### Software Templates
 
-Are you missing a plugin for your favorite tool? Please
-[suggest a new one](https://github.com/backstage/backstage/issues/new?labels=plugin&template=plugin_template.md&title=%5BPlugin%5D+THE+PLUGIN+NAME).
-Chances are that someone will jump in and help build it.
+The following features are planned for release::
 
-### Community Initiatives 🧑‍🤝‍🧑
+- **Re-creation/resubmission in case of failure:** Speed up productivity by
+  allowing developers to relaunch a project after a failure or any unexpected
+  problem. In the current version, this task requires retyping and a full
+  re-creation from scratch.
+- **Performance and usability improvements for contributors:** Reach a relevant
+  improvement in templating's performance through the replacement of
+  [handlebars](https://handlebarsjs.com/). Other replacements will be considered
+  as part of this task (possibly
+  [cookiecutter](https://cookiecutter.readthedocs.io/)) for easier software
+  template creation, allowing more contributors to reach their goals without
+  having to learn new tooling.
+- **Improved extensibility through inclusion:** Make software templates more
+  maintainable and extensible by adding `$include` support for parameters.
+- **Authenticated job creation:** Created jobs will be able to run with an
+  authenticated user with all actions tracked for future consumption and
+  evidence. Track users creating jobs and make “jobs created by me” reporting
+  available.
 
-- [**Backstage Community Sessions**](https://github.com/backstage/community#meetups) -
-  A monthly meetup for the community to come together to share and learn about
-  the latest happenings in Backstage.
+### Software Catalog
 
-- **Backstage Hackathons** - (Coming soon) Open to everyone in our Backstage
-  community, a celebration of you, the project and building awesome things
-  together
+The following features are planned for release:
 
-### Completed milestones ✅
+- **Request For Comments (RFC) for composability improvements (routing):**
+  Enable plugins to be auto-added and make plugin installation and upgrades
+  easier for all Backstage users. This includes information card layouts, entity
+  pages containing content and hooking the external header, considering the
+  support of a separate deployment, and configuration for plugins.
+- **Removing duplicated entities in catalog:** As any adopter knows, a software
+  catalog can contain thousands or more entities and it is very important to
+  avoid duplications in naming to prevent failures. With this development task,
+  two entities with the same name won't be allowed as described
+  [here](https://github.com/backstage/backstage/issues/4760).
+- **Connecting identity to ownership to prepare for role-based access control
+  ([RBAC](https://en.wikipedia.org/wiki/Role-based_access_control)):** This is a
+  first step to supporting RBAC for the software catalog (see the
+  [future work section](#future-work) for further details). Provide each entity
+  within the software catalog with a recognized owner.
+- **Catalog performance improvements through improved caching:** Fix the
+  performance gaps in the catalog processor, which currently doesn’t have a
+  strong caching mechanism. The current version often requires fetching a
+  relevant amount of data, especially at scale.
 
+### Search
+
+The following features are planned for release:
+
+- ElasticSearch integration: Add ElasticSearch to the Search Platform as the
+  underlying search engine. Check out the
+  [milestone here](https://github.com/backstage/backstage/milestone/27) for
+  further details.
+
+### TechDocs
+
+The following features are planned for release:
+
+- **TechDocs beta release:** Fix remaining bugs to get TechDocs to Beta. Check
+  out the [milestone here](https://github.com/backstage/backstage/milestone/29)
+  for further details.
+
+## Future work
+
+The following feature list doesn’t represent a commitment to develop and the
+list order doesn’t reflect any priority or importance. But these features are on
+the maintainers’ radar, with clear interest expressed by the community.
+
+- **Improved UX design:** Provide a better Backstage user experience through
+  visual guidelines and templates, especially navigation across plug-ins and
+  portal functionalities.
+- **Catalog composability (routing):** Follow up development after the RFC
+  planned for the ongoing quarter (see [what’s next](#whats-next) for further
+  details).
+- **Catalog-import improvements:** Provide a faster (scalability) and better
+  (more features like move/rename) way to import entities into the Software
+  Catalog. Importing items in the Software Catalog is crucial for creating a
+  Backstage proof-of-concept or testing/planning for broader organizational
+  adoption. This enhancement better supports getting developers to use Backstage
+  with less effort and customization.
+- **Catalog improvements:** Add pagination and sourcing to Software Catalog.
+- **[GraphQL](https://graphql.org/) support:** Introduce the ability to query
+  Backstage backend services with a standard query language for APIs.
+- **Software templates performance improvements through decoupling a separate
+  worker:** Improve performance through decoupling resource-consuming services
+  and making them asynchronous. In the current version, project auto-creation
+  through the Software Templating system can consume a lot of resources and
+  bottleneck many concurrent projects created simultaneously.
+- **API discovery and documentation:** Add better support for the
+  [gRPC](https://grpc.io/).
+- **Adding TechDocs search to the Search Platform:** Having this capability in
+  place will provide a better and new major version of the Search Platform
+  (v3.0). You can refer to the
+  [milestone here](https://github.com/backstage/backstage/milestone/28) for
+  further details.
+- **TechDocs GA release:** Work toward enhancements necessary to get TechDocs to
+  general availability. Check out the
+  [milestone here](https://github.com/backstage/backstage/milestone/30) for
+  further details.
+
+## Completed milestones
+
+Read more about the completed (and released) features for reference.
+
+- [[Search] Out-of-the-Box Implementation (Alpha)](https://github.com/backstage/backstage/milestone/26)
 - [Deploy a product demo at `demo.backstage.io`](https://demo.backstage.io)
 - [Kubernetes plugin - v1](https://github.com/backstage/backstage/tree/master/plugins/kubernetes)
 - [Helm charts](https://github.com/backstage/backstage/tree/master/contrib/chart/backstage)
diff --git a/docs/overview/stability-index.md b/docs/overview/stability-index.md
index 2b730024fd..8e710d4e7c 100644
--- a/docs/overview/stability-index.md
+++ b/docs/overview/stability-index.md
@@ -145,12 +145,6 @@ Provides utilities for developing plugins in isolation.
 
 Stability: `0`. This package is largely broken and needs updates.
 
-### `docgen` [GitHub](https://github.com/backstage/backstage/tree/master/packages/docgen/)
-
-Internal CLI utility for generating API Documentation.
-
-Stability: `N/A`
-
 ### `e2e-test` [GitHub](https://github.com/backstage/backstage/tree/master/packages/e2e-test/)
 
 Internal CLI utility for running e2e tests.
@@ -312,14 +306,6 @@ configuration.
 
 Stability: `1`
 
-### `register-component` [GitHub](https://github.com/backstage/backstage/tree/master/plugins/register-component/)
-
-A frontend plugin that allows the user to register entity locations in the
-catalog.
-
-Stability: `0`. This plugin is likely to be replaced by a generic entity import
-plugin instead.
-
 ### `scaffolder` [GitHub](https://github.com/backstage/backstage/tree/master/plugins/scaffolder/)
 
 The frontend scaffolder plugin where one can browse templates and initiate
diff --git a/docs/plugins/github-apps.md b/docs/plugins/github-apps.md
index 805e321093..f9f7590e09 100644
--- a/docs/plugins/github-apps.md
+++ b/docs/plugins/github-apps.md
@@ -89,6 +89,26 @@ integrations:
         - $include: example-backstage-app-credentials.yaml
 ```
 
+### Limiting the GitHub App installations
+
+If you want to limit the GitHub app installations visible to backstage you may
+optionally include the `allowedInstallationOwners` option.
+
+```yaml
+appId: 1
+allowedInstallationOwners: ['GlobexCorp']
+clientId: client id
+clientSecret: client secret
+webhookSecret: webhook secret
+privateKey: |
+  -----BEGIN RSA PRIVATE KEY-----
+  ...Key content...
+  -----END RSA PRIVATE KEY-----
+```
+
+This will result in backstage preventing the use of any installation that is not
+within the allow list.
+
 ### Permissions for pull requests
 
 These are the minimum permissions required for creating a pull request with
diff --git a/docs/plugins/structure-of-a-plugin.md b/docs/plugins/structure-of-a-plugin.md
index beffcdb313..83fcfbddba 100644
--- a/docs/plugins/structure-of-a-plugin.md
+++ b/docs/plugins/structure-of-a-plugin.md
@@ -82,8 +82,8 @@ export const ExamplePage = examplePlugin.provide(
 
 This is where the plugin is created and where it creates and exports extensions
 that can be imported and used the app. See reference docs for
-[createPlugin](../reference/createPlugin.md) or introduction to the new
-[Composability System](./composability.md).
+[createPlugin](../reference/core-plugin-api.createplugin.md) or introduction to
+the new [Composability System](./composability.md).
 
 ## Components
 
@@ -99,15 +99,14 @@ You may tweak these components, rename them and/or replace them completely.
 
 ## Connecting the plugin to the Backstage app
 
-There are three things needed for a Backstage app to start making use of a
-plugin.
+There are two things needed for a Backstage app to start making use of a plugin.
 
 1. Add plugin as dependency in `app/package.json`
 2. Import and use one or more plugin extensions, for example in
    `app/src/App.tsx`.
 
-Luckily these three steps happen automatically when you create a plugin with the
-Backstage CLI.
+Luckily both of these steps happen automatically when you create a plugin with
+the Backstage CLI.
 
 ## Talking to the outside world
 
diff --git a/docs/reference/createPlugin-feature-flags.md b/docs/reference/createPlugin-feature-flags.md
deleted file mode 100644
index d550ba10a9..0000000000
--- a/docs/reference/createPlugin-feature-flags.md
+++ /dev/null
@@ -1,44 +0,0 @@
----
-id: createPlugin-feature-flags
-title: createPlugin - feature flags
-description: Documentation on createPlugin - feature flags
----
-
-The `featureFlags` object passed to the `register` function makes it possible
-for plugins to register Feature Flags in Backstage for users to opt into. You
-can use this to split out logic in your code for manual A/B testing, etc.
-
-Here's a code sample:
-
-```typescript
-import { createPlugin } from '@backstage/core-plugin-api';
-
-export default createPlugin({
-  id: 'plugin-name',
-  register({ featureFlags }) {
-    featureFlags.register('enable-example-feature');
-  },
-});
-```
-
-## Using with useApi
-
-To inspect the state of a feature flag inside your plugin, you can use the
-`FeatureFlagsApi`, accessed via the `featureFlagsApiRef`. For example:
-
-```tsx
-import React from 'react';
-import { Button } from '@material-ui/core';
-import { featureFlagsApiRef, useApi } from '@backstage/core-plugin-api';
-
-const ExamplePage = () => {
-  const featureFlags = useApi(featureFlagsApiRef);
-
-  return (
-    <div>
-      <MyPluginWidget>
-      { featureFlags.isActive('enable-example-feature') && <ExperimentalPluginWidget> }
-    </div>
-  );
-};
-```
diff --git a/docs/reference/createPlugin.md b/docs/reference/createPlugin.md
deleted file mode 100644
index 6602b0b2cc..0000000000
--- a/docs/reference/createPlugin.md
+++ /dev/null
@@ -1,41 +0,0 @@
----
-id: createPlugin
-title: createPlugin
-description: Documentation on createPlugin
----
-
-Takes a plugin config as an argument and returns a new plugin.
-
-## Plugin Config
-
-```typescript
-function createPlugin(config: PluginConfig): BackstagePlugin;
-
-type PluginConfig = {
-  id: string;
-  register?(hooks: PluginHooks): void;
-};
-
-type PluginHooks = {
-  featureFlags: FeatureFlagsHooks;
-};
-```
-
-- [Read more about feature flags here](createPlugin-feature-flags.md)
-
-## Example Uses
-
-### Creating a basic plugin
-
-Showcasing adding a feature flag.
-
-```jsx
-import { createPlugin } from '@backstage/core-plugin-api';
-
-export default createPlugin({
-  id: 'new-plugin',
-  register({ router, featureFlags }) {
-    featureFlags.register('enable-example-component');
-  },
-});
-```
diff --git a/docs/reference/utility-apis/AlertApi.md b/docs/reference/utility-apis/AlertApi.md
deleted file mode 100644
index 8d1851cc44..0000000000
--- a/docs/reference/utility-apis/AlertApi.md
+++ /dev/null
@@ -1,114 +0,0 @@
-# AlertApi
-
-The AlertApi type is defined at
-[packages/core-api/src/apis/definitions/AlertApi.ts:29](https://github.com/backstage/backstage/blob/a4dbd8353cfa4d4d4334473e2c33afcda64e130d/packages/core-api/src/apis/definitions/AlertApi.ts#L29).
-
-The following Utility API implements this type: [alertApiRef](./README.md#alert)
-
-## Members
-
-### post()
-
-Post an alert for handling by the application.
-
-<pre>
-post(alert: <a href="#alertmessage">AlertMessage</a>): void
-</pre>
-
-### alert\$()
-
-Observe alerts posted by other parts of the application.
-
-<pre>
-alert$(): <a href="#observable">Observable</a>&lt;<a href="#alertmessage">AlertMessage</a>&gt;
-</pre>
-
-## Supporting types
-
-These types are part of the API declaration, but may not be unique to this API.
-
-### AlertMessage
-
-<pre>
-export type AlertMessage = {
-  message: string;
-  // Severity will default to success since that is what material ui defaults the value to.
-  severity?: 'success' | 'info' | 'warning' | 'error';
-}
-</pre>
-
-Defined at
-[packages/core-api/src/apis/definitions/AlertApi.ts:19](https://github.com/backstage/backstage/blob/a4dbd8353cfa4d4d4334473e2c33afcda64e130d/packages/core-api/src/apis/definitions/AlertApi.ts#L19).
-
-Referenced by: [post](#post), [alert\$](#alert).
-
-### Observable
-
-Observable sequence of values and errors, see TC39.
-
-https://github.com/tc39/proposal-observable
-
-This is used as a common return type for observable values and can be created
-using many different observable implementations, such as zen-observable or
-RxJS 5.
-
-<pre>
-export type Observable&lt;T&gt; = {
-  /**
-   * Subscribes to this observable to start receiving new values.
-   */
-  subscribe(observer: <a href="#observer">Observer</a>&lt;T&gt;): <a href="#subscription">Subscription</a>;
-  subscribe(
-    onNext: (value: T) =&gt; void,
-    onError?: (error: Error) =&gt; void,
-    onComplete?: () =&gt; void,
-  ): <a href="#subscription">Subscription</a>;
-}
-</pre>
-
-Defined at
-[packages/core-api/src/types.ts:53](https://github.com/backstage/backstage/blob/a4dbd8353cfa4d4d4334473e2c33afcda64e130d/packages/core-api/src/types.ts#L53).
-
-Referenced by: [alert\$](#alert).
-
-### Observer
-
-This file contains non-react related core types used throughout Backstage.
-
-Observer interface for consuming an Observer, see TC39.
-
-<pre>
-export type Observer&lt;T&gt; = {
-  next?(value: T): void;
-  error?(error: Error): void;
-  complete?(): void;
-}
-</pre>
-
-Defined at
-[packages/core-api/src/types.ts:24](https://github.com/backstage/backstage/blob/a4dbd8353cfa4d4d4334473e2c33afcda64e130d/packages/core-api/src/types.ts#L24).
-
-Referenced by: [Observable](#observable).
-
-### Subscription
-
-Subscription returned when subscribing to an Observable, see TC39.
-
-<pre>
-export type Subscription = {
-  /**
-   * Cancels the subscription
-   */
-  unsubscribe(): void;
-
-  /**
-   * Value indicating whether the subscription is closed.
-   */
-  readonly closed: Boolean;
-}
-</pre>
-
-Defined at
-[packages/core-api/src/types.ts:33](https://github.com/backstage/backstage/blob/a4dbd8353cfa4d4d4334473e2c33afcda64e130d/packages/core-api/src/types.ts#L33).
-
-Referenced by: [Observable](#observable).
diff --git a/docs/reference/utility-apis/AppThemeApi.md b/docs/reference/utility-apis/AppThemeApi.md
deleted file mode 100644
index a662b4cb70..0000000000
--- a/docs/reference/utility-apis/AppThemeApi.md
+++ /dev/null
@@ -1,271 +0,0 @@
-# AppThemeApi
-
-The AppThemeApi type is defined at
-[packages/core-api/src/apis/definitions/AppThemeApi.ts:56](https://github.com/backstage/backstage/blob/a4dbd8353cfa4d4d4334473e2c33afcda64e130d/packages/core-api/src/apis/definitions/AppThemeApi.ts#L56).
-
-The following Utility API implements this type:
-[appThemeApiRef](./README.md#apptheme)
-
-## Members
-
-### getInstalledThemes()
-
-Get a list of available themes.
-
-<pre>
-getInstalledThemes(): <a href="#apptheme">AppTheme</a>[]
-</pre>
-
-### activeThemeId\$()
-
-Observe the currently selected theme. A value of undefined means no specific
-theme has been selected.
-
-<pre>
-activeThemeId$(): <a href="#observable">Observable</a>&lt;string | undefined&gt;
-</pre>
-
-### getActiveThemeId()
-
-Get the current theme ID. Returns undefined if no specific theme is selected.
-
-<pre>
-getActiveThemeId(): string | undefined
-</pre>
-
-### setActiveThemeId()
-
-Set a specific theme to use in the app, overriding the default theme selection.
-
-Clear the selection by passing in undefined.
-
-<pre>
-setActiveThemeId(themeId?: string): void
-</pre>
-
-## Supporting types
-
-These types are part of the API declaration, but may not be unique to this API.
-
-### AppTheme
-
-Describes a theme provided by the app.
-
-<pre>
-export type AppTheme = {
-  /**
-   * ID used to remember theme selections.
-   */
-  id: string;
-
-  /**
-   * Title of the theme
-   */
-  title: string;
-
-  /**
-   * Theme variant
-   */
-  variant: 'light' | 'dark';
-
-  /**
-   * The specialized MaterialUI theme instance.
-   */
-  theme: <a href="#backstagetheme">BackstageTheme</a>;
-
-  /**
-   * An Icon for the theme mode setting.
-   */
-  icon?: React.ReactElement&lt;SvgIconProps&gt;;
-}
-</pre>
-
-Defined at
-[packages/core-api/src/apis/definitions/AppThemeApi.ts:25](https://github.com/backstage/backstage/blob/a4dbd8353cfa4d4d4334473e2c33afcda64e130d/packages/core-api/src/apis/definitions/AppThemeApi.ts#L25).
-
-Referenced by: [getInstalledThemes](#getinstalledthemes).
-
-### BackstagePalette
-
-<pre>
-export type BackstagePalette = Palette &amp; <a href="#paletteadditions">PaletteAdditions</a>
-</pre>
-
-Defined at
-[packages/theme/src/types.ts:74](https://github.com/backstage/backstage/blob/a4dbd8353cfa4d4d4334473e2c33afcda64e130d/packages/theme/src/types.ts#L74).
-
-Referenced by: [BackstageTheme](#backstagetheme).
-
-### BackstageTheme
-
-<pre>
-export interface BackstageTheme extends Theme {
-  palette: <a href="#backstagepalette">BackstagePalette</a>;
-  page: <a href="#pagetheme">PageTheme</a>;
-  getPageTheme: ({ themeId }: <a href="#pagethemeselector">PageThemeSelector</a>) =&gt; <a href="#pagetheme">PageTheme</a>;
-}
-</pre>
-
-Defined at
-[packages/theme/src/types.ts:81](https://github.com/backstage/backstage/blob/a4dbd8353cfa4d4d4334473e2c33afcda64e130d/packages/theme/src/types.ts#L81).
-
-Referenced by: [AppTheme](#apptheme).
-
-### Observable
-
-Observable sequence of values and errors, see TC39.
-
-https://github.com/tc39/proposal-observable
-
-This is used as a common return type for observable values and can be created
-using many different observable implementations, such as zen-observable or
-RxJS 5.
-
-<pre>
-export type Observable&lt;T&gt; = {
-  /**
-   * Subscribes to this observable to start receiving new values.
-   */
-  subscribe(observer: <a href="#observer">Observer</a>&lt;T&gt;): <a href="#subscription">Subscription</a>;
-  subscribe(
-    onNext: (value: T) =&gt; void,
-    onError?: (error: Error) =&gt; void,
-    onComplete?: () =&gt; void,
-  ): <a href="#subscription">Subscription</a>;
-}
-</pre>
-
-Defined at
-[packages/core-api/src/types.ts:53](https://github.com/backstage/backstage/blob/a4dbd8353cfa4d4d4334473e2c33afcda64e130d/packages/core-api/src/types.ts#L53).
-
-Referenced by: [activeThemeId\$](#activethemeid).
-
-### Observer
-
-This file contains non-react related core types used throughout Backstage.
-
-Observer interface for consuming an Observer, see TC39.
-
-<pre>
-export type Observer&lt;T&gt; = {
-  next?(value: T): void;
-  error?(error: Error): void;
-  complete?(): void;
-}
-</pre>
-
-Defined at
-[packages/core-api/src/types.ts:24](https://github.com/backstage/backstage/blob/a4dbd8353cfa4d4d4334473e2c33afcda64e130d/packages/core-api/src/types.ts#L24).
-
-Referenced by: [Observable](#observable).
-
-### PageTheme
-
-<pre>
-export type PageTheme = {
-  colors: string[];
-  shape: string;
-  backgroundImage: string;
-}
-</pre>
-
-Defined at
-[packages/theme/src/types.ts:103](https://github.com/backstage/backstage/blob/a4dbd8353cfa4d4d4334473e2c33afcda64e130d/packages/theme/src/types.ts#L103).
-
-Referenced by: [BackstageTheme](#backstagetheme).
-
-### PageThemeSelector
-
-<pre>
-export type PageThemeSelector = {
-  themeId: string;
-}
-</pre>
-
-Defined at
-[packages/theme/src/types.ts:77](https://github.com/backstage/backstage/blob/a4dbd8353cfa4d4d4334473e2c33afcda64e130d/packages/theme/src/types.ts#L77).
-
-Referenced by: [BackstageTheme](#backstagetheme).
-
-### PaletteAdditions
-
-<pre>
-type PaletteAdditions = {
-  status: {
-    ok: string;
-    warning: string;
-    error: string;
-    pending: string;
-    running: string;
-    aborted: string;
-  };
-  border: string;
-  textContrast: string;
-  textVerySubtle: string;
-  textSubtle: string;
-  highlight: string;
-  errorBackground: string;
-  warningBackground: string;
-  infoBackground: string;
-  errorText: string;
-  infoText: string;
-  warningText: string;
-  linkHover: string;
-  link: string;
-  gold: string;
-  navigation: {
-    background: string;
-    indicator: string;
-    color: string;
-    selectedColor: string;
-  };
-  tabbar: {
-    indicator: string;
-  };
-  bursts: {
-    fontColor: string;
-    slackChannelText: string;
-    backgroundColor: {
-      default: string;
-    };
-  };
-  pinSidebarButton: {
-    icon: string;
-    background: string;
-  };
-  banner: {
-    info: string;
-    error: string;
-    text: string;
-    link: string;
-  };
-}
-</pre>
-
-Defined at
-[packages/theme/src/types.ts:23](https://github.com/backstage/backstage/blob/a4dbd8353cfa4d4d4334473e2c33afcda64e130d/packages/theme/src/types.ts#L23).
-
-Referenced by: [BackstagePalette](#backstagepalette).
-
-### Subscription
-
-Subscription returned when subscribing to an Observable, see TC39.
-
-<pre>
-export type Subscription = {
-  /**
-   * Cancels the subscription
-   */
-  unsubscribe(): void;
-
-  /**
-   * Value indicating whether the subscription is closed.
-   */
-  readonly closed: Boolean;
-}
-</pre>
-
-Defined at
-[packages/core-api/src/types.ts:33](https://github.com/backstage/backstage/blob/a4dbd8353cfa4d4d4334473e2c33afcda64e130d/packages/core-api/src/types.ts#L33).
-
-Referenced by: [Observable](#observable).
diff --git a/docs/reference/utility-apis/BackstageIdentityApi.md b/docs/reference/utility-apis/BackstageIdentityApi.md
deleted file mode 100644
index 80a40d427e..0000000000
--- a/docs/reference/utility-apis/BackstageIdentityApi.md
+++ /dev/null
@@ -1,100 +0,0 @@
-# BackstageIdentityApi
-
-The BackstageIdentityApi type is defined at
-[packages/core-api/src/apis/definitions/auth.ts:134](https://github.com/backstage/backstage/blob/a4dbd8353cfa4d4d4334473e2c33afcda64e130d/packages/core-api/src/apis/definitions/auth.ts#L134).
-
-The following Utility APIs implement this type:
-
-- [auth0AuthApiRef](./README.md#auth0auth)
-
-- [githubAuthApiRef](./README.md#githubauth)
-
-- [gitlabAuthApiRef](./README.md#gitlabauth)
-
-- [googleAuthApiRef](./README.md#googleauth)
-
-- [microsoftAuthApiRef](./README.md#microsoftauth)
-
-- [oauth2ApiRef](./README.md#oauth2)
-
-- [oidcAuthApiRef](./README.md#oidcauth)
-
-- [oktaAuthApiRef](./README.md#oktaauth)
-
-- [oneloginAuthApiRef](./README.md#oneloginauth)
-
-- [samlAuthApiRef](./README.md#samlauth)
-
-## Members
-
-### getBackstageIdentity()
-
-Get the user's identity within Backstage. This should normally not be called
-directly, use the @IdentityApi instead.
-
-If the optional flag is not set, a session is guaranteed to be returned, while
-if the optional flag is set, the session may be undefined. See
-@AuthRequestOptions for more details.
-
-<pre>
-getBackstageIdentity(
-    options?: <a href="#authrequestoptions">AuthRequestOptions</a>,
-  ): Promise&lt;<a href="#backstageidentity">BackstageIdentity</a> | undefined&gt;
-</pre>
-
-## Supporting types
-
-These types are part of the API declaration, but may not be unique to this API.
-
-### AuthRequestOptions
-
-<pre>
-export type AuthRequestOptions = {
-  /**
-   * If this is set to true, the user will not be prompted to log in,
-   * and an empty response will be returned if there is no existing session.
-   *
-   * This can be used to perform a check whether the user is logged in, or if you don't
-   * want to force a user to be logged in, but provide functionality if they already are.
-   *
-   * @default false
-   */
-  optional?: boolean;
-
-  /**
-   * If this is set to true, the request will bypass the regular oauth login modal
-   * and open the login popup directly.
-   *
-   * The method must be called synchronously from a user action for this to work in all browsers.
-   *
-   * @default false
-   */
-  instantPopup?: boolean;
-}
-</pre>
-
-Defined at
-[packages/core-api/src/apis/definitions/auth.ts:40](https://github.com/backstage/backstage/blob/a4dbd8353cfa4d4d4334473e2c33afcda64e130d/packages/core-api/src/apis/definitions/auth.ts#L40).
-
-Referenced by: [getBackstageIdentity](#getbackstageidentity).
-
-### BackstageIdentity
-
-<pre>
-export type BackstageIdentity = {
-  /**
-   * The backstage user ID.
-   */
-  id: string;
-
-  /**
-   * An ID token that can be used to authenticate the user within Backstage.
-   */
-  idToken: string;
-}
-</pre>
-
-Defined at
-[packages/core-api/src/apis/definitions/auth.ts:147](https://github.com/backstage/backstage/blob/a4dbd8353cfa4d4d4334473e2c33afcda64e130d/packages/core-api/src/apis/definitions/auth.ts#L147).
-
-Referenced by: [getBackstageIdentity](#getbackstageidentity).
diff --git a/docs/reference/utility-apis/Config.md b/docs/reference/utility-apis/Config.md
deleted file mode 100644
index c5b20610e7..0000000000
--- a/docs/reference/utility-apis/Config.md
+++ /dev/null
@@ -1,187 +0,0 @@
-# Config
-
-The Config type is defined at
-[packages/config/src/types.ts:32](https://github.com/backstage/backstage/blob/a4dbd8353cfa4d4d4334473e2c33afcda64e130d/packages/config/src/types.ts#L32).
-
-The following Utility API implements this type:
-[configApiRef](./README.md#config)
-
-## Members
-
-### has()
-
-<pre>
-has(key: string): boolean
-</pre>
-
-### keys()
-
-<pre>
-keys(): string[]
-</pre>
-
-### get()
-
-<pre>
-get(key?: string): <a href="#jsonvalue">JsonValue</a>
-</pre>
-
-### getOptional()
-
-<pre>
-getOptional(key?: string): <a href="#jsonvalue">JsonValue</a> | undefined
-</pre>
-
-### getConfig()
-
-<pre>
-getConfig(key: string): <a href="#config">Config</a>
-</pre>
-
-### getOptionalConfig()
-
-<pre>
-getOptionalConfig(key: string): <a href="#config">Config</a> | undefined
-</pre>
-
-### getConfigArray()
-
-<pre>
-getConfigArray(key: string): <a href="#config">Config</a>[]
-</pre>
-
-### getOptionalConfigArray()
-
-<pre>
-getOptionalConfigArray(key: string): <a href="#config">Config</a>[] | undefined
-</pre>
-
-### getNumber()
-
-<pre>
-getNumber(key: string): number
-</pre>
-
-### getOptionalNumber()
-
-<pre>
-getOptionalNumber(key: string): number | undefined
-</pre>
-
-### getBoolean()
-
-<pre>
-getBoolean(key: string): boolean
-</pre>
-
-### getOptionalBoolean()
-
-<pre>
-getOptionalBoolean(key: string): boolean | undefined
-</pre>
-
-### getString()
-
-<pre>
-getString(key: string): string
-</pre>
-
-### getOptionalString()
-
-<pre>
-getOptionalString(key: string): string | undefined
-</pre>
-
-### getStringArray()
-
-<pre>
-getStringArray(key: string): string[]
-</pre>
-
-### getOptionalStringArray()
-
-<pre>
-getOptionalStringArray(key: string): string[] | undefined
-</pre>
-
-## Supporting types
-
-These types are part of the API declaration, but may not be unique to this API.
-
-### Config
-
-<pre>
-export type Config = {
-  has(key: string): boolean;
-
-  keys(): string[];
-
-  get(key?: string): <a href="#jsonvalue">JsonValue</a>;
-  getOptional(key?: string): <a href="#jsonvalue">JsonValue</a> | undefined;
-
-  getConfig(key: string): Config;
-  getOptionalConfig(key: string): <a href="#config">Config</a> | undefined;
-
-  getConfigArray(key: string): <a href="#config">Config</a>[];
-  getOptionalConfigArray(key: string): <a href="#config">Config</a>[] | undefined;
-
-  getNumber(key: string): number;
-  getOptionalNumber(key: string): number | undefined;
-
-  getBoolean(key: string): boolean;
-  getOptionalBoolean(key: string): boolean | undefined;
-
-  getString(key: string): string;
-  getOptionalString(key: string): string | undefined;
-
-  getStringArray(key: string): string[];
-  getOptionalStringArray(key: string): string[] | undefined;
-}
-</pre>
-
-Defined at
-[packages/config/src/types.ts:32](https://github.com/backstage/backstage/blob/a4dbd8353cfa4d4d4334473e2c33afcda64e130d/packages/config/src/types.ts#L32).
-
-Referenced by: [getConfig](#getconfig), [getOptionalConfig](#getoptionalconfig),
-[getConfigArray](#getconfigarray),
-[getOptionalConfigArray](#getoptionalconfigarray), [Config](#config).
-
-### JsonArray
-
-<pre>
-export type JsonArray = <a href="#jsonvalue">JsonValue</a>[]
-</pre>
-
-Defined at
-[packages/config/src/types.ts:18](https://github.com/backstage/backstage/blob/a4dbd8353cfa4d4d4334473e2c33afcda64e130d/packages/config/src/types.ts#L18).
-
-Referenced by: [JsonValue](#jsonvalue).
-
-### JsonObject
-
-<pre>
-export type JsonObject = { [key in string]?: <a href="#jsonvalue">JsonValue</a> }
-</pre>
-
-Defined at
-[packages/config/src/types.ts:17](https://github.com/backstage/backstage/blob/a4dbd8353cfa4d4d4334473e2c33afcda64e130d/packages/config/src/types.ts#L17).
-
-Referenced by: [JsonValue](#jsonvalue).
-
-### JsonValue
-
-<pre>
-export type JsonValue =
-  | <a href="#jsonobject">JsonObject</a>
-  | <a href="#jsonarray">JsonArray</a>
-  | number
-  | string
-  | boolean
-  | null
-</pre>
-
-Defined at
-[packages/config/src/types.ts:19](https://github.com/backstage/backstage/blob/a4dbd8353cfa4d4d4334473e2c33afcda64e130d/packages/config/src/types.ts#L19).
-
-Referenced by: [get](#get), [getOptional](#getoptional),
-[JsonObject](#jsonobject), [JsonArray](#jsonarray), [Config](#config).
diff --git a/docs/reference/utility-apis/DiscoveryApi.md b/docs/reference/utility-apis/DiscoveryApi.md
deleted file mode 100644
index 0d888c1daa..0000000000
--- a/docs/reference/utility-apis/DiscoveryApi.md
+++ /dev/null
@@ -1,24 +0,0 @@
-# DiscoveryApi
-
-The DiscoveryApi type is defined at
-[packages/core-api/src/apis/definitions/DiscoveryApi.ts:30](https://github.com/backstage/backstage/blob/a4dbd8353cfa4d4d4334473e2c33afcda64e130d/packages/core-api/src/apis/definitions/DiscoveryApi.ts#L30).
-
-The following Utility API implements this type:
-[discoveryApiRef](./README.md#discovery)
-
-## Members
-
-### getBaseUrl()
-
-Returns the HTTP base backend URL for a given plugin, without a trailing slash.
-
-This method must always be called just before making a request, as opposed to
-fetching the URL when constructing an API client. That is to ensure that more
-flexible routing patterns can be supported.
-
-For example, asking for the URL for `auth` may return something like
-`https://backstage.example.com/api/auth`
-
-<pre>
-getBaseUrl(pluginId: string): Promise&lt;string&gt;
-</pre>
diff --git a/docs/reference/utility-apis/ErrorApi.md b/docs/reference/utility-apis/ErrorApi.md
deleted file mode 100644
index 1aaecdb47e..0000000000
--- a/docs/reference/utility-apis/ErrorApi.md
+++ /dev/null
@@ -1,134 +0,0 @@
-# ErrorApi
-
-The ErrorApi type is defined at
-[packages/core-api/src/apis/definitions/ErrorApi.ts:53](https://github.com/backstage/backstage/blob/a4dbd8353cfa4d4d4334473e2c33afcda64e130d/packages/core-api/src/apis/definitions/ErrorApi.ts#L53).
-
-The following Utility API implements this type: [errorApiRef](./README.md#error)
-
-## Members
-
-### post()
-
-Post an error for handling by the application.
-
-<pre>
-post(error: <a href="#error">Error</a>, context?: <a href="#errorcontext">ErrorContext</a>): void
-</pre>
-
-### error\$()
-
-Observe errors posted by other parts of the application.
-
-<pre>
-error$(): <a href="#observable">Observable</a>&lt;{ error: <a href="#error">Error</a>; context?: <a href="#errorcontext">ErrorContext</a> }&gt;
-</pre>
-
-## Supporting types
-
-These types are part of the API declaration, but may not be unique to this API.
-
-### Error
-
-Mirrors the JavaScript Error class, for the purpose of providing documentation
-and optional fields.
-
-<pre>
-type Error = {
-  name: string;
-  message: string;
-  stack?: string;
-}
-</pre>
-
-Defined at
-[packages/core-api/src/apis/definitions/ErrorApi.ts:24](https://github.com/backstage/backstage/blob/a4dbd8353cfa4d4d4334473e2c33afcda64e130d/packages/core-api/src/apis/definitions/ErrorApi.ts#L24).
-
-Referenced by: [post](#post), [error\$](#error).
-
-### ErrorContext
-
-Provides additional information about an error that was posted to the
-application.
-
-<pre>
-export type ErrorContext = {
-  // If set to true, this error should not be displayed to the user. Defaults to false.
-  hidden?: boolean;
-}
-</pre>
-
-Defined at
-[packages/core-api/src/apis/definitions/ErrorApi.ts:33](https://github.com/backstage/backstage/blob/a4dbd8353cfa4d4d4334473e2c33afcda64e130d/packages/core-api/src/apis/definitions/ErrorApi.ts#L33).
-
-Referenced by: [post](#post), [error\$](#error).
-
-### Observable
-
-Observable sequence of values and errors, see TC39.
-
-https://github.com/tc39/proposal-observable
-
-This is used as a common return type for observable values and can be created
-using many different observable implementations, such as zen-observable or
-RxJS 5.
-
-<pre>
-export type Observable&lt;T&gt; = {
-  /**
-   * Subscribes to this observable to start receiving new values.
-   */
-  subscribe(observer: <a href="#observer">Observer</a>&lt;T&gt;): <a href="#subscription">Subscription</a>;
-  subscribe(
-    onNext: (value: T) =&gt; void,
-    onError?: (error: Error) =&gt; void,
-    onComplete?: () =&gt; void,
-  ): <a href="#subscription">Subscription</a>;
-}
-</pre>
-
-Defined at
-[packages/core-api/src/types.ts:53](https://github.com/backstage/backstage/blob/a4dbd8353cfa4d4d4334473e2c33afcda64e130d/packages/core-api/src/types.ts#L53).
-
-Referenced by: [error\$](#error).
-
-### Observer
-
-This file contains non-react related core types used throughout Backstage.
-
-Observer interface for consuming an Observer, see TC39.
-
-<pre>
-export type Observer&lt;T&gt; = {
-  next?(value: T): void;
-  error?(error: Error): void;
-  complete?(): void;
-}
-</pre>
-
-Defined at
-[packages/core-api/src/types.ts:24](https://github.com/backstage/backstage/blob/a4dbd8353cfa4d4d4334473e2c33afcda64e130d/packages/core-api/src/types.ts#L24).
-
-Referenced by: [Observable](#observable).
-
-### Subscription
-
-Subscription returned when subscribing to an Observable, see TC39.
-
-<pre>
-export type Subscription = {
-  /**
-   * Cancels the subscription
-   */
-  unsubscribe(): void;
-
-  /**
-   * Value indicating whether the subscription is closed.
-   */
-  readonly closed: Boolean;
-}
-</pre>
-
-Defined at
-[packages/core-api/src/types.ts:33](https://github.com/backstage/backstage/blob/a4dbd8353cfa4d4d4334473e2c33afcda64e130d/packages/core-api/src/types.ts#L33).
-
-Referenced by: [Observable](#observable).
diff --git a/docs/reference/utility-apis/FeatureFlagsApi.md b/docs/reference/utility-apis/FeatureFlagsApi.md
deleted file mode 100644
index 1e8979c02e..0000000000
--- a/docs/reference/utility-apis/FeatureFlagsApi.md
+++ /dev/null
@@ -1,113 +0,0 @@
-# FeatureFlagsApi
-
-The FeatureFlagsApi type is defined at
-[packages/core-api/src/apis/definitions/FeatureFlagsApi.ts:60](https://github.com/backstage/backstage/blob/a4dbd8353cfa4d4d4334473e2c33afcda64e130d/packages/core-api/src/apis/definitions/FeatureFlagsApi.ts#L60).
-
-The following Utility API implements this type:
-[featureFlagsApiRef](./README.md#featureflags)
-
-## Members
-
-### registerFlag()
-
-Registers a new feature flag. Once a feature flag has been registered it can be
-toggled by users, and read back to enable or disable features.
-
-<pre>
-registerFlag(flag: <a href="#featureflag">FeatureFlag</a>): void
-</pre>
-
-### getRegisteredFlags()
-
-Get a list of all registered flags.
-
-<pre>
-getRegisteredFlags(): <a href="#featureflag">FeatureFlag</a>[]
-</pre>
-
-### isActive()
-
-Whether the feature flag with the given name is currently activated for the
-user.
-
-<pre>
-isActive(name: string): boolean
-</pre>
-
-### save()
-
-Save the user's choice of feature flag states.
-
-<pre>
-save(options: <a href="#featureflagssaveoptions">FeatureFlagsSaveOptions</a>): void
-</pre>
-
-## Supporting types
-
-These types are part of the API declaration, but may not be unique to this API.
-
-### FeatureFlag
-
-The feature flags API is used to toggle functionality to users across plugins
-and Backstage.
-
-Plugins can use this API to register feature flags that they have available for
-users to enable/disable, and this API will centralize the current user's state
-of which feature flags they would like to enable.
-
-This is ideal for Backstage plugins, as well as your own App, to trial
-incomplete or unstable upcoming features. Although there will be a common
-interface for users to enable and disable feature flags, this API acts as
-another way to enable/disable.
-
-<pre>
-export type FeatureFlag = {
-  name: string;
-  pluginId: string;
-}
-</pre>
-
-Defined at
-[packages/core-api/src/apis/definitions/FeatureFlagsApi.ts:31](https://github.com/backstage/backstage/blob/a4dbd8353cfa4d4d4334473e2c33afcda64e130d/packages/core-api/src/apis/definitions/FeatureFlagsApi.ts#L31).
-
-Referenced by: [registerFlag](#registerflag),
-[getRegisteredFlags](#getregisteredflags).
-
-### FeatureFlagState
-
-<pre>
-export enum FeatureFlagState {
-  None = 0,
-  Active = 1,
-}
-</pre>
-
-Defined at
-[packages/core-api/src/apis/definitions/FeatureFlagsApi.ts:36](https://github.com/backstage/backstage/blob/a4dbd8353cfa4d4d4334473e2c33afcda64e130d/packages/core-api/src/apis/definitions/FeatureFlagsApi.ts#L36).
-
-Referenced by: [FeatureFlagsSaveOptions](#featureflagssaveoptions).
-
-### FeatureFlagsSaveOptions
-
-Options to use when saving feature flags.
-
-<pre>
-export type FeatureFlagsSaveOptions = {
-  /**
-   * The new feature flag states to save.
-   */
-  states: Record&lt;string, <a href="#featureflagstate">FeatureFlagState</a>&gt;;
-
-  /**
-   * Whether the saves states should be merged into the existing ones, or replace them.
-   *
-   * Defaults to false.
-   */
-  merge?: boolean;
-}
-</pre>
-
-Defined at
-[packages/core-api/src/apis/definitions/FeatureFlagsApi.ts:44](https://github.com/backstage/backstage/blob/a4dbd8353cfa4d4d4334473e2c33afcda64e130d/packages/core-api/src/apis/definitions/FeatureFlagsApi.ts#L44).
-
-Referenced by: [save](#save).
diff --git a/docs/reference/utility-apis/IdentityApi.md b/docs/reference/utility-apis/IdentityApi.md
deleted file mode 100644
index aa2a4dd9a0..0000000000
--- a/docs/reference/utility-apis/IdentityApi.md
+++ /dev/null
@@ -1,81 +0,0 @@
-# IdentityApi
-
-The IdentityApi type is defined at
-[packages/core-api/src/apis/definitions/IdentityApi.ts:22](https://github.com/backstage/backstage/blob/a4dbd8353cfa4d4d4334473e2c33afcda64e130d/packages/core-api/src/apis/definitions/IdentityApi.ts#L22).
-
-The following Utility API implements this type:
-[identityApiRef](./README.md#identity)
-
-## Members
-
-### getUserId()
-
-The ID of the signed in user. This ID is not meant to be presented to the user,
-but used as an opaque string to pass on to backends or use in frontend logic.
-
-TODO: The intention of the user ID is to be able to tie the user to an identity
-that is known by the catalog and/or identity backend. It should for example be
-possible to fetch all owned components using this ID.
-
-<pre>
-getUserId(): string
-</pre>
-
-### getProfile()
-
-The profile of the signed in user.
-
-<pre>
-getProfile(): <a href="#profileinfo">ProfileInfo</a>
-</pre>
-
-### getIdToken()
-
-An OpenID Connect ID Token which proves the identity of the signed in user.
-
-The ID token will be undefined if the signed in user does not have a verified
-identity, such as a demo user or mocked user for e2e tests.
-
-<pre>
-getIdToken(): Promise&lt;string | undefined&gt;
-</pre>
-
-### signOut()
-
-Sign out the current user
-
-<pre>
-signOut(): Promise&lt;void&gt;
-</pre>
-
-## Supporting types
-
-These types are part of the API declaration, but may not be unique to this API.
-
-### ProfileInfo
-
-Profile information of the user.
-
-<pre>
-export type ProfileInfo = {
-  /**
-   * Email ID.
-   */
-  email?: string;
-
-  /**
-   * Display name that can be presented to the user.
-   */
-  displayName?: string;
-
-  /**
-   * URL to an avatar image of the user.
-   */
-  picture?: string;
-}
-</pre>
-
-Defined at
-[packages/core-api/src/apis/definitions/auth.ts:162](https://github.com/backstage/backstage/blob/a4dbd8353cfa4d4d4334473e2c33afcda64e130d/packages/core-api/src/apis/definitions/auth.ts#L162).
-
-Referenced by: [getProfile](#getprofile).
diff --git a/docs/reference/utility-apis/OAuthApi.md b/docs/reference/utility-apis/OAuthApi.md
deleted file mode 100644
index 9af6b3bb53..0000000000
--- a/docs/reference/utility-apis/OAuthApi.md
+++ /dev/null
@@ -1,117 +0,0 @@
-# OAuthApi
-
-The OAuthApi type is defined at
-[packages/core-api/src/apis/definitions/auth.ts:67](https://github.com/backstage/backstage/blob/a4dbd8353cfa4d4d4334473e2c33afcda64e130d/packages/core-api/src/apis/definitions/auth.ts#L67).
-
-The following Utility APIs implement this type:
-
-- [githubAuthApiRef](./README.md#githubauth)
-
-- [gitlabAuthApiRef](./README.md#gitlabauth)
-
-- [googleAuthApiRef](./README.md#googleauth)
-
-- [microsoftAuthApiRef](./README.md#microsoftauth)
-
-- [oauth2ApiRef](./README.md#oauth2)
-
-- [oidcAuthApiRef](./README.md#oidcauth)
-
-- [oktaAuthApiRef](./README.md#oktaauth)
-
-- [oneloginAuthApiRef](./README.md#oneloginauth)
-
-## Members
-
-### getAccessToken()
-
-Requests an OAuth 2 Access Token, optionally with a set of scopes. The access
-token allows you to make requests on behalf of the user, and the copes may grant
-you broader access, depending on the auth provider.
-
-Each auth provider has separate handling of scope, so you need to look at the
-documentation for each one to know what scope you need to request.
-
-This method is cheap and should be called each time an access token is used. Do
-not for example store the access token in React component state, as that could
-cause the token to expire. Instead fetch a new access token for each request.
-
-Be sure to include all required scopes when requesting an access token. When
-testing your implementation it is best to log out the Backstage session and then
-visit your plugin page directly, as you might already have some required scopes
-in your existing session. Not requesting the correct scopes can lead to 403 or
-other authorization errors, which can be tricky to debug.
-
-If the user has not yet granted access to the provider and the set of requested
-scopes, the user will be prompted to log in. The returned promise will not
-resolve until the user has successfully logged in. The returned promise can be
-rejected, but only if the user rejects the login request.
-
-<pre>
-getAccessToken(
-    scope?: <a href="#oauthscope">OAuthScope</a>,
-    options?: <a href="#authrequestoptions">AuthRequestOptions</a>,
-  ): Promise&lt;string&gt;
-</pre>
-
-## Supporting types
-
-These types are part of the API declaration, but may not be unique to this API.
-
-### AuthRequestOptions
-
-<pre>
-export type AuthRequestOptions = {
-  /**
-   * If this is set to true, the user will not be prompted to log in,
-   * and an empty response will be returned if there is no existing session.
-   *
-   * This can be used to perform a check whether the user is logged in, or if you don't
-   * want to force a user to be logged in, but provide functionality if they already are.
-   *
-   * @default false
-   */
-  optional?: boolean;
-
-  /**
-   * If this is set to true, the request will bypass the regular oauth login modal
-   * and open the login popup directly.
-   *
-   * The method must be called synchronously from a user action for this to work in all browsers.
-   *
-   * @default false
-   */
-  instantPopup?: boolean;
-}
-</pre>
-
-Defined at
-[packages/core-api/src/apis/definitions/auth.ts:40](https://github.com/backstage/backstage/blob/a4dbd8353cfa4d4d4334473e2c33afcda64e130d/packages/core-api/src/apis/definitions/auth.ts#L40).
-
-Referenced by: [getAccessToken](#getaccesstoken).
-
-### OAuthScope
-
-This file contains declarations for common interfaces of auth-related APIs. The
-declarations should be used to signal which type of authentication and
-authorization methods each separate auth provider supports.
-
-For example, a Google OAuth provider that supports OAuth 2 and OpenID Connect,
-would be declared as follows:
-
-const googleAuthApiRef = createApiRef<OAuthApi & OpenIDConnectApi>({ ... })
-
-An array of scopes, or a scope string formatted according to the auth provider,
-which is typically a space separated list.
-
-See the documentation for each auth provider for the list of scopes supported by
-each provider.
-
-<pre>
-export type OAuthScope = string | string[]
-</pre>
-
-Defined at
-[packages/core-api/src/apis/definitions/auth.ts:38](https://github.com/backstage/backstage/blob/a4dbd8353cfa4d4d4334473e2c33afcda64e130d/packages/core-api/src/apis/definitions/auth.ts#L38).
-
-Referenced by: [getAccessToken](#getaccesstoken).
diff --git a/docs/reference/utility-apis/OAuthRequestApi.md b/docs/reference/utility-apis/OAuthRequestApi.md
deleted file mode 100644
index 5f521cf288..0000000000
--- a/docs/reference/utility-apis/OAuthRequestApi.md
+++ /dev/null
@@ -1,233 +0,0 @@
-# OAuthRequestApi
-
-The OAuthRequestApi type is defined at
-[packages/core-api/src/apis/definitions/OAuthRequestApi.ts:99](https://github.com/backstage/backstage/blob/a4dbd8353cfa4d4d4334473e2c33afcda64e130d/packages/core-api/src/apis/definitions/OAuthRequestApi.ts#L99).
-
-The following Utility API implements this type:
-[oauthRequestApiRef](./README.md#oauthrequest)
-
-## Members
-
-### createAuthRequester()
-
-A utility for showing login popups or similar things, and merging together
-multiple requests for different scopes into one request that includes all
-scopes.
-
-The passed in options provide information about the login provider, and how to
-handle auth requests.
-
-The returned AuthRequester function is used to request login with new scopes.
-These requests are merged together and forwarded to the auth handler, as soon as
-a consumer of auth requests triggers an auth flow.
-
-See AuthRequesterOptions, AuthRequester, and handleAuthRequests for more info.
-
-<pre>
-createAuthRequester&lt;AuthResponse&gt;(
-    options: <a href="#authrequesteroptions">AuthRequesterOptions</a>&lt;AuthResponse&gt;,
-  ): <a href="#authrequester">AuthRequester</a>&lt;AuthResponse&gt;
-</pre>
-
-### authRequest\$()
-
-Observers pending auth requests. The returned observable will emit all current
-active auth request, at most one for each created auth requester.
-
-Each request has its own info about the login provider, forwarded from the auth
-requester options.
-
-Depending on user interaction, the request should either be rejected, or used to
-trigger the auth handler. If the request is rejected, all pending AuthRequester
-calls will fail with a "RejectedError". If a auth is triggered, and the auth
-handler resolves successfully, then all currently pending AuthRequester calls
-will resolve to the value returned by the onAuthRequest call.
-
-<pre>
-authRequest$(): <a href="#observable">Observable</a>&lt;<a href="#pendingauthrequest">PendingAuthRequest</a>[]&gt;
-</pre>
-
-## Supporting types
-
-These types are part of the API declaration, but may not be unique to this API.
-
-### AuthProvider
-
-Information about the auth provider that we're requesting a login towards.
-
-This should be shown to the user so that they can be informed about what login
-is being requested before a popup is shown.
-
-<pre>
-export type AuthProvider = {
-  /**
-   * Title for the auth provider, for example "GitHub"
-   */
-  title: string;
-
-  /**
-   * Icon for the auth provider.
-   */
-  icon: IconComponent;
-}
-</pre>
-
-Defined at
-[packages/core-api/src/apis/definitions/OAuthRequestApi.ts:27](https://github.com/backstage/backstage/blob/a4dbd8353cfa4d4d4334473e2c33afcda64e130d/packages/core-api/src/apis/definitions/OAuthRequestApi.ts#L27).
-
-Referenced by: [AuthRequesterOptions](#authrequesteroptions),
-[PendingAuthRequest](#pendingauthrequest).
-
-### AuthRequester
-
-Function used to trigger new auth requests for a set of scopes.
-
-The returned promise will resolve to the same value returned by the
-onAuthRequest in the AuthRequesterOptions. Or rejected, if the request is
-rejected.
-
-This function can be called multiple times before the promise resolves. All
-calls will be merged into one request, and the scopes forwarded to the
-onAuthRequest will be the union of all requested scopes.
-
-<pre>
-export type AuthRequester&lt;AuthResponse&gt; = (
-  scopes: Set&lt;string&gt;,
-) =&gt; Promise&lt;AuthResponse&gt;
-</pre>
-
-Defined at
-[packages/core-api/src/apis/definitions/OAuthRequestApi.ts:66](https://github.com/backstage/backstage/blob/a4dbd8353cfa4d4d4334473e2c33afcda64e130d/packages/core-api/src/apis/definitions/OAuthRequestApi.ts#L66).
-
-Referenced by: [createAuthRequester](#createauthrequester).
-
-### AuthRequesterOptions
-
-Describes how to handle auth requests. Both how to show them to the user, and
-what to do when the user accesses the auth request.
-
-<pre>
-export type AuthRequesterOptions&lt;AuthResponse&gt; = {
-  /**
-   * Information about the auth provider, which will be forwarded to auth requests.
-   */
-  provider: <a href="#authprovider">AuthProvider</a>;
-
-  /**
-   * Implementation of the auth flow, which will be called synchronously when
-   * trigger() is called on an auth requests.
-   */
-  onAuthRequest(scopes: Set&lt;string&gt;): Promise&lt;AuthResponse&gt;;
-}
-</pre>
-
-Defined at
-[packages/core-api/src/apis/definitions/OAuthRequestApi.ts:43](https://github.com/backstage/backstage/blob/a4dbd8353cfa4d4d4334473e2c33afcda64e130d/packages/core-api/src/apis/definitions/OAuthRequestApi.ts#L43).
-
-Referenced by: [createAuthRequester](#createauthrequester).
-
-### Observable
-
-Observable sequence of values and errors, see TC39.
-
-https://github.com/tc39/proposal-observable
-
-This is used as a common return type for observable values and can be created
-using many different observable implementations, such as zen-observable or
-RxJS 5.
-
-<pre>
-export type Observable&lt;T&gt; = {
-  /**
-   * Subscribes to this observable to start receiving new values.
-   */
-  subscribe(observer: <a href="#observer">Observer</a>&lt;T&gt;): <a href="#subscription">Subscription</a>;
-  subscribe(
-    onNext: (value: T) =&gt; void,
-    onError?: (error: Error) =&gt; void,
-    onComplete?: () =&gt; void,
-  ): <a href="#subscription">Subscription</a>;
-}
-</pre>
-
-Defined at
-[packages/core-api/src/types.ts:53](https://github.com/backstage/backstage/blob/a4dbd8353cfa4d4d4334473e2c33afcda64e130d/packages/core-api/src/types.ts#L53).
-
-Referenced by: [authRequest\$](#authrequest).
-
-### Observer
-
-This file contains non-react related core types used throughout Backstage.
-
-Observer interface for consuming an Observer, see TC39.
-
-<pre>
-export type Observer&lt;T&gt; = {
-  next?(value: T): void;
-  error?(error: Error): void;
-  complete?(): void;
-}
-</pre>
-
-Defined at
-[packages/core-api/src/types.ts:24](https://github.com/backstage/backstage/blob/a4dbd8353cfa4d4d4334473e2c33afcda64e130d/packages/core-api/src/types.ts#L24).
-
-Referenced by: [Observable](#observable).
-
-### PendingAuthRequest
-
-An pending auth request for a single auth provider. The request will remain in
-this pending state until either reject() or trigger() is called.
-
-Any new requests for the same provider are merged into the existing pending
-request, meaning there will only ever be a single pending request for a given
-provider.
-
-<pre>
-export type PendingAuthRequest = {
-  /**
-   * Information about the auth provider, as given in the AuthRequesterOptions
-   */
-  provider: <a href="#authprovider">AuthProvider</a>;
-
-  /**
-   * Rejects the request, causing all pending AuthRequester calls to fail with "RejectedError".
-   */
-  reject: () =&gt; void;
-
-  /**
-   * Trigger the auth request to continue the auth flow, by for example showing a popup.
-   *
-   * Synchronously calls onAuthRequest with all scope currently in the request.
-   */
-  trigger(): Promise&lt;void&gt;;
-}
-</pre>
-
-Defined at
-[packages/core-api/src/apis/definitions/OAuthRequestApi.ts:77](https://github.com/backstage/backstage/blob/a4dbd8353cfa4d4d4334473e2c33afcda64e130d/packages/core-api/src/apis/definitions/OAuthRequestApi.ts#L77).
-
-Referenced by: [authRequest\$](#authrequest).
-
-### Subscription
-
-Subscription returned when subscribing to an Observable, see TC39.
-
-<pre>
-export type Subscription = {
-  /**
-   * Cancels the subscription
-   */
-  unsubscribe(): void;
-
-  /**
-   * Value indicating whether the subscription is closed.
-   */
-  readonly closed: Boolean;
-}
-</pre>
-
-Defined at
-[packages/core-api/src/types.ts:33](https://github.com/backstage/backstage/blob/a4dbd8353cfa4d4d4334473e2c33afcda64e130d/packages/core-api/src/types.ts#L33).
-
-Referenced by: [Observable](#observable).
diff --git a/docs/reference/utility-apis/OpenIdConnectApi.md b/docs/reference/utility-apis/OpenIdConnectApi.md
deleted file mode 100644
index 6d05af6189..0000000000
--- a/docs/reference/utility-apis/OpenIdConnectApi.md
+++ /dev/null
@@ -1,75 +0,0 @@
-# OpenIdConnectApi
-
-The OpenIdConnectApi type is defined at
-[packages/core-api/src/apis/definitions/auth.ts:99](https://github.com/backstage/backstage/blob/a4dbd8353cfa4d4d4334473e2c33afcda64e130d/packages/core-api/src/apis/definitions/auth.ts#L99).
-
-The following Utility APIs implement this type:
-
-- [auth0AuthApiRef](./README.md#auth0auth)
-
-- [googleAuthApiRef](./README.md#googleauth)
-
-- [microsoftAuthApiRef](./README.md#microsoftauth)
-
-- [oauth2ApiRef](./README.md#oauth2)
-
-- [oidcAuthApiRef](./README.md#oidcauth)
-
-- [oktaAuthApiRef](./README.md#oktaauth)
-
-- [oneloginAuthApiRef](./README.md#oneloginauth)
-
-## Members
-
-### getIdToken()
-
-Requests an OpenID Connect ID Token.
-
-This method is cheap and should be called each time an ID token is used. Do not
-for example store the id token in React component state, as that could cause the
-token to expire. Instead fetch a new id token for each request.
-
-If the user has not yet logged in to Google inside Backstage, the user will be
-prompted to log in. The returned promise will not resolve until the user has
-successfully logged in. The returned promise can be rejected, but only if the
-user rejects the login request.
-
-<pre>
-getIdToken(options?: <a href="#authrequestoptions">AuthRequestOptions</a>): Promise&lt;string&gt;
-</pre>
-
-## Supporting types
-
-These types are part of the API declaration, but may not be unique to this API.
-
-### AuthRequestOptions
-
-<pre>
-export type AuthRequestOptions = {
-  /**
-   * If this is set to true, the user will not be prompted to log in,
-   * and an empty response will be returned if there is no existing session.
-   *
-   * This can be used to perform a check whether the user is logged in, or if you don't
-   * want to force a user to be logged in, but provide functionality if they already are.
-   *
-   * @default false
-   */
-  optional?: boolean;
-
-  /**
-   * If this is set to true, the request will bypass the regular oauth login modal
-   * and open the login popup directly.
-   *
-   * The method must be called synchronously from a user action for this to work in all browsers.
-   *
-   * @default false
-   */
-  instantPopup?: boolean;
-}
-</pre>
-
-Defined at
-[packages/core-api/src/apis/definitions/auth.ts:40](https://github.com/backstage/backstage/blob/a4dbd8353cfa4d4d4334473e2c33afcda64e130d/packages/core-api/src/apis/definitions/auth.ts#L40).
-
-Referenced by: [getIdToken](#getidtoken).
diff --git a/docs/reference/utility-apis/ProfileInfoApi.md b/docs/reference/utility-apis/ProfileInfoApi.md
deleted file mode 100644
index 1a2f94d031..0000000000
--- a/docs/reference/utility-apis/ProfileInfoApi.md
+++ /dev/null
@@ -1,104 +0,0 @@
-# ProfileInfoApi
-
-The ProfileInfoApi type is defined at
-[packages/core-api/src/apis/definitions/auth.ts:117](https://github.com/backstage/backstage/blob/a4dbd8353cfa4d4d4334473e2c33afcda64e130d/packages/core-api/src/apis/definitions/auth.ts#L117).
-
-The following Utility APIs implement this type:
-
-- [auth0AuthApiRef](./README.md#auth0auth)
-
-- [githubAuthApiRef](./README.md#githubauth)
-
-- [gitlabAuthApiRef](./README.md#gitlabauth)
-
-- [googleAuthApiRef](./README.md#googleauth)
-
-- [microsoftAuthApiRef](./README.md#microsoftauth)
-
-- [oauth2ApiRef](./README.md#oauth2)
-
-- [oidcAuthApiRef](./README.md#oidcauth)
-
-- [oktaAuthApiRef](./README.md#oktaauth)
-
-- [oneloginAuthApiRef](./README.md#oneloginauth)
-
-- [samlAuthApiRef](./README.md#samlauth)
-
-## Members
-
-### getProfile()
-
-Get profile information for the user as supplied by this auth provider.
-
-If the optional flag is not set, a session is guaranteed to be returned, while
-if the optional flag is set, the session may be undefined. See
-@AuthRequestOptions for more details.
-
-<pre>
-getProfile(options?: <a href="#authrequestoptions">AuthRequestOptions</a>): Promise&lt;<a href="#profileinfo">ProfileInfo</a> | undefined&gt;
-</pre>
-
-## Supporting types
-
-These types are part of the API declaration, but may not be unique to this API.
-
-### AuthRequestOptions
-
-<pre>
-export type AuthRequestOptions = {
-  /**
-   * If this is set to true, the user will not be prompted to log in,
-   * and an empty response will be returned if there is no existing session.
-   *
-   * This can be used to perform a check whether the user is logged in, or if you don't
-   * want to force a user to be logged in, but provide functionality if they already are.
-   *
-   * @default false
-   */
-  optional?: boolean;
-
-  /**
-   * If this is set to true, the request will bypass the regular oauth login modal
-   * and open the login popup directly.
-   *
-   * The method must be called synchronously from a user action for this to work in all browsers.
-   *
-   * @default false
-   */
-  instantPopup?: boolean;
-}
-</pre>
-
-Defined at
-[packages/core-api/src/apis/definitions/auth.ts:40](https://github.com/backstage/backstage/blob/a4dbd8353cfa4d4d4334473e2c33afcda64e130d/packages/core-api/src/apis/definitions/auth.ts#L40).
-
-Referenced by: [getProfile](#getprofile).
-
-### ProfileInfo
-
-Profile information of the user.
-
-<pre>
-export type ProfileInfo = {
-  /**
-   * Email ID.
-   */
-  email?: string;
-
-  /**
-   * Display name that can be presented to the user.
-   */
-  displayName?: string;
-
-  /**
-   * URL to an avatar image of the user.
-   */
-  picture?: string;
-}
-</pre>
-
-Defined at
-[packages/core-api/src/apis/definitions/auth.ts:162](https://github.com/backstage/backstage/blob/a4dbd8353cfa4d4d4334473e2c33afcda64e130d/packages/core-api/src/apis/definitions/auth.ts#L162).
-
-Referenced by: [getProfile](#getprofile).
diff --git a/docs/reference/utility-apis/README.md b/docs/reference/utility-apis/README.md
deleted file mode 100644
index aefbb4b925..0000000000
--- a/docs/reference/utility-apis/README.md
+++ /dev/null
@@ -1,202 +0,0 @@
-# Backstage Core Utility APIs
-
-The following is a list of all Utility APIs defined by `@backstage/core`. They
-are available to use by plugins and components, and can be accessed using the
-`useApi` hook, also provided by `@backstage/core`. For more information, see
-https://github.com/backstage/backstage/blob/master/docs/api/utility-apis.md.
-
-### alert
-
-Used to report alerts and forward them to the app
-
-Implemented type: [AlertApi](./AlertApi.md)
-
-ApiRef:
-[alertApiRef](https://github.com/backstage/backstage/blob/a4dbd8353cfa4d4d4334473e2c33afcda64e130d/packages/core-api/src/apis/definitions/AlertApi.ts#L41)
-
-### appTheme
-
-API Used to configure the app theme, and enumerate options
-
-Implemented type: [AppThemeApi](./AppThemeApi.md)
-
-ApiRef:
-[appThemeApiRef](https://github.com/backstage/backstage/blob/a4dbd8353cfa4d4d4334473e2c33afcda64e130d/packages/core-api/src/apis/definitions/AppThemeApi.ts#L80)
-
-### auth0Auth
-
-Provides authentication towards Auth0 APIs
-
-Implemented types: [OpenIdConnectApi](./OpenIdConnectApi.md),
-[ProfileInfoApi](./ProfileInfoApi.md),
-[BackstageIdentityApi](./BackstageIdentityApi.md), [SessionApi](./SessionApi.md)
-
-ApiRef:
-[auth0AuthApiRef](https://github.com/backstage/backstage/blob/a4dbd8353cfa4d4d4334473e2c33afcda64e130d/packages/core-api/src/apis/definitions/auth.ts#L275)
-
-### config
-
-Used to access runtime configuration
-
-Implemented type: [Config](./Config.md)
-
-ApiRef:
-[configApiRef](https://github.com/backstage/backstage/blob/a4dbd8353cfa4d4d4334473e2c33afcda64e130d/packages/core-api/src/apis/definitions/ConfigApi.ts#L25)
-
-### discovery
-
-Provides service discovery of backend plugins
-
-Implemented type: [DiscoveryApi](./DiscoveryApi.md)
-
-ApiRef:
-[discoveryApiRef](https://github.com/backstage/backstage/blob/a4dbd8353cfa4d4d4334473e2c33afcda64e130d/packages/core-api/src/apis/definitions/DiscoveryApi.ts#L44)
-
-### error
-
-Used to report errors and forward them to the app
-
-Implemented type: [ErrorApi](./ErrorApi.md)
-
-ApiRef:
-[errorApiRef](https://github.com/backstage/backstage/blob/a4dbd8353cfa4d4d4334473e2c33afcda64e130d/packages/core-api/src/apis/definitions/ErrorApi.ts#L65)
-
-### featureFlags
-
-Used to toggle functionality in features across Backstage
-
-Implemented type: [FeatureFlagsApi](./FeatureFlagsApi.md)
-
-ApiRef:
-[featureFlagsApiRef](https://github.com/backstage/backstage/blob/a4dbd8353cfa4d4d4334473e2c33afcda64e130d/packages/core-api/src/apis/definitions/FeatureFlagsApi.ts#L83)
-
-### githubAuth
-
-Provides authentication towards GitHub APIs
-
-Implemented types: [OAuthApi](./OAuthApi.md),
-[ProfileInfoApi](./ProfileInfoApi.md),
-[BackstageIdentityApi](./BackstageIdentityApi.md), [SessionApi](./SessionApi.md)
-
-ApiRef:
-[githubAuthApiRef](https://github.com/backstage/backstage/blob/a4dbd8353cfa4d4d4334473e2c33afcda64e130d/packages/core-api/src/apis/definitions/auth.ts#L232)
-
-### gitlabAuth
-
-Provides authentication towards GitLab APIs
-
-Implemented types: [OAuthApi](./OAuthApi.md),
-[ProfileInfoApi](./ProfileInfoApi.md),
-[BackstageIdentityApi](./BackstageIdentityApi.md), [SessionApi](./SessionApi.md)
-
-ApiRef:
-[gitlabAuthApiRef](https://github.com/backstage/backstage/blob/a4dbd8353cfa4d4d4334473e2c33afcda64e130d/packages/core-api/src/apis/definitions/auth.ts#L262)
-
-### googleAuth
-
-Provides authentication towards Google APIs and identities
-
-Implemented types: [OAuthApi](./OAuthApi.md),
-[OpenIdConnectApi](./OpenIdConnectApi.md),
-[ProfileInfoApi](./ProfileInfoApi.md),
-[BackstageIdentityApi](./BackstageIdentityApi.md), [SessionApi](./SessionApi.md)
-
-ApiRef:
-[googleAuthApiRef](https://github.com/backstage/backstage/blob/a4dbd8353cfa4d4d4334473e2c33afcda64e130d/packages/core-api/src/apis/definitions/auth.ts#L215)
-
-### identity
-
-Provides access to the identity of the signed in user
-
-Implemented type: [IdentityApi](./IdentityApi.md)
-
-ApiRef:
-[identityApiRef](https://github.com/backstage/backstage/blob/a4dbd8353cfa4d4d4334473e2c33afcda64e130d/packages/core-api/src/apis/definitions/IdentityApi.ts#L53)
-
-### microsoftAuth
-
-Provides authentication towards Microsoft APIs and identities
-
-Implemented types: [OAuthApi](./OAuthApi.md),
-[OpenIdConnectApi](./OpenIdConnectApi.md),
-[ProfileInfoApi](./ProfileInfoApi.md),
-[BackstageIdentityApi](./BackstageIdentityApi.md), [SessionApi](./SessionApi.md)
-
-ApiRef:
-[microsoftAuthApiRef](https://github.com/backstage/backstage/blob/a4dbd8353cfa4d4d4334473e2c33afcda64e130d/packages/core-api/src/apis/definitions/auth.ts#L289)
-
-### oauth2
-
-Example of how to use oauth2 custom provider
-
-Implemented types: [OAuthApi](./OAuthApi.md),
-[OpenIdConnectApi](./OpenIdConnectApi.md),
-[ProfileInfoApi](./ProfileInfoApi.md),
-[BackstageIdentityApi](./BackstageIdentityApi.md), [SessionApi](./SessionApi.md)
-
-ApiRef:
-[oauth2ApiRef](https://github.com/backstage/backstage/blob/a4dbd8353cfa4d4d4334473e2c33afcda64e130d/packages/core-api/src/apis/definitions/auth.ts#L303)
-
-### oauthRequest
-
-An API for implementing unified OAuth flows in Backstage
-
-Implemented type: [OAuthRequestApi](./OAuthRequestApi.md)
-
-ApiRef:
-[oauthRequestApiRef](https://github.com/backstage/backstage/blob/a4dbd8353cfa4d4d4334473e2c33afcda64e130d/packages/core-api/src/apis/definitions/OAuthRequestApi.ts#L130)
-
-### oidcAuth
-
-Example of how to use oidc custom provider
-
-Implemented types: [OAuthApi](./OAuthApi.md),
-[OpenIdConnectApi](./OpenIdConnectApi.md),
-[ProfileInfoApi](./ProfileInfoApi.md),
-[BackstageIdentityApi](./BackstageIdentityApi.md), [SessionApi](./SessionApi.md)
-
-ApiRef:
-[oidcAuthApiRef](https://github.com/backstage/backstage/blob/a4dbd8353cfa4d4d4334473e2c33afcda64e130d/packages/core-api/src/apis/definitions/auth.ts#L317)
-
-### oktaAuth
-
-Provides authentication towards Okta APIs
-
-Implemented types: [OAuthApi](./OAuthApi.md),
-[OpenIdConnectApi](./OpenIdConnectApi.md),
-[ProfileInfoApi](./ProfileInfoApi.md),
-[BackstageIdentityApi](./BackstageIdentityApi.md), [SessionApi](./SessionApi.md)
-
-ApiRef:
-[oktaAuthApiRef](https://github.com/backstage/backstage/blob/a4dbd8353cfa4d4d4334473e2c33afcda64e130d/packages/core-api/src/apis/definitions/auth.ts#L245)
-
-### oneloginAuth
-
-Provides authentication towards OneLogin APIs and identities
-
-Implemented types: [OAuthApi](./OAuthApi.md),
-[OpenIdConnectApi](./OpenIdConnectApi.md),
-[ProfileInfoApi](./ProfileInfoApi.md),
-[BackstageIdentityApi](./BackstageIdentityApi.md), [SessionApi](./SessionApi.md)
-
-ApiRef:
-[oneloginAuthApiRef](https://github.com/backstage/backstage/blob/a4dbd8353cfa4d4d4334473e2c33afcda64e130d/packages/core-api/src/apis/definitions/auth.ts#L338)
-
-### samlAuth
-
-Example of how to use SAML custom provider
-
-Implemented types: [ProfileInfoApi](./ProfileInfoApi.md),
-[BackstageIdentityApi](./BackstageIdentityApi.md), [SessionApi](./SessionApi.md)
-
-ApiRef:
-[samlAuthApiRef](https://github.com/backstage/backstage/blob/a4dbd8353cfa4d4d4334473e2c33afcda64e130d/packages/core-api/src/apis/definitions/auth.ts#L331)
-
-### storage
-
-Provides the ability to store data which is unique to the user
-
-Implemented type: [StorageApi](./StorageApi.md)
-
-ApiRef:
-[storageApiRef](https://github.com/backstage/backstage/blob/a4dbd8353cfa4d4d4334473e2c33afcda64e130d/packages/core-api/src/apis/definitions/StorageApi.ts#L68)
diff --git a/docs/reference/utility-apis/SessionApi.md b/docs/reference/utility-apis/SessionApi.md
deleted file mode 100644
index 4b584d92c8..0000000000
--- a/docs/reference/utility-apis/SessionApi.md
+++ /dev/null
@@ -1,144 +0,0 @@
-# SessionApi
-
-The SessionApi type is defined at
-[packages/core-api/src/apis/definitions/auth.ts:190](https://github.com/backstage/backstage/blob/a4dbd8353cfa4d4d4334473e2c33afcda64e130d/packages/core-api/src/apis/definitions/auth.ts#L190).
-
-The following Utility APIs implement this type:
-
-- [auth0AuthApiRef](./README.md#auth0auth)
-
-- [githubAuthApiRef](./README.md#githubauth)
-
-- [gitlabAuthApiRef](./README.md#gitlabauth)
-
-- [googleAuthApiRef](./README.md#googleauth)
-
-- [microsoftAuthApiRef](./README.md#microsoftauth)
-
-- [oauth2ApiRef](./README.md#oauth2)
-
-- [oidcAuthApiRef](./README.md#oidcauth)
-
-- [oktaAuthApiRef](./README.md#oktaauth)
-
-- [oneloginAuthApiRef](./README.md#oneloginauth)
-
-- [samlAuthApiRef](./README.md#samlauth)
-
-## Members
-
-### signIn()
-
-Sign in with a minimum set of permissions.
-
-<pre>
-signIn(): Promise&lt;void&gt;
-</pre>
-
-### signOut()
-
-Sign out from the current session. This will reload the page.
-
-<pre>
-signOut(): Promise&lt;void&gt;
-</pre>
-
-### sessionState\$()
-
-Observe the current state of the auth session. Emits the current state on
-subscription.
-
-<pre>
-sessionState$(): <a href="#observable">Observable</a>&lt;<a href="#sessionstate">SessionState</a>&gt;
-</pre>
-
-## Supporting types
-
-These types are part of the API declaration, but may not be unique to this API.
-
-### Observable
-
-Observable sequence of values and errors, see TC39.
-
-https://github.com/tc39/proposal-observable
-
-This is used as a common return type for observable values and can be created
-using many different observable implementations, such as zen-observable or
-RxJS 5.
-
-<pre>
-export type Observable&lt;T&gt; = {
-  /**
-   * Subscribes to this observable to start receiving new values.
-   */
-  subscribe(observer: <a href="#observer">Observer</a>&lt;T&gt;): <a href="#subscription">Subscription</a>;
-  subscribe(
-    onNext: (value: T) =&gt; void,
-    onError?: (error: Error) =&gt; void,
-    onComplete?: () =&gt; void,
-  ): <a href="#subscription">Subscription</a>;
-}
-</pre>
-
-Defined at
-[packages/core-api/src/types.ts:53](https://github.com/backstage/backstage/blob/a4dbd8353cfa4d4d4334473e2c33afcda64e130d/packages/core-api/src/types.ts#L53).
-
-Referenced by: [sessionState\$](#sessionstate).
-
-### Observer
-
-This file contains non-react related core types used throughout Backstage.
-
-Observer interface for consuming an Observer, see TC39.
-
-<pre>
-export type Observer&lt;T&gt; = {
-  next?(value: T): void;
-  error?(error: Error): void;
-  complete?(): void;
-}
-</pre>
-
-Defined at
-[packages/core-api/src/types.ts:24](https://github.com/backstage/backstage/blob/a4dbd8353cfa4d4d4334473e2c33afcda64e130d/packages/core-api/src/types.ts#L24).
-
-Referenced by: [Observable](#observable).
-
-### SessionState
-
-Session state values passed to subscribers of the SessionApi.
-
-<pre>
-export enum SessionState {
-  SignedIn = 'SignedIn',
-  SignedOut = 'SignedOut',
-}
-</pre>
-
-Defined at
-[packages/core-api/src/apis/definitions/auth.ts:182](https://github.com/backstage/backstage/blob/a4dbd8353cfa4d4d4334473e2c33afcda64e130d/packages/core-api/src/apis/definitions/auth.ts#L182).
-
-Referenced by: [sessionState\$](#sessionstate).
-
-### Subscription
-
-Subscription returned when subscribing to an Observable, see TC39.
-
-<pre>
-export type Subscription = {
-  /**
-   * Cancels the subscription
-   */
-  unsubscribe(): void;
-
-  /**
-   * Value indicating whether the subscription is closed.
-   */
-  readonly closed: Boolean;
-}
-</pre>
-
-Defined at
-[packages/core-api/src/types.ts:33](https://github.com/backstage/backstage/blob/a4dbd8353cfa4d4d4334473e2c33afcda64e130d/packages/core-api/src/types.ts#L33).
-
-Referenced by: [Observable](#observable).
diff --git a/docs/reference/utility-apis/SessionStateApi.md b/docs/reference/utility-apis/SessionStateApi.md
deleted file mode 100644
index a8a4c3bc3d..0000000000
--- a/docs/reference/utility-apis/SessionStateApi.md
+++ /dev/null
@@ -1,119 +0,0 @@
-# SessionStateApi
-
-The SessionStateApi type is defined at
-[packages/core-api/src/apis/definitions/auth.ts:201](https://github.com/backstage/backstage/blob/82d329555c16af46db9b4e5cd2f44a3cc006a52e/packages/core-api/src/apis/definitions/auth.ts#L201).
-
-The following Utility APIs implement this type:
-
-- [auth0AuthApiRef](./README.md#auth0auth)
-
-- [githubAuthApiRef](./README.md#githubauth)
-
-- [gitlabAuthApiRef](./README.md#gitlabauth)
-
-- [googleAuthApiRef](./README.md#googleauth)
-
-- [microsoftAuthApiRef](./README.md#microsoftauth)
-
-- [oauth2ApiRef](./README.md#oauth2)
-
-- [oktaAuthApiRef](./README.md#oktaauth)
-
-## Members
-
-### sessionState\$()
-
-<pre>
-sessionState$(): <a href="#observable">Observable</a>&lt;<a href="#sessionstate">SessionState</a>&gt;
-</pre>
-
-## Supporting types
-
-These types are part of the API declaration, but may not be unique to this API.
-
-### Observable
-
-Observable sequence of values and errors, see TC39.
-
-https://github.com/tc39/proposal-observable
-
-This is used as a common return type for observable values and can be created
-using many different observable implementations, such as zen-observable or
-RxJS 5.
-
-<pre>
-export type Observable&lt;T&gt; = {
-  /**
-   * Subscribes to this observable to start receiving new values.
-   */
-  subscribe(observer: <a href="#observer">Observer</a>&lt;T&gt;): <a href="#subscription">Subscription</a>;
-  subscribe(
-    onNext: (value: T) =&gt; void,
-    onError?: (error: Error) =&gt; void,
-    onComplete?: () =&gt; void,
-  ): <a href="#subscription">Subscription</a>;
-}
-</pre>
-
-Defined at
-[packages/core-api/src/types.ts:53](https://github.com/backstage/backstage/blob/82d329555c16af46db9b4e5cd2f44a3cc006a52e/packages/core-api/src/types.ts#L53).
-
-Referenced by: [sessionState\$](#sessionstate).
-
-### Observer
-
-This file contains non-react related core types used through Backstage.
-
-Observer interface for consuming an Observer, see TC39.
-
-<pre>
-export type Observer&lt;T&gt; = {
-  next?(value: T): void;
-  error?(error: Error): void;
-  complete?(): void;
-}
-</pre>
-
-Defined at
-[packages/core-api/src/types.ts:24](https://github.com/backstage/backstage/blob/82d329555c16af46db9b4e5cd2f44a3cc006a52e/packages/core-api/src/types.ts#L24).
-
-Referenced by: [Observable](#observable).
-
-### SessionState
-
-Session state values passed to subscribers of the SessionStateApi.
-
-<pre>
-export enum SessionState {
-  SignedIn = 'SignedIn',
-  SignedOut = 'SignedOut',
-}
-</pre>
-
-Defined at
-[packages/core-api/src/apis/definitions/auth.ts:192](https://github.com/backstage/backstage/blob/82d329555c16af46db9b4e5cd2f44a3cc006a52e/packages/core-api/src/apis/definitions/auth.ts#L192).
-
-Referenced by: [sessionState\$](#sessionstate).
-
-### Subscription
-
-Subscription returned when subscribing to an Observable, see TC39.
-
-<pre>
-export type Subscription = {
-  /**
-   * Cancels the subscription
-   */
-  unsubscribe(): void;
-
-  /**
-   * Value indicating whether the subscription is closed.
-   */
-  readonly closed: Boolean;
-}
-</pre>
-
-Defined at
-[packages/core-api/src/types.ts:33](https://github.com/backstage/backstage/blob/82d329555c16af46db9b4e5cd2f44a3cc006a52e/packages/core-api/src/types.ts#L33).
-
-Referenced by: [Observable](#observable).
diff --git a/docs/reference/utility-apis/StorageApi.md b/docs/reference/utility-apis/StorageApi.md
deleted file mode 100644
index 3247d28f60..0000000000
--- a/docs/reference/utility-apis/StorageApi.md
+++ /dev/null
@@ -1,186 +0,0 @@
-# StorageApi
-
-The StorageApi type is defined at
-[packages/core-api/src/apis/definitions/StorageApi.ts:31](https://github.com/backstage/backstage/blob/a4dbd8353cfa4d4d4334473e2c33afcda64e130d/packages/core-api/src/apis/definitions/StorageApi.ts#L31).
-
-The following Utility API implements this type:
-[storageApiRef](./README.md#storage)
-
-## Members
-
-### forBucket()
-
-Create a bucket to store data in.
-
-<pre>
-forBucket(name: string): <a href="#storageapi">StorageApi</a>
-</pre>
-
-### get()
-
-Get the current value for persistent data, use observe\$ to be notified of
-updates.
-
-<pre>
-get&lt;T&gt;(key: string): T | undefined
-</pre>
-
-### remove()
-
-Remove persistent data.
-
-<pre>
-remove(key: string): Promise&lt;void&gt;
-</pre>
-
-### set()
-
-Save persistent data, and emit messages to anyone that is using observe\$ for
-this key
-
-<pre>
-set(key: string, data: any): Promise&lt;void&gt;
-</pre>
-
-### observe\$()
-
-Observe changes on a particular key in the bucket
-
-<pre>
-observe$&lt;T&gt;(key: string): <a href="#observable">Observable</a>&lt;<a href="#storagevaluechange">StorageValueChange</a>&lt;T&gt;&gt;
-</pre>
-
-## Supporting types
-
-These types are part of the API declaration, but may not be unique to this API.
-
-### Observable
-
-Observable sequence of values and errors, see TC39.
-
-https://github.com/tc39/proposal-observable
-
-This is used as a common return type for observable values and can be created
-using many different observable implementations, such as zen-observable or
-RxJS 5.
-
-<pre>
-export type Observable&lt;T&gt; = {
-  /**
-   * Subscribes to this observable to start receiving new values.
-   */
-  subscribe(observer: <a href="#observer">Observer</a>&lt;T&gt;): <a href="#subscription">Subscription</a>;
-  subscribe(
-    onNext: (value: T) =&gt; void,
-    onError?: (error: Error) =&gt; void,
-    onComplete?: () =&gt; void,
-  ): <a href="#subscription">Subscription</a>;
-}
-</pre>
-
-Defined at
-[packages/core-api/src/types.ts:53](https://github.com/backstage/backstage/blob/a4dbd8353cfa4d4d4334473e2c33afcda64e130d/packages/core-api/src/types.ts#L53).
-
-Referenced by: [observe\$](#observe), [StorageApi](#storageapi).
-
-### Observer
-
-This file contains non-react related core types used throughout Backstage.
-
-Observer interface for consuming an Observer, see TC39.
-
-<pre>
-export type Observer&lt;T&gt; = {
-  next?(value: T): void;
-  error?(error: Error): void;
-  complete?(): void;
-}
-</pre>
-
-Defined at
-[packages/core-api/src/types.ts:24](https://github.com/backstage/backstage/blob/a4dbd8353cfa4d4d4334473e2c33afcda64e130d/packages/core-api/src/types.ts#L24).
-
-Referenced by: [Observable](#observable).
-
-### StorageApi
-
-<pre>
-export interface StorageApi {
-  /**
-   * Create a bucket to store data in.
-   * @param {String} name Namespace for the storage to be stored under,
-   *                      will inherit previous namespaces too
-   */
-  forBucket(name: string): StorageApi;
-
-  /**
-   * Get the current value for persistent data, use observe$ to be notified of updates.
-   *
-   * @param {String} key Unique key associated with the data.
-   * @return {Object} data The data that should is stored.
-   */
-  get&lt;T&gt;(key: string): T | undefined;
-
-  /**
-   * Remove persistent data.
-   *
-   * @param {String} key Unique key associated with the data.
-   */
-  remove(key: string): Promise&lt;void&gt;;
-
-  /**
-   * Save persistent data, and emit messages to anyone that is using observe$ for this key
-   *
-   * @param {String} key Unique key associated with the data.
-   */
-  set(key: string, data: any): Promise&lt;void&gt;;
-
-  /**
-   * Observe changes on a particular key in the bucket
-   * @param {String} key Unique key associated with the data
-   */
-  observe$&lt;T&gt;(key: string): <a href="#observable">Observable</a>&lt;<a href="#storagevaluechange">StorageValueChange</a>&lt;T&gt;&gt;;
-}
-</pre>
-
-Defined at
-[packages/core-api/src/apis/definitions/StorageApi.ts:31](https://github.com/backstage/backstage/blob/a4dbd8353cfa4d4d4334473e2c33afcda64e130d/packages/core-api/src/apis/definitions/StorageApi.ts#L31).
-
-Referenced by: [forBucket](#forbucket).
-
-### StorageValueChange
-
-<pre>
-export type StorageValueChange&lt;T = any&gt; = {
-  key: string;
-  newValue?: T;
-}
-</pre>
-
-Defined at
-[packages/core-api/src/apis/definitions/StorageApi.ts:21](https://github.com/backstage/backstage/blob/a4dbd8353cfa4d4d4334473e2c33afcda64e130d/packages/core-api/src/apis/definitions/StorageApi.ts#L21).
-
-Referenced by: [observe\$](#observe), [StorageApi](#storageapi).
-
-### Subscription
-
-Subscription returned when subscribing to an Observable, see TC39.
-
-<pre>
-export type Subscription = {
-  /**
-   * Cancels the subscription
-   */
-  unsubscribe(): void;
-
-  /**
-   * Value indicating whether the subscription is closed.
-   */
-  readonly closed: Boolean;
-}
-</pre>
-
-Defined at
-[packages/core-api/src/types.ts:33](https://github.com/backstage/backstage/blob/a4dbd8353cfa4d4d4334473e2c33afcda64e130d/packages/core-api/src/types.ts#L33).
-
-Referenced by: [Observable](#observable).
diff --git a/lerna.json b/lerna.json
index dd2dd884eb..322929db1d 100644
--- a/lerna.json
+++ b/lerna.json
@@ -2,5 +2,5 @@
   "packages": ["packages/*", "plugins/*"],
   "npmClient": "yarn",
   "useWorkspaces": true,
-  "version": "0.1.1"
+  "version": "0.1.0"
 }
diff --git a/microsite/blog/2021-07-26-software-templates-are-now-in-beta.md b/microsite/blog/2021-07-26-software-templates-are-now-in-beta.md
new file mode 100644
index 0000000000..b646fbdb22
--- /dev/null
+++ b/microsite/blog/2021-07-26-software-templates-are-now-in-beta.md
@@ -0,0 +1,68 @@
+---
+title: Software Templates is now in Beta
+author: Ben Lambert, Spotify
+authorURL: https://github.com/benjdlambert
+authorImageURL: https://avatars.githubusercontent.com/u/3645856?v=4
+---
+
+![Software Templates in Beta](assets/21-07-26/backstage-software-templates-beta.gif)
+
+**TLDR**; At a high level, Backstage performs three main jobs: [Create, Manage, and Explore](https://backstage.io/blog/2021/05/20/adopting-backstage#three-jobs-create-manage-explore). Throughout the year, we’ve been focussed on improving the stability and scalability of these areas while enhancing the feature sets based upon requests from the community. Software Templates — which enable push-button deployments with all your standards and best practices built-in — is our first feature-complete release candidate to graduate to beta. Read on to learn how this release improves template customization and flexibility, as well as performance.
+
+<!--truncate-->
+
+Let’s rewind a little bit, around a year in fact. Backstage had been open sourced, and we released our first version of Software Templates and our Scaffolder plugin.
+
+In case you missed it, [Software Templates](https://backstage.io/blog/2020/08/05/announcing-backstage-software-templates) are part of the Create feature set, where you can set up Backstage to give your engineers the ability to spin up a new microservice, website, or any other software component with your organization’s best practices built-in, right from the start.
+
+Back when we released the first version of these templates, with the `apiVersion` `backstage.io/v1alpha1`, they were a little restrictive in what they could do. The generated repository could only have one template source and it was restricted to only being [cookiecutter](https://github.com/cookiecutter/cookiecutter) templates. And it had to fit into the three stages of templating which was `Prepare`, `Template`, and `Publish`.
+
+We [opened up for feedback](https://github.com/backstage/backstage/issues/2771) from the community knowing that this wasn’t going to be the final version, but something of a stepping stone to where we want to be in the future.
+
+And now we come to today…
+
+## Anddddd… Action(s)! 🎬
+
+Following the removal of the previously deprecated `backstage.io/v1alpha1` templates, today we’re officially announcing the beta version of Software Templates, or `backstage.io/v1beta2`.
+
+With it comes an entirely new architecture to the Software Templates functionality, and a load of new exciting features, which I’ll dig into a little deeper.
+
+### Template actions
+
+We’ve totally opened up the ability to compose your own workflows for each Template that you have registered in Software Templates. This means no restrictions on where your template skeleton is kept, and no restrictions on what your workflow should look like.
+
+Template Actions are customizable JavaScript functions that allow you to extend the capabilities of the Software Templates by adding your own business logic or reusing some of our Built-In actions.
+
+![New template syntax with actions](assets/21-07-26/example-template-code.png)
+
+_An example of the new template syntax with steps and parameters_
+
+The workflow for Software Templates are now step-based, and each Software Template can have a customizable amount of steps which will in turn call these new actions.
+
+![New steps being rendered in the frontend](assets/21-07-26/steps-running.gif)
+
+_An example of a Template with customizable steps_
+
+These actions are very heavily inspired by GitHub Actions and GitHub Workflows, and we’ve given back a lot of control to the template authors so they can build the boilerplate and push the code however they want.
+
+### Custom UI extensions
+
+A large part of the Software Templates feature is the form that we use to collect user input which is then passed on to these new actions. Sometimes, it makes sense that Template Authors want to provide their own React components which can be rendered in the frontend to maybe do some more complex things like calling internal APIs to provide autocomplete.
+
+This is now possible with the new `ScaffolderFieldExtensions`.
+
+![Custom UI extensions](assets/21-07-26/custom-components.gif)
+
+_An example of `ScaffolderFieldExtension` is the `OwnerPicker` component which can automatically add options and suggest typeahead with data from an async API request_
+
+Template Authors can create their own components to provide data to the custom actions in any way you see fit, and even override our own built in ones too like the `RepoUrlPicker`.
+
+### Horizontal scalability
+
+The Scaffolder Service and Software Templates are now horizontally scalable, coordinating work between your deployed backend machines. This means now that the number of instances of the `@backstage/plugin-scaffolder-backend` plugin you have, is the same amount of jobs that you can have in parallel. This ensures that your tasks are handled quickly and reliably, while providing great feedback in the process.
+
+## Try out the new templates
+
+We’re still on the journey to making the Software Templates a great user experience for both authors and developers — but we’re not done yet, so watch this space for new exciting features to come!
+
+In the meantime, make sure to visit the documentation for [building templates](https://backstage.io/docs/features/software-templates/adding-templates) or creating your own [custom actions](https://backstage.io/docs/features/software-templates/writing-custom-actions).
diff --git a/microsite/blog/assets/21-07-26/backstage-software-templates-beta.gif b/microsite/blog/assets/21-07-26/backstage-software-templates-beta.gif
new file mode 100644
index 0000000000..f67113f44c
Binary files /dev/null and b/microsite/blog/assets/21-07-26/backstage-software-templates-beta.gif differ
diff --git a/microsite/blog/assets/21-07-26/custom-components.gif b/microsite/blog/assets/21-07-26/custom-components.gif
new file mode 100644
index 0000000000..d9c78db33f
Binary files /dev/null and b/microsite/blog/assets/21-07-26/custom-components.gif differ
diff --git a/microsite/blog/assets/21-07-26/example-template-code.png b/microsite/blog/assets/21-07-26/example-template-code.png
new file mode 100644
index 0000000000..1205adf657
Binary files /dev/null and b/microsite/blog/assets/21-07-26/example-template-code.png differ
diff --git a/microsite/blog/assets/21-07-26/steps-running.gif b/microsite/blog/assets/21-07-26/steps-running.gif
new file mode 100644
index 0000000000..d824464bac
Binary files /dev/null and b/microsite/blog/assets/21-07-26/steps-running.gif differ
diff --git a/microsite/core/Footer.js b/microsite/core/Footer.js
index 8e69b7ff6f..1ea591b1d5 100644
--- a/microsite/core/Footer.js
+++ b/microsite/core/Footer.js
@@ -44,6 +44,10 @@ class Footer extends React.Component {
             <a href="https://github.com/backstage/backstage/blob/master/CONTRIBUTING.md">
               Contributing
             </a>
+            <a href="https://backstage.spotify.com">Adopting</a>
+            <a href="https://github.com/backstage/community">
+              Community Sessions
+            </a>
             <a href="https://mailchi.mp/spotify/backstage-community">
               Subscribe to our newsletter
             </a>
diff --git a/microsite/data/plugins/allure.yaml b/microsite/data/plugins/allure.yaml
new file mode 100644
index 0000000000..defa7158c0
--- /dev/null
+++ b/microsite/data/plugins/allure.yaml
@@ -0,0 +1,9 @@
+---
+title: Allure Reports
+author: Deepak Bhardwaj
+authorUrl: https://github.com/deepak-bhardwaj-ps
+category: Reporting
+description: View Allure reports for your components in Backstage.
+documentation: https://github.com/backstage/backstage/tree/master/plugins/allure
+iconUrl: https://avatars.githubusercontent.com/u/5879127
+npmPackageName: '@backstage/plugin-allure'
diff --git a/microsite/data/plugins/aws-cloudformation.yaml b/microsite/data/plugins/aws-cloudformation.yaml
new file mode 100644
index 0000000000..7f0feee143
--- /dev/null
+++ b/microsite/data/plugins/aws-cloudformation.yaml
@@ -0,0 +1,9 @@
+---
+title: AWS CloudFormation
+author: Purple Technology
+authorUrl: https://blog.purple-technology.com
+category: Infrastructure
+description: Load Backstage entities from AWS CloudFormation stacks
+documentation: https://github.com/purple-technology/backstage-aws-cloudformation-plugin#readme
+iconUrl: https://raw.githubusercontent.com/purple-technology/backstage-aws-cloudformation-plugin/master/docs/cloudformation-logo.png
+npmPackageName: 'backstage-aws-cloudformation-plugin'
diff --git a/microsite/data/plugins/firehydrant.yaml b/microsite/data/plugins/firehydrant.yaml
new file mode 100644
index 0000000000..e4dd5e7416
--- /dev/null
+++ b/microsite/data/plugins/firehydrant.yaml
@@ -0,0 +1,9 @@
+---
+title: FireHydrant
+author: FireHydrant
+authorUrl: https://firehydrant.io/
+category: Incident Management
+description: View service incidents information from FireHydrant, such as active incidents and incident metrics, directly within Backstage.
+documentation: https://github.com/backstage/backstage/blob/master/plugins/firehydrant/README.md
+iconUrl: https://raw.githubusercontent.com/backstage/backstage/master/plugins/firehydrant/doc/firehydrant_logo.png
+npmPackageName: '@backstage/plugin-firehydrant'
diff --git a/microsite/data/plugins/gitlab.yaml b/microsite/data/plugins/gitlab.yaml
new file mode 100644
index 0000000000..7a5493c7f4
--- /dev/null
+++ b/microsite/data/plugins/gitlab.yaml
@@ -0,0 +1,12 @@
+---
+title: GitLab
+author: Loblaw
+authorUrl: https://github.com/loblaw-sre/backstage-plugin-gitlab
+category: CI/CD
+description: View GitLab pipelines, merge requests, languages and contributors.
+documentation: https://github.com/loblaw-sre/backstage-plugin-gitlab
+iconUrl: https://about.gitlab.com/images/press/logo/png/gitlab-icon-rgb.png
+npmPackageName: '@loblaw/backstage-plugin-gitlab'
+tags:
+  - ci
+  - cd
diff --git a/microsite/data/plugins/home.yaml b/microsite/data/plugins/home.yaml
new file mode 100644
index 0000000000..e37b8c5e03
--- /dev/null
+++ b/microsite/data/plugins/home.yaml
@@ -0,0 +1,9 @@
+---
+title: Home
+author: Spotify
+authorUrl: https://github.com/spotify
+category: Discovery
+description: This plugin provides a composable home page, and ability to create home page components
+documentation: https://github.com/backstage/backstage/blob/master/plugins/home/README.md
+iconUrl: img/home.png
+npmPackageName: '@backstage/plugin-home'
diff --git a/microsite/data/plugins/xcmetrics.yaml b/microsite/data/plugins/xcmetrics.yaml
new file mode 100644
index 0000000000..f2f4f7c013
--- /dev/null
+++ b/microsite/data/plugins/xcmetrics.yaml
@@ -0,0 +1,9 @@
+---
+title: XCMetrics
+author: Spotify
+authorUrl: https://github.com/spotify
+category: Monitoring
+description: Discover valuable insights hiding inside Xcode’s build logs.
+documentation: https://xcmetrics.io/
+iconUrl: img/xcmetrics-icon.png
+npmPackageName: '@backstage/plugin-xcmetrics'
diff --git a/microsite/package.json b/microsite/package.json
index eee549fb70..b3048612a7 100644
--- a/microsite/package.json
+++ b/microsite/package.json
@@ -16,10 +16,10 @@
     "lock:check": "yarn-lock-check"
   },
   "devDependencies": {
-    "@spotify/prettier-config": "^10.0.0",
+    "@spotify/prettier-config": "^11.0.0",
     "docusaurus": "^2.0.0-alpha.70",
     "js-yaml": "^4.1.0",
-    "prettier": "^2.3.2",
+    "prettier": "^2.4.0",
     "yarn-lock-check": "^1.0.5"
   },
   "prettier": "@spotify/prettier-config"
diff --git a/microsite/pages/en/index.js b/microsite/pages/en/index.js
index d7325bb234..ec80bbc01f 100644
--- a/microsite/pages/en/index.js
+++ b/microsite/pages/en/index.js
@@ -212,9 +212,9 @@ class Index extends React.Component {
                 Backstage Software Templates{' '}
                 <a
                   title="Submit feedback for this feature. Click to learn more about this release."
-                  href="https://backstage.io/blog/2020/08/05/announcing-backstage-software-templates"
+                  href="https://backstage.io/blog/2021/07/26/software-templates-are-now-in-beta"
                 >
-                  (alpha)
+                  (beta)
                 </a>
               </Block.Subtitle>
               <Block.Title small>Standards can set you free</Block.Title>
@@ -292,7 +292,7 @@ class Index extends React.Component {
             Build your own software templates
           </ActionBlock.Title>
           <ActionBlock.Link
-            href={`https://github.com/backstage/backstage/blob/master/docs/features/software-templates/index.md`}
+            href={`https://backstage.io/docs/features/software-templates`}
           >
             Contribute
           </ActionBlock.Link>
diff --git a/microsite/scripts/verify-sidebars.js b/microsite/scripts/verify-sidebars.js
index 8d643b15a2..301a1cb4c0 100755
--- a/microsite/scripts/verify-sidebars.js
+++ b/microsite/scripts/verify-sidebars.js
@@ -28,15 +28,18 @@ try {
 }
 
 const errors = [];
-const ids = Object.keys(metadata);
-for (let id of ids) {
+
+// reference/index is generated, so make sure this goes through even if it's not there
+const knownIds = new Set([...Object.keys(metadata), 'reference/index']);
+
+for (const id in metadata) {
   const { next, previous } = metadata[id];
 
-  if (next && !ids.includes(next)) {
+  if (next && !knownIds.has(next)) {
     errors.push(`Next ${next} does not exist in ${id}.`);
   }
 
-  if (previous && !ids.includes(previous)) {
+  if (previous && !knownIds.has(previous)) {
     errors.push(`Previous ${previous} does not exist in ${id}.`);
   }
 }
diff --git a/microsite/sidebars.json b/microsite/sidebars.json
index 5999524073..d0d77e9b59 100644
--- a/microsite/sidebars.json
+++ b/microsite/sidebars.json
@@ -36,6 +36,7 @@
         "label": "Software Catalog",
         "ids": [
           "features/software-catalog/software-catalog-overview",
+          "features/software-catalog/life-of-an-entity",
           "features/software-catalog/configuration",
           "features/software-catalog/system-model",
           "features/software-catalog/descriptor-format",
@@ -80,7 +81,8 @@
           "features/search/search-overview",
           "features/search/getting-started",
           "features/search/concepts",
-          "features/search/architecture"
+          "features/search/architecture",
+          "features/search/search-engines"
         ]
       },
       {
@@ -103,6 +105,11 @@
     ],
     "Integrations": [
       "integrations/index",
+      {
+        "type": "subcategory",
+        "label": "AWS S3",
+        "ids": ["integrations/aws-s3/locations"]
+      },
       {
         "type": "subcategory",
         "label": "Azure",
@@ -227,21 +234,16 @@
       "dls/contributing-to-storybook",
       "dls/figma"
     ],
-    "API references": [
+    "API Reference": [
       {
         "type": "subcategory",
-        "label": "TypeScript API",
-        "ids": [
-          "api/utility-apis",
-          "reference/utility-apis/README",
-          "reference/createPlugin",
-          "reference/createPlugin-feature-flags"
-        ]
+        "label": "Guides",
+        "ids": ["api/utility-apis"]
       },
       {
         "type": "subcategory",
-        "label": "Backend APIs",
-        "ids": ["api/backend"]
+        "label": "API Reference",
+        "ids": ["reference/index"]
       }
     ],
     "Tutorials": [
diff --git a/microsite/static/css/custom.css b/microsite/static/css/custom.css
index 2c8b46ff00..393a5af118 100644
--- a/microsite/static/css/custom.css
+++ b/microsite/static/css/custom.css
@@ -288,6 +288,16 @@ td {
   .tocToggler {
     display: none;
   }
+
+  .docsSliderActive .toc section .navGroups {
+    padding-top: 0;
+    padding-bottom: 0;
+  }
+
+  .docsSliderActive.docsNavContainer {
+    background-color: #121212;
+    padding-bottom: 0;
+  }
 }
 
 /* content */
diff --git a/microsite/static/img/backstage-k8s.svg b/microsite/static/img/backstage-k8s.svg
index 2796a396e7..28b6ef8f92 100644
--- a/microsite/static/img/backstage-k8s.svg
+++ b/microsite/static/img/backstage-k8s.svg
@@ -1 +1 @@
-<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" width="250" height="250" viewBox="0 0 250 250"><defs><style>.cls-1{fill:none;stroke:#7df3e1;stroke-linejoin:round;stroke-width:2.5px;}</style></defs><polyline class="cls-1" points="79.08 24.38 79.08 218.83 79.08 245.06"/><polyline class="cls-1" points="63.67 235.75 63.67 209.52 63.67 24.38"/><path class="cls-1" d="M189.83,220h0l0,0Z"/><path class="cls-1" d="M145.5,88.07c-16.61-12.31-5.42-21.25-22-33.56s-27.8-3.37-44.4-15.68v116.3c16.6,12.31,27.79,3.37,44.4,15.68s5.41,21.25,22,33.56,27.76,3.38,44.33,15.63l0-116.27C173.28,91.43,162.09,100.37,145.5,88.07Z"/><path class="cls-1" d="M137.72,124.67V108a23.2,23.2,0,0,0-16.43,6.8l11.82,11.82A6.5,6.5,0,0,1,137.72,124.67Z"/><path class="cls-1" d="M144.24,131.19H161a23.15,23.15,0,0,0-6.81-16.43l-11.82,11.82A6.5,6.5,0,0,1,144.24,131.19Z"/><path class="cls-1" d="M133.11,126.58l-11.82-11.82a23.18,23.18,0,0,0-6.8,16.43H131.2A6.5,6.5,0,0,1,133.11,126.58Z"/><path class="cls-1" d="M142.33,126.58l11.82-11.82a23.16,23.16,0,0,0-16.43-6.8v16.71A6.5,6.5,0,0,1,142.33,126.58Z"/><path class="cls-1" d="M131.2,131.19H114.49a23.16,23.16,0,0,0,6.8,16.43l11.82-11.82A6.5,6.5,0,0,1,131.2,131.19Z"/><path class="cls-1" d="M137.72,137.71v16.72a23.13,23.13,0,0,0,16.43-6.81L142.33,135.8A6.5,6.5,0,0,1,137.72,137.71Z"/><path class="cls-1" d="M161,131.19H144.24a6.5,6.5,0,0,1-1.91,4.61l11.82,11.82A23.13,23.13,0,0,0,161,131.19Z"/><path class="cls-1" d="M133.11,135.8l-11.82,11.82a23.17,23.17,0,0,0,16.43,6.81V137.71A6.5,6.5,0,0,1,133.11,135.8Z"/><path class="cls-1" d="M82.63,16.19a11.26,11.26,0,1,0-19,8.19h0a11.23,11.23,0,0,0,15.41,0h0A11.21,11.21,0,0,0,82.63,16.19Z"/><line class="cls-1" x1="154.15" y1="147.62" x2="161.15" y2="154.62"/><line class="cls-1" x1="160.96" y1="131.19" x2="170.85" y2="131.19"/><line class="cls-1" x1="154.15" y1="114.76" x2="161.15" y2="107.77"/><line class="cls-1" x1="137.72" y1="107.96" x2="137.72" y2="98.06"/><line class="cls-1" x1="121.29" y1="114.76" x2="114.3" y2="107.77"/><line class="cls-1" x1="114.49" y1="131.19" x2="104.6" y2="131.19"/><line class="cls-1" x1="121.29" y1="147.62" x2="114.3" y2="154.62"/><line class="cls-1" x1="137.72" y1="154.43" x2="137.72" y2="164.32"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" id="Layer_1" width="250" height="250" data-name="Layer 1" viewBox="0 0 250 250"><defs><style>.cls-1{fill:none;stroke:#7df3e1;stroke-linejoin:round;stroke-width:2.5px}</style></defs><polyline points="79.08 24.38 79.08 218.83 79.08 245.06" class="cls-1"/><polyline points="63.67 235.75 63.67 209.52 63.67 24.38" class="cls-1"/><path d="M189.83,220h0l0,0Z" class="cls-1"/><path d="M145.5,88.07c-16.61-12.31-5.42-21.25-22-33.56s-27.8-3.37-44.4-15.68v116.3c16.6,12.31,27.79,3.37,44.4,15.68s5.41,21.25,22,33.56,27.76,3.38,44.33,15.63l0-116.27C173.28,91.43,162.09,100.37,145.5,88.07Z" class="cls-1"/><path d="M137.72,124.67V108a23.2,23.2,0,0,0-16.43,6.8l11.82,11.82A6.5,6.5,0,0,1,137.72,124.67Z" class="cls-1"/><path d="M144.24,131.19H161a23.15,23.15,0,0,0-6.81-16.43l-11.82,11.82A6.5,6.5,0,0,1,144.24,131.19Z" class="cls-1"/><path d="M133.11,126.58l-11.82-11.82a23.18,23.18,0,0,0-6.8,16.43H131.2A6.5,6.5,0,0,1,133.11,126.58Z" class="cls-1"/><path d="M142.33,126.58l11.82-11.82a23.16,23.16,0,0,0-16.43-6.8v16.71A6.5,6.5,0,0,1,142.33,126.58Z" class="cls-1"/><path d="M131.2,131.19H114.49a23.16,23.16,0,0,0,6.8,16.43l11.82-11.82A6.5,6.5,0,0,1,131.2,131.19Z" class="cls-1"/><path d="M137.72,137.71v16.72a23.13,23.13,0,0,0,16.43-6.81L142.33,135.8A6.5,6.5,0,0,1,137.72,137.71Z" class="cls-1"/><path d="M161,131.19H144.24a6.5,6.5,0,0,1-1.91,4.61l11.82,11.82A23.13,23.13,0,0,0,161,131.19Z" class="cls-1"/><path d="M133.11,135.8l-11.82,11.82a23.17,23.17,0,0,0,16.43,6.81V137.71A6.5,6.5,0,0,1,133.11,135.8Z" class="cls-1"/><path d="M82.63,16.19a11.26,11.26,0,1,0-19,8.19h0a11.23,11.23,0,0,0,15.41,0h0A11.21,11.21,0,0,0,82.63,16.19Z" class="cls-1"/><line x1="154.15" x2="161.15" y1="147.62" y2="154.62" class="cls-1"/><line x1="160.96" x2="170.85" y1="131.19" y2="131.19" class="cls-1"/><line x1="154.15" x2="161.15" y1="114.76" y2="107.77" class="cls-1"/><line x1="137.72" x2="137.72" y1="107.96" y2="98.06" class="cls-1"/><line x1="121.29" x2="114.3" y1="114.76" y2="107.77" class="cls-1"/><line x1="114.49" x2="104.6" y1="131.19" y2="131.19" class="cls-1"/><line x1="121.29" x2="114.3" y1="147.62" y2="154.62" class="cls-1"/><line x1="137.72" x2="137.72" y1="154.43" y2="164.32" class="cls-1"/></svg>
\ No newline at end of file
diff --git a/microsite/static/img/backstage-software-catalog.svg b/microsite/static/img/backstage-software-catalog.svg
index 101439497b..5cad498d35 100644
--- a/microsite/static/img/backstage-software-catalog.svg
+++ b/microsite/static/img/backstage-software-catalog.svg
@@ -1 +1 @@
-<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" width="250" height="250" viewBox="0 0 250 250"><defs><style>.cls-1,.cls-2,.cls-3{fill:none;stroke:#7df3e1;stroke-width:2.5px;}.cls-1{stroke-linecap:round;}.cls-1,.cls-3{stroke-linejoin:round;}.cls-2{stroke-miterlimit:10;}</style></defs><path class="cls-1" d="M22.08,87.32c-1.64-3.26-2-6.12-1-8.45C24.64,70.6,45,70.7,73.39,77.6"/><circle class="cls-2" cx="31.13" cy="100.9" r="15.94"/><path class="cls-1" d="M88,136.33c-17.15-8.82-32-17.87-43.33-26.3"/><path class="cls-1" d="M198.45,131.52c25,16.22,39.43,31.24,35.81,39.61-4.72,10.91-38.57,7.26-81.64-7.33"/><path class="cls-1" d="M91.39,129.7C49,85.89,23.62,45.42,33.42,35.14c6.72-7,28.38,1.71,56.08,20.9"/><path class="cls-1" d="M193,153c23.35,29.29,36,54.36,28.87,61.87-8.5,8.92-40.94-7.48-79.25-38.28"/><path class="cls-3" d="M128.76,182.48c20.74,32.14,40.49,51.49,50,46.81"/><path class="cls-3" d="M76.52,20.71C64.08,26.81,73.27,71.5,96.9,123.56"/><circle class="cls-2" cx="111.23" cy="46.18" r="23.7"/><path class="cls-3" d="M133.76,53.58a71,71,0,1,1-39.92,8.47"/><path class="cls-3" d="M128.76,182.48c20.74,32.14,40.49,51.49,50,46.81,8.24-4,7-25-1.67-53.87"/><path class="cls-3" d="M95.51,28.62c-7.92-7.07-14.56-10.08-19-7.91C64.08,26.81,73.27,71.5,96.9,123.56"/><circle class="cls-2" cx="120.99" cy="148.62" r="34.89"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" id="Layer_1" width="250" height="250" data-name="Layer 1" viewBox="0 0 250 250"><defs><style>.cls-1,.cls-2,.cls-3{fill:none;stroke:#7df3e1;stroke-width:2.5px}.cls-1{stroke-linecap:round}.cls-1,.cls-3{stroke-linejoin:round}.cls-2{stroke-miterlimit:10}</style></defs><path d="M22.08,87.32c-1.64-3.26-2-6.12-1-8.45C24.64,70.6,45,70.7,73.39,77.6" class="cls-1"/><circle cx="31.13" cy="100.9" r="15.94" class="cls-2"/><path d="M88,136.33c-17.15-8.82-32-17.87-43.33-26.3" class="cls-1"/><path d="M198.45,131.52c25,16.22,39.43,31.24,35.81,39.61-4.72,10.91-38.57,7.26-81.64-7.33" class="cls-1"/><path d="M91.39,129.7C49,85.89,23.62,45.42,33.42,35.14c6.72-7,28.38,1.71,56.08,20.9" class="cls-1"/><path d="M193,153c23.35,29.29,36,54.36,28.87,61.87-8.5,8.92-40.94-7.48-79.25-38.28" class="cls-1"/><path d="M128.76,182.48c20.74,32.14,40.49,51.49,50,46.81" class="cls-3"/><path d="M76.52,20.71C64.08,26.81,73.27,71.5,96.9,123.56" class="cls-3"/><circle cx="111.23" cy="46.18" r="23.7" class="cls-2"/><path d="M133.76,53.58a71,71,0,1,1-39.92,8.47" class="cls-3"/><path d="M128.76,182.48c20.74,32.14,40.49,51.49,50,46.81,8.24-4,7-25-1.67-53.87" class="cls-3"/><path d="M95.51,28.62c-7.92-7.07-14.56-10.08-19-7.91C64.08,26.81,73.27,71.5,96.9,123.56" class="cls-3"/><circle cx="120.99" cy="148.62" r="34.89" class="cls-2"/></svg>
\ No newline at end of file
diff --git a/microsite/static/img/backstage-software-templates.svg b/microsite/static/img/backstage-software-templates.svg
index 3984cd2870..e64428de82 100644
--- a/microsite/static/img/backstage-software-templates.svg
+++ b/microsite/static/img/backstage-software-templates.svg
@@ -1 +1 @@
-<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" width="250" height="250" viewBox="0 0 250 250"><defs><style>.cls-1{fill:none;stroke:#7df3e1;stroke-linejoin:round;stroke-width:2.5px;}</style></defs><path class="cls-1" d="M157.82,203.89a5.28,5.28,0,0,1-.67,3.09c-3.75,6.21-21.45,2.39-39.54-8.53C101.87,189,91,177.23,90.93,170.25c-7.27-.67-12.6.66-14.77,4.26-5.58,9.25,11.76,29.94,38.74,46.21s53.36,22,58.94,12.72C177.61,227.18,170.9,215.7,157.82,203.89Z"/><path class="cls-1" d="M157.82,203.89c-.3-5.42-6.78-13.52-16.86-21.24,0,0,0,.09-.05.13C139,185.93,130,184,120.77,178.43c-6.92-4.17-12-9.2-13.27-12.78-7.89-2-13.88-1.51-15.88,1.81a5.24,5.24,0,0,0-.69,2.79"/><path class="cls-1" d="M90.93,170.25c.09,7,10.94,18.71,26.68,28.2,18.09,10.92,35.79,14.74,39.54,8.53a5.28,5.28,0,0,0,.67-3.09"/><path class="cls-1" d="M141,182.65c1.69-3.22-4.19-10.17-13.28-15.66s-18.23-7.5-20.14-4.34a3.49,3.49,0,0,0,0,3"/><path class="cls-1" d="M107.5,165.65c1.29,3.58,6.35,8.61,13.27,12.78,9.22,5.56,18.23,7.5,20.14,4.35,0,0,0-.09.05-.13"/><path class="cls-1" d="M117.79,126a6.09,6.09,0,0,0,0,2.58l6.36,27,7.2-21.89a9.86,9.86,0,0,0,.45-4.26"/><path class="cls-1" d="M154.88,109V75.86a82.39,82.39,0,0,0-28-61.9l-2.08-1.83A45.42,45.42,0,0,0,94.7,54.89V94h0c-.64,9.87,5.75,21.3,17.08,28.72a44.56,44.56,0,0,0,6,3.28,6.16,6.16,0,0,1,9.26-4.09h0a10.13,10.13,0,0,1,4.8,7.57c8.51.37,16.05-2.61,20.12-8.83a18.2,18.2,0,0,0,2.88-8.6h0v-.38A20,20,0,0,0,154.88,109Z"/><path class="cls-1" d="M131.85,129.49a10.13,10.13,0,0,0-4.8-7.57h0a6.16,6.16,0,0,0-9.26,4.09"/><path class="cls-1" d="M173.76,96.66V86.55h0c.19-3.07-1.79-6.62-5.32-8.93-4.67-3.06-10.27-2.77-12.5.64a5.58,5.58,0,0,0-.89,2.68h0V81a5.89,5.89,0,0,0,0,.84v3.26h0v21.36h0v10.11h0c-.2,3.08,1.79,6.63,5.31,8.94,4.67,3.06,10.27,2.77,12.5-.64a5.71,5.71,0,0,0,.9-2.68h0v-.12c0-.27,0-.55,0-.83V118h0V96.66Z"/><path class="cls-1" d="M94.66,59.93a5.75,5.75,0,0,0,0-.83V59h0a5.63,5.63,0,0,0-.9-2.67c-2.23-3.41-7.83-3.7-12.5-.65-3.52,2.31-5.51,5.87-5.31,8.94h0v1.19s0,.07,0,.1V93.64s0,.07,0,.1v1.19h0c-.2,3.08,1.79,6.63,5.31,8.94,4.67,3.06,10.27,2.77,12.5-.64a5.71,5.71,0,0,0,.9-2.68h0v-.12a5.75,5.75,0,0,0,0-.83V95.9h0V59.94Z"/><ellipse class="cls-1" cx="122.77" cy="62.49" rx="10.06" ry="11.36"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" id="Layer_1" width="250" height="250" data-name="Layer 1" viewBox="0 0 250 250"><defs><style>.cls-1{fill:none;stroke:#7df3e1;stroke-linejoin:round;stroke-width:2.5px}</style></defs><path d="M157.82,203.89a5.28,5.28,0,0,1-.67,3.09c-3.75,6.21-21.45,2.39-39.54-8.53C101.87,189,91,177.23,90.93,170.25c-7.27-.67-12.6.66-14.77,4.26-5.58,9.25,11.76,29.94,38.74,46.21s53.36,22,58.94,12.72C177.61,227.18,170.9,215.7,157.82,203.89Z" class="cls-1"/><path d="M157.82,203.89c-.3-5.42-6.78-13.52-16.86-21.24,0,0,0,.09-.05.13C139,185.93,130,184,120.77,178.43c-6.92-4.17-12-9.2-13.27-12.78-7.89-2-13.88-1.51-15.88,1.81a5.24,5.24,0,0,0-.69,2.79" class="cls-1"/><path d="M90.93,170.25c.09,7,10.94,18.71,26.68,28.2,18.09,10.92,35.79,14.74,39.54,8.53a5.28,5.28,0,0,0,.67-3.09" class="cls-1"/><path d="M141,182.65c1.69-3.22-4.19-10.17-13.28-15.66s-18.23-7.5-20.14-4.34a3.49,3.49,0,0,0,0,3" class="cls-1"/><path d="M107.5,165.65c1.29,3.58,6.35,8.61,13.27,12.78,9.22,5.56,18.23,7.5,20.14,4.35,0,0,0-.09.05-.13" class="cls-1"/><path d="M117.79,126a6.09,6.09,0,0,0,0,2.58l6.36,27,7.2-21.89a9.86,9.86,0,0,0,.45-4.26" class="cls-1"/><path d="M154.88,109V75.86a82.39,82.39,0,0,0-28-61.9l-2.08-1.83A45.42,45.42,0,0,0,94.7,54.89V94h0c-.64,9.87,5.75,21.3,17.08,28.72a44.56,44.56,0,0,0,6,3.28,6.16,6.16,0,0,1,9.26-4.09h0a10.13,10.13,0,0,1,4.8,7.57c8.51.37,16.05-2.61,20.12-8.83a18.2,18.2,0,0,0,2.88-8.6h0v-.38A20,20,0,0,0,154.88,109Z" class="cls-1"/><path d="M131.85,129.49a10.13,10.13,0,0,0-4.8-7.57h0a6.16,6.16,0,0,0-9.26,4.09" class="cls-1"/><path d="M173.76,96.66V86.55h0c.19-3.07-1.79-6.62-5.32-8.93-4.67-3.06-10.27-2.77-12.5.64a5.58,5.58,0,0,0-.89,2.68h0V81a5.89,5.89,0,0,0,0,.84v3.26h0v21.36h0v10.11h0c-.2,3.08,1.79,6.63,5.31,8.94,4.67,3.06,10.27,2.77,12.5-.64a5.71,5.71,0,0,0,.9-2.68h0v-.12c0-.27,0-.55,0-.83V118h0V96.66Z" class="cls-1"/><path d="M94.66,59.93a5.75,5.75,0,0,0,0-.83V59h0a5.63,5.63,0,0,0-.9-2.67c-2.23-3.41-7.83-3.7-12.5-.65-3.52,2.31-5.51,5.87-5.31,8.94h0v1.19s0,.07,0,.1V93.64s0,.07,0,.1v1.19h0c-.2,3.08,1.79,6.63,5.31,8.94,4.67,3.06,10.27,2.77,12.5-.64a5.71,5.71,0,0,0,.9-2.68h0v-.12a5.75,5.75,0,0,0,0-.83V95.9h0V59.94Z" class="cls-1"/><ellipse cx="122.77" cy="62.49" class="cls-1" rx="10.06" ry="11.36"/></svg>
\ No newline at end of file
diff --git a/microsite/static/img/backstage-techdocs.svg b/microsite/static/img/backstage-techdocs.svg
index aa9362b1bc..643cde325c 100644
--- a/microsite/static/img/backstage-techdocs.svg
+++ b/microsite/static/img/backstage-techdocs.svg
@@ -1 +1 @@
-<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" width="250" height="250" viewBox="0 0 250 250"><defs><style>.cls-1{fill:none;stroke:#7df3e1;stroke-linejoin:round;stroke-width:2.5px;}</style></defs><polygon class="cls-1" points="210.2 178.75 210.2 96.75 186.09 44.02 136.67 12.26 136.67 134.08 210.2 178.75"/><polygon class="cls-1" points="113.33 237.75 113.33 118.51 39.8 71.25 39.8 193.07 113.33 237.75"/><polyline class="cls-1" points="69.73 136.22 58.56 147.39 68.59 167.84"/><polyline class="cls-1" points="82.96 176.15 93.08 166.03 82.67 143.81"/><line class="cls-1" x1="159.63" y1="127.73" x2="122.15" y2="165.96"/><polyline class="cls-1" points="136.74 165.96 122.15 165.96 122.15 151.37"/><line class="cls-1" x1="122.15" y1="115.07" x2="159.51" y2="77.07"/><polyline class="cls-1" points="144.92 77.07 159.51 77.07 159.51 91.66"/><polygon class="cls-1" points="186.03 81.26 210.13 96.75 186.03 44.1 186.03 81.26"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" id="Layer_1" width="250" height="250" data-name="Layer 1" viewBox="0 0 250 250"><defs><style>.cls-1{fill:none;stroke:#7df3e1;stroke-linejoin:round;stroke-width:2.5px}</style></defs><polygon points="210.2 178.75 210.2 96.75 186.09 44.02 136.67 12.26 136.67 134.08 210.2 178.75" class="cls-1"/><polygon points="113.33 237.75 113.33 118.51 39.8 71.25 39.8 193.07 113.33 237.75" class="cls-1"/><polyline points="69.73 136.22 58.56 147.39 68.59 167.84" class="cls-1"/><polyline points="82.96 176.15 93.08 166.03 82.67 143.81" class="cls-1"/><line x1="159.63" x2="122.15" y1="127.73" y2="165.96" class="cls-1"/><polyline points="136.74 165.96 122.15 165.96 122.15 151.37" class="cls-1"/><line x1="122.15" x2="159.51" y1="115.07" y2="77.07" class="cls-1"/><polyline points="144.92 77.07 159.51 77.07 159.51 91.66" class="cls-1"/><polygon points="186.03 81.26 210.13 96.75 186.03 44.1 186.03 81.26" class="cls-1"/></svg>
\ No newline at end of file
diff --git a/microsite/static/img/home.png b/microsite/static/img/home.png
new file mode 100644
index 0000000000..e217581586
Binary files /dev/null and b/microsite/static/img/home.png differ
diff --git a/microsite/static/img/rails-icon.png b/microsite/static/img/rails-icon.png
index f7b8b69bd9..04f63766fe 100644
Binary files a/microsite/static/img/rails-icon.png and b/microsite/static/img/rails-icon.png differ
diff --git a/microsite/static/img/xcmetrics-icon.png b/microsite/static/img/xcmetrics-icon.png
new file mode 100644
index 0000000000..09f3ea1e68
Binary files /dev/null and b/microsite/static/img/xcmetrics-icon.png differ
diff --git a/microsite/yarn.lock b/microsite/yarn.lock
index 1da9288808..2973f364b0 100644
--- a/microsite/yarn.lock
+++ b/microsite/yarn.lock
@@ -909,10 +909,10 @@
   resolved "https://registry.npmjs.org/@sindresorhus/is/-/is-0.7.0.tgz#9a06f4f137ee84d7df0460c1fdb1135ffa6c50fd"
   integrity sha512-ONhaKPIufzzrlNbqtWFFd+jlnemX6lJAgq9ZeiZtS7I1PIf/la7CW4m83rTXRnVnsMbW2k56pGYu7AUFJD9Pow==
 
-"@spotify/prettier-config@^10.0.0":
-  version "10.0.0"
-  resolved "https://registry.npmjs.org/@spotify/prettier-config/-/prettier-config-10.0.0.tgz#fa076d98d2e7e6c53dd3d86a696307a7010bd056"
-  integrity sha512-VYOdo8P7lIScAkl02nB9KpUAuOYMManryBIBuKJkAw5D3aVtLobfmdIKvdV6MqEmGMEQPbn7w/UpnjJYhUH+IA==
+"@spotify/prettier-config@^11.0.0":
+  version "11.0.0"
+  resolved "https://registry.npmjs.org/@spotify/prettier-config/-/prettier-config-11.0.0.tgz#d91e0546a8c1c0f7299e2edc7e44306e9be210f6"
+  integrity sha512-dOI13j1uHMZkRxhZuge/ugOE7Aqcg7Nxki932lDZuXyY4G8CGxkc/66PeQ8pR4PCzThHORXo7Ptvau6bh101lQ==
 
 "@types/cheerio@^0.22.8":
   version "0.22.23"
@@ -5207,10 +5207,10 @@ prepend-http@^2.0.0:
   resolved "https://registry.npmjs.org/prepend-http/-/prepend-http-2.0.0.tgz#e92434bfa5ea8c19f41cdfd401d741a3c819d897"
   integrity sha1-6SQ0v6XqjBn0HN/UAddBo8gZ2Jc=
 
-prettier@^2.3.2:
-  version "2.3.2"
-  resolved "https://registry.npmjs.org/prettier/-/prettier-2.3.2.tgz#ef280a05ec253712e486233db5c6f23441e7342d"
-  integrity sha512-lnJzDfJ66zkMy58OL5/NY5zp70S7Nz6KqcKkXYzn2tMVrNxvbqaBpg7H3qHaLxCJ5lNMsGuM8+ohS7cZrthdLQ==
+prettier@^2.4.0:
+  version "2.4.0"
+  resolved "https://registry.npmjs.org/prettier/-/prettier-2.4.0.tgz#85bdfe0f70c3e777cf13a4ffff39713ca6f64cba"
+  integrity sha512-DsEPLY1dE5HF3BxCRBmD4uYZ+5DCbvatnolqTqcxEgKVZnL2kUfyu7b8pPQ5+hTBkdhU9SLUmK0/pHb07RE4WQ==
 
 prismjs@^1.22.0:
   version "1.23.0"
diff --git a/mkdocs.yml b/mkdocs.yml
index 4d984e63e3..3ffd4aa97d 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -33,6 +33,7 @@ nav:
   - Core Features:
       - Software Catalog:
           - Overview: 'features/software-catalog/index.md'
+          - The Life of an Entity: 'features/software-catalog/life-of-an-entity.md'
           - Catalog Configuration: 'features/software-catalog/configuration.md'
           - System Model: 'features/software-catalog/system-model.md'
           - YAML File Format: 'features/software-catalog/descriptor-format.md'
@@ -64,6 +65,7 @@ nav:
           - Getting Started: 'features/search/getting-started.md'
           - Concepts: 'features/search/concepts.md'
           - Search Architecture: 'features/search/architecture.md'
+          - Search Engines: 'features/search/search-engines.md'
       - TechDocs:
           - Overview: 'features/techdocs/README.md'
           - Getting Started: 'features/techdocs/getting-started.md'
@@ -78,6 +80,8 @@ nav:
           - FAQ: 'features/techdocs/FAQ.md'
   - Integrations:
       - Overview: 'integrations/index.md'
+      - AWS S3:
+          - Locations: 'integrations/aws-s3/locations.md'
       - Azure:
           - Locations: 'integrations/azure/locations.md'
           - Org Data: 'integrations/azure/org.md'
@@ -152,14 +156,9 @@ nav:
       - Design: 'dls/design.md'
       - Contributing to Storybook: 'dls/contributing-to-storybook.md'
       - Figma: 'dls/figma.md'
-  - API references:
-      - TypeScript API:
+  - API Reference:
+      - Guides:
           - Utility APIs: 'api/utility-apis.md'
-          - reference/utility-apis/README: 'reference/utility-apis/README.md'
-          - createPlugin: 'reference/createPlugin.md'
-          - createPlugin -feature flags: 'reference/createPlugin-feature-flags.md'
-      - Backend APIs:
-          - Backend: 'api/backend.md'
   - Tutorials:
       - Future developer journey: 'tutorials/journey.md'
       - Migrating away from @backstage/core: 'tutorials/migrating-away-from-core.md'
diff --git a/package.json b/package.json
index 93517d3374..d362338370 100644
--- a/package.json
+++ b/package.json
@@ -22,7 +22,6 @@
     "lint:docs": "node ./scripts/check-docs-quality",
     "lint:all": "lerna run lint --",
     "lint:type-deps": "node scripts/check-type-dependencies.js",
-    "docgen": "lerna run docgen",
     "docker-build": "yarn tsc && yarn workspace example-backend build --build-dependencies && yarn workspace example-backend build-image",
     "create-plugin": "backstage-cli create-plugin --scope backstage --no-private",
     "remove-plugin": "backstage-cli remove-plugin",
@@ -38,9 +37,14 @@
     "packages": [
       "packages/*",
       "plugins/*"
+    ],
+    "nohoist": [
+      "**/@storybook/**",
+      "**/@storybook"
     ]
   },
   "resolutions": {
+    "**/@graphql-codegen/cli/**/ws": "^7.4.6",
     "**/@roadiehq/**/@backstage/core": "*",
     "**/@roadiehq/**/@backstage/plugin-catalog": "*",
     "**/@roadiehq/**/@backstage/catalog-model": "*",
@@ -49,11 +53,13 @@
   },
   "version": "1.0.0",
   "dependencies": {
-    "@microsoft/api-documenter": "^7.13.30",
-    "@microsoft/api-extractor": "^7.18.1",
-    "@microsoft/api-extractor-model": "^7.13.3"
+    "@microsoft/api-documenter": "^7.13.47",
+    "@microsoft/api-extractor": "^7.18.7",
+    "@microsoft/api-extractor-model": "^7.13.5",
+    "@microsoft/tsdoc": "^0.13.2"
   },
   "devDependencies": {
+    "@types/webpack": "^5.28.0",
     "@changesets/cli": "^2.14.0",
     "@octokit/openapi-types": "^2.2.0",
     "@spotify/prettier-config": "^10.0.0",
diff --git a/packages/app/CHANGELOG.md b/packages/app/CHANGELOG.md
index cc67b78f44..9b6dc1956a 100644
--- a/packages/app/CHANGELOG.md
+++ b/packages/app/CHANGELOG.md
@@ -1,5 +1,235 @@
 # example-app
 
+## 0.2.45
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-todo@0.1.9
+  - @backstage/core-components@0.4.1
+  - @backstage/catalog-model@0.9.2
+  - @backstage/plugin-home@0.3.0
+  - @backstage/plugin-scaffolder@0.11.3
+  - @backstage/plugin-org@0.3.22
+  - @backstage/core-app-api@0.1.12
+  - @backstage/plugin-search@0.4.10
+  - @backstage/core-plugin-api@0.1.7
+  - @backstage/cli@0.7.11
+
+## 0.2.44
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-scaffolder@0.11.2
+  - @backstage/cli@0.7.10
+  - @backstage/plugin-catalog-react@0.4.5
+  - @backstage/plugin-techdocs@0.11.1
+  - @backstage/core-components@0.4.0
+  - @backstage/plugin-catalog-import@0.5.20
+  - @backstage/plugin-shortcuts@0.1.7
+  - @backstage/plugin-org@0.3.21
+  - @backstage/plugin-catalog@0.6.14
+  - @backstage/search-common@0.2.0
+  - @backstage/plugin-search@0.4.9
+  - @backstage/catalog-model@0.9.1
+  - @backstage/core-app-api@0.1.11
+  - @backstage/integration-react@0.1.8
+  - @backstage/plugin-api-docs@0.6.7
+  - @backstage/plugin-badges@0.2.8
+  - @backstage/plugin-circleci@0.2.22
+  - @backstage/plugin-cloudbuild@0.2.22
+  - @backstage/plugin-code-coverage@0.1.10
+  - @backstage/plugin-cost-insights@0.11.5
+  - @backstage/plugin-explore@0.3.15
+  - @backstage/plugin-gcp-projects@0.3.3
+  - @backstage/plugin-github-actions@0.4.17
+  - @backstage/plugin-graphiql@0.2.15
+  - @backstage/plugin-home@0.2.1
+  - @backstage/plugin-jenkins@0.5.5
+  - @backstage/plugin-kafka@0.2.14
+  - @backstage/plugin-kubernetes@0.4.12
+  - @backstage/plugin-lighthouse@0.2.24
+  - @backstage/plugin-newrelic@0.3.3
+  - @backstage/plugin-pagerduty@0.3.12
+  - @backstage/plugin-rollbar@0.3.13
+  - @backstage/plugin-sentry@0.3.20
+  - @backstage/plugin-tech-radar@0.4.6
+  - @backstage/plugin-todo@0.1.8
+  - @backstage/plugin-user-settings@0.3.4
+
+## 0.2.43
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-explore@0.3.14
+  - @backstage/core-app-api@0.1.10
+  - @backstage/plugin-catalog-import@0.5.19
+  - @backstage/plugin-catalog@0.6.13
+  - @backstage/plugin-org@0.3.20
+  - @backstage/plugin-catalog-react@0.4.4
+  - @backstage/core-components@0.3.3
+  - @backstage/plugin-techdocs@0.11.0
+  - @backstage/plugin-search@0.4.8
+
+## 0.2.42
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-scaffolder@0.11.1
+  - @backstage/plugin-home@0.2.0
+  - @backstage/cli@0.7.9
+  - @backstage/core-app-api@0.1.9
+  - @backstage/plugin-catalog-import@0.5.18
+  - @backstage/plugin-catalog@0.6.12
+  - @backstage/plugin-catalog-react@0.4.3
+  - @backstage/plugin-sentry@0.3.19
+  - @backstage/plugin-jenkins@0.5.4
+  - @backstage/core-components@0.3.2
+  - @backstage/theme@0.2.10
+
+## 0.2.41
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-cost-insights@0.11.4
+  - @backstage/plugin-github-actions@0.4.16
+  - @backstage/plugin-jenkins@0.5.3
+  - @backstage/plugin-kubernetes@0.4.11
+  - @backstage/plugin-pagerduty@0.3.11
+  - @backstage/plugin-scaffolder@0.11.0
+  - @backstage/plugin-sentry@0.3.18
+  - @backstage/plugin-techdocs@0.10.4
+  - @backstage/core-app-api@0.1.8
+  - @backstage/core-components@0.3.1
+  - @backstage/core-plugin-api@0.1.6
+  - @backstage/plugin-api-docs@0.6.6
+  - @backstage/plugin-catalog@0.6.11
+  - @backstage/plugin-catalog-import@0.5.17
+  - @backstage/plugin-catalog-react@0.4.2
+  - @backstage/plugin-explore@0.3.13
+  - @backstage/plugin-lighthouse@0.2.23
+  - @backstage/plugin-rollbar@0.3.12
+  - @backstage/plugin-search@0.4.7
+  - @backstage/plugin-tech-radar@0.4.5
+  - @backstage/cli@0.7.8
+  - @backstage/integration-react@0.1.7
+
+## 0.2.40
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/cli@0.7.7
+  - @backstage/plugin-catalog@0.6.10
+  - @backstage/core-components@0.3.0
+  - @backstage/core-plugin-api@0.1.5
+  - @backstage/plugin-api-docs@0.6.5
+  - @backstage/plugin-scaffolder@0.10.3
+  - @backstage/plugin-search@0.4.6
+  - @backstage/plugin-cost-insights@0.11.3
+  - @backstage/plugin-kubernetes@0.4.10
+  - @backstage/plugin-lighthouse@0.2.22
+  - @backstage/plugin-pagerduty@0.3.10
+  - @backstage/plugin-techdocs@0.10.3
+  - @backstage/search-common@0.1.3
+  - @backstage/core-app-api@0.1.7
+  - @backstage/integration-react@0.1.6
+  - @backstage/plugin-badges@0.2.7
+  - @backstage/plugin-catalog-import@0.5.16
+  - @backstage/plugin-catalog-react@0.4.1
+  - @backstage/plugin-circleci@0.2.21
+  - @backstage/plugin-cloudbuild@0.2.21
+  - @backstage/plugin-code-coverage@0.1.9
+  - @backstage/plugin-explore@0.3.12
+  - @backstage/plugin-gcp-projects@0.3.2
+  - @backstage/plugin-github-actions@0.4.15
+  - @backstage/plugin-graphiql@0.2.14
+  - @backstage/plugin-jenkins@0.5.2
+  - @backstage/plugin-kafka@0.2.13
+  - @backstage/plugin-newrelic@0.3.2
+  - @backstage/plugin-org@0.3.19
+  - @backstage/plugin-rollbar@0.3.11
+  - @backstage/plugin-sentry@0.3.17
+  - @backstage/plugin-shortcuts@0.1.6
+  - @backstage/plugin-tech-radar@0.4.4
+  - @backstage/plugin-todo@0.1.7
+  - @backstage/plugin-user-settings@0.3.3
+
+## 0.2.39
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-scaffolder@0.10.2
+  - @backstage/core-components@0.2.0
+  - @backstage/plugin-catalog@0.6.9
+  - @backstage/plugin-catalog-react@0.4.0
+  - @backstage/cli@0.7.6
+  - @backstage/core-app-api@0.1.6
+  - @backstage/core-plugin-api@0.1.4
+  - @backstage/integration-react@0.1.5
+  - @backstage/theme@0.2.9
+  - @backstage/plugin-api-docs@0.6.4
+  - @backstage/plugin-badges@0.2.6
+  - @backstage/plugin-catalog-import@0.5.15
+  - @backstage/plugin-circleci@0.2.20
+  - @backstage/plugin-cloudbuild@0.2.20
+  - @backstage/plugin-code-coverage@0.1.8
+  - @backstage/plugin-cost-insights@0.11.2
+  - @backstage/plugin-explore@0.3.11
+  - @backstage/plugin-gcp-projects@0.3.1
+  - @backstage/plugin-github-actions@0.4.14
+  - @backstage/plugin-graphiql@0.2.13
+  - @backstage/plugin-jenkins@0.5.1
+  - @backstage/plugin-kafka@0.2.12
+  - @backstage/plugin-kubernetes@0.4.9
+  - @backstage/plugin-lighthouse@0.2.21
+  - @backstage/plugin-newrelic@0.3.1
+  - @backstage/plugin-org@0.3.18
+  - @backstage/plugin-pagerduty@0.3.9
+  - @backstage/plugin-rollbar@0.3.10
+  - @backstage/plugin-search@0.4.5
+  - @backstage/plugin-sentry@0.3.16
+  - @backstage/plugin-shortcuts@0.1.5
+  - @backstage/plugin-tech-radar@0.4.3
+  - @backstage/plugin-techdocs@0.10.2
+  - @backstage/plugin-todo@0.1.6
+  - @backstage/plugin-user-settings@0.3.2
+
+## 0.2.37
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog@0.6.7
+  - @backstage/plugin-catalog-react@0.3.0
+  - @backstage/plugin-scaffolder@0.10.1
+  - @backstage/plugin-techdocs@0.10.0
+  - @backstage/plugin-jenkins@0.5.0
+  - @backstage/plugin-user-settings@0.3.0
+  - @backstage/plugin-search@0.4.3
+  - @backstage/cli@0.7.4
+  - @backstage/plugin-api-docs@0.6.2
+  - @backstage/plugin-badges@0.2.5
+  - @backstage/plugin-catalog-import@0.5.13
+  - @backstage/plugin-circleci@0.2.19
+  - @backstage/plugin-cloudbuild@0.2.19
+  - @backstage/plugin-code-coverage@0.1.7
+  - @backstage/plugin-explore@0.3.10
+  - @backstage/plugin-github-actions@0.4.13
+  - @backstage/plugin-kafka@0.2.11
+  - @backstage/plugin-kubernetes@0.4.8
+  - @backstage/plugin-lighthouse@0.2.20
+  - @backstage/plugin-org@0.3.17
+  - @backstage/plugin-pagerduty@0.3.8
+  - @backstage/plugin-rollbar@0.3.9
+  - @backstage/plugin-sentry@0.3.15
+  - @backstage/plugin-todo@0.1.5
+
 ## 0.2.36
 
 ### Patch Changes
diff --git a/packages/app/cypress/integration/components/search/SearchPage.js b/packages/app/cypress/integration/components/search/SearchPage.js
index 4db7acf4fd..6a18d16198 100644
--- a/packages/app/cypress/integration/components/search/SearchPage.js
+++ b/packages/app/cypress/integration/components/search/SearchPage.js
@@ -34,7 +34,7 @@ describe('SearchPage', () => {
       cy.visit('/search-next', {
         onBeforeLoad(win) {
           cy.stub(win, 'fetch')
-            .withArgs(`${API_ENDPOINT}?term=&pageCursor=`)
+            .withArgs(`${API_ENDPOINT}?term=`)
             .resolves({
               ok: true,
               json: () => ({ results }),
@@ -56,7 +56,7 @@ describe('SearchPage', () => {
           onBeforeLoad(win) {
             cy.stub(win, 'fetch')
               .withArgs(
-                `${API_ENDPOINT}?term=&filters%5Bkind%5D=Component&filters%5Blifecycle%5D%5B0%5D=experimental&pageCursor=`,
+                `${API_ENDPOINT}?term=&filters%5Bkind%5D=Component&filters%5Blifecycle%5D%5B0%5D=experimental`,
               )
               .resolves({
                 ok: true,
@@ -102,7 +102,7 @@ describe('SearchPage', () => {
       cy.visit('/search-next?query=backstage', {
         onBeforeLoad(win) {
           cy.stub(win, 'fetch')
-            .withArgs(`${API_ENDPOINT}?term=backstage&pageCursor=`)
+            .withArgs(`${API_ENDPOINT}?term=backstage`)
             .resolves({
               ok: true,
               json: () => ({ results: [] }),
diff --git a/packages/app/package.json b/packages/app/package.json
index b26e94fc26..db7a99e632 100644
--- a/packages/app/package.json
+++ b/packages/app/package.json
@@ -1,52 +1,55 @@
 {
   "name": "example-app",
-  "version": "0.2.36",
+  "version": "0.2.45",
   "private": true,
   "bundled": true,
   "dependencies": {
-    "@backstage/catalog-model": "^0.9.0",
-    "@backstage/cli": "^0.7.2",
-    "@backstage/core-app-api": "^0.1.3",
-    "@backstage/core-components": "^0.1.5",
-    "@backstage/core-plugin-api": "^0.1.3",
-    "@backstage/integration-react": "^0.1.4",
-    "@backstage/plugin-api-docs": "^0.6.1",
-    "@backstage/plugin-badges": "^0.2.4",
-    "@backstage/plugin-catalog": "^0.6.6",
-    "@backstage/plugin-catalog-import": "^0.5.12",
-    "@backstage/plugin-catalog-react": "^0.2.6",
-    "@backstage/plugin-circleci": "^0.2.18",
-    "@backstage/plugin-cloudbuild": "^0.2.18",
-    "@backstage/plugin-code-coverage": "^0.1.6",
-    "@backstage/plugin-cost-insights": "^0.11.0",
-    "@backstage/plugin-explore": "^0.3.9",
-    "@backstage/plugin-gcp-projects": "^0.3.0",
-    "@backstage/plugin-github-actions": "^0.4.12",
-    "@backstage/plugin-graphiql": "^0.2.12",
-    "@backstage/plugin-jenkins": "^0.4.7",
-    "@backstage/plugin-kafka": "^0.2.10",
-    "@backstage/plugin-kubernetes": "^0.4.7",
-    "@backstage/plugin-lighthouse": "^0.2.19",
-    "@backstage/plugin-newrelic": "^0.3.0",
-    "@backstage/plugin-org": "^0.3.16",
-    "@backstage/plugin-pagerduty": "0.3.7",
-    "@backstage/plugin-rollbar": "^0.3.8",
-    "@backstage/plugin-scaffolder": "^0.10.0",
-    "@backstage/plugin-search": "^0.4.2",
-    "@backstage/plugin-sentry": "^0.3.14",
-    "@backstage/plugin-shortcuts": "^0.1.4",
-    "@backstage/plugin-tech-radar": "^0.4.1",
-    "@backstage/plugin-techdocs": "^0.9.9",
-    "@backstage/plugin-todo": "^0.1.4",
-    "@backstage/plugin-user-settings": "^0.2.12",
-    "@backstage/theme": "^0.2.8",
-    "@material-ui/core": "^4.11.0",
+    "@backstage/catalog-model": "^0.9.2",
+    "@backstage/cli": "^0.7.11",
+    "@backstage/core-app-api": "^0.1.12",
+    "@backstage/core-components": "^0.4.1",
+    "@backstage/core-plugin-api": "^0.1.7",
+    "@backstage/integration-react": "^0.1.8",
+    "@backstage/plugin-api-docs": "^0.6.7",
+    "@backstage/plugin-badges": "^0.2.8",
+    "@backstage/plugin-catalog": "^0.6.14",
+    "@backstage/plugin-catalog-import": "^0.5.20",
+    "@backstage/plugin-catalog-react": "^0.4.5",
+    "@backstage/plugin-circleci": "^0.2.22",
+    "@backstage/plugin-cloudbuild": "^0.2.22",
+    "@backstage/plugin-code-coverage": "^0.1.10",
+    "@backstage/plugin-cost-insights": "^0.11.5",
+    "@backstage/plugin-explore": "^0.3.15",
+    "@backstage/plugin-gcp-projects": "^0.3.3",
+    "@backstage/plugin-github-actions": "^0.4.17",
+    "@backstage/plugin-graphiql": "^0.2.15",
+    "@backstage/plugin-home": "^0.3.0",
+    "@backstage/plugin-jenkins": "^0.5.5",
+    "@backstage/plugin-kafka": "^0.2.14",
+    "@backstage/plugin-kubernetes": "^0.4.12",
+    "@backstage/plugin-lighthouse": "^0.2.24",
+    "@backstage/plugin-newrelic": "^0.3.3",
+    "@backstage/plugin-org": "^0.3.22",
+    "@backstage/plugin-pagerduty": "0.3.12",
+    "@backstage/plugin-rollbar": "^0.3.13",
+    "@backstage/plugin-scaffolder": "^0.11.3",
+    "@backstage/plugin-search": "^0.4.10",
+    "@backstage/plugin-sentry": "^0.3.20",
+    "@backstage/plugin-shortcuts": "^0.1.7",
+    "@backstage/plugin-tech-radar": "^0.4.6",
+    "@backstage/plugin-techdocs": "^0.11.1",
+    "@backstage/plugin-todo": "^0.1.9",
+    "@backstage/plugin-user-settings": "^0.3.4",
+    "@backstage/search-common": "^0.2.0",
+    "@backstage/theme": "^0.2.10",
+    "@material-ui/core": "^4.12.2",
     "@material-ui/icons": "^4.9.1",
+    "@material-ui/lab": "4.0.0-alpha.45",
     "@octokit/rest": "^18.5.3",
-    "@roadiehq/backstage-plugin-buildkite": "^1.0.4",
-    "@roadiehq/backstage-plugin-github-insights": "^1.1.15",
-    "@roadiehq/backstage-plugin-github-pull-requests": "^1.0.8",
-    "@roadiehq/backstage-plugin-travis-ci": "^1.0.4",
+    "@roadiehq/backstage-plugin-buildkite": "^1.0.8",
+    "@roadiehq/backstage-plugin-github-insights": "^1.1.23",
+    "@roadiehq/backstage-plugin-github-pull-requests": "^1.0.13",
+    "@roadiehq/backstage-plugin-travis-ci": "^1.0.11",
     "history": "^5.0.0",
     "prop-types": "^15.7.2",
     "react": "^16.12.0",
@@ -58,7 +61,8 @@
     "zen-observable": "^0.8.15"
   },
   "devDependencies": {
-    "@backstage/test-utils": "^0.1.14",
+    "@backstage/test-utils": "^0.1.17",
+    "@rjsf/core": "^3.0.0",
     "@testing-library/cypress": "^7.0.1",
     "@testing-library/jest-dom": "^5.10.1",
     "@testing-library/react": "^11.2.5",
@@ -66,7 +70,7 @@
     "@types/jest": "^26.0.7",
     "@types/jquery": "^3.3.34",
     "@types/node": "^14.14.32",
-    "@types/react-dom": "^16.9.8",
+    "@types/react-dom": "*",
     "@types/zen-observable": "^0.8.0",
     "cross-env": "^7.0.0",
     "cypress": "^7.3.0",
diff --git a/packages/app/src/App.tsx b/packages/app/src/App.tsx
index de62971f96..81dbdf4cac 100644
--- a/packages/app/src/App.tsx
+++ b/packages/app/src/App.tsx
@@ -20,6 +20,7 @@ import {
   OAuthRequestDialog,
   SignInPage,
 } from '@backstage/core-components';
+import { HomepageCompositionRoot } from '@backstage/plugin-home';
 import { apiDocsPlugin, ApiExplorerPage } from '@backstage/plugin-api-docs';
 import {
   CatalogEntityPage,
@@ -41,10 +42,19 @@ import { GcpProjectsPage } from '@backstage/plugin-gcp-projects';
 import { GraphiQLPage } from '@backstage/plugin-graphiql';
 import { LighthousePage } from '@backstage/plugin-lighthouse';
 import { NewRelicPage } from '@backstage/plugin-newrelic';
-import { ScaffolderPage, scaffolderPlugin } from '@backstage/plugin-scaffolder';
+import {
+  ScaffolderPage,
+  scaffolderPlugin,
+  ScaffolderFieldExtensions,
+} from '@backstage/plugin-scaffolder';
 import { SearchPage } from '@backstage/plugin-search';
 import { TechRadarPage } from '@backstage/plugin-tech-radar';
-import { TechdocsPage } from '@backstage/plugin-techdocs';
+import {
+  DefaultTechDocsHome,
+  TechDocsIndexPage,
+  techdocsPlugin,
+  TechDocsReaderPage,
+} from '@backstage/plugin-techdocs';
 import { UserSettingsPage } from '@backstage/plugin-user-settings';
 import AlarmIcon from '@material-ui/icons/Alarm';
 import React from 'react';
@@ -54,6 +64,9 @@ import { apis } from './apis';
 import { Root } from './components/Root';
 import { entityPage } from './components/catalog/EntityPage';
 import { searchPage } from './components/search/SearchPage';
+import { LowerCaseValuePickerFieldExtension } from './components/scaffolder/customScaffolderExtensions';
+import { HomePage } from './components/home/HomePage';
+
 import { providers } from './identityProviders';
 import * as plugins from './plugins';
 
@@ -80,6 +93,7 @@ const app = createApp({
   bindRoutes({ bind }) {
     bind(catalogPlugin.externalRoutes, {
       createComponent: scaffolderPlugin.routes.root,
+      viewTechDoc: techdocsPlugin.routes.docRoot,
     });
     bind(apiDocsPlugin.externalRoutes, {
       createComponent: scaffolderPlugin.routes.root,
@@ -98,7 +112,11 @@ const AppRouter = app.getRouter();
 
 const routes = (
   <FlatRoutes>
-    <Navigate key="/" to="/catalog" />
+    <Navigate key="/" to="catalog" />
+    {/* TODO(rubenl): Move this to / once its more mature and components exist */}
+    <Route path="/home" element={<HomepageCompositionRoot />}>
+      <HomePage />
+    </Route>
     <Route path="/catalog" element={<CatalogIndexPage />} />
     <Route
       path="/catalog/:namespace/:kind/:name"
@@ -107,8 +125,18 @@ const routes = (
       {entityPage}
     </Route>
     <Route path="/catalog-import" element={<CatalogImportPage />} />
-    <Route path="/docs" element={<TechdocsPage />} />
-    <Route path="/create" element={<ScaffolderPage />} />
+    <Route path="/docs" element={<TechDocsIndexPage />}>
+      <DefaultTechDocsHome />
+    </Route>
+    <Route
+      path="/docs/:namespace/:kind/:name/*"
+      element={<TechDocsReaderPage />}
+    />
+    <Route path="/create" element={<ScaffolderPage />}>
+      <ScaffolderFieldExtensions>
+        <LowerCaseValuePickerFieldExtension />
+      </ScaffolderFieldExtensions>
+    </Route>
     <Route path="/explore" element={<ExplorePage />} />
     <Route
       path="/tech-radar"
@@ -116,7 +144,6 @@ const routes = (
     />
     <Route path="/graphiql" element={<GraphiQLPage />} />
     <Route path="/lighthouse" element={<LighthousePage />} />
-
     <Route path="/api-docs" element={<ApiExplorerPage />} />
     <Route path="/gcp-projects" element={<GcpProjectsPage />} />
     <Route path="/newrelic" element={<NewRelicPage />} />
diff --git a/packages/app/src/components/Root/Root.tsx b/packages/app/src/components/Root/Root.tsx
index 48141e4f53..7a666a020a 100644
--- a/packages/app/src/components/Root/Root.tsx
+++ b/packages/app/src/components/Root/Root.tsx
@@ -82,7 +82,7 @@ export const Root = ({ children }: PropsWithChildren<{}>) => (
       <SidebarSearch />
       <SidebarDivider />
       {/* Global nav, not org-specific */}
-      <SidebarItem icon={HomeIcon} to="/catalog" text="Home" />
+      <SidebarItem icon={HomeIcon} to="catalog" text="Home" />
       <SidebarItem icon={ExtensionIcon} to="api-docs" text="APIs" />
       <SidebarItem icon={LibraryBooks} to="docs" text="Docs" />
       <SidebarItem icon={LayersIcon} to="explore" text="Explore" />
diff --git a/packages/app/src/components/catalog/EntityPage.tsx b/packages/app/src/components/catalog/EntityPage.tsx
index 16107a6cc0..4a392e0f05 100644
--- a/packages/app/src/components/catalog/EntityPage.tsx
+++ b/packages/app/src/components/catalog/EntityPage.tsx
@@ -40,6 +40,8 @@ import {
   isKind,
   EntityHasResourcesCard,
   EntityOrphanWarning,
+  EntityProcessingErrorsPanel,
+  hasCatalogProcessingErrors,
   isOrphan,
 } from '@backstage/plugin-catalog';
 import {
@@ -135,6 +137,13 @@ const EntityLayoutWrapper = (props: { children?: ReactNode }) => {
   );
 };
 
+/**
+ * NOTE: This page is designed to work on small screens such as mobile devices.
+ * This is based on Material UI Grid. If breakpoints are used, each grid item must set the `xs` prop to a column size or to `true`,
+ * since this does not default. If no breakpoints are used, the items will equitably share the asvailable space.
+ * https://material-ui.com/components/grid/#basic-grid.
+ */
+
 export const cicdContent = (
   <EntitySwitch>
     <EntitySwitch.Case if={isJenkinsAvailable}>
@@ -202,6 +211,26 @@ const cicdCard = (
   </EntitySwitch>
 );
 
+const entityWarningContent = (
+  <>
+    <EntitySwitch>
+      <EntitySwitch.Case if={isOrphan}>
+        <Grid item xs={12}>
+          <EntityOrphanWarning />
+        </Grid>
+      </EntitySwitch.Case>
+    </EntitySwitch>
+
+    <EntitySwitch>
+      <EntitySwitch.Case if={hasCatalogProcessingErrors}>
+        <Grid item xs={12}>
+          <EntityProcessingErrorsPanel />
+        </Grid>
+      </EntitySwitch.Case>
+    </EntitySwitch>
+  </>
+);
+
 const errorsContent = (
   <EntitySwitch>
     <EntitySwitch.Case if={isRollbarAvailable}>
@@ -216,14 +245,7 @@ const errorsContent = (
 
 const overviewContent = (
   <Grid container spacing={3} alignItems="stretch">
-    <EntitySwitch>
-      <EntitySwitch.Case if={isOrphan}>
-        <Grid item xs={12}>
-          <EntityOrphanWarning />
-        </Grid>
-      </EntitySwitch.Case>
-    </EntitySwitch>
-
+    {entityWarningContent}
     <Grid item md={8} xs={12}>
       <EntityAboutCard variant="gridItem" />
     </Grid>
@@ -292,10 +314,10 @@ const serviceEntityPage = (
 
     <EntityLayout.Route path="/api" title="API">
       <Grid container spacing={3} alignItems="stretch">
-        <Grid item md={6}>
+        <Grid item xs={12} md={6}>
           <EntityProvidedApisCard />
         </Grid>
-        <Grid item md={6}>
+        <Grid item xs={12} md={6}>
           <EntityConsumedApisCard />
         </Grid>
       </Grid>
@@ -303,10 +325,10 @@ const serviceEntityPage = (
 
     <EntityLayout.Route path="/dependencies" title="Dependencies">
       <Grid container spacing={3} alignItems="stretch">
-        <Grid item md={6}>
+        <Grid item xs={12} md={6}>
           <EntityDependsOnComponentsCard variant="gridItem" />
         </Grid>
-        <Grid item md={6}>
+        <Grid item xs={12} md={6}>
           <EntityDependsOnResourcesCard variant="gridItem" />
         </Grid>
       </Grid>
@@ -431,15 +453,18 @@ const apiPage = (
   <EntityLayoutWrapper>
     <EntityLayout.Route path="/" title="Overview">
       <Grid container spacing={3}>
-        <Grid item md={6}>
+        {entityWarningContent}
+        <Grid item xs={12}>
           <EntityAboutCard />
         </Grid>
-        <Grid container item md={12}>
-          <Grid item md={6}>
-            <EntityProvidingComponentsCard />
-          </Grid>
-          <Grid item md={6}>
-            <EntityConsumingComponentsCard />
+        <Grid item xs={12}>
+          <Grid container>
+            <Grid item xs={12} md={6}>
+              <EntityProvidingComponentsCard />
+            </Grid>
+            <Grid item xs={12} md={6}>
+              <EntityConsumingComponentsCard />
+            </Grid>
           </Grid>
         </Grid>
       </Grid>
@@ -459,6 +484,7 @@ const userPage = (
   <EntityLayoutWrapper>
     <EntityLayout.Route path="/" title="Overview">
       <Grid container spacing={3}>
+        {entityWarningContent}
         <Grid item xs={12} md={6}>
           <EntityUserProfileCard variant="gridItem" />
         </Grid>
@@ -474,6 +500,7 @@ const groupPage = (
   <EntityLayoutWrapper>
     <EntityLayout.Route path="/" title="Overview">
       <Grid container spacing={3}>
+        {entityWarningContent}
         <Grid item xs={12} md={6}>
           <EntityGroupProfileCard variant="gridItem" />
         </Grid>
@@ -492,6 +519,7 @@ const systemPage = (
   <EntityLayoutWrapper>
     <EntityLayout.Route path="/" title="Overview">
       <Grid container spacing={3} alignItems="stretch">
+        {entityWarningContent}
         <Grid item md={6}>
           <EntityAboutCard variant="gridItem" />
         </Grid>
@@ -516,6 +544,7 @@ const domainPage = (
   <EntityLayoutWrapper>
     <EntityLayout.Route path="/" title="Overview">
       <Grid container spacing={3} alignItems="stretch">
+        {entityWarningContent}
         <Grid item md={6}>
           <EntityAboutCard variant="gridItem" />
         </Grid>
diff --git a/packages/app/src/components/home/HomePage.tsx b/packages/app/src/components/home/HomePage.tsx
new file mode 100644
index 0000000000..ebb486790d
--- /dev/null
+++ b/packages/app/src/components/home/HomePage.tsx
@@ -0,0 +1,89 @@
+/*
+ * Copyright 2021 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import React from 'react';
+import Grid from '@material-ui/core/Grid';
+import {
+  HomePageRandomJoke,
+  ComponentAccordion,
+  ComponentTabs,
+  ComponentTab,
+} from '@backstage/plugin-home';
+import {
+  Content,
+  Header,
+  Page,
+  HomepageTimer,
+} from '@backstage/core-components';
+import { HomePageSearchBar } from '@backstage/plugin-search';
+
+export const HomePage = () => (
+  <Page themeId="home">
+    <Header title="Home">
+      <HomepageTimer />
+    </Header>
+    <Content>
+      <Grid container spacing={3}>
+        <Grid item xs={12}>
+          <HomePageSearchBar />
+        </Grid>
+        <Grid item xs={12} md={4}>
+          <HomePageRandomJoke />
+        </Grid>
+        <Grid item xs={12} md={4}>
+          <HomePageRandomJoke
+            defaultCategory="any"
+            Renderer={ComponentAccordion}
+          />
+          <HomePageRandomJoke
+            title="Another Random Joke"
+            Renderer={ComponentAccordion}
+          />
+          <HomePageRandomJoke
+            title="One More Random Joke"
+            defaultCategory="programming"
+            Renderer={ComponentAccordion}
+          />
+        </Grid>
+        <Grid item xs={12} md={4}>
+          <ComponentTabs
+            title="Random Jokes"
+            tabs={[
+              {
+                label: 'Programming',
+                Component: () => (
+                  <HomePageRandomJoke
+                    defaultCategory="programming"
+                    Renderer={ComponentTab}
+                  />
+                ),
+              },
+              {
+                label: 'Any',
+                Component: () => (
+                  <HomePageRandomJoke
+                    defaultCategory="any"
+                    Renderer={ComponentTab}
+                  />
+                ),
+              },
+            ]}
+          />
+        </Grid>
+      </Grid>
+    </Content>
+  </Page>
+);
diff --git a/packages/app/src/components/scaffolder/customScaffolderExtensions.tsx b/packages/app/src/components/scaffolder/customScaffolderExtensions.tsx
new file mode 100644
index 0000000000..5ef4f617a7
--- /dev/null
+++ b/packages/app/src/components/scaffolder/customScaffolderExtensions.tsx
@@ -0,0 +1,34 @@
+/*
+ * Copyright 2021 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import type { FieldValidation } from '@rjsf/core';
+import {
+  createScaffolderFieldExtension,
+  TextValuePicker,
+  scaffolderPlugin,
+} from '@backstage/plugin-scaffolder';
+
+export const LowerCaseValuePickerFieldExtension = scaffolderPlugin.provide(
+  createScaffolderFieldExtension({
+    name: 'LowerCaseValuePicker',
+    component: TextValuePicker,
+    validation: (value: string, validation: FieldValidation) => {
+      if (value.toLowerCase() !== value) {
+        validation.addError('Only lowercase values are allowed.');
+      }
+    },
+  }),
+);
diff --git a/packages/app/src/components/search/SearchPage.tsx b/packages/app/src/components/search/SearchPage.tsx
index 35c4a4ac1c..54f59d1a6e 100644
--- a/packages/app/src/components/search/SearchPage.tsx
+++ b/packages/app/src/components/search/SearchPage.tsx
@@ -14,35 +14,36 @@
  * limitations under the License.
  */
 
-import React from 'react';
-import { makeStyles, Theme, Grid, List, Paper } from '@material-ui/core';
-
+import { Content, Header, Lifecycle, Page } from '@backstage/core-components';
 import { CatalogResultListItem } from '@backstage/plugin-catalog';
 import {
+  DefaultResultListItem,
   SearchBar,
   SearchFilter,
   SearchResult,
-  DefaultResultListItem,
+  SearchResultPager,
+  SearchType,
 } from '@backstage/plugin-search';
-import { Content, Header, Lifecycle, Page } from '@backstage/core-components';
+import { DocsResultListItem } from '@backstage/plugin-techdocs';
+import { Grid, List, makeStyles, Paper, Theme } from '@material-ui/core';
+import React from 'react';
 
 const useStyles = makeStyles((theme: Theme) => ({
   bar: {
     padding: theme.spacing(1, 0),
   },
-  filters: {
-    padding: theme.spacing(2),
-  },
   filter: {
     '& + &': {
       marginTop: theme.spacing(2.5),
     },
   },
+  filters: {
+    padding: theme.spacing(2),
+  },
 }));
 
 const SearchPage = () => {
   const classes = useStyles();
-
   return (
     <Page themeId="home">
       <Header title="Search" subtitle={<Lifecycle alpha />} />
@@ -55,6 +56,11 @@ const SearchPage = () => {
           </Grid>
           <Grid item xs={3}>
             <Paper className={classes.filters}>
+              <SearchType
+                values={['techdocs', 'software-catalog']}
+                name="type"
+                defaultValue="software-catalog"
+              />
               <SearchFilter.Select
                 className={classes.filter}
                 name="kind"
@@ -80,6 +86,13 @@ const SearchPage = () => {
                             result={document}
                           />
                         );
+                      case 'techdocs':
+                        return (
+                          <DocsResultListItem
+                            key={document.location}
+                            result={document}
+                          />
+                        );
                       default:
                         return (
                           <DefaultResultListItem
@@ -92,6 +105,7 @@ const SearchPage = () => {
                 </List>
               )}
             </SearchResult>
+            <SearchResultPager />
           </Grid>
         </Grid>
       </Content>
diff --git a/packages/backend-common/CHANGELOG.md b/packages/backend-common/CHANGELOG.md
index 93016bd13c..7ffd6e52dc 100644
--- a/packages/backend-common/CHANGELOG.md
+++ b/packages/backend-common/CHANGELOG.md
@@ -1,5 +1,107 @@
 # @backstage/backend-common
 
+## 0.9.2
+
+### Patch Changes
+
+- 9e5ed27ec: Properly export all used types.
+- Updated dependencies
+  - @backstage/cli-common@0.1.3
+  - @backstage/config-loader@0.6.8
+  - @backstage/errors@0.1.2
+  - @backstage/config@0.1.9
+
+## 0.9.1
+
+### Patch Changes
+
+- 714a2a918: Export type that are needed to implement a new `UrlReader`
+- Updated dependencies
+  - @backstage/integration@0.6.3
+
+## 0.9.0
+
+### Minor Changes
+
+- a365f1faf: The `ZipArchiveResponse` class now accepts an optional `stripFirstDirectory` parameter. Note that its default value is `false`, which leads to a breaking change in behaviour to previous versions of the class. If you use this class explicitly and want to retain the old behaviour, add a `true` parameter value to its constructor.
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/integration@0.6.2
+  - @backstage/config@0.1.8
+
+## 0.8.10
+
+### Patch Changes
+
+- 8543d9890: Add an optional `info` parameter to the `readTree` filter option with a `size` property.
+- 4d909268c: Read responses in `UrlReader#read()` as array buffer instead of as text to allow reading non-text locations such as images.
+- 9b4604b38: Add support for watching configuration by implementing the `subscribe` method in the configuration returned by `loadBackendConfig`.
+- b8cb12009: Add AWS S3 URL Reader
+- Updated dependencies
+  - @backstage/config@0.1.7
+  - @backstage/config-loader@0.6.7
+  - @backstage/integration@0.6.1
+
+## 0.8.9
+
+### Patch Changes
+
+- f7ce7c565: Use a more informative error message when URL reading isn't allowed due to no reader matching the target URL.
+- ce1958021: Pass on credentials to the integrations package, so that it can properly pick the API route when using GitHub apps based auth
+- Updated dependencies
+  - @backstage/integration@0.6.0
+
+## 0.8.8
+
+### Patch Changes
+
+- 6aa7c3db7: bump node-tar version to the latest
+- Updated dependencies
+  - @backstage/config@0.1.6
+  - @backstage/integration@0.5.9
+  - @backstage/config-loader@0.6.6
+
+## 0.8.7
+
+### Patch Changes
+
+- f25357273: Implement the etag functionality in the `readUrl` method of `FetchUrlReader`.
+- bdd6ab5f1: It's possible to customize the request logging handler when building the service. For example in your `backend`
+
+  ```
+    const service = createServiceBuilder(module)
+      .loadConfig(config)
+      .setRequestLoggingHandler((logger?: Logger): RequestHandler => {
+        const actualLogger = (logger || getRootLogger()).child({
+          type: 'incomingRequest',
+        });
+        return expressWinston.logger({ ...
+  ```
+
+## 0.8.6
+
+### Patch Changes
+
+- 5f6f2fd96: Support a `ensureExists` config option to skip ensuring a configured database exists. This allows deployment scenarios where
+  limited permissions are given for provisioned databases without privileges to create new databases. If set to `false`, the
+  database connection will not be validated prior to use which means the backend will not attempt to create the database if it
+  doesn't exist. You can configure this in your app-config.yaml:
+
+  ```yaml
+  backend:
+    database:
+      ensureExists: false
+  ```
+
+  This defaults to `true` if unspecified. You can also configure this per plugin connection and will override the base option.
+
+- ad93bb035: Document the default behavior of `statusCheck` option in `createStatusCheckRouter`.
+- ae84b20cf: Revert the upgrade to `fs-extra@10.0.0` as that seemed to have broken all installs inexplicably.
+- Updated dependencies
+  - @backstage/config-loader@0.6.5
+
 ## 0.8.5
 
 ### Patch Changes
diff --git a/packages/backend-common/api-report.md b/packages/backend-common/api-report.md
index 94f1147b5a..eb1f9ad31f 100644
--- a/packages/backend-common/api-report.md
+++ b/packages/backend-common/api-report.md
@@ -9,7 +9,6 @@
 import { AzureIntegration } from '@backstage/integration';
 import { BitbucketIntegration } from '@backstage/integration';
 import { Config } from '@backstage/config';
-import { ConfigReader } from '@backstage/config';
 import cors from 'cors';
 import Docker from 'dockerode';
 import { ErrorRequestHandler } from 'express';
@@ -17,7 +16,6 @@ import express from 'express';
 import { GithubCredentialsProvider } from '@backstage/integration';
 import { GitHubIntegration } from '@backstage/integration';
 import { GitLabIntegration } from '@backstage/integration';
-import * as http from 'http';
 import { isChildPath } from '@backstage/cli-common';
 import { JsonValue } from '@backstage/config';
 import { Knex } from 'knex';
@@ -80,9 +78,23 @@ export class BitbucketUrlReader implements UrlReader {
 export interface CacheClient {
   delete(key: string): Promise<void>;
   get(key: string): Promise<JsonValue | undefined>;
-  set(key: string, value: JsonValue, options?: CacheSetOptions): Promise<void>;
+  set(
+    key: string,
+    value: JsonValue,
+    options?: CacheClientSetOptions,
+  ): Promise<void>;
 }
 
+// @public (undocumented)
+export type CacheClientOptions = {
+  defaultTtl?: number;
+};
+
+// @public (undocumented)
+export type CacheClientSetOptions = {
+  ttl?: number;
+};
+
 // @public
 export class CacheManager {
   forPlugin(pluginId: string): PluginCacheManager;
@@ -92,6 +104,12 @@ export class CacheManager {
   ): CacheManager;
 }
 
+// @public (undocumented)
+export type CacheManagerOptions = {
+  logger?: Logger_2;
+  onError?: (err: Error) => void;
+};
+
 // @public (undocumented)
 export const coloredFormat: winston.Logform.Format;
 
@@ -117,12 +135,14 @@ export function createRootLogger(
 ): winston.Logger;
 
 // @public
-export function createServiceBuilder(_module: NodeModule): ServiceBuilderImpl;
+export function createServiceBuilder(_module: NodeModule): ServiceBuilder;
 
 // @public (undocumented)
-export function createStatusCheckRouter(
-  options: StatusCheckRouterOptions,
-): Promise<express.Router>;
+export function createStatusCheckRouter(options: {
+  logger: Logger_2;
+  path?: string;
+  statusCheck?: StatusCheck;
+}): Promise<express.Router>;
 
 // @public (undocumented)
 export class DatabaseManager {
@@ -142,6 +162,7 @@ export class DockerContainerRunner implements ContainerRunner {
     mountDirs,
     workingDir,
     envVars,
+    pullImage,
   }: RunContainerOptions): Promise<void>;
 }
 
@@ -321,14 +342,17 @@ export class GitlabUrlReader implements UrlReader {
 export { isChildPath };
 
 // @public
-export function loadBackendConfig(options: Options): Promise<Config>;
+export function loadBackendConfig(options: {
+  logger: Logger_2;
+  argv: string[];
+}): Promise<Config>;
 
 // @public
 export function notFoundHandler(): RequestHandler;
 
 // @public
 export type PluginCacheManager = {
-  getClient: (options?: ClientOptions) => CacheClient;
+  getClient: (options?: CacheClientOptions) => CacheClient;
 };
 
 // @public
@@ -342,6 +366,24 @@ export type PluginEndpointDiscovery = {
   getExternalBaseUrl(pluginId: string): Promise<string>;
 };
 
+// @public
+export type ReaderFactory = (options: {
+  config: Config;
+  logger: Logger_2;
+  treeResponseFactory: ReadTreeResponseFactory;
+}) => UrlReaderPredicateTuple[];
+
+// @public
+export type ReadTreeOptions = {
+  filter?(
+    path: string,
+    info?: {
+      size: number;
+    },
+  ): boolean;
+  etag?: string;
+};
+
 // @public
 export type ReadTreeResponse = {
   files(): Promise<ReadTreeResponseFile[]>;
@@ -350,15 +392,61 @@ export type ReadTreeResponse = {
   etag: string;
 };
 
+// @public (undocumented)
+export type ReadTreeResponseDirOptions = {
+  targetDir?: string;
+};
+
+// @public (undocumented)
+export interface ReadTreeResponseFactory {
+  // (undocumented)
+  fromTarArchive(
+    options: ReadTreeResponseFactoryOptions,
+  ): Promise<ReadTreeResponse>;
+  // (undocumented)
+  fromZipArchive(
+    options: ReadTreeResponseFactoryOptions,
+  ): Promise<ReadTreeResponse>;
+}
+
+// @public (undocumented)
+export type ReadTreeResponseFactoryOptions = {
+  stream: Readable;
+  subpath?: string;
+  etag: string;
+  filter?: (
+    path: string,
+    info?: {
+      size: number;
+    },
+  ) => boolean;
+};
+
 // @public
 export type ReadTreeResponseFile = {
   path: string;
   content(): Promise<Buffer>;
 };
 
+// @public
+export type ReadUrlOptions = {
+  etag?: string;
+};
+
+// @public
+export type ReadUrlResponse = {
+  buffer(): Promise<Buffer>;
+  etag?: string;
+};
+
 // @public
 export function requestLoggingHandler(logger?: Logger_2): RequestHandler;
 
+// @public (undocumented)
+export type RequestLoggingHandlerFactory = (
+  logger?: Logger_2,
+) => RequestHandler;
+
 // @public
 export function resolvePackagePath(name: string, ...paths: string[]): string;
 
@@ -374,6 +462,12 @@ export type RunContainerOptions = {
   mountDirs?: Record<string, string>;
   workingDir?: string;
   envVars?: Record<string, string>;
+  pullImage?: boolean;
+};
+
+// @public
+export type SearchOptions = {
+  etag?: string;
 };
 
 // @public
@@ -390,13 +484,25 @@ export type SearchResponseFile = {
 
 // @public (undocumented)
 export type ServiceBuilder = {
-  loadConfig(config: ConfigReader): ServiceBuilder;
+  loadConfig(config: Config): ServiceBuilder;
   setPort(port: number): ServiceBuilder;
   setHost(host: string): ServiceBuilder;
   setLogger(logger: Logger_2): ServiceBuilder;
   enableCors(options: cors.CorsOptions): ServiceBuilder;
-  setHttpsSettings(settings: HttpsSettings): ServiceBuilder;
+  setHttpsSettings(settings: {
+    certificate:
+      | {
+          key: string;
+          cert: string;
+        }
+      | {
+          hostname: string;
+        };
+  }): ServiceBuilder;
   addRouter(root: string, router: Router | RequestHandler): ServiceBuilder;
+  setRequestLoggingHandler(
+    requestLoggingHandler: RequestLoggingHandlerFactory,
+  ): ServiceBuilder;
   start(): Promise<Server>;
 };
 
@@ -441,12 +547,25 @@ export type UrlReader = {
   search(url: string, options?: SearchOptions): Promise<SearchResponse>;
 };
 
+// @public (undocumented)
+export type UrlReaderPredicateTuple = {
+  predicate: (url: URL) => boolean;
+  reader: UrlReader;
+};
+
 // @public
 export class UrlReaders {
-  static create({ logger, config, factories }: CreateOptions): UrlReader;
-  static default({ logger, config, factories }: CreateOptions): UrlReader;
+  static create({ logger, config, factories }: UrlReadersOptions): UrlReader;
+  static default({ logger, config, factories }: UrlReadersOptions): UrlReader;
 }
 
+// @public (undocumented)
+export type UrlReadersOptions = {
+  config: Config;
+  logger: Logger_2;
+  factories?: ReaderFactory[];
+};
+
 // @public
 export function useHotCleanup(
   _module: NodeModule,
diff --git a/packages/backend-common/package.json b/packages/backend-common/package.json
index 6cf20b8234..6ec2c8b131 100644
--- a/packages/backend-common/package.json
+++ b/packages/backend-common/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@backstage/backend-common",
   "description": "Common functionality library for Backstage backends",
-  "version": "0.8.5",
+  "version": "0.9.2",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "private": false,
@@ -29,17 +29,18 @@
     "clean": "backstage-cli clean"
   },
   "dependencies": {
-    "@backstage/cli-common": "^0.1.2",
-    "@backstage/config": "^0.1.5",
-    "@backstage/config-loader": "^0.6.4",
-    "@backstage/errors": "^0.1.1",
-    "@backstage/integration": "^0.5.8",
+    "@backstage/cli-common": "^0.1.3",
+    "@backstage/config": "^0.1.9",
+    "@backstage/config-loader": "^0.6.8",
+    "@backstage/errors": "^0.1.2",
+    "@backstage/integration": "^0.6.3",
     "@google-cloud/storage": "^5.8.0",
     "@octokit/rest": "^18.5.3",
     "@types/cors": "^2.8.6",
     "@types/dockerode": "^3.2.1",
     "@types/express": "^4.17.6",
     "archiver": "^5.0.2",
+    "aws-sdk": "^2.840.0",
     "compression": "^1.7.4",
     "concat-stream": "^2.0.0",
     "cors": "^2.8.5",
@@ -48,7 +49,7 @@
     "express": "^4.17.1",
     "express-promise-router": "^4.1.0",
     "fs-extra": "9.1.0",
-    "git-url-parse": "~11.4.4",
+    "git-url-parse": "^11.6.0",
     "helmet": "^4.0.0",
     "isomorphic-git": "^1.8.0",
     "keyv": "^4.0.3",
@@ -62,7 +63,7 @@
     "raw-body": "^2.4.1",
     "selfsigned": "^1.10.7",
     "stoppable": "^1.1.0",
-    "tar": "^6.0.5",
+    "tar": "^6.1.2",
     "unzipper": "^0.10.11",
     "winston": "^3.2.1",
     "yn": "^4.0.0"
@@ -76,8 +77,8 @@
     }
   },
   "devDependencies": {
-    "@backstage/cli": "^0.7.3",
-    "@backstage/test-utils": "^0.1.12",
+    "@backstage/cli": "^0.7.11",
+    "@backstage/test-utils": "^0.1.17",
     "@types/archiver": "^5.1.0",
     "@types/compression": "^1.7.0",
     "@types/concat-stream": "^1.6.0",
@@ -92,6 +93,7 @@
     "@types/tar": "^4.0.3",
     "@types/unzipper": "^0.10.3",
     "@types/webpack-env": "^1.15.2",
+    "aws-sdk-mock": "^5.2.1",
     "get-port": "^5.1.1",
     "http-errors": "^1.7.3",
     "jest": "^26.0.1",
diff --git a/packages/backend-common/src/cache/CacheClient.ts b/packages/backend-common/src/cache/CacheClient.ts
index 860754aae1..79f48a2757 100644
--- a/packages/backend-common/src/cache/CacheClient.ts
+++ b/packages/backend-common/src/cache/CacheClient.ts
@@ -22,7 +22,8 @@ type CacheClientArgs = {
   client: Keyv;
 };
 
-type CacheSetOptions = {
+/** @public */
+export type CacheClientSetOptions = {
   /**
    * Optional TTL in milliseconds. Defaults to the TTL provided when the client
    * was set up (or no TTL if none are provided).
@@ -33,6 +34,8 @@ type CacheSetOptions = {
 /**
  * A pre-configured, storage agnostic cache client suitable for use by
  * Backstage plugins.
+ *
+ * @public
  */
 export interface CacheClient {
   /**
@@ -46,7 +49,11 @@ export interface CacheClient {
    * optional TTL may also be provided, otherwise it defaults to the TTL that
    * was provided when the client was instantiated.
    */
-  set(key: string, value: JsonValue, options?: CacheSetOptions): Promise<void>;
+  set(
+    key: string,
+    value: JsonValue,
+    options?: CacheClientSetOptions,
+  ): Promise<void>;
 
   /**
    * Removes the given key from the cache store.
@@ -73,7 +80,7 @@ export class DefaultCacheClient implements CacheClient {
   async set(
     key: string,
     value: JsonValue,
-    opts: CacheSetOptions = {},
+    opts: CacheClientSetOptions = {},
   ): Promise<void> {
     const k = this.getNormalizedKey(key);
     await this.client.set(k, value, opts.ttl);
diff --git a/packages/backend-common/src/cache/CacheManager.test.ts b/packages/backend-common/src/cache/CacheManager.test.ts
index b55b63f469..fb73687f54 100644
--- a/packages/backend-common/src/cache/CacheManager.test.ts
+++ b/packages/backend-common/src/cache/CacheManager.test.ts
@@ -104,7 +104,7 @@ describe('CacheManager', () => {
       manager.forPlugin(plugin2Id).getClient({ defaultTtl: expectedTtl });
 
       const client = DefaultCacheClient as jest.Mock;
-      const cache = (Keyv as unknown) as jest.Mock;
+      const cache = Keyv as unknown as jest.Mock;
       expect(cache).toHaveBeenCalledTimes(2);
       expect(client).toHaveBeenCalledTimes(2);
 
@@ -124,7 +124,7 @@ describe('CacheManager', () => {
       const expectedNamespace = 'test-plugin';
       manager.forPlugin(expectedNamespace).getClient();
 
-      const cache = (Keyv as unknown) as jest.Mock;
+      const cache = Keyv as unknown as jest.Mock;
       const mockCalls = cache.mock.calls.splice(-1);
       const callArgs = mockCalls[0];
       expect(callArgs[0].store).toBeInstanceOf(NoStore);
@@ -138,7 +138,7 @@ describe('CacheManager', () => {
         .forPlugin(expectedNamespace)
         .getClient({ defaultTtl: expectedTtl });
 
-      const cache = (Keyv as unknown) as jest.Mock;
+      const cache = Keyv as unknown as jest.Mock;
       const mockCalls = cache.mock.calls.splice(-1);
       const callArgs = mockCalls[0];
       expect(callArgs[0]).toMatchObject({
@@ -162,7 +162,7 @@ describe('CacheManager', () => {
       const expectedTtl = 3600;
       manager.forPlugin('test').getClient({ defaultTtl: expectedTtl });
 
-      const cache = (Keyv as unknown) as jest.Mock;
+      const cache = Keyv as unknown as jest.Mock;
       const mockCacheCalls = cache.mock.calls.splice(-1);
       expect(mockCacheCalls[0][0]).toMatchObject({
         ttl: expectedTtl,
diff --git a/packages/backend-common/src/cache/CacheManager.ts b/packages/backend-common/src/cache/CacheManager.ts
index 9d1afdaaeb..d3a1504187 100644
--- a/packages/backend-common/src/cache/CacheManager.ts
+++ b/packages/backend-common/src/cache/CacheManager.ts
@@ -22,16 +22,14 @@ import { Logger } from 'winston';
 import { getRootLogger } from '../logging';
 import { DefaultCacheClient, CacheClient } from './CacheClient';
 import { NoStore } from './NoStore';
-import {
-  CacheManagerOptions,
-  OptionalOnError,
-  PluginCacheManager,
-} from './types';
+import { CacheManagerOptions, PluginCacheManager } from './types';
 
 /**
  * Implements a Cache Manager which will automatically create new cache clients
  * for plugins when requested. All requested cache clients are created with the
  * connection details provided.
+ *
+ * @public
  */
 export class CacheManager {
   /**
@@ -47,13 +45,13 @@ export class CacheManager {
   private readonly logger: Logger;
   private readonly store: keyof CacheManager['storeFactories'];
   private readonly connection: string;
-  private readonly errorHandler: OptionalOnError;
+  private readonly errorHandler: CacheManagerOptions['onError'];
 
   /**
    * Creates a new CacheManager instance by reading from the `backend` config
    * section, specifically the `.cache` key.
    *
-   * @param config The loaded application configuration.
+   * @param config - The loaded application configuration.
    */
   static fromConfig(
     config: Config,
@@ -74,7 +72,7 @@ export class CacheManager {
     store: string,
     connectionString: string,
     logger: Logger,
-    errorHandler: OptionalOnError,
+    errorHandler: CacheManagerOptions['onError'],
   ) {
     if (!this.storeFactories.hasOwnProperty(store)) {
       throw new Error(`Unknown cache store: ${store}`);
@@ -88,7 +86,7 @@ export class CacheManager {
   /**
    * Generates a PluginCacheManager for consumption by plugins.
    *
-   * @param pluginId The plugin that the cache manager should be created for. Plugin names should be unique.
+   * @param pluginId - The plugin that the cache manager should be created for. Plugin names should be unique.
    */
   forPlugin(pluginId: string): PluginCacheManager {
     return {
diff --git a/packages/backend-common/src/cache/index.ts b/packages/backend-common/src/cache/index.ts
index 45eb431ed1..26e6c102d8 100644
--- a/packages/backend-common/src/cache/index.ts
+++ b/packages/backend-common/src/cache/index.ts
@@ -14,6 +14,10 @@
  * limitations under the License.
  */
 
-export type { CacheClient } from './CacheClient';
+export type { CacheClient, CacheClientSetOptions } from './CacheClient';
 export { CacheManager } from './CacheManager';
-export type { PluginCacheManager } from './types';
+export type {
+  PluginCacheManager,
+  CacheManagerOptions,
+  CacheClientOptions,
+} from './types';
diff --git a/packages/backend-common/src/cache/types.ts b/packages/backend-common/src/cache/types.ts
index ac5bb91b21..70c46770a8 100644
--- a/packages/backend-common/src/cache/types.ts
+++ b/packages/backend-common/src/cache/types.ts
@@ -17,7 +17,8 @@
 import { Logger } from 'winston';
 import { CacheClient } from './CacheClient';
 
-type ClientOptions = {
+/** @public */
+export type CacheClientOptions = {
   /**
    * An optional default TTL (in milliseconds) to be set when getting a client
    * instance. If not provided, data will persist indefinitely by default (or
@@ -26,8 +27,7 @@ type ClientOptions = {
   defaultTtl?: number;
 };
 
-export type OptionalOnError = ((err: Error) => void) | undefined;
-
+/** @public */
 export type CacheManagerOptions = {
   /**
    * An optional logger for use by the PluginCacheManager.
@@ -38,11 +38,13 @@ export type CacheManagerOptions = {
    * An optional handler for connection errors emitted from the underlying data
    * store.
    */
-  onError?: OptionalOnError;
+  onError?: (err: Error) => void;
 };
 
 /**
  * The PluginCacheManager manages access to cache stores that Plugins get.
+ *
+ * @public
  */
 export type PluginCacheManager = {
   /**
@@ -52,5 +54,5 @@ export type PluginCacheManager = {
    * stores so that plugins are discouraged from cache-level integration
    * and/or cache key collisions.
    */
-  getClient: (options?: ClientOptions) => CacheClient;
+  getClient: (options?: CacheClientOptions) => CacheClient;
 };
diff --git a/packages/backend-common/src/config.ts b/packages/backend-common/src/config.ts
index 1316642ae1..96907870cb 100644
--- a/packages/backend-common/src/config.ts
+++ b/packages/backend-common/src/config.ts
@@ -18,32 +18,142 @@ import { resolve as resolvePath } from 'path';
 import parseArgs from 'minimist';
 import { Logger } from 'winston';
 import { findPaths } from '@backstage/cli-common';
-import { Config, ConfigReader } from '@backstage/config';
+import { Config, ConfigReader, JsonValue } from '@backstage/config';
 import { loadConfig } from '@backstage/config-loader';
 
-type Options = {
+class ObservableConfigProxy implements Config {
+  private config: Config = new ConfigReader({});
+
+  private readonly subscribers: (() => void)[] = [];
+
+  constructor(private readonly logger: Logger) {}
+
+  setConfig(config: Config) {
+    this.config = config;
+    for (const subscriber of this.subscribers) {
+      try {
+        subscriber();
+      } catch (error) {
+        this.logger.error(`Config subscriber threw error, ${error}`);
+      }
+    }
+  }
+
+  subscribe(onChange: () => void): { unsubscribe: () => void } {
+    this.subscribers.push(onChange);
+    return {
+      unsubscribe: () => {
+        const index = this.subscribers.indexOf(onChange);
+        if (index >= 0) {
+          this.subscribers.splice(index, 1);
+        }
+      },
+    };
+  }
+
+  has(key: string): boolean {
+    return this.config.has(key);
+  }
+  keys(): string[] {
+    return this.config.keys();
+  }
+  get<T = JsonValue>(key?: string): T {
+    return this.config.get(key);
+  }
+  getOptional<T = JsonValue>(key?: string): T | undefined {
+    return this.config.getOptional(key);
+  }
+  getConfig(key: string): Config {
+    return this.config.getConfig(key);
+  }
+  getOptionalConfig(key: string): Config | undefined {
+    return this.config.getOptionalConfig(key);
+  }
+  getConfigArray(key: string): Config[] {
+    return this.config.getConfigArray(key);
+  }
+  getOptionalConfigArray(key: string): Config[] | undefined {
+    return this.config.getOptionalConfigArray(key);
+  }
+  getNumber(key: string): number {
+    return this.config.getNumber(key);
+  }
+  getOptionalNumber(key: string): number | undefined {
+    return this.config.getOptionalNumber(key);
+  }
+  getBoolean(key: string): boolean {
+    return this.config.getBoolean(key);
+  }
+  getOptionalBoolean(key: string): boolean | undefined {
+    return this.config.getOptionalBoolean(key);
+  }
+  getString(key: string): string {
+    return this.config.getString(key);
+  }
+  getOptionalString(key: string): string | undefined {
+    return this.config.getOptionalString(key);
+  }
+  getStringArray(key: string): string[] {
+    return this.config.getStringArray(key);
+  }
+  getOptionalStringArray(key: string): string[] | undefined {
+    return this.config.getOptionalStringArray(key);
+  }
+}
+
+// A global used to ensure that only a single file watcher is active at a time.
+let currentCancelFunc: () => void;
+
+/**
+ * Load configuration for a Backend.
+ *
+ * This function should only be called once, during the initialization of the backend.
+ *
+ * @public
+ */
+export async function loadBackendConfig(options: {
   logger: Logger;
   // process.argv or any other overrides
   argv: string[];
-};
-
-/**
- * Load configuration for a Backend
- */
-export async function loadBackendConfig(options: Options): Promise<Config> {
+}): Promise<Config> {
   const args = parseArgs(options.argv);
-  const configOpts: string[] = [args.config ?? []].flat();
+  const configPaths: string[] = [args.config ?? []].flat();
+
+  const config = new ObservableConfigProxy(options.logger);
 
   /* eslint-disable-next-line no-restricted-syntax */
   const paths = findPaths(__dirname);
+
   const configs = await loadConfig({
     configRoot: paths.targetRoot,
-    configPaths: configOpts.map(opt => resolvePath(opt)),
+    configPaths: configPaths.map(opt => resolvePath(opt)),
+    watch: {
+      onChange(newConfigs) {
+        options.logger.info(
+          `Reloaded config from ${newConfigs.map(c => c.context).join(', ')}`,
+        );
+
+        config.setConfig(ConfigReader.fromConfigs(newConfigs));
+      },
+      stopSignal: new Promise(resolve => {
+        if (currentCancelFunc) {
+          currentCancelFunc();
+        }
+        currentCancelFunc = resolve;
+
+        // For reloads of this module we need to use a dispose handler rather than the global.
+        if (module.hot) {
+          module.hot.addDisposeHandler(resolve);
+        }
+      }),
+    },
   });
 
   options.logger.info(
     `Loaded config from ${configs.map(c => c.context).join(', ')}`,
   );
 
-  return ConfigReader.fromConfigs(configs);
+  config.setConfig(ConfigReader.fromConfigs(configs));
+
+  return config;
 }
diff --git a/packages/backend-common/src/database/DatabaseManager.ts b/packages/backend-common/src/database/DatabaseManager.ts
index f3a3f218b0..de39279a4f 100644
--- a/packages/backend-common/src/database/DatabaseManager.ts
+++ b/packages/backend-common/src/database/DatabaseManager.ts
@@ -31,6 +31,7 @@ function pluginPath(pluginId: string): string {
   return `plugin.${pluginId}`;
 }
 
+/** @public */
 export class DatabaseManager {
   /**
    * Creates a DatabaseManager from `backend.database` config.
@@ -40,7 +41,7 @@ export class DatabaseManager {
    * defaults. Optionally, a user may set `prefix` which is used to prefix generated database
    * names if config is not provided.
    *
-   * @param config The loaded application configuration.
+   * @param config - The loaded application configuration.
    */
   static fromConfig(config: Config): DatabaseManager {
     const databaseConfig = config.getConfig('backend.database');
@@ -59,7 +60,7 @@ export class DatabaseManager {
   /**
    * Generates a PluginDatabaseManager for consumption by plugins.
    *
-   * @param pluginId The plugin that the database manager should be created for. Plugin names
+   * @param pluginId - The plugin that the database manager should be created for. Plugin names
    * should be unique as they are used to look up database config overrides under
    * `backend.database.plugin`.
    */
@@ -110,9 +111,7 @@ export class DatabaseManager {
    * @returns Object with client type returned as `client` and boolean representing whether
    * or not the client was overridden as `overridden`
    */
-  private getClientType(
-    pluginId: string,
-  ): {
+  private getClientType(pluginId: string): {
     client: string;
     overridden: boolean;
   } {
diff --git a/packages/backend-common/src/database/SingleConnection.ts b/packages/backend-common/src/database/SingleConnection.ts
index 153aea7f38..a81d60fe83 100644
--- a/packages/backend-common/src/database/SingleConnection.ts
+++ b/packages/backend-common/src/database/SingleConnection.ts
@@ -22,6 +22,7 @@ import { DatabaseManager } from './DatabaseManager';
  * credentials provided; if the database already exists no attempt to create
  * the database will be made.
  *
+ * @public
  * @deprecated Use `DatabaseManager` from `@backend-common` instead.
  */
 export const SingleConnectionDatabaseManager = DatabaseManager;
diff --git a/packages/backend-common/src/database/config.ts b/packages/backend-common/src/database/config.ts
index b771811e8c..cf821087d7 100644
--- a/packages/backend-common/src/database/config.ts
+++ b/packages/backend-common/src/database/config.ts
@@ -19,6 +19,7 @@ import { merge } from 'lodash';
 /**
  * Merges database objects together
  *
+ * @public
  * @param config The base config. The input is not modified
  * @param overrides Any additional overrides
  */
diff --git a/packages/backend-common/src/database/connection.ts b/packages/backend-common/src/database/connection.ts
index 6fdb5554bd..8ea46070eb 100644
--- a/packages/backend-common/src/database/connection.ts
+++ b/packages/backend-common/src/database/connection.ts
@@ -40,8 +40,9 @@ const ConnectorMapping: Record<DatabaseClient, DatabaseConnector> = {
 /**
  * Creates a knex database connection
  *
- * @param dbConfig The database config
- * @param overrides Additional options to merge with the config
+ * @public
+ * @param dbConfig - The database config
+ * @param overrides - Additional options to merge with the config
  */
 export function createDatabaseClient(
   dbConfig: Config,
@@ -57,12 +58,16 @@ export function createDatabaseClient(
 
 /**
  * Alias for createDatabaseClient
+ *
+ * @public
  * @deprecated Use createDatabaseClient instead
  */
 export const createDatabase = createDatabaseClient;
 
 /**
  * Ensures that the given databases all exist, creating them if they do not.
+ *
+ * @public
  */
 export async function ensureDatabaseExists(
   dbConfig: Config,
diff --git a/packages/backend-common/src/database/connectors/mysql.ts b/packages/backend-common/src/database/connectors/mysql.ts
index f2f2298559..94dce508c7 100644
--- a/packages/backend-common/src/database/connectors/mysql.ts
+++ b/packages/backend-common/src/database/connectors/mysql.ts
@@ -149,7 +149,7 @@ export async function ensureMysqlDatabaseExists(
 ) {
   const admin = createMysqlDatabaseClient(dbConfig, {
     connection: {
-      database: (null as unknown) as string,
+      database: null as unknown as string,
     },
   });
 
diff --git a/packages/backend-common/src/database/types.ts b/packages/backend-common/src/database/types.ts
index c1647862af..edcba1e643 100644
--- a/packages/backend-common/src/database/types.ts
+++ b/packages/backend-common/src/database/types.ts
@@ -19,6 +19,8 @@ import { Knex } from 'knex';
 
 /**
  * The PluginDatabaseManager manages access to databases that Plugins get.
+ *
+ * @public
  */
 export interface PluginDatabaseManager {
   /**
diff --git a/packages/backend-common/src/discovery/SingleHostDiscovery.ts b/packages/backend-common/src/discovery/SingleHostDiscovery.ts
index 7d19284d9a..c1e092706b 100644
--- a/packages/backend-common/src/discovery/SingleHostDiscovery.ts
+++ b/packages/backend-common/src/discovery/SingleHostDiscovery.ts
@@ -26,6 +26,8 @@ import { DEFAULT_PORT } from '../service/lib/ServiceBuilderImpl';
  * The deployment may be scaled horizontally, as long as the external URL
  * is the same for all instances. However, internal URLs will always be
  * resolved to the same host, so there won't be any balancing of internal traffic.
+ *
+ * @public
  */
 export class SingleHostDiscovery implements PluginEndpointDiscovery {
   /**
diff --git a/packages/backend-common/src/discovery/types.ts b/packages/backend-common/src/discovery/types.ts
index a5915be773..0b502bf88c 100644
--- a/packages/backend-common/src/discovery/types.ts
+++ b/packages/backend-common/src/discovery/types.ts
@@ -25,6 +25,8 @@
  * Implementations of the discovery API can be as simple as a URL pattern
  * using the pluginId, but could also have overrides for individual plugins,
  * or query a separate discovery service.
+ *
+ * @public
  */
 export type PluginEndpointDiscovery = {
   /**
diff --git a/packages/backend-common/src/hot.ts b/packages/backend-common/src/hot.ts
index 951e29da6a..7148778b8c 100644
--- a/packages/backend-common/src/hot.ts
+++ b/packages/backend-common/src/hot.ts
@@ -46,13 +46,14 @@ function findAllAncestors(_module: NodeModule): NodeModule[] {
  *
  * Useful for cleaning intervals, timers, requests etc
  *
+ * @public
  * @example
  * ```ts
  * const intervalId = setInterval(doStuff, 1000);
  * useHotCleanup(module, () => clearInterval(intervalId));
  * ```
- * @param _module Reference to the current module where you invoke the fn
- * @param cancelEffect Fn that cleans up the ongoing effects
+ * @param _module - Reference to the current module where you invoke the fn
+ * @param cancelEffect - Fn that cleans up the ongoing effects
  */
 export function useHotCleanup(_module: NodeModule, cancelEffect: () => void) {
   if (_module.hot) {
@@ -78,16 +79,17 @@ const CURRENT_HOT_MEMOIZE_INDEX_KEY = 'backstage.io/hmr-memoize-key';
  * Memoizes a generated value across hot-module reloads. This is useful for
  * stateful parts of the backend, e.g. to retain a database.
  *
+ * @public
  * @example
  * ```ts
  * const db = useHotMemoize(module, () => createDB(dbParams));
  * ```
  *
- * @warning Don't use inside conditionals or loops,
+ * **NOTE:** Do not use inside conditionals or loops,
  * same rules as for hooks apply (https://reactjs.org/docs/hooks-rules.html)
  *
- * @param _module Reference to the current module where you invoke the fn
- * @param valueFactory Fn that returns the value you want to memoize
+ * @param _module - Reference to the current module where you invoke the fn
+ * @param valueFactory - Fn that returns the value you want to memoize
  */
 export function useHotMemoize<T>(
   _module: NodeModule,
diff --git a/packages/backend-common/src/logging/formats.ts b/packages/backend-common/src/logging/formats.ts
index 870eeafa2a..0477136e63 100644
--- a/packages/backend-common/src/logging/formats.ts
+++ b/packages/backend-common/src/logging/formats.ts
@@ -31,6 +31,7 @@ const coloredTemplate = (info: TransformableInfo) => {
   return `${timestampColor} ${prefixColor} ${level} ${message} ${extraFields}`;
 };
 
+/** @public */
 export const coloredFormat = winston.format.combine(
   winston.format.timestamp(),
   winston.format.colorize({
diff --git a/packages/backend-common/src/logging/rootLogger.ts b/packages/backend-common/src/logging/rootLogger.ts
index 58b675d9cf..d06037863c 100644
--- a/packages/backend-common/src/logging/rootLogger.ts
+++ b/packages/backend-common/src/logging/rootLogger.ts
@@ -21,14 +21,17 @@ import { coloredFormat } from './formats';
 
 let rootLogger: winston.Logger;
 
+/** @public */
 export function getRootLogger(): winston.Logger {
   return rootLogger;
 }
 
+/** @public */
 export function setRootLogger(newLogger: winston.Logger) {
   rootLogger = newLogger;
 }
 
+/** @public */
 export function createRootLogger(
   options: winston.LoggerOptions = {},
   env = process.env,
diff --git a/packages/backend-common/src/logging/voidLogger.ts b/packages/backend-common/src/logging/voidLogger.ts
index 0afc1fc8c7..eb9993fe7f 100644
--- a/packages/backend-common/src/logging/voidLogger.ts
+++ b/packages/backend-common/src/logging/voidLogger.ts
@@ -19,6 +19,8 @@ import * as winston from 'winston';
 
 /**
  * A logger that just throws away all messages.
+ *
+ * @public
  */
 export function getVoidLogger(): winston.Logger {
   return winston.createLogger({
diff --git a/packages/backend-common/src/middleware/errorHandler.ts b/packages/backend-common/src/middleware/errorHandler.ts
index ee7995f2c6..47c9285b18 100644
--- a/packages/backend-common/src/middleware/errorHandler.ts
+++ b/packages/backend-common/src/middleware/errorHandler.ts
@@ -28,6 +28,7 @@ import { ErrorRequestHandler, NextFunction, Request, Response } from 'express';
 import { Logger } from 'winston';
 import { getRootLogger } from '../logging';
 
+/** @public */
 export type ErrorHandlerOptions = {
   /**
    * Whether error response bodies should show error stack traces or not.
@@ -44,9 +45,9 @@ export type ErrorHandlerOptions = {
   logger?: Logger;
 
   /**
-   * Whether any error < 4XX should be logged or not.
+   * Whether any 4xx errors should be logged or not.
    *
-   * If not specified, by default log any 5xx errors.
+   * If not specified, default to only logging 5xx errors.
    */
   logClientErrors?: boolean;
 };
@@ -62,6 +63,7 @@ export type ErrorHandlerOptions = {
  * error types (such as http-error exceptions) and returns the enclosed status
  * code accordingly.
  *
+ * @public
  * @returns An Express error request handler
  */
 export function errorHandler(
diff --git a/packages/backend-common/src/middleware/notFoundHandler.ts b/packages/backend-common/src/middleware/notFoundHandler.ts
index 59ca957cc1..53a548c0ad 100644
--- a/packages/backend-common/src/middleware/notFoundHandler.ts
+++ b/packages/backend-common/src/middleware/notFoundHandler.ts
@@ -22,6 +22,7 @@ import { NextFunction, Request, RequestHandler, Response } from 'express';
  * Should be used as the very last handler in the chain, as it unconditionally
  * returns a 404 status.
  *
+ * @public
  * @returns An Express request handler
  */
 export function notFoundHandler(): RequestHandler {
diff --git a/packages/backend-common/src/middleware/requestLoggingHandler.ts b/packages/backend-common/src/middleware/requestLoggingHandler.ts
index f2f5cbda27..fa114411e1 100644
--- a/packages/backend-common/src/middleware/requestLoggingHandler.ts
+++ b/packages/backend-common/src/middleware/requestLoggingHandler.ts
@@ -22,7 +22,8 @@ import { getRootLogger } from '../logging';
 /**
  * Logs incoming requests.
  *
- * @param logger An optional logger to use. If not specified, the root logger will be used.
+ * @public
+ * @param logger - An optional logger to use. If not specified, the root logger will be used.
  * @returns An Express request handler
  */
 export function requestLoggingHandler(logger?: Logger): RequestHandler {
diff --git a/packages/backend-common/src/middleware/statusCheckHandler.ts b/packages/backend-common/src/middleware/statusCheckHandler.ts
index 243d6533c8..a0ba59fac4 100644
--- a/packages/backend-common/src/middleware/statusCheckHandler.ts
+++ b/packages/backend-common/src/middleware/statusCheckHandler.ts
@@ -16,8 +16,10 @@
 
 import { NextFunction, Request, Response, RequestHandler } from 'express';
 
+/** @public */
 export type StatusCheck = () => Promise<any>;
 
+/** @public */
 export interface StatusCheckHandlerOptions {
   /**
    * Optional status function which returns a message.
@@ -30,7 +32,8 @@ export interface StatusCheckHandlerOptions {
  *
  * This is commonly used to implement healthcheck and readiness routes.
  *
- * @param options An optional configuration object.
+ * @public
+ * @param options - An optional configuration object.
  * @returns An Express error request handler
  */
 export async function statusCheckHandler(
diff --git a/packages/backend-common/src/paths.ts b/packages/backend-common/src/paths.ts
index ffe99fe762..c8a8849d6c 100644
--- a/packages/backend-common/src/paths.ts
+++ b/packages/backend-common/src/paths.ts
@@ -25,6 +25,8 @@ import { resolve as resolvePath } from 'path';
  * This is particularly useful when you want to access assets shipped with
  * your backend plugin package. When doing so, do not forget to include the assets
  * in your published package by adding them to `files` in your `package.json`.
+ *
+ * @public
  */
 export function resolvePackagePath(name: string, ...paths: string[]) {
   const req =
@@ -40,8 +42,9 @@ export function resolvePackagePath(name: string, ...paths: string[]) {
  * a path that point to or within the base path. This is useful for resolving
  * paths from user input, as it otherwise opens up for vulnerabilities.
  *
- * @param base The base directory to resolve the path from.
- * @param path The target path, relative or absolute
+ * @public
+ * @param base - The base directory to resolve the path from.
+ * @param path - The target path, relative or absolute
  * @returns A path that is guaranteed to point to or within the base path.
  */
 export function resolveSafeChildPath(base: string, path: string): string {
diff --git a/packages/backend-common/src/reading/AwsS3UrlReader.test.ts b/packages/backend-common/src/reading/AwsS3UrlReader.test.ts
new file mode 100644
index 0000000000..084f7e3e13
--- /dev/null
+++ b/packages/backend-common/src/reading/AwsS3UrlReader.test.ts
@@ -0,0 +1,232 @@
+/*
+ * Copyright 2021 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import { ConfigReader, JsonObject } from '@backstage/config';
+import { getVoidLogger } from '../logging';
+import { DefaultReadTreeResponseFactory } from './tree';
+import { AwsS3UrlReader } from './AwsS3UrlReader';
+import {
+  AwsS3Integration,
+  readAwsS3IntegrationConfig,
+} from '@backstage/integration';
+import { UrlReaderPredicateTuple } from './types';
+import AWSMock from 'aws-sdk-mock';
+import aws from 'aws-sdk';
+import path from 'path';
+
+describe('AwsS3UrlReader', () => {
+  const createReader = (config: JsonObject): UrlReaderPredicateTuple[] => {
+    return AwsS3UrlReader.factory({
+      config: new ConfigReader(config),
+      logger: getVoidLogger(),
+      treeResponseFactory: DefaultReadTreeResponseFactory.create({
+        config: new ConfigReader({}),
+      }),
+    });
+  };
+
+  afterEach(() => {
+    AWSMock.restore();
+  });
+
+  it('creates a dummy reader without the awsS3 field', () => {
+    const entries = createReader({
+      integrations: {},
+    });
+
+    expect(entries).toHaveLength(1);
+  });
+
+  it('creates a reader with credentials correctly configured', () => {
+    const awsS3Integrations = [];
+    awsS3Integrations.push({
+      host: 'amazonaws.com',
+      accessKeyId: 'fakekey',
+      secretAccessKey: 'fakekey',
+    });
+
+    const entries = createReader({
+      integrations: {
+        awsS3: awsS3Integrations,
+      },
+    });
+
+    expect(entries).toHaveLength(1);
+  });
+
+  it('creates a reader with default credentials provider', () => {
+    const awsS3Integrations = [];
+    awsS3Integrations.push({
+      host: 'amazonaws.com',
+    });
+
+    const entries = createReader({
+      integrations: {
+        awsS3: awsS3Integrations,
+      },
+    });
+
+    expect(entries).toHaveLength(1);
+  });
+
+  describe('predicates', () => {
+    const readers = createReader({
+      integrations: {
+        awsS3: [{}],
+      },
+    });
+    const predicate = readers[0].predicate;
+
+    it('returns true for the correct aws s3 storage host', () => {
+      expect(
+        predicate(new URL('https://test-bucket.s3.us-east-2.amazonaws.com')),
+      ).toBe(true);
+    });
+
+    it('returns true for a url with the full path and the correct host', () => {
+      expect(
+        predicate(
+          new URL(
+            'https://test-bucket.s3.us-east-2.amazonaws.com/team/service/catalog-info.yaml',
+          ),
+        ),
+      ).toBe(true);
+    });
+
+    it('returns false for an incorrect host', () => {
+      expect(predicate(new URL('https://amazon.com'))).toBe(false);
+    });
+
+    it('returns false for a completely different host', () => {
+      expect(predicate(new URL('https://storage.cloud.google.com'))).toBe(
+        false,
+      );
+    });
+
+    it("returns true for a url with a bucket with '.'", () => {
+      expect(
+        predicate(
+          new URL(
+            'https://test.bucket.s3.us-east-2.amazonaws.com/team/service/catalog-info.yaml',
+          ),
+        ),
+      ).toBe(true);
+    });
+  });
+
+  describe('read', () => {
+    AWSMock.setSDKInstance(aws);
+    AWSMock.mock(
+      'S3',
+      'getObject',
+      Buffer.from(
+        require('fs').readFileSync(
+          path.resolve(
+            'src',
+            'reading',
+            '__fixtures__',
+            'awsS3-mock-object.yaml',
+          ),
+        ),
+      ),
+    );
+    const s3 = new aws.S3();
+    const awsS3UrlReader = new AwsS3UrlReader(
+      new AwsS3Integration(
+        readAwsS3IntegrationConfig(
+          new ConfigReader({
+            host: 'amazonaws.com',
+            accessKeyId: 'fake-access-key',
+            secretAccessKey: 'fake-secret-key',
+          }),
+        ),
+      ),
+      s3,
+    );
+
+    it('returns contents of an object in a bucket', async () => {
+      const response = await awsS3UrlReader.read(
+        'https://test-bucket.s3.us-east-2.amazonaws.com/awsS3-mock-object.yaml',
+      );
+      expect(response.toString().trim()).toBe('site_name: Test');
+    });
+
+    it('rejects unknown targets', async () => {
+      await expect(
+        awsS3UrlReader.read(
+          'https://test-bucket.s3.us-east-2.NOTamazonaws.com/file.yaml',
+        ),
+      ).rejects.toThrow(
+        Error(
+          `Could not retrieve file from S3: not a valid AWS S3 URL: https://test-bucket.s3.us-east-2.NOTamazonaws.com/file.yaml`,
+        ),
+      );
+    });
+  });
+
+  describe('readUrl', () => {
+    AWSMock.setSDKInstance(aws);
+
+    AWSMock.mock(
+      'S3',
+      'getObject',
+      Buffer.from(
+        require('fs').readFileSync(
+          path.resolve(
+            'src',
+            'reading',
+            '__fixtures__',
+            'awsS3-mock-object.yaml',
+          ),
+        ),
+      ),
+    );
+
+    const s3 = new aws.S3();
+
+    const awsS3UrlReader = new AwsS3UrlReader(
+      new AwsS3Integration(
+        readAwsS3IntegrationConfig(
+          new ConfigReader({
+            host: 'amazonaws.com',
+            accessKeyId: 'fake-access-key',
+            secretAccessKey: 'fake-secret-key',
+          }),
+        ),
+      ),
+      s3,
+    );
+
+    it('returns contents of an object in a bucket', async () => {
+      const response = await awsS3UrlReader.readUrl(
+        'https://test-bucket.s3.us-east-2.amazonaws.com/awsS3-mock-object.yaml',
+      );
+      const buffer = await response.buffer();
+      expect(buffer.toString().trim()).toBe('site_name: Test');
+    });
+
+    it('rejects unknown targets', async () => {
+      await expect(
+        awsS3UrlReader.readUrl(
+          'https://test-bucket.s3.us-east-2.NOTamazonaws.com/file.yaml',
+        ),
+      ).rejects.toThrow(
+        Error(
+          `Could not retrieve file from S3: not a valid AWS S3 URL: https://test-bucket.s3.us-east-2.NOTamazonaws.com/file.yaml`,
+        ),
+      );
+    });
+  });
+});
diff --git a/packages/backend-common/src/reading/AwsS3UrlReader.ts b/packages/backend-common/src/reading/AwsS3UrlReader.ts
new file mode 100644
index 0000000000..d119115930
--- /dev/null
+++ b/packages/backend-common/src/reading/AwsS3UrlReader.ts
@@ -0,0 +1,175 @@
+/*
+ * Copyright 2021 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import aws, { Credentials, S3 } from 'aws-sdk';
+import { CredentialsOptions } from 'aws-sdk/lib/credentials';
+import {
+  ReaderFactory,
+  ReadTreeResponse,
+  ReadUrlOptions,
+  ReadUrlResponse,
+  SearchResponse,
+  UrlReader,
+} from './types';
+import getRawBody from 'raw-body';
+import { AwsS3Integration, ScmIntegrations } from '@backstage/integration';
+
+const parseURL = (
+  url: string,
+): { path: string; bucket: string; region: string } => {
+  let { host, pathname } = new URL(url);
+
+  /**
+   * Removes the leading '/' from the pathname to be processed
+   * as a parameter by AWS S3 SDK getObject method.
+   */
+  pathname = pathname.substr(1);
+
+  /**
+   * Checks that the given URL is a valid S3 object url.
+   * Format of a Valid S3 URL: https://bucket-name.s3.Region.amazonaws.com/keyname
+   */
+  const validHost = new RegExp(
+    /^[a-z\d][a-z\d\.-]{1,61}[a-z\d]\.s3\.[a-z\d-]+\.amazonaws.com$/,
+  );
+  if (!validHost.test(host)) {
+    throw new Error(`not a valid AWS S3 URL: ${url}`);
+  }
+
+  const [bucket] = host.split(/\.s3\.[a-z\d-]+\.amazonaws.com/);
+  host = host.substring(bucket.length);
+  const [, , region, ,] = host.split('.');
+
+  return {
+    path: pathname,
+    bucket: bucket,
+    region: region,
+  };
+};
+
+export class AwsS3UrlReader implements UrlReader {
+  static factory: ReaderFactory = ({ config }) => {
+    const integrations = ScmIntegrations.fromConfig(config);
+
+    return integrations.awsS3.list().map(integration => {
+      const creds = AwsS3UrlReader.buildCredentials(integration);
+      const s3 = new S3({
+        apiVersion: '2006-03-01',
+        credentials: creds,
+      });
+      const reader = new AwsS3UrlReader(integration, s3);
+      const predicate = (url: URL) =>
+        url.host.endsWith(integration.config.host);
+      return { reader, predicate };
+    });
+  };
+
+  constructor(
+    private readonly integration: AwsS3Integration,
+    private readonly s3: S3,
+  ) {}
+
+  /**
+   * If accesKeyId and secretAccessKey are missing, the standard credentials provider chain will be used:
+   * https://docs.aws.amazon.com/AWSJavaSDK/latest/javadoc/com/amazonaws/auth/DefaultAWSCredentialsProviderChain.html
+   */
+  private static buildCredentials(
+    integration?: AwsS3Integration,
+  ): Credentials | CredentialsOptions | undefined {
+    if (!integration) {
+      return undefined;
+    }
+
+    const accessKeyId = integration.config.accessKeyId;
+    const secretAccessKey = integration.config.secretAccessKey;
+    let explicitCredentials: Credentials | undefined;
+
+    if (accessKeyId && secretAccessKey) {
+      explicitCredentials = new Credentials({
+        accessKeyId,
+        secretAccessKey,
+      });
+    }
+
+    const roleArn = integration.config.roleArn;
+    if (roleArn) {
+      return new aws.ChainableTemporaryCredentials({
+        masterCredentials: explicitCredentials,
+        params: {
+          RoleSessionName: 'backstage-aws-s3-url-reader',
+          RoleArn: roleArn,
+        },
+      });
+    }
+
+    return explicitCredentials;
+  }
+
+  async read(url: string): Promise<Buffer> {
+    const response = await this.readUrl(url);
+    return response.buffer();
+  }
+
+  async readUrl(
+    url: string,
+    options?: ReadUrlOptions,
+  ): Promise<ReadUrlResponse> {
+    try {
+      const { path, bucket, region } = parseURL(url);
+      aws.config.update({ region: region });
+
+      let params;
+      if (options?.etag) {
+        params = {
+          Bucket: bucket,
+          Key: path,
+          IfNoneMatch: options.etag,
+        };
+      } else {
+        params = {
+          Bucket: bucket,
+          Key: path,
+        };
+      }
+
+      const response = this.s3.getObject(params);
+      const buffer = await getRawBody(response.createReadStream());
+      const etag = (await response.promise()).ETag;
+
+      return {
+        buffer: async () => buffer,
+        etag: etag,
+      };
+    } catch (e) {
+      throw new Error(`Could not retrieve file from S3: ${e.message}`);
+    }
+  }
+
+  async readTree(): Promise<ReadTreeResponse> {
+    throw new Error('AwsS3Reader does not implement readTree');
+  }
+
+  async search(): Promise<SearchResponse> {
+    throw new Error('AwsS3Reader does not implement search');
+  }
+
+  toString() {
+    const secretAccessKey = this.integration.config.secretAccessKey;
+    return `awsS3{host=${this.integration.config.host},authed=${Boolean(
+      secretAccessKey,
+    )}}`;
+  }
+}
diff --git a/packages/backend-common/src/reading/AzureUrlReader.test.ts b/packages/backend-common/src/reading/AzureUrlReader.test.ts
index 2b7c21d4ab..e014fa2e75 100644
--- a/packages/backend-common/src/reading/AzureUrlReader.test.ts
+++ b/packages/backend-common/src/reading/AzureUrlReader.test.ts
@@ -78,21 +78,17 @@ describe('AzureUrlReader', () => {
 
     it.each([
       {
-        url:
-          'https://dev.azure.com/org-name/project-name/_git/repo-name?path=my-template.yaml&version=GBmaster',
+        url: 'https://dev.azure.com/org-name/project-name/_git/repo-name?path=my-template.yaml&version=GBmaster',
         config: createConfig(),
         response: expect.objectContaining({
-          url:
-            'https://dev.azure.com/org-name/project-name/_apis/git/repositories/repo-name/items?path=my-template.yaml&version=master',
+          url: 'https://dev.azure.com/org-name/project-name/_apis/git/repositories/repo-name/items?api-version=6.0&path=my-template.yaml&version=master',
         }),
       },
       {
-        url:
-          'https://dev.azure.com/org-name/project-name/_git/repo-name?path=my-template.yaml',
+        url: 'https://dev.azure.com/org-name/project-name/_git/repo-name?path=my-template.yaml',
         config: createConfig(),
         response: expect.objectContaining({
-          url:
-            'https://dev.azure.com/org-name/project-name/_apis/git/repositories/repo-name/items?path=my-template.yaml',
+          url: 'https://dev.azure.com/org-name/project-name/_apis/git/repositories/repo-name/items?api-version=6.0&path=my-template.yaml',
         }),
       },
       {
@@ -129,14 +125,12 @@ describe('AzureUrlReader', () => {
       {
         url: 'https://api.com/a/b/blob/master/path/to/c.yaml',
         config: createConfig(),
-        error:
-          'Incorrect URL: https://api.com/a/b/blob/master/path/to/c.yaml, Error: Wrong Azure Devops URL or Invalid file path',
+        error: 'Azure URL must point to a git repository',
       },
       {
         url: 'com/a/b/blob/master/path/to/c.yaml',
         config: createConfig(),
-        error:
-          'Incorrect URL: com/a/b/blob/master/path/to/c.yaml, TypeError: Invalid URL: com/a/b/blob/master/path/to/c.yaml',
+        error: 'Invalid URL: com/a/b/blob/master/path/to/c.yaml',
       },
       {
         url: '',
diff --git a/packages/backend-common/src/reading/AzureUrlReader.ts b/packages/backend-common/src/reading/AzureUrlReader.ts
index bc22854d4e..6015b044bc 100644
--- a/packages/backend-common/src/reading/AzureUrlReader.ts
+++ b/packages/backend-common/src/reading/AzureUrlReader.ts
@@ -23,11 +23,9 @@ import {
   ScmIntegrations,
 } from '@backstage/integration';
 import fetch from 'cross-fetch';
-import parseGitUrl from 'git-url-parse';
 import { Minimatch } from 'minimatch';
 import { Readable } from 'stream';
 import { NotFoundError, NotModifiedError } from '@backstage/errors';
-import { stripFirstDirectoryFromPath } from './tree/util';
 import {
   ReadTreeResponseFactory,
   ReaderFactory,
@@ -40,6 +38,7 @@ import {
   ReadUrlResponse,
 } from './types';
 
+/** @public */
 export class AzureUrlReader implements UrlReader {
   static factory: ReaderFactory = ({ config, treeResponseFactory }) => {
     const integrations = ScmIntegrations.fromConfig(config);
@@ -70,7 +69,7 @@ export class AzureUrlReader implements UrlReader {
 
     // for private repos when PAT is not valid, Azure API returns a http status code 203 with sign in page html
     if (response.ok && response.status !== 203) {
-      return Buffer.from(await response.text());
+      return Buffer.from(await response.arrayBuffer());
     }
 
     const message = `${url} could not be read as ${builtUrl}, ${response.status} ${response.statusText}`;
@@ -128,28 +127,38 @@ export class AzureUrlReader implements UrlReader {
       throw new Error(message);
     }
 
+    // When downloading a zip archive from azure on a subpath we get an extra directory
+    // layer added at the top. With for example the file /a/b/c.txt and a download of
+    // /a/b, we'll see /b/c.txt in the zip archive. This picks out /b so that we can remove it.
+    let subpath;
+    const path = new URL(url).searchParams.get('path');
+    if (path) {
+      subpath = path.split('/').filter(Boolean).slice(-1)[0];
+    }
+
     return await this.deps.treeResponseFactory.fromZipArchive({
-      stream: (archiveAzureResponse.body as unknown) as Readable,
+      stream: archiveAzureResponse.body as unknown as Readable,
       etag: commitSha,
       filter: options?.filter,
+      subpath,
     });
   }
 
   async search(url: string, options?: SearchOptions): Promise<SearchResponse> {
-    const { filepath } = parseGitUrl(url);
-    const matcher = new Minimatch(filepath);
+    const treeUrl = new URL(url);
+
+    const path = treeUrl.searchParams.get('path');
+    const matcher = path && new Minimatch(path.replace(/^\/+/, ''));
 
     // TODO(freben): For now, read the entire repo and filter through that. In
     // a future improvement, we could be smart and try to deduce that non-glob
     // prefixes (like for filepaths such as some-prefix/**/a.yaml) can be used
     // to get just that part of the repo.
-    const treeUrl = new URL(url);
     treeUrl.searchParams.delete('path');
-    treeUrl.pathname = treeUrl.pathname.replace(/\/+$/, '');
 
     const tree = await this.readTree(treeUrl.toString(), {
       etag: options?.etag,
-      filter: path => matcher.match(stripFirstDirectoryFromPath(path)),
+      filter: p => (matcher ? matcher.match(p) : true),
     });
     const files = await tree.files();
 
diff --git a/packages/backend-common/src/reading/BitbucketUrlReader.ts b/packages/backend-common/src/reading/BitbucketUrlReader.ts
index 2849bc3cd9..4965d5a370 100644
--- a/packages/backend-common/src/reading/BitbucketUrlReader.ts
+++ b/packages/backend-common/src/reading/BitbucketUrlReader.ts
@@ -43,6 +43,8 @@ import {
 /**
  * A processor that adds the ability to read files from Bitbucket v1 and v2 APIs, such as
  * the one exposed by Bitbucket Cloud itself.
+ *
+ * @public
  */
 export class BitbucketUrlReader implements UrlReader {
   static factory: ReaderFactory = ({ config, treeResponseFactory }) => {
@@ -60,13 +62,8 @@ export class BitbucketUrlReader implements UrlReader {
     private readonly integration: BitbucketIntegration,
     private readonly deps: { treeResponseFactory: ReadTreeResponseFactory },
   ) {
-    const {
-      host,
-      apiBaseUrl,
-      token,
-      username,
-      appPassword,
-    } = integration.config;
+    const { host, apiBaseUrl, token, username, appPassword } =
+      integration.config;
 
     if (!apiBaseUrl) {
       throw new Error(
@@ -91,7 +88,7 @@ export class BitbucketUrlReader implements UrlReader {
     }
 
     if (response.ok) {
-      return Buffer.from(await response.text());
+      return Buffer.from(await response.arrayBuffer());
     }
 
     const message = `${url} could not be read as ${bitbucketUrl}, ${response.status} ${response.statusText}`;
@@ -138,7 +135,7 @@ export class BitbucketUrlReader implements UrlReader {
     }
 
     return await this.deps.treeResponseFactory.fromTarArchive({
-      stream: (archiveBitbucketResponse.body as unknown) as Readable,
+      stream: archiveBitbucketResponse.body as unknown as Readable,
       subpath: filepath,
       etag: lastCommitShortHash,
       filter: options?.filter,
diff --git a/packages/backend-common/src/reading/FetchUrlReader.test.ts b/packages/backend-common/src/reading/FetchUrlReader.test.ts
index 169cbfbf66..e8c16c5f0a 100644
--- a/packages/backend-common/src/reading/FetchUrlReader.test.ts
+++ b/packages/backend-common/src/reading/FetchUrlReader.test.ts
@@ -15,12 +15,16 @@
  */
 
 import { ConfigReader } from '@backstage/config';
+import { NotFoundError, NotModifiedError } from '@backstage/errors';
 import { msw } from '@backstage/test-utils';
+import { rest } from 'msw';
 import { setupServer } from 'msw/node';
 import { getVoidLogger } from '../logging';
 import { FetchUrlReader } from './FetchUrlReader';
 import { DefaultReadTreeResponseFactory } from './tree';
 
+const fetchUrlReader = new FetchUrlReader();
+
 describe('FetchUrlReader', () => {
   const worker = setupServer();
 
@@ -30,6 +34,39 @@ describe('FetchUrlReader', () => {
     jest.clearAllMocks();
   });
 
+  beforeEach(() => {
+    worker.use(
+      rest.get('https://backstage.io/some-resource', (req, res, ctx) => {
+        if (req.headers.get('if-none-match') === 'foo') {
+          return res(
+            ctx.status(304),
+            ctx.set('Content-Type', 'text/plain'),
+            ctx.set('etag', 'foo'),
+          );
+        }
+
+        return res(
+          ctx.status(200),
+          ctx.set('Content-Type', 'text/plain'),
+          ctx.set('etag', 'foo'),
+          ctx.body('content foo'),
+        );
+      }),
+    );
+
+    worker.use(
+      rest.get('https://backstage.io/not-exists', (_req, res, ctx) => {
+        return res(ctx.status(404));
+      }),
+    );
+
+    worker.use(
+      rest.get('https://backstage.io/error', (_req, res, ctx) => {
+        return res(ctx.status(500), ctx.body('An internal error occured'));
+      }),
+    );
+  });
+
   it('factory should create a single entry with a predicate that matches config', async () => {
     const entries = FetchUrlReader.factory({
       config: new ConfigReader({
@@ -70,4 +107,55 @@ describe('FetchUrlReader', () => {
     expect(predicate(new URL('https://a.examples.org:700/test'))).toBe(true);
     expect(predicate(new URL('https://a.b.examples.org:700/test'))).toBe(true);
   });
+
+  describe('read', () => {
+    it('should return etag from the response', async () => {
+      const buffer = await fetchUrlReader.read(
+        'https://backstage.io/some-resource',
+      );
+      expect(buffer.toString()).toBe('content foo');
+    });
+
+    it('should throw NotFound if server responds with 404', async () => {
+      await expect(
+        fetchUrlReader.read('https://backstage.io/not-exists'),
+      ).rejects.toThrow(NotFoundError);
+    });
+
+    it('should throw Error if server responds with 500', async () => {
+      await expect(
+        fetchUrlReader.read('https://backstage.io/error'),
+      ).rejects.toThrow(Error);
+    });
+  });
+
+  describe('readUrl', () => {
+    it('should throw NotModified if server responds with 304', async () => {
+      await expect(
+        fetchUrlReader.readUrl('https://backstage.io/some-resource', {
+          etag: 'foo',
+        }),
+      ).rejects.toThrow(NotModifiedError);
+    });
+
+    it('should return etag from the response', async () => {
+      const response = await fetchUrlReader.readUrl(
+        'https://backstage.io/some-resource',
+      );
+      expect(response.etag).toBe('foo');
+      expect((await response.buffer()).toString()).toEqual('content foo');
+    });
+
+    it('should throw NotFound if server responds with 404', async () => {
+      await expect(
+        fetchUrlReader.readUrl('https://backstage.io/not-exists'),
+      ).rejects.toThrow(NotFoundError);
+    });
+
+    it('should throw Error if server responds with 500', async () => {
+      await expect(
+        fetchUrlReader.readUrl('https://backstage.io/error'),
+      ).rejects.toThrow(Error);
+    });
+  });
 });
diff --git a/packages/backend-common/src/reading/FetchUrlReader.ts b/packages/backend-common/src/reading/FetchUrlReader.ts
index 30468158aa..732d3b9f59 100644
--- a/packages/backend-common/src/reading/FetchUrlReader.ts
+++ b/packages/backend-common/src/reading/FetchUrlReader.ts
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
+import { NotFoundError, NotModifiedError } from '@backstage/errors';
 import fetch from 'cross-fetch';
-import { NotFoundError } from '@backstage/errors';
 import {
   ReaderFactory,
   ReadTreeResponse,
@@ -27,6 +27,8 @@ import {
 
 /**
  * A UrlReader that does a plain fetch of the URL.
+ *
+ * @public
  */
 export class FetchUrlReader implements UrlReader {
   /**
@@ -57,15 +59,34 @@ export class FetchUrlReader implements UrlReader {
   };
 
   async read(url: string): Promise<Buffer> {
+    const response = await this.readUrl(url);
+    return response.buffer();
+  }
+
+  async readUrl(
+    url: string,
+    options?: ReadUrlOptions,
+  ): Promise<ReadUrlResponse> {
     let response: Response;
     try {
-      response = await fetch(url);
+      response = await fetch(url, {
+        headers: {
+          ...(options?.etag && { 'If-None-Match': options.etag }),
+        },
+      });
     } catch (e) {
       throw new Error(`Unable to read ${url}, ${e}`);
     }
 
+    if (response.status === 304) {
+      throw new NotModifiedError();
+    }
+
     if (response.ok) {
-      return Buffer.from(await response.text());
+      return {
+        buffer: async () => Buffer.from(await response.arrayBuffer()),
+        etag: response.headers.get('ETag') ?? undefined,
+      };
     }
 
     const message = `could not read ${url}, ${response.status} ${response.statusText}`;
@@ -75,15 +96,6 @@ export class FetchUrlReader implements UrlReader {
     throw new Error(message);
   }
 
-  async readUrl(
-    url: string,
-    _options?: ReadUrlOptions,
-  ): Promise<ReadUrlResponse> {
-    // TODO etag is not implemented yet.
-    const buffer = await this.read(url);
-    return { buffer: async () => buffer };
-  }
-
   async readTree(): Promise<ReadTreeResponse> {
     throw new Error('FetchUrlReader does not implement readTree');
   }
diff --git a/packages/backend-common/src/reading/GithubUrlReader.test.ts b/packages/backend-common/src/reading/GithubUrlReader.test.ts
index c8002cd3ce..f9717a862a 100644
--- a/packages/backend-common/src/reading/GithubUrlReader.test.ts
+++ b/packages/backend-common/src/reading/GithubUrlReader.test.ts
@@ -41,9 +41,9 @@ const treeResponseFactory = DefaultReadTreeResponseFactory.create({
   config: new ConfigReader({}),
 });
 
-const mockCredentialsProvider = ({
+const mockCredentialsProvider = {
   getCredentials: jest.fn().mockResolvedValue({ headers: {} }),
-} as unknown) as GithubCredentialsProvider;
+} as unknown as GithubCredentialsProvider;
 
 const githubProcessor = new GithubUrlReader(
   new GitHubIntegration(
diff --git a/packages/backend-common/src/reading/GithubUrlReader.ts b/packages/backend-common/src/reading/GithubUrlReader.ts
index bccddc6838..1eed5764ef 100644
--- a/packages/backend-common/src/reading/GithubUrlReader.ts
+++ b/packages/backend-common/src/reading/GithubUrlReader.ts
@@ -39,14 +39,20 @@ import {
   ReadUrlResponse,
 } from './types';
 
-export type GhRepoResponse = RestEndpointMethodTypes['repos']['get']['response']['data'];
-export type GhBranchResponse = RestEndpointMethodTypes['repos']['getBranch']['response']['data'];
-export type GhTreeResponse = RestEndpointMethodTypes['git']['getTree']['response']['data'];
-export type GhBlobResponse = RestEndpointMethodTypes['git']['getBlob']['response']['data'];
+export type GhRepoResponse =
+  RestEndpointMethodTypes['repos']['get']['response']['data'];
+export type GhBranchResponse =
+  RestEndpointMethodTypes['repos']['getBranch']['response']['data'];
+export type GhTreeResponse =
+  RestEndpointMethodTypes['git']['getTree']['response']['data'];
+export type GhBlobResponse =
+  RestEndpointMethodTypes['git']['getBlob']['response']['data'];
 
 /**
  * A processor that adds the ability to read files from GitHub v3 APIs, such as
  * the one exposed by GitHub itself.
+ *
+ * @public
  */
 export class GithubUrlReader implements UrlReader {
   static factory: ReaderFactory = ({ config, treeResponseFactory }) => {
@@ -87,15 +93,20 @@ export class GithubUrlReader implements UrlReader {
     url: string,
     options?: ReadUrlOptions,
   ): Promise<ReadUrlResponse> {
-    const ghUrl = getGitHubFileFetchUrl(url, this.integration.config);
-    const { headers } = await this.deps.credentialsProvider.getCredentials({
+    const credentials = await this.deps.credentialsProvider.getCredentials({
       url,
     });
+    const ghUrl = getGitHubFileFetchUrl(
+      url,
+      this.integration.config,
+      credentials,
+    );
+
     let response: Response;
     try {
-      response = await fetch(ghUrl.toString(), {
+      response = await fetch(ghUrl, {
         headers: {
-          ...headers,
+          ...credentials?.headers,
           ...(options?.etag && { 'If-None-Match': options.etag }),
           Accept: 'application/vnd.github.v3.raw',
         },
@@ -110,7 +121,7 @@ export class GithubUrlReader implements UrlReader {
 
     if (response.ok) {
       return {
-        buffer: async () => Buffer.from(await response.text()),
+        buffer: async () => Buffer.from(await response.arrayBuffer()),
         etag: response.headers.get('ETag') ?? undefined,
       };
     }
@@ -195,7 +206,7 @@ export class GithubUrlReader implements UrlReader {
     return await this.deps.treeResponseFactory.fromTarArchive({
       // TODO(Rugvip): Underlying implementation of fetch will be node-fetch, we probably want
       //               to stick to using that in exclusively backend code.
-      stream: (archive.body as unknown) as Readable,
+      stream: archive.body as unknown as Readable,
       subpath,
       etag: sha,
       filter: options?.filter,
@@ -258,9 +269,7 @@ export class GithubUrlReader implements UrlReader {
     }));
   }
 
-  private async getRepoDetails(
-    url: string,
-  ): Promise<{
+  private async getRepoDetails(url: string): Promise<{
     repo: GhRepoResponse;
     branch: GhBranchResponse;
   }> {
diff --git a/packages/backend-common/src/reading/GitlabUrlReader.test.ts b/packages/backend-common/src/reading/GitlabUrlReader.test.ts
index 945444d8ed..51b211e698 100644
--- a/packages/backend-common/src/reading/GitlabUrlReader.test.ts
+++ b/packages/backend-common/src/reading/GitlabUrlReader.test.ts
@@ -108,36 +108,30 @@ describe('GitlabUrlReader', () => {
     it.each([
       // Project URLs
       {
-        url:
-          'https://gitlab.com/groupA/teams/teamA/subgroupA/repoA/-/blob/branch/my/path/to/file.yaml',
+        url: 'https://gitlab.com/groupA/teams/teamA/subgroupA/repoA/-/blob/branch/my/path/to/file.yaml',
         config: createConfig(),
         response: expect.objectContaining({
-          url:
-            'https://gitlab.com/api/v4/projects/12345/repository/files/my%2Fpath%2Fto%2Ffile.yaml/raw?ref=branch',
+          url: 'https://gitlab.com/api/v4/projects/12345/repository/files/my%2Fpath%2Fto%2Ffile.yaml/raw?ref=branch',
           headers: expect.objectContaining({
             'private-token': '',
           }),
         }),
       },
       {
-        url:
-          'https://gitlab.example.com/groupA/teams/teamA/subgroupA/repoA/-/blob/branch/my/path/to/file.yaml',
+        url: 'https://gitlab.example.com/groupA/teams/teamA/subgroupA/repoA/-/blob/branch/my/path/to/file.yaml',
         config: createConfig('0123456789'),
         response: expect.objectContaining({
-          url:
-            'https://gitlab.example.com/api/v4/projects/12345/repository/files/my%2Fpath%2Fto%2Ffile.yaml/raw?ref=branch',
+          url: 'https://gitlab.example.com/api/v4/projects/12345/repository/files/my%2Fpath%2Fto%2Ffile.yaml/raw?ref=branch',
           headers: expect.objectContaining({
             'private-token': '0123456789',
           }),
         }),
       },
       {
-        url:
-          'https://gitlab.com/groupA/teams/teamA/repoA/-/blob/branch/my/path/to/file.yaml', // Repo not in subgroup
+        url: 'https://gitlab.com/groupA/teams/teamA/repoA/-/blob/branch/my/path/to/file.yaml', // Repo not in subgroup
         config: createConfig(),
         response: expect.objectContaining({
-          url:
-            'https://gitlab.com/api/v4/projects/12345/repository/files/my%2Fpath%2Fto%2Ffile.yaml/raw?ref=branch',
+          url: 'https://gitlab.com/api/v4/projects/12345/repository/files/my%2Fpath%2Fto%2Ffile.yaml/raw?ref=branch',
         }),
       },
 
diff --git a/packages/backend-common/src/reading/GitlabUrlReader.ts b/packages/backend-common/src/reading/GitlabUrlReader.ts
index 6c272471e2..b78add6916 100644
--- a/packages/backend-common/src/reading/GitlabUrlReader.ts
+++ b/packages/backend-common/src/reading/GitlabUrlReader.ts
@@ -38,6 +38,7 @@ import {
   ReadUrlOptions,
 } from './types';
 
+/** @public */
 export class GitlabUrlReader implements UrlReader {
   static factory: ReaderFactory = ({ config, treeResponseFactory }) => {
     const integrations = ScmIntegrations.fromConfig(config);
@@ -84,7 +85,7 @@ export class GitlabUrlReader implements UrlReader {
 
     if (response.ok) {
       return {
-        buffer: async () => Buffer.from(await response.text()),
+        buffer: async () => Buffer.from(await response.arrayBuffer()),
         etag: response.headers.get('ETag') ?? undefined,
       };
     }
@@ -170,7 +171,7 @@ export class GitlabUrlReader implements UrlReader {
     }
 
     return await this.deps.treeResponseFactory.fromTarArchive({
-      stream: (archiveGitLabResponse.body as unknown) as Readable,
+      stream: archiveGitLabResponse.body as unknown as Readable,
       subpath: filepath,
       etag: commitSha,
       filter: options?.filter,
diff --git a/packages/backend-common/src/reading/GoogleGcsUrlReader.ts b/packages/backend-common/src/reading/GoogleGcsUrlReader.ts
index 9f3fbad302..f1684c2945 100644
--- a/packages/backend-common/src/reading/GoogleGcsUrlReader.ts
+++ b/packages/backend-common/src/reading/GoogleGcsUrlReader.ts
@@ -48,6 +48,7 @@ const parseURL = (
   };
 };
 
+/** @public */
 export class GoogleGcsUrlReader implements UrlReader {
   static factory: ReaderFactory = ({ config, logger }) => {
     if (!config.has('integrations.googleGcs')) {
diff --git a/packages/backend-common/src/reading/UrlReaderPredicateMux.ts b/packages/backend-common/src/reading/UrlReaderPredicateMux.ts
index 4a166cb517..bbe94a0fb4 100644
--- a/packages/backend-common/src/reading/UrlReaderPredicateMux.ts
+++ b/packages/backend-common/src/reading/UrlReaderPredicateMux.ts
@@ -52,7 +52,11 @@ export class UrlReaderPredicateMux implements UrlReader {
       }
     }
 
-    throw new NotAllowedError(`Reading from '${url}' is not allowed`);
+    throw new NotAllowedError(
+      `Reading from '${url}' is not allowed. ` +
+        `You may need to configure an integration for the target host, or add it ` +
+        `to the configured list of allowed hosts at 'backend.reading.allow'`,
+    );
   }
 
   async readUrl(
diff --git a/packages/backend-common/src/reading/UrlReaders.ts b/packages/backend-common/src/reading/UrlReaders.ts
index 2b3a2f166c..7120a9570f 100644
--- a/packages/backend-common/src/reading/UrlReaders.ts
+++ b/packages/backend-common/src/reading/UrlReaders.ts
@@ -25,8 +25,10 @@ import { GitlabUrlReader } from './GitlabUrlReader';
 import { DefaultReadTreeResponseFactory } from './tree';
 import { FetchUrlReader } from './FetchUrlReader';
 import { GoogleGcsUrlReader } from './GoogleGcsUrlReader';
+import { AwsS3UrlReader } from './AwsS3UrlReader';
 
-type CreateOptions = {
+/** @public */
+export type UrlReadersOptions = {
   /** Root config object */
   config: Config;
   /** Logger used by all the readers */
@@ -37,12 +39,14 @@ type CreateOptions = {
 
 /**
  * UrlReaders provide various utilities related to the UrlReader interface.
+ *
+ * @public
  */
 export class UrlReaders {
   /**
    * Creates a UrlReader without any known types.
    */
-  static create({ logger, config, factories }: CreateOptions): UrlReader {
+  static create({ logger, config, factories }: UrlReadersOptions): UrlReader {
     const mux = new UrlReaderPredicateMux(logger);
     const treeResponseFactory = DefaultReadTreeResponseFactory.create({
       config,
@@ -64,7 +68,7 @@ export class UrlReaders {
    *
    * Any additional factories passed will be loaded before the default ones.
    */
-  static default({ logger, config, factories = [] }: CreateOptions) {
+  static default({ logger, config, factories = [] }: UrlReadersOptions) {
     return UrlReaders.create({
       logger,
       config,
@@ -74,6 +78,7 @@ export class UrlReaders {
         GithubUrlReader.factory,
         GitlabUrlReader.factory,
         GoogleGcsUrlReader.factory,
+        AwsS3UrlReader.factory,
         FetchUrlReader.factory,
       ]),
     });
diff --git a/packages/backend-common/src/reading/__fixtures__/awsS3-mock-object.yaml b/packages/backend-common/src/reading/__fixtures__/awsS3-mock-object.yaml
new file mode 100644
index 0000000000..7470c0e8a3
--- /dev/null
+++ b/packages/backend-common/src/reading/__fixtures__/awsS3-mock-object.yaml
@@ -0,0 +1 @@
+site_name: Test
diff --git a/packages/backend-common/src/reading/__fixtures__/mock-main.zip b/packages/backend-common/src/reading/__fixtures__/mock-main.zip
index beee59d3a0..ae362448fc 100644
Binary files a/packages/backend-common/src/reading/__fixtures__/mock-main.zip and b/packages/backend-common/src/reading/__fixtures__/mock-main.zip differ
diff --git a/packages/backend-common/src/reading/__fixtures__/mock-with-extra-root-dir.zip b/packages/backend-common/src/reading/__fixtures__/mock-with-extra-root-dir.zip
new file mode 100644
index 0000000000..beee59d3a0
Binary files /dev/null and b/packages/backend-common/src/reading/__fixtures__/mock-with-extra-root-dir.zip differ
diff --git a/packages/backend-common/src/reading/index.ts b/packages/backend-common/src/reading/index.ts
index 4c601556d7..097f604987 100644
--- a/packages/backend-common/src/reading/index.ts
+++ b/packages/backend-common/src/reading/index.ts
@@ -19,10 +19,20 @@ export { BitbucketUrlReader } from './BitbucketUrlReader';
 export { GithubUrlReader } from './GithubUrlReader';
 export { GitlabUrlReader } from './GitlabUrlReader';
 export type {
+  ReaderFactory,
+  ReadTreeOptions,
   ReadTreeResponse,
+  ReadTreeResponseFactory,
   ReadTreeResponseFile,
+  ReadTreeResponseDirOptions,
+  ReadTreeResponseFactoryOptions,
+  ReadUrlOptions,
+  ReadUrlResponse,
+  SearchOptions,
   SearchResponse,
   SearchResponseFile,
   UrlReader,
+  UrlReaderPredicateTuple,
 } from './types';
 export { UrlReaders } from './UrlReaders';
+export type { UrlReadersOptions } from './UrlReaders';
diff --git a/packages/backend-common/src/reading/tree/ReadTreeResponseFactory.ts b/packages/backend-common/src/reading/tree/ReadTreeResponseFactory.ts
index 912fddf965..5fdd633102 100644
--- a/packages/backend-common/src/reading/tree/ReadTreeResponseFactory.ts
+++ b/packages/backend-common/src/reading/tree/ReadTreeResponseFactory.ts
@@ -18,7 +18,7 @@ import os from 'os';
 import { Config } from '@backstage/config';
 import {
   ReadTreeResponse,
-  FromArchiveOptions,
+  ReadTreeResponseFactoryOptions,
   ReadTreeResponseFactory,
 } from '../types';
 import { TarArchiveResponse } from './TarArchiveResponse';
@@ -34,7 +34,9 @@ export class DefaultReadTreeResponseFactory implements ReadTreeResponseFactory {
 
   constructor(private readonly workDir: string) {}
 
-  async fromTarArchive(options: FromArchiveOptions): Promise<ReadTreeResponse> {
+  async fromTarArchive(
+    options: ReadTreeResponseFactoryOptions,
+  ): Promise<ReadTreeResponse> {
     return new TarArchiveResponse(
       options.stream,
       options.subpath ?? '',
@@ -44,7 +46,9 @@ export class DefaultReadTreeResponseFactory implements ReadTreeResponseFactory {
     );
   }
 
-  async fromZipArchive(options: FromArchiveOptions): Promise<ReadTreeResponse> {
+  async fromZipArchive(
+    options: ReadTreeResponseFactoryOptions,
+  ): Promise<ReadTreeResponse> {
     return new ZipArchiveResponse(
       options.stream,
       options.subpath ?? '',
diff --git a/packages/backend-common/src/reading/tree/TarArchiveResponse.ts b/packages/backend-common/src/reading/tree/TarArchiveResponse.ts
index a81add58f7..f7ab7f5349 100644
--- a/packages/backend-common/src/reading/tree/TarArchiveResponse.ts
+++ b/packages/backend-common/src/reading/tree/TarArchiveResponse.ts
@@ -28,7 +28,7 @@ import {
 import { stripFirstDirectoryFromPath } from './util';
 
 // Tar types for `Parse` is not a proper constructor, but it should be
-const TarParseStream = (Parse as unknown) as { new (): ParseStream };
+const TarParseStream = Parse as unknown as { new (): ParseStream };
 
 const pipeline = promisify(pipelineCb);
 
@@ -43,7 +43,7 @@ export class TarArchiveResponse implements ReadTreeResponse {
     private readonly subPath: string,
     private readonly workDir: string,
     public readonly etag: string,
-    private readonly filter?: (path: string) => boolean,
+    private readonly filter?: (path: string, info: { size: number }) => boolean,
   ) {
     if (subPath) {
       if (!subPath.endsWith('/')) {
@@ -92,7 +92,7 @@ export class TarArchiveResponse implements ReadTreeResponse {
 
       const path = relativePath.slice(this.subPath.length);
       if (this.filter) {
-        if (!this.filter(path)) {
+        if (!this.filter(path, { size: entry.remain })) {
           entry.resume();
           return;
         }
@@ -155,7 +155,7 @@ export class TarArchiveResponse implements ReadTreeResponse {
       tar.extract({
         strip,
         cwd: dir,
-        filter: path => {
+        filter: (path, stat) => {
           // File path relative to the root extracted directory. Will remove the
           // top level dir name from the path since its name is hard to predetermine.
           const relativePath = stripFirstDirectoryFromPath(path);
@@ -164,7 +164,7 @@ export class TarArchiveResponse implements ReadTreeResponse {
           }
           if (this.filter) {
             const innerPath = path.split('/').slice(strip).join('/');
-            return this.filter(innerPath);
+            return this.filter(innerPath, { size: stat.size });
           }
           return true;
         },
diff --git a/packages/backend-common/src/reading/tree/ZipArchiveResponse.test.ts b/packages/backend-common/src/reading/tree/ZipArchiveResponse.test.ts
index 659875286e..a54bac0c4a 100644
--- a/packages/backend-common/src/reading/tree/ZipArchiveResponse.test.ts
+++ b/packages/backend-common/src/reading/tree/ZipArchiveResponse.test.ts
@@ -22,11 +22,15 @@ import { ZipArchiveResponse } from './ZipArchiveResponse';
 const archiveData = fs.readFileSync(
   resolvePath(__filename, '../../__fixtures__/mock-main.zip'),
 );
+const archiveDataWithExtraDir = fs.readFileSync(
+  resolvePath(__filename, '../../__fixtures__/mock-with-extra-root-dir.zip'),
+);
 
 describe('ZipArchiveResponse', () => {
   beforeEach(() => {
     mockFs({
       '/test-archive.zip': archiveData,
+      '/test-archive-with-extra-root-dir.zip': archiveDataWithExtraDir,
       '/tmp': mockFs.directory(),
     });
   });
diff --git a/packages/backend-common/src/reading/tree/ZipArchiveResponse.ts b/packages/backend-common/src/reading/tree/ZipArchiveResponse.ts
index 45c6880a55..e07cedde87 100644
--- a/packages/backend-common/src/reading/tree/ZipArchiveResponse.ts
+++ b/packages/backend-common/src/reading/tree/ZipArchiveResponse.ts
@@ -24,7 +24,6 @@ import {
   ReadTreeResponseDirOptions,
   ReadTreeResponseFile,
 } from '../types';
-import { stripFirstDirectoryFromPath } from './util';
 
 /**
  * Wraps a zip archive stream into a tree response reader.
@@ -37,7 +36,7 @@ export class ZipArchiveResponse implements ReadTreeResponse {
     private readonly subPath: string,
     private readonly workDir: string,
     public readonly etag: string,
-    private readonly filter?: (path: string) => boolean,
+    private readonly filter?: (path: string, info: { size: number }) => boolean,
   ) {
     if (subPath) {
       if (!subPath.endsWith('/')) {
@@ -67,15 +66,17 @@ export class ZipArchiveResponse implements ReadTreeResponse {
   }
 
   private shouldBeIncluded(entry: Entry): boolean {
-    const strippedPath = stripFirstDirectoryFromPath(entry.path);
-
     if (this.subPath) {
-      if (!strippedPath.startsWith(this.subPath)) {
+      if (!entry.path.startsWith(this.subPath)) {
         return false;
       }
     }
     if (this.filter) {
-      return this.filter(this.getInnerPath(entry.path));
+      return this.filter(this.getInnerPath(entry.path), {
+        size:
+          (entry.vars as { uncompressedSize?: number }).uncompressedSize ??
+          entry.vars.compressedSize,
+      });
     }
     return true;
   }
@@ -95,7 +96,7 @@ export class ZipArchiveResponse implements ReadTreeResponse {
 
         if (this.shouldBeIncluded(entry)) {
           files.push({
-            path: this.getInnerPath(stripFirstDirectoryFromPath(entry.path)),
+            path: this.getInnerPath(entry.path),
             content: () => entry.buffer(),
           });
         } else {
@@ -143,9 +144,7 @@ export class ZipArchiveResponse implements ReadTreeResponse {
         // Ignore directory entries since we handle that with the file entries
         // as a zip can have files with directories without directory entries
         if (entry.type === 'File' && this.shouldBeIncluded(entry)) {
-          const entryPath = this.getInnerPath(
-            stripFirstDirectoryFromPath(entry.path),
-          );
+          const entryPath = this.getInnerPath(entry.path);
           const dirname = platformPath.dirname(entryPath);
           if (dirname) {
             await fs.mkdirp(platformPath.join(dir, dirname));
diff --git a/packages/backend-common/src/reading/types.ts b/packages/backend-common/src/reading/types.ts
index 8efc833ead..b7e1ff823f 100644
--- a/packages/backend-common/src/reading/types.ts
+++ b/packages/backend-common/src/reading/types.ts
@@ -20,6 +20,8 @@ import { Config } from '@backstage/config';
 
 /**
  * A generic interface for fetching plain data from URLs.
+ *
+ * @public
  */
 export type UrlReader = {
   /* Used to read a single file and return its content. */
@@ -39,6 +41,7 @@ export type UrlReader = {
   search(url: string, options?: SearchOptions): Promise<SearchResponse>;
 };
 
+/** @public */
 export type UrlReaderPredicateTuple = {
   predicate: (url: URL) => boolean;
   reader: UrlReader;
@@ -47,6 +50,8 @@ export type UrlReaderPredicateTuple = {
 /**
  * A factory function that can read config to construct zero or more
  * UrlReaders along with a predicate for when it should be used.
+ *
+ * @public
  */
 export type ReaderFactory = (options: {
   config: Config;
@@ -56,6 +61,8 @@ export type ReaderFactory = (options: {
 
 /**
  * An options object for readUrl operations.
+ *
+ * @public
  */
 export type ReadUrlOptions = {
   /**
@@ -74,6 +81,8 @@ export type ReadUrlOptions = {
 
 /**
  * A response object for readUrl operations.
+ *
+ * @public
  */
 export type ReadUrlResponse = {
   /**
@@ -90,6 +99,8 @@ export type ReadUrlResponse = {
 
 /**
  * An options object for readTree operations.
+ *
+ * @public
  */
 export type ReadTreeOptions = {
   /**
@@ -104,7 +115,7 @@ export type ReadTreeOptions = {
    *
    * If no filter is provided all files are extracted.
    */
-  filter?(path: string): boolean;
+  filter?(path: string, info?: { size: number }): boolean;
 
   /**
    * An etag can be provided to check whether readTree's response has changed from a previous execution.
@@ -120,8 +131,16 @@ export type ReadTreeOptions = {
   etag?: string;
 };
 
+/** @public */
+export type ReadTreeResponseDirOptions = {
+  /** The directory to write files to. Defaults to the OS tmpdir or `backend.workingDirectory` if set in config */
+  targetDir?: string;
+};
+
 /**
  * A response object for readTree operations.
+ *
+ * @public
  */
 export type ReadTreeResponse = {
   /**
@@ -142,20 +161,18 @@ export type ReadTreeResponse = {
   etag: string;
 };
 
-export type ReadTreeResponseDirOptions = {
-  /** The directory to write files to. Defaults to the OS tmpdir or `backend.workingDirectory` if set in config */
-  targetDir?: string;
-};
-
 /**
  * Represents a single file in a readTree response.
+ *
+ * @public
  */
 export type ReadTreeResponseFile = {
   path: string;
   content(): Promise<Buffer>;
 };
 
-export type FromArchiveOptions = {
+/** @public */
+export type ReadTreeResponseFactoryOptions = {
   // A binary stream of a tar archive.
   stream: Readable;
   // If unset, the files at the root of the tree will be read.
@@ -164,16 +181,23 @@ export type FromArchiveOptions = {
   // etag of the blob
   etag: string;
   // Filter passed on from the ReadTreeOptions
-  filter?: (path: string) => boolean;
+  filter?: (path: string, info?: { size: number }) => boolean;
 };
 
+/** @public */
 export interface ReadTreeResponseFactory {
-  fromTarArchive(options: FromArchiveOptions): Promise<ReadTreeResponse>;
-  fromZipArchive(options: FromArchiveOptions): Promise<ReadTreeResponse>;
+  fromTarArchive(
+    options: ReadTreeResponseFactoryOptions,
+  ): Promise<ReadTreeResponse>;
+  fromZipArchive(
+    options: ReadTreeResponseFactoryOptions,
+  ): Promise<ReadTreeResponse>;
 }
 
 /**
  * An options object for search operations.
+ *
+ * @public
  */
 export type SearchOptions = {
   /**
@@ -192,6 +216,8 @@ export type SearchOptions = {
 
 /**
  * The output of a search operation.
+ *
+ * @public
  */
 export type SearchResponse = {
   /**
@@ -207,6 +233,8 @@ export type SearchResponse = {
 
 /**
  * Represents a single file in a search response.
+ *
+ * @public
  */
 export type SearchResponseFile = {
   /**
diff --git a/packages/backend-common/src/scm/git.test.ts b/packages/backend-common/src/scm/git.test.ts
index 0b70edc45d..abbafc375d 100644
--- a/packages/backend-common/src/scm/git.test.ts
+++ b/packages/backend-common/src/scm/git.test.ts
@@ -123,9 +123,9 @@ describe('Git', () => {
 
       await git.clone({ url, dir });
 
-      const { onAuth } = ((isomorphic.clone as unknown) as jest.Mock<
-        typeof isomorphic['clone']
-      >).mock.calls[0][0]!;
+      const { onAuth } = (
+        isomorphic.clone as unknown as jest.Mock<typeof isomorphic['clone']>
+      ).mock.calls[0][0]!;
 
       expect(onAuth()).toEqual(auth);
     });
@@ -190,9 +190,9 @@ describe('Git', () => {
 
       await git.fetch({ remote, dir });
 
-      const { onAuth } = ((isomorphic.fetch as unknown) as jest.Mock<
-        typeof isomorphic['fetch']
-      >).mock.calls[0][0]!;
+      const { onAuth } = (
+        isomorphic.fetch as unknown as jest.Mock<typeof isomorphic['fetch']>
+      ).mock.calls[0][0]!;
 
       expect(onAuth()).toEqual(auth);
     });
@@ -279,9 +279,9 @@ describe('Git', () => {
 
       await git.push({ remote, dir });
 
-      const { onAuth } = ((isomorphic.push as unknown) as jest.Mock<
-        typeof isomorphic['push']
-      >).mock.calls[0][0]!;
+      const { onAuth } = (
+        isomorphic.push as unknown as jest.Mock<typeof isomorphic['push']>
+      ).mock.calls[0][0]!;
 
       expect(onAuth()).toEqual(auth);
     });
diff --git a/packages/backend-common/src/scm/git.ts b/packages/backend-common/src/scm/git.ts
index e786c279a1..00b103b240 100644
--- a/packages/backend-common/src/scm/git.ts
+++ b/packages/backend-common/src/scm/git.ts
@@ -31,6 +31,8 @@ From : https://isomorphic-git.org/docs/en/onAuth with fix for GitHub
 
 Azure       'notempty'      token
 */
+
+/** @public */
 export class Git {
   private constructor(
     private readonly config: {
diff --git a/packages/backend-common/src/service/createServiceBuilder.ts b/packages/backend-common/src/service/createServiceBuilder.ts
index 17d69e7082..a6ca25415e 100644
--- a/packages/backend-common/src/service/createServiceBuilder.ts
+++ b/packages/backend-common/src/service/createServiceBuilder.ts
@@ -15,10 +15,13 @@
  */
 
 import { ServiceBuilderImpl } from './lib/ServiceBuilderImpl';
+import { ServiceBuilder } from './types';
 
 /**
  * Creates a new service builder.
+ *
+ * @public
  */
-export function createServiceBuilder(_module: NodeModule) {
+export function createServiceBuilder(_module: NodeModule): ServiceBuilder {
   return new ServiceBuilderImpl(_module);
 }
diff --git a/packages/backend-common/src/service/createStatusCheckRouter.ts b/packages/backend-common/src/service/createStatusCheckRouter.ts
index fd794cc9c4..0d0f93f25c 100644
--- a/packages/backend-common/src/service/createStatusCheckRouter.ts
+++ b/packages/backend-common/src/service/createStatusCheckRouter.ts
@@ -19,7 +19,8 @@ import Router from 'express-promise-router';
 import express from 'express';
 import { errorHandler, statusCheckHandler, StatusCheck } from '../middleware';
 
-export interface StatusCheckRouterOptions {
+/** @public */
+export async function createStatusCheckRouter(options: {
   logger: Logger;
   path?: string;
   /**
@@ -27,11 +28,7 @@ export interface StatusCheckRouterOptions {
    * Override this to implement your own logic for a health check.
    */
   statusCheck?: StatusCheck;
-}
-
-export async function createStatusCheckRouter(
-  options: StatusCheckRouterOptions,
-): Promise<express.Router> {
+}): Promise<express.Router> {
   const router = Router();
   const { path = '/healthcheck', statusCheck } = options;
 
diff --git a/packages/backend-common/src/service/index.ts b/packages/backend-common/src/service/index.ts
index 4eb0bf4a5a..d01f25fad3 100644
--- a/packages/backend-common/src/service/index.ts
+++ b/packages/backend-common/src/service/index.ts
@@ -16,4 +16,4 @@
 
 export { createServiceBuilder } from './createServiceBuilder';
 export { createStatusCheckRouter } from './createStatusCheckRouter';
-export type { ServiceBuilder } from './types';
+export type { ServiceBuilder, RequestLoggingHandlerFactory } from './types';
diff --git a/packages/backend-common/src/service/lib/ServiceBuilderImpl.ts b/packages/backend-common/src/service/lib/ServiceBuilderImpl.ts
index 380d61abc8..ed16c9c9a7 100644
--- a/packages/backend-common/src/service/lib/ServiceBuilderImpl.ts
+++ b/packages/backend-common/src/service/lib/ServiceBuilderImpl.ts
@@ -27,9 +27,9 @@ import { getRootLogger } from '../../logging';
 import {
   errorHandler,
   notFoundHandler,
-  requestLoggingHandler,
+  requestLoggingHandler as defaultRequestLoggingHandler,
 } from '../../middleware';
-import { ServiceBuilder } from '../types';
+import { RequestLoggingHandlerFactory, ServiceBuilder } from '../types';
 import {
   CspOptions,
   HttpsSettings,
@@ -65,6 +65,7 @@ export class ServiceBuilderImpl implements ServiceBuilder {
   private cspOptions: Record<string, string[] | false> | undefined;
   private httpsSettings: HttpsSettings | undefined;
   private routers: [string, Router][];
+  private requestLoggingHandler: RequestLoggingHandlerFactory | undefined;
   // Reference to the module where builder is created - needed for hot module
   // reloading
   private module: NodeModule;
@@ -144,23 +145,26 @@ export class ServiceBuilderImpl implements ServiceBuilder {
     return this;
   }
 
+  setRequestLoggingHandler(
+    requestLoggingHandler: RequestLoggingHandlerFactory,
+  ) {
+    this.requestLoggingHandler = requestLoggingHandler;
+    return this;
+  }
+
   async start(): Promise<http.Server> {
     const app = express();
-    const {
-      port,
-      host,
-      logger,
-      corsOptions,
-      httpsSettings,
-      helmetOptions,
-    } = this.getOptions();
+    const { port, host, logger, corsOptions, httpsSettings, helmetOptions } =
+      this.getOptions();
 
     app.use(helmet(helmetOptions));
     if (corsOptions) {
       app.use(cors(corsOptions));
     }
     app.use(compression());
-    app.use(requestLoggingHandler(logger));
+    app.use(
+      (this.requestLoggingHandler ?? defaultRequestLoggingHandler)(logger),
+    );
     for (const [root, route] of this.routers) {
       app.use(root, route);
     }
diff --git a/packages/backend-common/src/service/types.ts b/packages/backend-common/src/service/types.ts
index 70f62acfca..3765cbcfdd 100644
--- a/packages/backend-common/src/service/types.ts
+++ b/packages/backend-common/src/service/types.ts
@@ -14,20 +14,20 @@
  * limitations under the License.
  */
 
-import { ConfigReader } from '@backstage/config';
+import { Config } from '@backstage/config';
 import cors from 'cors';
 import { Router, RequestHandler } from 'express';
 import { Server } from 'http';
 import { Logger } from 'winston';
-import { HttpsSettings } from './lib/config';
 
+/** @public */
 export type ServiceBuilder = {
   /**
    * Sets the service parameters based on configuration.
    *
-   * @param config The configuration to read
+   * @param config - The configuration to read
    */
-  loadConfig(config: ConfigReader): ServiceBuilder;
+  loadConfig(config: Config): ServiceBuilder;
 
   /**
    * Sets the port to listen on.
@@ -36,7 +36,7 @@ export type ServiceBuilder = {
    * variable named PORT and use that if present, otherwise it picks a default
    * port (7000).
    *
-   * @param port The port to listen on
+   * @param port - The port to listen on
    */
   setPort(port: number): ServiceBuilder;
 
@@ -45,7 +45,7 @@ export type ServiceBuilder = {
    *
    * '' is express default, which listens to all interfaces.
    *
-   * @param host The host to listen on
+   * @param host - The host to listen on
    */
   setHost(host: string): ServiceBuilder;
 
@@ -54,7 +54,7 @@ export type ServiceBuilder = {
    *
    * If no logger is given, the default root logger is used.
    *
-   * @param logger A winston logger
+   * @param logger - A winston logger
    */
   setLogger(logger: Logger): ServiceBuilder;
 
@@ -64,7 +64,7 @@ export type ServiceBuilder = {
    * If this method is not called, the resulting service will not have any
    * built in CORS handling.
    *
-   * @param options Standard CORS options
+   * @param options - Standard CORS options
    */
   enableCors(options: cors.CorsOptions): ServiceBuilder;
 
@@ -73,20 +73,36 @@ export type ServiceBuilder = {
    *
    * If this method is not called, the resulting service will use sensible defaults
    *
-   * @param options Standard certificate options
+   * @param options - Standard certificate options
    */
-  setHttpsSettings(settings: HttpsSettings): ServiceBuilder;
+  setHttpsSettings(settings: {
+    certificate: { key: string; cert: string } | { hostname: string };
+  }): ServiceBuilder;
 
   /**
    * Adds a router (similar to the express .use call) to the service.
    *
-   * @param root The root URL to bind to (e.g. "/api/function1")
-   * @param router An express router
+   * @param root - The root URL to bind to (e.g. "/api/function1")
+   * @param router - An express router
    */
   addRouter(root: string, router: Router | RequestHandler): ServiceBuilder;
 
+  /**
+   * Set the request logging handler
+   *
+   * If no handler is given the default one is used
+   *
+   * @param requestLoggingHandler - a factory function that given a logger returns an handler
+   */
+  setRequestLoggingHandler(
+    requestLoggingHandler: RequestLoggingHandlerFactory,
+  ): ServiceBuilder;
+
   /**
    * Starts the server using the given settings.
    */
   start(): Promise<Server>;
 };
+
+/** @public */
+export type RequestLoggingHandlerFactory = (logger?: Logger) => RequestHandler;
diff --git a/packages/backend-common/src/util/ContainerRunner.ts b/packages/backend-common/src/util/ContainerRunner.ts
index 80ac4e3954..be861501c3 100644
--- a/packages/backend-common/src/util/ContainerRunner.ts
+++ b/packages/backend-common/src/util/ContainerRunner.ts
@@ -16,6 +16,7 @@
 
 import { Writable } from 'stream';
 
+/** @public */
 export type RunContainerOptions = {
   imageName: string;
   command?: string | string[];
@@ -24,8 +25,10 @@ export type RunContainerOptions = {
   mountDirs?: Record<string, string>;
   workingDir?: string;
   envVars?: Record<string, string>;
+  pullImage?: boolean;
 };
 
+/** @public */
 export interface ContainerRunner {
   runContainer(opts: RunContainerOptions): Promise<void>;
 }
diff --git a/packages/backend-common/src/util/DockerContainerRunner.test.ts b/packages/backend-common/src/util/DockerContainerRunner.test.ts
index 0ed41d5cd3..8833e4518b 100644
--- a/packages/backend-common/src/util/DockerContainerRunner.test.ts
+++ b/packages/backend-common/src/util/DockerContainerRunner.test.ts
@@ -58,6 +58,7 @@ describe('DockerContainerRunner', () => {
   });
 
   afterEach(() => {
+    jest.clearAllMocks();
     mockFs.restore();
   });
 
@@ -86,6 +87,17 @@ describe('DockerContainerRunner', () => {
     expect(mockDocker.run).toHaveBeenCalled();
   });
 
+  it('should not pull the docker container when pullImage is false', async () => {
+    await containerTaskApi.runContainer({
+      imageName,
+      args,
+      pullImage: false,
+    });
+
+    expect(mockDocker.pull).not.toHaveBeenCalled();
+    expect(mockDocker.run).toHaveBeenCalled();
+  });
+
   it('should call the dockerClient run command with the correct arguments passed through', async () => {
     await containerTaskApi.runContainer({
       imageName,
diff --git a/packages/backend-common/src/util/DockerContainerRunner.ts b/packages/backend-common/src/util/DockerContainerRunner.ts
index 6ec366eb94..da3ce66ec2 100644
--- a/packages/backend-common/src/util/DockerContainerRunner.ts
+++ b/packages/backend-common/src/util/DockerContainerRunner.ts
@@ -23,6 +23,7 @@ export type UserOptions = {
   User?: string;
 };
 
+/** @public */
 export class DockerContainerRunner implements ContainerRunner {
   private readonly dockerClient: Docker;
 
@@ -38,6 +39,7 @@ export class DockerContainerRunner implements ContainerRunner {
     mountDirs = {},
     workingDir,
     envVars = {},
+    pullImage = true,
   }: RunContainerOptions) {
     // Show a better error message when Docker is unavailable.
     try {
@@ -48,15 +50,17 @@ export class DockerContainerRunner implements ContainerRunner {
       );
     }
 
-    await new Promise<void>((resolve, reject) => {
-      this.dockerClient.pull(imageName, {}, (err, stream) => {
-        if (err) return reject(err);
-        stream.pipe(logStream, { end: false });
-        stream.on('end', () => resolve());
-        stream.on('error', (error: Error) => reject(error));
-        return undefined;
+    if (pullImage) {
+      await new Promise<void>((resolve, reject) => {
+        this.dockerClient.pull(imageName, {}, (err, stream) => {
+          if (err) return reject(err);
+          stream.pipe(logStream, { end: false });
+          stream.on('end', () => resolve());
+          stream.on('error', (error: Error) => reject(error));
+          return undefined;
+        });
       });
-    });
+    }
 
     const userOptions: UserOptions = {};
     if (process.getuid && process.getgid) {
@@ -89,18 +93,17 @@ export class DockerContainerRunner implements ContainerRunner {
       Env.push(`${key}=${value}`);
     }
 
-    const [
-      { Error: error, StatusCode: statusCode },
-    ] = await this.dockerClient.run(imageName, args, logStream, {
-      Volumes,
-      HostConfig: {
-        Binds,
-      },
-      ...(workingDir ? { WorkingDir: workingDir } : {}),
-      Entrypoint: command,
-      Env,
-      ...userOptions,
-    } as Docker.ContainerCreateOptions);
+    const [{ Error: error, StatusCode: statusCode }] =
+      await this.dockerClient.run(imageName, args, logStream, {
+        Volumes,
+        HostConfig: {
+          Binds,
+        },
+        ...(workingDir ? { WorkingDir: workingDir } : {}),
+        Entrypoint: command,
+        Env,
+        ...userOptions,
+      } as Docker.ContainerCreateOptions);
 
     if (error) {
       throw new Error(
diff --git a/packages/backend-test-utils/CHANGELOG.md b/packages/backend-test-utils/CHANGELOG.md
index 2faa5afbc3..6e10d188df 100644
--- a/packages/backend-test-utils/CHANGELOG.md
+++ b/packages/backend-test-utils/CHANGELOG.md
@@ -1,5 +1,33 @@
 # @backstage/backend-test-utils
 
+## 0.1.7
+
+### Patch Changes
+
+- d1da88a19: Properly export all used types.
+- Updated dependencies
+  - @backstage/config@0.1.9
+  - @backstage/backend-common@0.9.2
+  - @backstage/cli@0.7.11
+
+## 0.1.6
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.9.0
+  - @backstage/config@0.1.8
+
+## 0.1.5
+
+### Patch Changes
+
+- 524045758: Make sure that the unique databases names generated by `TestDatabases.create()`
+  don't collide.
+- Updated dependencies
+  - @backstage/backend-common@0.8.9
+  - @backstage/cli@0.7.8
+
 ## 0.1.4
 
 ### Patch Changes
diff --git a/packages/backend-test-utils/package.json b/packages/backend-test-utils/package.json
index 9ec11a58b7..1713f05d25 100644
--- a/packages/backend-test-utils/package.json
+++ b/packages/backend-test-utils/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@backstage/backend-test-utils",
   "description": "Test helpers library for Backstage backends",
-  "version": "0.1.4",
+  "version": "0.1.7",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "private": false,
@@ -30,9 +30,9 @@
     "clean": "backstage-cli clean"
   },
   "dependencies": {
-    "@backstage/backend-common": "^0.8.5",
-    "@backstage/cli": "^0.7.1",
-    "@backstage/config": "^0.1.5",
+    "@backstage/backend-common": "^0.9.2",
+    "@backstage/cli": "^0.7.11",
+    "@backstage/config": "^0.1.9",
     "knex": "^0.95.1",
     "mysql2": "^2.2.5",
     "pg": "^8.3.0",
@@ -41,7 +41,7 @@
     "uuid": "^8.0.0"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.7.1",
+    "@backstage/cli": "^0.7.11",
     "jest": "^26.0.1"
   },
   "files": [
diff --git a/packages/backend-test-utils/src/database/TestDatabases.test.ts b/packages/backend-test-utils/src/database/TestDatabases.test.ts
index 62612f3fcc..000e047c4d 100644
--- a/packages/backend-test-utils/src/database/TestDatabases.test.ts
+++ b/packages/backend-test-utils/src/database/TestDatabases.test.ts
@@ -71,7 +71,7 @@ describe('TestDatabases', () => {
         await input.insert({ x: 'y' }).into('a');
 
         // Look for the mark
-        const database = 'backstage_plugin_db0';
+        const database = input.client.config.connection.database;
         const output = knexFactory({
           client: 'pg',
           connection: { host, port, user, password, database },
@@ -105,7 +105,7 @@ describe('TestDatabases', () => {
         await input.insert({ x: 'y' }).into('a');
 
         // Look for the mark
-        const database = 'backstage_plugin_db0';
+        const database = input.client.config.connection.database;
         const output = knexFactory({
           client: 'pg',
           connection: { host, port, user, password, database },
@@ -139,7 +139,7 @@ describe('TestDatabases', () => {
         await input.insert({ x: 'y' }).into('a');
 
         // Look for the mark
-        const database = 'backstage_plugin_db0';
+        const database = input.client.config.connection.database;
         const output = knexFactory({
           client: 'mysql2',
           connection: { host, port, user, password, database },
diff --git a/packages/backend-test-utils/src/database/TestDatabases.ts b/packages/backend-test-utils/src/database/TestDatabases.ts
index c35202354d..243c6bbe52 100644
--- a/packages/backend-test-utils/src/database/TestDatabases.ts
+++ b/packages/backend-test-utils/src/database/TestDatabases.ts
@@ -16,6 +16,7 @@
 
 import { DatabaseManager } from '@backstage/backend-common';
 import { ConfigReader } from '@backstage/config';
+import { randomBytes } from 'crypto';
 import { Knex } from 'knex';
 import { isDockerDisabledForTests } from '../util/isDockerDisabledForTests';
 import { startMysqlContainer } from './startMysqlContainer';
@@ -30,11 +31,12 @@ import {
 /**
  * Encapsulates the creation of ephemeral test database instances for use
  * inside unit or integration tests.
+ *
+ * @public
  */
 export class TestDatabases {
   private readonly instanceById: Map<string, Instance>;
   private readonly supportedIds: TestDatabaseId[];
-  private lastDatabaseIndex: number;
 
   /**
    * Creates an empty `TestDatabases` instance, and sets up Jest to clean up
@@ -99,7 +101,6 @@ export class TestDatabases {
   private constructor(supportedIds: TestDatabaseId[]) {
     this.instanceById = new Map();
     this.supportedIds = supportedIds;
-    this.lastDatabaseIndex = 0;
   }
 
   supports(id: TestDatabaseId): boolean {
@@ -114,7 +115,7 @@ export class TestDatabases {
    * Returns a fresh, unique, empty logical database on an instance of the
    * given database ID platform.
    *
-   * @param id The ID of the database platform to use, e.g. 'POSTGRES_13'
+   * @param id - The ID of the database platform to use, e.g. 'POSTGRES_13'
    * @returns A `Knex` connection object
    */
   async init(id: TestDatabaseId): Promise<Knex> {
@@ -142,7 +143,7 @@ export class TestDatabases {
 
     // Ensure that a unique logical database is created in the instance
     const connection = await instance.databaseManager
-      .forPlugin(String(`db${this.lastDatabaseIndex++}`))
+      .forPlugin(`db${randomBytes(16).toString('hex')}`)
       .getClient();
 
     instance.connections.push(connection);
diff --git a/packages/backend-test-utils/src/database/types.ts b/packages/backend-test-utils/src/database/types.ts
index b5516a19c0..d405f73738 100644
--- a/packages/backend-test-utils/src/database/types.ts
+++ b/packages/backend-test-utils/src/database/types.ts
@@ -19,6 +19,8 @@ import { Knex } from 'knex';
 
 /**
  * The possible databases to test against.
+ *
+ * @public
  */
 export type TestDatabaseId =
   | 'POSTGRES_13'
@@ -38,33 +40,31 @@ export type Instance = {
   databaseManager: DatabaseManager;
   connections: Array<Knex>;
 };
-export const allDatabases: Record<
-  TestDatabaseId,
-  TestDatabaseProperties
-> = Object.freeze({
-  POSTGRES_13: {
-    name: 'Postgres 13.x',
-    driver: 'pg',
-    dockerImageName: 'postgres:13',
-    connectionStringEnvironmentVariableName:
-      'BACKSTAGE_TEST_DATABASE_POSTGRES13_CONNECTION_STRING',
-  },
-  POSTGRES_9: {
-    name: 'Postgres 9.x',
-    driver: 'pg',
-    dockerImageName: 'postgres:9',
-    connectionStringEnvironmentVariableName:
-      'BACKSTAGE_TEST_DATABASE_POSTGRES9_CONNECTION_STRING',
-  },
-  MYSQL_8: {
-    name: 'MySQL 8.x',
-    driver: 'mysql2',
-    dockerImageName: 'mysql:8',
-    connectionStringEnvironmentVariableName:
-      'BACKSTAGE_TEST_DATABASE_MYSQL8_CONNECTION_STRING',
-  },
-  SQLITE_3: {
-    name: 'SQLite 3.x',
-    driver: 'sqlite3',
-  },
-});
+export const allDatabases: Record<TestDatabaseId, TestDatabaseProperties> =
+  Object.freeze({
+    POSTGRES_13: {
+      name: 'Postgres 13.x',
+      driver: 'pg',
+      dockerImageName: 'postgres:13',
+      connectionStringEnvironmentVariableName:
+        'BACKSTAGE_TEST_DATABASE_POSTGRES13_CONNECTION_STRING',
+    },
+    POSTGRES_9: {
+      name: 'Postgres 9.x',
+      driver: 'pg',
+      dockerImageName: 'postgres:9',
+      connectionStringEnvironmentVariableName:
+        'BACKSTAGE_TEST_DATABASE_POSTGRES9_CONNECTION_STRING',
+    },
+    MYSQL_8: {
+      name: 'MySQL 8.x',
+      driver: 'mysql2',
+      dockerImageName: 'mysql:8',
+      connectionStringEnvironmentVariableName:
+        'BACKSTAGE_TEST_DATABASE_MYSQL8_CONNECTION_STRING',
+    },
+    SQLITE_3: {
+      name: 'SQLite 3.x',
+      driver: 'sqlite3',
+    },
+  });
diff --git a/packages/backend-test-utils/src/util/isDockerDisabledForTests.ts b/packages/backend-test-utils/src/util/isDockerDisabledForTests.ts
index 617e9eb2a1..b411086728 100644
--- a/packages/backend-test-utils/src/util/isDockerDisabledForTests.ts
+++ b/packages/backend-test-utils/src/util/isDockerDisabledForTests.ts
@@ -14,6 +14,7 @@
  * limitations under the License.
  */
 
+/** @public */
 export function isDockerDisabledForTests() {
   // If we are not running in continuous integration, the default is to skip
   // the (relatively heavy, long running) docker based tests. If you want to
diff --git a/packages/backend/CHANGELOG.md b/packages/backend/CHANGELOG.md
index 47edc5107f..9ca401a105 100644
--- a/packages/backend/CHANGELOG.md
+++ b/packages/backend/CHANGELOG.md
@@ -1,5 +1,100 @@
 # example-backend
 
+## 0.2.44
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-backend@0.13.6
+  - @backstage/plugin-scaffolder-backend@0.15.3
+  - @backstage/plugin-techdocs-backend@0.10.1
+  - @backstage/plugin-auth-backend@0.3.24
+  - @backstage/integration@0.6.3
+  - @backstage/plugin-search-backend@0.2.6
+  - @backstage/plugin-search-backend-module-elasticsearch@0.0.3
+  - @backstage/plugin-search-backend-module-pg@0.2.0
+  - @backstage/plugin-search-backend-node@0.4.2
+  - @backstage/catalog-model@0.9.1
+  - @backstage/backend-common@0.9.1
+  - example-app@0.2.44
+
+## 0.2.43
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.9.0
+  - @backstage/plugin-catalog-backend@0.13.5
+  - @backstage/plugin-search-backend-module-pg@0.1.3
+  - @backstage/plugin-auth-backend@0.3.23
+  - @backstage/plugin-scaffolder-backend@0.15.2
+  - @backstage/integration@0.6.2
+  - @backstage/config@0.1.8
+  - @backstage/plugin-kubernetes-backend@0.3.15
+  - @backstage/plugin-techdocs-backend@0.10.0
+  - @backstage/plugin-jenkins-backend@0.1.4
+  - @backstage/plugin-app-backend@0.3.16
+  - @backstage/plugin-badges-backend@0.1.9
+  - @backstage/plugin-code-coverage-backend@0.1.10
+  - @backstage/plugin-graphql-backend@0.1.9
+  - @backstage/plugin-kafka-backend@0.2.9
+  - @backstage/plugin-proxy-backend@0.2.12
+  - @backstage/plugin-rollbar-backend@0.1.14
+  - @backstage/plugin-scaffolder-backend-module-rails@0.1.5
+  - @backstage/plugin-search-backend@0.2.5
+  - @backstage/plugin-todo-backend@0.1.11
+  - example-app@0.2.43
+
+## 0.2.41
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-auth-backend@0.3.20
+  - @backstage/integration@0.6.0
+  - @backstage/plugin-scaffolder-backend@0.15.0
+  - @backstage/backend-common@0.8.9
+  - @backstage/plugin-kubernetes-backend@0.3.14
+  - @backstage/plugin-search-backend-module-elasticsearch@0.0.2
+  - @backstage/plugin-search-backend-module-pg@0.1.1
+  - @backstage/plugin-catalog-backend@0.13.2
+  - @backstage/plugin-code-coverage-backend@0.1.9
+  - @backstage/plugin-scaffolder-backend-module-rails@0.1.4
+  - @backstage/plugin-techdocs-backend@0.9.2
+  - @backstage/plugin-todo-backend@0.1.9
+  - example-app@0.2.41
+
+## 0.2.38
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-kubernetes-backend@0.3.11
+  - @backstage/catalog-client@0.3.17
+  - @backstage/plugin-auth-backend@0.3.18
+  - @backstage/plugin-jenkins-backend@0.1.2
+  - @backstage/backend-common@0.8.7
+  - @backstage/plugin-techdocs-backend@0.9.0
+  - @backstage/plugin-scaffolder-backend@0.14.1
+
+## 0.2.37
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.8.6
+  - @backstage/plugin-scaffolder-backend@0.14.0
+  - @backstage/plugin-catalog-backend@0.13.0
+  - @backstage/plugin-auth-backend@0.3.17
+  - @backstage/plugin-scaffolder-backend-module-rails@0.1.3
+  - @backstage/plugin-search-backend-node@0.4.0
+  - @backstage/plugin-techdocs-backend@0.8.7
+  - @backstage/plugin-app-backend@0.3.15
+  - @backstage/plugin-kubernetes-backend@0.3.10
+  - @backstage/plugin-rollbar-backend@0.1.13
+  - example-app@0.2.37
+  - @backstage/plugin-search-backend@0.2.3
+
 ## 0.2.36
 
 ### Patch Changes
diff --git a/packages/backend/package.json b/packages/backend/package.json
index 4338f3e2b7..56b73e0591 100644
--- a/packages/backend/package.json
+++ b/packages/backend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "example-backend",
-  "version": "0.2.36",
+  "version": "0.2.44",
   "main": "dist/index.cjs.js",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -27,42 +27,47 @@
     "migrate:create": "knex migrate:make -x ts"
   },
   "dependencies": {
-    "@backstage/backend-common": "^0.8.5",
-    "@backstage/catalog-client": "^0.3.16",
-    "@backstage/catalog-model": "^0.9.0",
-    "@backstage/config": "^0.1.5",
-    "@backstage/integration": "^0.5.8",
-    "@backstage/plugin-app-backend": "^0.3.13",
-    "@backstage/plugin-auth-backend": "^0.3.16",
-    "@backstage/plugin-badges-backend": "^0.1.8",
-    "@backstage/plugin-catalog-backend": "^0.12.0",
-    "@backstage/plugin-code-coverage-backend": "^0.1.8",
-    "@backstage/plugin-graphql-backend": "^0.1.8",
-    "@backstage/plugin-kubernetes-backend": "^0.3.9",
-    "@backstage/plugin-kafka-backend": "^0.2.8",
-    "@backstage/plugin-proxy-backend": "^0.2.9",
-    "@backstage/plugin-rollbar-backend": "^0.1.11",
-    "@backstage/plugin-scaffolder-backend": "^0.13.0",
-    "@backstage/plugin-scaffolder-backend-module-rails": "^0.1.2",
-    "@backstage/plugin-search-backend": "^0.2.2",
-    "@backstage/plugin-search-backend-node": "^0.3.0",
-    "@backstage/plugin-techdocs-backend": "^0.8.6",
-    "@backstage/plugin-todo-backend": "^0.1.8",
+    "@backstage/backend-common": "^0.9.1",
+    "@backstage/catalog-client": "^0.3.17",
+    "@backstage/catalog-model": "^0.9.1",
+    "@backstage/config": "^0.1.8",
+    "@backstage/integration": "^0.6.3",
+    "@backstage/plugin-app-backend": "^0.3.16",
+    "@backstage/plugin-auth-backend": "^0.3.24",
+    "@backstage/plugin-badges-backend": "^0.1.9",
+    "@backstage/plugin-catalog-backend": "^0.13.6",
+    "@backstage/plugin-code-coverage-backend": "^0.1.10",
+    "@backstage/plugin-graphql-backend": "^0.1.9",
+    "@backstage/plugin-jenkins-backend": "^0.1.4",
+    "@backstage/plugin-kubernetes-backend": "^0.3.15",
+    "@backstage/plugin-kafka-backend": "^0.2.9",
+    "@backstage/plugin-proxy-backend": "^0.2.12",
+    "@backstage/plugin-rollbar-backend": "^0.1.14",
+    "@backstage/plugin-scaffolder-backend": "^0.15.3",
+    "@backstage/plugin-scaffolder-backend-module-rails": "^0.1.5",
+    "@backstage/plugin-search-backend": "^0.2.6",
+    "@backstage/plugin-search-backend-node": "^0.4.2",
+    "@backstage/plugin-search-backend-module-elasticsearch": "^0.0.3",
+    "@backstage/plugin-search-backend-module-pg": "^0.2.0",
+    "@backstage/plugin-techdocs-backend": "^0.10.1",
+    "@backstage/plugin-todo-backend": "^0.1.11",
     "@gitbeaker/node": "^30.2.0",
     "@octokit/rest": "^18.5.3",
-    "azure-devops-node-api": "^10.2.2",
+    "azure-devops-node-api": "^11.0.1",
     "dockerode": "^3.2.1",
-    "example-app": "^0.2.36",
+    "example-app": "^0.2.44",
     "express": "^4.17.1",
     "express-promise-router": "^4.1.0",
+    "express-prom-bundle": "^6.3.6",
     "knex": "^0.95.1",
     "pg": "^8.3.0",
     "pg-connection-string": "^2.3.0",
+    "prom-client": "^13.2.0",
     "sqlite3": "^5.0.1",
     "winston": "^3.2.1"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.7.3",
+    "@backstage/cli": "^0.7.10",
     "@types/dockerode": "^3.2.1",
     "@types/express": "^4.17.6",
     "@types/express-serve-static-core": "^4.17.5"
diff --git a/packages/backend/src/index.ts b/packages/backend/src/index.ts
index 168f6aa2d9..78c6c4c20b 100644
--- a/packages/backend/src/index.ts
+++ b/packages/backend/src/index.ts
@@ -36,6 +36,7 @@ import {
 } from '@backstage/backend-common';
 import { Config } from '@backstage/config';
 import healthcheck from './plugins/healthcheck';
+import { metricsInit, metricsHandler } from './metrics';
 import auth from './plugins/auth';
 import catalog from './plugins/catalog';
 import codeCoverage from './plugins/codecoverage';
@@ -50,6 +51,7 @@ import todo from './plugins/todo';
 import graphql from './plugins/graphql';
 import app from './plugins/app';
 import badges from './plugins/badges';
+import jenkins from './plugins/jenkins';
 import { PluginEnvironment } from './types';
 
 function makeCreateEnv(config: Config) {
@@ -71,6 +73,7 @@ function makeCreateEnv(config: Config) {
 }
 
 async function main() {
+  metricsInit();
   const logger = getRootLogger();
 
   logger.info(
@@ -101,6 +104,7 @@ async function main() {
   const graphqlEnv = useHotMemoize(module, () => createEnv('graphql'));
   const appEnv = useHotMemoize(module, () => createEnv('app'));
   const badgesEnv = useHotMemoize(module, () => createEnv('badges'));
+  const jenkinsEnv = useHotMemoize(module, () => createEnv('jenkins'));
 
   const apiRouter = Router();
   apiRouter.use('/catalog', await catalog(catalogEnv));
@@ -116,11 +120,13 @@ async function main() {
   apiRouter.use('/proxy', await proxy(proxyEnv));
   apiRouter.use('/graphql', await graphql(graphqlEnv));
   apiRouter.use('/badges', await badges(badgesEnv));
+  apiRouter.use('/jenkins', await jenkins(jenkinsEnv));
   apiRouter.use(notFoundHandler());
 
   const service = createServiceBuilder(module)
     .loadConfig(config)
     .addRouter('', await healthcheck(healthcheckEnv))
+    .addRouter('', metricsHandler())
     .addRouter('/api', apiRouter)
     .addRouter('', await app(appEnv));
 
diff --git a/packages/backend/src/metrics.ts b/packages/backend/src/metrics.ts
new file mode 100644
index 0000000000..8834022cd9
--- /dev/null
+++ b/packages/backend/src/metrics.ts
@@ -0,0 +1,63 @@
+/*
+ * Copyright 2021 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { useHotCleanup } from '@backstage/backend-common';
+import { RequestHandler, Request } from 'express';
+import promBundle from 'express-prom-bundle';
+import prom from 'prom-client';
+import * as url from 'url';
+
+/**
+ * Experimental Prometheus metrics used to benchmark the performance of the
+ * software catalog. Use this at your own risk.
+ */
+const rootRegEx = new RegExp('^/([^/]*)/.*');
+const apiRegEx = new RegExp('^/api/([^/]*)/.*');
+
+function normalizePath(req: Request): string {
+  const path = url.parse(req.originalUrl || req.url).pathname || '/';
+
+  // Capture /api/ and the plugin name
+  if (apiRegEx.test(path)) {
+    return path.replace(apiRegEx, '/api/$1');
+  }
+
+  // Only the first path segment at root level
+  return path.replace(rootRegEx, '/$1');
+}
+
+export function metricsInit(): void {
+  prom.collectDefaultMetrics({ prefix: 'backstage_' });
+}
+
+/**
+ * Adds a /metrics endpoint, register default runtime metrics and instrument the router.
+ */
+export function metricsHandler(): RequestHandler {
+  // We can only initialize the metrics once and have to clean them up between hot reloads
+  useHotCleanup(module, () => prom.register.clear());
+
+  return promBundle({
+    includeMethod: true,
+    includePath: true,
+    // Using includePath alone is problematic, as it will include path labels with high
+    // cardinality (e.g. path params). Instead we would have to template them. However, this
+    // is difficult, as every backend plugin might use different routes. Instead we only take
+    // the first directory of the path, to have at least an idea how each plugin performs:
+    normalizePath,
+    promClient: { collectDefaultMetrics: {} },
+  });
+}
diff --git a/packages/backend/src/plugins/jenkins.ts b/packages/backend/src/plugins/jenkins.ts
new file mode 100644
index 0000000000..5420eb0df6
--- /dev/null
+++ b/packages/backend/src/plugins/jenkins.ts
@@ -0,0 +1,39 @@
+/*
+ * Copyright 2020 Spotify AB
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import {
+  createRouter,
+  DefaultJenkinsInfoProvider,
+} from '@backstage/plugin-jenkins-backend';
+import { Router } from 'express';
+import { PluginEnvironment } from '../types';
+import { CatalogClient } from '@backstage/catalog-client';
+
+export default async function createPlugin({
+  logger,
+  config,
+  discovery,
+}: PluginEnvironment): Promise<Router> {
+  const catalog = new CatalogClient({ discoveryApi: discovery });
+
+  return await createRouter({
+    logger,
+    jenkinsInfoProvider: DefaultJenkinsInfoProvider.fromConfig({
+      catalog,
+      config,
+    }),
+  });
+}
diff --git a/packages/backend/src/plugins/search.ts b/packages/backend/src/plugins/search.ts
index 4a1e415c74..2da108608e 100644
--- a/packages/backend/src/plugins/search.ts
+++ b/packages/backend/src/plugins/search.ts
@@ -13,28 +13,67 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { useHotCleanup } from '@backstage/backend-common';
+import {
+  PluginDatabaseManager,
+  useHotCleanup,
+} from '@backstage/backend-common';
+import { Config } from '@backstage/config';
+import { DefaultCatalogCollator } from '@backstage/plugin-catalog-backend';
 import { createRouter } from '@backstage/plugin-search-backend';
+import { ElasticSearchSearchEngine } from '@backstage/plugin-search-backend-module-elasticsearch';
+import { PgSearchEngine } from '@backstage/plugin-search-backend-module-pg';
 import {
   IndexBuilder,
   LunrSearchEngine,
+  SearchEngine,
 } from '@backstage/plugin-search-backend-node';
+import { DefaultTechDocsCollator } from '@backstage/plugin-techdocs-backend';
+import { Logger } from 'winston';
 import { PluginEnvironment } from '../types';
-import { DefaultCatalogCollator } from '@backstage/plugin-catalog-backend';
+
+async function createSearchEngine({
+  logger,
+  database,
+  config,
+}: {
+  logger: Logger;
+  database: PluginDatabaseManager;
+  config: Config;
+}): Promise<SearchEngine> {
+  if (config.has('search.elasticsearch')) {
+    return await ElasticSearchSearchEngine.fromConfig({
+      logger,
+      config,
+    });
+  }
+
+  if (await PgSearchEngine.supported(database)) {
+    return await PgSearchEngine.from({ database });
+  }
+
+  return new LunrSearchEngine({ logger });
+}
 
 export default async function createPlugin({
   logger,
   discovery,
+  config,
+  database,
 }: PluginEnvironment) {
   // Initialize a connection to a search engine.
-  const searchEngine = new LunrSearchEngine({ logger });
+  const searchEngine = await createSearchEngine({ config, logger, database });
   const indexBuilder = new IndexBuilder({ logger, searchEngine });
 
   // Collators are responsible for gathering documents known to plugins. This
   // particular collator gathers entities from the software catalog.
   indexBuilder.addCollator({
     defaultRefreshIntervalSeconds: 600,
-    collator: new DefaultCatalogCollator({ discovery }),
+    collator: DefaultCatalogCollator.fromConfig(config, { discovery }),
+  });
+
+  indexBuilder.addCollator({
+    defaultRefreshIntervalSeconds: 600,
+    collator: new DefaultTechDocsCollator({ discovery, logger }),
   });
 
   // The scheduler controls when documents are gathered from collators and sent
diff --git a/packages/catalog-client/CHANGELOG.md b/packages/catalog-client/CHANGELOG.md
index 70b79b961f..b32007a3e2 100644
--- a/packages/catalog-client/CHANGELOG.md
+++ b/packages/catalog-client/CHANGELOG.md
@@ -1,5 +1,27 @@
 # @backstage/catalog-client
 
+## 0.3.19
+
+### Patch Changes
+
+- d1da88a19: Properly export all used types.
+- Updated dependencies
+  - @backstage/catalog-model@0.9.2
+  - @backstage/errors@0.1.2
+  - @backstage/config@0.1.9
+
+## 0.3.18
+
+### Patch Changes
+
+- 11c370af2: Support filtering entities via property existence
+
+## 0.3.17
+
+### Patch Changes
+
+- 71c936eb6: Export `CatalogRequestOptions` type
+
 ## 0.3.16
 
 ### Patch Changes
diff --git a/packages/catalog-client/api-report.md b/packages/catalog-client/api-report.md
index 2abdeb8c75..f059174ba3 100644
--- a/packages/catalog-client/api-report.md
+++ b/packages/catalog-client/api-report.md
@@ -21,6 +21,9 @@ export type AddLocationResponse = {
   entities: Entity[];
 };
 
+// @public (undocumented)
+export const CATALOG_FILTER_EXISTS: unique symbol;
+
 // @public (undocumented)
 export interface CatalogApi {
   // (undocumented)
@@ -113,8 +116,8 @@ export class CatalogClient implements CatalogApi {
 // @public (undocumented)
 export type CatalogEntitiesRequest = {
   filter?:
-    | Record<string, string | string[]>[]
-    | Record<string, string | string[]>
+    | Record<string, string | symbol | (string | symbol)[]>[]
+    | Record<string, string | symbol | (string | symbol)[]>
     | undefined;
   fields?: string[] | undefined;
 };
@@ -124,6 +127,16 @@ export type CatalogListResponse<T> = {
   items: T[];
 };
 
+// @public (undocumented)
+export type CatalogRequestOptions = {
+  token?: string;
+};
+
+// @public
+export type DiscoveryApi = {
+  getBaseUrl(pluginId: string): Promise<string>;
+};
+
 // @public
 export const ENTITY_STATUS_CATALOG_PROCESSING_TYPE =
   'backstage.io/catalog-processing';
diff --git a/packages/catalog-client/package.json b/packages/catalog-client/package.json
index fbb37d2449..2040090fde 100644
--- a/packages/catalog-client/package.json
+++ b/packages/catalog-client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/catalog-client",
-  "version": "0.3.16",
+  "version": "0.3.19",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -29,13 +29,13 @@
     "clean": "backstage-cli clean"
   },
   "dependencies": {
-    "@backstage/catalog-model": "^0.9.0",
-    "@backstage/config": "^0.1.5",
-    "@backstage/errors": "^0.1.1",
+    "@backstage/catalog-model": "^0.9.2",
+    "@backstage/config": "^0.1.9",
+    "@backstage/errors": "^0.1.2",
     "cross-fetch": "^3.0.6"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.7.3",
+    "@backstage/cli": "^0.7.11",
     "@types/jest": "^26.0.7",
     "msw": "^0.29.0"
   },
diff --git a/packages/catalog-client/src/CatalogClient.test.ts b/packages/catalog-client/src/CatalogClient.test.ts
index 4e3d95f99f..d2db98bb25 100644
--- a/packages/catalog-client/src/CatalogClient.test.ts
+++ b/packages/catalog-client/src/CatalogClient.test.ts
@@ -18,7 +18,7 @@ import { Entity } from '@backstage/catalog-model';
 import { rest } from 'msw';
 import { setupServer } from 'msw/node';
 import { CatalogClient } from './CatalogClient';
-import { CatalogListResponse } from './types/api';
+import { CATALOG_FILTER_EXISTS, CatalogListResponse } from './types/api';
 import { DiscoveryApi } from './types/discovery';
 
 const server = setupServer();
@@ -83,7 +83,7 @@ describe('CatalogClient', () => {
       server.use(
         rest.get(`${mockBaseUrl}/entities`, (req, res, ctx) => {
           expect(req.url.search).toBe(
-            '?filter=a=1,b=2,b=3,%C3%B6=%3D&filter=a=2',
+            '?filter=a=1,b=2,b=3,%C3%B6=%3D&filter=a=2&filter=c',
           );
           return res(ctx.json([]));
         }),
@@ -100,6 +100,9 @@ describe('CatalogClient', () => {
             {
               a: '2',
             },
+            {
+              c: CATALOG_FILTER_EXISTS,
+            },
           ],
         },
         { token },
@@ -113,7 +116,7 @@ describe('CatalogClient', () => {
 
       server.use(
         rest.get(`${mockBaseUrl}/entities`, (req, res, ctx) => {
-          expect(req.url.search).toBe('?filter=a=1,b=2,b=3,%C3%B6=%3D');
+          expect(req.url.search).toBe('?filter=a=1,b=2,b=3,%C3%B6=%3D,c');
           return res(ctx.json([]));
         }),
       );
@@ -124,6 +127,7 @@ describe('CatalogClient', () => {
             a: '1',
             b: ['2', '3'],
             ö: '=',
+            c: CATALOG_FILTER_EXISTS,
           },
         },
         { token },
diff --git a/packages/catalog-client/src/CatalogClient.ts b/packages/catalog-client/src/CatalogClient.ts
index 5dfcddde0c..410d921d3b 100644
--- a/packages/catalog-client/src/CatalogClient.ts
+++ b/packages/catalog-client/src/CatalogClient.ts
@@ -26,6 +26,7 @@ import {
 import { ResponseError } from '@backstage/errors';
 import fetch from 'cross-fetch';
 import {
+  CATALOG_FILTER_EXISTS,
   AddLocationRequest,
   AddLocationResponse,
   CatalogApi,
@@ -35,6 +36,7 @@ import {
 } from './types/api';
 import { DiscoveryApi } from './types/discovery';
 
+/** @public */
 export class CatalogClient implements CatalogApi {
   private readonly discoveryApi: DiscoveryApi;
 
@@ -69,9 +71,13 @@ export class CatalogClient implements CatalogApi {
       const filterParts: string[] = [];
       for (const [key, value] of Object.entries(filterItem)) {
         for (const v of [value].flat()) {
-          filterParts.push(
-            `${encodeURIComponent(key)}=${encodeURIComponent(v)}`,
-          );
+          if (v === CATALOG_FILTER_EXISTS) {
+            filterParts.push(encodeURIComponent(key));
+          } else if (typeof v === 'string') {
+            filterParts.push(
+              `${encodeURIComponent(key)}=${encodeURIComponent(v)}`,
+            );
+          }
         }
       }
 
diff --git a/packages/catalog-client/src/types/api.ts b/packages/catalog-client/src/types/api.ts
index ae3fd7b514..e78bd9d713 100644
--- a/packages/catalog-client/src/types/api.ts
+++ b/packages/catalog-client/src/types/api.ts
@@ -16,22 +16,29 @@
 
 import { Entity, EntityName, Location } from '@backstage/catalog-model';
 
+/** @public */
+export const CATALOG_FILTER_EXISTS = Symbol('CATALOG_FILTER_EXISTS');
+
+/** @public */
 export type CatalogEntitiesRequest = {
   filter?:
-    | Record<string, string | string[]>[]
-    | Record<string, string | string[]>
+    | Record<string, string | symbol | (string | symbol)[]>[]
+    | Record<string, string | symbol | (string | symbol)[]>
     | undefined;
   fields?: string[] | undefined;
 };
 
+/** @public */
 export type CatalogListResponse<T> = {
   items: T[];
 };
 
+/** @public */
 export type CatalogRequestOptions = {
   token?: string;
 };
 
+/** @public */
 export interface CatalogApi {
   // Entities
   getEntities(
@@ -70,6 +77,7 @@ export interface CatalogApi {
   ): Promise<void>;
 }
 
+/** @public */
 export type AddLocationRequest = {
   type?: string;
   target: string;
@@ -77,6 +85,7 @@ export type AddLocationRequest = {
   presence?: 'optional' | 'required';
 };
 
+/** @public */
 export type AddLocationResponse = {
   location: Location;
   entities: Entity[];
diff --git a/packages/catalog-client/src/types/discovery.ts b/packages/catalog-client/src/types/discovery.ts
index 447998b3b8..19ee5ed19c 100644
--- a/packages/catalog-client/src/types/discovery.ts
+++ b/packages/catalog-client/src/types/discovery.ts
@@ -16,6 +16,8 @@
 
 /**
  * This is a copy of the core DiscoveryApi, to avoid importing core.
+ *
+ * @public
  */
 export type DiscoveryApi = {
   getBaseUrl(pluginId: string): Promise<string>;
diff --git a/packages/catalog-client/src/types/index.ts b/packages/catalog-client/src/types/index.ts
index 842d0393a4..7963891a4c 100644
--- a/packages/catalog-client/src/types/index.ts
+++ b/packages/catalog-client/src/types/index.ts
@@ -20,5 +20,8 @@ export type {
   CatalogApi,
   CatalogEntitiesRequest,
   CatalogListResponse,
+  CatalogRequestOptions,
 } from './api';
+export type { DiscoveryApi } from './discovery';
+export { CATALOG_FILTER_EXISTS } from './api';
 export { ENTITY_STATUS_CATALOG_PROCESSING_TYPE } from './status';
diff --git a/packages/catalog-client/src/types/status.ts b/packages/catalog-client/src/types/status.ts
index d2935b890e..38560a3791 100644
--- a/packages/catalog-client/src/types/status.ts
+++ b/packages/catalog-client/src/types/status.ts
@@ -17,6 +17,8 @@
 /**
  * The entity `status.items[].type` for the status of the processing engine in
  * regards to an entity.
+ *
+ * @public
  */
 export const ENTITY_STATUS_CATALOG_PROCESSING_TYPE =
   'backstage.io/catalog-processing';
diff --git a/packages/catalog-model/CHANGELOG.md b/packages/catalog-model/CHANGELOG.md
index 5dbbfd241f..6e6a7193c1 100644
--- a/packages/catalog-model/CHANGELOG.md
+++ b/packages/catalog-model/CHANGELOG.md
@@ -1,5 +1,26 @@
 # @backstage/catalog-model
 
+## 0.9.2
+
+### Patch Changes
+
+- d1da88a19: Properly export all used types.
+- Updated dependencies
+  - @backstage/errors@0.1.2
+  - @backstage/config@0.1.9
+
+## 0.9.1
+
+### Patch Changes
+
+- 13dc3735c: Add an optional `metadata.title` field to all entity kinds.
+
+  This used to be available on only the `Template` kind, and we have decided that the metadata block should be the same for all kinds. A title can be useful especially in large and complex catalogs where users have a tough time navigating or discerning among the entities.
+
+  It also carries some risk. You do not want to end up giving a title that collides with an actual name, which at best leads to confusion and at worst could be a liability. We do not perform any collision detection in the catalog. If you want to disallow this facility you may want to add a small processor that makes sure it's not set.
+
+  At the time of writing this message, only the scaffolder actually makes use of this field for display purposes.
+
 ## 0.9.0
 
 ### Minor Changes
diff --git a/packages/catalog-model/api-report.md b/packages/catalog-model/api-report.md
index 74027716de..407e18a409 100644
--- a/packages/catalog-model/api-report.md
+++ b/packages/catalog-model/api-report.md
@@ -143,7 +143,7 @@ export type EntityEnvelope = {
 
 // @public
 export function entityEnvelopeSchemaValidator<
-  T extends EntityEnvelope = EntityEnvelope
+  T extends EntityEnvelope = EntityEnvelope,
 >(schema?: unknown): (data: unknown) => T;
 
 // @public
@@ -168,6 +168,7 @@ export type EntityMeta = JsonObject & {
   generation?: number;
   name: string;
   namespace?: string;
+  title?: string;
   description?: string;
   labels?: Record<string, string>;
   annotations?: Record<string, string>;
@@ -184,8 +185,8 @@ export type EntityName = {
 
 // @public (undocumented)
 export const EntityPolicies: {
-  allOf(policies: EntityPolicy[]): AllEntityPolicies;
-  oneOf(policies: EntityPolicy[]): AnyEntityPolicy;
+  allOf(policies: EntityPolicy[]): EntityPolicy;
+  oneOf(policies: EntityPolicy[]): EntityPolicy;
 };
 
 // @public
@@ -202,6 +203,12 @@ export type EntityRef =
       name: string;
     };
 
+// @public
+export type EntityRefContext = {
+  defaultKind?: string;
+  defaultNamespace?: string;
+};
+
 // @public
 export type EntityRelation = {
   type: string;
@@ -240,9 +247,7 @@ export function generateUpdatedEntity(previous: Entity, next: Entity): Entity;
 export function getEntityName(entity: Entity): EntityName;
 
 // @public
-export function getEntitySourceLocation(
-  entity: Entity,
-): {
+export function getEntitySourceLocation(entity: Entity): {
   type: string;
   target: string;
 };
@@ -402,9 +407,7 @@ export function parseEntityRef(
 };
 
 // @public
-export function parseLocationReference(
-  ref: string,
-): {
+export function parseLocationReference(ref: string): {
   type: string;
   target: string;
 };
@@ -533,10 +536,6 @@ export interface TemplateEntityV1beta2 extends Entity {
   // (undocumented)
   kind: 'Template';
   // (undocumented)
-  metadata: EntityMeta & {
-    title?: string;
-  };
-  // (undocumented)
   spec: {
     type: string;
     parameters?: JsonObject | JsonObject[];
@@ -611,5 +610,9 @@ export type Validators = {
 // @public
 export const VIEW_URL_ANNOTATION = 'backstage.io/view-url';
 
+// Warnings were encountered during analysis:
+//
+// src/entity/Entity.d.ts:38:5 - (ae-incompatible-release-tags) The symbol "status" is marked as @public, but its signature references "UNSTABLE_EntityStatus" which is marked as @alpha
+
 // (No @packageDocumentation comment for this package)
 ```
diff --git a/packages/catalog-model/package.json b/packages/catalog-model/package.json
index 13c3214252..a20fb235c6 100644
--- a/packages/catalog-model/package.json
+++ b/packages/catalog-model/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/catalog-model",
-  "version": "0.9.0",
+  "version": "0.9.2",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -29,8 +29,8 @@
     "clean": "backstage-cli clean"
   },
   "dependencies": {
-    "@backstage/config": "^0.1.5",
-    "@backstage/errors": "^0.1.1",
+    "@backstage/config": "^0.1.9",
+    "@backstage/errors": "^0.1.2",
     "@types/json-schema": "^7.0.5",
     "@types/yup": "^0.29.8",
     "ajv": "^7.0.3",
@@ -40,7 +40,7 @@
     "yup": "^0.29.3"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.7.2",
+    "@backstage/cli": "^0.7.11",
     "@types/express": "^4.17.6",
     "@types/jest": "^26.0.7",
     "@types/lodash": "^4.14.151",
diff --git a/packages/catalog-model/src/EntityPolicies.ts b/packages/catalog-model/src/EntityPolicies.ts
index eca5e4b77a..0fff68d569 100644
--- a/packages/catalog-model/src/EntityPolicies.ts
+++ b/packages/catalog-model/src/EntityPolicies.ts
@@ -52,11 +52,12 @@ class AnyEntityPolicy implements EntityPolicy {
   }
 }
 
+/** @public */
 export const EntityPolicies = {
-  allOf(policies: EntityPolicy[]) {
+  allOf(policies: EntityPolicy[]): EntityPolicy {
     return new AllEntityPolicies(policies);
   },
-  oneOf(policies: EntityPolicy[]) {
+  oneOf(policies: EntityPolicy[]): EntityPolicy {
     return new AnyEntityPolicy(policies);
   },
 };
diff --git a/packages/catalog-model/src/entity/Entity.ts b/packages/catalog-model/src/entity/Entity.ts
index 8843f10f5f..ca38fef183 100644
--- a/packages/catalog-model/src/entity/Entity.ts
+++ b/packages/catalog-model/src/entity/Entity.ts
@@ -21,6 +21,7 @@ import { UNSTABLE_EntityStatus } from './EntityStatus';
 /**
  * The parts of the format that's common to all versions/kinds of entity.
  *
+ * @public
  * @see https://kubernetes.io/docs/concepts/overview/working-with-objects/kubernetes-objects/
  */
 export type Entity = {
@@ -62,6 +63,7 @@ export type Entity = {
 /**
  * Metadata fields common to all versions/kinds of entity.
  *
+ * @public
  * @see https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.18/#objectmeta-v1-meta
  * @see https://kubernetes.io/docs/concepts/overview/working-with-objects/kubernetes-objects/
  */
@@ -103,7 +105,13 @@ export type EntityMeta = JsonObject & {
    * The name of the entity.
    *
    * Must be unique within the catalog at any given point in time, for any
-   * given namespace + kind pair.
+   * given namespace + kind pair. This value is part of the technical
+   * identifier of the entity, and as such it will appear in URLs, database
+   * tables, entity references, and similar. It is subject to restrictions
+   * regarding what characters are allowed.
+   *
+   * If you want to use a different, more human readable string with fewer
+   * restrictions on it in user interfaces, see the `title` field below.
    */
   name: string;
 
@@ -112,6 +120,23 @@ export type EntityMeta = JsonObject & {
    */
   namespace?: string;
 
+  /**
+   * A display name of the entity, to be presented in user interfaces instead
+   * of the `name` property above, when available.
+   *
+   * This field is sometimes useful when the `name` is cumbersome or ends up
+   * being perceived as overly technical. The title generally does not have
+   * as stringent format requirements on it, so it may contain special
+   * characters and be more explanatory. Do keep it very short though, and
+   * avoid situations where a title can be confused with the name of another
+   * entity, or where two entities share a title.
+   *
+   * Note that this is only for display purposes, and may be ignored by some
+   * parts of the code. Entity references still always make use of the `name`
+   * property, not the title.
+   */
+  title?: string;
+
   /**
    * A short (typically relatively few words, on one line) description of the
    * entity.
@@ -143,6 +168,8 @@ export type EntityMeta = JsonObject & {
 
 /**
  * A relation of a specific type to another entity in the catalog.
+ *
+ * @public
  */
 export type EntityRelation = {
   /**
@@ -158,6 +185,8 @@ export type EntityRelation = {
 
 /**
  * Holds the relation data for entities.
+ *
+ * @public
  */
 export type EntityRelationSpec = {
   /**
@@ -178,6 +207,8 @@ export type EntityRelationSpec = {
 
 /**
  * A link to external information that is related to the entity.
+ *
+ * @public
  */
 export type EntityLink = {
   /**
diff --git a/packages/catalog-model/src/entity/EntityEnvelope.ts b/packages/catalog-model/src/entity/EntityEnvelope.ts
index ed21a7d666..290738f491 100644
--- a/packages/catalog-model/src/entity/EntityEnvelope.ts
+++ b/packages/catalog-model/src/entity/EntityEnvelope.ts
@@ -18,6 +18,7 @@
  * The envelope skeleton parts of an entity - whatever is necessary to be able
  * to give it a ref and pass to further validation / policy checking.
  *
+ * @public
  * @see https://kubernetes.io/docs/concepts/overview/working-with-objects/kubernetes-objects/
  */
 export type EntityEnvelope = {
diff --git a/packages/catalog-model/src/entity/EntityStatus.ts b/packages/catalog-model/src/entity/EntityStatus.ts
index 92e1d1454f..8f79fbd615 100644
--- a/packages/catalog-model/src/entity/EntityStatus.ts
+++ b/packages/catalog-model/src/entity/EntityStatus.ts
@@ -18,6 +18,7 @@ import { SerializedError } from '@backstage/errors';
 
 /**
  * The current status of the entity, as claimed by various sources.
+ *
  * @alpha
  */
 export type UNSTABLE_EntityStatus = {
diff --git a/packages/catalog-model/src/entity/constants.ts b/packages/catalog-model/src/entity/constants.ts
index d46d839720..ff031fc1ae 100644
--- a/packages/catalog-model/src/entity/constants.ts
+++ b/packages/catalog-model/src/entity/constants.ts
@@ -16,11 +16,15 @@
 
 /**
  * The namespace that entities without an explicit namespace fall into.
+ *
+ * @public
  */
 export const ENTITY_DEFAULT_NAMESPACE = 'default';
 
 /**
  * The keys of EntityMeta that are auto-generated.
+ *
+ * @public
  */
 export const ENTITY_META_GENERATED_FIELDS = [
   'uid',
@@ -30,6 +34,9 @@ export const ENTITY_META_GENERATED_FIELDS = [
 
 /**
  * Annotations for linking to entity from catalog pages.
+ *
+ * @public
  */
 export const VIEW_URL_ANNOTATION = 'backstage.io/view-url';
+/** @public */
 export const EDIT_URL_ANNOTATION = 'backstage.io/edit-url';
diff --git a/packages/catalog-model/src/entity/index.ts b/packages/catalog-model/src/entity/index.ts
index d05045fc78..eac55ea325 100644
--- a/packages/catalog-model/src/entity/index.ts
+++ b/packages/catalog-model/src/entity/index.ts
@@ -42,6 +42,7 @@ export {
   serializeEntityRef,
   stringifyEntityRef,
 } from './ref';
+export type { EntityRefContext } from './ref';
 export {
   entityHasChanges,
   generateEntityEtag,
diff --git a/packages/catalog-model/src/entity/policies/DefaultNamespaceEntityPolicy.ts b/packages/catalog-model/src/entity/policies/DefaultNamespaceEntityPolicy.ts
index 1750aece17..9511dfb05f 100644
--- a/packages/catalog-model/src/entity/policies/DefaultNamespaceEntityPolicy.ts
+++ b/packages/catalog-model/src/entity/policies/DefaultNamespaceEntityPolicy.ts
@@ -21,6 +21,8 @@ import { Entity } from '../Entity';
 
 /**
  * Sets a default namespace if none was set.
+ *
+ * @public
  */
 export class DefaultNamespaceEntityPolicy implements EntityPolicy {
   private readonly namespace: string;
diff --git a/packages/catalog-model/src/entity/policies/FieldFormatEntityPolicy.ts b/packages/catalog-model/src/entity/policies/FieldFormatEntityPolicy.ts
index ee95fd16ea..8655116ec6 100644
--- a/packages/catalog-model/src/entity/policies/FieldFormatEntityPolicy.ts
+++ b/packages/catalog-model/src/entity/policies/FieldFormatEntityPolicy.ts
@@ -29,6 +29,8 @@ import { Entity } from '../Entity';
  *
  * This does not take into account machine generated fields such as uid, etag
  * and generation.
+ *
+ * @public
  */
 export class FieldFormatEntityPolicy implements EntityPolicy {
   private readonly validators: Validators;
diff --git a/packages/catalog-model/src/entity/policies/NoForeignRootFieldsEntityPolicy.ts b/packages/catalog-model/src/entity/policies/NoForeignRootFieldsEntityPolicy.ts
index 6700a935d5..1c3f865434 100644
--- a/packages/catalog-model/src/entity/policies/NoForeignRootFieldsEntityPolicy.ts
+++ b/packages/catalog-model/src/entity/policies/NoForeignRootFieldsEntityPolicy.ts
@@ -21,6 +21,8 @@ const defaultKnownFields = ['apiVersion', 'kind', 'metadata', 'spec'];
 
 /**
  * Ensures that there are no foreign root fields in the entity.
+ *
+ * @public
  */
 export class NoForeignRootFieldsEntityPolicy implements EntityPolicy {
   private readonly knownFields: string[];
diff --git a/packages/catalog-model/src/entity/policies/SchemaValidEntityPolicy.test.ts b/packages/catalog-model/src/entity/policies/SchemaValidEntityPolicy.test.ts
index 21539aaba4..c263689446 100644
--- a/packages/catalog-model/src/entity/policies/SchemaValidEntityPolicy.test.ts
+++ b/packages/catalog-model/src/entity/policies/SchemaValidEntityPolicy.test.ts
@@ -58,7 +58,7 @@ describe('SchemaValidEntityPolicy', () => {
   //
 
   it('rejects wrong root type', async () => {
-    await expect(policy.enforce((7 as unknown) as Entity)).rejects.toThrow(
+    await expect(policy.enforce(7 as unknown as Entity)).rejects.toThrow(
       /object/,
     );
   });
diff --git a/packages/catalog-model/src/entity/policies/SchemaValidEntityPolicy.ts b/packages/catalog-model/src/entity/policies/SchemaValidEntityPolicy.ts
index b5a4305a3c..721dc7d2dc 100644
--- a/packages/catalog-model/src/entity/policies/SchemaValidEntityPolicy.ts
+++ b/packages/catalog-model/src/entity/policies/SchemaValidEntityPolicy.ts
@@ -27,6 +27,8 @@ import { EntityPolicy } from './types';
  * This should be the first policy in the list, to ensure that other downstream
  * policies can work with a structure that is at least valid in therms of the
  * typescript type.
+ *
+ * @public
  */
 export class SchemaValidEntityPolicy implements EntityPolicy {
   private validate: ValidateFunction<Entity> | undefined;
diff --git a/packages/catalog-model/src/entity/policies/types.ts b/packages/catalog-model/src/entity/policies/types.ts
index 6c7f47c332..ad0485e711 100644
--- a/packages/catalog-model/src/entity/policies/types.ts
+++ b/packages/catalog-model/src/entity/policies/types.ts
@@ -19,12 +19,14 @@ import type { Entity } from '../Entity';
 /**
  * A policy for validation or mutation to be applied to entities as they are
  * entering the system.
+ *
+ * @public
  */
 export type EntityPolicy = {
   /**
    * Applies validation or mutation on an entity.
    *
-   * @param entity The entity, as validated/mutated so far in the policy tree
+   * @param entity - The entity, as validated/mutated so far in the policy tree
    * @returns The incoming entity, or a mutated version of the same, or
    *          undefined if this processor could not handle the entity
    * @throws An error if the entity should be rejected
diff --git a/packages/catalog-model/src/entity/ref.ts b/packages/catalog-model/src/entity/ref.ts
index 91d8547c6b..c1b9383eeb 100644
--- a/packages/catalog-model/src/entity/ref.ts
+++ b/packages/catalog-model/src/entity/ref.ts
@@ -18,9 +18,7 @@ import { EntityName, EntityRef } from '../types';
 import { ENTITY_DEFAULT_NAMESPACE } from './constants';
 import { Entity } from './Entity';
 
-function parseRefString(
-  ref: string,
-): {
+function parseRefString(ref: string): {
   kind?: string;
   namespace?: string;
   name: string;
@@ -43,7 +41,8 @@ function parseRefString(
  * Extracts the kind, namespace and name that form the name triplet of the
  * given entity.
  *
- * @param entity An entity
+ * @public
+ * @param entity - An entity
  * @returns The complete entity name
  */
 export function getEntityName(entity: Entity): EntityName {
@@ -56,8 +55,10 @@ export function getEntityName(entity: Entity): EntityName {
 
 /**
  * The context of defaults that entity reference parsing happens within.
+ *
+ * @public
  */
-type EntityRefContext = {
+export type EntityRefContext = {
   /** The default kind, if none is given in the reference */
   defaultKind?: string;
   /** The default namespace, if none is given in the reference */
@@ -72,8 +73,9 @@ type EntityRefContext = {
  * otherwise specified as part of the options, and will throw an error if no
  * kind was specified in the input reference and no default kind was given.
  *
- * @param ref The reference to parse
- * @param context The context of defaults that the parsing happens within
+ * @public
+ * @param ref - The reference to parse
+ * @param context - The context of defaults that the parsing happens within
  * @returns A complete entity name
  */
 export function parseEntityName(
@@ -101,8 +103,9 @@ export function parseEntityName(
  * The options object can contain default values for the kind and namespace,
  * that will be used if the input reference did not specify any.
  *
- * @param ref The reference to parse
- * @param context The context of defaults that the parsing happens within
+ * @public
+ * @param ref - The reference to parse
+ * @param context - The context of defaults that the parsing happens within
  * @returns The compound form of the reference
  */
 export function parseEntityRef(
@@ -113,6 +116,7 @@ export function parseEntityRef(
   namespace: string;
   name: string;
 };
+/** @public */
 export function parseEntityRef(
   ref: EntityRef,
   context?: { defaultKind: string },
@@ -121,6 +125,7 @@ export function parseEntityRef(
   namespace?: string;
   name: string;
 };
+/** @public */
 export function parseEntityRef(
   ref: EntityRef,
   context?: { defaultNamespace: string },
@@ -172,8 +177,9 @@ export function parseEntityRef(
  * special/reserved characters, it outputs the string form, otherwise it
  * outputs the compound form.
  *
+ * @public
  * @deprecated Use `stringifyEntityRef` instead
- * @param ref The reference to serialize
+ * @param ref - The reference to serialize
  * @returns The same reference on either string or compound form
  */
 export function serializeEntityRef(
@@ -221,7 +227,8 @@ export function serializeEntityRef(
  * all parts of the name to lowercase and inserts the default namespace if needed.
  * It is typically not the best way to represent the entity reference to the user.
  *
- * @param ref The reference to serialize
+ * @public
+ * @param ref - The reference to serialize
  * @returns The same reference on either string or compound form
  */
 export function stringifyEntityRef(
@@ -250,9 +257,10 @@ export function stringifyEntityRef(
  * The comparison is case insensitive, and all of kind, namespace, and name
  * must match (after applying the optional context to the ref).
  *
- * @param entity The entity to match
- * @param ref A string or compound entity ref
- * @param context An optional context of default kind and namespace, that apply
+ * @public
+ * @param entity - The entity to match
+ * @param ref - A string or compound entity ref
+ * @param context - An optional context of default kind and namespace, that apply
  *                to the ref if given
  * @returns True if matching, false otherwise
  */
diff --git a/packages/catalog-model/src/entity/util.ts b/packages/catalog-model/src/entity/util.ts
index 84b6845347..314f3b7737 100644
--- a/packages/catalog-model/src/entity/util.ts
+++ b/packages/catalog-model/src/entity/util.ts
@@ -21,6 +21,7 @@ import { Entity } from './Entity';
 /**
  * Generates a new random UID for an entity.
  *
+ * @public
  * @returns A string with enough randomness to uniquely identify an entity
  */
 export function generateEntityUid(): string {
@@ -30,6 +31,7 @@ export function generateEntityUid(): string {
 /**
  * Generates a new random Etag for an entity.
  *
+ * @public
  * @returns A string with enough randomness to uniquely identify an entity
  *          revision
  */
@@ -48,8 +50,9 @@ export function generateEntityEtag(): string {
  * account. It only compares the actual input entity data, i.e. metadata and
  * spec.
  *
- * @param previous The old state of the entity
- * @param next The new state of the entity
+ * @public
+ * @param previous - The old state of the entity
+ * @param next - The new state of the entity
  */
 export function entityHasChanges(previous: Entity, next: Entity): boolean {
   const e1 = lodash.cloneDeep(previous);
@@ -98,8 +101,9 @@ export function entityHasChanges(previous: Entity, next: Entity): boolean {
  * The previous revision is expected to be a complete model loaded from the
  * catalog, including the uid, etag and generation fields.
  *
- * @param previous The old state of the entity
- * @param next The new state of the entity
+ * @public
+ * @param previous - The old state of the entity
+ * @param next - The new state of the entity
  * @returns An entity with the merged state of both
  */
 export function generateUpdatedEntity(previous: Entity, next: Entity): Entity {
diff --git a/packages/catalog-model/src/kinds/ApiEntityV1alpha1.ts b/packages/catalog-model/src/kinds/ApiEntityV1alpha1.ts
index 737037e6b2..310b6695eb 100644
--- a/packages/catalog-model/src/kinds/ApiEntityV1alpha1.ts
+++ b/packages/catalog-model/src/kinds/ApiEntityV1alpha1.ts
@@ -18,6 +18,7 @@ import type { Entity } from '../entity/Entity';
 import schema from '../schema/kinds/API.v1alpha1.schema.json';
 import { ajvCompiledJsonSchemaValidator } from './util';
 
+/** @public */
 export interface ApiEntityV1alpha1 extends Entity {
   apiVersion: 'backstage.io/v1alpha1' | 'backstage.io/v1beta1';
   kind: 'API';
@@ -30,6 +31,6 @@ export interface ApiEntityV1alpha1 extends Entity {
   };
 }
 
-export const apiEntityV1alpha1Validator = ajvCompiledJsonSchemaValidator(
-  schema,
-);
+/** @public */
+export const apiEntityV1alpha1Validator =
+  ajvCompiledJsonSchemaValidator(schema);
diff --git a/packages/catalog-model/src/kinds/ComponentEntityV1alpha1.ts b/packages/catalog-model/src/kinds/ComponentEntityV1alpha1.ts
index 4e08d4cce9..6777778409 100644
--- a/packages/catalog-model/src/kinds/ComponentEntityV1alpha1.ts
+++ b/packages/catalog-model/src/kinds/ComponentEntityV1alpha1.ts
@@ -18,6 +18,7 @@ import type { Entity } from '../entity/Entity';
 import schema from '../schema/kinds/Component.v1alpha1.schema.json';
 import { ajvCompiledJsonSchemaValidator } from './util';
 
+/** @public */
 export interface ComponentEntityV1alpha1 extends Entity {
   apiVersion: 'backstage.io/v1alpha1' | 'backstage.io/v1beta1';
   kind: 'Component';
@@ -33,6 +34,6 @@ export interface ComponentEntityV1alpha1 extends Entity {
   };
 }
 
-export const componentEntityV1alpha1Validator = ajvCompiledJsonSchemaValidator(
-  schema,
-);
+/** @public */
+export const componentEntityV1alpha1Validator =
+  ajvCompiledJsonSchemaValidator(schema);
diff --git a/packages/catalog-model/src/kinds/DomainEntityV1alpha1.ts b/packages/catalog-model/src/kinds/DomainEntityV1alpha1.ts
index c2f39de321..fe777af24e 100644
--- a/packages/catalog-model/src/kinds/DomainEntityV1alpha1.ts
+++ b/packages/catalog-model/src/kinds/DomainEntityV1alpha1.ts
@@ -18,6 +18,7 @@ import type { Entity } from '../entity/Entity';
 import schema from '../schema/kinds/Domain.v1alpha1.schema.json';
 import { ajvCompiledJsonSchemaValidator } from './util';
 
+/** @public */
 export interface DomainEntityV1alpha1 extends Entity {
   apiVersion: 'backstage.io/v1alpha1' | 'backstage.io/v1beta1';
   kind: 'Domain';
@@ -26,6 +27,6 @@ export interface DomainEntityV1alpha1 extends Entity {
   };
 }
 
-export const domainEntityV1alpha1Validator = ajvCompiledJsonSchemaValidator(
-  schema,
-);
+/** @public */
+export const domainEntityV1alpha1Validator =
+  ajvCompiledJsonSchemaValidator(schema);
diff --git a/packages/catalog-model/src/kinds/GroupEntityV1alpha1.ts b/packages/catalog-model/src/kinds/GroupEntityV1alpha1.ts
index 28f1503223..f6aab856f0 100644
--- a/packages/catalog-model/src/kinds/GroupEntityV1alpha1.ts
+++ b/packages/catalog-model/src/kinds/GroupEntityV1alpha1.ts
@@ -18,6 +18,7 @@ import type { Entity } from '../entity/Entity';
 import schema from '../schema/kinds/Group.v1alpha1.schema.json';
 import { ajvCompiledJsonSchemaValidator } from './util';
 
+/** @public */
 export interface GroupEntityV1alpha1 extends Entity {
   apiVersion: 'backstage.io/v1alpha1' | 'backstage.io/v1beta1';
   kind: 'Group';
@@ -34,6 +35,6 @@ export interface GroupEntityV1alpha1 extends Entity {
   };
 }
 
-export const groupEntityV1alpha1Validator = ajvCompiledJsonSchemaValidator(
-  schema,
-);
+/** @public */
+export const groupEntityV1alpha1Validator =
+  ajvCompiledJsonSchemaValidator(schema);
diff --git a/packages/catalog-model/src/kinds/LocationEntityV1alpha1.ts b/packages/catalog-model/src/kinds/LocationEntityV1alpha1.ts
index 4a37340bee..f2ae4bcc91 100644
--- a/packages/catalog-model/src/kinds/LocationEntityV1alpha1.ts
+++ b/packages/catalog-model/src/kinds/LocationEntityV1alpha1.ts
@@ -18,6 +18,7 @@ import type { Entity } from '../entity/Entity';
 import schema from '../schema/kinds/Location.v1alpha1.schema.json';
 import { ajvCompiledJsonSchemaValidator } from './util';
 
+/** @public */
 export interface LocationEntityV1alpha1 extends Entity {
   apiVersion: 'backstage.io/v1alpha1' | 'backstage.io/v1beta1';
   kind: 'Location';
@@ -28,6 +29,6 @@ export interface LocationEntityV1alpha1 extends Entity {
   };
 }
 
-export const locationEntityV1alpha1Validator = ajvCompiledJsonSchemaValidator(
-  schema,
-);
+/** @public */
+export const locationEntityV1alpha1Validator =
+  ajvCompiledJsonSchemaValidator(schema);
diff --git a/packages/catalog-model/src/kinds/ResourceEntityV1alpha1.ts b/packages/catalog-model/src/kinds/ResourceEntityV1alpha1.ts
index c8f96b87e3..acc6ab5245 100644
--- a/packages/catalog-model/src/kinds/ResourceEntityV1alpha1.ts
+++ b/packages/catalog-model/src/kinds/ResourceEntityV1alpha1.ts
@@ -18,6 +18,7 @@ import type { Entity } from '../entity/Entity';
 import schema from '../schema/kinds/Resource.v1alpha1.schema.json';
 import { ajvCompiledJsonSchemaValidator } from './util';
 
+/** @public */
 export interface ResourceEntityV1alpha1 extends Entity {
   apiVersion: 'backstage.io/v1alpha1' | 'backstage.io/v1beta1';
   kind: 'Resource';
@@ -29,6 +30,6 @@ export interface ResourceEntityV1alpha1 extends Entity {
   };
 }
 
-export const resourceEntityV1alpha1Validator = ajvCompiledJsonSchemaValidator(
-  schema,
-);
+/** @public */
+export const resourceEntityV1alpha1Validator =
+  ajvCompiledJsonSchemaValidator(schema);
diff --git a/packages/catalog-model/src/kinds/SystemEntityV1alpha1.ts b/packages/catalog-model/src/kinds/SystemEntityV1alpha1.ts
index 7c719566ad..5f90351480 100644
--- a/packages/catalog-model/src/kinds/SystemEntityV1alpha1.ts
+++ b/packages/catalog-model/src/kinds/SystemEntityV1alpha1.ts
@@ -18,6 +18,7 @@ import type { Entity } from '../entity/Entity';
 import schema from '../schema/kinds/System.v1alpha1.schema.json';
 import { ajvCompiledJsonSchemaValidator } from './util';
 
+/** @public */
 export interface SystemEntityV1alpha1 extends Entity {
   apiVersion: 'backstage.io/v1alpha1' | 'backstage.io/v1beta1';
   kind: 'System';
@@ -27,6 +28,6 @@ export interface SystemEntityV1alpha1 extends Entity {
   };
 }
 
-export const systemEntityV1alpha1Validator = ajvCompiledJsonSchemaValidator(
-  schema,
-);
+/** @public */
+export const systemEntityV1alpha1Validator =
+  ajvCompiledJsonSchemaValidator(schema);
diff --git a/packages/catalog-model/src/kinds/TemplateEntityV1beta2.ts b/packages/catalog-model/src/kinds/TemplateEntityV1beta2.ts
index 2710fe1275..e708d4b387 100644
--- a/packages/catalog-model/src/kinds/TemplateEntityV1beta2.ts
+++ b/packages/catalog-model/src/kinds/TemplateEntityV1beta2.ts
@@ -15,16 +15,14 @@
  */
 
 import { JsonObject } from '@backstage/config';
-import type { Entity, EntityMeta } from '../entity/Entity';
+import type { Entity } from '../entity/Entity';
 import schema from '../schema/kinds/Template.v1beta2.schema.json';
 import { ajvCompiledJsonSchemaValidator } from './util';
 
+/** @public */
 export interface TemplateEntityV1beta2 extends Entity {
   apiVersion: 'backstage.io/v1beta2';
   kind: 'Template';
-  metadata: EntityMeta & {
-    title?: string;
-  };
   spec: {
     type: string;
     parameters?: JsonObject | JsonObject[];
@@ -40,6 +38,6 @@ export interface TemplateEntityV1beta2 extends Entity {
   };
 }
 
-export const templateEntityV1beta2Validator = ajvCompiledJsonSchemaValidator(
-  schema,
-);
+/** @public */
+export const templateEntityV1beta2Validator =
+  ajvCompiledJsonSchemaValidator(schema);
diff --git a/packages/catalog-model/src/kinds/UserEntityV1alpha1.ts b/packages/catalog-model/src/kinds/UserEntityV1alpha1.ts
index 267a9f07fd..d719ab35ef 100644
--- a/packages/catalog-model/src/kinds/UserEntityV1alpha1.ts
+++ b/packages/catalog-model/src/kinds/UserEntityV1alpha1.ts
@@ -18,6 +18,7 @@ import type { Entity } from '../entity/Entity';
 import schema from '../schema/kinds/User.v1alpha1.schema.json';
 import { ajvCompiledJsonSchemaValidator } from './util';
 
+/** @public */
 export interface UserEntityV1alpha1 extends Entity {
   apiVersion: 'backstage.io/v1alpha1' | 'backstage.io/v1beta1';
   kind: 'User';
@@ -31,6 +32,6 @@ export interface UserEntityV1alpha1 extends Entity {
   };
 }
 
-export const userEntityV1alpha1Validator = ajvCompiledJsonSchemaValidator(
-  schema,
-);
+/** @public */
+export const userEntityV1alpha1Validator =
+  ajvCompiledJsonSchemaValidator(schema);
diff --git a/packages/catalog-model/src/kinds/relations.ts b/packages/catalog-model/src/kinds/relations.ts
index 57977e7168..7546d1508b 100644
--- a/packages/catalog-model/src/kinds/relations.ts
+++ b/packages/catalog-model/src/kinds/relations.ts
@@ -25,40 +25,60 @@ Naming rules for relations in priority order:
 /**
  * An ownership relation where the owner is usually an organizational
  * entity (user or group), and the other entity can be anything.
+ *
+ * @public
  */
 export const RELATION_OWNED_BY = 'ownedBy';
+/** @public */
 export const RELATION_OWNER_OF = 'ownerOf';
 
 /**
  * A relation with an API entity, typically from a component
+ *
+ * @public
  */
 export const RELATION_CONSUMES_API = 'consumesApi';
+/** @public */
 export const RELATION_API_CONSUMED_BY = 'apiConsumedBy';
+/** @public */
 export const RELATION_PROVIDES_API = 'providesApi';
+/** @public */
 export const RELATION_API_PROVIDED_BY = 'apiProvidedBy';
 
 /**
  * A relation denoting a dependency on another entity.
+ *
+ * @public
  */
 export const RELATION_DEPENDS_ON = 'dependsOn';
+/** @public */
 export const RELATION_DEPENDENCY_OF = 'dependencyOf';
 
 /**
  * A parent/child relation to build up a tree, used for example to describe
  * the organizational structure between groups.
+ *
+ * @public
  */
 export const RELATION_PARENT_OF = 'parentOf';
+/** @public */
 export const RELATION_CHILD_OF = 'childOf';
 
 /**
  * A membership relation, typically for users in a group.
+ *
+ * @public
  */
 export const RELATION_MEMBER_OF = 'memberOf';
+/** @public */
 export const RELATION_HAS_MEMBER = 'hasMember';
 
 /**
  * A part/whole relation, typically for components in a system and systems
  * in a domain.
+ *
+ * @public
  */
 export const RELATION_PART_OF = 'partOf';
+/** @public */
 export const RELATION_HAS_PART = 'hasPart';
diff --git a/packages/catalog-model/src/kinds/types.ts b/packages/catalog-model/src/kinds/types.ts
index 0ec0d313bb..f4bc151384 100644
--- a/packages/catalog-model/src/kinds/types.ts
+++ b/packages/catalog-model/src/kinds/types.ts
@@ -18,12 +18,14 @@ import { Entity } from '../entity';
 
 /**
  * Validates entities of a certain kind.
+ *
+ * @public
  */
 export type KindValidator = {
   /**
    * Validates the entity as a known entity kind.
    *
-   * @param entity The entity to validate
+   * @param entity - The entity to validate
    * @returns Resolves to true, if the entity was of a kind that was known and
    *   handled by this validator, and was found to be valid. Resolves to false,
    *   if the entity was not of a kind that was known by this validator.
diff --git a/packages/catalog-model/src/location/annotation.ts b/packages/catalog-model/src/location/annotation.ts
index 137d36a0da..4bcabdb705 100644
--- a/packages/catalog-model/src/location/annotation.ts
+++ b/packages/catalog-model/src/location/annotation.ts
@@ -14,8 +14,11 @@
  * limitations under the License.
  */
 
+/** @public */
 export const LOCATION_ANNOTATION = 'backstage.io/managed-by-location';
+/** @public */
 export const ORIGIN_LOCATION_ANNOTATION =
   'backstage.io/managed-by-origin-location';
 
+/** @public */
 export const SOURCE_LOCATION_ANNOTATION = 'backstage.io/source-location';
diff --git a/packages/catalog-model/src/location/helpers.ts b/packages/catalog-model/src/location/helpers.ts
index 431ee71218..cf12031dc1 100644
--- a/packages/catalog-model/src/location/helpers.ts
+++ b/packages/catalog-model/src/location/helpers.ts
@@ -23,12 +23,14 @@ import { LOCATION_ANNOTATION, SOURCE_LOCATION_ANNOTATION } from './annotation';
  * Note that the return type is not `LocationSpec`, because we do not want to
  * conflate the string form with the additional properties of that type.
  *
- * @param ref A string-form location reference, e.g. 'url:https://host'
- * @returns A location reference, e.g. { type: 'url', target: 'https://host' }
+ * @public
+ * @param ref - A string-form location reference, e.g. `'url:https://host'`
+ * @returns A location reference, e.g. `{ type: 'url', target: 'https://host' }`
  */
-export function parseLocationReference(
-  ref: string,
-): { type: string; target: string } {
+export function parseLocationReference(ref: string): {
+  type: string;
+  target: string;
+} {
   if (typeof ref !== 'string') {
     throw new TypeError(
       `Unable to parse location reference '${ref}', unexpected argument ${typeof ref}`,
@@ -66,8 +68,9 @@ export function parseLocationReference(
  * Note that the input type is not `LocationSpec`, because we do not want to
  * conflate the string form with the additional properties of that type.
  *
- * @param ref A location reference, e.g. { type: 'url', target: 'https://host' }
- * @returns A string-form location reference, e.g. 'url:https://host'
+ * @public
+ * @param ref - A location reference, e.g. `{ type: 'url', target: 'https://host' }`
+ * @returns A string-form location reference, e.g. `'url:https://host'`
  */
 export function stringifyLocationReference(ref: {
   type: string;
@@ -88,12 +91,15 @@ export function stringifyLocationReference(ref: {
  * Returns the source code location of the Entity, to the extent that one exists.
  *
  * If the returned location type is of type 'url', the target should be readable at least
- * using the UrlReader from @backstage/backend-common. If it is not of type 'url', the caller
+ * using the UrlReader from `@backstage/backend-common`. If it is not of type 'url', the caller
  * needs to have explicit handling of each location type or signal that it is not supported.
+ *
+ * @public
  */
-export function getEntitySourceLocation(
-  entity: Entity,
-): { type: string; target: string } {
+export function getEntitySourceLocation(entity: Entity): {
+  type: string;
+  target: string;
+} {
   const locationRef =
     entity.metadata?.annotations?.[SOURCE_LOCATION_ANNOTATION] ??
     entity.metadata?.annotations?.[LOCATION_ANNOTATION];
diff --git a/packages/catalog-model/src/location/types.ts b/packages/catalog-model/src/location/types.ts
index 9837ce384d..1d16a9047d 100644
--- a/packages/catalog-model/src/location/types.ts
+++ b/packages/catalog-model/src/location/types.ts
@@ -14,6 +14,7 @@
  * limitations under the License.
  */
 
+/** @public */
 export type LocationSpec = {
   type: string;
   target: string;
@@ -23,6 +24,7 @@ export type LocationSpec = {
   presence?: 'optional' | 'required';
 };
 
+/** @public */
 export type Location = {
   id: string;
 } & LocationSpec;
diff --git a/packages/catalog-model/src/location/validation.ts b/packages/catalog-model/src/location/validation.ts
index 4857fc76bc..f6680d6eee 100644
--- a/packages/catalog-model/src/location/validation.ts
+++ b/packages/catalog-model/src/location/validation.ts
@@ -17,7 +17,10 @@
 import * as yup from 'yup';
 import { LocationSpec, Location } from './types';
 
-/** @deprecated */
+/**
+ * @public
+ * @deprecated Use JSONSchema or validators instead.
+ */
 export const locationSpecSchema = yup
   .object<LocationSpec>({
     type: yup.string().required(),
@@ -27,7 +30,10 @@ export const locationSpecSchema = yup
   .noUnknown()
   .required();
 
-/** @deprecated */
+/**
+ * @public
+ * @deprecated Use JSONSchema or validators instead.
+ */
 export const locationSchema = yup
   .object<Location>({
     id: yup.string().required(),
@@ -37,7 +43,10 @@ export const locationSchema = yup
   .noUnknown()
   .required();
 
-/** @deprecated */
+/**
+ * @public
+ * @deprecated Use JSONSchema or validators instead.
+ */
 export const analyzeLocationSchema = yup
   .object<{ location: LocationSpec }>({
     location: locationSpecSchema,
diff --git a/packages/catalog-model/src/schema/EntityMeta.schema.json b/packages/catalog-model/src/schema/EntityMeta.schema.json
index ff0f9c84a8..c834bfb113 100644
--- a/packages/catalog-model/src/schema/EntityMeta.schema.json
+++ b/packages/catalog-model/src/schema/EntityMeta.schema.json
@@ -53,6 +53,12 @@
       "examples": ["default", "admin"],
       "minLength": 1
     },
+    "title": {
+      "type": "string",
+      "description": "A display name of the entity, to be presented in user interfaces instead of the name property, when available.",
+      "examples": ["React SSR Template"],
+      "minLength": 1
+    },
     "description": {
       "type": "string",
       "description": "A short (typically relatively few words, on one line) description of the entity."
diff --git a/packages/catalog-model/src/schema/kinds/Template.v1beta2.schema.json b/packages/catalog-model/src/schema/kinds/Template.v1beta2.schema.json
index b14cdb8ee0..d68eac936d 100644
--- a/packages/catalog-model/src/schema/kinds/Template.v1beta2.schema.json
+++ b/packages/catalog-model/src/schema/kinds/Template.v1beta2.schema.json
@@ -69,17 +69,6 @@
         "kind": {
           "enum": ["Template"]
         },
-        "metadata": {
-          "type": "object",
-          "properties": {
-            "title": {
-              "type": "string",
-              "description": "The nice display name for the template.",
-              "examples": ["React SSR Template"],
-              "minLength": 1
-            }
-          }
-        },
         "spec": {
           "type": "object",
           "required": ["type", "steps"],
diff --git a/packages/catalog-model/src/types.ts b/packages/catalog-model/src/types.ts
index 50de5a1cea..1fbb3be95c 100644
--- a/packages/catalog-model/src/types.ts
+++ b/packages/catalog-model/src/types.ts
@@ -17,10 +17,13 @@
 import { JsonValue } from '@backstage/config';
 import { JSONSchema7 } from 'json-schema';
 
+/** @public */
 export type JSONSchema = JSONSchema7 & { [key in string]?: JsonValue };
 
 /**
  * A complete entity name, with the full kind-namespace-name triplet.
+ *
+ * @public
  */
 export type EntityName = {
   kind: string;
@@ -36,6 +39,8 @@ export type EntityName = {
  *
  * Left-out parts of the reference need to be handled by the application,
  * either by rejecting the reference or by falling back to default values.
+ *
+ * @public
  */
 export type EntityRef =
   | string
diff --git a/packages/catalog-model/src/validation/CommonValidatorFunctions.ts b/packages/catalog-model/src/validation/CommonValidatorFunctions.ts
index 7c9736baf7..5fcd2ee755 100644
--- a/packages/catalog-model/src/validation/CommonValidatorFunctions.ts
+++ b/packages/catalog-model/src/validation/CommonValidatorFunctions.ts
@@ -19,16 +19,18 @@ import lodash from 'lodash';
 /**
  * Contains various helper validation and normalization functions that can be
  * composed to form a Validator.
+ *
+ * @public
  */
 export class CommonValidatorFunctions {
   /**
    * Checks that the value is on the form <suffix> or <prefix><separator><suffix>, and validates
    * those parts separately.
    *
-   * @param value The value to check
-   * @param separator The separator between parts
-   * @param isValidPrefix Checks that the part before the separator is valid, if present
-   * @param isValidSuffix Checks that the part after the separator (or the entire value if there is no separator) is valid
+   * @param value - The value to check
+   * @param separator - The separator between parts
+   * @param isValidPrefix - Checks that the part before the separator is valid, if present
+   * @param isValidSuffix - Checks that the part after the separator (or the entire value if there is no separator) is valid
    */
   static isValidPrefixAndOrSuffix(
     value: unknown,
@@ -53,7 +55,7 @@ export class CommonValidatorFunctions {
   /**
    * Checks that the value can be safely transferred as JSON.
    *
-   * @param value The value to check
+   * @param value - The value to check
    */
   static isJsonSafe(value: unknown): boolean {
     try {
@@ -66,7 +68,7 @@ export class CommonValidatorFunctions {
   /**
    * Checks that the value is a valid DNS subdomain name.
    *
-   * @param value The value to check
+   * @param value - The value to check
    * @see https://tools.ietf.org/html/rfc1123
    */
   static isValidDnsSubdomain(value: unknown): boolean {
@@ -81,7 +83,7 @@ export class CommonValidatorFunctions {
   /**
    * Checks that the value is a valid DNS label.
    *
-   * @param value The value to check
+   * @param value - The value to check
    * @see https://tools.ietf.org/html/rfc1123
    */
   static isValidDnsLabel(value: unknown): boolean {
@@ -96,7 +98,7 @@ export class CommonValidatorFunctions {
   /**
    * Checks that the value is a valid URL.
    *
-   * @param value The value to check
+   * @param value - The value to check
    */
   static isValidUrl(value: unknown): boolean {
     if (typeof value !== 'string') {
@@ -115,7 +117,7 @@ export class CommonValidatorFunctions {
   /**
    * Checks that the value is a non empty string value.
    *
-   * @param value The value to check
+   * @param value - The value to check
    */
   static isValidString(value: unknown): boolean {
     return typeof value === 'string' && value?.trim()?.length >= 1;
diff --git a/packages/catalog-model/src/validation/KubernetesValidatorFunctions.ts b/packages/catalog-model/src/validation/KubernetesValidatorFunctions.ts
index 86d27e7b13..2423c47bef 100644
--- a/packages/catalog-model/src/validation/KubernetesValidatorFunctions.ts
+++ b/packages/catalog-model/src/validation/KubernetesValidatorFunctions.ts
@@ -20,6 +20,7 @@ import { CommonValidatorFunctions } from './CommonValidatorFunctions';
  * Contains validation functions that match the Kubernetes spec, usable to
  * build a catalog that is compatible with those rule sets.
  *
+ * @public
  * @see https://kubernetes.io/docs/concepts/overview/working-with-objects/names/
  * @see https://kubernetes.io/docs/concepts/overview/working-with-objects/labels/#syntax-and-character-set
  * @see https://kubernetes.io/docs/concepts/overview/working-with-objects/annotations/#syntax-and-character-set
diff --git a/packages/catalog-model/src/validation/entityEnvelopeSchemaValidator.ts b/packages/catalog-model/src/validation/entityEnvelopeSchemaValidator.ts
index 2fe74ea2a4..daa44ffaf1 100644
--- a/packages/catalog-model/src/validation/entityEnvelopeSchemaValidator.ts
+++ b/packages/catalog-model/src/validation/entityEnvelopeSchemaValidator.ts
@@ -22,7 +22,7 @@ import { compileAjvSchema, throwAjvError } from './ajv';
 /**
  * Creates a validation function that takes some arbitrary data, and either
  * returns that data cast to an {@link EntityEnvelope} (or the given subtype)
- * if it matches that schema, or throws a {@link TypeError} describing the
+ * if it matches that schema, or throws a {@link globals#TypeError} describing the
  * errors.
  *
  * Note that this validator is only meant for applying the base schema checks;
@@ -38,10 +38,11 @@ import { compileAjvSchema, throwAjvError } from './ajv';
  * - EntityMeta
  * - common#<id>
  *
+ * @public
  * @see https://github.com/backstage/backstage/tree/master/packages/catalog-model/src/schema
  */
 export function entityEnvelopeSchemaValidator<
-  T extends EntityEnvelope = EntityEnvelope
+  T extends EntityEnvelope = EntityEnvelope,
 >(schema?: unknown): (data: unknown) => T {
   const validate = compileAjvSchema(
     schema ? (schema as Schema) : entityEnvelopeSchema,
diff --git a/packages/catalog-model/src/validation/entityKindSchemaValidator.ts b/packages/catalog-model/src/validation/entityKindSchemaValidator.ts
index a295fac205..535dba9842 100644
--- a/packages/catalog-model/src/validation/entityKindSchemaValidator.ts
+++ b/packages/catalog-model/src/validation/entityKindSchemaValidator.ts
@@ -22,20 +22,20 @@ import { compileAjvSchema, throwAjvError } from './ajv';
  * Creates a validation function that takes some arbitrary data, and either
  * returns that data cast to a `T` if it matches that schema, or `false` if the
  * schema apiVersion/kind didn't apply to that data, or throws a
- * {@link TypeError} describing actual errors.
+ * {@link globals#TypeError} describing actual errors.
  *
  * This validator is highly specialized, in that it has special treatment of
  * the `kind` and `apiVersion` root keys. This only works if your schema has
  * their rule set to `"enum"`:
  *
- * <pre>
- *   "apiVersion": {
- *      "enum": ["backstage.io/v1alpha1", "backstage.io/v1beta1"]
- *   },
- *   "kind": {
- *     "enum": ["Group"]
- *   },
- * </pre>
+ * ```
+ * "apiVersion": {
+ *    "enum": ["backstage.io/v1alpha1", "backstage.io/v1beta1"]
+ * },
+ * "kind": {
+ *   "enum": ["Group"]
+ * },
+ * ```
  *
  * In the above example, the created validator will return `false` if and only
  * if the kind and/or apiVersion mismatch.
@@ -52,6 +52,7 @@ import { compileAjvSchema, throwAjvError } from './ajv';
  * - EntityMeta
  * - common#<id>
  *
+ * @public
  * @see https://github.com/backstage/backstage/tree/master/packages/catalog-model/src/schema
  */
 export function entityKindSchemaValidator<T extends Entity>(
diff --git a/packages/catalog-model/src/validation/entitySchemaValidator.test.ts b/packages/catalog-model/src/validation/entitySchemaValidator.test.ts
index 3dfe307f92..b486de1df2 100644
--- a/packages/catalog-model/src/validation/entitySchemaValidator.test.ts
+++ b/packages/catalog-model/src/validation/entitySchemaValidator.test.ts
@@ -30,6 +30,8 @@ describe('entitySchemaValidator', () => {
         generation: 13,
         name: 'test',
         namespace: 'ns',
+        title: 'My Component, Yay',
+        description: 'Yeah this is probably the best component so far',
         labels: {
           'backstage.io/custom': 'ValueStuff',
         },
@@ -192,6 +194,21 @@ describe('entitySchemaValidator', () => {
     expect(() => validator(entity)).toThrow(/namespace/);
   });
 
+  it('accepts missing title', () => {
+    delete entity.metadata.title;
+    expect(() => validator(entity)).not.toThrow();
+  });
+
+  it('rejects bad title type', () => {
+    entity.metadata.title = 7;
+    expect(() => validator(entity)).toThrow(/title/);
+  });
+
+  it('rejects empty title', () => {
+    entity.metadata.title = '';
+    expect(() => validator(entity)).toThrow(/title/);
+  });
+
   it('accepts missing description', () => {
     delete entity.metadata.description;
     expect(() => validator(entity)).not.toThrow();
diff --git a/packages/catalog-model/src/validation/entitySchemaValidator.ts b/packages/catalog-model/src/validation/entitySchemaValidator.ts
index 8683ab6de6..dd110efd75 100644
--- a/packages/catalog-model/src/validation/entitySchemaValidator.ts
+++ b/packages/catalog-model/src/validation/entitySchemaValidator.ts
@@ -22,7 +22,7 @@ import { compileAjvSchema, throwAjvError } from './ajv';
 /**
  * Creates a validation function that takes some arbitrary data, and either
  * returns that data cast to an {@link Entity} (or the given subtype) if it
- * matches that schema, or throws a {@link TypeError} describing the errors.
+ * matches that schema, or throws a {@link globals#TypeError} describing the errors.
  *
  * Note that this validator is only meant for applying the base schema checks;
  * it does not take custom policies or additional processor based validation
@@ -37,6 +37,7 @@ import { compileAjvSchema, throwAjvError } from './ajv';
  * - EntityMeta
  * - common#<id>
  *
+ * @public
  * @see https://github.com/backstage/backstage/tree/master/packages/catalog-model/src/schema
  */
 export function entitySchemaValidator<T extends Entity = Entity>(
diff --git a/packages/catalog-model/src/validation/makeValidator.ts b/packages/catalog-model/src/validation/makeValidator.ts
index 0ddd9d1088..48eff566f2 100644
--- a/packages/catalog-model/src/validation/makeValidator.ts
+++ b/packages/catalog-model/src/validation/makeValidator.ts
@@ -30,6 +30,7 @@ const defaultValidators: Validators = {
   isValidTag: CommonValidatorFunctions.isValidDnsLabel,
 };
 
+/** @public */
 export function makeValidator(overrides: Partial<Validators> = {}): Validators {
   return {
     ...defaultValidators,
diff --git a/packages/catalog-model/src/validation/types.ts b/packages/catalog-model/src/validation/types.ts
index cfa9d845bc..23d639c166 100644
--- a/packages/catalog-model/src/validation/types.ts
+++ b/packages/catalog-model/src/validation/types.ts
@@ -14,6 +14,7 @@
  * limitations under the License.
  */
 
+/** @public */
 export type Validators = {
   isValidApiVersion(value: unknown): boolean;
   isValidKind(value: unknown): boolean;
diff --git a/packages/cli-common/CHANGELOG.md b/packages/cli-common/CHANGELOG.md
index 52a247f57a..8a2a903efd 100644
--- a/packages/cli-common/CHANGELOG.md
+++ b/packages/cli-common/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @backstage/cli-common
 
+## 0.1.3
+
+### Patch Changes
+
+- d1da88a19: Properly export all used types.
+
 ## 0.1.2
 
 ### Patch Changes
diff --git a/packages/cli-common/api-report.md b/packages/cli-common/api-report.md
index 7141d27f3a..f129fa3045 100644
--- a/packages/cli-common/api-report.md
+++ b/packages/cli-common/api-report.md
@@ -3,26 +3,26 @@
 > Do not edit this file. It is a report generated by [API Extractor](https://api-extractor.com/).
 
 ```ts
-
 // @public
 export function findPaths(searchDir: string): Paths;
 
 // @public
 export function isChildPath(base: string, path: string): boolean;
 
-// @public (undocumented)
+// @public
 export type Paths = {
-    ownDir: string;
-    ownRoot: string;
-    targetDir: string;
-    targetRoot: string;
-    resolveOwn: ResolveFunc;
-    resolveOwnRoot: ResolveFunc;
-    resolveTarget: ResolveFunc;
-    resolveTargetRoot: ResolveFunc;
+  ownDir: string;
+  ownRoot: string;
+  targetDir: string;
+  targetRoot: string;
+  resolveOwn: ResolveFunc;
+  resolveOwnRoot: ResolveFunc;
+  resolveTarget: ResolveFunc;
+  resolveTargetRoot: ResolveFunc;
 };
 
+// @public (undocumented)
+export type ResolveFunc = (...paths: string[]) => string;
 
 // (No @packageDocumentation comment for this package)
-
 ```
diff --git a/packages/cli-common/package.json b/packages/cli-common/package.json
index 16f10717f9..c643192df3 100644
--- a/packages/cli-common/package.json
+++ b/packages/cli-common/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@backstage/cli-common",
   "description": "Common functionality used by cli, backend, and create-app",
-  "version": "0.1.2",
+  "version": "0.1.3",
   "private": false,
   "main": "src/index.ts",
   "types": "src/index.ts",
diff --git a/packages/cli-common/src/index.ts b/packages/cli-common/src/index.ts
index 1f4f17fe9f..ed8158366d 100644
--- a/packages/cli-common/src/index.ts
+++ b/packages/cli-common/src/index.ts
@@ -16,4 +16,4 @@
 
 export { findPaths } from './paths';
 export { isChildPath } from './isChildPath';
-export type { Paths } from './paths';
+export type { Paths, ResolveFunc } from './paths';
diff --git a/packages/cli-common/src/isChildPath.ts b/packages/cli-common/src/isChildPath.ts
index f48c92db32..f66a0cfa94 100644
--- a/packages/cli-common/src/isChildPath.ts
+++ b/packages/cli-common/src/isChildPath.ts
@@ -18,6 +18,8 @@ import { relative, isAbsolute } from 'path';
 
 /**
  * Checks if path is the same as or a child path of base.
+ *
+ * @public
  */
 export function isChildPath(base: string, path: string): boolean {
   const relativePath = relative(base, path);
diff --git a/packages/cli-common/src/paths.ts b/packages/cli-common/src/paths.ts
index 12a8484797..90239dfa4a 100644
--- a/packages/cli-common/src/paths.ts
+++ b/packages/cli-common/src/paths.ts
@@ -17,10 +17,15 @@
 import fs from 'fs';
 import { dirname, resolve as resolvePath } from 'path';
 
+/** @public */
 export type ResolveFunc = (...paths: string[]) => string;
 
-// Common paths and resolve functions used by the cli.
-// Currently assumes it is being executed within a monorepo.
+/**
+ * Common paths and resolve functions used by the cli.
+ * Currently assumes it is being executed within a monorepo.
+ *
+ * @public
+ */
 export type Paths = {
   // Root dir of the cli itself, containing package.json
   ownDir: string;
@@ -100,6 +105,7 @@ export function findOwnRootDir(ownDir: string) {
 /**
  * Find paths related to a package and its execution context.
  *
+ * @public
  * @example
  *
  * const paths = findPaths(__dirname)
diff --git a/packages/cli/.snyk b/packages/cli/.snyk
new file mode 100644
index 0000000000..612b4b0525
--- /dev/null
+++ b/packages/cli/.snyk
@@ -0,0 +1,70 @@
+# Snyk (https://snyk.io) policy file, patches or ignores known vulnerabilities.
+version: v1.22.1
+# ignores vulnerabilities until expiry date; change duration by modifying expiry date
+ignore:
+  SNYK-JS-ANSIHTML-1296849:
+    - 'webpack-dev-server > ansi-html':
+        reason: Developer tools are not a valid target for ReDoS attacks
+        expires: 2022-03-06T17:18:55.019Z
+        created: 2021-09-06T17:18:55.027Z
+
+  SNYK-JS-ANSIREGEX-1583908:
+    - '*':
+        reason: Developer tools are not a valid target for ReDoS attacks
+        expires: 2022-03-06T17:18:55.019Z
+        created: 2021-09-06T17:18:55.027Z
+
+  SNYK-JS-CSSWHAT-1298035:
+    - '*':
+        reason: Developer tools are not a valid target for ReDoS attacks
+        expires: 2022-03-06T17:18:55.019Z
+        created: 2021-09-06T17:18:55.027Z
+
+  SNYK-JS-BROWSERSLIST-1090194:
+    - '*':
+        reason: Developer tools are not a valid target for ReDoS attacks
+        expires: 2022-03-06T17:18:55.019Z
+        created: 2021-09-06T17:18:55.027Z
+
+  SNYK-JS-ISSVG-1243891:
+    - '*':
+        reason: Developer tools are not a valid target for ReDoS attacks
+        expires: 2022-03-06T17:18:55.019Z
+        created: 2021-09-06T17:18:55.027Z
+
+  SNYK-JS-ISSVG-1085627:
+    - '*':
+        reason: Developer tools are not a valid target for ReDoS attacks
+        expires: 2022-03-06T17:18:55.019Z
+        created: 2021-09-06T17:18:55.027Z
+
+  SNYK-JS-POSTCSS-1255640:
+    - '*':
+        reason: Developer tools are not a valid target for ReDoS attacks
+        expires: 2022-03-06T17:18:55.019Z
+        created: 2021-09-06T17:18:55.027Z
+
+  SNYK-JS-POSTCSS-1090595:
+    - '*':
+        reason: Developer tools are not a valid target for ReDoS attacks
+        expires: 2022-03-06T17:18:55.019Z
+        created: 2021-09-06T17:18:55.027Z
+
+  SNYK-JS-WS-1296835:
+    - '*':
+        reason: Developer tools are not a valid target for ReDoS attacks
+        expires: 2022-03-06T17:18:55.019Z
+        created: 2021-09-06T17:18:55.027Z
+
+  SNYK-JS-IMMER-1540542:
+    - '*':
+        reason: Prototype pollution is not an effective attack against a CLI as it already executes arbitrary code
+        expires: 2022-03-06T17:18:55.019Z
+        created: 2021-09-06T17:18:55.027Z
+
+  SNYK-JS-SETVALUE-1540541:
+    - '*':
+        reason: Prototype pollution is not an effective attack against a CLI as it already executes arbitrary code
+        expires: 2022-03-06T17:18:55.019Z
+        created: 2021-09-06T17:18:55.027Z
+patch: {}
diff --git a/packages/cli/CHANGELOG.md b/packages/cli/CHANGELOG.md
index a8cacedf22..f404b49e48 100644
--- a/packages/cli/CHANGELOG.md
+++ b/packages/cli/CHANGELOG.md
@@ -1,5 +1,79 @@
 # @backstage/cli
 
+## 0.7.11
+
+### Patch Changes
+
+- 13895db37: Support importing font files in tests.
+  This fixes remaining issues from [#7019](https://github.com/backstage/backstage/pull/7019).
+- Updated dependencies
+  - @backstage/cli-common@0.1.3
+  - @backstage/config-loader@0.6.8
+  - @backstage/config@0.1.9
+
+## 0.7.10
+
+### Patch Changes
+
+- 5e803edb8: Added support for importing font files. Imports in CSS via `url()` are supported for the final frontend bundle, but not for packages that are built for publishing. Module imports of fonts files from TypeScript are supported everywhere.
+- b5118ff76: Updated dependencies
+
+## 0.7.9
+
+### Patch Changes
+
+- f3bba3d2b: Remove debug logging
+- 8ea1e96b3: Fix file path handling in diff commands on Windows.
+- 2518aab58: Compensate for error formatting mismatch between Webpack 5 and react-dev-utils
+- 1ac2961c3: Reintroduce Node.js shims that were removed in the Webpack 5 migration.
+- 8d07a8b03: Add Buffer to `ProvidePlugin` since this is no longer provided in `webpack@5`
+- fe506a0cf: Remove Webpack deprecation message when running build.
+- 485438a56: Fix `backstage-cli backend:dev` argument passing
+- Updated dependencies
+  - @backstage/config@0.1.7
+  - @backstage/config-loader@0.6.7
+
+## 0.7.8
+
+### Patch Changes
+
+- c4ef9181a: Migrate to using `webpack@5` 🎉
+
+## 0.7.7
+
+### Patch Changes
+
+- 6aa7c3db7: bump node-tar version to the latest
+- e9d3983ee: Keep track of filtered configuration values when running frontend in development mode.
+- Updated dependencies
+  - @backstage/config@0.1.6
+  - @backstage/config-loader@0.6.6
+
+## 0.7.6
+
+### Patch Changes
+
+- 9d40fcb1e: - Bumping `material-ui/core` version to at least `4.12.2` as they made some breaking changes in later versions which broke `Pagination` of the `Table`.
+  - Switching out `material-table` to `@material-table/core` for support for the later versions of `material-ui/core`
+  - This causes a minor API change to `@backstage/core-components` as the interface for `Table` re-exports the `prop` from the underlying `Table` components.
+  - `onChangeRowsPerPage` has been renamed to `onRowsPerPageChange`
+  - `onChangePage` has been renamed to `onPageChange`
+  - Migration guide is here: https://material-table-core.com/docs/breaking-changes
+
+## 0.7.5
+
+### Patch Changes
+
+- 9a96b5da7: chore: bump `eslint` to `7.30.0`
+
+## 0.7.4
+
+### Patch Changes
+
+- ae84b20cf: Revert the upgrade to `fs-extra@10.0.0` as that seemed to have broken all installs inexplicably.
+- Updated dependencies
+  - @backstage/config-loader@0.6.5
+
 ## 0.7.3
 
 ### Patch Changes
diff --git a/packages/cli/asset-types/asset-types.d.ts b/packages/cli/asset-types/asset-types.d.ts
index 879e9b0b05..0bd0922004 100644
--- a/packages/cli/asset-types/asset-types.d.ts
+++ b/packages/cli/asset-types/asset-types.d.ts
@@ -68,6 +68,26 @@ declare module '*.svg' {
   export default src;
 }
 
+declare module '*.eot' {
+  const src: string;
+  export default src;
+}
+
+declare module '*.woff' {
+  const src: string;
+  export default src;
+}
+
+declare module '*.woff2' {
+  const src: string;
+  export default src;
+}
+
+declare module '*.ttf' {
+  const src: string;
+  export default src;
+}
+
 declare module '*.css' {
   const classes: { readonly [key: string]: string };
   export default classes;
diff --git a/packages/cli/config/jest.js b/packages/cli/config/jest.js
index e2ff338b4e..4e11a63a6b 100644
--- a/packages/cli/config/jest.js
+++ b/packages/cli/config/jest.js
@@ -80,9 +80,8 @@ async function getConfig() {
     transform: {
       '\\.esm\\.js$': require.resolve('./jestEsmTransform.js'), // See jestEsmTransform.js
       '\\.(js|jsx|ts|tsx)$': require.resolve('@sucrase/jest-plugin'),
-      '\\.(bmp|gif|jpg|jpeg|png|frag|xml|svg)$': require.resolve(
-        './jestFileTransform.js',
-      ),
+      '\\.(bmp|gif|jpg|jpeg|png|frag|xml|svg|eot|woff|woff2|ttf)$':
+        require.resolve('./jestFileTransform.js'),
       '\\.(yaml)$': require.resolve('yaml-jest'),
     },
 
diff --git a/packages/cli/package.json b/packages/cli/package.json
index a7032879bc..dd79f0df19 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@backstage/cli",
   "description": "CLI for developing Backstage plugins and apps",
-  "version": "0.7.3",
+  "version": "0.7.11",
   "private": false,
   "publishConfig": {
     "access": "public"
@@ -30,9 +30,9 @@
   "dependencies": {
     "@babel/core": "^7.4.4",
     "@babel/plugin-transform-modules-commonjs": "^7.4.4",
-    "@backstage/cli-common": "^0.1.2",
-    "@backstage/config": "^0.1.5",
-    "@backstage/config-loader": "^0.6.4",
+    "@backstage/cli-common": "^0.1.3",
+    "@backstage/config": "^0.1.9",
+    "@backstage/config-loader": "^0.6.8",
     "@hot-loader/react-dom": "^16.13.0",
     "@lerna/package-graph": "^4.0.0",
     "@lerna/project": "^4.0.0",
@@ -50,14 +50,13 @@
     "@svgr/plugin-svgo": "5.4.x",
     "@svgr/rollup": "5.5.x",
     "@svgr/webpack": "5.5.x",
-    "@types/start-server-webpack-plugin": "^2.2.0",
     "@types/webpack-env": "^1.15.2",
-    "@types/webpack-node-externals": "^2.5.0",
-    "@typescript-eslint/eslint-plugin": "^v4.27.0",
-    "@typescript-eslint/parser": "^v4.27.0",
+    "@typescript-eslint/eslint-plugin": "^v4.30.0",
+    "@typescript-eslint/parser": "^v4.28.3",
     "@yarnpkg/lockfile": "^1.1.0",
     "babel-plugin-dynamic-import-node": "^2.3.3",
     "bfj": "^7.0.2",
+    "buffer": "^6.0.3",
     "chalk": "^4.0.0",
     "chokidar": "^3.3.1",
     "commander": "^6.1.0",
@@ -65,7 +64,7 @@
     "dashify": "^2.0.0",
     "diff": "^5.0.0",
     "esbuild": "^0.8.56",
-    "eslint": "^7.1.0",
+    "eslint": "^7.30.0",
     "eslint-config-prettier": "^8.3.0",
     "eslint-formatter-friendly": "^7.0.0",
     "eslint-plugin-import": "^2.20.2",
@@ -75,20 +74,20 @@
     "eslint-plugin-react": "^7.12.4",
     "eslint-plugin-react-hooks": "^4.0.0",
     "express": "^4.17.1",
-    "file-loader": "^6.2.0",
-    "fork-ts-checker-webpack-plugin": "^6.2.9",
+    "fork-ts-checker-webpack-plugin": "^4.0.5",
     "fs-extra": "9.1.0",
     "handlebars": "^4.7.3",
-    "html-webpack-plugin": "^4.3.0",
+    "html-webpack-plugin": "^5.3.1",
     "inquirer": "^7.0.4",
     "jest": "^26.0.1",
     "jest-css-modules": "^2.1.0",
     "json-schema": "^0.3.0",
     "lodash": "^4.17.19",
-    "mini-css-extract-plugin": "^0.9.0",
+    "mini-css-extract-plugin": "^1.4.1",
+    "node-libs-browser": "^2.2.1",
     "ora": "^5.3.0",
     "postcss": "^8.1.0",
-    "raw-loader": "^4.0.1",
+    "process": "^0.11.10",
     "react": "^16.0.0",
     "react-dev-utils": "^11.0.4",
     "react-hot-loader": "^4.12.21",
@@ -100,17 +99,17 @@
     "rollup-plugin-peer-deps-external": "^2.2.2",
     "rollup-plugin-postcss": "^4.0.0",
     "rollup-pluginutils": "^2.8.2",
+    "run-script-webpack-plugin": "^0.0.11",
     "semver": "^7.3.2",
-    "start-server-webpack-plugin": "^2.2.5",
     "style-loader": "^1.2.1",
     "sucrase": "^3.18.2",
-    "tar": "^6.0.1",
-    "terser-webpack-plugin": "^1.4.3",
+    "tar": "^6.1.2",
+    "terser-webpack-plugin": "^5.1.3",
     "ts-loader": "^8.0.17",
     "typescript": "^4.0.3",
-    "url-loader": "^4.1.0",
-    "webpack": "^4.41.6",
-    "webpack-dev-server": "3.11.0",
+    "util": "^0.12.3",
+    "webpack": "^5.48.0",
+    "webpack-dev-server": "4.0.0-rc.0",
     "webpack-node-externals": "^3.0.0",
     "yaml": "^1.10.0",
     "yaml-jest": "^1.0.5",
@@ -118,36 +117,37 @@
     "yn": "^4.0.0"
   },
   "devDependencies": {
-    "@backstage/backend-common": "^0.8.4",
-    "@backstage/config": "^0.1.5",
-    "@backstage/core-components": "^0.1.4",
-    "@backstage/core-plugin-api": "^0.1.3",
-    "@backstage/core-app-api": "^0.1.4",
-    "@backstage/dev-utils": "^0.2.0",
-    "@backstage/test-utils": "^0.1.14",
-    "@backstage/theme": "^0.2.8",
+    "@backstage/backend-common": "^0.9.2",
+    "@backstage/config": "^0.1.9",
+    "@backstage/core-components": "^0.4.1",
+    "@backstage/core-plugin-api": "^0.1.7",
+    "@backstage/core-app-api": "^0.1.12",
+    "@backstage/dev-utils": "^0.2.9",
+    "@backstage/test-utils": "^0.1.17",
+    "@backstage/theme": "^0.2.10",
     "@types/diff": "^5.0.0",
     "@types/express": "^4.17.6",
     "@types/fs-extra": "^9.0.1",
-    "@types/html-webpack-plugin": "^3.2.2",
     "@types/http-proxy": "^1.17.4",
     "@types/inquirer": "^7.3.1",
-    "@types/mini-css-extract-plugin": "^1.2.2",
     "@types/mock-fs": "^4.13.0",
     "@types/node": "^14.14.32",
-    "@types/react-dev-utils": "^9.0.4",
     "@types/recursive-readdir": "^2.2.0",
     "@types/rollup-plugin-peer-deps-external": "^2.2.0",
     "@types/rollup-plugin-postcss": "^2.0.0",
     "@types/tar": "^4.0.3",
-    "@types/webpack": "^4.41.7",
-    "@types/webpack-dev-server": "^3.11.0",
+    "@types/terser-webpack-plugin": "^5.0.4",
+    "@types/webpack": "^5.28.0",
+    "@types/webpack-dev-server": "^3.11.5",
     "@types/yarnpkg__lockfile": "^1.1.4",
     "del": "^6.0.0",
     "mock-fs": "^4.13.0",
     "nodemon": "^2.0.2",
     "ts-node": "^10.0.0"
   },
+  "resolutions": {
+    "@types/webpack-dev-server/@types/webpack": "^5.28.0"
+  },
   "files": [
     "asset-types",
     "templates",
diff --git a/packages/cli/src/commands/app/serve.ts b/packages/cli/src/commands/app/serve.ts
index 85fbdd97a0..208042c719 100644
--- a/packages/cli/src/commands/app/serve.ts
+++ b/packages/cli/src/commands/app/serve.ts
@@ -59,6 +59,7 @@ export default async (cmd: Command) => {
     ...(await loadCliConfig({
       args: cmd.config,
       fromPackage: name,
+      withFilteredKeys: true,
     })),
   });
 
diff --git a/packages/cli/src/commands/plugin/serve.ts b/packages/cli/src/commands/plugin/serve.ts
index b9ba93bc62..a0200b7ce8 100644
--- a/packages/cli/src/commands/plugin/serve.ts
+++ b/packages/cli/src/commands/plugin/serve.ts
@@ -28,6 +28,7 @@ export default async (cmd: Command) => {
     ...(await loadCliConfig({
       args: cmd.config,
       fromPackage: name,
+      withFilteredKeys: true,
     })),
   });
 
diff --git a/packages/cli/src/commands/testCommand.ts b/packages/cli/src/commands/testCommand.ts
index d885e1aec9..24a4e06f9e 100644
--- a/packages/cli/src/commands/testCommand.ts
+++ b/packages/cli/src/commands/testCommand.ts
@@ -63,6 +63,13 @@ export default async (cmd: Command) => {
     (process.env as any).NODE_ENV = 'test';
   }
 
+  // This is to have a consistent timezone for when running tests that involve checking
+  // the formatting of date/times.
+  // https://stackoverflow.com/questions/56261381/how-do-i-set-a-timezone-in-my-jest-config
+  if (!process.env.TZ) {
+    process.env.TZ = 'UTC';
+  }
+
   // eslint-disable-next-line jest/no-jest-import
   await require('jest').run(args);
 };
diff --git a/packages/cli/src/commands/versions/lint.ts b/packages/cli/src/commands/versions/lint.ts
index 68d0766217..c542da6dfb 100644
--- a/packages/cli/src/commands/versions/lint.ts
+++ b/packages/cli/src/commands/versions/lint.ts
@@ -55,11 +55,9 @@ export default async (cmd: Command) => {
     lockfile.replaceVersions(result.newVersions);
     await lockfile.save();
   } else {
-    const [
-      newVersionsForbidden,
-      newVersionsAllowed,
-    ] = partition(result.newVersions, ({ name }) =>
-      forbiddenDuplicatesFilter(name),
+    const [newVersionsForbidden, newVersionsAllowed] = partition(
+      result.newVersions,
+      ({ name }) => forbiddenDuplicatesFilter(name),
     );
     if (newVersionsForbidden.length && !fix) {
       success = false;
diff --git a/packages/cli/src/lib/builder/config.ts b/packages/cli/src/lib/builder/config.ts
index 60a5f0efca..3c95a87bdd 100644
--- a/packages/cli/src/lib/builder/config.ts
+++ b/packages/cli/src/lib/builder/config.ts
@@ -80,7 +80,17 @@ export const makeConfigs = async (
         postcss(),
         forwardFileImports({
           exclude: /\.icon\.svg$/,
-          include: [/\.svg$/, /\.png$/, /\.gif$/, /\.jpg$/, /\.jpeg$/],
+          include: [
+            /\.svg$/,
+            /\.png$/,
+            /\.gif$/,
+            /\.jpg$/,
+            /\.jpeg$/,
+            /\.eot$/,
+            /\.woff$/,
+            /\.woff2$/,
+            /\.ttf$/,
+          ],
         }),
         json(),
         yaml(),
diff --git a/packages/cli/src/lib/bundler/LinkedPackageResolvePlugin.ts b/packages/cli/src/lib/bundler/LinkedPackageResolvePlugin.ts
index aa6a6b4e2e..91615eddee 100644
--- a/packages/cli/src/lib/bundler/LinkedPackageResolvePlugin.ts
+++ b/packages/cli/src/lib/bundler/LinkedPackageResolvePlugin.ts
@@ -15,14 +15,14 @@
  */
 
 import { resolve as resolvePath } from 'path';
-import { ResolvePlugin } from 'webpack';
+import { WebpackPluginInstance } from 'webpack';
 import { isChildPath } from '@backstage/cli-common';
 import { LernaPackage } from './types';
 
 // Enables proper resolution of packages when linking in external packages.
 // Without this the packages would depend on dependencies in the node_modules
 // of the external packages themselves, leading to module duplication
-export class LinkedPackageResolvePlugin implements ResolvePlugin {
+export class LinkedPackageResolvePlugin implements WebpackPluginInstance {
   constructor(
     private readonly targetModules: string,
     private readonly packages: LernaPackage[],
diff --git a/packages/cli/src/lib/bundler/backend.ts b/packages/cli/src/lib/bundler/backend.ts
index bddeac0de3..bd4ab42098 100644
--- a/packages/cli/src/lib/bundler/backend.ts
+++ b/packages/cli/src/lib/bundler/backend.ts
@@ -26,23 +26,16 @@ export async function serveBackend(options: BackendServeOptions) {
     isDev: true,
   });
 
-  const compiler = webpack(config);
-
-  const watcher = compiler.watch(
-    {
-      poll: true,
-    },
-    (err: Error) => {
-      if (err) {
-        console.error(err);
-      } else console.log('Build succeeded');
-    },
-  );
+  const compiler = webpack(config, (err: Error | undefined) => {
+    if (err) {
+      console.error(err);
+    } else console.log('Build succeeded');
+  });
 
   const waitForExit = async () => {
     for (const signal of ['SIGINT', 'SIGTERM'] as const) {
       process.on(signal, () => {
-        watcher.close(() => console.log('Stopped watcher'));
+        compiler.close(() => console.log('Stopped watcher'));
         // exit instead of resolve. The process is shutting down and resolving a promise here logs an error
         process.exit();
       });
diff --git a/packages/cli/src/lib/bundler/bundle.ts b/packages/cli/src/lib/bundler/bundle.ts
index 17a7398b2a..2f23d5cae6 100644
--- a/packages/cli/src/lib/bundler/bundle.ts
+++ b/packages/cli/src/lib/bundler/bundle.ts
@@ -69,6 +69,10 @@ export async function buildBundle(options: BuildOptions) {
     throw new Error(`Failed to compile.\n${error.message || error}`);
   });
 
+  if (!stats) {
+    throw new Error('No stats returned');
+  }
+
   if (statsJsonEnabled) {
     // No @types/bfj
     await require('bfj').write(
@@ -87,29 +91,49 @@ export async function buildBundle(options: BuildOptions) {
 }
 
 async function build(compiler: webpack.Compiler, isCi: boolean) {
-  const stats = await new Promise<webpack.Stats>((resolve, reject) => {
-    compiler.run((err, buildStats) => {
-      if (err) {
-        if (err.message) {
-          const { errors } = formatWebpackMessages({
-            errors: [err.message],
-            warnings: new Array<string>(),
-          } as webpack.Stats.ToJsonOutput);
+  const stats = await new Promise<webpack.Stats | undefined>(
+    (resolve, reject) => {
+      compiler.run((err, buildStats) => {
+        if (err) {
+          if (err.message) {
+            const { errors } = formatWebpackMessages({
+              errors: [err.message],
+              warnings: new Array<string>(),
+              _showErrors: true,
+              _showWarnings: true,
+            });
 
-          throw new Error(errors[0]);
+            throw new Error(errors[0]);
+          } else {
+            reject(err);
+          }
         } else {
-          reject(err);
+          resolve(buildStats);
         }
-      } else {
-        resolve(buildStats);
-      }
-    });
-  });
-
-  const { errors, warnings } = formatWebpackMessages(
-    stats.toJson({ all: false, warnings: true, errors: true }),
+      });
+    },
   );
 
+  if (!stats) {
+    throw new Error('No stats provided');
+  }
+
+  const serializedStats = stats.toJson({
+    all: false,
+    warnings: true,
+    errors: true,
+  });
+  // NOTE(freben): The code below that extracts the message part of the errors,
+  // is due to react-dev-utils not yet being compatible with webpack 5. This
+  // may be possible to remove (just passing the serialized stats object
+  // directly into the format function) after a new release of react-dev-utils
+  // has been made available.
+  // See https://github.com/facebook/create-react-app/issues/9880
+  const { errors, warnings } = formatWebpackMessages({
+    errors: serializedStats.errors?.map(e => (e.message ? e.message : e)),
+    warnings: serializedStats.warnings?.map(e => (e.message ? e.message : e)),
+  });
+
   if (errors.length) {
     // Only keep the first error. Others are often indicative
     // of the same problem, but confuse the reader with noise.
diff --git a/packages/cli/src/lib/bundler/config.ts b/packages/cli/src/lib/bundler/config.ts
index 75e94af716..6e3f445f4a 100644
--- a/packages/cli/src/lib/bundler/config.ts
+++ b/packages/cli/src/lib/bundler/config.ts
@@ -19,8 +19,8 @@ import { resolve as resolvePath } from 'path';
 import ForkTsCheckerWebpackPlugin from 'fork-ts-checker-webpack-plugin';
 import HtmlWebpackPlugin from 'html-webpack-plugin';
 import ModuleScopePlugin from 'react-dev-utils/ModuleScopePlugin';
-import StartServerPlugin from 'start-server-webpack-plugin';
-import webpack from 'webpack';
+import { RunScriptWebpackPlugin } from 'run-script-webpack-plugin';
+import webpack, { ProvidePlugin } from 'webpack';
 import nodeExternals from 'webpack-node-externals';
 import { isChildPath } from '@backstage/cli-common';
 import { optimization } from './optimization';
@@ -32,6 +32,7 @@ import { BundlingOptions, BackendBundlingOptions, LernaPackage } from './types';
 import { version } from '../../lib/version';
 import { paths as cliPaths } from '../../lib/paths';
 import { runPlain } from '../run';
+import pickBy from 'lodash/pickBy';
 
 export function resolveBaseUrl(config: Config): URL {
   const baseUrl = config.getString('app.baseUrl');
@@ -98,10 +99,9 @@ export async function createConfig(
   if (checksEnabled) {
     plugins.push(
       new ForkTsCheckerWebpackPlugin({
-        typescript: {
-          configFile: paths.targetTsConfig,
-        },
-        eslint: {
+        typescript: paths.targetTsConfig,
+        eslint: true,
+        eslintOptions: {
           files: ['**', '!**/__tests__/**', '!**/?(*.)(spec|test).*'],
           options: {
             parserOptions: {
@@ -114,6 +114,16 @@ export async function createConfig(
     );
   }
 
+  // TODO(blam): process is no longer auto polyfilled by webpack in v5.
+  // we use the provide plugin to provide this polyfill, but lets look
+  // to remove this eventually!
+  plugins.push(
+    new ProvidePlugin({
+      process: 'process/browser',
+      Buffer: ['buffer', 'Buffer'],
+    }),
+  );
+
   plugins.push(
     new webpack.EnvironmentPlugin({
       APP_CONFIG: options.frontendAppConfigs,
@@ -156,27 +166,34 @@ export async function createConfig(
   return {
     mode: isDev ? 'development' : 'production',
     profile: false,
-    node: {
-      module: 'empty',
-      dgram: 'empty',
-      dns: 'mock',
-      fs: 'empty',
-      http2: 'empty',
-      net: 'empty',
-      tls: 'empty',
-      child_process: 'empty',
-    },
     optimization: optimization(options),
     bail: false,
     performance: {
       hints: false, // we check the gzip size instead
     },
-    devtool: isDev ? 'cheap-module-eval-source-map' : 'source-map',
+    devtool: isDev ? 'eval-cheap-module-source-map' : 'source-map',
     context: paths.targetPath,
     entry: [require.resolve('react-hot-loader/patch'), paths.targetEntry],
     resolve: {
       extensions: ['.ts', '.tsx', '.mjs', '.js', '.jsx'],
       mainFields: ['browser', 'module', 'main'],
+      fallback: {
+        ...pickBy(require('node-libs-browser')),
+        module: false,
+        dgram: false,
+        dns: false,
+        fs: false,
+        http2: false,
+        net: false,
+        tls: false,
+        child_process: false,
+
+        /* new ignores */
+        path: false,
+        https: false,
+        http: false,
+        util: require.resolve('util/'),
+      },
       plugins: [
         new LinkedPackageResolvePlugin(paths.rootNodeModules, externalPkgs),
         new ModuleScopePlugin(
@@ -194,13 +211,13 @@ export async function createConfig(
     output: {
       path: paths.targetDist,
       publicPath: validBaseUrl.pathname,
-      filename: isDev ? '[name].js' : 'static/[name].[hash:8].js',
+      filename: isDev ? '[name].js' : 'static/[name].[fullhash:8].js',
       chunkFilename: isDev
         ? '[name].chunk.js'
         : 'static/[name].[chunkhash:8].chunk.js',
       ...(isDev
         ? {
-            devtoolModuleFilenameTemplate: info =>
+            devtoolModuleFilenameTemplate: (info: any) =>
               `file:///${resolvePath(info.absoluteResourcePath).replace(
                 /\\/g,
                 '/',
@@ -237,7 +254,7 @@ export async function createBackendConfig(
       ? {
           watch: true,
           watchOptions: {
-            ignored: [/node_modules\/(?!\@backstage)/],
+            ignored: /node_modules\/(?!\@backstage)/,
           },
         }
       : {}),
@@ -259,7 +276,7 @@ export async function createBackendConfig(
     performance: {
       hints: false, // we check the gzip size instead
     },
-    devtool: isDev ? 'cheap-module-eval-source-map' : 'source-map',
+    devtool: isDev ? 'eval-cheap-module-source-map' : 'source-map',
     context: paths.targetPath,
     entry: [
       'webpack/hot/poll?100',
@@ -291,7 +308,7 @@ export async function createBackendConfig(
         : '[name].[chunkhash:8].chunk.js',
       ...(isDev
         ? {
-            devtoolModuleFilenameTemplate: info =>
+            devtoolModuleFilenameTemplate: (info: any) =>
               `file:///${resolvePath(info.absoluteResourcePath).replace(
                 /\\/g,
                 '/',
@@ -300,18 +317,18 @@ export async function createBackendConfig(
         : {}),
     },
     plugins: [
-      new StartServerPlugin({
+      new RunScriptWebpackPlugin({
         name: 'main.js',
         nodeArgs: options.inspectEnabled ? ['--inspect'] : undefined,
+        args: process.argv.slice(3), // drop `node backstage-cli backend:dev`
       }),
       new webpack.HotModuleReplacementPlugin(),
       ...(checksEnabled
         ? [
             new ForkTsCheckerWebpackPlugin({
-              typescript: {
-                configFile: paths.targetTsConfig,
-              },
-              eslint: {
+              typescript: paths.targetTsConfig,
+              eslint: true,
+              eslintOptions: {
                 files: ['**', '!**/__tests__/**', '!**/?(*.)(spec|test).*'],
                 options: {
                   parserOptions: {
@@ -347,11 +364,10 @@ function nodeExternalsWithResolve(
   });
 
   return (
-    context: string,
-    request: string,
-    callback: webpack.ExternalsFunctionCallback,
+    { context, request }: { context?: string; request?: string },
+    callback: any,
   ) => {
-    currentContext = context;
+    currentContext = context!;
     return externals(context, request, callback);
   };
 }
diff --git a/packages/cli/src/lib/bundler/optimization.ts b/packages/cli/src/lib/bundler/optimization.ts
index e97b2ae868..b8164d263d 100644
--- a/packages/cli/src/lib/bundler/optimization.ts
+++ b/packages/cli/src/lib/bundler/optimization.ts
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-import { Options } from 'webpack';
+import { WebpackOptionsNormalized, WebpackPluginInstance } from 'webpack';
 import TerserPlugin from 'terser-webpack-plugin';
 import { BundlingOptions } from './types';
 import { isParallelDefault } from '../parallel';
 
 export const optimization = (
   options: BundlingOptions,
-): Options.Optimization => {
+): WebpackOptionsNormalized['optimization'] => {
   const { isDev } = options;
 
   return {
@@ -32,7 +32,7 @@ export const optimization = (
           minimizer: [
             new TerserPlugin({
               parallel: options.parallel,
-            }),
+            }) as unknown as WebpackPluginInstance,
           ],
         }
       : {}),
diff --git a/packages/cli/src/lib/bundler/server.ts b/packages/cli/src/lib/bundler/server.ts
index 088128c805..2f8e3125c1 100644
--- a/packages/cli/src/lib/bundler/server.ts
+++ b/packages/cli/src/lib/bundler/server.ts
@@ -42,25 +42,31 @@ export async function serveBundle(options: ServeOptions) {
   });
   const compiler = webpack(config);
 
-  const server = new WebpackDevServer(compiler, {
-    hot: !process.env.CI,
-    contentBase: paths.targetPublic,
-    contentBasePublicPath: config.output?.publicPath,
-    publicPath: config.output?.publicPath,
-    historyApiFallback: {
-      // Paths with dots should still use the history fallback.
-      // See https://github.com/facebookincubator/create-react-app/issues/387.
-      disableDotRule: true,
-    },
-    clientLogLevel: 'warning',
-    stats: 'errors-warnings',
-    https: url.protocol === 'https:',
-    host,
-    port,
-    proxy: pkg.proxy,
-    // When the dev server is behind a proxy, the host and public hostname differ
-    allowedHosts: [url.hostname],
-  });
+  const server = new WebpackDevServer(
+    compiler as any,
+    {
+      hot: !process.env.CI,
+      devMiddleware: {
+        publicPath: config.output?.publicPath as string,
+        stats: 'errors-warnings',
+      },
+      static: {
+        publicPath: config.output?.publicPath as string,
+        directory: paths.targetPublic ?? '/',
+      },
+      historyApiFallback: {
+        // Paths with dots should still use the history fallback.
+        // See https://github.com/facebookincubator/create-react-app/issues/387.
+        disableDotRule: true,
+      },
+      https: url.protocol === 'https:',
+      host,
+      port,
+      proxy: pkg.proxy,
+      // When the dev server is behind a proxy, the host and public hostname differ
+      allowedHosts: [url.hostname],
+    } as any,
+  );
 
   await new Promise<void>((resolve, reject) => {
     server.listen(port, host, (err?: Error) => {
diff --git a/packages/cli/src/lib/bundler/transforms.ts b/packages/cli/src/lib/bundler/transforms.ts
index 6eb4920326..56162acf4b 100644
--- a/packages/cli/src/lib/bundler/transforms.ts
+++ b/packages/cli/src/lib/bundler/transforms.ts
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-import webpack, { Module, Plugin } from 'webpack';
+import webpack, { ModuleOptions, WebpackPluginInstance } from 'webpack';
 import MiniCssExtractPlugin from 'mini-css-extract-plugin';
 import { svgrTemplate } from '../svgrTemplate';
 
 type Transforms = {
-  loaders: Module['rules'];
-  plugins: Plugin[];
+  loaders: ModuleOptions['rules'];
+  plugins: WebpackPluginInstance[];
 };
 
 type TransformOptions = {
@@ -51,6 +51,12 @@ export const transforms = (options: TransformOptions): Transforms => {
         production: !isDev,
       },
     },
+    {
+      test: /\.m?js/,
+      resolve: {
+        fullySpecified: false,
+      },
+    },
     {
       test: [/\.icon\.svg$/],
       use: [
@@ -77,10 +83,16 @@ export const transforms = (options: TransformOptions): Transforms => {
         { and: [/\.svg/, { not: [/\.icon\.svg/] }] },
         /\.xml/,
       ],
-      loader: require.resolve('url-loader'),
-      options: {
-        limit: 10000,
-        name: 'static/[name].[hash:8].[ext]',
+      type: 'asset/resource',
+      generator: {
+        filename: 'static/[name].[hash:8].[ext]',
+      },
+    },
+    {
+      test: /\.(eot|woff|woff2|ttf)$/i,
+      type: 'asset/resource',
+      generator: {
+        filename: 'static/[name].[hash][ext][query]',
       },
     },
     {
@@ -89,7 +101,10 @@ export const transforms = (options: TransformOptions): Transforms => {
     },
     {
       include: /\.(md)$/,
-      use: require.resolve('raw-loader'),
+      type: 'asset/resource',
+      generator: {
+        filename: 'static/[name].[hash][ext][query]',
+      },
     },
     {
       test: /\.css$/i,
@@ -105,7 +120,7 @@ export const transforms = (options: TransformOptions): Transforms => {
     },
   ];
 
-  const plugins = new Array<Plugin>();
+  const plugins = new Array<WebpackPluginInstance>();
 
   if (isDev) {
     plugins.push(new webpack.HotModuleReplacementPlugin());
diff --git a/packages/cli/src/lib/config.ts b/packages/cli/src/lib/config.ts
index db96ca7686..a93f040122 100644
--- a/packages/cli/src/lib/config.ts
+++ b/packages/cli/src/lib/config.ts
@@ -22,6 +22,7 @@ type Options = {
   args: string[];
   fromPackage?: string;
   mockEnv?: boolean;
+  withFilteredKeys?: boolean;
 };
 
 export async function loadCliConfig(options: Options) {
@@ -57,6 +58,7 @@ export async function loadCliConfig(options: Options) {
   try {
     const frontendAppConfigs = schema.process(appConfigs, {
       visibility: ['frontend'],
+      withFilteredKeys: options.withFilteredKeys,
     });
     const frontendConfig = ConfigReader.fromConfigs(frontendAppConfigs);
 
diff --git a/packages/cli/src/lib/diff/handlers.ts b/packages/cli/src/lib/diff/handlers.ts
index 5cbddde0ec..4a17125e5a 100644
--- a/packages/cli/src/lib/diff/handlers.ts
+++ b/packages/cli/src/lib/diff/handlers.ts
@@ -16,6 +16,7 @@
 
 import chalk from 'chalk';
 import { diffLines } from 'diff';
+import { sep, posix } from 'path';
 import { FileDiff, PromptFunc, FileHandler, WriteFileFunc } from './types';
 
 function sortObjectKeys(obj: Record<string, unknown>) {
@@ -281,7 +282,7 @@ export async function handleAllFiles(
   promptFunc: PromptFunc,
 ) {
   for (const file of files) {
-    const { path } = file;
+    const path = file.path.split(sep).join(posix.sep);
     const fileHandler = fileHandlers.find(handler =>
       handler.patterns.some(pattern =>
         typeof pattern === 'string' ? pattern === path : pattern.test(path),
diff --git a/packages/cli/src/lib/versioning/Lockfile.ts b/packages/cli/src/lib/versioning/Lockfile.ts
index 7b23652c33..d3517e3c83 100644
--- a/packages/cli/src/lib/versioning/Lockfile.ts
+++ b/packages/cli/src/lib/versioning/Lockfile.ts
@@ -137,9 +137,9 @@ export class Lockfile {
       }
 
       // Find all versions currently in use
-      const versions = Array.from(
-        new Set(entries.map(e => e.version)),
-      ).sort((v1, v2) => semver.rcompare(v1, v2));
+      const versions = Array.from(new Set(entries.map(e => e.version))).sort(
+        (v1, v2) => semver.rcompare(v1, v2),
+      );
 
       // If we're not using at least 2 different versions we're done
       if (versions.length < 2) {
diff --git a/packages/cli/src/types.d.ts b/packages/cli/src/types.d.ts
index 9088a86369..db5e508ec2 100644
--- a/packages/cli/src/types.d.ts
+++ b/packages/cli/src/types.d.ts
@@ -29,5 +29,230 @@ declare module '@svgr/rollup' {
 }
 
 declare module '@rollup/plugin-yaml';
+declare module 'react-dev-utils/formatWebpackMessages' {
+  export default function (stats: any): {
+    errors: string[];
+    warnings: string[];
+  };
+}
 
-declare module 'terser-webpack-plugin';
+declare module 'react-dev-utils/openBrowser' {
+  export default function (url: string): boolean;
+}
+
+declare module 'react-dev-utils/ModuleScopePlugin' {
+  import webpack = require('webpack');
+
+  export default class ModuleScopePlugin
+    implements webpack.WebpackPluginInstance
+  {
+    constructor(
+      appSrc: string | ReadonlyArray<string>,
+      allowedFiles?: ReadonlyArray<string>,
+    );
+    apply: (resolver: any) => void;
+  }
+}
+
+declare module 'react-dev-utils/FileSizeReporter' {
+  import webpack = require('webpack');
+
+  export interface OpaqueFileSizes {
+    root: string;
+    sizes: Record<string, number>;
+  }
+
+  /**
+   * Captures JS and CSS asset sizes inside the passed `buildFolder`. Save the
+   * result value to compare it after the build.
+   */
+  export function measureFileSizesBeforeBuild(
+    buildFolder: string,
+  ): Promise<OpaqueFileSizes>;
+
+  /**
+   * Prints the JS and CSS asset sizes after the build, and includes a size
+   * comparison with `previousFileSizes` that were captured earlier using
+   * `measureFileSizesBeforeBuild()`. `maxBundleGzipSize` and
+   * `maxChunkGzipSizemay` may optionally be specified to display a warning when
+   * the main bundle or a chunk exceeds the specified size (in bytes).
+   */
+  export function printFileSizesAfterBuild(
+    webpackStats: webpack.Stats,
+    previousFileSizes: OpaqueFileSizes,
+    buildFolder: string,
+    maxBundleGzipSize?: number,
+    maxChunkGzipSize?: number,
+  ): void;
+}
+
+declare module 'mini-css-extract-plugin' {
+  import webpack = require('webpack');
+
+  /**
+   * Lightweight CSS extraction webpack plugin.
+   *
+   * This plugin extracts CSS into separate files. It creates a CSS file per JS file which
+   * contains CSS. It supports On-Demand-Loading of CSS and SourceMaps.
+   *
+   * Configuration Detail: https://github.com/webpack-contrib/mini-css-extract-plugin#configuration
+   */
+  export default class MiniCssExtractPlugin {
+    /**
+     * Webpack loader always used at the end of loaders list (ie. array index zero).
+     */
+    static loader: string;
+
+    constructor(options?: MiniCssExtractPlugin.PluginOptions);
+
+    /**
+     * Apply the plugin
+     */
+    apply(compiler: webpack.Compiler): void;
+  }
+
+  namespace MiniCssExtractPlugin {
+    interface PluginOptions {
+      /**
+       * Works like [`output.filename`](https://webpack.js.org/configuration/output/#outputfilename).
+       */
+      filename?: Required<webpack.Configuration>['output']['filename'];
+      /**
+       * Works like [`output.chunkFilename`](https://webpack.js.org/configuration/output/#outputchunkfilename).
+       */
+      chunkFilename?: string;
+      /**
+       * For projects where CSS ordering has been mitigated through consistent
+       * use of scoping or naming conventions, the CSS order warnings can be
+       * disabled by setting this flag to true for the plugin.
+       */
+      ignoreOrder?: boolean;
+      /**
+       * Specify where to insert the link tag.
+       *
+       * A string value specifies a DOM query for a parent element to attach to.
+       *
+       * A function allows to override default behavior for non-entry CSS chunks.
+       * This code will run in the browser alongside your application. It is recommend
+       * to only use ECMA 5 features and syntax. The function won't have access to the
+       * scope of the webpack configuration module.
+       *
+       * @default function() { document.head.appendChild(linkTag); }
+       */
+      insert?: string | ((linkTag: any) => void);
+      /**
+       * Specify additional html attributes to add to the link tag.
+       *
+       * Note: These are only applied to dynamically loaded css chunks. To modify link
+       * attributes for entry CSS chunks, please use html-webpack-plugin.
+       */
+      attributes?: Record<string, string>;
+      /**
+       * This option allows loading asynchronous chunks with a custom link type, such as
+       * `<link type="text/css" ...>`.
+       *
+       * `false` disables the link `type` attribute.
+       *
+       * @default 'text/css'
+       */
+      linkType?: string | false | 'text/css';
+    }
+    interface LoaderOptions {
+      /**
+       * Overrides [`output.publicPath`](https://webpack.js.org/configuration/output/#outputpublicpath).
+       * @default output.publicPath
+       */
+      publicPath?: string | ((resourcePath: string, context: string) => string);
+      /**
+       * If false, the plugin will extract the CSS but **will not** emit the file
+       * @default true
+       */
+      emit?: boolean;
+      /**
+       * By default, `mini-css-extract-plugin` generates JS modules that use the ES modules syntax.
+       * There are some cases in which using ES modules is beneficial,
+       * like in the case of module concatenation and tree shaking.
+       * @default true
+       */
+      esModule?: boolean;
+      modules?: {
+        /**
+         * Enables/disables ES modules named export for locals.
+         *
+         * Names of locals are converted to camelCase. It is not allowed to use
+         * JavaScript reserved words in CSS class names. Options `esModule` and
+         * `modules.namedExport` in css-loader and MiniCssExtractPlugin.loader
+         * must be enabled.
+         *
+         * @default false
+         */
+        namedExport?: boolean;
+      };
+    }
+  }
+}
+
+declare module 'fork-ts-checker-webpack-plugin/lib/ForkTsCheckerWebpackPlugin' {}
+declare module 'webpack-node-externals' {
+  export default function webpackNodeExternals(
+    options?: webpackNodeExternals.Options,
+  ): any;
+
+  namespace webpackNodeExternals {
+    type AllowlistOption = string | RegExp | AllowlistFunctionType;
+    type ImportTypeCallback = (moduleName: string) => string;
+    /** a function that accepts the module name and returns whether it should be included */
+    type AllowlistFunctionType = (moduleName: string) => boolean;
+    interface ModulesFromFileType {
+      exclude?: string | string[];
+      include?: string | string[];
+    }
+
+    interface Options {
+      /**
+       * An array for the externals to allow, so they will be included in the bundle.
+       * Can accept exact strings ('module_name'), regex patterns (/^module_name/), or a
+       * function that accepts the module name and returns whether it should be included.
+       * Important - if you have set aliases in your webpack config with the exact
+       * same names as modules in node_modules, you need to allowlist them so Webpack will know
+       * they should be bundled.
+       * @default []
+       */
+      allowlist?: AllowlistOption[] | AllowlistOption;
+      /**
+       * @default ['.bin']
+       */
+      binaryDirs?: string[];
+      /**
+       * The method in which unbundled modules will be required in the code. Best to leave as
+       * 'commonjs' for node modules.
+       * @default 'commonjs'
+       */
+      importType?:
+        | 'var'
+        | 'this'
+        | 'commonjs'
+        | 'amd'
+        | 'umd'
+        | ImportTypeCallback;
+      /**
+       * The folder in which to search for the node modules.
+       * @default 'node_modules'
+       */
+      modulesDir?: string;
+      /**
+       * Additional folders to look for node modules.
+       */
+      additionalModuleDirs?: string[];
+      /**
+       * Read the modules from the package.json file instead of the node_modules folder.
+       * @default false
+       */
+      modulesFromFile?: boolean | ModulesFromFileType;
+      /**
+       * @default false
+       */
+      includeAbsolutePaths?: boolean;
+    }
+  }
+}
diff --git a/packages/cli/templates/default-plugin/package.json.hbs b/packages/cli/templates/default-plugin/package.json.hbs
index dbba628055..fdac5a0c67 100644
--- a/packages/cli/templates/default-plugin/package.json.hbs
+++ b/packages/cli/templates/default-plugin/package.json.hbs
@@ -27,7 +27,7 @@
     "@backstage/core-components": "^{{version '@backstage/core-components'}}",
     "@backstage/core-plugin-api": "^{{version '@backstage/core-plugin-api'}}",
     "@backstage/theme": "^{{version '@backstage/theme'}}",
-    "@material-ui/core": "^4.11.0",
+    "@material-ui/core": "^4.12.2",
     "@material-ui/icons": "^4.9.1",
     "@material-ui/lab": "4.0.0-alpha.45",
     "react": "^16.13.1",
diff --git a/packages/codemods/CHANGELOG.md b/packages/codemods/CHANGELOG.md
index dc1f694dca..aa21ebc3a1 100644
--- a/packages/codemods/CHANGELOG.md
+++ b/packages/codemods/CHANGELOG.md
@@ -1,5 +1,74 @@
 # @backstage/codemods
 
+## 0.1.13
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.4.1
+  - @backstage/cli-common@0.1.3
+  - @backstage/core-app-api@0.1.12
+  - @backstage/core-plugin-api@0.1.7
+
+## 0.1.12
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.4.0
+  - @backstage/core-app-api@0.1.11
+
+## 0.1.11
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-app-api@0.1.10
+  - @backstage/core-components@0.3.3
+
+## 0.1.10
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-app-api@0.1.9
+  - @backstage/core-components@0.3.2
+
+## 0.1.9
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-app-api@0.1.8
+  - @backstage/core-components@0.3.1
+  - @backstage/core-plugin-api@0.1.6
+
+## 0.1.8
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.3.0
+  - @backstage/core-plugin-api@0.1.5
+  - @backstage/core-app-api@0.1.7
+
+## 0.1.7
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.2.0
+  - @backstage/core-app-api@0.1.6
+  - @backstage/core-plugin-api@0.1.4
+
+## 0.1.6
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.1.6
+  - @backstage/core-app-api@0.1.5
+
 ## 0.1.5
 
 ### Patch Changes
diff --git a/packages/codemods/package.json b/packages/codemods/package.json
index 9cf5730126..0fbafe7fe2 100644
--- a/packages/codemods/package.json
+++ b/packages/codemods/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@backstage/codemods",
   "description": "A collection of codemods for Backstage projects",
-  "version": "0.1.5",
+  "version": "0.1.13",
   "private": false,
   "publishConfig": {
     "access": "public",
@@ -31,7 +31,7 @@
     "backstage-codemods": "bin/backstage-codemods"
   },
   "dependencies": {
-    "@backstage/cli-common": "0.1.2",
+    "@backstage/cli-common": "0.1.3",
     "@backstage/core-app-api": "*",
     "@backstage/core-components": "*",
     "@backstage/core-plugin-api": "*",
diff --git a/packages/config-loader/CHANGELOG.md b/packages/config-loader/CHANGELOG.md
index e0be1eebc8..88479bbb18 100644
--- a/packages/config-loader/CHANGELOG.md
+++ b/packages/config-loader/CHANGELOG.md
@@ -1,5 +1,37 @@
 # @backstage/config-loader
 
+## 0.6.8
+
+### Patch Changes
+
+- d1da88a19: Properly export all used types.
+- Updated dependencies
+  - @backstage/cli-common@0.1.3
+  - @backstage/config@0.1.9
+
+## 0.6.7
+
+### Patch Changes
+
+- 0ade9d02b: Include `devDependencies` and `optionalDependencies` in the detection of Backstage packages when collecting configuration schema.
+- 9b8cec063: Add support for config file watching through a new group of `watch` options to `loadConfig`.
+- Updated dependencies
+  - @backstage/config@0.1.7
+
+## 0.6.6
+
+### Patch Changes
+
+- e9d3983ee: Add option to populate the `filteredKeys` property when processing configuration with a schema.
+- Updated dependencies
+  - @backstage/config@0.1.6
+
+## 0.6.5
+
+### Patch Changes
+
+- ae84b20cf: Revert the upgrade to `fs-extra@10.0.0` as that seemed to have broken all installs inexplicably.
+
 ## 0.6.4
 
 ### Patch Changes
diff --git a/packages/config-loader/api-report.md b/packages/config-loader/api-report.md
index ffd15b0c9a..a674f624b0 100644
--- a/packages/config-loader/api-report.md
+++ b/packages/config-loader/api-report.md
@@ -11,15 +11,25 @@ import { JSONSchema7 } from 'json-schema';
 export type ConfigSchema = {
   process(
     appConfigs: AppConfig[],
-    options?: ConfigProcessingOptions,
+    options?: ConfigSchemaProcessingOptions,
   ): AppConfig[];
   serialize(): JsonObject;
 };
 
 // @public
-export type ConfigVisibility = typeof CONFIG_VISIBILITIES[number];
+export type ConfigSchemaProcessingOptions = {
+  visibility?: ConfigVisibility[];
+  valueTransform?: TransformFunc<any>;
+  withFilteredKeys?: boolean;
+};
+
+// @public
+export type ConfigVisibility = 'frontend' | 'backend' | 'secret';
 
 // @public (undocumented)
+export type EnvFunc = (name: string) => Promise<string | undefined>;
+
+// @public
 export function loadConfig(options: LoadConfigOptions): Promise<AppConfig[]>;
 
 // @public (undocumented)
@@ -28,10 +38,25 @@ export type LoadConfigOptions = {
   configPaths: string[];
   env?: string;
   experimentalEnvFunc?: EnvFunc;
+  watch?: {
+    onChange: (configs: AppConfig[]) => void;
+    stopSignal?: Promise<void>;
+  };
 };
 
 // @public
-export function loadConfigSchema(options: Options): Promise<ConfigSchema>;
+export function loadConfigSchema(
+  options: LoadConfigSchemaOptions,
+): Promise<ConfigSchema>;
+
+// @public (undocumented)
+export type LoadConfigSchemaOptions =
+  | {
+      dependencies: string[];
+    }
+  | {
+      serialized: JsonObject;
+    };
 
 // @public
 export function mergeConfigSchemas(schemas: JSONSchema7[]): JSONSchema7;
@@ -41,5 +66,13 @@ export function readEnvConfig(env: {
   [name: string]: string | undefined;
 }): AppConfig[];
 
+// @public
+export type TransformFunc<T extends number | string | boolean> = (
+  value: T,
+  context: {
+    visibility: ConfigVisibility;
+  },
+) => T | undefined;
+
 // (No @packageDocumentation comment for this package)
 ```
diff --git a/packages/config-loader/package.json b/packages/config-loader/package.json
index cff324484a..0f5bac2ffc 100644
--- a/packages/config-loader/package.json
+++ b/packages/config-loader/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@backstage/config-loader",
   "description": "Config loading functionality used by Backstage backend, and CLI",
-  "version": "0.6.4",
+  "version": "0.6.8",
   "private": false,
   "publishConfig": {
     "access": "public",
@@ -30,10 +30,11 @@
     "clean": "backstage-cli clean"
   },
   "dependencies": {
-    "@backstage/cli-common": "^0.1.1",
-    "@backstage/config": "^0.1.5",
+    "@backstage/cli-common": "^0.1.3",
+    "@backstage/config": "^0.1.9",
     "@types/json-schema": "^7.0.6",
     "ajv": "^7.0.3",
+    "chokidar": "^3.5.2",
     "fs-extra": "9.1.0",
     "json-schema": "^0.3.0",
     "json-schema-merge-allof": "^0.8.1",
diff --git a/packages/config-loader/src/index.ts b/packages/config-loader/src/index.ts
index f605d53115..29976b52de 100644
--- a/packages/config-loader/src/index.ts
+++ b/packages/config-loader/src/index.ts
@@ -15,6 +15,13 @@
  */
 
 export { readEnvConfig, loadConfigSchema, mergeConfigSchemas } from './lib';
-export type { ConfigSchema, ConfigVisibility } from './lib';
+export type {
+  ConfigSchema,
+  ConfigSchemaProcessingOptions,
+  ConfigVisibility,
+  EnvFunc,
+  LoadConfigSchemaOptions,
+  TransformFunc,
+} from './lib';
 export { loadConfig } from './loader';
 export type { LoadConfigOptions } from './loader';
diff --git a/packages/config-loader/src/lib/env.ts b/packages/config-loader/src/lib/env.ts
index 7d28e6b6ef..b244c06c64 100644
--- a/packages/config-loader/src/lib/env.ts
+++ b/packages/config-loader/src/lib/env.ts
@@ -38,6 +38,8 @@ const CONFIG_KEY_PART_PATTERN = /^[a-z][a-z0-9]*(?:[-_][a-z][a-z0-9]*)*$/i;
  * For example, to set the config app.title to "My Title", use the following:
  *
  * APP_CONFIG_app_title='"My Title"'
+ *
+ * @public
  */
 export function readEnvConfig(env: {
   [name: string]: string | undefined;
diff --git a/packages/config-loader/src/lib/schema/collect.test.ts b/packages/config-loader/src/lib/schema/collect.test.ts
index 479e63c94c..ef9d38faa9 100644
--- a/packages/config-loader/src/lib/schema/collect.test.ts
+++ b/packages/config-loader/src/lib/schema/collect.test.ts
@@ -87,6 +87,8 @@ describe('collectConfigSchemas', () => {
             dependencies: {
               c1: '0.0.0',
               c2: '0.0.0',
+            },
+            devDependencies: {
               '@backstage/mock': '0.0.0',
             },
             configSchema: { ...mockSchema, title: 'b' },
diff --git a/packages/config-loader/src/lib/schema/collect.ts b/packages/config-loader/src/lib/schema/collect.ts
index b53389d499..b363e8e5f3 100644
--- a/packages/config-loader/src/lib/schema/collect.ts
+++ b/packages/config-loader/src/lib/schema/collect.ts
@@ -74,6 +74,8 @@ export async function collectConfigSchemas(
     const pkg = await fs.readJson(pkgPath);
     const depNames = [
       ...Object.keys(pkg.dependencies ?? {}),
+      ...Object.keys(pkg.devDependencies ?? {}),
+      ...Object.keys(pkg.optionalDependencies ?? {}),
       ...Object.keys(pkg.peerDependencies ?? {}),
     ];
 
diff --git a/packages/config-loader/src/lib/schema/compile.ts b/packages/config-loader/src/lib/schema/compile.ts
index 4236fd2d17..a36d2eb9a2 100644
--- a/packages/config-loader/src/lib/schema/compile.ts
+++ b/packages/config-loader/src/lib/schema/compile.ts
@@ -108,6 +108,8 @@ export function compileConfigSchemas(
 /**
  * Given a list of configuration schemas from packages, merge them
  * into a single json schema.
+ *
+ * @public
  */
 export function mergeConfigSchemas(schemas: JSONSchema[]): JSONSchema {
   const merged = mergeAllOf(
diff --git a/packages/config-loader/src/lib/schema/filtering.test.ts b/packages/config-loader/src/lib/schema/filtering.test.ts
index 5079afa876..d4b3cd55b6 100644
--- a/packages/config-loader/src/lib/schema/filtering.test.ts
+++ b/packages/config-loader/src/lib/schema/filtering.test.ts
@@ -63,43 +63,115 @@ const visibility = new Map<string, ConfigVisibility>(
 
 describe('filterByVisibility', () => {
   test.each<[ConfigVisibility[], JsonObject]>([
-    [[], {}],
+    [
+      [],
+      {
+        data: {},
+        filteredKeys: [
+          'arr[0]',
+          'arr[1]',
+          'arr[2]',
+          'objArr[0].f',
+          'objArr[0].b',
+          'objArr[0].s',
+          'objArr[1].f',
+          'objArr[1].b',
+          'objArr[1].s',
+          'obj.f',
+          'obj.b.s',
+          'arrF[0].never',
+          'arrB[0].never',
+          'arrS[0].never',
+          'objF.never',
+          'objB.never',
+          'objS.never',
+        ],
+      },
+    ],
     [
       ['frontend'],
       {
-        arr: ['f'],
-        objArr: [{ f: 1 }, { f: 4 }],
-        obj: { f: 'a' },
-        arrF: [],
-        objF: {},
+        data: {
+          arr: ['f'],
+          objArr: [{ f: 1 }, { f: 4 }],
+          obj: { f: 'a' },
+          arrF: [],
+          objF: {},
+        },
+        filteredKeys: [
+          'arr[1]',
+          'arr[2]',
+          'objArr[0].b',
+          'objArr[0].s',
+          'objArr[1].b',
+          'objArr[1].s',
+          'obj.b.s',
+          'arrF[0].never',
+          'arrB[0].never',
+          'arrS[0].never',
+          'objF.never',
+          'objB.never',
+          'objS.never',
+        ],
       },
     ],
     [
       ['backend'],
       {
-        arr: ['b'],
-        objArr: [{ b: 2 }, { b: 5 }],
-        obj: { b: {} },
-        arrF: [{ never: 'here' }],
-        arrB: [{ never: 'here' }],
-        arrS: [{ never: 'here' }],
-        objF: { never: 'here' },
-        objB: { never: 'here' },
-        objS: { never: 'here' },
+        data: {
+          arr: ['b'],
+          objArr: [{ b: 2 }, { b: 5 }],
+          obj: { b: {} },
+          arrF: [{ never: 'here' }],
+          arrB: [{ never: 'here' }],
+          arrS: [{ never: 'here' }],
+          objF: { never: 'here' },
+          objB: { never: 'here' },
+          objS: { never: 'here' },
+        },
+        filteredKeys: [
+          'arr[0]',
+          'arr[2]',
+          'objArr[0].f',
+          'objArr[0].s',
+          'objArr[1].f',
+          'objArr[1].s',
+          'obj.f',
+          'obj.b.s',
+        ],
       },
     ],
     [
       ['secret'],
       {
-        arr: ['s'],
-        objArr: [{ s: 3 }, { s: 6 }],
-        obj: { b: { s: true } },
-        arrS: [],
-        objS: {},
+        data: {
+          arr: ['s'],
+          objArr: [{ s: 3 }, { s: 6 }],
+          obj: { b: { s: true } },
+          arrS: [],
+          objS: {},
+        },
+        filteredKeys: [
+          'arr[0]',
+          'arr[1]',
+          'objArr[0].f',
+          'objArr[0].b',
+          'objArr[1].f',
+          'objArr[1].b',
+          'obj.f',
+          'arrF[0].never',
+          'arrB[0].never',
+          'arrS[0].never',
+          'objF.never',
+          'objB.never',
+          'objS.never',
+        ],
       },
     ],
-    [['frontend', 'backend', 'secret'], data],
+    [['frontend', 'backend', 'secret'], { data, filteredKeys: [] }],
   ])('should filter correctly with %p', (filter, expected) => {
-    expect(filterByVisibility(data, filter, visibility)).toEqual(expected);
+    expect(
+      filterByVisibility(data, filter, visibility, undefined, true),
+    ).toEqual(expected);
   });
 });
diff --git a/packages/config-loader/src/lib/schema/filtering.ts b/packages/config-loader/src/lib/schema/filtering.ts
index 74d367a30a..3533be01b7 100644
--- a/packages/config-loader/src/lib/schema/filtering.ts
+++ b/packages/config-loader/src/lib/schema/filtering.ts
@@ -30,9 +30,17 @@ export function filterByVisibility(
   includeVisibilities: ConfigVisibility[],
   visibilityByPath: Map<string, ConfigVisibility>,
   transformFunc?: TransformFunc<number | string | boolean>,
-): JsonObject {
-  function transform(jsonVal: JsonValue, path: string): JsonValue | undefined {
-    const visibility = visibilityByPath.get(path) ?? DEFAULT_CONFIG_VISIBILITY;
+  withFilteredKeys?: boolean,
+): { data: JsonObject; filteredKeys?: string[] } {
+  const filteredKeys = new Array<string>();
+
+  function transform(
+    jsonVal: JsonValue,
+    visibilityPath: string, // Matches the format we get from ajv
+    filterPath: string, // Matches the format of the ConfigReader
+  ): JsonValue | undefined {
+    const visibility =
+      visibilityByPath.get(visibilityPath) ?? DEFAULT_CONFIG_VISIBILITY;
     const isVisible = includeVisibilities.includes(visibility);
 
     if (typeof jsonVal !== 'object') {
@@ -42,6 +50,9 @@ export function filterByVisibility(
         }
         return jsonVal;
       }
+      if (withFilteredKeys) {
+        filteredKeys.push(filterPath);
+      }
       return undefined;
     } else if (jsonVal === null) {
       return undefined;
@@ -49,7 +60,11 @@ export function filterByVisibility(
       const arr = new Array<JsonValue>();
 
       for (const [index, value] of jsonVal.entries()) {
-        const out = transform(value, `${path}/${index}`);
+        const out = transform(
+          value,
+          `${visibilityPath}/${index}`,
+          `${filterPath}[${index}]`,
+        );
         if (out !== undefined) {
           arr.push(out);
         }
@@ -68,7 +83,11 @@ export function filterByVisibility(
       if (value === undefined) {
         continue;
       }
-      const out = transform(value, `${path}/${key}`);
+      const out = transform(
+        value,
+        `${visibilityPath}/${key}`,
+        filterPath ? `${filterPath}.${key}` : key,
+      );
       if (out !== undefined) {
         outObj[key] = out;
         hasOutput = true;
@@ -81,5 +100,8 @@ export function filterByVisibility(
     return undefined;
   }
 
-  return (transform(data, '') as JsonObject) ?? {};
+  return {
+    filteredKeys: withFilteredKeys ? filteredKeys : undefined,
+    data: (transform(data, '', '') as JsonObject) ?? {},
+  };
 }
diff --git a/packages/config-loader/src/lib/schema/index.ts b/packages/config-loader/src/lib/schema/index.ts
index 851be36f84..1dcb9d7b4b 100644
--- a/packages/config-loader/src/lib/schema/index.ts
+++ b/packages/config-loader/src/lib/schema/index.ts
@@ -16,4 +16,10 @@
 
 export { mergeConfigSchemas } from './compile';
 export { loadConfigSchema } from './load';
-export type { ConfigSchema, ConfigVisibility } from './types';
+export type { LoadConfigSchemaOptions } from './load';
+export type {
+  ConfigSchema,
+  ConfigVisibility,
+  ConfigSchemaProcessingOptions,
+  TransformFunc,
+} from './types';
diff --git a/packages/config-loader/src/lib/schema/load.test.ts b/packages/config-loader/src/lib/schema/load.test.ts
index 4a2b719590..73fa55b90c 100644
--- a/packages/config-loader/src/lib/schema/load.test.ts
+++ b/packages/config-loader/src/lib/schema/load.test.ts
@@ -68,13 +68,19 @@ describe('loadConfigSchema', () => {
       schema.process(configs, {
         visibility: ['frontend'],
         valueTransform: () => 'X',
+        withFilteredKeys: true,
       }),
-    ).toEqual([{ data: { key1: 'X' }, context: 'test' }]);
+    ).toEqual([
+      { data: { key1: 'X' }, context: 'test', filteredKeys: ['key2'] },
+    ]);
     expect(
       schema.process(configs, {
         valueTransform: () => 'X',
+        withFilteredKeys: true,
       }),
-    ).toEqual([{ data: { key1: 'X', key2: 'X' }, context: 'test' }]);
+    ).toEqual([
+      { data: { key1: 'X', key2: 'X' }, context: 'test', filteredKeys: [] },
+    ]);
 
     const serialized = schema.serialize();
 
diff --git a/packages/config-loader/src/lib/schema/load.ts b/packages/config-loader/src/lib/schema/load.ts
index ae5823c8cc..4620961310 100644
--- a/packages/config-loader/src/lib/schema/load.ts
+++ b/packages/config-loader/src/lib/schema/load.ts
@@ -24,7 +24,8 @@ import {
   CONFIG_VISIBILITIES,
 } from './types';
 
-type Options =
+/** @public */
+export type LoadConfigSchemaOptions =
   | {
       dependencies: string[];
     }
@@ -34,9 +35,11 @@ type Options =
 
 /**
  * Loads config schema for a Backstage instance.
+ *
+ * @public
  */
 export async function loadConfigSchema(
-  options: Options,
+  options: LoadConfigSchemaOptions,
 ): Promise<ConfigSchema> {
   let schemas: ConfigSchemaPackageEntry[];
 
@@ -57,7 +60,7 @@ export async function loadConfigSchema(
   return {
     process(
       configs: AppConfig[],
-      { visibility, valueTransform } = {},
+      { visibility, valueTransform, withFilteredKeys } = {},
     ): AppConfig[] {
       const result = validate(configs);
       if (result.errors) {
@@ -73,21 +76,23 @@ export async function loadConfigSchema(
       if (visibility) {
         processedConfigs = processedConfigs.map(({ data, context }) => ({
           context,
-          data: filterByVisibility(
+          ...filterByVisibility(
             data,
             visibility,
             result.visibilityByPath,
             valueTransform,
+            withFilteredKeys,
           ),
         }));
       } else if (valueTransform) {
         processedConfigs = processedConfigs.map(({ data, context }) => ({
           context,
-          data: filterByVisibility(
+          ...filterByVisibility(
             data,
             Array.from(CONFIG_VISIBILITIES),
             result.visibilityByPath,
             valueTransform,
+            withFilteredKeys,
           ),
         }));
       }
diff --git a/packages/config-loader/src/lib/schema/types.ts b/packages/config-loader/src/lib/schema/types.ts
index 30e47917bc..ef6a197f55 100644
--- a/packages/config-loader/src/lib/schema/types.ts
+++ b/packages/config-loader/src/lib/schema/types.ts
@@ -37,8 +37,10 @@ export const CONFIG_VISIBILITIES = ['frontend', 'backend', 'secret'] as const;
 
 /**
  * A type representing the possible configuration value visibilities
+ *
+ * @public
  */
-export type ConfigVisibility = typeof CONFIG_VISIBILITIES[number];
+export type ConfigVisibility = 'frontend' | 'backend' | 'secret';
 
 /**
  * The default configuration visibility if no other values is given.
@@ -73,6 +75,8 @@ export type ValidationFunc = (configs: AppConfig[]) => ValidationResult;
 
 /**
  * A function used to transform primitive configuration values.
+ *
+ * @public
  */
 export type TransformFunc<T extends number | string | boolean> = (
   value: T,
@@ -81,8 +85,10 @@ export type TransformFunc<T extends number | string | boolean> = (
 
 /**
  * Options used to process configuration data with a schema.
+ *
+ * @public
  */
-type ConfigProcessingOptions = {
+export type ConfigSchemaProcessingOptions = {
   /**
    * The visibilities that should be included in the output data.
    * If omitted, the data will not be filtered by visibility.
@@ -96,15 +102,24 @@ type ConfigProcessingOptions = {
    * will be omitted.
    */
   valueTransform?: TransformFunc<any>;
+
+  /**
+   * Whether or not to include the `filteredKeys` property in the output `AppConfig`s.
+   *
+   * Default: `false`.
+   */
+  withFilteredKeys?: boolean;
 };
 
 /**
  * A loaded configuration schema that is ready to process configuration data.
+ *
+ * @public
  */
 export type ConfigSchema = {
   process(
     appConfigs: AppConfig[],
-    options?: ConfigProcessingOptions,
+    options?: ConfigSchemaProcessingOptions,
   ): AppConfig[];
 
   serialize(): JsonObject;
diff --git a/packages/config-loader/src/lib/transform/include.test.ts b/packages/config-loader/src/lib/transform/include.test.ts
index 44bf07ab4d..91df723621 100644
--- a/packages/config-loader/src/lib/transform/include.test.ts
+++ b/packages/config-loader/src/lib/transform/include.test.ts
@@ -24,9 +24,11 @@ const substituteMe = '${MY_SUBSTITUTION}';
 const mySubstitution = 'fooSubstitution';
 
 const env = jest.fn(async (name: string) => {
-  return ({
-    SECRET: 'my-secret',
-  } as { [name: string]: string })[name];
+  return (
+    {
+      SECRET: 'my-secret',
+    } as { [name: string]: string }
+  )[name];
 });
 
 const substitute: TransformFunc = async value => {
@@ -44,14 +46,16 @@ const substitute: TransformFunc = async value => {
 };
 
 const readFile = jest.fn(async (path: string) => {
-  const content = ({
-    [resolvePath(root, 'my-secret')]: 'secret',
-    [resolvePath(root, 'my-data.json')]: '{"a":{"b":{"c":42}}}',
-    [resolvePath(root, 'my-data.yaml')]: 'some:\n yaml:\n  key: 7',
-    [resolvePath(root, 'my-data.yml')]: 'different: { key: hello }',
-    [resolvePath(root, 'invalid.yaml')]: 'foo: [}',
-    [resolvePath(root, `${mySubstitution}/my-data.json`)]: '{"foo":"bar"}',
-  } as { [key: string]: string })[path];
+  const content = (
+    {
+      [resolvePath(root, 'my-secret')]: 'secret',
+      [resolvePath(root, 'my-data.json')]: '{"a":{"b":{"c":42}}}',
+      [resolvePath(root, 'my-data.yaml')]: 'some:\n yaml:\n  key: 7',
+      [resolvePath(root, 'my-data.yml')]: 'different: { key: hello }',
+      [resolvePath(root, 'invalid.yaml')]: 'foo: [}',
+      [resolvePath(root, `${mySubstitution}/my-data.json`)]: '{"foo":"bar"}',
+    } as { [key: string]: string }
+  )[path];
 
   if (!content) {
     throw new Error('File not found!');
diff --git a/packages/config-loader/src/lib/transform/index.ts b/packages/config-loader/src/lib/transform/index.ts
index 5053cd7443..eaa85cca3c 100644
--- a/packages/config-loader/src/lib/transform/index.ts
+++ b/packages/config-loader/src/lib/transform/index.ts
@@ -17,3 +17,4 @@
 export { applyConfigTransforms } from './apply';
 export { createIncludeTransform } from './include';
 export { createSubstitutionTransform } from './substitution';
+export type { EnvFunc } from './types';
diff --git a/packages/config-loader/src/lib/transform/substitution.test.ts b/packages/config-loader/src/lib/transform/substitution.test.ts
index dc6ed47597..b03c39c174 100644
--- a/packages/config-loader/src/lib/transform/substitution.test.ts
+++ b/packages/config-loader/src/lib/transform/substitution.test.ts
@@ -17,10 +17,12 @@
 import { createSubstitutionTransform } from './substitution';
 
 const env = jest.fn(async (name: string) => {
-  return ({
-    SECRET: 'my-secret',
-    TOKEN: 'my-token',
-  } as { [name: string]: string })[name];
+  return (
+    {
+      SECRET: 'my-secret',
+      TOKEN: 'my-token',
+    } as { [name: string]: string }
+  )[name];
 });
 
 const substituteTransform = createSubstitutionTransform(env);
diff --git a/packages/config-loader/src/lib/transform/types.ts b/packages/config-loader/src/lib/transform/types.ts
index 20e5f88718..afd3550984 100644
--- a/packages/config-loader/src/lib/transform/types.ts
+++ b/packages/config-loader/src/lib/transform/types.ts
@@ -16,6 +16,7 @@
 
 import { JsonValue } from '@backstage/config';
 
+/** @public */
 export type EnvFunc = (name: string) => Promise<string | undefined>;
 
 export type ReadFileFunc = (path: string) => Promise<string>;
diff --git a/packages/config-loader/src/loader.test.ts b/packages/config-loader/src/loader.test.ts
index b0e236f9c9..3f51e76936 100644
--- a/packages/config-loader/src/loader.test.ts
+++ b/packages/config-loader/src/loader.test.ts
@@ -14,11 +14,13 @@
  * limitations under the License.
  */
 
+import { AppConfig } from '@backstage/config';
 import { loadConfig } from './loader';
 import mockFs from 'mock-fs';
+import fs from 'fs-extra';
 
 describe('loadConfig', () => {
-  beforeAll(() => {
+  beforeEach(() => {
     process.env.MY_SECRET = 'is-secret';
     process.env.SUBSTITUTE_ME = 'substituted';
 
@@ -63,7 +65,7 @@ describe('loadConfig', () => {
     });
   });
 
-  afterAll(() => {
+  afterEach(() => {
     mockFs.restore();
   });
 
@@ -170,4 +172,81 @@ describe('loadConfig', () => {
       },
     ]);
   });
+
+  it('watches config files', async () => {
+    const onChange = defer<AppConfig[]>();
+    const stopSignal = defer<void>();
+
+    await expect(
+      loadConfig({
+        configRoot: '/root',
+        configPaths: [],
+        watch: {
+          onChange: onChange.resolve,
+          stopSignal: stopSignal.promise,
+        },
+      }),
+    ).resolves.toEqual([
+      {
+        context: 'app-config.yaml',
+        data: {
+          app: {
+            title: 'Example App',
+            sessionKey: 'abc123',
+            escaped: '${Escaped}',
+          },
+        },
+      },
+    ]);
+
+    await fs.writeJson('/root/app-config.yaml', {
+      app: {
+        title: 'New Title',
+      },
+    });
+    await expect(onChange.promise).resolves.toEqual([
+      {
+        context: 'app-config.yaml',
+        data: {
+          app: {
+            title: 'New Title',
+          },
+        },
+      },
+    ]);
+
+    stopSignal.resolve();
+  });
+
+  it('stops watching config files', async () => {
+    const stopSignal = defer<void>();
+
+    await loadConfig({
+      configRoot: '/root',
+      configPaths: [],
+      watch: {
+        onChange: () => {
+          expect('not').toBe('called');
+        },
+        stopSignal: stopSignal.promise,
+      },
+    });
+
+    stopSignal.resolve();
+
+    await fs.writeJson('/root/app-config.yaml', {
+      app: {
+        title: 'New Title',
+      },
+    });
+    await new Promise(resolve => setTimeout(resolve, 1000));
+  });
+
+  function defer<T>() {
+    let resolve: (value: T) => void;
+    const promise = new Promise<T>(_resolve => {
+      resolve = _resolve;
+    });
+    return { promise, resolve: resolve! };
+  }
 });
diff --git a/packages/config-loader/src/loader.ts b/packages/config-loader/src/loader.ts
index 3846d6474b..315b44c4ee 100644
--- a/packages/config-loader/src/loader.ts
+++ b/packages/config-loader/src/loader.ts
@@ -16,6 +16,7 @@
 
 import fs from 'fs-extra';
 import yaml from 'yaml';
+import chokidar from 'chokidar';
 import { resolve as resolvePath, dirname, isAbsolute, basename } from 'path';
 import { AppConfig } from '@backstage/config';
 import {
@@ -26,6 +27,7 @@ import {
 } from './lib';
 import { EnvFunc } from './lib/transform/types';
 
+/** @public */
 export type LoadConfigOptions = {
   // The root directory of the config loading context. Used to find default configs.
   configRoot: string;
@@ -42,13 +44,32 @@ export type LoadConfigOptions = {
    * @experimental This API is not stable and may change at any point
    */
   experimentalEnvFunc?: EnvFunc;
+
+  /**
+   * An optional configuration that enables watching of config files.
+   */
+  watch?: {
+    /**
+     * A listener that is called when a config file is changed.
+     */
+    onChange: (configs: AppConfig[]) => void;
+
+    /**
+     * An optional signal that stops the watcher once the promise resolves.
+     */
+    stopSignal?: Promise<void>;
+  };
 };
 
+/**
+ * Load configuration data.
+ *
+ * @public
+ */
 export async function loadConfig(
   options: LoadConfigOptions,
 ): Promise<AppConfig[]> {
-  const configs = [];
-  const { configRoot, experimentalEnvFunc: envFunc } = options;
+  const { configRoot, experimentalEnvFunc: envFunc, watch } = options;
   const configPaths = options.configPaths.slice();
 
   // If no paths are provided, we default to reading
@@ -64,7 +85,9 @@ export async function loadConfig(
 
   const env = envFunc ?? (async (name: string) => process.env[name]);
 
-  try {
+  const loadConfigFiles = async () => {
+    const configs = [];
+
     for (const configPath of configPaths) {
       if (!isAbsolute(configPath)) {
         throw new Error(`Config load path is not absolute: '${configPath}'`);
@@ -83,13 +106,50 @@ export async function loadConfig(
 
       configs.push({ data, context: basename(configPath) });
     }
+
+    return configs;
+  };
+
+  let fileConfigs;
+  try {
+    fileConfigs = await loadConfigFiles();
   } catch (error) {
     throw new Error(
       `Failed to read static configuration file, ${error.message}`,
     );
   }
 
-  configs.push(...readEnvConfig(process.env));
+  const envConfigs = await readEnvConfig(process.env);
 
-  return configs;
+  // Set up config file watching if requested by the caller
+  if (watch) {
+    let currentSerializedConfig = JSON.stringify(fileConfigs);
+
+    const watcher = chokidar.watch(configPaths, {
+      usePolling: process.env.NODE_ENV === 'test',
+    });
+    watcher.on('change', async () => {
+      try {
+        const newConfigs = await loadConfigFiles();
+        const newSerializedConfig = JSON.stringify(newConfigs);
+
+        if (currentSerializedConfig === newSerializedConfig) {
+          return;
+        }
+        currentSerializedConfig = newSerializedConfig;
+
+        watch.onChange([...newConfigs, ...envConfigs]);
+      } catch (error) {
+        console.error(`Failed to reload configuration files, ${error}`);
+      }
+    });
+
+    if (watch.stopSignal) {
+      watch.stopSignal.then(() => {
+        watcher.close();
+      });
+    }
+  }
+
+  return [...fileConfigs, ...envConfigs];
 }
diff --git a/packages/config/CHANGELOG.md b/packages/config/CHANGELOG.md
index 5cababf94e..7691ed2865 100644
--- a/packages/config/CHANGELOG.md
+++ b/packages/config/CHANGELOG.md
@@ -1,5 +1,29 @@
 # @backstage/config
 
+## 0.1.9
+
+### Patch Changes
+
+- f88b2c7db: Documented `Config` interface and mark types as public.
+
+## 0.1.8
+
+### Patch Changes
+
+- 47113f1f1: Only warn once per key when trying to read visibility-filtered values
+
+## 0.1.7
+
+### Patch Changes
+
+- 90f25476a: Extended the `Config` interface to have an optional `subscribe` method that can be used be notified of updates to the configuration.
+
+## 0.1.6
+
+### Patch Changes
+
+- e9d3983ee: Add warning when trying to access configuration values that have been filtered out by visibility.
+
 ## 0.1.5
 
 ### Patch Changes
diff --git a/packages/config/api-report.md b/packages/config/api-report.md
index 0c243aab48..068498b17a 100644
--- a/packages/config/api-report.md
+++ b/packages/config/api-report.md
@@ -3,14 +3,18 @@
 > Do not edit this file. It is a report generated by [API Extractor](https://api-extractor.com/).
 
 ```ts
-// @public (undocumented)
+// @public
 export type AppConfig = {
   context: string;
   data: JsonObject;
+  filteredKeys?: string[];
 };
 
-// @public (undocumented)
+// @public
 export type Config = {
+  subscribe?(onChange: () => void): {
+    unsubscribe: () => void;
+  };
   has(key: string): boolean;
   keys(): string[];
   get<T = JsonValue>(key?: string): T;
@@ -29,7 +33,7 @@ export type Config = {
   getOptionalStringArray(key: string): string[] | undefined;
 };
 
-// @public (undocumented)
+// @public
 export class ConfigReader implements Config {
   constructor(
     data: JsonObject | undefined,
@@ -73,18 +77,18 @@ export class ConfigReader implements Config {
   keys(): string[];
 }
 
-// @public (undocumented)
+// @public
 export interface JsonArray extends Array<JsonValue> {}
 
-// @public (undocumented)
+// @public
 export type JsonObject = {
   [key in string]?: JsonValue;
 };
 
-// @public (undocumented)
+// @public
 export type JsonPrimitive = number | string | boolean | null;
 
-// @public (undocumented)
+// @public
 export type JsonValue = JsonObject | JsonArray | JsonPrimitive;
 
 // (No @packageDocumentation comment for this package)
diff --git a/packages/config/package.json b/packages/config/package.json
index 400e4548cd..969bc44045 100644
--- a/packages/config/package.json
+++ b/packages/config/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@backstage/config",
   "description": "Config API used by Backstage core, backend, and CLI",
-  "version": "0.1.5",
+  "version": "0.1.9",
   "private": false,
   "publishConfig": {
     "access": "public",
diff --git a/packages/config/src/reader.test.ts b/packages/config/src/reader.test.ts
index b1ba536797..7f3513abf6 100644
--- a/packages/config/src/reader.test.ts
+++ b/packages/config/src/reader.test.ts
@@ -14,6 +14,7 @@
  * limitations under the License.
  */
 
+import { withLogCollector } from '../../test-utils-core/src';
 import { ConfigReader } from './reader';
 
 const DATA = {
@@ -63,9 +64,9 @@ function expectValidValues(config: ConfigReader) {
     strings: ['string1', 'string2'],
   });
   expect(config.getConfig('nested').getString('string')).toBe('string');
-  expect(
-    config.getOptionalConfig('nested')!.getStringArray('strings'),
-  ).toEqual(['string1', 'string2']);
+  expect(config.getOptionalConfig('nested')!.getStringArray('strings')).toEqual(
+    ['string1', 'string2'],
+  );
   expect(config.getOptional('missing')).toBe(undefined);
   expect(config.getOptionalConfig('missing')).toBe(undefined);
   expect(config.getOptionalConfigArray('missing')).toBe(undefined);
@@ -185,6 +186,85 @@ describe('ConfigReader', () => {
     const config = new ConfigReader(DATA, CTX);
     expectInvalidValues(config);
   });
+
+  it('should warn when accessing filtered keys in development mode', () => {
+    const oldEnv = process.env.NODE_ENV;
+    (process.env as any).NODE_ENV = 'development';
+
+    const config = ConfigReader.fromConfigs([
+      {
+        data: DATA,
+        context: CTX,
+        filteredKeys: ['a', 'a2', 'b[0]'],
+      },
+    ]);
+
+    expect(withLogCollector(() => config.getOptional('a'))).toMatchObject({
+      warn: [
+        "Failed to read configuration value at 'a' as it is not visible. See https://backstage.io/docs/conf/defining#visibility for instructions on how to make it visible.",
+      ],
+    });
+    expect(
+      withLogCollector(() => config.getOptionalString('a2')),
+    ).toMatchObject({
+      warn: [
+        "Failed to read configuration value at 'a2' as it is not visible. See https://backstage.io/docs/conf/defining#visibility for instructions on how to make it visible.",
+      ],
+    });
+    expect(
+      withLogCollector(() => config.getOptionalConfigArray('b')),
+    ).toMatchObject({
+      warn: [
+        "Failed to read configuration array at 'b' as it does not have any visible elements. See https://backstage.io/docs/conf/defining#visibility for instructions on how to make it visible.",
+      ],
+    });
+
+    (process.env as any).NODE_ENV = oldEnv;
+  });
+
+  it('only warns once when accessing filtered keys in development mode', () => {
+    const oldEnv = process.env.NODE_ENV;
+    (process.env as any).NODE_ENV = 'development';
+
+    const config = ConfigReader.fromConfigs([
+      {
+        data: DATA,
+        context: CTX,
+        filteredKeys: ['a'],
+      },
+    ]);
+
+    expect(withLogCollector(() => config.getOptional('a'))).toMatchObject({
+      warn: [
+        "Failed to read configuration value at 'a' as it is not visible. See https://backstage.io/docs/conf/defining#visibility for instructions on how to make it visible.",
+      ],
+    });
+    expect(withLogCollector(() => config.getOptional('a'))).toMatchObject({
+      warn: [],
+    });
+
+    (process.env as any).NODE_ENV = oldEnv;
+  });
+
+  it('should not warn when accessing filtered keys outside of development mode', () => {
+    const config = ConfigReader.fromConfigs([
+      {
+        data: DATA,
+        context: CTX,
+        filteredKeys: ['a', 'b[0]'],
+      },
+    ]);
+
+    expect(withLogCollector(() => config.getOptional('a'))).toMatchObject({
+      warn: [],
+    });
+    expect(withLogCollector(() => config.getOptionalString('a'))).toMatchObject(
+      { warn: [] },
+    );
+    expect(
+      withLogCollector(() => config.getOptionalConfigArray('b')),
+    ).toMatchObject({ warn: [] });
+  });
 });
 
 describe('ConfigReader with fallback', () => {
diff --git a/packages/config/src/reader.ts b/packages/config/src/reader.ts
index 11346d4a50..92ca0eede3 100644
--- a/packages/config/src/reader.ts
+++ b/packages/config/src/reader.ts
@@ -54,7 +54,23 @@ const errors = {
   },
 };
 
+/**
+ * An implementation of the `Config` interface that uses a plain JavaScript object
+ * for the backing data, with the ability of linking multiple readers together.
+ *
+ * @public
+ */
 export class ConfigReader implements Config {
+  /**
+   * A set of key paths that where removed from the config due to not being visible.
+   *
+   * This was added as a mutable private member to avoid changes to the public API.
+   * Its only purpose of this is to warn users of missing visibility when running
+   * the frontend in development mode.
+   */
+  private filteredKeys?: string[];
+  private notifiedFilteredKeys = new Set<string>();
+
   static fromConfigs(configs: AppConfig[]): ConfigReader {
     if (configs.length === 0) {
       return new ConfigReader(undefined);
@@ -62,9 +78,14 @@ export class ConfigReader implements Config {
 
     // Merge together all configs into a single config with recursive fallback
     // readers, giving the first config object in the array the lowest priority.
-    return configs.reduce<ConfigReader>((previousReader, { data, context }) => {
-      return new ConfigReader(data, context, previousReader);
-    }, undefined!);
+    return configs.reduce<ConfigReader>(
+      (previousReader, { data, context, filteredKeys }) => {
+        const reader = new ConfigReader(data, context, previousReader);
+        reader.filteredKeys = filteredKeys;
+        return reader;
+      },
+      undefined!,
+    );
   }
 
   constructor(
@@ -101,6 +122,22 @@ export class ConfigReader implements Config {
     const fallbackValue = this.fallback?.getOptional<T>(key);
 
     if (value === undefined) {
+      if (process.env.NODE_ENV === 'development') {
+        if (fallbackValue === undefined && key) {
+          const fullKey = this.fullKey(key);
+          if (
+            this.filteredKeys?.includes(fullKey) &&
+            !this.notifiedFilteredKeys.has(fullKey)
+          ) {
+            this.notifiedFilteredKeys.add(fullKey);
+            // eslint-disable-next-line no-console
+            console.warn(
+              `Failed to read configuration value at '${fullKey}' as it is not visible. ` +
+                'See https://backstage.io/docs/conf/defining#visibility for instructions on how to make it visible.',
+            );
+          }
+        }
+      }
       return fallbackValue;
     } else if (fallbackValue === undefined) {
       return value as T;
@@ -127,10 +164,9 @@ export class ConfigReader implements Config {
   getOptionalConfig(key: string): ConfigReader | undefined {
     const value = this.readValue(key);
     const fallbackConfig = this.fallback?.getOptionalConfig(key);
-    const prefix = this.fullKey(key);
 
     if (isObject(value)) {
-      return new ConfigReader(value, this.context, fallbackConfig, prefix);
+      return this.copy(value, key, fallbackConfig);
     }
     if (value !== undefined) {
       throw new TypeError(
@@ -163,18 +199,24 @@ export class ConfigReader implements Config {
     });
 
     if (!configs) {
+      if (process.env.NODE_ENV === 'development') {
+        const fullKey = this.fullKey(key);
+        if (
+          this.filteredKeys?.some(k => k.startsWith(fullKey)) &&
+          !this.notifiedFilteredKeys.has(key)
+        ) {
+          this.notifiedFilteredKeys.add(key);
+          // eslint-disable-next-line no-console
+          console.warn(
+            `Failed to read configuration array at '${key}' as it does not have any visible elements. ` +
+              'See https://backstage.io/docs/conf/defining#visibility for instructions on how to make it visible.',
+          );
+        }
+      }
       return undefined;
     }
 
-    return configs.map(
-      (obj, index) =>
-        new ConfigReader(
-          obj,
-          this.context,
-          undefined,
-          this.fullKey(`${key}[${index}]`),
-        ),
-    );
+    return configs.map((obj, index) => this.copy(obj, `${key}[${index}]`));
   }
 
   getNumber(key: string): number {
@@ -261,6 +303,17 @@ export class ConfigReader implements Config {
     return `${this.prefix}${this.prefix ? '.' : ''}${key}`;
   }
 
+  private copy(data: JsonObject, key: string, fallback?: ConfigReader) {
+    const reader = new ConfigReader(
+      data,
+      this.context,
+      fallback,
+      this.fullKey(key),
+    );
+    reader.filteredKeys = this.filteredKeys;
+    return reader;
+  }
+
   private readConfigValue<T extends JsonValue>(
     key: string,
     validate: (
@@ -270,6 +323,21 @@ export class ConfigReader implements Config {
     const value = this.readValue(key);
 
     if (value === undefined) {
+      if (process.env.NODE_ENV === 'development') {
+        const fullKey = this.fullKey(key);
+        if (
+          this.filteredKeys?.includes(fullKey) &&
+          !this.notifiedFilteredKeys.has(fullKey)
+        ) {
+          this.notifiedFilteredKeys.add(fullKey);
+          // eslint-disable-next-line no-console
+          console.warn(
+            `Failed to read configuration value at '${fullKey}' as it is not visible. ` +
+              'See https://backstage.io/docs/conf/defining#visibility for instructions on how to make it visible.',
+          );
+        }
+      }
+
       return this.fallback?.readConfigValue(key, validate);
     }
     const result = validate(value);
diff --git a/packages/config/src/types.ts b/packages/config/src/types.ts
index d8f12f4f6e..d5f551cd69 100644
--- a/packages/config/src/types.ts
+++ b/packages/config/src/types.ts
@@ -14,39 +14,157 @@
  * limitations under the License.
  */
 
+/**
+ * A type representing all allowed JSON primitive values.
+ *
+ * @public
+ */
 export type JsonPrimitive = number | string | boolean | null;
+
+/**
+ * A type representing all allowed JSON object values.
+ *
+ * @public
+ */
 export type JsonObject = { [key in string]?: JsonValue };
+
+/**
+ * A type representing all allowed JSON array values.
+ *
+ * @public
+ */
 export interface JsonArray extends Array<JsonValue> {}
+
+/**
+ * A type representing all allowed JSON values.
+ *
+ * @public
+ */
 export type JsonValue = JsonObject | JsonArray | JsonPrimitive;
 
+/**
+ * A serialized form of configuration data that carries additional context.
+ *
+ * @public
+ */
 export type AppConfig = {
+  /**
+   * A string representing the source of this configuration data, for example a filepath.
+   */
   context: string;
+  /**
+   * The configuration data itself.
+   */
   data: JsonObject;
+  /**
+   * A list of keys that where filtered out from the configuration when it was loaded.
+   *
+   * This can be used to warn the user if they try to read any of these keys.
+   */
+  filteredKeys?: string[];
 };
 
+/**
+ * The interface used to represent static configuration at runtime.
+ *
+ * @public
+ */
 export type Config = {
+  /**
+   * Subscribes to the configuration object in order to receive a notification
+   * whenever any value within the configuration has changed.
+   *
+   * This method is optional to implement, and consumers need to check if it is
+   * implemented before invoking it.
+   */
+  subscribe?(onChange: () => void): {
+    unsubscribe: () => void;
+  };
+
+  /**
+   * Checks whether the given key is present.
+   */
   has(key: string): boolean;
 
+  /**
+   * Lists all available configuration keys.
+   */
   keys(): string[];
 
+  /**
+   * Same as `getOptional`, but will throw an error if there's no value for the given key.
+   */
   get<T = JsonValue>(key?: string): T;
+
+  /**
+   * Read out all configuration data for the given key.
+   *
+   * Usage of this method should be avoided as the typed alternatives provide
+   * much better error reporting. The main use-case of this method is to determine
+   * the type of a configuration value in the case where there are multiple possible
+   * shapes of the configuration.
+   */
   getOptional<T = JsonValue>(key?: string): T | undefined;
 
+  /**
+   * Same as `getOptionalConfig`, but will throw an error if there's no value for the given key.
+   */
   getConfig(key: string): Config;
+
+  /**
+   * Creates a sub-view of the configuration object.
+   * The configuration value at the position of the provided key must be an object.
+   */
   getOptionalConfig(key: string): Config | undefined;
 
+  /**
+   * Same as `getOptionalConfigArray`, but will throw an error if there's no value for the given key.
+   */
   getConfigArray(key: string): Config[];
+
+  /**
+   * Creates a sub-view of an array of configuration objects.
+   * The configuration value at the position of the provided key must be an array of objects.
+   */
   getOptionalConfigArray(key: string): Config[] | undefined;
 
+  /**
+   * Same as `getOptionalNumber`, but will throw an error if there's no value for the given key.
+   */
   getNumber(key: string): number;
+
+  /**
+   * Reads a configuration value at the given key, expecting it to be a number.
+   */
   getOptionalNumber(key: string): number | undefined;
 
+  /**
+   * Same as `getOptionalBoolean`, but will throw an error if there's no value for the given key.
+   */
   getBoolean(key: string): boolean;
+
+  /**
+   * Reads a configuration value at the given key, expecting it to be a boolean.
+   */
   getOptionalBoolean(key: string): boolean | undefined;
 
+  /**
+   * Same as `getOptionalString`, but will throw an error if there's no value for the given key.
+   */
   getString(key: string): string;
+
+  /**
+   * Reads a configuration value at the given key, expecting it to be a string.
+   */
   getOptionalString(key: string): string | undefined;
 
+  /**
+   * Same as `getOptionalStringArray`, but will throw an error if there's no value for the given key.
+   */
   getStringArray(key: string): string[];
+
+  /**
+   * Reads a configuration value at the given key, expecting it to be an array of strings.
+   */
   getOptionalStringArray(key: string): string[] | undefined;
 };
diff --git a/packages/core-app-api/CHANGELOG.md b/packages/core-app-api/CHANGELOG.md
index 4f09f231c3..9020661647 100644
--- a/packages/core-app-api/CHANGELOG.md
+++ b/packages/core-app-api/CHANGELOG.md
@@ -1,5 +1,89 @@
 # @backstage/core-app-api
 
+## 0.1.12
+
+### Patch Changes
+
+- 841666a19: Removed deprecated internal functions.
+- Updated dependencies
+  - @backstage/core-components@0.4.1
+  - @backstage/config@0.1.9
+  - @backstage/core-plugin-api@0.1.7
+
+## 0.1.11
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.4.0
+
+## 0.1.10
+
+### Patch Changes
+
+- cfcb486aa: Add system icons for the built-in entity types and use them in the entity list of the `catalog-import` plugin.
+- 392b36fa1: Added support for using authenticating via GitHub Apps in addition to GitHub OAuth Apps. It used to be possible to use GitHub Apps, but they did not handle session refresh correctly.
+
+  Note that GitHub Apps handle OAuth scope at the app installation level, meaning that the `scope` parameter for `getAccessToken` has no effect. When calling `getAccessToken` in open source plugins, one should still include the appropriate scope, but also document in the plugin README what scopes are required in the case of GitHub Apps.
+
+  In addition, the `authHandler` and `signInResolver` options have been implemented for the GitHub provider in the auth backend.
+
+- Updated dependencies
+  - @backstage/core-components@0.3.3
+  - @backstage/config@0.1.8
+
+## 0.1.9
+
+### Patch Changes
+
+- 72a31c29a: Add support for additional app origins
+- Updated dependencies
+  - @backstage/config@0.1.7
+  - @backstage/core-components@0.3.2
+  - @backstage/theme@0.2.10
+
+## 0.1.8
+
+### Patch Changes
+
+- 362657623: Add support for serving the app with a base path other than `/`, which is enabled by including the path in `app.baseUrl`.
+- 56c773909: Switched `@types/react` dependency to request `*` rather than a specific version.
+- Updated dependencies
+  - @backstage/core-components@0.3.1
+  - @backstage/core-plugin-api@0.1.6
+
+## 0.1.7
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.3.0
+  - @backstage/config@0.1.6
+  - @backstage/core-plugin-api@0.1.5
+
+## 0.1.6
+
+### Patch Changes
+
+- 9d40fcb1e: - Bumping `material-ui/core` version to at least `4.12.2` as they made some breaking changes in later versions which broke `Pagination` of the `Table`.
+  - Switching out `material-table` to `@material-table/core` for support for the later versions of `material-ui/core`
+  - This causes a minor API change to `@backstage/core-components` as the interface for `Table` re-exports the `prop` from the underlying `Table` components.
+  - `onChangeRowsPerPage` has been renamed to `onRowsPerPageChange`
+  - `onChangePage` has been renamed to `onPageChange`
+  - Migration guide is here: https://material-table-core.com/docs/breaking-changes
+- Updated dependencies
+  - @backstage/core-components@0.2.0
+  - @backstage/core-plugin-api@0.1.4
+  - @backstage/theme@0.2.9
+
+## 0.1.5
+
+### Patch Changes
+
+- ea249c6e6: Fix a bug in `FlatRoutes` that prevented outlets from working with the root route, as well as matching root routes too broadly.
+- Updated dependencies
+  - @backstage/core-components@0.1.6
+
 ## 0.1.4
 
 ### Patch Changes
diff --git a/packages/core-app-api/api-report.md b/packages/core-app-api/api-report.md
index af86f042a0..20d8a5a770 100644
--- a/packages/core-app-api/api-report.md
+++ b/packages/core-app-api/api-report.md
@@ -54,6 +54,8 @@ import { StorageApi } from '@backstage/core-plugin-api';
 import { StorageValueChange } from '@backstage/core-plugin-api';
 import { SubRouteRef } from '@backstage/core-plugin-api';
 
+// Warning: (ae-missing-release-tag) "AlertApiForwarder" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public
 export class AlertApiForwarder implements AlertApi {
   // (undocumented)
@@ -62,11 +64,11 @@ export class AlertApiForwarder implements AlertApi {
   post(alert: AlertMessage): void;
 }
 
+// Warning: (ae-missing-release-tag) "ApiFactoryHolder" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export type ApiFactoryHolder = {
-  get<T>(
-    api: ApiRef<T>,
-  ):
+  get<T>(api: ApiRef<T>):
     | ApiFactory<
         T,
         T,
@@ -77,12 +79,12 @@ export type ApiFactoryHolder = {
     | undefined;
 };
 
+// Warning: (ae-missing-release-tag) "ApiFactoryRegistry" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public
 export class ApiFactoryRegistry implements ApiFactoryHolder {
   // (undocumented)
-  get<T>(
-    api: ApiRef<T>,
-  ):
+  get<T>(api: ApiRef<T>):
     | ApiFactory<
         T,
         T,
@@ -93,15 +95,18 @@ export class ApiFactoryRegistry implements ApiFactoryHolder {
     | undefined;
   // (undocumented)
   getAllApis(): Set<AnyApiRef>;
+  // Warning: (ae-forgotten-export) The symbol "ApiFactoryScope" needs to be exported by the entry point index.d.ts
   register<
     Api,
     Impl extends Api,
     Deps extends {
       [name in string]: unknown;
-    }
+    },
   >(scope: ApiFactoryScope, factory: ApiFactory<Api, Impl, Deps>): boolean;
 }
 
+// Warning: (ae-missing-release-tag) "ApiProvider" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export const ApiProvider: {
   ({ apis, children }: PropsWithChildren<ApiProviderProps>): JSX.Element;
@@ -115,19 +120,31 @@ export const ApiProvider: {
   };
 };
 
+// Warning: (ae-missing-release-tag) "ApiRegistry" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export class ApiRegistry implements ApiHolder {
   constructor(apis: Map<string, unknown>);
+  // Warning: (ae-forgotten-export) The symbol "ApiRegistryBuilder" needs to be exported by the entry point index.d.ts
+  //
   // (undocumented)
   static builder(): ApiRegistryBuilder;
+  // Warning: (ae-forgotten-export) The symbol "ApiImpl" needs to be exported by the entry point index.d.ts
+  //
   // (undocumented)
   static from(apis: ApiImpl[]): ApiRegistry;
   // (undocumented)
   get<T>(api: ApiRef<T>): T | undefined;
+  // Warning: (tsdoc-param-tag-missing-hyphen) The @param block should be followed by a parameter name and then a hyphen
+  // Warning: (tsdoc-param-tag-missing-hyphen) The @param block should be followed by a parameter name and then a hyphen
   static with<T>(api: ApiRef<T>, impl: T): ApiRegistry;
+  // Warning: (tsdoc-param-tag-missing-hyphen) The @param block should be followed by a parameter name and then a hyphen
+  // Warning: (tsdoc-param-tag-missing-hyphen) The @param block should be followed by a parameter name and then a hyphen
   with<T>(api: ApiRef<T>, impl: T): ApiRegistry;
 }
 
+// Warning: (ae-missing-release-tag) "ApiResolver" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export class ApiResolver implements ApiHolder {
   constructor(factories: ApiFactoryHolder);
@@ -139,6 +156,8 @@ export class ApiResolver implements ApiHolder {
   ): void;
 }
 
+// Warning: (ae-missing-release-tag) "AppComponents" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export type AppComponents = {
   NotFoundErrorPage: ComponentType<{}>;
@@ -149,9 +168,13 @@ export type AppComponents = {
   SignInPage?: ComponentType<SignInPageProps>;
 };
 
+// Warning: (ae-missing-release-tag) "AppConfigLoader" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public
 export type AppConfigLoader = () => Promise<AppConfig[]>;
 
+// Warning: (ae-missing-release-tag) "AppContext" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export type AppContext = {
   getPlugins(): BackstagePlugin<any, any>[];
@@ -159,6 +182,8 @@ export type AppContext = {
   getComponents(): AppComponents;
 };
 
+// Warning: (ae-missing-release-tag) "AppOptions" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export type AppOptions = {
   apis?: Iterable<AnyApiFactory>;
@@ -173,11 +198,16 @@ export type AppOptions = {
   bindRoutes?(context: { bind: AppRouteBinder }): void;
 };
 
+// Warning: (ae-forgotten-export) The symbol "PartialKeys" needs to be exported by the entry point index.d.ts
+// Warning: (ae-forgotten-export) The symbol "TargetRouteMap" needs to be exported by the entry point index.d.ts
+// Warning: (ae-forgotten-export) The symbol "KeysWithType" needs to be exported by the entry point index.d.ts
+// Warning: (ae-missing-release-tag) "AppRouteBinder" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export type AppRouteBinder = <
   ExternalRoutes extends {
     [name: string]: ExternalRouteRef;
-  }
+  },
 >(
   externalRoutes: ExternalRoutes,
   targetRoutes: PartialKeys<
@@ -186,6 +216,8 @@ export type AppRouteBinder = <
   >,
 ) => void;
 
+// Warning: (ae-missing-release-tag) "AppThemeSelector" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export class AppThemeSelector implements AppThemeApi {
   constructor(themes: AppTheme[]);
@@ -201,8 +233,12 @@ export class AppThemeSelector implements AppThemeApi {
   setActiveThemeId(themeId?: string): void;
 }
 
+// Warning: (ae-missing-release-tag) "Auth0Auth" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export class Auth0Auth {
+  // Warning: (ae-forgotten-export) The symbol "OAuthApiCreateOptions" needs to be exported by the entry point index.d.ts
+  //
   // (undocumented)
   static create({
     discoveryApi,
@@ -213,6 +249,8 @@ export class Auth0Auth {
   }: OAuthApiCreateOptions): typeof auth0AuthApiRef.T;
 }
 
+// Warning: (ae-missing-release-tag) "BackstageApp" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export type BackstageApp = {
   getPlugins(): BackstagePlugin<any, any>[];
@@ -221,6 +259,8 @@ export type BackstageApp = {
   getRouter(): ComponentType<{}>;
 };
 
+// Warning: (ae-missing-release-tag) "BackstagePluginWithAnyOutput" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export type BackstagePluginWithAnyOutput = Omit<
   BackstagePlugin<any, any>,
@@ -229,6 +269,8 @@ export type BackstagePluginWithAnyOutput = Omit<
   output(): (PluginOutput | UnknownPluginOutput)[];
 };
 
+// Warning: (ae-missing-release-tag) "BootErrorPageProps" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export type BootErrorPageProps = {
   step: 'load-config' | 'load-chunk';
@@ -237,12 +279,19 @@ export type BootErrorPageProps = {
 
 export { ConfigReader };
 
+// Warning: (ae-forgotten-export) The symbol "PrivateAppImpl" needs to be exported by the entry point index.d.ts
+// Warning: (ae-missing-release-tag) "createApp" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public
 export function createApp(options?: AppOptions): PrivateAppImpl;
 
+// Warning: (ae-missing-release-tag) "defaultConfigLoader" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public
 export const defaultConfigLoader: AppConfigLoader;
 
+// Warning: (ae-missing-release-tag) "ErrorAlerter" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public
 export class ErrorAlerter implements ErrorApi {
   constructor(alertApi: AlertApi, errorApi: ErrorApi);
@@ -259,6 +308,8 @@ export class ErrorAlerter implements ErrorApi {
   post(error: Error, context?: ErrorContext): void;
 }
 
+// Warning: (ae-missing-release-tag) "ErrorApiForwarder" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public
 export class ErrorApiForwarder implements ErrorApi {
   // (undocumented)
@@ -270,6 +321,8 @@ export class ErrorApiForwarder implements ErrorApi {
   post(error: Error, context?: ErrorContext): void;
 }
 
+// Warning: (ae-missing-release-tag) "ErrorBoundaryFallbackProps" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export type ErrorBoundaryFallbackProps = {
   plugin?: BackstagePlugin;
@@ -277,9 +330,13 @@ export type ErrorBoundaryFallbackProps = {
   resetError: () => void;
 };
 
+// Warning: (ae-missing-release-tag) "FeatureFlagged" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export const FeatureFlagged: (props: FeatureFlaggedProps) => JSX.Element;
 
+// Warning: (ae-missing-release-tag) "FeatureFlaggedProps" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export type FeatureFlaggedProps = {
   children: ReactNode;
@@ -292,11 +349,17 @@ export type FeatureFlaggedProps = {
     }
 );
 
+// Warning: (ae-forgotten-export) The symbol "FlatRoutesProps" needs to be exported by the entry point index.d.ts
+// Warning: (ae-missing-release-tag) "FlatRoutes" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export const FlatRoutes: (props: FlatRoutesProps) => JSX.Element | null;
 
+// Warning: (ae-missing-release-tag) "GithubAuth" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export class GithubAuth implements OAuthApi, SessionApi {
+  // Warning: (ae-forgotten-export) The symbol "SessionManager" needs to be exported by the entry point index.d.ts
   constructor(sessionManager: SessionManager<GithubSession>);
   // (undocumented)
   static create({
@@ -324,17 +387,21 @@ export class GithubAuth implements OAuthApi, SessionApi {
   signOut(): Promise<void>;
 }
 
+// Warning: (ae-missing-release-tag) "GithubSession" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export type GithubSession = {
   providerInfo: {
     accessToken: string;
     scopes: Set<string>;
-    expiresAt: Date;
+    expiresAt?: Date;
   };
   profile: ProfileInfo;
   backstageIdentity: BackstageIdentity;
 };
 
+// Warning: (ae-missing-release-tag) "GitlabAuth" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export class GitlabAuth {
   // (undocumented)
@@ -347,6 +414,8 @@ export class GitlabAuth {
   }: OAuthApiCreateOptions): typeof gitlabAuthApiRef.T;
 }
 
+// Warning: (ae-missing-release-tag) "GoogleAuth" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export class GoogleAuth {
   // (undocumented)
@@ -359,6 +428,8 @@ export class GoogleAuth {
   }: OAuthApiCreateOptions): typeof googleAuthApiRef.T;
 }
 
+// Warning: (ae-missing-release-tag) "LocalStorageFeatureFlags" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public
 export class LocalStorageFeatureFlags implements FeatureFlagsApi {
   // (undocumented)
@@ -371,6 +442,8 @@ export class LocalStorageFeatureFlags implements FeatureFlagsApi {
   save(options: FeatureFlagsSaveOptions): void;
 }
 
+// Warning: (ae-missing-release-tag) "MicrosoftAuth" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export class MicrosoftAuth {
   // (undocumented)
@@ -383,6 +456,8 @@ export class MicrosoftAuth {
   }: OAuthApiCreateOptions): typeof microsoftAuthApiRef.T;
 }
 
+// Warning: (ae-missing-release-tag) "OAuth2" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export class OAuth2
   implements
@@ -390,8 +465,12 @@ export class OAuth2
     OpenIdConnectApi,
     ProfileInfoApi,
     BackstageIdentityApi,
-    SessionApi {
+    SessionApi
+{
+  // Warning: (ae-forgotten-export) The symbol "Options" needs to be exported by the entry point index.d.ts
   constructor(options: Options);
+  // Warning: (ae-forgotten-export) The symbol "CreateOptions" needs to be exported by the entry point index.d.ts
+  //
   // (undocumented)
   static create({
     discoveryApi,
@@ -422,6 +501,8 @@ export class OAuth2
   signOut(): Promise<void>;
 }
 
+// Warning: (ae-missing-release-tag) "OAuth2Session" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export type OAuth2Session = {
   providerInfo: {
@@ -434,6 +515,8 @@ export type OAuth2Session = {
   backstageIdentity: BackstageIdentity;
 };
 
+// Warning: (ae-missing-release-tag) "OAuthRequestManager" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public
 export class OAuthRequestManager implements OAuthRequestApi {
   // (undocumented)
@@ -442,6 +525,8 @@ export class OAuthRequestManager implements OAuthRequestApi {
   createAuthRequester<T>(options: AuthRequesterOptions<T>): AuthRequester<T>;
 }
 
+// Warning: (ae-missing-release-tag) "OktaAuth" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export class OktaAuth {
   // (undocumented)
@@ -454,8 +539,12 @@ export class OktaAuth {
   }: OAuthApiCreateOptions): typeof oktaAuthApiRef.T;
 }
 
+// Warning: (ae-missing-release-tag) "OneLoginAuth" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export class OneLoginAuth {
+  // Warning: (ae-forgotten-export) The symbol "CreateOptions" needs to be exported by the entry point index.d.ts
+  //
   // (undocumented)
   static create({
     discoveryApi,
@@ -465,10 +554,16 @@ export class OneLoginAuth {
   }: CreateOptions_2): typeof oneloginAuthApiRef.T;
 }
 
+// Warning: (ae-missing-release-tag) "SamlAuth" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export class SamlAuth
-  implements ProfileInfoApi, BackstageIdentityApi, SessionApi {
+  implements ProfileInfoApi, BackstageIdentityApi, SessionApi
+{
+  // Warning: (ae-forgotten-export) The symbol "SamlSession" needs to be exported by the entry point index.d.ts
   constructor(sessionManager: SessionManager<SamlSession>);
+  // Warning: (ae-forgotten-export) The symbol "AuthApiCreateOptions" needs to be exported by the entry point index.d.ts
+  //
   // (undocumented)
   static create({
     discoveryApi,
@@ -489,11 +584,15 @@ export class SamlAuth
   signOut(): Promise<void>;
 }
 
+// Warning: (ae-missing-release-tag) "SignInPageProps" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export type SignInPageProps = {
   onResult(result: SignInResult): void;
 };
 
+// Warning: (ae-missing-release-tag) "SignInResult" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export type SignInResult = {
   userId: string;
@@ -502,11 +601,15 @@ export type SignInResult = {
   signOut?: () => Promise<void>;
 };
 
+// Warning: (ae-missing-release-tag) "UnhandledErrorForwarder" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export class UnhandledErrorForwarder {
   static forward(errorApi: ErrorApi, errorContext: ErrorContext): void;
 }
 
+// Warning: (ae-missing-release-tag) "UrlPatternDiscovery" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public
 export class UrlPatternDiscovery implements DiscoveryApi {
   static compile(pattern: string): UrlPatternDiscovery;
@@ -514,9 +617,13 @@ export class UrlPatternDiscovery implements DiscoveryApi {
   getBaseUrl(pluginId: string): Promise<string>;
 }
 
+// Warning: (ae-missing-release-tag) "WebStorage" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export class WebStorage implements StorageApi {
   constructor(namespace: string, errorApi: ErrorApi);
+  // Warning: (ae-forgotten-export) The symbol "CreateStorageApiOptions" needs to be exported by the entry point index.d.ts
+  //
   // (undocumented)
   static create(options: CreateStorageApiOptions): WebStorage;
   // (undocumented)
@@ -531,5 +638,11 @@ export class WebStorage implements StorageApi {
   set<T>(key: string, data: T): Promise<void>;
 }
 
+// Warnings were encountered during analysis:
+//
+// src/apis/system/ApiProvider.d.ts:9:5 - (ae-forgotten-export) The symbol "ApiProviderProps" needs to be exported by the entry point index.d.ts
+// src/app/types.d.ts:88:5 - (ae-forgotten-export) The symbol "UnknownPluginOutput" needs to be exported by the entry point index.d.ts
+// src/app/types.d.ts:99:5 - (ae-forgotten-export) The symbol "AppIcons" needs to be exported by the entry point index.d.ts
+
 // (No @packageDocumentation comment for this package)
 ```
diff --git a/packages/core-app-api/package.json b/packages/core-app-api/package.json
index 0f6773497b..790b1e29fb 100644
--- a/packages/core-app-api/package.json
+++ b/packages/core-app-api/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@backstage/core-app-api",
   "description": "Core app API used by Backstage apps",
-  "version": "0.1.4",
+  "version": "0.1.12",
   "private": false,
   "publishConfig": {
     "access": "public",
@@ -29,13 +29,14 @@
     "clean": "backstage-cli clean"
   },
   "dependencies": {
-    "@backstage/core-components": "^0.1.4",
-    "@backstage/config": "^0.1.3",
-    "@backstage/core-plugin-api": "^0.1.3",
-    "@backstage/theme": "^0.2.8",
-    "@material-ui/core": "^4.11.0",
+    "@backstage/core-components": "^0.4.1",
+    "@backstage/config": "^0.1.9",
+    "@backstage/core-plugin-api": "^0.1.7",
+    "@backstage/theme": "^0.2.10",
+    "@backstage/version-bridge": "^0.1.0",
+    "@material-ui/core": "^4.12.2",
     "@material-ui/icons": "^4.9.1",
-    "@types/react": "^16.9",
+    "@types/react": "*",
     "@types/prop-types": "^15.7.3",
     "prop-types": "^15.7.2",
     "react": "^16.12.0",
@@ -44,9 +45,9 @@
     "zen-observable": "^0.8.15"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.7.3",
-    "@backstage/test-utils": "^0.1.14",
-    "@backstage/test-utils-core": "^0.1.1",
+    "@backstage/cli": "^0.7.11",
+    "@backstage/test-utils": "^0.1.17",
+    "@backstage/test-utils-core": "^0.1.2",
     "@testing-library/jest-dom": "^5.10.1",
     "@testing-library/react": "^11.2.5",
     "@testing-library/react-hooks": "^3.4.2",
diff --git a/packages/core-app-api/src/apis/implementations/FeatureFlagsApi/LocalStorageFeatureFlags.test.tsx b/packages/core-app-api/src/apis/implementations/FeatureFlagsApi/LocalStorageFeatureFlags.test.tsx
index afc25b2e8c..1193592e96 100644
--- a/packages/core-app-api/src/apis/implementations/FeatureFlagsApi/LocalStorageFeatureFlags.test.tsx
+++ b/packages/core-app-api/src/apis/implementations/FeatureFlagsApi/LocalStorageFeatureFlags.test.tsx
@@ -194,8 +194,7 @@ describe('FeatureFlags', () => {
     it('throws an error if length is greater than 150 characters', () => {
       expect(() =>
         featureFlags.registerFlag({
-          name:
-            'loremipsumdolorsitametconsecteturadipiscingelitnuncvitaeportaexaullamcorperturpismaurisutmattisnequemorbisediaculisauguevivamuspulvinarcursuseratblandithendreritquisqueuttinciduntmagnavestibulumblanditaugueat',
+          name: 'loremipsumdolorsitametconsecteturadipiscingelitnuncvitaeportaexaullamcorperturpismaurisutmattisnequemorbisediaculisauguevivamuspulvinarcursuseratblandithendreritquisqueuttinciduntmagnavestibulumblanditaugueat',
           pluginId: 'plugin-three',
         }),
       ).toThrow(/not exceed 150 characters/i);
diff --git a/packages/core-app-api/src/apis/implementations/auth/github/GithubAuth.ts b/packages/core-app-api/src/apis/implementations/auth/github/GithubAuth.ts
index 21ebc5699a..85e3e79ad5 100644
--- a/packages/core-app-api/src/apis/implementations/auth/github/GithubAuth.ts
+++ b/packages/core-app-api/src/apis/implementations/auth/github/GithubAuth.ts
@@ -29,15 +29,17 @@ import {
 import { SessionManager } from '../../../../lib/AuthSessionManager/types';
 import {
   AuthSessionStore,
+  RefreshingAuthSessionManager,
   StaticAuthSessionManager,
 } from '../../../../lib/AuthSessionManager';
 import { OAuthApiCreateOptions } from '../types';
+import { OptionalRefreshSessionManagerMux } from '../../../../lib/AuthSessionManager/OptionalRefreshSessionManagerMux';
 
 export type GithubAuthResponse = {
   providerInfo: {
     accessToken: string;
     scope: string;
-    expiresInSeconds: number;
+    expiresInSeconds?: number;
   };
   profile: ProfileInfo;
   backstageIdentity: BackstageIdentity;
@@ -68,27 +70,46 @@ class GithubAuth implements OAuthApi, SessionApi {
           providerInfo: {
             accessToken: res.providerInfo.accessToken,
             scopes: GithubAuth.normalizeScope(res.providerInfo.scope),
-            expiresAt: new Date(
-              Date.now() + res.providerInfo.expiresInSeconds * 1000,
-            ),
+            expiresAt: res.providerInfo.expiresInSeconds
+              ? new Date(Date.now() + res.providerInfo.expiresInSeconds * 1000)
+              : undefined,
           },
         };
       },
     });
 
-    const sessionManager = new StaticAuthSessionManager({
+    const refreshingSessionManager = new RefreshingAuthSessionManager({
       connector,
       defaultScopes: new Set(defaultScopes),
       sessionScopes: (session: GithubSession) => session.providerInfo.scopes,
+      sessionShouldRefresh: (session: GithubSession) => {
+        const { expiresAt } = session.providerInfo;
+        if (!expiresAt) {
+          return false;
+        }
+        const expiresInSec = (expiresAt.getTime() - Date.now()) / 1000;
+        return expiresInSec < 60 * 5;
+      },
     });
 
-    const authSessionStore = new AuthSessionStore<GithubSession>({
-      manager: sessionManager,
+    const staticSessionManager = new AuthSessionStore<GithubSession>({
+      manager: new StaticAuthSessionManager({
+        connector,
+        defaultScopes: new Set(defaultScopes),
+        sessionScopes: (session: GithubSession) => session.providerInfo.scopes,
+      }),
       storageKey: `${provider.id}Session`,
       sessionScopes: (session: GithubSession) => session.providerInfo.scopes,
     });
 
-    return new GithubAuth(authSessionStore);
+    const sessionManagerMux = new OptionalRefreshSessionManagerMux({
+      refreshingSessionManager,
+      staticSessionManager,
+      sessionCanRefresh: session =>
+        session.providerInfo.expiresAt !== undefined,
+    });
+
+    return new GithubAuth(sessionManagerMux);
   }
 
   constructor(private readonly sessionManager: SessionManager<GithubSession>) {}
diff --git a/packages/core-app-api/src/apis/implementations/auth/github/types.ts b/packages/core-app-api/src/apis/implementations/auth/github/types.ts
index 88df25b49d..f5dae3a064 100644
--- a/packages/core-app-api/src/apis/implementations/auth/github/types.ts
+++ b/packages/core-app-api/src/apis/implementations/auth/github/types.ts
@@ -20,7 +20,7 @@ export type GithubSession = {
   providerInfo: {
     accessToken: string;
     scopes: Set<string>;
-    expiresAt: Date;
+    expiresAt?: Date;
   };
   profile: ProfileInfo;
   backstageIdentity: BackstageIdentity;
diff --git a/packages/core-app-api/src/apis/implementations/auth/oauth2/OAuth2.ts b/packages/core-app-api/src/apis/implementations/auth/oauth2/OAuth2.ts
index 8c27e0aa63..24db8d2560 100644
--- a/packages/core-app-api/src/apis/implementations/auth/oauth2/OAuth2.ts
+++ b/packages/core-app-api/src/apis/implementations/auth/oauth2/OAuth2.ts
@@ -65,7 +65,8 @@ class OAuth2
     OpenIdConnectApi,
     ProfileInfoApi,
     BackstageIdentityApi,
-    SessionApi {
+    SessionApi
+{
   static create({
     discoveryApi,
     environment = 'development',
diff --git a/packages/core-app-api/src/apis/system/ApiProvider.test.tsx b/packages/core-app-api/src/apis/system/ApiProvider.test.tsx
index 5afb39a2ec..d1793f890e 100644
--- a/packages/core-app-api/src/apis/system/ApiProvider.test.tsx
+++ b/packages/core-app-api/src/apis/system/ApiProvider.test.tsx
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import React, { Context, useContext } from 'react';
+import React from 'react';
 import {
   useApi,
   createApiRef,
@@ -26,8 +26,7 @@ import { ApiProvider } from './ApiProvider';
 import { ApiRegistry } from './ApiRegistry';
 import { render } from '@testing-library/react';
 import { withLogCollector } from '@backstage/test-utils-core';
-import { getGlobalSingleton } from '../../lib/globalObject';
-import { VersionedValue } from '../../lib/versionedValues';
+import { useVersionedContext } from '@backstage/version-bridge';
 
 describe('ApiProvider', () => {
   type Api = () => string;
@@ -116,11 +115,11 @@ describe('ApiProvider', () => {
       withLogCollector(['error'], () => {
         expect(() => {
           render(<MyHookConsumer />);
-        }).toThrow(/^No provider available for api-context context/);
+        }).toThrow(/^API context is not available/);
       }).error,
     ).toEqual([
       expect.stringMatching(
-        /^Error: Uncaught \[Error: No provider available for api-context context/,
+        /^Error: Uncaught \[Error: API context is not available/,
       ),
       expect.stringMatching(
         /^The above error occurred in the <MyHookConsumer> component/,
@@ -131,11 +130,11 @@ describe('ApiProvider', () => {
       withLogCollector(['error'], () => {
         expect(() => {
           render(<MyHocConsumer />);
-        }).toThrow(/^No provider available for api-context context/);
+        }).toThrow(/^API context is not available/);
       }).error,
     ).toEqual([
       expect.stringMatching(
-        /^Error: Uncaught \[Error: No provider available for api-context context/,
+        /^Error: Uncaught \[Error: API context is not available/,
       ),
       expect.stringMatching(
         /^The above error occurred in the <withApis\(Component\)> component/,
@@ -185,12 +184,10 @@ describe('ApiProvider', () => {
 });
 
 describe('v1 consumer', () => {
-  const ApiContext = getGlobalSingleton<
-    Context<VersionedValue<{ 1: ApiHolder }>>
-  >('api-context');
-
   function useMockApiV1<T>(apiRef: ApiRef<T>): T {
-    const impl = useContext(ApiContext)?.atVersion(1)?.get(apiRef);
+    const impl = useVersionedContext<{ 1: ApiHolder }>('api-context')
+      ?.atVersion(1)
+      ?.get(apiRef);
     if (!impl) {
       throw new Error('no impl');
     }
diff --git a/packages/core-app-api/src/apis/system/ApiProvider.tsx b/packages/core-app-api/src/apis/system/ApiProvider.tsx
index ce6c388087..aa57fa9310 100644
--- a/packages/core-app-api/src/apis/system/ApiProvider.tsx
+++ b/packages/core-app-api/src/apis/system/ApiProvider.tsx
@@ -14,30 +14,21 @@
  * limitations under the License.
  */
 
-import React, {
-  createContext,
-  useContext,
-  ReactNode,
-  PropsWithChildren,
-} from 'react';
+import React, { useContext, ReactNode, PropsWithChildren } from 'react';
 import PropTypes from 'prop-types';
 import { ApiHolder } from '@backstage/core-plugin-api';
 import { ApiAggregator } from './ApiAggregator';
-import { getOrCreateGlobalSingleton } from '../../lib/globalObject';
 import {
-  VersionedValue,
   createVersionedValueMap,
-} from '../../lib/versionedValues';
+  createVersionedContext,
+} from '@backstage/version-bridge';
 
 type ApiProviderProps = {
   apis: ApiHolder;
   children: ReactNode;
 };
 
-type ApiContextType = VersionedValue<{ 1: ApiHolder }> | undefined;
-const ApiContext = getOrCreateGlobalSingleton('api-context', () =>
-  createContext<ApiContextType>(undefined),
-);
+const ApiContext = createVersionedContext<{ 1: ApiHolder }>('api-context');
 
 export const ApiProvider = ({
   apis,
diff --git a/packages/core-app-api/src/app/App.tsx b/packages/core-app-api/src/app/App.tsx
index a95554709a..c8bd8fec8f 100644
--- a/packages/core-app-api/src/app/App.tsx
+++ b/packages/core-app-api/src/app/App.tsx
@@ -107,6 +107,20 @@ export function generateBoundRoutes(bindRoutes: AppOptions['bindRoutes']) {
   return result;
 }
 
+/**
+ * Get the app base path from the configured app baseUrl.
+ *
+ * The returned path does not have a trailing slash.
+ */
+function getBasePath(configApi: Config) {
+  let { pathname } = new URL(
+    configApi.getOptionalString('app.baseUrl') ?? '/',
+    'http://dummy.dev', // baseUrl can be specified as just a path
+  );
+  pathname = pathname.replace(/\/*$/, '');
+  return pathname;
+}
+
 type FullAppOptions = {
   apis: Iterable<AnyApiFactory>;
   icons: NonNullable<AppOptions['icons']>;
@@ -216,37 +230,33 @@ export class PrivateAppImpl implements BackstageApp {
         [],
       );
 
-      const {
-        routePaths,
-        routeParents,
-        routeObjects,
-        featureFlags,
-      } = useMemo(() => {
-        const result = traverseElementTree({
-          root: children,
-          discoverers: [childDiscoverer, routeElementDiscoverer],
-          collectors: {
-            routePaths: routePathCollector,
-            routeParents: routeParentCollector,
-            routeObjects: routeObjectCollector,
-            collectedPlugins: pluginCollector,
-            featureFlags: featureFlagCollector,
-          },
-        });
+      const { routePaths, routeParents, routeObjects, featureFlags } =
+        useMemo(() => {
+          const result = traverseElementTree({
+            root: children,
+            discoverers: [childDiscoverer, routeElementDiscoverer],
+            collectors: {
+              routePaths: routePathCollector,
+              routeParents: routeParentCollector,
+              routeObjects: routeObjectCollector,
+              collectedPlugins: pluginCollector,
+              featureFlags: featureFlagCollector,
+            },
+          });
 
-        validateRoutes(result.routePaths, result.routeParents);
+          validateRoutes(result.routePaths, result.routeParents);
 
-        // TODO(Rugvip): Restructure the public API so that we can get an immediate view of
-        //               the app, rather than having to wait for the provider to render.
-        //               For now we need to push the additional plugins we find during
-        //               collection and then make sure we initialize things afterwards.
-        result.collectedPlugins.forEach(plugin => this.plugins.add(plugin));
-        this.verifyPlugins(this.plugins);
+          // TODO(Rugvip): Restructure the public API so that we can get an immediate view of
+          //               the app, rather than having to wait for the provider to render.
+          //               For now we need to push the additional plugins we find during
+          //               collection and then make sure we initialize things afterwards.
+          result.collectedPlugins.forEach(plugin => this.plugins.add(plugin));
+          this.verifyPlugins(this.plugins);
 
-        // Initialize APIs once all plugins are available
-        this.getApiHolder();
-        return result;
-      }, [children]);
+          // Initialize APIs once all plugins are available
+          this.getApiHolder();
+          return result;
+        }, [children]);
 
       const loadedConfig = useConfigLoader(
         this.configLoader,
@@ -302,6 +312,7 @@ export class PrivateAppImpl implements BackstageApp {
                 routeParents={routeParents}
                 routeObjects={routeObjects}
                 routeBindings={generateBoundRoutes(this.bindRoutes)}
+                basePath={getBasePath(loadedConfig.api)}
               >
                 {children}
               </RoutingProvider>
@@ -314,10 +325,8 @@ export class PrivateAppImpl implements BackstageApp {
   }
 
   getRouter(): ComponentType<{}> {
-    const {
-      Router: RouterComponent,
-      SignInPage: SignInPageComponent,
-    } = this.components;
+    const { Router: RouterComponent, SignInPage: SignInPageComponent } =
+      this.components;
 
     // This wraps the sign-in page and waits for sign-in to be completed before rendering the app
     const SignInPageWrapper = ({
@@ -339,14 +348,7 @@ export class PrivateAppImpl implements BackstageApp {
 
     const AppRouter = ({ children }: PropsWithChildren<{}>) => {
       const configApi = useApi(configApiRef);
-
-      let { pathname } = new URL(
-        configApi.getOptionalString('app.baseUrl') ?? '/',
-        'http://dummy.dev', // baseUrl can be specified as just a path
-      );
-      if (pathname.endsWith('/')) {
-        pathname = pathname.replace(/\/$/, '');
-      }
+      const mountPath = `${getBasePath(configApi)}/*`;
 
       // If the app hasn't configured a sign-in page, we just continue as guest.
       if (!SignInPageComponent) {
@@ -361,7 +363,7 @@ export class PrivateAppImpl implements BackstageApp {
         return (
           <RouterComponent>
             <Routes>
-              <Route path={`${pathname}/*`} element={<>{children}</>} />
+              <Route path={mountPath} element={<>{children}</>} />
             </Routes>
           </RouterComponent>
         );
@@ -371,7 +373,7 @@ export class PrivateAppImpl implements BackstageApp {
         <RouterComponent>
           <SignInPageWrapper component={SignInPageComponent}>
             <Routes>
-              <Route path={`${pathname}/*`} element={<>{children}</>} />
+              <Route path={mountPath} element={<>{children}</>} />
             </Routes>
           </SignInPageWrapper>
         </RouterComponent>
diff --git a/packages/core-app-api/src/app/AppContext.test.tsx b/packages/core-app-api/src/app/AppContext.test.tsx
index d87bf7d228..a1131969f2 100644
--- a/packages/core-app-api/src/app/AppContext.test.tsx
+++ b/packages/core-app-api/src/app/AppContext.test.tsx
@@ -14,20 +14,16 @@
  * limitations under the License.
  */
 
-import React, { useContext, Context } from 'react';
+import React from 'react';
 import { renderHook } from '@testing-library/react-hooks';
-import { VersionedValue } from '../lib/versionedValues';
-import { getGlobalSingleton } from '../lib/globalObject';
+import { useVersionedContext } from '@backstage/version-bridge';
 import { AppContext as AppContextV1 } from './types';
 import { AppContextProvider } from './AppContext';
 
 describe('v1 consumer', () => {
-  const AppContext = getGlobalSingleton<
-    Context<VersionedValue<{ 1: AppContextV1 }>>
-  >('app-context');
-
   function useMockAppV1(): AppContextV1 {
-    const impl = useContext(AppContext)?.atVersion(1);
+    const impl =
+      useVersionedContext<{ 1: AppContextV1 }>('app-context')?.atVersion(1);
     if (!impl) {
       throw new Error('no impl');
     }
diff --git a/packages/core-app-api/src/app/AppContext.tsx b/packages/core-app-api/src/app/AppContext.tsx
index c583478ec2..f39d9a095e 100644
--- a/packages/core-app-api/src/app/AppContext.tsx
+++ b/packages/core-app-api/src/app/AppContext.tsx
@@ -14,18 +14,14 @@
  * limitations under the License.
  */
 
-import React, { createContext, PropsWithChildren } from 'react';
+import React, { PropsWithChildren } from 'react';
 import {
-  VersionedValue,
   createVersionedValueMap,
-} from '../lib/versionedValues';
-import { getOrCreateGlobalSingleton } from '../lib/globalObject';
+  createVersionedContext,
+} from '@backstage/version-bridge';
 import { AppContext as AppContextV1 } from './types';
 
-type AppContextType = VersionedValue<{ 1: AppContextV1 }> | undefined;
-const AppContext = getOrCreateGlobalSingleton('app-context', () =>
-  createContext<AppContextType | undefined>(undefined),
-);
+const AppContext = createVersionedContext<{ 1: AppContextV1 }>('app-context');
 
 type Props = {
   appContext: AppContextV1;
diff --git a/packages/core-app-api/src/app/createApp.tsx b/packages/core-app-api/src/app/createApp.tsx
index b7c49939e2..1d74f93add 100644
--- a/packages/core-app-api/src/app/createApp.tsx
+++ b/packages/core-app-api/src/app/createApp.tsx
@@ -60,7 +60,7 @@ export const defaultConfigLoader: AppConfigLoader = async (
   if (!Array.isArray(appConfig)) {
     throw new Error('Static configuration has invalid format');
   }
-  const configs = (appConfig.slice() as unknown) as AppConfig[];
+  const configs = appConfig.slice() as unknown as AppConfig[];
 
   // Avoiding this string also being replaced at runtime
   if (
diff --git a/packages/core-app-api/src/app/icons.tsx b/packages/core-app-api/src/app/icons.tsx
index bf45155096..a102026b29 100644
--- a/packages/core-app-api/src/app/icons.tsx
+++ b/packages/core-app-api/src/app/icons.tsx
@@ -15,17 +15,22 @@
  */
 
 import { IconComponent } from '@backstage/core-plugin-api';
-import MuiMenuBookIcon from '@material-ui/icons/MenuBook';
+import MuiApartmentIcon from '@material-ui/icons/Apartment';
 import MuiBrokenImageIcon from '@material-ui/icons/BrokenImage';
+import MuiCategoryIcon from '@material-ui/icons/Category';
 import MuiChatIcon from '@material-ui/icons/Chat';
 import MuiDashboardIcon from '@material-ui/icons/Dashboard';
+import MuiDocsIcon from '@material-ui/icons/Description';
 import MuiEmailIcon from '@material-ui/icons/Email';
+import MuiExtensionIcon from '@material-ui/icons/Extension';
 import MuiGitHubIcon from '@material-ui/icons/GitHub';
 import MuiHelpIcon from '@material-ui/icons/Help';
+import MuiLocationOnIcon from '@material-ui/icons/LocationOn';
+import MuiMemoryIcon from '@material-ui/icons/Memory';
+import MuiMenuBookIcon from '@material-ui/icons/MenuBook';
 import MuiPeopleIcon from '@material-ui/icons/People';
 import MuiPersonIcon from '@material-ui/icons/Person';
 import MuiWarningIcon from '@material-ui/icons/Warning';
-import MuiDocsIcon from '@material-ui/icons/Description';
 
 type AppIconsKey =
   | 'brokenImage'
@@ -37,6 +42,13 @@ type AppIconsKey =
   | 'github'
   | 'group'
   | 'help'
+  | 'kind:api'
+  | 'kind:component'
+  | 'kind:domain'
+  | 'kind:group'
+  | 'kind:location'
+  | 'kind:system'
+  | 'kind:user'
   | 'user'
   | 'warning';
 
@@ -53,6 +65,13 @@ export const defaultAppIcons: AppIcons = {
   github: MuiGitHubIcon,
   group: MuiPeopleIcon,
   help: MuiHelpIcon,
+  'kind:api': MuiExtensionIcon,
+  'kind:component': MuiMemoryIcon,
+  'kind:domain': MuiApartmentIcon,
+  'kind:group': MuiPeopleIcon,
+  'kind:location': MuiLocationOnIcon,
+  'kind:system': MuiCategoryIcon,
+  'kind:user': MuiPersonIcon,
   user: MuiPersonIcon,
   warning: MuiWarningIcon,
 };
diff --git a/packages/core-app-api/src/app/types.ts b/packages/core-app-api/src/app/types.ts
index 836f1b7fb0..30ce45abe9 100644
--- a/packages/core-app-api/src/app/types.ts
+++ b/packages/core-app-api/src/app/types.ts
@@ -105,14 +105,14 @@ type KeysWithType<Obj extends { [key in string]: any }, Type> = {
  */
 type PartialKeys<
   Map extends { [name in string]: any },
-  Keys extends keyof Map
+  Keys extends keyof Map,
 > = Partial<Pick<Map, Keys>> & Required<Omit<Map, Keys>>;
 
 /**
  * Creates a map of target routes with matching parameters based on a map of external routes.
  */
 type TargetRouteMap<
-  ExternalRoutes extends { [name: string]: ExternalRouteRef }
+  ExternalRoutes extends { [name: string]: ExternalRouteRef },
 > = {
   [name in keyof ExternalRoutes]: ExternalRoutes[name] extends ExternalRouteRef<
     infer Params,
@@ -123,7 +123,7 @@ type TargetRouteMap<
 };
 
 export type AppRouteBinder = <
-  ExternalRoutes extends { [name: string]: ExternalRouteRef }
+  ExternalRoutes extends { [name: string]: ExternalRouteRef },
 >(
   externalRoutes: ExternalRoutes,
   targetRoutes: PartialKeys<
diff --git a/packages/core-app-api/src/extensions/componentData.test.tsx b/packages/core-app-api/src/extensions/componentData.test.tsx
deleted file mode 100644
index 808ab08cf1..0000000000
--- a/packages/core-app-api/src/extensions/componentData.test.tsx
+++ /dev/null
@@ -1,118 +0,0 @@
-/*
- * Copyright 2020 The Backstage Authors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import React from 'react';
-import { attachComponentData, getComponentData } from './componentData';
-
-describe('elementData', () => {
-  it('should attach a single piece of data', () => {
-    const data = { foo: 'bar' };
-    const Component = () => null;
-    attachComponentData(Component, 'my-data', data);
-
-    const element = <Component />;
-    expect(getComponentData(element, 'my-data')).toBe(data);
-  });
-
-  it('should attach several distinct pieces of data', () => {
-    const data1 = { foo: 'bar' };
-    const data2 = { test: 'value' };
-    const Component = () => null;
-    attachComponentData(Component, 'my-data', data1);
-    attachComponentData(Component, 'second', data2);
-
-    const element = <Component />;
-    expect(getComponentData(element, 'my-data')).toBe(data1);
-    expect(getComponentData(element, 'second')).toBe(data2);
-  });
-
-  it('returns undefined for missing data', () => {
-    const data = { foo: 'bar' };
-    const Component1 = () => null;
-    const Component2 = () => null;
-    attachComponentData(Component2, 'my-data', data);
-
-    const element1 = <Component1 />;
-    const element2 = <Component2 />;
-    expect(getComponentData(element1, 'missing')).toBeUndefined();
-    expect(getComponentData(element2, 'missing')).toBeUndefined();
-  });
-
-  it('should throw when attempting to overwrite data', () => {
-    const data = { foo: 'bar' };
-    const MyComponent = () => null;
-    attachComponentData(MyComponent, 'my-data', data);
-    expect(() => attachComponentData(MyComponent, 'my-data', data)).toThrow(
-      'Attempted to attach duplicate data "my-data" to component "MyComponent"',
-    );
-  });
-
-  describe('works across versions', () => {
-    function getDataSymbol() {
-      const Component = () => null;
-      attachComponentData(Component, 'my-data', {});
-      const [symbol] = Object.getOwnPropertySymbols(Component);
-      return symbol;
-    }
-
-    it('should should be able to get data from older versions', () => {
-      const symbol = getDataSymbol();
-
-      const data = { foo: 'bar' };
-      const Component = () => null;
-      attachComponentData(Component, 'my-data', data);
-
-      const element = <Component />;
-      expect((element as any).type[symbol].map.get('my-data')).toBe(data);
-    });
-
-    it('should should be able to attach data for older versions', () => {
-      const symbol = getDataSymbol();
-
-      const data = { foo: 'bar' };
-      const Component = () => null;
-      (Component as any)[symbol] = {
-        map: new Map([['my-data', data]]),
-      };
-
-      const element = <Component />;
-      expect(getComponentData(element, 'my-data')).toBe(data);
-    });
-
-    it('should be able to get data from newer versions', () => {
-      const data = { foo: 'bar' };
-      const Component = () => null;
-      attachComponentData(Component, 'my-data', data);
-
-      const element = <Component />;
-      const container = (global as any)[
-        '__@backstage/component-data-store__'
-      ].get(element.type);
-      expect(container.map.get('my-data')).toBe(data);
-    });
-
-    it('should should be able to attach data for newer versions', () => {
-      const data = { foo: 'bar' };
-      const Component = () => null;
-      (global as any)['__@backstage/component-data-store__'].set(Component, {
-        map: new Map([['my-data', data]]),
-      });
-
-      const element = <Component />;
-      expect(getComponentData(element, 'my-data')).toBe(data);
-    });
-  });
-});
diff --git a/packages/core-app-api/src/extensions/componentData.tsx b/packages/core-app-api/src/extensions/componentData.tsx
deleted file mode 100644
index d4975d9eef..0000000000
--- a/packages/core-app-api/src/extensions/componentData.tsx
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
- * Copyright 2020 The Backstage Authors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import { ComponentType, ReactNode } from 'react';
-import { getOrCreateGlobalSingleton } from '../lib/globalObject';
-
-// TODO(Rugvip): Access via symbol is deprecated, remove once on 0.3.x
-const DATA_KEY = Symbol('backstage-component-data');
-
-type ComponentWithData<P> = ComponentType<P> & {
-  [DATA_KEY]?: DataContainer;
-};
-
-type DataContainer = {
-  map: Map<string, unknown>;
-};
-
-type MaybeComponentNode = ReactNode & {
-  type?: ComponentType<any> & { [DATA_KEY]?: DataContainer };
-};
-
-// The store is bridged across versions using the global object
-const store = getOrCreateGlobalSingleton(
-  'component-data-store',
-  () => new WeakMap<ComponentType<any>, DataContainer>(),
-);
-
-export function attachComponentData<P>(
-  component: ComponentType<P>,
-  type: string,
-  data: unknown,
-) {
-  const dataComponent = component as ComponentWithData<P>;
-
-  let container = store.get(component) || dataComponent[DATA_KEY];
-  if (!container) {
-    container = { map: new Map() };
-    store.set(component, container);
-    dataComponent[DATA_KEY] = container;
-  }
-
-  if (container.map.has(type)) {
-    const name = component.displayName || component.name;
-    throw new Error(
-      `Attempted to attach duplicate data "${type}" to component "${name}"`,
-    );
-  }
-
-  container.map.set(type, data);
-}
-
-export function getComponentData<T>(
-  node: ReactNode,
-  type: string,
-): T | undefined {
-  if (!node) {
-    return undefined;
-  }
-
-  const component = (node as MaybeComponentNode).type;
-  if (!component) {
-    return undefined;
-  }
-
-  const container = store.get(component) || component[DATA_KEY];
-  if (!container) {
-    return undefined;
-  }
-
-  return container.map.get(type) as T | undefined;
-}
diff --git a/packages/core-app-api/src/extensions/extensions.tsx b/packages/core-app-api/src/extensions/extensions.tsx
deleted file mode 100644
index 063f34c659..0000000000
--- a/packages/core-app-api/src/extensions/extensions.tsx
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Copyright 2020 The Backstage Authors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import { Extension, RouteRef } from '@backstage/core-plugin-api';
-
-type ComponentLoader<T> =
-  | {
-      lazy: () => Promise<T>;
-    }
-  | {
-      sync: T;
-    };
-
-const ERROR_MESSAGE = 'Import this from @backstage/core-plugin-api';
-
-/** @deprecated Import from @backstage/core-plugin-api instead */
-export function createRoutableExtension<
-  T extends (props: any) => JSX.Element | null
->(_options: {
-  component: () => Promise<T>;
-  mountPoint: RouteRef;
-}): Extension<T> {
-  throw new Error(ERROR_MESSAGE);
-}
-
-/** @deprecated Import from @backstage/core-plugin-api instead */
-export function createComponentExtension<
-  T extends (props: any) => JSX.Element | null
->(_options: { component: ComponentLoader<T> }): Extension<T> {
-  throw new Error(ERROR_MESSAGE);
-}
-
-/** @deprecated Import from @backstage/core-plugin-api instead */
-export function createReactExtension<
-  T extends (props: any) => JSX.Element | null
->(_options: {
-  component: ComponentLoader<T>;
-  data?: Record<string, unknown>;
-}): Extension<T> {
-  throw new Error(ERROR_MESSAGE);
-}
diff --git a/packages/core-app-api/src/lib/AuthConnector/DefaultAuthConnector.test.ts b/packages/core-app-api/src/lib/AuthConnector/DefaultAuthConnector.test.ts
index 524a0c5709..28125f6fa8 100644
--- a/packages/core-app-api/src/lib/AuthConnector/DefaultAuthConnector.test.ts
+++ b/packages/core-app-api/src/lib/AuthConnector/DefaultAuthConnector.test.ts
@@ -126,8 +126,7 @@ describe('DefaultAuthConnector', () => {
 
     expect(popupSpy).toBeCalledTimes(1);
     expect(popupSpy.mock.calls[0][0]).toMatchObject({
-      url:
-        'http://my-host/api/auth/my-provider/start?scope=a%20b&env=production',
+      url: 'http://my-host/api/auth/my-provider/start?scope=a%20b&origin=http%3A%2F%2Flocalhost&env=production',
     });
 
     await expect(sessionPromise).resolves.toEqual({
@@ -175,8 +174,7 @@ describe('DefaultAuthConnector', () => {
 
     expect(popupSpy).toBeCalledTimes(1);
     expect(popupSpy.mock.calls[0][0]).toMatchObject({
-      url:
-        'http://my-host/api/auth/my-provider/start?scope=-ab-&env=production',
+      url: 'http://my-host/api/auth/my-provider/start?scope=-ab-&origin=http%3A%2F%2Flocalhost&env=production',
     });
   });
 });
diff --git a/packages/core-app-api/src/lib/AuthConnector/DefaultAuthConnector.ts b/packages/core-app-api/src/lib/AuthConnector/DefaultAuthConnector.ts
index 81da04010c..261a008d4b 100644
--- a/packages/core-app-api/src/lib/AuthConnector/DefaultAuthConnector.ts
+++ b/packages/core-app-api/src/lib/AuthConnector/DefaultAuthConnector.ts
@@ -61,7 +61,8 @@ function defaultJoinScopes(scopes: Set<string>) {
  * via the OAuthRequestApi.
  */
 export class DefaultAuthConnector<AuthSession>
-  implements AuthConnector<AuthSession> {
+  implements AuthConnector<AuthSession>
+{
   private readonly discoveryApi: DiscoveryApi;
   private readonly environment: string;
   private readonly provider: AuthProvider & { id: string };
@@ -151,7 +152,10 @@ export class DefaultAuthConnector<AuthSession>
 
   private async showPopup(scopes: Set<string>): Promise<AuthSession> {
     const scope = this.joinScopesFunc(scopes);
-    const popupUrl = await this.buildUrl('/start', { scope });
+    const popupUrl = await this.buildUrl('/start', {
+      scope,
+      origin: location.origin,
+    });
 
     const payload = await showLoginPopup({
       url: popupUrl,
diff --git a/packages/core-app-api/src/lib/AuthSessionManager/AuthSessionStore.test.ts b/packages/core-app-api/src/lib/AuthSessionManager/AuthSessionStore.test.ts
index 4ceadd51ba..ded26c59e5 100644
--- a/packages/core-app-api/src/lib/AuthSessionManager/AuthSessionStore.test.ts
+++ b/packages/core-app-api/src/lib/AuthSessionManager/AuthSessionStore.test.ts
@@ -128,6 +128,19 @@ describe('GheAuth AuthSessionStore', () => {
     expect(manager.removeSession).toHaveBeenCalled();
   });
 
+  it('should set session', async () => {
+    const manager = new MockManager();
+    const store = new AuthSessionStore({ manager, ...defaultOptions });
+
+    await expect(store.getSession({ optional: true })).resolves.toBe(undefined);
+    expect(localStorage.getItem('my-key')).toBe(null);
+    expect(manager.setSession).not.toHaveBeenCalled();
+    store.setSession('123');
+    expect(manager.setSession).toHaveBeenCalled();
+    expect(localStorage.getItem('my-key')).toBe('"123"');
+    await expect(store.getSession({ optional: true })).resolves.toBe('123');
+  });
+
   it('should forward sessionState calls', () => {
     const manager = new MockManager();
     const store = new AuthSessionStore({ manager, ...defaultOptions });
diff --git a/packages/core-app-api/src/lib/AuthSessionManager/AuthSessionStore.ts b/packages/core-app-api/src/lib/AuthSessionManager/AuthSessionStore.ts
index 057a70e58d..fc15da7af8 100644
--- a/packages/core-app-api/src/lib/AuthSessionManager/AuthSessionStore.ts
+++ b/packages/core-app-api/src/lib/AuthSessionManager/AuthSessionStore.ts
@@ -15,7 +15,6 @@
  */
 
 import {
-  SessionManager,
   MutableSessionManager,
   SessionScopesFunc,
   SessionShouldRefreshFunc,
@@ -40,7 +39,7 @@ type Options<T> = {
  *
  * Session is serialized to JSON with special support for following types: Set.
  */
-export class AuthSessionStore<T> implements SessionManager<T> {
+export class AuthSessionStore<T> implements MutableSessionManager<T> {
   private readonly manager: MutableSessionManager<T>;
   private readonly storageKey: string;
   private readonly sessionShouldRefreshFunc: SessionShouldRefreshFunc<T>;
@@ -63,6 +62,11 @@ export class AuthSessionStore<T> implements SessionManager<T> {
     });
   }
 
+  setSession(session: T | undefined): void {
+    this.manager.setSession(session);
+    this.saveSession(session);
+  }
+
   async getSession(options: GetSessionOptions): Promise<T | undefined> {
     const { scopes } = options;
     const session = this.loadSession();
diff --git a/packages/core-app-api/src/lib/AuthSessionManager/OptionalRefreshSessionManagerMux.test.ts b/packages/core-app-api/src/lib/AuthSessionManager/OptionalRefreshSessionManagerMux.test.ts
new file mode 100644
index 0000000000..919948f531
--- /dev/null
+++ b/packages/core-app-api/src/lib/AuthSessionManager/OptionalRefreshSessionManagerMux.test.ts
@@ -0,0 +1,138 @@
+/*
+ * Copyright 2020 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { Observable, SessionState } from '@backstage/core-plugin-api';
+import { OptionalRefreshSessionManagerMux } from './OptionalRefreshSessionManagerMux';
+import { MutableSessionManager, SessionManager } from './types';
+
+class MockManager implements MutableSessionManager<string> {
+  constructor(public session?: string) {}
+
+  setSession(session: string | undefined): void {
+    this.session = session;
+  }
+  async getSession(): Promise<string | undefined> {
+    return this.session;
+  }
+  async removeSession(): Promise<void> {
+    delete this.session;
+  }
+  sessionState$(): Observable<SessionState> {
+    throw new Error('Method not implemented.');
+  }
+}
+
+function trackState(manager: SessionManager<any>) {
+  const states = new Array<boolean>();
+  manager
+    .sessionState$()
+    .subscribe(state => states.push(state === SessionState.SignedIn));
+  return states;
+}
+
+describe('OptionalRefreshSessionManagerMux', () => {
+  it('finds no session', async () => {
+    const mux = new OptionalRefreshSessionManagerMux({
+      staticSessionManager: new MockManager(),
+      refreshingSessionManager: new MockManager(),
+      sessionCanRefresh: () => false,
+    });
+
+    const states = trackState(mux);
+    await expect(mux.getSession({})).resolves.toBe(undefined);
+    expect(states).toEqual([false]);
+  });
+
+  it('prioritizes a static session', async () => {
+    const mux = new OptionalRefreshSessionManagerMux({
+      staticSessionManager: new MockManager('static'),
+      refreshingSessionManager: new MockManager('refreshing'),
+      sessionCanRefresh: () => false,
+    });
+
+    const states = trackState(mux);
+    await expect(mux.getSession({})).resolves.toBe('static');
+    expect(states).toEqual([false, true]);
+  });
+
+  it('transfers a refreshing session to the static manager', async () => {
+    const staticSessionManager = new MockManager();
+    const refreshingSessionManager = new MockManager('refreshing');
+    const mux = new OptionalRefreshSessionManagerMux({
+      staticSessionManager,
+      refreshingSessionManager,
+      sessionCanRefresh: () => false,
+    });
+
+    const states = trackState(mux);
+    expect(staticSessionManager.session).toBeUndefined();
+    await expect(mux.getSession({})).resolves.toBe('refreshing');
+    expect(staticSessionManager.session).toBe('refreshing');
+    expect(states).toEqual([false, true]);
+  });
+
+  it('relies on the refreshing manager if refresh is available', async () => {
+    const staticSessionManager = new MockManager();
+    const refreshingSessionManager = new MockManager('refreshing');
+    const mux = new OptionalRefreshSessionManagerMux({
+      staticSessionManager,
+      refreshingSessionManager,
+      sessionCanRefresh: () => true,
+    });
+
+    const states = trackState(mux);
+    await expect(mux.getSession({})).resolves.toBe('refreshing');
+    expect(staticSessionManager.session).toBeUndefined();
+    expect(states).toEqual([false, true]);
+  });
+
+  it('can switch between refreshing and static sessions', async () => {
+    let canRefresh = true;
+    const staticSessionManager = new MockManager();
+    const refreshingSessionManager = new MockManager('refreshing');
+    const mux = new OptionalRefreshSessionManagerMux({
+      staticSessionManager,
+      refreshingSessionManager,
+      sessionCanRefresh: () => canRefresh,
+    });
+
+    const states = trackState(mux);
+    await expect(mux.getSession({})).resolves.toBe('refreshing');
+    expect(staticSessionManager.session).toBeUndefined();
+    canRefresh = false;
+    await expect(mux.getSession({})).resolves.toBe('refreshing');
+    expect(staticSessionManager.session).toBe('refreshing');
+
+    expect(states).toEqual([false, true]);
+  });
+
+  it('removes sessions from both managers', async () => {
+    const staticSessionManager = new MockManager('static');
+    const refreshingSessionManager = new MockManager('refreshing');
+    const mux = new OptionalRefreshSessionManagerMux({
+      staticSessionManager,
+      refreshingSessionManager,
+      sessionCanRefresh: () => true,
+    });
+
+    const states = trackState(mux);
+    await expect(mux.getSession({})).resolves.toBe('static');
+    await mux.removeSession();
+    expect(staticSessionManager.session).toBeUndefined();
+    expect(refreshingSessionManager.session).toBeUndefined();
+    expect(states).toEqual([false, true, false]);
+  });
+});
diff --git a/packages/core-app-api/src/lib/AuthSessionManager/OptionalRefreshSessionManagerMux.ts b/packages/core-app-api/src/lib/AuthSessionManager/OptionalRefreshSessionManagerMux.ts
new file mode 100644
index 0000000000..221a7635ea
--- /dev/null
+++ b/packages/core-app-api/src/lib/AuthSessionManager/OptionalRefreshSessionManagerMux.ts
@@ -0,0 +1,105 @@
+/*
+ * Copyright 2020 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { Observable, SessionState } from '@backstage/core-plugin-api';
+import {
+  SessionManager,
+  MutableSessionManager,
+  GetSessionOptions,
+} from './types';
+import { SessionStateTracker } from './SessionStateTracker';
+
+type Options<T> = {
+  /**
+   * A callback that is called to determine whether a given session supports refresh
+   */
+  sessionCanRefresh: (session: T) => boolean;
+
+  /**
+   * The session manager that is used if the a session does not support refresh.
+   */
+  staticSessionManager: MutableSessionManager<T>;
+
+  /**
+   * The session manager that is used if the a session supports refresh.
+   */
+  refreshingSessionManager: SessionManager<T>;
+};
+
+/**
+ * OptionalRefreshSessionManagerMux wraps two different session managers, one for
+ * static session storage and another one that supports refresh. For each session
+ * that is retrieved is checked for whether it supports refresh. If it does, the
+ * refreshing session manager is used, otherwise the static session manager is used.
+ */
+export class OptionalRefreshSessionManagerMux<T> implements SessionManager<T> {
+  private readonly stateTracker = new SessionStateTracker();
+
+  private readonly sessionCanRefresh: (session: T) => boolean;
+  private readonly staticSessionManager: MutableSessionManager<T>;
+  private readonly refreshingSessionManager: SessionManager<T>;
+
+  constructor(options: Options<T>) {
+    this.sessionCanRefresh = options.sessionCanRefresh;
+    this.staticSessionManager = options.staticSessionManager;
+    this.refreshingSessionManager = options.refreshingSessionManager;
+  }
+
+  async getSession(options: GetSessionOptions): Promise<T | undefined> {
+    // First we check if there is an existing static session, using an optional request
+    const staticSession = await this.staticSessionManager.getSession({
+      ...options,
+      optional: true,
+    });
+    if (staticSession) {
+      this.stateTracker.setIsSignedIn(true);
+      return staticSession;
+    }
+
+    // If there is no static session available, we ask the refresh manager to get a session
+    const session = await this.refreshingSessionManager.getSession(options);
+
+    // Handling the case where the session request is optional
+    if (!session) {
+      this.stateTracker.setIsSignedIn(false);
+      return undefined;
+    }
+
+    // Next we check if the session we received from the refreshing manager can actually
+    // be refreshed. If it can, we use this session without storing it in the static manager.
+    if (this.sessionCanRefresh(session)) {
+      this.stateTracker.setIsSignedIn(true);
+      return session;
+    }
+
+    // If the session can't be refreshed, we store it in the static manager
+    this.staticSessionManager.setSession(session);
+    this.stateTracker.setIsSignedIn(true);
+    return session;
+  }
+
+  async removeSession(): Promise<void> {
+    await Promise.all([
+      this.refreshingSessionManager.removeSession(),
+      this.staticSessionManager.removeSession(),
+    ]);
+    this.stateTracker.setIsSignedIn(false);
+  }
+
+  sessionState$(): Observable<SessionState> {
+    return this.stateTracker.sessionState$();
+  }
+}
diff --git a/packages/core-app-api/src/lib/globalObject.test.ts b/packages/core-app-api/src/lib/globalObject.test.ts
deleted file mode 100644
index a658b253a6..0000000000
--- a/packages/core-app-api/src/lib/globalObject.test.ts
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
- * Copyright 2021 The Backstage Authors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import {
-  getGlobalSingleton,
-  getOrCreateGlobalSingleton,
-  setGlobalSingleton,
-} from './globalObject';
-
-const anyGlobal = global as any;
-
-describe('getGlobalSingleton', () => {
-  beforeEach(() => {
-    delete anyGlobal['__@backstage/my-thing__'];
-  });
-
-  it('should return an existing value', () => {
-    const myThing = {};
-    const myOtherThing = {};
-
-    anyGlobal['__@backstage/my-thing__'] = myThing;
-    expect(getGlobalSingleton('my-thing')).toBe(myThing);
-    expect(getGlobalSingleton('my-thing')).toBe(myThing);
-    anyGlobal['__@backstage/my-thing__'] = myOtherThing;
-    expect(getGlobalSingleton('my-thing')).toBe(myOtherThing);
-  });
-
-  it('should throw if the value is not set', () => {
-    expect(() => getGlobalSingleton('my-thing')).toThrow(
-      'Global my-thing is not set',
-    );
-  });
-});
-
-describe('getOrCreateGlobalSingleton', () => {
-  beforeEach(() => {
-    delete anyGlobal['__@backstage/my-thing__'];
-  });
-
-  it('should return an existing value', () => {
-    const myThing = {};
-    anyGlobal['__@backstage/my-thing__'] = myThing;
-
-    expect(getOrCreateGlobalSingleton('my-thing', () => ({}))).toBe(myThing);
-    expect(getOrCreateGlobalSingleton('my-thing', () => ({}))).toBe(myThing);
-  });
-
-  it('should should create a new value', () => {
-    const myNewThing = {};
-
-    expect(anyGlobal['__@backstage/my-thing__']).toBe(undefined);
-    expect(getOrCreateGlobalSingleton('my-thing', () => myNewThing)).toBe(
-      myNewThing,
-    );
-    expect(anyGlobal['__@backstage/my-thing__']).toBe(myNewThing);
-    expect(getOrCreateGlobalSingleton('my-thing', () => ({}))).toBe(myNewThing);
-  });
-});
-
-describe('setGlobalSingleton', () => {
-  beforeEach(() => {
-    delete anyGlobal['__@backstage/my-thing__'];
-  });
-
-  it('should set a global value', () => {
-    setGlobalSingleton('my-thing', 'global value');
-
-    expect(anyGlobal['__@backstage/my-thing__']).toBe('global value');
-  });
-
-  it('should throw if global value is set', () => {
-    anyGlobal['__@backstage/my-thing__'] = 'already defined';
-    expect(() => setGlobalSingleton('my-thing', () => 'global value')).toThrow(
-      'Global my-thing is already se',
-    );
-  });
-});
diff --git a/packages/core-app-api/src/lib/globalObject.ts b/packages/core-app-api/src/lib/globalObject.ts
deleted file mode 100644
index ad70a61110..0000000000
--- a/packages/core-app-api/src/lib/globalObject.ts
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * Copyright 2021 The Backstage Authors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-// https://github.com/zloirock/core-js/issues/86#issuecomment-115759028
-function getGlobalObject() {
-  if (typeof window !== 'undefined' && window.Math === Math) {
-    return window;
-  }
-  if (typeof self !== 'undefined' && self.Math === Math) {
-    return self;
-  }
-  // eslint-disable-next-line no-new-func
-  return Function('return this')();
-}
-
-const globalObject = getGlobalObject();
-
-const makeKey = (id: string) => `__@backstage/${id}__`;
-
-/**
- * Used to provide a global singleton value, failing if it is already set.
- */
-export function setGlobalSingleton(id: string, value: unknown): void {
-  const key = makeKey(id);
-  if (key in globalObject) {
-    throw new Error(`Global ${id} is already set`); // TODO some sort of special build err
-  }
-  globalObject[key] = value;
-}
-
-/**
- * Used to access a global singleton value, failing if it is not already set.
- */
-export function getGlobalSingleton<T>(id: string): T {
-  const key = makeKey(id);
-  if (!(key in globalObject)) {
-    throw new Error(`Global ${id} is not set`); // TODO some sort of special build err
-  }
-
-  return globalObject[key];
-}
-
-/**
- * Serializes access to a global singleton value, with the first caller creating the value.
- */
-export function getOrCreateGlobalSingleton<T>(
-  id: string,
-  supplier: () => T,
-): T {
-  const key = makeKey(id);
-
-  let value = globalObject[key];
-  if (value) {
-    return value;
-  }
-
-  value = supplier();
-  globalObject[key] = value;
-  return value;
-}
diff --git a/packages/core-app-api/src/lib/loginPopup.test.ts b/packages/core-app-api/src/lib/loginPopup.test.ts
index 1eb7c3f8b9..db4d9eb8eb 100644
--- a/packages/core-app-api/src/lib/loginPopup.test.ts
+++ b/packages/core-app-api/src/lib/loginPopup.test.ts
@@ -30,8 +30,7 @@ describe('showLoginPopup', () => {
     const removeEventListenerSpy = jest.spyOn(window, 'removeEventListener');
 
     const payloadPromise = showLoginPopup({
-      url:
-        'my-origin/api/backend/auth/start?scope=https%3A%2F%2Fwww.googleapis.com%2Fauth%2Fa%20https%3A%2F%2Fwww.googleapis.com%2Fauth%2Fb',
+      url: 'my-origin/api/backend/auth/start?scope=https%3A%2F%2Fwww.googleapis.com%2Fauth%2Fa%20https%3A%2F%2Fwww.googleapis.com%2Fauth%2Fb',
       name: 'test-popup',
       origin: 'my-origin',
     });
diff --git a/packages/core-app-api/src/lib/subjects.ts b/packages/core-app-api/src/lib/subjects.ts
index 0391050bda..e122da819b 100644
--- a/packages/core-app-api/src/lib/subjects.ts
+++ b/packages/core-app-api/src/lib/subjects.ts
@@ -29,7 +29,8 @@ import ObservableImpl from 'zen-observable';
  * See http://reactivex.io/documentation/subject.html
  */
 export class PublishSubject<T>
-  implements Observable<T>, ZenObservable.SubscriptionObserver<T> {
+  implements Observable<T>, ZenObservable.SubscriptionObserver<T>
+{
   private isClosed = false;
   private terminatingError?: Error;
 
@@ -121,7 +122,8 @@ export class PublishSubject<T>
  * See http://reactivex.io/documentation/subject.html
  */
 export class BehaviorSubject<T>
-  implements Observable<T>, ZenObservable.SubscriptionObserver<T> {
+  implements Observable<T>, ZenObservable.SubscriptionObserver<T>
+{
   private isClosed = false;
   private currentValue: T;
   private terminatingError?: Error;
diff --git a/packages/core-app-api/src/plugins/collectors.ts b/packages/core-app-api/src/plugins/collectors.ts
index 11e5cd51b3..0f8b65ad62 100644
--- a/packages/core-app-api/src/plugins/collectors.ts
+++ b/packages/core-app-api/src/plugins/collectors.ts
@@ -14,8 +14,7 @@
  * limitations under the License.
  */
 
-import { BackstagePlugin } from '@backstage/core-plugin-api';
-import { getComponentData } from '../extensions';
+import { BackstagePlugin, getComponentData } from '@backstage/core-plugin-api';
 import { createCollector } from '../extensions/traversal';
 
 export const pluginCollector = createCollector(
diff --git a/packages/core-app-api/src/routing/FlatRoutes.test.tsx b/packages/core-app-api/src/routing/FlatRoutes.test.tsx
index a73534a272..0df296cc59 100644
--- a/packages/core-app-api/src/routing/FlatRoutes.test.tsx
+++ b/packages/core-app-api/src/routing/FlatRoutes.test.tsx
@@ -37,11 +37,11 @@ function makeRouteRenderer(node: ReactNode) {
       <Wrapper>
         <AppContextProvider
           appContext={
-            ({
+            {
               getComponents: () => ({
                 NotFoundErrorPage: () => <>Not Found</>,
               }),
-            } as unknown) as AppContext
+            } as unknown as AppContext
           }
         >
           <MemoryRouter initialEntries={[path]} children={node} />
@@ -100,7 +100,6 @@ describe('FlatRoutes', () => {
       return <>Outlet: {useOutlet()}</>;
     };
 
-    // The '/*' suffixes here are intentional and will be ignored by FlatRoutes
     const routes = (
       <>
         <Route path="/a" element={<MyPage />}>
@@ -112,11 +111,15 @@ describe('FlatRoutes', () => {
         <Route path="/b" element={<MyPage />}>
           b
         </Route>
+        <Route path="/" element={<MyPage />}>
+          c
+        </Route>
       </>
     );
     const renderRoute = makeRouteRenderer(<FlatRoutes>{routes}</FlatRoutes>);
     expect(renderRoute('/a').getByText('Outlet: a')).toBeInTheDocument();
     expect(renderRoute('/a/b').getByText('Outlet: a-b')).toBeInTheDocument();
     expect(renderRoute('/b').getByText('Outlet: b')).toBeInTheDocument();
+    expect(renderRoute('/').getByText('Outlet: c')).toBeInTheDocument();
   });
 });
diff --git a/packages/core-app-api/src/routing/FlatRoutes.tsx b/packages/core-app-api/src/routing/FlatRoutes.tsx
index 6ba82203fd..315ec91cdb 100644
--- a/packages/core-app-api/src/routing/FlatRoutes.tsx
+++ b/packages/core-app-api/src/routing/FlatRoutes.tsx
@@ -49,8 +49,10 @@ export const FlatRoutes = (props: FlatRoutesProps): JSX.Element | null => {
             element: child,
             children: child.props.children
               ? [
+                  // These are the children of each route, which we all add in under a catch-all
+                  // subroute in order to make them available to `useOutlet`
                   {
-                    path: '/*',
+                    path: path === '/' ? '/' : '/*', // The root path must require an exact match
                     element: child.props.children,
                   },
                 ]
diff --git a/packages/core-app-api/src/routing/RouteResolver.test.ts b/packages/core-app-api/src/routing/RouteResolver.test.ts
index b47a18ecce..1b7eb10003 100644
--- a/packages/core-app-api/src/routing/RouteResolver.test.ts
+++ b/packages/core-app-api/src/routing/RouteResolver.test.ts
@@ -65,7 +65,7 @@ const externalRef4 = createExternalRouteRef({
 
 describe('RouteResolver', () => {
   it('should not resolve anything with an empty resolver', () => {
-    const r = new RouteResolver(new Map(), new Map(), [], new Map());
+    const r = new RouteResolver(new Map(), new Map(), [], new Map(), '');
 
     expect(r.resolve(ref1, '/')?.()).toBe(undefined);
     expect(r.resolve(ref2, '/')?.({ x: '1x' })).toBe(undefined);
@@ -85,6 +85,7 @@ describe('RouteResolver', () => {
       new Map(),
       [{ routeRefs: new Set([ref1]), path: '/my-route', ...rest }],
       new Map(),
+      '',
     );
 
     expect(r.resolve(ref1, '/')?.()).toBe('/my-route');
@@ -99,6 +100,29 @@ describe('RouteResolver', () => {
     expect(r.resolve(externalRef4, '/')?.({ x: '6x' })).toBe(undefined);
   });
 
+  it('should resolve an absolute route and an app base path', () => {
+    const r = new RouteResolver(
+      new Map([[ref1, '/my-route']]),
+      new Map(),
+      [{ routeRefs: new Set([ref1]), path: '/my-route', ...rest }],
+      new Map(),
+      '/base',
+    );
+
+    expect(r.resolve(ref1, '/')?.()).toBe('/base/my-route');
+    expect(r.resolve(ref2, '/')?.({ x: '1x' })).toBe(undefined);
+    expect(r.resolve(subRef1, '/')?.()).toBe('/base/my-route/foo');
+    expect(r.resolve(subRef2, '/')?.({ a: '2a' })).toBe(
+      '/base/my-route/foo/2a',
+    );
+    expect(r.resolve(subRef3, '/')?.({ x: '3x' })).toBe(undefined);
+    expect(r.resolve(subRef4, '/')?.({ x: '4x', a: '4a' })).toBe(undefined);
+    expect(r.resolve(externalRef1, '/')?.()).toBe(undefined);
+    expect(r.resolve(externalRef2, '/')?.()).toBe(undefined);
+    expect(r.resolve(externalRef3, '/')?.({ x: '5x' })).toBe(undefined);
+    expect(r.resolve(externalRef4, '/')?.({ x: '6x' })).toBe(undefined);
+  });
+
   it('should resolve an absolute route with a param and with a parent', () => {
     const r = new RouteResolver(
       new Map<RouteRef, string>([
@@ -122,6 +146,7 @@ describe('RouteResolver', () => {
         [externalRef3, ref2],
         [externalRef4, subRef3],
       ]),
+      '',
     );
 
     expect(r.resolve(ref1, '/')?.()).toBe('/my-route');
@@ -179,6 +204,7 @@ describe('RouteResolver', () => {
         },
       ],
       new Map<ExternalRouteRef, RouteRef | SubRouteRef>(),
+      '',
     );
 
     expect(r.resolve(ref2, '/')?.({ x: 'x' })).toBe('/root/x');
@@ -232,6 +258,7 @@ describe('RouteResolver', () => {
         [externalRef3, ref2],
         [externalRef4, subRef3],
       ]),
+      '',
     );
 
     const l = '/my-grandparent/my-y/my-parent/my-x';
diff --git a/packages/core-app-api/src/routing/RouteResolver.ts b/packages/core-app-api/src/routing/RouteResolver.ts
index e09da28df8..b5be5f893e 100644
--- a/packages/core-app-api/src/routing/RouteResolver.ts
+++ b/packages/core-app-api/src/routing/RouteResolver.ts
@@ -187,6 +187,7 @@ export class RouteResolver {
       ExternalRouteRef,
       RouteRef | SubRouteRef
     >,
+    private readonly appBasePath: string, // base path without a trailing slash
   ) {}
 
   resolve<Params extends AnyParams>(
@@ -209,13 +210,15 @@ export class RouteResolver {
     // Next we figure out the base path, which is the combination of the common parent path
     // between our current location and our target location, as well as the additional path
     // that is the difference between the parent path and the base of our target location.
-    const basePath = resolveBasePath(
-      targetRef,
-      sourceLocation,
-      this.routePaths,
-      this.routeParents,
-      this.routeObjects,
-    );
+    const basePath =
+      this.appBasePath +
+      resolveBasePath(
+        targetRef,
+        sourceLocation,
+        this.routePaths,
+        this.routeParents,
+        this.routeObjects,
+      );
 
     const routeFunc: RouteFunc<Params> = (...[params]) => {
       return basePath + generatePath(targetPath, params);
diff --git a/packages/core-app-api/src/routing/RoutingProvider.test.tsx b/packages/core-app-api/src/routing/RoutingProvider.test.tsx
index 499b81a743..397217e34a 100644
--- a/packages/core-app-api/src/routing/RoutingProvider.test.tsx
+++ b/packages/core-app-api/src/routing/RoutingProvider.test.tsx
@@ -14,17 +14,11 @@
  * limitations under the License.
  */
 
-import React, {
-  PropsWithChildren,
-  ReactElement,
-  useContext,
-  Context,
-} from 'react';
+import React, { PropsWithChildren, ReactElement } from 'react';
 import { MemoryRouter, Routes } from 'react-router-dom';
 import { render } from '@testing-library/react';
 import { renderHook } from '@testing-library/react-hooks';
-import { VersionedValue } from '../lib/versionedValues';
-import { getGlobalSingleton } from '../lib/globalObject';
+import { useVersionedContext } from '@backstage/version-bridge';
 import {
   childDiscoverer,
   routeElementDiscoverer,
@@ -152,6 +146,7 @@ function withRoutingProvider(
       routeParents={routeParents}
       routeObjects={routeObjects}
       routeBindings={new Map(routeBindings)}
+      basePath=""
     >
       {root}
     </RoutingProvider>
@@ -330,15 +325,13 @@ describe('discovery', () => {
 });
 
 describe('v1 consumer', () => {
-  const RoutingContext = getGlobalSingleton<
-    Context<VersionedValue<{ 1: RouteResolver }>>
-  >('routing-context');
-
   function useMockRouteRefV1(
     routeRef: AnyRouteRef,
     location: string,
   ): RouteFunc<any> | undefined {
-    const resolver = useContext(RoutingContext)?.atVersion(1);
+    const resolver = useVersionedContext<{
+      1: RouteResolver;
+    }>('routing-context')?.atVersion(1);
     if (!resolver) {
       throw new Error('no impl');
     }
@@ -367,6 +360,7 @@ describe('v1 consumer', () => {
             routeParents={new Map()}
             routeObjects={[]}
             routeBindings={new Map()}
+            basePath="/base"
             children={children}
           />
         ),
@@ -375,8 +369,8 @@ describe('v1 consumer', () => {
 
     expect(renderedHook.result.current).toBe(undefined);
     renderedHook.rerender({ routeRef: routeRef2 });
-    expect(renderedHook.result.current?.()).toBe('/foo');
+    expect(renderedHook.result.current?.()).toBe('/base/foo');
     renderedHook.rerender({ routeRef: routeRef3 });
-    expect(renderedHook.result.current?.({ x: 'my-x' })).toBe('/bar/my-x');
+    expect(renderedHook.result.current?.({ x: 'my-x' })).toBe('/base/bar/my-x');
   });
 });
diff --git a/packages/core-app-api/src/routing/RoutingProvider.tsx b/packages/core-app-api/src/routing/RoutingProvider.tsx
index ea8e8f76f8..2ab1686368 100644
--- a/packages/core-app-api/src/routing/RoutingProvider.tsx
+++ b/packages/core-app-api/src/routing/RoutingProvider.tsx
@@ -14,30 +14,28 @@
  * limitations under the License.
  */
 
-import React, { createContext, ReactNode } from 'react';
+import React, { ReactNode } from 'react';
 import {
   ExternalRouteRef,
   RouteRef,
   SubRouteRef,
 } from '@backstage/core-plugin-api';
-import { getOrCreateGlobalSingleton } from '../lib/globalObject';
 import {
   createVersionedValueMap,
-  VersionedValue,
-} from '../lib/versionedValues';
+  createVersionedContext,
+} from '@backstage/version-bridge';
 import { RouteResolver } from './RouteResolver';
 import { BackstageRouteObject } from './types';
 
-type RoutingContextType = VersionedValue<{ 1: RouteResolver }> | undefined;
-const RoutingContext = getOrCreateGlobalSingleton('routing-context', () =>
-  createContext<RoutingContextType>(undefined),
-);
+const RoutingContext =
+  createVersionedContext<{ 1: RouteResolver }>('routing-context');
 
 type ProviderProps = {
   routePaths: Map<RouteRef, string>;
   routeParents: Map<RouteRef, RouteRef | undefined>;
   routeObjects: BackstageRouteObject[];
   routeBindings: Map<ExternalRouteRef, RouteRef | SubRouteRef>;
+  basePath?: string;
   children: ReactNode;
 };
 
@@ -46,6 +44,7 @@ export const RoutingProvider = ({
   routeParents,
   routeObjects,
   routeBindings,
+  basePath = '',
   children,
 }: ProviderProps) => {
   const resolver = new RouteResolver(
@@ -53,6 +52,7 @@ export const RoutingProvider = ({
     routeParents,
     routeObjects,
     routeBindings,
+    basePath,
   );
 
   const versionedValue = createVersionedValueMap({ 1: resolver });
diff --git a/packages/core-app-api/src/routing/collectors.test.tsx b/packages/core-app-api/src/routing/collectors.test.tsx
index d37b5e3016..36d99d2938 100644
--- a/packages/core-app-api/src/routing/collectors.test.tsx
+++ b/packages/core-app-api/src/routing/collectors.test.tsx
@@ -31,8 +31,8 @@ import {
   createRouteRef,
   createPlugin,
   RouteRef,
+  attachComponentData,
 } from '@backstage/core-plugin-api';
-import { attachComponentData } from '../extensions';
 import { MemoryRouter, Routes, Route } from 'react-router-dom';
 
 const MockComponent = ({ children }: PropsWithChildren<{ path?: string }>) => (
diff --git a/packages/core-app-api/src/routing/collectors.tsx b/packages/core-app-api/src/routing/collectors.tsx
index fcbe3ca923..0ba83e90f8 100644
--- a/packages/core-app-api/src/routing/collectors.tsx
+++ b/packages/core-app-api/src/routing/collectors.tsx
@@ -15,9 +15,8 @@
  */
 
 import { isValidElement, ReactElement, ReactNode } from 'react';
-import { RouteRef } from '@backstage/core-plugin-api';
+import { RouteRef, getComponentData } from '@backstage/core-plugin-api';
 import { BackstageRouteObject } from './types';
-import { getComponentData } from '../extensions';
 import { createCollector } from '../extensions/traversal';
 import { FeatureFlagged, FeatureFlaggedProps } from './FeatureFlagged';
 
diff --git a/packages/core-app-api/src/routing/types.ts b/packages/core-app-api/src/routing/types.ts
index 6561a0da70..12bf0d1a0f 100644
--- a/packages/core-app-api/src/routing/types.ts
+++ b/packages/core-app-api/src/routing/types.ts
@@ -19,7 +19,7 @@ import {
   SubRouteRef,
   ExternalRouteRef,
 } from '@backstage/core-plugin-api';
-import { getOrCreateGlobalSingleton } from '../lib/globalObject';
+import { getOrCreateGlobalSingleton } from '@backstage/version-bridge';
 
 type RouteRefType = Exclude<
   keyof RouteRef,
@@ -75,7 +75,7 @@ export function isSubRouteRef<Params extends AnyParams>(
 
 export function isExternalRouteRef<
   Params extends AnyParams,
-  Optional extends boolean
+  Optional extends boolean,
 >(
   routeRef:
     | RouteRef<Params>
diff --git a/packages/core-components/CHANGELOG.md b/packages/core-components/CHANGELOG.md
index 1536cf3fb2..1c195cdd2c 100644
--- a/packages/core-components/CHANGELOG.md
+++ b/packages/core-components/CHANGELOG.md
@@ -1,5 +1,141 @@
 # @backstage/core-components
 
+## 0.4.1
+
+### Patch Changes
+
+- 06e275705: Fix warning produced by BottomLink component
+
+  During development, we noticed warnings such as:
+
+  ```
+  react_devtools_backend.js:2842 Warning: validateDOMNesting(...): <div> cannot appear as a descendant of <p>.
+  ```
+
+  The BottomLink component renders a Box component within a Typography component which leads to a div tag within a p tag.
+  This change inverts that ordering without changing the visual appearance.
+
+- Updated dependencies
+  - @backstage/errors@0.1.2
+  - @backstage/config@0.1.9
+  - @backstage/core-plugin-api@0.1.7
+
+## 0.4.0
+
+### Minor Changes
+
+- 3ed78fca3: Changed the `titleComponent` prop on `ContentHeader` to accept `ReactNode` instead of a React `ComponentType`. Usages of this prop should be converted from passing a component to passing in the rendered element:
+
+  ```diff
+  -<ContentHeader titleComponent={MyComponent}>
+  +<ContentHeader titleComponent={<MyComponent />}>
+  ```
+
+### Patch Changes
+
+- e0a6aea82: Bumped `react-hook-form` to `^7.12.2`
+
+## 0.3.3
+
+### Patch Changes
+
+- d041655a7: Fix accessibility issue in `<CopyTextButton />`. The component doesn't render anymore an hidden `textarea` containing the text to be copied.
+- 6d76bca85: Handle changes to nodes passed into `<DependencyGraph>` correctly.
+- Updated dependencies
+  - @backstage/config@0.1.8
+
+## 0.3.2
+
+### Patch Changes
+
+- a3f3cff3b: Change the default hover experience for the sidebar to be not jumpy & add visual separation between sidebar & Entity Page tabs for dark mode.
+- 6b1afe8c0: Add a configurable `palette.bursts.gradient` property to the Backstage theme, to support customizing the gradients in the `ItemCard` header.
+- Updated dependencies
+  - @backstage/config@0.1.7
+  - @backstage/theme@0.2.10
+
+## 0.3.1
+
+### Patch Changes
+
+- 56c773909: Switched `@types/react` dependency to request `*` rather than a specific version.
+- 55a5dbd54: Fix for `SidebarItem` matching the active route too broadly.
+- Updated dependencies
+  - @backstage/core-plugin-api@0.1.6
+
+## 0.3.0
+
+### Minor Changes
+
+- 7bf006210: Remove unused props from InfoCard prop type
+
+### Patch Changes
+
+- c4d8ff963: Switched frontend identity code to use `token` instead of the deprecated `idToken` field
+- 7b8aa8d0d: Move the `CreateComponentButton` from the catalog plugin to the `core-components` & rename it to `CreateButton` to be reused inside the api-docs plugin & scaffolder plugin, but also future plugins. Additionally, improve responsiveness of `CreateButton` & `SupportButton` by shrinking them to `IconButtons` on smaller screens.
+- 260c053b9: Fix All Material UI Warnings
+- Updated dependencies
+  - @backstage/config@0.1.6
+  - @backstage/core-plugin-api@0.1.5
+
+## 0.2.0
+
+### Minor Changes
+
+- 9d40fcb1e: - Bumping `material-ui/core` version to at least `4.12.2` as they made some breaking changes in later versions which broke `Pagination` of the `Table`.
+  - Switching out `material-table` to `@material-table/core` for support for the later versions of `material-ui/core`
+  - This causes a minor API change to `@backstage/core-components` as the interface for `Table` re-exports the `prop` from the underlying `Table` components.
+  - `onChangeRowsPerPage` has been renamed to `onRowsPerPageChange`
+  - `onChangePage` has been renamed to `onPageChange`
+  - Migration guide is here: https://material-table-core.com/docs/breaking-changes
+
+### Patch Changes
+
+- 19d9995b6: Improve accessibility of core & catalog components by adjusting them with non-breaking changes.
+- 224e54484: Added an `EntityProcessingErrorsPanel` component to show any errors that occurred when refreshing an entity from its source location.
+
+  If upgrading, this should be added to your `EntityPage` in your Backstage application:
+
+  ```diff
+  // packages/app/src/components/catalog/EntityPage.tsx
+
+  const overviewContent = (
+  ...
+            <EntityOrphanWarning />
+          </Grid>
+         </EntitySwitch.Case>
+      </EntitySwitch>
+  +   <EntitySwitch>
+  +     <EntitySwitch.Case if={hasCatalogProcessingErrors}>
+  +       <Grid item xs={12}>
+  +         <EntityProcessingErrorsPanel />
+  +       </Grid>
+  +     </EntitySwitch.Case>
+  +   </EntitySwitch>
+
+  ```
+
+  Additionally, `WarningPanel` now changes color based on the provided severity.
+
+- Updated dependencies
+  - @backstage/core-plugin-api@0.1.4
+  - @backstage/theme@0.2.9
+
+## 0.1.6
+
+### Patch Changes
+
+- 9a751bb28: Increase the vertical padding of the sidebar search input field to match the height of the parent anchor tag. This prevents users from accidentally navigating to the search page when they actually wanted to use the search input directly.
+- 45b5fc3a8: Updated the layout of catalog and API index pages to handle smaller screen sizes. This adds responsive wrappers to the entity tables, and switches filters to a drawer when width-constrained. If you have created a custom catalog or API index page, you will need to update the page structure to match the updated [catalog customization](https://backstage.io/docs/features/software-catalog/catalog-customization) documentation.
+- 03bf17e9b: Improve the responsiveness of the EntityPage UI. With this the Header component should scale with the screen size & wrapping should not cause overflowing/blocking of links. Additionally enforce the Pages using the Grid Layout to use it across all screen sizes & to wrap as intended.
+
+  To benefit from the improved responsive layout, the `EntityPage` in existing Backstage applications should be updated to set the `xs` column size on each grid item in the page, as this does not default. For example:
+
+  ```diff
+  -  <Grid item md={6}>
+  +  <Grid item xs={12} md={6}>
+  ```
+
 ## 0.1.5
 
 ### Patch Changes
diff --git a/packages/core-components/api-report.md b/packages/core-components/api-report.md
index 3d8e60d4fb..f3652d98cf 100644
--- a/packages/core-components/api-report.md
+++ b/packages/core-components/api-report.md
@@ -9,13 +9,10 @@ import { ApiRef } from '@backstage/core-plugin-api';
 import { BackstageIdentityApi } from '@backstage/core-plugin-api';
 import { Breadcrumbs as Breadcrumbs_2 } from '@material-ui/core';
 import { ButtonProps } from '@material-ui/core';
-import { ButtonTypeMap } from '@material-ui/core';
 import { CardHeaderProps } from '@material-ui/core';
-import { Column } from 'material-table';
-import { CommonProps } from '@material-ui/core/OverridableComponent';
+import { Column } from '@material-table/core';
 import { ComponentClass } from 'react';
 import { ComponentProps } from 'react';
-import { ComponentType } from 'react';
 import { Context } from 'react';
 import { default as CSS_2 } from 'csstype';
 import { CSSProperties } from 'react';
@@ -26,8 +23,9 @@ import { IconComponent } from '@backstage/core-plugin-api';
 import { LinearProgressProps } from '@material-ui/core';
 import { LinkProps as LinkProps_2 } from '@material-ui/core';
 import { LinkProps as LinkProps_3 } from 'react-router-dom';
-import { MaterialTableProps } from 'material-table';
+import { MaterialTableProps } from '@material-table/core';
 import { NavLinkProps } from 'react-router-dom';
+import { Palette } from '@material-ui/core/styles/createPalette';
 import { ProfileInfoApi } from '@backstage/core-plugin-api';
 import { PropsWithChildren } from 'react';
 import PropTypes from 'prop-types';
@@ -47,9 +45,13 @@ import { Theme } from '@material-ui/core';
 import { TooltipProps } from '@material-ui/core';
 import { WithStyles } from '@material-ui/core';
 
+// Warning: (ae-missing-release-tag) "AlertDisplay" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
-export const AlertDisplay: () => JSX.Element | null;
+export function AlertDisplay(_props: {}): JSX.Element | null;
 
+// Warning: (ae-missing-release-tag) "Alignment" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 enum Alignment {
   // (undocumented)
@@ -62,381 +64,97 @@ enum Alignment {
   UP_RIGHT = 'UR',
 }
 
+// Warning: (ae-forgotten-export) The symbol "AvatarProps" needs to be exported by the entry point index.d.ts
+// Warning: (ae-missing-release-tag) "Avatar" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
-export const Avatar: ({
-  displayName,
-  picture,
-  customStyles,
-}: AvatarProps) => JSX.Element;
+export function Avatar(props: AvatarProps): JSX.Element;
+
+// Warning: (ae-forgotten-export) The symbol "Props" needs to be exported by the entry point index.d.ts
+// Warning: (ae-missing-release-tag) "Breadcrumbs" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
+// @public (undocumented)
+export function Breadcrumbs(props: Props_24): JSX.Element;
+
+// Warning: (ae-forgotten-export) The symbol "IconComponentProps" needs to be exported by the entry point index.d.ts
+// Warning: (ae-missing-release-tag) "BrokenImageIcon" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
+// @public (undocumented)
+export function BrokenImageIcon(props: IconComponentProps): JSX.Element;
+
+// Warning: (ae-forgotten-export) The symbol "Props" needs to be exported by the entry point index.d.ts
+// Warning: (ae-missing-release-tag) "ButtonType" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
+// @public (undocumented)
+export function Button(props: Props): JSX.Element;
+
+// Warning: (ae-forgotten-export) The symbol "CardTabProps" needs to be exported by the entry point index.d.ts
+// Warning: (ae-missing-release-tag) "CardTab" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
+// @public (undocumented)
+export function CardTab(props: PropsWithChildren<CardTabProps>): JSX.Element;
+
+// Warning: (ae-missing-release-tag) "CatalogIcon" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
+// @public (undocumented)
+export function CatalogIcon(props: IconComponentProps): JSX.Element;
+
+// Warning: (ae-missing-release-tag) "ChatIcon" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
+// @public (undocumented)
+export function ChatIcon(props: IconComponentProps): JSX.Element;
+
+// Warning: (ae-forgotten-export) The symbol "Props" needs to be exported by the entry point index.d.ts
+// Warning: (ae-missing-release-tag) "CodeSnippet" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
+// @public (undocumented)
+export const CodeSnippet: (props: Props_2) => JSX.Element;
+
+// Warning: (ae-forgotten-export) The symbol "Props" needs to be exported by the entry point index.d.ts
+// Warning: (ae-missing-release-tag) "Content" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
+// @public (undocumented)
+export function Content(props: PropsWithChildren<Props_17>): JSX.Element;
+
+// Warning: (ae-forgotten-export) The symbol "ContentHeaderProps" needs to be exported by the entry point index.d.ts
+// Warning: (ae-missing-release-tag) "ContentHeader" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
+// @public (undocumented)
+export function ContentHeader(
+  props: PropsWithChildren<ContentHeaderProps>,
+): JSX.Element;
+
+// Warning: (ae-forgotten-export) The symbol "Props" needs to be exported by the entry point index.d.ts
+// Warning: (ae-missing-release-tag) "CopyTextButton" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+// Warning: (ae-missing-release-tag) "CopyTextButton" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
+// @public (undocumented)
+export function CopyTextButton(props: Props_3): JSX.Element;
 
 // @public (undocumented)
-export const Breadcrumbs: ({ children, ...props }: Props_25) => JSX.Element;
+export namespace CopyTextButton {
+  var // (undocumented)
+    propTypes: {
+      text: PropTypes.Validator<string>;
+      tooltipDelay: PropTypes.Requireable<number>;
+      tooltipText: PropTypes.Requireable<string>;
+    };
+}
 
+// Warning: (ae-forgotten-export) The symbol "CreateButtonProps" needs to be exported by the entry point index.d.ts
+// Warning: (ae-missing-release-tag) "CreateButton" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
-export const BrokenImageIcon: IconComponent;
-
-// @public
-export const Button: React_2.ForwardRefExoticComponent<
-  Pick<
-    Props,
-    | 'replace'
-    | 'media'
-    | 'hidden'
-    | 'dir'
-    | 'form'
-    | 'slot'
-    | 'title'
-    | 'disabled'
-    | 'color'
-    | 'size'
-    | 'underline'
-    | 'display'
-    | 'translate'
-    | 'prefix'
-    | 'children'
-    | 'key'
-    | 'value'
-    | 'id'
-    | 'name'
-    | 'action'
-    | 'defaultChecked'
-    | 'defaultValue'
-    | 'suppressContentEditableWarning'
-    | 'suppressHydrationWarning'
-    | 'accessKey'
-    | 'contentEditable'
-    | 'contextMenu'
-    | 'draggable'
-    | 'lang'
-    | 'placeholder'
-    | 'spellCheck'
-    | 'tabIndex'
-    | 'radioGroup'
-    | 'role'
-    | 'about'
-    | 'datatype'
-    | 'inlist'
-    | 'property'
-    | 'resource'
-    | 'typeof'
-    | 'vocab'
-    | 'autoCapitalize'
-    | 'autoCorrect'
-    | 'autoSave'
-    | 'itemProp'
-    | 'itemScope'
-    | 'itemType'
-    | 'itemID'
-    | 'itemRef'
-    | 'results'
-    | 'security'
-    | 'unselectable'
-    | 'inputMode'
-    | 'is'
-    | 'aria-activedescendant'
-    | 'aria-atomic'
-    | 'aria-autocomplete'
-    | 'aria-busy'
-    | 'aria-checked'
-    | 'aria-colcount'
-    | 'aria-colindex'
-    | 'aria-colspan'
-    | 'aria-controls'
-    | 'aria-current'
-    | 'aria-describedby'
-    | 'aria-details'
-    | 'aria-disabled'
-    | 'aria-dropeffect'
-    | 'aria-errormessage'
-    | 'aria-expanded'
-    | 'aria-flowto'
-    | 'aria-grabbed'
-    | 'aria-haspopup'
-    | 'aria-hidden'
-    | 'aria-invalid'
-    | 'aria-keyshortcuts'
-    | 'aria-label'
-    | 'aria-labelledby'
-    | 'aria-level'
-    | 'aria-live'
-    | 'aria-modal'
-    | 'aria-multiline'
-    | 'aria-multiselectable'
-    | 'aria-orientation'
-    | 'aria-owns'
-    | 'aria-placeholder'
-    | 'aria-posinset'
-    | 'aria-pressed'
-    | 'aria-readonly'
-    | 'aria-relevant'
-    | 'aria-required'
-    | 'aria-roledescription'
-    | 'aria-rowcount'
-    | 'aria-rowindex'
-    | 'aria-rowspan'
-    | 'aria-selected'
-    | 'aria-setsize'
-    | 'aria-sort'
-    | 'aria-valuemax'
-    | 'aria-valuemin'
-    | 'aria-valuenow'
-    | 'aria-valuetext'
-    | 'dangerouslySetInnerHTML'
-    | 'onCopy'
-    | 'onCopyCapture'
-    | 'onCut'
-    | 'onCutCapture'
-    | 'onPaste'
-    | 'onPasteCapture'
-    | 'onCompositionEnd'
-    | 'onCompositionEndCapture'
-    | 'onCompositionStart'
-    | 'onCompositionStartCapture'
-    | 'onCompositionUpdate'
-    | 'onCompositionUpdateCapture'
-    | 'onFocus'
-    | 'onFocusCapture'
-    | 'onBlur'
-    | 'onBlurCapture'
-    | 'onChange'
-    | 'onChangeCapture'
-    | 'onBeforeInput'
-    | 'onBeforeInputCapture'
-    | 'onInput'
-    | 'onInputCapture'
-    | 'onReset'
-    | 'onResetCapture'
-    | 'onSubmit'
-    | 'onSubmitCapture'
-    | 'onInvalid'
-    | 'onInvalidCapture'
-    | 'onLoad'
-    | 'onLoadCapture'
-    | 'onError'
-    | 'onErrorCapture'
-    | 'onKeyDown'
-    | 'onKeyDownCapture'
-    | 'onKeyPress'
-    | 'onKeyPressCapture'
-    | 'onKeyUp'
-    | 'onKeyUpCapture'
-    | 'onAbort'
-    | 'onAbortCapture'
-    | 'onCanPlay'
-    | 'onCanPlayCapture'
-    | 'onCanPlayThrough'
-    | 'onCanPlayThroughCapture'
-    | 'onDurationChange'
-    | 'onDurationChangeCapture'
-    | 'onEmptied'
-    | 'onEmptiedCapture'
-    | 'onEncrypted'
-    | 'onEncryptedCapture'
-    | 'onEnded'
-    | 'onEndedCapture'
-    | 'onLoadedData'
-    | 'onLoadedDataCapture'
-    | 'onLoadedMetadata'
-    | 'onLoadedMetadataCapture'
-    | 'onLoadStart'
-    | 'onLoadStartCapture'
-    | 'onPause'
-    | 'onPauseCapture'
-    | 'onPlay'
-    | 'onPlayCapture'
-    | 'onPlaying'
-    | 'onPlayingCapture'
-    | 'onProgress'
-    | 'onProgressCapture'
-    | 'onRateChange'
-    | 'onRateChangeCapture'
-    | 'onSeeked'
-    | 'onSeekedCapture'
-    | 'onSeeking'
-    | 'onSeekingCapture'
-    | 'onStalled'
-    | 'onStalledCapture'
-    | 'onSuspend'
-    | 'onSuspendCapture'
-    | 'onTimeUpdate'
-    | 'onTimeUpdateCapture'
-    | 'onVolumeChange'
-    | 'onVolumeChangeCapture'
-    | 'onWaiting'
-    | 'onWaitingCapture'
-    | 'onAuxClick'
-    | 'onAuxClickCapture'
-    | 'onClick'
-    | 'onClickCapture'
-    | 'onContextMenu'
-    | 'onContextMenuCapture'
-    | 'onDoubleClick'
-    | 'onDoubleClickCapture'
-    | 'onDrag'
-    | 'onDragCapture'
-    | 'onDragEnd'
-    | 'onDragEndCapture'
-    | 'onDragEnter'
-    | 'onDragEnterCapture'
-    | 'onDragExit'
-    | 'onDragExitCapture'
-    | 'onDragLeave'
-    | 'onDragLeaveCapture'
-    | 'onDragOver'
-    | 'onDragOverCapture'
-    | 'onDragStart'
-    | 'onDragStartCapture'
-    | 'onDrop'
-    | 'onDropCapture'
-    | 'onMouseDown'
-    | 'onMouseDownCapture'
-    | 'onMouseEnter'
-    | 'onMouseLeave'
-    | 'onMouseMove'
-    | 'onMouseMoveCapture'
-    | 'onMouseOut'
-    | 'onMouseOutCapture'
-    | 'onMouseOver'
-    | 'onMouseOverCapture'
-    | 'onMouseUp'
-    | 'onMouseUpCapture'
-    | 'onSelect'
-    | 'onSelectCapture'
-    | 'onTouchCancel'
-    | 'onTouchCancelCapture'
-    | 'onTouchEnd'
-    | 'onTouchEndCapture'
-    | 'onTouchMove'
-    | 'onTouchMoveCapture'
-    | 'onTouchStart'
-    | 'onTouchStartCapture'
-    | 'onPointerDown'
-    | 'onPointerDownCapture'
-    | 'onPointerMove'
-    | 'onPointerMoveCapture'
-    | 'onPointerUp'
-    | 'onPointerUpCapture'
-    | 'onPointerCancel'
-    | 'onPointerCancelCapture'
-    | 'onPointerEnter'
-    | 'onPointerEnterCapture'
-    | 'onPointerLeave'
-    | 'onPointerLeaveCapture'
-    | 'onPointerOver'
-    | 'onPointerOverCapture'
-    | 'onPointerOut'
-    | 'onPointerOutCapture'
-    | 'onGotPointerCapture'
-    | 'onGotPointerCaptureCapture'
-    | 'onLostPointerCapture'
-    | 'onLostPointerCaptureCapture'
-    | 'onScroll'
-    | 'onScrollCapture'
-    | 'onWheel'
-    | 'onWheelCapture'
-    | 'onAnimationStart'
-    | 'onAnimationStartCapture'
-    | 'onAnimationEnd'
-    | 'onAnimationEndCapture'
-    | 'onAnimationIteration'
-    | 'onAnimationIterationCapture'
-    | 'onTransitionEnd'
-    | 'onTransitionEndCapture'
-    | 'component'
-    | 'variant'
-    | 'download'
-    | 'href'
-    | 'hrefLang'
-    | 'ping'
-    | 'rel'
-    | 'target'
-    | 'type'
-    | 'referrerPolicy'
-    | 'disableElevation'
-    | 'fullWidth'
-    | 'startIcon'
-    | 'endIcon'
-    | 'noWrap'
-    | 'gutterBottom'
-    | 'paragraph'
-    | 'autoFocus'
-    | 'formAction'
-    | 'formEncType'
-    | 'formMethod'
-    | 'formNoValidate'
-    | 'formTarget'
-    | 'disableFocusRipple'
-    | 'buttonRef'
-    | 'centerRipple'
-    | 'disableRipple'
-    | 'disableTouchRipple'
-    | 'focusRipple'
-    | 'focusVisibleClassName'
-    | 'onFocusVisible'
-    | 'TouchRippleProps'
-    | 'align'
-    | 'variantMapping'
-    | 'to'
-    | 'state'
-    | 'TypographyClasses'
-    | keyof CommonProps<ButtonTypeMap<{}, 'button'>>
-  > &
-    React_2.RefAttributes<any>
->;
+export function CreateButton(props: CreateButtonProps): JSX.Element | null;
 
+// Warning: (ae-missing-release-tag) "DashboardIcon" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
-export const CardTab: ({
-  children,
-  ...props
-}: PropsWithChildren<CardTabProps>) => JSX.Element;
-
-// @public (undocumented)
-export const CatalogIcon: IconComponent;
-
-// @public (undocumented)
-export const ChatIcon: IconComponent;
-
-// @public (undocumented)
-export const CodeSnippet: ({
-  text,
-  language,
-  showLineNumbers,
-  showCopyCodeButton,
-  highlightedNumbers,
-  customStyle,
-}: Props_2) => JSX.Element;
-
-// @public (undocumented)
-export const Content: ({
-  className,
-  stretch,
-  noPadding,
-  children,
-  ...props
-}: PropsWithChildren<Props_18>) => JSX.Element;
-
-// @public (undocumented)
-export const ContentHeader: ({
-  description,
-  title,
-  titleComponent: TitleComponent,
-  children,
-  textAlign,
-}: PropsWithChildren<ContentHeaderProps>) => JSX.Element;
-
-// @public (undocumented)
-export const CopyTextButton: {
-  (props: Props_3): JSX.Element;
-  propTypes: {
-    text: PropTypes.Validator<string>;
-    tooltipDelay: PropTypes.Requireable<number>;
-    tooltipText: PropTypes.Requireable<string>;
-  };
-};
-
-// @public (undocumented)
-export const DashboardIcon: IconComponent;
+export function DashboardIcon(props: IconComponentProps): JSX.Element;
 
+// Warning: (ae-forgotten-export) The symbol "CustomType" needs to be exported by the entry point index.d.ts
+// Warning: (ae-missing-release-tag) "DependencyEdge" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 type DependencyEdge<T = CustomType> = T & {
   from: string;
@@ -444,28 +162,11 @@ type DependencyEdge<T = CustomType> = T & {
   label?: string;
 };
 
+// Warning: (ae-forgotten-export) The symbol "DependencyGraphProps" needs to be exported by the entry point index.d.ts
+// Warning: (ae-missing-release-tag) "DependencyGraph" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
-export function DependencyGraph({
-  edges,
-  nodes,
-  renderNode,
-  direction,
-  align,
-  nodeMargin,
-  edgeMargin,
-  rankMargin,
-  paddingX,
-  paddingY,
-  acyclicer,
-  ranker,
-  labelPosition,
-  labelOffset,
-  edgeRanks,
-  edgeWeight,
-  renderLabel,
-  defs,
-  ...svgProps
-}: DependencyGraphProps): JSX.Element;
+export function DependencyGraph(props: DependencyGraphProps): JSX.Element;
 
 declare namespace DependencyGraphTypes {
   export {
@@ -486,11 +187,15 @@ declare namespace DependencyGraphTypes {
 }
 export { DependencyGraphTypes };
 
+// Warning: (ae-missing-release-tag) "DependencyNode" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 type DependencyNode<T = CustomType> = T & {
   id: string;
 };
 
+// Warning: (ae-missing-release-tag) "Direction" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 enum Direction {
   // (undocumented)
@@ -503,17 +208,19 @@ enum Direction {
   TOP_BOTTOM = 'TB',
 }
 
+// Warning: (ae-forgotten-export) The symbol "Props" needs to be exported by the entry point index.d.ts
+// Warning: (ae-missing-release-tag) "DismissableBanner" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
-export const DismissableBanner: ({
-  variant,
-  message,
-  id,
-  fixed,
-}: Props_4) => JSX.Element;
+export const DismissableBanner: (props: Props_4) => JSX.Element;
 
+// Warning: (ae-missing-release-tag) "DocsIcon" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
-export const DocsIcon: IconComponent;
+export function DocsIcon(props: IconComponentProps): JSX.Element;
 
+// Warning: (ae-missing-release-tag) "EdgeProperties" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 type EdgeProperties = {
   label?: string;
@@ -526,41 +233,46 @@ type EdgeProperties = {
   [customKey: string]: any;
 };
 
+// Warning: (ae-missing-release-tag) "EmailIcon" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
-export const EmailIcon: IconComponent;
+export function EmailIcon(props: IconComponentProps): JSX.Element;
 
+// Warning: (ae-forgotten-export) The symbol "Props" needs to be exported by the entry point index.d.ts
+// Warning: (ae-missing-release-tag) "EmptyState" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
-export const EmptyState: ({
-  title,
-  description,
-  missing,
-  action,
-}: Props_5) => JSX.Element;
+export function EmptyState(props: Props_5): JSX.Element;
 
+// Warning: (ae-forgotten-export) The symbol "State" needs to be exported by the entry point index.d.ts
+// Warning: (ae-missing-release-tag) "ErrorBoundary" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export const ErrorBoundary: ComponentClass<ErrorBoundaryProps, State>;
 
+// Warning: (ae-missing-release-tag) "ErrorBoundaryProps" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export type ErrorBoundaryProps = {
   slackChannel?: string | SlackChannel;
   onError?: (error: Error, errorInfo: string) => null;
 };
 
+// Warning: (ae-forgotten-export) The symbol "IErrorPageProps" needs to be exported by the entry point index.d.ts
+// Warning: (ae-missing-release-tag) "ErrorPage" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
-export const ErrorPage: ({
-  status,
-  statusMessage,
-  additionalInfo,
-}: IErrorPageProps) => JSX.Element;
+export function ErrorPage(props: IErrorPageProps): JSX.Element;
 
+// Warning: (ae-missing-release-tag) "ErrorPanel" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public
-export const ErrorPanel: ({
-  title,
-  error,
-  defaultExpanded,
-  children,
-}: PropsWithChildren<ErrorPanelProps>) => JSX.Element;
+export function ErrorPanel(
+  props: PropsWithChildren<ErrorPanelProps>,
+): JSX.Element;
 
+// Warning: (ae-missing-release-tag) "ErrorPanelProps" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export type ErrorPanelProps = {
   error: Error;
@@ -568,74 +280,92 @@ export type ErrorPanelProps = {
   title?: string;
 };
 
+// Warning: (ae-forgotten-export) The symbol "Props" needs to be exported by the entry point index.d.ts
+// Warning: (ae-missing-release-tag) "FeatureCalloutCircular" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
-export const FeatureCalloutCircular: ({
-  featureId,
-  title,
-  description,
-  children,
-}: PropsWithChildren<Props_7>) => JSX.Element;
+export function FeatureCalloutCircular(
+  props: PropsWithChildren<Props_7>,
+): JSX.Element;
 
+// Warning: (ae-forgotten-export) The symbol "Props" needs to be exported by the entry point index.d.ts
+// Warning: (ae-missing-release-tag) "Gauge" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
-export const Gauge: (props: Props_14) => JSX.Element;
+export function Gauge(props: Props_14): JSX.Element;
 
+// Warning: (ae-forgotten-export) The symbol "Props" needs to be exported by the entry point index.d.ts
+// Warning: (ae-missing-release-tag) "GaugeCard" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
-export const GaugeCard: (props: Props_13) => JSX.Element;
+export function GaugeCard(props: Props_13): JSX.Element;
 
+// Warning: (ae-missing-release-tag) "GitHubIcon" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
-export const GitHubIcon: IconComponent;
+export function GitHubIcon(props: IconComponentProps): JSX.Element;
 
+// Warning: (ae-missing-release-tag) "GraphEdge" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 type GraphEdge<T = CustomType> = DependencyEdge<T> &
   dagre_2.GraphEdge &
   EdgeProperties;
 
+// Warning: (ae-missing-release-tag) "GraphNode" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 type GraphNode<T = CustomType> = dagre_2.Node<DependencyNode<T>>;
 
+// Warning: (ae-missing-release-tag) "GroupIcon" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
-export const GroupIcon: IconComponent;
+export function GroupIcon(props: IconComponentProps): JSX.Element;
 
+// Warning: (ae-forgotten-export) The symbol "Props" needs to be exported by the entry point index.d.ts
+// Warning: (ae-missing-release-tag) "Header" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
-export const Header: ({
-  children,
-  pageTitleOverride,
-  style,
-  subtitle,
-  title,
-  tooltip,
-  type,
-  typeLink,
-}: PropsWithChildren<Props_19>) => JSX.Element;
+export function Header(props: PropsWithChildren<Props_18>): JSX.Element;
 
+// Warning: (ae-forgotten-export) The symbol "Props" needs to be exported by the entry point index.d.ts
+// Warning: (ae-missing-release-tag) "HeaderIconLinkRow" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
-export const HeaderIconLinkRow: ({ links }: Props_8) => JSX.Element;
+export function HeaderIconLinkRow(props: Props_8): JSX.Element;
 
+// Warning: (ae-forgotten-export) The symbol "HeaderLabelProps" needs to be exported by the entry point index.d.ts
+// Warning: (ae-missing-release-tag) "HeaderLabel" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
-export const HeaderLabel: ({
-  label,
-  value,
-  url,
-}: HeaderLabelProps) => JSX.Element;
+export function HeaderLabel(props: HeaderLabelProps): JSX.Element;
 
+// Warning: (ae-forgotten-export) The symbol "HeaderTabsProps" needs to be exported by the entry point index.d.ts
+// Warning: (ae-missing-release-tag) "HeaderTabs" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
-export const HeaderTabs: ({
-  tabs,
-  onChange,
-  selectedIndex,
-}: HeaderTabsProps) => JSX.Element;
+export function HeaderTabs(props: HeaderTabsProps): JSX.Element;
 
+// Warning: (ae-missing-release-tag) "HelpIcon" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
-export const HelpIcon: IconComponent;
+export function HelpIcon(props: IconComponentProps): JSX.Element;
 
+// Warning: (ae-missing-release-tag) "HomepageTimer" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
-export const HomepageTimer: () => JSX.Element | null;
+export function HomepageTimer(_props: {}): JSX.Element | null;
 
+// Warning: (ae-forgotten-export) The symbol "Props" needs to be exported by the entry point index.d.ts
+// Warning: (ae-missing-release-tag) "HorizontalScrollGrid" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
-export const HorizontalScrollGrid: (
+export function HorizontalScrollGrid(
   props: PropsWithChildren<Props_9>,
-) => JSX.Element;
+): JSX.Element;
 
+// Warning: (ae-missing-release-tag) "IconLinkVerticalProps" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export type IconLinkVerticalProps = {
   color?: 'primary' | 'secondary';
@@ -647,57 +377,64 @@ export type IconLinkVerticalProps = {
   title?: string;
 };
 
+// Warning: (ae-forgotten-export) The symbol "Props" needs to be exported by the entry point index.d.ts
+// Warning: (ae-missing-release-tag) "InfoCard" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
-export const InfoCard: ({
-  title,
-  subheader,
-  divider,
-  deepLink,
-  slackChannel,
-  errorBoundaryProps,
-  variant,
-  children,
-  headerStyle,
-  headerProps,
-  action,
-  actionsClassName,
-  actions,
-  cardClassName,
-  actionsTopRight,
-  className,
-  noPadding,
-  titleTypographyProps,
-}: Props_20) => JSX.Element;
+export function InfoCard(props: Props_19): JSX.Element;
 
+// Warning: (ae-missing-release-tag) "InfoCardVariants" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export type InfoCardVariants = 'flex' | 'fullHeight' | 'gridItem';
 
+// Warning: (ae-forgotten-export) The symbol "IntroCardProps" needs to be exported by the entry point index.d.ts
+// Warning: (ae-missing-release-tag) "IntroCard" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
-export const IntroCard: (props: IntroCardProps) => JSX.Element;
+export function IntroCard(props: IntroCardProps): JSX.Element;
 
+// Warning: (tsdoc-malformed-html-name) Invalid HTML element: Expecting an HTML name
+// Warning: (tsdoc-escape-greater-than) The ">" character should be escaped using a backslash to avoid confusion with an HTML tag
+// Warning: (ae-forgotten-export) The symbol "ItemCardProps" needs to be exported by the entry point index.d.ts
+// Warning: (ae-missing-release-tag) "ItemCard" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public @deprecated
-export const ItemCard: ({
-  description,
-  tags,
-  title,
-  type,
-  subtitle,
-  label,
-  onClick,
-  href,
-}: ItemCardProps) => JSX.Element;
+export function ItemCard(props: ItemCardProps): JSX.Element;
 
+// Warning: (tsdoc-escape-greater-than) The ">" character should be escaped using a backslash to avoid confusion with an HTML tag
+// Warning: (tsdoc-escape-right-brace) The "}" character should be escaped using a backslash to avoid confusion with a TSDoc inline tag
+// Warning: (tsdoc-escape-right-brace) The "}" character should be escaped using a backslash to avoid confusion with a TSDoc inline tag
+// Warning: (tsdoc-html-tag-missing-string) The HTML element has an invalid attribute: Expecting an HTML string starting with a single-quote or double-quote character
+// Warning: (tsdoc-malformed-inline-tag) Expecting a TSDoc tag starting with "{@"
+// Warning: (tsdoc-malformed-inline-tag) Expecting a TSDoc tag starting with "{@"
+// Warning: (ae-missing-release-tag) "ItemCardGrid" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public
-export const ItemCardGrid: (props: ItemCardGridProps) => JSX.Element;
+export function ItemCardGrid(props: ItemCardGridProps): JSX.Element;
 
+// Warning: (ae-forgotten-export) The symbol "styles" needs to be exported by the entry point index.d.ts
+// Warning: (ae-missing-release-tag) "ItemCardGridProps" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export type ItemCardGridProps = Partial<WithStyles<typeof styles>> & {
   children?: React_2.ReactNode;
 };
 
+// Warning: (tsdoc-escape-greater-than) The ">" character should be escaped using a backslash to avoid confusion with an HTML tag
+// Warning: (tsdoc-escape-right-brace) The "}" character should be escaped using a backslash to avoid confusion with a TSDoc inline tag
+// Warning: (tsdoc-escape-right-brace) The "}" character should be escaped using a backslash to avoid confusion with a TSDoc inline tag
+// Warning: (tsdoc-html-tag-missing-string) The HTML element has an invalid attribute: Expecting an HTML string starting with a single-quote or double-quote character
+// Warning: (tsdoc-malformed-inline-tag) Expecting a TSDoc tag starting with "{@"
+// Warning: (tsdoc-malformed-inline-tag) Expecting a TSDoc tag starting with "{@"
+// Warning: (ae-missing-release-tag) "ItemCardHeader" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public
-export const ItemCardHeader: (props: ItemCardHeaderProps) => JSX.Element;
+export function ItemCardHeader(props: ItemCardHeaderProps): JSX.Element;
 
+// Warning: (ae-forgotten-export) The symbol "styles" needs to be exported by the entry point index.d.ts
+// Warning: (ae-missing-release-tag) "ItemCardHeaderProps" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export type ItemCardHeaderProps = Partial<WithStyles<typeof styles_2>> & {
   title?: React_2.ReactNode;
@@ -705,6 +442,8 @@ export type ItemCardHeaderProps = Partial<WithStyles<typeof styles_2>> & {
   children?: React_2.ReactNode;
 };
 
+// Warning: (ae-missing-release-tag) "LabelPosition" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 enum LabelPosition {
   // (undocumented)
@@ -715,330 +454,77 @@ enum LabelPosition {
   RIGHT = 'r',
 }
 
+// Warning: (ae-forgotten-export) The symbol "Props" needs to be exported by the entry point index.d.ts
+// Warning: (ae-missing-release-tag) "Lifecycle" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
-export const Lifecycle: (props: Props_10) => JSX.Element;
+export function Lifecycle(props: Props_10): JSX.Element;
 
+// Warning: (ae-forgotten-export) The symbol "Props" needs to be exported by the entry point index.d.ts
+// Warning: (ae-missing-release-tag) "LinearGauge" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
-export const LinearGauge: ({ value }: Props_15) => JSX.Element | null;
+export function LinearGauge(props: Props_15): JSX.Element | null;
 
-// @public
-export const Link: React_2.ForwardRefExoticComponent<
-  Pick<
-    LinkProps,
-    | 'replace'
-    | 'media'
-    | 'hidden'
-    | 'dir'
-    | 'slot'
-    | 'style'
-    | 'title'
-    | 'color'
-    | 'underline'
-    | 'display'
-    | 'translate'
-    | 'prefix'
-    | 'children'
-    | 'key'
-    | 'id'
-    | 'classes'
-    | 'defaultChecked'
-    | 'defaultValue'
-    | 'suppressContentEditableWarning'
-    | 'suppressHydrationWarning'
-    | 'accessKey'
-    | 'className'
-    | 'contentEditable'
-    | 'contextMenu'
-    | 'draggable'
-    | 'lang'
-    | 'placeholder'
-    | 'spellCheck'
-    | 'tabIndex'
-    | 'radioGroup'
-    | 'role'
-    | 'about'
-    | 'datatype'
-    | 'inlist'
-    | 'property'
-    | 'resource'
-    | 'typeof'
-    | 'vocab'
-    | 'autoCapitalize'
-    | 'autoCorrect'
-    | 'autoSave'
-    | 'itemProp'
-    | 'itemScope'
-    | 'itemType'
-    | 'itemID'
-    | 'itemRef'
-    | 'results'
-    | 'security'
-    | 'unselectable'
-    | 'inputMode'
-    | 'is'
-    | 'aria-activedescendant'
-    | 'aria-atomic'
-    | 'aria-autocomplete'
-    | 'aria-busy'
-    | 'aria-checked'
-    | 'aria-colcount'
-    | 'aria-colindex'
-    | 'aria-colspan'
-    | 'aria-controls'
-    | 'aria-current'
-    | 'aria-describedby'
-    | 'aria-details'
-    | 'aria-disabled'
-    | 'aria-dropeffect'
-    | 'aria-errormessage'
-    | 'aria-expanded'
-    | 'aria-flowto'
-    | 'aria-grabbed'
-    | 'aria-haspopup'
-    | 'aria-hidden'
-    | 'aria-invalid'
-    | 'aria-keyshortcuts'
-    | 'aria-label'
-    | 'aria-labelledby'
-    | 'aria-level'
-    | 'aria-live'
-    | 'aria-modal'
-    | 'aria-multiline'
-    | 'aria-multiselectable'
-    | 'aria-orientation'
-    | 'aria-owns'
-    | 'aria-placeholder'
-    | 'aria-posinset'
-    | 'aria-pressed'
-    | 'aria-readonly'
-    | 'aria-relevant'
-    | 'aria-required'
-    | 'aria-roledescription'
-    | 'aria-rowcount'
-    | 'aria-rowindex'
-    | 'aria-rowspan'
-    | 'aria-selected'
-    | 'aria-setsize'
-    | 'aria-sort'
-    | 'aria-valuemax'
-    | 'aria-valuemin'
-    | 'aria-valuenow'
-    | 'aria-valuetext'
-    | 'dangerouslySetInnerHTML'
-    | 'onCopy'
-    | 'onCopyCapture'
-    | 'onCut'
-    | 'onCutCapture'
-    | 'onPaste'
-    | 'onPasteCapture'
-    | 'onCompositionEnd'
-    | 'onCompositionEndCapture'
-    | 'onCompositionStart'
-    | 'onCompositionStartCapture'
-    | 'onCompositionUpdate'
-    | 'onCompositionUpdateCapture'
-    | 'onFocus'
-    | 'onFocusCapture'
-    | 'onBlur'
-    | 'onBlurCapture'
-    | 'onChange'
-    | 'onChangeCapture'
-    | 'onBeforeInput'
-    | 'onBeforeInputCapture'
-    | 'onInput'
-    | 'onInputCapture'
-    | 'onReset'
-    | 'onResetCapture'
-    | 'onSubmit'
-    | 'onSubmitCapture'
-    | 'onInvalid'
-    | 'onInvalidCapture'
-    | 'onLoad'
-    | 'onLoadCapture'
-    | 'onError'
-    | 'onErrorCapture'
-    | 'onKeyDown'
-    | 'onKeyDownCapture'
-    | 'onKeyPress'
-    | 'onKeyPressCapture'
-    | 'onKeyUp'
-    | 'onKeyUpCapture'
-    | 'onAbort'
-    | 'onAbortCapture'
-    | 'onCanPlay'
-    | 'onCanPlayCapture'
-    | 'onCanPlayThrough'
-    | 'onCanPlayThroughCapture'
-    | 'onDurationChange'
-    | 'onDurationChangeCapture'
-    | 'onEmptied'
-    | 'onEmptiedCapture'
-    | 'onEncrypted'
-    | 'onEncryptedCapture'
-    | 'onEnded'
-    | 'onEndedCapture'
-    | 'onLoadedData'
-    | 'onLoadedDataCapture'
-    | 'onLoadedMetadata'
-    | 'onLoadedMetadataCapture'
-    | 'onLoadStart'
-    | 'onLoadStartCapture'
-    | 'onPause'
-    | 'onPauseCapture'
-    | 'onPlay'
-    | 'onPlayCapture'
-    | 'onPlaying'
-    | 'onPlayingCapture'
-    | 'onProgress'
-    | 'onProgressCapture'
-    | 'onRateChange'
-    | 'onRateChangeCapture'
-    | 'onSeeked'
-    | 'onSeekedCapture'
-    | 'onSeeking'
-    | 'onSeekingCapture'
-    | 'onStalled'
-    | 'onStalledCapture'
-    | 'onSuspend'
-    | 'onSuspendCapture'
-    | 'onTimeUpdate'
-    | 'onTimeUpdateCapture'
-    | 'onVolumeChange'
-    | 'onVolumeChangeCapture'
-    | 'onWaiting'
-    | 'onWaitingCapture'
-    | 'onAuxClick'
-    | 'onAuxClickCapture'
-    | 'onClick'
-    | 'onClickCapture'
-    | 'onContextMenu'
-    | 'onContextMenuCapture'
-    | 'onDoubleClick'
-    | 'onDoubleClickCapture'
-    | 'onDrag'
-    | 'onDragCapture'
-    | 'onDragEnd'
-    | 'onDragEndCapture'
-    | 'onDragEnter'
-    | 'onDragEnterCapture'
-    | 'onDragExit'
-    | 'onDragExitCapture'
-    | 'onDragLeave'
-    | 'onDragLeaveCapture'
-    | 'onDragOver'
-    | 'onDragOverCapture'
-    | 'onDragStart'
-    | 'onDragStartCapture'
-    | 'onDrop'
-    | 'onDropCapture'
-    | 'onMouseDown'
-    | 'onMouseDownCapture'
-    | 'onMouseEnter'
-    | 'onMouseLeave'
-    | 'onMouseMove'
-    | 'onMouseMoveCapture'
-    | 'onMouseOut'
-    | 'onMouseOutCapture'
-    | 'onMouseOver'
-    | 'onMouseOverCapture'
-    | 'onMouseUp'
-    | 'onMouseUpCapture'
-    | 'onSelect'
-    | 'onSelectCapture'
-    | 'onTouchCancel'
-    | 'onTouchCancelCapture'
-    | 'onTouchEnd'
-    | 'onTouchEndCapture'
-    | 'onTouchMove'
-    | 'onTouchMoveCapture'
-    | 'onTouchStart'
-    | 'onTouchStartCapture'
-    | 'onPointerDown'
-    | 'onPointerDownCapture'
-    | 'onPointerMove'
-    | 'onPointerMoveCapture'
-    | 'onPointerUp'
-    | 'onPointerUpCapture'
-    | 'onPointerCancel'
-    | 'onPointerCancelCapture'
-    | 'onPointerEnter'
-    | 'onPointerEnterCapture'
-    | 'onPointerLeave'
-    | 'onPointerLeaveCapture'
-    | 'onPointerOver'
-    | 'onPointerOverCapture'
-    | 'onPointerOut'
-    | 'onPointerOutCapture'
-    | 'onGotPointerCapture'
-    | 'onGotPointerCaptureCapture'
-    | 'onLostPointerCapture'
-    | 'onLostPointerCaptureCapture'
-    | 'onScroll'
-    | 'onScrollCapture'
-    | 'onWheel'
-    | 'onWheelCapture'
-    | 'onAnimationStart'
-    | 'onAnimationStartCapture'
-    | 'onAnimationEnd'
-    | 'onAnimationEndCapture'
-    | 'onAnimationIteration'
-    | 'onAnimationIterationCapture'
-    | 'onTransitionEnd'
-    | 'onTransitionEndCapture'
-    | 'component'
-    | 'variant'
-    | 'innerRef'
-    | 'download'
-    | 'href'
-    | 'hrefLang'
-    | 'ping'
-    | 'rel'
-    | 'target'
-    | 'type'
-    | 'referrerPolicy'
-    | 'noWrap'
-    | 'gutterBottom'
-    | 'paragraph'
-    | 'align'
-    | 'variantMapping'
-    | 'to'
-    | 'state'
-    | 'TypographyClasses'
-  > &
-    React_2.RefAttributes<any>
->;
+// Warning: (ae-missing-release-tag) "LinkType" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
+// @public (undocumented)
+export function Link(props: LinkProps): JSX.Element;
 
+// Warning: (ae-missing-release-tag) "LinkProps" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export type LinkProps = LinkProps_2 &
   LinkProps_3 & {
     component?: ElementType<any>;
   };
 
+// Warning: (ae-forgotten-export) The symbol "Props" needs to be exported by the entry point index.d.ts
+// Warning: (ae-missing-release-tag) "MarkdownContent" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public
-export const MarkdownContent: ({ content, dialect }: Props_11) => JSX.Element;
+export function MarkdownContent(props: Props_11): JSX.Element;
 
+// Warning: (ae-forgotten-export) The symbol "Props" needs to be exported by the entry point index.d.ts
+// Warning: (ae-missing-release-tag) "MissingAnnotationEmptyState" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
-export const MissingAnnotationEmptyState: ({
-  annotation,
-}: Props_6) => JSX.Element;
+export function MissingAnnotationEmptyState(props: Props_6): JSX.Element;
 
+// Warning: (ae-missing-release-tag) "OAuthRequestDialog" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
-export const OAuthRequestDialog: () => JSX.Element;
+export function OAuthRequestDialog(_props: {}): JSX.Element;
 
+// Warning: (ae-forgotten-export) The symbol "Props" needs to be exported by the entry point index.d.ts
+// Warning: (ae-missing-release-tag) "OverflowTooltip" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
-export const OverflowTooltip: (props: Props_12) => JSX.Element;
+export function OverflowTooltip(props: Props_12): JSX.Element;
 
+// Warning: (ae-forgotten-export) The symbol "Props" needs to be exported by the entry point index.d.ts
+// Warning: (ae-missing-release-tag) "Page" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
-export const Page: ({
-  themeId,
-  children,
-}: PropsWithChildren<Props_21>) => JSX.Element;
+export function Page(props: PropsWithChildren<Props_20>): JSX.Element;
 
+// Warning: (ae-forgotten-export) The symbol "PageWithHeaderProps" needs to be exported by the entry point index.d.ts
+// Warning: (ae-missing-release-tag) "PageWithHeader" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
-export const Progress: (
+export function PageWithHeader(
+  props: PropsWithChildren<PageWithHeaderProps>,
+): JSX.Element;
+
+// Warning: (ae-missing-release-tag) "Progress" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
+// @public (undocumented)
+export function Progress(
   props: PropsWithChildren<LinearProgressProps>,
-) => JSX.Element;
+): JSX.Element;
 
+// Warning: (ae-missing-release-tag) "Ranker" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 enum Ranker {
   // (undocumented)
@@ -1049,54 +535,60 @@ enum Ranker {
   TIGHT_TREE = 'tight-tree',
 }
 
+// Warning: (ae-missing-release-tag) "RenderLabelFunction" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 type RenderLabelFunction = (props: RenderLabelProps<any>) => React.ReactNode;
 
+// Warning: (ae-missing-release-tag) "RenderLabelProps" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 type RenderLabelProps<T = CustomType> = {
   edge: DependencyEdge<T>;
 };
 
+// Warning: (ae-missing-release-tag) "RenderNodeFunction" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 type RenderNodeFunction = (props: RenderNodeProps<any>) => React.ReactNode;
 
+// Warning: (ae-missing-release-tag) "RenderNodeProps" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 type RenderNodeProps<T = CustomType> = {
   node: DependencyNode<T>;
 };
 
+// Warning: (ae-missing-release-tag) "ResponseErrorPanel" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public
-export const ResponseErrorPanel: ({
-  title,
-  error,
-  defaultExpanded,
-}: ErrorPanelProps) => JSX.Element;
+export function ResponseErrorPanel(props: ErrorPanelProps): JSX.Element;
 
+// Warning: (ae-missing-release-tag) "RoutedTabs" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
-export const RoutedTabs: ({ routes }: { routes: SubRoute_2[] }) => JSX.Element;
+export function RoutedTabs(props: { routes: SubRoute_2[] }): JSX.Element;
 
+// Warning: (ae-forgotten-export) The symbol "SelectProps" needs to be exported by the entry point index.d.ts
+// Warning: (ae-missing-release-tag) "SelectComponent" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
-export const Select: ({
-  multiple,
-  items,
-  label,
-  placeholder,
-  selected,
-  onChange,
-  triggerReset,
-}: SelectProps) => JSX.Element;
+export function Select(props: SelectProps): JSX.Element;
 
+// Warning: (ae-forgotten-export) The symbol "Props" needs to be exported by the entry point index.d.ts
+// Warning: (ae-missing-release-tag) "Sidebar" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
-export const Sidebar: ({
-  openDelayMs,
-  closeDelayMs,
-  children,
-}: PropsWithChildren<Props_22>) => JSX.Element;
+export function Sidebar(props: PropsWithChildren<Props_21>): JSX.Element;
 
+// Warning: (ae-missing-release-tag) "SIDEBAR_INTRO_LOCAL_STORAGE" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export const SIDEBAR_INTRO_LOCAL_STORAGE =
   '@backstage/core/sidebar-intro-dismissed';
 
+// Warning: (ae-missing-release-tag) "sidebarConfig" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export const sidebarConfig: {
   drawerWidthClosed: number;
@@ -1113,14 +605,20 @@ export const sidebarConfig: {
   userBadgeDiameter: number;
 };
 
+// Warning: (ae-missing-release-tag) "SidebarContext" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export const SidebarContext: Context<SidebarContextType>;
 
+// Warning: (ae-missing-release-tag) "SidebarContextType" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export type SidebarContextType = {
   isOpen: boolean;
 };
 
+// Warning: (ae-missing-release-tag) "SidebarDivider" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export const SidebarDivider: React_2.ComponentType<
   Pick<
@@ -1388,26 +886,39 @@ export const SidebarDivider: React_2.ComponentType<
     }
 >;
 
+// Warning: (ae-missing-release-tag) "SidebarIntro" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
-export const SidebarIntro: () => JSX.Element | null;
+export function SidebarIntro(_props: {}): JSX.Element | null;
 
+// Warning: (ae-forgotten-export) The symbol "SidebarItemProps" needs to be exported by the entry point index.d.ts
+// Warning: (ae-missing-release-tag) "SidebarItem" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export const SidebarItem: React_2.ForwardRefExoticComponent<
   SidebarItemProps & React_2.RefAttributes<any>
 >;
 
+// Warning: (ae-missing-release-tag) "SidebarPage" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
-export const SidebarPage: (props: PropsWithChildren<{}>) => JSX.Element;
+export function SidebarPage(props: PropsWithChildren<{}>): JSX.Element;
 
+// Warning: (ae-missing-release-tag) "SidebarPinStateContext" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export const SidebarPinStateContext: React_2.Context<SidebarPinStateContextType>;
 
+// Warning: (ae-missing-release-tag) "SidebarPinStateContextType" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export type SidebarPinStateContextType = {
   isPinned: boolean;
   toggleSidebarPinState: () => any;
 };
 
+// Warning: (ae-missing-release-tag) "SidebarScrollWrapper" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export const SidebarScrollWrapper: React_2.ComponentType<
   Pick<
@@ -1675,11 +1186,14 @@ export const SidebarScrollWrapper: React_2.ComponentType<
     }
 >;
 
+// Warning: (ae-forgotten-export) The symbol "SidebarSearchFieldProps" needs to be exported by the entry point index.d.ts
+// Warning: (ae-missing-release-tag) "SidebarSearchField" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
-export const SidebarSearchField: (
-  props: SidebarSearchFieldProps,
-) => JSX.Element;
+export function SidebarSearchField(props: SidebarSearchFieldProps): JSX.Element;
 
+// Warning: (ae-missing-release-tag) "SidebarSpace" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export const SidebarSpace: React_2.ComponentType<
   Pick<
@@ -1947,6 +1461,8 @@ export const SidebarSpace: React_2.ComponentType<
     }
 >;
 
+// Warning: (ae-missing-release-tag) "SidebarSpacer" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export const SidebarSpacer: React_2.ComponentType<
   Pick<
@@ -2214,9 +1730,14 @@ export const SidebarSpacer: React_2.ComponentType<
     }
 >;
 
+// Warning: (ae-forgotten-export) The symbol "Props" needs to be exported by the entry point index.d.ts
+// Warning: (ae-missing-release-tag) "SignInPage" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
-export const SignInPage: (props: Props_23) => JSX.Element;
+export function SignInPage(props: Props_22): JSX.Element;
 
+// Warning: (ae-missing-release-tag) "SignInProviderConfig" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export type SignInProviderConfig = {
   id: string;
@@ -2225,66 +1746,80 @@ export type SignInProviderConfig = {
   apiRef: ApiRef<ProfileInfoApi & BackstageIdentityApi & SessionApi>;
 };
 
+// Warning: (ae-forgotten-export) The symbol "StepperProps" needs to be exported by the entry point index.d.ts
+// Warning: (ae-missing-release-tag) "SimpleStepper" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
-export const SimpleStepper: ({
-  children,
-  elevated,
-  onStepChange,
-  activeStep,
-}: PropsWithChildren<StepperProps>) => JSX.Element;
+export function SimpleStepper(
+  props: PropsWithChildren<StepperProps>,
+): JSX.Element;
 
+// Warning: (ae-forgotten-export) The symbol "StepProps" needs to be exported by the entry point index.d.ts
+// Warning: (ae-missing-release-tag) "SimpleStepperStep" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
-export const SimpleStepperStep: ({
-  title,
-  children,
-  end,
-  actions,
-  ...muiProps
-}: PropsWithChildren<StepProps>) => JSX.Element;
+export function SimpleStepperStep(
+  props: PropsWithChildren<StepProps>,
+): JSX.Element;
 
+// Warning: (ae-missing-release-tag) "StatusAborted" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
-export const StatusAborted: (props: PropsWithChildren<{}>) => JSX.Element;
+export function StatusAborted(props: PropsWithChildren<{}>): JSX.Element;
 
+// Warning: (ae-missing-release-tag) "StatusError" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
-export const StatusError: (props: PropsWithChildren<{}>) => JSX.Element;
+export function StatusError(props: PropsWithChildren<{}>): JSX.Element;
 
+// Warning: (ae-missing-release-tag) "StatusOK" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
-export const StatusOK: (props: PropsWithChildren<{}>) => JSX.Element;
+export function StatusOK(props: PropsWithChildren<{}>): JSX.Element;
 
+// Warning: (ae-missing-release-tag) "StatusPending" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
-export const StatusPending: (props: PropsWithChildren<{}>) => JSX.Element;
+export function StatusPending(props: PropsWithChildren<{}>): JSX.Element;
 
+// Warning: (ae-missing-release-tag) "StatusRunning" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
-export const StatusRunning: (props: PropsWithChildren<{}>) => JSX.Element;
+export function StatusRunning(props: PropsWithChildren<{}>): JSX.Element;
 
+// Warning: (ae-missing-release-tag) "StatusWarning" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
-export const StatusWarning: (props: PropsWithChildren<{}>) => JSX.Element;
+export function StatusWarning(props: PropsWithChildren<{}>): JSX.Element;
 
+// Warning: (ae-forgotten-export) The symbol "Props" needs to be exported by the entry point index.d.ts
+// Warning: (ae-missing-release-tag) "StructuredMetadataTable" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
-export const StructuredMetadataTable: ({
-  metadata,
-  dense,
-  options,
-}: Props_16) => JSX.Element;
+export function StructuredMetadataTable(props: Props_16): JSX.Element;
 
+// Warning: (ae-forgotten-export) The symbol "SubvalueCellProps" needs to be exported by the entry point index.d.ts
+// Warning: (ae-missing-release-tag) "SubvalueCell" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
-export const SubvalueCell: ({
-  value,
-  subvalue,
-}: SubvalueCellProps) => JSX.Element;
+export function SubvalueCell(props: SubvalueCellProps): JSX.Element;
 
+// Warning: (ae-forgotten-export) The symbol "SupportButtonProps" needs to be exported by the entry point index.d.ts
+// Warning: (ae-missing-release-tag) "SupportButton" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
-export const SupportButton: ({
-  title,
-  children,
-}: SupportButtonProps) => JSX.Element;
+export function SupportButton(props: SupportButtonProps): JSX.Element;
 
+// Warning: (ae-missing-release-tag) "SupportConfig" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export type SupportConfig = {
   url: string;
   items: SupportItem[];
 };
 
+// Warning: (ae-missing-release-tag) "SupportItem" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export type SupportItem = {
   title: string;
@@ -2292,12 +1827,16 @@ export type SupportItem = {
   links: SupportItemLink[];
 };
 
+// Warning: (ae-missing-release-tag) "SupportItemLink" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export type SupportItemLink = {
   url: string;
   title: string;
 };
 
+// Warning: (ae-missing-release-tag) "Tab" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export type Tab = {
   id: string;
@@ -2310,36 +1849,33 @@ export type Tab = {
   >;
 };
 
+// Warning: (ae-forgotten-export) The symbol "Props" needs to be exported by the entry point index.d.ts
+// Warning: (ae-missing-release-tag) "TabbedCard" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
-export const TabbedCard: ({
-  slackChannel,
-  errorBoundaryProps,
-  children,
-  title,
-  deepLink,
-  value,
-  onChange,
-}: PropsWithChildren<Props_24>) => JSX.Element;
+export function TabbedCard(props: PropsWithChildren<Props_23>): JSX.Element;
 
+// Warning: (ae-missing-release-tag) "TabbedLayout" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+// Warning: (ae-missing-release-tag) "TabbedLayout" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public
-export const TabbedLayout: {
-  ({ children }: PropsWithChildren<{}>): JSX.Element;
-  Route: (props: SubRoute) => null;
-};
+export function TabbedLayout(props: PropsWithChildren<{}>): JSX.Element;
 
 // @public (undocumented)
-export function Table<T extends object = {}>({
-  columns,
-  options,
-  title,
-  subtitle,
-  filters,
-  initialState,
-  emptyContent,
-  onStateChange,
-  ...props
-}: TableProps<T>): JSX.Element;
+export namespace TabbedLayout {
+  var // Warning: (ae-forgotten-export) The symbol "SubRoute" needs to be exported by the entry point index.d.ts
+    //
+    // (undocumented)
+    Route: (props: SubRoute) => null;
+}
 
+// Warning: (ae-missing-release-tag) "Table" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
+// @public (undocumented)
+export function Table<T extends object = {}>(props: TableProps<T>): JSX.Element;
+
+// Warning: (ae-missing-release-tag) "TableColumn" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export interface TableColumn<T extends object = {}> extends Column<T> {
   // (undocumented)
@@ -2348,12 +1884,16 @@ export interface TableColumn<T extends object = {}> extends Column<T> {
   width?: string;
 }
 
+// Warning: (ae-missing-release-tag) "TableFilter" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export type TableFilter = {
   column: string;
   type: 'select' | 'multiple-select' | 'checkbox-tree';
 };
 
+// Warning: (ae-missing-release-tag) "TableProps" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export interface TableProps<T extends object = {}>
   extends MaterialTableProps<T> {
@@ -2371,6 +1911,8 @@ export interface TableProps<T extends object = {}>
   subtitle?: string;
 }
 
+// Warning: (ae-missing-release-tag) "TableState" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export type TableState = {
   search?: string;
@@ -2378,34 +1920,69 @@ export type TableState = {
   filters?: SelectedFilters;
 };
 
+// Warning: (ae-forgotten-export) The symbol "TabsProps" needs to be exported by the entry point index.d.ts
+// Warning: (ae-missing-release-tag) "Tabs" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
-export const Tabs: ({ tabs }: TabsProps) => JSX.Element;
+export function Tabs(props: TabsProps): JSX.Element;
 
+// Warning: (ae-missing-release-tag) "TrendLine" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
-export const TrendLine: (
+export function TrendLine(
   props: SparklinesProps &
     Pick<SparklinesLineProps, 'color'> & {
       title?: string;
     },
-) => JSX.Element | null;
+): JSX.Element | null;
 
+// Warning: (ae-forgotten-export) The symbol "SetQueryParams" needs to be exported by the entry point index.d.ts
+// Warning: (ae-missing-release-tag) "useQueryParamState" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export function useQueryParamState<T>(
   stateName: string,
   debounceTime?: number,
 ): [T | undefined, SetQueryParams<T>];
 
+// Warning: (ae-missing-release-tag) "UserIcon" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
-export const UserIcon: IconComponent;
+export function UserIcon(props: IconComponentProps): JSX.Element;
 
+// Warning: (ae-missing-release-tag) "useSupportConfig" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export function useSupportConfig(): SupportConfig;
 
+// Warning: (ae-missing-release-tag) "WarningIcon" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
-export const WarningIcon: IconComponent;
+export function WarningIcon(props: IconComponentProps): JSX.Element;
 
+// Warning: (tsdoc-param-tag-missing-hyphen) The @param block should be followed by a parameter name and then a hyphen
+// Warning: (tsdoc-param-tag-with-invalid-optional-name) The @param should not include a JSDoc-style optional name; it must not be enclosed in '[ ]' brackets.
+// Warning: (tsdoc-param-tag-with-invalid-type) The @param block should not include a JSDoc-style '{type}'
+// Warning: (tsdoc-param-tag-missing-hyphen) The @param block should be followed by a parameter name and then a hyphen
+// Warning: (tsdoc-param-tag-with-invalid-optional-name) The @param should not include a JSDoc-style optional name; it must not be enclosed in '[ ]' brackets.
+// Warning: (tsdoc-param-tag-with-invalid-type) The @param block should not include a JSDoc-style '{type}'
+// Warning: (tsdoc-param-tag-missing-hyphen) The @param block should be followed by a parameter name and then a hyphen
+// Warning: (tsdoc-param-tag-with-invalid-optional-name) The @param should not include a JSDoc-style optional name; it must not be enclosed in '[ ]' brackets.
+// Warning: (tsdoc-param-tag-with-invalid-type) The @param block should not include a JSDoc-style '{type}'
+// Warning: (tsdoc-param-tag-missing-hyphen) The @param block should be followed by a parameter name and then a hyphen
+// Warning: (tsdoc-param-tag-with-invalid-optional-name) The @param should not include a JSDoc-style optional name; it must not be enclosed in '[ ]' brackets.
+// Warning: (tsdoc-param-tag-with-invalid-type) The @param block should not include a JSDoc-style '{type}'
+// Warning: (ae-forgotten-export) The symbol "WarningProps" needs to be exported by the entry point index.d.ts
+// Warning: (ae-missing-release-tag) "WarningPanel" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public
-export const WarningPanel: (props: Props_17) => JSX.Element;
+export function WarningPanel(props: WarningProps): JSX.Element;
+
+// Warnings were encountered during analysis:
+//
+// src/components/TabbedLayout/RoutedTabs.d.ts:9:5 - (ae-forgotten-export) The symbol "SubRoute" needs to be exported by the entry point index.d.ts
+// src/components/Table/Table.d.ts:15:5 - (ae-forgotten-export) The symbol "SelectedFilters" needs to be exported by the entry point index.d.ts
+// src/layout/ErrorBoundary/ErrorBoundary.d.ts:7:5 - (ae-forgotten-export) The symbol "SlackChannel" needs to be exported by the entry point index.d.ts
 
 // (No @packageDocumentation comment for this package)
 ```
diff --git a/packages/core-components/package.json b/packages/core-components/package.json
index b9d514d074..7ac256ad30 100644
--- a/packages/core-components/package.json
+++ b/packages/core-components/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@backstage/core-components",
   "description": "Core components used by Backstage plugins and apps",
-  "version": "0.1.5",
+  "version": "0.4.1",
   "private": false,
   "publishConfig": {
     "access": "public",
@@ -29,17 +29,18 @@
     "clean": "backstage-cli clean"
   },
   "dependencies": {
-    "@backstage/config": "^0.1.5",
-    "@backstage/core-plugin-api": "^0.1.2",
-    "@backstage/errors": "^0.1.1",
-    "@backstage/theme": "^0.2.8",
-    "@material-ui/core": "^4.11.0",
+    "@backstage/config": "^0.1.9",
+    "@backstage/core-plugin-api": "^0.1.7",
+    "@backstage/errors": "^0.1.2",
+    "@backstage/theme": "^0.2.10",
+    "@material-table/core": "^3.1.0",
+    "@material-ui/core": "^4.12.2",
     "@material-ui/icons": "^4.9.1",
     "@material-ui/lab": "4.0.0-alpha.45",
     "@testing-library/react-hooks": "^3.4.2",
     "@types/dagre": "^0.7.44",
     "@types/prop-types": "^15.7.3",
-    "@types/react": "^16.9",
+    "@types/react": "*",
     "@types/react-sparklines": "^1.7.0",
     "@types/react-text-truncate": "^0.14.0",
     "classnames": "^2.2.6",
@@ -50,7 +51,6 @@
     "dagre": "^0.8.5",
     "immer": "^9.0.1",
     "lodash": "^4.17.15",
-    "material-table": "^1.69.1",
     "pluralize": "^8.0.0",
     "prop-types": "^15.7.2",
     "qs": "^6.9.4",
@@ -58,7 +58,7 @@
     "react": "^16.12.0",
     "react-dom": "^16.12.0",
     "react-helmet": "6.1.0",
-    "react-hook-form": "^6.15.4",
+    "react-hook-form": "^7.12.2",
     "react-markdown": "^5.0.2",
     "react-router": "6.0.0-beta.0",
     "react-router-dom": "6.0.0-beta.0",
@@ -70,20 +70,21 @@
     "zen-observable": "^0.8.15"
   },
   "devDependencies": {
-    "@backstage/core-app-api": "^0.1.4",
-    "@backstage/cli": "^0.7.3",
-    "@backstage/test-utils": "^0.1.13",
+    "@backstage/core-app-api": "^0.1.12",
+    "@backstage/cli": "^0.7.11",
+    "@backstage/test-utils": "^0.1.17",
     "@testing-library/jest-dom": "^5.10.1",
     "@testing-library/react": "^11.2.5",
     "@testing-library/user-event": "^13.1.8",
     "@types/classnames": "^2.2.9",
     "@types/d3-selection": "^2.0.0",
-    "@types/d3-shape": "^2.0.0",
+    "@types/d3-shape": "^3.0.1",
     "@types/d3-zoom": "^2.0.0",
     "@types/google-protobuf": "^3.7.2",
     "@types/jest": "^26.0.7",
     "@types/node": "^14.14.32",
     "@types/react-helmet": "^6.1.0",
+    "@types/react-syntax-highlighter": "^13.5.2",
     "@types/zen-observable": "^0.8.0"
   },
   "files": [
diff --git a/packages/core-components/src/components/AlertDisplay/AlertDisplay.tsx b/packages/core-components/src/components/AlertDisplay/AlertDisplay.tsx
index 495e2ea14c..f3e102d9a0 100644
--- a/packages/core-components/src/components/AlertDisplay/AlertDisplay.tsx
+++ b/packages/core-components/src/components/AlertDisplay/AlertDisplay.tsx
@@ -22,7 +22,7 @@ import { AlertMessage, useApi, alertApiRef } from '@backstage/core-plugin-api';
 import pluralize from 'pluralize';
 
 // TODO: improve on this and promote to a shared component for use by all apps.
-export const AlertDisplay = () => {
+export function AlertDisplay(_props: {}) {
   const [messages, setMessages] = useState<Array<AlertMessage>>([]);
   const alertApi = useApi(alertApiRef);
 
@@ -73,4 +73,4 @@ export const AlertDisplay = () => {
       </Alert>
     </Snackbar>
   );
-};
+}
diff --git a/packages/core-components/src/components/Avatar/Avatar.tsx b/packages/core-components/src/components/Avatar/Avatar.tsx
index df3c46fba7..f694365233 100644
--- a/packages/core-components/src/components/Avatar/Avatar.tsx
+++ b/packages/core-components/src/components/Avatar/Avatar.tsx
@@ -41,7 +41,8 @@ export type AvatarProps = {
   customStyles?: CSSProperties;
 };
 
-export const Avatar = ({ displayName, picture, customStyles }: AvatarProps) => {
+export function Avatar(props: AvatarProps) {
+  const { displayName, picture, customStyles } = props;
   const classes = useStyles();
   return (
     <MaterialAvatar
@@ -56,4 +57,4 @@ export const Avatar = ({ displayName, picture, customStyles }: AvatarProps) => {
       {displayName && extractInitials(displayName)}
     </MaterialAvatar>
   );
-};
+}
diff --git a/packages/core-components/src/components/Button/Button.stories.tsx b/packages/core-components/src/components/Button/Button.stories.tsx
index 28deb1ad33..3451a77765 100644
--- a/packages/core-components/src/components/Button/Button.stories.tsx
+++ b/packages/core-components/src/components/Button/Button.stories.tsx
@@ -15,7 +15,7 @@
  */
 import React, { ComponentType } from 'react';
 import { Button } from './Button';
-import { MemoryRouter, useLocation } from 'react-router-dom';
+import { useLocation } from 'react-router-dom';
 import { createRouteRef, useRouteRef } from '@backstage/core-plugin-api';
 import {
   Divider,
@@ -26,11 +26,7 @@ import {
   Typography,
   Button as MaterialButton,
 } from '@material-ui/core';
-// We don't want to export RoutingProvider from core-app-api, but it's way easier to
-// use here. This hack only works in storybook stories.
-// TODO: Export a nicer to user routing provider, perhaps from test-utils
-// eslint-disable-next-line monorepo/no-internal-import
-import { RoutingProvider } from '@backstage/core-app-api/src/routing/RoutingProvider';
+import { wrapInTestApp } from '@backstage/test-utils';
 
 const routeRef = createRouteRef({
   id: 'storybook.test-route',
@@ -45,36 +41,29 @@ export default {
   title: 'Inputs/Button',
   component: Button,
   decorators: [
-    (Story: ComponentType<{}>) => (
-      <>
-        <Typography>
-          A collection of buttons that should be used in the Backstage
-          interface. These leverage the properties inherited from{' '}
-          <Link href="https://material-ui.com/components/buttons/">
-            Material-UI Button
-          </Link>
-          , but include an opinionated set that align to the Backstage design.
-        </Typography>
+    (Story: ComponentType<{}>) =>
+      wrapInTestApp(
+        <>
+          <Typography>
+            A collection of buttons that should be used in the Backstage
+            interface. These leverage the properties inherited from{' '}
+            <Link href="https://material-ui.com/components/buttons/">
+              Material-UI Button
+            </Link>
+            , but include an opinionated set that align to the Backstage design.
+          </Typography>
 
-        <Divider />
+          <Divider />
 
-        <MemoryRouter>
-          <RoutingProvider
-            routeBindings={new Map()}
-            routeObjects={[]}
-            routeParents={new Map()}
-            routePaths={new Map([[routeRef, '/hello']])}
-          >
+          <div>
             <div>
-              <div>
-                <Location />
-              </div>
-              <Story />
+              <Location />
             </div>
-          </RoutingProvider>
-        </MemoryRouter>
-      </>
-    ),
+            <Story />
+          </div>
+        </>,
+        { mountedRoutes: { '/hello': routeRef } },
+      ),
   ],
 };
 
diff --git a/packages/core-components/src/components/Button/Button.tsx b/packages/core-components/src/components/Button/Button.tsx
index 6dd593d776..e52285312b 100644
--- a/packages/core-components/src/components/Button/Button.tsx
+++ b/packages/core-components/src/components/Button/Button.tsx
@@ -23,10 +23,19 @@ import { Link, LinkProps } from '../Link';
 
 type Props = MaterialButtonProps & Omit<LinkProps, 'variant' | 'color'>;
 
+declare function ButtonType(props: Props): JSX.Element;
+
 /**
  * Thin wrapper on top of material-ui's Button component
  * Makes the Button to utilise react-router
  */
-export const Button = React.forwardRef<any, Props>((props, ref) => (
+const ActualButton = React.forwardRef<any, Props>((props, ref) => (
   <MaterialButton ref={ref} component={Link} {...props} />
-));
+)) as { (props: Props): JSX.Element };
+
+// TODO(Rugvip): We use this as a workaround to make the exported type be a
+//               function, which makes our API reference docs much nicer.
+//               The first type to be exported gets priority, but it will
+//               be thrown away when compiling to JS.
+// @ts-ignore
+export { ButtonType as Button, ActualButton as Button };
diff --git a/packages/core-components/src/components/CheckboxTree/CheckboxTree.tsx b/packages/core-components/src/components/CheckboxTree/CheckboxTree.tsx
index 7e7155143b..695da88192 100644
--- a/packages/core-components/src/components/CheckboxTree/CheckboxTree.tsx
+++ b/packages/core-components/src/components/CheckboxTree/CheckboxTree.tsx
@@ -225,13 +225,8 @@ const indexer = (
     };
   }, {});
 
-export const CheckboxTree = ({
-  subCategories,
-  label,
-  selected,
-  onChange,
-  triggerReset,
-}: CheckboxTreeProps) => {
+export function CheckboxTree(props: CheckboxTreeProps) {
+  const { subCategories, label, selected, onChange, triggerReset } = props;
   const classes = useStyles();
 
   const [state, dispatch] = useReducer(reducer, indexer(subCategories));
@@ -355,4 +350,4 @@ export const CheckboxTree = ({
       </List>
     </div>
   );
-};
+}
diff --git a/packages/core-components/src/components/CodeSnippet/CodeSnippet.test.tsx b/packages/core-components/src/components/CodeSnippet/CodeSnippet.test.tsx
index 298a8d5780..a4ffd3462b 100644
--- a/packages/core-components/src/components/CodeSnippet/CodeSnippet.test.tsx
+++ b/packages/core-components/src/components/CodeSnippet/CodeSnippet.test.tsx
@@ -15,8 +15,6 @@
  */
 
 import React from 'react';
-import { fireEvent } from '@testing-library/react';
-import { act } from 'react-dom/test-utils';
 import { renderInTestApp } from '@backstage/test-utils';
 
 import { CodeSnippet } from './CodeSnippet';
@@ -56,19 +54,4 @@ describe('<CodeSnippet />', () => {
     expect(getByText('2')).toBeInTheDocument();
     expect(getByText('3')).toBeInTheDocument();
   });
-
-  it('copy code using button', async () => {
-    jest.useFakeTimers();
-    document.execCommand = jest.fn();
-    const { getByTitle } = await renderInTestApp(
-      <CodeSnippet {...minProps} showCopyCodeButton />,
-    );
-    const button = getByTitle('Text copied to clipboard');
-    fireEvent.click(button);
-    act(() => {
-      jest.runAllTimers();
-    });
-    expect(document.execCommand).toHaveBeenCalled();
-    jest.useRealTimers();
-  });
 });
diff --git a/packages/core-components/src/components/CodeSnippet/CodeSnippet.tsx b/packages/core-components/src/components/CodeSnippet/CodeSnippet.tsx
index a3badaad07..6417151ff4 100644
--- a/packages/core-components/src/components/CodeSnippet/CodeSnippet.tsx
+++ b/packages/core-components/src/components/CodeSnippet/CodeSnippet.tsx
@@ -30,14 +30,15 @@ type Props = {
   customStyle?: any;
 };
 
-export const CodeSnippet = ({
-  text,
-  language,
-  showLineNumbers = false,
-  showCopyCodeButton = false,
-  highlightedNumbers,
-  customStyle,
-}: Props) => {
+export const CodeSnippet = (props: Props) => {
+  const {
+    text,
+    language,
+    showLineNumbers = false,
+    showCopyCodeButton = false,
+    highlightedNumbers,
+    customStyle,
+  } = props;
   const theme = useTheme<BackstageTheme>();
   const mode = theme.palette.type === 'dark' ? dark : docco;
   const highlightColor = theme.palette.type === 'dark' ? '#256bf3' : '#e6ffed';
diff --git a/packages/core-components/src/components/CopyTextButton/CopyTextButton.test.tsx b/packages/core-components/src/components/CopyTextButton/CopyTextButton.test.tsx
index acd0fa809c..b84d3919e8 100644
--- a/packages/core-components/src/components/CopyTextButton/CopyTextButton.test.tsx
+++ b/packages/core-components/src/components/CopyTextButton/CopyTextButton.test.tsx
@@ -19,8 +19,9 @@ import { fireEvent } from '@testing-library/react';
 import { act } from 'react-dom/test-utils';
 import { renderInTestApp } from '@backstage/test-utils';
 import { CopyTextButton } from './CopyTextButton';
-import { ApiRegistry, ApiProvider } from '@backstage/core-app-api';
+import { ApiProvider, ApiRegistry } from '@backstage/core-app-api';
 import { errorApiRef, ErrorApi } from '@backstage/core-plugin-api';
+import { useCopyToClipboard } from 'react-use';
 
 jest.mock('popper.js', () => {
   const PopperJS = jest.requireActual('popper.js');
@@ -33,6 +34,17 @@ jest.mock('popper.js', () => {
   };
 });
 
+jest.mock('react-use', () => {
+  const original = jest.requireActual('react-use');
+
+  return {
+    ...original,
+    useCopyToClipboard: jest
+      .fn()
+      .mockImplementation(original.useCopyToClipboard),
+  };
+});
+
 const props = {
   text: 'mockText',
   tooltipDelay: 2,
@@ -43,9 +55,7 @@ const apiRegistry = ApiRegistry.from([
   [
     errorApiRef,
     {
-      post(error) {
-        throw error;
-      },
+      post: jest.fn(),
       error$: jest.fn(),
     } as ErrorApi,
   ],
@@ -53,17 +63,22 @@ const apiRegistry = ApiRegistry.from([
 
 describe('<CopyTextButton />', () => {
   it('renders without exploding', async () => {
-    const { getByDisplayValue } = await renderInTestApp(
+    const { getByTitle, queryByText } = await renderInTestApp(
       <ApiProvider apis={apiRegistry}>
         <CopyTextButton {...props} />
       </ApiProvider>,
     );
-    getByDisplayValue('mockText');
+    expect(getByTitle('mockTooltip')).toBeInTheDocument();
+    expect(queryByText('mockTooltip')).not.toBeInTheDocument();
   });
 
-  it('displays tooltip on click', async () => {
+  it('displays tooltip and copy the text on click', async () => {
     jest.useFakeTimers();
-    document.execCommand = jest.fn();
+
+    const spy = useCopyToClipboard as jest.Mock;
+    const copy = jest.fn();
+    spy.mockReturnValue([{}, copy]);
+
     const rendered = await renderInTestApp(
       <ApiProvider apis={apiRegistry}>
         <CopyTextButton {...props} />
@@ -74,8 +89,22 @@ describe('<CopyTextButton />', () => {
     act(() => {
       jest.runAllTimers();
     });
-    expect(document.execCommand).toHaveBeenCalled();
+    expect(copy).toHaveBeenCalledWith('mockText');
     rendered.getByText('mockTooltip');
     jest.useRealTimers();
   });
+
+  it('reports copy errors', async () => {
+    const spy = useCopyToClipboard as jest.Mock;
+
+    const error = new Error('just an error');
+    spy.mockReturnValue([{ error }, jest.fn()]);
+
+    await renderInTestApp(
+      <ApiProvider apis={apiRegistry}>
+        <CopyTextButton {...props} />
+      </ApiProvider>,
+    );
+    expect(apiRegistry.get(errorApiRef)?.post).toHaveBeenCalledWith(error);
+  });
 });
diff --git a/packages/core-components/src/components/CopyTextButton/CopyTextButton.tsx b/packages/core-components/src/components/CopyTextButton/CopyTextButton.tsx
index b5bc516d1a..2d3afff1dc 100644
--- a/packages/core-components/src/components/CopyTextButton/CopyTextButton.tsx
+++ b/packages/core-components/src/components/CopyTextButton/CopyTextButton.tsx
@@ -18,7 +18,8 @@ import { errorApiRef, useApi } from '@backstage/core-plugin-api';
 import { IconButton, Tooltip } from '@material-ui/core';
 import CopyIcon from '@material-ui/icons/FileCopy';
 import PropTypes from 'prop-types';
-import React, { MouseEventHandler, useRef, useState } from 'react';
+import React, { MouseEventHandler, useEffect, useState } from 'react';
+import { useCopyToClipboard } from 'react-use';
 
 /**
  * Copy text button with visual feedback in the form of
@@ -46,36 +47,29 @@ const defaultProps = {
   tooltipText: 'Text copied to clipboard',
 };
 
-export const CopyTextButton = (props: Props) => {
+export function CopyTextButton(props: Props) {
   const { text, tooltipDelay, tooltipText } = {
     ...defaultProps,
     ...props,
   };
   const errorApi = useApi(errorApiRef);
-  const inputRef = useRef<HTMLTextAreaElement>(null);
   const [open, setOpen] = useState(false);
+  const [{ error }, copyToClipboard] = useCopyToClipboard();
+
+  useEffect(() => {
+    if (error) {
+      errorApi.post(error);
+    }
+  }, [error, errorApi]);
 
   const handleCopyClick: MouseEventHandler = e => {
     e.stopPropagation();
     setOpen(true);
-
-    try {
-      if (inputRef.current) {
-        inputRef.current.select();
-        document.execCommand('copy');
-      }
-    } catch (error) {
-      errorApi.post(error);
-    }
+    copyToClipboard(text);
   };
 
   return (
     <>
-      <textarea
-        ref={inputRef}
-        style={{ position: 'absolute', top: -9999, left: -9999 }}
-        defaultValue={text}
-      />
       <Tooltip
         id="copy-test-tooltip"
         title={tooltipText}
@@ -90,7 +84,7 @@ export const CopyTextButton = (props: Props) => {
       </Tooltip>
     </>
   );
-};
+}
 
 // Type check for the JS files using this core component
 CopyTextButton.propTypes = {
diff --git a/packages/core-components/src/components/CreateButton/CreateButton.tsx b/packages/core-components/src/components/CreateButton/CreateButton.tsx
new file mode 100644
index 0000000000..1ca4fdaa97
--- /dev/null
+++ b/packages/core-components/src/components/CreateButton/CreateButton.tsx
@@ -0,0 +1,52 @@
+/*
+ * Copyright 2021 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { BackstageTheme } from '@backstage/theme';
+import { Button, IconButton, useMediaQuery } from '@material-ui/core';
+import React from 'react';
+import { Link as RouterLink, LinkProps } from 'react-router-dom';
+import AddCircleOutline from '@material-ui/icons/AddCircleOutline';
+
+type CreateButtonProps = {
+  title: string;
+} & Partial<Pick<LinkProps, 'to'>>;
+
+export function CreateButton(props: CreateButtonProps) {
+  const { title, to } = props;
+  const isXSScreen = useMediaQuery<BackstageTheme>(theme =>
+    theme.breakpoints.down('xs'),
+  );
+
+  if (!to) {
+    return null;
+  }
+
+  return isXSScreen ? (
+    <IconButton
+      component={RouterLink}
+      color="primary"
+      title={title}
+      size="small"
+      to={to}
+    >
+      <AddCircleOutline />
+    </IconButton>
+  ) : (
+    <Button component={RouterLink} variant="contained" color="primary" to={to}>
+      {title}
+    </Button>
+  );
+}
diff --git a/plugins/catalog/src/components/CreateComponentButton/index.ts b/packages/core-components/src/components/CreateButton/index.ts
similarity index 90%
rename from plugins/catalog/src/components/CreateComponentButton/index.ts
rename to packages/core-components/src/components/CreateButton/index.ts
index e525bef782..f0e4cbe646 100644
--- a/plugins/catalog/src/components/CreateComponentButton/index.ts
+++ b/packages/core-components/src/components/CreateButton/index.ts
@@ -13,4 +13,5 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-export { CreateComponentButton } from './CreateComponentButton';
+
+export { CreateButton } from './CreateButton';
diff --git a/packages/core-components/src/components/DependencyGraph/DefaultNode.tsx b/packages/core-components/src/components/DependencyGraph/DefaultNode.tsx
index c93651e3e0..8feca43e9a 100644
--- a/packages/core-components/src/components/DependencyGraph/DefaultNode.tsx
+++ b/packages/core-components/src/components/DependencyGraph/DefaultNode.tsx
@@ -21,11 +21,11 @@ import { RenderNodeProps } from './types';
 
 const useStyles = makeStyles((theme: BackstageTheme) => ({
   node: {
-    fill: theme.palette.background.paper,
-    stroke: theme.palette.border,
+    fill: theme.palette.primary.light,
+    stroke: theme.palette.primary.light,
   },
   text: {
-    fill: theme.palette.textContrast,
+    fill: theme.palette.primary.contrastText,
   },
 }));
 
@@ -38,10 +38,8 @@ export function DefaultNode({ node: { id } }: RenderNodeProps) {
   React.useLayoutEffect(() => {
     // set the width to the length of the ID
     if (idRef.current) {
-      let {
-        height: renderedHeight,
-        width: renderedWidth,
-      } = idRef.current.getBBox();
+      let { height: renderedHeight, width: renderedWidth } =
+        idRef.current.getBBox();
       renderedHeight = Math.round(renderedHeight);
       renderedWidth = Math.round(renderedWidth);
 
diff --git a/packages/core-components/src/components/DependencyGraph/DependencyGraph.test.tsx b/packages/core-components/src/components/DependencyGraph/DependencyGraph.test.tsx
index 2020c2ba65..d1d0eac36e 100644
--- a/packages/core-components/src/components/DependencyGraph/DependencyGraph.test.tsx
+++ b/packages/core-components/src/components/DependencyGraph/DependencyGraph.test.tsx
@@ -49,6 +49,28 @@ describe('<DependencyGraph />', () => {
     expect(queryAllByTestId(LABEL_TEST_ID)).toHaveLength(0);
   });
 
+  it('update render if already referenced nodes are added later', async () => {
+    const { getByText, queryAllByTestId, findAllByTestId, rerender } = render(
+      <DependencyGraph nodes={nodes.slice(0, 2)} edges={edges} />,
+    );
+
+    let renderedNodes = await findAllByTestId(NODE_TEST_ID);
+    expect(renderedNodes).toHaveLength(2);
+    expect(getByText(nodes[0].id)).toBeInTheDocument();
+    expect(getByText(nodes[1].id)).toBeInTheDocument();
+    expect(queryAllByTestId(EDGE_TEST_ID)).toHaveLength(2);
+    expect(queryAllByTestId(LABEL_TEST_ID)).toHaveLength(0);
+
+    rerender(<DependencyGraph nodes={nodes} edges={edges} />);
+
+    renderedNodes = await findAllByTestId(NODE_TEST_ID);
+    expect(renderedNodes).toHaveLength(3);
+    expect(getByText(nodes[0].id)).toBeInTheDocument();
+    expect(getByText(nodes[1].id)).toBeInTheDocument();
+    expect(queryAllByTestId(EDGE_TEST_ID)).toHaveLength(2);
+    expect(queryAllByTestId(LABEL_TEST_ID)).toHaveLength(0);
+  });
+
   it('renders edge labels if present', async () => {
     const labeledEdges = [
       { ...edges[0], label: 'first' },
diff --git a/packages/core-components/src/components/DependencyGraph/DependencyGraph.tsx b/packages/core-components/src/components/DependencyGraph/DependencyGraph.tsx
index 89f7421d2a..0d74965e7e 100644
--- a/packages/core-components/src/components/DependencyGraph/DependencyGraph.tsx
+++ b/packages/core-components/src/components/DependencyGraph/DependencyGraph.tsx
@@ -60,27 +60,28 @@ export type DependencyGraphProps = React.SVGProps<SVGSVGElement> & {
 
 const WORKSPACE_ID = 'workspace';
 
-export function DependencyGraph({
-  edges,
-  nodes,
-  renderNode,
-  direction = Direction.TOP_BOTTOM,
-  align,
-  nodeMargin = 50,
-  edgeMargin = 10,
-  rankMargin = 50,
-  paddingX = 0,
-  paddingY = 0,
-  acyclicer,
-  ranker = Ranker.NETWORK_SIMPLEX,
-  labelPosition = LabelPosition.RIGHT,
-  labelOffset = 10,
-  edgeRanks = 1,
-  edgeWeight = 1,
-  renderLabel,
-  defs,
-  ...svgProps
-}: DependencyGraphProps) {
+export function DependencyGraph(props: DependencyGraphProps) {
+  const {
+    edges,
+    nodes,
+    renderNode,
+    direction = Direction.TOP_BOTTOM,
+    align,
+    nodeMargin = 50,
+    edgeMargin = 10,
+    rankMargin = 50,
+    paddingX = 0,
+    paddingY = 0,
+    acyclicer,
+    ranker = Ranker.NETWORK_SIMPLEX,
+    labelPosition = LabelPosition.RIGHT,
+    labelOffset = 10,
+    edgeRanks = 1,
+    edgeWeight = 1,
+    renderLabel,
+    defs,
+    ...svgProps
+  } = props;
   const theme: BackstageTheme = useTheme();
   const [containerWidth, setContainerWidth] = React.useState<number>(100);
   const [containerHeight, setContainerHeight] = React.useState<number>(100);
@@ -132,10 +133,8 @@ export function DependencyGraph({
 
         container.call(zoom);
 
-        const {
-          width: newContainerWidth,
-          height: newContainerHeight,
-        } = node.getBoundingClientRect();
+        const { width: newContainerWidth, height: newContainerHeight } =
+          node.getBoundingClientRect();
         if (containerWidth !== newContainerWidth) {
           setContainerWidth(newContainerWidth);
         }
@@ -173,7 +172,7 @@ export function DependencyGraph({
         .nodes()
         .find(nodeId => node.id === nodeId);
 
-      if (existingNode) {
+      if (existingNode && graph.current.node(existingNode)) {
         const { width, height, x, y } = graph.current.node(existingNode);
         graph.current.setNode(existingNode, { ...node, width, height, x, y });
       } else {
diff --git a/packages/core-components/src/components/DependencyGraph/Edge.tsx b/packages/core-components/src/components/DependencyGraph/Edge.tsx
index 4e4c5ca5f7..e0f19d3536 100644
--- a/packages/core-components/src/components/DependencyGraph/Edge.tsx
+++ b/packages/core-components/src/components/DependencyGraph/Edge.tsx
@@ -71,10 +71,8 @@ export function Edge({
   React.useLayoutEffect(() => {
     // set the label width to the actual rendered width to properly layout graph
     if (labelRef.current) {
-      let {
-        height: renderedHeight,
-        width: renderedWidth,
-      } = labelRef.current.getBBox();
+      let { height: renderedHeight, width: renderedWidth } =
+        labelRef.current.getBBox();
       renderedHeight = Math.round(renderedHeight);
       renderedWidth = Math.round(renderedWidth);
 
diff --git a/packages/core-components/src/components/DependencyGraph/Node.tsx b/packages/core-components/src/components/DependencyGraph/Node.tsx
index d9e8cbfb78..a5e1a62f09 100644
--- a/packages/core-components/src/components/DependencyGraph/Node.tsx
+++ b/packages/core-components/src/components/DependencyGraph/Node.tsx
@@ -46,10 +46,8 @@ export function Node({
   React.useLayoutEffect(() => {
     // set the node width to the actual rendered width to properly layout graph
     if (nodeRef.current) {
-      let {
-        height: renderedHeight,
-        width: renderedWidth,
-      } = nodeRef.current.getBBox();
+      let { height: renderedHeight, width: renderedWidth } =
+        nodeRef.current.getBBox();
       renderedHeight = Math.round(renderedHeight);
       renderedWidth = Math.round(renderedWidth);
 
diff --git a/packages/core-components/src/components/DismissableBanner/DismissableBanner.tsx b/packages/core-components/src/components/DismissableBanner/DismissableBanner.tsx
index 6c4e43811d..cc20a49ad6 100644
--- a/packages/core-components/src/components/DismissableBanner/DismissableBanner.tsx
+++ b/packages/core-components/src/components/DismissableBanner/DismissableBanner.tsx
@@ -70,12 +70,8 @@ type Props = {
   fixed?: boolean;
 };
 
-export const DismissableBanner = ({
-  variant,
-  message,
-  id,
-  fixed = false,
-}: Props) => {
+export const DismissableBanner = (props: Props) => {
+  const { variant, message, id, fixed = false } = props;
   const classes = useStyles();
   const storageApi = useApi(storageApiRef);
   const notificationsStore = storageApi.forBucket('notifications');
diff --git a/packages/core-components/src/components/EmptyState/EmptyState.tsx b/packages/core-components/src/components/EmptyState/EmptyState.tsx
index 1d8d5a798f..b2f5eca65e 100644
--- a/packages/core-components/src/components/EmptyState/EmptyState.tsx
+++ b/packages/core-components/src/components/EmptyState/EmptyState.tsx
@@ -38,26 +38,29 @@ type Props = {
   action?: JSX.Element;
 };
 
-export const EmptyState = ({ title, description, missing, action }: Props) => {
+export function EmptyState(props: Props) {
+  const { title, description, missing, action } = props;
   const classes = useStyles();
   return (
     <Grid
       container
       direction="row"
-      justify="space-around"
+      justifyContent="space-around"
       alignItems="flex-start"
       className={classes.root}
       spacing={2}
     >
-      <Grid item container direction="column" xs={12} md={6}>
-        <Grid item>
-          <Typography variant="h5">{title}</Typography>
-        </Grid>
-        <Grid item>
-          <Typography variant="body1">{description}</Typography>
-        </Grid>
-        <Grid item className={classes.action}>
-          {action}
+      <Grid item xs={12} md={6}>
+        <Grid container direction="column">
+          <Grid item xs>
+            <Typography variant="h5">{title}</Typography>
+          </Grid>
+          <Grid item xs>
+            <Typography variant="body1">{description}</Typography>
+          </Grid>
+          <Grid item xs className={classes.action}>
+            {action}
+          </Grid>
         </Grid>
       </Grid>
       <Grid item xs={12} md={6} className={classes.imageContainer}>
@@ -65,4 +68,4 @@ export const EmptyState = ({ title, description, missing, action }: Props) => {
       </Grid>
     </Grid>
   );
-};
+}
diff --git a/packages/core-components/src/components/EmptyState/EmptyStateImage.tsx b/packages/core-components/src/components/EmptyState/EmptyStateImage.tsx
index a76f0863f7..660e7fc947 100644
--- a/packages/core-components/src/components/EmptyState/EmptyStateImage.tsx
+++ b/packages/core-components/src/components/EmptyState/EmptyStateImage.tsx
@@ -29,7 +29,7 @@ const useStyles = makeStyles({
   generalImg: {
     width: '95%',
     zIndex: 2,
-    position: 'absolute',
+    position: 'relative',
     left: '50%',
     top: '50%',
     transform: 'translate(-50%, 15%)',
diff --git a/packages/core-components/src/components/EmptyState/MissingAnnotationEmptyState.tsx b/packages/core-components/src/components/EmptyState/MissingAnnotationEmptyState.tsx
index d477494964..17061fa237 100644
--- a/packages/core-components/src/components/EmptyState/MissingAnnotationEmptyState.tsx
+++ b/packages/core-components/src/components/EmptyState/MissingAnnotationEmptyState.tsx
@@ -45,7 +45,8 @@ const useStyles = makeStyles<BackstageTheme>(theme => ({
   },
 }));
 
-export const MissingAnnotationEmptyState = ({ annotation }: Props) => {
+export function MissingAnnotationEmptyState(props: Props) {
+  const { annotation } = props;
   const classes = useStyles();
   const description = (
     <>
@@ -84,4 +85,4 @@ export const MissingAnnotationEmptyState = ({ annotation }: Props) => {
       }
     />
   );
-};
+}
diff --git a/packages/core-components/src/components/ErrorPanel/ErrorPanel.tsx b/packages/core-components/src/components/ErrorPanel/ErrorPanel.tsx
index 14b5d50325..309f2b447a 100644
--- a/packages/core-components/src/components/ErrorPanel/ErrorPanel.tsx
+++ b/packages/core-components/src/components/ErrorPanel/ErrorPanel.tsx
@@ -92,14 +92,11 @@ export type ErrorPanelProps = {
 /**
  * Renders a warning panel as the effect of an error.
  */
-export const ErrorPanel = ({
-  title,
-  error,
-  defaultExpanded,
-  children,
-}: PropsWithChildren<ErrorPanelProps>) => {
+export function ErrorPanel(props: PropsWithChildren<ErrorPanelProps>) {
+  const { title, error, defaultExpanded, children } = props;
   return (
     <WarningPanel
+      severity="error"
       title={title ?? error.message}
       defaultExpanded={defaultExpanded}
     >
@@ -111,4 +108,4 @@ export const ErrorPanel = ({
       />
     </WarningPanel>
   );
-};
+}
diff --git a/packages/core-components/src/components/FeatureDiscovery/FeatureCalloutCircular.tsx b/packages/core-components/src/components/FeatureDiscovery/FeatureCalloutCircular.tsx
index 9af6c30c3b..9459c3cbe0 100644
--- a/packages/core-components/src/components/FeatureDiscovery/FeatureCalloutCircular.tsx
+++ b/packages/core-components/src/components/FeatureDiscovery/FeatureCalloutCircular.tsx
@@ -93,12 +93,8 @@ type Placement = {
   textWidth: number;
 };
 
-export const FeatureCalloutCircular = ({
-  featureId,
-  title,
-  description,
-  children,
-}: PropsWithChildren<Props>) => {
+export function FeatureCalloutCircular(props: PropsWithChildren<Props>) {
+  const { featureId, title, description, children } = props;
   const { show, hide } = useShowCallout(featureId);
   const portalElement = usePortal('core.callout');
   const wrapperRef = useRef<HTMLDivElement>(null);
@@ -196,4 +192,4 @@ export const FeatureCalloutCircular = ({
       )}
     </>
   );
-};
+}
diff --git a/packages/core-components/src/components/FeatureDiscovery/lib/useShowCallout.ts b/packages/core-components/src/components/FeatureDiscovery/lib/useShowCallout.ts
index 617f1324ed..a507d210a7 100644
--- a/packages/core-components/src/components/FeatureDiscovery/lib/useShowCallout.ts
+++ b/packages/core-components/src/components/FeatureDiscovery/lib/useShowCallout.ts
@@ -38,9 +38,10 @@ function useCalloutStates(): {
   return { states, setState };
 }
 
-function useCalloutHasBeenSeen(
-  featureId: string,
-): { seen: boolean | undefined; markSeen: () => void } {
+function useCalloutHasBeenSeen(featureId: string): {
+  seen: boolean | undefined;
+  markSeen: () => void;
+} {
   const { states, setState } = useCalloutStates();
 
   const markSeen = useCallback(() => {
@@ -50,9 +51,10 @@ function useCalloutHasBeenSeen(
   return { seen: states[featureId] === true, markSeen };
 }
 
-export function useShowCallout(
-  featureId: string,
-): { show: boolean; hide: () => void } {
+export function useShowCallout(featureId: string): {
+  show: boolean;
+  hide: () => void;
+} {
   const { seen, markSeen } = useCalloutHasBeenSeen(featureId);
   return { show: seen === false, hide: markSeen };
 }
diff --git a/packages/core-components/src/components/HeaderIconLinkRow/HeaderIconLinkRow.tsx b/packages/core-components/src/components/HeaderIconLinkRow/HeaderIconLinkRow.tsx
index afceda165e..7e49537492 100644
--- a/packages/core-components/src/components/HeaderIconLinkRow/HeaderIconLinkRow.tsx
+++ b/packages/core-components/src/components/HeaderIconLinkRow/HeaderIconLinkRow.tsx
@@ -31,7 +31,8 @@ type Props = {
   links: IconLinkVerticalProps[];
 };
 
-export const HeaderIconLinkRow = ({ links }: Props) => {
+export function HeaderIconLinkRow(props: Props) {
+  const { links } = props;
   const classes = useStyles();
   return (
     <nav className={classes.links}>
@@ -40,4 +41,4 @@ export const HeaderIconLinkRow = ({ links }: Props) => {
       ))}
     </nav>
   );
-};
+}
diff --git a/packages/core-components/src/components/HorizontalScrollGrid/HorizontalScrollGrid.tsx b/packages/core-components/src/components/HorizontalScrollGrid/HorizontalScrollGrid.tsx
index f5c45d3eb0..a3d16bc4ec 100644
--- a/packages/core-components/src/components/HorizontalScrollGrid/HorizontalScrollGrid.tsx
+++ b/packages/core-components/src/components/HorizontalScrollGrid/HorizontalScrollGrid.tsx
@@ -181,7 +181,7 @@ function useSmoothScroll(
   return setScrollTarget;
 }
 
-export const HorizontalScrollGrid = (props: PropsWithChildren<Props>) => {
+export function HorizontalScrollGrid(props: PropsWithChildren<Props>) {
   const {
     scrollStep = 100,
     scrollSpeed = 50,
@@ -244,4 +244,4 @@ export const HorizontalScrollGrid = (props: PropsWithChildren<Props>) => {
       )}
     </div>
   );
-};
+}
diff --git a/packages/core-components/src/components/Lifecycle/Lifecycle.tsx b/packages/core-components/src/components/Lifecycle/Lifecycle.tsx
index c72ea46f1b..ef451ac1b0 100644
--- a/packages/core-components/src/components/Lifecycle/Lifecycle.tsx
+++ b/packages/core-components/src/components/Lifecycle/Lifecycle.tsx
@@ -38,7 +38,7 @@ const useStyles = makeStyles({
   },
 });
 
-export const Lifecycle = (props: Props) => {
+export function Lifecycle(props: Props) {
   const classes = useStyles(props);
   const { shorthand, alpha } = props;
   return shorthand ? (
@@ -53,4 +53,4 @@ export const Lifecycle = (props: Props) => {
       {alpha ? 'Alpha' : 'Beta'}
     </span>
   );
-};
+}
diff --git a/packages/core-components/src/components/Link/Link.stories.tsx b/packages/core-components/src/components/Link/Link.stories.tsx
index 516a5adcff..d9944c1c51 100644
--- a/packages/core-components/src/components/Link/Link.stories.tsx
+++ b/packages/core-components/src/components/Link/Link.stories.tsx
@@ -15,17 +15,9 @@
  */
 import React, { ComponentType } from 'react';
 import { Link } from './Link';
-import {
-  MemoryRouter,
-  Route,
-  useLocation,
-  NavLink as RouterNavLink,
-} from 'react-router-dom';
+import { Route, useLocation, NavLink as RouterNavLink } from 'react-router-dom';
 import { createRouteRef, useRouteRef } from '@backstage/core-plugin-api';
-// We don't want to export RoutingProvider from core-app-api, but it's way easier to
-// use here. This hack only works in storybook stories.
-// eslint-disable-next-line monorepo/no-internal-import
-import { RoutingProvider } from '@backstage/core-app-api/src/routing/RoutingProvider';
+import { wrapInTestApp } from '@backstage/test-utils';
 
 const routeRef = createRouteRef({
   id: 'storybook.test-route',
@@ -40,23 +32,16 @@ export default {
   title: 'Navigation/Link',
   component: Link,
   decorators: [
-    (Story: ComponentType<{}>) => (
-      <MemoryRouter>
-        <RoutingProvider
-          routeBindings={new Map()}
-          routeObjects={[]}
-          routeParents={new Map()}
-          routePaths={new Map([[routeRef, '/hello']])}
-        >
+    (Story: ComponentType<{}>) =>
+      wrapInTestApp(
+        <div>
           <div>
-            <div>
-              <Location />
-            </div>
-            <Story />
+            <Location />
           </div>
-        </RoutingProvider>
-      </MemoryRouter>
-    ),
+          <Story />
+        </div>,
+        { mountedRoutes: { '/hello': routeRef } },
+      ),
   ],
 };
 
diff --git a/packages/core-components/src/components/Link/Link.tsx b/packages/core-components/src/components/Link/Link.tsx
index 7853c4f52f..0d301dccf9 100644
--- a/packages/core-components/src/components/Link/Link.tsx
+++ b/packages/core-components/src/components/Link/Link.tsx
@@ -31,11 +31,13 @@ export type LinkProps = MaterialLinkProps &
     component?: ElementType<any>;
   };
 
+declare function LinkType(props: LinkProps): JSX.Element;
+
 /**
  * Thin wrapper on top of material-ui's Link component
  * Makes the Link to utilise react-router
  */
-export const Link = React.forwardRef<any, LinkProps>((props, ref) => {
+const ActualLink = React.forwardRef<any, LinkProps>((props, ref) => {
   const to = String(props.to);
   const external = isExternalUri(to);
   const newWindow = external && !!/^https?:/.exec(to);
@@ -52,3 +54,10 @@ export const Link = React.forwardRef<any, LinkProps>((props, ref) => {
     <MaterialLink ref={ref} component={RouterLink} {...props} />
   );
 });
+
+// TODO(Rugvip): We use this as a workaround to make the exported type be a
+//               function, which makes our API reference docs much nicer.
+//               The first type to be exported gets priority, but it will
+//               be thrown away when compiling to JS.
+// @ts-ignore
+export { LinkType as Link, ActualLink as Link };
diff --git a/packages/core-components/src/components/MarkdownContent/MarkdownContent.tsx b/packages/core-components/src/components/MarkdownContent/MarkdownContent.tsx
index 296df22ecd..d2930cbf5d 100644
--- a/packages/core-components/src/components/MarkdownContent/MarkdownContent.tsx
+++ b/packages/core-components/src/components/MarkdownContent/MarkdownContent.tsx
@@ -76,7 +76,8 @@ const renderers = {
  * Renders markdown with the default dialect [gfm - GitHub flavored Markdown](https://github.github.com/gfm/) to backstage theme styled HTML.
  * If you just want to render to plain [CommonMark](https://commonmark.org/), set the dialect to `'common-mark'`
  */
-export const MarkdownContent = ({ content, dialect = 'gfm' }: Props) => {
+export function MarkdownContent(props: Props) {
+  const { content, dialect = 'gfm' } = props;
   const classes = useStyles();
   return (
     <ReactMarkdown
@@ -86,4 +87,4 @@ export const MarkdownContent = ({ content, dialect = 'gfm' }: Props) => {
       renderers={renderers}
     />
   );
-};
+}
diff --git a/packages/core-components/src/components/OAuthRequestDialog/LoginRequestListItem.tsx b/packages/core-components/src/components/OAuthRequestDialog/LoginRequestListItem.tsx
index e0102564fd..f9533d9d03 100644
--- a/packages/core-components/src/components/OAuthRequestDialog/LoginRequestListItem.tsx
+++ b/packages/core-components/src/components/OAuthRequestDialog/LoginRequestListItem.tsx
@@ -21,6 +21,7 @@ import {
   makeStyles,
   Typography,
   Theme,
+  Button,
 } from '@material-ui/core';
 import React, { useState } from 'react';
 import { PendingAuthRequest } from '@backstage/core-plugin-api';
@@ -55,12 +56,7 @@ const LoginRequestListItem = ({ request, busy, setBusy }: RowProps) => {
   const IconComponent = request.provider.icon;
 
   return (
-    <ListItem
-      button
-      disabled={busy}
-      onClick={handleContinue}
-      classes={{ root: classes.root }}
-    >
+    <ListItem button disabled={busy} classes={{ root: classes.root }}>
       <ListItemAvatar>
         <IconComponent fontSize="large" />
       </ListItemAvatar>
@@ -74,6 +70,9 @@ const LoginRequestListItem = ({ request, busy, setBusy }: RowProps) => {
           )
         }
       />
+      <Button color="primary" variant="contained" onClick={handleContinue}>
+        Log in
+      </Button>
     </ListItem>
   );
 };
diff --git a/packages/core-components/src/components/OAuthRequestDialog/OAuthRequestDialog.tsx b/packages/core-components/src/components/OAuthRequestDialog/OAuthRequestDialog.tsx
index 687e4211bf..e79d28c470 100644
--- a/packages/core-components/src/components/OAuthRequestDialog/OAuthRequestDialog.tsx
+++ b/packages/core-components/src/components/OAuthRequestDialog/OAuthRequestDialog.tsx
@@ -39,9 +39,12 @@ const useStyles = makeStyles<Theme>(theme => ({
   contentList: {
     padding: 0,
   },
+  actionButtons: {
+    padding: theme.spacing(2, 0),
+  },
 }));
 
-export const OAuthRequestDialog = () => {
+export function OAuthRequestDialog(_props: {}) {
   const classes = useStyles();
   const [busy, setBusy] = useState(false);
   const oauthRequestApi = useApi(oauthRequestApiRef);
@@ -65,7 +68,7 @@ export const OAuthRequestDialog = () => {
         Login Required
       </DialogTitle>
 
-      <DialogContent classes={{ root: classes.contentList }}>
+      <DialogContent dividers classes={{ root: classes.contentList }}>
         <List>
           {requests.map(request => (
             <LoginRequestListItem
@@ -78,9 +81,9 @@ export const OAuthRequestDialog = () => {
         </List>
       </DialogContent>
 
-      <DialogActions>
+      <DialogActions classes={{ root: classes.actionButtons }}>
         <Button onClick={handleRejectAll}>Reject All</Button>
       </DialogActions>
     </Dialog>
   );
-};
+}
diff --git a/packages/core-components/src/components/OverflowTooltip/OverflowTooltip.tsx b/packages/core-components/src/components/OverflowTooltip/OverflowTooltip.tsx
index 1be7ebc7ed..fbb1537847 100644
--- a/packages/core-components/src/components/OverflowTooltip/OverflowTooltip.tsx
+++ b/packages/core-components/src/components/OverflowTooltip/OverflowTooltip.tsx
@@ -32,7 +32,7 @@ const useStyles = makeStyles({
   },
 });
 
-export const OverflowTooltip = (props: Props) => {
+export function OverflowTooltip(props: Props) {
   const [hover, setHover] = useState(false);
   const classes = useStyles();
 
@@ -54,4 +54,4 @@ export const OverflowTooltip = (props: Props) => {
       />
     </Tooltip>
   );
-};
+}
diff --git a/packages/core-components/src/components/Progress/Progress.tsx b/packages/core-components/src/components/Progress/Progress.tsx
index 68dcb91785..00ad532b5e 100644
--- a/packages/core-components/src/components/Progress/Progress.tsx
+++ b/packages/core-components/src/components/Progress/Progress.tsx
@@ -17,7 +17,7 @@
 import React, { useState, useEffect, PropsWithChildren } from 'react';
 import { LinearProgress, LinearProgressProps } from '@material-ui/core';
 
-export const Progress = (props: PropsWithChildren<LinearProgressProps>) => {
+export function Progress(props: PropsWithChildren<LinearProgressProps>) {
   const [isVisible, setIsVisible] = useState(false);
 
   useEffect(() => {
@@ -30,4 +30,4 @@ export const Progress = (props: PropsWithChildren<LinearProgressProps>) => {
   ) : (
     <div style={{ display: 'none' }} />
   );
-};
+}
diff --git a/packages/core-components/src/components/ProgressBars/Gauge.tsx b/packages/core-components/src/components/ProgressBars/Gauge.tsx
index 46948d4af6..3b31f64fe7 100644
--- a/packages/core-components/src/components/ProgressBars/Gauge.tsx
+++ b/packages/core-components/src/components/ProgressBars/Gauge.tsx
@@ -77,7 +77,7 @@ export function getProgressColor(
   return palette.status.ok;
 }
 
-export const Gauge = (props: Props) => {
+export function Gauge(props: Props) {
   const classes = useStyles(props);
   const theme = useTheme<BackstageTheme>();
   const { value, fractional, inverse, unit, max } = {
@@ -103,4 +103,4 @@ export const Gauge = (props: Props) => {
       </div>
     </div>
   );
-};
+}
diff --git a/packages/core-components/src/components/ProgressBars/GaugeCard.tsx b/packages/core-components/src/components/ProgressBars/GaugeCard.tsx
index 39248b1786..0a603ea991 100644
--- a/packages/core-components/src/components/ProgressBars/GaugeCard.tsx
+++ b/packages/core-components/src/components/ProgressBars/GaugeCard.tsx
@@ -37,7 +37,7 @@ const useStyles = makeStyles({
   },
 });
 
-export const GaugeCard = (props: Props) => {
+export function GaugeCard(props: Props) {
   const classes = useStyles(props);
   const { title, subheader, progress, inverse, deepLink, variant } = props;
 
@@ -53,4 +53,4 @@ export const GaugeCard = (props: Props) => {
       </InfoCard>
     </div>
   );
-};
+}
diff --git a/packages/core-components/src/components/ProgressBars/LinearGauge.tsx b/packages/core-components/src/components/ProgressBars/LinearGauge.tsx
index d733cb2eae..cf8c022852 100644
--- a/packages/core-components/src/components/ProgressBars/LinearGauge.tsx
+++ b/packages/core-components/src/components/ProgressBars/LinearGauge.tsx
@@ -28,7 +28,8 @@ type Props = {
   value: number;
 };
 
-export const LinearGauge = ({ value }: Props) => {
+export function LinearGauge(props: Props) {
+  const { value } = props;
   const theme = useTheme<BackstageTheme>();
   if (isNaN(value)) {
     return null;
@@ -50,4 +51,4 @@ export const LinearGauge = ({ value }: Props) => {
       </span>
     </Tooltip>
   );
-};
+}
diff --git a/packages/core-components/src/components/ResponseErrorPanel/ResponseErrorPanel.tsx b/packages/core-components/src/components/ResponseErrorPanel/ResponseErrorPanel.tsx
index ccfb706bf9..9f25e8290f 100644
--- a/packages/core-components/src/components/ResponseErrorPanel/ResponseErrorPanel.tsx
+++ b/packages/core-components/src/components/ResponseErrorPanel/ResponseErrorPanel.tsx
@@ -39,11 +39,8 @@ const useStyles = makeStyles(theme => ({
  * Has special treatment for ResponseError errors, to display rich
  * server-provided information about what happened.
  */
-export const ResponseErrorPanel = ({
-  title,
-  error,
-  defaultExpanded,
-}: ErrorPanelProps) => {
+export function ResponseErrorPanel(props: ErrorPanelProps) {
+  const { title, error, defaultExpanded } = props;
   const classes = useStyles();
 
   if (error.name !== 'ResponseError') {
@@ -93,4 +90,4 @@ export const ResponseErrorPanel = ({
       </>
     </ErrorPanel>
   );
-};
+}
diff --git a/packages/core-components/src/components/Select/Select.tsx b/packages/core-components/src/components/Select/Select.tsx
index b4512b3562..ae14545b29 100644
--- a/packages/core-components/src/components/Select/Select.tsx
+++ b/packages/core-components/src/components/Select/Select.tsx
@@ -106,15 +106,16 @@ export type SelectProps = {
   triggerReset?: boolean;
 };
 
-export const SelectComponent = ({
-  multiple,
-  items,
-  label,
-  placeholder,
-  selected,
-  onChange,
-  triggerReset,
-}: SelectProps) => {
+export function SelectComponent(props: SelectProps) {
+  const {
+    multiple,
+    items,
+    label,
+    placeholder,
+    selected,
+    onChange,
+    triggerReset,
+  } = props;
   const classes = useStyles();
   const [value, setValue] = useState<Selection>(
     selected || (multiple ? [] : ''),
@@ -228,4 +229,4 @@ export const SelectComponent = ({
       </ClickAwayListener>
     </div>
   );
-};
+}
diff --git a/packages/core-components/src/components/SimpleStepper/SimpleStepper.tsx b/packages/core-components/src/components/SimpleStepper/SimpleStepper.tsx
index 46b2ce551a..9ffb63c085 100644
--- a/packages/core-components/src/components/SimpleStepper/SimpleStepper.tsx
+++ b/packages/core-components/src/components/SimpleStepper/SimpleStepper.tsx
@@ -47,12 +47,8 @@ export interface StepperProps {
   activeStep?: number;
 }
 
-export const SimpleStepper = ({
-  children,
-  elevated,
-  onStepChange,
-  activeStep = 0,
-}: PropsWithChildren<StepperProps>) => {
+export function SimpleStepper(props: PropsWithChildren<StepperProps>) {
+  const { children, elevated, onStepChange, activeStep = 0 } = props;
   const [stepIndex, setStepIndex] = useState<number>(activeStep);
   const [stepHistory, setStepHistory] = useState<number[]>([0]);
 
@@ -95,4 +91,4 @@ export const SimpleStepper = ({
       {stepIndex >= Children.count(children) - 1 && endStep}
     </>
   );
-};
+}
diff --git a/packages/core-components/src/components/SimpleStepper/SimpleStepperStep.tsx b/packages/core-components/src/components/SimpleStepper/SimpleStepperStep.tsx
index 51fcee1f71..39383b934b 100644
--- a/packages/core-components/src/components/SimpleStepper/SimpleStepperStep.tsx
+++ b/packages/core-components/src/components/SimpleStepper/SimpleStepperStep.tsx
@@ -30,13 +30,8 @@ const useStyles = makeStyles(theme => ({
   },
 }));
 
-export const SimpleStepperStep = ({
-  title,
-  children,
-  end,
-  actions,
-  ...muiProps
-}: PropsWithChildren<StepProps>) => {
+export function SimpleStepperStep(props: PropsWithChildren<StepProps>) {
+  const { title, children, end, actions, ...muiProps } = props;
   const classes = useStyles();
 
   // The end step is not a part of the stepper
@@ -58,4 +53,4 @@ export const SimpleStepperStep = ({
       </StepContent>
     </MuiStep>
   );
-};
+}
diff --git a/packages/core-components/src/components/Status/Status.tsx b/packages/core-components/src/components/Status/Status.tsx
index 3d79c38581..2b2d40dee3 100644
--- a/packages/core-components/src/components/Status/Status.tsx
+++ b/packages/core-components/src/components/Status/Status.tsx
@@ -63,68 +63,74 @@ const useStyles = makeStyles<BackstageTheme>(theme => ({
   },
 }));
 
-export const StatusOK = (props: PropsWithChildren<{}>) => {
+export function StatusOK(props: PropsWithChildren<{}>) {
   const classes = useStyles(props);
   return (
     <span
       className={classNames(classes.status, classes.ok)}
       aria-label="Status ok"
+      aria-hidden="true"
       {...props}
     />
   );
-};
+}
 
-export const StatusWarning = (props: PropsWithChildren<{}>) => {
+export function StatusWarning(props: PropsWithChildren<{}>) {
   const classes = useStyles(props);
   return (
     <span
       className={classNames(classes.status, classes.warning)}
       aria-label="Status warning"
+      aria-hidden="true"
       {...props}
     />
   );
-};
+}
 
-export const StatusError = (props: PropsWithChildren<{}>) => {
+export function StatusError(props: PropsWithChildren<{}>) {
   const classes = useStyles(props);
   return (
     <span
       className={classNames(classes.status, classes.error)}
       aria-label="Status error"
+      aria-hidden="true"
       {...props}
     />
   );
-};
+}
 
-export const StatusPending = (props: PropsWithChildren<{}>) => {
+export function StatusPending(props: PropsWithChildren<{}>) {
   const classes = useStyles(props);
   return (
     <span
       className={classNames(classes.status, classes.pending)}
       aria-label="Status pending"
+      aria-hidden="true"
       {...props}
     />
   );
-};
+}
 
-export const StatusRunning = (props: PropsWithChildren<{}>) => {
+export function StatusRunning(props: PropsWithChildren<{}>) {
   const classes = useStyles(props);
   return (
     <span
       className={classNames(classes.status, classes.running)}
       aria-label="Status running"
+      aria-hidden="true"
       {...props}
     />
   );
-};
+}
 
-export const StatusAborted = (props: PropsWithChildren<{}>) => {
+export function StatusAborted(props: PropsWithChildren<{}>) {
   const classes = useStyles(props);
   return (
     <span
       className={classNames(classes.status, classes.aborted)}
       aria-label="Status aborted"
+      aria-hidden="true"
       {...props}
     />
   );
-};
+}
diff --git a/packages/core-components/src/components/StructuredMetadataTable/MetadataTable.tsx b/packages/core-components/src/components/StructuredMetadataTable/MetadataTable.tsx
index b7790e38da..5740ba9500 100644
--- a/packages/core-components/src/components/StructuredMetadataTable/MetadataTable.tsx
+++ b/packages/core-components/src/components/StructuredMetadataTable/MetadataTable.tsx
@@ -96,14 +96,14 @@ interface StyleProps extends WithStyles {
   children?: React.ReactNode;
 }
 
-export const MetadataList = withStyles(
-  listStyles,
-)(({ classes, children }: StyleProps) => (
-  <ul className={classes.root}>{children}</ul>
-));
+export const MetadataList = withStyles(listStyles)(
+  ({ classes, children }: StyleProps) => (
+    <ul className={classes.root}>{children}</ul>
+  ),
+);
 
-export const MetadataListItem = withStyles(
-  listItemStyles,
-)(({ classes, children }: StyleProps) => (
-  <li className={classes.root}>{children}</li>
-));
+export const MetadataListItem = withStyles(listItemStyles)(
+  ({ classes, children }: StyleProps) => (
+    <li className={classes.root}>{children}</li>
+  ),
+);
diff --git a/packages/core-components/src/components/StructuredMetadataTable/StructuredMetadataTable.tsx b/packages/core-components/src/components/StructuredMetadataTable/StructuredMetadataTable.tsx
index af56cb5b89..22a1a43b69 100644
--- a/packages/core-components/src/components/StructuredMetadataTable/StructuredMetadataTable.tsx
+++ b/packages/core-components/src/components/StructuredMetadataTable/StructuredMetadataTable.tsx
@@ -44,16 +44,16 @@ interface StyleProps extends WithStyles {
   children?: React.ReactNode;
 }
 // Sub Components
-const StyledList = withStyles(
-  listStyle,
-)(({ classes, children }: StyleProps) => (
-  <MetadataList classes={classes}>{children}</MetadataList>
-));
-const StyledNestedList = withStyles(
-  nestedListStyle,
-)(({ classes, children }: StyleProps) => (
-  <MetadataList classes={classes}>{children}</MetadataList>
-));
+const StyledList = withStyles(listStyle)(
+  ({ classes, children }: StyleProps) => (
+    <MetadataList classes={classes}>{children}</MetadataList>
+  ),
+);
+const StyledNestedList = withStyles(nestedListStyle)(
+  ({ classes, children }: StyleProps) => (
+    <MetadataList classes={classes}>{children}</MetadataList>
+  ),
+);
 
 function renderList(list: Array<any>, nested?: boolean) {
   const values = list.map((item: any, index: number) => (
@@ -153,11 +153,8 @@ type Props = {
   options?: any;
 };
 
-export const StructuredMetadataTable = ({
-  metadata,
-  dense = true,
-  options,
-}: Props) => {
+export function StructuredMetadataTable(props: Props) {
+  const { metadata, dense = true, options } = props;
   const metadataItems = mapToItems(metadata, options || {});
   return <MetadataTable dense={dense}>{metadataItems}</MetadataTable>;
-};
+}
diff --git a/packages/core-components/src/components/SupportButton/SupportButton.tsx b/packages/core-components/src/components/SupportButton/SupportButton.tsx
index 2ffef89878..8076636654 100644
--- a/packages/core-components/src/components/SupportButton/SupportButton.tsx
+++ b/packages/core-components/src/components/SupportButton/SupportButton.tsx
@@ -15,21 +15,24 @@
  */
 
 import { useApp } from '@backstage/core-plugin-api';
-import { HelpIcon } from '../../icons';
+import { BackstageTheme } from '@backstage/theme';
 import {
   Box,
   Button,
   DialogActions,
+  IconButton,
   List,
   ListItem,
   ListItemIcon,
   ListItemText,
-  Typography,
   makeStyles,
   Popover,
+  Typography,
+  useMediaQuery,
 } from '@material-ui/core';
-import React, { Fragment, MouseEventHandler, useState } from 'react';
+import React, { MouseEventHandler, useState } from 'react';
 import { SupportItem, SupportItemLink, useSupportConfig } from '../../hooks';
+import { HelpIcon } from '../../icons';
 import { Link } from '../Link';
 
 type SupportButtonProps = {
@@ -77,12 +80,16 @@ const SupportListItem = ({ item }: { item: SupportItem }) => {
   );
 };
 
-export const SupportButton = ({ title, children }: SupportButtonProps) => {
+export function SupportButton(props: SupportButtonProps) {
+  const { title, children } = props;
   const { items } = useSupportConfig();
 
   const [popoverOpen, setPopoverOpen] = useState(false);
   const [anchorEl, setAnchorEl] = useState<Element | null>(null);
   const classes = useStyles();
+  const isSmallScreen = useMediaQuery<BackstageTheme>(theme =>
+    theme.breakpoints.down('sm'),
+  );
 
   const onClickHandler: MouseEventHandler = event => {
     setAnchorEl(event.currentTarget);
@@ -94,17 +101,28 @@ export const SupportButton = ({ title, children }: SupportButtonProps) => {
   };
 
   return (
-    <Fragment>
-      <Button
-        data-testid="support-button"
-        color="primary"
-        onClick={onClickHandler}
-      >
-        <Box marginRight={1}>
-          <HelpIcon />
-        </Box>
-        Support
-      </Button>
+    <>
+      <Box display="flex" ml={1}>
+        {isSmallScreen ? (
+          <IconButton
+            color="primary"
+            size="small"
+            onClick={onClickHandler}
+            data-testid="support-button"
+          >
+            <HelpIcon />
+          </IconButton>
+        ) : (
+          <Button
+            data-testid="support-button"
+            color="primary"
+            onClick={onClickHandler}
+            startIcon={<HelpIcon />}
+          >
+            Support
+          </Button>
+        )}
+      </Box>
       <Popover
         data-testid="support-button-popover"
         open={popoverOpen}
@@ -141,6 +159,6 @@ export const SupportButton = ({ title, children }: SupportButtonProps) => {
           </Button>
         </DialogActions>
       </Popover>
-    </Fragment>
+    </>
   );
-};
+}
diff --git a/packages/core-components/src/components/TabbedLayout/RoutedTabs.tsx b/packages/core-components/src/components/TabbedLayout/RoutedTabs.tsx
index 531262544c..2a65c8ffc8 100644
--- a/packages/core-components/src/components/TabbedLayout/RoutedTabs.tsx
+++ b/packages/core-components/src/components/TabbedLayout/RoutedTabs.tsx
@@ -20,9 +20,11 @@ import { Content } from '../../layout/Content';
 import { HeaderTabs } from '../../layout/HeaderTabs';
 import { SubRoute } from './types';
 
-export function useSelectedSubRoute(
-  subRoutes: SubRoute[],
-): { index: number; route: SubRoute; element: JSX.Element } {
+export function useSelectedSubRoute(subRoutes: SubRoute[]): {
+  index: number;
+  route: SubRoute;
+  element: JSX.Element;
+} {
   const params = useParams();
 
   const routes = subRoutes.map(({ path, children }) => ({
@@ -45,7 +47,8 @@ export function useSelectedSubRoute(
   };
 }
 
-export const RoutedTabs = ({ routes }: { routes: SubRoute[] }) => {
+export function RoutedTabs(props: { routes: SubRoute[] }) {
+  const { routes } = props;
   const navigate = useNavigate();
   const { index, route, element } = useSelectedSubRoute(routes);
   const headerTabs = useMemo(
@@ -78,4 +81,4 @@ export const RoutedTabs = ({ routes }: { routes: SubRoute[] }) => {
       </Content>
     </>
   );
-};
+}
diff --git a/packages/core-components/src/components/TabbedLayout/TabbedLayout.tsx b/packages/core-components/src/components/TabbedLayout/TabbedLayout.tsx
index f7671928f2..03f012b78f 100644
--- a/packages/core-components/src/components/TabbedLayout/TabbedLayout.tsx
+++ b/packages/core-components/src/components/TabbedLayout/TabbedLayout.tsx
@@ -82,10 +82,10 @@ export function createSubRoutesFromChildren(
  * </TabbedLayout>
  * ```
  */
-export const TabbedLayout = ({ children }: PropsWithChildren<{}>) => {
-  const routes = createSubRoutesFromChildren(children);
+export function TabbedLayout(props: PropsWithChildren<{}>) {
+  const routes = createSubRoutesFromChildren(props.children);
 
   return <RoutedTabs routes={routes} />;
-};
+}
 
 TabbedLayout.Route = Route;
diff --git a/packages/core-components/src/components/Table/SubvalueCell.tsx b/packages/core-components/src/components/Table/SubvalueCell.tsx
index 1dab2e1f49..fd7d3fd9fa 100644
--- a/packages/core-components/src/components/Table/SubvalueCell.tsx
+++ b/packages/core-components/src/components/Table/SubvalueCell.tsx
@@ -33,7 +33,8 @@ type SubvalueCellProps = {
   subvalue: React.ReactNode;
 };
 
-export const SubvalueCell = ({ value, subvalue }: SubvalueCellProps) => {
+export function SubvalueCell(props: SubvalueCellProps) {
+  const { value, subvalue } = props;
   const classes = useSubvalueCellStyles();
 
   return (
@@ -42,4 +43,4 @@ export const SubvalueCell = ({ value, subvalue }: SubvalueCellProps) => {
       <div className={classes.subvalue}>{subvalue}</div>
     </>
   );
-};
+}
diff --git a/packages/core-components/src/components/Table/Table.tsx b/packages/core-components/src/components/Table/Table.tsx
index d8db602e93..edc5fd33ce 100644
--- a/packages/core-components/src/components/Table/Table.tsx
+++ b/packages/core-components/src/components/Table/Table.tsx
@@ -47,14 +47,13 @@ import MTable, {
   MTableHeader,
   MTableToolbar,
   Options,
-} from 'material-table';
+} from '@material-table/core';
 import React, {
   forwardRef,
   MutableRefObject,
   ReactNode,
   useCallback,
   useEffect,
-  useRef,
   useState,
 } from 'react';
 import { CheckboxTreeProps } from '../CheckboxTree/CheckboxTree';
@@ -264,21 +263,21 @@ export function TableToolbar(toolbarProps: {
   );
 }
 
-export function Table<T extends object = {}>({
-  columns,
-  options,
-  title,
-  subtitle,
-  filters,
-  initialState,
-  emptyContent,
-  onStateChange,
-  ...props
-}: TableProps<T>) {
+export function Table<T extends object = {}>(props: TableProps<T>) {
+  const {
+    data,
+    columns,
+    options,
+    title,
+    subtitle,
+    filters,
+    initialState,
+    emptyContent,
+    onStateChange,
+    ...restProps
+  } = props;
   const tableClasses = useTableStyles();
 
-  const { data, ...propsWithoutData } = props;
-
   const theme = useTheme<BackstageTheme>();
 
   const calculatedInitialState = { ...defaultInitialState, ...initialState };
@@ -286,9 +285,10 @@ export function Table<T extends object = {}>({
   const [filtersOpen, setFiltersOpen] = useState(
     calculatedInitialState.filtersOpen,
   );
-  const toggleFilters = useCallback(() => setFiltersOpen(v => !v), [
-    setFiltersOpen,
-  ]);
+  const toggleFilters = useCallback(
+    () => setFiltersOpen(v => !v),
+    [setFiltersOpen],
+  );
   const [selectedFiltersLength, setSelectedFiltersLength] = useState(0);
   const [tableData, setTableData] = useState(data as any[]);
   const [selectedFilters, setSelectedFilters] = useState(
@@ -298,13 +298,6 @@ export function Table<T extends object = {}>({
   const MTColumns = convertColumns(columns, theme);
 
   const [search, setSearch] = useState(calculatedInitialState.search);
-  const toolbarRef = useRef<any>();
-
-  useEffect(() => {
-    if (toolbarRef.current) {
-      toolbarRef.current.onSearchChange(search);
-    }
-  }, [search, toolbarRef]);
 
   useEffect(() => {
     if (onStateChange) {
@@ -440,7 +433,6 @@ export function Table<T extends object = {}>({
     toolbarProps => {
       return (
         <TableToolbar
-          toolbarRef={toolbarRef}
           setSearch={setSearch}
           hasFilters={hasFilters}
           selectedFiltersLength={selectedFiltersLength}
@@ -449,7 +441,7 @@ export function Table<T extends object = {}>({
         />
       );
     },
-    [toggleFilters, hasFilters, selectedFiltersLength, setSearch, toolbarRef],
+    [toggleFilters, hasFilters, selectedFiltersLength, setSearch],
   );
 
   const hasNoRows = typeof data !== 'function' && data.length === 0;
@@ -491,7 +483,9 @@ export function Table<T extends object = {}>({
         icons={tableIcons}
         title={
           <>
-            <Typography variant="h5">{title}</Typography>
+            <Typography variant="h5" component="h3">
+              {title}
+            </Typography>
             {subtitle && (
               <Typography color="textSecondary" variant="body1">
                 {subtitle}
@@ -501,7 +495,7 @@ export function Table<T extends object = {}>({
         }
         data={typeof data === 'function' ? data : tableData}
         style={{ width: '100%' }}
-        {...propsWithoutData}
+        {...restProps}
       />
     </div>
   );
diff --git a/packages/core-components/src/components/Tabs/TabBar.tsx b/packages/core-components/src/components/Tabs/TabBar.tsx
index a5f2d6b0d6..5fb44d3f09 100644
--- a/packages/core-components/src/components/Tabs/TabBar.tsx
+++ b/packages/core-components/src/components/Tabs/TabBar.tsx
@@ -20,6 +20,7 @@ import { BackstageTheme } from '@backstage/theme';
 
 interface StyledTabsProps {
   value: number | boolean;
+  selectionFollowsFocus: boolean;
   onChange: (event: React.ChangeEvent<{}>, newValue: number) => void;
 }
 
diff --git a/packages/core-components/src/components/Tabs/Tabs.tsx b/packages/core-components/src/components/Tabs/Tabs.tsx
index c6e5ad765e..844f54a543 100644
--- a/packages/core-components/src/components/Tabs/Tabs.tsx
+++ b/packages/core-components/src/components/Tabs/Tabs.tsx
@@ -58,7 +58,8 @@ const useStyles = makeStyles<BackstageTheme>(theme => ({
   },
 }));
 
-export const Tabs = ({ tabs }: TabsProps) => {
+export function Tabs(props: TabsProps) {
+  const { tabs } = props;
   const classes = useStyles();
   const [value, setValue] = useState([0, 0]); // [selectedChunkedNavIndex, selectedIndex]
   const [navIndex, setNavIndex] = useState(0);
@@ -107,7 +108,11 @@ export const Tabs = ({ tabs }: TabsProps) => {
     <div className={classes.root}>
       <AppBar ref={wrapper} className={classes.appbar} position="static">
         <div>
-          <StyledTabs value={currentIndex} onChange={handleChange}>
+          <StyledTabs
+            value={currentIndex}
+            onChange={handleChange}
+            selectionFollowsFocus
+          >
             {navIndex !== 0 && (
               <StyledIcon
                 onClick={navigateToPrevChunk}
@@ -156,4 +161,4 @@ export const Tabs = ({ tabs }: TabsProps) => {
       )}
     </div>
   );
-};
+}
diff --git a/packages/core-components/src/components/TrendLine/TrendLine.tsx b/packages/core-components/src/components/TrendLine/TrendLine.tsx
index 0cbc2ca9d7..cb44d2b36b 100644
--- a/packages/core-components/src/components/TrendLine/TrendLine.tsx
+++ b/packages/core-components/src/components/TrendLine/TrendLine.tsx
@@ -32,10 +32,10 @@ function color(data: number[], theme: BackstageTheme): string | undefined {
   return theme.palette.status.error;
 }
 
-export const TrendLine = (
+export function TrendLine(
   props: SparklinesProps &
     Pick<SparklinesLineProps, 'color'> & { title?: string },
-) => {
+) {
   const theme = useTheme<BackstageTheme>();
 
   if (!props.data) return null;
@@ -45,4 +45,4 @@ export const TrendLine = (
       <SparklinesLine color={props.color ?? color(props.data, theme)} />
     </Sparklines>
   );
-};
+}
diff --git a/packages/core-components/src/components/WarningPanel/WarningPanel.test.tsx b/packages/core-components/src/components/WarningPanel/WarningPanel.test.tsx
index 36b5372900..4ae6423333 100644
--- a/packages/core-components/src/components/WarningPanel/WarningPanel.test.tsx
+++ b/packages/core-components/src/components/WarningPanel/WarningPanel.test.tsx
@@ -19,11 +19,19 @@ import { fireEvent, screen } from '@testing-library/react';
 import { renderInTestApp } from '@backstage/test-utils';
 import { Typography } from '@material-ui/core';
 
-import { WarningPanel } from './WarningPanel';
+import { WarningPanel, WarningProps } from './WarningPanel';
 
-const propsTitle = { title: 'Mock title' };
-const propsTitleMessage = { title: 'Mock title', message: 'Some more info' };
-const propsMessage = { message: 'Some more info' };
+const propsTitle: WarningProps = { title: 'Mock title' };
+const propsTitleMessage: WarningProps = {
+  title: 'Mock title',
+  message: 'Some more info',
+};
+const propsMessage: WarningProps = { message: 'Some more info' };
+const propsErrorMessage: WarningProps = {
+  severity: 'error',
+  title: 'Mock title',
+  message: 'Some more info',
+};
 
 describe('<WarningPanel />', () => {
   it('renders without exploding', async () => {
@@ -64,4 +72,8 @@ describe('<WarningPanel />', () => {
     expect(screen.getByText('Some more info')).toBeInTheDocument();
     expect(screen.getByText('Java stacktrace')).toBeInTheDocument();
   });
+  it('renders message using severity', async () => {
+    await renderInTestApp(<WarningPanel {...propsErrorMessage} />);
+    expect(screen.getByText('Error: Mock title')).toBeInTheDocument();
+  });
 });
diff --git a/packages/core-components/src/components/WarningPanel/WarningPanel.tsx b/packages/core-components/src/components/WarningPanel/WarningPanel.tsx
index 37ae5b2c62..536ab066b3 100644
--- a/packages/core-components/src/components/WarningPanel/WarningPanel.tsx
+++ b/packages/core-components/src/components/WarningPanel/WarningPanel.tsx
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 import { BackstageTheme } from '@backstage/theme';
 import {
   Accordion,
@@ -22,30 +21,61 @@ import {
   Grid,
   makeStyles,
   Typography,
+  darken,
+  lighten,
 } from '@material-ui/core';
 import ErrorOutline from '@material-ui/icons/ErrorOutline';
 import ExpandMoreIcon from '@material-ui/icons/ExpandMore';
 import React from 'react';
 
+const getWarningTextColor = (
+  severity: NonNullable<WarningProps['severity']>,
+  theme: BackstageTheme,
+) => {
+  const getColor = theme.palette.type === 'light' ? darken : lighten;
+  return getColor(theme.palette[severity].light, 0.6);
+};
+
+const getWarningBackgroundColor = (
+  severity: NonNullable<WarningProps['severity']>,
+  theme: BackstageTheme,
+) => {
+  const getBackgroundColor = theme.palette.type === 'light' ? lighten : darken;
+  return getBackgroundColor(theme.palette[severity].light, 0.9);
+};
+
 const useErrorOutlineStyles = makeStyles<BackstageTheme>(theme => ({
   root: {
     marginRight: theme.spacing(1),
-    fill: theme.palette.warningText,
+    fill: ({ severity }: WarningProps) =>
+      getWarningTextColor(
+        severity as NonNullable<WarningProps['severity']>,
+        theme,
+      ),
   },
 }));
-const ErrorOutlineStyled = () => {
-  const classes = useErrorOutlineStyles();
+
+const ErrorOutlineStyled = ({ severity }: Pick<WarningProps, 'severity'>) => {
+  const classes = useErrorOutlineStyles({ severity });
   return <ErrorOutline classes={classes} />;
 };
-const ExpandMoreIconStyled = () => {
-  const classes = useErrorOutlineStyles();
+const ExpandMoreIconStyled = ({ severity }: Pick<WarningProps, 'severity'>) => {
+  const classes = useErrorOutlineStyles({ severity });
   return <ExpandMoreIcon classes={classes} />;
 };
 
 const useStyles = makeStyles<BackstageTheme>(theme => ({
   panel: {
-    backgroundColor: theme.palette.warningBackground,
-    color: theme.palette.warningText,
+    backgroundColor: ({ severity }: WarningProps) =>
+      getWarningBackgroundColor(
+        severity as NonNullable<WarningProps['severity']>,
+        theme,
+      ),
+    color: ({ severity }: WarningProps) =>
+      getWarningTextColor(
+        severity as NonNullable<WarningProps['severity']>,
+        theme,
+      ),
     verticalAlign: 'middle',
   },
   summary: {
@@ -53,14 +83,26 @@ const useStyles = makeStyles<BackstageTheme>(theme => ({
     flexDirection: 'row',
   },
   summaryText: {
-    color: theme.palette.warningText,
+    color: ({ severity }: WarningProps) =>
+      getWarningTextColor(
+        severity as NonNullable<WarningProps['severity']>,
+        theme,
+      ),
     fontWeight: 'bold',
   },
   message: {
     width: '100%',
     display: 'block',
-    color: theme.palette.warningText,
-    backgroundColor: theme.palette.warningBackground,
+    color: ({ severity }: WarningProps) =>
+      getWarningTextColor(
+        severity as NonNullable<WarningProps['severity']>,
+        theme,
+      ),
+    backgroundColor: ({ severity }: WarningProps) =>
+      getWarningBackgroundColor(
+        severity as NonNullable<WarningProps['severity']>,
+        theme,
+      ),
   },
   details: {
     width: '100%',
@@ -73,7 +115,7 @@ const useStyles = makeStyles<BackstageTheme>(theme => ({
   },
 }));
 
-type Props = {
+export type WarningProps = {
   title?: string;
   severity?: 'warning' | 'error' | 'info';
   message?: React.ReactNode;
@@ -89,19 +131,24 @@ const capitalize = (s: string) => {
  * WarningPanel. Show a user friendly error message to a user similar to ErrorPanel except that the warning panel
  * only shows the warning message to the user.
  *
- * @param {string} [severity=warning] Ability to change the severity of the alert. Not fully implemented. (error, warning, info)
+ * @param {string} [severity=warning] Ability to change the severity of the alert.
  * @param {string} [title] A title for the warning. If not supplied, "Warning" will be used.
  * @param {Object} [message] Optional more detailed user-friendly message elaborating on the cause of the error.
  * @param {Object} [children] Objects to provide context, such as a stack trace or detailed error reporting.
  * Will be available inside an unfolded accordion.
  */
-export const WarningPanel = (props: Props) => {
-  const classes = useStyles(props);
-  const { severity, title, message, children, defaultExpanded } = props;
+export function WarningPanel(props: WarningProps) {
+  const {
+    severity = 'warning',
+    title,
+    message,
+    children,
+    defaultExpanded,
+  } = props;
+  const classes = useStyles({ severity });
 
   // If no severity or title provided, the heading will read simply "Warning"
-  const subTitle =
-    (severity ? capitalize(severity) : 'Warning') + (title ? `: ${title}` : '');
+  const subTitle = capitalize(severity) + (title ? `: ${title}` : '');
 
   return (
     <Accordion
@@ -110,10 +157,10 @@ export const WarningPanel = (props: Props) => {
       role="alert"
     >
       <AccordionSummary
-        expandIcon={<ExpandMoreIconStyled />}
+        expandIcon={<ExpandMoreIconStyled severity={severity} />}
         className={classes.summary}
       >
-        <ErrorOutlineStyled />
+        <ErrorOutlineStyled severity={severity} />
         <Typography className={classes.summaryText} variant="subtitle1">
           {subTitle}
         </Typography>
@@ -138,4 +185,4 @@ export const WarningPanel = (props: Props) => {
       )}
     </Accordion>
   );
-};
+}
diff --git a/packages/core-components/src/components/index.ts b/packages/core-components/src/components/index.ts
index 9f89a58248..3c9376a894 100644
--- a/packages/core-components/src/components/index.ts
+++ b/packages/core-components/src/components/index.ts
@@ -19,6 +19,7 @@ export * from './Avatar';
 export * from './Button';
 export * from './CodeSnippet';
 export * from './CopyTextButton';
+export * from './CreateButton';
 export * from './DependencyGraph';
 export * from './DismissableBanner';
 export * from './EmptyState';
diff --git a/packages/core-components/src/hooks/useSupportConfig.ts b/packages/core-components/src/hooks/useSupportConfig.ts
index 5bab9a3c6b..5d64e38f3d 100644
--- a/packages/core-components/src/hooks/useSupportConfig.ts
+++ b/packages/core-components/src/hooks/useSupportConfig.ts
@@ -42,8 +42,7 @@ const DEFAULT_SUPPORT_CONFIG: SupportConfig = {
         {
           // TODO: Update to dedicated support page on backstage.io/docs
           title: 'Add `app.support` config key',
-          url:
-            'https://github.com/andrewthauer/backstage/blob/master/app-config.yaml',
+          url: 'https://github.com/andrewthauer/backstage/blob/master/app-config.yaml',
         },
       ],
     },
diff --git a/packages/core-components/src/icons/icons.tsx b/packages/core-components/src/icons/icons.tsx
index 258bc9f8e1..7a9f7f9832 100644
--- a/packages/core-components/src/icons/icons.tsx
+++ b/packages/core-components/src/icons/icons.tsx
@@ -15,27 +15,48 @@
  */
 
 import MuiBrokenImageIcon from '@material-ui/icons/BrokenImage';
-import React from 'react';
+import React, { ComponentProps } from 'react';
 import { useApp, IconComponent } from '@backstage/core-plugin-api';
 
-const overridableSystemIcon = (key: string): IconComponent => {
-  const Component: IconComponent = props => {
-    const app = useApp();
-    const Icon = app.getSystemIcon(key);
-    return Icon ? <Icon {...props} /> : <MuiBrokenImageIcon {...props} />;
-  };
-  return Component;
-};
+type IconComponentProps = ComponentProps<IconComponent>;
+
+function useSystemIcon(key: string, props: IconComponentProps) {
+  const app = useApp();
+  const Icon = app.getSystemIcon(key);
+  return Icon ? <Icon {...props} /> : <MuiBrokenImageIcon {...props} />;
+}
 
 // Should match the list of overridable system icon keys in @backstage/core-app-api
-export const BrokenImageIcon = overridableSystemIcon('brokenImage');
-export const CatalogIcon = overridableSystemIcon('catalog');
-export const ChatIcon = overridableSystemIcon('chat');
-export const DashboardIcon = overridableSystemIcon('dashboard');
-export const DocsIcon = overridableSystemIcon('docs');
-export const EmailIcon = overridableSystemIcon('email');
-export const GitHubIcon = overridableSystemIcon('github');
-export const GroupIcon = overridableSystemIcon('group');
-export const HelpIcon = overridableSystemIcon('help');
-export const UserIcon = overridableSystemIcon('user');
-export const WarningIcon = overridableSystemIcon('warning');
+export function BrokenImageIcon(props: IconComponentProps) {
+  return useSystemIcon('brokenImage', props);
+}
+export function CatalogIcon(props: IconComponentProps) {
+  return useSystemIcon('catalog', props);
+}
+export function ChatIcon(props: IconComponentProps) {
+  return useSystemIcon('chat', props);
+}
+export function DashboardIcon(props: IconComponentProps) {
+  return useSystemIcon('dashboard', props);
+}
+export function DocsIcon(props: IconComponentProps) {
+  return useSystemIcon('docs', props);
+}
+export function EmailIcon(props: IconComponentProps) {
+  return useSystemIcon('email', props);
+}
+export function GitHubIcon(props: IconComponentProps) {
+  return useSystemIcon('github', props);
+}
+export function GroupIcon(props: IconComponentProps) {
+  return useSystemIcon('group', props);
+}
+export function HelpIcon(props: IconComponentProps) {
+  return useSystemIcon('help', props);
+}
+export function UserIcon(props: IconComponentProps) {
+  return useSystemIcon('user', props);
+}
+export function WarningIcon(props: IconComponentProps) {
+  return useSystemIcon('warning', props);
+}
diff --git a/packages/core-components/src/layout/BottomLink/BottomLink.tsx b/packages/core-components/src/layout/BottomLink/BottomLink.tsx
index f92f546809..6d6811cc09 100644
--- a/packages/core-components/src/layout/BottomLink/BottomLink.tsx
+++ b/packages/core-components/src/layout/BottomLink/BottomLink.tsx
@@ -15,13 +15,7 @@
  */
 
 import React from 'react';
-import {
-  ListItem,
-  ListItemIcon,
-  Divider,
-  ListItemText,
-  makeStyles,
-} from '@material-ui/core';
+import { Divider, Typography, makeStyles } from '@material-ui/core';
 import ArrowIcon from '@material-ui/icons/ArrowForward';
 import { BackstageTheme } from '@backstage/theme';
 import Box from '@material-ui/core/Box';
@@ -47,24 +41,23 @@ export type BottomLinkProps = {
   onClick?: (event: React.MouseEvent<HTMLAnchorElement>) => void;
 };
 
-export const BottomLink = ({ link, title, onClick }: BottomLinkProps) => {
+export function BottomLink(props: BottomLinkProps) {
+  const { link, title, onClick } = props;
   const classes = useStyles();
 
   return (
     <div>
       <Divider />
       <Link to={link} onClick={onClick} underline="none">
-        <ListItem className={classes.root}>
-          <ListItemText>
-            <Box className={classes.boxTitle} fontWeight="fontWeightBold" m={1}>
-              {title}
-            </Box>
-          </ListItemText>
-          <ListItemIcon>
-            <ArrowIcon className={classes.arrow} />
-          </ListItemIcon>
-        </ListItem>
+        <Box display="flex" alignItems="center" className={classes.root}>
+          <Box className={classes.boxTitle} fontWeight="fontWeightBold" m={1}>
+            <Typography>
+              <strong>{title}</strong>
+            </Typography>
+          </Box>
+          <ArrowIcon className={classes.arrow} />
+        </Box>
       </Link>
     </div>
   );
-};
+}
diff --git a/packages/core-components/src/layout/Breadcrumbs/Breadcrumbs.tsx b/packages/core-components/src/layout/Breadcrumbs/Breadcrumbs.tsx
index 418217f3b5..28c86d32f0 100644
--- a/packages/core-components/src/layout/Breadcrumbs/Breadcrumbs.tsx
+++ b/packages/core-components/src/layout/Breadcrumbs/Breadcrumbs.tsx
@@ -41,7 +41,8 @@ const StyledBox = withStyles({
   },
 })(Box);
 
-export const Breadcrumbs = ({ children, ...props }: Props) => {
+export function Breadcrumbs(props: Props) {
+  const { children, ...restProps } = props;
   const [anchorEl, setAnchorEl] = React.useState<HTMLButtonElement | null>(
     null,
   );
@@ -65,7 +66,7 @@ export const Breadcrumbs = ({ children, ...props }: Props) => {
   const open = Boolean(anchorEl);
   return (
     <Fragment>
-      <MaterialBreadcrumbs aria-label="breadcrumb" {...props}>
+      <MaterialBreadcrumbs aria-label="breadcrumb" {...restProps}>
         {childrenArray.length > 1 && <StyledBox clone>{firstPage}</StyledBox>}
         {childrenArray.length > 2 && <StyledBox clone>{secondPage}</StyledBox>}
         {hasHiddenBreadcrumbs && (
@@ -96,4 +97,4 @@ export const Breadcrumbs = ({ children, ...props }: Props) => {
       </Popover>
     </Fragment>
   );
-};
+}
diff --git a/packages/core-components/src/layout/Content/Content.tsx b/packages/core-components/src/layout/Content/Content.tsx
index cb6a841cf3..a3771dff3f 100644
--- a/packages/core-components/src/layout/Content/Content.tsx
+++ b/packages/core-components/src/layout/Content/Content.tsx
@@ -24,7 +24,12 @@ const useStyles = makeStyles((theme: Theme) => ({
     minWidth: 0,
     paddingTop: theme.spacing(3),
     paddingBottom: theme.spacing(3),
-    ...theme.mixins.gutters({}),
+    paddingLeft: theme.spacing(2),
+    paddingRight: theme.spacing(2),
+    [theme.breakpoints.up('sm')]: {
+      paddingLeft: theme.spacing(3),
+      paddingRight: theme.spacing(3),
+    },
   },
   stretch: {
     display: 'flex',
@@ -42,17 +47,12 @@ type Props = {
   className?: string;
 };
 
-export const Content = ({
-  className,
-  stretch,
-  noPadding,
-  children,
-  ...props
-}: PropsWithChildren<Props>) => {
+export function Content(props: PropsWithChildren<Props>) {
+  const { className, stretch, noPadding, children, ...restProps } = props;
   const classes = useStyles();
   return (
     <article
-      {...props}
+      {...restProps}
       className={classNames(classes.root, className, {
         [classes.stretch]: stretch,
         [classes.noPadding]: noPadding,
@@ -61,4 +61,4 @@ export const Content = ({
       {children}
     </article>
   );
-};
+}
diff --git a/packages/core-components/src/layout/ContentHeader/ContentHeader.test.tsx b/packages/core-components/src/layout/ContentHeader/ContentHeader.test.tsx
index 498b859db1..37059766a8 100644
--- a/packages/core-components/src/layout/ContentHeader/ContentHeader.test.tsx
+++ b/packages/core-components/src/layout/ContentHeader/ContentHeader.test.tsx
@@ -32,7 +32,7 @@ describe('<ContentHeader/>', () => {
 
   it('should render with titleComponent', async () => {
     const title = 'Custom title';
-    const titleComponent = () => <h1>{title}</h1>;
+    const titleComponent = <h1>{title}</h1>;
     const rendered = await renderInTestApp(
       <ContentHeader titleComponent={titleComponent} />,
     );
diff --git a/packages/core-components/src/layout/ContentHeader/ContentHeader.tsx b/packages/core-components/src/layout/ContentHeader/ContentHeader.tsx
index 1e2ad0b5d4..76fec703a9 100644
--- a/packages/core-components/src/layout/ContentHeader/ContentHeader.tsx
+++ b/packages/core-components/src/layout/ContentHeader/ContentHeader.tsx
@@ -18,7 +18,7 @@
  * TODO favoriteable capability
  */
 
-import React, { ComponentType, Fragment, PropsWithChildren } from 'react';
+import React, { PropsWithChildren, ReactNode } from 'react';
 import { Typography, makeStyles } from '@material-ui/core';
 import { Helmet } from 'react-helmet';
 
@@ -31,12 +31,11 @@ const useStyles = (props: ContentHeaderProps) =>
       flexWrap: 'wrap',
       justifyContent: 'flex-end',
       alignItems: 'center',
-      marginBottom: theme.spacing(1),
+      marginBottom: theme.spacing(2),
       textAlign: props.textAlign,
     },
     leftItemsBox: {
       flex: '1 1 auto',
-      marginBottom: theme.spacing(1),
       minWidth: 0,
       overflow: 'visible',
     },
@@ -47,25 +46,25 @@ const useStyles = (props: ContentHeaderProps) =>
       flexWrap: 'wrap',
       alignItems: 'center',
       marginLeft: theme.spacing(1),
-      marginBottom: theme.spacing(1),
       minWidth: 0,
       overflow: 'visible',
     },
     description: {},
     title: {
       display: 'inline-flex',
+      marginBottom: 0,
     },
   }));
 
-type DefaultTitleProps = {
+type ContentHeaderTitleProps = {
   title?: string;
-  className: string;
+  className?: string;
 };
 
-const DefaultTitle = ({
+const ContentHeaderTitle = ({
   title = 'Unknown page',
   className,
-}: DefaultTitleProps) => (
+}: ContentHeaderTitleProps) => (
   <Typography
     variant="h4"
     component="h2"
@@ -77,28 +76,29 @@ const DefaultTitle = ({
 );
 
 type ContentHeaderProps = {
-  title?: DefaultTitleProps['title'];
-  titleComponent?: ComponentType;
+  title?: ContentHeaderTitleProps['title'];
+  titleComponent?: ReactNode;
   description?: string;
   textAlign?: 'left' | 'right' | 'center';
 };
 
-export const ContentHeader = ({
-  description,
-  title,
-  titleComponent: TitleComponent = undefined,
-  children,
-  textAlign = 'left',
-}: PropsWithChildren<ContentHeaderProps>) => {
+export function ContentHeader(props: PropsWithChildren<ContentHeaderProps>) {
+  const {
+    description,
+    title,
+    titleComponent: TitleComponent = undefined,
+    children,
+    textAlign = 'left',
+  } = props;
   const classes = useStyles({ textAlign })();
 
   const renderedTitle = TitleComponent ? (
-    <TitleComponent />
+    TitleComponent
   ) : (
-    <DefaultTitle title={title} className={classes.title} />
+    <ContentHeaderTitle title={title} className={classes.title} />
   );
   return (
-    <Fragment>
+    <>
       <Helmet title={title} />
       <div className={classes.container}>
         <div className={classes.leftItemsBox}>
@@ -111,6 +111,6 @@ export const ContentHeader = ({
         </div>
         <div className={classes.rightItemsBox}>{children}</div>
       </div>
-    </Fragment>
+    </>
   );
-};
+}
diff --git a/packages/core-components/src/layout/ErrorBoundary/ErrorBoundary.test.tsx b/packages/core-components/src/layout/ErrorBoundary/ErrorBoundary.test.tsx
index f8adb81a2a..a1c45bff4d 100644
--- a/packages/core-components/src/layout/ErrorBoundary/ErrorBoundary.test.tsx
+++ b/packages/core-components/src/layout/ErrorBoundary/ErrorBoundary.test.tsx
@@ -42,18 +42,14 @@ describe('<ErrorBoundary/>', () => {
   it('should render error boundary with and without error', async () => {
     const { error } = await withLogCollector(['error'], async () => {
       const apis = ApiRegistry.with(errorApiRef, new MockErrorApi());
-      const {
-        rerender,
-        queryByRole,
-        getByRole,
-        getByText,
-      } = await renderInTestApp(
-        <ApiProvider apis={apis}>
-          <ErrorBoundary>
-            <Bomb />
-          </ErrorBoundary>
-        </ApiProvider>,
-      );
+      const { rerender, queryByRole, getByRole, getByText } =
+        await renderInTestApp(
+          <ApiProvider apis={apis}>
+            <ErrorBoundary>
+              <Bomb />
+            </ErrorBoundary>
+          </ApiProvider>,
+        );
 
       expect(queryByRole('alert')).not.toBeInTheDocument();
       expect(getByText(/working component/i)).toBeInTheDocument();
diff --git a/packages/core-components/src/layout/ErrorPage/ErrorPage.tsx b/packages/core-components/src/layout/ErrorPage/ErrorPage.tsx
index cca88147c4..f4b2960f96 100644
--- a/packages/core-components/src/layout/ErrorPage/ErrorPage.tsx
+++ b/packages/core-components/src/layout/ErrorPage/ErrorPage.tsx
@@ -47,11 +47,8 @@ const useStyles = makeStyles<BackstageTheme>(theme => ({
   },
 }));
 
-export const ErrorPage = ({
-  status,
-  statusMessage,
-  additionalInfo,
-}: IErrorPageProps) => {
+export function ErrorPage(props: IErrorPageProps) {
+  const { status, statusMessage, additionalInfo } = props;
   const classes = useStyles();
   const navigate = useNavigate();
   const support = useSupportConfig();
@@ -82,4 +79,4 @@ export const ErrorPage = ({
       </Grid>
     </Grid>
   );
-};
+}
diff --git a/packages/core-components/src/layout/Header/Header.tsx b/packages/core-components/src/layout/Header/Header.tsx
index 96d024f524..3f83bcc843 100644
--- a/packages/core-components/src/layout/Header/Header.tsx
+++ b/packages/core-components/src/layout/Header/Header.tsx
@@ -16,7 +16,7 @@
 
 import { useApi, configApiRef } from '@backstage/core-plugin-api';
 import { BackstageTheme } from '@backstage/theme';
-import { makeStyles, Tooltip, Typography } from '@material-ui/core';
+import { Box, Grid, makeStyles, Tooltip, Typography } from '@material-ui/core';
 import React, { CSSProperties, PropsWithChildren, ReactNode } from 'react';
 import { Helmet } from 'react-helmet';
 import { Link } from '../../components/Link';
@@ -26,7 +26,6 @@ const useStyles = makeStyles<BackstageTheme>(theme => ({
   header: {
     gridArea: 'pageHeader',
     padding: theme.spacing(3),
-    minHeight: 118,
     width: '100%',
     boxShadow: '0 0 8px 3px rgba(20, 20, 20, 0.3)',
     position: 'relative',
@@ -34,33 +33,29 @@ const useStyles = makeStyles<BackstageTheme>(theme => ({
     display: 'flex',
     flexDirection: 'row',
     flexWrap: 'wrap',
-    justifyContent: 'flex-end',
     alignItems: 'center',
     backgroundImage: theme.page.backgroundImage,
     backgroundPosition: 'center',
     backgroundSize: 'cover',
   },
   leftItemsBox: {
-    flex: '1 1 auto',
+    maxWidth: '100%',
+    flexGrow: 1,
   },
   rightItemsBox: {
-    flex: '0 1 auto',
-    display: 'flex',
-    flexDirection: 'row',
-    flexWrap: 'wrap',
-    alignItems: 'center',
-    marginRight: theme.spacing(1),
+    width: 'auto',
   },
   title: {
     color: theme.palette.bursts.fontColor,
-    lineHeight: '1.0em',
     wordBreak: 'break-all',
     fontSize: 'calc(24px + 6 * ((100vw - 320px) / 680))',
-    marginBottom: theme.spacing(1),
+    marginBottom: 0,
   },
   subtitle: {
     color: 'rgba(255, 255, 255, 0.8)',
     lineHeight: '1.0em',
+    display: 'inline-block', // prevents margin collapse of adjacent siblings
+    marginTop: theme.spacing(1),
   },
   type: {
     textTransform: 'uppercase',
@@ -177,16 +172,17 @@ const SubtitleFragment = ({ classes, subtitle }: SubtitleFragmentProps) => {
   );
 };
 
-export const Header = ({
-  children,
-  pageTitleOverride,
-  style,
-  subtitle,
-  title,
-  tooltip,
-  type,
-  typeLink,
-}: PropsWithChildren<Props>) => {
+export function Header(props: PropsWithChildren<Props>) {
+  const {
+    children,
+    pageTitleOverride,
+    style,
+    subtitle,
+    title,
+    tooltip,
+    type,
+    typeLink,
+  } = props;
   const classes = useStyles();
   const configApi = useApi(configApiRef);
   const appTitle = configApi.getOptionalString('app.title') || 'Backstage';
@@ -199,7 +195,7 @@ export const Header = ({
     <>
       <Helmet titleTemplate={titleTemplate} defaultTitle={defaultTitle} />
       <header style={style} className={classes.header}>
-        <div className={classes.leftItemsBox}>
+        <Box className={classes.leftItemsBox}>
           <TypeFragment
             classes={classes}
             type={type}
@@ -212,9 +208,11 @@ export const Header = ({
             tooltip={tooltip}
           />
           <SubtitleFragment classes={classes} subtitle={subtitle} />
-        </div>
-        <div className={classes.rightItemsBox}>{children}</div>
+        </Box>
+        <Grid container className={classes.rightItemsBox} spacing={4}>
+          {children}
+        </Grid>
       </header>
     </>
   );
-};
+}
diff --git a/packages/core-components/src/layout/HeaderActionMenu/HeaderActionMenu.tsx b/packages/core-components/src/layout/HeaderActionMenu/HeaderActionMenu.tsx
index 06a9b2b701..5243a65498 100644
--- a/packages/core-components/src/layout/HeaderActionMenu/HeaderActionMenu.tsx
+++ b/packages/core-components/src/layout/HeaderActionMenu/HeaderActionMenu.tsx
@@ -66,7 +66,8 @@ export type HeaderActionMenuProps = {
   actionItems: ActionItemProps[];
 };
 
-export const HeaderActionMenu = ({ actionItems }: HeaderActionMenuProps) => {
+export function HeaderActionMenu(props: HeaderActionMenuProps) {
+  const { actionItems } = props;
   const [open, setOpen] = React.useState(false);
   const anchorElRef = React.useRef(null);
 
@@ -103,4 +104,4 @@ export const HeaderActionMenu = ({ actionItems }: HeaderActionMenuProps) => {
       </Popover>
     </Fragment>
   );
-};
+}
diff --git a/packages/core-components/src/layout/HeaderLabel/HeaderLabel.tsx b/packages/core-components/src/layout/HeaderLabel/HeaderLabel.tsx
index 1534656f24..88f6e26bf5 100644
--- a/packages/core-components/src/layout/HeaderLabel/HeaderLabel.tsx
+++ b/packages/core-components/src/layout/HeaderLabel/HeaderLabel.tsx
@@ -14,29 +14,25 @@
  * limitations under the License.
  */
 
-import { Link, makeStyles, Typography } from '@material-ui/core';
+import { Link, makeStyles, Typography, Grid } from '@material-ui/core';
 import React from 'react';
 
 const useStyles = makeStyles(theme => ({
   root: {
     textAlign: 'left',
-    margin: theme.spacing(2),
-    display: 'inline-block',
   },
   label: {
-    color: '#FFFFFF',
+    color: theme.palette.common.white,
     fontWeight: 'bold',
-    lineHeight: '16px',
     letterSpacing: 0,
-    fontSize: 14,
-    height: '16px',
-    marginBottom: 2,
+    fontSize: theme.typography.fontSize,
+    marginBottom: theme.spacing(1) / 2,
+    lineHeight: 1,
   },
   value: {
     color: 'rgba(255, 255, 255, 0.8)',
-    lineHeight: '16px',
-    fontSize: 14,
-    height: '16px',
+    fontSize: theme.typography.fontSize,
+    lineHeight: 1,
   },
 }));
 
@@ -55,7 +51,8 @@ type HeaderLabelProps = {
   url?: string;
 };
 
-export const HeaderLabel = ({ label, value, url }: HeaderLabelProps) => {
+export function HeaderLabel(props: HeaderLabelProps) {
+  const { label, value, url } = props;
   const classes = useStyles();
   const content = (
     <HeaderLabelContent
@@ -64,9 +61,11 @@ export const HeaderLabel = ({ label, value, url }: HeaderLabelProps) => {
     />
   );
   return (
-    <span className={classes.root}>
-      <Typography className={classes.label}>{label}</Typography>
-      {url ? <Link href={url}>{content}</Link> : content}
-    </span>
+    <Grid item>
+      <span className={classes.root}>
+        <Typography className={classes.label}>{label}</Typography>
+        {url ? <Link href={url}>{content}</Link> : content}
+      </span>
+    </Grid>
   );
-};
+}
diff --git a/packages/core-components/src/layout/HeaderTabs/HeaderTabs.tsx b/packages/core-components/src/layout/HeaderTabs/HeaderTabs.tsx
index 46fe9f1569..0fe3cd967e 100644
--- a/packages/core-components/src/layout/HeaderTabs/HeaderTabs.tsx
+++ b/packages/core-components/src/layout/HeaderTabs/HeaderTabs.tsx
@@ -36,6 +36,12 @@ const useStyles = makeStyles(theme => ({
   selected: {
     color: theme.palette.text.primary,
   },
+  tabRoot: {
+    '&:hover': {
+      backgroundColor: theme.palette.background.default,
+      color: theme.palette.text.primary,
+    },
+  },
 }));
 
 export type Tab = {
@@ -49,11 +55,8 @@ type HeaderTabsProps = {
   onChange?: (index: number) => void;
   selectedIndex?: number;
 };
-export const HeaderTabs = ({
-  tabs,
-  onChange,
-  selectedIndex,
-}: HeaderTabsProps) => {
+export function HeaderTabs(props: HeaderTabsProps) {
+  const { tabs, onChange, selectedIndex } = props;
   const [selectedTab, setSelectedTab] = useState<number>(selectedIndex ?? 0);
   const styles = useStyles();
 
@@ -73,6 +76,7 @@ export const HeaderTabs = ({
   return (
     <div className={styles.tabsWrapper}>
       <Tabs
+        selectionFollowsFocus
         indicatorColor="primary"
         textColor="inherit"
         variant="scrollable"
@@ -88,10 +92,10 @@ export const HeaderTabs = ({
             key={tab.id}
             value={index}
             className={styles.defaultTab}
-            classes={{ selected: styles.selected }}
+            classes={{ selected: styles.selected, root: styles.tabRoot }}
           />
         ))}
       </Tabs>
     </div>
   );
-};
+}
diff --git a/packages/core-components/src/layout/HomepageTimer/HomepageTimer.tsx b/packages/core-components/src/layout/HomepageTimer/HomepageTimer.tsx
index 04073cca48..a78f4af8ca 100644
--- a/packages/core-components/src/layout/HomepageTimer/HomepageTimer.tsx
+++ b/packages/core-components/src/layout/HomepageTimer/HomepageTimer.tsx
@@ -67,7 +67,7 @@ function getTimes(configApi: ConfigApi) {
   return clocks;
 }
 
-export const HomepageTimer = () => {
+export function HomepageTimer(_props: {}) {
   const configApi = useApi(configApiRef);
 
   const defaultTimes: TimeObj[] = [];
@@ -99,4 +99,4 @@ export const HomepageTimer = () => {
     );
   }
   return null;
-};
+}
diff --git a/packages/core-components/src/layout/InfoCard/InfoCard.tsx b/packages/core-components/src/layout/InfoCard/InfoCard.tsx
index cc15bbd9f4..36205b0dc0 100644
--- a/packages/core-components/src/layout/InfoCard/InfoCard.tsx
+++ b/packages/core-components/src/layout/InfoCard/InfoCard.tsx
@@ -91,8 +91,8 @@ export type InfoCardVariants = 'flex' | 'fullHeight' | 'gridItem';
 /**
  * InfoCard is used to display a paper-styled block on the screen, similar to a panel.
  *
- * You can custom style an InfoCard with the 'style' (outer container) and 'cardStyle' (inner container)
- * styles.
+ * You can custom style an InfoCard with the 'className' (outer container) and 'cardClassName' (inner container)
+ * props. This is typically used with the material-ui makeStyles mechanism.
  *
  * The InfoCard serves as an error boundary. As a result, if you provide an 'errorBoundaryProps' property this
  * specifies the extra information to display in the error component that is displayed if an error occurs
@@ -115,8 +115,6 @@ type Props = {
   slackChannel?: string;
   errorBoundaryProps?: ErrorBoundaryProps;
   variant?: InfoCardVariants;
-  style?: object;
-  cardStyle?: object;
   children?: ReactNode;
   headerStyle?: object;
   headerProps?: CardHeaderProps;
@@ -130,26 +128,27 @@ type Props = {
   titleTypographyProps?: object;
 };
 
-export const InfoCard = ({
-  title,
-  subheader,
-  divider = true,
-  deepLink,
-  slackChannel,
-  errorBoundaryProps,
-  variant,
-  children,
-  headerStyle,
-  headerProps,
-  action,
-  actionsClassName,
-  actions,
-  cardClassName,
-  actionsTopRight,
-  className,
-  noPadding,
-  titleTypographyProps,
-}: Props): JSX.Element => {
+export function InfoCard(props: Props): JSX.Element {
+  const {
+    title,
+    subheader,
+    divider = true,
+    deepLink,
+    slackChannel,
+    errorBoundaryProps,
+    variant,
+    children,
+    headerStyle,
+    headerProps,
+    action,
+    actionsClassName,
+    actions,
+    cardClassName,
+    actionsTopRight,
+    className,
+    noPadding,
+    titleTypographyProps,
+  } = props;
   const classes = useStyles();
   /**
    * If variant is specified, we build up styles for that particular variant for both
@@ -216,4 +215,4 @@ export const InfoCard = ({
       </ErrorBoundary>
     </Card>
   );
-};
+}
diff --git a/packages/core-components/src/layout/ItemCard/ItemCard.tsx b/packages/core-components/src/layout/ItemCard/ItemCard.tsx
index b4273ee837..81a88d2c09 100644
--- a/packages/core-components/src/layout/ItemCard/ItemCard.tsx
+++ b/packages/core-components/src/layout/ItemCard/ItemCard.tsx
@@ -62,16 +62,9 @@ type ItemCardProps = {
  * @deprecated Use plain MUI <Card> and composable helpers instead.
  * @see https://material-ui.com/components/cards/
  */
-export const ItemCard = ({
-  description,
-  tags,
-  title,
-  type,
-  subtitle,
-  label,
-  onClick,
-  href,
-}: ItemCardProps) => {
+export function ItemCard(props: ItemCardProps) {
+  const { description, tags, title, type, subtitle, label, onClick, href } =
+    props;
   return (
     <Card>
       <CardMedia>
@@ -101,4 +94,4 @@ export const ItemCard = ({
       </CardActions>
     </Card>
   );
-};
+}
diff --git a/packages/core-components/src/layout/ItemCard/ItemCardGrid.test.tsx b/packages/core-components/src/layout/ItemCard/ItemCardGrid.test.tsx
index 02c3bb3639..30fdb415e5 100644
--- a/packages/core-components/src/layout/ItemCard/ItemCardGrid.test.tsx
+++ b/packages/core-components/src/layout/ItemCard/ItemCardGrid.test.tsx
@@ -27,24 +27,26 @@ describe('<ItemCardGrid />', () => {
         <Card>Hello!</Card>
       </ItemCardGrid>,
     );
-    expect(screen.getByRole('grid')).toBeInTheDocument();
     expect(screen.getByText('Hello!')).toBeInTheDocument();
   });
 
   it('renders custom styles', async () => {
     await renderInTestApp(
       <>
-        <ItemCardGrid>
+        <ItemCardGrid data-testid="cards-hello">
           <Card>Hello!</Card>
         </ItemCardGrid>
-        <ItemCardGrid classes={{ root: 'my-css-class' }}>
+        <ItemCardGrid
+          data-testid="cards-goodbye"
+          classes={{ root: 'my-css-class' }}
+        >
           <Card>Goodbye!</Card>
         </ItemCardGrid>
       </>,
     );
-    expect(screen.getAllByRole('grid')[0]).toHaveStyle({
+    expect(screen.getByTestId('cards-hello')).toHaveStyle({
       gridTemplateColumns: 'repeat(auto-fill, minmax(22em, 1fr))',
     });
-    expect(screen.getAllByRole('grid')[1]).toHaveClass('my-css-class');
+    expect(screen.getByTestId('cards-goodbye')).toHaveClass('my-css-class');
   });
 });
diff --git a/packages/core-components/src/layout/ItemCard/ItemCardGrid.tsx b/packages/core-components/src/layout/ItemCard/ItemCardGrid.tsx
index 815bfffa2c..137c48d272 100644
--- a/packages/core-components/src/layout/ItemCard/ItemCardGrid.tsx
+++ b/packages/core-components/src/layout/ItemCard/ItemCardGrid.tsx
@@ -51,12 +51,12 @@ export type ItemCardGridProps = Partial<WithStyles<typeof styles>> & {
  * This can be useful for e.g. overriding gridTemplateColumns to adapt the
  * minimum size of the cells to fit the content better.
  */
-export const ItemCardGrid = (props: ItemCardGridProps) => {
+export function ItemCardGrid(props: ItemCardGridProps) {
   const { children, ...otherProps } = props;
   const classes = useStyles(otherProps);
   return (
-    <div role="grid" className={classes.root} {...otherProps}>
+    <div className={classes.root} {...otherProps}>
       {children}
     </div>
   );
-};
+}
diff --git a/packages/core-components/src/layout/ItemCard/ItemCardHeader.tsx b/packages/core-components/src/layout/ItemCard/ItemCardHeader.tsx
index 6f8b17701d..15a1a7d78b 100644
--- a/packages/core-components/src/layout/ItemCard/ItemCardHeader.tsx
+++ b/packages/core-components/src/layout/ItemCard/ItemCardHeader.tsx
@@ -17,18 +17,18 @@
 import {
   createStyles,
   makeStyles,
-  Theme,
   Typography,
   WithStyles,
 } from '@material-ui/core';
 import React from 'react';
+import { BackstageTheme } from '../../../../theme/src';
 
-const styles = (theme: Theme) =>
+const styles = (theme: BackstageTheme) =>
   createStyles({
     root: {
       color: theme.palette.common.white,
       padding: theme.spacing(2, 2, 3),
-      backgroundImage: 'linear-gradient(-137deg,  #4BB8A5 0%,  #187656 100%)',
+      backgroundImage: theme.palette.bursts.gradient.linear,
       backgroundPosition: 0,
       backgroundSize: 'inherit',
     },
@@ -72,7 +72,7 @@ export type ItemCardHeaderProps = Partial<WithStyles<typeof styles>> & {
  *   <ItemCardHeader title="Hello" classes={{ root: myClassName }} />
  * </code>
  */
-export const ItemCardHeader = (props: ItemCardHeaderProps) => {
+export function ItemCardHeader(props: ItemCardHeaderProps) {
   const { title, subtitle, children } = props;
   const classes = useStyles(props);
   return (
@@ -90,4 +90,4 @@ export const ItemCardHeader = (props: ItemCardHeaderProps) => {
       {children}
     </div>
   );
-};
+}
diff --git a/packages/core-components/src/layout/Page/Page.stories.tsx b/packages/core-components/src/layout/Page/Page.stories.tsx
index 0ea4303f2f..3ad9ecfe72 100644
--- a/packages/core-components/src/layout/Page/Page.stories.tsx
+++ b/packages/core-components/src/layout/Page/Page.stories.tsx
@@ -117,7 +117,7 @@ const DataGrid = () => (
         xs={12}
         container
         spacing={2}
-        justify="space-between"
+        justifyContent="space-between"
         direction="row"
       >
         <Grid item xs={12} md={6}>
diff --git a/packages/core-components/src/layout/Page/Page.tsx b/packages/core-components/src/layout/Page/Page.tsx
index 8d1dfe2943..b838693a3c 100644
--- a/packages/core-components/src/layout/Page/Page.tsx
+++ b/packages/core-components/src/layout/Page/Page.tsx
@@ -23,7 +23,7 @@ const useStyles = makeStyles(() => ({
     display: 'grid',
     gridTemplateAreas:
       "'pageHeader pageHeader pageHeader' 'pageSubheader pageSubheader pageSubheader' 'pageNav pageContent pageSidebar'",
-    gridTemplateRows: 'auto auto 1fr',
+    gridTemplateRows: 'max-content auto 1fr',
     gridTemplateColumns: 'auto 1fr auto',
     height: '100vh',
     overflowY: 'auto',
@@ -34,7 +34,8 @@ type Props = {
   themeId: string;
 };
 
-export const Page = ({ themeId, children }: PropsWithChildren<Props>) => {
+export function Page(props: PropsWithChildren<Props>) {
+  const { themeId, children } = props;
   const classes = useStyles();
   return (
     <ThemeProvider
@@ -46,4 +47,4 @@ export const Page = ({ themeId, children }: PropsWithChildren<Props>) => {
       <div className={classes.root}>{children}</div>
     </ThemeProvider>
   );
-};
+}
diff --git a/packages/docgen/src/docgen/sortSelector.ts b/packages/core-components/src/layout/Page/PageWithHeader.tsx
similarity index 57%
rename from packages/docgen/src/docgen/sortSelector.ts
rename to packages/core-components/src/layout/Page/PageWithHeader.tsx
index e8cb577ba5..541b655dff 100644
--- a/packages/docgen/src/docgen/sortSelector.ts
+++ b/packages/core-components/src/layout/Page/PageWithHeader.tsx
@@ -14,20 +14,21 @@
  * limitations under the License.
  */
 
-/**
- * The sortSelector is a utility that makes a sort function by selecting the value to sort on with a lambda.
- */
-export default function sortSelector<T>(
-  selector: (x: T) => any,
-): (a: T, b: T) => -1 | 1 | 0 {
-  return (a: T, b: T) => {
-    const aV = selector(a);
-    const bV = selector(b);
-    if (aV < bV) {
-      return -1;
-    } else if (aV > bV) {
-      return 1;
-    }
-    return 0;
-  };
+import React, { PropsWithChildren, ComponentProps } from 'react';
+
+import { Header } from '../Header';
+import { Page } from './Page';
+
+type PageWithHeaderProps = ComponentProps<typeof Header> & {
+  themeId: string;
+};
+
+export function PageWithHeader(props: PropsWithChildren<PageWithHeaderProps>) {
+  const { themeId, children, ...restProps } = props;
+  return (
+    <Page themeId={themeId}>
+      <Header {...restProps} />
+      {children}
+    </Page>
+  );
 }
diff --git a/packages/core-components/src/layout/Page/index.ts b/packages/core-components/src/layout/Page/index.ts
index d2523e8467..91db73657e 100644
--- a/packages/core-components/src/layout/Page/index.ts
+++ b/packages/core-components/src/layout/Page/index.ts
@@ -15,3 +15,4 @@
  */
 
 export { Page } from './Page';
+export { PageWithHeader } from './PageWithHeader';
diff --git a/packages/core-components/src/layout/Sidebar/Bar.tsx b/packages/core-components/src/layout/Sidebar/Bar.tsx
index 65da4d2d75..8855f01104 100644
--- a/packages/core-components/src/layout/Sidebar/Bar.tsx
+++ b/packages/core-components/src/layout/Sidebar/Bar.tsx
@@ -42,6 +42,7 @@ const useStyles = makeStyles<BackstageTheme>(theme => ({
     msOverflowStyle: 'none',
     scrollbarWidth: 'none',
     width: sidebarConfig.drawerWidthClosed,
+    borderRight: `1px solid #383838`,
     transition: theme.transitions.create('width', {
       easing: theme.transitions.easing.sharp,
       duration: theme.transitions.duration.shortest,
@@ -60,14 +61,11 @@ const useStyles = makeStyles<BackstageTheme>(theme => ({
       duration: theme.transitions.duration.shorter,
     }),
   },
-  drawerPeek: {
-    width: sidebarConfig.drawerWidthClosed + 4,
-  },
 }));
 
 enum State {
   Closed,
-  Peek,
+  Idle,
   Open,
 }
 
@@ -76,11 +74,12 @@ type Props = {
   closeDelayMs?: number;
 };
 
-export const Sidebar = ({
-  openDelayMs = sidebarConfig.defaultOpenDelayMs,
-  closeDelayMs = sidebarConfig.defaultCloseDelayMs,
-  children,
-}: PropsWithChildren<Props>) => {
+export function Sidebar(props: PropsWithChildren<Props>) {
+  const {
+    openDelayMs = sidebarConfig.defaultOpenDelayMs,
+    closeDelayMs = sidebarConfig.defaultCloseDelayMs,
+    children,
+  } = props;
   const classes = useStyles();
   const isSmallScreen = useMediaQuery<BackstageTheme>(theme =>
     theme.breakpoints.down('md'),
@@ -103,7 +102,7 @@ export const Sidebar = ({
         setState(State.Open);
       }, openDelayMs);
 
-      setState(State.Peek);
+      setState(State.Idle);
     }
   };
 
@@ -115,7 +114,7 @@ export const Sidebar = ({
       clearTimeout(hoverTimerRef.current);
       hoverTimerRef.current = undefined;
     }
-    if (state === State.Peek) {
+    if (state === State.Idle) {
       setState(State.Closed);
     } else if (state === State.Open) {
       hoverTimerRef.current = window.setTimeout(() => {
@@ -143,7 +142,6 @@ export const Sidebar = ({
       >
         <div
           className={clsx(classes.drawer, {
-            [classes.drawerPeek]: state === State.Peek,
             [classes.drawerOpen]: isOpen,
           })}
         >
@@ -152,4 +150,4 @@ export const Sidebar = ({
       </SidebarContext.Provider>
     </div>
   );
-};
+}
diff --git a/packages/core-components/src/layout/Sidebar/Intro.tsx b/packages/core-components/src/layout/Sidebar/Intro.tsx
index 1d46239865..45098b49e1 100644
--- a/packages/core-components/src/layout/Sidebar/Intro.tsx
+++ b/packages/core-components/src/layout/Sidebar/Intro.tsx
@@ -74,7 +74,7 @@ type IntroCardProps = {
   onClose: () => void;
 };
 
-export const IntroCard = (props: IntroCardProps) => {
+export function IntroCard(props: IntroCardProps) {
   const classes = useStyles();
   const { text, onClose } = props;
   const handleClose = () => onClose();
@@ -97,7 +97,7 @@ export const IntroCard = (props: IntroCardProps) => {
       </div>
     </div>
   );
-};
+}
 
 type SidebarIntroLocalStorage = {
   starredItemsDismissed: boolean;
@@ -127,16 +127,14 @@ Keep an eye out for the little star icon (⭐) next to the plugin name and give
 const recentlyViewedIntroText =
   'And your recently viewed plugins will pop up here!';
 
-export const SidebarIntro = () => {
+export function SidebarIntro(_props: {}) {
   const { isOpen } = useContext(SidebarContext);
   const defaultValue = {
     starredItemsDismissed: false,
     recentlyViewedItemsDismissed: false,
   };
-  const [
-    dismissedIntro,
-    setDismissedIntro,
-  ] = useLocalStorage<SidebarIntroLocalStorage>(SIDEBAR_INTRO_LOCAL_STORAGE);
+  const [dismissedIntro, setDismissedIntro] =
+    useLocalStorage<SidebarIntroLocalStorage>(SIDEBAR_INTRO_LOCAL_STORAGE);
 
   const { starredItemsDismissed, recentlyViewedItemsDismissed } =
     dismissedIntro ?? {};
@@ -179,4 +177,4 @@ export const SidebarIntro = () => {
       )}
     </>
   );
-};
+}
diff --git a/packages/core-components/src/layout/Sidebar/Items.tsx b/packages/core-components/src/layout/Sidebar/Items.tsx
index 28abbce53c..b3acc36f98 100644
--- a/packages/core-components/src/layout/Sidebar/Items.tsx
+++ b/packages/core-components/src/layout/Sidebar/Items.tsx
@@ -34,7 +34,12 @@ import React, {
   useContext,
   useState,
 } from 'react';
-import { NavLink, NavLinkProps } from 'react-router-dom';
+import {
+  Link,
+  NavLinkProps,
+  useLocation,
+  useResolvedPath,
+} from 'react-router-dom';
 import { sidebarConfig, SidebarContext } from './config';
 
 const useStyles = makeStyles<BackstageTheme>(theme => {
@@ -44,7 +49,6 @@ const useStyles = makeStyles<BackstageTheme>(theme => {
     drawerWidthOpen,
     iconContainerWidth,
   } = sidebarConfig;
-
   return {
     root: {
       color: theme.palette.navigation.color,
@@ -97,6 +101,9 @@ const useStyles = makeStyles<BackstageTheme>(theme => {
       fontWeight: 'bold',
       fontSize: theme.typography.fontSize,
     },
+    searchFieldHTMLInput: {
+      padding: `${theme.spacing(2)} 0 ${theme.spacing(2)}`,
+    },
     searchContainer: {
       width: drawerWidthOpen - iconContainerWidth,
     },
@@ -145,6 +152,54 @@ function isButtonItem(
   return (props as SidebarItemLinkProps).to === undefined;
 }
 
+// TODO(Rugvip): Remove this once NavLink is updated in react-router-dom.
+//               This is needed because react-router doesn't handle the path comparison
+//               properly yet, matching for example /foobar with /foo.
+export const WorkaroundNavLink = React.forwardRef<
+  HTMLAnchorElement,
+  NavLinkProps
+>(function WorkaroundNavLinkWithRef(
+  {
+    to,
+    end,
+    style,
+    className,
+    activeStyle,
+    caseSensitive,
+    activeClassName = 'active',
+    'aria-current': ariaCurrentProp = 'page',
+    ...rest
+  },
+  ref,
+) {
+  let { pathname: locationPathname } = useLocation();
+  let { pathname: toPathname } = useResolvedPath(to);
+
+  if (!caseSensitive) {
+    locationPathname = locationPathname.toLowerCase();
+    toPathname = toPathname.toLowerCase();
+  }
+
+  let isActive = locationPathname === toPathname;
+  if (!isActive && !end) {
+    // This is the behavior that is different from the original NavLink
+    isActive = locationPathname.startsWith(`${toPathname}/`);
+  }
+
+  const ariaCurrent = isActive ? ariaCurrentProp : undefined;
+
+  return (
+    <Link
+      {...rest}
+      to={to}
+      ref={ref}
+      aria-current={ariaCurrent}
+      style={{ ...style, ...(isActive ? activeStyle : undefined) }}
+      className={clsx([className, isActive ? activeClassName : undefined])}
+    />
+  );
+});
+
 export const SidebarItem = forwardRef<any, SidebarItemProps>((props, ref) => {
   const {
     icon: Icon,
@@ -165,7 +220,7 @@ export const SidebarItem = forwardRef<any, SidebarItemProps>((props, ref) => {
     <Badge
       color="secondary"
       variant="dot"
-      overlap="circle"
+      overlap="circular"
       invisible={!hasNotifications}
     >
       <Icon fontSize="small" />
@@ -202,22 +257,23 @@ export const SidebarItem = forwardRef<any, SidebarItemProps>((props, ref) => {
 
   if (isButtonItem(props)) {
     return (
-      <button {...childProps} ref={ref}>
+      <button aria-label={text} {...childProps} ref={ref}>
         {content}
       </button>
     );
   }
 
   return (
-    <NavLink
+    <WorkaroundNavLink
       {...childProps}
       activeClassName={classes.selected}
       to={props.to}
       ref={ref}
+      aria-label={text ? text : props.to}
       {...navLinkProps}
     >
       {content}
-    </NavLink>
+    </WorkaroundNavLink>
   );
 });
 
@@ -226,7 +282,7 @@ type SidebarSearchFieldProps = {
   to?: string;
 };
 
-export const SidebarSearchField = (props: SidebarSearchFieldProps) => {
+export function SidebarSearchField(props: SidebarSearchFieldProps) {
   const [input, setInput] = useState('');
   const classes = useStyles();
 
@@ -271,11 +327,14 @@ export const SidebarSearchField = (props: SidebarSearchFieldProps) => {
             disableUnderline: true,
             className: classes.searchField,
           }}
+          inputProps={{
+            className: classes.searchFieldHTMLInput,
+          }}
         />
       </SidebarItem>
     </div>
   );
-};
+}
 
 export const SidebarSpace = styled('div')({
   flex: 1,
diff --git a/packages/core-components/src/layout/Sidebar/Page.tsx b/packages/core-components/src/layout/Sidebar/Page.tsx
index 0ace7468ef..47c5878cde 100644
--- a/packages/core-components/src/layout/Sidebar/Page.tsx
+++ b/packages/core-components/src/layout/Sidebar/Page.tsx
@@ -49,7 +49,7 @@ export const SidebarPinStateContext = createContext<SidebarPinStateContextType>(
   },
 );
 
-export const SidebarPage = (props: PropsWithChildren<{}>) => {
+export function SidebarPage(props: PropsWithChildren<{}>) {
   const [isPinned, setIsPinned] = useState(() =>
     LocalStorage.getSidebarPinState(),
   );
@@ -71,4 +71,4 @@ export const SidebarPage = (props: PropsWithChildren<{}>) => {
       <div className={classes.root}>{props.children}</div>
     </SidebarPinStateContext.Provider>
   );
-};
+}
diff --git a/packages/core-components/src/layout/Sidebar/Sidebar.stories.tsx b/packages/core-components/src/layout/Sidebar/Sidebar.stories.tsx
index 40921a8159..aee5c70b43 100644
--- a/packages/core-components/src/layout/Sidebar/Sidebar.stories.tsx
+++ b/packages/core-components/src/layout/Sidebar/Sidebar.stories.tsx
@@ -44,7 +44,7 @@ const handleSearch = (input: string) => {
 
 export const SampleSidebar = () => (
   <Sidebar>
-    <SidebarSearchField onSearch={handleSearch} />
+    <SidebarSearchField onSearch={handleSearch} to="/search" />
     <SidebarDivider />
     <SidebarItem icon={HomeOutlinedIcon} to="#" text="Home" />
     <SidebarItem icon={HomeOutlinedIcon} to="#" text="Plugins" />
diff --git a/packages/core-components/src/layout/Sidebar/config.ts b/packages/core-components/src/layout/Sidebar/config.ts
index 3d574d03bb..d2a690e38f 100644
--- a/packages/core-components/src/layout/Sidebar/config.ts
+++ b/packages/core-components/src/layout/Sidebar/config.ts
@@ -25,7 +25,7 @@ export const sidebarConfig = {
   drawerWidthOpen: 224,
   // As per NN/g's guidance on timing for exposing hidden content
   // See https://www.nngroup.com/articles/timing-exposing-content/
-  defaultOpenDelayMs: 300,
+  defaultOpenDelayMs: 100,
   defaultCloseDelayMs: 0,
   defaultFadeDuration: 200,
   logoHeight: 32,
diff --git a/packages/core-components/src/layout/SignInPage/SignInPage.tsx b/packages/core-components/src/layout/SignInPage/SignInPage.tsx
index 1ccce80e59..e0d4f6ed0d 100644
--- a/packages/core-components/src/layout/SignInPage/SignInPage.tsx
+++ b/packages/core-components/src/layout/SignInPage/SignInPage.tsx
@@ -70,7 +70,7 @@ export const MultiSignInPage = ({
         {title && <ContentHeader title={title} textAlign={align} />}
         <Grid
           container
-          justify={align === 'center' ? align : 'flex-start'}
+          justifyContent={align === 'center' ? align : 'flex-start'}
           spacing={2}
           component="ul"
           classes={classes}
@@ -130,7 +130,9 @@ export const SingleSignInPage = ({
           userId: identity!.id,
           profile: profile!,
           getIdToken: () => {
-            return authApi.getBackstageIdentity().then(i => i!.idToken);
+            return authApi
+              .getBackstageIdentity()
+              .then(i => i!.token ?? i!.idToken);
           },
           signOut: async () => {
             await authApi.signOut();
@@ -152,7 +154,7 @@ export const SingleSignInPage = ({
       <Content>
         <Grid
           container
-          justify="center"
+          justifyContent="center"
           spacing={2}
           component="ul"
           classes={classes}
@@ -190,10 +192,10 @@ export const SingleSignInPage = ({
   );
 };
 
-export const SignInPage = (props: Props) => {
+export function SignInPage(props: Props) {
   if ('provider' in props) {
     return <SingleSignInPage {...props} />;
   }
 
   return <MultiSignInPage {...props} />;
-};
+}
diff --git a/packages/core-components/src/layout/SignInPage/auth0Provider.tsx b/packages/core-components/src/layout/SignInPage/auth0Provider.tsx
index f105cd4716..518304d58c 100644
--- a/packages/core-components/src/layout/SignInPage/auth0Provider.tsx
+++ b/packages/core-components/src/layout/SignInPage/auth0Provider.tsx
@@ -40,7 +40,7 @@ const Component: ProviderComponent = ({ onResult }) => {
         userId: identity!.id,
         profile: profile!,
         getIdToken: () =>
-          auth0AuthApi.getBackstageIdentity().then(i => i!.idToken),
+          auth0AuthApi.getBackstageIdentity().then(i => i!.token ?? i!.idToken),
         signOut: async () => {
           await auth0AuthApi.signOut();
         },
@@ -82,7 +82,8 @@ const loader: ProviderLoader = async apis => {
   return {
     userId: identity.id,
     profile: profile!,
-    getIdToken: () => auth0AuthApi.getBackstageIdentity().then(i => i!.idToken),
+    getIdToken: () =>
+      auth0AuthApi.getBackstageIdentity().then(i => i!.token ?? i!.idToken),
     signOut: async () => {
       await auth0AuthApi.signOut();
     },
diff --git a/packages/core-components/src/layout/SignInPage/commonProvider.tsx b/packages/core-components/src/layout/SignInPage/commonProvider.tsx
index bd46e6fa58..0c5d195b1d 100644
--- a/packages/core-components/src/layout/SignInPage/commonProvider.tsx
+++ b/packages/core-components/src/layout/SignInPage/commonProvider.tsx
@@ -86,7 +86,8 @@ const loader: ProviderLoader = async (apis, apiRef) => {
   return {
     userId: identity.id,
     profile: profile!,
-    getIdToken: () => authApi.getBackstageIdentity().then(i => i!.idToken),
+    getIdToken: () =>
+      authApi.getBackstageIdentity().then(i => i!.token ?? i!.idToken),
     signOut: async () => {
       await authApi.signOut();
     },
diff --git a/packages/core-components/src/layout/SignInPage/customProvider.tsx b/packages/core-components/src/layout/SignInPage/customProvider.tsx
index e8f7d03a1d..98753ad444 100644
--- a/packages/core-components/src/layout/SignInPage/customProvider.tsx
+++ b/packages/core-components/src/layout/SignInPage/customProvider.tsx
@@ -15,7 +15,7 @@
  */
 
 import React from 'react';
-import { useForm } from 'react-hook-form';
+import { useForm, UseFormRegisterReturn } from 'react-hook-form';
 import {
   Typography,
   Button,
@@ -48,12 +48,21 @@ type Data = {
   idToken?: string;
 };
 
+const asInputRef = (renderResult: UseFormRegisterReturn) => {
+  const { ref, ...rest } = renderResult;
+  return {
+    inputRef: ref,
+    ...rest,
+  };
+};
 const Component: ProviderComponent = ({ onResult }) => {
   const classes = useFormStyles();
-  const { register, handleSubmit, errors, formState } = useForm<Data>({
+  const { register, handleSubmit, formState } = useForm<Data>({
     mode: 'onChange',
   });
 
+  const { errors } = formState;
+
   const handleResult = ({ userId, idToken }: Data) => {
     onResult({
       userId,
@@ -76,11 +85,10 @@ const Component: ProviderComponent = ({ onResult }) => {
         <form className={classes.form} onSubmit={handleSubmit(handleResult)}>
           <FormControl>
             <TextField
-              name="userId"
+              {...asInputRef(register('userId', { required: true }))}
               label="User ID"
               margin="normal"
               error={Boolean(errors.userId)}
-              inputRef={register({ required: true })}
             />
             {errors.userId && (
               <FormHelperText error>{errors.userId.message}</FormHelperText>
@@ -88,18 +96,19 @@ const Component: ProviderComponent = ({ onResult }) => {
           </FormControl>
           <FormControl>
             <TextField
-              name="idToken"
+              {...asInputRef(
+                register('idToken', {
+                  required: false,
+                  validate: token =>
+                    !token ||
+                    ID_TOKEN_REGEX.test(token) ||
+                    'Token is not a valid OpenID Connect JWT Token',
+                }),
+              )}
               label="ID Token (optional)"
               margin="normal"
               autoComplete="off"
               error={Boolean(errors.idToken)}
-              inputRef={register({
-                required: false,
-                validate: token =>
-                  !token ||
-                  ID_TOKEN_REGEX.test(token) ||
-                  'Token is not a valid OpenID Connect JWT Token',
-              })}
             />
             {errors.idToken && (
               <FormHelperText error>{errors.idToken.message}</FormHelperText>
diff --git a/packages/core-components/src/layout/TabbedCard/TabbedCard.tsx b/packages/core-components/src/layout/TabbedCard/TabbedCard.tsx
index 41b39984a5..f350b24f1d 100644
--- a/packages/core-components/src/layout/TabbedCard/TabbedCard.tsx
+++ b/packages/core-components/src/layout/TabbedCard/TabbedCard.tsx
@@ -62,15 +62,16 @@ type Props = {
   deepLink?: BottomLinkProps;
 };
 
-const TabbedCard = ({
-  slackChannel,
-  errorBoundaryProps,
-  children,
-  title,
-  deepLink,
-  value,
-  onChange,
-}: PropsWithChildren<Props>) => {
+export function TabbedCard(props: PropsWithChildren<Props>) {
+  const {
+    slackChannel,
+    errorBoundaryProps,
+    children,
+    title,
+    deepLink,
+    value,
+    onChange,
+  } = props;
   const tabsClasses = useTabsStyles();
   const [selectedIndex, selectIndex] = useState(0);
 
@@ -98,6 +99,7 @@ const TabbedCard = ({
       <ErrorBoundary {...errProps}>
         {title && <BoldHeader title={title} />}
         <Tabs
+          selectionFollowsFocus
           classes={tabsClasses}
           value={value || selectedIndex}
           onChange={handleChange}
@@ -110,7 +112,7 @@ const TabbedCard = ({
       </ErrorBoundary>
     </Card>
   );
-};
+}
 
 const useCardTabStyles = makeStyles(theme => ({
   root: {
@@ -119,6 +121,11 @@ const useCardTabStyles = makeStyles(theme => ({
     margin: theme.spacing(0, 2, 0, 0),
     padding: theme.spacing(0.5, 0, 0.5, 0),
     textTransform: 'none',
+    '&:hover': {
+      opacity: 1,
+      backgroundColor: 'transparent',
+      color: theme.palette.text.primary,
+    },
   },
   selected: {
     fontWeight: 'bold',
@@ -129,10 +136,9 @@ type CardTabProps = TabProps & {
   children: ReactNode;
 };
 
-const CardTab = ({ children, ...props }: PropsWithChildren<CardTabProps>) => {
+export function CardTab(props: PropsWithChildren<CardTabProps>) {
+  const { children, ...restProps } = props;
   const classes = useCardTabStyles();
 
-  return <Tab disableRipple classes={classes} {...props} />;
-};
-
-export { TabbedCard, CardTab };
+  return <Tab disableRipple classes={classes} {...restProps} />;
+}
diff --git a/packages/core-plugin-api/CHANGELOG.md b/packages/core-plugin-api/CHANGELOG.md
index 740f42708f..4cd9b4ade7 100644
--- a/packages/core-plugin-api/CHANGELOG.md
+++ b/packages/core-plugin-api/CHANGELOG.md
@@ -1,5 +1,40 @@
 # @backstage/core-plugin-api
 
+## 0.1.7
+
+### Patch Changes
+
+- 3d238b028: Migrated component data attachment method to have better compatibility with component proxies such as `react-hot-loader`.
+- Updated dependencies
+  - @backstage/config@0.1.9
+
+## 0.1.6
+
+### Patch Changes
+
+- 56c773909: Switched `@types/react` dependency to request `*` rather than a specific version.
+
+## 0.1.5
+
+### Patch Changes
+
+- c4d8ff963: Switched frontend identity code to use `token` instead of the deprecated `idToken` field
+- Updated dependencies
+  - @backstage/config@0.1.6
+
+## 0.1.4
+
+### Patch Changes
+
+- 9d40fcb1e: - Bumping `material-ui/core` version to at least `4.12.2` as they made some breaking changes in later versions which broke `Pagination` of the `Table`.
+  - Switching out `material-table` to `@material-table/core` for support for the later versions of `material-ui/core`
+  - This causes a minor API change to `@backstage/core-components` as the interface for `Table` re-exports the `prop` from the underlying `Table` components.
+  - `onChangeRowsPerPage` has been renamed to `onRowsPerPageChange`
+  - `onChangePage` has been renamed to `onPageChange`
+  - Migration guide is here: https://material-table-core.com/docs/breaking-changes
+- Updated dependencies
+  - @backstage/theme@0.2.9
+
 ## 0.1.3
 
 ### Patch Changes
diff --git a/packages/core-plugin-api/api-report.md b/packages/core-plugin-api/api-report.md
index f3cb134fe1..b87e4511d2 100644
--- a/packages/core-plugin-api/api-report.md
+++ b/packages/core-plugin-api/api-report.md
@@ -13,21 +13,29 @@ import { ReactElement } from 'react';
 import { ReactNode } from 'react';
 import { SvgIconProps } from '@material-ui/core';
 
+// Warning: (ae-missing-release-tag) "AlertApi" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public
 export type AlertApi = {
   post(alert: AlertMessage): void;
   alert$(): Observable<AlertMessage>;
 };
 
+// Warning: (ae-missing-release-tag) "alertApiRef" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export const alertApiRef: ApiRef<AlertApi>;
 
+// Warning: (ae-missing-release-tag) "AlertMessage" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export type AlertMessage = {
   message: string;
   severity?: 'success' | 'info' | 'warning' | 'error';
 };
 
+// Warning: (ae-missing-release-tag) "AnyApiFactory" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export type AnyApiFactory = ApiFactory<
   unknown,
@@ -37,45 +45,59 @@ export type AnyApiFactory = ApiFactory<
   }
 >;
 
+// Warning: (ae-missing-release-tag) "AnyApiRef" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export type AnyApiRef = ApiRef<unknown>;
 
+// Warning: (ae-missing-release-tag) "ApiFactory" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export type ApiFactory<
   Api,
   Impl extends Api,
   Deps extends {
     [name in string]: unknown;
-  }
+  },
 > = {
   api: ApiRef<Api>;
   deps: TypesToApiRefs<Deps>;
   factory(deps: Deps): Impl;
 };
 
+// Warning: (ae-missing-release-tag) "ApiHolder" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export type ApiHolder = {
   get<T>(api: ApiRef<T>): T | undefined;
 };
 
+// Warning: (ae-missing-release-tag) "ApiRef" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export type ApiRef<T> = {
   id: string;
   T: T;
 };
 
+// Warning: (ae-missing-release-tag) "ApiRefsToTypes" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export type ApiRefsToTypes<
   T extends {
     [key in string]: ApiRef<unknown>;
-  }
+  },
 > = {
   [key in keyof T]: ApiRefType<T[key]>;
 };
 
+// Warning: (ae-missing-release-tag) "ApiRefType" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export type ApiRefType<T> = T extends ApiRef<infer U> ? U : never;
 
+// Warning: (ae-missing-release-tag) "AppComponents" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export type AppComponents = {
   NotFoundErrorPage: ComponentType<{}>;
@@ -86,6 +108,8 @@ export type AppComponents = {
   SignInPage?: ComponentType<SignInPageProps>;
 };
 
+// Warning: (ae-missing-release-tag) "AppContext" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export type AppContext = {
   getPlugins(): BackstagePlugin<any, any>[];
@@ -93,6 +117,8 @@ export type AppContext = {
   getComponents(): AppComponents;
 };
 
+// Warning: (ae-missing-release-tag) "AppTheme" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public
 export type AppTheme = {
   id: string;
@@ -102,6 +128,8 @@ export type AppTheme = {
   icon?: React.ReactElement;
 };
 
+// Warning: (ae-missing-release-tag) "AppThemeApi" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public
 export type AppThemeApi = {
   getInstalledThemes(): AppTheme[];
@@ -110,9 +138,13 @@ export type AppThemeApi = {
   setActiveThemeId(themeId?: string): void;
 };
 
+// Warning: (ae-missing-release-tag) "appThemeApiRef" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export const appThemeApiRef: ApiRef<AppThemeApi>;
 
+// Warning: (ae-missing-release-tag) "attachComponentData" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export function attachComponentData<P>(
   component: ComponentType<P>,
@@ -120,40 +152,56 @@ export function attachComponentData<P>(
   data: unknown,
 ): void;
 
+// Warning: (ae-missing-release-tag) "auth0AuthApiRef" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public
 export const auth0AuthApiRef: ApiRef<
   OpenIdConnectApi & ProfileInfoApi & BackstageIdentityApi & SessionApi
 >;
 
+// Warning: (ae-missing-release-tag) "AuthProvider" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public
 export type AuthProvider = {
   title: string;
   icon: IconComponent;
 };
 
+// Warning: (ae-missing-release-tag) "AuthRequester" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public
 export type AuthRequester<AuthResponse> = (
   scopes: Set<string>,
 ) => Promise<AuthResponse>;
 
+// Warning: (ae-missing-release-tag) "AuthRequesterOptions" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public
 export type AuthRequesterOptions<AuthResponse> = {
   provider: AuthProvider;
   onAuthRequest(scopes: Set<string>): Promise<AuthResponse>;
 };
 
+// Warning: (ae-missing-release-tag) "AuthRequestOptions" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export type AuthRequestOptions = {
   optional?: boolean;
   instantPopup?: boolean;
 };
 
+// Warning: (ae-missing-release-tag) "BackstageIdentity" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export type BackstageIdentity = {
   id: string;
   idToken: string;
+  token: string;
 };
 
+// Warning: (tsdoc-undefined-tag) The TSDoc tag "@IdentityApi" is not defined in this configuration
+// Warning: (ae-missing-release-tag) "BackstageIdentityApi" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public
 export type BackstageIdentityApi = {
   getBackstageIdentity(
@@ -161,10 +209,14 @@ export type BackstageIdentityApi = {
   ): Promise<BackstageIdentity | undefined>;
 };
 
+// Warning: (ae-forgotten-export) The symbol "AnyRoutes" needs to be exported by the entry point index.d.ts
+// Warning: (ae-forgotten-export) The symbol "AnyExternalRoutes" needs to be exported by the entry point index.d.ts
+// Warning: (ae-missing-release-tag) "BackstagePlugin" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export type BackstagePlugin<
   Routes extends AnyRoutes = {},
-  ExternalRoutes extends AnyExternalRoutes = {}
+  ExternalRoutes extends AnyExternalRoutes = {},
 > = {
   getId(): string;
   output(): PluginOutput[];
@@ -174,25 +226,34 @@ export type BackstagePlugin<
   externalRoutes: ExternalRoutes;
 };
 
+// Warning: (ae-missing-release-tag) "BootErrorPageProps" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export type BootErrorPageProps = {
   step: 'load-config' | 'load-chunk';
   error: Error;
 };
 
+// Warning: (ae-missing-release-tag) "ConfigApi" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public
 export type ConfigApi = Config;
 
+// Warning: (ae-missing-release-tag) "configApiRef" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export const configApiRef: ApiRef<ConfigApi>;
 
+// Warning: (ae-missing-release-tag) "createApiFactory" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+// Warning: (ae-missing-release-tag) "createApiFactory" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public
 export function createApiFactory<
   Api,
   Impl extends Api,
   Deps extends {
     [name in string]: unknown;
-  }
+  },
 >(factory: ApiFactory<Api, Impl, Deps>): ApiFactory<Api, Impl, Deps>;
 
 // @public (undocumented)
@@ -201,54 +262,70 @@ export function createApiFactory<Api, Impl extends Api>(
   instance: Impl,
 ): ApiFactory<Api, Impl, {}>;
 
+// Warning: (ae-forgotten-export) The symbol "ApiRefConfig" needs to be exported by the entry point index.d.ts
+// Warning: (ae-missing-release-tag) "createApiRef" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export function createApiRef<T>(config: ApiRefConfig): ApiRef<T>;
 
+// Warning: (ae-missing-release-tag) "createComponentExtension" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export function createComponentExtension<
-  T extends (props: any) => JSX.Element | null
+  T extends (props: any) => JSX.Element | null,
 >(options: { component: ComponentLoader<T> }): Extension<T>;
 
+// Warning: (ae-forgotten-export) The symbol "OptionalParams" needs to be exported by the entry point index.d.ts
+// Warning: (ae-missing-release-tag) "createExternalRouteRef" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export function createExternalRouteRef<
   Params extends {
     [param in ParamKey]: string;
   },
   Optional extends boolean = false,
-  ParamKey extends string = never
+  ParamKey extends string = never,
 >(options: {
   id: string;
   params?: ParamKey[];
   optional?: Optional;
 }): ExternalRouteRef<OptionalParams<Params>, Optional>;
 
+// Warning: (ae-missing-release-tag) "createPlugin" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export function createPlugin<
   Routes extends AnyRoutes = {},
-  ExternalRoutes extends AnyExternalRoutes = {}
+  ExternalRoutes extends AnyExternalRoutes = {},
 >(
   config: PluginConfig<Routes, ExternalRoutes>,
 ): BackstagePlugin<Routes, ExternalRoutes>;
 
+// Warning: (ae-missing-release-tag) "createReactExtension" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export function createReactExtension<
-  T extends (props: any) => JSX.Element | null
+  T extends (props: any) => JSX.Element | null,
 >(options: {
   component: ComponentLoader<T>;
   data?: Record<string, unknown>;
 }): Extension<T>;
 
+// Warning: (ae-missing-release-tag) "createRoutableExtension" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export function createRoutableExtension<
-  T extends (props: any) => JSX.Element | null
+  T extends (props: any) => JSX.Element | null,
 >(options: { component: () => Promise<T>; mountPoint: RouteRef }): Extension<T>;
 
+// Warning: (ae-missing-release-tag) "createRouteRef" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export function createRouteRef<
   Params extends {
     [param in ParamKey]: string;
   },
-  ParamKey extends string = never
+  ParamKey extends string = never,
 >(config: {
   id?: string;
   params?: ParamKey[];
@@ -257,31 +334,42 @@ export function createRouteRef<
   title?: string;
 }): RouteRef<OptionalParams<Params>>;
 
+// Warning: (ae-forgotten-export) The symbol "AnyParams" needs to be exported by the entry point index.d.ts
+// Warning: (ae-forgotten-export) The symbol "MakeSubRouteRef" needs to be exported by the entry point index.d.ts
+// Warning: (ae-forgotten-export) The symbol "PathParams" needs to be exported by the entry point index.d.ts
+// Warning: (ae-missing-release-tag) "createSubRouteRef" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export function createSubRouteRef<
   Path extends string,
-  ParentParams extends AnyParams = never
+  ParentParams extends AnyParams = never,
 >(config: {
   id: string;
   path: Path;
   parent: RouteRef<ParentParams>;
 }): MakeSubRouteRef<PathParams<Path>, ParentParams>;
 
+// Warning: (ae-missing-release-tag) "DiscoveryApi" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public
 export type DiscoveryApi = {
   getBaseUrl(pluginId: string): Promise<string>;
 };
 
+// Warning: (ae-missing-release-tag) "discoveryApiRef" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export const discoveryApiRef: ApiRef<DiscoveryApi>;
 
+// Warning: (ae-missing-release-tag) "ElementCollection" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public
 export interface ElementCollection {
   findComponentData<T>(query: { key: string }): T[];
   getElements<
     Props extends {
       [name: string]: unknown;
-    }
+    },
   >(): Array<ReactElement<Props>>;
   selectByComponentData(query: {
     key: string;
@@ -289,6 +377,8 @@ export interface ElementCollection {
   }): ElementCollection;
 }
 
+// Warning: (ae-missing-release-tag) "ErrorApi" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public
 export type ErrorApi = {
   post(error: Error_2, context?: ErrorContext): void;
@@ -298,9 +388,13 @@ export type ErrorApi = {
   }>;
 };
 
+// Warning: (ae-missing-release-tag) "errorApiRef" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export const errorApiRef: ApiRef<ErrorApi>;
 
+// Warning: (ae-missing-release-tag) "ErrorBoundaryFallbackProps" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export type ErrorBoundaryFallbackProps = {
   plugin?: BackstagePlugin;
@@ -308,38 +402,50 @@ export type ErrorBoundaryFallbackProps = {
   resetError: () => void;
 };
 
+// Warning: (ae-missing-release-tag) "ErrorContext" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public
 export type ErrorContext = {
   hidden?: boolean;
 };
 
+// Warning: (ae-missing-release-tag) "Extension" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export type Extension<T> = {
   expose(plugin: BackstagePlugin<any, any>): T;
 };
 
+// Warning: (ae-missing-release-tag) "ExternalRouteRef" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export type ExternalRouteRef<
   Params extends AnyParams = any,
-  Optional extends boolean = any
+  Optional extends boolean = any,
 > = {
   readonly [routeRefType]: 'external';
   params: ParamKeys<Params>;
   optional?: Optional;
 };
 
+// Warning: (ae-missing-release-tag) "FeatureFlag" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public
 export type FeatureFlag = {
   name: string;
   pluginId: string;
 };
 
+// Warning: (ae-missing-release-tag) "FeatureFlagOutput" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export type FeatureFlagOutput = {
   type: 'feature-flag';
   name: string;
 };
 
+// Warning: (ae-missing-release-tag) "FeatureFlagsApi" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export interface FeatureFlagsApi {
   getRegisteredFlags(): FeatureFlag[];
@@ -348,20 +454,28 @@ export interface FeatureFlagsApi {
   save(options: FeatureFlagsSaveOptions): void;
 }
 
+// Warning: (ae-missing-release-tag) "featureFlagsApiRef" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export const featureFlagsApiRef: ApiRef<FeatureFlagsApi>;
 
+// Warning: (ae-missing-release-tag) "FeatureFlagsHooks" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export type FeatureFlagsHooks = {
   register(name: string): void;
 };
 
+// Warning: (ae-missing-release-tag) "FeatureFlagsSaveOptions" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public
 export type FeatureFlagsSaveOptions = {
   states: Record<string, FeatureFlagState>;
   merge?: boolean;
 };
 
+// Warning: (ae-missing-release-tag) "FeatureFlagState" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export enum FeatureFlagState {
   // (undocumented)
@@ -370,22 +484,30 @@ export enum FeatureFlagState {
   None = 0,
 }
 
+// Warning: (ae-missing-release-tag) "getComponentData" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export function getComponentData<T>(
   node: ReactNode,
   type: string,
 ): T | undefined;
 
+// Warning: (ae-missing-release-tag) "githubAuthApiRef" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public
 export const githubAuthApiRef: ApiRef<
   OAuthApi & ProfileInfoApi & BackstageIdentityApi & SessionApi
 >;
 
+// Warning: (ae-missing-release-tag) "gitlabAuthApiRef" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public
 export const gitlabAuthApiRef: ApiRef<
   OAuthApi & ProfileInfoApi & BackstageIdentityApi & SessionApi
 >;
 
+// Warning: (ae-missing-release-tag) "googleAuthApiRef" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public
 export const googleAuthApiRef: ApiRef<
   OAuthApi &
@@ -395,11 +517,15 @@ export const googleAuthApiRef: ApiRef<
     SessionApi
 >;
 
+// Warning: (ae-missing-release-tag) "IconComponent" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public
 export type IconComponent = ComponentType<{
   fontSize?: 'default' | 'small' | 'large';
 }>;
 
+// Warning: (ae-missing-release-tag) "IdentityApi" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public
 export type IdentityApi = {
   getUserId(): string;
@@ -408,9 +534,13 @@ export type IdentityApi = {
   signOut(): Promise<void>;
 };
 
+// Warning: (ae-missing-release-tag) "identityApiRef" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export const identityApiRef: ApiRef<IdentityApi>;
 
+// Warning: (ae-missing-release-tag) "microsoftAuthApiRef" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public
 export const microsoftAuthApiRef: ApiRef<
   OAuthApi &
@@ -420,6 +550,8 @@ export const microsoftAuthApiRef: ApiRef<
     SessionApi
 >;
 
+// Warning: (ae-missing-release-tag) "oauth2ApiRef" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public
 export const oauth2ApiRef: ApiRef<
   OAuthApi &
@@ -429,6 +561,8 @@ export const oauth2ApiRef: ApiRef<
     SessionApi
 >;
 
+// Warning: (ae-missing-release-tag) "OAuthApi" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public
 export type OAuthApi = {
   getAccessToken(
@@ -437,6 +571,8 @@ export type OAuthApi = {
   ): Promise<string>;
 };
 
+// Warning: (ae-missing-release-tag) "OAuthRequestApi" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public
 export type OAuthRequestApi = {
   createAuthRequester<AuthResponse>(
@@ -445,12 +581,18 @@ export type OAuthRequestApi = {
   authRequest$(): Observable<PendingAuthRequest[]>;
 };
 
+// Warning: (ae-missing-release-tag) "oauthRequestApiRef" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export const oauthRequestApiRef: ApiRef<OAuthRequestApi>;
 
+// Warning: (ae-missing-release-tag) "OAuthScope" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public
 export type OAuthScope = string | string[];
 
+// Warning: (ae-missing-release-tag) "Observable" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public
 export type Observable<T> = {
   [Symbol.observable](): Observable<T>;
@@ -462,6 +604,8 @@ export type Observable<T> = {
   ): Subscription;
 };
 
+// Warning: (ae-missing-release-tag) "Observer" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public
 export type Observer<T> = {
   next?(value: T): void;
@@ -469,6 +613,8 @@ export type Observer<T> = {
   complete?(): void;
 };
 
+// Warning: (ae-missing-release-tag) "oidcAuthApiRef" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public
 export const oidcAuthApiRef: ApiRef<
   OAuthApi &
@@ -478,6 +624,8 @@ export const oidcAuthApiRef: ApiRef<
     SessionApi
 >;
 
+// Warning: (ae-missing-release-tag) "oktaAuthApiRef" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public
 export const oktaAuthApiRef: ApiRef<
   OAuthApi &
@@ -487,6 +635,8 @@ export const oktaAuthApiRef: ApiRef<
     SessionApi
 >;
 
+// Warning: (ae-missing-release-tag) "oneloginAuthApiRef" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export const oneloginAuthApiRef: ApiRef<
   OAuthApi &
@@ -496,11 +646,15 @@ export const oneloginAuthApiRef: ApiRef<
     SessionApi
 >;
 
+// Warning: (ae-missing-release-tag) "OpenIdConnectApi" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public
 export type OpenIdConnectApi = {
   getIdToken(options?: AuthRequestOptions): Promise<string>;
 };
 
+// Warning: (ae-missing-release-tag) "PendingAuthRequest" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public
 export type PendingAuthRequest = {
   provider: AuthProvider;
@@ -508,10 +662,12 @@ export type PendingAuthRequest = {
   trigger(): Promise<void>;
 };
 
+// Warning: (ae-missing-release-tag) "PluginConfig" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export type PluginConfig<
   Routes extends AnyRoutes,
-  ExternalRoutes extends AnyExternalRoutes
+  ExternalRoutes extends AnyExternalRoutes,
 > = {
   id: string;
   apis?: Iterable<AnyApiFactory>;
@@ -520,14 +676,20 @@ export type PluginConfig<
   externalRoutes?: ExternalRoutes;
 };
 
+// Warning: (ae-missing-release-tag) "PluginHooks" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export type PluginHooks = {
   featureFlags: FeatureFlagsHooks;
 };
 
+// Warning: (ae-missing-release-tag) "PluginOutput" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export type PluginOutput = FeatureFlagOutput;
 
+// Warning: (ae-missing-release-tag) "ProfileInfo" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public
 export type ProfileInfo = {
   email?: string;
@@ -535,19 +697,27 @@ export type ProfileInfo = {
   picture?: string;
 };
 
+// Warning: (ae-missing-release-tag) "ProfileInfoApi" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public
 export type ProfileInfoApi = {
   getProfile(options?: AuthRequestOptions): Promise<ProfileInfo | undefined>;
 };
 
+// Warning: (ae-missing-release-tag) "RouteOptions" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export type RouteOptions = {
   exact?: boolean;
 };
 
+// Warning: (ae-missing-release-tag) "RoutePath" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export type RoutePath = string;
 
+// Warning: (ae-missing-release-tag) "RouteRef" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export type RouteRef<Params extends AnyParams = any> = {
   readonly [routeRefType]: 'absolute';
@@ -557,11 +727,15 @@ export type RouteRef<Params extends AnyParams = any> = {
   title?: string;
 };
 
+// Warning: (ae-missing-release-tag) "samlAuthApiRef" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public
 export const samlAuthApiRef: ApiRef<
   ProfileInfoApi & BackstageIdentityApi & SessionApi
 >;
 
+// Warning: (ae-missing-release-tag) "SessionApi" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public
 export type SessionApi = {
   signIn(): Promise<void>;
@@ -569,6 +743,8 @@ export type SessionApi = {
   sessionState$(): Observable<SessionState>;
 };
 
+// Warning: (ae-missing-release-tag) "SessionState" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public
 export enum SessionState {
   // (undocumented)
@@ -577,11 +753,15 @@ export enum SessionState {
   SignedOut = 'SignedOut',
 }
 
+// Warning: (ae-missing-release-tag) "SignInPageProps" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export type SignInPageProps = {
   onResult(result: SignInResult): void;
 };
 
+// Warning: (ae-missing-release-tag) "SignInResult" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export type SignInResult = {
   userId: string;
@@ -590,24 +770,45 @@ export type SignInResult = {
   signOut?: () => Promise<void>;
 };
 
+// Warning: (ae-missing-release-tag) "StorageApi" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export interface StorageApi {
+  // Warning: (tsdoc-param-tag-missing-hyphen) The @param block should be followed by a parameter name and then a hyphen
+  // Warning: (tsdoc-param-tag-with-invalid-type) The @param block should not include a JSDoc-style '{type}'
   forBucket(name: string): StorageApi;
+  // Warning: (tsdoc-param-tag-missing-hyphen) The @param block should be followed by a parameter name and then a hyphen
+  // Warning: (tsdoc-param-tag-with-invalid-type) The @param block should not include a JSDoc-style '{type}'
+  // Warning: (tsdoc-escape-right-brace) The "}" character should be escaped using a backslash to avoid confusion with a TSDoc inline tag
+  // Warning: (tsdoc-malformed-inline-tag) Expecting a TSDoc tag starting with "{@"
+  // Warning: (tsdoc-undefined-tag) The TSDoc tag "@return" is not defined in this configuration
   get<T>(key: string): T | undefined;
+  // Warning: (tsdoc-param-tag-missing-hyphen) The @param block should be followed by a parameter name and then a hyphen
+  // Warning: (tsdoc-param-tag-with-invalid-type) The @param block should not include a JSDoc-style '{type}'
   observe$<T>(key: string): Observable<StorageValueChange<T>>;
+  // Warning: (tsdoc-param-tag-missing-hyphen) The @param block should be followed by a parameter name and then a hyphen
+  // Warning: (tsdoc-param-tag-with-invalid-type) The @param block should not include a JSDoc-style '{type}'
   remove(key: string): Promise<void>;
+  // Warning: (tsdoc-param-tag-missing-hyphen) The @param block should be followed by a parameter name and then a hyphen
+  // Warning: (tsdoc-param-tag-with-invalid-type) The @param block should not include a JSDoc-style '{type}'
   set(key: string, data: any): Promise<void>;
 }
 
+// Warning: (ae-missing-release-tag) "storageApiRef" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export const storageApiRef: ApiRef<StorageApi>;
 
+// Warning: (ae-missing-release-tag) "StorageValueChange" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export type StorageValueChange<T = any> = {
   key: string;
   newValue?: T;
 };
 
+// Warning: (ae-missing-release-tag) "SubRouteRef" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export type SubRouteRef<Params extends AnyParams = any> = {
   readonly [routeRefType]: 'sub';
@@ -616,26 +817,38 @@ export type SubRouteRef<Params extends AnyParams = any> = {
   params: ParamKeys<Params>;
 };
 
+// Warning: (ae-missing-release-tag) "Subscription" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public
 export type Subscription = {
   unsubscribe(): void;
   readonly closed: boolean;
 };
 
+// Warning: (ae-missing-release-tag) "TypesToApiRefs" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export type TypesToApiRefs<T> = {
   [key in keyof T]: ApiRef<T[key]>;
 };
 
+// Warning: (ae-missing-release-tag) "useApi" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export function useApi<T>(apiRef: ApiRef<T>): T;
 
+// Warning: (ae-missing-release-tag) "useApiHolder" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export function useApiHolder(): ApiHolder;
 
+// Warning: (ae-missing-release-tag) "useApp" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export const useApp: () => AppContext;
 
+// Warning: (ae-missing-release-tag) "useElementFilter" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public
 export function useElementFilter<T>(
   node: ReactNode,
@@ -643,9 +856,15 @@ export function useElementFilter<T>(
   dependencies?: any[],
 ): T;
 
+// Warning: (ae-missing-release-tag) "UserFlags" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export type UserFlags = {};
 
+// Warning: (ae-forgotten-export) The symbol "RouteFunc" needs to be exported by the entry point index.d.ts
+// Warning: (ae-missing-release-tag) "useRouteRef" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+// Warning: (ae-missing-release-tag) "useRouteRef" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export function useRouteRef<Optional extends boolean, Params extends AnyParams>(
   routeRef: ExternalRouteRef<Params, Optional>,
@@ -656,20 +875,34 @@ export function useRouteRef<Params extends AnyParams>(
   routeRef: RouteRef<Params> | SubRouteRef<Params>,
 ): RouteFunc<Params>;
 
+// Warning: (ae-missing-release-tag) "useRouteRefParams" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export function useRouteRefParams<Params extends AnyParams>(
   _routeRef: RouteRef<Params> | SubRouteRef<Params>,
 ): Params;
 
+// Warning: (ae-missing-release-tag) "withApis" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
-export function withApis<T>(
-  apis: TypesToApiRefs<T>,
-): <P extends T>(
+export function withApis<T>(apis: TypesToApiRefs<T>): <P extends T>(
   WrappedComponent: React_2.ComponentType<P>,
 ) => {
   (props: React_2.PropsWithChildren<Omit<P, keyof T>>): JSX.Element;
   displayName: string;
 };
 
+// Warnings were encountered during analysis:
+//
+// src/apis/definitions/ErrorApi.d.ts:37:5 - (ae-forgotten-export) The symbol "Error" needs to be exported by the entry point index.d.ts
+// src/apis/definitions/auth.d.ts:29:8 - (tsdoc-undefined-tag) The TSDoc tag "@default" is not defined in this configuration
+// src/apis/definitions/auth.d.ts:38:8 - (tsdoc-undefined-tag) The TSDoc tag "@default" is not defined in this configuration
+// src/apis/definitions/auth.d.ts:96:68 - (tsdoc-undefined-tag) The TSDoc tag "@AuthRequestOptions" is not defined in this configuration
+// src/apis/definitions/auth.d.ts:110:16 - (tsdoc-undefined-tag) The TSDoc tag "@IdentityApi" is not defined in this configuration
+// src/apis/definitions/auth.d.ts:113:68 - (tsdoc-undefined-tag) The TSDoc tag "@AuthRequestOptions" is not defined in this configuration
+// src/extensions/extensions.d.ts:14:5 - (ae-forgotten-export) The symbol "ComponentLoader" needs to be exported by the entry point index.d.ts
+// src/routing/RouteRef.d.ts:34:5 - (ae-forgotten-export) The symbol "OldIconComponent" needs to be exported by the entry point index.d.ts
+// src/routing/types.d.ts:30:5 - (ae-forgotten-export) The symbol "ParamKeys" needs to be exported by the entry point index.d.ts
+
 // (No @packageDocumentation comment for this package)
 ```
diff --git a/packages/core-plugin-api/package.json b/packages/core-plugin-api/package.json
index 7b2aa3deea..d9380a3245 100644
--- a/packages/core-plugin-api/package.json
+++ b/packages/core-plugin-api/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@backstage/core-plugin-api",
   "description": "Core API used by Backstage plugins",
-  "version": "0.1.3",
+  "version": "0.1.7",
   "private": false,
   "publishConfig": {
     "access": "public",
@@ -29,10 +29,11 @@
     "clean": "backstage-cli clean"
   },
   "dependencies": {
-    "@backstage/config": "^0.1.3",
-    "@backstage/theme": "^0.2.8",
-    "@material-ui/core": "^4.11.0",
-    "@types/react": "^16.9",
+    "@backstage/config": "^0.1.9",
+    "@backstage/theme": "^0.2.9",
+    "@backstage/version-bridge": "^0.1.0",
+    "@material-ui/core": "^4.12.2",
+    "@types/react": "*",
     "history": "^5.0.0",
     "prop-types": "^15.7.2",
     "react": "^16.12.0",
@@ -41,10 +42,10 @@
     "zen-observable": "^0.8.15"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.7.2",
-    "@backstage/core-app-api": "^0.1.3",
-    "@backstage/test-utils": "^0.1.14",
-    "@backstage/test-utils-core": "^0.1.1",
+    "@backstage/cli": "^0.7.11",
+    "@backstage/core-app-api": "^0.1.12",
+    "@backstage/test-utils": "^0.1.17",
+    "@backstage/test-utils-core": "^0.1.2",
     "@testing-library/jest-dom": "^5.10.1",
     "@testing-library/react": "^11.2.5",
     "@testing-library/react-hooks": "^3.4.2",
diff --git a/packages/core-plugin-api/src/apis/definitions/auth.ts b/packages/core-plugin-api/src/apis/definitions/auth.ts
index c786b43fc3..c585619ba5 100644
--- a/packages/core-plugin-api/src/apis/definitions/auth.ts
+++ b/packages/core-plugin-api/src/apis/definitions/auth.ts
@@ -151,9 +151,14 @@ export type BackstageIdentity = {
   id: string;
 
   /**
-   * An ID token that can be used to authenticate the user within Backstage.
+   * @deprecated This is deprecated, use `token` instead.
    */
   idToken: string;
+
+  /**
+   * The token used to authenticate the user within Backstage.
+   */
+  token: string;
 };
 
 /**
diff --git a/packages/core-plugin-api/src/apis/system/helpers.ts b/packages/core-plugin-api/src/apis/system/helpers.ts
index 8e84dd6c09..547d583482 100644
--- a/packages/core-plugin-api/src/apis/system/helpers.ts
+++ b/packages/core-plugin-api/src/apis/system/helpers.ts
@@ -24,7 +24,7 @@ import { ApiRef, ApiFactory, TypesToApiRefs } from './types';
 export function createApiFactory<
   Api,
   Impl extends Api,
-  Deps extends { [name in string]: unknown }
+  Deps extends { [name in string]: unknown },
 >(factory: ApiFactory<Api, Impl, Deps>): ApiFactory<Api, Impl, Deps>;
 export function createApiFactory<Api, Impl extends Api>(
   api: ApiRef<Api>,
@@ -33,7 +33,7 @@ export function createApiFactory<Api, Impl extends Api>(
 export function createApiFactory<
   Api,
   Impl extends Api,
-  Deps extends { [name in string]: unknown }
+  Deps extends { [name in string]: unknown },
 >(
   factory: ApiFactory<Api, Impl, Deps> | ApiRef<Api>,
   instance?: Impl,
diff --git a/packages/core-plugin-api/src/apis/system/types.ts b/packages/core-plugin-api/src/apis/system/types.ts
index e805b6f255..a97d29fdaa 100644
--- a/packages/core-plugin-api/src/apis/system/types.ts
+++ b/packages/core-plugin-api/src/apis/system/types.ts
@@ -36,7 +36,7 @@ export type ApiHolder = {
 export type ApiFactory<
   Api,
   Impl extends Api,
-  Deps extends { [name in string]: unknown }
+  Deps extends { [name in string]: unknown },
 > = {
   api: ApiRef<Api>;
   deps: TypesToApiRefs<Deps>;
diff --git a/packages/core-plugin-api/src/apis/system/useApi.test.tsx b/packages/core-plugin-api/src/apis/system/useApi.test.tsx
index b23e44b815..6f473d8f59 100644
--- a/packages/core-plugin-api/src/apis/system/useApi.test.tsx
+++ b/packages/core-plugin-api/src/apis/system/useApi.test.tsx
@@ -15,7 +15,7 @@
  */
 
 import { renderHook } from '@testing-library/react-hooks';
-import { createVersionedContextForTesting } from '../../lib/versionedValues';
+import { createVersionedContextForTesting } from '@backstage/version-bridge';
 import { createApiRef } from './ApiRef';
 import { useApi } from './useApi';
 
diff --git a/packages/core-plugin-api/src/apis/system/useApi.tsx b/packages/core-plugin-api/src/apis/system/useApi.tsx
index eae6b98654..ef598a4c0e 100644
--- a/packages/core-plugin-api/src/apis/system/useApi.tsx
+++ b/packages/core-plugin-api/src/apis/system/useApi.tsx
@@ -16,10 +16,13 @@
 
 import React, { PropsWithChildren } from 'react';
 import { ApiRef, ApiHolder, TypesToApiRefs } from './types';
-import { useVersionedContext } from '../../lib/versionedValues';
+import { useVersionedContext } from '@backstage/version-bridge';
 
 export function useApiHolder(): ApiHolder {
   const versionedHolder = useVersionedContext<{ 1: ApiHolder }>('api-context');
+  if (!versionedHolder) {
+    throw new Error('API context is not available');
+  }
 
   const apiHolder = versionedHolder.atVersion(1);
   if (!apiHolder) {
diff --git a/packages/core-plugin-api/src/app/useApp.test.tsx b/packages/core-plugin-api/src/app/useApp.test.tsx
index 12b315ae87..f2e330e847 100644
--- a/packages/core-plugin-api/src/app/useApp.test.tsx
+++ b/packages/core-plugin-api/src/app/useApp.test.tsx
@@ -15,7 +15,7 @@
  */
 
 import { renderHook } from '@testing-library/react-hooks';
-import { createVersionedContextForTesting } from '../lib/versionedValues';
+import { createVersionedContextForTesting } from '@backstage/version-bridge';
 import { useApp } from './useApp';
 
 describe('v1 consumer', () => {
diff --git a/packages/core-plugin-api/src/app/useApp.tsx b/packages/core-plugin-api/src/app/useApp.tsx
index 1d17fb2d0f..05d2e1c5c0 100644
--- a/packages/core-plugin-api/src/app/useApp.tsx
+++ b/packages/core-plugin-api/src/app/useApp.tsx
@@ -14,13 +14,16 @@
  * limitations under the License.
  */
 
-import { useVersionedContext } from '../lib/versionedValues';
+import { useVersionedContext } from '@backstage/version-bridge';
 import { AppContext as AppContextV1 } from './types';
 
 export const useApp = (): AppContextV1 => {
-  const versionedContext = useVersionedContext<{ 1: AppContextV1 }>(
-    'app-context',
-  );
+  const versionedContext =
+    useVersionedContext<{ 1: AppContextV1 }>('app-context');
+  if (!versionedContext) {
+    throw new Error('App context is not available');
+  }
+
   const appContext = versionedContext.atVersion(1);
   if (!appContext) {
     throw new Error('AppContext v1 not available');
diff --git a/packages/core-plugin-api/src/extensions/componentData.test.tsx b/packages/core-plugin-api/src/extensions/componentData.test.tsx
index 49a1d59cc4..6f2694a512 100644
--- a/packages/core-plugin-api/src/extensions/componentData.test.tsx
+++ b/packages/core-plugin-api/src/extensions/componentData.test.tsx
@@ -17,7 +17,7 @@
 import React from 'react';
 import { attachComponentData, getComponentData } from './componentData';
 
-describe('elementData', () => {
+describe('componentData', () => {
   it('should attach a single piece of data', () => {
     const data = { foo: 'bar' };
     const Component = () => null;
@@ -59,4 +59,51 @@ describe('elementData', () => {
       'Attempted to attach duplicate data "my-data" to component "MyComponent"',
     );
   });
+
+  describe('works across versions', () => {
+    it('should should be able to get data from newer versions', () => {
+      const data = { foo: 'bar' };
+      const Component = () => null;
+      attachComponentData(Component, 'my-data', data);
+
+      const element = <Component />;
+      expect((element as any).type.__backstage_data.map.get('my-data')).toBe(
+        data,
+      );
+    });
+
+    it('should should be able to attach data for newer versions', () => {
+      const data = { foo: 'bar' };
+      const Component = () => null;
+      (Component as any).__backstage_data = {
+        map: new Map([['my-data', data]]),
+      };
+
+      const element = <Component />;
+      expect(getComponentData(element, 'my-data')).toBe(data);
+    });
+
+    it('should be able to get data from older versions', () => {
+      const data = { foo: 'bar' };
+      const Component = () => null;
+      attachComponentData(Component, 'my-data', data);
+
+      const element = <Component />;
+      const container = (global as any)[
+        '__@backstage/component-data-store__'
+      ].get(element.type);
+      expect(container.map.get('my-data')).toBe(data);
+    });
+
+    it('should should be able to attach data for older versions', () => {
+      const data = { foo: 'bar' };
+      const Component = () => null;
+      (global as any)['__@backstage/component-data-store__'].set(Component, {
+        map: new Map([['my-data', data]]),
+      });
+
+      const element = <Component />;
+      expect(getComponentData(element, 'my-data')).toBe(data);
+    });
+  });
 });
diff --git a/packages/core-plugin-api/src/extensions/componentData.tsx b/packages/core-plugin-api/src/extensions/componentData.tsx
index 85527950ab..97a0b74e5b 100644
--- a/packages/core-plugin-api/src/extensions/componentData.tsx
+++ b/packages/core-plugin-api/src/extensions/componentData.tsx
@@ -15,30 +15,48 @@
  */
 
 import { ComponentType, ReactNode } from 'react';
-import { getOrCreateGlobalSingleton } from '../lib/globalObject';
+import { getOrCreateGlobalSingleton } from '@backstage/version-bridge';
 
 type DataContainer = {
   map: Map<string, unknown>;
 };
 
-type MaybeComponentNode = ReactNode & {
-  type?: ComponentType<any>;
-};
-
-// The store is bridged across versions using the global object
+// This method of storing the component data was deprecated in September 2021, it
+// will be removed in the future for the reasons described below.
 const globalStore = getOrCreateGlobalSingleton(
   'component-data-store',
   () => new WeakMap<ComponentType<any>, DataContainer>(),
 );
 
+// This key is used to attach component data to the component type (function or class)
+// itself. This method is used because it has better compatibility component wrappers
+// like react-hot-loader, as opposed to the WeakMap method or using a symbol.
+const componentDataKey = '__backstage_data';
+
+type ComponentWithData = ComponentType<any> & {
+  [componentDataKey]?: DataContainer;
+};
+
+type MaybeComponentNode = ReactNode & {
+  type?: ComponentWithData;
+};
+
 export function attachComponentData<P>(
   component: ComponentType<P>,
   type: string,
   data: unknown,
 ) {
-  let container = globalStore.get(component);
+  const dataComponent = component as ComponentWithData;
+
+  let container = dataComponent[componentDataKey] ?? globalStore.get(component);
   if (!container) {
     container = { map: new Map() };
+    Object.defineProperty(dataComponent, componentDataKey, {
+      enumerable: false,
+      configurable: true,
+      writable: false,
+      value: container,
+    });
     globalStore.set(component, container);
   }
 
@@ -65,7 +83,7 @@ export function getComponentData<T>(
     return undefined;
   }
 
-  const container = globalStore.get(component);
+  const container = component[componentDataKey] ?? globalStore.get(component);
   if (!container) {
     return undefined;
   }
diff --git a/packages/core-plugin-api/src/extensions/extensions.tsx b/packages/core-plugin-api/src/extensions/extensions.tsx
index 5142dccc55..73b927afc8 100644
--- a/packages/core-plugin-api/src/extensions/extensions.tsx
+++ b/packages/core-plugin-api/src/extensions/extensions.tsx
@@ -33,7 +33,7 @@ type ComponentLoader<T> =
 // ComponentType inserts children as an optional prop whether the inner component accepts it or not,
 // making it impossible to make the usage of children type safe.
 export function createRoutableExtension<
-  T extends (props: any) => JSX.Element | null
+  T extends (props: any) => JSX.Element | null,
 >(options: {
   component: () => Promise<T>;
   mountPoint: RouteRef;
@@ -91,7 +91,7 @@ export function createRoutableExtension<
 // ComponentType inserts children as an optional prop whether the inner component accepts it or not,
 // making it impossible to make the usage of children type safe.
 export function createComponentExtension<
-  T extends (props: any) => JSX.Element | null
+  T extends (props: any) => JSX.Element | null,
 >(options: { component: ComponentLoader<T> }): Extension<T> {
   const { component } = options;
   return createReactExtension({ component });
@@ -101,7 +101,7 @@ export function createComponentExtension<
 // ComponentType inserts children as an optional prop whether the inner component accepts it or not,
 // making it impossible to make the usage of children type safe.
 export function createReactExtension<
-  T extends (props: any) => JSX.Element | null
+  T extends (props: any) => JSX.Element | null,
 >(options: {
   component: ComponentLoader<T>;
   data?: Record<string, unknown>;
@@ -111,9 +111,9 @@ export function createReactExtension<
   let Component: T;
   if ('lazy' in options.component) {
     const lazyLoader = options.component.lazy;
-    Component = (lazy(() =>
+    Component = lazy(() =>
       lazyLoader().then(component => ({ default: component })),
-    ) as unknown) as T;
+    ) as unknown as T;
   } else {
     Component = options.component.sync;
   }
diff --git a/packages/core-plugin-api/src/lib/versionedValues.ts b/packages/core-plugin-api/src/lib/versionedValues.ts
deleted file mode 100644
index a7b7d8e3b7..0000000000
--- a/packages/core-plugin-api/src/lib/versionedValues.ts
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * Copyright 2021 The Backstage Authors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import { createContext, useContext, Context } from 'react';
-import { getGlobalSingleton, setGlobalSingleton } from './globalObject';
-
-/**
- * The versioned value interface is a container for a set of values that
- * can be looked up by version. It is intended to be used as a container
- * for values that can be versioned independently of package versions.
- */
-export type VersionedValue<Versions extends { [version: number]: any }> = {
-  atVersion<Version extends keyof Versions>(
-    version: Version,
-  ): Versions[Version] | undefined;
-};
-
-/**
- * Creates a container for a map of versioned values that implements VersionedValue.
- */
-export function createVersionedValueMap<
-  Versions extends { [version: number]: any }
->(versions: Versions): VersionedValue<Versions> {
-  Object.freeze(versions);
-  return {
-    atVersion(version) {
-      return versions[version];
-    },
-  };
-}
-
-export function useVersionedContext<
-  Versions extends { [version in number]: any }
->(key: string): VersionedValue<Versions> {
-  const versionedValue = useContext(
-    getGlobalSingleton<Context<VersionedValue<Versions>>>(key),
-  );
-  if (!versionedValue) {
-    throw new Error(`No provider available for ${key} context`);
-  }
-  return versionedValue;
-}
-
-export function createVersionedContextForTesting(key: string) {
-  return {
-    set(versions: { [version in number]: unknown }) {
-      setGlobalSingleton(key, createContext(createVersionedValueMap(versions)));
-    },
-    reset() {
-      delete (globalThis as any)[`__@backstage/${key}__`];
-    },
-  };
-}
diff --git a/packages/core-plugin-api/src/plugin/Plugin.tsx b/packages/core-plugin-api/src/plugin/Plugin.tsx
index abf4bfa35c..53a53b76d0 100644
--- a/packages/core-plugin-api/src/plugin/Plugin.tsx
+++ b/packages/core-plugin-api/src/plugin/Plugin.tsx
@@ -26,8 +26,9 @@ import { AnyApiFactory } from '../apis';
 
 export class PluginImpl<
   Routes extends AnyRoutes,
-  ExternalRoutes extends AnyExternalRoutes
-> implements BackstagePlugin<Routes, ExternalRoutes> {
+  ExternalRoutes extends AnyExternalRoutes,
+> implements BackstagePlugin<Routes, ExternalRoutes>
+{
   private storedOutput?: PluginOutput[];
 
   constructor(private readonly config: PluginConfig<Routes, ExternalRoutes>) {}
@@ -81,7 +82,7 @@ export class PluginImpl<
 
 export function createPlugin<
   Routes extends AnyRoutes = {},
-  ExternalRoutes extends AnyExternalRoutes = {}
+  ExternalRoutes extends AnyExternalRoutes = {},
 >(
   config: PluginConfig<Routes, ExternalRoutes>,
 ): BackstagePlugin<Routes, ExternalRoutes> {
diff --git a/packages/core-plugin-api/src/plugin/types.ts b/packages/core-plugin-api/src/plugin/types.ts
index 23ff4594a5..b3e1043efd 100644
--- a/packages/core-plugin-api/src/plugin/types.ts
+++ b/packages/core-plugin-api/src/plugin/types.ts
@@ -42,7 +42,7 @@ export type AnyExternalRoutes = { [name: string]: ExternalRouteRef };
 
 export type BackstagePlugin<
   Routes extends AnyRoutes = {},
-  ExternalRoutes extends AnyExternalRoutes = {}
+  ExternalRoutes extends AnyExternalRoutes = {},
 > = {
   getId(): string;
   output(): PluginOutput[];
@@ -54,7 +54,7 @@ export type BackstagePlugin<
 
 export type PluginConfig<
   Routes extends AnyRoutes,
-  ExternalRoutes extends AnyExternalRoutes
+  ExternalRoutes extends AnyExternalRoutes,
 > = {
   id: string;
   apis?: Iterable<AnyApiFactory>;
diff --git a/packages/core-plugin-api/src/routing/ExternalRouteRef.ts b/packages/core-plugin-api/src/routing/ExternalRouteRef.ts
index 348c78220f..401e34773c 100644
--- a/packages/core-plugin-api/src/routing/ExternalRouteRef.ts
+++ b/packages/core-plugin-api/src/routing/ExternalRouteRef.ts
@@ -24,8 +24,9 @@ import {
 
 export class ExternalRouteRefImpl<
   Params extends AnyParams,
-  Optional extends boolean
-> implements ExternalRouteRef<Params, Optional> {
+  Optional extends boolean,
+> implements ExternalRouteRef<Params, Optional>
+{
   readonly [routeRefType] = 'external';
 
   constructor(
@@ -42,7 +43,7 @@ export class ExternalRouteRefImpl<
 export function createExternalRouteRef<
   Params extends { [param in ParamKey]: string },
   Optional extends boolean = false,
-  ParamKey extends string = never
+  ParamKey extends string = never,
 >(options: {
   /**
    * An identifier for this route, used to identify it in error messages
diff --git a/packages/core-plugin-api/src/routing/RouteRef.ts b/packages/core-plugin-api/src/routing/RouteRef.ts
index 0239b57c25..31dd9ef518 100644
--- a/packages/core-plugin-api/src/routing/RouteRef.ts
+++ b/packages/core-plugin-api/src/routing/RouteRef.ts
@@ -32,7 +32,8 @@ export type RouteRefConfig<Params extends AnyParams> = {
 };
 
 export class RouteRefImpl<Params extends AnyParams>
-  implements RouteRef<Params> {
+  implements RouteRef<Params>
+{
   readonly [routeRefType] = 'absolute';
 
   constructor(
@@ -70,7 +71,7 @@ export function createRouteRef<
   // ParamKey is here to make sure the Params type properly has its keys narrowed down
   // to only the elements of params. Defaulting to never makes sure we end up with
   // Param = {} if the params array is empty.
-  ParamKey extends string = never
+  ParamKey extends string = never,
 >(config: {
   /** The id of the route ref, used to identify it when printed */
   id?: string;
diff --git a/packages/core-plugin-api/src/routing/SubRouteRef.ts b/packages/core-plugin-api/src/routing/SubRouteRef.ts
index f7e5cf0bc5..6b329dfd42 100644
--- a/packages/core-plugin-api/src/routing/SubRouteRef.ts
+++ b/packages/core-plugin-api/src/routing/SubRouteRef.ts
@@ -27,7 +27,8 @@ import {
 const PARAM_PATTERN = /^\w+$/;
 
 export class SubRouteRefImpl<Params extends AnyParams>
-  implements SubRouteRef<Params> {
+  implements SubRouteRef<Params>
+{
   readonly [routeRefType] = 'sub';
 
   constructor(
@@ -55,7 +56,7 @@ type PathParams<S extends string> = { [name in ParamNames<S>]: string };
  */
 type MergeParams<
   P1 extends { [param in string]: string },
-  P2 extends AnyParams
+  P2 extends AnyParams,
 > = (P1[keyof P1] extends never ? {} : P1) & (P2 extends undefined ? {} : P2);
 
 /**
@@ -64,14 +65,14 @@ type MergeParams<
  */
 type MakeSubRouteRef<
   Params extends { [param in string]: string },
-  ParentParams extends AnyParams
+  ParentParams extends AnyParams,
 > = keyof Params & keyof ParentParams extends never
   ? SubRouteRef<OptionalParams<MergeParams<Params, ParentParams>>>
   : never;
 
 export function createSubRouteRef<
   Path extends string,
-  ParentParams extends AnyParams = never
+  ParentParams extends AnyParams = never,
 >(config: {
   id: string;
   path: Path;
diff --git a/packages/core-plugin-api/src/routing/types.ts b/packages/core-plugin-api/src/routing/types.ts
index 9ea1e3ff0d..86d469c2cc 100644
--- a/packages/core-plugin-api/src/routing/types.ts
+++ b/packages/core-plugin-api/src/routing/types.ts
@@ -15,15 +15,14 @@
  */
 
 import { OldIconComponent } from '../icons/types';
-import { getOrCreateGlobalSingleton } from '../lib/globalObject';
+import { getOrCreateGlobalSingleton } from '@backstage/version-bridge';
 
 export type AnyParams = { [param in string]: string } | undefined;
 export type ParamKeys<Params extends AnyParams> = keyof Params extends never
   ? []
   : (keyof Params)[];
-export type OptionalParams<
-  Params extends { [param in string]: string }
-> = Params[keyof Params] extends never ? undefined : Params;
+export type OptionalParams<Params extends { [param in string]: string }> =
+  Params[keyof Params] extends never ? undefined : Params;
 
 // The extra TS magic here is to require a single params argument if the RouteRef
 // had at least one param defined, but require 0 arguments if there are no params defined.
@@ -65,7 +64,7 @@ export type SubRouteRef<Params extends AnyParams = any> = {
 
 export type ExternalRouteRef<
   Params extends AnyParams = any,
-  Optional extends boolean = any
+  Optional extends boolean = any,
 > = {
   readonly [routeRefType]: 'external';
 
diff --git a/packages/core-plugin-api/src/routing/useRouteRef.test.tsx b/packages/core-plugin-api/src/routing/useRouteRef.test.tsx
index ace2d1a58a..62f6d6da42 100644
--- a/packages/core-plugin-api/src/routing/useRouteRef.test.tsx
+++ b/packages/core-plugin-api/src/routing/useRouteRef.test.tsx
@@ -17,7 +17,7 @@
 import { renderHook } from '@testing-library/react-hooks';
 import React from 'react';
 import { MemoryRouter } from 'react-router-dom';
-import { createVersionedContextForTesting } from '../lib/versionedValues';
+import { createVersionedContextForTesting } from '@backstage/version-bridge';
 import { useRouteRef } from './useRouteRef';
 import { createRouteRef } from './RouteRef';
 
diff --git a/packages/core-plugin-api/src/routing/useRouteRef.tsx b/packages/core-plugin-api/src/routing/useRouteRef.tsx
index 4447759b99..ea05cc14fd 100644
--- a/packages/core-plugin-api/src/routing/useRouteRef.tsx
+++ b/packages/core-plugin-api/src/routing/useRouteRef.tsx
@@ -16,7 +16,7 @@
 
 import { useMemo } from 'react';
 import { matchRoutes, useLocation } from 'react-router-dom';
-import { useVersionedContext } from '../lib/versionedValues';
+import { useVersionedContext } from '@backstage/version-bridge';
 import {
   AnyParams,
   ExternalRouteRef,
@@ -48,9 +48,12 @@ export function useRouteRef<Params extends AnyParams>(
     | ExternalRouteRef<Params, any>,
 ): RouteFunc<Params> | undefined {
   const sourceLocation = useLocation();
-  const versionedContext = useVersionedContext<{ 1: RouteResolver }>(
-    'routing-context',
-  );
+  const versionedContext =
+    useVersionedContext<{ 1: RouteResolver }>('routing-context');
+  if (!versionedContext) {
+    throw new Error('Routing context is not available');
+  }
+
   const resolver = versionedContext.atVersion(1);
   const routeFunc = useMemo(
     () => resolver && resolver.resolve(routeRef, sourceLocation),
diff --git a/packages/create-app/CHANGELOG.md b/packages/create-app/CHANGELOG.md
index 91863f51d7..f8d93846ba 100644
--- a/packages/create-app/CHANGELOG.md
+++ b/packages/create-app/CHANGELOG.md
@@ -1,5 +1,288 @@
 # @backstage/create-app
 
+## 0.3.40
+
+### Patch Changes
+
+- a5013957e: Updated the search configuration class to use the static `fromConfig`-based constructor for the `DefaultCatalogCollator`.
+
+  To apply this change to an existing app, replace the following line in `search.ts`:
+
+  ```diff
+  -collator: new DefaultCatalogCollator({ discovery })
+  +collator: DefaultCatalogCollator.fromConfig(config, { discovery })
+  ```
+
+  The `config` parameter was not needed before, so make sure you also add that in the signature of `createPlugin`
+  in `search.ts`:
+
+  ```diff
+  export default async function createPlugin({
+    logger,
+    discovery,
+  +  config,
+  }: PluginEnvironment) {
+  ```
+
+- Updated dependencies
+  - @backstage/cli-common@0.1.3
+
+## 0.3.39
+
+### Patch Changes
+
+- 25924638b: Minor tweaks to the create-app template to match earlier documented changes
+
+## 0.3.38
+
+### Patch Changes
+
+- 787bc0826: Wire up TechDocs, which now relies on the composability API for routing.
+
+  First, ensure you've mounted `<TechDocsReaderPage />`. If you already updated
+  to use the composable `<TechDocsIndexPage />` (see below), no action is
+  necessary. Otherwise, update your `App.tsx` so that `<TechDocsReaderPage />` is
+  mounted:
+
+  ```diff
+       <Route path="/docs" element={<TechdocsPage />} />
+  +    <Route
+  +      path="/docs/:namespace/:kind/:name/*"
+  +      element={<TechDocsReaderPage />}
+  +    />
+  ```
+
+  Next, ensure links from the Catalog Entity Page to its TechDocs site are bound:
+
+  ```diff
+    bindRoutes({ bind }) {
+      bind(catalogPlugin.externalRoutes, {
+        createComponent: scaffolderPlugin.routes.root,
+  +     viewTechDoc: techdocsPlugin.routes.docRoot,
+      });
+  ```
+
+- d02768171: Updated the default create-app `EntityPage` to include orphan and processing error alerts for all entity types. Previously these were only shown for entities with the `Component` kind. This also adds the `EntityLinkCard` for API entities.
+
+  As an example, you might add this to your `packages/app/src/components/catalog/EntityPage.tsx`:
+
+  ```tsx
+  const entityWarningContent = (
+    <>
+      <EntitySwitch>
+        <EntitySwitch.Case if={isOrphan}>
+          <Grid item xs={12}>
+            <EntityOrphanWarning />
+          </Grid>
+        </EntitySwitch.Case>
+      </EntitySwitch>
+      <EntitySwitch>
+        <EntitySwitch.Case if={hasCatalogProcessingErrors}>
+          <Grid item xs={12}>
+            <EntityProcessingErrorsPanel />
+          </Grid>
+        </EntitySwitch.Case>
+      </EntitySwitch>
+    </>
+  );
+  ```
+
+  and then add that at the top of your various content pages:
+
+  ```diff
+   const overviewContent = (
+     <Grid container spacing={3} alignItems="stretch">
+  +    {entityWarningContent}
+       <Grid item md={6}>
+         <EntityAboutCard variant="gridItem" />
+       </Grid>
+  ```
+
+  or in actual page wrappers:
+
+  ```diff
+   const apiPage = (
+     <EntityLayout>
+       <EntityLayout.Route path="/" title="Overview">
+         <Grid container spacing={3}>
+  +        {entityWarningContent}
+           <Grid item md={6}>
+             <EntityAboutCard />
+           </Grid>
+  ```
+
+  Note that there may be many such `*Page` pages in that file, and you probably want that warning at the top of them all.
+
+  You can also add the links card to your API page if you do not already have it:
+
+  ```diff
+  const apiPage = (
+    <EntityLayout>
+      <EntityLayout.Route path="/" title="Overview">
+        <Grid container spacing={3}>
+  +       {entityWarningContent}
+           <Grid item md={6}>
+             <EntityAboutCard />
+           </Grid>
+  +        <Grid item md={4} xs={12}>
+  +          <EntityLinksCard />
+  +        </Grid>
+  ```
+
+## 0.3.37
+
+## 0.3.36
+
+## 0.3.35
+
+### Patch Changes
+
+- 362ea5a72: Updated the index page redirect to work with apps served on a different base path than `/`.
+
+  To apply this change to an existing app, remove the `/` prefix from the target route in the `Navigate` element in `packages/app/src/App.tsx`:
+
+  ```diff
+  -<Navigate key="/" to="/catalog" />
+  +<Navigate key="/" to="catalog" />
+  ```
+
+- 80582cbec: Use new composable `TechDocsIndexPage` and `DefaultTechDocsHome`
+
+  Make the following changes to your `App.tsx` to migrate existing apps:
+
+  ```diff
+  -    <Route path="/docs" element={<TechdocsPage />} />
+  +    <Route path="/docs" element={<TechDocsIndexPage />}>
+  +      <DefaultTechDocsHome />
+  +    </Route>
+  +    <Route
+  +      path="/docs/:namespace/:kind/:name/*"
+  +      element={<TechDocsReaderPage />}
+  +    />
+  ```
+
+- c4ef9181a: Migrate to using `webpack@5` 🎉
+- 56c773909: Add a complete prettier setup to the created project. Prettier used to only be added as a dependency to create apps, but there wasn't a complete setup included that makes it easy to run prettier. That has now changed, and the new `prettier:check` command can be used to check the formatting of the files in your created project.
+
+  To apply this change to an existing app, a couple of changes need to be made.
+
+  Create a `.prettierignore` file at the root of your repository with the following contents:
+
+  ```
+  dist
+  dist-types
+  coverage
+  .vscode
+  ```
+
+  Next update the root `package.json` by bumping the prettier version and adding the new `prettier:check` command:
+
+  ```diff
+     "scripts": {
+       ...
+  +    "prettier:check": "prettier --check .",
+       ...
+     },
+     ...
+     "dependencies": {
+       ...
+  -    "prettier": "^1.19.1"
+  +    "prettier": "^2.3.2"
+     }
+  ```
+
+  Finally run `yarn prettier --write .` on your project to update the existing formatting.
+
+- 9f8f8dd6b: Removed the `/` prefix in the catalog `SidebarItem` element, as it is no longer needed.
+
+  To apply this change to an existing app, remove the `/` prefix from the catalog and any other sidebar items in `packages/app/src/components/Root/Root.ts`:
+
+  ```diff
+  -<SidebarItem icon={HomeIcon} to="/catalog" text="Home" />
+  +<SidebarItem icon={HomeIcon} to="catalog" text="Home" />
+  ```
+
+- 56c773909: Switched `@types/react-dom` dependency to of the app package to request `*` rather than a specific version.
+
+  To apply this change to an existing app, change the following in `packages/app/package.json`:
+
+  ```diff
+  -    "@types/react-dom": "^16.9.8",
+  +    "@types/react-dom": "*",
+  ```
+
+## 0.3.34
+
+### Patch Changes
+
+- c189c5da5: fix typo in the comments of EntityPage component
+- 48ea3d25b: The recommended value for a `backstage.io/techdocs-ref` annotation is now
+  `dir:.`, indicating "documentation source files are located in the same
+  directory relative to the catalog entity." Note that `url:<location>` values
+  are still supported.
+- 98dda80b4: Update `techdocs.generators` with the latest `techdocs.generator` config in `app-config.yaml`. See
+  https://backstage.io/docs/features/techdocs/configuration for reference and relevant PR
+  https://github.com/backstage/backstage/pull/6071/files for the changes.
+
+## 0.3.33
+
+### Patch Changes
+
+- 9d40fcb1e: - Bumping `material-ui/core` version to at least `4.12.2` as they made some breaking changes in later versions which broke `Pagination` of the `Table`.
+  - Switching out `material-table` to `@material-table/core` for support for the later versions of `material-ui/core`
+  - This causes a minor API change to `@backstage/core-components` as the interface for `Table` re-exports the `prop` from the underlying `Table` components.
+  - `onChangeRowsPerPage` has been renamed to `onRowsPerPageChange`
+  - `onChangePage` has been renamed to `onPageChange`
+  - Migration guide is here: https://material-table-core.com/docs/breaking-changes
+- d50c9e7c0: Update the `software-templates` to point to `main` branch instead of `master`
+- 224e54484: Added an `EntityProcessingErrorsPanel` component to show any errors that occurred when refreshing an entity from its source location.
+
+  If upgrading, this should be added to your `EntityPage` in your Backstage application:
+
+  ```diff
+  // packages/app/src/components/catalog/EntityPage.tsx
+
+  const overviewContent = (
+  ...
+            <EntityOrphanWarning />
+          </Grid>
+         </EntitySwitch.Case>
+      </EntitySwitch>
+  +   <EntitySwitch>
+  +     <EntitySwitch.Case if={hasCatalogProcessingErrors}>
+  +       <Grid item xs={12}>
+  +         <EntityProcessingErrorsPanel />
+  +       </Grid>
+  +     </EntitySwitch.Case>
+  +   </EntitySwitch>
+
+  ```
+
+  Additionally, `WarningPanel` now changes color based on the provided severity.
+
+## 0.3.32
+
+### Patch Changes
+
+- 03bf17e9b: Improve the responsiveness of the EntityPage UI. With this the Header component should scale with the screen size & wrapping should not cause overflowing/blocking of links. Additionally enforce the Pages using the Grid Layout to use it across all screen sizes & to wrap as intended.
+
+  To benefit from the improved responsive layout, the `EntityPage` in existing Backstage applications should be updated to set the `xs` column size on each grid item in the page, as this does not default. For example:
+
+  ```diff
+  -  <Grid item md={6}>
+  +  <Grid item xs={12} md={6}>
+  ```
+
+- eb740ee24: Moved sample software templates to the [backstage/software-templates](https://github.com/backstage/software-templates) repository. If you previously referenced the sample templates straight from `scaffolder-backend` plugin in the main [backstage/backstage](https://github.com/backstage/backstage) repository in your `app-config.yaml`, these references will need to be updated.
+
+  See https://github.com/backstage/software-templates
+
+## 0.3.31
+
+### Patch Changes
+
+- ae84b20cf: Revert the upgrade to `fs-extra@10.0.0` as that seemed to have broken all installs inexplicably.
+
 ## 0.3.30
 
 ### Patch Changes
@@ -440,7 +723,7 @@
   -<Route path="/search" element={<SearchPage />} />
   +<Route path="/search" element={<SearchPage />}>
   +  {searchPage}
-  +</Route>;
+  +</Route>
   ```
 
 - Updated dependencies [9cd3c533c]
diff --git a/packages/create-app/package.json b/packages/create-app/package.json
index b3f587ac32..aac845093f 100644
--- a/packages/create-app/package.json
+++ b/packages/create-app/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@backstage/create-app",
   "description": "Create app package for Backstage",
-  "version": "0.3.30",
+  "version": "0.3.40",
   "private": false,
   "publishConfig": {
     "access": "public"
@@ -27,7 +27,7 @@
     "start": "nodemon --"
   },
   "dependencies": {
-    "@backstage/cli-common": "^0.1.2",
+    "@backstage/cli-common": "^0.1.3",
     "chalk": "^4.0.0",
     "commander": "^6.1.0",
     "fs-extra": "9.1.0",
@@ -39,7 +39,6 @@
   "devDependencies": {
     "@types/fs-extra": "^9.0.1",
     "@types/inquirer": "^7.3.1",
-    "@types/react-dev-utils": "^9.0.4",
     "@types/recursive-readdir": "^2.2.0",
     "ts-node": "^10.0.0"
   },
diff --git a/packages/create-app/templates/default-app/.prettierignore b/packages/create-app/templates/default-app/.prettierignore
new file mode 100644
index 0000000000..dfb0f1cd11
--- /dev/null
+++ b/packages/create-app/templates/default-app/.prettierignore
@@ -0,0 +1,4 @@
+dist
+dist-types
+coverage
+.vscode
diff --git a/packages/create-app/templates/default-app/README.md b/packages/create-app/templates/default-app/README.md
index 07cf6fd136..8c7c4373fe 100644
--- a/packages/create-app/templates/default-app/README.md
+++ b/packages/create-app/templates/default-app/README.md
@@ -7,4 +7,4 @@ To start the app, run:
 ```sh
 yarn install
 yarn dev
-```
\ No newline at end of file
+```
diff --git a/packages/create-app/templates/default-app/app-config.yaml.hbs b/packages/create-app/templates/default-app/app-config.yaml.hbs
index 9a04f38c14..9c35c58c33 100644
--- a/packages/create-app/templates/default-app/app-config.yaml.hbs
+++ b/packages/create-app/templates/default-app/app-config.yaml.hbs
@@ -32,9 +32,9 @@ backend:
       user: ${POSTGRES_USER}
       password: ${POSTGRES_PASSWORD}
       # https://node-postgres.com/features/ssl
-      #ssl: require # see https://www.postgresql.org/docs/current/libpq-ssl.html Table 33.1. SSL Mode Descriptions (e.g. require)
-        #ca: # if you have a CA file and want to verify it you can uncomment this section
-        #  $file: <file-path>/ca/server.crt
+      # ssl: require # see https://www.postgresql.org/docs/current/libpq-ssl.html Table 33.1. SSL Mode Descriptions (e.g. require)
+      #   ca: # if you have a CA file and want to verify it you can uncomment this section
+      #     $file: <file-path>/ca/server.crt
   {{/if}}
   cache:
     store: memory
@@ -60,8 +60,8 @@ proxy:
 # https://backstage.io/docs/features/techdocs/how-to-guides#how-to-migrate-from-techdocs-basic-to-recommended-deployment-approach
 techdocs:
   builder: 'local' # Alternatives - 'external'
-  generators:
-    techdocs: 'docker' # Alternatives - 'local'
+  generator:
+    runIn: 'docker' # Alternatives - 'local'
   publisher:
     type: 'local' # Alternatives - 'googleGcs' or 'awsS3'. Read documentation for using alternatives.
 
@@ -100,11 +100,11 @@ catalog:
 
     # Backstage example templates
     - type: url
-      target: https://github.com/backstage/backstage/blob/master/plugins/scaffolder-backend/sample-templates/react-ssr-template/template.yaml
+      target: https://github.com/backstage/software-templates/blob/main/scaffolder-templates/react-ssr-template/template.yaml
       rules:
         - allow: [Template]
     - type: url
-      target: https://github.com/backstage/backstage/blob/master/plugins/scaffolder-backend/sample-templates/springboot-grpc-template/template.yaml
+      target: https://github.com/backstage/software-templates/blob/main/scaffolder-templates/springboot-grpc-template/template.yaml
       rules:
         - allow: [Template]
     - type: url
@@ -112,6 +112,6 @@ catalog:
       rules:
         - allow: [Template]
     - type: url
-      target: https://github.com/backstage/backstage/blob/master/plugins/scaffolder-backend/sample-templates/docs-template/template.yaml
+      target: https://github.com/backstage/software-templates/blob/main/scaffolder-templates/docs-template/template.yaml
       rules:
         - allow: [Template]
diff --git a/packages/create-app/templates/default-app/catalog-info.yaml.hbs b/packages/create-app/templates/default-app/catalog-info.yaml.hbs
index d66da552b7..e01ce8f756 100644
--- a/packages/create-app/templates/default-app/catalog-info.yaml.hbs
+++ b/packages/create-app/templates/default-app/catalog-info.yaml.hbs
@@ -5,8 +5,8 @@ metadata:
   description: An example of a Backstage application.
   # Example for optional annotations
   # annotations:
-    # github.com/project-slug: backstage/backstage
-    # backstage.io/techdocs-ref: url:https://github.com/backstage/backstage
+  #   github.com/project-slug: backstage/backstage
+  #   backstage.io/techdocs-ref: dir:.
 spec:
   type: website
   owner: john@example.com
diff --git a/packages/create-app/templates/default-app/package.json.hbs b/packages/create-app/templates/default-app/package.json.hbs
index 7ae86c0fbc..3f913102cb 100644
--- a/packages/create-app/templates/default-app/package.json.hbs
+++ b/packages/create-app/templates/default-app/package.json.hbs
@@ -19,6 +19,7 @@
     "test:all": "lerna run test -- --coverage",
     "lint": "lerna run lint --since origin/master --",
     "lint:all": "lerna run lint --",
+    "prettier:check": "prettier --check .",
     "create-plugin": "backstage-cli create-plugin --scope internal --no-private",
     "remove-plugin": "backstage-cli remove-plugin"
   },
@@ -37,7 +38,7 @@
     "@spotify/prettier-config": "^7.0.0",
     "concurrently": "^6.0.0",
     "lerna": "^4.0.0",
-    "prettier": "^1.19.1"
+    "prettier": "^2.3.2"
   },
   "prettier": "@spotify/prettier-config",
   "lint-staged": {
diff --git a/packages/create-app/templates/default-app/packages/app/package.json.hbs b/packages/create-app/templates/default-app/packages/app/package.json.hbs
index 71cc86ba34..c443b45dc7 100644
--- a/packages/create-app/templates/default-app/packages/app/package.json.hbs
+++ b/packages/create-app/templates/default-app/packages/app/package.json.hbs
@@ -23,7 +23,7 @@
     "@backstage/plugin-user-settings": "^{{version '@backstage/plugin-user-settings'}}",
     "@backstage/test-utils": "^{{version '@backstage/test-utils'}}",
     "@backstage/theme": "^{{version '@backstage/theme'}}",
-    "@material-ui/core": "^4.11.0",
+    "@material-ui/core": "^4.12.2",
     "@material-ui/icons": "^4.9.1",
     "history": "^5.0.0",
     "react": "^16.13.1",
@@ -38,7 +38,7 @@
     "@testing-library/user-event": "^12.0.7",
     "@types/jest": "^26.0.7",
     "@types/node": "^14.14.32",
-    "@types/react-dom": "^16.9.8",
+    "@types/react-dom": "*",
     "cross-env": "^7.0.0",
     "cypress": "^7.3.0",
     "eslint-plugin-cypress": "^2.10.3",
diff --git a/packages/create-app/templates/default-app/packages/app/public/index.html b/packages/create-app/templates/default-app/packages/app/public/index.html
index 5653173480..b93896c6da 100644
--- a/packages/create-app/templates/default-app/packages/app/public/index.html
+++ b/packages/create-app/templates/default-app/packages/app/public/index.html
@@ -65,7 +65,7 @@
     </script>
     <% } %>
   </head>
-  <body style="margin: 0;">
+  <body style="margin: 0">
     <noscript>You need to enable JavaScript to run this app.</noscript>
     <div id="root"></div>
     <!--
diff --git a/packages/create-app/templates/default-app/packages/app/src/App.tsx b/packages/create-app/templates/default-app/packages/app/src/App.tsx
index c513c7e28e..4cd83685a6 100644
--- a/packages/create-app/templates/default-app/packages/app/src/App.tsx
+++ b/packages/create-app/templates/default-app/packages/app/src/App.tsx
@@ -6,17 +6,23 @@ import {
   CatalogIndexPage,
   catalogPlugin,
 } from '@backstage/plugin-catalog';
-import {CatalogImportPage, catalogImportPlugin} from '@backstage/plugin-catalog-import';
-import { 
-  ScaffolderPage, 
-  scaffolderPlugin 
-} from '@backstage/plugin-scaffolder';
+import {
+  CatalogImportPage,
+  catalogImportPlugin,
+} from '@backstage/plugin-catalog-import';
+import { ScaffolderPage, scaffolderPlugin } from '@backstage/plugin-scaffolder';
 import { SearchPage } from '@backstage/plugin-search';
 import { TechRadarPage } from '@backstage/plugin-tech-radar';
-import { TechdocsPage } from '@backstage/plugin-techdocs';
+import {
+  DefaultTechDocsHome,
+  TechDocsIndexPage,
+  techdocsPlugin,
+  TechDocsReaderPage,
+} from '@backstage/plugin-techdocs';
 import { UserSettingsPage } from '@backstage/plugin-user-settings';
 import { apis } from './apis';
 import { entityPage } from './components/catalog/EntityPage';
+import { searchPage } from './components/search/SearchPage';
 import { Root } from './components/Root';
 
 import { AlertDisplay, OAuthRequestDialog } from '@backstage/core-components';
@@ -27,6 +33,7 @@ const app = createApp({
   bindRoutes({ bind }) {
     bind(catalogPlugin.externalRoutes, {
       createComponent: scaffolderPlugin.routes.root,
+      viewTechDoc: techdocsPlugin.routes.docRoot,
     });
     bind(apiDocsPlugin.externalRoutes, {
       createComponent: scaffolderPlugin.routes.root,
@@ -42,7 +49,7 @@ const AppRouter = app.getRouter();
 
 const routes = (
   <FlatRoutes>
-    <Navigate key="/" to="/catalog" />
+    <Navigate key="/" to="catalog" />
     <Route path="/catalog" element={<CatalogIndexPage />} />
     <Route
       path="/catalog/:namespace/:kind/:name"
@@ -50,7 +57,13 @@ const routes = (
     >
       {entityPage}
     </Route>
-    <Route path="/docs" element={<TechdocsPage />} />
+    <Route path="/docs" element={<TechDocsIndexPage />}>
+      <DefaultTechDocsHome />
+    </Route>
+    <Route
+      path="/docs/:namespace/:kind/:name/*"
+      element={<TechDocsReaderPage />}
+    />
     <Route path="/create" element={<ScaffolderPage />} />
     <Route path="/api-docs" element={<ApiExplorerPage />} />
     <Route
@@ -58,7 +71,9 @@ const routes = (
       element={<TechRadarPage width={1500} height={800} />}
     />
     <Route path="/catalog-import" element={<CatalogImportPage />} />
-    <Route path="/search" element={<SearchPage />} />
+    <Route path="/search" element={<SearchPage />}>
+      {searchPage}
+    </Route>
     <Route path="/settings" element={<UserSettingsPage />} />
   </FlatRoutes>
 );
diff --git a/packages/create-app/templates/default-app/packages/app/src/apis.ts b/packages/create-app/templates/default-app/packages/app/src/apis.ts
index 080b20fcbc..f2cd272c87 100644
--- a/packages/create-app/templates/default-app/packages/app/src/apis.ts
+++ b/packages/create-app/templates/default-app/packages/app/src/apis.ts
@@ -1,7 +1,12 @@
 import {
-  ScmIntegrationsApi, scmIntegrationsApiRef
+  ScmIntegrationsApi,
+  scmIntegrationsApiRef,
 } from '@backstage/integration-react';
-import { AnyApiFactory, configApiRef, createApiFactory } from '@backstage/core-plugin-api';
+import {
+  AnyApiFactory,
+  configApiRef,
+  createApiFactory,
+} from '@backstage/core-plugin-api';
 
 export const apis: AnyApiFactory[] = [
   createApiFactory({
diff --git a/packages/create-app/templates/default-app/packages/app/src/components/Root/Root.tsx b/packages/create-app/templates/default-app/packages/app/src/components/Root/Root.tsx
index d8665a2f9b..198e7ec2b1 100644
--- a/packages/create-app/templates/default-app/packages/app/src/components/Root/Root.tsx
+++ b/packages/create-app/templates/default-app/packages/app/src/components/Root/Root.tsx
@@ -77,7 +77,7 @@ export const Root = ({ children }: PropsWithChildren<{}>) => (
       <SidebarSearch />
       <SidebarDivider />
       {/* Global nav, not org-specific */}
-      <SidebarItem icon={HomeIcon} to="/catalog" text="Home" />
+      <SidebarItem icon={HomeIcon} to="catalog" text="Home" />
       <SidebarItem icon={ExtensionIcon} to="api-docs" text="APIs" />
       <SidebarItem icon={LibraryBooks} to="docs" text="Docs" />
       <SidebarItem icon={CreateComponentIcon} to="create" text="Create..." />
diff --git a/packages/create-app/templates/default-app/packages/app/src/components/catalog/EntityPage.tsx b/packages/create-app/templates/default-app/packages/app/src/components/catalog/EntityPage.tsx
index e3dd5be3c7..d3b4b786a0 100644
--- a/packages/create-app/templates/default-app/packages/app/src/components/catalog/EntityPage.tsx
+++ b/packages/create-app/templates/default-app/packages/app/src/components/catalog/EntityPage.tsx
@@ -35,8 +35,12 @@ import {
   EntityLayout,
   EntityLinksCard,
   EntitySwitch,
+  EntityOrphanWarning,
+  EntityProcessingErrorsPanel,
   isComponentType,
   isKind,
+  hasCatalogProcessingErrors,
+  isOrphan,
 } from '@backstage/plugin-catalog';
 import {
   isGithubActionsAvailable,
@@ -78,8 +82,29 @@ const cicdContent = (
   </EntitySwitch>
 );
 
+const entityWarningContent = (
+  <>
+    <EntitySwitch>
+      <EntitySwitch.Case if={isOrphan}>
+        <Grid item xs={12}>
+          <EntityOrphanWarning />
+        </Grid>
+      </EntitySwitch.Case>
+    </EntitySwitch>
+
+    <EntitySwitch>
+      <EntitySwitch.Case if={hasCatalogProcessingErrors}>
+        <Grid item xs={12}>
+          <EntityProcessingErrorsPanel />
+        </Grid>
+      </EntitySwitch.Case>
+    </EntitySwitch>
+  </>
+);
+
 const overviewContent = (
   <Grid container spacing={3} alignItems="stretch">
+    {entityWarningContent}
     <Grid item md={6}>
       <EntityAboutCard variant="gridItem" />
     </Grid>
@@ -157,6 +182,13 @@ const websiteEntityPage = (
   </EntityLayout>
 );
 
+/**
+ * NOTE: This page is designed to work on small screens such as mobile devices.
+ * This is based on Material UI Grid. If breakpoints are used, each grid item must set the `xs` prop to a column size or to `true`,
+ * since this does not default. If no breakpoints are used, the items will equitably share the available space.
+ * https://material-ui.com/components/grid/#basic-grid.
+ */
+
 const defaultEntityPage = (
   <EntityLayout>
     <EntityLayout.Route path="/" title="Overview">
@@ -187,9 +219,13 @@ const apiPage = (
   <EntityLayout>
     <EntityLayout.Route path="/" title="Overview">
       <Grid container spacing={3}>
+        {entityWarningContent}
         <Grid item md={6}>
           <EntityAboutCard />
         </Grid>
+        <Grid item md={4} xs={12}>
+          <EntityLinksCard />
+        </Grid>
         <Grid container item md={12}>
           <Grid item md={6}>
             <EntityProvidingComponentsCard />
@@ -215,6 +251,7 @@ const userPage = (
   <EntityLayout>
     <EntityLayout.Route path="/" title="Overview">
       <Grid container spacing={3}>
+        {entityWarningContent}
         <Grid item xs={12} md={6}>
           <EntityUserProfileCard variant="gridItem" />
         </Grid>
@@ -230,6 +267,7 @@ const groupPage = (
   <EntityLayout>
     <EntityLayout.Route path="/" title="Overview">
       <Grid container spacing={3}>
+        {entityWarningContent}
         <Grid item xs={12} md={6}>
           <EntityGroupProfileCard variant="gridItem" />
         </Grid>
@@ -248,6 +286,7 @@ const systemPage = (
   <EntityLayout>
     <EntityLayout.Route path="/" title="Overview">
       <Grid container spacing={3} alignItems="stretch">
+        {entityWarningContent}
         <Grid item md={6}>
           <EntityAboutCard variant="gridItem" />
         </Grid>
@@ -272,6 +311,7 @@ const domainPage = (
   <EntityLayout>
     <EntityLayout.Route path="/" title="Overview">
       <Grid container spacing={3} alignItems="stretch">
+        {entityWarningContent}
         <Grid item md={6}>
           <EntityAboutCard variant="gridItem" />
         </Grid>
diff --git a/packages/create-app/templates/default-app/packages/backend/src/plugins/catalog.ts b/packages/create-app/templates/default-app/packages/backend/src/plugins/catalog.ts
index a132f0a8ae..3145e588cc 100644
--- a/packages/create-app/templates/default-app/packages/backend/src/plugins/catalog.ts
+++ b/packages/create-app/templates/default-app/packages/backend/src/plugins/catalog.ts
@@ -1,11 +1,13 @@
 import {
   CatalogBuilder,
-  createRouter
+  createRouter,
 } from '@backstage/plugin-catalog-backend';
 import { Router } from 'express';
 import { PluginEnvironment } from '../types';
 
-export default async function createPlugin(env: PluginEnvironment): Promise<Router> {
+export default async function createPlugin(
+  env: PluginEnvironment,
+): Promise<Router> {
   const builder = await CatalogBuilder.create(env);
   const {
     entitiesCatalog,
diff --git a/packages/create-app/templates/default-app/packages/backend/src/plugins/scaffolder.ts b/packages/create-app/templates/default-app/packages/backend/src/plugins/scaffolder.ts
index a0201cec01..6be2e9712d 100644
--- a/packages/create-app/templates/default-app/packages/backend/src/plugins/scaffolder.ts
+++ b/packages/create-app/templates/default-app/packages/backend/src/plugins/scaffolder.ts
@@ -1,11 +1,6 @@
-import {
-  DockerContainerRunner,
-  SingleHostDiscovery,
-} from '@backstage/backend-common';
+import { DockerContainerRunner } from '@backstage/backend-common';
 import { CatalogClient } from '@backstage/catalog-client';
-import {
-  createRouter,
-} from '@backstage/plugin-scaffolder-backend';
+import { createRouter } from '@backstage/plugin-scaffolder-backend';
 import Docker from 'dockerode';
 import { Router } from 'express';
 import type { PluginEnvironment } from '../types';
@@ -15,11 +10,10 @@ export default async function createPlugin({
   config,
   database,
   reader,
+  discovery,
 }: PluginEnvironment): Promise<Router> {
   const dockerClient = new Docker();
   const containerRunner = new DockerContainerRunner({ dockerClient });
-
-  const discovery = SingleHostDiscovery.fromConfig(config);
   const catalogClient = new CatalogClient({ discoveryApi: discovery });
 
   return await createRouter({
diff --git a/packages/create-app/templates/default-app/packages/backend/src/plugins/search.ts b/packages/create-app/templates/default-app/packages/backend/src/plugins/search.ts
index 248ed37ea8..7fc317d23d 100644
--- a/packages/create-app/templates/default-app/packages/backend/src/plugins/search.ts
+++ b/packages/create-app/templates/default-app/packages/backend/src/plugins/search.ts
@@ -10,6 +10,7 @@ import { DefaultCatalogCollator } from '@backstage/plugin-catalog-backend';
 export default async function createPlugin({
   logger,
   discovery,
+  config,
 }: PluginEnvironment) {
   // Initialize a connection to a search engine.
   const searchEngine = new LunrSearchEngine({ logger });
@@ -19,7 +20,7 @@ export default async function createPlugin({
   // particular collator gathers entities from the software catalog.
   indexBuilder.addCollator({
     defaultRefreshIntervalSeconds: 600,
-    collator: new DefaultCatalogCollator({ discovery }),
+    collator: DefaultCatalogCollator.fromConfig(config, { discovery }),
   });
 
   // The scheduler controls when documents are gathered from collators and sent
diff --git a/packages/create-app/templates/default-app/packages/backend/src/types.ts b/packages/create-app/templates/default-app/packages/backend/src/types.ts
index e5bfff2e1f..6c78a2a90c 100644
--- a/packages/create-app/templates/default-app/packages/backend/src/types.ts
+++ b/packages/create-app/templates/default-app/packages/backend/src/types.ts
@@ -12,6 +12,6 @@ export type PluginEnvironment = {
   database: PluginDatabaseManager;
   cache: PluginCacheManager;
   config: Config;
-  reader: UrlReader
+  reader: UrlReader;
   discovery: PluginEndpointDiscovery;
 };
diff --git a/packages/dev-utils/CHANGELOG.md b/packages/dev-utils/CHANGELOG.md
index 9cd431fba8..b15b3437f2 100644
--- a/packages/dev-utils/CHANGELOG.md
+++ b/packages/dev-utils/CHANGELOG.md
@@ -1,5 +1,99 @@
 # @backstage/dev-utils
 
+## 0.2.9
+
+### Patch Changes
+
+- d1da88a19: Properly export all used types.
+- Updated dependencies
+  - @backstage/core-components@0.4.1
+  - @backstage/catalog-model@0.9.2
+  - @backstage/core-app-api@0.1.12
+  - @backstage/core-plugin-api@0.1.7
+
+## 0.2.8
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@0.4.5
+  - @backstage/core-components@0.4.0
+  - @backstage/catalog-model@0.9.1
+  - @backstage/core-app-api@0.1.11
+  - @backstage/integration-react@0.1.8
+
+## 0.2.7
+
+### Patch Changes
+
+- be2cd4740: Fixed busy refresh loop that happened when registering a page at `/`.
+- Updated dependencies
+  - @backstage/core-app-api@0.1.9
+  - @backstage/plugin-catalog-react@0.4.3
+  - @backstage/core-components@0.3.2
+  - @backstage/theme@0.2.10
+
+## 0.2.6
+
+### Patch Changes
+
+- 56c773909: Switched `@types/react` dependency to request `*` rather than a specific version.
+- Updated dependencies
+  - @backstage/core-app-api@0.1.8
+  - @backstage/core-components@0.3.1
+  - @backstage/core-plugin-api@0.1.6
+  - @backstage/test-utils@0.1.17
+  - @backstage/plugin-catalog-react@0.4.2
+  - @backstage/integration-react@0.1.7
+
+## 0.2.5
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.3.0
+  - @backstage/core-plugin-api@0.1.5
+  - @backstage/core-app-api@0.1.7
+  - @backstage/integration-react@0.1.6
+  - @backstage/plugin-catalog-react@0.4.1
+
+## 0.2.4
+
+### Patch Changes
+
+- 9d40fcb1e: - Bumping `material-ui/core` version to at least `4.12.2` as they made some breaking changes in later versions which broke `Pagination` of the `Table`.
+  - Switching out `material-table` to `@material-table/core` for support for the later versions of `material-ui/core`
+  - This causes a minor API change to `@backstage/core-components` as the interface for `Table` re-exports the `prop` from the underlying `Table` components.
+  - `onChangeRowsPerPage` has been renamed to `onRowsPerPageChange`
+  - `onChangePage` has been renamed to `onPageChange`
+  - Migration guide is here: https://material-table-core.com/docs/breaking-changes
+- Updated dependencies
+  - @backstage/core-components@0.2.0
+  - @backstage/plugin-catalog-react@0.4.0
+  - @backstage/core-app-api@0.1.6
+  - @backstage/core-plugin-api@0.1.4
+  - @backstage/integration-react@0.1.5
+  - @backstage/test-utils@0.1.16
+  - @backstage/theme@0.2.9
+
+## 0.2.3
+
+### Patch Changes
+
+- 01001a324: Allow custom theme for dev app.
+- Updated dependencies
+  - @backstage/core-components@0.1.6
+  - @backstage/plugin-catalog-react@0.3.1
+  - @backstage/core-app-api@0.1.5
+  - @backstage/test-utils@0.1.15
+
+## 0.2.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@0.3.0
+
 ## 0.2.1
 
 ### Patch Changes
diff --git a/packages/dev-utils/api-report.md b/packages/dev-utils/api-report.md
index 18bee415ff..8d54d8f98d 100644
--- a/packages/dev-utils/api-report.md
+++ b/packages/dev-utils/api-report.md
@@ -6,8 +6,9 @@
 /// <reference types="react" />
 
 import { ApiFactory } from '@backstage/core-plugin-api';
+import { AppTheme } from '@backstage/core-plugin-api';
+import { BackstagePlugin } from '@backstage/core-plugin-api';
 import { ComponentType } from 'react';
-import { createPlugin } from '@backstage/core-plugin-api';
 import { Entity } from '@backstage/catalog-model';
 import { GridProps } from '@material-ui/core';
 import { IconComponent } from '@backstage/core-plugin-api';
@@ -16,6 +17,32 @@ import { ReactNode } from 'react';
 // @public
 export function createDevApp(): DevAppBuilder;
 
+// @public
+export class DevAppBuilder {
+  addPage(opts: DevAppPageOptions): DevAppBuilder;
+  addRootChild(node: ReactNode): DevAppBuilder;
+  addThemes(themes: AppTheme[]): this;
+  build(): ComponentType<{}>;
+  registerApi<
+    Api,
+    Impl extends Api,
+    Deps extends {
+      [name in string]: unknown;
+    },
+  >(factory: ApiFactory<Api, Impl, Deps>): DevAppBuilder;
+  registerPlugin(...plugins: BackstagePlugin[]): DevAppBuilder;
+  render(): void;
+}
+
+// @public (undocumented)
+export type DevAppPageOptions = {
+  path?: string;
+  element: JSX.Element;
+  children?: JSX.Element;
+  title?: string;
+  icon?: IconComponent;
+};
+
 // @public (undocumented)
 export const EntityGridItem: ({
   entity,
diff --git a/packages/dev-utils/package.json b/packages/dev-utils/package.json
index 1f6833e573..5d6bbba3d7 100644
--- a/packages/dev-utils/package.json
+++ b/packages/dev-utils/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@backstage/dev-utils",
   "description": "Utilities for developing Backstage plugins.",
-  "version": "0.2.1",
+  "version": "0.2.9",
   "private": false,
   "publishConfig": {
     "access": "public",
@@ -29,20 +29,20 @@
     "clean": "backstage-cli clean"
   },
   "dependencies": {
-    "@backstage/core-app-api": "^0.1.3",
-    "@backstage/core-components": "^0.1.5",
-    "@backstage/core-plugin-api": "^0.1.3",
-    "@backstage/catalog-model": "^0.9.0",
-    "@backstage/integration-react": "^0.1.4",
-    "@backstage/plugin-catalog-react": "^0.2.6",
-    "@backstage/test-utils": "^0.1.14",
-    "@backstage/theme": "^0.2.8",
-    "@material-ui/core": "^4.11.0",
+    "@backstage/core-app-api": "^0.1.12",
+    "@backstage/core-components": "^0.4.1",
+    "@backstage/core-plugin-api": "^0.1.7",
+    "@backstage/catalog-model": "^0.9.2",
+    "@backstage/integration-react": "^0.1.8",
+    "@backstage/plugin-catalog-react": "^0.4.5",
+    "@backstage/test-utils": "^0.1.17",
+    "@backstage/theme": "^0.2.10",
+    "@material-ui/core": "^4.12.2",
     "@material-ui/icons": "^4.9.1",
     "@testing-library/jest-dom": "^5.10.1",
     "@testing-library/react": "^11.2.5",
     "@testing-library/user-event": "^13.1.8",
-    "@types/react": "^16.9",
+    "@types/react": "*",
     "react": "^16.12.0",
     "react-dom": "^16.12.0",
     "react-hot-loader": "^4.12.21",
@@ -50,7 +50,7 @@
     "react-router-dom": "6.0.0-beta.0"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.7.2",
+    "@backstage/cli": "^0.7.11",
     "@types/jest": "^26.0.7",
     "@types/node": "^14.14.32"
   },
diff --git a/packages/dev-utils/src/components/EntityGridItem/EntityGridItem.tsx b/packages/dev-utils/src/components/EntityGridItem/EntityGridItem.tsx
index 30288fe7bb..55327f35e5 100644
--- a/packages/dev-utils/src/components/EntityGridItem/EntityGridItem.tsx
+++ b/packages/dev-utils/src/components/EntityGridItem/EntityGridItem.tsx
@@ -34,6 +34,7 @@ const useStyles = makeStyles<BackstageTheme, { entity: Entity }>(theme => ({
   }),
 }));
 
+/** @public */
 export const EntityGridItem = ({
   entity,
   classes,
diff --git a/packages/dev-utils/src/devApp/index.tsx b/packages/dev-utils/src/devApp/index.tsx
index d72b4757c8..69394007d2 100644
--- a/packages/dev-utils/src/devApp/index.tsx
+++ b/packages/dev-utils/src/devApp/index.tsx
@@ -14,4 +14,5 @@
  * limitations under the License.
  */
 
-export * from './render';
+export { createDevApp } from './render';
+export type { DevAppBuilder, DevAppPageOptions } from './render';
diff --git a/packages/dev-utils/src/devApp/render.tsx b/packages/dev-utils/src/devApp/render.tsx
index 508eb105f1..755289a060 100644
--- a/packages/dev-utils/src/devApp/render.tsx
+++ b/packages/dev-utils/src/devApp/render.tsx
@@ -37,13 +37,14 @@ import {
 import {
   AnyApiFactory,
   ApiFactory,
+  AppTheme,
   attachComponentData,
   configApiRef,
   createApiFactory,
-  createPlugin,
   createRouteRef,
   IconComponent,
   RouteRef,
+  BackstagePlugin,
 } from '@backstage/core-plugin-api';
 
 import { createApp, FlatRoutes } from '@backstage/core-app-api';
@@ -56,7 +57,8 @@ const GatheringRoute: (props: {
 
 attachComponentData(GatheringRoute, 'core.gatherMountPoints', true);
 
-type RegisterPageOptions = {
+/** @public */
+export type DevAppPageOptions = {
   path?: string;
   element: JSX.Element;
   children?: JSX.Element;
@@ -64,14 +66,13 @@ type RegisterPageOptions = {
   icon?: IconComponent;
 };
 
-// TODO(rugvip): export proper plugin type from core that isn't the plugin class
-type BackstagePlugin = ReturnType<typeof createPlugin>;
-
 /**
  * DevApp builder that is similar to the App builder API, but creates an App
  * with the purpose of developing one or more plugins inside it.
+ *
+ * @public
  */
-class DevAppBuilder {
+export class DevAppBuilder {
   private readonly plugins = new Array<BackstagePlugin>();
   private readonly apis = new Array<AnyApiFactory>();
   private readonly rootChildren = new Array<ReactNode>();
@@ -79,6 +80,7 @@ class DevAppBuilder {
   private readonly sidebarItems = new Array<JSX.Element>();
 
   private defaultPage?: string;
+  private themes?: Array<AppTheme>;
 
   /**
    * Register one or more plugins to render in the dev app
@@ -94,7 +96,7 @@ class DevAppBuilder {
   registerApi<
     Api,
     Impl extends Api,
-    Deps extends { [name in string]: unknown }
+    Deps extends { [name in string]: unknown },
   >(factory: ApiFactory<Api, Impl, Deps>): DevAppBuilder {
     this.apis.push(factory);
     return this;
@@ -116,7 +118,7 @@ class DevAppBuilder {
    * If no path is provided one will be generated.
    * If no title is provided, no sidebar item will be created.
    */
-  addPage(opts: RegisterPageOptions): DevAppBuilder {
+  addPage(opts: DevAppPageOptions): DevAppBuilder {
     const path = opts.path ?? `/page-${this.routes.length + 1}`;
 
     if (!this.defaultPage || path === '/') {
@@ -144,6 +146,14 @@ class DevAppBuilder {
     return this;
   }
 
+  /**
+   * Adds an array of themes to overide the default theme.
+   */
+  addThemes(themes: AppTheme[]) {
+    this.themes = themes;
+    return this;
+  }
+
   /**
    * Build a DevApp component using the resources registered so far
    */
@@ -166,6 +176,7 @@ class DevAppBuilder {
     const app = createApp({
       apis,
       plugins: this.plugins,
+      themes: this.themes,
       bindRoutes: ({ bind }) => {
         for (const plugin of this.plugins ?? []) {
           const targets: Record<string, RouteRef<any>> = {};
@@ -216,7 +227,11 @@ class DevAppBuilder {
 
     const DevApp = hot(hotModule)(this.build());
 
-    if (window.location.pathname === '/' && this.defaultPage) {
+    if (
+      window.location.pathname === '/' &&
+      this.defaultPage &&
+      this.defaultPage !== '/'
+    ) {
       window.location.pathname = this.defaultPage;
     }
 
@@ -229,6 +244,8 @@ class DevAppBuilder {
 
 /**
  * Creates a dev app for rendering one or more plugins and exposing the touch points of the plugin.
+ *
+ * @public
  */
 export function createDevApp() {
   return new DevAppBuilder();
diff --git a/packages/docgen/README.md b/packages/docgen/README.md
deleted file mode 100644
index be1d7cd521..0000000000
--- a/packages/docgen/README.md
+++ /dev/null
@@ -1,21 +0,0 @@
-# DocGen - API Reference Documentation Generator
-
-The docgen package provides a CLI to generate markdown documentation for all exported ApiRefs in `@backstage/core`. The documentation is generated based on exported `ApiRef` instances and their type parameters.
-
-The CLI supports generating both TechDocs and GitHub Markdown, where the TechDocs one provides some better linking and syntax highlighting.
-
-## Usage
-
-To generate markdown documentation in the top-level `docs/` directory, run the following:
-
-```bash
-yarn docgen
-```
-
-## TODO
-
-This package was lifted out from the Spotify internal Backstage project and could use some further work:
-
-- Use a higher-level TypeScript compiler library, e.g. `ts-morph`.
-- Support for generating docs for any package or multiple packages.
-- Better handling of self-referencing types in APIs, e.g. ConfigApi.
diff --git a/packages/docgen/bin/backstage-docgen b/packages/docgen/bin/backstage-docgen
deleted file mode 100755
index 71674eedd4..0000000000
--- a/packages/docgen/bin/backstage-docgen
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/usr/bin/env node
-/*
- * Copyright 2020 The Backstage Authors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/* eslint-disable no-restricted-syntax */
-const path = require('path');
-
-// Figure out whether we're running inside the backstage repo or as an installed dependency
-const isLocal = require('fs').existsSync(path.resolve(__dirname, '../src'));
-
-if (!isLocal || process.env.BACKSTAGE_E2E_CLI_TEST) {
-  require('..');
-} else {
-  require('ts-node').register({
-    transpileOnly: true,
-    project: path.resolve(__dirname, '../../../tsconfig.json'),
-    compilerOptions: {
-      module: 'CommonJS',
-    },
-  });
-
-  require('../src');
-}
diff --git a/packages/docgen/package.json b/packages/docgen/package.json
deleted file mode 100644
index ad47991159..0000000000
--- a/packages/docgen/package.json
+++ /dev/null
@@ -1,51 +0,0 @@
-{
-  "name": "docgen",
-  "description": "Tool for generating API Documentation for itself",
-  "version": "0.1.1",
-  "private": true,
-  "homepage": "https://backstage.io",
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/backstage/backstage",
-    "directory": "packages/docgen"
-  },
-  "keywords": [
-    "backstage"
-  ],
-  "license": "Apache-2.0",
-  "main": "src/index.ts",
-  "scripts": {
-    "build": "backstage-cli build --outputs cjs",
-    "lint": "backstage-cli lint",
-    "test": "backstage-cli test",
-    "docgen": "backstage-docgen generate --output ../../docs/reference/utility-apis --format github && prettier --write ../../docs/reference/utility-apis",
-    "clean": "backstage-cli clean",
-    "start": "nodemon --"
-  },
-  "bin": {
-    "backstage-docgen": "bin/backstage-docgen"
-  },
-  "dependencies": {
-    "chalk": "^4.0.0",
-    "commander": "^6.1.0",
-    "fs-extra": "9.1.0",
-    "github-slugger": "^1.3.0",
-    "ts-node": "^10.0.0",
-    "typescript": "^4.0.3"
-  },
-  "devDependencies": {
-    "@types/fs-extra": "^9.0.1",
-    "@types/github-slugger": "^1.3.0",
-    "@types/node": "^14.14.32",
-    "nodemon": "^2.0.2"
-  },
-  "files": [
-    "bin",
-    "dist"
-  ],
-  "nodemonConfig": {
-    "watch": "./src",
-    "exec": "bin/backstage-docgen",
-    "ext": "ts"
-  }
-}
diff --git a/packages/docgen/src/docgen/ApiDocGenerator.test.ts b/packages/docgen/src/docgen/ApiDocGenerator.test.ts
deleted file mode 100644
index 2d6598b925..0000000000
--- a/packages/docgen/src/docgen/ApiDocGenerator.test.ts
+++ /dev/null
@@ -1,267 +0,0 @@
-/*
- * Copyright 2020 The Backstage Authors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import ts from 'typescript';
-import TypeLocator from './TypeLocator';
-import { createMemProgram } from './testUtils';
-import ApiDocGenerator from './ApiDocGenerator';
-
-describe('ApiDocGenerator', () => {
-  it('should generate empty API doc', () => {
-    const program = createMemProgram(
-      `
-      import MyApi from './type';
-
-      type MyApiType = {};
-
-      export const myApi = new MyApi<MyApiType>({
-        id: 'my-id',
-        description: 'my-description',
-      });
-    `,
-      {
-        '/mem/type.ts': `export default class MyApi<T> {
-          constructor(private readonly info: { id: string, description: string }) {}
-        }`,
-      },
-    );
-
-    const typeLocator = TypeLocator.fromProgram(program, '/');
-
-    const { apiInstances } = typeLocator.findExportedInstances({
-      apiInstances: typeLocator.getExportedType('/mem/type.ts'),
-    });
-
-    expect(apiInstances.length).toBe(1);
-    const [apiInstance] = apiInstances;
-
-    const docGenerator = ApiDocGenerator.fromProgram(program, '/');
-    const doc = docGenerator.toDoc(apiInstance);
-
-    expect(doc.id).toBe('my-id');
-    expect(doc.description).toBe('my-description');
-    expect(doc.name).toBe('myApi');
-    expect(doc.file).toBe('mem/index.ts');
-    expect(doc.lineInFile).toBe(6);
-    expect(doc.interfaceInfos).toEqual([
-      {
-        dependentTypes: [],
-        docs: [],
-        file: 'mem/index.ts',
-        lineInFile: 4,
-        members: [],
-        name: 'MyApiType',
-      },
-    ]);
-  });
-
-  it('should generate API docs', () => {
-    const program = createMemProgram(
-      `
-      import MyApi from './type';
-
-      /** MySubSubType Docs */
-      type MySubSubType = { n: number; };
-
-      /** MySubType Docs */
-      type MySubType = {
-        /** Field a docs */
-        a: boolean;
-        // Field b docs
-        b: MySubSubType;
-      }
-
-      /** MySecondSubType Docs */
-
-      /** With multiple comments */
-      export type MySecondSubType = { s: string };
-
-      // MyThirdSubType Docs that shouldn't show up
-      type MyThirdSubType = { b: boolean };
-
-      /** MyApiType Docs */
-      type MyApiType = {
-        /** Docs for x */
-        x: string;
-        // Line comments shouldn't show up
-        y: MySubType;
-        /** Multiple */
-        /** JsDoc */
-        /** Comments */
-        z(a: Promise<readonly [{k: MySecondSubType}[]]>): Array<MyThirdSubType>;
-      };
-
-      /** Should not show up */
-      export const myApi = new MyApi<MyApiType>({
-        id: 'my-id',
-        description: 'my-description',
-      });
-    `,
-      {
-        '/mem/type.ts': `export default class MyApi<T> {
-          constructor(private readonly info: { id: string, description: string }) {}
-        }`,
-      },
-    );
-
-    const source = program.getSourceFile('/mem/index.ts');
-
-    // Figure out type IDs so we can make sure they match later
-    const checker = program.getTypeChecker();
-    const symbols = checker.getSymbolsInScope(
-      source!.getChildren().slice(-1)[0],
-      ts.SymbolFlags.TypeAlias,
-    );
-    const Ids = [
-      'MySubType',
-      'MySubSubType',
-      'MySecondSubType',
-      'MyThirdSubType',
-    ].reduce((ids, name) => {
-      const symbol = symbols.find(s => s.escapedName === name)!;
-      const type = checker.getTypeAtLocation(symbol.declarations[0]);
-      ids[name] = (type.aliasSymbol as any).id;
-      return ids;
-    }, {} as { [key in string]: number });
-
-    const typeLocator = TypeLocator.fromProgram(program, '/mem');
-
-    const { apiInstances } = typeLocator.findExportedInstances({
-      apiInstances: typeLocator.getExportedType('/mem/type.ts'),
-    });
-
-    expect(apiInstances.length).toBe(1);
-    const [apiInstance] = apiInstances;
-
-    const docGenerator = ApiDocGenerator.fromProgram(program, '/mem');
-    const doc = docGenerator.toDoc(apiInstance);
-
-    expect(doc.id).toBe('my-id');
-    expect(doc.description).toBe('my-description');
-    expect(doc.name).toBe('myApi');
-    expect(doc.file).toBe('index.ts');
-    expect(doc.interfaceInfos.length).toBe(1);
-    expect(doc.interfaceInfos[0].docs).toEqual(['MyApiType Docs']);
-    expect(doc.interfaceInfos[0].file).toBe('index.ts');
-    expect(doc.interfaceInfos[0].lineInFile).toBe(24);
-    expect(doc.interfaceInfos[0].name).toBe('MyApiType');
-    expect(doc.interfaceInfos[0].members).toEqual([
-      {
-        type: 'prop',
-        name: 'x',
-        path: 'MyApiType.x',
-        text: 'x: string',
-        docs: ['Docs for x'],
-        links: [],
-      },
-      {
-        type: 'prop',
-        name: 'y',
-        path: 'MyApiType.y',
-        text: 'y: MySubType',
-        docs: [],
-        links: [
-          {
-            id: Ids.MySubType,
-            name: 'MySubType',
-            path: 'index.ts/MySubType',
-            location: [3, 12],
-          },
-        ],
-      },
-      {
-        type: 'method',
-        name: 'z',
-        path: 'MyApiType.z',
-        text:
-          'z(a: Promise<readonly [{k: MySecondSubType}[]]>): Array<MyThirdSubType>',
-        docs: ['Multiple', 'JsDoc', 'Comments'],
-        links: [
-          {
-            id: Ids.MySecondSubType,
-            name: 'MySecondSubType',
-            path: 'index.ts/MySecondSubType',
-            location: [27, 42],
-          },
-          {
-            id: Ids.MyThirdSubType,
-            name: 'MyThirdSubType',
-            path: 'index.ts/MyThirdSubType',
-            location: [56, 70],
-          },
-        ],
-      },
-    ]);
-    expect(doc.interfaceInfos[0].dependentTypes).toEqual([
-      {
-        id: Ids.MySubType,
-        name: 'MySubType',
-        path: 'index.ts/MySubType',
-        file: 'index.ts',
-        lineInFile: 8,
-        text: `type MySubType = {
-        /** Field a docs */
-        a: boolean;
-        // Field b docs
-        b: MySubSubType;
-      }`,
-        docs: ['MySubType Docs'],
-        links: [
-          {
-            id: Ids.MySubSubType,
-            name: 'MySubSubType',
-            path: 'index.ts/MySubSubType',
-            location: [102, 114],
-          },
-        ],
-        children: [],
-      },
-      {
-        id: Ids.MySubSubType,
-        name: 'MySubSubType',
-        path: 'index.ts/MySubSubType',
-        file: 'index.ts',
-        lineInFile: 5,
-        text: 'type MySubSubType = { n: number; }',
-        docs: ['MySubSubType Docs'],
-        links: [],
-        children: [],
-      },
-      {
-        id: Ids.MySecondSubType,
-        name: 'MySecondSubType',
-        path: 'index.ts/MySecondSubType',
-        file: 'index.ts',
-        lineInFile: 18,
-        text: 'export type MySecondSubType = { s: string }',
-        docs: ['MySecondSubType Docs', 'With multiple comments'],
-        links: [],
-        children: [],
-      },
-      {
-        id: Ids.MyThirdSubType,
-        name: 'MyThirdSubType',
-        path: 'index.ts/MyThirdSubType',
-        file: 'index.ts',
-        lineInFile: 21,
-        text: 'type MyThirdSubType = { b: boolean }',
-        docs: [],
-        links: [],
-        children: [],
-      },
-    ]);
-  });
-});
diff --git a/packages/docgen/src/docgen/ApiDocGenerator.ts b/packages/docgen/src/docgen/ApiDocGenerator.ts
deleted file mode 100644
index 3199b2ddf3..0000000000
--- a/packages/docgen/src/docgen/ApiDocGenerator.ts
+++ /dev/null
@@ -1,344 +0,0 @@
-/*
- * Copyright 2020 The Backstage Authors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import ts from 'typescript';
-import {
-  relative as relativePath,
-  sep as pathSep,
-  posix as posixPath,
-} from 'path';
-import {
-  ExportedInstance,
-  ApiDoc,
-  InterfaceInfo,
-  FieldInfo,
-  TypeInfo,
-  TypeLink,
-} from './types';
-
-// Always use unix path separators for the relative file
-// paths, since we'll be using those for HTTP URLs.
-function relativeLink(basePath: string, filePath: string) {
-  return relativePath(basePath, filePath).split(pathSep).join(posixPath.sep);
-}
-
-/**
- * The ApiDocGenerator uses the typescript compiler API to build the data structure that
- * describes a Backstage API and all of it's related types.
- *
- * It receives an exported instance that of the form
- * `export name = createApiRef<Interface>({id: ..., description: ...})`.
- * It will then traverse all fields and methods on the interface type, and also
- * types and declaration of all types that are used by those, both directly and indirectly.
- * While traversing, it collects information such as names, location in source, docs, etc.
- */
-export default class ApiDocGenerator {
-  static fromProgram(program: ts.Program, sourcePath: string) {
-    return new ApiDocGenerator(program.getTypeChecker(), sourcePath);
-  }
-
-  constructor(
-    private readonly checker: ts.TypeChecker,
-    private readonly basePath: string,
-  ) {}
-
-  /**
-   * Generate documentation information for a given exported symbol.
-   */
-  toDoc(apiInstance: ExportedInstance): ApiDoc {
-    const { name, source, args, typeArgs } = apiInstance;
-
-    const [info] = args;
-    if (!ts.isObjectLiteralExpression(info)) {
-      throw new Error('api info is not an object literal');
-    }
-
-    const id = this.getObjectPropertyLiteral(info, 'id');
-    const description = this.getObjectPropertyLiteral(info, 'description');
-    const file = relativeLink(this.basePath, source.fileName);
-    const { line } = source.getLineAndCharacterOfPosition(
-      apiInstance.node.getStart(),
-    );
-
-    const rootTypeNode = typeArgs[0];
-    const typeNodes = ts.isIntersectionTypeNode(rootTypeNode)
-      ? rootTypeNode.types.slice()
-      : [rootTypeNode];
-    const interfaceInfos = typeNodes.map(typeNode =>
-      this.getInterfaceInfo(typeNode),
-    );
-
-    return {
-      id,
-      name,
-      file,
-      lineInFile: line + 1,
-      description,
-      interfaceInfos,
-    };
-  }
-
-  /**
-   * Grab jsDoc and regular comments for a node
-   */
-  private getNodeDocs(node: ts.Node): string[] {
-    const docNodes = ((node && (node as any).jsDoc) || []) as ts.JSDoc[];
-    const docs = docNodes.map(docNode => docNode.comment || '').filter(Boolean);
-    return docs;
-  }
-
-  /**
-   * Collect information about a top-level type.
-   */
-  private getInterfaceInfo(typeNode: ts.TypeNode): InterfaceInfo {
-    if (ts.isTypeQueryNode(typeNode)) {
-      throw new Error(
-        'APIs must have a proper type parameter, TypeQueries are now allowed',
-      );
-    }
-    if (!ts.isTypeReferenceNode(typeNode)) {
-      throw new Error('Interface is not a type node');
-    }
-
-    const type = this.checker.getTypeFromTypeNode(typeNode);
-    const interfaceMembers = type.symbol.members as Map<string, ts.Symbol>;
-    if (!interfaceMembers) {
-      throw new Error('Interface does not have any members');
-    }
-    const name = (type.aliasSymbol || type.symbol).name;
-    const [declaration] = (type.aliasSymbol || type.symbol).declarations;
-    const sourceFile = declaration.getSourceFile();
-    const file = relativeLink(this.basePath, sourceFile.fileName);
-    const { line } = sourceFile.getLineAndCharacterOfPosition(
-      declaration.getStart(),
-    );
-    const docs = this.getNodeDocs(declaration);
-
-    const membersAndTypes = Array.from(
-      interfaceMembers.values(),
-    ).flatMap(fieldSymbol => this.getMemberInfo(name, fieldSymbol));
-
-    const members = membersAndTypes.map(t => t.member);
-    const dependentTypes = this.flattenTypes(
-      membersAndTypes.flatMap(t => t.dependentTypes),
-    );
-
-    return { name, docs, file, lineInFile: line + 1, members, dependentTypes };
-  }
-
-  /**
-   * Grab primitive values from an object literal expression.
-   */
-  private getObjectPropertyLiteral(
-    objectLiteral: ts.ObjectLiteralExpression,
-    propertyName: string,
-  ): string {
-    const matchingProp = objectLiteral.properties.filter(
-      prop =>
-        ts.isPropertyAssignment(prop) &&
-        ts.isIdentifier(prop.name) &&
-        prop.name.text === propertyName,
-    )[0] as ts.PropertyAssignment;
-
-    if (!matchingProp) {
-      throw new Error(`no identifier found for property ${propertyName}`);
-    }
-
-    const { initializer } = matchingProp;
-    if (!ts.isStringLiteral(initializer)) {
-      throw new Error(`no string literal for ${propertyName}`);
-    }
-
-    return initializer.text;
-  }
-
-  /**
-   * Get field definitions for a given symbol.
-   */
-  private getMemberInfo(
-    parentName: string,
-    symbol: ts.Symbol,
-  ): { member: FieldInfo; dependentTypes: TypeInfo[] } {
-    const declaration = symbol.valueDeclaration;
-
-    const { links, infos: dependentTypes } = this.findAllTypeReferences(
-      declaration,
-    );
-
-    let type: FieldInfo['type'] = 'prop';
-    if (
-      ts.isPropertySignature(declaration) &&
-      declaration.type &&
-      ts.isFunctionTypeNode(declaration.type)
-    ) {
-      type = 'method';
-    } else if (ts.isMethodSignature(declaration)) {
-      type = 'method';
-    }
-
-    return {
-      member: {
-        type,
-        name: symbol.name,
-        path: `${parentName}.${symbol.name}`,
-        text: declaration.getText().replace(/;$/, ''),
-        docs: this.getNodeDocs(declaration),
-        links: this.recalculateLinkOffsets(declaration, links),
-      },
-      dependentTypes,
-    };
-  }
-
-  /**
-   * Recursively search for references to types that we care about and want to include in the documentation.
-   */
-  private findAllTypeReferences = (
-    node: ts.Node | undefined,
-    visited: Set<ts.Node> = new Set(),
-  ): { links: TypeLink[]; infos: TypeInfo[] } => {
-    if (!node || visited.has(node)) {
-      return { links: [], infos: [] };
-    }
-    // This makes sure we don't end up in a loop.
-    // It doesn't exclude repeated types, e.g. Array<Array<MyType>>, since we're exiting on duplicate nodes, not types.
-    visited.add(node);
-
-    const children = node
-      .getChildren()
-      .flatMap(child => this.findAllTypeReferences(child, visited));
-
-    if (!ts.isTypeReferenceNode(node)) {
-      return {
-        links: children.flatMap(child => child.links),
-        infos: children.flatMap(child => child.infos),
-      };
-    }
-
-    const type = this.checker.getTypeFromTypeNode(node);
-
-    const info = this.validateTypeDeclaration(type);
-    if (!info) {
-      return {
-        links: children.flatMap(child => child.links),
-        infos: children.flatMap(child => child.infos),
-      };
-    }
-    const { symbol, declaration } = info;
-
-    const typeRefs = this.findAllTypeReferences(declaration, visited);
-
-    const sourceFile = declaration.getSourceFile();
-    const { line } = sourceFile.getLineAndCharacterOfPosition(
-      declaration.getStart(),
-    );
-    const file = relativeLink(this.basePath, sourceFile.fileName);
-    const typeInfo = {
-      id: (symbol as any).id,
-      name: symbol.name,
-      text: declaration.getText().replace(/;$/, ''),
-      docs: this.getNodeDocs(declaration),
-      path: `${file}/${symbol.name}`,
-      file,
-      lineInFile: line + 1, // TS line is 0-based
-      links: this.recalculateLinkOffsets(declaration, typeRefs.links),
-      children: typeRefs.infos,
-    };
-
-    const link = {
-      id: typeInfo.id,
-      path: typeInfo.path,
-      name: typeInfo.name,
-      location: [node.typeName.getStart(), node.typeName.getEnd()] as const,
-    };
-
-    return {
-      links: [link, ...children.flatMap(child => child.links)],
-      infos: [typeInfo, ...children.flatMap(child => child.infos)],
-    };
-  };
-
-  /**
-   * Check if a given type declaration is one that we care about.
-   */
-  private validateTypeDeclaration(
-    type: ts.Type | undefined,
-  ): undefined | { symbol: ts.Symbol; declaration: ts.Declaration } {
-    if (!type) {
-      return undefined;
-    }
-    const symbol = type.aliasSymbol || type.symbol;
-    if (!symbol) {
-      return undefined;
-    }
-
-    const [declaration] = symbol.declarations;
-
-    // Don't generate standalone infos for type paramters
-    if (ts.isTypeParameterDeclaration(declaration)) {
-      return undefined;
-    }
-
-    if (declaration.getSourceFile().fileName.includes('node_modules')) {
-      return undefined;
-    }
-
-    return { symbol, declaration };
-  }
-
-  /**
-   * Flatten a tree of TypeInfos with children into a flat
-   * list of TypeInfos with duplicates removed.
-   */
-  private flattenTypes(descs: TypeInfo[]): TypeInfo[] {
-    function getChildren(parent: TypeInfo): TypeInfo[] {
-      return [
-        {
-          ...parent,
-          children: [],
-        },
-        ...parent.children.flatMap(getChildren),
-      ];
-    }
-
-    const flatDescs = descs.flatMap(getChildren);
-    const seenTypes = new Set<number>();
-    return flatDescs.filter(desc => {
-      if (seenTypes.has(desc.id)) {
-        return false;
-      }
-      seenTypes.add(desc.id);
-      return true;
-    });
-  }
-
-  /**
-   * Calculate link positions within a block of code, with 0 being
-   * the first character in the block.
-   */
-  private recalculateLinkOffsets(
-    parent: ts.Node,
-    links: TypeLink[],
-  ): TypeLink[] {
-    const parentStart = parent.getStart();
-    return links.map(link => {
-      const [start, end] = link.location;
-      return {
-        ...link,
-        location: [start - parentStart, end - parentStart],
-      };
-    });
-  }
-}
diff --git a/packages/docgen/src/docgen/ApiDocsPrinter.ts b/packages/docgen/src/docgen/ApiDocsPrinter.ts
deleted file mode 100644
index 1fd62c29cd..0000000000
--- a/packages/docgen/src/docgen/ApiDocsPrinter.ts
+++ /dev/null
@@ -1,163 +0,0 @@
-/*
- * Copyright 2020 The Backstage Authors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import sortSelector from './sortSelector';
-import { ApiDoc, InterfaceInfo, MarkdownPrinter } from './types';
-
-/**
- * The ApiDocPrinter takes a ApiDoc data structure, typically generated by an ApiDocGenerator,
- * and prints it out as a markdown doc with custom code highlighting and links.
- */
-export default class ApiDocPrinter {
-  printerFactory: () => MarkdownPrinter;
-
-  constructor(printerFactory: () => MarkdownPrinter) {
-    this.printerFactory = printerFactory;
-  }
-
-  /**
-   * Print an index file with all ApiRefs and what types they implement.
-   */
-  printApiIndex(apiDocs: ApiDoc[]): Buffer {
-    const printer = this.printerFactory();
-
-    printer.header(1, 'Backstage Core Utility APIs');
-
-    printer.paragraph(
-      'The following is a list of all Utility APIs defined by `@backstage/core`.',
-      'They are available to use by plugins and components, and can be accessed ',
-      'using the `useApi` hook, also provided by `@backstage/core`.',
-      'For more information, see https://github.com/backstage/backstage/blob/master/docs/api/utility-apis.md.',
-    );
-
-    for (const api of apiDocs) {
-      printer.header(3, `${this.apiDisplayName(api)}`, api.id);
-
-      printer.paragraph(api.description);
-
-      const typeLinks = api.interfaceInfos.map(
-        i => `[${i.name}](${printer.pageLink(i.name)})`,
-      );
-      printer.paragraph(
-        `Implemented type${typeLinks.length > 1 ? 's' : ''}: ${typeLinks.join(
-          ', ',
-        )}`,
-      );
-
-      printer.paragraph(`ApiRef: ${printer.srcLink(api, api.name)}`);
-    }
-
-    return printer.toBuffer();
-  }
-
-  /**
-   * Print documentation page for a type implemented by an ApiRef and
-   */
-  printInterface(apiType: InterfaceInfo, apiDocs: ApiDoc[]): Buffer {
-    const printer = this.printerFactory();
-
-    printer.header(1, apiType.name);
-
-    printer.paragraph(
-      `The ${apiType.name} type is defined at ${printer.srcLink(apiType)}.`,
-    );
-
-    const apiLinks = apiDocs
-      .filter(ad => ad.interfaceInfos.some(i => i.name === apiType.name))
-      .map(ad => {
-        const link =
-          printer.indexLink() +
-          printer.headerLink(this.apiDisplayName(ad), ad.id);
-        return `[${ad.name}](${link})`;
-      });
-
-    if (apiLinks.length === 1) {
-      printer.paragraph(
-        `The following Utility API implements this type: ${apiLinks}`,
-      );
-    } else {
-      printer.paragraph(`The following Utility APIs implement this type:`);
-      for (const link of apiLinks) {
-        printer.text(`  - ${link}`);
-      }
-    }
-
-    printer.header(2, 'Members');
-
-    this.addInterfaceMembers(printer, apiType);
-
-    if (apiType.dependentTypes.length) {
-      printer.header(2, 'Supporting types');
-      printer.paragraph(
-        'These types are part of the API declaration, but may not be unique to this API.',
-      );
-
-      this.addInterfaceTypes(printer, apiType);
-    }
-
-    return printer.toBuffer();
-  }
-
-  private addInterfaceMembers(
-    printer: MarkdownPrinter,
-    apiType: InterfaceInfo,
-  ) {
-    for (const member of apiType.members) {
-      printer.header(
-        3,
-        `${member.name}${member.type === 'method' ? '()' : ''}`,
-        member.path,
-      );
-
-      for (const doc of member.docs) {
-        printer.text(doc);
-      }
-
-      printer.code(member);
-    }
-  }
-
-  private addInterfaceTypes(printer: MarkdownPrinter, apiType: InterfaceInfo) {
-    for (const type of apiType.dependentTypes
-      .slice()
-      .sort(sortSelector(x => x.name))) {
-      printer.header(3, `${type.name}`, type.path);
-
-      for (const doc of type.docs) {
-        printer.text(doc);
-      }
-      printer.code(type);
-
-      printer.paragraph(`Defined at ${printer.srcLink(type)}.`);
-
-      const usageLinks = [...apiType.members, ...apiType.dependentTypes]
-        .filter(member => {
-          return member.links.some(link => link.id === type.id);
-        })
-        .map(
-          ({ name, path }) => `[${name}](${printer.headerLink(name, path)})`,
-        );
-
-      if (usageLinks.length) {
-        printer.paragraph(`Referenced by: ${usageLinks.join(', ')}.`);
-      }
-    }
-  }
-
-  private apiDisplayName(api: ApiDoc): string {
-    return api.name.replace(/ApiRef$/, '');
-  }
-}
diff --git a/packages/docgen/src/docgen/GitHubMarkdownPrinter.ts b/packages/docgen/src/docgen/GitHubMarkdownPrinter.ts
deleted file mode 100644
index b36895597e..0000000000
--- a/packages/docgen/src/docgen/GitHubMarkdownPrinter.ts
+++ /dev/null
@@ -1,145 +0,0 @@
-/*
- * Copyright 2020 The Backstage Authors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import GithubSlugger from 'github-slugger';
-import sortSelector from './sortSelector';
-import { MarkdownPrinter, TypeLink } from './types';
-import { execSync } from 'child_process';
-
-// TODO(Rugvip): provide through options?
-const GH_BASE_URL = 'https://github.com/backstage/backstage';
-
-const COMMIT_SHA =
-  process.env.COMMIT_SHA ||
-  execSync('git rev-parse HEAD').toString('utf8').trim();
-
-/**
- * The GithubMarkdownPrinter is a MarkdownPrinter for printing GitHub Flavored Markdown documents.
- */
-export default class GithubMarkdownPrinter implements MarkdownPrinter {
-  private str: string = '';
-
-  private line(line: string = '') {
-    this.str += `${line}\n`;
-  }
-
-  text(text: string) {
-    this.line(text);
-    this.line();
-  }
-
-  header(level: number, text: string) {
-    this.line(`${'#'.repeat(level)} ${text}`);
-    this.line();
-  }
-
-  headerLink(heading: string): string {
-    const slug = GithubSlugger.slug(heading);
-    return `#${slug}`;
-  }
-
-  indexLink() {
-    return './README.md';
-  }
-
-  pageLink(name: string) {
-    return `./${name}.md`;
-  }
-
-  srcLink(
-    { file, lineInFile }: { file: string; lineInFile: number },
-    text?: string,
-  ): string {
-    const linkText = text ?? `${file}:${lineInFile}`;
-    const href = `${GH_BASE_URL}/blob/${COMMIT_SHA}/${file}#L${lineInFile}`;
-    return `[${linkText}](${href})`;
-  }
-
-  paragraph(...text: string[]) {
-    this.line(
-      text
-        .join('\n')
-        .trim()
-        .split('\n')
-        .map(line => line.trim())
-        .join('\n'),
-    );
-    this.line();
-  }
-
-  code({ text, links = [] }: { text: string; links?: TypeLink[] }) {
-    this.line('<pre>');
-    this.line(this.formatWithLinks({ text, links }));
-    this.line('</pre>');
-    this.line();
-  }
-
-  private escapeText: (text: string) => string = (() => {
-    const escapes: { [char in string]: string } = {
-      '&': '&amp;',
-      '<': '&lt;',
-      '>': '&gt;',
-    };
-
-    return (text: string) => text.replace(/[&<>]/g, char => escapes[char]);
-  })();
-
-  private formatWithLinks({
-    text,
-    links = [],
-  }: {
-    text: string;
-    links?: TypeLink[];
-  }): string {
-    const sortedLinks = links.slice().sort(sortSelector(x => x.location[0]));
-
-    sortedLinks.reduce((lastEnd, link) => {
-      if (link.location[0] <= lastEnd) {
-        throw new Error(
-          `overlapping link detected for ${link.path}, ${link.location}`,
-        );
-      }
-      return link.location[1];
-    }, -1);
-
-    const parts: Array<{ text: string; link?: boolean }> = [];
-
-    const endLocation = sortedLinks.reduce((prev, link) => {
-      const [start, end] = link.location;
-      parts.push(
-        { text: text.slice(prev, start) },
-        { text: text.slice(start, end), link: true },
-      );
-      return end;
-    }, 0);
-
-    parts.push({ text: text.slice(endLocation) });
-
-    return parts
-      .map(part => {
-        if (part.link) {
-          const link = this.headerLink(part.text);
-          return `<a href="${link}">${this.escapeText(part.text)}</a>`;
-        }
-        return this.escapeText(part.text);
-      })
-      .join('');
-  }
-
-  toBuffer(): Buffer {
-    return Buffer.from(this.str, 'utf8');
-  }
-}
diff --git a/packages/docgen/src/docgen/TechdocsMarkdownPrinter.ts b/packages/docgen/src/docgen/TechdocsMarkdownPrinter.ts
deleted file mode 100644
index c9e3010dda..0000000000
--- a/packages/docgen/src/docgen/TechdocsMarkdownPrinter.ts
+++ /dev/null
@@ -1,161 +0,0 @@
-/*
- * Copyright 2020 The Backstage Authors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import sortSelector from './sortSelector';
-import { Highlighter, MarkdownPrinter, TypeLink } from './types';
-import { execSync } from 'child_process';
-
-// TODO(Rugvip): provide through options?
-const GH_BASE_URL = 'https://github.com/backstage/backstage';
-
-const COMMIT_SHA =
-  process.env.COMMIT_SHA || execSync('git rev-parse HEAD').toString('utf8');
-
-/**
- * The TechdocsMarkdownPrinter is a MarkdownPrinter for building TechDocs markdown documents.
- */
-export default class TechdocsMarkdownPrinter implements MarkdownPrinter {
-  private str: string = '';
-  private readonly highlighter: Highlighter;
-
-  constructor(highlighter: Highlighter) {
-    this.highlighter = highlighter;
-
-    // Remove line numbers from codeblocks
-    this.style('.linenodiv{ display: none }');
-  }
-
-  private line(line: string = '') {
-    this.str += `${line}\n`;
-  }
-
-  text(text: string) {
-    this.line(text);
-    this.line();
-  }
-
-  style(style: string) {
-    this.line('<style>');
-    this.line(style);
-    this.line('</style>');
-  }
-
-  header(level: number, text: string, id?: string) {
-    this.line(`${'#'.repeat(level)} ${text}${id ? ` {#${id}}` : ''}`);
-    this.line();
-  }
-
-  headerLink(heading: string, id?: string): string {
-    return `#${id ?? heading}`;
-  }
-
-  indexLink() {
-    return '../';
-  }
-
-  pageLink(name: string) {
-    return `./${name}/`;
-  }
-
-  srcLink(
-    { file, lineInFile }: { file: string; lineInFile: number },
-    text?: string,
-  ): string {
-    const linkText = text ?? `${file}:${lineInFile}`;
-    const href = `${GH_BASE_URL}/blob/${COMMIT_SHA}/${file}#L${lineInFile}`;
-    return `[${linkText}](${href})`;
-  }
-
-  paragraph(...text: string[]) {
-    this.line(
-      text
-        .join('\n')
-        .trim()
-        .split('\n')
-        .map(line => line.trim())
-        .join('\n'),
-    );
-    this.line();
-  }
-
-  code({ text, links = [] }: { text: string; links?: TypeLink[] }) {
-    this.line('<div class="code">');
-    this.line(
-      '<div class="codehilite" style="background: #f0f0f0; padding: 0.225rem 0.6rem">',
-    );
-    this.line('<pre style="line-height: 125%">');
-    this.line(this.formatWithLinks({ text, links }));
-    this.line('</pre>');
-    this.line('</div>');
-    this.line('</div>');
-  }
-
-  private escapeText: (text: string) => string = (() => {
-    const escapes: { [char in string]: string } = {
-      '&': '&amp;',
-      '<': '&lt;',
-      '>': '&gt;',
-    };
-
-    return (text: string) => text.replace(/[&<>]/g, char => escapes[char]);
-  })();
-
-  private formatWithLinks({
-    text,
-    links = [],
-  }: {
-    text: string;
-    links?: TypeLink[];
-  }): string {
-    const sortedLinks = links.slice().sort(sortSelector(x => x.location[0]));
-
-    sortedLinks.reduce((lastEnd, link) => {
-      if (link.location[0] <= lastEnd) {
-        throw new Error(
-          `overlapping link detected for ${link.path}, ${link.location}`,
-        );
-      }
-      return link.location[1];
-    }, -1);
-
-    const parts: Array<{ text: string; path?: string }> = [];
-
-    const endLocation = sortedLinks.reduce((prev, link) => {
-      const [start, end] = link.location;
-      parts.push(
-        { text: text.slice(prev, start) },
-        { text: text.slice(start, end), path: link.path },
-      );
-      return end;
-    }, 0);
-
-    parts.push({ text: text.slice(endLocation) });
-
-    return parts
-      .map(part => {
-        if (part.path) {
-          const link = this.headerLink(part.text, part.path);
-          return `<a href="${link}">${this.escapeText(part.text)}</a>`;
-        }
-        return this.highlighter.highlight(this.escapeText(part.text));
-      })
-      .join('');
-  }
-
-  toBuffer(): Buffer {
-    return Buffer.from(this.str, 'utf8');
-  }
-}
diff --git a/packages/docgen/src/docgen/TypeLocator.test.ts b/packages/docgen/src/docgen/TypeLocator.test.ts
deleted file mode 100644
index 8988b25814..0000000000
--- a/packages/docgen/src/docgen/TypeLocator.test.ts
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * Copyright 2020 The Backstage Authors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import ts from 'typescript';
-import TypeLocator from './TypeLocator';
-import { createMemProgram } from './testUtils';
-
-describe('TypeLocator', () => {
-  it('should find a default export', () => {
-    const program = createMemProgram('export default class MyApi<T> {}');
-
-    const typeLocator = TypeLocator.fromProgram(program, '/mem');
-
-    const apiType = typeLocator.getExportedType('/mem/index.ts');
-    expect(apiType.symbol.name).toBe('default');
-    const [declaration] = apiType.symbol.declarations;
-    expect(declaration.kind).toBe(ts.SyntaxKind.ClassDeclaration);
-    expect((declaration as ts.ClassDeclaration).name).toBeDefined();
-    expect((declaration as ts.ClassDeclaration).name!.text).toBe('MyApi');
-  }, 10000);
-
-  it('should find api instance export', () => {
-    const program = createMemProgram(
-      `
-      import MyApi from './type';
-
-      type MyApiType = {};
-
-      export const myApi = new MyApi<MyApiType>();
-    `,
-      {
-        '/mem/type.ts': 'export default class MyApi<T> {}',
-      },
-    );
-
-    const typeLocator = TypeLocator.fromProgram(program, '/mem');
-
-    const { apiInstances } = typeLocator.findExportedInstances({
-      apiInstances: typeLocator.getExportedType('/mem/type.ts'),
-    });
-
-    expect(apiInstances.length).toBe(1);
-    const [apiInstance] = apiInstances;
-    expect(apiInstance.name).toBe('myApi');
-    expect(apiInstance.source.fileName).toBe('/mem/index.ts');
-    expect(apiInstance.args).toEqual([]);
-
-    expect(apiInstance.typeArgs.length).toBe(1);
-    const [typeArg] = apiInstance.typeArgs;
-    expect(typeArg.kind).toBe(ts.SyntaxKind.TypeReference);
-    expect((typeArg as ts.TypeReferenceNode).typeName.getText()).toBe(
-      'MyApiType',
-    );
-  });
-});
diff --git a/packages/docgen/src/docgen/TypeLocator.ts b/packages/docgen/src/docgen/TypeLocator.ts
deleted file mode 100644
index 984724e667..0000000000
--- a/packages/docgen/src/docgen/TypeLocator.ts
+++ /dev/null
@@ -1,145 +0,0 @@
-/*
- * Copyright 2020 The Backstage Authors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import ts from 'typescript';
-import { ExportedInstance } from './types';
-
-/**
- * The TypeLocator is used to extract typescrint Type structures from a compiled program,
- * as well as finding locations where types are used in according to a matching pattern.
- *
- * This is used to e.g. find exported APIs that we should generate documentation for.
- */
-export default class TypeLocator {
-  static fromProgram(program: ts.Program, sourcePath: string) {
-    return new TypeLocator(program.getTypeChecker(), program, sourcePath);
-  }
-
-  constructor(
-    private readonly checker: ts.TypeChecker,
-    private readonly program: ts.Program,
-    private readonly sourcePath: string,
-  ) {}
-
-  /**
-   * Get the type of a symbol by export path and name
-   */
-  getExportedType(path: string, exportedName: string = 'default'): ts.Type {
-    const source = this.program.getSourceFile(path);
-    if (!source) {
-      throw new Error(`Source not found for path '${path}'`);
-    }
-    const exported = this.checker.getExportsOfModule(
-      this.checker.getSymbolAtLocation(source)!,
-    );
-    const [symbol] = exported.filter(e => e.name === exportedName);
-    if (!symbol) {
-      throw new Error(`No export '${exportedName}' found in ${path}`);
-    }
-    const type = this.checker.getTypeOfSymbolAtLocation(symbol, source);
-    return type;
-  }
-
-  /**
-   * Find exported instances and return values from calls using the types
-   * provided in the lookup table.
-   */
-  findExportedInstances<T extends string>(
-    typeLookupTable: { [key in T]: ts.Type },
-  ): { [key in T]: ExportedInstance[] } {
-    const docMap = new Map<ts.Type, ExportedInstance[]>();
-    for (const type of Object.values<ts.Type>(typeLookupTable)) {
-      docMap.set(type, []);
-    }
-
-    this.program.getSourceFiles().forEach(source => {
-      const inRoot = source.fileName.startsWith(this.sourcePath);
-      if (!inRoot) {
-        return;
-      }
-      ts.forEachChild(source, node => {
-        const decl = this.getExportedConstructorDeclaration(node);
-        if (!decl || !docMap.has(decl.constructorType)) {
-          return;
-        }
-
-        docMap.get(decl.constructorType)!.push({ node, source, ...decl });
-      });
-    });
-
-    const result: { [key in T]?: ExportedInstance[] } = {};
-
-    for (const key in typeLookupTable) {
-      if (typeLookupTable.hasOwnProperty(key)) {
-        const type = typeLookupTable[key];
-        result[key] = docMap.get(type)!;
-      }
-    }
-
-    return result as { [key in T]: ExportedInstance[] };
-  }
-
-  private getExportedConstructorDeclaration(
-    node: ts.Node,
-  ):
-    | {
-        constructorType: ts.Type;
-        args: ts.Expression[];
-        typeArgs: ts.TypeNode[];
-        name: string;
-      }
-    | undefined {
-    if (!ts.isVariableStatement(node)) {
-      return undefined;
-    }
-    if (
-      !node.modifiers ||
-      !node.modifiers.some(mod => mod.kind === ts.SyntaxKind.ExportKeyword)
-    ) {
-      return undefined;
-    }
-    const { declarations } = node.declarationList;
-    if (declarations.length !== 1) {
-      return undefined;
-    }
-
-    const [declaration] = declarations;
-    const { initializer, name } = declaration;
-
-    if (!initializer || !name) {
-      return undefined;
-    }
-    if (!ts.isCallOrNewExpression(initializer)) {
-      return undefined;
-    }
-    if (!ts.isIdentifier(name)) {
-      return undefined;
-    }
-
-    const constructorType = this.checker.getTypeAtLocation(
-      initializer.expression,
-    );
-    const args = Array.from(initializer.arguments ?? []);
-    const typeNode = declaration.type;
-    const typeArgs = Array.from(
-      (typeNode && ts.isTypeReferenceNode(typeNode)
-        ? typeNode.typeArguments
-        : initializer.typeArguments) ?? [],
-    );
-
-    return { constructorType, args, typeArgs, name: name.text };
-  }
-}
diff --git a/packages/docgen/src/docgen/TypescriptHighlighter.ts b/packages/docgen/src/docgen/TypescriptHighlighter.ts
deleted file mode 100644
index a48e17ba66..0000000000
--- a/packages/docgen/src/docgen/TypescriptHighlighter.ts
+++ /dev/null
@@ -1,87 +0,0 @@
-/*
- * Copyright 2020 The Backstage Authors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import { Highlighter } from './types';
-
-// Simple syntax highlighter that mimics hilite
-export default class TypescriptHighlighter implements Highlighter {
-  private static readonly basicTypes = [
-    'boolean',
-    'number',
-    'string',
-    'Array',
-    'object',
-    'Record',
-    'Set',
-    'Map',
-    'true',
-    'false',
-    'null',
-    'undefined',
-    'void',
-    'Promise',
-    'any',
-    '[0-9\\.]+',
-  ];
-
-  // List of highlightings to apply, each with a match regex and the style that should be applied
-  private static readonly highlighters = [
-    [/(\/\*\*?(?:.|\n)+?\*\/)/g, 'color: #60a0b0; font-style: italic'], // block comment
-    [/(\/\/.*)/gm, 'color: #60a0b0; font-style: italic'], // line comment
-    [/('[^']*?'|"[^"]*?")/g, 'color: #4070a0'], // string literals
-    [
-      new RegExp(
-        `\\b(${TypescriptHighlighter.basicTypes.join('|')})\\b(?!:|,)`,
-        'g',
-      ),
-      'color: #902000',
-    ], // basic types
-    [
-      /^((?:export\s)?(?:type\s)?(?:interface\s)?)/g,
-      'color: #007020; font-weight: bold',
-    ], // keywords
-  ] as readonly [RegExp, string][];
-
-  highlight(fullText: string): string {
-    // Each part is either plain text that can be highlighted or text that is already highlighted
-    type HighlightPart = { text: string; highlighted?: boolean };
-
-    const painter = (regex: RegExp, style: string) => (part: HighlightPart) => {
-      if (part.highlighted) {
-        return [part];
-      }
-      // Apply highlighting to all matches of the regex by splitting into parts
-      return part.text.split(regex).map((text, index) => {
-        // Odd parts are the ones that matched the regex and should be highlighted.
-        if (index % 2 === 1) {
-          return {
-            text: `<span style="${style}">${text}</span>`,
-            highlighted: true,
-          };
-        }
-        return { text };
-      });
-    };
-
-    // Order here is important, e.g. comments must be first to avoid string literals inside comments being highlighted
-    return TypescriptHighlighter.highlighters
-      .reduce((parts, highlighter) => parts.flatMap(painter(...highlighter)), [
-        { text: fullText },
-      ])
-      .map(({ text }) => text)
-      .join('');
-  }
-}
diff --git a/packages/docgen/src/docgen/sortSelector.test.ts b/packages/docgen/src/docgen/sortSelector.test.ts
deleted file mode 100644
index 277b06faa5..0000000000
--- a/packages/docgen/src/docgen/sortSelector.test.ts
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Copyright 2020 The Backstage Authors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import sortSelector from './sortSelector';
-
-describe('sortSelector', () => {
-  it('should stable sort', () => {
-    const arr = [
-      [3, 1],
-      [1, 2],
-      [1, 1],
-      [1, 3],
-      [2, 1],
-    ];
-
-    const sortedByFirst = arr.slice().sort(sortSelector(([first]) => first));
-    expect(sortedByFirst).toEqual([
-      [1, 2],
-      [1, 1],
-      [1, 3],
-      [2, 1],
-      [3, 1],
-    ]);
-
-    const sortedBySecond = arr
-      .slice()
-      .sort(sortSelector(([, second]) => second));
-    expect(sortedBySecond).toEqual([
-      [3, 1],
-      [1, 1],
-      [2, 1],
-      [1, 2],
-      [1, 3],
-    ]);
-  });
-});
diff --git a/packages/docgen/src/docgen/testUtils.ts b/packages/docgen/src/docgen/testUtils.ts
deleted file mode 100644
index c449dd7461..0000000000
--- a/packages/docgen/src/docgen/testUtils.ts
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * Copyright 2020 The Backstage Authors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import ts from 'typescript';
-
-export function createMemProgram(
-  indexSource: string,
-  otherSourceFiles: { [fileName in string]: string } = {},
-): ts.Program {
-  const rootDir = '/mem';
-
-  const options = { noEmit: true };
-  const baseHost = ts.createCompilerHost(options);
-  const files: { [fileName in string]: string } = {
-    [`${rootDir}/index.ts`]: indexSource,
-    ...otherSourceFiles,
-  };
-
-  // Custom compiler hosts that reads from a map of in-memory files, but
-  // falls back to reading from disc for ts libs etc.
-  const compilerHost: ts.CompilerHost = {
-    ...baseHost,
-    readFile(fileName): string | undefined {
-      if (fileName in files) {
-        return files[fileName];
-      }
-      return baseHost.readFile(fileName);
-    },
-    getCurrentDirectory(): string {
-      return rootDir;
-    },
-    directoryExists(dir) {
-      if (dir === rootDir) {
-        return true;
-      }
-      if (baseHost.directoryExists) {
-        return baseHost.directoryExists(dir);
-      }
-      return false;
-    },
-    fileExists(fileName: string): boolean {
-      return !!files[fileName] || baseHost.fileExists(fileName);
-    },
-    getSourceFile(fileName, ...rest): ts.SourceFile | undefined {
-      const file = files[fileName];
-      if (file) {
-        return ts.createSourceFile(fileName, file, ts.ScriptTarget.ES2017);
-      }
-      return baseHost.getSourceFile(fileName, ...rest);
-    },
-  };
-
-  return ts.createProgram(['/mem/index.ts'], options, compilerHost);
-}
diff --git a/packages/docgen/src/docgen/types.ts b/packages/docgen/src/docgen/types.ts
deleted file mode 100644
index 60f3d35007..0000000000
--- a/packages/docgen/src/docgen/types.ts
+++ /dev/null
@@ -1,119 +0,0 @@
-/*
- * Copyright 2020 The Backstage Authors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import ts from 'typescript';
-
-/**
- * A TypeLink is a link to a different type.
- */
-export type TypeLink = {
-  // The ID of the linked type
-  id: number;
-  // The path to the type from the project root
-  path: string;
-  // The name of the type, to display
-  name: string;
-  // The location of the type name as it appears in it's parent text.
-  location: readonly [number, number];
-};
-
-/**
- * TypeInfo describes a TypeScript Type.
- */
-export type TypeInfo = {
-  id: number;
-  name: string;
-  path: string;
-  file: string;
-  lineInFile: number;
-  text: string;
-  docs: string[];
-  links: TypeLink[];
-  children: TypeInfo[];
-};
-
-/**
- * FieldInfo describes a property or method in a documented API.
- */
-export type FieldInfo = {
-  type: 'prop' | 'method';
-  name: string;
-  path: string;
-  text: string;
-  docs: string[];
-  links: TypeLink[];
-};
-
-/**
- * InterfaceInfo describes the type of a documented API.
- */
-export type InterfaceInfo = {
-  name: string;
-  docs: string[];
-  file: string;
-  lineInFile: number;
-  members: Array<FieldInfo>;
-  dependentTypes: TypeInfo[];
-};
-
-/**
- * ApiDoc describes a documented API.
- */
-export type ApiDoc = {
-  id: string;
-  name: string;
-  description: string;
-  file: string;
-  lineInFile: number;
-  interfaceInfos: InterfaceInfo[];
-};
-
-/**
- * ExportedInstance describes an expression matching `export {name} = new {Contructor}<{typeArgs}...>({args}...)`
- */
-export type ExportedInstance = {
-  node: ts.Node;
-  name: string;
-  source: ts.SourceFile;
-  args: Array<ts.Expression>;
-  typeArgs: Array<ts.TypeNode>;
-};
-
-export type Highlighter = {
-  highlight(test: string): string;
-};
-
-/**
- * Markdown printer is an abstraction for printing markdown documents of different flavors.
- */
-export type MarkdownPrinter = {
-  text(text: string): void;
-  header(level: number, text: string, id?: string): void;
-  paragraph(...text: string[]): void;
-  code(options: { text: string; links?: TypeLink[] }): void;
-
-  headerLink(header: string, id?: string): string;
-  /** Link from pages to index */
-  indexLink(): string;
-  /** Link from index to pages */
-  pageLink(name: string): string;
-  srcLink(
-    { file, lineInFile }: { file: string; lineInFile: number },
-    text?: string,
-  ): string;
-
-  toBuffer(): Buffer;
-};
diff --git a/packages/docgen/src/generate.ts b/packages/docgen/src/generate.ts
deleted file mode 100644
index bbc18e48ab..0000000000
--- a/packages/docgen/src/generate.ts
+++ /dev/null
@@ -1,127 +0,0 @@
-/*
- * Copyright 2020 The Backstage Authors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import * as ts from 'typescript';
-import fs from 'fs-extra';
-import { resolve as resolvePath, join as joinPath } from 'path';
-import ApiDocGenerator from './docgen/ApiDocGenerator';
-import sortSelector from './docgen/sortSelector';
-import TypeLocator from './docgen/TypeLocator';
-import ApiDocPrinter from './docgen/ApiDocsPrinter';
-import TypescriptHighlighter from './docgen/TypescriptHighlighter';
-import GitHubMarkdownPrinter from './docgen/GitHubMarkdownPrinter';
-import TechdocsMarkdownPrinter from './docgen/TechdocsMarkdownPrinter';
-
-const FORMATS = ['github', 'techdocs'] as const;
-
-export async function generate(
-  targetPath: string,
-  format: typeof FORMATS[number],
-) {
-  if (!FORMATS.includes(format)) {
-    throw new TypeError(
-      `Invalid format, '${format}', must be one of ${FORMATS.join(', ')}`,
-    );
-  }
-
-  /* eslint-disable-next-line no-restricted-syntax */
-  const rootDir = resolvePath(__dirname, '../../..');
-  const srcDir = resolvePath(rootDir, 'packages', 'core-api', 'src');
-  const targetDir = resolvePath(targetPath);
-
-  const options = await fs.readJson(resolvePath('../cli/config/tsconfig.json'));
-
-  delete options.moduleResolution;
-  options.noEmit = true;
-
-  const program = ts.createProgram([resolvePath(srcDir, 'index.ts')], options);
-
-  const typeLocator = TypeLocator.fromProgram(program, srcDir);
-
-  const { apis } = typeLocator.findExportedInstances({
-    apis: typeLocator.getExportedType(
-      resolvePath(srcDir, 'index.ts'),
-      'createApiRef',
-    ),
-  });
-
-  const apiDocGenerator = ApiDocGenerator.fromProgram(program, rootDir);
-  const apiDocs = apis
-    .map(api => {
-      try {
-        return apiDocGenerator.toDoc(api);
-      } catch (error) {
-        throw new Error(
-          `Doc generation failed for API in ${api.source.fileName}, ${error.stack}`,
-        );
-      }
-    })
-    .sort(sortSelector(x => x.name));
-
-  const apiTypes = Object.values(
-    Object.fromEntries(
-      apiDocs.flatMap(d => d.interfaceInfos).map(i => [i.name, i]),
-    ),
-  ).sort(sortSelector(i => i.name));
-
-  if (format === 'techdocs') {
-    const docsDir = resolvePath(targetDir, 'docs');
-    await fs.ensureDir(docsDir);
-
-    const apiDocPrinter = new ApiDocPrinter(
-      () => new TechdocsMarkdownPrinter(new TypescriptHighlighter()),
-    );
-
-    await fs.writeFile(
-      joinPath(docsDir, 'README.md'),
-      apiDocPrinter.printApiIndex(apiDocs),
-    );
-
-    for (const apiType of Object.values(apiTypes)) {
-      const data = apiDocPrinter.printInterface(apiType, apiDocs);
-
-      await fs.writeFile(joinPath(docsDir, `${apiType.name}.md`), data);
-    }
-
-    await fs.writeFile(
-      resolvePath(targetDir, 'mkdocs.yml'),
-      [
-        'site_name: Backstage Core Utility API References',
-        'nav:',
-        `  - API Index: 'README.md'`,
-        ...apiTypes.map(({ name }) => `  - ${name}: '${name}.md'`),
-        'plugins:',
-        '  - techdocs-core',
-      ].join('\n'),
-      'utf8',
-    );
-  } else {
-    await fs.ensureDir(targetDir);
-
-    const apiDocPrinter = new ApiDocPrinter(() => new GitHubMarkdownPrinter());
-
-    await fs.writeFile(
-      joinPath(targetDir, 'README.md'),
-      apiDocPrinter.printApiIndex(apiDocs),
-    );
-
-    for (const apiType of Object.values(apiTypes)) {
-      const data = apiDocPrinter.printInterface(apiType, apiDocs);
-
-      await fs.writeFile(joinPath(targetDir, `${apiType.name}.md`), data);
-    }
-  }
-}
diff --git a/packages/docgen/src/index.ts b/packages/docgen/src/index.ts
deleted file mode 100644
index 755bc9cb98..0000000000
--- a/packages/docgen/src/index.ts
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Copyright 2020 The Backstage Authors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import program from 'commander';
-import { resolve as resolvePath } from 'path';
-import chalk from 'chalk';
-import fs from 'fs-extra';
-import { generate } from './generate';
-
-const main = (argv: string[]) => {
-  /* eslint-disable-next-line no-restricted-syntax */
-  const pkgJson = fs.readJsonSync(resolvePath(__dirname, '../package.json'));
-  program.name('docgen').version(pkgJson.version);
-
-  program
-    .command('generate')
-    .description(
-      'Generate documentation for the declarations in the core-api package',
-    )
-    .option('--output <output>', 'Output directory [./dist]')
-    .option(
-      '--format <format>',
-      'Output format, either techdocs or github [techdocs]',
-    )
-    .action(async cmd => {
-      await generate(cmd.output ?? './dist', cmd.format ?? 'techdocs');
-    });
-
-  program.on('command:*', () => {
-    console.log();
-    console.log(
-      chalk.red(`Invalid command: ${chalk.cyan(program.args.join(' '))}`),
-    );
-    console.log(chalk.red('See --help for a list of available commands.'));
-    console.log();
-    process.exit(1);
-  });
-
-  program.parse(argv);
-};
-
-process.on('unhandledRejection', rejection => {
-  console.error(String(rejection));
-  process.exit(1);
-});
-
-main(process.argv);
diff --git a/packages/e2e-test/src/commands/run.ts b/packages/e2e-test/src/commands/run.ts
index c205b4f527..dde93341ef 100644
--- a/packages/e2e-test/src/commands/run.ts
+++ b/packages/e2e-test/src/commands/run.ts
@@ -232,7 +232,14 @@ async function createApp(
 
     print('Test app created');
 
-    for (const cmd of ['install', 'tsc', 'build', 'lint:all', 'test:all']) {
+    for (const cmd of [
+      'install',
+      'tsc:full',
+      'build',
+      'lint:all',
+      'prettier:check',
+      'test:all',
+    ]) {
       print(`Running 'yarn ${cmd}' in newly created app`);
       await runPlain(['yarn', cmd], { cwd: appDir });
     }
@@ -396,14 +403,9 @@ async function testBackendStart(appDir: string, isPostgres: boolean) {
   if (isPostgres) {
     print('Dropping old DBs');
     await Promise.all(
-      [
-        'catalog',
-        'scaffolder',
-        'auth',
-        'identity',
-        'proxy',
-        'techdocs',
-      ].map(name => dropDB(`backstage_plugin_${name}`)),
+      ['catalog', 'scaffolder', 'auth', 'identity', 'proxy', 'techdocs'].map(
+        name => dropDB(`backstage_plugin_${name}`),
+      ),
     );
     print('Created DBs');
   }
diff --git a/packages/e2e-test/src/lib/helpers.ts b/packages/e2e-test/src/lib/helpers.ts
index 2485e46b31..2182a9d324 100644
--- a/packages/e2e-test/src/lib/helpers.ts
+++ b/packages/e2e-test/src/lib/helpers.ts
@@ -24,7 +24,8 @@ import { promisify } from 'util';
 
 const execFile = promisify(execFileCb);
 
-const EXPECTED_LOAD_ERRORS = /ECONNREFUSED|ECONNRESET|did not get to load all resources/;
+const EXPECTED_LOAD_ERRORS =
+  /ECONNREFUSED|ECONNRESET|did not get to load all resources/;
 
 export function spawnPiped(cmd: string[], options?: SpawnOptions) {
   function pipeWithPrefix(stream: NodeJS.WriteStream, prefix = '') {
@@ -164,7 +165,6 @@ export async function waitForPageWithText(
     } catch (error) {
       findTextAttempts++;
       if (findTextAttempts <= maxFindTextAttempts) {
-        await browser.visit(path);
         await new Promise(resolve => setTimeout(resolve, intervalMs));
         continue;
       } else {
diff --git a/packages/errors/CHANGELOG.md b/packages/errors/CHANGELOG.md
index e69de29bb2..7cadaa6e07 100644
--- a/packages/errors/CHANGELOG.md
+++ b/packages/errors/CHANGELOG.md
@@ -0,0 +1,9 @@
+# @backstage/errors
+
+## 0.1.2
+
+### Patch Changes
+
+- d1da88a19: Properly export all used types.
+- Updated dependencies
+  - @backstage/config@0.1.9
diff --git a/packages/errors/package.json b/packages/errors/package.json
index 8fa76d8bfc..dc31d8827e 100644
--- a/packages/errors/package.json
+++ b/packages/errors/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/errors",
-  "version": "0.1.1",
+  "version": "0.1.2",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -29,12 +29,12 @@
     "clean": "backstage-cli clean"
   },
   "dependencies": {
-    "@backstage/config": "^0.1.2",
+    "@backstage/config": "^0.1.9",
     "cross-fetch": "^3.0.6",
     "serialize-error": "^8.0.1"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.7.0",
+    "@backstage/cli": "^0.7.11",
     "@types/jest": "^26.0.7"
   },
   "files": [
diff --git a/packages/errors/src/errors/CustomErrorBase.ts b/packages/errors/src/errors/CustomErrorBase.ts
index fc374287c7..a392135c13 100644
--- a/packages/errors/src/errors/CustomErrorBase.ts
+++ b/packages/errors/src/errors/CustomErrorBase.ts
@@ -14,6 +14,7 @@
  * limitations under the License.
  */
 
+/** @public */
 export class CustomErrorBase extends Error {
   readonly cause?: Error;
 
diff --git a/packages/errors/src/errors/ResponseError.ts b/packages/errors/src/errors/ResponseError.ts
index c8927a447c..f74ad2fa0c 100644
--- a/packages/errors/src/errors/ResponseError.ts
+++ b/packages/errors/src/errors/ResponseError.ts
@@ -24,6 +24,8 @@ import {
  * An error thrown as the result of a failed server request.
  *
  * The server is expected to respond on the ErrorResponse format.
+ *
+ * @public
  */
 export class ResponseError extends Error {
   /**
diff --git a/packages/errors/src/errors/common.ts b/packages/errors/src/errors/common.ts
index 51c82eeda5..dad236d4b5 100644
--- a/packages/errors/src/errors/common.ts
+++ b/packages/errors/src/errors/common.ts
@@ -29,16 +29,22 @@ import { CustomErrorBase } from './CustomErrorBase';
 
 /**
  * The given inputs are malformed and cannot be processed.
+ *
+ * @public
  */
 export class InputError extends CustomErrorBase {}
 
 /**
  * The request requires authentication, which was not properly supplied.
+ *
+ * @public
  */
 export class AuthenticationError extends CustomErrorBase {}
 
 /**
  * The authenticated caller is not allowed to perform this request.
+ *
+ * @public
  */
 export class NotAllowedError extends CustomErrorBase {}
 
@@ -47,16 +53,22 @@ export class NotAllowedError extends CustomErrorBase {}
  *
  * Note that this error usually is used to indicate that an entity with a given
  * ID does not exist, rather than signalling that an entire route is missing.
+ *
+ * @public
  */
 export class NotFoundError extends CustomErrorBase {}
 
 /**
  * The request could not complete due to a conflict in the current state of the
  * resource.
+ *
+ * @public
  */
 export class ConflictError extends CustomErrorBase {}
 
 /**
  * The requested resource has not changed since last request.
+ *
+ * @public
  */
 export class NotModifiedError extends CustomErrorBase {}
diff --git a/packages/errors/src/serialization/error.ts b/packages/errors/src/serialization/error.ts
index 46a2c2f74c..ab543164d8 100644
--- a/packages/errors/src/serialization/error.ts
+++ b/packages/errors/src/serialization/error.ts
@@ -22,6 +22,8 @@ import {
 
 /**
  * The serialized form of an Error.
+ *
+ * @public
  */
 export type SerializedError = JsonObject & {
   /** The name of the exception that was thrown */
@@ -37,12 +39,16 @@ export type SerializedError = JsonObject & {
 /**
  * Serializes an error object to a JSON friendly form.
  *
- * @param error The error
- * @param options.includeStackTraces: Include stack trace in the output (default false)
+ * @public
+ * @param error - The error.
+ * @param options - Optional serialization options.
  */
 export function serializeError(
   error: Error,
-  options?: { includeStack?: boolean },
+  options?: {
+    /** Include stack trace in the output (default false) */
+    includeStack?: boolean;
+  },
 ): SerializedError {
   const serialized = serializeErrorInternal(error);
   const result: SerializedError = {
@@ -60,6 +66,8 @@ export function serializeError(
 
 /**
  * Deserializes a serialized error object back to an Error.
+ *
+ * @public
  */
 export function deserializeError<T extends Error = Error>(
   data: SerializedError,
diff --git a/packages/errors/src/serialization/response.ts b/packages/errors/src/serialization/response.ts
index 0196b2d597..50bf8f7ab1 100644
--- a/packages/errors/src/serialization/response.ts
+++ b/packages/errors/src/serialization/response.ts
@@ -18,6 +18,8 @@ import { SerializedError } from './error';
 
 /**
  * A standard shape of JSON data returned as the body of backend errors.
+ *
+ * @public
  */
 export type ErrorResponse = {
   /** Details of the error that was caught */
@@ -47,7 +49,8 @@ export type ErrorResponse = {
  * The code is forgiving, and constructs a useful synthetic body as best it can
  * if the response body wasn't on the expected form.
  *
- * @param response The response of a failed request
+ * @public
+ * @param response - The response of a failed request
  */
 export async function parseErrorResponse(
   response: Response,
diff --git a/packages/integration-react/CHANGELOG.md b/packages/integration-react/CHANGELOG.md
index 48c0260fc5..a9944238ce 100644
--- a/packages/integration-react/CHANGELOG.md
+++ b/packages/integration-react/CHANGELOG.md
@@ -1,5 +1,47 @@
 # @backstage/integration-react
 
+## 0.1.8
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/integration@0.6.3
+  - @backstage/core-components@0.4.0
+
+## 0.1.7
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/integration@0.6.0
+  - @backstage/core-components@0.3.1
+  - @backstage/core-plugin-api@0.1.6
+
+## 0.1.6
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.3.0
+  - @backstage/config@0.1.6
+  - @backstage/core-plugin-api@0.1.5
+  - @backstage/integration@0.5.9
+
+## 0.1.5
+
+### Patch Changes
+
+- 9d40fcb1e: - Bumping `material-ui/core` version to at least `4.12.2` as they made some breaking changes in later versions which broke `Pagination` of the `Table`.
+  - Switching out `material-table` to `@material-table/core` for support for the later versions of `material-ui/core`
+  - This causes a minor API change to `@backstage/core-components` as the interface for `Table` re-exports the `prop` from the underlying `Table` components.
+  - `onChangeRowsPerPage` has been renamed to `onRowsPerPageChange`
+  - `onChangePage` has been renamed to `onPageChange`
+  - Migration guide is here: https://material-table-core.com/docs/breaking-changes
+- Updated dependencies
+  - @backstage/core-components@0.2.0
+  - @backstage/core-plugin-api@0.1.4
+  - @backstage/theme@0.2.9
+
 ## 0.1.4
 
 ### Patch Changes
diff --git a/packages/integration-react/api-report.md b/packages/integration-react/api-report.md
index e2574196e0..ecd3ae54c3 100644
--- a/packages/integration-react/api-report.md
+++ b/packages/integration-react/api-report.md
@@ -9,6 +9,8 @@ import { ApiRef } from '@backstage/core-plugin-api';
 import { Config } from '@backstage/config';
 import { ScmIntegrationRegistry } from '@backstage/integration';
 
+// Warning: (ae-missing-release-tag) "ScmIntegrationIcon" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export const ScmIntegrationIcon: ({
   type,
@@ -16,12 +18,16 @@ export const ScmIntegrationIcon: ({
   type?: string | undefined;
 }) => JSX.Element;
 
+// Warning: (ae-missing-release-tag) "ScmIntegrationsApi" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export class ScmIntegrationsApi {
   // (undocumented)
   static fromConfig(config: Config): ScmIntegrationRegistry;
 }
 
+// Warning: (ae-missing-release-tag) "scmIntegrationsApiRef" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export const scmIntegrationsApiRef: ApiRef<ScmIntegrationRegistry>;
 
diff --git a/packages/integration-react/package.json b/packages/integration-react/package.json
index e0161cb5ab..90acb9acd3 100644
--- a/packages/integration-react/package.json
+++ b/packages/integration-react/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/integration-react",
-  "version": "0.1.4",
+  "version": "0.1.8",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -20,12 +20,12 @@
     "clean": "backstage-cli clean"
   },
   "dependencies": {
-    "@backstage/config": "^0.1.2",
-    "@backstage/core-components": "^0.1.3",
-    "@backstage/core-plugin-api": "^0.1.3",
-    "@backstage/integration": "^0.5.6",
-    "@backstage/theme": "^0.2.3",
-    "@material-ui/core": "^4.11.0",
+    "@backstage/config": "^0.1.6",
+    "@backstage/core-components": "^0.4.0",
+    "@backstage/core-plugin-api": "^0.1.6",
+    "@backstage/integration": "^0.6.3",
+    "@backstage/theme": "^0.2.9",
+    "@material-ui/core": "^4.12.2",
     "@material-ui/icons": "^4.9.1",
     "@material-ui/lab": "4.0.0-alpha.45",
     "react": "^16.13.1",
@@ -33,9 +33,9 @@
     "react-use": "^17.2.4"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.7.2",
-    "@backstage/dev-utils": "^0.2.0",
-    "@backstage/test-utils": "^0.1.14",
+    "@backstage/cli": "^0.7.10",
+    "@backstage/dev-utils": "^0.2.8",
+    "@backstage/test-utils": "^0.1.17",
     "@testing-library/jest-dom": "^5.10.1",
     "@testing-library/react": "^11.2.5",
     "@testing-library/user-event": "^13.1.8",
diff --git a/packages/integration-react/src/api/ScmIntegrationsApi.test.ts b/packages/integration-react/src/api/ScmIntegrationsApi.test.ts
index 869ef83a86..aa291c2815 100644
--- a/packages/integration-react/src/api/ScmIntegrationsApi.test.ts
+++ b/packages/integration-react/src/api/ScmIntegrationsApi.test.ts
@@ -26,6 +26,6 @@ describe('scmIntegrationsApiRef', () => {
 
   it('should be instantiated', () => {
     const i = ScmIntegrationsApi.fromConfig(new ConfigReader({}));
-    expect(i.list().length).toBe(4); // The default ones
+    expect(i.list().length).toBe(5); // The default ones
   });
 });
diff --git a/packages/integration-react/src/api/ScmIntegrationsApi.ts b/packages/integration-react/src/api/ScmIntegrationsApi.ts
index 982989540a..6bf2ba8a6d 100644
--- a/packages/integration-react/src/api/ScmIntegrationsApi.ts
+++ b/packages/integration-react/src/api/ScmIntegrationsApi.ts
@@ -27,9 +27,8 @@ export class ScmIntegrationsApi {
   }
 }
 
-export const scmIntegrationsApiRef: ApiRef<ScmIntegrationRegistry> = createApiRef(
-  {
+export const scmIntegrationsApiRef: ApiRef<ScmIntegrationRegistry> =
+  createApiRef({
     id: 'integration.scmintegrations',
     description: 'All of the registered SCM integrations of your config',
-  },
-);
+  });
diff --git a/packages/integration/CHANGELOG.md b/packages/integration/CHANGELOG.md
index a175c0c068..1befa4f6cc 100644
--- a/packages/integration/CHANGELOG.md
+++ b/packages/integration/CHANGELOG.md
@@ -1,5 +1,50 @@
 # @backstage/integration
 
+## 0.6.3
+
+### Patch Changes
+
+- 5dca42b17: Update to properly handle Azure DevOps Server download URL
+
+## 0.6.2
+
+### Patch Changes
+
+- f0ba514f0: Take custom ports into account when matching integrations to URLs. It used to be the case that an integration with e.g. `host: 'scm.mycompany.net:8080'` would not be matched by the `byUrl` method, while hosts without a custom port did match.
+- 90c68a2ca: Export `replaceGitHubUrlType`
+- Updated dependencies
+  - @backstage/config@0.1.8
+
+## 0.6.1
+
+### Patch Changes
+
+- b8cb12009: Add AWS S3 URL Reader
+- Updated dependencies
+  - @backstage/config@0.1.7
+
+## 0.6.0
+
+### Minor Changes
+
+- ce1958021: `getGitHubFileFetchUrl` and `getGitHubRequestOptions` now require a `credentials` argument. This is needed to address an issue where the raw route was chosen by the `UrlReader` when using GitHub Apps based auth.
+
+  Deprecated the `getGitHubRequestOptions` function, which is no longer used internally.
+
+### Patch Changes
+
+- 8bedb75ae: Update Luxon dependency to 2.x
+- 68af4d556: Adds an allow list of GitHub installations
+- 5fd31c2f4: Remove repo restriction from GitHub credentials provider
+
+## 0.5.9
+
+### Patch Changes
+
+- 3c50ff562: Fixed bug for comparing Organization name in `GithubCredentialsProvider`
+- Updated dependencies
+  - @backstage/config@0.1.6
+
 ## 0.5.8
 
 ### Patch Changes
diff --git a/packages/integration/api-report.md b/packages/integration/api-report.md
index fb06ca0de6..8298d858ee 100644
--- a/packages/integration/api-report.md
+++ b/packages/integration/api-report.md
@@ -6,6 +6,43 @@
 import { Config } from '@backstage/config';
 import { RestEndpointMethodTypes } from '@octokit/rest';
 
+// Warning: (ae-missing-release-tag) "AwsS3Integration" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
+// @public (undocumented)
+export class AwsS3Integration implements ScmIntegration {
+  constructor(integrationConfig: AwsS3IntegrationConfig);
+  // (undocumented)
+  get config(): AwsS3IntegrationConfig;
+  // Warning: (ae-forgotten-export) The symbol "ScmIntegrationsFactory" needs to be exported by the entry point index.d.ts
+  //
+  // (undocumented)
+  static factory: ScmIntegrationsFactory<AwsS3Integration>;
+  // (undocumented)
+  resolveEditUrl(url: string): string;
+  // (undocumented)
+  resolveUrl(options: {
+    url: string;
+    base: string;
+    lineNumber?: number | undefined;
+  }): string;
+  // (undocumented)
+  get title(): string;
+  // (undocumented)
+  get type(): string;
+}
+
+// Warning: (ae-missing-release-tag) "AwsS3IntegrationConfig" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
+// @public
+export type AwsS3IntegrationConfig = {
+  host: string;
+  accessKeyId?: string;
+  secretAccessKey?: string;
+  roleArn?: string;
+};
+
+// Warning: (ae-missing-release-tag) "AzureIntegration" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export class AzureIntegration implements ScmIntegration {
   constructor(integrationConfig: AzureIntegrationConfig);
@@ -27,12 +64,16 @@ export class AzureIntegration implements ScmIntegration {
   get type(): string;
 }
 
+// Warning: (ae-missing-release-tag) "AzureIntegrationConfig" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public
 export type AzureIntegrationConfig = {
   host: string;
   token?: string;
 };
 
+// Warning: (ae-missing-release-tag) "BitbucketIntegration" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export class BitbucketIntegration implements ScmIntegration {
   constructor(integrationConfig: BitbucketIntegrationConfig);
@@ -54,6 +95,8 @@ export class BitbucketIntegration implements ScmIntegration {
   get type(): string;
 }
 
+// Warning: (ae-missing-release-tag) "BitbucketIntegrationConfig" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public
 export type BitbucketIntegrationConfig = {
   host: string;
@@ -63,6 +106,8 @@ export type BitbucketIntegrationConfig = {
   appPassword?: string;
 };
 
+// Warning: (ae-missing-release-tag) "defaultScmResolveUrl" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public
 export function defaultScmResolveUrl(options: {
   url: string;
@@ -70,66 +115,128 @@ export function defaultScmResolveUrl(options: {
   lineNumber?: number;
 }): string;
 
+// Warning: (tsdoc-param-tag-missing-hyphen) The @param block should be followed by a parameter name and then a hyphen
+// Warning: (ae-missing-release-tag) "getAzureCommitsUrl" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public
 export function getAzureCommitsUrl(url: string): string;
 
+// Warning: (tsdoc-param-tag-missing-hyphen) The @param block should be followed by a parameter name and then a hyphen
+// Warning: (ae-missing-release-tag) "getAzureDownloadUrl" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public
 export function getAzureDownloadUrl(url: string): string;
 
+// Warning: (tsdoc-escape-right-brace) The "}" character should be escaped using a backslash to avoid confusion with a TSDoc inline tag
+// Warning: (tsdoc-escape-right-brace) The "}" character should be escaped using a backslash to avoid confusion with a TSDoc inline tag
+// Warning: (tsdoc-escape-right-brace) The "}" character should be escaped using a backslash to avoid confusion with a TSDoc inline tag
+// Warning: (tsdoc-escape-right-brace) The "}" character should be escaped using a backslash to avoid confusion with a TSDoc inline tag
+// Warning: (tsdoc-malformed-inline-tag) Expecting a TSDoc tag starting with "{@"
+// Warning: (tsdoc-malformed-inline-tag) Expecting a TSDoc tag starting with "{@"
+// Warning: (tsdoc-malformed-inline-tag) Expecting a TSDoc tag starting with "{@"
+// Warning: (tsdoc-malformed-inline-tag) Expecting a TSDoc tag starting with "{@"
+// Warning: (tsdoc-escape-right-brace) The "}" character should be escaped using a backslash to avoid confusion with a TSDoc inline tag
+// Warning: (tsdoc-escape-right-brace) The "}" character should be escaped using a backslash to avoid confusion with a TSDoc inline tag
+// Warning: (tsdoc-escape-right-brace) The "}" character should be escaped using a backslash to avoid confusion with a TSDoc inline tag
+// Warning: (tsdoc-escape-right-brace) The "}" character should be escaped using a backslash to avoid confusion with a TSDoc inline tag
+// Warning: (tsdoc-malformed-inline-tag) Expecting a TSDoc tag starting with "{@"
+// Warning: (tsdoc-malformed-inline-tag) Expecting a TSDoc tag starting with "{@"
+// Warning: (tsdoc-malformed-inline-tag) Expecting a TSDoc tag starting with "{@"
+// Warning: (tsdoc-malformed-inline-tag) Expecting a TSDoc tag starting with "{@"
+// Warning: (tsdoc-param-tag-missing-hyphen) The @param block should be followed by a parameter name and then a hyphen
+// Warning: (ae-missing-release-tag) "getAzureFileFetchUrl" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public
 export function getAzureFileFetchUrl(url: string): string;
 
+// Warning: (tsdoc-param-tag-missing-hyphen) The @param block should be followed by a parameter name and then a hyphen
+// Warning: (ae-missing-release-tag) "getAzureRequestOptions" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public
 export function getAzureRequestOptions(
   config: AzureIntegrationConfig,
   additionalHeaders?: Record<string, string>,
 ): RequestInit;
 
+// Warning: (tsdoc-param-tag-missing-hyphen) The @param block should be followed by a parameter name and then a hyphen
+// Warning: (tsdoc-param-tag-missing-hyphen) The @param block should be followed by a parameter name and then a hyphen
+// Warning: (ae-missing-release-tag) "getBitbucketDefaultBranch" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public
 export function getBitbucketDefaultBranch(
   url: string,
   config: BitbucketIntegrationConfig,
 ): Promise<string>;
 
+// Warning: (tsdoc-param-tag-missing-hyphen) The @param block should be followed by a parameter name and then a hyphen
+// Warning: (tsdoc-param-tag-missing-hyphen) The @param block should be followed by a parameter name and then a hyphen
+// Warning: (ae-missing-release-tag) "getBitbucketDownloadUrl" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public
 export function getBitbucketDownloadUrl(
   url: string,
   config: BitbucketIntegrationConfig,
 ): Promise<string>;
 
+// Warning: (tsdoc-param-tag-missing-hyphen) The @param block should be followed by a parameter name and then a hyphen
+// Warning: (tsdoc-param-tag-missing-hyphen) The @param block should be followed by a parameter name and then a hyphen
+// Warning: (ae-missing-release-tag) "getBitbucketFileFetchUrl" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public
 export function getBitbucketFileFetchUrl(
   url: string,
   config: BitbucketIntegrationConfig,
 ): string;
 
+// Warning: (tsdoc-param-tag-missing-hyphen) The @param block should be followed by a parameter name and then a hyphen
+// Warning: (ae-missing-release-tag) "getBitbucketRequestOptions" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public
 export function getBitbucketRequestOptions(
   config: BitbucketIntegrationConfig,
 ): RequestInit;
 
+// Warning: (tsdoc-param-tag-missing-hyphen) The @param block should be followed by a parameter name and then a hyphen
+// Warning: (tsdoc-param-tag-missing-hyphen) The @param block should be followed by a parameter name and then a hyphen
+// Warning: (ae-forgotten-export) The symbol "GithubCredentials" needs to be exported by the entry point index.d.ts
+// Warning: (ae-missing-release-tag) "getGitHubFileFetchUrl" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public
 export function getGitHubFileFetchUrl(
   url: string,
   config: GitHubIntegrationConfig,
+  credentials: GithubCredentials,
 ): string;
 
-// @public
+// Warning: (tsdoc-param-tag-missing-hyphen) The @param block should be followed by a parameter name and then a hyphen
+// Warning: (ae-missing-release-tag) "getGitHubRequestOptions" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
+// @public @deprecated
 export function getGitHubRequestOptions(
   config: GitHubIntegrationConfig,
+  credentials: GithubCredentials,
 ): RequestInit;
 
+// Warning: (tsdoc-param-tag-missing-hyphen) The @param block should be followed by a parameter name and then a hyphen
+// Warning: (tsdoc-param-tag-missing-hyphen) The @param block should be followed by a parameter name and then a hyphen
+// Warning: (ae-missing-release-tag) "getGitLabFileFetchUrl" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public
 export function getGitLabFileFetchUrl(
   url: string,
   config: GitLabIntegrationConfig,
 ): Promise<string>;
 
+// Warning: (tsdoc-param-tag-missing-hyphen) The @param block should be followed by a parameter name and then a hyphen
+// Warning: (ae-missing-release-tag) "getGitLabRequestOptions" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public
 export function getGitLabRequestOptions(
   config: GitLabIntegrationConfig,
 ): RequestInit;
 
+// Warning: (ae-missing-release-tag) "GithubAppCredentialsMux" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export class GithubAppCredentialsMux {
   constructor(config: GitHubIntegrationConfig);
@@ -141,16 +248,32 @@ export class GithubAppCredentialsMux {
   getAppToken(owner: string, repo?: string): Promise<string | undefined>;
 }
 
+// Warning: (ae-missing-release-tag) "GithubCredentialsProvider" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export class GithubCredentialsProvider {
   // (undocumented)
   static create(config: GitHubIntegrationConfig): GithubCredentialsProvider;
+  // Warning: (tsdoc-param-tag-missing-hyphen) The @param block should be followed by a parameter name and then a hyphen
+  // Warning: (tsdoc-escape-right-brace) The "}" character should be escaped using a backslash to avoid confusion with a TSDoc inline tag
+  // Warning: (tsdoc-escape-right-brace) The "}" character should be escaped using a backslash to avoid confusion with a TSDoc inline tag
+  // Warning: (tsdoc-malformed-inline-tag) Expecting a TSDoc tag starting with "{@"
+  // Warning: (tsdoc-malformed-inline-tag) Expecting a TSDoc tag starting with "{@"
+  // Warning: (tsdoc-undefined-tag) The TSDoc tag "@type" is not defined in this configuration
+  // Warning: (tsdoc-escape-right-brace) The "}" character should be escaped using a backslash to avoid confusion with a TSDoc inline tag
+  // Warning: (tsdoc-escape-right-brace) The "}" character should be escaped using a backslash to avoid confusion with a TSDoc inline tag
+  // Warning: (tsdoc-malformed-inline-tag) Expecting a TSDoc tag starting with "{@"
+  // Warning: (tsdoc-malformed-inline-tag) Expecting a TSDoc tag starting with "{@"
   getCredentials(opts: { url: string }): Promise<GithubCredentials>;
 }
 
+// Warning: (ae-missing-release-tag) "GithubCredentialType" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export type GithubCredentialType = 'app' | 'token';
 
+// Warning: (ae-missing-release-tag) "GitHubIntegration" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export class GitHubIntegration implements ScmIntegration {
   constructor(integrationConfig: GitHubIntegrationConfig);
@@ -172,6 +295,8 @@ export class GitHubIntegration implements ScmIntegration {
   get type(): string;
 }
 
+// Warning: (ae-missing-release-tag) "GitHubIntegrationConfig" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public
 export type GitHubIntegrationConfig = {
   host: string;
@@ -181,6 +306,8 @@ export type GitHubIntegrationConfig = {
   apps?: GithubAppConfig[];
 };
 
+// Warning: (ae-missing-release-tag) "GitLabIntegration" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export class GitLabIntegration implements ScmIntegration {
   constructor(integrationConfig: GitLabIntegrationConfig);
@@ -202,6 +329,8 @@ export class GitLabIntegration implements ScmIntegration {
   get type(): string;
 }
 
+// Warning: (ae-missing-release-tag) "GitLabIntegrationConfig" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public
 export type GitLabIntegrationConfig = {
   host: string;
@@ -210,60 +339,118 @@ export type GitLabIntegrationConfig = {
   baseUrl: string;
 };
 
+// Warning: (ae-missing-release-tag) "GoogleGcsIntegrationConfig" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public
 export type GoogleGcsIntegrationConfig = {
   clientEmail?: string;
   privateKey?: string;
 };
 
+// Warning: (tsdoc-param-tag-missing-hyphen) The @param block should be followed by a parameter name and then a hyphen
+// Warning: (ae-missing-release-tag) "readAwsS3IntegrationConfig" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
+// @public
+export function readAwsS3IntegrationConfig(
+  config: Config,
+): AwsS3IntegrationConfig;
+
+// Warning: (ae-missing-release-tag) "readAwsS3IntegrationConfigs" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
+// @public (undocumented)
+export function readAwsS3IntegrationConfigs(
+  configs: Config[],
+): AwsS3IntegrationConfig[];
+
+// Warning: (tsdoc-param-tag-missing-hyphen) The @param block should be followed by a parameter name and then a hyphen
+// Warning: (ae-missing-release-tag) "readAzureIntegrationConfig" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public
 export function readAzureIntegrationConfig(
   config: Config,
 ): AzureIntegrationConfig;
 
+// Warning: (tsdoc-param-tag-missing-hyphen) The @param block should be followed by a parameter name and then a hyphen
+// Warning: (ae-missing-release-tag) "readAzureIntegrationConfigs" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public
 export function readAzureIntegrationConfigs(
   configs: Config[],
 ): AzureIntegrationConfig[];
 
+// Warning: (tsdoc-param-tag-missing-hyphen) The @param block should be followed by a parameter name and then a hyphen
+// Warning: (ae-missing-release-tag) "readBitbucketIntegrationConfig" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public
 export function readBitbucketIntegrationConfig(
   config: Config,
 ): BitbucketIntegrationConfig;
 
+// Warning: (tsdoc-param-tag-missing-hyphen) The @param block should be followed by a parameter name and then a hyphen
+// Warning: (ae-missing-release-tag) "readBitbucketIntegrationConfigs" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public
 export function readBitbucketIntegrationConfigs(
   configs: Config[],
 ): BitbucketIntegrationConfig[];
 
+// Warning: (tsdoc-param-tag-missing-hyphen) The @param block should be followed by a parameter name and then a hyphen
+// Warning: (ae-missing-release-tag) "readGitHubIntegrationConfig" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public
 export function readGitHubIntegrationConfig(
   config: Config,
 ): GitHubIntegrationConfig;
 
+// Warning: (tsdoc-param-tag-missing-hyphen) The @param block should be followed by a parameter name and then a hyphen
+// Warning: (ae-missing-release-tag) "readGitHubIntegrationConfigs" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public
 export function readGitHubIntegrationConfigs(
   configs: Config[],
 ): GitHubIntegrationConfig[];
 
+// Warning: (tsdoc-param-tag-missing-hyphen) The @param block should be followed by a parameter name and then a hyphen
+// Warning: (ae-missing-release-tag) "readGitLabIntegrationConfig" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public
 export function readGitLabIntegrationConfig(
   config: Config,
 ): GitLabIntegrationConfig;
 
+// Warning: (tsdoc-param-tag-missing-hyphen) The @param block should be followed by a parameter name and then a hyphen
+// Warning: (ae-missing-release-tag) "readGitLabIntegrationConfigs" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public
 export function readGitLabIntegrationConfigs(
   configs: Config[],
 ): GitLabIntegrationConfig[];
 
+// Warning: (tsdoc-param-tag-missing-hyphen) The @param block should be followed by a parameter name and then a hyphen
+// Warning: (ae-missing-release-tag) "readGoogleGcsIntegrationConfig" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public
 export function readGoogleGcsIntegrationConfig(
   config: Config,
 ): GoogleGcsIntegrationConfig;
 
+// Warning: (ae-missing-release-tag) "replaceUrlType" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
+// @public (undocumented)
+export function replaceGitHubUrlType(
+  url: string,
+  type: 'blob' | 'tree' | 'edit',
+): string;
+
+// Warning: (ae-missing-release-tag) "ScmIntegration" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public
 export interface ScmIntegration {
+  // Warning: (tsdoc-param-tag-missing-hyphen) The @param block should be followed by a parameter name and then a hyphen
   resolveEditUrl(url: string): string;
+  // Warning: (tsdoc-param-tag-with-invalid-name) The @param block should be followed by a valid parameter name: The identifier cannot non-word characters
+  // Warning: (tsdoc-param-tag-with-invalid-name) The @param block should be followed by a valid parameter name: The identifier cannot non-word characters
+  // Warning: (tsdoc-param-tag-with-invalid-name) The @param block should be followed by a valid parameter name: The identifier cannot non-word characters
   resolveUrl(options: {
     url: string;
     base: string;
@@ -273,10 +460,14 @@ export interface ScmIntegration {
   type: string;
 }
 
+// Warning: (ae-missing-release-tag) "ScmIntegrationRegistry" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public
 export interface ScmIntegrationRegistry
   extends ScmIntegrationsGroup<ScmIntegration> {
   // (undocumented)
+  awsS3: ScmIntegrationsGroup<AwsS3Integration>;
+  // (undocumented)
   azure: ScmIntegrationsGroup<AzureIntegration>;
   // (undocumented)
   bitbucket: ScmIntegrationsGroup<BitbucketIntegration>;
@@ -284,7 +475,11 @@ export interface ScmIntegrationRegistry
   github: ScmIntegrationsGroup<GitHubIntegration>;
   // (undocumented)
   gitlab: ScmIntegrationsGroup<GitLabIntegration>;
+  // Warning: (tsdoc-param-tag-missing-hyphen) The @param block should be followed by a parameter name and then a hyphen
   resolveEditUrl(url: string): string;
+  // Warning: (tsdoc-param-tag-with-invalid-name) The @param block should be followed by a valid parameter name: The identifier cannot non-word characters
+  // Warning: (tsdoc-param-tag-with-invalid-name) The @param block should be followed by a valid parameter name: The identifier cannot non-word characters
+  // Warning: (tsdoc-param-tag-with-invalid-name) The @param block should be followed by a valid parameter name: The identifier cannot non-word characters
   resolveUrl(options: {
     url: string;
     base: string;
@@ -292,10 +487,15 @@ export interface ScmIntegrationRegistry
   }): string;
 }
 
+// Warning: (ae-missing-release-tag) "ScmIntegrations" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export class ScmIntegrations implements ScmIntegrationRegistry {
+  // Warning: (ae-forgotten-export) The symbol "IntegrationsByType" needs to be exported by the entry point index.d.ts
   constructor(integrationsByType: IntegrationsByType);
   // (undocumented)
+  get awsS3(): ScmIntegrationsGroup<AwsS3Integration>;
+  // (undocumented)
   get azure(): ScmIntegrationsGroup<AzureIntegration>;
   // (undocumented)
   get bitbucket(): ScmIntegrationsGroup<BitbucketIntegration>;
@@ -321,12 +521,22 @@ export class ScmIntegrations implements ScmIntegrationRegistry {
   }): string;
 }
 
+// Warning: (ae-missing-release-tag) "ScmIntegrationsGroup" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public
 export interface ScmIntegrationsGroup<T extends ScmIntegration> {
+  // Warning: (tsdoc-param-tag-missing-hyphen) The @param block should be followed by a parameter name and then a hyphen
   byHost(host: string): T | undefined;
+  // Warning: (tsdoc-param-tag-missing-hyphen) The @param block should be followed by a parameter name and then a hyphen
   byUrl(url: string | URL): T | undefined;
   list(): T[];
 }
 
+// Warnings were encountered during analysis:
+//
+// src/github/config.d.ts:41:5 - (ae-forgotten-export) The symbol "GithubAppConfig" needs to be exported by the entry point index.d.ts
+// src/gitlab/config.d.ts:27:68 - (tsdoc-escape-right-brace) The "}" character should be escaped using a backslash to avoid confusion with a TSDoc inline tag
+// src/gitlab/config.d.ts:27:63 - (tsdoc-malformed-inline-tag) Expecting a TSDoc tag starting with "{@"
+
 // (No @packageDocumentation comment for this package)
 ```
diff --git a/packages/integration/config.d.ts b/packages/integration/config.d.ts
index 501373de53..90cc10f77b 100644
--- a/packages/integration/config.d.ts
+++ b/packages/integration/config.d.ts
@@ -163,5 +163,30 @@ export interface Config {
        */
       privateKey?: string;
     };
+
+    /** Integration configuration for AWS S3 Service */
+    awsS3?: Array<{
+      /**
+       * The host of the target that this matches on, e.g. "amazonaws.com".
+       * @visibility frontend
+       */
+      host: string;
+      /**
+       * Account access key used to authenticate requests.
+       * @visibility backend
+       */
+      accessKeyId?: string;
+      /**
+       * Account secret key used to authenticate requests.
+       * @visibility secret
+       */
+      secretAccessKey?: string;
+
+      /**
+       * ARN of the role to be assumed
+       * @visibility backend
+       */
+      roleArn?: string;
+    }>;
   };
 }
diff --git a/packages/integration/package.json b/packages/integration/package.json
index 496376ac61..5358912852 100644
--- a/packages/integration/package.json
+++ b/packages/integration/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/integration",
-  "version": "0.5.8",
+  "version": "0.6.3",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -29,17 +29,17 @@
     "clean": "backstage-cli clean"
   },
   "dependencies": {
-    "@backstage/config": "^0.1.5",
+    "@backstage/config": "^0.1.8",
     "cross-fetch": "^3.0.6",
-    "git-url-parse": "~11.4.4",
+    "git-url-parse": "^11.6.0",
     "@octokit/rest": "^18.5.3",
     "@octokit/auth-app": "^3.4.0",
-    "luxon": "^1.25.0"
+    "luxon": "^2.0.2"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.7.3",
-    "@backstage/config-loader": "^0.6.3",
-    "@backstage/test-utils": "^0.1.13",
+    "@backstage/cli": "^0.7.10",
+    "@backstage/config-loader": "^0.6.7",
+    "@backstage/test-utils": "^0.1.17",
     "@types/jest": "^26.0.7",
     "@types/luxon": "^1.25.0",
     "msw": "^0.29.0"
diff --git a/packages/integration/src/ScmIntegrations.test.ts b/packages/integration/src/ScmIntegrations.test.ts
index a21337b45d..f0a6e5d72d 100644
--- a/packages/integration/src/ScmIntegrations.test.ts
+++ b/packages/integration/src/ScmIntegrations.test.ts
@@ -13,7 +13,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
+import { AwsS3IntegrationConfig } from './awsS3';
+import { AwsS3Integration } from './awsS3/AwsS3Integration';
 import { AzureIntegrationConfig } from './azure';
 import { AzureIntegration } from './azure/AzureIntegration';
 import { BitbucketIntegrationConfig } from './bitbucket';
@@ -26,6 +27,10 @@ import { basicIntegrations } from './helpers';
 import { ScmIntegrations } from './ScmIntegrations';
 
 describe('ScmIntegrations', () => {
+  const awsS3 = new AwsS3Integration({
+    host: 'awss3.local',
+  } as AwsS3IntegrationConfig);
+
   const azure = new AzureIntegration({
     host: 'azure.local',
   } as AzureIntegrationConfig);
@@ -43,6 +48,7 @@ describe('ScmIntegrations', () => {
   } as GitLabIntegrationConfig);
 
   const i = new ScmIntegrations({
+    awsS3: basicIntegrations([awsS3], item => item.config.host),
     azure: basicIntegrations([azure], item => item.config.host),
     bitbucket: basicIntegrations([bitbucket], item => item.config.host),
     github: basicIntegrations([github], item => item.config.host),
@@ -50,6 +56,7 @@ describe('ScmIntegrations', () => {
   });
 
   it('can get the specifics', () => {
+    expect(i.awsS3.byUrl('https://awss3.local')).toBe(awsS3);
     expect(i.azure.byUrl('https://azure.local')).toBe(azure);
     expect(i.bitbucket.byUrl('https://bitbucket.local')).toBe(bitbucket);
     expect(i.github.byUrl('https://github.local')).toBe(github);
@@ -58,16 +65,18 @@ describe('ScmIntegrations', () => {
 
   it('can list', () => {
     expect(i.list()).toEqual(
-      expect.arrayContaining([azure, bitbucket, github, gitlab]),
+      expect.arrayContaining([awsS3, azure, bitbucket, github, gitlab]),
     );
   });
 
   it('can select by url and host', () => {
+    expect(i.byUrl('https://awss3.local')).toBe(awsS3);
     expect(i.byUrl('https://azure.local')).toBe(azure);
     expect(i.byUrl('https://bitbucket.local')).toBe(bitbucket);
     expect(i.byUrl('https://github.local')).toBe(github);
     expect(i.byUrl('https://gitlab.local')).toBe(gitlab);
 
+    expect(i.byHost('awss3.local')).toBe(awsS3);
     expect(i.byHost('azure.local')).toBe(azure);
     expect(i.byHost('bitbucket.local')).toBe(bitbucket);
     expect(i.byHost('github.local')).toBe(github);
diff --git a/packages/integration/src/ScmIntegrations.ts b/packages/integration/src/ScmIntegrations.ts
index d5548b0ce8..983ab7d24b 100644
--- a/packages/integration/src/ScmIntegrations.ts
+++ b/packages/integration/src/ScmIntegrations.ts
@@ -15,6 +15,7 @@
  */
 
 import { Config } from '@backstage/config';
+import { AwsS3Integration } from './awsS3/AwsS3Integration';
 import { AzureIntegration } from './azure/AzureIntegration';
 import { BitbucketIntegration } from './bitbucket/BitbucketIntegration';
 import { GitHubIntegration } from './github/GitHubIntegration';
@@ -24,6 +25,7 @@ import { ScmIntegration, ScmIntegrationsGroup } from './types';
 import { ScmIntegrationRegistry } from './registry';
 
 type IntegrationsByType = {
+  awsS3: ScmIntegrationsGroup<AwsS3Integration>;
   azure: ScmIntegrationsGroup<AzureIntegration>;
   bitbucket: ScmIntegrationsGroup<BitbucketIntegration>;
   github: ScmIntegrationsGroup<GitHubIntegration>;
@@ -35,6 +37,7 @@ export class ScmIntegrations implements ScmIntegrationRegistry {
 
   static fromConfig(config: Config): ScmIntegrations {
     return new ScmIntegrations({
+      awsS3: AwsS3Integration.factory({ config }),
       azure: AzureIntegration.factory({ config }),
       bitbucket: BitbucketIntegration.factory({ config }),
       github: GitHubIntegration.factory({ config }),
@@ -46,6 +49,10 @@ export class ScmIntegrations implements ScmIntegrationRegistry {
     this.byType = integrationsByType;
   }
 
+  get awsS3(): ScmIntegrationsGroup<AwsS3Integration> {
+    return this.byType.awsS3;
+  }
+
   get azure(): ScmIntegrationsGroup<AzureIntegration> {
     return this.byType.azure;
   }
diff --git a/packages/integration/src/awsS3/AwsS3Integration.test.ts b/packages/integration/src/awsS3/AwsS3Integration.test.ts
new file mode 100644
index 0000000000..481f3c1951
--- /dev/null
+++ b/packages/integration/src/awsS3/AwsS3Integration.test.ts
@@ -0,0 +1,72 @@
+/*
+ * Copyright 2020 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { ConfigReader } from '@backstage/config';
+import { AwsS3Integration } from './AwsS3Integration';
+
+describe('AwsS3Integration', () => {
+  it('has a working factory', () => {
+    const integrations = AwsS3Integration.factory({
+      config: new ConfigReader({
+        integrations: {
+          awsS3: [
+            {
+              host: 'a.com',
+              accessKeyId: 'access key',
+              secretAccessKey: 'secret key',
+            },
+          ],
+        },
+      }),
+    });
+    expect(integrations.list().length).toBe(2); // including default
+    expect(integrations.list()[0].config.host).toBe('a.com');
+    expect(integrations.list()[1].config.host).toBe('amazonaws.com');
+  });
+
+  it('returns the basics', () => {
+    const integration = new AwsS3Integration({ host: 'a.com' } as any);
+    expect(integration.type).toBe('awsS3');
+    expect(integration.title).toBe('a.com');
+  });
+
+  describe('resolveUrl', () => {
+    it('works for valid urls', () => {
+      const integration = new AwsS3Integration({
+        host: 'amazonaws.com',
+      } as any);
+
+      expect(
+        integration.resolveUrl({
+          url: 'https://mytest.s3.us-east-2.amazonaws.com/catalog-info.yaml',
+          base: 'https://mytest.s3.us-east-2.amazonaws.com/catalog-info.yaml',
+        }),
+      ).toBe('https://mytest.s3.us-east-2.amazonaws.com/catalog-info.yaml');
+    });
+  });
+
+  it('resolve edit URL', () => {
+    const integration = new AwsS3Integration({ host: 'a.com' } as any);
+
+    // TODO: The Aws S3 integration doesn't support resolving an edit URL,
+    // instead we keep the input URL.
+    expect(
+      integration.resolveEditUrl(
+        'https://mytest.s3.us-east-2.amazonaws.com/catalog-info.yaml',
+      ),
+    ).toBe('https://mytest.s3.us-east-2.amazonaws.com/catalog-info.yaml');
+  });
+});
diff --git a/packages/integration/src/awsS3/AwsS3Integration.ts b/packages/integration/src/awsS3/AwsS3Integration.ts
new file mode 100644
index 0000000000..e987b8f7a3
--- /dev/null
+++ b/packages/integration/src/awsS3/AwsS3Integration.ts
@@ -0,0 +1,58 @@
+/*
+ * Copyright 2020 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { basicIntegrations, defaultScmResolveUrl } from '../helpers';
+import { ScmIntegration, ScmIntegrationsFactory } from '../types';
+import { AwsS3IntegrationConfig, readAwsS3IntegrationConfigs } from './config';
+
+export class AwsS3Integration implements ScmIntegration {
+  static factory: ScmIntegrationsFactory<AwsS3Integration> = ({ config }) => {
+    const configs = readAwsS3IntegrationConfigs(
+      config.getOptionalConfigArray('integrations.awsS3') ?? [],
+    );
+    return basicIntegrations(
+      configs.map(c => new AwsS3Integration(c)),
+      i => i.config.host,
+    );
+  };
+
+  get type(): string {
+    return 'awsS3';
+  }
+
+  get title(): string {
+    return this.integrationConfig.host;
+  }
+
+  get config(): AwsS3IntegrationConfig {
+    return this.integrationConfig;
+  }
+
+  constructor(private readonly integrationConfig: AwsS3IntegrationConfig) {}
+  resolveUrl(options: {
+    url: string;
+    base: string;
+    lineNumber?: number | undefined;
+  }): string {
+    const resolved = defaultScmResolveUrl(options);
+    return resolved;
+  }
+
+  resolveEditUrl(url: string): string {
+    // TODO: Implement edit URL for awsS3
+    return url;
+  }
+}
diff --git a/packages/integration/src/awsS3/config.test.ts b/packages/integration/src/awsS3/config.test.ts
new file mode 100644
index 0000000000..1c7d7d1647
--- /dev/null
+++ b/packages/integration/src/awsS3/config.test.ts
@@ -0,0 +1,75 @@
+/*
+ * Copyright 2020 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { Config, ConfigReader } from '@backstage/config';
+import {
+  AwsS3IntegrationConfig,
+  readAwsS3IntegrationConfig,
+  readAwsS3IntegrationConfigs,
+} from './config';
+
+describe('readAwsS3IntegrationConfig', () => {
+  function buildConfig(data: Partial<AwsS3IntegrationConfig>): Config {
+    return new ConfigReader(data);
+  }
+
+  it('reads all values', () => {
+    const output = readAwsS3IntegrationConfig(
+      buildConfig({
+        host: 'amazonaws.com',
+        accessKeyId: 'fake-key',
+        secretAccessKey: 'fake-secret-key',
+      }),
+    );
+    expect(output).toEqual({
+      host: 'amazonaws.com',
+      accessKeyId: 'fake-key',
+      secretAccessKey: 'fake-secret-key',
+    });
+  });
+});
+
+describe('readAwsS3IntegrationConfigs', () => {
+  function buildConfig(data: Partial<AwsS3IntegrationConfig>[]): Config[] {
+    return data.map(item => new ConfigReader(item));
+  }
+
+  it('reads all values', () => {
+    const output = readAwsS3IntegrationConfigs(
+      buildConfig([
+        {
+          host: 'amazonaws.com',
+          accessKeyId: 'key',
+          secretAccessKey: 'secret',
+        },
+      ]),
+    );
+    expect(output).toContainEqual({
+      host: 'amazonaws.com',
+      accessKeyId: 'key',
+      secretAccessKey: 'secret',
+    });
+  });
+
+  it('adds a default entry when missing', () => {
+    const output = readAwsS3IntegrationConfigs(buildConfig([]));
+    expect(output).toEqual([
+      {
+        host: 'amazonaws.com',
+      },
+    ]);
+  });
+});
diff --git a/packages/integration/src/awsS3/config.ts b/packages/integration/src/awsS3/config.ts
new file mode 100644
index 0000000000..5f9cd46a22
--- /dev/null
+++ b/packages/integration/src/awsS3/config.ts
@@ -0,0 +1,87 @@
+/*
+ * Copyright 2020 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { Config } from '@backstage/config';
+import { isValidHost } from '../helpers';
+
+const AMAZON_AWS_HOST = 'amazonaws.com';
+
+/**
+ * The configuration parameters for a single AWS S3 provider.
+ */
+
+export type AwsS3IntegrationConfig = {
+  /**
+   * The host of the target that this matches on, e.g. "amazonaws.com"
+   *
+   * Currently only "amazonaws.com" is supported.
+   */
+  host: string;
+
+  /**
+   * accessKeyId
+   */
+  accessKeyId?: string;
+
+  /**
+   * secretAccessKey
+   */
+  secretAccessKey?: string;
+
+  /**
+   * roleArn
+   */
+  roleArn?: string;
+};
+
+/**
+ * Reads a single Aws S3 integration config.
+ *
+ * @param config The config object of a single integration
+ */
+
+export function readAwsS3IntegrationConfig(
+  config: Config,
+): AwsS3IntegrationConfig {
+  const host = config.getOptionalString('host') ?? AMAZON_AWS_HOST;
+  const accessKeyId = config.getOptionalString('accessKeyId');
+  const secretAccessKey = config.getOptionalString('secretAccessKey');
+  const roleArn = config.getOptionalString('roleArn');
+
+  if (!isValidHost(host)) {
+    throw new Error(
+      `Invalid awsS3 integration config, '${host}' is not a valid host`,
+    );
+  }
+
+  return { host, accessKeyId, secretAccessKey, roleArn };
+}
+
+export function readAwsS3IntegrationConfigs(
+  configs: Config[],
+): AwsS3IntegrationConfig[] {
+  // First read all the explicit integrations
+  const result = configs.map(readAwsS3IntegrationConfig);
+
+  // If no explicit amazonaws.com integration was added, put one in the list as
+  // a convenience
+  if (!result.some(c => c.host === AMAZON_AWS_HOST)) {
+    result.push({
+      host: AMAZON_AWS_HOST,
+    });
+  }
+  return result;
+}
diff --git a/packages/core-app-api/src/extensions/index.ts b/packages/integration/src/awsS3/index.ts
similarity index 76%
rename from packages/core-app-api/src/extensions/index.ts
rename to packages/integration/src/awsS3/index.ts
index 914d76aebf..1ae3964ec1 100644
--- a/packages/core-app-api/src/extensions/index.ts
+++ b/packages/integration/src/awsS3/index.ts
@@ -13,10 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
-export { attachComponentData, getComponentData } from './componentData';
+export { AwsS3Integration } from './AwsS3Integration';
 export {
-  createReactExtension,
-  createRoutableExtension,
-  createComponentExtension,
-} from './extensions';
+  readAwsS3IntegrationConfig,
+  readAwsS3IntegrationConfigs,
+} from './config';
+export type { AwsS3IntegrationConfig } from './config';
diff --git a/packages/integration/src/azure/AzureIntegration.test.ts b/packages/integration/src/azure/AzureIntegration.test.ts
index 654ce47836..c30283f432 100644
--- a/packages/integration/src/azure/AzureIntegration.test.ts
+++ b/packages/integration/src/azure/AzureIntegration.test.ts
@@ -51,8 +51,7 @@ describe('AzureIntegration', () => {
       expect(
         integration.resolveUrl({
           url: '../a.yaml',
-          base:
-            'https://dev.azure.com/organization/project/_git/repository?path=%2Ffolder%2Fcatalog-info.yaml',
+          base: 'https://dev.azure.com/organization/project/_git/repository?path=%2Ffolder%2Fcatalog-info.yaml',
         }),
       ).toBe(
         'https://dev.azure.com/organization/project/_git/repository?path=%2Fa.yaml',
@@ -61,28 +60,47 @@ describe('AzureIntegration', () => {
       expect(
         integration.resolveUrl({
           url: '/a.yaml',
-          base:
-            'https://dev.azure.com/organization/project/_git/repository?path=%2Ffolder%2Fcatalog-info.yaml',
+          base: 'https://internal.com/organization/project/_git/repository?path=%2Ffolder%2Fcatalog-info.yaml',
           lineNumber: 14,
         }),
       ).toBe(
-        'https://dev.azure.com/organization/project/_git/repository?path=%2Fa.yaml&line=14&lineEnd=15&lineStartColumn=1&lineEndColumn=1',
+        'https://internal.com/organization/project/_git/repository?path=%2Fa.yaml&line=14&lineEnd=15&lineStartColumn=1&lineEndColumn=1',
       );
 
       expect(
         integration.resolveUrl({
           url: './a.yaml',
-          base: 'https://dev.azure.com/organization/project/_git/repository',
+          base: 'https://dev.azure.com/organization/_git/project',
+        }),
+      ).toBe('https://dev.azure.com/organization/_git/project?path=%2Fa.yaml');
+
+      expect(
+        integration.resolveUrl({
+          url: 'https://dev.azure.com/organization/_git/project?path=%2Fa.yaml',
+          base: 'https://dev.azure.com/organization/_git/project',
+        }),
+      ).toBe('https://dev.azure.com/organization/_git/project?path=%2Fa.yaml');
+
+      expect(
+        integration.resolveUrl({
+          url: 'https://dev.azure.com/other-organization/_git/other-project?path=%2Fa.yaml',
+          base: 'https://dev.azure.com/organization/_git/project',
         }),
       ).toBe(
-        'https://dev.azure.com/organization/project/_git/repository?path=%2Fa.yaml',
+        'https://dev.azure.com/other-organization/_git/other-project?path=%2Fa.yaml',
       );
 
+      expect(
+        integration.resolveUrl({
+          url: './a.yaml',
+          base: 'http://not-azure.com/organization/_git/project',
+        }),
+      ).toBe('http://not-azure.com/organization/_git/project?path=%2Fa.yaml');
+
       expect(
         integration.resolveUrl({
           url: 'https://absolute.com/path',
-          base:
-            'https://dev.azure.com/organization/project/_git/repository?path=%2Fcatalog-info.yaml',
+          base: 'https://dev.azure.com/organization/project/_git/repository?path=%2Fcatalog-info.yaml',
         }),
       ).toBe('https://absolute.com/path');
     });
diff --git a/packages/integration/src/azure/AzureIntegration.ts b/packages/integration/src/azure/AzureIntegration.ts
index c2a8dd8f5e..ab1b2489ae 100644
--- a/packages/integration/src/azure/AzureIntegration.ts
+++ b/packages/integration/src/azure/AzureIntegration.ts
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-import parseGitUrl from 'git-url-parse';
 import { basicIntegrations, isValidUrl } from '../helpers';
 import { ScmIntegration, ScmIntegrationsFactory } from '../types';
+import { AzureUrl } from './AzureUrl';
 import { AzureIntegrationConfig, readAzureIntegrationConfigs } from './config';
 
 export class AzureIntegration implements ScmIntegration {
@@ -61,29 +61,27 @@ export class AzureIntegration implements ScmIntegration {
       return url;
     }
 
-    const parsed = parseGitUrl(base);
-    const { organization, owner, name, filepath } = parsed;
+    try {
+      const azureUrl = AzureUrl.fromRepoUrl(base);
+      const newUrl = new URL(base);
 
-    // If not an actual file path within a repo, treat the URL as raw
-    if (!organization || !owner || !name) {
+      // We lean on the URL path resolution logic to resolve the path param
+      const mockBaseUrl = new URL(`https://a.com${azureUrl.getPath() ?? ''}`);
+      const updatedPath = new URL(url, mockBaseUrl).pathname;
+      newUrl.searchParams.set('path', updatedPath);
+
+      if (options.lineNumber) {
+        newUrl.searchParams.set('line', String(options.lineNumber));
+        newUrl.searchParams.set('lineEnd', String(options.lineNumber + 1));
+        newUrl.searchParams.set('lineStartColumn', '1');
+        newUrl.searchParams.set('lineEndColumn', '1');
+      }
+
+      return newUrl.toString();
+    } catch {
+      // If not an actual file path within a repo, treat the URL as raw
       return new URL(url, base).toString();
     }
-
-    const path = filepath?.replace(/^\//, '') || '';
-    const mockBaseUrl = new URL(`https://a.com/${path}`);
-    const updatedPath = new URL(url, mockBaseUrl).pathname;
-
-    const newUrl = new URL(base);
-    newUrl.searchParams.set('path', updatedPath);
-
-    if (options.lineNumber) {
-      newUrl.searchParams.set('line', String(options.lineNumber));
-      newUrl.searchParams.set('lineEnd', String(options.lineNumber + 1));
-      newUrl.searchParams.set('lineStartColumn', '1');
-      newUrl.searchParams.set('lineEndColumn', '1');
-    }
-
-    return newUrl.toString();
   }
 
   resolveEditUrl(url: string): string {
diff --git a/packages/integration/src/azure/AzureUrl.test.ts b/packages/integration/src/azure/AzureUrl.test.ts
new file mode 100644
index 0000000000..2f22dd13da
--- /dev/null
+++ b/packages/integration/src/azure/AzureUrl.test.ts
@@ -0,0 +1,177 @@
+/*
+ * Copyright 2021 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { AzureUrl } from './AzureUrl';
+
+describe('AzureUrl', () => {
+  it('should work with the short URL form', () => {
+    const url = AzureUrl.fromRepoUrl(
+      'https://dev.azure.com/my-org/_git/my-project',
+    );
+
+    expect(url.getOwner()).toBe('my-org');
+    expect(url.getProject()).toBe('my-project');
+    expect(url.getRepo()).toBe('my-project');
+    expect(url.getRef()).toBeUndefined();
+    expect(url.getPath()).toBeUndefined();
+
+    expect(url.toRepoUrl()).toBe(
+      'https://dev.azure.com/my-org/_git/my-project',
+    );
+    expect(() => url.toFileUrl()).toThrow(
+      'Azure URL must point to a specific path to be able to download a file',
+    );
+    expect(url.toArchiveUrl()).toBe(
+      'https://dev.azure.com/my-org/my-project/_apis/git/repositories/my-project/items?recursionLevel=full&download=true&api-version=6.0',
+    );
+    expect(url.toCommitsUrl()).toBe(
+      'https://dev.azure.com/my-org/my-project/_apis/git/repositories/my-project/commits?api-version=6.0',
+    );
+  });
+
+  it('should work with the short URL form with a path', () => {
+    const url = AzureUrl.fromRepoUrl(
+      'https://dev.azure.com/my-org/_git/my-project?path=%2Ftest.yaml',
+    );
+
+    expect(url.getOwner()).toBe('my-org');
+    expect(url.getProject()).toBe('my-project');
+    expect(url.getRepo()).toBe('my-project');
+    expect(url.getRef()).toBeUndefined();
+    expect(url.getPath()).toBe('/test.yaml');
+
+    expect(url.toRepoUrl()).toBe(
+      'https://dev.azure.com/my-org/_git/my-project?path=%2Ftest.yaml',
+    );
+    expect(url.toFileUrl()).toBe(
+      'https://dev.azure.com/my-org/my-project/_apis/git/repositories/my-project/items?api-version=6.0&path=%2Ftest.yaml',
+    );
+    expect(url.toArchiveUrl()).toBe(
+      'https://dev.azure.com/my-org/my-project/_apis/git/repositories/my-project/items?recursionLevel=full&download=true&api-version=6.0&scopePath=%2Ftest.yaml',
+    );
+    expect(url.toCommitsUrl()).toBe(
+      'https://dev.azure.com/my-org/my-project/_apis/git/repositories/my-project/commits?api-version=6.0',
+    );
+  });
+
+  it('should work with the short URL form with a path and ref', () => {
+    const url = AzureUrl.fromRepoUrl(
+      'https://dev.azure.com/my-org/_git/my-project?path=%2Ftest.yaml&version=GBtest-branch',
+    );
+
+    expect(url.getOwner()).toBe('my-org');
+    expect(url.getProject()).toBe('my-project');
+    expect(url.getRepo()).toBe('my-project');
+    expect(url.getRef()).toBe('test-branch');
+    expect(url.getPath()).toBe('/test.yaml');
+
+    expect(url.toRepoUrl()).toBe(
+      'https://dev.azure.com/my-org/_git/my-project?path=%2Ftest.yaml&version=GBtest-branch',
+    );
+    expect(url.toFileUrl()).toBe(
+      'https://dev.azure.com/my-org/my-project/_apis/git/repositories/my-project/items?api-version=6.0&path=%2Ftest.yaml&version=test-branch',
+    );
+    expect(url.toArchiveUrl()).toBe(
+      'https://dev.azure.com/my-org/my-project/_apis/git/repositories/my-project/items?recursionLevel=full&download=true&api-version=6.0&scopePath=%2Ftest.yaml&version=test-branch',
+    );
+    expect(url.toCommitsUrl()).toBe(
+      'https://dev.azure.com/my-org/my-project/_apis/git/repositories/my-project/commits?api-version=6.0&searchCriteria.itemVersion.version=test-branch',
+    );
+  });
+
+  it('should work with the long URL', () => {
+    const url = AzureUrl.fromRepoUrl(
+      'http://my-host/my-org/my-project/_git/my-repo',
+    );
+
+    expect(url.getOwner()).toBe('my-org');
+    expect(url.getProject()).toBe('my-project');
+    expect(url.getRepo()).toBe('my-repo');
+    expect(url.getRef()).toBeUndefined();
+    expect(url.getPath()).toBeUndefined();
+
+    expect(url.toRepoUrl()).toBe(
+      'http://my-host/my-org/my-project/_git/my-repo',
+    );
+    expect(() => url.toFileUrl()).toThrow(
+      'Azure URL must point to a specific path to be able to download a file',
+    );
+    expect(url.toArchiveUrl()).toBe(
+      'http://my-host/my-org/my-project/_apis/git/repositories/my-repo/items?recursionLevel=full&download=true&api-version=6.0',
+    );
+    expect(url.toCommitsUrl()).toBe(
+      'http://my-host/my-org/my-project/_apis/git/repositories/my-repo/commits?api-version=6.0',
+    );
+  });
+
+  it('should work with the long URL form with a path and ref', () => {
+    const url = AzureUrl.fromRepoUrl(
+      'http://my-host/my-org/my-project/_git/my-repo?path=%2Ffolder&version=GBtest-branch',
+    );
+
+    expect(url.getOwner()).toBe('my-org');
+    expect(url.getProject()).toBe('my-project');
+    expect(url.getRepo()).toBe('my-repo');
+    expect(url.getRef()).toBe('test-branch');
+    expect(url.getPath()).toBe('/folder');
+
+    expect(url.toRepoUrl()).toBe(
+      'http://my-host/my-org/my-project/_git/my-repo?path=%2Ffolder&version=GBtest-branch',
+    );
+    expect(url.toFileUrl()).toBe(
+      'http://my-host/my-org/my-project/_apis/git/repositories/my-repo/items?api-version=6.0&path=%2Ffolder&version=test-branch',
+    );
+    expect(url.toArchiveUrl()).toBe(
+      'http://my-host/my-org/my-project/_apis/git/repositories/my-repo/items?recursionLevel=full&download=true&api-version=6.0&scopePath=%2Ffolder&version=test-branch',
+    );
+    expect(url.toCommitsUrl()).toBe(
+      'http://my-host/my-org/my-project/_apis/git/repositories/my-repo/commits?api-version=6.0&searchCriteria.itemVersion.version=test-branch',
+    );
+  });
+
+  it('should reject non-branch refs', () => {
+    expect(() =>
+      AzureUrl.fromRepoUrl(
+        'https://dev.azure.com/my-org/_git/my-project?version=GC6eead79870d998a3befd4bc7c72cc89e446f2970',
+      ),
+    ).toThrow('Azure URL version must point to a git branch');
+  });
+
+  it('should reject non-repo URLs', () => {
+    expect(() =>
+      AzureUrl.fromRepoUrl('https://dev.azure.com/my-org/_git'),
+    ).toThrow('Azure URL must point to a git repository');
+    expect(() =>
+      AzureUrl.fromRepoUrl('https://dev.azure.com/my-org/_git/'),
+    ).toThrow('Azure URL must point to a git repository');
+    expect(() =>
+      AzureUrl.fromRepoUrl('https://dev.azure.com/my-org/my-project/'),
+    ).toThrow('Azure URL must point to a git repository');
+    expect(() =>
+      AzureUrl.fromRepoUrl('https://dev.azure.com/my-org/my-project/_not-git'),
+    ).toThrow('Azure URL must point to a git repository');
+    expect(() =>
+      AzureUrl.fromRepoUrl(
+        'https://dev.azure.com/my-org/my-project/_not-git/my-repo',
+      ),
+    ).toThrow('Azure URL must point to a git repository');
+    expect(() =>
+      AzureUrl.fromRepoUrl(
+        'https://dev.azure.com/my-org/_workitems/recentlyupdated/',
+      ),
+    ).toThrow('Azure URL must point to a git repository');
+  });
+});
diff --git a/packages/integration/src/azure/AzureUrl.ts b/packages/integration/src/azure/AzureUrl.ts
new file mode 100644
index 0000000000..76de8550ed
--- /dev/null
+++ b/packages/integration/src/azure/AzureUrl.ts
@@ -0,0 +1,231 @@
+/*
+ * Copyright 2021 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+const VERSION_PREFIX_GIT_BRANCH = 'GB';
+
+export class AzureUrl {
+  /**
+   * Parses an azure URL as copied from the browser address bar.
+   *
+   * Throws an error if the URL is not a valid azure repo URL.
+   */
+  static fromRepoUrl(repoUrl: string): AzureUrl {
+    const url = new URL(repoUrl);
+
+    let owner;
+    let project;
+    let repo;
+
+    const parts = url.pathname.split('/').map(part => decodeURIComponent(part));
+    if (parts[2] === '_git') {
+      owner = parts[1];
+      project = repo = parts[3];
+    } else if (parts[3] === '_git') {
+      owner = parts[1];
+      project = parts[2];
+      repo = parts[4];
+    }
+
+    if (!owner || !project || !repo) {
+      throw new Error('Azure URL must point to a git repository');
+    }
+
+    const path = url.searchParams.get('path') ?? undefined;
+
+    let ref;
+    const version = url.searchParams.get('version');
+    if (version) {
+      const prefix = version.slice(0, 2);
+      if (prefix !== 'GB') {
+        throw new Error('Azure URL version must point to a git branch');
+      }
+      ref = version.slice(2);
+    }
+
+    return new AzureUrl(url.origin, owner, project, repo, path, ref);
+  }
+
+  #origin: string;
+  #owner: string;
+  #project: string;
+  #repo: string;
+  #path?: string;
+  #ref?: string;
+
+  private constructor(
+    origin: string,
+    owner: string,
+    project: string,
+    repo: string,
+    path?: string,
+    ref?: string,
+  ) {
+    this.#origin = origin;
+    this.#owner = owner;
+    this.#project = project;
+    this.#repo = repo;
+    this.#path = path;
+    this.#ref = ref;
+  }
+
+  #baseUrl = (...parts: string[]): URL => {
+    const url = new URL(this.#origin);
+    url.pathname = parts.map(part => encodeURIComponent(part)).join('/');
+    return url;
+  };
+
+  /**
+   * Returns a repo URL that can be used to navigate to the resource in azure.
+   *
+   * Throws an error if the URL is not a valid azure repo URL.
+   */
+  toRepoUrl(): string {
+    let url;
+    if (this.#project === this.#repo) {
+      url = this.#baseUrl(this.#owner, '_git', this.#repo);
+    } else {
+      url = this.#baseUrl(this.#owner, this.#project, '_git', this.#repo);
+    }
+
+    if (this.#path) {
+      url.searchParams.set('path', this.#path);
+    }
+    if (this.#ref) {
+      url.searchParams.set('version', VERSION_PREFIX_GIT_BRANCH + this.#ref);
+    }
+
+    return url.toString();
+  }
+
+  /**
+   * Returns the file download URL for this azure resource.
+   *
+   * Throws an error if the URL does not point to a file.
+   */
+  toFileUrl(): string {
+    if (!this.#path) {
+      throw new Error(
+        'Azure URL must point to a specific path to be able to download a file',
+      );
+    }
+
+    const url = this.#baseUrl(
+      this.#owner,
+      this.#project,
+      '_apis',
+      'git',
+      'repositories',
+      this.#repo,
+      'items',
+    );
+    url.searchParams.set('api-version', '6.0');
+    url.searchParams.set('path', this.#path);
+
+    if (this.#ref) {
+      url.searchParams.set('version', this.#ref);
+    }
+
+    return url.toString();
+  }
+
+  /**
+   * Returns the archive download URL for this azure resource.
+   *
+   * Throws an error if the URL does not point to a repo.
+   */
+  toArchiveUrl(): string {
+    const url = this.#baseUrl(
+      this.#owner,
+      this.#project,
+      '_apis',
+      'git',
+      'repositories',
+      this.#repo,
+      'items',
+    );
+    url.searchParams.set('recursionLevel', 'full');
+    url.searchParams.set('download', 'true');
+    url.searchParams.set('api-version', '6.0');
+
+    if (this.#path) {
+      url.searchParams.set('scopePath', this.#path);
+    }
+    if (this.#ref) {
+      url.searchParams.set('version', this.#ref);
+    }
+
+    return url.toString();
+  }
+
+  /**
+   * Returns the API url for fetching commits from a branch for this azure resource.
+   *
+   * Throws an error if the URL does not point to a commit.
+   */
+  toCommitsUrl(): string {
+    const url = this.#baseUrl(
+      this.#owner,
+      this.#project,
+      '_apis',
+      'git',
+      'repositories',
+      this.#repo,
+      'commits',
+    );
+    url.searchParams.set('api-version', '6.0');
+
+    if (this.#ref) {
+      url.searchParams.set('searchCriteria.itemVersion.version', this.#ref);
+    }
+
+    return url.toString();
+  }
+
+  /**
+   * Returns the name of the owner, a user or an organization.
+   */
+  getOwner(): string {
+    return this.#owner;
+  }
+
+  /**
+   * Returns the name of the project.
+   */
+  getProject(): string {
+    return this.#project;
+  }
+
+  /**
+   * Returns the name of the repo.
+   */
+  getRepo(): string {
+    return this.#repo;
+  }
+
+  /**
+   * Returns the file path within the repo if the URL contains one.
+   */
+  getPath(): string | undefined {
+    return this.#path;
+  }
+
+  /**
+   * Returns the git ref in the repo if the URL contains one.
+   */
+  getRef(): string | undefined {
+    return this.#ref;
+  }
+}
diff --git a/packages/integration/src/azure/config.test.ts b/packages/integration/src/azure/config.test.ts
index d43536cf47..385086fbcf 100644
--- a/packages/integration/src/azure/config.test.ts
+++ b/packages/integration/src/azure/config.test.ts
@@ -30,9 +30,18 @@ describe('readAzureIntegrationConfig', () => {
   async function buildFrontendConfig(
     data: Partial<AzureIntegrationConfig>,
   ): Promise<Config> {
-    const schema = await loadConfigSchema({
+    const fullSchema = await loadConfigSchema({
       dependencies: [require('../../package.json').name],
     });
+    const serializedSchema = fullSchema.serialize() as {
+      schemas: { path: string }[];
+    };
+    const schema = await loadConfigSchema({
+      serialized: {
+        ...serializedSchema, // grab the schema from this package only
+        schemas: serializedSchema.schemas.filter(s => s.path === 'config.d.ts'),
+      },
+    });
     const processed = schema.process(
       [{ data: { integrations: { azure: [data] } }, context: 'app' }],
       { visibility: ['frontend'] },
diff --git a/packages/integration/src/azure/core.test.ts b/packages/integration/src/azure/core.test.ts
index ab5a4bc700..ad8f2691b5 100644
--- a/packages/integration/src/azure/core.test.ts
+++ b/packages/integration/src/azure/core.test.ts
@@ -43,28 +43,24 @@ describe('azure core', () => {
   describe('getAzureFileFetchUrl', () => {
     it.each([
       {
-        url:
-          'https://dev.azure.com/org-name/project-name/_git/repo-name?path=my-template.yaml&version=GBmaster',
+        url: 'https://dev.azure.com/org-name/project-name/_git/repo-name?path=my-template.yaml&version=GBmaster',
         result:
-          'https://dev.azure.com/org-name/project-name/_apis/git/repositories/repo-name/items?path=my-template.yaml&version=master',
+          'https://dev.azure.com/org-name/project-name/_apis/git/repositories/repo-name/items?api-version=6.0&path=my-template.yaml&version=master',
       },
       {
-        url:
-          'https://dev.azure.com/org-name/project-name/_git/repo-name?path=my-template.yaml',
+        url: 'https://dev.azure.com/org-name/project-name/_git/repo-name?path=my-template.yaml',
         result:
-          'https://dev.azure.com/org-name/project-name/_apis/git/repositories/repo-name/items?path=my-template.yaml',
+          'https://dev.azure.com/org-name/project-name/_apis/git/repositories/repo-name/items?api-version=6.0&path=my-template.yaml',
       },
       {
-        url:
-          'https://api.com/org-name/project-name/_git/repo-name?path=my-template.yaml',
+        url: 'https://api.com/org-name/project-name/_git/repo-name?path=my-template.yaml',
         result:
-          'https://api.com/org-name/project-name/_apis/git/repositories/repo-name/items?path=my-template.yaml',
+          'https://api.com/org-name/project-name/_apis/git/repositories/repo-name/items?api-version=6.0&path=my-template.yaml',
       },
       {
-        url:
-          'https://api.com/org-name/project-name/_git/repo-name?path=my-template.yaml&version=GBmaster',
+        url: 'https://api.com/org-name/project-name/_git/repo-name?path=my-template.yaml&version=GBmaster',
         result:
-          'https://api.com/org-name/project-name/_apis/git/repositories/repo-name/items?path=my-template.yaml&version=master',
+          'https://api.com/org-name/project-name/_apis/git/repositories/repo-name/items?api-version=6.0&path=my-template.yaml&version=master',
       },
     ])('should handle happy path %#', async ({ url, result }) => {
       expect(getAzureFileFetchUrl(url)).toBe(result);
@@ -73,13 +69,11 @@ describe('azure core', () => {
     it.each([
       {
         url: 'https://api.com/a/b/blob/master/path/to/c.yaml',
-        error:
-          'Incorrect URL: https://api.com/a/b/blob/master/path/to/c.yaml, Error: Wrong Azure Devops URL or Invalid file path',
+        error: 'Azure URL must point to a git repository',
       },
       {
         url: 'com/a/b/blob/master/path/to/c.yaml',
-        error:
-          'Incorrect URL: com/a/b/blob/master/path/to/c.yaml, TypeError: Invalid URL: com/a/b/blob/master/path/to/c.yaml',
+        error: 'Invalid URL: com/a/b/blob/master/path/to/c.yaml',
       },
     ])('should handle error path %#', ({ url, error }) => {
       expect(() => getAzureFileFetchUrl(url)).toThrow(error);
@@ -99,7 +93,22 @@ describe('azure core', () => {
       const result = getAzureDownloadUrl(
         'https://dev.azure.com/organization/project/_git/repository?path=%2Fdocs',
       );
-      expect(new URL(result).searchParams.get('scopePath')).toEqual('docs');
+      expect(new URL(result).searchParams.get('scopePath')).toEqual('/docs');
+    });
+
+    it.each([
+      {
+        url: 'https://dev.azure.com/org-name/project-name/_git/repo-name',
+        result:
+          'https://dev.azure.com/org-name/project-name/_apis/git/repositories/repo-name/items?recursionLevel=full&download=true&api-version=6.0',
+      },
+      {
+        url: 'https://api.com/org-name/project-name/_git/repo-name',
+        result:
+          'https://api.com/org-name/project-name/_apis/git/repositories/repo-name/items?recursionLevel=full&download=true&api-version=6.0',
+      },
+    ])('should handle happy path %#', async ({ url, result }) => {
+      expect(getAzureDownloadUrl(url)).toBe(result);
     });
   });
 });
diff --git a/packages/integration/src/azure/core.ts b/packages/integration/src/azure/core.ts
index 5aacc09700..30603b1f09 100644
--- a/packages/integration/src/azure/core.ts
+++ b/packages/integration/src/azure/core.ts
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import parseGitUrl from 'git-url-parse';
+import { AzureUrl } from './AzureUrl';
 import { AzureIntegrationConfig } from './config';
 
 /**
@@ -28,58 +28,7 @@ import { AzureIntegrationConfig } from './config';
  * @param url A URL pointing to a file
  */
 export function getAzureFileFetchUrl(url: string): string {
-  try {
-    const parsedUrl = new URL(url);
-
-    const [
-      empty,
-      userOrOrg,
-      project,
-      srcKeyword,
-      repoName,
-    ] = parsedUrl.pathname.split('/');
-
-    const path = parsedUrl.searchParams.get('path') || '';
-    const ref = parsedUrl.searchParams.get('version')?.substr(2);
-
-    if (
-      empty !== '' ||
-      userOrOrg === '' ||
-      project === '' ||
-      srcKeyword !== '_git' ||
-      repoName === '' ||
-      path === '' ||
-      ref === ''
-    ) {
-      throw new Error('Wrong Azure Devops URL or Invalid file path');
-    }
-
-    // transform to api
-    parsedUrl.pathname = [
-      empty,
-      userOrOrg,
-      project,
-      '_apis',
-      'git',
-      'repositories',
-      repoName,
-      'items',
-    ].join('/');
-
-    const queryParams = [`path=${path}`];
-
-    if (ref) {
-      queryParams.push(`version=${ref}`);
-    }
-
-    parsedUrl.search = queryParams.join('&');
-
-    parsedUrl.protocol = 'https';
-
-    return parsedUrl.toString();
-  } catch (e) {
-    throw new Error(`Incorrect URL: ${url}, ${e}`);
-  }
+  return AzureUrl.fromRepoUrl(url).toFileUrl();
 }
 
 /**
@@ -89,23 +38,7 @@ export function getAzureFileFetchUrl(url: string): string {
  * @param url A URL pointing to a path
  */
 export function getAzureDownloadUrl(url: string): string {
-  const {
-    name: repoName,
-    owner: project,
-    organization,
-    protocol,
-    resource,
-    filepath,
-  } = parseGitUrl(url);
-
-  // scopePath will limit the downloaded content
-  // /docs will only download the docs folder and everything below it
-  // /docs/index.md will only download index.md but put it in the root of the archive
-  const scopePath = filepath
-    ? `&scopePath=${encodeURIComponent(filepath)}`
-    : '';
-
-  return `${protocol}://${resource}/${organization}/${project}/_apis/git/repositories/${repoName}/items?recursionLevel=full&download=true&api-version=6.0${scopePath}`;
+  return AzureUrl.fromRepoUrl(url).toArchiveUrl();
 }
 
 /**
@@ -114,54 +47,7 @@ export function getAzureDownloadUrl(url: string): string {
  * @param url A URL pointing to a repository or a sub-path
  */
 export function getAzureCommitsUrl(url: string): string {
-  try {
-    const parsedUrl = new URL(url);
-
-    const [
-      empty,
-      userOrOrg,
-      project,
-      srcKeyword,
-      repoName,
-    ] = parsedUrl.pathname.split('/');
-
-    // Remove the "GB" from "GBmain" for example.
-    const ref = parsedUrl.searchParams.get('version')?.substr(2);
-
-    if (
-      !!empty ||
-      !userOrOrg ||
-      !project ||
-      srcKeyword !== '_git' ||
-      !repoName
-    ) {
-      throw new Error('Wrong Azure Devops URL');
-    }
-
-    // transform to commits api
-    parsedUrl.pathname = [
-      empty,
-      userOrOrg,
-      project,
-      '_apis',
-      'git',
-      'repositories',
-      repoName,
-      'commits',
-    ].join('/');
-
-    const queryParams = [];
-    if (ref) {
-      queryParams.push(`searchCriteria.itemVersion.version=${ref}`);
-    }
-    parsedUrl.search = queryParams.join('&');
-
-    parsedUrl.protocol = 'https';
-
-    return parsedUrl.toString();
-  } catch (e) {
-    throw new Error(`Incorrect URL: ${url}, ${e}`);
-  }
+  return AzureUrl.fromRepoUrl(url).toCommitsUrl();
 }
 
 /**
diff --git a/packages/integration/src/bitbucket/config.test.ts b/packages/integration/src/bitbucket/config.test.ts
index f3d076e1b6..b887566e35 100644
--- a/packages/integration/src/bitbucket/config.test.ts
+++ b/packages/integration/src/bitbucket/config.test.ts
@@ -30,9 +30,18 @@ describe('readBitbucketIntegrationConfig', () => {
   async function buildFrontendConfig(
     data: Partial<BitbucketIntegrationConfig>,
   ): Promise<Config> {
-    const schema = await loadConfigSchema({
+    const fullSchema = await loadConfigSchema({
       dependencies: [require('../../package.json').name],
     });
+    const serializedSchema = fullSchema.serialize() as {
+      schemas: { path: string }[];
+    };
+    const schema = await loadConfigSchema({
+      serialized: {
+        ...serializedSchema, // grab the schema from this package only
+        schemas: serializedSchema.schemas.filter(s => s.path === 'config.d.ts'),
+      },
+    });
     const processed = schema.process(
       [{ data: { integrations: { bitbucket: [data] } }, context: 'app' }],
       { visibility: ['frontend'] },
diff --git a/packages/integration/src/github/GitHubIntegration.test.ts b/packages/integration/src/github/GitHubIntegration.test.ts
index 416618e53b..efc1de782e 100644
--- a/packages/integration/src/github/GitHubIntegration.test.ts
+++ b/packages/integration/src/github/GitHubIntegration.test.ts
@@ -56,8 +56,7 @@ describe('GitHubIntegration', () => {
     expect(
       integration.resolveUrl({
         url: '../a.yaml',
-        base:
-          'https://github.com/backstage/backstage/blob/master/test/README.md',
+        base: 'https://github.com/backstage/backstage/blob/master/test/README.md',
         lineNumber: 17,
       }),
     ).toBe('https://github.com/backstage/backstage/tree/master/a.yaml#L17');
@@ -65,8 +64,7 @@ describe('GitHubIntegration', () => {
     expect(
       integration.resolveUrl({
         url: './',
-        base:
-          'https://github.com/backstage/backstage/blob/master/test/README.md',
+        base: 'https://github.com/backstage/backstage/blob/master/test/README.md',
       }),
     ).toBe('https://github.com/backstage/backstage/tree/master/test/');
   });
diff --git a/packages/integration/src/github/GithubCredentialsProvider.test.ts b/packages/integration/src/github/GithubCredentialsProvider.test.ts
index 85df1bb4e1..9450d96ab7 100644
--- a/packages/integration/src/github/GithubCredentialsProvider.test.ts
+++ b/packages/integration/src/github/GithubCredentialsProvider.test.ts
@@ -133,7 +133,7 @@ describe('GithubCredentialsProvider tests', () => {
     expect(token).toEqual('secret_token');
   });
 
-  it('should fail to issue tokens for an organization when the app is installed for a single repo', async () => {
+  it('should not fail to issue tokens for an organization when the app is installed for a single repo', async () => {
     octokit.apps.listInstallations.mockResolvedValue({
       headers: {
         etag: '123',
@@ -156,13 +156,12 @@ describe('GithubCredentialsProvider tests', () => {
       },
     } as RestEndpointMethodTypes['apps']['createInstallationAccessToken']['response']);
 
-    await expect(
-      github.getCredentials({
-        url: 'https://github.com/backstage',
-      }),
-    ).rejects.toThrow(
-      'The Backstage GitHub application used in the backstage organization must be installed for the entire organization to be able to issue credentials without a specified repository.',
-    );
+    const { token, headers } = await github.getCredentials({
+      url: 'https://github.com/backstage',
+    });
+    const expectedToken = 'secret_token';
+    expect(headers).toEqual({ Authorization: `Bearer ${expectedToken}` });
+    expect(token).toEqual('secret_token');
   });
 
   it('should throw if the app is suspended', async () => {
@@ -232,9 +231,9 @@ describe('GithubCredentialsProvider tests', () => {
       ],
       token: 'hardcoded_token',
     });
-    octokit.apps.listInstallations.mockResolvedValue(({
+    octokit.apps.listInstallations.mockResolvedValue({
       data: [],
-    } as unknown) as RestEndpointMethodTypes['apps']['listInstallations']['response']);
+    } as unknown as RestEndpointMethodTypes['apps']['listInstallations']['response']);
 
     await expect(
       githubProvider.getCredentials({
@@ -254,4 +253,35 @@ describe('GithubCredentialsProvider tests', () => {
       }),
     ).resolves.toEqual({ headers: undefined, token: undefined, type: 'token' });
   });
+
+  it('should to create a token for the organization ignoring case sensitive', async () => {
+    octokit.apps.listInstallations.mockResolvedValue({
+      headers: {
+        etag: '123',
+      },
+      data: [
+        {
+          id: 1,
+          repository_selection: 'all',
+          account: {
+            login: 'BACKSTAGE',
+          },
+        },
+      ],
+    } as RestEndpointMethodTypes['apps']['listInstallations']['response']);
+
+    octokit.apps.createInstallationAccessToken.mockResolvedValueOnce({
+      data: {
+        expires_at: DateTime.local().plus({ hour: 1 }).toString(),
+        token: 'secret_token',
+      },
+    } as RestEndpointMethodTypes['apps']['createInstallationAccessToken']['response']);
+
+    const { token, headers } = await github.getCredentials({
+      url: 'https://github.com/backstage',
+    });
+
+    expect(headers).toEqual({ Authorization: 'Bearer secret_token' });
+    expect(token).toEqual('secret_token');
+  });
 });
diff --git a/packages/integration/src/github/GithubCredentialsProvider.ts b/packages/integration/src/github/GithubCredentialsProvider.ts
index 899b233195..3156488ba7 100644
--- a/packages/integration/src/github/GithubCredentialsProvider.ts
+++ b/packages/integration/src/github/GithubCredentialsProvider.ts
@@ -23,7 +23,6 @@ import { DateTime } from 'luxon';
 type InstallationData = {
   installationId: number;
   suspended: boolean;
-  repositorySelection: 'selected' | 'all';
 };
 
 class Cache {
@@ -67,8 +66,10 @@ class GithubAppManager {
   private readonly appClient: Octokit;
   private readonly baseAuthConfig: { appId: number; privateKey: string };
   private readonly cache = new Cache();
+  private readonly allowedInstallationOwners: string[] | undefined; // undefined allows all installations
 
   constructor(config: GithubAppConfig, baseUrl?: string) {
+    this.allowedInstallationOwners = config.allowedInstallationOwners;
     this.baseAuthConfig = {
       appId: config.appId,
       privateKey: config.privateKey,
@@ -85,34 +86,42 @@ class GithubAppManager {
     owner: string,
     repo?: string,
   ): Promise<{ accessToken: string }> {
-    const {
-      installationId,
-      suspended,
-      repositorySelection,
-    } = await this.getInstallationData(owner);
-    if (suspended) {
-      throw new Error(
-        `The GitHub application for ${[owner, repo]
-          .filter(Boolean)
-          .join('/')} is suspended`,
-      );
+    const { installationId, suspended } = await this.getInstallationData(owner);
+    if (this.allowedInstallationOwners) {
+      if (!this.allowedInstallationOwners?.includes(owner)) {
+        throw new Error(
+          `The GitHub application for ${owner} is not included in the allowed installation list (${installationId}).`,
+        );
+      }
     }
-    if (repositorySelection !== 'all' && !repo) {
-      throw new Error(
-        `The Backstage GitHub application used in the ${owner} organization must be installed for the entire organization to be able to issue credentials without a specified repository.`,
-      );
+    if (suspended) {
+      throw new Error(`The GitHub application for ${owner} is suspended`);
     }
 
-    const cacheKey = !repo ? owner : `${owner}/${repo}`;
-    const repositories = repositorySelection !== 'all' ? [repo!] : undefined;
+    const cacheKey = repo ? `${owner}/${repo}` : owner;
 
     // Go and grab an access token for the app scoped to a repository if provided, if not use the organisation installation.
     return this.cache.getOrCreateToken(cacheKey, async () => {
       const result = await this.appClient.apps.createInstallationAccessToken({
         installation_id: installationId,
         headers: HEADERS,
-        repositories,
       });
+      if (repo && result.data.repository_selection === 'selected') {
+        const installationClient = new Octokit({
+          auth: result.data.token,
+        });
+        const repos = await installationClient.paginate(
+          installationClient.apps.listReposAccessibleToInstallation,
+        );
+        const hasRepo = repos.some(repository => {
+          return repository.name === repo;
+        });
+        if (!hasRepo) {
+          throw new Error(
+            `The Backstage GitHub application used in the ${owner} organization does not have access to a repository with the name ${repo}`,
+          );
+        }
+      }
       return {
         token: result.data.token,
         expiresAt: DateTime.fromISO(result.data.expires_at),
@@ -129,13 +138,12 @@ class GithubAppManager {
   private async getInstallationData(owner: string): Promise<InstallationData> {
     const allInstallations = await this.getInstallations();
     const installation = allInstallations.find(
-      inst => inst.account?.login === owner,
+      inst => inst.account?.login?.toLowerCase() === owner.toLowerCase(),
     );
     if (installation) {
       return {
         installationId: installation.id,
         suspended: Boolean(installation.suspended_by),
-        repositorySelection: installation.repository_selection,
       };
     }
     const notFoundError = new Error(
@@ -243,11 +251,7 @@ export class GithubCredentialsProvider {
     }
 
     return {
-      headers: token
-        ? {
-            Authorization: `Bearer ${token}`,
-          }
-        : undefined,
+      headers: token ? { Authorization: `Bearer ${token}` } : undefined,
       token,
       type,
     };
diff --git a/packages/integration/src/github/config.test.ts b/packages/integration/src/github/config.test.ts
index 10d076f85d..eb084b14a9 100644
--- a/packages/integration/src/github/config.test.ts
+++ b/packages/integration/src/github/config.test.ts
@@ -30,9 +30,18 @@ describe('readGitHubIntegrationConfig', () => {
   async function buildFrontendConfig(
     data: Partial<GitHubIntegrationConfig>,
   ): Promise<Config> {
-    const schema = await loadConfigSchema({
+    const fullSchema = await loadConfigSchema({
       dependencies: [require('../../package.json').name],
     });
+    const serializedSchema = fullSchema.serialize() as {
+      schemas: { path: string }[];
+    };
+    const schema = await loadConfigSchema({
+      serialized: {
+        ...serializedSchema, // grab the schema from this package only
+        schemas: serializedSchema.schemas.filter(s => s.path === 'config.d.ts'),
+      },
+    });
     const processed = schema.process(
       [{ data: { integrations: { github: [data] } }, context: 'app' }],
       { visibility: ['frontend'] },
diff --git a/packages/integration/src/github/config.ts b/packages/integration/src/github/config.ts
index d03b45e424..4ecac99295 100644
--- a/packages/integration/src/github/config.ts
+++ b/packages/integration/src/github/config.ts
@@ -93,6 +93,14 @@ export type GithubAppConfig = {
    * Client secrets can be generated at https://github.com/organizations/$org/settings/apps/$AppName
    */
   clientSecret: string;
+  /**
+   * List of installation owners allowed to be used by this GitHub app. The GitHub UI does not provide a way to list the installations.
+   * However you can list the installations with the GitHub API. You can find the list of installations here:
+   * https://api.github.com/app/installations
+   * The relevant documentation for this is here.
+   * https://docs.github.com/en/rest/reference/apps#list-installations-for-the-authenticated-app--code-samples
+   */
+  allowedInstallationOwners?: string[];
 };
 
 /**
@@ -113,6 +121,9 @@ export function readGitHubIntegrationConfig(
     clientSecret: c.getString('clientSecret'),
     webhookSecret: c.getString('webhookSecret'),
     privateKey: c.getString('privateKey'),
+    allowedInstallationOwners: c.getOptionalStringArray(
+      'allowedInstallationOwners',
+    ),
   }));
 
   if (!isValidHost(host)) {
diff --git a/packages/integration/src/github/core.test.ts b/packages/integration/src/github/core.test.ts
index 2dab4ab4d5..53733b40d0 100644
--- a/packages/integration/src/github/core.test.ts
+++ b/packages/integration/src/github/core.test.ts
@@ -16,8 +16,25 @@
 
 import { GitHubIntegrationConfig } from './config';
 import { getGitHubFileFetchUrl, getGitHubRequestOptions } from './core';
+import { GithubCredentials } from './GithubCredentialsProvider';
 
 describe('github core', () => {
+  const appCredentials: GithubCredentials = {
+    type: 'app',
+    token: 'A',
+    headers: {},
+  };
+
+  const tokenCredentials: GithubCredentials = {
+    type: 'token',
+    token: 'A',
+    headers: {},
+  };
+
+  const noCredentials: GithubCredentials = {
+    type: 'token',
+  };
+
   describe('getGitHubRequestOptions', () => {
     it('inserts a token when needed', () => {
       const withToken: GitHubIntegrationConfig = {
@@ -30,10 +47,12 @@ describe('github core', () => {
         rawBaseUrl: '',
       };
       expect(
-        (getGitHubRequestOptions(withToken).headers as any).Authorization,
+        (getGitHubRequestOptions(withToken, appCredentials).headers as any)
+          .Authorization,
       ).toEqual('token A');
       expect(
-        (getGitHubRequestOptions(withoutToken).headers as any).Authorization,
+        (getGitHubRequestOptions(withoutToken, noCredentials).headers as any)
+          .Authorization,
       ).toBeUndefined();
     });
   });
@@ -41,7 +60,7 @@ describe('github core', () => {
   describe('getGitHubFileFetchUrl', () => {
     it('rejects targets that do not look like URLs', () => {
       const config: GitHubIntegrationConfig = { host: '', apiBaseUrl: '' };
-      expect(() => getGitHubFileFetchUrl('a/b', config)).toThrow(
+      expect(() => getGitHubFileFetchUrl('a/b', config, noCredentials)).toThrow(
         /Incorrect URL: a\/b/,
       );
     });
@@ -55,14 +74,16 @@ describe('github core', () => {
         getGitHubFileFetchUrl(
           'https://github.com/a/b/blob/branchname/path/to/c.yaml',
           config,
+          appCredentials,
         ),
       ).toEqual(
         'https://api.github.com/repos/a/b/contents/path/to/c.yaml?ref=branchname',
       );
       expect(
         getGitHubFileFetchUrl(
-          'https://ghe.mycompany.net/a/b/blob/branchname/path/to/c.yaml',
+          'https://github.com/a/b/blob/branchname/path/to/c.yaml',
           config,
+          tokenCredentials,
         ),
       ).toEqual(
         'https://api.github.com/repos/a/b/contents/path/to/c.yaml?ref=branchname',
@@ -78,6 +99,16 @@ describe('github core', () => {
         getGitHubFileFetchUrl(
           'https://ghe.mycompany.net/a/b/blob/branchname/path/to/c.yaml',
           config,
+          appCredentials,
+        ),
+      ).toEqual(
+        'https://ghe.mycompany.net/api/v3/repos/a/b/contents/path/to/c.yaml?ref=branchname',
+      );
+      expect(
+        getGitHubFileFetchUrl(
+          'https://ghe.mycompany.net/a/b/blob/branchname/path/to/c.yaml',
+          config,
+          tokenCredentials,
         ),
       ).toEqual(
         'https://ghe.mycompany.net/api/v3/repos/a/b/contents/path/to/c.yaml?ref=branchname',
@@ -93,6 +124,7 @@ describe('github core', () => {
         getGitHubFileFetchUrl(
           'https://github.com/a/b/tree/branchname/path/to/c.yaml',
           config,
+          tokenCredentials,
         ),
       ).toEqual(
         'https://api.github.com/repos/a/b/contents/path/to/c.yaml?ref=branchname',
@@ -108,6 +140,7 @@ describe('github core', () => {
         getGitHubFileFetchUrl(
           'https://ghe.mycompany.net/a/b/tree/branchname/path/to/c.yaml',
           config,
+          tokenCredentials,
         ),
       ).toEqual(
         'https://ghe.mycompany.net/api/v3/repos/a/b/contents/path/to/c.yaml?ref=branchname',
@@ -123,6 +156,7 @@ describe('github core', () => {
         getGitHubFileFetchUrl(
           'https://github.com/a/b/blob/branchname/path/to/c.yaml',
           config,
+          tokenCredentials,
         ),
       ).toEqual(
         'https://raw.githubusercontent.com/a/b/branchname/path/to/c.yaml',
@@ -138,6 +172,7 @@ describe('github core', () => {
         getGitHubFileFetchUrl(
           'https://ghe.mycompany.net/a/b/blob/branchname/path/to/c.yaml',
           config,
+          tokenCredentials,
         ),
       ).toEqual('https://ghe.mycompany.net/raw/a/b/branchname/path/to/c.yaml');
     });
diff --git a/packages/integration/src/github/core.ts b/packages/integration/src/github/core.ts
index 4a069bcba4..49695ec5ac 100644
--- a/packages/integration/src/github/core.ts
+++ b/packages/integration/src/github/core.ts
@@ -16,6 +16,7 @@
 
 import parseGitUrl from 'git-url-parse';
 import { GitHubIntegrationConfig } from './config';
+import { GithubCredentials } from './GithubCredentialsProvider';
 
 /**
  * Given a URL pointing to a file on a provider, returns a URL that is suitable
@@ -32,6 +33,7 @@ import { GitHubIntegrationConfig } from './config';
 export function getGitHubFileFetchUrl(
   url: string,
   config: GitHubIntegrationConfig,
+  credentials: GithubCredentials,
 ): string {
   try {
     const { owner, name, ref, filepathtype, filepath } = parseGitUrl(url);
@@ -49,7 +51,7 @@ export function getGitHubFileFetchUrl(
     }
 
     const pathWithoutSlash = filepath.replace(/^\//, '');
-    if (chooseEndpoint(config) === 'api') {
+    if (chooseEndpoint(config, credentials) === 'api') {
       return `${config.apiBaseUrl}/repos/${owner}/${name}/contents/${pathWithoutSlash}?ref=${ref}`;
     }
     return `${config.rawBaseUrl}/${owner}/${name}/${ref}/${pathWithoutSlash}`;
@@ -61,25 +63,31 @@ export function getGitHubFileFetchUrl(
 /**
  * Gets the request options necessary to make requests to a given provider.
  *
+ * @deprecated This function is no longer used internally
  * @param config The relevant provider config
  */
 export function getGitHubRequestOptions(
   config: GitHubIntegrationConfig,
+  credentials: GithubCredentials,
 ): RequestInit {
   const headers: HeadersInit = {};
 
-  if (chooseEndpoint(config) === 'api') {
+  if (chooseEndpoint(config, credentials) === 'api') {
     headers.Accept = 'application/vnd.github.v3.raw';
   }
-  if (config.token) {
-    headers.Authorization = `token ${config.token}`;
+
+  if (credentials.token) {
+    headers.Authorization = `token ${credentials.token}`;
   }
 
   return { headers };
 }
 
-export function chooseEndpoint(config: GitHubIntegrationConfig): 'api' | 'raw' {
-  if (config.apiBaseUrl && (config.token || !config.rawBaseUrl)) {
+export function chooseEndpoint(
+  config: GitHubIntegrationConfig,
+  credentials: GithubCredentials,
+): 'api' | 'raw' {
+  if (config.apiBaseUrl && (credentials.token || !config.rawBaseUrl)) {
     return 'api';
   }
   return 'raw';
diff --git a/packages/integration/src/github/index.ts b/packages/integration/src/github/index.ts
index 9247c4ff8e..80d9ce2f26 100644
--- a/packages/integration/src/github/index.ts
+++ b/packages/integration/src/github/index.ts
@@ -25,4 +25,7 @@ export {
   GithubCredentialsProvider,
 } from './GithubCredentialsProvider';
 export type { GithubCredentialType } from './GithubCredentialsProvider';
-export { GitHubIntegration } from './GitHubIntegration';
+export {
+  GitHubIntegration,
+  replaceUrlType as replaceGitHubUrlType,
+} from './GitHubIntegration';
diff --git a/packages/integration/src/gitlab/config.test.ts b/packages/integration/src/gitlab/config.test.ts
index 4c235ff668..1308704e9d 100644
--- a/packages/integration/src/gitlab/config.test.ts
+++ b/packages/integration/src/gitlab/config.test.ts
@@ -30,9 +30,18 @@ describe('readGitLabIntegrationConfig', () => {
   async function buildFrontendConfig(
     data: Partial<GitLabIntegrationConfig>,
   ): Promise<Config> {
-    const schema = await loadConfigSchema({
+    const fullSchema = await loadConfigSchema({
       dependencies: [require('../../package.json').name],
     });
+    const serializedSchema = fullSchema.serialize() as {
+      schemas: { path: string }[];
+    };
+    const schema = await loadConfigSchema({
+      serialized: {
+        ...serializedSchema, // grab the schema from this package only
+        schemas: serializedSchema.schemas.filter(s => s.path === 'config.d.ts'),
+      },
+    });
     const processed = schema.process(
       [{ data: { integrations: { gitlab: [data] } }, context: 'app' }],
       { visibility: ['frontend'] },
diff --git a/packages/integration/src/gitlab/core.test.ts b/packages/integration/src/gitlab/core.test.ts
index 574403d70b..f07d65e02a 100644
--- a/packages/integration/src/gitlab/core.test.ts
+++ b/packages/integration/src/gitlab/core.test.ts
@@ -52,37 +52,32 @@ describe('gitlab core', () => {
       // Project URLs
       {
         config: configWithNoToken,
-        url:
-          'https://gitlab.com/groupA/teams/teamA/subgroupA/repoA/-/blob/branch/my/path/to/file.yaml',
+        url: 'https://gitlab.com/groupA/teams/teamA/subgroupA/repoA/-/blob/branch/my/path/to/file.yaml',
         result:
           'https://gitlab.com/api/v4/projects/12345/repository/files/my%2Fpath%2Fto%2Ffile.yaml/raw?ref=branch',
       },
       {
         config: configWithNoToken,
         // Works with non URI encoded link
-        url:
-          'https://gitlab.com/groupA/teams/teamA/subgroupA/repoA/-/blob/branch/my/path/to/file with spaces.yaml',
+        url: 'https://gitlab.com/groupA/teams/teamA/subgroupA/repoA/-/blob/branch/my/path/to/file with spaces.yaml',
         result:
           'https://gitlab.com/api/v4/projects/12345/repository/files/my%2Fpath%2Fto%2Ffile%20with%20spaces.yaml/raw?ref=branch',
       },
       {
         config: configWithNoToken,
-        url:
-          'https://gitlab.com/groupA/teams/teamA/subgroupA/repoA/-/blob/branch/my/path%20with%20spaces/to/file.yaml',
+        url: 'https://gitlab.com/groupA/teams/teamA/subgroupA/repoA/-/blob/branch/my/path%20with%20spaces/to/file.yaml',
         result:
           'https://gitlab.com/api/v4/projects/12345/repository/files/my%2Fpath%20with%20spaces%2Fto%2Ffile.yaml/raw?ref=branch',
       },
       {
         config: configWithToken,
-        url:
-          'https://gitlab.example.com/groupA/teams/teamA/subgroupA/repoA/-/blob/branch/my/path%20with%20spaces/to/file.yaml',
+        url: 'https://gitlab.example.com/groupA/teams/teamA/subgroupA/repoA/-/blob/branch/my/path%20with%20spaces/to/file.yaml',
         result:
           'https://gitlab.example.com/api/v4/projects/12345/repository/files/my%2Fpath%20with%20spaces%2Fto%2Ffile.yaml/raw?ref=branch',
       },
       {
         config: configWithNoToken,
-        url:
-          'https://gitlab.com/groupA/teams/teamA/repoA/-/blob/branch/my/path%20with%20spaces/to/file.yaml', // Repo not in subgroup
+        url: 'https://gitlab.com/groupA/teams/teamA/repoA/-/blob/branch/my/path%20with%20spaces/to/file.yaml', // Repo not in subgroup
         result:
           'https://gitlab.com/api/v4/projects/12345/repository/files/my%2Fpath%20with%20spaces%2Fto%2Ffile.yaml/raw?ref=branch',
       },
diff --git a/packages/integration/src/gitlab/core.ts b/packages/integration/src/gitlab/core.ts
index 9b7b928059..83ab29c62e 100644
--- a/packages/integration/src/gitlab/core.ts
+++ b/packages/integration/src/gitlab/core.ts
@@ -68,13 +68,8 @@ export function buildRawUrl(target: string): URL {
   try {
     const url = new URL(target);
 
-    const [
-      empty,
-      userOrOrg,
-      repoName,
-      blobKeyword,
-      ...restOfPath
-    ] = url.pathname.split('/');
+    const [empty, userOrOrg, repoName, blobKeyword, ...restOfPath] =
+      url.pathname.split('/');
 
     if (
       empty !== '' ||
diff --git a/packages/integration/src/helpers.test.ts b/packages/integration/src/helpers.test.ts
index 90102ce6aa..a69c7faec9 100644
--- a/packages/integration/src/helpers.test.ts
+++ b/packages/integration/src/helpers.test.ts
@@ -14,7 +14,35 @@
  * limitations under the License.
  */
 
-import { defaultScmResolveUrl, isValidHost } from './helpers';
+import { BitbucketIntegration } from './bitbucket';
+import {
+  basicIntegrations,
+  defaultScmResolveUrl,
+  isValidHost,
+} from './helpers';
+
+describe('basicIntegrations', () => {
+  describe('byUrl', () => {
+    it('handles hosts without a port', () => {
+      const integration = new BitbucketIntegration({ host: 'host.com' });
+      const integrations = basicIntegrations<BitbucketIntegration>(
+        [integration],
+        i => i.config.host,
+      );
+      expect(integrations.byUrl('https://host.com/a')).toBe(integration);
+      expect(integrations.byUrl('https://host.com:8080/a')).toBeUndefined();
+    });
+    it('handles hosts with a port', () => {
+      const integration = new BitbucketIntegration({ host: 'host.com:8080' });
+      const integrations = basicIntegrations<BitbucketIntegration>(
+        [integration],
+        i => i.config.host,
+      );
+      expect(integrations.byUrl('https://host.com:8080/a')).toBe(integration);
+      expect(integrations.byUrl('https://host.com/a')).toBeUndefined();
+    });
+  });
+});
 
 describe('isValidHost', () => {
   it.each([
@@ -57,8 +85,7 @@ describe('defaultScmResolveUrl', () => {
     expect(
       defaultScmResolveUrl({
         url: './b.yaml',
-        base:
-          'https://gitlab.com/groupA/teams/teamA/subgroupA/repoA/-/blob/branch/folder/a.yaml',
+        base: 'https://gitlab.com/groupA/teams/teamA/subgroupA/repoA/-/blob/branch/folder/a.yaml',
       }),
     ).toBe(
       'https://gitlab.com/groupA/teams/teamA/subgroupA/repoA/-/blob/branch/folder/b.yaml',
@@ -67,8 +94,7 @@ describe('defaultScmResolveUrl', () => {
     expect(
       defaultScmResolveUrl({
         url: './b.yaml',
-        base:
-          'https://gitlab.com/groupA/teams/teamA/subgroupA/repoA/-/blob/branch/folder/a.yaml?at=master',
+        base: 'https://gitlab.com/groupA/teams/teamA/subgroupA/repoA/-/blob/branch/folder/a.yaml?at=master',
       }),
     ).toBe(
       'https://gitlab.com/groupA/teams/teamA/subgroupA/repoA/-/blob/branch/folder/b.yaml?at=master',
@@ -77,8 +103,7 @@ describe('defaultScmResolveUrl', () => {
     expect(
       defaultScmResolveUrl({
         url: 'b.yaml',
-        base:
-          'https://gitlab.com/groupA/teams/teamA/subgroupA/repoA/-/blob/branch/folder/a.yaml',
+        base: 'https://gitlab.com/groupA/teams/teamA/subgroupA/repoA/-/blob/branch/folder/a.yaml',
       }),
     ).toBe(
       'https://gitlab.com/groupA/teams/teamA/subgroupA/repoA/-/blob/branch/folder/b.yaml',
@@ -89,8 +114,7 @@ describe('defaultScmResolveUrl', () => {
     expect(
       defaultScmResolveUrl({
         url: '/other/b.yaml',
-        base:
-          'https://gitlab.com/groupA/teams/teamA/subgroupA/repoA/-/blob/branch/folder/a.yaml',
+        base: 'https://gitlab.com/groupA/teams/teamA/subgroupA/repoA/-/blob/branch/folder/a.yaml',
       }),
     ).toBe(
       'https://gitlab.com/groupA/teams/teamA/subgroupA/repoA/-/blob/branch/other/b.yaml',
@@ -99,8 +123,7 @@ describe('defaultScmResolveUrl', () => {
     expect(
       defaultScmResolveUrl({
         url: '/other/b.yaml',
-        base:
-          'https://gitlab.com/groupA/teams/teamA/subgroupA/repoA/-/blob/branch/folder/a.yaml?at=master',
+        base: 'https://gitlab.com/groupA/teams/teamA/subgroupA/repoA/-/blob/branch/folder/a.yaml?at=master',
       }),
     ).toBe(
       'https://gitlab.com/groupA/teams/teamA/subgroupA/repoA/-/blob/branch/other/b.yaml?at=master',
@@ -111,8 +134,7 @@ describe('defaultScmResolveUrl', () => {
     expect(
       defaultScmResolveUrl({
         url: './b.yaml',
-        base:
-          'https://gitlab.com/groupA/teams/teamA/subgroupA/repoA/-/blob/branch/folder/a.yaml?at=master',
+        base: 'https://gitlab.com/groupA/teams/teamA/subgroupA/repoA/-/blob/branch/folder/a.yaml?at=master',
         lineNumber: 11,
       }),
     ).toBe(
@@ -122,8 +144,7 @@ describe('defaultScmResolveUrl', () => {
     expect(
       defaultScmResolveUrl({
         url: 'b.yaml',
-        base:
-          'https://gitlab.com/groupA/teams/teamA/subgroupA/repoA/-/blob/branch/folder/a.yaml',
+        base: 'https://gitlab.com/groupA/teams/teamA/subgroupA/repoA/-/blob/branch/folder/a.yaml',
         lineNumber: 12,
       }),
     ).toBe(
@@ -133,8 +154,7 @@ describe('defaultScmResolveUrl', () => {
     expect(
       defaultScmResolveUrl({
         url: '/other/b.yaml',
-        base:
-          'https://gitlab.com/groupA/teams/teamA/subgroupA/repoA/-/blob/branch/folder/a.yaml',
+        base: 'https://gitlab.com/groupA/teams/teamA/subgroupA/repoA/-/blob/branch/folder/a.yaml',
         lineNumber: 13,
       }),
     ).toBe(
@@ -144,8 +164,7 @@ describe('defaultScmResolveUrl', () => {
     expect(
       defaultScmResolveUrl({
         url: '/other/b.yaml',
-        base:
-          'https://gitlab.com/groupA/teams/teamA/subgroupA/repoA/-/blob/branch/folder/a.yaml?at=master',
+        base: 'https://gitlab.com/groupA/teams/teamA/subgroupA/repoA/-/blob/branch/folder/a.yaml?at=master',
         lineNumber: 14,
       }),
     ).toBe(
@@ -157,8 +176,7 @@ describe('defaultScmResolveUrl', () => {
     expect(
       defaultScmResolveUrl({
         url: 'https://b.com/b.yaml',
-        base:
-          'https://gitlab.com/groupA/teams/teamA/subgroupA/repoA/-/blob/branch/folder/a.yaml?at=master',
+        base: 'https://gitlab.com/groupA/teams/teamA/subgroupA/repoA/-/blob/branch/folder/a.yaml?at=master',
       }),
     ).toBe('https://b.com/b.yaml');
   });
diff --git a/packages/integration/src/helpers.ts b/packages/integration/src/helpers.ts
index b1e74035f1..dc1ce1a502 100644
--- a/packages/integration/src/helpers.ts
+++ b/packages/integration/src/helpers.ts
@@ -46,7 +46,7 @@ export function basicIntegrations<T extends ScmIntegration>(
     byUrl(url: string | URL): T | undefined {
       try {
         const parsed = typeof url === 'string' ? new URL(url) : url;
-        return integrations.find(i => getHost(i) === parsed.hostname);
+        return integrations.find(i => getHost(i) === parsed.host);
       } catch {
         return undefined;
       }
diff --git a/packages/integration/src/index.ts b/packages/integration/src/index.ts
index bf88cf9751..9bbbab9fce 100644
--- a/packages/integration/src/index.ts
+++ b/packages/integration/src/index.ts
@@ -19,6 +19,7 @@ export * from './bitbucket';
 export * from './github';
 export * from './gitlab';
 export * from './googleGcs';
+export * from './awsS3';
 export { defaultScmResolveUrl } from './helpers';
 export { ScmIntegrations } from './ScmIntegrations';
 export type { ScmIntegration, ScmIntegrationsGroup } from './types';
diff --git a/packages/integration/src/registry.ts b/packages/integration/src/registry.ts
index da205ae1e7..21ca472ccb 100644
--- a/packages/integration/src/registry.ts
+++ b/packages/integration/src/registry.ts
@@ -15,6 +15,7 @@
  */
 
 import { ScmIntegration, ScmIntegrationsGroup } from './types';
+import { AwsS3Integration } from './awsS3/AwsS3Integration';
 import { AzureIntegration } from './azure/AzureIntegration';
 import { BitbucketIntegration } from './bitbucket/BitbucketIntegration';
 import { GitHubIntegration } from './github/GitHubIntegration';
@@ -25,6 +26,7 @@ import { GitLabIntegration } from './gitlab/GitLabIntegration';
  */
 export interface ScmIntegrationRegistry
   extends ScmIntegrationsGroup<ScmIntegration> {
+  awsS3: ScmIntegrationsGroup<AwsS3Integration>;
   azure: ScmIntegrationsGroup<AzureIntegration>;
   bitbucket: ScmIntegrationsGroup<BitbucketIntegration>;
   github: ScmIntegrationsGroup<GitHubIntegration>;
diff --git a/packages/search-common/CHANGELOG.md b/packages/search-common/CHANGELOG.md
index f4c0e4e6f1..34f956586e 100644
--- a/packages/search-common/CHANGELOG.md
+++ b/packages/search-common/CHANGELOG.md
@@ -1,5 +1,88 @@
 # @backstage/search-common
 
+## 0.2.0
+
+### Minor Changes
+
+- a13f21cdc: Implement optional `pageCursor` based paging in search.
+
+  To use paging in your app, add a `<SearchResultPager />` to your
+  `SearchPage.tsx`.
+
+## 0.1.3
+
+### Patch Changes
+
+- d9c13d535: Implements configuration and indexing functionality for ElasticSearch search engine. Adds indexing, searching and default translator for ElasticSearch and modifies default backend example-app to use ES if it is configured.
+
+  ## Example configurations:
+
+  ### AWS
+
+  Using AWS hosted ElasticSearch the only configuration options needed is the URL to the ElasticSearch service. The implementation assumes
+  that environment variables for AWS access key id and secret access key are defined in accordance to the [default AWS credential chain.](https://docs.aws.amazon.com/sdk-for-javascript/v2/developer-guide/setting-credentials-node.html).
+
+  ```yaml
+  search:
+    elasticsearch:
+      provider: aws
+      node: https://my-backstage-search-asdfqwerty.eu-west-1.es.amazonaws.com
+  ```
+
+  ### Elastic.co
+
+  Elastic Cloud hosted ElasticSearch uses a Cloud ID to determine the instance of hosted ElasticSearch to connect to. Additionally, username and password needs to be provided either directly or using environment variables like defined in [Backstage documentation.](https://backstage.io/docs/conf/writing#includes-and-dynamic-data)
+
+  ```yaml
+  search:
+    elasticsearch:
+      provider: elastic
+      cloudId: backstage-elastic:asdfqwertyasdfqwertyasdfqwertyasdfqwerty==
+      auth:
+        username: elastic
+        password: changeme
+  ```
+
+  ### Others
+
+  Other ElasticSearch instances can be connected to by using standard ElasticSearch authentication methods and exposed URL, provided that the cluster supports that. The configuration options needed are the URL to the node and authentication information. Authentication can be handled by either providing username/password or and API key or a bearer token. In case both username/password combination and one of the tokens are provided, token takes precedence. For more information how to create an API key, see [Elastic documentation on API keys](https://www.elastic.co/guide/en/elasticsearch/reference/current/security-api-create-api-key.html) and how to create a bearer token, see [Elastic documentation on tokens.](https://www.elastic.co/guide/en/elasticsearch/reference/current/security-api-create-service-token.html)
+
+  #### Configuration examples
+
+  ##### With username and password
+
+  ```yaml
+  search:
+    elasticsearch:
+      node: http://localhost:9200
+      auth:
+        username: elastic
+        password: changeme
+  ```
+
+  ##### With bearer token
+
+  ```yaml
+  search:
+    elasticsearch:
+      node: http://localhost:9200
+      auth:
+        bearer: token
+  ```
+
+  ##### With API key
+
+  ```yaml
+  search:
+    elasticsearch:
+      node: http://localhost:9200
+      auth:
+        apiKey: base64EncodedKey
+  ```
+
+- Updated dependencies
+  - @backstage/config@0.1.6
+
 ## 0.1.2
 
 ### Patch Changes
diff --git a/packages/search-common/api-report.md b/packages/search-common/api-report.md
index 0ba995f673..f00beb6830 100644
--- a/packages/search-common/api-report.md
+++ b/packages/search-common/api-report.md
@@ -5,6 +5,8 @@
 ```ts
 import { JsonObject } from '@backstage/config';
 
+// Warning: (ae-missing-release-tag) "DocumentCollator" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public
 export interface DocumentCollator {
   // (undocumented)
@@ -12,6 +14,8 @@ export interface DocumentCollator {
   readonly type: string;
 }
 
+// Warning: (ae-missing-release-tag) "DocumentDecorator" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public
 export interface DocumentDecorator {
   // (undocumented)
@@ -19,6 +23,8 @@ export interface DocumentDecorator {
   readonly types?: string[];
 }
 
+// Warning: (ae-missing-release-tag) "IndexableDocument" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public
 export interface IndexableDocument {
   location: string;
@@ -26,18 +32,36 @@ export interface IndexableDocument {
   title: string;
 }
 
+// Warning: (ae-missing-release-tag) "QueryTranslator" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
+// @public
+export type QueryTranslator = (query: SearchQuery) => unknown;
+
+// Warning: (ae-missing-release-tag) "SearchEngine" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
+// @public
+export interface SearchEngine {
+  index(type: string, documents: IndexableDocument[]): Promise<void>;
+  query(query: SearchQuery): Promise<SearchResultSet>;
+  setTranslator(translator: QueryTranslator): void;
+}
+
+// Warning: (ae-missing-release-tag) "SearchQuery" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export interface SearchQuery {
   // (undocumented)
   filters?: JsonObject;
   // (undocumented)
-  pageCursor: string;
+  pageCursor?: string;
   // (undocumented)
   term: string;
   // (undocumented)
   types?: string[];
 }
 
+// Warning: (ae-missing-release-tag) "SearchResult" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export interface SearchResult {
   // (undocumented)
@@ -46,8 +70,14 @@ export interface SearchResult {
   type: string;
 }
 
+// Warning: (ae-missing-release-tag) "SearchResultSet" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export interface SearchResultSet {
+  // (undocumented)
+  nextPageCursor?: string;
+  // (undocumented)
+  previousPageCursor?: string;
   // (undocumented)
   results: SearchResult[];
 }
diff --git a/packages/search-common/package.json b/packages/search-common/package.json
index 5415adbf0d..be1aad16b0 100644
--- a/packages/search-common/package.json
+++ b/packages/search-common/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@backstage/search-common",
   "description": "Common functionalities for Search, to be shared between various search-enabled plugins",
-  "version": "0.1.2",
+  "version": "0.2.0",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "private": false,
@@ -36,10 +36,10 @@
     "url": "https://github.com/backstage/backstage/issues"
   },
   "dependencies": {
-    "@backstage/config": "^0.1.3"
+    "@backstage/config": "^0.1.6"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.7.0"
+    "@backstage/cli": "^0.7.10"
   },
   "jest": {
     "roots": [
diff --git a/packages/search-common/src/types.ts b/packages/search-common/src/types.ts
index 8a5e16b6b5..063e0cb96c 100644
--- a/packages/search-common/src/types.ts
+++ b/packages/search-common/src/types.ts
@@ -19,7 +19,7 @@ export interface SearchQuery {
   term: string;
   filters?: JsonObject;
   types?: string[];
-  pageCursor: string;
+  pageCursor?: string;
 }
 
 export interface SearchResult {
@@ -29,6 +29,8 @@ export interface SearchResult {
 
 export interface SearchResultSet {
   results: SearchResult[];
+  nextPageCursor?: string;
+  previousPageCursor?: string;
 }
 
 /**
@@ -79,3 +81,31 @@ export interface DocumentDecorator {
   readonly types?: string[];
   execute(documents: IndexableDocument[]): Promise<IndexableDocument[]>;
 }
+
+/**
+ * A type of function responsible for translating an abstract search query into
+ * a concrete query relevant to a particular search engine.
+ */
+export type QueryTranslator = (query: SearchQuery) => unknown;
+
+/**
+ * Interface that must be implemented by specific search engines, responsible
+ * for performing indexing and querying and translating abstract queries into
+ * concrete, search engine-specific queries.
+ */
+export interface SearchEngine {
+  /**
+   * Override the default translator provided by the SearchEngine.
+   */
+  setTranslator(translator: QueryTranslator): void;
+
+  /**
+   * Add the given documents to the SearchEngine index of the given type.
+   */
+  index(type: string, documents: IndexableDocument[]): Promise<void>;
+
+  /**
+   * Perform a search query against the SearchEngine.
+   */
+  query(query: SearchQuery): Promise<SearchResultSet>;
+}
diff --git a/packages/storybook/.storybook/main.js b/packages/storybook/.storybook/main.js
index 3fdf741cb4..4afcac335c 100644
--- a/packages/storybook/.storybook/main.js
+++ b/packages/storybook/.storybook/main.js
@@ -7,6 +7,7 @@ module.exports = {
     '../../../plugins/**/src/**/*.stories.tsx',
   ],
   addons: [
+    '@storybook/addon-a11y',
     '@storybook/addon-actions',
     '@storybook/addon-links',
     '@storybook/addon-storysource',
diff --git a/packages/storybook/package.json b/packages/storybook/package.json
index 025e5d2f1f..736afbb8d8 100644
--- a/packages/storybook/package.json
+++ b/packages/storybook/package.json
@@ -7,23 +7,18 @@
     "start": "start-storybook -p 6006",
     "build-storybook": "build-storybook --output-dir dist"
   },
-  "workspaces": {
-    "nohoist": [
-      "@storybook/react/**",
-      "@storybook/addons/**"
-    ]
-  },
   "dependencies": {
     "@backstage/theme": "^0.2.0",
     "react": "^16.12.0",
     "react-dom": "^16.12.0"
   },
   "devDependencies": {
+    "@storybook/addon-a11y": "^6.3.4",
     "@storybook/addon-actions": "^6.1.11",
     "@storybook/addon-links": "^6.1.11",
     "@storybook/addon-storysource": "^6.1.11",
     "@storybook/addons": "^6.1.11",
-    "@storybook/react": "^6.1.11",
+    "@storybook/react": "^6.3.6",
     "storybook-dark-mode": "^1.0.3"
   }
 }
diff --git a/packages/techdocs-common/CHANGELOG.md b/packages/techdocs-common/CHANGELOG.md
index 02edf9c95f..360bebded0 100644
--- a/packages/techdocs-common/CHANGELOG.md
+++ b/packages/techdocs-common/CHANGELOG.md
@@ -1,5 +1,306 @@
 # @backstage/techdocs-common
 
+## 0.10.0
+
+### Minor Changes
+
+- 8b0f6f860: Set the correct `edit_uri` or `repo_url` for documentation pages that are hosted on GitHub and GitLab.
+
+  The constructor of the `TechDocsGenerator` changed.
+  Prefer the use of `TechdocsGenerator.fromConfig(…)` instead:
+
+  ```diff
+  - const techdocsGenerator = new TechdocsGenerator({
+  + const techdocsGenerator = TechdocsGenerator.fromConfig(config, {
+      logger,
+      containerRunner,
+  -   config,
+    });
+  ```
+
+### Patch Changes
+
+- 30ed662a3: Adding in-context search to TechDocs Reader component. Using existing search-backend to query for indexed search results scoped into a specific entity's techdocs. Needs TechDocsCollator enabled on the backend to work.
+
+  Adding extra information to indexed tech docs documents for search.
+
+- 3624616e7: "Local" (out-of-the-box) publisher explicitly follows lower-case entity triplet
+  logic.
+- 67ba7e088: Only write the updated `mkdocs.yml` file if the content was updated.
+
+  This keeps local files unchanged if the `dir` annotation is used in combination with the `file` location.
+
+- 8eab6be6a: Force using `posix` path for cloud storage
+- Updated dependencies
+  - @backstage/integration@0.6.3
+  - @backstage/search-common@0.2.0
+  - @backstage/catalog-model@0.9.1
+  - @backstage/backend-common@0.9.1
+
+## 0.9.0
+
+### Minor Changes
+
+- 58452cdb7: OpenStack Swift Client changed with Trendyol's OpenStack Swift SDK.
+
+  ## Migration from old OpenStack Swift Configuration
+
+  Let's assume we have the old OpenStack Swift configuration here.
+
+  ```yaml
+  techdocs:
+    publisher:
+      type: 'openStackSwift'
+      openStackSwift:
+        containerName: 'name-of-techdocs-storage-bucket'
+        credentials:
+          username: ${OPENSTACK_SWIFT_STORAGE_USERNAME}
+          password: ${OPENSTACK_SWIFT_STORAGE_PASSWORD}
+        authUrl: ${OPENSTACK_SWIFT_STORAGE_AUTH_URL}
+        keystoneAuthVersion: ${OPENSTACK_SWIFT_STORAGE_AUTH_VERSION}
+        domainId: ${OPENSTACK_SWIFT_STORAGE_DOMAIN_ID}
+        domainName: ${OPENSTACK_SWIFT_STORAGE_DOMAIN_NAME}
+        region: ${OPENSTACK_SWIFT_STORAGE_REGION}
+  ```
+
+  ##### Step 1: Change the credential keys
+
+  Since the new SDK uses _Application Credentials_ to authenticate OpenStack, we
+  need to change the keys `credentials.username` to `credentials.id`,
+  `credentials.password` to `credentials.secret` and use Application Credential ID
+  and secret here. For more detail about credentials look
+  [here](https://docs.openstack.org/api-ref/identity/v3/?expanded=password-authentication-with-unscoped-authorization-detail,authenticating-with-an-application-credential-detail#authenticating-with-an-application-credential).
+
+  ##### Step 2: Remove the unused keys
+
+  Since the new SDK doesn't use the old way authentication, we don't need the keys
+  `openStackSwift.keystoneAuthVersion`, `openStackSwift.domainId`,
+  `openStackSwift.domainName` and `openStackSwift.region`. So you can remove them.
+
+  ##### Step 3: Add Swift URL
+
+  The new SDK needs the OpenStack Swift connection URL for connecting the Swift.
+  So you need to add a new key called `openStackSwift.swiftUrl` and give the
+  OpenStack Swift url here. Example url should look like that:
+  `https://example.com:6780/swift/v1`
+
+  ##### That's it!
+
+  Your new configuration should look like that!
+
+  ```yaml
+  techdocs:
+    publisher:
+      type: 'openStackSwift'
+      openStackSwift:
+        containerName: 'name-of-techdocs-storage-bucket'
+        credentials:
+          id: ${OPENSTACK_SWIFT_STORAGE_APPLICATION_CREDENTIALS_ID}
+          secret: ${OPENSTACK_SWIFT_STORAGE_APPLICATION_CREDENTIALS_SECRET}
+        authUrl: ${OPENSTACK_SWIFT_STORAGE_AUTH_URL}
+        swiftUrl: ${OPENSTACK_SWIFT_STORAGE_SWIFT_URL}
+  ```
+
+- c772d9a84: TechDocs sites can now be accessed using paths containing entity triplets of
+  any case (e.g. `/docs/namespace/KIND/name` or `/docs/namespace/kind/name`).
+
+  If you do not use an external storage provider for serving TechDocs, this is a
+  transparent change and no action is required from you.
+
+  If you _do_ use an external storage provider for serving TechDocs (one of\* GCS,
+  AWS S3, or Azure Blob Storage), you must run a migration command against your
+  storage provider before updating.
+
+  [A migration guide is available here](https://backstage.io/docs/features/techdocs/how-to-guides#how-to-migrate-from-techdocs-alpha-to-beta).
+
+  - (\*) We're seeking help from the community to bring OpenStack Swift support
+    [to feature parity](https://github.com/backstage/backstage/issues/6763) with the above.
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.9.0
+  - @backstage/integration@0.6.2
+  - @backstage/config@0.1.8
+
+## 0.8.1
+
+### Patch Changes
+
+- bc405be6e: Stale TechDocs content (files that had previously been published but which have
+  since been removed) is now removed from storage at publish-time. This is now
+  supported by the following publishers:
+
+  - Google GCS
+  - AWS S3
+  - Azure Blob Storage
+
+  You may need to apply a greater level of permissions (e.g. the ability to
+  delete objects in your storage provider) to any credentials/accounts used by
+  the TechDocs CLI or TechDocs backend in order for this change to take effect.
+
+  For more details, see [#6132][issue-ref].
+
+  [issue-ref]: https://github.com/backstage/backstage/issues/6132
+
+- Updated dependencies
+  - @backstage/integration@0.6.0
+  - @backstage/backend-common@0.8.9
+
+## 0.8.0
+
+### Minor Changes
+
+- 48ea3d25b: TechDocs has dropped all support for the long-ago deprecated git-based common
+  prepares as well as all corresponding values in `backstage.io/techdocs-ref`
+  annotations.
+
+  Entities whose `backstage.io/techdocs-ref` annotation values still begin with
+  `github:`, `gitlab:`, `bitbucket:`, or `azure/api:` will no longer be generated
+  by TechDocs. Be sure to update these values so that they align with their
+  expected format and your usage of TechDocs.
+
+  For details, see [this explainer on TechDocs ref annotation values][how].
+
+  [how]: https://backstage.io/docs/features/techdocs/how-to-guides#how-to-understand-techdocs-ref-annotation-values
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.8.8
+  - @backstage/config@0.1.6
+  - @backstage/integration@0.5.9
+
+## 0.7.1
+
+### Patch Changes
+
+- 59a5fa319: Migrated files are now printed when `techdocs-cli migrate` is run with the
+  `--verbose` flag set.
+- 54356336e: TechDocs generator stage now supports `mkdocs.yaml` file, in addition to `.yml`
+  depending on whichever is present at the time of generation. (Assumes the
+  latest `spotify/techdocs` container, running mkdocs `v1.2.2` or greater).
+
+## 0.7.0
+
+### Minor Changes
+
+- d32d01e5b: Improve the annotation `backstage.io/techdocs-ref: dir:<relative-target>` that links to a path that is relative to the source of the annotated entity.
+  This annotation works with the basic and the recommended flow, however, it will be most useful with the basic approach.
+
+  This change remove the deprecation of the `dir` reference and provides first-class support for it.
+  In addition, this change removes the support of the deprecated `github`, `gitlab`, and `azure/api` locations from the `dir` reference preparer.
+
+  #### Example Usage
+
+  The annotation is convenient if the documentation is stored in the same location, i.e. the same git repository, as the `catalog-info.yaml`.
+  While it is still supported to add full URLs such as `backstage.io/techdocs-ref: url:https://...` for custom setups, documentation is mostly stored in the same repository as the entity definition.
+  By automatically resolving the target relative to the registration location of the entity, the configuration overhead for this default setup is minimized.
+  Since it leverages the `@backstage/integrations` package for the URL resolution, this is compatible with every supported source.
+
+  Consider the following examples:
+
+  1. "I have a repository with a single `catalog-info.yaml` and a TechDocs page in the root folder!"
+
+  ```
+  https://github.com/backstage/example/tree/main/
+   |- catalog-info.yaml
+   |  > apiVersion: backstage.io/v1alpha1
+   |  > kind: Component
+   |  > metadata:
+   |  >   name: example
+   |  >   annotations:
+   |  >     backstage.io/techdocs-ref: dir:. # -> same folder
+   |  > spec: {}
+   |- docs/
+   |- mkdocs.yml
+  ```
+
+  2. "I have a repository with a single `catalog-info.yaml` and my TechDocs page in located in a folder!"
+
+  ```
+  https://bitbucket.org/my-owner/my-project/src/master/
+   |- catalog-info.yaml
+   |  > apiVersion: backstage.io/v1alpha1
+   |  > kind: Component
+   |  > metadata:
+   |  >   name: example
+   |  >   annotations:
+   |  >     backstage.io/techdocs-ref: dir:./some-folder # -> subfolder
+   |  > spec: {}
+   |- some-folder/
+     |- docs/
+     |- mkdocs.yml
+  ```
+
+  3. "I have a mono repository that hosts multiple components!"
+
+  ```
+  https://dev.azure.com/organization/project/_git/repository
+   |- my-1st-module/
+     |- catalog-info.yaml
+     |  > apiVersion: backstage.io/v1alpha1
+     |  > kind: Component
+     |  > metadata:
+     |  >   name: my-1st-module
+     |  >   annotations:
+     |  >     backstage.io/techdocs-ref: dir:. # -> same folder
+     |  > spec: {}
+     |- docs/
+     |- mkdocs.yml
+   |- my-2nd-module/
+     |- catalog-info.yaml
+     |  > apiVersion: backstage.io/v1alpha1
+     |  > kind: Component
+     |  > metadata:
+     |  >   name: my-2nd-module
+     |  >   annotations:
+     |  >     backstage.io/techdocs-ref: dir:. # -> same folder
+     |  > spec: {}
+     |- docs/
+     |- mkdocs.yml
+   |- catalog-info.yaml
+   |  > apiVersion: backstage.io/v1alpha1
+   |  > kind: Location
+   |  > metadata:
+   |  >   name: example
+   |  > spec:
+   |  >   targets:
+   |  >     - ./*/catalog-info.yaml
+  ```
+
+### Patch Changes
+
+- 6e5aed1c9: Fix validation of mkdocs.yml docs_dir
+- 250984333: Add link to https://backstage.io/docs/features/techdocs/configuration in the log warning message about updating techdocs.generate key.
+- Updated dependencies
+  - @backstage/backend-common@0.8.7
+
+## 0.6.8
+
+### Patch Changes
+
+- d5eaab91d: Adds custom docker image support to the techdocs generator. This change adds a new `techdocs.generator` configuration key and deprecates the existing `techdocs.generators.techdocs` key.
+
+  ```yaml
+  techdocs:
+    # recommended, going forward:
+    generator:
+      runIn: 'docker' # or 'local'
+      # New optional settings
+      dockerImage: my-org/techdocs # use a custom docker image
+      pullImage: false # disable automatic pulling of image (e.g. if custom docker login is required)
+    # legacy (deprecated):
+    generators:
+      techdocs: 'docker' # or 'local'
+  ```
+
+- c18e8eb91: Provide optional `logger: Logger` and `logStream: Writable` arguments to the `GeneratorBase#run(...)` command.
+  They receive all log messages that are emitted during the generator run.
+- ae84b20cf: Revert the upgrade to `fs-extra@10.0.0` as that seemed to have broken all installs inexplicably.
+- Updated dependencies
+  - @backstage/backend-common@0.8.6
+
 ## 0.6.7
 
 ### Patch Changes
diff --git a/packages/techdocs-common/__mocks__/@azure/storage-blob.ts b/packages/techdocs-common/__mocks__/@azure/storage-blob.ts
index 73c5873832..3af2dc4a30 100644
--- a/packages/techdocs-common/__mocks__/@azure/storage-blob.ts
+++ b/packages/techdocs-common/__mocks__/@azure/storage-blob.ts
@@ -13,34 +13,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import type {
+import {
   BlobUploadCommonResponse,
   ContainerGetPropertiesResponse,
 } from '@azure/storage-blob';
 import { EventEmitter } from 'events';
-import fs from 'fs-extra';
-import os from 'os';
-import path from 'path';
 
-const rootDir = os.platform() === 'win32' ? 'C:\\rootDir' : '/rootDir';
-
-/**
- * @param sourceFile Relative path to entity root dir. Contains either / or \ as file separator
- * depending upon the OS.
- */
-const checkFileExists = async (sourceFile: string): Promise<boolean> => {
-  // sourceFile will always have / as file separator irrespective of OS since Azure expects /.
-  // Normalize sourceFile to OS specific path before checking if file exists.
-  const relativeFilePath = sourceFile.split(path.posix.sep).join(path.sep);
-  const filePath = path.join(rootDir, sourceFile);
-
-  try {
-    await fs.access(filePath, fs.constants.F_OK);
-    return true;
-  } catch (err) {
-    return false;
-  }
-};
+const storage = global.storageFilesMock;
 
 export class BlockBlobClient {
   private readonly blobName;
@@ -50,9 +29,7 @@ export class BlockBlobClient {
   }
 
   uploadFile(source: string): Promise<BlobUploadCommonResponse> {
-    if (!fs.existsSync(source)) {
-      return Promise.reject(new Error(`The file ${source} does not exist`));
-    }
+    storage.writeFile(this.blobName, source);
     return Promise.resolve({
       _response: {
         request: {
@@ -65,20 +42,19 @@ export class BlockBlobClient {
   }
 
   exists() {
-    return checkFileExists(this.blobName);
+    return storage.fileExists(this.blobName);
   }
 
   download() {
-    const filePath = path.join(rootDir, this.blobName);
     const emitter = new EventEmitter();
     setTimeout(() => {
-      if (fs.existsSync(filePath)) {
-        emitter.emit('data', fs.readFileSync(filePath));
+      if (storage.fileExists(this.blobName)) {
+        emitter.emit('data', storage.readFile(this.blobName));
         emitter.emit('end');
       } else {
         emitter.emit(
           'error',
-          new Error(`The file ${filePath} does not exist !`),
+          new Error(`The file ${this.blobName} does not exist!`),
         );
       }
     }, 0);
@@ -89,7 +65,7 @@ export class BlockBlobClient {
 }
 
 class BlockBlobClientFailUpload extends BlockBlobClient {
-  uploadFile(source: string): Promise<BlobUploadCommonResponse> {
+  uploadFile(): Promise<BlobUploadCommonResponse> {
     return Promise.resolve({
       _response: {
         request: {
@@ -102,13 +78,37 @@ class BlockBlobClientFailUpload extends BlockBlobClient {
   }
 }
 
-export class ContainerClient {
-  private readonly containerName;
+class ContainerClientIterator {
+  private containerName: string;
 
-  constructor(containerName: string) {
+  constructor(containerName) {
     this.containerName = containerName;
   }
 
+  async next() {
+    if (
+      this.containerName === 'delete_stale_files_success' ||
+      this.containerName === 'delete_stale_files_error'
+    ) {
+      return {
+        value: {
+          segment: {
+            blobItems: [{ name: `stale_file.png` }],
+          },
+        },
+      };
+    }
+    return {
+      value: {
+        segment: {
+          blobItems: [],
+        },
+      },
+    };
+  }
+}
+
+export class ContainerClient {
   getProperties(): Promise<ContainerGetPropertiesResponse> {
     return Promise.resolve({
       _response: {
@@ -125,6 +125,20 @@ export class ContainerClient {
   getBlockBlobClient(blobName: string) {
     return new BlockBlobClient(blobName);
   }
+
+  listBlobsFlat() {
+    return {
+      byPage: () => {
+        return new ContainerClientIterator(this.containerName);
+      },
+    };
+  }
+
+  deleteBlob() {
+    if (this.containerName === 'delete_stale_files_error') {
+      throw new Error('Message');
+    }
+  }
 }
 
 class ContainerClientFailGetProperties extends ContainerClient {
@@ -153,18 +167,19 @@ export class BlobServiceClient {
   private readonly credential;
 
   constructor(url: string, credential?: StorageSharedKeyCredential) {
+    storage.emptyFiles();
     this.url = url;
     this.credential = credential;
   }
 
   getContainerClient(containerName: string) {
     if (containerName === 'bad_container') {
-      return new ContainerClientFailGetProperties(containerName);
+      return new ContainerClientFailGetProperties();
     }
-    if (this.credential.accountName === 'failupload') {
-      return new ContainerClientFailUpload(containerName);
+    if (this.credential.accountName === 'bad_account_credentials') {
+      return new ContainerClientFailUpload();
     }
-    return new ContainerClient(containerName);
+    return new ContainerClient();
   }
 }
 
diff --git a/packages/techdocs-common/__mocks__/@google-cloud/storage.ts b/packages/techdocs-common/__mocks__/@google-cloud/storage.ts
index 18fe62af14..a48e8c1273 100644
--- a/packages/techdocs-common/__mocks__/@google-cloud/storage.ts
+++ b/packages/techdocs-common/__mocks__/@google-cloud/storage.ts
@@ -14,42 +14,19 @@
  * limitations under the License.
  */
 import { Readable } from 'stream';
-import fs from 'fs-extra';
-import os from 'os';
-import path from 'path';
 
-type storageOptions = {
-  keyFilename?: string;
-};
-
-const rootDir = os.platform() === 'win32' ? 'C:\\rootDir' : '/rootDir';
-/**
- * @param sourceFile Absolute path. Contains either / or \ as file separator depending upon the OS.
- */
-const checkFileExists = async (sourceFile: string): Promise<boolean> => {
-  // sourceFile will always have / as file separator irrespective of OS since GCS expects /.
-  // Normalize sourceFile to OS specific path before checking if file exists.
-  const filePath = sourceFile.split(path.posix.sep).join(path.sep);
-
-  try {
-    await fs.access(filePath, fs.constants.F_OK);
-    return true;
-  } catch (err) {
-    return false;
-  }
-};
+const storage = global.storageFilesMock;
 
 class GCSFile {
-  private readonly localFilePath: string;
+  private readonly path: string;
 
-  constructor(private readonly destinationFilePath: string) {
-    this.destinationFilePath = destinationFilePath;
-    this.localFilePath = path.join(rootDir, this.destinationFilePath);
+  constructor(path: string) {
+    this.path = path;
   }
 
   exists() {
     return new Promise(async (resolve, reject) => {
-      if (await checkFileExists(this.localFilePath)) {
+      if (storage.fileExists(this.path)) {
         resolve([true]);
       } else {
         reject();
@@ -62,21 +39,26 @@ class GCSFile {
     readable._read = () => {};
 
     process.nextTick(() => {
-      if (fs.existsSync(this.localFilePath)) {
+      if (storage.fileExists(this.path)) {
         if (readable.eventNames().includes('pipe')) {
           readable.emit('pipe');
         }
-        readable.emit('data', fs.readFileSync(this.localFilePath));
+        readable.emit('data', storage.readFile(this.path));
         readable.emit('end');
       } else {
         readable.emit(
           'error',
-          new Error(`The file ${this.localFilePath} does not exist !`),
+          new Error(`The file ${this.path} does not exist!`),
         );
       }
     });
+
     return readable;
   }
+
+  delete() {
+    return Promise.resolve();
+  }
 }
 
 class Bucket {
@@ -87,33 +69,47 @@ class Bucket {
   }
 
   async getMetadata() {
-    if (this.bucketName === 'errorBucket') {
+    if (this.bucketName === 'bad_bucket_name') {
       throw Error('Bucket does not exist');
     }
-
     return '';
   }
 
   upload(source: string, { destination }) {
-    return new Promise(async (resolve, reject) => {
-      if (await checkFileExists(source)) {
-        resolve({ source, destination });
-      } else {
-        reject(`Source file ${source} does not exist.`);
-      }
+    return new Promise(async resolve => {
+      storage.writeFile(destination, source);
+      resolve(null);
     });
   }
 
   file(destinationFilePath: string) {
+    if (this.bucketName === 'delete_stale_files_error') {
+      throw Error('Message');
+    }
     return new GCSFile(destinationFilePath);
   }
+
+  getFilesStream() {
+    const readable = new Readable();
+    readable._read = () => {};
+
+    process.nextTick(() => {
+      if (
+        this.bucketName === 'delete_stale_files_success' ||
+        this.bucketName === 'delete_stale_files_error'
+      ) {
+        readable.emit('data', { name: 'stale-file.png' });
+      }
+      readable.emit('end');
+    });
+
+    return readable;
+  }
 }
 
 export class Storage {
-  private readonly keyFilename;
-
-  constructor(options: storageOptions) {
-    this.keyFilename = options.keyFilename;
+  constructor() {
+    storage.emptyFiles();
   }
 
   bucket(bucketName) {
diff --git a/packages/techdocs-common/__mocks__/@trendyol-js/openstack-swift-sdk.ts b/packages/techdocs-common/__mocks__/@trendyol-js/openstack-swift-sdk.ts
new file mode 100644
index 0000000000..0f11950a66
--- /dev/null
+++ b/packages/techdocs-common/__mocks__/@trendyol-js/openstack-swift-sdk.ts
@@ -0,0 +1,103 @@
+/*
+ * Copyright 2020 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import fs from 'fs-extra';
+import os from 'os';
+import path from 'path';
+import {
+  ContainerMetaResponse,
+  DownloadResponse,
+  NotFound,
+  ObjectMetaResponse,
+  UploadResponse,
+} from '@trendyol-js/openstack-swift-sdk';
+import { Stream, Readable } from 'stream';
+
+const rootDir = os.platform() === 'win32' ? 'C:\\rootDir' : '/rootDir';
+
+const checkFileExists = async (Key: string): Promise<boolean> => {
+  // Key will always have / as file separator irrespective of OS since cloud providers expects /.
+  // Normalize Key to OS specific path before checking if file exists.
+  const filePath = path.join(rootDir, Key);
+
+  try {
+    await fs.access(filePath, fs.constants.F_OK);
+    return true;
+  } catch (err) {
+    return false;
+  }
+};
+
+const streamToBuffer = (stream: Stream | Readable): Promise<Buffer> => {
+  return new Promise((resolve, reject) => {
+    try {
+      const chunks: any[] = [];
+      stream.on('data', chunk => chunks.push(chunk));
+      stream.on('error', reject);
+      stream.on('end', () => resolve(Buffer.concat(chunks)));
+    } catch (e) {
+      throw new Error(`Unable to parse the response data ${e.message}`);
+    }
+  });
+};
+
+export class SwiftClient {
+  async getMetadata(_containerName: string, file: string) {
+    const fileExists = await checkFileExists(file);
+    if (fileExists) {
+      return new ObjectMetaResponse({
+        fullPath: file,
+      });
+    }
+    return new NotFound();
+  }
+
+  async getContainerMetadata(containerName: string) {
+    if (containerName === 'mock') {
+      return new ContainerMetaResponse({
+        size: 10,
+      });
+    }
+    return new NotFound();
+  }
+
+  async upload(_containerName: string, destination: string, stream: Readable) {
+    try {
+      const filePath = path.join(rootDir, destination);
+      const fileBuffer = await streamToBuffer(stream);
+
+      await fs.writeFile(filePath, fileBuffer);
+      const fileExists = await checkFileExists(destination);
+
+      if (fileExists) {
+        return new UploadResponse(filePath);
+      }
+      const errorMessage = `Unable to upload file(s) to OpenStack Swift.`;
+      throw new Error(errorMessage);
+    } catch (error) {
+      const errorMessage = `Unable to upload file(s) to OpenStack Swift. ${error}`;
+      throw new Error(errorMessage);
+    }
+  }
+
+  async download(_containerName: string, file: string) {
+    const filePath = path.join(rootDir, file);
+    const fileExists = await checkFileExists(file);
+    if (!fileExists) {
+      return new NotFound();
+    }
+    return new DownloadResponse([], fs.createReadStream(filePath));
+  }
+}
diff --git a/packages/techdocs-common/__mocks__/aws-sdk.ts b/packages/techdocs-common/__mocks__/aws-sdk.ts
index 2826a8d8bb..e4ae44c94e 100644
--- a/packages/techdocs-common/__mocks__/aws-sdk.ts
+++ b/packages/techdocs-common/__mocks__/aws-sdk.ts
@@ -13,45 +13,22 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import type { S3 as S3Types } from 'aws-sdk';
 import { EventEmitter } from 'events';
-import fs from 'fs-extra';
-import os from 'os';
-import path from 'path';
+import { ReadStream } from 'fs';
 
 export { Credentials } from 'aws-sdk';
 
-const rootDir = os.platform() === 'win32' ? 'C:\\rootDir' : '/rootDir';
-
-/**
- * @param Key Relative path to entity root dir. Contains either / or \ as file separator
- * depending upon the OS.
- */
-const checkFileExists = async (Key: string): Promise<boolean> => {
-  // Key will always have / as file separator irrespective of OS since S3 expects /.
-  // Normalize Key to OS specific path before checking if file exists.
-  const relativeFilePath = Key.split(path.posix.sep).join(path.sep);
-  const filePath = path.join(rootDir, Key);
-
-  try {
-    await fs.access(filePath, fs.constants.F_OK);
-    return true;
-  } catch (err) {
-    return false;
-  }
-};
+const storage = global.storageFilesMock;
 
 export class S3 {
-  private readonly options;
-
-  constructor(options: S3Types.ClientConfiguration) {
-    this.options = options;
+  constructor() {
+    storage.emptyFiles();
   }
 
   headObject({ Key }: { Key: string }) {
     return {
       promise: async () => {
-        if (!(await checkFileExists(Key))) {
+        if (!storage.fileExists(Key)) {
           throw new Error('File does not exist');
         }
       },
@@ -59,20 +36,16 @@ export class S3 {
   }
 
   getObject({ Key }: { Key: string }) {
-    const filePath = path.join(rootDir, Key);
     return {
-      promise: () => checkFileExists(filePath),
+      promise: async () => storage.fileExists(Key),
       createReadStream: () => {
         const emitter = new EventEmitter();
         process.nextTick(() => {
-          if (fs.existsSync(filePath)) {
-            emitter.emit('data', Buffer.from(fs.readFileSync(filePath)));
+          if (storage.fileExists(Key)) {
+            emitter.emit('data', Buffer.from(storage.readFile(Key)));
             emitter.emit('end');
           } else {
-            emitter.emit(
-              'error',
-              new Error(`The file ${filePath} does not exist !`),
-            );
+            emitter.emit('error', new Error(`The file ${Key} does not exist!`));
           }
         });
         return emitter;
@@ -86,24 +59,53 @@ export class S3 {
         if (Bucket === 'errorBucket') {
           throw new Error('Bucket does not exist');
         }
-
         return {};
       },
     };
   }
 
-  upload({ Key }: { Key: string }) {
+  upload({ Key, Body }: { Key: string; Body: ReadStream }) {
     return {
       promise: () =>
-        new Promise(async (resolve, reject) => {
-          if (!(await checkFileExists(Key))) {
-            reject(`The file ${Key} does not exist`);
-          } else {
-            resolve('');
-          }
+        new Promise(async resolve => {
+          const chunks = [];
+          Body.on('data', chunk => {
+            chunks.push(chunk);
+          });
+          Body.once('end', () => {
+            storage.writeFile(Key, Buffer.concat(chunks));
+            resolve(null);
+          });
         }),
     };
   }
+
+  listObjectsV2({ Bucket }) {
+    return {
+      promise: () => {
+        if (
+          Bucket === 'delete_stale_files_success' ||
+          Bucket === 'delete_stale_files_error'
+        ) {
+          return Promise.resolve({
+            Contents: [{ Key: 'stale_file.png' }],
+          });
+        }
+        return Promise.resolve({});
+      },
+    };
+  }
+
+  deleteObject({ Bucket }) {
+    return {
+      promise: () => {
+        if (Bucket === 'delete_stale_files_error') {
+          throw new Error('Message');
+        }
+        return Promise.resolve();
+      },
+    };
+  }
 }
 
 export default {
diff --git a/packages/techdocs-common/__mocks__/globals.d.ts b/packages/techdocs-common/__mocks__/globals.d.ts
new file mode 100644
index 0000000000..ad293d2ebe
--- /dev/null
+++ b/packages/techdocs-common/__mocks__/globals.d.ts
@@ -0,0 +1,22 @@
+/*
+ * Copyright 2020 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+declare module NodeJS {
+  interface Global {
+    rootDir: string;
+    storageFilesMock: IStorageFilesMock;
+  }
+}
diff --git a/packages/techdocs-common/__mocks__/pkgcloud.ts b/packages/techdocs-common/__mocks__/pkgcloud.ts
deleted file mode 100644
index 2b855bf174..0000000000
--- a/packages/techdocs-common/__mocks__/pkgcloud.ts
+++ /dev/null
@@ -1,108 +0,0 @@
-/*
- * Copyright 2020 The Backstage Authors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-import { EventEmitter } from 'events';
-import fs from 'fs-extra';
-import os from 'os';
-import path from 'path';
-import { ClientError } from 'pkgcloud';
-
-const rootDir = os.platform() === 'win32' ? 'C:\\rootDir' : '/rootDir';
-
-const checkFileExists = async (Key: string): Promise<boolean> => {
-  // Key will always have / as file separator irrespective of OS since cloud providers expects /.
-  // Normalize Key to OS specific path before checking if file exists.
-  const filePath = path.join(rootDir, Key);
-
-  try {
-    fs.accessSync(filePath, fs.constants.F_OK);
-    return true;
-  } catch (err) {
-    return false;
-  }
-};
-
-class PkgCloudStorageClient {
-  getFile(
-    containerName: string,
-    file: string,
-    callback: (err: any, file: any) => any,
-  ) {
-    checkFileExists(file).then(res => {
-      if (!res) {
-        callback('File does not exist', undefined);
-      } else {
-        callback(undefined, 'success');
-      }
-    });
-  }
-
-  getContainer(
-    containerName: string,
-    callback: (err: ClientError, container: any) => any,
-  ) {
-    if (containerName !== 'mock') {
-      callback(new Error('Container does not exist'), undefined);
-    } else {
-      callback(undefined, 'success');
-    }
-  }
-
-  upload({ remote }: { remote: string }) {
-    const filePath = path.join(rootDir, remote);
-
-    const emitter = new EventEmitter();
-
-    process.nextTick(() => {
-      if (fs.existsSync(filePath)) {
-        emitter.emit('success');
-        (emitter as any).end = () => true;
-      } else {
-        emitter.emit(
-          'error',
-          new Error(`The file ${filePath} does not exist !`),
-        );
-      }
-    });
-
-    return emitter;
-  }
-
-  download({ remote }: { remote: string }) {
-    const filePath = path.join(rootDir, remote);
-
-    const emitter = new EventEmitter();
-
-    process.nextTick(() => {
-      if (fs.existsSync(filePath)) {
-        emitter.emit('data', Buffer.from(fs.readFileSync(filePath)));
-        emitter.emit('end');
-      } else {
-        emitter.emit(
-          'error',
-          new Error(`The file ${filePath} does not exist !`),
-        );
-      }
-    });
-
-    return emitter;
-  }
-}
-
-export class storage {
-  static createClient() {
-    return new PkgCloudStorageClient();
-  }
-}
diff --git a/packages/techdocs-common/__mocks__/types.d.ts b/packages/techdocs-common/__mocks__/types.d.ts
new file mode 100644
index 0000000000..e085b95851
--- /dev/null
+++ b/packages/techdocs-common/__mocks__/types.d.ts
@@ -0,0 +1,24 @@
+/*
+ * Copyright 2020 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+interface IStorageFilesMock {
+  emptyFiles(): void;
+  fileExists(targetPath: string): boolean;
+  readFile(targetPath: string): Buffer;
+  writeFile(targetPath: string, sourcePath: string): void;
+  writeFile(targetPath: string, sourceBuffer: Buffer): void;
+  writeFile(targetPath: string, source: string | Buffer): void;
+}
diff --git a/packages/techdocs-common/api-report.md b/packages/techdocs-common/api-report.md
index 8cca624e11..edf4bac6db 100644
--- a/packages/techdocs-common/api-report.md
+++ b/packages/techdocs-common/api-report.md
@@ -5,56 +5,78 @@
 ```ts
 /// <reference types="node" />
 
-import { AzureIntegrationConfig } from '@backstage/integration';
 import { Config } from '@backstage/config';
 import { ContainerRunner } from '@backstage/backend-common';
 import { Entity } from '@backstage/catalog-model';
 import { EntityName } from '@backstage/catalog-model';
 import express from 'express';
-import { GitHubIntegrationConfig } from '@backstage/integration';
-import { GitLabIntegrationConfig } from '@backstage/integration';
+import { IndexableDocument } from '@backstage/search-common';
 import { Logger as Logger_2 } from 'winston';
 import { PluginEndpointDiscovery } from '@backstage/backend-common';
+import { ScmIntegrationRegistry } from '@backstage/integration';
 import { UrlReader } from '@backstage/backend-common';
 import { Writable } from 'stream';
 
+// Warning: (ae-missing-release-tag) "DirectoryPreparer" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
-export const checkoutGitRepository: (
-  repoUrl: string,
-  config: Config,
-  logger: Logger_2,
-) => Promise<string>;
-
-// @public (undocumented)
-export class CommonGitPreparer implements PreparerBase {
-  constructor(config: Config, logger: Logger_2);
+export class DirectoryPreparer implements PreparerBase {
+  constructor(config: Config, _logger: Logger_2, reader: UrlReader);
+  // Warning: (ae-forgotten-export) The symbol "PreparerResponse" needs to be exported by the entry point index.d.ts
+  //
   // (undocumented)
   prepare(
     entity: Entity,
     options?: {
+      logger?: Logger_2;
       etag?: string;
     },
   ): Promise<PreparerResponse>;
 }
 
-// @public (undocumented)
-export class DirectoryPreparer implements PreparerBase {
-  constructor(config: Config, logger: Logger_2, reader: UrlReader);
-  // (undocumented)
-  prepare(entity: Entity): Promise<PreparerResponse>;
-}
-
+// Warning: (ae-missing-release-tag) "GeneratorBase" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export type GeneratorBase = {
   run(opts: GeneratorRunOptions): Promise<void>;
 };
 
+// Warning: (ae-missing-release-tag) "GeneratorBuilder" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public
 export type GeneratorBuilder = {
   register(protocol: SupportedGeneratorKey, generator: GeneratorBase): void;
   get(entity: Entity): GeneratorBase;
 };
 
+// Warning: (tsdoc-param-tag-missing-hyphen) The @param block should be followed by a parameter name and then a hyphen
+// Warning: (tsdoc-param-tag-with-invalid-type) The @param block should not include a JSDoc-style '{type}'
+// Warning: (tsdoc-param-tag-missing-hyphen) The @param block should be followed by a parameter name and then a hyphen
+// Warning: (tsdoc-param-tag-with-invalid-type) The @param block should not include a JSDoc-style '{type}'
+// Warning: (tsdoc-param-tag-missing-hyphen) The @param block should be followed by a parameter name and then a hyphen
+// Warning: (tsdoc-param-tag-with-invalid-type) The @param block should not include a JSDoc-style '{type}'
+// Warning: (tsdoc-param-tag-missing-hyphen) The @param block should be followed by a parameter name and then a hyphen
+// Warning: (tsdoc-param-tag-with-invalid-type) The @param block should not include a JSDoc-style '{type}'
+// Warning: (tsdoc-param-tag-missing-hyphen) The @param block should be followed by a parameter name and then a hyphen
+// Warning: (tsdoc-param-tag-with-invalid-optional-name) The @param should not include a JSDoc-style optional name; it must not be enclosed in '[ ]' brackets.
+// Warning: (tsdoc-param-tag-with-invalid-type) The @param block should not include a JSDoc-style '{type}'
+// Warning: (tsdoc-param-tag-missing-hyphen) The @param block should be followed by a parameter name and then a hyphen
+// Warning: (tsdoc-param-tag-with-invalid-optional-name) The @param should not include a JSDoc-style optional name; it must not be enclosed in '[ ]' brackets.
+// Warning: (tsdoc-param-tag-with-invalid-type) The @param block should not include a JSDoc-style '{type}'
+// Warning: (ae-missing-release-tag) "GeneratorRunOptions" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
+// @public
+export type GeneratorRunOptions = {
+  inputDir: string;
+  outputDir: string;
+  parsedLocationAnnotation?: ParsedLocationAnnotation;
+  etag?: string;
+  logger: Logger_2;
+  logStream?: Writable;
+};
+
+// Warning: (ae-missing-release-tag) "Generators" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export class Generators implements GeneratorBuilder {
   // (undocumented)
@@ -74,18 +96,8 @@ export class Generators implements GeneratorBuilder {
   register(generatorKey: SupportedGeneratorKey, generator: GeneratorBase): void;
 }
 
-// @public (undocumented)
-export const getAzureIntegrationConfig: (
-  config: Config,
-  host: string,
-) => AzureIntegrationConfig;
-
-// @public (undocumented)
-export const getDefaultBranch: (
-  repositoryUrl: string,
-  config: Config,
-) => Promise<string>;
-
+// Warning: (ae-missing-release-tag) "getDocFilesFromRepository" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export const getDocFilesFromRepository: (
   reader: UrlReader,
@@ -98,57 +110,32 @@ export const getDocFilesFromRepository: (
     | undefined,
 ) => Promise<PreparerResponse>;
 
+// Warning: (ae-missing-release-tag) "getLocationForEntity" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
-export function getGitHost(url: string): string;
-
-// @public (undocumented)
-export const getGitHubIntegrationConfig: (
-  config: Config,
-  host: string,
-) => GitHubIntegrationConfig;
-
-// @public (undocumented)
-export const getGitLabIntegrationConfig: (
-  config: Config,
-  host: string,
-) => GitLabIntegrationConfig;
-
-// @public (undocumented)
-export const getGitRepositoryTempFolder: (
-  repositoryUrl: string,
-  config: Config,
-) => Promise<string>;
-
-// @public (undocumented)
-export function getGitRepoType(url: string): string;
-
-// @public (undocumented)
-export const getLastCommitTimestamp: (
-  repositoryLocation: string,
-  logger: Logger_2,
-) => Promise<number>;
-
-// @public (undocumented)
-export const getLocationForEntity: (entity: Entity) => ParsedLocationAnnotation;
-
-// @public (undocumented)
-export const getTokenForGitRepo: (
-  repositoryUrl: string,
-  config: Config,
-) => Promise<string | undefined>;
+export const getLocationForEntity: (
+  entity: Entity,
+  scmIntegration: ScmIntegrationRegistry,
+) => ParsedLocationAnnotation;
 
+// Warning: (ae-missing-release-tag) "ParsedLocationAnnotation" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export type ParsedLocationAnnotation = {
   type: RemoteProtocol;
   target: string;
 };
 
+// Warning: (ae-missing-release-tag) "parseReferenceAnnotation" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export const parseReferenceAnnotation: (
   annotationName: string,
   entity: Entity,
 ) => ParsedLocationAnnotation;
 
+// Warning: (ae-missing-release-tag) "PreparerBase" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export type PreparerBase = {
   prepare(
@@ -160,14 +147,20 @@ export type PreparerBase = {
   ): Promise<PreparerResponse>;
 };
 
+// Warning: (ae-missing-release-tag) "PreparerBuilder" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export type PreparerBuilder = {
   register(protocol: RemoteProtocol, preparer: PreparerBase): void;
   get(entity: Entity): PreparerBase;
 };
 
+// Warning: (ae-missing-release-tag) "Preparers" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export class Preparers implements PreparerBuilder {
+  // Warning: (ae-forgotten-export) The symbol "factoryOptions" needs to be exported by the entry point index.d.ts
+  //
   // (undocumented)
   static fromConfig(
     config: Config,
@@ -179,8 +172,12 @@ export class Preparers implements PreparerBuilder {
   register(protocol: RemoteProtocol, preparer: PreparerBase): void;
 }
 
+// Warning: (ae-missing-release-tag) "Publisher" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public
 export class Publisher {
+  // Warning: (ae-forgotten-export) The symbol "factoryOptions" needs to be exported by the entry point index.d.ts
+  //
   // (undocumented)
   static fromConfig(
     config: Config,
@@ -188,15 +185,31 @@ export class Publisher {
   ): Promise<PublisherBase>;
 }
 
+// Warning: (ae-missing-release-tag) "PublisherBase" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public
 export interface PublisherBase {
   docsRouter(): express.Handler;
   fetchTechDocsMetadata(entityName: EntityName): Promise<TechDocsMetadata>;
+  // Warning: (ae-forgotten-export) The symbol "ReadinessResponse" needs to be exported by the entry point index.d.ts
   getReadiness(): Promise<ReadinessResponse>;
   hasDocsBeenGenerated(entityName: Entity): Promise<boolean>;
+  // Warning: (tsdoc-escape-right-brace) The "}" character should be escaped using a backslash to avoid confusion with a TSDoc inline tag
+  // Warning: (tsdoc-escape-right-brace) The "}" character should be escaped using a backslash to avoid confusion with a TSDoc inline tag
+  // Warning: (tsdoc-malformed-inline-tag) Expecting a TSDoc tag starting with "{@"
+  // Warning: (tsdoc-malformed-inline-tag) Expecting a TSDoc tag starting with "{@"
+  // Warning: (tsdoc-escape-right-brace) The "}" character should be escaped using a backslash to avoid confusion with a TSDoc inline tag
+  // Warning: (tsdoc-malformed-inline-tag) Expecting a TSDoc tag starting with "{@"
+  // Warning: (ae-forgotten-export) The symbol "MigrateRequest" needs to be exported by the entry point index.d.ts
+  migrateDocsCase?(migrateRequest: MigrateRequest): Promise<void>;
+  // Warning: (tsdoc-param-tag-missing-hyphen) The @param block should be followed by a parameter name and then a hyphen
+  // Warning: (ae-forgotten-export) The symbol "PublishRequest" needs to be exported by the entry point index.d.ts
+  // Warning: (ae-forgotten-export) The symbol "PublishResponse" needs to be exported by the entry point index.d.ts
   publish(request: PublishRequest): Promise<PublishResponse>;
 }
 
+// Warning: (ae-missing-release-tag) "PublisherType" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public
 export type PublisherType =
   | 'local'
@@ -205,35 +218,69 @@ export type PublisherType =
   | 'azureBlobStorage'
   | 'openStackSwift';
 
-// @public
-export type RemoteProtocol =
-  | 'url'
-  | 'dir'
-  | 'github'
-  | 'gitlab'
-  | 'file'
-  | 'azure/api';
+// Warning: (ae-missing-release-tag) "RemoteProtocol" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
+// @public (undocumented)
+export type RemoteProtocol = 'url' | 'dir';
 
+// Warning: (ae-missing-release-tag) "TechDocsDocument" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
+// @public (undocumented)
+export interface TechDocsDocument extends IndexableDocument {
+  // (undocumented)
+  kind: string;
+  // (undocumented)
+  lifecycle: string;
+  // (undocumented)
+  name: string;
+  // (undocumented)
+  namespace: string;
+  // (undocumented)
+  owner: string;
+  // (undocumented)
+  path: string;
+}
+
+// Warning: (ae-missing-release-tag) "TechdocsGenerator" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export class TechdocsGenerator implements GeneratorBase {
   constructor({
     logger,
     containerRunner,
     config,
+    scmIntegrations,
   }: {
     logger: Logger_2;
     containerRunner: ContainerRunner;
     config: Config;
+    scmIntegrations: ScmIntegrationRegistry;
   });
   // (undocumented)
+  static fromConfig(
+    config: Config,
+    {
+      containerRunner,
+      logger,
+    }: {
+      containerRunner: ContainerRunner;
+      logger: Logger_2;
+    },
+  ): TechdocsGenerator;
+  // (undocumented)
   run({
     inputDir,
     outputDir,
     parsedLocationAnnotation,
     etag,
+    logger: childLogger,
+    logStream,
   }: GeneratorRunOptions): Promise<void>;
 }
 
+// Warning: (tsdoc-param-tag-missing-hyphen) The @param block should be followed by a parameter name and then a hyphen
+// Warning: (ae-missing-release-tag) "TechDocsMetadata" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public
 export type TechDocsMetadata = {
   site_name: string;
@@ -241,6 +288,20 @@ export type TechDocsMetadata = {
   etag: string;
 };
 
+// Warning: (ae-missing-release-tag) "transformDirLocation" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
+// @public
+export const transformDirLocation: (
+  entity: Entity,
+  dirAnnotation: ParsedLocationAnnotation,
+  scmIntegrations: ScmIntegrationRegistry,
+) => {
+  type: 'dir' | 'url';
+  target: string;
+};
+
+// Warning: (ae-missing-release-tag) "UrlPreparer" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export class UrlPreparer implements PreparerBase {
   constructor(reader: UrlReader, logger: Logger_2);
@@ -253,5 +314,13 @@ export class UrlPreparer implements PreparerBase {
   ): Promise<PreparerResponse>;
 }
 
+// Warnings were encountered during analysis:
+//
+// src/stages/generate/types.d.ts:44:5 - (ae-forgotten-export) The symbol "SupportedGeneratorKey" needs to be exported by the entry point index.d.ts
+// src/stages/prepare/types.d.ts:18:8 - (tsdoc-param-tag-missing-hyphen) The @param block should be followed by a parameter name and then a hyphen
+// src/stages/prepare/types.d.ts:19:8 - (tsdoc-param-tag-with-invalid-name) The @param block should be followed by a valid parameter name: The identifier cannot non-word characters
+// src/stages/prepare/types.d.ts:21:33 - (tsdoc-escape-right-brace) The "}" character should be escaped using a backslash to avoid confusion with a TSDoc inline tag
+// src/stages/prepare/types.d.ts:21:16 - (tsdoc-malformed-inline-tag) Expecting a TSDoc tag starting with "{@"
+
 // (No @packageDocumentation comment for this package)
 ```
diff --git a/packages/techdocs-common/package.json b/packages/techdocs-common/package.json
index de97e9815d..2316d96a55 100644
--- a/packages/techdocs-common/package.json
+++ b/packages/techdocs-common/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@backstage/techdocs-common",
   "description": "Common functionalities for TechDocs, to be shared between techdocs-backend plugin and techdocs-cli",
-  "version": "0.6.7",
+  "version": "0.10.0",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "private": false,
@@ -36,37 +36,35 @@
     "url": "https://github.com/backstage/backstage/issues"
   },
   "dependencies": {
-    "@azure/identity": "^1.2.2",
-    "@azure/storage-blob": "^12.4.0",
-    "@backstage/backend-common": "^0.8.5",
-    "@backstage/catalog-model": "^0.9.0",
-    "@backstage/config": "^0.1.5",
+    "@azure/identity": "^1.5.0",
+    "@azure/storage-blob": "^12.5.0",
+    "@backstage/backend-common": "^0.9.1",
+    "@backstage/catalog-model": "^0.9.1",
+    "@backstage/config": "^0.1.8",
     "@backstage/errors": "^0.1.1",
-    "@backstage/integration": "^0.5.8",
+    "@backstage/search-common": "^0.2.0",
+    "@backstage/integration": "^0.6.3",
     "@google-cloud/storage": "^5.6.0",
+    "@trendyol-js/openstack-swift-sdk": "^0.0.4",
     "@types/express": "^4.17.6",
     "aws-sdk": "^2.840.0",
-    "cross-fetch": "^3.0.6",
     "express": "^4.17.1",
     "fs-extra": "9.1.0",
-    "git-url-parse": "~11.4.4",
+    "git-url-parse": "^11.6.0",
     "js-yaml": "^4.0.0",
     "json5": "^2.1.3",
     "mime-types": "^2.1.27",
     "mock-fs": "^4.13.0",
     "p-limit": "^3.1.0",
-    "pkgcloud": "^2.2.0",
     "recursive-readdir": "^2.2.2",
     "winston": "^3.2.1"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.7.3",
+    "@backstage/cli": "^0.7.10",
     "@types/fs-extra": "^9.0.5",
-    "@types/git-url-parse": "^9.0.0",
     "@types/js-yaml": "^4.0.0",
     "@types/mime-types": "^2.1.0",
     "@types/mock-fs": "^4.13.0",
-    "@types/pkgcloud": "^1.7.4",
     "@types/recursive-readdir": "^2.2.0",
     "@types/supertest": "^2.0.8",
     "supertest": "^6.1.3"
diff --git a/packages/techdocs-common/src/default-branch.ts b/packages/techdocs-common/src/default-branch.ts
deleted file mode 100644
index f4bca6fd30..0000000000
--- a/packages/techdocs-common/src/default-branch.ts
+++ /dev/null
@@ -1,217 +0,0 @@
-/*
- * Copyright 2020 The Backstage Authors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-import fetch from 'cross-fetch';
-import parseGitUrl from 'git-url-parse';
-import { Config } from '@backstage/config';
-import {
-  getGitHubRequestOptions,
-  getGitLabRequestOptions,
-  getAzureRequestOptions,
-} from '@backstage/integration';
-import {
-  getGitHost,
-  getGitRepoType,
-  getGitHubIntegrationConfig,
-  getGitLabIntegrationConfig,
-  getAzureIntegrationConfig,
-} from './git-auth';
-
-interface IGitlabBranch {
-  name: string;
-  merged: boolean;
-  protected: boolean;
-  default: boolean;
-  developers_can_push: boolean;
-  developers_can_merge: boolean;
-  can_push: boolean;
-  web_url: string;
-  commit: {
-    author_email: string;
-    author_name: string;
-    authored_date: string;
-    committed_date: string;
-    committer_email: string;
-    committer_name: string;
-    id: string;
-    short_id: string;
-    title: string;
-    message: string;
-    parent_ids: string[];
-  };
-}
-
-function getGithubApiUrl(config: Config, url: string): URL {
-  const { resource, owner, name } = parseGitUrl(url);
-  const providerConfigs =
-    config.getOptionalConfigArray('integrations.github') ?? [];
-
-  const hostConfig = providerConfigs.filter(
-    providerConfig => providerConfig.getOptionalString('host') === resource,
-  );
-
-  const apiBaseUrl =
-    hostConfig[0]?.getOptionalString('apiBaseUrl') ?? 'https://api.github.com';
-  const apiRepos = 'repos';
-
-  return new URL(`${apiBaseUrl}/${apiRepos}/${owner}/${name}`);
-}
-
-function getGitlabApiUrl(url: string): URL {
-  const { protocol, resource, full_name: fullName } = parseGitUrl(url);
-  const apiProjectsBasePath = 'api/v4/projects';
-  const project = encodeURIComponent(fullName);
-  const branches = 'repository/branches';
-
-  return new URL(
-    `${protocol}://${resource}/${apiProjectsBasePath}/${project}/${branches}`,
-  );
-}
-
-function getAzureApiUrl(url: string): URL {
-  const { protocol, resource, organization, owner, name } = parseGitUrl(url);
-  const apiRepoPath = '_apis/git/repositories';
-  const apiVersion = 'api-version=6.0';
-
-  return new URL(
-    `${protocol}://${resource}/${organization}/${owner}/${apiRepoPath}/${name}?${apiVersion}`,
-  );
-}
-
-async function getGithubDefaultBranch(
-  repositoryUrl: string,
-  config: Config,
-): Promise<string> {
-  const path = getGithubApiUrl(config, repositoryUrl).toString();
-  const host = getGitHost(repositoryUrl);
-
-  const integrationConfig = getGitHubIntegrationConfig(config, host);
-  const options = getGitHubRequestOptions(integrationConfig);
-
-  try {
-    const raw = await fetch(path, options);
-
-    if (!raw.ok) {
-      throw new Error(
-        `Failed to load url: ${raw.status} ${raw.statusText}. Make sure you have permission to repository: ${repositoryUrl}`,
-      );
-    }
-
-    const { default_branch: branch } = await raw.json();
-
-    if (!branch) {
-      throw new Error('Not found github default branch');
-    }
-
-    return branch;
-  } catch (error) {
-    throw new Error(`Failed to get github default branch: ${error}`);
-  }
-}
-
-async function getGitlabDefaultBranch(
-  repositoryUrl: string,
-  config: Config,
-): Promise<string> {
-  const path = getGitlabApiUrl(repositoryUrl).toString();
-  const host = getGitHost(repositoryUrl);
-
-  const integrationConfig = getGitLabIntegrationConfig(config, host);
-  const options = getGitLabRequestOptions(integrationConfig);
-
-  try {
-    const raw = await fetch(path, options);
-
-    if (!raw.ok) {
-      throw new Error(
-        `Failed to load url: ${raw.status} ${raw.statusText}. Make sure you have permission to repository: ${repositoryUrl}`,
-      );
-    }
-
-    const result = await raw.json();
-    const { name } = (result || []).find(
-      (branch: IGitlabBranch) => branch.default === true,
-    );
-
-    if (!name) {
-      throw new Error('Not found gitlab default branch');
-    }
-
-    return name;
-  } catch (error) {
-    throw new Error(`Failed to get gitlab default branch: ${error}`);
-  }
-}
-
-async function getAzureDefaultBranch(
-  repositoryUrl: string,
-  config: Config,
-): Promise<string> {
-  const path = getAzureApiUrl(repositoryUrl).toString();
-  const host = getGitHost(repositoryUrl);
-
-  const integrationConfig = getAzureIntegrationConfig(config, host);
-  const options = getAzureRequestOptions(integrationConfig);
-
-  try {
-    const urlResponse = await fetch(path, options);
-    if (!urlResponse.ok) {
-      throw new Error(
-        `Failed to load url: ${urlResponse.status} ${urlResponse.statusText}. Make sure you have permission to repository: ${repositoryUrl}`,
-      );
-    }
-    const urlResult = await urlResponse.json();
-
-    const idResponse = await fetch(urlResult.url, options);
-    if (!idResponse.ok) {
-      throw new Error(
-        `Failed to load url: ${idResponse.status} ${idResponse.statusText}. Make sure you have permission to repository: ${urlResult.repository.url}`,
-      );
-    }
-    const idResult = await idResponse.json();
-    const name = idResult.defaultBranch;
-
-    if (!name) {
-      throw new Error('Not found Azure DevOps default branch');
-    }
-
-    return name;
-  } catch (error) {
-    throw new Error(`Failed to get Azure DevOps default branch: ${error}`);
-  }
-}
-
-export const getDefaultBranch = async (
-  repositoryUrl: string,
-  config: Config,
-): Promise<string> => {
-  const type = getGitRepoType(repositoryUrl);
-
-  try {
-    switch (type) {
-      case 'github':
-        return await getGithubDefaultBranch(repositoryUrl, config);
-      case 'gitlab':
-        return await getGitlabDefaultBranch(repositoryUrl, config);
-      case 'azure/api':
-        return await getAzureDefaultBranch(repositoryUrl, config);
-
-      default:
-        throw new Error('Failed to get repository type');
-    }
-  } catch (error) {
-    throw error;
-  }
-};
diff --git a/packages/techdocs-common/src/git-auth.ts b/packages/techdocs-common/src/git-auth.ts
deleted file mode 100644
index 158c4ebebf..0000000000
--- a/packages/techdocs-common/src/git-auth.ts
+++ /dev/null
@@ -1,109 +0,0 @@
-/*
- * Copyright 2020 The Backstage Authors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-import parseGitUrl from 'git-url-parse';
-import { Config } from '@backstage/config';
-import {
-  readGitHubIntegrationConfigs,
-  readGitLabIntegrationConfigs,
-  readAzureIntegrationConfigs,
-  GitHubIntegrationConfig,
-  GitLabIntegrationConfig,
-  AzureIntegrationConfig,
-} from '@backstage/integration';
-
-export function getGitHost(url: string): string {
-  const { resource } = parseGitUrl(url);
-  return resource;
-}
-
-export function getGitRepoType(url: string): string {
-  const typeMapping = [
-    { url: /github*/g, type: 'github' },
-    { url: /gitlab*/g, type: 'gitlab' },
-    { url: /azure*/g, type: 'azure/api' },
-  ];
-
-  const type = typeMapping.filter(item => item.url.test(url))[0]?.type;
-
-  return type;
-}
-
-export const getGitHubIntegrationConfig = (
-  config: Config,
-  host: string,
-): GitHubIntegrationConfig => {
-  const allGitHubConfigs = readGitHubIntegrationConfigs(
-    config.getOptionalConfigArray('integrations.github') ?? [],
-  );
-  const gitHubIntegrationConfig = allGitHubConfigs.find(v => v.host === host);
-  if (!gitHubIntegrationConfig) {
-    throw new Error(`Unable to locate GitHub integration for the host ${host}`);
-  }
-  return gitHubIntegrationConfig;
-};
-
-export const getGitLabIntegrationConfig = (
-  config: Config,
-  host: string,
-): GitLabIntegrationConfig => {
-  const allGitLabConfigs = readGitLabIntegrationConfigs(
-    config.getOptionalConfigArray('integrations.gitlab') ?? [],
-  );
-  const gitLabIntegrationConfig = allGitLabConfigs.find(v => v.host === host);
-  if (!gitLabIntegrationConfig) {
-    throw new Error(`Unable to locate GitLab integration for the host ${host}`);
-  }
-  return gitLabIntegrationConfig;
-};
-
-export const getAzureIntegrationConfig = (
-  config: Config,
-  host: string,
-): AzureIntegrationConfig => {
-  const allAzureIntegrationConfig = readAzureIntegrationConfigs(
-    config.getOptionalConfigArray('integrations.azure') ?? [],
-  );
-  const azureIntegrationConfig = allAzureIntegrationConfig.find(
-    v => v.host === host,
-  );
-  if (!azureIntegrationConfig) {
-    throw new Error(`Unable to locate Azure integration for the host ${host}`);
-  }
-  return azureIntegrationConfig;
-};
-
-export const getTokenForGitRepo = async (
-  repositoryUrl: string,
-  config: Config,
-): Promise<string | undefined> => {
-  const host = getGitHost(repositoryUrl);
-  const type = getGitRepoType(repositoryUrl);
-
-  try {
-    switch (type) {
-      case 'github':
-        return getGitHubIntegrationConfig(config, host).token;
-      case 'gitlab':
-        return getGitLabIntegrationConfig(config, host).token;
-      case 'azure/api':
-        return getAzureIntegrationConfig(config, host).token;
-      default:
-        throw new Error('Failed to get repository type');
-    }
-  } catch (error) {
-    throw error;
-  }
-};
diff --git a/packages/techdocs-common/src/globals.d.ts b/packages/techdocs-common/src/globals.d.ts
new file mode 100644
index 0000000000..ad293d2ebe
--- /dev/null
+++ b/packages/techdocs-common/src/globals.d.ts
@@ -0,0 +1,22 @@
+/*
+ * Copyright 2020 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+declare module NodeJS {
+  interface Global {
+    rootDir: string;
+    storageFilesMock: IStorageFilesMock;
+  }
+}
diff --git a/packages/techdocs-common/src/helpers.test.ts b/packages/techdocs-common/src/helpers.test.ts
index b94cbba572..69f09d92ed 100644
--- a/packages/techdocs-common/src/helpers.test.ts
+++ b/packages/techdocs-common/src/helpers.test.ts
@@ -19,14 +19,26 @@ import {
   SearchResponse,
   UrlReader,
 } from '@backstage/backend-common';
-import { Entity } from '@backstage/catalog-model';
+import { Entity, getEntitySourceLocation } from '@backstage/catalog-model';
+import { ConfigReader } from '@backstage/config';
+import { ScmIntegrations } from '@backstage/integration';
+import os from 'os';
+import path from 'path';
 import { Readable } from 'stream';
 import {
   getDocFilesFromRepository,
   getLocationForEntity,
   parseReferenceAnnotation,
+  transformDirLocation,
 } from './helpers';
 
+jest.mock('@backstage/catalog-model', () => ({
+  ...jest.requireActual('@backstage/catalog-model'),
+  getEntitySourceLocation: jest.fn(),
+}));
+
+const rootDir = os.platform() === 'win32' ? 'C:\\rootDir' : '/rootDir';
+
 const entityBase: Entity = {
   metadata: {
     namespace: 'default',
@@ -81,6 +93,10 @@ const mockEntityWithBadAnnotation: Entity = {
   },
 };
 
+const scmIntegrations = ScmIntegrations.fromConfig(new ConfigReader({}));
+
+afterEach(() => jest.resetAllMocks());
+
 describe('parseReferenceAnnotation', () => {
   it('should parse annotation', () => {
     const parsedLocationAnnotation = parseReferenceAnnotation(
@@ -109,10 +125,158 @@ describe('parseReferenceAnnotation', () => {
   });
 });
 
+describe('transformDirLocation', () => {
+  it.each`
+    techdocsRef           | target
+    ${'dir:.'}            | ${'https://my-url/folder/'}
+    ${'dir:./sub-folder'} | ${'https://my-url/folder/sub-folder'}
+  `(
+    'should transform "$techdocsRef" for url type locations',
+    ({ techdocsRef, target }) => {
+      (getEntitySourceLocation as jest.Mock).mockReturnValue({
+        type: 'url',
+        target: 'https://my-url/folder/',
+      });
+
+      const entity = {
+        apiVersion: '1',
+        kind: 'Component',
+        metadata: {
+          name: 'test',
+          annotations: {
+            'backstage.io/techdocs-ref': techdocsRef,
+          },
+        },
+      };
+
+      const result = transformDirLocation(
+        entity,
+        parseReferenceAnnotation('backstage.io/techdocs-ref', entity),
+        scmIntegrations,
+      );
+
+      expect(result).toEqual({ type: 'url', target });
+    },
+  );
+
+  it.each`
+    techdocsRef           | target
+    ${'dir:.'}            | ${path.join(rootDir, 'working-copy')}
+    ${'dir:./sub-folder'} | ${path.join(rootDir, 'working-copy', 'sub-folder')}
+  `(
+    'should transform "$techdocsRef" for file type locations',
+    ({ techdocsRef, target }) => {
+      (getEntitySourceLocation as jest.Mock).mockReturnValue({
+        type: 'file',
+        target: path.join(rootDir, 'working-copy', 'catalog-info.yaml'),
+      });
+
+      const entity = {
+        apiVersion: '1',
+        kind: 'Component',
+        metadata: {
+          name: 'test',
+          annotations: {
+            'backstage.io/techdocs-ref': techdocsRef,
+          },
+        },
+      };
+
+      const result = transformDirLocation(
+        entity,
+        parseReferenceAnnotation('backstage.io/techdocs-ref', entity),
+        scmIntegrations,
+      );
+
+      expect(result).toEqual({ type: 'dir', target });
+    },
+  );
+
+  it('should reject unsafe file location', () => {
+    (getEntitySourceLocation as jest.Mock).mockReturnValue({
+      type: 'file',
+      target: '/tmp/catalog-info.yaml',
+    });
+
+    const entity = {
+      apiVersion: '1',
+      kind: 'Component',
+      metadata: {
+        name: 'test',
+        annotations: {
+          'backstage.io/techdocs-ref': 'dir:..',
+        },
+      },
+    };
+
+    expect(() =>
+      transformDirLocation(
+        entity,
+        parseReferenceAnnotation('backstage.io/techdocs-ref', entity),
+        scmIntegrations,
+      ),
+    ).toThrow(
+      /Relative path is not allowed to refer to a directory outside its parent/,
+    );
+  });
+
+  it('should reject other location types', () => {
+    (getEntitySourceLocation as jest.Mock).mockReturnValue({
+      type: 'other',
+      target: '/',
+    });
+
+    const entity = {
+      apiVersion: '1',
+      kind: 'Component',
+      metadata: {
+        name: 'test',
+        annotations: {
+          'backstage.io/techdocs-ref': 'dir:.',
+        },
+      },
+    };
+
+    expect(() =>
+      transformDirLocation(
+        entity,
+        parseReferenceAnnotation('backstage.io/techdocs-ref', entity),
+        scmIntegrations,
+      ),
+    ).toThrow(/Unable to resolve location type other/);
+  });
+});
+
 describe('getLocationForEntity', () => {
+  it('should handle dir locations', () => {
+    (getEntitySourceLocation as jest.Mock).mockReturnValue({
+      type: 'url',
+      target: 'https://my-url/folder/',
+    });
+
+    const entity = {
+      apiVersion: '1',
+      kind: 'Component',
+      metadata: {
+        name: 'test',
+        annotations: {
+          'backstage.io/techdocs-ref': 'dir:.',
+        },
+      },
+    };
+
+    const parsedLocationAnnotation = getLocationForEntity(
+      entity,
+      scmIntegrations,
+    );
+    expect(parsedLocationAnnotation.type).toBe('url');
+    expect(parsedLocationAnnotation.target).toBe('https://my-url/folder/');
+  });
+
   it('should get location for entity', () => {
     const parsedLocationAnnotation = getLocationForEntity(
       mockEntityWithAnnotation,
+      scmIntegrations,
     );
     expect(parsedLocationAnnotation.type).toBe('url');
     expect(parsedLocationAnnotation.target).toBe(
diff --git a/packages/techdocs-common/src/helpers.ts b/packages/techdocs-common/src/helpers.ts
index cac8a7047f..7a9e4b18be 100644
--- a/packages/techdocs-common/src/helpers.ts
+++ b/packages/techdocs-common/src/helpers.ts
@@ -14,17 +14,16 @@
  * limitations under the License.
  */
 
-import { Git, UrlReader } from '@backstage/backend-common';
+import { resolveSafeChildPath, UrlReader } from '@backstage/backend-common';
+import {
+  Entity,
+  getEntitySourceLocation,
+  parseLocationReference,
+} from '@backstage/catalog-model';
 import { InputError } from '@backstage/errors';
-import { Entity, parseLocationReference } from '@backstage/catalog-model';
-import { Config } from '@backstage/config';
-import fs from 'fs-extra';
-import parseGitUrl from 'git-url-parse';
-import os from 'os';
+import { ScmIntegrationRegistry } from '@backstage/integration';
 import path from 'path';
 import { Logger } from 'winston';
-import { getDefaultBranch } from './default-branch';
-import { getGitRepoType, getTokenForGitRepo } from './git-auth';
 import { PreparerResponse, RemoteProtocol } from './stages/prepare/types';
 
 export type ParsedLocationAnnotation = {
@@ -50,151 +49,77 @@ export const parseReferenceAnnotation = (
   };
 };
 
+/**
+ * TechDocs references of type `dir` are relative the source location of the entity.
+ * This function transforms relative references to absolute ones, based on the
+ * location the entity was ingested from. If the entity was registered by a `url`
+ * location, it returns a `url` location with a resolved target that points to the
+ * targeted subfolder. If the entity was registered by a `file` location, it returns
+ * an absolute `dir` location.
+ *
+ * @param entity - the entity with annotations
+ * @param dirAnnotation - the parsed techdocs-ref annotation of type 'dir'
+ * @param scmIntegrations - access to the scmIntegration to do url transformations
+ * @throws if the entity doesn't specify a `dir` location or is ingested from an unsupported location.
+ * @returns the transformed location with an absolute target.
+ */
+export const transformDirLocation = (
+  entity: Entity,
+  dirAnnotation: ParsedLocationAnnotation,
+  scmIntegrations: ScmIntegrationRegistry,
+): { type: 'dir' | 'url'; target: string } => {
+  const location = getEntitySourceLocation(entity);
+
+  switch (location.type) {
+    case 'url': {
+      const target = scmIntegrations.resolveUrl({
+        url: dirAnnotation.target,
+        base: location.target,
+      });
+
+      return {
+        type: 'url',
+        target,
+      };
+    }
+
+    case 'file': {
+      // only permit targets in the same folder as the target of the `file` location!
+      const target = resolveSafeChildPath(
+        path.dirname(location.target),
+        dirAnnotation.target,
+      );
+
+      return {
+        type: 'dir',
+        target,
+      };
+    }
+
+    default:
+      throw new InputError(`Unable to resolve location type ${location.type}`);
+  }
+};
+
 export const getLocationForEntity = (
   entity: Entity,
+  scmIntegration: ScmIntegrationRegistry,
 ): ParsedLocationAnnotation => {
-  const { type, target } = parseReferenceAnnotation(
+  const annotation = parseReferenceAnnotation(
     'backstage.io/techdocs-ref',
     entity,
   );
 
-  switch (type) {
-    case 'github':
-    case 'gitlab':
-    case 'azure/api':
+  switch (annotation.type) {
     case 'url':
-      return { type, target };
+      return annotation;
     case 'dir':
-      if (path.isAbsolute(target)) {
-        return { type, target };
-      }
-      return parseReferenceAnnotation(
-        'backstage.io/managed-by-location',
-        entity,
-      );
+      return transformDirLocation(entity, annotation, scmIntegration);
     default:
-      throw new Error(`Invalid reference annotation ${type}`);
+      throw new Error(`Invalid reference annotation ${annotation.type}`);
   }
 };
 
-export const getGitRepositoryTempFolder = async (
-  repositoryUrl: string,
-  config: Config,
-): Promise<string> => {
-  const parsedGitLocation = parseGitUrl(repositoryUrl);
-  // removes .git from git location path
-  parsedGitLocation.git_suffix = false;
-
-  if (!parsedGitLocation.ref) {
-    parsedGitLocation.ref = await getDefaultBranch(
-      parsedGitLocation.toString('https'),
-      config,
-    );
-  }
-
-  return path.join(
-    // fs.realpathSync fixes a problem with macOS returning a path that is a symlink
-    fs.realpathSync(os.tmpdir()),
-    'backstage-repo',
-    parsedGitLocation.resource,
-    parsedGitLocation.owner,
-    parsedGitLocation.name,
-    parsedGitLocation.ref,
-  );
-};
-
-export const checkoutGitRepository = async (
-  repoUrl: string,
-  config: Config,
-  logger: Logger,
-): Promise<string> => {
-  const parsedGitLocation = parseGitUrl(repoUrl);
-  const repositoryTmpPath = await getGitRepositoryTempFolder(repoUrl, config);
-  const token = await getTokenForGitRepo(repoUrl, config);
-
-  // Initialize a git client
-  let git = Git.fromAuth({ logger });
-
-  // Docs about why username and password are set to these specific values.
-  // https://isomorphic-git.org/docs/en/onAuth#oauth2-tokens
-  if (token) {
-    const type = getGitRepoType(repoUrl);
-    switch (type) {
-      case 'github':
-        git = Git.fromAuth({
-          username: 'x-access-token',
-          password: token,
-          logger,
-        });
-        parsedGitLocation.token = `x-access-token:${token}`;
-        break;
-      case 'gitlab':
-        git = Git.fromAuth({
-          username: 'oauth2',
-          password: token,
-          logger,
-        });
-        parsedGitLocation.token = `dummyUsername:${token}`;
-        parsedGitLocation.git_suffix = true;
-        break;
-      case 'azure/api':
-        git = Git.fromAuth({
-          username: 'notempty',
-          password: token,
-          logger: logger,
-        });
-        break;
-      default:
-        parsedGitLocation.token = `:${token}`;
-    }
-  }
-
-  // Pull from repository if it has already been cloned.
-  if (fs.existsSync(repositoryTmpPath)) {
-    try {
-      const currentBranchName = await git.currentBranch({
-        dir: repositoryTmpPath,
-      });
-
-      await git.fetch({ dir: repositoryTmpPath, remote: 'origin' });
-      await git.merge({
-        dir: repositoryTmpPath,
-        theirs: `origin/${currentBranchName}`,
-        ours: currentBranchName || undefined,
-        author: { name: 'Backstage TechDocs', email: 'techdocs@backstage.io' },
-        committer: {
-          name: 'Backstage TechDocs',
-          email: 'techdocs@backstage.io',
-        },
-      });
-      return repositoryTmpPath;
-    } catch (e) {
-      logger.info(
-        `Found error "${e.message}" in cached repository "${repoUrl}" when getting latest changes. Removing cached repository.`,
-      );
-      fs.removeSync(repositoryTmpPath);
-    }
-  }
-
-  const repositoryCheckoutUrl = parsedGitLocation.toString('https');
-
-  fs.mkdirSync(repositoryTmpPath, { recursive: true });
-  await git.clone({ url: repositoryCheckoutUrl, dir: repositoryTmpPath });
-
-  return repositoryTmpPath;
-};
-
-export const getLastCommitTimestamp = async (
-  repositoryLocation: string,
-  logger: Logger,
-): Promise<number> => {
-  const git = Git.fromAuth({ logger });
-  const sha = await git.resolveRef({ dir: repositoryLocation, ref: 'HEAD' });
-  const commit = await git.readCommit({ dir: repositoryLocation, sha });
-
-  return commit.commit.committer.timestamp;
-};
-
 export const getDocFilesFromRepository = async (
   reader: UrlReader,
   entity: Entity,
diff --git a/packages/techdocs-common/src/index.ts b/packages/techdocs-common/src/index.ts
index 881f80cccb..faf60440c0 100644
--- a/packages/techdocs-common/src/index.ts
+++ b/packages/techdocs-common/src/index.ts
@@ -15,5 +15,4 @@
  */
 export * from './stages';
 export * from './helpers';
-export * from './default-branch';
-export * from './git-auth';
+export * from './techdocsTypes';
diff --git a/packages/techdocs-common/src/setupTests.ts b/packages/techdocs-common/src/setupTests.ts
new file mode 100644
index 0000000000..9a13e57633
--- /dev/null
+++ b/packages/techdocs-common/src/setupTests.ts
@@ -0,0 +1,60 @@
+/*
+ * Copyright 2020 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import os from 'os';
+import path from 'path';
+import fs from 'fs-extra';
+
+const rootDir: string = os.platform() === 'win32' ? 'C:\\rootDir' : '/rootDir';
+
+const encoding = 'utf8';
+
+class StorageFilesMock implements IStorageFilesMock {
+  private files: Record<string, string>;
+
+  constructor() {
+    this.files = {};
+  }
+
+  public emptyFiles(): void {
+    this.files = {};
+  }
+
+  public fileExists(targetPath: string): boolean {
+    const filePath = path.join(rootDir, targetPath);
+    const posixPath = filePath.split(path.posix.sep).join(path.sep);
+    return this.files[posixPath] !== undefined;
+  }
+
+  public readFile(targetPath: string): Buffer {
+    const filePath = path.join(rootDir, targetPath);
+    return Buffer.from(this.files[filePath] ?? '', encoding);
+  }
+
+  public writeFile(targetPath: string, sourcePath: string): void;
+  public writeFile(targetPath: string, sourceBuffer: Buffer): void;
+  public writeFile(targetPath: string, source: string | Buffer): void {
+    const filePath = path.join(rootDir, targetPath);
+    if (typeof source === 'string') {
+      this.files[filePath] = fs.readFileSync(source).toString(encoding);
+    } else {
+      this.files[filePath] = source.toString(encoding);
+    }
+  }
+}
+
+global.rootDir = rootDir;
+global.storageFilesMock = new StorageFilesMock();
diff --git a/packages/techdocs-common/src/stages/generate/__fixtures__/mkdocs_valid_doc_dir.yml b/packages/techdocs-common/src/stages/generate/__fixtures__/mkdocs_valid_doc_dir.yml
new file mode 100644
index 0000000000..e75b06ada7
--- /dev/null
+++ b/packages/techdocs-common/src/stages/generate/__fixtures__/mkdocs_valid_doc_dir.yml
@@ -0,0 +1,3 @@
+site_name: Test site name
+site_description: Test site description
+docs_dir: docs/
diff --git a/packages/techdocs-common/src/stages/generate/__fixtures__/mkdocs_with_comments.yml b/packages/techdocs-common/src/stages/generate/__fixtures__/mkdocs_with_comments.yml
new file mode 100644
index 0000000000..3924224560
--- /dev/null
+++ b/packages/techdocs-common/src/stages/generate/__fixtures__/mkdocs_with_comments.yml
@@ -0,0 +1,3 @@
+site_name: Test site name
+site_description: Test site description
+# This is a comment that is removed after editing
diff --git a/packages/techdocs-common/src/stages/generate/__fixtures__/mkdocs_with_edit_uri.yml b/packages/techdocs-common/src/stages/generate/__fixtures__/mkdocs_with_edit_uri.yml
new file mode 100644
index 0000000000..c7f402ec12
--- /dev/null
+++ b/packages/techdocs-common/src/stages/generate/__fixtures__/mkdocs_with_edit_uri.yml
@@ -0,0 +1,4 @@
+site_name: Test site name
+site_description: Test site description
+
+edit_uri: https://github.com/backstage/backstage/edit/main/docs
diff --git a/packages/techdocs-common/src/stages/generate/generators.test.ts b/packages/techdocs-common/src/stages/generate/generators.test.ts
index a2ace2628c..56343763e9 100644
--- a/packages/techdocs-common/src/stages/generate/generators.test.ts
+++ b/packages/techdocs-common/src/stages/generate/generators.test.ts
@@ -44,10 +44,9 @@ describe('generators', () => {
 
   it('should return correct registered generator', async () => {
     const generators = new Generators();
-    const techdocs = new TechdocsGenerator({
+    const techdocs = TechdocsGenerator.fromConfig(new ConfigReader({}), {
       logger,
       containerRunner,
-      config: new ConfigReader({}),
     });
 
     generators.register('techdocs', techdocs);
diff --git a/packages/techdocs-common/src/stages/generate/generators.ts b/packages/techdocs-common/src/stages/generate/generators.ts
index af7958dcfb..3d1ad2b73b 100644
--- a/packages/techdocs-common/src/stages/generate/generators.ts
+++ b/packages/techdocs-common/src/stages/generate/generators.ts
@@ -38,10 +38,9 @@ export class Generators implements GeneratorBuilder {
   ): Promise<GeneratorBuilder> {
     const generators = new Generators();
 
-    const techdocsGenerator = new TechdocsGenerator({
+    const techdocsGenerator = TechdocsGenerator.fromConfig(config, {
       logger,
       containerRunner,
-      config,
     });
     generators.register('techdocs', techdocsGenerator);
 
diff --git a/packages/techdocs-common/src/stages/generate/helpers.test.ts b/packages/techdocs-common/src/stages/generate/helpers.test.ts
index b6b71e3e2b..fcf506098e 100644
--- a/packages/techdocs-common/src/stages/generate/helpers.test.ts
+++ b/packages/techdocs-common/src/stages/generate/helpers.test.ts
@@ -13,18 +13,20 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 import { getVoidLogger } from '@backstage/backend-common';
+import { ConfigReader } from '@backstage/config';
+import { ScmIntegrations } from '@backstage/integration';
 import fs from 'fs-extra';
 import mockFs from 'mock-fs';
 import os from 'os';
 import path, { resolve as resolvePath } from 'path';
 import { ParsedLocationAnnotation } from '../../helpers';
-import { RemoteProtocol } from '../prepare/types';
 import {
   addBuildTimestampMetadata,
   getGeneratorKey,
+  getMkdocsYml,
   getRepoUrlFromLocationAnnotation,
-  isValidRepoUrlForMkdocs,
   patchMkdocsYmlPreBuild,
   storeEtagMetadata,
   validateMkdocsYaml,
@@ -47,12 +49,26 @@ const mkdocsYmlWithExtensions = fs.readFileSync(
 const mkdocsYmlWithRepoUrl = fs.readFileSync(
   resolvePath(__filename, '../__fixtures__/mkdocs_with_repo_url.yml'),
 );
+const mkdocsYmlWithEditUri = fs.readFileSync(
+  resolvePath(__filename, '../__fixtures__/mkdocs_with_edit_uri.yml'),
+);
+const mkdocsYmlWithValidDocDir = fs.readFileSync(
+  resolvePath(__filename, '../__fixtures__/mkdocs_valid_doc_dir.yml'),
+);
 const mkdocsYmlWithInvalidDocDir = fs.readFileSync(
   resolvePath(__filename, '../__fixtures__/mkdocs_invalid_doc_dir.yml'),
 );
+const mkdocsYmlWithInvalidDocDir2 = fs.readFileSync(
+  resolvePath(__filename, '../__fixtures__/mkdocs_invalid_doc_dir2.yml'),
+);
+const mkdocsYmlWithComments = fs.readFileSync(
+  resolvePath(__filename, '../__fixtures__/mkdocs_with_comments.yml'),
+);
 const mockLogger = getVoidLogger();
 const rootDir = os.platform() === 'win32' ? 'C:\\rootDir' : '/rootDir';
 
+const scmIntegrations = ScmIntegrations.fromConfig(new ConfigReader({}));
+
 describe('helpers', () => {
   describe('getGeneratorKey', () => {
     it('should return techdocs as the only generator key', () => {
@@ -61,120 +77,85 @@ describe('helpers', () => {
     });
   });
 
-  describe('isValidRepoUrlForMkdocs', () => {
-    it('should return true for valid repo_url values for mkdocs', () => {
-      const validRepoUrls = [
-        'https://github.com/org/repo',
-        'https://github.com/backstage/backstage/',
-        'https://github.com/org123/repo1-2-3/',
-        'http://github.com/insecureOrg/insecureRepo',
-        'https://gitlab.com/org/repo',
-        'https://gitlab.com/backstage/backstage/',
-        'https://gitlab.com/org123/repo1-2-3/',
-        'http://gitlab.com/insecureOrg/insecureRepo',
-      ];
-
-      const validRemoteProtocols = ['github', 'gitlab'];
-
-      validRepoUrls.forEach(url => {
-        validRemoteProtocols.forEach(targetType => {
-          expect(
-            isValidRepoUrlForMkdocs(url, targetType as RemoteProtocol),
-          ).toBe(true);
-        });
-      });
-    });
-
-    it('should return false for invalid repo_urls values for mkdocs', () => {
-      const invalidRepoUrls = [
-        'git@github.com:org/repo',
-        'https://github.com/backstage/backstage/tree/master/plugins/techdocs-backend',
-      ];
-
-      invalidRepoUrls.forEach(url => {
-        expect(isValidRepoUrlForMkdocs(url, 'github')).toBe(false);
-      });
-    });
-
-    it('should return false for unsupported remote protocols', () => {
-      const validRepoUrl = 'https://github.com/backstage/backstage';
-
-      const unsupportedRemoteProtocols = ['dir', 'file', 'url'];
-
-      unsupportedRemoteProtocols.forEach(targetType => {
-        expect(
-          isValidRepoUrlForMkdocs(validRepoUrl, targetType as RemoteProtocol),
-        ).toBe(false);
-      });
-    });
-  });
-
   describe('getRepoUrlFromLocationAnnotation', () => {
-    it('should return undefined for unsupported location type', () => {
-      const parsedLocationAnnotation1: ParsedLocationAnnotation = {
+    it.each`
+      url                                                                        | repo_url                                    | edit_uri
+      ${'https://github.com/backstage/backstage'}                                | ${'https://github.com/backstage/backstage'} | ${undefined}
+      ${'https://github.com/backstage/backstage/tree/main/examples/techdocs/'}   | ${undefined}                                | ${'https://github.com/backstage/backstage/edit/main/examples/techdocs/docs'}
+      ${'https://github.com/backstage/backstage/tree/main/'}                     | ${undefined}                                | ${'https://github.com/backstage/backstage/edit/main/docs'}
+      ${'https://gitlab.com/backstage/backstage'}                                | ${'https://gitlab.com/backstage/backstage'} | ${undefined}
+      ${'https://gitlab.com/backstage/backstage/-/blob/main/examples/techdocs/'} | ${undefined}                                | ${'https://gitlab.com/backstage/backstage/-/edit/main/examples/techdocs/docs'}
+      ${'https://gitlab.com/backstage/backstage/-/blob/main/'}                   | ${undefined}                                | ${'https://gitlab.com/backstage/backstage/-/edit/main/docs'}
+    `('should convert $url', ({ url: target, repo_url, edit_uri }) => {
+      const parsedLocationAnnotation: ParsedLocationAnnotation = {
+        type: 'url',
+        target,
+      };
+
+      expect(
+        getRepoUrlFromLocationAnnotation(
+          parsedLocationAnnotation,
+          scmIntegrations,
+        ),
+      ).toEqual({ repo_url, edit_uri });
+    });
+
+    it.each`
+      url                                                                        | edit_uri
+      ${'https://github.com/backstage/backstage/tree/main/examples/techdocs/'}   | ${'https://github.com/backstage/backstage/edit/main/examples/techdocs/custom/folder'}
+      ${'https://github.com/backstage/backstage/tree/main/'}                     | ${'https://github.com/backstage/backstage/edit/main/custom/folder'}
+      ${'https://gitlab.com/backstage/backstage/-/blob/main/examples/techdocs/'} | ${'https://gitlab.com/backstage/backstage/-/edit/main/examples/techdocs/custom/folder'}
+      ${'https://gitlab.com/backstage/backstage/-/blob/main/'}                   | ${'https://gitlab.com/backstage/backstage/-/edit/main/custom/folder'}
+    `(
+      'should convert $url with custom docsFolder',
+      ({ url: target, edit_uri }) => {
+        const parsedLocationAnnotation: ParsedLocationAnnotation = {
+          type: 'url',
+          target,
+        };
+
+        expect(
+          getRepoUrlFromLocationAnnotation(
+            parsedLocationAnnotation,
+            scmIntegrations,
+            './custom/folder',
+          ),
+        ).toEqual({ edit_uri });
+      },
+    );
+
+    it.each`
+      url
+      ${'https://bitbucket.org/backstage/backstage/src/master/examples/techdocs/'}
+      ${'https://bitbucket.org/backstage/backstage/src/master/'}
+      ${'https://dev.azure.com/organization/project/_git/repository?path=%2Fexamples%2Ftechdocs'}
+      ${'https://dev.azure.com/organization/project/_git/repository?path=%2F'}
+    `('should ignore $url', ({ url: target }) => {
+      const parsedLocationAnnotation: ParsedLocationAnnotation = {
+        type: 'url',
+        target,
+      };
+
+      expect(
+        getRepoUrlFromLocationAnnotation(
+          parsedLocationAnnotation,
+          scmIntegrations,
+        ),
+      ).toEqual({});
+    });
+
+    it('should ignore unsupported location type', () => {
+      const parsedLocationAnnotation: ParsedLocationAnnotation = {
         type: 'dir',
         target: '/home/user/workspace/docs-repository',
       };
 
-      const parsedLocationAnnotation2: ParsedLocationAnnotation = {
-        type: 'file',
-        target: '/home/user/workspace/docs-repository/catalog-info.yaml',
-      };
-
-      const parsedLocationAnnotation3: ParsedLocationAnnotation = {
-        type: 'url',
-        target: 'https://my-website.com/storage/this/docs/repository',
-      };
-
-      expect(getRepoUrlFromLocationAnnotation(parsedLocationAnnotation1)).toBe(
-        undefined,
-      );
-      expect(getRepoUrlFromLocationAnnotation(parsedLocationAnnotation2)).toBe(
-        undefined,
-      );
-
-      expect(getRepoUrlFromLocationAnnotation(parsedLocationAnnotation3)).toBe(
-        undefined,
-      );
-    });
-
-    it('should return correct target url for supported hosts', () => {
-      const parsedLocationAnnotation1: ParsedLocationAnnotation = {
-        type: 'github',
-        target: 'https://github.com/backstage/backstage.git',
-      };
-
-      expect(getRepoUrlFromLocationAnnotation(parsedLocationAnnotation1)).toBe(
-        'https://github.com/backstage/backstage',
-      );
-
-      const parsedLocationAnnotation2: ParsedLocationAnnotation = {
-        type: 'github',
-        target: 'https://github.com/org/repo',
-      };
-
-      expect(getRepoUrlFromLocationAnnotation(parsedLocationAnnotation2)).toBe(
-        'https://github.com/org/repo',
-      );
-
-      const parsedLocationAnnotation3: ParsedLocationAnnotation = {
-        type: 'gitlab',
-        target: 'https://gitlab.com/org/repo',
-      };
-
-      expect(getRepoUrlFromLocationAnnotation(parsedLocationAnnotation3)).toBe(
-        'https://gitlab.com/org/repo',
-      );
-
-      const parsedLocationAnnotation4: ParsedLocationAnnotation = {
-        type: 'github',
-        target:
-          'github.com/backstage/backstage/blob/master/plugins/techdocs-backend/examples/documented-component',
-      };
-
-      expect(getRepoUrlFromLocationAnnotation(parsedLocationAnnotation4)).toBe(
-        'github.com/backstage/backstage/blob/master/plugins/techdocs-backend/examples/documented-component',
-      );
+      expect(
+        getRepoUrlFromLocationAnnotation(
+          parsedLocationAnnotation,
+          scmIntegrations,
+        ),
+      ).toEqual({});
     });
   });
 
@@ -183,7 +164,9 @@ describe('helpers', () => {
       mockFs({
         '/mkdocs.yml': mkdocsYml,
         '/mkdocs_with_repo_url.yml': mkdocsYmlWithRepoUrl,
+        '/mkdocs_with_edit_uri.yml': mkdocsYmlWithEditUri,
         '/mkdocs_with_extensions.yml': mkdocsYmlWithExtensions,
+        '/mkdocs_with_comments.yml': mkdocsYmlWithComments,
       });
     });
 
@@ -191,9 +174,9 @@ describe('helpers', () => {
       mockFs.restore();
     });
 
-    it('should add repo_url to mkdocs.yml', async () => {
+    it('should add edit_uri to mkdocs.yml', async () => {
       const parsedLocationAnnotation: ParsedLocationAnnotation = {
-        type: 'github',
+        type: 'url',
         target: 'https://github.com/backstage/backstage',
       };
 
@@ -201,6 +184,7 @@ describe('helpers', () => {
         '/mkdocs.yml',
         mockLogger,
         parsedLocationAnnotation,
+        scmIntegrations,
       );
 
       const updatedMkdocsYml = await fs.readFile('/mkdocs.yml');
@@ -212,7 +196,7 @@ describe('helpers', () => {
 
     it('should add repo_url to mkdocs.yml that contains custom yaml tags', async () => {
       const parsedLocationAnnotation: ParsedLocationAnnotation = {
-        type: 'github',
+        type: 'url',
         target: 'https://github.com/backstage/backstage',
       };
 
@@ -220,6 +204,7 @@ describe('helpers', () => {
         '/mkdocs_with_extensions.yml',
         mockLogger,
         parsedLocationAnnotation,
+        scmIntegrations,
       );
 
       const updatedMkdocsYml = await fs.readFile('/mkdocs_with_extensions.yml');
@@ -234,7 +219,7 @@ describe('helpers', () => {
 
     it('should not override existing repo_url in mkdocs.yml', async () => {
       const parsedLocationAnnotation: ParsedLocationAnnotation = {
-        type: 'github',
+        type: 'url',
         target: 'https://github.com/neworg/newrepo',
       };
 
@@ -242,6 +227,7 @@ describe('helpers', () => {
         '/mkdocs_with_repo_url.yml',
         mockLogger,
         parsedLocationAnnotation,
+        scmIntegrations,
       );
 
       const updatedMkdocsYml = await fs.readFile('/mkdocs_with_repo_url.yml');
@@ -253,6 +239,51 @@ describe('helpers', () => {
         'repo_url: https://github.com/neworg/newrepo',
       );
     });
+
+    it('should not override existing edit_uri in mkdocs.yml', async () => {
+      const parsedLocationAnnotation: ParsedLocationAnnotation = {
+        type: 'url',
+        target: 'https://github.com/neworg/newrepo',
+      };
+
+      await patchMkdocsYmlPreBuild(
+        '/mkdocs_with_edit_uri.yml',
+        mockLogger,
+        parsedLocationAnnotation,
+        scmIntegrations,
+      );
+
+      const updatedMkdocsYml = await fs.readFile('/mkdocs_with_edit_uri.yml');
+
+      expect(updatedMkdocsYml.toString()).toContain(
+        'edit_uri: https://github.com/backstage/backstage/edit/main/docs',
+      );
+      expect(updatedMkdocsYml.toString()).not.toContain(
+        'https://github.com/neworg/newrepo',
+      );
+    });
+
+    it('should not update mkdocs.yml if nothing should be changed', async () => {
+      const parsedLocationAnnotation: ParsedLocationAnnotation = {
+        type: 'dir',
+        target: '/unsupported/path',
+      };
+
+      await patchMkdocsYmlPreBuild(
+        '/mkdocs_with_comments.yml',
+        mockLogger,
+        parsedLocationAnnotation,
+        scmIntegrations,
+      );
+
+      const updatedMkdocsYml = await fs.readFile('/mkdocs_with_comments.yml');
+
+      expect(updatedMkdocsYml.toString()).toContain(
+        '# This is a comment that is removed after editing',
+      );
+      expect(updatedMkdocsYml.toString()).not.toContain('edit_uri');
+      expect(updatedMkdocsYml.toString()).not.toContain('repo_url');
+    });
   });
 
   describe('addBuildTimestampMetadata', () => {
@@ -331,41 +362,68 @@ describe('helpers', () => {
     });
   });
 
-  describe('validateMkdocsYaml', () => {
-    beforeEach(() => {
-      mockFs({
-        '/mkdocs.yml': mkdocsYml,
-        '/mkdocs_with_extensions.yml': mkdocsYmlWithExtensions,
-        '/mkdocs_invalid_doc_dir.yml': mkdocsYmlWithInvalidDocDir,
-      });
-    });
-
+  describe('getMkdocsYml', () => {
     afterEach(() => {
       mockFs.restore();
     });
 
     const inputDir = resolvePath(__filename, '../__fixtures__/');
+
+    it('returns expected contents when .yml file is present', async () => {
+      const key = path.join(inputDir, 'mkdocs.yml');
+      mockFs({ [key]: mkdocsYml });
+      const { path: mkdocsPath, content } = await getMkdocsYml(inputDir);
+
+      expect(mkdocsPath).toBe(key);
+      expect(content).toBe(mkdocsYml.toString());
+    });
+
+    it('returns expected contents when .yaml file is present', async () => {
+      const key = path.join(inputDir, 'mkdocs.yaml');
+      mockFs({ [key]: mkdocsYml });
+      const { path: mkdocsPath, content } = await getMkdocsYml(inputDir);
+      expect(mkdocsPath).toBe(key);
+      expect(content).toBe(mkdocsYml.toString());
+    });
+
+    it('throws when neither .yml nor .yaml file is present', async () => {
+      const invalidInputDir = resolvePath(__filename);
+      await expect(getMkdocsYml(invalidInputDir)).rejects.toThrowError(
+        /Could not read MkDocs YAML config file mkdocs.yml or mkdocs.yaml for validation/,
+      );
+    });
+  });
+
+  describe('validateMkdocsYaml', () => {
+    const inputDir = resolvePath(__filename, '../__fixtures__/');
+
     it('should return true on when no docs_dir present', async () => {
       await expect(
-        validateMkdocsYaml(inputDir, '/mkdocs.yml'),
+        validateMkdocsYaml(inputDir, mkdocsYml.toString()),
+      ).resolves.toBeUndefined();
+    });
+
+    it('should return true on when a valid docs_dir is present', async () => {
+      await expect(
+        validateMkdocsYaml(inputDir, mkdocsYmlWithValidDocDir.toString()),
       ).resolves.toBeUndefined();
     });
 
     it('should return false on absolute doc_dir path', async () => {
       await expect(
-        validateMkdocsYaml(inputDir, '/mkdocs_invalid_doc_dir.yml'),
+        validateMkdocsYaml(inputDir, mkdocsYmlWithInvalidDocDir.toString()),
       ).rejects.toThrow();
     });
 
     it('should return false on doc_dir path that traverses directory structure backwards', async () => {
       await expect(
-        validateMkdocsYaml(inputDir, '/mkdocs_invalid_doc_dir2.yml'),
+        validateMkdocsYaml(inputDir, mkdocsYmlWithInvalidDocDir2.toString()),
       ).rejects.toThrow();
     });
 
     it('should validate files with custom yaml tags', async () => {
       await expect(
-        validateMkdocsYaml(inputDir, '/mkdocs_with_extensions.yml'),
+        validateMkdocsYaml(inputDir, mkdocsYmlWithExtensions.toString()),
       ).resolves.toBeUndefined();
     });
   });
diff --git a/packages/techdocs-common/src/stages/generate/helpers.ts b/packages/techdocs-common/src/stages/generate/helpers.ts
index 086377b4ef..0ac05e7dd2 100644
--- a/packages/techdocs-common/src/stages/generate/helpers.ts
+++ b/packages/techdocs-common/src/stages/generate/helpers.ts
@@ -14,15 +14,17 @@
  * limitations under the License.
  */
 
-import { Entity } from '@backstage/catalog-model';
 import { isChildPath } from '@backstage/backend-common';
+import { Entity } from '@backstage/catalog-model';
+import { ScmIntegrationRegistry } from '@backstage/integration';
 import { spawn } from 'child_process';
 import fs from 'fs-extra';
+import gitUrlParse from 'git-url-parse';
 import yaml, { DEFAULT_SCHEMA, Type } from 'js-yaml';
+import path, { resolve as resolvePath } from 'path';
 import { PassThrough, Writable } from 'stream';
 import { Logger } from 'winston';
 import { ParsedLocationAnnotation } from '../../helpers';
-import { RemoteProtocol } from '../prepare/types';
 import { SupportedGeneratorKey } from './types';
 
 // TODO: Implement proper support for more generators.
@@ -80,63 +82,42 @@ export const runCommand = async ({
 };
 
 /**
- * Return true if mkdocs can compile docs with provided repo_url
- *
- * Valid repo_url examples in mkdocs.yml
- * - https://github.com/backstage/backstage
- * - https://gitlab.com/org/repo/
- * - http://github.com/backstage/backstage
- * - A http(s) protocol URL to the root of the repository
- *
- * Invalid repo_url examples in mkdocs.yml
- * - https://github.com/backstage/backstage/blob/master/plugins/techdocs-backend/examples/documented-component
- * - (anything that is not valid as described above)
- *
- * @param {string} repoUrl URL supposed to be used as repo_url in mkdocs.yml
- * @param {RemoteProtocol} locationType Type of source code host - github, gitlab, dir, url, etc.
- * @returns {boolean}
- */
-export const isValidRepoUrlForMkdocs = (
-  repoUrl: string,
-  locationType: RemoteProtocol,
-): boolean => {
-  // Trim trailing slash
-  const cleanRepoUrl = repoUrl.replace(/\/$/, '');
-
-  if (locationType === 'github' || locationType === 'gitlab') {
-    // A valid repoUrl to the root of the repository will be split into 5 strings if split using the / delimiter.
-    // We do not want URLs which have more than that number of forward slashes since they will signify a non-root location
-    // Note: This is not the best possible implementation but will work most of the times.. Feel free to improve or
-    // highlight edge cases.
-    return cleanRepoUrl.split('/').length === 5;
-  }
-
-  return false;
-};
-
-/**
- * Return a valid URL of the repository used in backstage.io/techdocs-ref annotation.
- * Return undefined if the `target` is not valid in context of repo_url in mkdocs.yml
- * Alter URL so that it is a valid repo_url config in mkdocs.yml
+ * Return the source url for MkDocs based on the backstage.io/techdocs-ref annotation.
+ * Depending on the type of target, it can either return a repo_url, an edit_uri, both, or none.
  *
  * @param {ParsedLocationAnnotation} parsedLocationAnnotation Object with location url and type
- * @returns {string | undefined}
+ * @param {ScmIntegrationRegistry} scmIntegrations the scmIntegration to do url transformations
+ * @param {string} docsFolder the configured docs folder in the mkdocs.yml (defaults to 'docs')
+ * @returns the settings for the mkdocs.yml
  */
 export const getRepoUrlFromLocationAnnotation = (
   parsedLocationAnnotation: ParsedLocationAnnotation,
-): string | undefined => {
+  scmIntegrations: ScmIntegrationRegistry,
+  docsFolder: string = 'docs',
+): { repo_url?: string; edit_uri?: string } => {
   const { type: locationType, target } = parsedLocationAnnotation;
 
-  // Add more options from the RemoteProtocol type of parsedLocationAnnotation.type here
-  // when TechDocs supports more hosts and if mkdocs can generated an Edit URL for them.
-  const supportedHosts = ['github', 'gitlab'];
+  if (locationType === 'url') {
+    const integration = scmIntegrations.byUrl(target);
 
-  if (supportedHosts.includes(locationType)) {
-    // Trim .git or .git/ from the end of repository url
-    return target.replace(/.git\/*$/, '');
+    // We only support it for github and gitlab for now as the edit_uri
+    // is not properly supported for others yet.
+    if (integration && ['github', 'gitlab'].includes(integration.type)) {
+      // handle the case where a user manually writes url:https://github.com/backstage/backstage i.e. without /blob/...
+      const { filepathtype } = gitUrlParse(target);
+      if (filepathtype === '') {
+        return { repo_url: target };
+      }
+
+      const sourceFolder = integration.resolveUrl({
+        url: `./${docsFolder}`,
+        base: target,
+      });
+      return { edit_uri: integration.resolveEditUrl(sourceFolder) };
+    }
   }
 
-  return undefined;
+  return {};
 };
 
 class UnknownTag {
@@ -154,31 +135,58 @@ const MKDOCS_SCHEMA = DEFAULT_SCHEMA.extend([
   }),
 ]);
 
+/**
+ * Finds and loads the contents of either an mkdocs.yml or mkdocs.yaml file,
+ * depending on which is present (MkDocs supports both as of v1.2.2).
+ *
+ * @param {string} inputDir base dir to be searched for either an mkdocs.yml or
+ *   mkdocs.yaml file.
+ */
+export const getMkdocsYml = async (
+  inputDir: string,
+): Promise<{ path: string; content: string }> => {
+  let mkdocsYmlPath: string;
+  let mkdocsYmlFileString: string;
+  try {
+    mkdocsYmlPath = path.join(inputDir, 'mkdocs.yaml');
+    mkdocsYmlFileString = await fs.readFile(mkdocsYmlPath, 'utf8');
+  } catch {
+    try {
+      mkdocsYmlPath = path.join(inputDir, 'mkdocs.yml');
+      mkdocsYmlFileString = await fs.readFile(mkdocsYmlPath, 'utf8');
+    } catch (error) {
+      throw new Error(
+        `Could not read MkDocs YAML config file mkdocs.yml or mkdocs.yaml for validation: ${error.message}`,
+      );
+    }
+  }
+
+  return {
+    path: mkdocsYmlPath,
+    content: mkdocsYmlFileString,
+  };
+};
+
 /**
  * Validating mkdocs config file for incorrect/insecure values
  * Throws on invalid configs
  *
  * @param {string} inputDir base dir to be used as a docs_dir path validity check
- * @param {string} mkdocsYmlPath Absolute path to mkdocs.yml or equivalent of a docs site
+ * @param {string} mkdocsYmlFileString The string contents of the loaded
+ *   mkdocs.yml or equivalent of a docs site
  */
 export const validateMkdocsYaml = async (
   inputDir: string,
-  mkdocsYmlPath: string,
+  mkdocsYmlFileString: string,
 ) => {
-  let mkdocsYmlFileString;
-  try {
-    mkdocsYmlFileString = await fs.readFile(mkdocsYmlPath, 'utf8');
-  } catch (error) {
-    throw new Error(
-      `Could not read MkDocs YAML config file ${mkdocsYmlPath} before for validation: ${error.message}`,
-    );
-  }
-
   const mkdocsYml: any = yaml.load(mkdocsYmlFileString, {
     schema: MKDOCS_SCHEMA,
   });
 
-  if (mkdocsYml.docs_dir && !isChildPath(inputDir, mkdocsYml.docs_dir)) {
+  if (
+    mkdocsYml.docs_dir &&
+    !isChildPath(inputDir, resolvePath(inputDir, mkdocsYml.docs_dir))
+  ) {
     throw new Error(
       `docs_dir configuration value in mkdocs can't be an absolute directory or start with ../ for security reasons.
        Use relative paths instead which are resolved relative to your mkdocs.yml file location.`,
@@ -190,7 +198,7 @@ export const validateMkdocsYaml = async (
  * Update the mkdocs.yml file before TechDocs generator uses it to generate docs site.
  *
  * List of tasks:
- * - Add repo_url if it does not exists
+ * - Add repo_url or edit_uri if it does not exists
  * If mkdocs.yml has a repo_url, the generated docs site gets an Edit button on the pages by default.
  * If repo_url is missing in mkdocs.yml, we will use techdocs annotation of the entity to possibly get
  * the repository URL.
@@ -201,12 +209,18 @@ export const validateMkdocsYaml = async (
  * @param {string} mkdocsYmlPath Absolute path to mkdocs.yml or equivalent of a docs site
  * @param {Logger} logger
  * @param {ParsedLocationAnnotation} parsedLocationAnnotation Object with location url and type
+ * @param {ScmIntegrationRegistry} scmIntegrations the scmIntegration to do url transformations
  */
 export const patchMkdocsYmlPreBuild = async (
   mkdocsYmlPath: string,
   logger: Logger,
   parsedLocationAnnotation: ParsedLocationAnnotation,
+  scmIntegrations: ScmIntegrationRegistry,
 ) => {
+  // We only want to override the mkdocs.yml if it has actually changed. This is relevant if
+  // used with a 'dir' location on the file system as this would permanently update the file.
+  let didEdit = false;
+
   let mkdocsYmlFileString;
   try {
     mkdocsYmlFileString = await fs.readFile(mkdocsYmlPath, 'utf8');
@@ -233,23 +247,37 @@ export const patchMkdocsYmlPreBuild = async (
     return;
   }
 
-  // Add repo_url to mkdocs.yml if it is missing. This will enable the Page edit button generated by MkDocs.
-  if (!('repo_url' in mkdocsYml)) {
-    const repoUrl = getRepoUrlFromLocationAnnotation(parsedLocationAnnotation);
-    if (repoUrl !== undefined) {
-      // mkdocs.yml will not build with invalid repo_url. So, make sure it is valid.
-      if (isValidRepoUrlForMkdocs(repoUrl, parsedLocationAnnotation.type)) {
-        mkdocsYml.repo_url = repoUrl;
-      }
+  // Add edit_uri and/or repo_url to mkdocs.yml if it is missing.
+  // This will enable the Page edit button generated by MkDocs.
+  // If the either has been set, keep the original value
+  if (!('repo_url' in mkdocsYml) && !('edit_uri' in mkdocsYml)) {
+    const result = getRepoUrlFromLocationAnnotation(
+      parsedLocationAnnotation,
+      scmIntegrations,
+      mkdocsYml.docs_dir,
+    );
+
+    if (result.repo_url || result.edit_uri) {
+      mkdocsYml.repo_url = result.repo_url;
+      mkdocsYml.edit_uri = result.edit_uri;
+      didEdit = true;
+
+      logger.info(
+        `Set ${JSON.stringify(
+          result,
+        )}. You can disable this feature by manually setting 'repo_url' or 'edit_uri' according to the MkDocs documentation at https://www.mkdocs.org/user-guide/configuration/#repo_url`,
+      );
     }
   }
 
   try {
-    await fs.writeFile(
-      mkdocsYmlPath,
-      yaml.dump(mkdocsYml, { schema: MKDOCS_SCHEMA }),
-      'utf8',
-    );
+    if (didEdit) {
+      await fs.writeFile(
+        mkdocsYmlPath,
+        yaml.dump(mkdocsYml, { schema: MKDOCS_SCHEMA }),
+        'utf8',
+      );
+    }
   } catch (error) {
     logger.warn(
       `Could not write to ${mkdocsYmlPath} after updating it before running the generator. ${error.message}`,
diff --git a/packages/techdocs-common/src/stages/generate/index.ts b/packages/techdocs-common/src/stages/generate/index.ts
index 382712ccbc..eb015a5c2d 100644
--- a/packages/techdocs-common/src/stages/generate/index.ts
+++ b/packages/techdocs-common/src/stages/generate/index.ts
@@ -15,4 +15,8 @@
  */
 export { TechdocsGenerator } from './techdocs';
 export { Generators } from './generators';
-export type { GeneratorBuilder, GeneratorBase } from './types';
+export type {
+  GeneratorBuilder,
+  GeneratorBase,
+  GeneratorRunOptions,
+} from './types';
diff --git a/packages/techdocs-common/src/stages/generate/techdocs.test.ts b/packages/techdocs-common/src/stages/generate/techdocs.test.ts
new file mode 100644
index 0000000000..f3a91657e1
--- /dev/null
+++ b/packages/techdocs-common/src/stages/generate/techdocs.test.ts
@@ -0,0 +1,140 @@
+/*
+ * Copyright 2020 Spotify AB
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { ConfigReader } from '@backstage/config';
+import { readGeneratorConfig } from './techdocs';
+
+const mockLogger = {
+  warn: jest.fn(),
+};
+
+describe('readGeneratorConfig', () => {
+  beforeEach(() => {
+    jest.resetAllMocks();
+  });
+
+  const logger = mockLogger as any;
+
+  it('defaults to runIn docker', () => {
+    const config = new ConfigReader({
+      techdocs: {
+        generator: {},
+      },
+    });
+
+    expect(readGeneratorConfig(config, logger)).toEqual({
+      runIn: 'docker',
+      dockerImage: undefined,
+      pullImage: undefined,
+    });
+  });
+
+  it('should read local config', () => {
+    const config = new ConfigReader({
+      techdocs: {
+        generator: {
+          runIn: 'local',
+        },
+      },
+    });
+
+    expect(readGeneratorConfig(config, logger)).toEqual({
+      runIn: 'local',
+    });
+  });
+
+  it('should read docker config', () => {
+    const config = new ConfigReader({
+      techdocs: {
+        generator: {
+          runIn: 'docker',
+        },
+      },
+    });
+
+    expect(readGeneratorConfig(config, logger)).toEqual({
+      runIn: 'docker',
+    });
+  });
+
+  it('should read custom docker image', () => {
+    const config = new ConfigReader({
+      techdocs: {
+        generator: {
+          runIn: 'docker',
+          dockerImage: 'my-org/techdocs',
+        },
+      },
+    });
+
+    expect(readGeneratorConfig(config, logger)).toEqual({
+      runIn: 'docker',
+      dockerImage: 'my-org/techdocs',
+    });
+  });
+
+  it('should read config disabling docker pull', () => {
+    const config = new ConfigReader({
+      techdocs: {
+        generator: {
+          runIn: 'docker',
+          dockerImage: 'my-org/techdocs',
+          pullImage: false,
+        },
+      },
+    });
+
+    expect(readGeneratorConfig(config, logger)).toEqual({
+      runIn: 'docker',
+      dockerImage: 'my-org/techdocs',
+      pullImage: false,
+    });
+  });
+
+  describe('with legacy techdocs.generators.techdocs config', () => {
+    it('should read legacy docker option', () => {
+      const config = new ConfigReader({
+        techdocs: {
+          generators: {
+            techdocs: 'docker',
+          },
+        },
+      });
+
+      expect(readGeneratorConfig(config, logger)).toEqual({
+        runIn: 'docker',
+      });
+    });
+
+    it('legacy option should log warning', () => {
+      const config = new ConfigReader({
+        techdocs: {
+          generators: {
+            techdocs: 'local',
+          },
+        },
+      });
+
+      expect(readGeneratorConfig(config, logger)).toEqual({
+        runIn: 'local',
+      });
+      expect(logger.warn).toHaveBeenCalledWith(
+        `The 'techdocs.generators.techdocs' configuration key is deprecated and will be removed in the future. Please use 'techdocs.generator' instead. ` +
+          `See here https://backstage.io/docs/features/techdocs/configuration`,
+      );
+    });
+  });
+});
diff --git a/packages/techdocs-common/src/stages/generate/techdocs.ts b/packages/techdocs-common/src/stages/generate/techdocs.ts
index 041dff1d2f..c3d48507ce 100644
--- a/packages/techdocs-common/src/stages/generate/techdocs.ts
+++ b/packages/techdocs-common/src/stages/generate/techdocs.ts
@@ -17,56 +17,65 @@
 import { ContainerRunner } from '@backstage/backend-common';
 import { Config } from '@backstage/config';
 import path from 'path';
-import { PassThrough } from 'stream';
 import { Logger } from 'winston';
+import {
+  ScmIntegrationRegistry,
+  ScmIntegrations,
+} from '@backstage/integration';
 import {
   addBuildTimestampMetadata,
+  getMkdocsYml,
   patchMkdocsYmlPreBuild,
   runCommand,
   storeEtagMetadata,
   validateMkdocsYaml,
 } from './helpers';
-import { GeneratorBase, GeneratorRunOptions } from './types';
+import {
+  GeneratorBase,
+  GeneratorConfig,
+  GeneratorRunInType,
+  GeneratorRunOptions,
+} from './types';
 
-type TechdocsGeneratorOptions = {
-  // This option enables users to configure if they want to use TechDocs container
-  // or generate without the container.
-  // This is used to avoid running into Docker in Docker environment.
-  runGeneratorIn: string;
-};
-
-const createStream = (): [string[], PassThrough] => {
-  const log = [] as Array<string>;
-
-  const stream = new PassThrough();
-  stream.on('data', chunk => {
-    const textValue = chunk.toString().trim();
-    if (textValue?.length > 1) log.push(textValue);
-  });
-
-  return [log, stream];
-};
+const defaultDockerImage = 'spotify/techdocs';
 
 export class TechdocsGenerator implements GeneratorBase {
   private readonly logger: Logger;
   private readonly containerRunner: ContainerRunner;
-  private readonly options: TechdocsGeneratorOptions;
+  private readonly options: GeneratorConfig;
+  private readonly scmIntegrations: ScmIntegrationRegistry;
+
+  static fromConfig(
+    config: Config,
+    {
+      containerRunner,
+      logger,
+    }: { containerRunner: ContainerRunner; logger: Logger },
+  ) {
+    const scmIntegrations = ScmIntegrations.fromConfig(config);
+    return new TechdocsGenerator({
+      logger,
+      containerRunner,
+      config,
+      scmIntegrations,
+    });
+  }
 
   constructor({
     logger,
     containerRunner,
     config,
+    scmIntegrations,
   }: {
     logger: Logger;
     containerRunner: ContainerRunner;
     config: Config;
+    scmIntegrations: ScmIntegrationRegistry;
   }) {
     this.logger = logger;
-    this.options = {
-      runGeneratorIn:
-        config.getOptionalString('techdocs.generators.techdocs') ?? 'docker',
-    };
+    this.options = readGeneratorConfig(config, logger);
     this.containerRunner = containerRunner;
+    this.scmIntegrations = scmIntegrations;
   }
 
   public async run({
@@ -74,23 +83,24 @@ export class TechdocsGenerator implements GeneratorBase {
     outputDir,
     parsedLocationAnnotation,
     etag,
+    logger: childLogger,
+    logStream,
   }: GeneratorRunOptions): Promise<void> {
-    const [log, logStream] = createStream();
-
-    // TODO: In future mkdocs.yml can be mkdocs.yaml. So, use a config variable here to find out
-    // the correct file name.
     // Do some updates to mkdocs.yml before generating docs e.g. adding repo_url
-    const mkdocsYmlPath = path.join(inputDir, 'mkdocs.yml');
+    const { path: mkdocsYmlPath, content } = await getMkdocsYml(inputDir);
+
+    // validate the docs_dir first
+    await validateMkdocsYaml(inputDir, content);
+
     if (parsedLocationAnnotation) {
       await patchMkdocsYmlPreBuild(
         mkdocsYmlPath,
-        this.logger,
+        childLogger,
         parsedLocationAnnotation,
+        this.scmIntegrations,
       );
     }
 
-    await validateMkdocsYaml(inputDir, mkdocsYmlPath);
-
     // Directories to bind on container
     const mountDirs = {
       [inputDir]: '/input',
@@ -98,7 +108,7 @@ export class TechdocsGenerator implements GeneratorBase {
     };
 
     try {
-      switch (this.options.runGeneratorIn) {
+      switch (this.options.runIn) {
         case 'local':
           await runCommand({
             command: 'mkdocs',
@@ -108,13 +118,13 @@ export class TechdocsGenerator implements GeneratorBase {
             },
             logStream,
           });
-          this.logger.info(
+          childLogger.info(
             `Successfully generated docs from ${inputDir} into ${outputDir} using local mkdocs`,
           );
           break;
         case 'docker':
           await this.containerRunner.runContainer({
-            imageName: 'spotify/techdocs',
+            imageName: this.options.dockerImage ?? defaultDockerImage,
             args: ['build', '-d', '/output'],
             logStream,
             mountDirs,
@@ -122,21 +132,21 @@ export class TechdocsGenerator implements GeneratorBase {
             // Set the home directory inside the container as something that applications can
             // write to, otherwise they will just fail trying to write to /
             envVars: { HOME: '/tmp' },
+            pullImage: this.options.pullImage,
           });
-          this.logger.info(
+          childLogger.info(
             `Successfully generated docs from ${inputDir} into ${outputDir} using techdocs-container`,
           );
           break;
         default:
           throw new Error(
-            `Invalid config value "${this.options.runGeneratorIn}" provided in 'techdocs.generators.techdocs'.`,
+            `Invalid config value "${this.options.runIn}" provided in 'techdocs.generators.techdocs'.`,
           );
       }
     } catch (error) {
       this.logger.debug(
         `Failed to generate docs from ${inputDir} into ${outputDir}`,
       );
-      this.logger.error(`Build failed with error: ${log}`);
       throw new Error(
         `Failed to generate docs from ${inputDir} into ${outputDir} with error ${error.message}`,
       );
@@ -150,7 +160,7 @@ export class TechdocsGenerator implements GeneratorBase {
     // Creates techdocs_metadata.json if file does not exist.
     await addBuildTimestampMetadata(
       path.join(outputDir, 'techdocs_metadata.json'),
-      this.logger,
+      childLogger,
     );
 
     // Add etag of the prepared tree to techdocs_metadata.json
@@ -163,3 +173,28 @@ export class TechdocsGenerator implements GeneratorBase {
     }
   }
 }
+
+export function readGeneratorConfig(
+  config: Config,
+  logger: Logger,
+): GeneratorConfig {
+  const legacyGeneratorType = config.getOptionalString(
+    'techdocs.generators.techdocs',
+  ) as GeneratorRunInType;
+
+  if (legacyGeneratorType) {
+    logger.warn(
+      `The 'techdocs.generators.techdocs' configuration key is deprecated and will be removed in the future. Please use 'techdocs.generator' instead. ` +
+        `See here https://backstage.io/docs/features/techdocs/configuration`,
+    );
+  }
+
+  return {
+    runIn:
+      legacyGeneratorType ??
+      config.getOptionalString('techdocs.generator.runIn') ??
+      'docker',
+    dockerImage: config.getOptionalString('techdocs.generator.dockerImage'),
+    pullImage: config.getOptionalBoolean('techdocs.generator.pullImage'),
+  };
+}
diff --git a/packages/techdocs-common/src/stages/generate/types.ts b/packages/techdocs-common/src/stages/generate/types.ts
index 5ea9721c54..3559716be0 100644
--- a/packages/techdocs-common/src/stages/generate/types.ts
+++ b/packages/techdocs-common/src/stages/generate/types.ts
@@ -13,10 +13,24 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 import { Entity } from '@backstage/catalog-model';
 import { Writable } from 'stream';
+import { Logger } from 'winston';
 import { ParsedLocationAnnotation } from '../../helpers';
 
+// Determines where the generator will be run
+export type GeneratorRunInType = 'docker' | 'local';
+
+/**
+ * The techdocs generator configurations options.
+ */
+export type GeneratorConfig = {
+  runIn: GeneratorRunInType;
+  dockerImage?: string;
+  pullImage?: boolean;
+};
+
 /**
  * The values that the generator will receive.
  *
@@ -24,13 +38,15 @@ import { ParsedLocationAnnotation } from '../../helpers';
  * @param {string} outputDir Directory to store generated docs in. Usually - a newly created temporary directory.
  * @param {ParsedLocationAnnotation} parsedLocationAnnotation backstage.io/techdocs-ref annotation of an entity
  * @param {string} etag A unique identifier for the prepared tree e.g. commit SHA. If provided it will be stored in techdocs_metadata.json.
- * @param {Writable} [logStream] A dedicated log stream
+ * @param {Logger} [logger] A logger that forwards the messages to the caller to be displayed outside of the backend.
+ * @param {Writable} [logStream] A log stream that can send raw log messages to the caller to be displayed outside of the backend..
  */
 export type GeneratorRunOptions = {
   inputDir: string;
   outputDir: string;
   parsedLocationAnnotation?: ParsedLocationAnnotation;
   etag?: string;
+  logger: Logger;
   logStream?: Writable;
 };
 
diff --git a/packages/techdocs-common/src/stages/prepare/commonGit.test.ts b/packages/techdocs-common/src/stages/prepare/commonGit.test.ts
deleted file mode 100644
index d1c6c99c6d..0000000000
--- a/packages/techdocs-common/src/stages/prepare/commonGit.test.ts
+++ /dev/null
@@ -1,97 +0,0 @@
-/*
- * Copyright 2020 The Backstage Authors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import { getVoidLogger } from '@backstage/backend-common';
-import { ConfigReader } from '@backstage/config';
-import { checkoutGitRepository } from '../../helpers';
-import { CommonGitPreparer } from './commonGit';
-
-function normalizePath(path: string) {
-  return path
-    .replace(/^[a-z]:/i, '')
-    .split('\\')
-    .join('/');
-}
-
-jest.mock('../../helpers', () => ({
-  ...jest.requireActual<{}>('../../helpers'),
-  checkoutGitRepository: jest.fn(() => '/tmp/backstage-repo/org/name/branch'),
-  getLastCommitTimestamp: jest.fn(() => 12345678),
-}));
-
-const createMockEntity = (annotations = {}) => {
-  return {
-    apiVersion: 'version',
-    kind: 'TestKind',
-    metadata: {
-      name: 'test-component-name',
-      annotations: {
-        ...annotations,
-      },
-    },
-  };
-};
-
-const mockConfig = new ConfigReader({});
-
-const logger = getVoidLogger();
-
-describe('commonGit preparer', () => {
-  it('should prepare temp docs path from github repo', async () => {
-    const preparer = new CommonGitPreparer(mockConfig, logger);
-
-    const mockEntity = createMockEntity({
-      'backstage.io/techdocs-ref':
-        'github:https://github.com/backstage/backstage/blob/master/plugins/techdocs-backend/examples/documented-component',
-    });
-
-    const { preparedDir } = await preparer.prepare(mockEntity);
-    expect(checkoutGitRepository).toHaveBeenCalledTimes(1);
-    expect(normalizePath(preparedDir)).toEqual(
-      '/tmp/backstage-repo/org/name/branch/plugins/techdocs-backend/examples/documented-component',
-    );
-  });
-
-  it('should prepare temp docs path from gitlab repo', async () => {
-    const preparer = new CommonGitPreparer(mockConfig, logger);
-
-    const mockEntity = createMockEntity({
-      'backstage.io/techdocs-ref':
-        'gitlab:https://gitlab.com/xesjkeee/go-logger/blob/master/catalog-info.yaml',
-    });
-
-    const { preparedDir } = await preparer.prepare(mockEntity);
-    expect(checkoutGitRepository).toHaveBeenCalledTimes(2);
-    expect(normalizePath(preparedDir)).toEqual(
-      '/tmp/backstage-repo/org/name/branch/catalog-info.yaml',
-    );
-  });
-
-  it('should prepare temp docs path from azure repo', async () => {
-    const preparer = new CommonGitPreparer(mockConfig, logger);
-
-    const mockEntity = createMockEntity({
-      'backstage.io/techdocs-ref':
-        'azure/api:https://dev.azure.com/backstage-org/backstage-project/_git/template-repo?path=%2Ftemplate.yaml',
-    });
-
-    const { preparedDir } = await preparer.prepare(mockEntity);
-    expect(checkoutGitRepository).toHaveBeenCalledTimes(3);
-    expect(normalizePath(preparedDir)).toEqual(
-      '/tmp/backstage-repo/org/name/branch/template.yaml',
-    );
-  });
-});
diff --git a/packages/techdocs-common/src/stages/prepare/commonGit.ts b/packages/techdocs-common/src/stages/prepare/commonGit.ts
deleted file mode 100644
index ad70283e78..0000000000
--- a/packages/techdocs-common/src/stages/prepare/commonGit.ts
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- * Copyright 2020 The Backstage Authors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-import { NotModifiedError } from '@backstage/errors';
-import { Entity } from '@backstage/catalog-model';
-import { Config } from '@backstage/config';
-import parseGitUrl from 'git-url-parse';
-import path from 'path';
-import { Logger } from 'winston';
-import {
-  checkoutGitRepository,
-  getLastCommitTimestamp,
-  parseReferenceAnnotation,
-} from '../../helpers';
-import { PreparerBase, PreparerResponse } from './types';
-
-export class CommonGitPreparer implements PreparerBase {
-  private readonly config: Config;
-  private readonly logger: Logger;
-
-  constructor(config: Config, logger: Logger) {
-    this.config = config;
-    this.logger = logger;
-  }
-
-  async prepare(
-    entity: Entity,
-    options?: { etag?: string },
-  ): Promise<PreparerResponse> {
-    this.logger.warn(
-      `You are using the legacy git preparer in TechDocs for \`${entity.metadata.name}\` which will be removed in near future (March 2021). ` +
-        `Migrate to URL reader by updating \`backstage.io/techdocs-ref\` annotation in \`catalog-info.yaml\` ` +
-        `to be prefixed with \`url:\`. Read the migration guide and benefits at https://github.com/backstage/backstage/issues/4409 `,
-    );
-
-    const { target } = parseReferenceAnnotation(
-      'backstage.io/techdocs-ref',
-      entity,
-    );
-
-    try {
-      // Update repository or do a fresh clone.
-      const repoPath = await checkoutGitRepository(
-        target,
-        this.config,
-        this.logger,
-      );
-      // Check if etag has changed for cache invalidation.
-      const etag = await getLastCommitTimestamp(repoPath, this.logger);
-      if (options?.etag === etag.toString()) {
-        throw new NotModifiedError();
-      }
-
-      const parsedGitLocation = parseGitUrl(target);
-      return {
-        preparedDir: path.join(repoPath, parsedGitLocation.filepath),
-        etag: etag.toString(),
-      };
-    } catch (error) {
-      if (error instanceof NotModifiedError) {
-        this.logger.debug(`Cache is valid for etag ${options?.etag}`);
-      } else {
-        this.logger.debug(`Repo checkout failed with error ${error.message}`);
-      }
-      throw error;
-    }
-  }
-}
diff --git a/packages/techdocs-common/src/stages/prepare/dir.test.ts b/packages/techdocs-common/src/stages/prepare/dir.test.ts
index 6992a35c65..019bf51fe9 100644
--- a/packages/techdocs-common/src/stages/prepare/dir.test.ts
+++ b/packages/techdocs-common/src/stages/prepare/dir.test.ts
@@ -15,7 +15,6 @@
  */
 import { getVoidLogger, UrlReader } from '@backstage/backend-common';
 import { ConfigReader } from '@backstage/config';
-import { checkoutGitRepository } from '../../helpers';
 import { DirectoryPreparer } from './dir';
 
 function normalizePath(path: string) {
@@ -27,8 +26,6 @@ function normalizePath(path: string) {
 
 jest.mock('../../helpers', () => ({
   ...jest.requireActual<{}>('../../helpers'),
-  checkoutGitRepository: jest.fn(() => '/tmp/backstage-repo/org/name/branch/'),
-  getLastCommitTimestamp: jest.fn(() => 12345678),
 }));
 
 const logger = getVoidLogger();
@@ -71,7 +68,7 @@ describe('directory preparer', () => {
     expect(normalizePath(preparedDir)).toEqual('/directory/our-documentation');
   });
 
-  it('should merge managed-by-location and techdocs-ref when techdocs-ref is absolute', async () => {
+  it('should reject when techdocs-ref is absolute', async () => {
     const directoryPreparer = new DirectoryPreparer(
       mockConfig,
       logger,
@@ -84,11 +81,12 @@ describe('directory preparer', () => {
       'backstage.io/techdocs-ref': 'dir:/our-documentation/techdocs',
     });
 
-    const { preparedDir } = await directoryPreparer.prepare(mockEntity);
-    expect(normalizePath(preparedDir)).toEqual('/our-documentation/techdocs');
+    await expect(directoryPreparer.prepare(mockEntity)).rejects.toThrow(
+      /Relative path is not allowed to refer to a directory outside its parent/,
+    );
   });
 
-  it('should merge managed-by-location and techdocs-ref when managed-by-location is a git repository', async () => {
+  it('should reject when managed-by-location is a git repository', async () => {
     const directoryPreparer = new DirectoryPreparer(
       mockConfig,
       logger,
@@ -101,10 +99,8 @@ describe('directory preparer', () => {
       'backstage.io/techdocs-ref': 'dir:./docs',
     });
 
-    const { preparedDir } = await directoryPreparer.prepare(mockEntity);
-    expect(normalizePath(preparedDir)).toEqual(
-      '/tmp/backstage-repo/org/name/branch/docs',
+    await expect(directoryPreparer.prepare(mockEntity)).rejects.toThrow(
+      /Unable to resolve location type github/,
     );
-    expect(checkoutGitRepository).toHaveBeenCalledTimes(1);
   });
 });
diff --git a/packages/techdocs-common/src/stages/prepare/dir.ts b/packages/techdocs-common/src/stages/prepare/dir.ts
index 9ec4b4d37a..ade0b00162 100644
--- a/packages/techdocs-common/src/stages/prepare/dir.ts
+++ b/packages/techdocs-common/src/stages/prepare/dir.ts
@@ -15,104 +15,68 @@
  */
 
 import { UrlReader } from '@backstage/backend-common';
-import { InputError, NotModifiedError } from '@backstage/errors';
 import { Entity } from '@backstage/catalog-model';
 import { Config } from '@backstage/config';
-import parseGitUrl from 'git-url-parse';
-import path from 'path';
-import { Logger } from 'winston';
+import { InputError } from '@backstage/errors';
 import {
-  checkoutGitRepository,
-  getLastCommitTimestamp,
-  parseReferenceAnnotation,
-} from '../../helpers';
+  ScmIntegrationRegistry,
+  ScmIntegrations,
+} from '@backstage/integration';
+import { Logger } from 'winston';
+import { parseReferenceAnnotation, transformDirLocation } from '../../helpers';
 import { PreparerBase, PreparerResponse } from './types';
 
 export class DirectoryPreparer implements PreparerBase {
-  constructor(
-    private readonly config: Config,
-    private readonly logger: Logger,
-    private readonly reader: UrlReader,
-  ) {
-    this.config = config;
-    this.logger = logger;
+  private readonly scmIntegrations: ScmIntegrationRegistry;
+  private readonly reader: UrlReader;
+
+  constructor(config: Config, _logger: Logger, reader: UrlReader) {
     this.reader = reader;
+    this.scmIntegrations = ScmIntegrations.fromConfig(config);
   }
 
-  private async resolveManagedByLocationToDir(
+  async prepare(
     entity: Entity,
-    options?: { etag?: string },
+    options?: { logger?: Logger; etag?: string },
   ): Promise<PreparerResponse> {
-    const { type, target } = parseReferenceAnnotation(
-      'backstage.io/managed-by-location',
+    const annotation = parseReferenceAnnotation(
+      'backstage.io/techdocs-ref',
       entity,
     );
-
-    this.logger.debug(
-      `Building docs for entity with type 'dir' and managed-by-location '${type}'`,
+    const { type, target } = transformDirLocation(
+      entity,
+      annotation,
+      this.scmIntegrations,
     );
+
     switch (type) {
       case 'url': {
+        options?.logger?.debug(`Reading files from ${target}`);
+        // the target is an absolute url since it has already been transformed
         const response = await this.reader.readTree(target, {
           etag: options?.etag,
         });
         const preparedDir = await response.dir();
+
+        options?.logger?.debug(`Tree downloaded and stored at ${preparedDir}`);
+
         return {
           preparedDir,
           etag: response.etag,
         };
       }
-      case 'github':
-      case 'gitlab':
-      case 'azure/api': {
-        const parsedGitLocation = parseGitUrl(target);
-        const repoLocation = await checkoutGitRepository(
-          target,
-          this.config,
-          this.logger,
-        );
 
-        // Check if etag has changed for cache invalidation.
-        const etag = await getLastCommitTimestamp(repoLocation, this.logger);
-        if (options?.etag === etag.toString()) {
-          throw new NotModifiedError();
-        }
+      case 'dir': {
         return {
-          preparedDir: path.dirname(
-            path.join(repoLocation, parsedGitLocation.filepath),
-          ),
-          etag: etag.toString(),
-        };
-      }
-      case 'file':
-        return {
-          preparedDir: path.dirname(target),
+          // the transformation already validated that the target is in a safe location
+          preparedDir: target,
           // Instead of supporting caching on local sources, use techdocs-cli for local development and debugging.
           etag: '',
         };
+      }
+
       default:
         throw new InputError(`Unable to resolve location type ${type}`);
     }
   }
-
-  async prepare(entity: Entity): Promise<PreparerResponse> {
-    this.logger.warn(
-      'You are using the legacy dir preparer in TechDocs which will be removed in near future (March 2021). ' +
-        'Migrate to URL reader by updating `backstage.io/techdocs-ref` annotation in `catalog-info.yaml` ' +
-        'to be prefixed with `url:`. Read the migration guide and benefits at https://github.com/backstage/backstage/issues/4409 ',
-    );
-
-    const { target } = parseReferenceAnnotation(
-      'backstage.io/techdocs-ref',
-      entity,
-    );
-
-    // This will throw NotModified error if etag has not changed.
-    const response = await this.resolveManagedByLocationToDir(entity);
-
-    return {
-      preparedDir: path.resolve(response.preparedDir, target),
-      etag: response.etag,
-    };
-  }
 }
diff --git a/packages/techdocs-common/src/stages/prepare/index.ts b/packages/techdocs-common/src/stages/prepare/index.ts
index e683ac8f71..f129bf5315 100644
--- a/packages/techdocs-common/src/stages/prepare/index.ts
+++ b/packages/techdocs-common/src/stages/prepare/index.ts
@@ -14,7 +14,6 @@
  * limitations under the License.
  */
 export { DirectoryPreparer } from './dir';
-export { CommonGitPreparer } from './commonGit';
 export { UrlPreparer } from './url';
 export { Preparers } from './preparers';
 export type { PreparerBuilder, PreparerBase, RemoteProtocol } from './types';
diff --git a/packages/techdocs-common/src/stages/prepare/preparers.ts b/packages/techdocs-common/src/stages/prepare/preparers.ts
index 5c78d96f15..75c9a7f23b 100644
--- a/packages/techdocs-common/src/stages/prepare/preparers.ts
+++ b/packages/techdocs-common/src/stages/prepare/preparers.ts
@@ -19,7 +19,6 @@ import { Config } from '@backstage/config';
 import { Logger } from 'winston';
 import { parseReferenceAnnotation } from '../../helpers';
 import { DirectoryPreparer } from './dir';
-import { CommonGitPreparer } from './commonGit';
 import { UrlPreparer } from './url';
 import { PreparerBase, PreparerBuilder, RemoteProtocol } from './types';
 
@@ -47,12 +46,6 @@ export class Preparers implements PreparerBuilder {
     const directoryPreparer = new DirectoryPreparer(config, logger, reader);
     preparers.register('dir', directoryPreparer);
 
-    // Common git preparers will be deprecated soon.
-    const commonGitPreparer = new CommonGitPreparer(config, logger);
-    preparers.register('github', commonGitPreparer);
-    preparers.register('gitlab', commonGitPreparer);
-    preparers.register('azure/api', commonGitPreparer);
-
     return preparers;
   }
 
diff --git a/packages/techdocs-common/src/stages/prepare/types.ts b/packages/techdocs-common/src/stages/prepare/types.ts
index d6f4e79062..5d46b5d235 100644
--- a/packages/techdocs-common/src/stages/prepare/types.ts
+++ b/packages/techdocs-common/src/stages/prepare/types.ts
@@ -48,14 +48,4 @@ export type PreparerBuilder = {
   get(entity: Entity): PreparerBase;
 };
 
-/**
- * Everything except `url` will be deprecated.
- * Read more https://github.com/backstage/backstage/issues/4409
- */
-export type RemoteProtocol =
-  | 'url'
-  | 'dir'
-  | 'github'
-  | 'gitlab'
-  | 'file'
-  | 'azure/api';
+export type RemoteProtocol = 'url' | 'dir';
diff --git a/packages/techdocs-common/src/stages/publish/awsS3.test.ts b/packages/techdocs-common/src/stages/publish/awsS3.test.ts
index 81f06716b1..dbc81a25b4 100644
--- a/packages/techdocs-common/src/stages/publish/awsS3.test.ts
+++ b/packages/techdocs-common/src/stages/publish/awsS3.test.ts
@@ -15,43 +15,18 @@
  */
 
 import { getVoidLogger } from '@backstage/backend-common';
-import {
-  Entity,
-  EntityName,
-  ENTITY_DEFAULT_NAMESPACE,
-} from '@backstage/catalog-model';
+import { Entity, ENTITY_DEFAULT_NAMESPACE } from '@backstage/catalog-model';
 import { ConfigReader } from '@backstage/config';
 import express from 'express';
 import request from 'supertest';
 import mockFs from 'mock-fs';
-import os from 'os';
 import path from 'path';
+import fs from 'fs-extra';
 import { AwsS3Publish } from './awsS3';
-import { PublisherBase, TechDocsMetadata } from './types';
 
 // NOTE: /packages/techdocs-common/__mocks__ is being used to mock aws-sdk client library
 
-const createMockEntity = (annotations = {}): Entity => {
-  return {
-    apiVersion: 'version',
-    kind: 'TestKind',
-    metadata: {
-      name: 'test-component-name',
-      namespace: 'test-namespace',
-      annotations: {
-        ...annotations,
-      },
-    },
-  };
-};
-
-const createMockEntityName = (): EntityName => ({
-  kind: 'TestKind',
-  name: 'test-component-name',
-  namespace: 'test-namespace',
-});
-
-const rootDir = os.platform() === 'win32' ? 'C:\\rootDir' : '/rootDir';
+const rootDir = global.rootDir;
 
 const getEntityRootDir = (entity: Entity) => {
   const {
@@ -63,11 +38,16 @@ const getEntityRootDir = (entity: Entity) => {
 };
 
 const logger = getVoidLogger();
+const loggerInfoSpy = jest.spyOn(logger, 'info');
+const loggerErrorSpy = jest.spyOn(logger, 'error');
 
-let publisher: PublisherBase;
-
-beforeEach(() => {
-  mockFs.restore();
+const createPublisherFromConfig = ({
+  bucketName = 'bucketName',
+  legacyUseCaseSensitiveTripletPaths = false,
+}: {
+  bucketName?: string;
+  legacyUseCaseSensitiveTripletPaths?: boolean;
+} = {}) => {
   const mockConfig = new ConfigReader({
     techdocs: {
       requestUrl: 'http://localhost:7000',
@@ -78,82 +58,99 @@ beforeEach(() => {
             accessKeyId: 'accessKeyId',
             secretAccessKey: 'secretAccessKey',
           },
-          bucketName: 'bucketName',
+          bucketName,
         },
       },
+      legacyUseCaseSensitiveTripletPaths,
     },
   });
 
-  publisher = AwsS3Publish.fromConfig(mockConfig, logger);
-});
+  return AwsS3Publish.fromConfig(mockConfig, logger);
+};
 
 describe('AwsS3Publish', () => {
+  const entity = {
+    apiVersion: '1',
+    kind: 'Component',
+    metadata: {
+      name: 'backstage',
+      namespace: 'default',
+      annotations: {},
+    },
+  };
+
+  const entityName = {
+    kind: 'Component',
+    name: 'backstage',
+    namespace: 'default',
+  };
+
+  const techdocsMetadata = {
+    site_name: 'backstage',
+    site_description: 'site_content',
+    etag: 'etag',
+  };
+
+  const directory = getEntityRootDir(entity);
+
+  const files = {
+    'index.html': '',
+    '404.html': '',
+    'techdocs_metadata.json': JSON.stringify(techdocsMetadata),
+    assets: {
+      'main.css': '',
+    },
+    html: {
+      'unsafe.html': '<html></html>',
+    },
+    img: {
+      'with spaces.png': 'found it',
+      'unsafe.svg': '<svg></svg>',
+    },
+    'some folder': {
+      'also with spaces.js': 'found it too',
+    },
+  };
+
+  beforeEach(() => {
+    mockFs({
+      [directory]: files,
+    });
+  });
+
+  afterEach(() => {
+    mockFs.restore();
+  });
+
   describe('getReadiness', () => {
     it('should validate correct config', async () => {
+      const publisher = createPublisherFromConfig();
       expect(await publisher.getReadiness()).toEqual({
         isAvailable: true,
       });
     });
 
     it('should reject incorrect config', async () => {
-      const mockConfig = new ConfigReader({
-        techdocs: {
-          requestUrl: 'http://localhost:7000',
-          publisher: {
-            type: 'awsS3',
-            awsS3: {
-              credentials: {
-                accessKeyId: 'accessKeyId',
-                secretAccessKey: 'secretAccessKey',
-              },
-              // this bucket name will throw an error
-              bucketName: 'errorBucket',
-            },
-          },
-        },
+      const publisher = createPublisherFromConfig({
+        bucketName: 'errorBucket',
       });
-
-      const errorPublisher = AwsS3Publish.fromConfig(mockConfig, logger);
-
-      expect(await errorPublisher.getReadiness()).toEqual({
+      expect(await publisher.getReadiness()).toEqual({
         isAvailable: false,
       });
     });
   });
 
   describe('publish', () => {
-    beforeEach(() => {
-      const entity = createMockEntity();
-      const entityRootDir = getEntityRootDir(entity);
-
-      mockFs({
-        [entityRootDir]: {
-          'index.html': '',
-          '404.html': '',
-          assets: {
-            'main.css': '',
-          },
-          attachments: {
-            'image.png': Buffer.from([2, 3, 5, 3, 5, 3, 5, 9, 1]),
-          },
-        },
-      });
-    });
-
-    afterEach(() => {
-      mockFs.restore();
-    });
-
     it('should publish a directory', async () => {
-      const entity = createMockEntity();
-      const entityRootDir = getEntityRootDir(entity);
+      const publisher = createPublisherFromConfig();
+      expect(await publisher.publish({ entity, directory })).toBeUndefined();
+    });
 
-      expect(
-        await publisher.publish({
-          entity,
-          directory: entityRootDir,
-        }),
-      ).toBeUndefined();
+    it('should publish a directory as well when legacy casing is used', async () => {
+      const publisher = createPublisherFromConfig({
+        legacyUseCaseSensitiveTripletPaths: true,
+      });
+      expect(await publisher.publish({ entity, directory })).toBeUndefined();
     });
 
     it('should fail to publish a directory', async () => {
@@ -165,172 +162,182 @@ describe('AwsS3Publish', () => {
         'generatedDirectory',
       );
 
-      const entity = createMockEntity();
-      await expect(
-        publisher.publish({
-          entity,
-          directory: wrongPathToGeneratedDirectory,
-        }),
-      ).rejects.toThrowError();
+      const publisher = createPublisherFromConfig();
 
       const fails = publisher.publish({
         entity,
         directory: wrongPathToGeneratedDirectory,
       });
 
-      // Can not do exact error message match due to mockFs adding unexpected characters in the path when throwing the error
-      // Issue reported https://github.com/tschaub/mock-fs/issues/118
       await expect(fails).rejects.toMatchObject({
         message: expect.stringContaining(
           'Unable to upload file(s) to AWS S3. Error: Failed to read template directory: ENOENT, no such file or directory',
         ),
       });
+
       await expect(fails).rejects.toMatchObject({
         message: expect.stringContaining(wrongPathToGeneratedDirectory),
       });
+    });
 
-      mockFs.restore();
+    it('should delete stale files after upload', async () => {
+      const bucketName = 'delete_stale_files_success';
+      const publisher = createPublisherFromConfig({ bucketName: bucketName });
+      await publisher.publish({ entity, directory });
+      expect(loggerInfoSpy).toHaveBeenLastCalledWith(
+        `Successfully deleted stale files for Entity ${entity.metadata.name}. Total number of files: 1`,
+      );
+    });
+
+    it('should log error when the stale files deletion fails', async () => {
+      const bucketName = 'delete_stale_files_error';
+      const publisher = createPublisherFromConfig({ bucketName: bucketName });
+      await publisher.publish({ entity, directory });
+      expect(loggerErrorSpy).toHaveBeenLastCalledWith(
+        'Unable to delete file(s) from AWS S3. Error: Message',
+      );
     });
   });
 
   describe('hasDocsBeenGenerated', () => {
     it('should return true if docs has been generated', async () => {
-      const entity = createMockEntity();
-      const entityRootDir = getEntityRootDir(entity);
-
-      mockFs({
-        [entityRootDir]: {
-          'index.html': 'file-content',
-        },
-      });
-
+      const publisher = createPublisherFromConfig();
+      await publisher.publish({ entity, directory });
+      expect(await publisher.hasDocsBeenGenerated(entity)).toBe(true);
+    });
+
+    it('should return true if docs has been generated even if the legacy case is enabled', async () => {
+      const publisher = createPublisherFromConfig({
+        legacyUseCaseSensitiveTripletPaths: true,
+      });
+      await publisher.publish({ entity, directory });
       expect(await publisher.hasDocsBeenGenerated(entity)).toBe(true);
-      mockFs.restore();
     });
 
     it('should return false if docs has not been generated', async () => {
-      const entity = createMockEntity();
-
-      expect(await publisher.hasDocsBeenGenerated(entity)).toBe(false);
+      const publisher = createPublisherFromConfig();
+      expect(
+        await publisher.hasDocsBeenGenerated({
+          kind: 'entity',
+          metadata: {
+            namespace: 'invalid',
+            name: 'triplet',
+          },
+        } as Entity),
+      ).toBe(false);
     });
   });
 
   describe('fetchTechDocsMetadata', () => {
     it('should return tech docs metadata', async () => {
-      const entityNameMock = createMockEntityName();
-      const entity = createMockEntity();
-      const entityRootDir = getEntityRootDir(entity);
+      const publisher = createPublisherFromConfig();
+      await publisher.publish({ entity, directory });
+      expect(await publisher.fetchTechDocsMetadata(entityName)).toStrictEqual(
+        techdocsMetadata,
+      );
+    });
 
-      mockFs({
-        [entityRootDir]: {
-          'techdocs_metadata.json':
-            '{"site_name": "backstage", "site_description": "site_content", "etag": "etag"}',
-        },
+    it('should return tech docs metadata even if the legacy case is enabled', async () => {
+      const publisher = createPublisherFromConfig({
+        legacyUseCaseSensitiveTripletPaths: true,
       });
-
-      const expectedMetadata: TechDocsMetadata = {
-        site_name: 'backstage',
-        site_description: 'site_content',
-        etag: 'etag',
-      };
-      expect(
-        await publisher.fetchTechDocsMetadata(entityNameMock),
-      ).toStrictEqual(expectedMetadata);
-      mockFs.restore();
+      await publisher.publish({ entity, directory });
+      expect(await publisher.fetchTechDocsMetadata(entityName)).toStrictEqual(
+        techdocsMetadata,
+      );
     });
 
     it('should return tech docs metadata when json encoded with single quotes', async () => {
-      const entityNameMock = createMockEntityName();
-      const entity = createMockEntity();
-      const entityRootDir = getEntityRootDir(entity);
+      const techdocsMetadataPath = path.join(
+        directory,
+        'techdocs_metadata.json',
+      );
+      const techdocsMetadataContent = files['techdocs_metadata.json'];
 
-      mockFs({
-        [entityRootDir]: {
-          'techdocs_metadata.json': `{'site_name': 'backstage', 'site_description': 'site_content', 'etag': 'etag'}`,
-        },
-      });
+      fs.writeFileSync(
+        techdocsMetadataPath,
+        techdocsMetadataContent.replace(/"/g, "'"),
+      );
 
-      const expectedMetadata: TechDocsMetadata = {
-        site_name: 'backstage',
-        site_description: 'site_content',
-        etag: 'etag',
-      };
-      expect(
-        await publisher.fetchTechDocsMetadata(entityNameMock),
-      ).toStrictEqual(expectedMetadata);
-      mockFs.restore();
+      const publisher = createPublisherFromConfig();
+      await publisher.publish({ entity, directory });
+
+      expect(await publisher.fetchTechDocsMetadata(entityName)).toStrictEqual(
+        techdocsMetadata,
+      );
+
+      fs.writeFileSync(techdocsMetadataPath, techdocsMetadataContent);
     });
 
     it('should return an error if the techdocs_metadata.json file is not present', async () => {
-      const entityNameMock = createMockEntityName();
-      const entity = createMockEntity();
-      const entityRootDir = getEntityRootDir(entity);
+      const publisher = createPublisherFromConfig();
 
-      const fails = publisher.fetchTechDocsMetadata(entityNameMock);
+      const invalidEntityName = {
+        namespace: 'invalid',
+        kind: 'triplet',
+        name: 'path',
+      };
+
+      const techDocsMetadaFilePath = path.posix.join(
+        ...Object.values(invalidEntityName),
+        'techdocs_metadata.json',
+      );
+
+      const fails = publisher.fetchTechDocsMetadata(invalidEntityName);
 
-      const errorPath = path.join(entityRootDir, 'techdocs_metadata.json');
       await expect(fails).rejects.toMatchObject({
-        message: `TechDocs metadata fetch failed, The file ${errorPath} does not exist !`,
+        message: `TechDocs metadata fetch failed, The file ${techDocsMetadaFilePath} does not exist!`,
       });
     });
   });
 
   describe('docsRouter', () => {
+    const entityTripletPath = `${entity.metadata.namespace}/${entity.kind}/${entity.metadata.name}`;
+
     let app: express.Express;
-    const entity = createMockEntity();
-    const entityRootDir = getEntityRootDir(entity);
 
-    beforeEach(() => {
+    beforeEach(async () => {
+      const publisher = createPublisherFromConfig();
+      await publisher.publish({ entity, directory });
       app = express().use(publisher.docsRouter());
-
-      mockFs.restore();
-      mockFs({
-        [entityRootDir]: {
-          html: {
-            'unsafe.html': '<html></html>',
-          },
-          img: {
-            'with spaces.png': 'found it',
-            'unsafe.svg': '<svg></svg>',
-          },
-          'some folder': {
-            'also with spaces.js': 'found it too',
-          },
-        },
-      });
-    });
-
-    afterEach(() => {
-      mockFs.restore();
     });
 
     it('should pass expected object path to bucket', async () => {
-      const {
-        kind,
-        metadata: { namespace, name },
-      } = entity;
-
       // Ensures leading slash is trimmed and encoded path is decoded.
       const pngResponse = await request(app).get(
-        `/${namespace}/${kind}/${name}/img/with%20spaces.png`,
+        `/${entityTripletPath}/img/with%20spaces.png`,
       );
       expect(Buffer.from(pngResponse.body).toString('utf8')).toEqual(
         'found it',
       );
       const jsResponse = await request(app).get(
-        `/${namespace}/${kind}/${name}/some%20folder/also%20with%20spaces.js`,
+        `/${entityTripletPath}/some%20folder/also%20with%20spaces.js`,
+      );
+      expect(jsResponse.text).toEqual('found it too');
+    });
+
+    it('should pass expected object path to bucket even if the legacy case is enabled', async () => {
+      const publisher = createPublisherFromConfig({
+        legacyUseCaseSensitiveTripletPaths: true,
+      });
+      await publisher.publish({ entity, directory });
+      app = express().use(publisher.docsRouter());
+      // Ensures leading slash is trimmed and encoded path is decoded.
+      const pngResponse = await request(app).get(
+        `/${entityTripletPath}/img/with%20spaces.png`,
+      );
+      expect(Buffer.from(pngResponse.body).toString('utf8')).toEqual(
+        'found it',
+      );
+      const jsResponse = await request(app).get(
+        `/${entityTripletPath}/some%20folder/also%20with%20spaces.js`,
       );
       expect(jsResponse.text).toEqual('found it too');
     });
 
     it('should pass text/plain content-type for html', async () => {
-      const {
-        kind,
-        metadata: { namespace, name },
-      } = entity;
-
       const htmlResponse = await request(app).get(
-        `/${namespace}/${kind}/${name}/html/unsafe.html`,
+        `/${entityTripletPath}/html/unsafe.html`,
       );
       expect(htmlResponse.text).toEqual('<html></html>');
       expect(htmlResponse.header).toMatchObject({
@@ -338,7 +345,7 @@ describe('AwsS3Publish', () => {
       });
 
       const svgResponse = await request(app).get(
-        `/${namespace}/${kind}/${name}/img/unsafe.svg`,
+        `/${entityTripletPath}/img/unsafe.svg`,
       );
       expect(svgResponse.text).toEqual('<svg></svg>');
       expect(svgResponse.header).toMatchObject({
diff --git a/packages/techdocs-common/src/stages/publish/awsS3.ts b/packages/techdocs-common/src/stages/publish/awsS3.ts
index 15fe5a467f..85857929d5 100644
--- a/packages/techdocs-common/src/stages/publish/awsS3.ts
+++ b/packages/techdocs-common/src/stages/publish/awsS3.ts
@@ -16,7 +16,7 @@
 import { Entity, EntityName } from '@backstage/catalog-model';
 import { Config } from '@backstage/config';
 import aws, { Credentials } from 'aws-sdk';
-import { ManagedUpload } from 'aws-sdk/clients/s3';
+import { ListObjectsV2Output } from 'aws-sdk/clients/s3';
 import { CredentialsOptions } from 'aws-sdk/lib/credentials';
 import express from 'express';
 import fs from 'fs-extra';
@@ -25,7 +25,15 @@ import createLimiter from 'p-limit';
 import path from 'path';
 import { Readable } from 'stream';
 import { Logger } from 'winston';
-import { getFileTreeRecursively, getHeadersForFileExtension } from './helpers';
+import {
+  bulkStorageOperation,
+  getCloudPathForLocalPath,
+  getFileTreeRecursively,
+  getHeadersForFileExtension,
+  getStaleFiles,
+  lowerCaseEntityTriplet,
+  lowerCaseEntityTripletInStoragePath,
+} from './helpers';
 import {
   PublisherBase,
   PublishRequest,
@@ -93,7 +101,17 @@ export class AwsS3Publish implements PublisherBase {
       ...(s3ForcePathStyle && { s3ForcePathStyle }),
     });
 
-    return new AwsS3Publish(storageClient, bucketName, logger);
+    const legacyPathCasing =
+      config.getOptionalBoolean(
+        'techdocs.legacyUseCaseSensitiveTripletPaths',
+      ) || false;
+
+    return new AwsS3Publish(
+      storageClient,
+      bucketName,
+      legacyPathCasing,
+      logger,
+    );
   }
 
   private static buildCredentials(
@@ -130,10 +148,12 @@ export class AwsS3Publish implements PublisherBase {
   constructor(
     private readonly storageClient: aws.S3,
     private readonly bucketName: string,
+    private readonly legacyPathCasing: boolean,
     private readonly logger: Logger,
   ) {
     this.storageClient = storageClient;
     this.bucketName = bucketName;
+    this.legacyPathCasing = legacyPathCasing;
     this.logger = logger;
   }
 
@@ -171,54 +191,94 @@ export class AwsS3Publish implements PublisherBase {
    * Directory structure used in the bucket is - entityNamespace/entityKind/entityName/index.html
    */
   async publish({ entity, directory }: PublishRequest): Promise<void> {
+    const useLegacyPathCasing = this.legacyPathCasing;
+    // First, try to retrieve a list of all individual files currently existing
+    let existingFiles: string[] = [];
     try {
-      // Note: S3 manages creation of parent directories if they do not exist.
-      // So collecting path of only the files is good enough.
-      const allFilesToUpload = await getFileTreeRecursively(directory);
+      const remoteFolder = getCloudPathForLocalPath(
+        entity,
+        undefined,
+        useLegacyPathCasing,
+      );
+      existingFiles = await this.getAllObjectsFromBucket({
+        prefix: remoteFolder,
+      });
+    } catch (e) {
+      this.logger.error(
+        `Unable to list files for Entity ${entity.metadata.name}: ${e.message}`,
+      );
+    }
 
-      const limiter = createLimiter(10);
-      const uploadPromises: Array<Promise<ManagedUpload.SendData>> = [];
-      for (const filePath of allFilesToUpload) {
-        // Remove the absolute path prefix of the source directory
-        // Path of all files to upload, relative to the root of the source directory
-        // e.g. ['index.html', 'sub-page/index.html', 'assets/images/favicon.png']
-        const relativeFilePath = path.relative(directory, filePath);
+    // Then, merge new files into the same folder
+    let absoluteFilesToUpload;
+    try {
+      // Remove the absolute path prefix of the source directory
+      // Path of all files to upload, relative to the root of the source directory
+      // e.g. ['index.html', 'sub-page/index.html', 'assets/images/favicon.png']
+      absoluteFilesToUpload = await getFileTreeRecursively(directory);
 
-        // Convert destination file path to a POSIX path for uploading.
-        // S3 expects / as path separator and relativeFilePath will contain \\ on Windows.
-        // https://docs.aws.amazon.com/AmazonS3/latest/userguide/object-keys.html
-        const relativeFilePathPosix = relativeFilePath
-          .split(path.sep)
-          .join(path.posix.sep);
-
-        // The / delimiter is intentional since it represents the cloud storage and not the local file system.
-        const entityRootDir = `${entity.metadata.namespace}/${entity.kind}/${entity.metadata.name}`;
-        const destination = `${entityRootDir}/${relativeFilePathPosix}`; // S3 Bucket file relative path
-
-        // Rate limit the concurrent execution of file uploads to batches of 10 (per publish)
-        const uploadFile = limiter(() => {
-          const fileStream = fs.createReadStream(filePath);
+      await bulkStorageOperation(
+        async absoluteFilePath => {
+          const relativeFilePath = path.relative(directory, absoluteFilePath);
+          const fileStream = fs.createReadStream(absoluteFilePath);
 
           const params = {
             Bucket: this.bucketName,
-            Key: destination,
+            Key: getCloudPathForLocalPath(
+              entity,
+              relativeFilePath,
+              useLegacyPathCasing,
+            ),
             Body: fileStream,
           };
 
           return this.storageClient.upload(params).promise();
-        });
-        uploadPromises.push(uploadFile);
-      }
-      await Promise.all(uploadPromises);
-      this.logger.info(
-        `Successfully uploaded all the generated files for Entity ${entity.metadata.name}. Total number of files: ${allFilesToUpload.length}`,
+        },
+        absoluteFilesToUpload,
+        { concurrencyLimit: 10 },
+      );
+
+      this.logger.info(
+        `Successfully uploaded all the generated files for Entity ${entity.metadata.name}. Total number of files: ${absoluteFilesToUpload.length}`,
       );
-      return;
     } catch (e) {
       const errorMessage = `Unable to upload file(s) to AWS S3. ${e}`;
       this.logger.error(errorMessage);
       throw new Error(errorMessage);
     }
+
+    // Last, try to remove the files that were *only* present previously
+    try {
+      const relativeFilesToUpload = absoluteFilesToUpload.map(
+        absoluteFilePath =>
+          getCloudPathForLocalPath(
+            entity,
+            path.relative(directory, absoluteFilePath),
+            useLegacyPathCasing,
+          ),
+      );
+      const staleFiles = getStaleFiles(relativeFilesToUpload, existingFiles);
+
+      await bulkStorageOperation(
+        async relativeFilePath => {
+          return await this.storageClient
+            .deleteObject({
+              Bucket: this.bucketName,
+              Key: relativeFilePath,
+            })
+            .promise();
+        },
+        staleFiles,
+        { concurrencyLimit: 10 },
+      );
+
+      this.logger.info(
+        `Successfully deleted stale files for Entity ${entity.metadata.name}. Total number of files: ${staleFiles.length}`,
+      );
+    } catch (error) {
+      const errorMessage = `Unable to delete file(s) from AWS S3. ${error}`;
+      this.logger.error(errorMessage);
+    }
   }
 
   async fetchTechDocsMetadata(
@@ -226,7 +286,10 @@ export class AwsS3Publish implements PublisherBase {
   ): Promise<TechDocsMetadata> {
     try {
       return await new Promise<TechDocsMetadata>(async (resolve, reject) => {
-        const entityRootDir = `${entityName.namespace}/${entityName.kind}/${entityName.name}`;
+        const entityTriplet = `${entityName.namespace}/${entityName.kind}/${entityName.name}`;
+        const entityRootDir = this.legacyPathCasing
+          ? entityTriplet
+          : lowerCaseEntityTriplet(entityTriplet);
 
         const stream = this.storageClient
           .getObject({
@@ -264,8 +327,12 @@ export class AwsS3Publish implements PublisherBase {
   docsRouter(): express.Handler {
     return async (req, res) => {
       // Decode and trim the leading forward slash
-      // filePath example - /default/Component/documented-component/index.html
-      const filePath = decodeURI(req.path.replace(/^\//, ''));
+      const decodedUri = decodeURI(req.path.replace(/^\//, ''));
+
+      // filePath example - /default/component/documented-component/index.html
+      const filePath = this.legacyPathCasing
+        ? decodedUri
+        : lowerCaseEntityTripletInStoragePath(decodedUri);
 
       // Files with different extensions (CSS, HTML) need to be served with different headers
       const fileExtension = path.extname(filePath);
@@ -296,7 +363,11 @@ export class AwsS3Publish implements PublisherBase {
    */
   async hasDocsBeenGenerated(entity: Entity): Promise<boolean> {
     try {
-      const entityRootDir = `${entity.metadata.namespace}/${entity.kind}/${entity.metadata.name}`;
+      const entityTriplet = `${entity.metadata.namespace}/${entity.kind}/${entity.metadata.name}`;
+      const entityRootDir = this.legacyPathCasing
+        ? entityTriplet
+        : lowerCaseEntityTriplet(entityTriplet);
+
       await this.storageClient
         .headObject({
           Bucket: this.bucketName,
@@ -308,4 +379,80 @@ export class AwsS3Publish implements PublisherBase {
       return Promise.resolve(false);
     }
   }
+
+  async migrateDocsCase({
+    removeOriginal = false,
+    concurrency = 25,
+  }): Promise<void> {
+    // Iterate through every file in the root of the publisher.
+    const allObjects = await this.getAllObjectsFromBucket();
+    const limiter = createLimiter(concurrency);
+    await Promise.all(
+      allObjects.map(f =>
+        limiter(async file => {
+          let newPath;
+          try {
+            newPath = lowerCaseEntityTripletInStoragePath(file);
+          } catch (e) {
+            this.logger.warn(e.message);
+            return;
+          }
+
+          // If all parts are already lowercase, ignore.
+          if (file === newPath) {
+            return;
+          }
+
+          try {
+            this.logger.verbose(`Migrating ${file}`);
+            await this.storageClient
+              .copyObject({
+                Bucket: this.bucketName,
+                CopySource: [this.bucketName, file].join('/'),
+                Key: newPath,
+              })
+              .promise();
+
+            if (removeOriginal) {
+              await this.storageClient
+                .deleteObject({
+                  Bucket: this.bucketName,
+                  Key: file,
+                })
+                .promise();
+            }
+          } catch (e) {
+            this.logger.warn(`Unable to migrate ${file}: ${e.message}`);
+          }
+        }, f),
+      ),
+    );
+  }
+
+  /**
+   * Returns a list of all object keys from the configured bucket.
+   */
+  protected async getAllObjectsFromBucket(
+    { prefix } = { prefix: '' },
+  ): Promise<string[]> {
+    const objects: string[] = [];
+    let nextContinuation: string | undefined;
+    let allObjects: ListObjectsV2Output;
+    // Iterate through every file in the root of the publisher.
+    do {
+      allObjects = await this.storageClient
+        .listObjectsV2({
+          Bucket: this.bucketName,
+          ContinuationToken: nextContinuation,
+          ...(prefix ? { Prefix: prefix } : {}),
+        })
+        .promise();
+      objects.push(
+        ...(allObjects.Contents || []).map(f => f.Key || '').filter(f => !!f),
+      );
+      nextContinuation = allObjects.NextContinuationToken;
+    } while (nextContinuation);
+
+    return objects;
+  }
 }
diff --git a/packages/techdocs-common/src/stages/publish/azureBlobStorage.test.ts b/packages/techdocs-common/src/stages/publish/azureBlobStorage.test.ts
index e55314a71b..914cc24986 100644
--- a/packages/techdocs-common/src/stages/publish/azureBlobStorage.test.ts
+++ b/packages/techdocs-common/src/stages/publish/azureBlobStorage.test.ts
@@ -15,43 +15,18 @@
  */
 
 import { getVoidLogger } from '@backstage/backend-common';
-import {
-  Entity,
-  EntityName,
-  ENTITY_DEFAULT_NAMESPACE,
-} from '@backstage/catalog-model';
+import { Entity, ENTITY_DEFAULT_NAMESPACE } from '@backstage/catalog-model';
 import { ConfigReader } from '@backstage/config';
 import express from 'express';
 import request from 'supertest';
 import mockFs from 'mock-fs';
-import os from 'os';
 import path from 'path';
+import fs from 'fs-extra';
 import { AzureBlobStoragePublish } from './azureBlobStorage';
-import { PublisherBase, TechDocsMetadata } from './types';
 
 // NOTE: /packages/techdocs-common/__mocks__ is being used to mock Azure client library
 
-const createMockEntity = (annotations = {}) => {
-  return {
-    apiVersion: 'version',
-    kind: 'TestKind',
-    metadata: {
-      name: 'test-component-name',
-      namespace: 'test-namespace',
-      annotations: {
-        ...annotations,
-      },
-    },
-  };
-};
-
-const createMockEntityName = (): EntityName => ({
-  kind: 'TestKind',
-  name: 'test-component-name',
-  namespace: 'test-namespace',
-});
-
-const rootDir = os.platform() === 'win32' ? 'C:\\rootDir' : '/rootDir';
+const rootDir = global.rootDir;
 
 const getEntityRootDir = (entity: Entity) => {
   const {
@@ -63,61 +38,107 @@ const getEntityRootDir = (entity: Entity) => {
 };
 
 const logger = getVoidLogger();
-jest.spyOn(logger, 'info').mockReturnValue(logger);
 jest.spyOn(logger, 'error').mockReturnValue(logger);
 
-let publisher: PublisherBase;
-beforeEach(async () => {
-  mockFs.restore();
-  const mockConfig = new ConfigReader({
+const createPublisherFromConfig = ({
+  accountName = 'accountName',
+  containerName = 'containerName',
+  legacyUseCaseSensitiveTripletPaths = false,
+}: {
+  accountName?: string;
+  containerName?: string;
+  legacyUseCaseSensitiveTripletPaths?: boolean;
+} = {}) => {
+  const config = new ConfigReader({
     techdocs: {
       requestUrl: 'http://localhost:7000',
       publisher: {
         type: 'azureBlobStorage',
         azureBlobStorage: {
           credentials: {
-            accountName: 'accountName',
+            accountName,
             accountKey: 'accountKey',
           },
-          containerName: 'containerName',
+          containerName,
         },
       },
+      legacyUseCaseSensitiveTripletPaths,
     },
   });
+  return AzureBlobStoragePublish.fromConfig(config, logger);
+};
 
-  publisher = AzureBlobStoragePublish.fromConfig(mockConfig, logger);
-});
+describe('AzureBlobStoragePublish', () => {
+  const entity = {
+    apiVersion: '1',
+    kind: 'Component',
+    metadata: {
+      name: 'backstage',
+      namespace: 'default',
+      annotations: {},
+    },
+  };
+
+  const entityName = {
+    kind: 'Component',
+    name: 'backstage',
+    namespace: 'default',
+  };
+
+  const techdocsMetadata = {
+    site_name: 'backstage',
+    site_description: 'site_content',
+    etag: 'etag',
+  };
+
+  const directory = getEntityRootDir(entity);
+
+  beforeEach(() => {
+    (logger.error as jest.Mock).mockClear();
+  });
+
+  const files = {
+    'index.html': '',
+    '404.html': '',
+    'techdocs_metadata.json': JSON.stringify(techdocsMetadata),
+    assets: {
+      'main.css': '',
+    },
+    html: {
+      'unsafe.html': '<html></html>',
+    },
+    img: {
+      'with spaces.png': 'found it',
+      'unsafe.svg': '<svg></svg>',
+    },
+    'some folder': {
+      'also with spaces.js': 'found it too',
+    },
+  };
+
+  beforeEach(async () => {
+    mockFs({
+      [directory]: files,
+    });
+  });
+
+  afterEach(() => {
+    mockFs.restore();
+  });
 
-describe('publishing with valid credentials', () => {
   describe('getReadiness', () => {
     it('should validate correct config', async () => {
+      const publisher = createPublisherFromConfig();
       expect(await publisher.getReadiness()).toEqual({
         isAvailable: true,
       });
     });
 
     it('should reject incorrect config', async () => {
-      const mockConfig = new ConfigReader({
-        techdocs: {
-          requestUrl: 'http://localhost:7000',
-          publisher: {
-            type: 'azureBlobStorage',
-            azureBlobStorage: {
-              credentials: {
-                accountName: 'accountName',
-                accountKey: 'accountKey',
-              },
-              containerName: 'bad_container',
-            },
-          },
-        },
+      const errorPublisher = createPublisherFromConfig({
+        containerName: 'bad_container',
       });
 
-      const errorPublisher = await AzureBlobStoragePublish.fromConfig(
-        mockConfig,
-        logger,
-      );
-
       expect(await errorPublisher.getReadiness()).toEqual({
         isAvailable: false,
       });
@@ -131,32 +152,16 @@ describe('publishing with valid credentials', () => {
   });
 
   describe('publish', () => {
-    beforeEach(() => {
-      const entity = createMockEntity();
-      const entityRootDir = getEntityRootDir(entity);
-
-      mockFs({
-        [entityRootDir]: {
-          'index.html': '',
-          '404.html': '',
-          assets: {
-            'main.css': '',
-          },
-        },
-      });
+    it('should publish a directory', async () => {
+      const publisher = createPublisherFromConfig();
+      expect(await publisher.publish({ entity, directory })).toBeUndefined();
     });
 
-    it('should publish a directory', async () => {
-      const entity = createMockEntity();
-      const entityRootDir = getEntityRootDir(entity);
-
-      expect(
-        await publisher.publish({
-          entity,
-          directory: entityRootDir,
-        }),
-      ).toBeUndefined();
-      mockFs.restore();
+    it('should publish a directory as well when legacy casing is used', async () => {
+      const publisher = createPublisherFromConfig({
+        legacyUseCaseSensitiveTripletPaths: true,
+      });
+      expect(await publisher.publish({ entity, directory })).toBeUndefined();
     });
 
     it('should fail to publish a directory', async () => {
@@ -168,7 +173,9 @@ describe('publishing with valid credentials', () => {
         'generatedDirectory',
       );
 
-      const entity = createMockEntity();
+      const publisher = createPublisherFromConfig({
+        containerName: 'bad_container',
+      });
 
       const fails = publisher.publish({
         entity,
@@ -177,184 +184,141 @@ describe('publishing with valid credentials', () => {
 
       await expect(fails).rejects.toMatchObject({
         message: expect.stringContaining(
-          `Unable to upload file(s) to Azure Blob Storage. Error: Failed to read template directory: ENOENT, no such file or directory`,
+          'Unable to upload file(s) to Azure. Error: Failed to read template directory: ENOENT, no such file or directory',
         ),
       });
+
       await expect(fails).rejects.toMatchObject({
         message: expect.stringContaining(wrongPathToGeneratedDirectory),
       });
-
-      mockFs.restore();
     });
 
     it('reports an error when bad account credentials', async () => {
-      const mockConfig = new ConfigReader({
-        techdocs: {
-          requestUrl: 'http://localhost:7000',
-          publisher: {
-            type: 'azureBlobStorage',
-            azureBlobStorage: {
-              credentials: {
-                accountName: 'failupload',
-                accountKey: 'accountKey',
-              },
-              containerName: 'containerName',
-            },
-          },
-        },
-      });
-
-      publisher = await AzureBlobStoragePublish.fromConfig(mockConfig, logger);
-
-      const entity = createMockEntity();
-      const entityRootDir = getEntityRootDir(entity);
-
-      mockFs({
-        [entityRootDir]: {
-          'index.html': '',
-        },
+      const publisher = createPublisherFromConfig({
+        accountName: 'bad_account_credentials',
       });
 
       let error;
       try {
-        await publisher.publish({
-          entity,
-          directory: entityRootDir,
-        });
+        await publisher.publish({ entity, directory });
       } catch (e) {
         error = e;
       }
 
-      expect(error.message).toContain(
-        `Unable to upload file(s) to Azure Blob Storage.`,
-      );
+      expect(error.message).toContain(`Unable to upload file(s) to Azure`);
 
       expect(logger.error).toHaveBeenCalledWith(
         expect.stringContaining(
-          `Unable to upload file(s) to Azure Blob Storage. Error: Upload failed for ${path.join(
-            entityRootDir,
-            'index.html',
+          `Unable to upload file(s) to Azure. Error: Upload failed for ${path.join(
+            directory,
+            '404.html',
           )} with status code 500`,
         ),
       );
-
-      mockFs.restore();
     });
   });
 
   describe('hasDocsBeenGenerated', () => {
-    it('should return true if docs has been generated', async () => {
-      const entity = createMockEntity();
-      const entityRootDir = getEntityRootDir(entity);
-
-      mockFs({
-        [entityRootDir]: {
-          'index.html': 'file-content',
-        },
-      });
-
+    it('should check expected file', async () => {
+      const publisher = createPublisherFromConfig();
+      await publisher.publish({ entity, directory });
+      expect(await publisher.hasDocsBeenGenerated(entity)).toBe(true);
+    });
+
+    it('should check expected file when legacy case flag is passed', async () => {
+      const publisher = createPublisherFromConfig({
+        legacyUseCaseSensitiveTripletPaths: true,
+      });
+      await publisher.publish({ entity, directory });
       expect(await publisher.hasDocsBeenGenerated(entity)).toBe(true);
-      mockFs.restore();
     });
 
     it('should return false if docs has not been generated', async () => {
-      const entity = createMockEntity();
-
-      expect(await publisher.hasDocsBeenGenerated(entity)).toBe(false);
+      const publisher = createPublisherFromConfig();
+      expect(
+        await publisher.hasDocsBeenGenerated({
+          kind: 'triplet',
+          metadata: {
+            namespace: 'invalid',
+            name: 'path',
+          },
+        } as Entity),
+      ).toBe(false);
     });
   });
 
   describe('fetchTechDocsMetadata', () => {
     it('should return tech docs metadata', async () => {
-      const entityNameMock = createMockEntityName();
-      const entity = createMockEntity();
-      const entityRootDir = getEntityRootDir(entity);
+      const publisher = createPublisherFromConfig();
+      await publisher.publish({ entity, directory });
+      expect(await publisher.fetchTechDocsMetadata(entityName)).toStrictEqual(
+        techdocsMetadata,
+      );
+    });
 
-      mockFs({
-        [entityRootDir]: {
-          'techdocs_metadata.json':
-            '{"site_name": "backstage", "site_description": "site_content", "etag": "etag"}',
-        },
+    it('should return tech docs metadata even if the legacy case is enabled', async () => {
+      const publisher = createPublisherFromConfig({
+        legacyUseCaseSensitiveTripletPaths: true,
       });
-      const expectedMetadata: TechDocsMetadata = {
-        site_name: 'backstage',
-        site_description: 'site_content',
-        etag: 'etag',
-      };
-      expect(
-        await publisher.fetchTechDocsMetadata(entityNameMock),
-      ).toStrictEqual(expectedMetadata);
-      mockFs.restore();
+      await publisher.publish({ entity, directory });
+      expect(await publisher.fetchTechDocsMetadata(entityName)).toStrictEqual(
+        techdocsMetadata,
+      );
     });
 
     it('should return tech docs metadata when json encoded with single quotes', async () => {
-      const entityNameMock = createMockEntityName();
-      const entity = createMockEntity();
-      const entityRootDir = getEntityRootDir(entity);
+      const techdocsMetadataPath = path.join(
+        directory,
+        'techdocs_metadata.json',
+      );
+      const techdocsMetadataContent = files['techdocs_metadata.json'];
 
-      mockFs({
-        [entityRootDir]: {
-          'techdocs_metadata.json': `{'site_name': 'backstage', 'site_description': 'site_content', 'etag': 'etag'}`,
-        },
-      });
+      fs.writeFileSync(
+        techdocsMetadataPath,
+        techdocsMetadataContent.replace(/"/g, "'"),
+      );
 
-      const expectedMetadata: TechDocsMetadata = {
-        site_name: 'backstage',
-        site_description: 'site_content',
-        etag: 'etag',
-      };
-      expect(
-        await publisher.fetchTechDocsMetadata(entityNameMock),
-      ).toStrictEqual(expectedMetadata);
-      mockFs.restore();
+      const publisher = createPublisherFromConfig();
+      await publisher.publish({ entity, directory });
+
+      expect(await publisher.fetchTechDocsMetadata(entityName)).toStrictEqual(
+        techdocsMetadata,
+      );
+
+      fs.writeFileSync(techdocsMetadataPath, techdocsMetadataContent);
     });
 
     it('should return an error if the techdocs_metadata.json file is not present', async () => {
-      const entityNameMock = createMockEntityName();
-      const entity = createMockEntity();
-      const entityRootDir = getEntityRootDir(entity);
+      const publisher = createPublisherFromConfig();
 
-      let error;
-      try {
-        await publisher.fetchTechDocsMetadata(entityNameMock);
-      } catch (e) {
-        error = e;
-      }
+      const invalidEntityName = {
+        namespace: 'invalid',
+        kind: 'triplet',
+        name: 'path',
+      };
 
-      expect(error).toEqual(
-        new Error(
-          `TechDocs metadata fetch failed, The file ${path.join(
-            entityRootDir,
-            'techdocs_metadata.json',
-          )} does not exist !`,
-        ),
+      const techDocsMetadaFilePath = path.posix.join(
+        ...Object.values(invalidEntityName),
+        'techdocs_metadata.json',
       );
+
+      const fails = publisher.fetchTechDocsMetadata(invalidEntityName);
+
+      await expect(fails).rejects.toMatchObject({
+        message: `TechDocs metadata fetch failed, The file ${techDocsMetadaFilePath} does not exist!`,
+      });
     });
   });
 
   describe('docsRouter', () => {
+    const entityTripletPath = `${entity.metadata.namespace}/${entity.kind}/${entity.metadata.name}`;
+
     let app: express.Express;
-    const entity = createMockEntity();
-    const entityRootDir = getEntityRootDir(entity);
 
-    beforeEach(() => {
+    beforeEach(async () => {
+      const publisher = createPublisherFromConfig();
+      await publisher.publish({ entity, directory });
       app = express().use(publisher.docsRouter());
-
-      mockFs.restore();
-      mockFs({
-        [entityRootDir]: {
-          html: {
-            'unsafe.html': '<html></html>',
-          },
-          img: {
-            'with spaces.png': 'found it',
-            'unsafe.svg': '<svg></svg>',
-          },
-          'some folder': {
-            'also with spaces.js': 'found it too',
-          },
-        },
-      });
     });
 
     afterEach(() => {
@@ -362,32 +326,41 @@ describe('publishing with valid credentials', () => {
     });
 
     it('should pass expected object path to bucket', async () => {
-      const {
-        kind,
-        metadata: { namespace, name },
-      } = entity;
-
       // Ensures leading slash is trimmed and encoded path is decoded.
       const pngResponse = await request(app).get(
-        `/${namespace}/${kind}/${name}/img/with%20spaces.png`,
+        `/${entityTripletPath}/img/with%20spaces.png`,
       );
       expect(Buffer.from(pngResponse.body).toString('utf8')).toEqual(
         'found it',
       );
       const jsResponse = await request(app).get(
-        `/${namespace}/${kind}/${name}/some%20folder/also%20with%20spaces.js`,
+        `/${entityTripletPath}/some%20folder/also%20with%20spaces.js`,
+      );
+      expect(jsResponse.text).toEqual('found it too');
+    });
+
+    it('should pass expected object path to bucket even if the legacy case is enabled', async () => {
+      const publisher = createPublisherFromConfig({
+        legacyUseCaseSensitiveTripletPaths: true,
+      });
+      await publisher.publish({ entity, directory });
+      app = express().use(publisher.docsRouter());
+      // Ensures leading slash is trimmed and encoded path is decoded.
+      const pngResponse = await request(app).get(
+        `/${entityTripletPath}/img/with%20spaces.png`,
+      );
+      expect(Buffer.from(pngResponse.body).toString('utf8')).toEqual(
+        'found it',
+      );
+      const jsResponse = await request(app).get(
+        `/${entityTripletPath}/some%20folder/also%20with%20spaces.js`,
       );
       expect(jsResponse.text).toEqual('found it too');
     });
 
     it('should pass text/plain content-type for html', async () => {
-      const {
-        kind,
-        metadata: { namespace, name },
-      } = entity;
-
       const htmlResponse = await request(app).get(
-        `/${namespace}/${kind}/${name}/html/unsafe.html`,
+        `/${entityTripletPath}/html/unsafe.html`,
       );
       expect(htmlResponse.text).toEqual('<html></html>');
       expect(htmlResponse.header).toMatchObject({
@@ -395,7 +368,7 @@ describe('publishing with valid credentials', () => {
       });
 
       const svgResponse = await request(app).get(
-        `/${namespace}/${kind}/${name}/img/unsafe.svg`,
+        `/${entityTripletPath}/img/unsafe.svg`,
       );
       expect(svgResponse.text).toEqual('<svg></svg>');
       expect(svgResponse.header).toMatchObject({
diff --git a/packages/techdocs-common/src/stages/publish/azureBlobStorage.ts b/packages/techdocs-common/src/stages/publish/azureBlobStorage.ts
index 3ed75f532e..4dfd8ba2f5 100644
--- a/packages/techdocs-common/src/stages/publish/azureBlobStorage.ts
+++ b/packages/techdocs-common/src/stages/publish/azureBlobStorage.ts
@@ -16,6 +16,7 @@
 import { DefaultAzureCredential } from '@azure/identity';
 import {
   BlobServiceClient,
+  ContainerClient,
   StorageSharedKeyCredential,
 } from '@azure/storage-blob';
 import { Entity, EntityName } from '@backstage/catalog-model';
@@ -25,7 +26,15 @@ import JSON5 from 'json5';
 import limiterFactory from 'p-limit';
 import { default as path, default as platformPath } from 'path';
 import { Logger } from 'winston';
-import { getFileTreeRecursively, getHeadersForFileExtension } from './helpers';
+import {
+  bulkStorageOperation,
+  getCloudPathForLocalPath,
+  getFileTreeRecursively,
+  getHeadersForFileExtension,
+  lowerCaseEntityTriplet,
+  getStaleFiles,
+  lowerCaseEntityTripletInStoragePath,
+} from './helpers';
 import {
   PublisherBase,
   PublishRequest,
@@ -80,16 +89,28 @@ export class AzureBlobStoragePublish implements PublisherBase {
       credential,
     );
 
-    return new AzureBlobStoragePublish(storageClient, containerName, logger);
+    const legacyPathCasing =
+      config.getOptionalBoolean(
+        'techdocs.legacyUseCaseSensitiveTripletPaths',
+      ) || false;
+
+    return new AzureBlobStoragePublish(
+      storageClient,
+      containerName,
+      legacyPathCasing,
+      logger,
+    );
   }
 
   constructor(
     private readonly storageClient: BlobServiceClient,
     private readonly containerName: string,
+    private readonly legacyPathCasing: boolean,
     private readonly logger: Logger,
   ) {
     this.storageClient = storageClient;
     this.containerName = containerName;
+    this.legacyPathCasing = legacyPathCasing;
     this.logger = logger;
   }
 
@@ -129,75 +150,112 @@ export class AzureBlobStoragePublish implements PublisherBase {
    * Directory structure used in the container is - entityNamespace/entityKind/entityName/index.html
    */
   async publish({ entity, directory }: PublishRequest): Promise<void> {
+    const useLegacyPathCasing = this.legacyPathCasing;
+
+    // First, try to retrieve a list of all individual files currently existing
+    const remoteFolder = getCloudPathForLocalPath(
+      entity,
+      undefined,
+      useLegacyPathCasing,
+    );
+    let existingFiles: string[] = [];
     try {
-      // Note: Azure Blob Storage manages creation of parent directories if they do not exist.
-      // So collecting path of only the files is good enough.
-      const allFilesToUpload = await getFileTreeRecursively(directory);
+      existingFiles = await this.getAllBlobsFromContainer({
+        prefix: remoteFolder,
+        maxPageSize: BATCH_CONCURRENCY,
+      });
+    } catch (e) {
+      this.logger.error(
+        `Unable to list files for Entity ${entity.metadata.name}: ${e.message}`,
+      );
+    }
 
-      // Bound the number of concurrent batches. We want a bit of concurrency for
-      // performance reasons, but not so much that we starve the connection pool
-      // or start thrashing.
-      const limiter = limiterFactory(BATCH_CONCURRENCY);
+    // Then, merge new files into the same folder
+    let absoluteFilesToUpload;
+    let container: ContainerClient;
+    try {
+      // Remove the absolute path prefix of the source directory
+      // Path of all files to upload, relative to the root of the source directory
+      // e.g. ['index.html', 'sub-page/index.html', 'assets/images/favicon.png']
+      absoluteFilesToUpload = await getFileTreeRecursively(directory);
 
-      const promises = allFilesToUpload.map(sourceFilePath => {
-        // Remove the absolute path prefix of the source directory
-        // Path of all files to upload, relative to the root of the source directory
-        // e.g. ['index.html', 'sub-page/index.html', 'assets/images/favicon.png']
-        const relativeFilePath = path.normalize(
-          path.relative(directory, sourceFilePath),
-        );
-
-        // Convert destination file path to a POSIX path for uploading.
-        // Azure Blob Storage expects / as path separator and relativeFilePath will contain \\ on Windows.
-        // https://docs.microsoft.com/en-us/rest/api/storageservices/naming-and-referencing-containers--blobs--and-metadata#blob-names
-        const relativeFilePathPosix = relativeFilePath
-          .split(path.sep)
-          .join(path.posix.sep);
-
-        // The / delimiter is intentional since it represents the cloud storage and not the local file system.
-        const entityRootDir = `${entity.metadata.namespace}/${entity.kind}/${entity.metadata.name}`;
-        const destination = `${entityRootDir}/${relativeFilePathPosix}`; // Azure Blob Storage Container file relative path
-        return limiter(async () => {
-          const response = await this.storageClient
-            .getContainerClient(this.containerName)
-            .getBlockBlobClient(destination)
-            .uploadFile(sourceFilePath);
+      container = this.storageClient.getContainerClient(this.containerName);
+      const failedOperations: Error[] = [];
+      await bulkStorageOperation(
+        async absoluteFilePath => {
+          const relativeFilePath = path.normalize(
+            path.relative(directory, absoluteFilePath),
+          );
+          const response = await container
+            .getBlockBlobClient(
+              getCloudPathForLocalPath(
+                entity,
+                relativeFilePath,
+                useLegacyPathCasing,
+              ),
+            )
+            .uploadFile(absoluteFilePath);
 
           if (response._response.status >= 400) {
-            return {
-              ...response,
-              error: new Error(
-                `Upload failed for ${sourceFilePath} with status code ${response._response.status}`,
+            failedOperations.push(
+              new Error(
+                `Upload failed for ${absoluteFilePath} with status code ${response._response.status}`,
               ),
-            };
+            );
           }
-          return {
-            ...response,
-            error: undefined,
-          };
-        });
-      });
 
-      const responses = await Promise.all(promises);
+          return response;
+        },
+        absoluteFilesToUpload,
+        { concurrencyLimit: BATCH_CONCURRENCY },
+      );
 
-      const failed = responses.filter(r => r.error);
-      if (failed.length === 0) {
-        this.logger.info(
-          `Successfully uploaded the ${responses.length} generated file(s) for Entity ${entity.metadata.name}. Total number of files: ${allFilesToUpload.length}`,
-        );
-      } else {
+      if (failedOperations.length > 0) {
         throw new Error(
-          failed
-            .map(r => r.error?.message)
+          failedOperations
+            .map(r => r.message)
             .filter(Boolean)
             .join(' '),
         );
       }
+
+      this.logger.info(
+        `Successfully uploaded all the generated files for Entity ${entity.metadata.name}. Total number of files: ${absoluteFilesToUpload.length}`,
+      );
     } catch (e) {
-      const errorMessage = `Unable to upload file(s) to Azure Blob Storage. ${e}`;
+      const errorMessage = `Unable to upload file(s) to Azure. ${e}`;
       this.logger.error(errorMessage);
       throw new Error(errorMessage);
     }
+
+    // Last, try to remove the files that were *only* present previously
+    try {
+      const relativeFilesToUpload = absoluteFilesToUpload.map(
+        absoluteFilePath =>
+          getCloudPathForLocalPath(
+            entity,
+            path.relative(directory, absoluteFilePath),
+            useLegacyPathCasing,
+          ),
+      );
+
+      const staleFiles = getStaleFiles(relativeFilesToUpload, existingFiles);
+
+      await bulkStorageOperation(
+        async relativeFilePath => {
+          return await container.deleteBlob(relativeFilePath);
+        },
+        staleFiles,
+        { concurrencyLimit: BATCH_CONCURRENCY },
+      );
+
+      this.logger.info(
+        `Successfully deleted stale files for Entity ${entity.metadata.name}. Total number of files: ${staleFiles.length}`,
+      );
+    } catch (error) {
+      const errorMessage = `Unable to delete file(s) from Azure. ${error}`;
+      this.logger.error(errorMessage);
+    }
   }
 
   private download(containerName: string, blobPath: string): Promise<Buffer> {
@@ -229,7 +287,11 @@ export class AzureBlobStoragePublish implements PublisherBase {
   async fetchTechDocsMetadata(
     entityName: EntityName,
   ): Promise<TechDocsMetadata> {
-    const entityRootDir = `${entityName.namespace}/${entityName.kind}/${entityName.name}`;
+    const entityTriplet = `${entityName.namespace}/${entityName.kind}/${entityName.name}`;
+    const entityRootDir = this.legacyPathCasing
+      ? entityTriplet
+      : lowerCaseEntityTriplet(entityTriplet);
+
     try {
       const techdocsMetadataJson = await this.download(
         this.containerName,
@@ -255,8 +317,13 @@ export class AzureBlobStoragePublish implements PublisherBase {
   docsRouter(): express.Handler {
     return (req, res) => {
       // Decode and trim the leading forward slash
+      const decodedUri = decodeURI(req.path.replace(/^\//, ''));
+
       // filePath example - /default/Component/documented-component/index.html
-      const filePath = decodeURI(req.path.replace(/^\//, ''));
+      const filePath = this.legacyPathCasing
+        ? decodedUri
+        : lowerCaseEntityTripletInStoragePath(decodedUri);
+
       // Files with different extensions (CSS, HTML) need to be served with different headers
       const fileExtension = platformPath.extname(filePath);
       const responseHeaders = getHeadersForFileExtension(fileExtension);
@@ -283,10 +350,97 @@ export class AzureBlobStoragePublish implements PublisherBase {
    * can be used to verify if there are any pre-generated docs available to serve.
    */
   hasDocsBeenGenerated(entity: Entity): Promise<boolean> {
-    const entityRootDir = `${entity.metadata.namespace}/${entity.kind}/${entity.metadata.name}`;
+    const entityTriplet = `${entity.metadata.namespace}/${entity.kind}/${entity.metadata.name}`;
+    const entityRootDir = this.legacyPathCasing
+      ? entityTriplet
+      : lowerCaseEntityTriplet(entityTriplet);
+
     return this.storageClient
       .getContainerClient(this.containerName)
       .getBlockBlobClient(`${entityRootDir}/index.html`)
       .exists();
   }
+
+  protected async renameBlob(
+    originalName: string,
+    newName: string,
+    removeOriginal = false,
+  ): Promise<void> {
+    const container = this.storageClient.getContainerClient(this.containerName);
+    const blob = container.getBlobClient(newName);
+    const { url } = container.getBlobClient(originalName);
+    const response = await blob.beginCopyFromURL(url);
+    await response.pollUntilDone();
+    if (removeOriginal) {
+      await container.deleteBlob(originalName);
+    }
+  }
+
+  protected async renameBlobToLowerCase(
+    originalPath: string,
+    removeOriginal: boolean,
+  ) {
+    let newPath;
+    try {
+      newPath = lowerCaseEntityTripletInStoragePath(originalPath);
+    } catch (e) {
+      this.logger.warn(e.message);
+      return;
+    }
+
+    if (originalPath === newPath) return;
+    try {
+      this.logger.verbose(`Migrating ${originalPath}`);
+      await this.renameBlob(originalPath, newPath, removeOriginal);
+    } catch (e) {
+      this.logger.warn(`Unable to migrate ${originalPath}: ${e.message}`);
+    }
+  }
+
+  async migrateDocsCase({
+    removeOriginal = false,
+    concurrency = 25,
+  }): Promise<void> {
+    const promises = [];
+    const limiter = limiterFactory(concurrency);
+    const container = this.storageClient.getContainerClient(this.containerName);
+
+    for await (const blob of container.listBlobsFlat()) {
+      promises.push(
+        limiter(
+          this.renameBlobToLowerCase.bind(this),
+          blob.name,
+          removeOriginal,
+        ),
+      );
+    }
+
+    await Promise.all(promises);
+  }
+
+  protected async getAllBlobsFromContainer({
+    prefix,
+    maxPageSize,
+  }: {
+    prefix: string;
+    maxPageSize: number;
+  }): Promise<string[]> {
+    const blobs: string[] = [];
+    const container = this.storageClient.getContainerClient(this.containerName);
+
+    let iterator = container.listBlobsFlat({ prefix }).byPage({ maxPageSize });
+    let response = (await iterator.next()).value;
+
+    do {
+      for (const blob of response?.segment?.blobItems ?? []) {
+        blobs.push(blob.name);
+      }
+      iterator = container
+        .listBlobsFlat({ prefix })
+        .byPage({ continuationToken: response.continuationToken, maxPageSize });
+      response = (await iterator.next()).value;
+    } while (response && response.continuationToken);
+
+    return blobs;
+  }
 }
diff --git a/packages/techdocs-common/src/stages/publish/googleStorage.test.ts b/packages/techdocs-common/src/stages/publish/googleStorage.test.ts
index 8a00fc9708..4247442c54 100644
--- a/packages/techdocs-common/src/stages/publish/googleStorage.test.ts
+++ b/packages/techdocs-common/src/stages/publish/googleStorage.test.ts
@@ -15,43 +15,18 @@
  */
 
 import { getVoidLogger } from '@backstage/backend-common';
-import {
-  Entity,
-  ENTITY_DEFAULT_NAMESPACE,
-  EntityName,
-} from '@backstage/catalog-model';
+import { Entity, ENTITY_DEFAULT_NAMESPACE } from '@backstage/catalog-model';
 import { ConfigReader } from '@backstage/config';
 import express from 'express';
 import request from 'supertest';
 import mockFs from 'mock-fs';
-import os from 'os';
 import path from 'path';
+import fs from 'fs-extra';
 import { GoogleGCSPublish } from './googleStorage';
-import { PublisherBase, TechDocsMetadata } from './types';
 
 // NOTE: /packages/techdocs-common/__mocks__ is being used to mock Google Cloud Storage client library
 
-const createMockEntity = (annotations = {}): Entity => {
-  return {
-    apiVersion: 'version',
-    kind: 'TestKind',
-    metadata: {
-      name: 'test-component-name',
-      namespace: 'test-namespace',
-      annotations: {
-        ...annotations,
-      },
-    },
-  };
-};
-
-const createMockEntityName = (): EntityName => ({
-  kind: 'TestKind',
-  name: 'test-component-name',
-  namespace: 'test-namespace',
-});
-
-const rootDir = os.platform() === 'win32' ? 'C:\\rootDir' : '/rootDir';
+const rootDir = global.rootDir;
 
 const getEntityRootDir = (entity: Entity) => {
   const {
@@ -64,88 +39,114 @@ const getEntityRootDir = (entity: Entity) => {
 
 const logger = getVoidLogger();
 jest.spyOn(logger, 'info').mockReturnValue(logger);
+jest.spyOn(logger, 'error').mockReturnValue(logger);
 
-let publisher: PublisherBase;
-
-beforeEach(async () => {
-  mockFs.restore();
-  const mockConfig = new ConfigReader({
+const createPublisherFromConfig = ({
+  bucketName = 'bucketName',
+  legacyUseCaseSensitiveTripletPaths = false,
+}: {
+  bucketName?: string;
+  legacyUseCaseSensitiveTripletPaths?: boolean;
+} = {}) => {
+  const config = new ConfigReader({
     techdocs: {
       requestUrl: 'http://localhost:7000',
       publisher: {
         type: 'googleGcs',
         googleGcs: {
           credentials: '{}',
-          bucketName: 'bucketName',
+          bucketName,
         },
       },
+      legacyUseCaseSensitiveTripletPaths,
     },
   });
-
-  publisher = await GoogleGCSPublish.fromConfig(mockConfig, logger);
-});
+  return GoogleGCSPublish.fromConfig(config, logger);
+};
 
 describe('GoogleGCSPublish', () => {
+  const entity = {
+    apiVersion: 'version',
+    kind: 'Component',
+    metadata: {
+      name: 'backstage',
+      namespace: 'default',
+      annotations: {},
+    },
+  };
+
+  const entityName = {
+    kind: 'Component',
+    name: 'backstage',
+    namespace: 'default',
+  };
+
+  const techdocsMetadata = {
+    site_name: 'backstage',
+    site_description: 'site_content',
+    etag: 'etag',
+  };
+
+  const directory = getEntityRootDir(entity);
+
+  const files = {
+    'index.html': '',
+    '404.html': '',
+    assets: {
+      'main.css': '',
+    },
+    'techdocs_metadata.json': JSON.stringify(techdocsMetadata),
+    html: {
+      'unsafe.html': '<html></html>',
+    },
+    img: {
+      'with spaces.png': 'found it',
+      'unsafe.svg': '<svg></svg>',
+    },
+    'some folder': {
+      'also with spaces.js': 'found it too',
+    },
+  };
+
+  beforeAll(() => {
+    mockFs({
+      [directory]: files,
+    });
+  });
+
+  afterAll(() => {
+    mockFs.restore();
+  });
+
   describe('getReadiness', () => {
     it('should validate correct config', async () => {
+      const publisher = createPublisherFromConfig();
       expect(await publisher.getReadiness()).toEqual({
         isAvailable: true,
       });
     });
 
     it('should reject incorrect config', async () => {
-      const mockConfig = new ConfigReader({
-        techdocs: {
-          requestUrl: 'http://localhost:7000',
-          publisher: {
-            type: 'googleGcs',
-            googleGcs: {
-              credentials: '{}',
-              bucketName: 'errorBucket',
-            },
-          },
-        },
+      const publisher = createPublisherFromConfig({
+        bucketName: 'bad_bucket_name',
       });
-
-      const errorPublisher = GoogleGCSPublish.fromConfig(mockConfig, logger);
-
-      expect(await errorPublisher.getReadiness()).toEqual({
+      expect(await publisher.getReadiness()).toEqual({
         isAvailable: false,
       });
     });
   });
 
   describe('publish', () => {
-    beforeEach(() => {
-      const entity = createMockEntity();
-      const entityRootDir = getEntityRootDir(entity);
-
-      mockFs({
-        [entityRootDir]: {
-          'index.html': '',
-          '404.html': '',
-          assets: {
-            'main.css': '',
-          },
-        },
-      });
-    });
-
-    afterEach(() => {
-      mockFs.restore();
-    });
-
     it('should publish a directory', async () => {
-      const entity = createMockEntity();
-      const entityRootDir = getEntityRootDir(entity);
+      const publisher = createPublisherFromConfig();
+      expect(await publisher.publish({ entity, directory })).toBeUndefined();
+    });
 
-      expect(
-        await publisher.publish({
-          entity,
-          directory: entityRootDir,
-        }),
-      ).toBeUndefined();
-      mockFs.restore();
+    it('should publish a directory as well when legacy casing is used', async () => {
+      const publisher = createPublisherFromConfig({
+        legacyUseCaseSensitiveTripletPaths: true,
+      });
+      expect(await publisher.publish({ entity, directory })).toBeUndefined();
     });
 
     it('should fail to publish a directory', async () => {
@@ -157,14 +158,7 @@ describe('GoogleGCSPublish', () => {
         'generatedDirectory',
       );
 
-      const entity = createMockEntity();
-
-      await expect(
-        publisher.publish({
-          entity,
-          directory: wrongPathToGeneratedDirectory,
-        }),
-      ).rejects.toThrowError();
+      const publisher = createPublisherFromConfig();
 
       const fails = publisher.publish({
         entity,
@@ -178,158 +172,171 @@ describe('GoogleGCSPublish', () => {
           `Unable to upload file(s) to Google Cloud Storage. Error: Failed to read template directory: ENOENT, no such file or directory`,
         ),
       });
+
       await expect(fails).rejects.toMatchObject({
         message: expect.stringContaining(wrongPathToGeneratedDirectory),
       });
+    });
 
-      mockFs.restore();
+    it('should delete stale files after upload', async () => {
+      const bucketName = 'delete_stale_files_success';
+      const publisher = createPublisherFromConfig({ bucketName });
+      await publisher.publish({ entity, directory });
+      expect(logger.info).toHaveBeenLastCalledWith(
+        `Successfully deleted stale files for Entity ${entity.metadata.name}. Total number of files: 1`,
+      );
+    });
+
+    it('should log error when the stale files deletion fails', async () => {
+      const bucketName = 'delete_stale_files_error';
+      const publisher = createPublisherFromConfig({ bucketName });
+      await publisher.publish({ entity, directory });
+      expect(logger.error).toHaveBeenLastCalledWith(
+        'Unable to delete file(s) from Google Cloud Storage. Error: Message',
+      );
     });
   });
 
   describe('hasDocsBeenGenerated', () => {
     it('should return true if docs has been generated', async () => {
-      const entity = createMockEntity();
-      const entityRootDir = getEntityRootDir(entity);
-
-      mockFs({
-        [entityRootDir]: {
-          'index.html': 'file-content',
-        },
-      });
-
+      const publisher = createPublisherFromConfig();
+      await publisher.publish({ entity, directory });
+      expect(await publisher.hasDocsBeenGenerated(entity)).toBe(true);
+    });
+
+    it('should return true if docs has been generated even if the legacy case is enabled', async () => {
+      const publisher = createPublisherFromConfig({
+        legacyUseCaseSensitiveTripletPaths: true,
+      });
+      await publisher.publish({ entity, directory });
       expect(await publisher.hasDocsBeenGenerated(entity)).toBe(true);
-      mockFs.restore();
     });
 
     it('should return false if docs has not been generated', async () => {
-      const entity = createMockEntity();
-
-      expect(await publisher.hasDocsBeenGenerated(entity)).toBe(false);
+      const publisher = createPublisherFromConfig();
+      expect(
+        await publisher.hasDocsBeenGenerated({
+          kind: 'entity',
+          metadata: {
+            namespace: 'invalid',
+            name: 'triplet',
+          },
+        } as Entity),
+      ).toBe(false);
     });
   });
 
   describe('fetchTechDocsMetadata', () => {
-    beforeEach(() => {
-      mockFs.restore();
+    it('should return tech docs metadata', async () => {
+      const publisher = createPublisherFromConfig();
+      await publisher.publish({ entity, directory });
+      expect(await publisher.fetchTechDocsMetadata(entityName)).toStrictEqual(
+        techdocsMetadata,
+      );
     });
 
-    it('should return tech docs metadata', async () => {
-      const entityNameMock = createMockEntityName();
-      const entity = createMockEntity();
-      const entityRootDir = getEntityRootDir(entity);
-
-      mockFs({
-        [entityRootDir]: {
-          'techdocs_metadata.json':
-            '{"site_name": "backstage", "site_description": "site_content", "etag": "etag"}',
-        },
+    it('should return tech docs metadata even if the legacy case is enabled', async () => {
+      const publisher = createPublisherFromConfig({
+        legacyUseCaseSensitiveTripletPaths: true,
       });
-
-      const expectedMetadata: TechDocsMetadata = {
-        site_name: 'backstage',
-        site_description: 'site_content',
-        etag: 'etag',
-      };
-      expect(
-        await publisher.fetchTechDocsMetadata(entityNameMock),
-      ).toStrictEqual(expectedMetadata);
+      await publisher.publish({ entity, directory });
+      expect(await publisher.fetchTechDocsMetadata(entityName)).toStrictEqual(
+        techdocsMetadata,
+      );
     });
 
     it('should return tech docs metadata when json encoded with single quotes', async () => {
-      const entityNameMock = createMockEntityName();
-      const entity = createMockEntity();
-      const entityRootDir = getEntityRootDir(entity);
+      const techdocsMetadataPath = path.join(
+        directory,
+        'techdocs_metadata.json',
+      );
+      const techdocsMetadataContent = files['techdocs_metadata.json'];
 
-      mockFs({
-        [entityRootDir]: {
-          'techdocs_metadata.json':
-            "{'site_name': 'backstage', 'site_description': 'site_content', 'etag': 'etag'}",
-        },
-      });
+      fs.writeFileSync(
+        techdocsMetadataPath,
+        techdocsMetadataContent.replace(/"/g, "'"),
+      );
 
-      const expectedMetadata: TechDocsMetadata = {
-        site_name: 'backstage',
-        site_description: 'site_content',
-        etag: 'etag',
-      };
-      expect(
-        await publisher.fetchTechDocsMetadata(entityNameMock),
-      ).toStrictEqual(expectedMetadata);
-      mockFs.restore();
+      const publisher = createPublisherFromConfig();
+      await publisher.publish({ entity, directory });
+
+      expect(await publisher.fetchTechDocsMetadata(entityName)).toStrictEqual(
+        techdocsMetadata,
+      );
+
+      fs.writeFileSync(techdocsMetadataPath, techdocsMetadataContent);
     });
 
     it('should return an error if the techdocs_metadata.json file is not present', async () => {
-      const entityNameMock = createMockEntityName();
-      const entity = createMockEntity();
-      const entityRootDir = getEntityRootDir(entity);
+      const publisher = createPublisherFromConfig();
 
-      const fails = publisher.fetchTechDocsMetadata(entityNameMock);
+      const invalidEntityName = {
+        namespace: 'invalid',
+        kind: 'triplet',
+        name: 'path',
+      };
+
+      const techDocsMetadaFilePath = path.posix.join(
+        ...Object.values(invalidEntityName),
+        'techdocs_metadata.json',
+      );
+
+      const fails = publisher.fetchTechDocsMetadata(invalidEntityName);
 
       await expect(fails).rejects.toMatchObject({
-        message: `The file ${path.join(
-          entityRootDir,
-          'techdocs_metadata.json',
-        )} does not exist !`,
+        message: `The file ${techDocsMetadaFilePath} does not exist!`,
       });
     });
   });
 
   describe('docsRouter', () => {
-    let app: express.Express;
-    const entity = createMockEntity();
-    const entityRootDir = getEntityRootDir(entity);
+    const entityTripletPath = `${entity.metadata.namespace}/${entity.kind}/${entity.metadata.name}`;
 
-    beforeEach(() => {
+    let app: Express.Application;
+
+    beforeEach(async () => {
+      const publisher = createPublisherFromConfig();
+      await publisher.publish({ entity, directory });
       app = express().use(publisher.docsRouter());
-
-      mockFs.restore();
-      mockFs({
-        [entityRootDir]: {
-          html: {
-            'unsafe.html': '<html></html>',
-          },
-          img: {
-            'with spaces.png': 'found it',
-            'unsafe.svg': '<svg></svg>',
-          },
-          'some folder': {
-            'also with spaces.js': 'found it too',
-          },
-        },
-      });
-    });
-
-    afterEach(() => {
-      mockFs.restore();
     });
 
     it('should pass expected object path to bucket', async () => {
-      const {
-        kind,
-        metadata: { namespace, name },
-      } = entity;
-
       // Ensures leading slash is trimmed and encoded path is decoded.
       const pngResponse = await request(app).get(
-        `/${namespace}/${kind}/${name}/img/with%20spaces.png`,
+        `/${entityTripletPath}/img/with%20spaces.png`,
       );
       expect(Buffer.from(pngResponse.body).toString('utf8')).toEqual(
         'found it',
       );
       const jsResponse = await request(app).get(
-        `/${namespace}/${kind}/${name}/some%20folder/also%20with%20spaces.js`,
+        `/${entityTripletPath}/some%20folder/also%20with%20spaces.js`,
+      );
+      expect(jsResponse.text).toEqual('found it too');
+    });
+
+    it('should pass expected object path to bucket even if the legacy case is enabled', async () => {
+      const publisher = createPublisherFromConfig({
+        legacyUseCaseSensitiveTripletPaths: true,
+      });
+      await publisher.publish({ entity, directory });
+      app = express().use(publisher.docsRouter());
+
+      // Ensures leading slash is trimmed and encoded path is decoded.
+      const pngResponse = await request(app).get(
+        `/${entityTripletPath}/img/with%20spaces.png`,
+      );
+      expect(Buffer.from(pngResponse.body).toString('utf8')).toEqual(
+        'found it',
+      );
+      const jsResponse = await request(app).get(
+        `/${entityTripletPath}/some%20folder/also%20with%20spaces.js`,
       );
       expect(jsResponse.text).toEqual('found it too');
     });
 
     it('should pass text/plain content-type for html', async () => {
-      const {
-        kind,
-        metadata: { namespace, name },
-      } = entity;
-
       const htmlResponse = await request(app).get(
-        `/${namespace}/${kind}/${name}/html/unsafe.html`,
+        `/${entityTripletPath}/html/unsafe.html`,
       );
       expect(htmlResponse.text).toEqual('<html></html>');
       expect(htmlResponse.header).toMatchObject({
@@ -337,7 +344,7 @@ describe('GoogleGCSPublish', () => {
       });
 
       const svgResponse = await request(app).get(
-        `/${namespace}/${kind}/${name}/img/unsafe.svg`,
+        `/${entityTripletPath}/img/unsafe.svg`,
       );
       expect(svgResponse.text).toEqual('<svg></svg>');
       expect(svgResponse.header).toMatchObject({
diff --git a/packages/techdocs-common/src/stages/publish/googleStorage.ts b/packages/techdocs-common/src/stages/publish/googleStorage.ts
index bca7b86856..1f519829f2 100644
--- a/packages/techdocs-common/src/stages/publish/googleStorage.ts
+++ b/packages/techdocs-common/src/stages/publish/googleStorage.ts
@@ -15,17 +15,22 @@
  */
 import { Entity, EntityName } from '@backstage/catalog-model';
 import { Config } from '@backstage/config';
-import {
-  FileExistsResponse,
-  Storage,
-  UploadResponse,
-} from '@google-cloud/storage';
+import { File, FileExistsResponse, Storage } from '@google-cloud/storage';
 import express from 'express';
 import JSON5 from 'json5';
-import createLimiter from 'p-limit';
 import path from 'path';
+import { Readable } from 'stream';
 import { Logger } from 'winston';
-import { getFileTreeRecursively, getHeadersForFileExtension } from './helpers';
+import {
+  getFileTreeRecursively,
+  getHeadersForFileExtension,
+  lowerCaseEntityTriplet,
+  lowerCaseEntityTripletInStoragePath,
+  bulkStorageOperation,
+  getCloudPathForLocalPath,
+  getStaleFiles,
+} from './helpers';
+import { MigrateWriteStream } from './migrations';
 import {
   PublisherBase,
   PublishRequest,
@@ -67,16 +72,28 @@ export class GoogleGCSPublish implements PublisherBase {
       }),
     });
 
-    return new GoogleGCSPublish(storageClient, bucketName, logger);
+    const legacyPathCasing =
+      config.getOptionalBoolean(
+        'techdocs.legacyUseCaseSensitiveTripletPaths',
+      ) || false;
+
+    return new GoogleGCSPublish(
+      storageClient,
+      bucketName,
+      legacyPathCasing,
+      logger,
+    );
   }
 
   constructor(
     private readonly storageClient: Storage,
     private readonly bucketName: string,
+    private readonly legacyPathCasing: boolean,
     private readonly logger: Logger,
   ) {
     this.storageClient = storageClient;
     this.bucketName = bucketName;
+    this.legacyPathCasing = legacyPathCasing;
     this.logger = logger;
   }
 
@@ -112,54 +129,91 @@ export class GoogleGCSPublish implements PublisherBase {
    * Directory structure used in the bucket is - entityNamespace/entityKind/entityName/index.html
    */
   async publish({ entity, directory }: PublishRequest): Promise<void> {
+    const useLegacyPathCasing = this.legacyPathCasing;
+    const bucket = this.storageClient.bucket(this.bucketName);
+
+    // First, try to retrieve a list of all individual files currently existing
+    let existingFiles: string[] = [];
     try {
-      // Note: GCS manages creation of parent directories if they do not exist.
-      // So collecting path of only the files is good enough.
-      const allFilesToUpload = await getFileTreeRecursively(directory);
+      const remoteFolder = getCloudPathForLocalPath(
+        entity,
+        undefined,
+        useLegacyPathCasing,
+      );
+      existingFiles = await this.getFilesForFolder(remoteFolder);
+    } catch (e) {
+      this.logger.error(
+        `Unable to list files for Entity ${entity.metadata.name}: ${e.message}`,
+      );
+    }
 
-      const limiter = createLimiter(10);
-      const uploadPromises: Array<Promise<UploadResponse>> = [];
-      allFilesToUpload.forEach(sourceFilePath => {
-        // Remove the absolute path prefix of the source directory
-        // Path of all files to upload, relative to the root of the source directory
-        // e.g. ['index.html', 'sub-page/index.html', 'assets/images/favicon.png']
-        const relativeFilePath = path.relative(directory, sourceFilePath);
+    // Then, merge new files into the same folder
+    let absoluteFilesToUpload;
+    try {
+      // Remove the absolute path prefix of the source directory
+      // Path of all files to upload, relative to the root of the source directory
+      // e.g. ['index.html', 'sub-page/index.html', 'assets/images/favicon.png']
+      absoluteFilesToUpload = await getFileTreeRecursively(directory);
 
-        // Convert destination file path to a POSIX path for uploading.
-        // GCS expects / as path separator and relativeFilePath will contain \\ on Windows.
-        // https://cloud.google.com/storage/docs/gsutil/addlhelp/HowSubdirectoriesWork
-        const relativeFilePathPosix = relativeFilePath
-          .split(path.sep)
-          .join(path.posix.sep);
-
-        // The / delimiter is intentional since it represents the cloud storage and not the local file system.
-        const entityRootDir = `${entity.metadata.namespace}/${entity.kind}/${entity.metadata.name}`;
-        const destination = `${entityRootDir}/${relativeFilePathPosix}`; // GCS Bucket file relative path
-
-        // Rate limit the concurrent execution of file uploads to batches of 10 (per publish)
-        const uploadFile = limiter(() =>
-          this.storageClient.bucket(this.bucketName).upload(sourceFilePath, {
-            destination,
-          }),
-        );
-        uploadPromises.push(uploadFile);
-      });
-
-      await Promise.all(uploadPromises);
+      await bulkStorageOperation(
+        async absoluteFilePath => {
+          const relativeFilePath = path.relative(directory, absoluteFilePath);
+          return await bucket.upload(absoluteFilePath, {
+            destination: getCloudPathForLocalPath(
+              entity,
+              relativeFilePath,
+              useLegacyPathCasing,
+            ),
+          });
+        },
+        absoluteFilesToUpload,
+        { concurrencyLimit: 10 },
+      );
 
       this.logger.info(
-        `Successfully uploaded all the generated files for Entity ${entity.metadata.name}. Total number of files: ${allFilesToUpload.length}`,
+        `Successfully uploaded all the generated files for Entity ${entity.metadata.name}. Total number of files: ${absoluteFilesToUpload.length}`,
       );
     } catch (e) {
       const errorMessage = `Unable to upload file(s) to Google Cloud Storage. ${e}`;
       this.logger.error(errorMessage);
       throw new Error(errorMessage);
     }
+
+    // Last, try to remove the files that were *only* present previously
+    try {
+      const relativeFilesToUpload = absoluteFilesToUpload.map(
+        absoluteFilePath =>
+          getCloudPathForLocalPath(
+            entity,
+            path.relative(directory, absoluteFilePath),
+            useLegacyPathCasing,
+          ),
+      );
+      const staleFiles = getStaleFiles(relativeFilesToUpload, existingFiles);
+
+      await bulkStorageOperation(
+        async relativeFilePath => {
+          return await bucket.file(relativeFilePath).delete();
+        },
+        staleFiles,
+        { concurrencyLimit: 10 },
+      );
+
+      this.logger.info(
+        `Successfully deleted stale files for Entity ${entity.metadata.name}. Total number of files: ${staleFiles.length}`,
+      );
+    } catch (error) {
+      const errorMessage = `Unable to delete file(s) from Google Cloud Storage. ${error}`;
+      this.logger.error(errorMessage);
+    }
   }
 
   fetchTechDocsMetadata(entityName: EntityName): Promise<TechDocsMetadata> {
     return new Promise((resolve, reject) => {
-      const entityRootDir = `${entityName.namespace}/${entityName.kind}/${entityName.name}`;
+      const entityTriplet = `${entityName.namespace}/${entityName.kind}/${entityName.name}`;
+      const entityRootDir = this.legacyPathCasing
+        ? entityTriplet
+        : lowerCaseEntityTriplet(entityTriplet);
 
       const fileStreamChunks: Array<any> = [];
       this.storageClient
@@ -174,9 +228,8 @@ export class GoogleGCSPublish implements PublisherBase {
           fileStreamChunks.push(chunk);
         })
         .on('end', () => {
-          const techdocsMetadataJson = Buffer.concat(fileStreamChunks).toString(
-            'utf-8',
-          );
+          const techdocsMetadataJson =
+            Buffer.concat(fileStreamChunks).toString('utf-8');
           resolve(JSON5.parse(techdocsMetadataJson));
         });
     });
@@ -188,8 +241,12 @@ export class GoogleGCSPublish implements PublisherBase {
   docsRouter(): express.Handler {
     return (req, res) => {
       // Decode and trim the leading forward slash
-      // filePath example - /default/Component/documented-component/index.html
-      const filePath = decodeURI(req.path.replace(/^\//, ''));
+      const decodedUri = decodeURI(req.path.replace(/^\//, ''));
+
+      // filePath example - /default/component/documented-component/index.html
+      const filePath = this.legacyPathCasing
+        ? decodedUri
+        : lowerCaseEntityTripletInStoragePath(decodedUri);
 
       // Files with different extensions (CSS, HTML) need to be served with different headers
       const fileExtension = path.extname(filePath);
@@ -222,7 +279,11 @@ export class GoogleGCSPublish implements PublisherBase {
    */
   async hasDocsBeenGenerated(entity: Entity): Promise<boolean> {
     return new Promise(resolve => {
-      const entityRootDir = `${entity.metadata.namespace}/${entity.kind}/${entity.metadata.name}`;
+      const entityTriplet = `${entity.metadata.namespace}/${entity.kind}/${entity.metadata.name}`;
+      const entityRootDir = this.legacyPathCasing
+        ? entityTriplet
+        : lowerCaseEntityTriplet(entityTriplet);
+
       this.storageClient
         .bucket(this.bucketName)
         .file(`${entityRootDir}/index.html`)
@@ -235,4 +296,48 @@ export class GoogleGCSPublish implements PublisherBase {
         });
     });
   }
+
+  migrateDocsCase({ removeOriginal = false, concurrency = 25 }): Promise<void> {
+    return new Promise((resolve, reject) => {
+      // Iterate through every file in the root of the publisher.
+      const allFileMetadata: Readable = this.storageClient
+        .bucket(this.bucketName)
+        .getFilesStream();
+      const migrateFiles = new MigrateWriteStream(
+        this.logger,
+        removeOriginal,
+        concurrency,
+      );
+      migrateFiles.on('finish', resolve).on('error', reject);
+      allFileMetadata.pipe(migrateFiles).on('error', error => {
+        migrateFiles.destroy();
+        reject(error);
+      });
+    });
+  }
+
+  private getFilesForFolder(folder: string): Promise<string[]> {
+    const fileMetadataStream: Readable = this.storageClient
+      .bucket(this.bucketName)
+      .getFilesStream({ prefix: folder });
+
+    return new Promise((resolve, reject) => {
+      const files: string[] = [];
+
+      fileMetadataStream.on('error', error => {
+        // push file to file array
+        reject(error);
+      });
+
+      fileMetadataStream.on('data', (file: File) => {
+        // push file to file array
+        files.push(file.name);
+      });
+
+      fileMetadataStream.on('end', () => {
+        // resolve promise
+        resolve(files);
+      });
+    });
+  }
 }
diff --git a/packages/techdocs-common/src/stages/publish/helpers.test.ts b/packages/techdocs-common/src/stages/publish/helpers.test.ts
index cfb9c7930d..a3571ef0ab 100644
--- a/packages/techdocs-common/src/stages/publish/helpers.test.ts
+++ b/packages/techdocs-common/src/stages/publish/helpers.test.ts
@@ -16,7 +16,16 @@
 import mockFs from 'mock-fs';
 import * as os from 'os';
 import * as path from 'path';
-import { getFileTreeRecursively, getHeadersForFileExtension } from './helpers';
+import { Entity, ENTITY_DEFAULT_NAMESPACE } from '@backstage/catalog-model';
+import {
+  getStaleFiles,
+  getFileTreeRecursively,
+  getCloudPathForLocalPath,
+  getHeadersForFileExtension,
+  bulkStorageOperation,
+  lowerCaseEntityTriplet,
+  lowerCaseEntityTripletInStoragePath,
+} from './helpers';
 
 describe('getHeadersForFileExtension', () => {
   const correctMapOfExtensions = [
@@ -73,3 +82,143 @@ describe('getFileTreeRecursively', () => {
     expect(fileList).toContain(path.resolve(root, 'subDirA/file2'));
   });
 });
+
+describe('lowerCaseEntityTriplet', () => {
+  it('returns lower-cased entity triplet path', () => {
+    const originalPath = 'default/Component/backstage/index.html';
+    const actualPath = lowerCaseEntityTriplet(originalPath);
+    expect(actualPath).toBe('default/component/backstage/index.html');
+  });
+});
+
+describe('lowerCaseEntityTripletInStoragePath', () => {
+  it('does not lowercase beyond the triplet', () => {
+    const originalPath = 'default/Component/backstage/assets/IMAGE.png';
+    const actualPath = lowerCaseEntityTripletInStoragePath(originalPath);
+    expect(actualPath).toBe('default/component/backstage/assets/IMAGE.png');
+  });
+
+  it('throws error when there is no triplet', () => {
+    const originalPath = '/default/component/IMAGE.png';
+    const error = `Encountered file unmanaged by TechDocs ${originalPath}. Skipping.`;
+    expect(() =>
+      lowerCaseEntityTripletInStoragePath(originalPath),
+    ).toThrowError(error);
+  });
+});
+
+describe('getStaleFiles', () => {
+  const defaultFiles = [
+    'default/Component/backstage/index.html',
+    'default/Component/backstage/techdocs_metadata.json',
+    'default/Component/backstage/assests/javascripts/bundle.7f4f3c92.min.js',
+    'default/Component/backstage/assets/stylesheets/main.fe0cca5b.min.css',
+  ];
+
+  it('should return empty array if there is no stale file', () => {
+    const oldFiles = [...defaultFiles];
+    const newFiles = [...defaultFiles];
+    const staleFiles = getStaleFiles(newFiles, oldFiles);
+    expect(staleFiles).toHaveLength(0);
+  });
+
+  it('should return all stale files when they exists', () => {
+    const oldFiles = [...defaultFiles, 'stale_file.png'];
+    const newFiles = [...defaultFiles];
+    const staleFiles = getStaleFiles(newFiles, oldFiles);
+    expect(staleFiles).toHaveLength(1);
+    expect(staleFiles).toEqual(expect.arrayContaining(['stale_file.png']));
+  });
+});
+
+describe('getCloudPathForLocalPath', () => {
+  const entity: Entity = {
+    apiVersion: 'version',
+    metadata: { namespace: 'custom', name: 'backstage' },
+    kind: 'Component',
+  };
+
+  it('should compose a remote bucket path including entity information', () => {
+    const remoteBucket = getCloudPathForLocalPath(entity);
+    expect(remoteBucket).toBe('custom/component/backstage/');
+  });
+
+  it('should compose a remote filename including entity information', () => {
+    const localPath = 'index.html';
+    const remoteBucket = getCloudPathForLocalPath(entity, localPath);
+    expect(remoteBucket).toBe(`custom/component/backstage/${localPath}`);
+  });
+
+  it('should use the default namespace when it is undefined', () => {
+    const localPath = 'index.html';
+    const {
+      kind,
+      metadata: { name },
+    } = entity;
+    const remoteBucket = getCloudPathForLocalPath(
+      { kind, metadata: { name } } as Entity,
+      localPath,
+    );
+    expect(remoteBucket).toBe(
+      `${ENTITY_DEFAULT_NAMESPACE}/component/backstage/${localPath}`,
+    );
+  });
+
+  it('should preserve case when legacy flag is passed', () => {
+    const remoteBucket = getCloudPathForLocalPath(entity, undefined, true);
+    expect(remoteBucket).toBe('custom/Component/backstage/');
+  });
+
+  it('should throw error when entity is invalid', () => {
+    expect(() => getCloudPathForLocalPath({} as Entity)).toThrow();
+  });
+});
+
+describe('bulkStorageOperation', () => {
+  const length = 26;
+  const args = Array.from({ length });
+  const createConcurrentRequestCounter = (
+    callback: (count: number) => void,
+  ) => {
+    let count = 0;
+    return () =>
+      new Promise(resolve => {
+        callback(++count);
+        setTimeout(() => {
+          count--;
+          resolve(null);
+        }, 100);
+      });
+  };
+
+  it('should take care of rate limit by default', async () => {
+    const operation = createConcurrentRequestCounter((count: number) => {
+      expect(count <= 25).toBeTruthy();
+    });
+    await bulkStorageOperation(operation, args);
+  });
+
+  it('should accept the number of concurrency limit', async () => {
+    const concurrencyLimit = 10;
+    const operation = createConcurrentRequestCounter((count: number) => {
+      expect(count <= concurrencyLimit).toBeTruthy();
+    });
+    await bulkStorageOperation(operation, args, { concurrencyLimit });
+  });
+
+  it('should wait for all promises be resolved', async () => {
+    const callback = jest.fn();
+    const operation = createConcurrentRequestCounter(callback);
+    await bulkStorageOperation(operation, args);
+    expect(callback).toHaveBeenCalledTimes(length);
+  });
+
+  it('should call operation with the correct argument', async () => {
+    const files = ['file1.txt', 'file2.txt'];
+    const fn = jest.fn();
+    await bulkStorageOperation(fn, files);
+    expect(fn).toHaveBeenCalledTimes(2);
+    expect(fn).toHaveBeenNthCalledWith(1, files[0]);
+    expect(fn).toHaveBeenNthCalledWith(2, files[1]);
+  });
+});
diff --git a/packages/techdocs-common/src/stages/publish/helpers.ts b/packages/techdocs-common/src/stages/publish/helpers.ts
index eac5ba05c8..9b935ccbfd 100644
--- a/packages/techdocs-common/src/stages/publish/helpers.ts
+++ b/packages/techdocs-common/src/stages/publish/helpers.ts
@@ -13,7 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+import { Entity, ENTITY_DEFAULT_NAMESPACE } from '@backstage/catalog-model';
 import mime from 'mime-types';
+import path from 'path';
+import createLimiter from 'p-limit';
 import recursiveReadDir from 'recursive-readdir';
 
 /**
@@ -82,3 +85,103 @@ export const getFileTreeRecursively = async (
   });
   return fileList;
 };
+
+/**
+ * Takes a posix path and returns a lower-cased version of entity's triplet
+ * with the remaining path in posix.
+ *
+ * Path must not include a starting slash.
+ *
+ * @example
+ * lowerCaseEntityTriplet('default/Component/backstage')
+ * // return default/component/backstage
+ */
+export const lowerCaseEntityTriplet = (posixPath: string): string => {
+  const [namespace, kind, name, ...rest] = posixPath.split(path.posix.sep);
+  const lowerNamespace = namespace.toLowerCase();
+  const lowerKind = kind.toLowerCase();
+  const lowerName = name.toLowerCase();
+  return [lowerNamespace, lowerKind, lowerName, ...rest].join(path.posix.sep);
+};
+
+/**
+ * Takes either a win32 or posix path and returns a lower-cased version of entity's triplet
+ * with the remaining path in posix.
+ *
+ * Starting slashes will be trimmed.
+ *
+ * Throws an error if the path does not appear to be an entity triplet.
+ *
+ * @example
+ * lowerCaseEntityTripletInStoragePath('/default/Component/backstage/file.txt')
+ * // return default/component/backstage/file.txt
+ */
+export const lowerCaseEntityTripletInStoragePath = (
+  originalPath: string,
+): string => {
+  let posixPath = originalPath;
+  if (originalPath.includes(path.win32.sep)) {
+    posixPath = originalPath.split(path.win32.sep).join(path.posix.sep);
+  }
+
+  // remove leading slash
+  const parts = posixPath.split(path.posix.sep);
+  if (parts[0] === '') {
+    parts.shift();
+  }
+
+  // check if all parts of the entity exist (name, namespace, kind) plus filename
+  if (parts.length <= 3) {
+    throw new Error(
+      `Encountered file unmanaged by TechDocs ${originalPath}. Skipping.`,
+    );
+  }
+
+  return lowerCaseEntityTriplet(parts.join(path.posix.sep));
+};
+
+// Only returns the files that existed previously and are not present anymore.
+export const getStaleFiles = (
+  newFiles: string[],
+  oldFiles: string[],
+): string[] => {
+  const staleFiles = new Set(oldFiles);
+  newFiles.forEach(newFile => {
+    staleFiles.delete(newFile);
+  });
+  return Array.from(staleFiles);
+};
+
+// Compose actual filename on remote bucket including entity information
+export const getCloudPathForLocalPath = (
+  entity: Entity,
+  localPath = '',
+  useLegacyPathCasing = false,
+): string => {
+  // Convert destination file path to a POSIX path for uploading.
+  // GCS expects / as path separator and relativeFilePath will contain \\ on Windows.
+  // https://cloud.google.com/storage/docs/gsutil/addlhelp/HowSubdirectoriesWork
+  const relativeFilePathPosix = localPath.split(path.sep).join(path.posix.sep);
+
+  // The / delimiter is intentional since it represents the cloud storage and not the local file system.
+  const entityRootDir = `${
+    entity.metadata?.namespace ?? ENTITY_DEFAULT_NAMESPACE
+  }/${entity.kind}/${entity.metadata.name}`;
+
+  const relativeFilePathTriplet = `${entityRootDir}/${relativeFilePathPosix}`;
+  const destination = useLegacyPathCasing
+    ? relativeFilePathTriplet
+    : lowerCaseEntityTriplet(relativeFilePathTriplet);
+
+  return destination; // Remote storage file relative path
+};
+
+// Perform rate limited generic operations by passing a function and a list of arguments
+export const bulkStorageOperation = async <T>(
+  operation: (arg: T) => Promise<unknown>,
+  args: T[],
+  { concurrencyLimit } = { concurrencyLimit: 25 },
+) => {
+  const limiter = createLimiter(concurrencyLimit);
+  await Promise.all(args.map(arg => limiter(operation, arg)));
+};
diff --git a/packages/techdocs-common/src/stages/publish/local.test.ts b/packages/techdocs-common/src/stages/publish/local.test.ts
index 0ced296a88..38ead236bd 100644
--- a/packages/techdocs-common/src/stages/publish/local.test.ts
+++ b/packages/techdocs-common/src/stages/publish/local.test.ts
@@ -25,10 +25,10 @@ import mockFs from 'mock-fs';
 import * as os from 'os';
 import { LocalPublish } from './local';
 
-const createMockEntity = (annotations = {}) => {
+const createMockEntity = (annotations = {}, lowerCase = false) => {
   return {
     apiVersion: 'version',
-    kind: 'TestKind',
+    kind: lowerCase ? 'testkind' : 'TestKind',
     metadata: {
       name: 'test-component-name',
       annotations: {
@@ -65,11 +65,42 @@ describe('local publisher', () => {
 
     const publisher = new LocalPublish(mockConfig, logger, testDiscovery);
     const mockEntity = createMockEntity();
+    const lowerMockEntity = createMockEntity(undefined, true);
 
     await publisher.publish({ entity: mockEntity, directory: tmpDir });
 
     expect(await publisher.hasDocsBeenGenerated(mockEntity)).toBe(true);
 
+    // Lower/upper should be treated the same.
+    expect(await publisher.hasDocsBeenGenerated(lowerMockEntity)).toBe(true);
+
+    mockFs.restore();
+  });
+
+  it('should respect legacy casing', async () => {
+    mockFs({
+      [tmpDir]: {
+        'index.html': '',
+      },
+    });
+
+    const mockConfig = new ConfigReader({
+      techdocs: {
+        legacyUseCaseSensitiveTripletPaths: true,
+      },
+    });
+
+    const publisher = new LocalPublish(mockConfig, logger, testDiscovery);
+    const mockEntity = createMockEntity();
+    const lowerMockEntity = createMockEntity(undefined, true);
+
+    await publisher.publish({ entity: mockEntity, directory: tmpDir });
+
+    expect(await publisher.hasDocsBeenGenerated(mockEntity)).toBe(true);
+
+    // Lower/upper should be treated differently.
+    expect(await publisher.hasDocsBeenGenerated(lowerMockEntity)).toBe(false);
+
     mockFs.restore();
   });
 
@@ -86,6 +117,13 @@ describe('local publisher', () => {
         [resolvedDir]: {
           'unsafe.html': '<html></html>',
           'unsafe.svg': '<svg></svg>',
+          default: {
+            testkind: {
+              testname: {
+                'index.html': 'found it',
+              },
+            },
+          },
         },
       });
     });
@@ -107,5 +145,38 @@ describe('local publisher', () => {
         'content-type': 'text/plain; charset=utf-8',
       });
     });
+
+    it('should redirect case-sensitive triplet path to lower-case', async () => {
+      const response = await request(app)
+        .get('/default/TestKind/TestName/index.html')
+        .expect('Location', '/default/testkind/testname/index.html');
+      expect(response.status).toBe(301);
+    });
+
+    it('should resolve lower-case triplet path content eventually', async () => {
+      const response = await request(app)
+        .get('/default/TestKind/TestName/index.html')
+        .redirects(1);
+      expect(response.text).toEqual('found it');
+    });
+
+    it('should not redirect when legacy case setting is used', async () => {
+      const legacyConfig = new ConfigReader({
+        techdocs: {
+          legacyUseCaseSensitiveTripletPaths: true,
+        },
+      });
+      const legacyPublisher = new LocalPublish(
+        legacyConfig,
+        logger,
+        testDiscovery,
+      );
+      app = express().use(legacyPublisher.docsRouter());
+
+      const response = await request(app).get(
+        '/default/TestKind/TestName/index.html',
+      );
+      expect(response.status).toBe(404);
+    });
   });
 });
diff --git a/packages/techdocs-common/src/stages/publish/local.ts b/packages/techdocs-common/src/stages/publish/local.ts
index 3ad0ed65ad..c547b65406 100644
--- a/packages/techdocs-common/src/stages/publish/local.ts
+++ b/packages/techdocs-common/src/stages/publish/local.ts
@@ -22,6 +22,7 @@ import { Config } from '@backstage/config';
 import express from 'express';
 import fs from 'fs-extra';
 import os from 'os';
+import createLimiter from 'p-limit';
 import path from 'path';
 import { Logger } from 'winston';
 import {
@@ -31,7 +32,11 @@ import {
   ReadinessResponse,
   TechDocsMetadata,
 } from './types';
-import { getHeadersForFileExtension } from './helpers';
+import {
+  getFileTreeRecursively,
+  getHeadersForFileExtension,
+  lowerCaseEntityTripletInStoragePath,
+} from './helpers';
 
 // TODO: Use a more persistent storage than node_modules or /tmp directory.
 // Make it configurable with techdocs.publisher.local.publishDirectory
@@ -53,6 +58,8 @@ try {
  * called "static" at the root of techdocs-backend plugin.
  */
 export class LocalPublish implements PublisherBase {
+  private legacyPathCasing: boolean;
+
   // TODO: Use a static fromConfig method to create a LocalPublish instance, similar to aws/gcs publishers.
   // Move the logic of setting staticDocsDir based on config over to fromConfig,
   // and set the value as a class parameter.
@@ -65,6 +72,10 @@ export class LocalPublish implements PublisherBase {
     this.config = config;
     this.logger = logger;
     this.discovery = discovery;
+    this.legacyPathCasing =
+      config.getOptionalBoolean(
+        'techdocs.legacyUseCaseSensitiveTripletPaths',
+      ) || false;
   }
 
   async getReadiness(): Promise<ReadinessResponse> {
@@ -76,8 +87,7 @@ export class LocalPublish implements PublisherBase {
   publish({ entity, directory }: PublishRequest): Promise<PublishResponse> {
     const entityNamespace = entity.metadata.namespace ?? 'default';
 
-    const publishDir = path.join(
-      staticDocsDir,
+    const publishDir = this.staticEntityPathJoin(
       entityNamespace,
       entity.kind,
       entity.metadata.name,
@@ -114,8 +124,7 @@ export class LocalPublish implements PublisherBase {
   async fetchTechDocsMetadata(
     entityName: EntityName,
   ): Promise<TechDocsMetadata> {
-    const metadataPath = path.join(
-      staticDocsDir,
+    const metadataPath = this.staticEntityPathJoin(
       entityName.namespace,
       entityName.kind,
       entityName.name,
@@ -133,23 +142,61 @@ export class LocalPublish implements PublisherBase {
   }
 
   docsRouter(): express.Handler {
-    return express.static(staticDocsDir, {
-      // Handle content-type header the same as all other publishers.
-      setHeaders: (res, filePath) => {
-        const fileExtension = path.extname(filePath);
-        const headers = getHeadersForFileExtension(fileExtension);
-        for (const [header, value] of Object.entries(headers)) {
-          res.setHeader(header, value);
-        }
-      },
+    const router = express.Router();
+
+    // Redirect middleware ensuring that requests to case-sensitive entity
+    // triplet paths are always sent to lower-case versions.
+    router.use((req, res, next) => {
+      // If legacy path casing is on, let the request immediately continue.
+      if (this.legacyPathCasing) {
+        return next();
+      }
+
+      // Generate a lower-case entity triplet path.
+      const [_, namespace, kind, name, ...rest] = req.path.split('/');
+
+      // Ignore non-triplet objects.
+      if (!namespace || !kind || !name) {
+        return next();
+      }
+
+      const newPath = [
+        _,
+        namespace.toLowerCase(),
+        kind.toLowerCase(),
+        name.toLowerCase(),
+        ...rest,
+      ].join('/');
+
+      // If there was no change, then let express.static() handle the request.
+      if (newPath === req.path) {
+        return next();
+      }
+
+      // Otherwise, redirect to the new path.
+      return res.redirect(req.baseUrl + newPath, 301);
     });
+
+    router.use(
+      express.static(staticDocsDir, {
+        // Handle content-type header the same as all other publishers.
+        setHeaders: (res, filePath) => {
+          const fileExtension = path.extname(filePath);
+          const headers = getHeadersForFileExtension(fileExtension);
+          for (const [header, value] of Object.entries(headers)) {
+            res.setHeader(header, value);
+          }
+        },
+      }),
+    );
+
+    return router;
   }
 
   async hasDocsBeenGenerated(entity: Entity): Promise<boolean> {
     const namespace = entity.metadata.namespace ?? 'default';
 
-    const indexHtmlPath = path.join(
-      staticDocsDir,
+    const indexHtmlPath = this.staticEntityPathJoin(
       namespace,
       entity.kind,
       entity.metadata.name,
@@ -164,4 +211,63 @@ export class LocalPublish implements PublisherBase {
       return false;
     }
   }
+
+  /**
+   * This code will never run in practice. It is merely here to illustrate how
+   * to implement this method for other storage providers.
+   */
+  async migrateDocsCase({
+    removeOriginal = false,
+    concurrency = 25,
+  }): Promise<void> {
+    // Iterate through every file in the root of the publisher.
+    const files = await getFileTreeRecursively(staticDocsDir);
+    const limit = createLimiter(concurrency);
+
+    await Promise.all(
+      files.map(f =>
+        limit(async file => {
+          const relativeFile = file.replace(`${staticDocsDir}${path.sep}`, '');
+          const newFile = lowerCaseEntityTripletInStoragePath(relativeFile);
+
+          // If all parts are already lowercase, ignore.
+          if (relativeFile === newFile) {
+            return;
+          }
+
+          // Otherwise, copy or move the file.
+          await new Promise<void>(resolve => {
+            const migrate = removeOriginal ? fs.move : fs.copyFile;
+            this.logger.verbose(`Migrating ${relativeFile}`);
+            migrate(file, newFile, err => {
+              if (err) {
+                this.logger.warn(
+                  `Unable to migrate ${relativeFile}: ${err.message}`,
+                );
+              }
+              resolve();
+            });
+          });
+        }, f),
+      ),
+    );
+  }
+
+  /**
+   * Utility wrapper around path.join(), used to control legacy case logic.
+   */
+  protected staticEntityPathJoin(...allParts: string[]): string {
+    if (this.legacyPathCasing) {
+      const [namespace, kind, name, ...parts] = allParts;
+      return path.join(staticDocsDir, namespace, kind, name, ...parts);
+    }
+    const [namespace, kind, name, ...parts] = allParts;
+    return path.join(
+      staticDocsDir,
+      namespace.toLowerCase(),
+      kind.toLowerCase(),
+      name.toLowerCase(),
+      ...parts,
+    );
+  }
 }
diff --git a/packages/techdocs-common/src/stages/publish/migrations/GoogleMigration.ts b/packages/techdocs-common/src/stages/publish/migrations/GoogleMigration.ts
new file mode 100644
index 0000000000..192cefbfe2
--- /dev/null
+++ b/packages/techdocs-common/src/stages/publish/migrations/GoogleMigration.ts
@@ -0,0 +1,79 @@
+/*
+ * Copyright 2021 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { File } from '@google-cloud/storage';
+import { Writable } from 'stream';
+import { Logger } from 'winston';
+import { lowerCaseEntityTripletInStoragePath } from '../helpers';
+
+/**
+ * Writable stream to handle object copy/move operations. This implementation
+ * ensures we don't read in files from GCS faster than GCS can copy/move them.
+ */
+export class MigrateWriteStream extends Writable {
+  protected logger: Logger;
+  protected removeOriginal: boolean;
+  protected maxConcurrency: number;
+  protected inFlight = 0;
+
+  constructor(logger: Logger, removeOriginal: boolean, concurrency: number) {
+    super({ objectMode: true });
+    this.logger = logger;
+    this.removeOriginal = removeOriginal;
+    this.maxConcurrency = concurrency;
+  }
+
+  _write(file: File, _encoding: BufferEncoding, next: Function) {
+    let shouldCallNext = true;
+    let newFile;
+    try {
+      newFile = lowerCaseEntityTripletInStoragePath(file.name);
+    } catch (e) {
+      this.logger.warn(e.message);
+      next();
+      return;
+    }
+
+    // If all parts are already lowercase, ignore.
+    if (newFile === file.name) {
+      next();
+      return;
+    }
+
+    // Allow up to n-many files to be migrated at a time.
+    this.inFlight++;
+    if (this.inFlight < this.maxConcurrency) {
+      next();
+      shouldCallNext = false;
+    }
+
+    // Otherwise, copy or move the file.
+    const migrate = this.removeOriginal
+      ? file.move.bind(file)
+      : file.copy.bind(file);
+    this.logger.verbose(`Migrating ${file.name}`);
+    migrate(newFile)
+      .catch(e =>
+        this.logger.warn(`Unable to migrate ${file.name}: ${e.message}`),
+      )
+      .finally(() => {
+        this.inFlight--;
+        if (shouldCallNext) {
+          next();
+        }
+      });
+  }
+}
diff --git a/packages/techdocs-common/src/stages/publish/migrations/index.ts b/packages/techdocs-common/src/stages/publish/migrations/index.ts
new file mode 100644
index 0000000000..f82ab054a4
--- /dev/null
+++ b/packages/techdocs-common/src/stages/publish/migrations/index.ts
@@ -0,0 +1,17 @@
+/*
+ * Copyright 2021 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+export { MigrateWriteStream } from './GoogleMigration';
diff --git a/packages/techdocs-common/src/stages/publish/openStackSwift.test.ts b/packages/techdocs-common/src/stages/publish/openStackSwift.test.ts
index 9da1df0aa9..84007c0f5b 100644
--- a/packages/techdocs-common/src/stages/publish/openStackSwift.test.ts
+++ b/packages/techdocs-common/src/stages/publish/openStackSwift.test.ts
@@ -29,7 +29,7 @@ import path from 'path';
 import { OpenStackSwiftPublish } from './openStackSwift';
 import { PublisherBase, TechDocsMetadata } from './types';
 
-// NOTE: /packages/techdocs-common/__mocks__ is being used to mock pkgcloud client library
+// NOTE: /packages/techdocs-common/__mocks__ is being used to mock @trendyol-js/openstack-swift-sdk client library
 
 const createMockEntity = (annotations = {}): Entity => {
   return {
@@ -62,6 +62,20 @@ const getEntityRootDir = (entity: Entity) => {
   return path.join(rootDir, namespace || ENTITY_DEFAULT_NAMESPACE, kind, name);
 };
 
+const getPosixEntityRootDir = (entity: Entity) => {
+  const {
+    kind,
+    metadata: { namespace, name },
+  } = entity;
+
+  return path.posix.join(
+    '/rootDir',
+    namespace || ENTITY_DEFAULT_NAMESPACE,
+    kind,
+    name,
+  );
+};
+
 const logger = getVoidLogger();
 
 let publisher: PublisherBase;
@@ -75,11 +89,11 @@ beforeEach(() => {
         type: 'openStackSwift',
         openStackSwift: {
           credentials: {
-            username: 'mockuser',
-            password: 'verystrongpass',
+            id: 'mockid',
+            secret: 'verystrongsecret',
           },
           authUrl: 'mockauthurl',
-          region: 'mockregion',
+          swiftUrl: 'mockSwiftUrl',
           containerName: 'mock',
         },
       },
@@ -105,11 +119,11 @@ describe('OpenStackSwiftPublish', () => {
             type: 'openStackSwift',
             openStackSwift: {
               credentials: {
-                username: 'mockuser',
-                password: 'verystrongpass',
+                id: 'mockId',
+                secret: 'mockSecret',
               },
               authUrl: 'mockauthurl',
-              region: 'mockregion',
+              swiftUrl: 'mockSwiftUrl',
               containerName: 'errorBucket',
             },
           },
@@ -267,12 +281,12 @@ describe('OpenStackSwiftPublish', () => {
     it('should return an error if the techdocs_metadata.json file is not present', async () => {
       const entityNameMock = createMockEntityName();
       const entity = createMockEntity();
-      const entityRootDir = getEntityRootDir(entity);
+      const entityRootDir = getPosixEntityRootDir(entity);
 
       const fails = publisher.fetchTechDocsMetadata(entityNameMock);
 
       await expect(fails).rejects.toMatchObject({
-        message: `TechDocs metadata fetch failed, The file ${path.join(
+        message: `TechDocs metadata fetch failed, The file ${path.posix.join(
           entityRootDir,
           'techdocs_metadata.json',
         )} does not exist !`,
diff --git a/packages/techdocs-common/src/stages/publish/openStackSwift.ts b/packages/techdocs-common/src/stages/publish/openStackSwift.ts
index 6be8539aa9..2902d7384f 100644
--- a/packages/techdocs-common/src/stages/publish/openStackSwift.ts
+++ b/packages/techdocs-common/src/stages/publish/openStackSwift.ts
@@ -20,8 +20,9 @@ import fs from 'fs-extra';
 import JSON5 from 'json5';
 import createLimiter from 'p-limit';
 import path from 'path';
-import { storage } from 'pkgcloud';
-import { Readable } from 'stream';
+import { SwiftClient } from '@trendyol-js/openstack-swift-sdk';
+import { NotFound } from '@trendyol-js/openstack-swift-sdk/lib/types';
+import { Stream, Readable } from 'stream';
 import { Logger } from 'winston';
 import { getFileTreeRecursively, getHeadersForFileExtension } from './helpers';
 import {
@@ -31,7 +32,7 @@ import {
   TechDocsMetadata,
 } from './types';
 
-const streamToBuffer = (stream: Readable): Promise<Buffer> => {
+const streamToBuffer = (stream: Stream | Readable): Promise<Buffer> => {
   return new Promise((resolve, reject) => {
     try {
       const chunks: any[] = [];
@@ -44,6 +45,13 @@ const streamToBuffer = (stream: Readable): Promise<Buffer> => {
   });
 };
 
+const bufferToStream = (buffer: Buffer): Readable => {
+  const stream = new Readable();
+  stream.push(buffer);
+  stream.push(null);
+  return stream;
+};
+
 export class OpenStackSwiftPublish implements PublisherBase {
   static fromConfig(config: Config, logger: Logger): PublisherBase {
     let containerName = '';
@@ -62,24 +70,18 @@ export class OpenStackSwiftPublish implements PublisherBase {
       'techdocs.publisher.openStackSwift',
     );
 
-    const storageClient = storage.createClient({
-      provider: 'openstack',
-      username: openStackSwiftConfig.getString('credentials.username'),
-      password: openStackSwiftConfig.getString('credentials.password'),
-      authUrl: openStackSwiftConfig.getString('authUrl'),
-      keystoneAuthVersion:
-        openStackSwiftConfig.getOptionalString('keystoneAuthVersion') || 'v3',
-      domainId: openStackSwiftConfig.getOptionalString('domainId') || 'default',
-      domainName:
-        openStackSwiftConfig.getOptionalString('domainName') || 'Default',
-      region: openStackSwiftConfig.getString('region'),
+    const storageClient = new SwiftClient({
+      authEndpoint: openStackSwiftConfig.getString('authUrl'),
+      swiftEndpoint: openStackSwiftConfig.getString('swiftUrl'),
+      credentialId: openStackSwiftConfig.getString('credentials.id'),
+      secret: openStackSwiftConfig.getString('credentials.secret'),
     });
 
     return new OpenStackSwiftPublish(storageClient, containerName, logger);
   }
 
   constructor(
-    private readonly storageClient: storage.Client,
+    private readonly storageClient: SwiftClient,
     private readonly containerName: string,
     private readonly logger: Logger,
   ) {
@@ -92,31 +94,35 @@ export class OpenStackSwiftPublish implements PublisherBase {
    * Check if the defined container exists. Being able to connect means the configuration is good
    * and the storage client will work.
    */
-  getReadiness(): Promise<ReadinessResponse> {
-    return new Promise(resolve => {
-      this.storageClient.getContainer(this.containerName, (err, container) => {
-        if (container) {
-          this.logger.info(
-            `Successfully connected to the OpenStack Swift container ${this.containerName}.`,
-          );
-          resolve({
-            isAvailable: true,
-          });
-        } else {
-          this.logger.error(
-            `Could not retrieve metadata about the OpenStack Swift container ${this.containerName}. ` +
-              'Make sure the container exists. Also make sure that authentication is setup either by ' +
-              'explicitly defining credentials and region in techdocs.publisher.openStackSwift in app config or ' +
-              'by using environment variables. Refer to https://backstage.io/docs/features/techdocs/using-cloud-storage',
-          );
+  async getReadiness(): Promise<ReadinessResponse> {
+    try {
+      const container = await this.storageClient.getContainerMetadata(
+        this.containerName,
+      );
 
-          this.logger.error(`from OpenStack client library: ${err.message}`);
-          resolve({
-            isAvailable: false,
-          });
-        }
-      });
-    });
+      if (!(container instanceof NotFound)) {
+        this.logger.info(
+          `Successfully connected to the OpenStack Swift container ${this.containerName}.`,
+        );
+        return {
+          isAvailable: true,
+        };
+      }
+      this.logger.error(
+        `Could not retrieve metadata about the OpenStack Swift container ${this.containerName}. ` +
+          'Make sure the container exists. Also make sure that authentication is setup either by ' +
+          'explicitly defining credentials and region in techdocs.publisher.openStackSwift in app config or ' +
+          'by using environment variables. Refer to https://backstage.io/docs/features/techdocs/using-cloud-storage',
+      );
+      return {
+        isAvailable: false,
+      };
+    } catch (err) {
+      this.logger.error(`from OpenStack client library: ${err.message}`);
+      return {
+        isAvailable: false,
+      };
+    }
   }
 
   /**
@@ -135,7 +141,6 @@ export class OpenStackSwiftPublish implements PublisherBase {
         // Path of all files to upload, relative to the root of the source directory
         // e.g. ['index.html', 'sub-page/index.html', 'assets/images/favicon.png']
         const relativeFilePath = path.relative(directory, filePath);
-
         // Convert destination file path to a POSIX path for uploading.
         // Swift expects / as path separator and relativeFilePath will contain \\ on Windows.
         // https://docs.openstack.org/python-openstackclient/pike/cli/man/openstack.html
@@ -147,26 +152,16 @@ export class OpenStackSwiftPublish implements PublisherBase {
         const entityRootDir = `${entity.metadata.namespace}/${entity.kind}/${entity.metadata.name}`;
         const destination = `${entityRootDir}/${relativeFilePathPosix}`; // Swift container file relative path
 
-        const params = {
-          container: this.containerName,
-          remote: destination,
-        };
-
         // Rate limit the concurrent execution of file uploads to batches of 10 (per publish)
-        const uploadFile = limiter(
-          () =>
-            new Promise((res, rej) => {
-              const readStream = fs.createReadStream(filePath);
-
-              const writeStream = this.storageClient.upload(params);
-
-              writeStream.on('error', rej);
-
-              writeStream.on('success', res);
-
-              readStream.pipe(writeStream);
-            }),
-        );
+        const uploadFile = limiter(async () => {
+          const fileBuffer = await fs.readFile(filePath);
+          const stream = bufferToStream(fileBuffer);
+          return this.storageClient.upload(
+            this.containerName,
+            destination,
+            stream,
+          );
+        });
         uploadPromises.push(uploadFile);
       }
       await Promise.all(uploadPromises);
@@ -184,15 +179,16 @@ export class OpenStackSwiftPublish implements PublisherBase {
   async fetchTechDocsMetadata(
     entityName: EntityName,
   ): Promise<TechDocsMetadata> {
-    try {
-      return await new Promise<TechDocsMetadata>(async (resolve, reject) => {
-        const entityRootDir = `${entityName.namespace}/${entityName.kind}/${entityName.name}`;
+    return await new Promise<TechDocsMetadata>(async (resolve, reject) => {
+      const entityRootDir = `${entityName.namespace}/${entityName.kind}/${entityName.name}`;
 
-        const stream = this.storageClient.download({
-          container: this.containerName,
-          remote: `${entityRootDir}/techdocs_metadata.json`,
-        });
+      const downloadResponse = await this.storageClient.download(
+        this.containerName,
+        `${entityRootDir}/techdocs_metadata.json`,
+      );
 
+      if (!(downloadResponse instanceof NotFound)) {
+        const stream = downloadResponse.data;
         try {
           const techdocsMetadataJson = await streamToBuffer(stream);
           if (!techdocsMetadataJson) {
@@ -210,10 +206,12 @@ export class OpenStackSwiftPublish implements PublisherBase {
           this.logger.error(err.message);
           reject(new Error(err.message));
         }
-      });
-    } catch (e) {
-      throw new Error(`TechDocs metadata fetch failed, ${e.message}`);
-    }
+      } else {
+        reject({
+          message: `TechDocs metadata fetch failed, The file /rootDir/${entityRootDir}/techdocs_metadata.json does not exist !`,
+        });
+      }
+    });
   }
 
   /**
@@ -229,23 +227,29 @@ export class OpenStackSwiftPublish implements PublisherBase {
       const fileExtension = path.extname(filePath);
       const responseHeaders = getHeadersForFileExtension(fileExtension);
 
-      const stream = this.storageClient.download({
-        container: this.containerName,
-        remote: filePath,
-      });
+      const downloadResponse = await this.storageClient.download(
+        this.containerName,
+        filePath,
+      );
 
-      try {
-        // Inject response headers
-        for (const [headerKey, headerValue] of Object.entries(
-          responseHeaders,
-        )) {
-          res.setHeader(headerKey, headerValue);
+      if (!(downloadResponse instanceof NotFound)) {
+        const stream = downloadResponse.data;
+
+        try {
+          // Inject response headers
+          for (const [headerKey, headerValue] of Object.entries(
+            responseHeaders,
+          )) {
+            res.setHeader(headerKey, headerValue);
+          }
+
+          res.send(await streamToBuffer(stream));
+        } catch (err) {
+          this.logger.warn(err.message);
+          res.status(404).send(err.message);
         }
-
-        res.send(await streamToBuffer(stream));
-      } catch (err) {
-        this.logger.warn(err.message);
-        res.status(404).send(err.message);
+      } else {
+        res.status(404).send('File Not Found');
       }
     };
   }
@@ -255,25 +259,20 @@ export class OpenStackSwiftPublish implements PublisherBase {
    * can be used to verify if there are any pre-generated docs available to serve.
    */
   async hasDocsBeenGenerated(entity: Entity): Promise<boolean> {
+    const entityRootDir = `${entity.metadata.namespace}/${entity.kind}/${entity.metadata.name}`;
     try {
-      const entityRootDir = `${entity.metadata.namespace}/${entity.kind}/${entity.metadata.name}`;
+      const fileResponse = await this.storageClient.getMetadata(
+        this.containerName,
+        `${entityRootDir}/index.html`,
+      );
 
-      return new Promise(res => {
-        this.storageClient.getFile(
-          this.containerName,
-          `${entityRootDir}/index.html`,
-          (err, file) => {
-            if (!err && file) {
-              res(true);
-            } else {
-              res(false);
-              this.logger.warn(err.message);
-            }
-          },
-        );
-      });
-    } catch (e) {
-      return Promise.resolve(false);
+      if (!(fileResponse instanceof NotFound)) {
+        return true;
+      }
+      return false;
+    } catch (err) {
+      this.logger.warn(err.message);
+      return false;
     }
   }
 }
diff --git a/packages/techdocs-common/src/stages/publish/publish.test.ts b/packages/techdocs-common/src/stages/publish/publish.test.ts
index 30004616ca..2671ef7b47 100644
--- a/packages/techdocs-common/src/stages/publish/publish.test.ts
+++ b/packages/techdocs-common/src/stages/publish/publish.test.ts
@@ -171,11 +171,11 @@ describe('Publisher', () => {
           type: 'openStackSwift',
           openStackSwift: {
             credentials: {
-              username: 'mockuser',
-              password: 'verystrongpass',
+              id: 'mockId',
+              secret: 'mockSecret',
             },
             authUrl: 'mockauthurl',
-            region: 'mockregion',
+            swiftUrl: 'mockSwiftUrl',
             containerName: 'mock',
           },
         },
diff --git a/packages/techdocs-common/src/stages/publish/types.ts b/packages/techdocs-common/src/stages/publish/types.ts
index a7f6ff7a45..229c853427 100644
--- a/packages/techdocs-common/src/stages/publish/types.ts
+++ b/packages/techdocs-common/src/stages/publish/types.ts
@@ -55,6 +55,19 @@ export type TechDocsMetadata = {
   etag: string;
 };
 
+export type MigrateRequest = {
+  /**
+   * Whether or not to remove the source file. Defaults to false (acting like a
+   * copy instead of a move).
+   */
+  removeOriginal?: boolean;
+
+  /**
+   * Maximum number of files/objects to migrate at once. Defaults to 25.
+   */
+  concurrency?: number;
+};
+
 /**
  * Base class for a TechDocs publisher (e.g. Local, Google GCS Bucket, AWS S3, etc.)
  * The publisher handles publishing of the generated static files after the prepare and generate steps of TechDocs.
@@ -92,4 +105,14 @@ export interface PublisherBase {
    * Check if the index.html is present for the Entity at the Storage location.
    */
   hasDocsBeenGenerated(entityName: Entity): Promise<boolean>;
+
+  /**
+   * Migrates documentation objects with case sensitive entity triplets to
+   * lowercase entity triplets. This was (will be) a change introduced in
+   * techdocs-cli v{0.x.y} and techdocs-backend v{0.x.y}.
+   *
+   * Implementation of this method is unnecessary in publishers introduced
+   * after v{0.x.y} of techdocs-common.
+   */
+  migrateDocsCase?(migrateRequest: MigrateRequest): Promise<void>;
 }
diff --git a/packages/techdocs-common/src/techdocsTypes.ts b/packages/techdocs-common/src/techdocsTypes.ts
new file mode 100644
index 0000000000..4aa3972b31
--- /dev/null
+++ b/packages/techdocs-common/src/techdocsTypes.ts
@@ -0,0 +1,26 @@
+/*
+ * Copyright 2021 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { IndexableDocument } from '@backstage/search-common';
+
+export interface TechDocsDocument extends IndexableDocument {
+  kind: string;
+  namespace: string;
+  name: string;
+  lifecycle: string;
+  owner: string;
+  path: string;
+}
diff --git a/packages/techdocs-common/src/types.d.ts b/packages/techdocs-common/src/types.d.ts
new file mode 100644
index 0000000000..e085b95851
--- /dev/null
+++ b/packages/techdocs-common/src/types.d.ts
@@ -0,0 +1,24 @@
+/*
+ * Copyright 2020 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+interface IStorageFilesMock {
+  emptyFiles(): void;
+  fileExists(targetPath: string): boolean;
+  readFile(targetPath: string): Buffer;
+  writeFile(targetPath: string, sourcePath: string): void;
+  writeFile(targetPath: string, sourceBuffer: Buffer): void;
+  writeFile(targetPath: string, source: string | Buffer): void;
+}
diff --git a/packages/test-utils-core/CHANGELOG.md b/packages/test-utils-core/CHANGELOG.md
new file mode 100644
index 0000000000..a84ab931f3
--- /dev/null
+++ b/packages/test-utils-core/CHANGELOG.md
@@ -0,0 +1,7 @@
+# @backstage/test-utils-core
+
+## 0.1.2
+
+### Patch Changes
+
+- 56c773909: Switched `@types/react` dependency to request `*` rather than a specific version.
diff --git a/packages/test-utils-core/api-report.md b/packages/test-utils-core/api-report.md
index 8eb7ee458a..7cef987174 100644
--- a/packages/test-utils-core/api-report.md
+++ b/packages/test-utils-core/api-report.md
@@ -6,14 +6,20 @@
 import { ReactElement } from 'react';
 import { RenderResult } from '@testing-library/react';
 
+// Warning: (ae-missing-release-tag) "AsyncLogCollector" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export type AsyncLogCollector = () => Promise<void>;
 
+// Warning: (ae-missing-release-tag) "CollectedLogs" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export type CollectedLogs<T extends LogFuncs> = {
   [key in T]: string[];
 };
 
+// Warning: (ae-missing-release-tag) "Keyboard" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export class Keyboard {
   constructor(
@@ -60,18 +66,31 @@ export class Keyboard {
   static typeDebug(target: any, input: any): Promise<void>;
 }
 
+// Warning: (ae-missing-release-tag) "LogCollector" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export type LogCollector = AsyncLogCollector | SyncLogCollector;
 
+// Warning: (ae-missing-release-tag) "LogFuncs" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export type LogFuncs = 'log' | 'warn' | 'error';
 
+// Warning: (ae-missing-release-tag) "renderWithEffects" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export function renderWithEffects(nodes: ReactElement): Promise<RenderResult>;
 
+// Warning: (ae-missing-release-tag) "SyncLogCollector" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export type SyncLogCollector = () => void;
 
+// Warning: (ae-missing-release-tag) "withLogCollector" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+// Warning: (ae-missing-release-tag) "withLogCollector" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+// Warning: (ae-missing-release-tag) "withLogCollector" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+// Warning: (ae-missing-release-tag) "withLogCollector" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export function withLogCollector(
   callback: AsyncLogCollector,
diff --git a/packages/test-utils-core/package.json b/packages/test-utils-core/package.json
index d3c8d11bb5..b88184f121 100644
--- a/packages/test-utils-core/package.json
+++ b/packages/test-utils-core/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@backstage/test-utils-core",
   "description": "Utilities to test Backstage core",
-  "version": "0.1.1",
+  "version": "0.1.2",
   "private": false,
   "publishConfig": {
     "access": "public",
@@ -31,7 +31,7 @@
   "dependencies": {
     "@testing-library/jest-dom": "^5.10.1",
     "@testing-library/react": "^11.2.5",
-    "@types/react": "^16.9",
+    "@types/react": "*",
     "react": "^16.12.0",
     "react-dom": "^16.12.0"
   },
diff --git a/packages/test-utils/.snyk b/packages/test-utils/.snyk
new file mode 100644
index 0000000000..7737037634
--- /dev/null
+++ b/packages/test-utils/.snyk
@@ -0,0 +1,17 @@
+# Snyk (https://snyk.io) policy file, patches or ignores known vulnerabilities.
+version: v1.22.1
+# ignores vulnerabilities until expiry date; change duration by modifying expiry date
+ignore:
+  SNYK-JS-ANSIREGEX-1583908:
+    - '*':
+        reason: Self-inflicted ReDos in tests is not an issue
+        expires: 2022-03-06T17:18:55.019Z
+        created: 2021-09-06T17:18:55.027Z
+
+  SNYK-JS-XMLDOM-1534562:
+    - 'msw@0.29.0 > @mswjs/interceptors@0.10.0 > xmldom@0.6.0':
+        reason: Self-inflicted XML injection attacks in tests is not an issue
+        expires: 2022-03-06T17:18:55.019Z
+        created: 2021-09-06T17:18:55.027Z
+
+patch: {}
diff --git a/packages/test-utils/CHANGELOG.md b/packages/test-utils/CHANGELOG.md
index 68e45cd831..08594ae824 100644
--- a/packages/test-utils/CHANGELOG.md
+++ b/packages/test-utils/CHANGELOG.md
@@ -1,5 +1,38 @@
 # @backstage/test-utils
 
+## 0.1.17
+
+### Patch Changes
+
+- 56c773909: Switched `@types/react` dependency to request `*` rather than a specific version.
+- Updated dependencies
+  - @backstage/core-app-api@0.1.8
+  - @backstage/core-plugin-api@0.1.6
+  - @backstage/test-utils-core@0.1.2
+
+## 0.1.16
+
+### Patch Changes
+
+- 9d40fcb1e: - Bumping `material-ui/core` version to at least `4.12.2` as they made some breaking changes in later versions which broke `Pagination` of the `Table`.
+  - Switching out `material-table` to `@material-table/core` for support for the later versions of `material-ui/core`
+  - This causes a minor API change to `@backstage/core-components` as the interface for `Table` re-exports the `prop` from the underlying `Table` components.
+  - `onChangeRowsPerPage` has been renamed to `onRowsPerPageChange`
+  - `onChangePage` has been renamed to `onPageChange`
+  - Migration guide is here: https://material-table-core.com/docs/breaking-changes
+- Updated dependencies
+  - @backstage/core-app-api@0.1.6
+  - @backstage/core-plugin-api@0.1.4
+  - @backstage/theme@0.2.9
+
+## 0.1.15
+
+### Patch Changes
+
+- 45b5fc3a8: Updated the layout of catalog and API index pages to handle smaller screen sizes. This adds responsive wrappers to the entity tables, and switches filters to a drawer when width-constrained. If you have created a custom catalog or API index page, you will need to update the page structure to match the updated [catalog customization](https://backstage.io/docs/features/software-catalog/catalog-customization) documentation.
+- Updated dependencies
+  - @backstage/core-app-api@0.1.5
+
 ## 0.1.14
 
 ### Patch Changes
diff --git a/packages/test-utils/api-report.md b/packages/test-utils/api-report.md
index 57020e6221..187867d24f 100644
--- a/packages/test-utils/api-report.md
+++ b/packages/test-utils/api-report.md
@@ -15,22 +15,29 @@ import { RouteRef } from '@backstage/core-plugin-api';
 import { StorageApi } from '@backstage/core-plugin-api';
 import { StorageValueChange } from '@backstage/core-plugin-api';
 
-// @public (undocumented)
-export function mockBreakpoint(
-  initialBreakpoint?: Breakpoint,
-): {
-  set(breakpoint: Breakpoint): void;
-  remove(): void;
-};
+// Warning: (tsdoc-param-tag-missing-hyphen) The @param block should be followed by a parameter name and then a hyphen
+// Warning: (ae-missing-release-tag) "mockBreakpoint" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
+// @public
+export function mockBreakpoint({
+  matches,
+}: {
+  matches?: boolean | undefined;
+}): void;
 
+// Warning: (ae-missing-release-tag) "MockErrorApi" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export class MockErrorApi implements ErrorApi {
+  // Warning: (ae-forgotten-export) The symbol "Options" needs to be exported by the entry point index.d.ts
   constructor(options?: Options);
   // (undocumented)
   error$(): Observable<{
     error: Error;
     context?: ErrorContext;
   }>;
+  // Warning: (ae-forgotten-export) The symbol "ErrorWithContext" needs to be exported by the entry point index.d.ts
+  //
   // (undocumented)
   getErrors(): ErrorWithContext[];
   // (undocumented)
@@ -39,6 +46,8 @@ export class MockErrorApi implements ErrorApi {
   waitForError(pattern: RegExp, timeoutMs?: number): Promise<ErrorWithContext>;
 }
 
+// Warning: (ae-missing-release-tag) "MockStorageApi" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export class MockStorageApi implements StorageApi {
   // (undocumented)
@@ -55,11 +64,15 @@ export class MockStorageApi implements StorageApi {
   set<T>(key: string, data: T): Promise<void>;
 }
 
+// Warning: (ae-missing-release-tag) "MockStorageBucket" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export type MockStorageBucket = {
   [key: string]: any;
 };
 
+// Warning: (ae-missing-release-tag) "msw" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export const msw: {
   setupDefaultHandlers: (worker: {
@@ -69,12 +82,17 @@ export const msw: {
   }) => void;
 };
 
+// Warning: (ae-forgotten-export) The symbol "TestAppOptions" needs to be exported by the entry point index.d.ts
+// Warning: (ae-missing-release-tag) "renderInTestApp" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public
 export function renderInTestApp(
   Component: ComponentType | ReactNode,
   options?: TestAppOptions,
 ): Promise<RenderResult>;
 
+// Warning: (ae-missing-release-tag) "wrapInTestApp" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public
 export function wrapInTestApp(
   Component: ComponentType | ReactNode,
diff --git a/packages/test-utils/package.json b/packages/test-utils/package.json
index 797a23b17f..0134382b7f 100644
--- a/packages/test-utils/package.json
+++ b/packages/test-utils/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@backstage/test-utils",
   "description": "Utilities to test Backstage plugins and apps.",
-  "version": "0.1.14",
+  "version": "0.1.17",
   "private": false,
   "publishConfig": {
     "access": "public",
@@ -29,15 +29,15 @@
     "clean": "backstage-cli clean"
   },
   "dependencies": {
-    "@backstage/core-app-api": "^0.1.3",
-    "@backstage/core-plugin-api": "^0.1.3",
-    "@backstage/test-utils-core": "^0.1.1",
-    "@backstage/theme": "^0.2.8",
-    "@material-ui/core": "^4.11.0",
+    "@backstage/core-app-api": "^0.1.8",
+    "@backstage/core-plugin-api": "^0.1.6",
+    "@backstage/test-utils-core": "^0.1.2",
+    "@backstage/theme": "^0.2.9",
+    "@material-ui/core": "^4.12.2",
     "@testing-library/jest-dom": "^5.10.1",
     "@testing-library/react": "^11.2.5",
     "@testing-library/user-event": "^13.1.8",
-    "@types/react": "^16.9",
+    "@types/react": "*",
     "msw": "^0.29.0",
     "react": "^16.12.0",
     "react-dom": "^16.12.0",
@@ -46,7 +46,7 @@
     "zen-observable": "^0.8.15"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.7.2",
+    "@backstage/cli": "^0.7.8",
     "@types/jest": "^26.0.7",
     "@types/node": "^14.14.32"
   },
diff --git a/packages/test-utils/src/testUtils/appWrappers.tsx b/packages/test-utils/src/testUtils/appWrappers.tsx
index b884efd00d..09c9e5d0bf 100644
--- a/packages/test-utils/src/testUtils/appWrappers.tsx
+++ b/packages/test-utils/src/testUtils/appWrappers.tsx
@@ -92,7 +92,7 @@ export function wrapInTestApp(
     apis: mockApis,
     // Bit of a hack to make sure that the default config loader isn't used
     // as that would force every single test to wait for config loading.
-    configLoader: (false as unknown) as undefined,
+    configLoader: false as unknown as undefined,
     components: {
       Progress,
       BootErrorPage,
diff --git a/packages/test-utils/src/testUtils/mockBreakpoint.ts b/packages/test-utils/src/testUtils/mockBreakpoint.ts
index 37f0e761b6..3335284f88 100644
--- a/packages/test-utils/src/testUtils/mockBreakpoint.ts
+++ b/packages/test-utils/src/testUtils/mockBreakpoint.ts
@@ -14,80 +14,30 @@
  * limitations under the License.
  */
 
-import { act } from '@testing-library/react';
-
-type Breakpoint = 'xs' | 'sm' | 'md' | 'lg' | 'xl';
-
-const queryToBreakpoint = {
-  '(min-width:1920px)': 'xl',
-  '(min-width:1280px)': 'lg',
-  '(min-width:960px)': 'md',
-  '(min-width:600px)': 'sm',
-  '(min-width:0px)': 'xs',
-} as Record<string, Breakpoint>;
-
-function toBreakpoint(query: string) {
-  const breakpoint = queryToBreakpoint[query];
-  if (!breakpoint) {
-    throw new Error(
-      `received unknown media query in breakpoint mock: '${query}'`,
-    );
-  }
-  return breakpoint;
-}
-
-type Listener = (event: { matches: boolean }) => void;
-
-interface QueryList {
-  addListener(listener: Listener): void;
-  removeListener(listener: Listener): void;
-  matches: boolean;
-}
-
-interface Query {
-  query: string;
-  queryList: QueryList;
-  listeners: Set<Listener>;
-}
-
-export default function mockBreakpoint(initialBreakpoint: Breakpoint = 'xl') {
-  let currentBreakpoint = initialBreakpoint;
-  const queries = Array<Query>();
-
-  const previousMatchMedia: any = (window as any).matchMedia;
-
-  (window as any).matchMedia = (query: string): QueryList => {
-    const listeners = new Set<Listener>();
-
-    const queryList: QueryList = {
-      addListener(listener) {
-        listeners.add(listener);
-      },
-      removeListener(listener) {
-        listeners.delete(listener);
-      },
-      matches: toBreakpoint(query) === currentBreakpoint,
-    };
-
-    queries.push({ query, queryList, listeners });
-
-    return queryList;
-  };
-
-  return {
-    set(breakpoint: Breakpoint) {
-      currentBreakpoint = breakpoint;
-
-      act(() => {
-        queries.forEach(({ query, queryList, listeners }) => {
-          const matches = toBreakpoint(query) === breakpoint;
-          queryList.matches = matches;
-          listeners.forEach(listener => listener({ matches }));
-        });
-      });
-    },
-    remove() {
-      (window as any).matchMedia = previousMatchMedia;
-    },
-  };
+/**
+ *  This is a mocking method suggested in the Jest Doc's, as it is not implemented in JSDOM yet.
+ *  It can be used to mock values when the MUI `useMediaQuery` hook if it is used in a tested component.
+ *
+ *  For issues checkout the documentation:
+ *  https://jestjs.io/docs/manual-mocks#mocking-methods-which-are-not-implemented-in-jsdom
+ *
+ *  If there are any updates from MUI React on testing `useMediaQuery` this mock should be replaced
+ *  https://material-ui.com/components/use-media-query/#testing
+ *
+ * @param matchMediaOptions
+ */
+export default function mockBreakpoint({ matches = false }) {
+  Object.defineProperty(window, 'matchMedia', {
+    writable: true,
+    value: jest.fn().mockImplementation(query => ({
+      matches: matches,
+      media: query,
+      onchange: null,
+      addListener: jest.fn(), // deprecated
+      removeListener: jest.fn(), // deprecated
+      addEventListener: jest.fn(),
+      removeEventListener: jest.fn(),
+      dispatchEvent: jest.fn(),
+    })),
+  });
 }
diff --git a/packages/theme/CHANGELOG.md b/packages/theme/CHANGELOG.md
index e19e044977..e3d01123fc 100644
--- a/packages/theme/CHANGELOG.md
+++ b/packages/theme/CHANGELOG.md
@@ -1,5 +1,22 @@
 # @backstage/theme
 
+## 0.2.10
+
+### Patch Changes
+
+- 6b1afe8c0: Add a configurable `palette.bursts.gradient` property to the Backstage theme, to support customizing the gradients in the `ItemCard` header.
+
+## 0.2.9
+
+### Patch Changes
+
+- 9d40fcb1e: - Bumping `material-ui/core` version to at least `4.12.2` as they made some breaking changes in later versions which broke `Pagination` of the `Table`.
+  - Switching out `material-table` to `@material-table/core` for support for the later versions of `material-ui/core`
+  - This causes a minor API change to `@backstage/core-components` as the interface for `Table` re-exports the `prop` from the underlying `Table` components.
+  - `onChangeRowsPerPage` has been renamed to `onRowsPerPageChange`
+  - `onChangePage` has been renamed to `onPageChange`
+  - Migration guide is here: https://material-table-core.com/docs/breaking-changes
+
 ## 0.2.8
 
 ### Patch Changes
diff --git a/packages/theme/api-report.md b/packages/theme/api-report.md
index e09f5838c7..a3f6f6dd43 100644
--- a/packages/theme/api-report.md
+++ b/packages/theme/api-report.md
@@ -9,12 +9,19 @@ import { PaletteOptions } from '@material-ui/core/styles/createPalette';
 import { Theme } from '@material-ui/core';
 import { ThemeOptions } from '@material-ui/core';
 
+// Warning: (ae-forgotten-export) The symbol "PaletteAdditions" needs to be exported by the entry point index.d.ts
+// Warning: (ae-missing-release-tag) "BackstagePalette" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export type BackstagePalette = Palette & PaletteAdditions;
 
+// Warning: (ae-missing-release-tag) "BackstagePaletteOptions" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export type BackstagePaletteOptions = PaletteOptions & PaletteAdditions;
 
+// Warning: (ae-missing-release-tag) "BackstageTheme" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export interface BackstageTheme extends Theme {
   // (undocumented)
@@ -25,6 +32,8 @@ export interface BackstageTheme extends Theme {
   palette: BackstagePalette;
 }
 
+// Warning: (ae-missing-release-tag) "BackstageThemeOptions" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export interface BackstageThemeOptions extends ThemeOptions {
   // (undocumented)
@@ -35,29 +44,45 @@ export interface BackstageThemeOptions extends ThemeOptions {
   palette: BackstagePaletteOptions;
 }
 
+// Warning: (ae-missing-release-tag) "colorVariants" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export const colorVariants: Record<string, string[]>;
 
+// Warning: (ae-missing-release-tag) "createTheme" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export function createTheme(options: SimpleThemeOptions): BackstageTheme;
 
+// Warning: (ae-missing-release-tag) "createThemeOptions" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export function createThemeOptions(
   options: SimpleThemeOptions,
 ): BackstageThemeOptions;
 
+// Warning: (ae-missing-release-tag) "createThemeOverrides" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export function createThemeOverrides(theme: BackstageTheme): Overrides;
 
+// Warning: (ae-missing-release-tag) "darkTheme" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export const darkTheme: BackstageTheme;
 
+// Warning: (ae-missing-release-tag) "genPageTheme" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export function genPageTheme(colors: string[], shape: string): PageTheme;
 
+// Warning: (ae-missing-release-tag) "lightTheme" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export const lightTheme: BackstageTheme;
 
+// Warning: (ae-missing-release-tag) "PageTheme" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export type PageTheme = {
   colors: string[];
@@ -65,17 +90,25 @@ export type PageTheme = {
   backgroundImage: string;
 };
 
+// Warning: (ae-missing-release-tag) "pageTheme" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export const pageTheme: Record<string, PageTheme>;
 
+// Warning: (ae-missing-release-tag) "PageThemeSelector" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export type PageThemeSelector = {
   themeId: string;
 };
 
+// Warning: (ae-missing-release-tag) "shapes" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export const shapes: Record<string, string>;
 
+// Warning: (ae-missing-release-tag) "SimpleThemeOptions" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public
 export type SimpleThemeOptions = {
   palette: BackstagePaletteOptions;
diff --git a/packages/theme/package.json b/packages/theme/package.json
index d433be4648..0a0429a8fb 100644
--- a/packages/theme/package.json
+++ b/packages/theme/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@backstage/theme",
   "description": "material-ui theme for use with Backstage.",
-  "version": "0.2.8",
+  "version": "0.2.10",
   "private": false,
   "publishConfig": {
     "access": "public",
@@ -28,10 +28,10 @@
     "clean": "backstage-cli clean"
   },
   "dependencies": {
-    "@material-ui/core": "^4.11.0"
+    "@material-ui/core": "^4.12.2"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.7.0"
+    "@backstage/cli": "^0.7.9"
   },
   "files": [
     "dist"
diff --git a/packages/theme/src/baseTheme.ts b/packages/theme/src/baseTheme.ts
index 93132d8b7a..b2d964c4db 100644
--- a/packages/theme/src/baseTheme.ts
+++ b/packages/theme/src/baseTheme.ts
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import { createMuiTheme } from '@material-ui/core';
+import { createTheme as createMuiTheme } from '@material-ui/core';
 import { darken, lighten } from '@material-ui/core/styles/colorManipulator';
 import { Overrides } from '@material-ui/core/styles/overrides';
 
diff --git a/packages/theme/src/themes.ts b/packages/theme/src/themes.ts
index b31786aae9..d7a4a6d785 100644
--- a/packages/theme/src/themes.ts
+++ b/packages/theme/src/themes.ts
@@ -38,6 +38,9 @@ export const lightTheme = createTheme({
       backgroundColor: {
         default: '#7C3699',
       },
+      gradient: {
+        linear: 'linear-gradient(-137deg, #4BB8A5 0%, #187656 100%)',
+      },
     },
     primary: {
       main: '#2E77D0',
@@ -100,6 +103,9 @@ export const darkTheme = createTheme({
       backgroundColor: {
         default: '#7C3699',
       },
+      gradient: {
+        linear: 'linear-gradient(-137deg, #4BB8A5 0%, #187656 100%)',
+      },
     },
     primary: {
       main: '#9CC9FF',
diff --git a/packages/theme/src/types.ts b/packages/theme/src/types.ts
index c2758c29e7..76a1b7eb5c 100644
--- a/packages/theme/src/types.ts
+++ b/packages/theme/src/types.ts
@@ -58,6 +58,9 @@ type PaletteAdditions = {
     backgroundColor: {
       default: string;
     };
+    gradient: {
+      linear: string;
+    };
   };
   pinSidebarButton: {
     icon: string;
diff --git a/plugins/register-component/.eslintrc.js b/packages/version-bridge/.eslintrc.js
similarity index 100%
rename from plugins/register-component/.eslintrc.js
rename to packages/version-bridge/.eslintrc.js
diff --git a/packages/version-bridge/README.md b/packages/version-bridge/README.md
new file mode 100644
index 0000000000..e687b8c5a3
--- /dev/null
+++ b/packages/version-bridge/README.md
@@ -0,0 +1,10 @@
+# @backstage/version-bridge
+
+This package provides utilities to help enable support for multiple concurrent package versions within an app.
+
+It's currently only intended for use internally within @backstage packages.
+
+## Documentation
+
+- [Backstage Readme](https://github.com/backstage/backstage/blob/master/README.md)
+- [Backstage Documentation](https://backstage.io/docs)
diff --git a/packages/version-bridge/api-report.md b/packages/version-bridge/api-report.md
new file mode 100644
index 0000000000..eca13071ed
--- /dev/null
+++ b/packages/version-bridge/api-report.md
@@ -0,0 +1,50 @@
+## API Report File for "@backstage/version-bridge"
+
+> Do not edit this file. It is a report generated by [API Extractor](https://api-extractor.com/).
+
+```ts
+import { Context } from 'react';
+
+// @public
+export function createVersionedContext<
+  Versions extends {
+    [version in number]: unknown;
+  },
+>(key: string): Context<VersionedValue<Versions> | undefined>;
+
+// @public
+export function createVersionedContextForTesting(key: string): {
+  set(versions: { [x: number]: unknown }): void;
+  reset(): void;
+};
+
+// @public
+export function createVersionedValueMap<
+  Versions extends {
+    [version: number]: unknown;
+  },
+>(versions: Versions): VersionedValue<Versions>;
+
+// @public
+export function getOrCreateGlobalSingleton<T>(id: string, supplier: () => T): T;
+
+// @public
+export function useVersionedContext<
+  Versions extends {
+    [version in number]: unknown;
+  },
+>(key: string): VersionedValue<Versions> | undefined;
+
+// @public
+export type VersionedValue<
+  Versions extends {
+    [version: number]: unknown;
+  },
+> = {
+  atVersion<Version extends keyof Versions>(
+    version: Version,
+  ): Versions[Version] | undefined;
+};
+
+// (No @packageDocumentation comment for this package)
+```
diff --git a/packages/version-bridge/package.json b/packages/version-bridge/package.json
new file mode 100644
index 0000000000..3adbac681d
--- /dev/null
+++ b/packages/version-bridge/package.json
@@ -0,0 +1,44 @@
+{
+  "name": "@backstage/version-bridge",
+  "description": "Utilities used by @backstage packages to support multiple concurrent versions",
+  "version": "0.1.0",
+  "private": false,
+  "publishConfig": {
+    "access": "public",
+    "main": "dist/index.esm.js",
+    "types": "dist/index.d.ts"
+  },
+  "homepage": "https://backstage.io",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/backstage/backstage",
+    "directory": "packages/version-bridge"
+  },
+  "keywords": [
+    "backstage"
+  ],
+  "license": "Apache-2.0",
+  "main": "src/index.ts",
+  "types": "src/index.ts",
+  "scripts": {
+    "build": "backstage-cli build --outputs types,esm",
+    "lint": "backstage-cli lint",
+    "test": "backstage-cli test",
+    "prepack": "backstage-cli prepack",
+    "postpack": "backstage-cli postpack",
+    "clean": "backstage-cli clean"
+  },
+  "dependencies": {
+    "@types/react": "*",
+    "react": "^16.12.0"
+  },
+  "devDependencies": {
+    "@backstage/cli": "^0.7.11",
+    "@testing-library/jest-dom": "^5.10.1",
+    "@testing-library/react": "^11.2.5",
+    "@testing-library/react-hooks": "^3.4.2"
+  },
+  "files": [
+    "dist"
+  ]
+}
diff --git a/plugins/register-component/src/components/RegisterComponentPage/index.ts b/packages/version-bridge/src/index.ts
similarity index 90%
rename from plugins/register-component/src/components/RegisterComponentPage/index.ts
rename to packages/version-bridge/src/index.ts
index 982d277451..3e6b2a00f4 100644
--- a/plugins/register-component/src/components/RegisterComponentPage/index.ts
+++ b/packages/version-bridge/src/index.ts
@@ -14,4 +14,4 @@
  * limitations under the License.
  */
 
-export { RegisterComponentPage } from './RegisterComponentPage';
+export * from './lib';
diff --git a/packages/version-bridge/src/lib/VersionedContext.test.tsx b/packages/version-bridge/src/lib/VersionedContext.test.tsx
new file mode 100644
index 0000000000..659fd9b5b9
--- /dev/null
+++ b/packages/version-bridge/src/lib/VersionedContext.test.tsx
@@ -0,0 +1,94 @@
+/*
+ * Copyright 2021 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import React, { useContext } from 'react';
+import { renderHook } from '@testing-library/react-hooks';
+import {
+  createVersionedContext,
+  createVersionedContextForTesting,
+  useVersionedContext,
+} from './VersionedContext';
+import { createVersionedValueMap } from './VersionedValue';
+
+type ContextType = { 1: string; 2: string };
+
+describe('VersionedContext', () => {
+  it('should provide a versioned value', () => {
+    const Context = createVersionedContext<ContextType>('test-context-1');
+
+    const rendered = renderHook(() => useContext(Context), {
+      wrapper: ({ children }) => (
+        <Context.Provider
+          value={createVersionedValueMap({ 1: '1v1', 2: '1v2' })}
+        >
+          {children}
+        </Context.Provider>
+      ),
+    });
+
+    expect(rendered.result.current?.atVersion(1)).toBe('1v1');
+    expect(rendered.result.current?.atVersion(2)).toBe('1v2');
+  });
+
+  it('should provide a versioned value to hook', () => {
+    const Context = createVersionedContext<ContextType>('test-context-2');
+
+    const rendered = renderHook(() => useVersionedContext('test-context-2'), {
+      wrapper: ({ children }) => (
+        <Context.Provider
+          value={createVersionedValueMap({ 1: '2v1', 2: '2v2' })}
+        >
+          {children}
+        </Context.Provider>
+      ),
+    });
+
+    expect(rendered.result.current?.atVersion(1)).toBe('2v1');
+    expect(rendered.result.current?.atVersion(2)).toBe('2v2');
+  });
+
+  it('should be provide a test utility', () => {
+    const context = createVersionedContextForTesting('test-context-3');
+
+    const rendered = renderHook(() => useVersionedContext('test-context-3'));
+
+    expect(rendered.result.current).toBeUndefined();
+    context.set({ 1: '3v1' });
+    expect(rendered.result.current).toBeUndefined();
+    // should need a rerender before update
+    rendered.rerender();
+
+    expect(rendered.result.current?.atVersion(1)).toBe('3v1');
+    expect(rendered.result.current?.atVersion(2)).toBeUndefined();
+
+    context.set({ 2: '3v2' });
+    rendered.rerender();
+
+    expect(rendered.result.current?.atVersion(1)).toBeUndefined();
+    expect(rendered.result.current?.atVersion(2)).toBe('3v2');
+
+    context.reset();
+    rendered.rerender();
+    expect(rendered.result.current).toBeUndefined();
+
+    context.set({ 1: '3v1', 2: '3v2' });
+
+    rendered.rerender();
+
+    expect(rendered.result.current?.atVersion(1)).toBe('3v1');
+    expect(rendered.result.current?.atVersion(2)).toBe('3v2');
+  });
+});
diff --git a/packages/version-bridge/src/lib/VersionedContext.ts b/packages/version-bridge/src/lib/VersionedContext.ts
new file mode 100644
index 0000000000..ea0c40bbc4
--- /dev/null
+++ b/packages/version-bridge/src/lib/VersionedContext.ts
@@ -0,0 +1,106 @@
+/*
+ * Copyright 2021 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { createContext, useContext, Context } from 'react';
+import { getOrCreateGlobalSingleton } from './globalObject';
+import { createVersionedValueMap, VersionedValue } from './VersionedValue';
+
+/**
+ * Get the existing or create a new versioned React context that's
+ * stored inside a global singleton.
+ *
+ * @param key - A key that uniquely identifies the context.
+ * @public
+ * @example
+ *
+ * ```ts
+ * const MyContext = createVersionedContext<{ 1: string }>('my-context');
+ *
+ * const MyContextProvider = ({children}) => (
+ *   <MyContext.Provider value={createVersionedValueMap({ 1: 'value-for-version-1' })}>
+ *     {children}
+ *   <MyContext.Provider>
+ * )
+ * ```
+ */
+export function createVersionedContext<
+  Versions extends { [version in number]: unknown },
+>(key: string): Context<VersionedValue<Versions> | undefined> {
+  return getOrCreateGlobalSingleton(key, () =>
+    createContext<VersionedValue<Versions> | undefined>(undefined),
+  );
+}
+
+/**
+ * A hook that simplifies the consumption of a versioned contexts that's
+ * stored inside a global singleton.
+ *
+ * @param key - A key that uniquely identifies the context.
+ * @public
+ * @example
+ *
+ * ```ts
+ * const versionedHolder = useVersionedContext<{ 1: string }>('my-context');
+ *
+ * if (!versionedHolder) {
+ *   throw new Error('My context is not available!')
+ * }
+ *
+ * const myValue = versionedHolder.atVersion(1);
+ *
+ * // ...
+ * ```
+ */
+export function useVersionedContext<
+  Versions extends { [version in number]: unknown },
+>(key: string): VersionedValue<Versions> | undefined {
+  return useContext(createVersionedContext<Versions>(key));
+}
+
+/**
+ * Creates a helper for writing tests towards multiple different
+ * combinations of versions provided from a context.
+ *
+ * @param key - A key that uniquely identifies the context.
+ * @public
+ * @example
+ *
+ * ```ts
+ * const context = createVersionedContextForTesting('my-context');
+ *
+ * afterEach(() => {
+ *   context.reset();
+ * });
+ *
+ * it('should work when provided with version 1', () => {
+ *   context.set({1: 'value-for-version-1'})
+ *
+ *   // ...
+ * })
+ * ```
+ */
+export function createVersionedContextForTesting(key: string) {
+  return {
+    set(versions: { [version in number]: unknown }) {
+      (globalThis as any)[`__@backstage/${key}__`] = createContext(
+        createVersionedValueMap(versions),
+      );
+    },
+    reset() {
+      delete (globalThis as any)[`__@backstage/${key}__`];
+    },
+  };
+}
diff --git a/packages/core-app-api/src/lib/versionedValues.test.ts b/packages/version-bridge/src/lib/VersionedValue.test.ts
similarity index 95%
rename from packages/core-app-api/src/lib/versionedValues.test.ts
rename to packages/version-bridge/src/lib/VersionedValue.test.ts
index 19f9c8f349..2b6637a96f 100644
--- a/packages/core-app-api/src/lib/versionedValues.test.ts
+++ b/packages/version-bridge/src/lib/VersionedValue.test.ts
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import { createVersionedValueMap } from './versionedValues';
+import { createVersionedValueMap } from './VersionedValue';
 
 describe('createVersionedValueMap', () => {
   it('should be empty', () => {
diff --git a/packages/core-app-api/src/lib/versionedValues.ts b/packages/version-bridge/src/lib/VersionedValue.ts
similarity index 93%
rename from packages/core-app-api/src/lib/versionedValues.ts
rename to packages/version-bridge/src/lib/VersionedValue.ts
index 3d0a4a41ae..b7c2153e38 100644
--- a/packages/core-app-api/src/lib/versionedValues.ts
+++ b/packages/version-bridge/src/lib/VersionedValue.ts
@@ -18,8 +18,10 @@
  * The versioned value interface is a container for a set of values that
  * can be looked up by version. It is intended to be used as a container
  * for values that can be versioned independently of package versions.
+ *
+ * @public
  */
-export type VersionedValue<Versions extends { [version: number]: any }> = {
+export type VersionedValue<Versions extends { [version: number]: unknown }> = {
   atVersion<Version extends keyof Versions>(
     version: Version,
   ): Versions[Version] | undefined;
@@ -27,9 +29,11 @@ export type VersionedValue<Versions extends { [version: number]: any }> = {
 
 /**
  * Creates a container for a map of versioned values that implements VersionedValue.
+ *
+ * @public
  */
 export function createVersionedValueMap<
-  Versions extends { [version: number]: any }
+  Versions extends { [version: number]: unknown },
 >(versions: Versions): VersionedValue<Versions> {
   Object.freeze(versions);
   return {
diff --git a/packages/core-plugin-api/src/lib/globalObject.test.ts b/packages/version-bridge/src/lib/globalObject.test.ts
similarity index 65%
rename from packages/core-plugin-api/src/lib/globalObject.test.ts
rename to packages/version-bridge/src/lib/globalObject.test.ts
index 13634f1f08..9c12ae1dfa 100644
--- a/packages/core-plugin-api/src/lib/globalObject.test.ts
+++ b/packages/version-bridge/src/lib/globalObject.test.ts
@@ -14,33 +14,10 @@
  * limitations under the License.
  */
 
-import { getGlobalSingleton, getOrCreateGlobalSingleton } from './globalObject';
+import { getOrCreateGlobalSingleton } from './globalObject';
 
 const anyGlobal = global as any;
 
-describe('getGlobalSingleton', () => {
-  beforeEach(() => {
-    delete anyGlobal['__@backstage/my-thing__'];
-  });
-
-  it('should return an existing value', () => {
-    const myThing = {};
-    const myOtherThing = {};
-
-    anyGlobal['__@backstage/my-thing__'] = myThing;
-    expect(getGlobalSingleton('my-thing')).toBe(myThing);
-    expect(getGlobalSingleton('my-thing')).toBe(myThing);
-    anyGlobal['__@backstage/my-thing__'] = myOtherThing;
-    expect(getGlobalSingleton('my-thing')).toBe(myOtherThing);
-  });
-
-  it('should throw if the value is not set', () => {
-    expect(() => getGlobalSingleton('my-thing')).toThrow(
-      'Global my-thing is not set',
-    );
-  });
-});
-
 describe('getOrCreateGlobalSingleton', () => {
   beforeEach(() => {
     delete anyGlobal['__@backstage/my-thing__'];
diff --git a/packages/core-plugin-api/src/lib/globalObject.ts b/packages/version-bridge/src/lib/globalObject.ts
similarity index 70%
rename from packages/core-plugin-api/src/lib/globalObject.ts
rename to packages/version-bridge/src/lib/globalObject.ts
index 7a400148fb..b29e81e4a0 100644
--- a/packages/core-plugin-api/src/lib/globalObject.ts
+++ b/packages/version-bridge/src/lib/globalObject.ts
@@ -30,31 +30,10 @@ const globalObject = getGlobalObject();
 
 const makeKey = (id: string) => `__@backstage/${id}__`;
 
-/**
- * Used to provide a global singleton value, failing if it is already set.
- */
-export function setGlobalSingleton(id: string, value: unknown): void {
-  const key = makeKey(id);
-  if (key in globalObject) {
-    throw new Error(`Global ${id} is already set`);
-  }
-  globalObject[key] = value;
-}
-
-/**
- * Used to access a global singleton value, failing if it is not already set.
- */
-export function getGlobalSingleton<T>(id: string): T {
-  const key = makeKey(id);
-  if (!(key in globalObject)) {
-    throw new Error(`Global ${id} is not set`);
-  }
-
-  return globalObject[key];
-}
-
 /**
  * Serializes access to a global singleton value, with the first caller creating the value.
+ *
+ * @public
  */
 export function getOrCreateGlobalSingleton<T>(
   id: string,
diff --git a/packages/version-bridge/src/lib/index.ts b/packages/version-bridge/src/lib/index.ts
new file mode 100644
index 0000000000..191abe7444
--- /dev/null
+++ b/packages/version-bridge/src/lib/index.ts
@@ -0,0 +1,24 @@
+/*
+ * Copyright 2020 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+export { getOrCreateGlobalSingleton } from './globalObject';
+export {
+  createVersionedContextForTesting,
+  useVersionedContext,
+  createVersionedContext,
+} from './VersionedContext';
+export { createVersionedValueMap } from './VersionedValue';
+export type { VersionedValue } from './VersionedValue';
diff --git a/plugins/register-component/src/setupTests.ts b/packages/version-bridge/src/setupTests.ts
similarity index 100%
rename from plugins/register-component/src/setupTests.ts
rename to packages/version-bridge/src/setupTests.ts
diff --git a/plugins/allure/.eslintrc.js b/plugins/allure/.eslintrc.js
new file mode 100644
index 0000000000..13573efa9c
--- /dev/null
+++ b/plugins/allure/.eslintrc.js
@@ -0,0 +1,3 @@
+module.exports = {
+  extends: [require.resolve('@backstage/cli/config/eslint')],
+};
diff --git a/plugins/allure/CHANGELOG.md b/plugins/allure/CHANGELOG.md
new file mode 100644
index 0000000000..d62b95ea66
--- /dev/null
+++ b/plugins/allure/CHANGELOG.md
@@ -0,0 +1,10 @@
+# @backstage/plugin-allure
+
+## 0.1.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@0.4.5
+  - @backstage/core-components@0.4.0
+  - @backstage/catalog-model@0.9.1
diff --git a/plugins/allure/README.md b/plugins/allure/README.md
new file mode 100644
index 0000000000..b9a8435a34
--- /dev/null
+++ b/plugins/allure/README.md
@@ -0,0 +1,47 @@
+# [Allure](https://docs.qameta.io/allure/)
+
+Welcome to the Backstage Allure plugin. This plugin add an entity service page to display Allure test reports related to the service.
+
+## Install
+
+Run the below command from the `app` package directory.
+
+```shell
+yarn add @backstage/plugin-allure
+```
+
+alternatively, you can execute below command from the root directory of your Backstage app.
+
+```shell
+yarn workspace app add @backstage/plugin-allure
+```
+
+## Configure
+
+### Configure Allure service
+
+Add below configuration in the `app-config.yaml`.
+
+```yaml
+allure:
+  baseUrl: <ALLURE_SERVICE_BASE_URL> # Example: https://allure.my-company.net or when running allure locally, http://localhost:5050/allure-docker-service
+```
+
+### Setup entity service page
+
+Add `EntityAllureReportContent` in the `EntityPage.tsx` like below:
+
+```diff
++ import { EntityAllureReportContent } from '@backstage/plugin-allure';
+
+...
+
+const serviceEntityPage = (
+  <EntityLayoutWrapper>
+    ...
++    <EntityLayout.Route path="/allure" title="Allure Report">
++        <EntityAllureReportContent />
++    </EntityLayout.Route>
+  </EntityLayoutWrapper>
+);
+```
diff --git a/plugins/allure/api-report.md b/plugins/allure/api-report.md
new file mode 100644
index 0000000000..c39b092954
--- /dev/null
+++ b/plugins/allure/api-report.md
@@ -0,0 +1,27 @@
+## API Report File for "@backstage/plugin-allure"
+
+> Do not edit this file. It is a report generated by [API Extractor](https://api-extractor.com/).
+
+```ts
+/// <reference types="react" />
+
+import { BackstagePlugin } from '@backstage/core-plugin-api';
+import { RouteRef } from '@backstage/core-plugin-api';
+
+// Warning: (ae-missing-release-tag) "allurePlugin" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
+// @public (undocumented)
+export const allurePlugin: BackstagePlugin<
+  {
+    root: RouteRef<undefined>;
+  },
+  {}
+>;
+
+// Warning: (ae-missing-release-tag) "EntityAllureReportContent" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
+// @public (undocumented)
+export const EntityAllureReportContent: () => JSX.Element;
+
+// (No @packageDocumentation comment for this package)
+```
diff --git a/plugins/allure/dev/example-entity.yaml b/plugins/allure/dev/example-entity.yaml
new file mode 100644
index 0000000000..58a9ffd110
--- /dev/null
+++ b/plugins/allure/dev/example-entity.yaml
@@ -0,0 +1,11 @@
+apiVersion: backstage.io/v1alpha1
+kind: Component
+metadata:
+  name: allure-example-service
+  description: Allure Example Service
+  annotations:
+    qameta.io/allure-project: sample
+spec:
+  type: service
+  lifecycle: experimental
+  owner: team-a
diff --git a/plugins/allure/dev/index.tsx b/plugins/allure/dev/index.tsx
new file mode 100644
index 0000000000..d697febd56
--- /dev/null
+++ b/plugins/allure/dev/index.tsx
@@ -0,0 +1,55 @@
+/*
+ * Copyright 2021 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import React from 'react';
+import { createDevApp } from '@backstage/dev-utils';
+import { EntityAllureReportContent } from '../src/plugin';
+import { Content, Header, Page } from '@backstage/core-components';
+import { EntityProvider } from '@backstage/plugin-catalog-react';
+import { Entity } from '@backstage/catalog-model';
+
+import exampleEntity from './example-entity.yaml';
+import { allureApiRef } from '../src/api';
+
+createDevApp()
+  .registerApi({
+    api: allureApiRef,
+    deps: {},
+    factory: () =>
+      ({
+        async getReportUrl(projectId: string) {
+          return Promise.resolve(
+            // Follow the instructions from https://github.com/fescobar/allure-docker-service-ui
+            // to setup Allure service locally
+            `http://localhost:5050/allure-docker-service/projects/${projectId}/reports/latest/index.html`,
+          );
+        },
+      } as unknown as typeof allureApiRef.T),
+  })
+  .addPage({
+    element: (
+      <Page themeId="home">
+        <Header title="Allure Report" />
+        <Content>
+          <EntityProvider entity={exampleEntity as any as Entity}>
+            <EntityAllureReportContent />
+          </EntityProvider>
+        </Content>
+      </Page>
+    ),
+    title: 'Allure Report',
+    path: '/allure',
+  })
+  .render();
diff --git a/plugins/allure/package.json b/plugins/allure/package.json
new file mode 100644
index 0000000000..efa44cb6f8
--- /dev/null
+++ b/plugins/allure/package.json
@@ -0,0 +1,69 @@
+{
+  "name": "@backstage/plugin-allure",
+  "version": "0.1.1",
+  "main": "src/index.ts",
+  "types": "src/index.ts",
+  "license": "Apache-2.0",
+  "private": false,
+  "publishConfig": {
+    "access": "public",
+    "main": "dist/index.esm.js",
+    "types": "dist/index.d.ts"
+  },
+  "scripts": {
+    "build": "backstage-cli plugin:build",
+    "start": "backstage-cli plugin:serve",
+    "lint": "backstage-cli lint",
+    "test": "backstage-cli test",
+    "diff": "backstage-cli plugin:diff",
+    "prepack": "backstage-cli prepack",
+    "postpack": "backstage-cli postpack",
+    "clean": "backstage-cli clean"
+  },
+  "dependencies": {
+    "@backstage/catalog-model": "^0.9.1",
+    "@backstage/core-components": "^0.4.1",
+    "@backstage/core-plugin-api": "^0.1.7",
+    "@backstage/plugin-catalog-react": "^0.4.5",
+    "@backstage/theme": "^0.2.10",
+    "@material-ui/core": "^4.12.2",
+    "@material-ui/icons": "^4.9.1",
+    "@material-ui/lab": "4.0.0-alpha.45",
+    "react": "^16.13.1",
+    "react-dom": "^16.13.1",
+    "react-router-dom": "6.0.0-beta.0",
+    "react-use": "^17.2.4"
+  },
+  "devDependencies": {
+    "@backstage/cli": "^0.7.11",
+    "@backstage/core-app-api": "^0.1.12",
+    "@backstage/dev-utils": "^0.2.9",
+    "@backstage/test-utils": "^0.1.17",
+    "@testing-library/jest-dom": "^5.10.1",
+    "@testing-library/react": "^11.2.5",
+    "@testing-library/user-event": "^13.1.8",
+    "@types/jest": "^26.0.7",
+    "@types/node": "^14.14.32",
+    "cross-fetch": "^3.0.6",
+    "msw": "^0.29.0"
+  },
+  "files": [
+    "dist"
+  ],
+  "configSchema": {
+    "$schema": "https://backstage.io/schema/config-v1",
+    "title": "@backstage/allure",
+    "type": "object",
+    "properties": {
+      "allure": {
+        "type": "object",
+        "properties": {
+          "baseUrl": {
+            "type": "string",
+            "visibility": "frontend"
+          }
+        }
+      }
+    }
+  }
+}
diff --git a/plugins/allure/src/api/AllureApi.ts b/plugins/allure/src/api/AllureApi.ts
new file mode 100644
index 0000000000..a926da03d0
--- /dev/null
+++ b/plugins/allure/src/api/AllureApi.ts
@@ -0,0 +1,24 @@
+/*
+ * Copyright 2021 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import { createApiRef } from '@backstage/core-plugin-api';
+
+export type AllureApi = {
+  getReportUrl(projectId: string): Promise<string>;
+};
+
+export const allureApiRef = createApiRef<AllureApi>({
+  id: 'allure-api',
+});
diff --git a/plugins/allure/src/api/AllureApiClient.ts b/plugins/allure/src/api/AllureApiClient.ts
new file mode 100644
index 0000000000..698713c837
--- /dev/null
+++ b/plugins/allure/src/api/AllureApiClient.ts
@@ -0,0 +1,30 @@
+/*
+ * Copyright 2021 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import { ConfigApi } from '@backstage/core-plugin-api';
+import { AllureApi } from './AllureApi';
+
+export class AllureApiClient implements AllureApi {
+  readonly configApi: ConfigApi;
+
+  constructor(options: { configApi: ConfigApi }) {
+    this.configApi = options.configApi;
+  }
+
+  async getReportUrl(projectId: string): Promise<string> {
+    const baseUrl = this.configApi.getString('allure.baseUrl');
+    return `${baseUrl}/projects/${projectId}/reports/latest/index.html`;
+  }
+}
diff --git a/plugins/allure/src/api/index.ts b/plugins/allure/src/api/index.ts
new file mode 100644
index 0000000000..1c1adb1db2
--- /dev/null
+++ b/plugins/allure/src/api/index.ts
@@ -0,0 +1,17 @@
+/*
+ * Copyright 2021 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+export { allureApiRef } from './AllureApi';
+export { AllureApiClient } from './AllureApiClient';
diff --git a/plugins/allure/src/components/AllureReportComponent/AllureReportComponent.test.tsx b/plugins/allure/src/components/AllureReportComponent/AllureReportComponent.test.tsx
new file mode 100644
index 0000000000..19c7796e55
--- /dev/null
+++ b/plugins/allure/src/components/AllureReportComponent/AllureReportComponent.test.tsx
@@ -0,0 +1,44 @@
+/*
+ * Copyright 2021 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import React from 'react';
+import { AllureReportComponent } from './AllureReportComponent';
+import { ThemeProvider } from '@material-ui/core';
+import { lightTheme } from '@backstage/theme';
+import { rest } from 'msw';
+import { setupServer } from 'msw/node';
+import { msw, renderInTestApp } from '@backstage/test-utils';
+
+describe('ExampleComponent', () => {
+  const server = setupServer();
+  // Enable sane handlers for network requests
+  msw.setupDefaultHandlers(server);
+
+  // setup mock response
+  beforeEach(() => {
+    server.use(
+      rest.get('/*', (_, res, ctx) => res(ctx.status(200), ctx.json({}))),
+    );
+  });
+
+  it('should render', async () => {
+    const rendered = await renderInTestApp(
+      <ThemeProvider theme={lightTheme}>
+        <AllureReportComponent />
+      </ThemeProvider>,
+    );
+    expect(rendered.getByText('Missing Annotation')).toBeInTheDocument();
+  });
+});
diff --git a/plugins/allure/src/components/AllureReportComponent/AllureReportComponent.tsx b/plugins/allure/src/components/AllureReportComponent/AllureReportComponent.tsx
new file mode 100644
index 0000000000..2ca3e87691
--- /dev/null
+++ b/plugins/allure/src/components/AllureReportComponent/AllureReportComponent.tsx
@@ -0,0 +1,65 @@
+/*
+ * Copyright 2021 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import React from 'react';
+import { useApi } from '@backstage/core-plugin-api';
+import { allureApiRef } from '../../api';
+import { useEntity } from '@backstage/plugin-catalog-react';
+import {
+  ALLURE_PROJECT_ID_ANNOTATION,
+  isAllureReportAvailable,
+  getAllureProjectId,
+} from '../annotationHelpers';
+import {
+  MissingAnnotationEmptyState,
+  Progress,
+} from '@backstage/core-components';
+import { useAsync } from 'react-use';
+import { Entity } from '@backstage/catalog-model';
+
+const AllureReport = (props: { entity: Entity }) => {
+  const allureApi = useApi(allureApiRef);
+
+  const allureProjectId = getAllureProjectId(props.entity);
+  const { value, loading } = useAsync(async () => {
+    const url = await allureApi.getReportUrl(allureProjectId);
+    return url;
+  });
+
+  if (loading) {
+    return <Progress />;
+  }
+  return (
+    <iframe
+      style={{
+        display: 'table',
+        width: '100%',
+        height: '100%',
+      }}
+      title="Allure Report"
+      src={value}
+    />
+  );
+};
+
+export const AllureReportComponent = () => {
+  const { entity } = useEntity();
+  const isReportAvailable = entity && isAllureReportAvailable(entity);
+
+  if (isReportAvailable) return <AllureReport entity={entity} />;
+  return (
+    <MissingAnnotationEmptyState annotation={ALLURE_PROJECT_ID_ANNOTATION} />
+  );
+};
diff --git a/plugins/allure/src/components/AllureReportComponent/index.ts b/plugins/allure/src/components/AllureReportComponent/index.ts
new file mode 100644
index 0000000000..7b2fab744b
--- /dev/null
+++ b/plugins/allure/src/components/AllureReportComponent/index.ts
@@ -0,0 +1,16 @@
+/*
+ * Copyright 2021 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+export { AllureReportComponent } from './AllureReportComponent';
diff --git a/plugins/allure/src/components/annotationHelpers.ts b/plugins/allure/src/components/annotationHelpers.ts
new file mode 100644
index 0000000000..7500c1d88b
--- /dev/null
+++ b/plugins/allure/src/components/annotationHelpers.ts
@@ -0,0 +1,25 @@
+/*
+ * Copyright 2021 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import { Entity } from '@backstage/catalog-model';
+
+export const ALLURE_PROJECT_ID_ANNOTATION = 'qameta.io/allure-project';
+
+export const isAllureReportAvailable = (entity: Entity) =>
+  Boolean(entity.metadata.annotations?.[ALLURE_PROJECT_ID_ANNOTATION]);
+
+export const getAllureProjectId = (entity: Entity) => {
+  return entity?.metadata.annotations?.[ALLURE_PROJECT_ID_ANNOTATION] ?? '';
+};
diff --git a/plugins/allure/src/index.ts b/plugins/allure/src/index.ts
new file mode 100644
index 0000000000..016d33c2ff
--- /dev/null
+++ b/plugins/allure/src/index.ts
@@ -0,0 +1,16 @@
+/*
+ * Copyright 2021 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+export { allurePlugin, EntityAllureReportContent } from './plugin';
diff --git a/plugins/register-component/src/plugin.test.ts b/plugins/allure/src/plugin.test.ts
similarity index 77%
rename from plugins/register-component/src/plugin.test.ts
rename to plugins/allure/src/plugin.test.ts
index c09499beda..dab1088ad3 100644
--- a/plugins/register-component/src/plugin.test.ts
+++ b/plugins/allure/src/plugin.test.ts
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 The Backstage Authors
+ * Copyright 2021 The Backstage Authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,11 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+import { allurePlugin } from './plugin';
 
-import { registerComponentPlugin } from './plugin';
-
-describe('register-component', () => {
+describe('allure', () => {
   it('should export plugin', () => {
-    expect(registerComponentPlugin).toBeDefined();
+    expect(allurePlugin).toBeDefined();
   });
 });
diff --git a/plugins/allure/src/plugin.ts b/plugins/allure/src/plugin.ts
new file mode 100644
index 0000000000..3907707b18
--- /dev/null
+++ b/plugins/allure/src/plugin.ts
@@ -0,0 +1,53 @@
+/*
+ * Copyright 2021 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import {
+  configApiRef,
+  createApiFactory,
+  createPlugin,
+  createRoutableExtension,
+  createRouteRef,
+} from '@backstage/core-plugin-api';
+import { AllureApiClient, allureApiRef } from './api';
+
+export const allureRouteRef = createRouteRef({
+  title: 'allure-report',
+});
+
+export const allurePlugin = createPlugin({
+  id: 'allure',
+  apis: [
+    createApiFactory({
+      api: allureApiRef,
+      deps: {
+        configApi: configApiRef,
+      },
+      factory: ({ configApi }) => new AllureApiClient({ configApi }),
+    }),
+  ],
+  routes: {
+    root: allureRouteRef,
+  },
+});
+
+export const EntityAllureReportContent = allurePlugin.provide(
+  createRoutableExtension({
+    component: () =>
+      import('./components/AllureReportComponent').then(
+        m => m.AllureReportComponent,
+      ),
+    mountPoint: allureRouteRef,
+  }),
+);
diff --git a/plugins/allure/src/setupTests.ts b/plugins/allure/src/setupTests.ts
new file mode 100644
index 0000000000..fc6dbd98f8
--- /dev/null
+++ b/plugins/allure/src/setupTests.ts
@@ -0,0 +1,17 @@
+/*
+ * Copyright 2021 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import '@testing-library/jest-dom';
+import 'cross-fetch/polyfill';
diff --git a/plugins/api-docs/CHANGELOG.md b/plugins/api-docs/CHANGELOG.md
index 9135443ac9..103c57823f 100644
--- a/plugins/api-docs/CHANGELOG.md
+++ b/plugins/api-docs/CHANGELOG.md
@@ -1,5 +1,74 @@
 # @backstage/plugin-api-docs
 
+## 0.6.7
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@0.4.5
+  - @backstage/core-components@0.4.0
+  - @backstage/plugin-catalog@0.6.14
+  - @backstage/catalog-model@0.9.1
+
+## 0.6.6
+
+### Patch Changes
+
+- 56c773909: Switched `@types/react` dependency to request `*` rather than a specific version.
+- 0383314c9: Support deep linking in OpenAPI definitions.
+- Updated dependencies
+  - @backstage/core-components@0.3.1
+  - @backstage/core-plugin-api@0.1.6
+  - @backstage/plugin-catalog@0.6.11
+  - @backstage/plugin-catalog-react@0.4.2
+
+## 0.6.5
+
+### Patch Changes
+
+- 7b8aa8d0d: Move the `CreateComponentButton` from the catalog plugin to the `core-components` & rename it to `CreateButton` to be reused inside the api-docs plugin & scaffolder plugin, but also future plugins. Additionally, improve responsiveness of `CreateButton` & `SupportButton` by shrinking them to `IconButtons` on smaller screens.
+- Updated dependencies
+  - @backstage/plugin-catalog@0.6.10
+  - @backstage/core-components@0.3.0
+  - @backstage/core-plugin-api@0.1.5
+  - @backstage/plugin-catalog-react@0.4.1
+
+## 0.6.4
+
+### Patch Changes
+
+- 9d40fcb1e: - Bumping `material-ui/core` version to at least `4.12.2` as they made some breaking changes in later versions which broke `Pagination` of the `Table`.
+  - Switching out `material-table` to `@material-table/core` for support for the later versions of `material-ui/core`
+  - This causes a minor API change to `@backstage/core-components` as the interface for `Table` re-exports the `prop` from the underlying `Table` components.
+  - `onChangeRowsPerPage` has been renamed to `onRowsPerPageChange`
+  - `onChangePage` has been renamed to `onPageChange`
+  - Migration guide is here: https://material-table-core.com/docs/breaking-changes
+- bebc09fa8: Add explicit import for `isomorphic-form-data` needed for `swagger-ui-react`
+- Updated dependencies
+  - @backstage/core-components@0.2.0
+  - @backstage/plugin-catalog@0.6.9
+  - @backstage/plugin-catalog-react@0.4.0
+  - @backstage/core-plugin-api@0.1.4
+  - @backstage/theme@0.2.9
+
+## 0.6.3
+
+### Patch Changes
+
+- 45b5fc3a8: Updated the layout of catalog and API index pages to handle smaller screen sizes. This adds responsive wrappers to the entity tables, and switches filters to a drawer when width-constrained. If you have created a custom catalog or API index page, you will need to update the page structure to match the updated [catalog customization](https://backstage.io/docs/features/software-catalog/catalog-customization) documentation.
+- Updated dependencies
+  - @backstage/core-components@0.1.6
+  - @backstage/plugin-catalog@0.6.8
+  - @backstage/plugin-catalog-react@0.3.1
+
+## 0.6.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog@0.6.7
+  - @backstage/plugin-catalog-react@0.3.0
+
 ## 0.6.1
 
 ### Patch Changes
diff --git a/plugins/api-docs/README.md b/plugins/api-docs/README.md
index 60d8986d9b..d5ed198dc1 100644
--- a/plugins/api-docs/README.md
+++ b/plugins/api-docs/README.md
@@ -59,15 +59,17 @@ const apiPage = (
   <EntityLayout>
     <EntityLayout.Route path="/" title="Overview">
       <Grid container spacing={3}>
-        <Grid item md={6}>
+        <Grid item xs={12} md={6}>
           <EntityAboutCard />
         </Grid>
-        <Grid container item md={12}>
-          <Grid item md={6}>
-            <EntityProvidingComponentsCard />
-          </Grid>
-          <Grid item md={6}>
-            <EntityConsumingComponentsCard />
+        <Grid container>
+          <Grid item md={12}>
+            <Grid item xs={12} md={6}>
+              <EntityProvidingComponentsCard />
+            </Grid>
+            <Grid item xs={12} md={6}>
+              <EntityConsumingComponentsCard />
+            </Grid>
           </Grid>
         </Grid>
       </Grid>
diff --git a/plugins/api-docs/api-report.md b/plugins/api-docs/api-report.md
index bb83d4c539..639485a42d 100644
--- a/plugins/api-docs/api-report.md
+++ b/plugins/api-docs/api-report.md
@@ -16,9 +16,14 @@ import { RouteRef } from '@backstage/core-plugin-api';
 import { TableColumn } from '@backstage/core-components';
 import { UserListFilterKind } from '@backstage/plugin-catalog-react';
 
+// Warning: (ae-forgotten-export) The symbol "Props" needs to be exported by the entry point index.d.ts
+// Warning: (ae-missing-release-tag) "ApiDefinitionCard" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export const ApiDefinitionCard: (_: Props) => JSX.Element;
 
+// Warning: (ae-missing-release-tag) "ApiDefinitionWidget" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export type ApiDefinitionWidget = {
   type: string;
@@ -27,9 +32,14 @@ export type ApiDefinitionWidget = {
   rawLanguage?: string;
 };
 
+// Warning: (ae-forgotten-export) The symbol "ApiDocsConfig" needs to be exported by the entry point index.d.ts
+// Warning: (ae-missing-release-tag) "apiDocsConfigRef" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export const apiDocsConfigRef: ApiRef<ApiDocsConfig>;
 
+// Warning: (ae-missing-release-tag) "apiDocsPlugin" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 const apiDocsPlugin: BackstagePlugin<
   {
@@ -42,12 +52,19 @@ const apiDocsPlugin: BackstagePlugin<
 export { apiDocsPlugin };
 export { apiDocsPlugin as plugin };
 
+// Warning: (ae-missing-release-tag) "ApiExplorerPage" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export const ApiExplorerPage: ({
   initiallySelectedFilter,
   columns,
-}: ApiExplorerPageProps) => JSX.Element;
+}: {
+  initiallySelectedFilter?: UserListFilterKind | undefined;
+  columns?: TableColumn<CatalogTableRow>[] | undefined;
+}) => JSX.Element;
 
+// Warning: (ae-missing-release-tag) "ApiTypeTitle" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export const ApiTypeTitle: ({
   apiEntity,
@@ -55,23 +72,38 @@ export const ApiTypeTitle: ({
   apiEntity: ApiEntity;
 }) => JSX.Element;
 
+// Warning: (ae-forgotten-export) The symbol "Props" needs to be exported by the entry point index.d.ts
+// Warning: (ae-missing-release-tag) "AsyncApiDefinitionWidget" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export const AsyncApiDefinitionWidget: ({ definition }: Props_5) => JSX.Element;
 
+// Warning: (ae-forgotten-export) The symbol "Props" needs to be exported by the entry point index.d.ts
+// Warning: (ae-missing-release-tag) "ConsumedApisCard" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export const ConsumedApisCard: ({ variant }: Props_2) => JSX.Element;
 
+// Warning: (ae-forgotten-export) The symbol "Props" needs to be exported by the entry point index.d.ts
+// Warning: (ae-missing-release-tag) "ConsumingComponentsCard" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export const ConsumingComponentsCard: ({ variant }: Props_6) => JSX.Element;
 
+// Warning: (ae-missing-release-tag) "defaultDefinitionWidgets" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export function defaultDefinitionWidgets(): ApiDefinitionWidget[];
 
+// Warning: (ae-missing-release-tag) "EntityApiDefinitionCard" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export const EntityApiDefinitionCard: (_: {
   apiEntity?: ApiEntity | undefined;
 }) => JSX.Element;
 
+// Warning: (ae-missing-release-tag) "EntityConsumedApisCard" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export const EntityConsumedApisCard: ({
   variant,
@@ -80,6 +112,8 @@ export const EntityConsumedApisCard: ({
   variant?: 'gridItem' | undefined;
 }) => JSX.Element;
 
+// Warning: (ae-missing-release-tag) "EntityConsumingComponentsCard" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export const EntityConsumingComponentsCard: ({
   variant,
@@ -88,6 +122,8 @@ export const EntityConsumingComponentsCard: ({
   variant?: 'gridItem' | undefined;
 }) => JSX.Element;
 
+// Warning: (ae-missing-release-tag) "EntityHasApisCard" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export const EntityHasApisCard: ({
   variant,
@@ -95,6 +131,8 @@ export const EntityHasApisCard: ({
   variant?: 'gridItem' | undefined;
 }) => JSX.Element;
 
+// Warning: (ae-missing-release-tag) "EntityProvidedApisCard" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export const EntityProvidedApisCard: ({
   variant,
@@ -103,6 +141,8 @@ export const EntityProvidedApisCard: ({
   variant?: 'gridItem' | undefined;
 }) => JSX.Element;
 
+// Warning: (ae-missing-release-tag) "EntityProvidingComponentsCard" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export const EntityProvidingComponentsCard: ({
   variant,
@@ -111,21 +151,36 @@ export const EntityProvidingComponentsCard: ({
   variant?: 'gridItem' | undefined;
 }) => JSX.Element;
 
+// Warning: (ae-forgotten-export) The symbol "Props" needs to be exported by the entry point index.d.ts
+// Warning: (ae-missing-release-tag) "HasApisCard" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export const HasApisCard: ({ variant }: Props_3) => JSX.Element;
 
+// Warning: (ae-forgotten-export) The symbol "Props" needs to be exported by the entry point index.d.ts
+// Warning: (ae-missing-release-tag) "OpenApiDefinitionWidget" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export const OpenApiDefinitionWidget: ({ definition }: Props_8) => JSX.Element;
 
+// Warning: (ae-forgotten-export) The symbol "Props" needs to be exported by the entry point index.d.ts
+// Warning: (ae-missing-release-tag) "PlainApiDefinitionWidget" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export const PlainApiDefinitionWidget: ({
   definition,
   language,
 }: Props_9) => JSX.Element;
 
+// Warning: (ae-forgotten-export) The symbol "Props" needs to be exported by the entry point index.d.ts
+// Warning: (ae-missing-release-tag) "ProvidedApisCard" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export const ProvidedApisCard: ({ variant }: Props_4) => JSX.Element;
 
+// Warning: (ae-forgotten-export) The symbol "Props" needs to be exported by the entry point index.d.ts
+// Warning: (ae-missing-release-tag) "ProvidingComponentsCard" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export const ProvidingComponentsCard: ({ variant }: Props_7) => JSX.Element;
 
diff --git a/plugins/api-docs/dev/index.tsx b/plugins/api-docs/dev/index.tsx
index bbbfe4a516..e60647e7b9 100644
--- a/plugins/api-docs/dev/index.tsx
+++ b/plugins/api-docs/dev/index.tsx
@@ -30,19 +30,19 @@ import openapiApiEntity from './openapi-example-api.yaml';
 import otherApiEntity from './other-example-api.yaml';
 import { Content, Header, Page } from '@backstage/core-components';
 
-const mockEntities = ([
+const mockEntities = [
   openapiApiEntity,
   asyncapiApiEntity,
   graphqlApiEntity,
   otherApiEntity,
-] as unknown) as Entity[];
+] as unknown as Entity[];
 
 createDevApp()
   .registerApi({
     api: catalogApiRef,
     deps: {},
     factory: () =>
-      (({
+      ({
         async getEntities() {
           return {
             items: mockEntities.slice(),
@@ -51,7 +51,7 @@ createDevApp()
         async getEntityByName(name: string) {
           return mockEntities.find(e => e.metadata.name === name);
         },
-      } as unknown) as typeof catalogApiRef.T),
+      } as unknown as typeof catalogApiRef.T),
   })
   .registerApi({
     api: apiDocsConfigRef,
@@ -72,7 +72,7 @@ createDevApp()
       <Page themeId="home">
         <Header title="OpenAPI" />
         <Content>
-          <EntityProvider entity={(openapiApiEntity as any) as Entity}>
+          <EntityProvider entity={openapiApiEntity as any as Entity}>
             <EntityApiDefinitionCard />
           </EntityProvider>
         </Content>
@@ -85,7 +85,7 @@ createDevApp()
       <Page themeId="home">
         <Header title="AsyncAPI" />
         <Content>
-          <EntityProvider entity={(asyncapiApiEntity as any) as Entity}>
+          <EntityProvider entity={asyncapiApiEntity as any as Entity}>
             <EntityApiDefinitionCard />
           </EntityProvider>
         </Content>
@@ -98,7 +98,7 @@ createDevApp()
       <Page themeId="home">
         <Header title="GraphQL" />
         <Content>
-          <EntityProvider entity={(graphqlApiEntity as any) as Entity}>
+          <EntityProvider entity={graphqlApiEntity as any as Entity}>
             <EntityApiDefinitionCard />
           </EntityProvider>
         </Content>
@@ -111,7 +111,7 @@ createDevApp()
       <Page themeId="home">
         <Header title="Other" />
         <Content>
-          <EntityProvider entity={(otherApiEntity as any) as Entity}>
+          <EntityProvider entity={otherApiEntity as any as Entity}>
             <EntityApiDefinitionCard />
           </EntityProvider>
         </Content>
diff --git a/plugins/api-docs/package.json b/plugins/api-docs/package.json
index 3e667d6528..63871ce4e1 100644
--- a/plugins/api-docs/package.json
+++ b/plugins/api-docs/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-api-docs",
-  "version": "0.6.1",
+  "version": "0.6.7",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -30,19 +30,20 @@
   },
   "dependencies": {
     "@asyncapi/react-component": "^0.23.0",
-    "@backstage/catalog-model": "^0.9.0",
-    "@backstage/core-components": "^0.1.5",
-    "@backstage/core-plugin-api": "^0.1.3",
-    "@backstage/plugin-catalog": "^0.6.6",
-    "@backstage/plugin-catalog-react": "^0.2.6",
-    "@backstage/theme": "^0.2.8",
+    "@backstage/catalog-model": "^0.9.1",
+    "@backstage/core-components": "^0.4.1",
+    "@backstage/core-plugin-api": "^0.1.7",
+    "@backstage/plugin-catalog": "^0.6.14",
+    "@backstage/plugin-catalog-react": "^0.4.5",
+    "@backstage/theme": "^0.2.10",
     "@material-icons/font": "^1.0.2",
-    "@material-ui/core": "^4.11.0",
+    "@material-ui/core": "^4.12.2",
     "@material-ui/icons": "^4.9.1",
     "@material-ui/lab": "4.0.0-alpha.45",
-    "@types/react": "^16.9",
+    "@types/react": "*",
     "graphiql": "^1.0.0-alpha.10",
     "graphql": "^15.3.0",
+    "isomorphic-form-data": "^2.0.0",
     "react": "^16.13.1",
     "react-dom": "^16.13.1",
     "react-router": "6.0.0-beta.0",
@@ -51,10 +52,10 @@
     "swagger-ui-react": "^3.37.2"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.7.3",
-    "@backstage/core-app-api": "^0.1.4",
-    "@backstage/dev-utils": "^0.2.1",
-    "@backstage/test-utils": "^0.1.14",
+    "@backstage/cli": "^0.7.11",
+    "@backstage/core-app-api": "^0.1.12",
+    "@backstage/dev-utils": "^0.2.9",
+    "@backstage/test-utils": "^0.1.17",
     "@testing-library/jest-dom": "^5.10.1",
     "@testing-library/react": "^11.2.5",
     "@testing-library/user-event": "^13.1.8",
diff --git a/plugins/api-docs/src/components/ApiDefinitionCard/ApiDefinitionCard.test.tsx b/plugins/api-docs/src/components/ApiDefinitionCard/ApiDefinitionCard.test.tsx
index 56ffe6fc55..7b0ffac58e 100644
--- a/plugins/api-docs/src/components/ApiDefinitionCard/ApiDefinitionCard.test.tsx
+++ b/plugins/api-docs/src/components/ApiDefinitionCard/ApiDefinitionCard.test.tsx
@@ -111,7 +111,7 @@ paths:
       },
     };
 
-    const { getByText } = await renderInTestApp(
+    const { getByText, getAllByText } = await renderInTestApp(
       <Wrapper>
         <EntityProvider entity={apiEntity}>
           <ApiDefinitionCard />
@@ -121,6 +121,10 @@ paths:
 
     expect(getByText(/my-name/i)).toBeInTheDocument();
     expect(getByText(/custom-type/i)).toBeInTheDocument();
-    expect(getByText(/Custom Definition/i)).toBeInTheDocument();
+    expect(
+      getAllByText(
+        (_text, element) => element?.textContent === 'Custom Definition',
+      ).length,
+    ).toBeGreaterThan(0);
   });
 });
diff --git a/plugins/api-docs/src/components/ApiExplorerPage/ApiExplorerPage.tsx b/plugins/api-docs/src/components/ApiExplorerPage/ApiExplorerPage.tsx
index 9a8b725ffc..2f74aaa166 100644
--- a/plugins/api-docs/src/components/ApiExplorerPage/ApiExplorerPage.tsx
+++ b/plugins/api-docs/src/components/ApiExplorerPage/ApiExplorerPage.tsx
@@ -14,6 +14,22 @@
  * limitations under the License.
  */
 
+import {
+  Content,
+  ContentHeader,
+  CreateButton,
+  PageWithHeader,
+  SupportButton,
+  TableColumn,
+} from '@backstage/core-components';
+import { configApiRef, useApi, useRouteRef } from '@backstage/core-plugin-api';
+import {
+  CatalogTable,
+  CatalogTableRow,
+  FilteredEntityLayout,
+  EntityListContainer,
+  FilterContainer,
+} from '@backstage/plugin-catalog';
 import {
   EntityKindPicker,
   EntityLifecyclePicker,
@@ -24,29 +40,8 @@ import {
   UserListFilterKind,
   UserListPicker,
 } from '@backstage/plugin-catalog-react';
-import { CatalogTable, CatalogTableRow } from '@backstage/plugin-catalog';
-import { Button, makeStyles } from '@material-ui/core';
 import React from 'react';
-import { Link as RouterLink } from 'react-router-dom';
 import { createComponentRouteRef } from '../../routes';
-import { ApiExplorerLayout } from './ApiExplorerLayout';
-
-import {
-  Content,
-  ContentHeader,
-  SupportButton,
-  TableColumn,
-} from '@backstage/core-components';
-import { useRouteRef } from '@backstage/core-plugin-api';
-
-const useStyles = makeStyles(theme => ({
-  contentWrapper: {
-    display: 'grid',
-    gridTemplateAreas: "'filters' 'table'",
-    gridTemplateColumns: '250px 1fr',
-    gridColumnGap: theme.spacing(2),
-  },
-}));
 
 const defaultColumns: TableColumn<CatalogTableRow>[] = [
   CatalogTable.columns.createNameColumn({ defaultKind: 'API' }),
@@ -58,7 +53,7 @@ const defaultColumns: TableColumn<CatalogTableRow>[] = [
   CatalogTable.columns.createTagsColumn(),
 ];
 
-export type ApiExplorerPageProps = {
+type ApiExplorerPageProps = {
   initiallySelectedFilter?: UserListFilterKind;
   columns?: TableColumn<CatalogTableRow>[];
 };
@@ -67,39 +62,43 @@ export const ApiExplorerPage = ({
   initiallySelectedFilter = 'all',
   columns,
 }: ApiExplorerPageProps) => {
-  const styles = useStyles();
+  const configApi = useApi(configApiRef);
+  const generatedSubtitle = `${
+    configApi.getOptionalString('organization.name') ?? 'Backstage'
+  } API Explorer`;
   const createComponentLink = useRouteRef(createComponentRouteRef);
 
   return (
-    <ApiExplorerLayout>
+    <PageWithHeader
+      themeId="apis"
+      title="APIs"
+      subtitle={generatedSubtitle}
+      pageTitleOverride="APIs"
+    >
       <Content>
         <ContentHeader title="">
-          {createComponentLink && (
-            <Button
-              variant="contained"
-              color="primary"
-              component={RouterLink}
-              to={createComponentLink()}
-            >
-              Register Existing API
-            </Button>
-          )}
+          <CreateButton
+            title="Register Existing API"
+            to={createComponentLink?.()}
+          />
           <SupportButton>All your APIs</SupportButton>
         </ContentHeader>
-        <div className={styles.contentWrapper}>
-          <EntityListProvider>
-            <div>
+        <EntityListProvider>
+          <FilteredEntityLayout>
+            <FilterContainer>
               <EntityKindPicker initialFilter="api" hidden />
               <EntityTypePicker />
               <UserListPicker initialFilter={initiallySelectedFilter} />
               <EntityOwnerPicker />
               <EntityLifecyclePicker />
               <EntityTagPicker />
-            </div>
-            <CatalogTable columns={columns || defaultColumns} />
-          </EntityListProvider>
-        </div>
+            </FilterContainer>
+            <EntityListContainer>
+              <CatalogTable columns={columns || defaultColumns} />
+            </EntityListContainer>
+          </FilteredEntityLayout>
+        </EntityListProvider>
       </Content>
-    </ApiExplorerLayout>
+    </PageWithHeader>
   );
 };
diff --git a/plugins/api-docs/src/components/AsyncApiDefinitionWidget/AsyncApiDefinitionWidget.tsx b/plugins/api-docs/src/components/AsyncApiDefinitionWidget/AsyncApiDefinitionWidget.tsx
index 0b8462ed6e..f32b5d01b5 100644
--- a/plugins/api-docs/src/components/AsyncApiDefinitionWidget/AsyncApiDefinitionWidget.tsx
+++ b/plugins/api-docs/src/components/AsyncApiDefinitionWidget/AsyncApiDefinitionWidget.tsx
@@ -88,13 +88,15 @@ const useStyles = makeStyles(theme => ({
     '& .asyncapi__enum': {
       color: theme.palette.secondary.main,
     },
-    '& .asyncapi__info, .asyncapi__channel, .asyncapi__channels > div, .asyncapi__schema, .asyncapi__channel-operations-list .asyncapi__messages-list-item .asyncapi__message, .asyncapi__message, .asyncapi__server, .asyncapi__servers > div, .asyncapi__messages > div, .asyncapi__schemas > div': {
-      'background-color': 'inherit',
-    },
-    '& .asyncapi__channel-parameters-header, .asyncapi__channel-operations-header, .asyncapi__channel-operation-oneOf-subscribe-header, .asyncapi__channel-operation-oneOf-publish-header, .asyncapi__channel-operation-message-header,  .asyncapi__message-header, .asyncapi__message-header-title, .asyncapi__message-header-title > h3, .asyncapi__bindings, .asyncapi__bindings-header, .asyncapi__bindings-header > h4': {
-      'background-color': 'inherit',
-      color: theme.palette.text.primary,
-    },
+    '& .asyncapi__info, .asyncapi__channel, .asyncapi__channels > div, .asyncapi__schema, .asyncapi__channel-operations-list .asyncapi__messages-list-item .asyncapi__message, .asyncapi__message, .asyncapi__server, .asyncapi__servers > div, .asyncapi__messages > div, .asyncapi__schemas > div':
+      {
+        'background-color': 'inherit',
+      },
+    '& .asyncapi__channel-parameters-header, .asyncapi__channel-operations-header, .asyncapi__channel-operation-oneOf-subscribe-header, .asyncapi__channel-operation-oneOf-publish-header, .asyncapi__channel-operation-message-header,  .asyncapi__message-header, .asyncapi__message-header-title, .asyncapi__message-header-title > h3, .asyncapi__bindings, .asyncapi__bindings-header, .asyncapi__bindings-header > h4':
+      {
+        'background-color': 'inherit',
+        color: theme.palette.text.primary,
+      },
     '& .asyncapi__additional-properties-notice': {
       color: theme.palette.text.hint,
     },
@@ -104,10 +106,11 @@ const useStyles = makeStyles(theme => ({
     '& .asyncapi__schema-example-header-title': {
       color: theme.palette.text.secondary,
     },
-    '& .asyncapi__message-headers-header, .asyncapi__message-payload-header, .asyncapi__server-variables-header, .asyncapi__server-security-header': {
-      'background-color': 'inherit',
-      color: theme.palette.text.secondary,
-    },
+    '& .asyncapi__message-headers-header, .asyncapi__message-payload-header, .asyncapi__server-variables-header, .asyncapi__server-security-header':
+      {
+        'background-color': 'inherit',
+        color: theme.palette.text.secondary,
+      },
     '& .asyncapi__table-header': {
       background: theme.palette.background.default,
     },
diff --git a/plugins/api-docs/src/components/OpenApiDefinitionWidget/OpenApiDefinitionWidget.tsx b/plugins/api-docs/src/components/OpenApiDefinitionWidget/OpenApiDefinitionWidget.tsx
index 75b3ef62f2..4c22d29bc2 100644
--- a/plugins/api-docs/src/components/OpenApiDefinitionWidget/OpenApiDefinitionWidget.tsx
+++ b/plugins/api-docs/src/components/OpenApiDefinitionWidget/OpenApiDefinitionWidget.tsx
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-import React, { useEffect, useState } from 'react';
 import { makeStyles } from '@material-ui/core/styles';
+import React, { useEffect, useState } from 'react';
 import SwaggerUI from 'swagger-ui-react';
 import 'swagger-ui-react/swagger-ui.css';
 
@@ -30,22 +30,26 @@ const useStyles = makeStyles(theme => ({
     '& .scheme-container': {
       'background-color': theme.palette.background.default,
     },
-    '& .opblock-tag, .opblock-tag small, table thead tr td, table thead tr th': {
-      color: theme.palette.text.primary,
-      'border-color': theme.palette.divider,
-    },
+    '& .opblock-tag, .opblock-tag small, table thead tr td, table thead tr th':
+      {
+        color: theme.palette.text.primary,
+        'border-color': theme.palette.divider,
+      },
     '& section.models, section.models.is-open h4': {
       'border-color': theme.palette.divider,
     },
-    '& .opblock .opblock-summary-description, .parameter__type, table.headers td, .model-title, .model .property.primitive, section h3': {
-      color: theme.palette.text.secondary,
-    },
-    '& .opblock .opblock-summary-operation-id, .opblock .opblock-summary-path, .opblock .opblock-summary-path__deprecated, .opblock .opblock-section-header h4, .parameter__name, .response-col_status, .response-col_links, .responses-inner h4, .swagger-ui .responses-inner h5, .opblock-section-header .btn, .tab li, .info li, .info p, .info table, section.models h4, .info .title, table.model tr.description, .property-row': {
-      color: theme.palette.text.primary,
-    },
-    '& .opblock .opblock-section-header, .model-box, section.models .model-container': {
-      background: theme.palette.background.default,
-    },
+    '& .opblock .opblock-summary-description, .parameter__type, table.headers td, .model-title, .model .property.primitive, section h3':
+      {
+        color: theme.palette.text.secondary,
+      },
+    '& .opblock .opblock-summary-operation-id, .opblock .opblock-summary-path, .opblock .opblock-summary-path__deprecated, .opblock .opblock-section-header h4, .parameter__name, .response-col_status, .response-col_links, .responses-inner h4, .swagger-ui .responses-inner h5, .opblock-section-header .btn, .tab li, .info li, .info p, .info table, section.models h4, .info .title, table.model tr.description, .property-row':
+      {
+        color: theme.palette.text.primary,
+      },
+    '& .opblock .opblock-section-header, .model-box, section.models .model-container':
+      {
+        background: theme.palette.background.default,
+      },
     '& .prop-format, .parameter__in': {
       color: theme.palette.text.disabled,
     },
@@ -53,9 +57,10 @@ const useStyles = makeStyles(theme => ({
       color: theme.palette.text.primary,
       'border-color': theme.palette.divider,
     },
-    '& .opblock-description-wrapper p, .opblock-external-docs-wrapper p, .opblock-title_normal p, .response-control-media-type__accept-message, .opblock .opblock-section-header>label, .scheme-container .schemes>label, .info .base-url, .model': {
-      color: theme.palette.text.hint,
-    },
+    '& .opblock-description-wrapper p, .opblock-external-docs-wrapper p, .opblock-title_normal p, .response-control-media-type__accept-message, .opblock .opblock-section-header>label, .scheme-container .schemes>label, .info .base-url, .model':
+      {
+        color: theme.palette.text.hint,
+      },
     '& .parameter__name.required:after': {
       color: theme.palette.warning.dark,
     },
@@ -83,7 +88,7 @@ export const OpenApiDefinitionWidget = ({ definition }: Props) => {
 
   return (
     <div className={classes.root}>
-      <SwaggerUI spec={def} />
+      <SwaggerUI spec={def} deepLinking />
     </div>
   );
 };
diff --git a/plugins/api-docs/src/components/PlainApiDefinitionWidget/PlainApiDefinitionWidget.test.tsx b/plugins/api-docs/src/components/PlainApiDefinitionWidget/PlainApiDefinitionWidget.test.tsx
index a71cb65be0..1600d608fb 100644
--- a/plugins/api-docs/src/components/PlainApiDefinitionWidget/PlainApiDefinitionWidget.test.tsx
+++ b/plugins/api-docs/src/components/PlainApiDefinitionWidget/PlainApiDefinitionWidget.test.tsx
@@ -20,9 +20,13 @@ import { PlainApiDefinitionWidget } from './PlainApiDefinitionWidget';
 
 describe('<PlainApiDefinitionWidget />', () => {
   it('renders plain text', async () => {
-    const { getByText } = await renderInTestApp(
+    const { getAllByText } = await renderInTestApp(
       <PlainApiDefinitionWidget definition="Hello World" language="yaml" />,
     );
-    expect(getByText(/Hello World/i)).toBeInTheDocument();
+
+    expect(
+      getAllByText((_text, element) => element?.textContent === 'Hello World')
+        .length,
+    ).toBeGreaterThan(0);
   });
 });
diff --git a/plugins/app-backend/CHANGELOG.md b/plugins/app-backend/CHANGELOG.md
index 144d641d2c..9d71990ba0 100644
--- a/plugins/app-backend/CHANGELOG.md
+++ b/plugins/app-backend/CHANGELOG.md
@@ -1,5 +1,22 @@
 # @backstage/plugin-app-backend
 
+## 0.3.16
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.9.0
+  - @backstage/config@0.1.8
+
+## 0.3.15
+
+### Patch Changes
+
+- ae84b20cf: Revert the upgrade to `fs-extra@10.0.0` as that seemed to have broken all installs inexplicably.
+- Updated dependencies
+  - @backstage/backend-common@0.8.6
+  - @backstage/config-loader@0.6.5
+
 ## 0.3.14
 
 ### Patch Changes
diff --git a/plugins/app-backend/api-report.md b/plugins/app-backend/api-report.md
index 7215366ebb..8c674b34e2 100644
--- a/plugins/app-backend/api-report.md
+++ b/plugins/app-backend/api-report.md
@@ -7,9 +7,13 @@ import { Config } from '@backstage/config';
 import express from 'express';
 import { Logger as Logger_2 } from 'winston';
 
+// Warning: (ae-missing-release-tag) "createRouter" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export function createRouter(options: RouterOptions): Promise<express.Router>;
 
+// Warning: (ae-missing-release-tag) "RouterOptions" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export interface RouterOptions {
   appPackageName: string;
diff --git a/plugins/app-backend/package.json b/plugins/app-backend/package.json
index cd5b62dfb4..a201ab6411 100644
--- a/plugins/app-backend/package.json
+++ b/plugins/app-backend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-app-backend",
-  "version": "0.3.14",
+  "version": "0.3.16",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -29,9 +29,9 @@
     "clean": "backstage-cli clean"
   },
   "dependencies": {
-    "@backstage/backend-common": "^0.8.3",
-    "@backstage/config-loader": "^0.6.4",
-    "@backstage/config": "^0.1.5",
+    "@backstage/backend-common": "^0.9.0",
+    "@backstage/config-loader": "^0.6.5",
+    "@backstage/config": "^0.1.8",
     "@types/express": "^4.17.6",
     "express": "^4.17.1",
     "express-promise-router": "^4.1.0",
@@ -40,7 +40,7 @@
     "yn": "^4.0.0"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.7.1",
+    "@backstage/cli": "^0.7.4",
     "@types/supertest": "^2.0.8",
     "msw": "^0.29.0",
     "supertest": "^6.1.3"
diff --git a/plugins/app-backend/src/lib/config.test.ts b/plugins/app-backend/src/lib/config.test.ts
index 1d5739e711..f36052116a 100644
--- a/plugins/app-backend/src/lib/config.test.ts
+++ b/plugins/app-backend/src/lib/config.test.ts
@@ -22,7 +22,7 @@ import { injectConfig } from './config';
 jest.mock('fs-extra');
 
 const fsMock = fs as jest.Mocked<typeof fs>;
-const readFileMock = (fsMock.readFile as unknown) as jest.MockedFunction<
+const readFileMock = fsMock.readFile as unknown as jest.MockedFunction<
   (name: string) => Promise<string>
 >;
 
diff --git a/plugins/app-backend/src/service/router.ts b/plugins/app-backend/src/service/router.ts
index 681b6335fe..297029dffc 100644
--- a/plugins/app-backend/src/service/router.ts
+++ b/plugins/app-backend/src/service/router.ts
@@ -104,8 +104,7 @@ export async function createRouter(
         // The Cache-Control header instructs the browser to not cache html files since it might
         // link to static assets from recently deployed versions.
         if (
-          ((express.static.mime as unknown) as Mime).lookup(path) ===
-          'text/html'
+          (express.static.mime as unknown as Mime).lookup(path) === 'text/html'
         ) {
           res.setHeader('Cache-Control', 'no-store, max-age=0');
         }
diff --git a/plugins/auth-backend/CHANGELOG.md b/plugins/auth-backend/CHANGELOG.md
index dd96bee3cc..4150d7f0e0 100644
--- a/plugins/auth-backend/CHANGELOG.md
+++ b/plugins/auth-backend/CHANGELOG.md
@@ -1,5 +1,92 @@
 # @backstage/plugin-auth-backend
 
+## 0.3.24
+
+### Patch Changes
+
+- 2a105f451: Add a warning log message that `passport-saml` will require a `cert` config parameter imminently.
+
+  We intend to upgrade this package soon, past the point where we will start to strictly require the `auth.saml.cert` configuration parameter to be present. To avoid issues starting your auth backend, please
+
+- 31892ee25: typo fix `tenentId` in Azure auth provider docs
+- e9b1e2a9f: Added signIn and authHandler resolver for oAuth2 provider
+- ca45b169d: Export GitHub to allow use with Identity resolver
+- Updated dependencies
+  - @backstage/catalog-model@0.9.1
+  - @backstage/backend-common@0.9.1
+
+## 0.3.23
+
+### Patch Changes
+
+- 392b36fa1: Added support for using authenticating via GitHub Apps in addition to GitHub OAuth Apps. It used to be possible to use GitHub Apps, but they did not handle session refresh correctly.
+
+  Note that GitHub Apps handle OAuth scope at the app installation level, meaning that the `scope` parameter for `getAccessToken` has no effect. When calling `getAccessToken` in open source plugins, one should still include the appropriate scope, but also document in the plugin README what scopes are required in the case of GitHub Apps.
+
+  In addition, the `authHandler` and `signInResolver` options have been implemented for the GitHub provider in the auth backend.
+
+- ea9fe9567: Fixed a bug where OAuth state parameters would be serialized as the string `'undefined'`.
+- 39fc3d7f8: Add Sign In and Handler resolver for GitLab provider
+- Updated dependencies
+  - @backstage/backend-common@0.9.0
+  - @backstage/config@0.1.8
+
+## 0.3.22
+
+### Patch Changes
+
+- 79d24a966: Fix an issue where the default app origin was not allowed to authenticate users.
+
+## 0.3.21
+
+### Patch Changes
+
+- 72a31c29a: Add support for additional app origins
+- Updated dependencies
+  - @backstage/backend-common@0.8.10
+  - @backstage/config@0.1.7
+
+## 0.3.20
+
+### Patch Changes
+
+- 29f7cfffb: Added `resolveCatalogMembership` utility to query the catalog for additional authentication claims within sign-in resolvers.
+- 8bedb75ae: Update Luxon dependency to 2.x
+- bfe0ff93f: Add Sign In and Handler resolver for Okta provider
+- Updated dependencies
+  - @backstage/backend-common@0.8.9
+  - @backstage/test-utils@0.1.17
+
+## 0.3.19
+
+### Patch Changes
+
+- 4edca1bd0: Allow to configure SAML auth `acceptedClockSkewMs`
+- b68f2c83c: Added the `disableRefresh` option to the `OAuth2` config
+- Updated dependencies
+  - @backstage/test-utils@0.1.16
+  - @backstage/catalog-client@0.3.18
+
+## 0.3.18
+
+### Patch Changes
+
+- 2567c066d: TokenIssuer is now exported so it may be used by auth providers that are not bundled with Backstage
+- Updated dependencies
+  - @backstage/catalog-client@0.3.17
+  - @backstage/backend-common@0.8.7
+  - @backstage/test-utils@0.1.15
+
+## 0.3.17
+
+### Patch Changes
+
+- 40b3c60e2: Configuration updates for the `OpenID Connect` auth provider to allow `prompt` configuration and some sensible defaults.
+- f55f9df10: Add Sign In and Handler resolver for Microsoft provider
+- ae84b20cf: Revert the upgrade to `fs-extra@10.0.0` as that seemed to have broken all installs inexplicably.
+- Updated dependencies
+  - @backstage/backend-common@0.8.6
+
 ## 0.3.16
 
 ### Patch Changes
diff --git a/plugins/auth-backend/api-report.md b/plugins/auth-backend/api-report.md
index 50341c0392..b499f0bf8e 100644
--- a/plugins/auth-backend/api-report.md
+++ b/plugins/auth-backend/api-report.md
@@ -14,11 +14,15 @@ import { PluginEndpointDiscovery } from '@backstage/backend-common';
 import { Profile } from 'passport';
 import { UserEntity } from '@backstage/catalog-model';
 
+// Warning: (ae-missing-release-tag) "AuthProviderFactory" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export type AuthProviderFactory = (
   options: AuthProviderFactoryOptions,
 ) => AuthProviderRouteHandlers;
 
+// Warning: (ae-missing-release-tag) "AuthProviderFactoryOptions" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export type AuthProviderFactoryOptions = {
   providerId: string;
@@ -31,14 +35,38 @@ export type AuthProviderFactoryOptions = {
   identityResolver?: ExperimentalIdentityResolver;
 };
 
+// Warning: (tsdoc-escape-greater-than) The ">" character should be escaped using a backslash to avoid confusion with an HTML tag
+// Warning: (tsdoc-escape-greater-than) The ">" character should be escaped using a backslash to avoid confusion with an HTML tag
+// Warning: (tsdoc-escape-greater-than) The ">" character should be escaped using a backslash to avoid confusion with an HTML tag
+// Warning: (tsdoc-escape-greater-than) The ">" character should be escaped using a backslash to avoid confusion with an HTML tag
+// Warning: (ae-missing-release-tag) "AuthProviderRouteHandlers" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public
 export interface AuthProviderRouteHandlers {
+  // Warning: (tsdoc-param-tag-missing-hyphen) The @param block should be followed by a parameter name and then a hyphen
+  // Warning: (tsdoc-param-tag-with-invalid-type) The @param block should not include a JSDoc-style '{type}'
+  // Warning: (tsdoc-param-tag-missing-hyphen) The @param block should be followed by a parameter name and then a hyphen
+  // Warning: (tsdoc-param-tag-with-invalid-type) The @param block should not include a JSDoc-style '{type}'
   frameHandler(req: express.Request, res: express.Response): Promise<void>;
+  // Warning: (tsdoc-param-tag-missing-hyphen) The @param block should be followed by a parameter name and then a hyphen
+  // Warning: (tsdoc-param-tag-with-invalid-type) The @param block should not include a JSDoc-style '{type}'
+  // Warning: (tsdoc-param-tag-missing-hyphen) The @param block should be followed by a parameter name and then a hyphen
+  // Warning: (tsdoc-param-tag-with-invalid-type) The @param block should not include a JSDoc-style '{type}'
   logout?(req: express.Request, res: express.Response): Promise<void>;
+  // Warning: (tsdoc-param-tag-missing-hyphen) The @param block should be followed by a parameter name and then a hyphen
+  // Warning: (tsdoc-param-tag-with-invalid-type) The @param block should not include a JSDoc-style '{type}'
+  // Warning: (tsdoc-param-tag-missing-hyphen) The @param block should be followed by a parameter name and then a hyphen
+  // Warning: (tsdoc-param-tag-with-invalid-type) The @param block should not include a JSDoc-style '{type}'
   refresh?(req: express.Request, res: express.Response): Promise<void>;
+  // Warning: (tsdoc-param-tag-missing-hyphen) The @param block should be followed by a parameter name and then a hyphen
+  // Warning: (tsdoc-param-tag-with-invalid-type) The @param block should not include a JSDoc-style '{type}'
+  // Warning: (tsdoc-param-tag-missing-hyphen) The @param block should be followed by a parameter name and then a hyphen
+  // Warning: (tsdoc-param-tag-with-invalid-type) The @param block should not include a JSDoc-style '{type}'
   start(req: express.Request, res: express.Response): Promise<void>;
 }
 
+// Warning: (ae-missing-release-tag) "AuthResponse" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export type AuthResponse<ProviderInfo> = {
   providerInfo: ProviderInfo;
@@ -46,6 +74,8 @@ export type AuthResponse<ProviderInfo> = {
   backstageIdentity?: BackstageIdentity;
 };
 
+// Warning: (ae-missing-release-tag) "BackstageIdentity" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export type BackstageIdentity = {
   id: string;
@@ -54,16 +84,55 @@ export type BackstageIdentity = {
   entity?: Entity;
 };
 
+// Warning: (ae-missing-release-tag) "createGithubProvider" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
+// @public (undocumented)
+export const createGithubProvider: (
+  options?: GithubProviderOptions | undefined,
+) => AuthProviderFactory;
+
+// Warning: (ae-missing-release-tag) "createGitlabProvider" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
+// @public (undocumented)
+export const createGitlabProvider: (
+  options?: GitlabProviderOptions | undefined,
+) => AuthProviderFactory;
+
+// Warning: (ae-missing-release-tag) "createGoogleProvider" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export const createGoogleProvider: (
   options?: GoogleProviderOptions | undefined,
 ) => AuthProviderFactory;
 
+// Warning: (ae-missing-release-tag) "createMicrosoftProvider" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export const createMicrosoftProvider: (
   options?: MicrosoftProviderOptions | undefined,
 ) => AuthProviderFactory;
 
+// Warning: (ae-missing-release-tag) "createOAuth2Provider" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
+// @public (undocumented)
+export const createOAuth2Provider: (
+  options?: OAuth2ProviderOptions | undefined,
+) => AuthProviderFactory;
+
+// Warning: (ae-missing-release-tag) "createOktaProvider" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
+// @public (undocumented)
+export const createOktaProvider: (
+  _options?: OktaProviderOptions | undefined,
+) => AuthProviderFactory;
+
+// Warning: (ae-missing-release-tag) "createOriginFilter" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
+// @public (undocumented)
+export function createOriginFilter(config: Config): (origin: string) => boolean;
+
+// Warning: (ae-missing-release-tag) "createRouter" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export function createRouter({
   logger,
@@ -73,20 +142,64 @@ export function createRouter({
   providerFactories,
 }: RouterOptions): Promise<express.Router>;
 
+// Warning: (ae-missing-release-tag) "factories" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export const defaultAuthProviderFactories: {
   [providerId: string]: AuthProviderFactory;
 };
 
+// Warning: (ae-missing-release-tag) "encodeState" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export const encodeState: (state: OAuthState) => string;
 
+// Warning: (ae-missing-release-tag) "ensuresXRequestedWith" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export const ensuresXRequestedWith: (req: express.Request) => boolean;
 
+// Warning: (ae-missing-release-tag) "GithubOAuthResult" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
+// @public (undocumented)
+export type GithubOAuthResult = {
+  fullProfile: Profile;
+  params: {
+    scope: string;
+    expires_in?: string;
+    refresh_token_expires_in?: string;
+  };
+  accessToken: string;
+  refreshToken?: string;
+};
+
+// Warning: (ae-missing-release-tag) "GithubProviderOptions" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
+// @public (undocumented)
+export type GithubProviderOptions = {
+  authHandler?: AuthHandler<GithubOAuthResult>;
+  signIn?: {
+    resolver?: SignInResolver<GithubOAuthResult>;
+  };
+};
+
+// Warning: (ae-missing-release-tag) "GitlabProviderOptions" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
+// @public (undocumented)
+export type GitlabProviderOptions = {
+  authHandler?: AuthHandler<OAuthResult>;
+  signIn?: {
+    resolver?: SignInResolver<OAuthResult>;
+  };
+};
+
+// Warning: (ae-missing-release-tag) "googleEmailSignInResolver" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export const googleEmailSignInResolver: SignInResolver<OAuthResult>;
 
+// Warning: (ae-missing-release-tag) "GoogleProviderOptions" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export type GoogleProviderOptions = {
   authHandler?: AuthHandler<OAuthResult>;
@@ -95,6 +208,8 @@ export type GoogleProviderOptions = {
   };
 };
 
+// Warning: (ae-missing-release-tag) "IdentityClient" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public
 export class IdentityClient {
   constructor(options: { discovery: PluginEndpointDiscovery; issuer: string });
@@ -107,9 +222,13 @@ export class IdentityClient {
   }>;
 }
 
+// Warning: (ae-missing-release-tag) "microsoftEmailSignInResolver" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export const microsoftEmailSignInResolver: SignInResolver<OAuthResult>;
 
+// Warning: (ae-missing-release-tag) "MicrosoftProviderOptions" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export type MicrosoftProviderOptions = {
   authHandler?: AuthHandler<OAuthResult>;
@@ -118,11 +237,25 @@ export type MicrosoftProviderOptions = {
   };
 };
 
+// Warning: (ae-missing-release-tag) "OAuth2ProviderOptions" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
+// @public (undocumented)
+export type OAuth2ProviderOptions = {
+  authHandler?: AuthHandler<OAuthResult>;
+  signIn?: {
+    resolver?: SignInResolver<OAuthResult>;
+  };
+};
+
+// Warning: (ae-missing-release-tag) "OAuthAdapter" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export class OAuthAdapter implements AuthProviderRouteHandlers {
   constructor(handlers: OAuthHandlers, options: Options);
   // (undocumented)
   frameHandler(req: express.Request, res: express.Response): Promise<void>;
+  // Warning: (ae-forgotten-export) The symbol "Options" needs to be exported by the entry point index.d.ts
+  //
   // (undocumented)
   static fromConfig(
     config: AuthProviderConfig,
@@ -140,6 +273,8 @@ export class OAuthAdapter implements AuthProviderRouteHandlers {
   start(req: express.Request, res: express.Response): Promise<void>;
 }
 
+// Warning: (ae-missing-release-tag) "OAuthEnvironmentHandler" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export class OAuthEnvironmentHandler implements AuthProviderRouteHandlers {
   constructor(handlers: Map<string, AuthProviderRouteHandlers>);
@@ -158,19 +293,31 @@ export class OAuthEnvironmentHandler implements AuthProviderRouteHandlers {
   start(req: express.Request, res: express.Response): Promise<void>;
 }
 
+// Warning: (ae-missing-release-tag) "OAuthHandlers" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public
 export interface OAuthHandlers {
-  handler(
-    req: express.Request,
-  ): Promise<{
+  // Warning: (tsdoc-param-tag-missing-hyphen) The @param block should be followed by a parameter name and then a hyphen
+  // Warning: (tsdoc-param-tag-with-invalid-type) The @param block should not include a JSDoc-style '{type}'
+  handler(req: express.Request): Promise<{
     response: AuthResponse<OAuthProviderInfo>;
     refreshToken?: string;
   }>;
   logout?(): Promise<void>;
+  // Warning: (tsdoc-param-tag-missing-hyphen) The @param block should be followed by a parameter name and then a hyphen
+  // Warning: (tsdoc-param-tag-with-invalid-type) The @param block should not include a JSDoc-style '{type}'
+  // Warning: (tsdoc-param-tag-missing-hyphen) The @param block should be followed by a parameter name and then a hyphen
+  // Warning: (tsdoc-param-tag-with-invalid-type) The @param block should not include a JSDoc-style '{type}'
   refresh?(req: OAuthRefreshRequest): Promise<AuthResponse<OAuthProviderInfo>>;
+  // Warning: (tsdoc-param-tag-missing-hyphen) The @param block should be followed by a parameter name and then a hyphen
+  // Warning: (tsdoc-param-tag-with-invalid-type) The @param block should not include a JSDoc-style '{type}'
+  // Warning: (tsdoc-param-tag-missing-hyphen) The @param block should be followed by a parameter name and then a hyphen
+  // Warning: (ae-forgotten-export) The symbol "RedirectInfo" needs to be exported by the entry point index.d.ts
   start(req: OAuthStartRequest): Promise<RedirectInfo>;
 }
 
+// Warning: (ae-missing-release-tag) "OAuthProviderInfo" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export type OAuthProviderInfo = {
   accessToken: string;
@@ -180,6 +327,8 @@ export type OAuthProviderInfo = {
   refreshToken?: string;
 };
 
+// Warning: (ae-missing-release-tag) "OAuthProviderOptions" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public
 export type OAuthProviderOptions = {
   clientId: string;
@@ -187,15 +336,21 @@ export type OAuthProviderOptions = {
   callbackUrl: string;
 };
 
+// Warning: (ae-missing-release-tag) "OAuthRefreshRequest" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export type OAuthRefreshRequest = express.Request<{}> & {
   scope: string;
   refreshToken: string;
 };
 
+// Warning: (ae-missing-release-tag) "OAuthResponse" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export type OAuthResponse = AuthResponse<OAuthProviderInfo>;
 
+// Warning: (ae-missing-release-tag) "OAuthResult" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export type OAuthResult = {
   fullProfile: Profile;
@@ -208,18 +363,40 @@ export type OAuthResult = {
   refreshToken?: string;
 };
 
+// Warning: (ae-missing-release-tag) "OAuthStartRequest" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export type OAuthStartRequest = express.Request<{}> & {
   scope: string;
   state: OAuthState;
 };
 
+// Warning: (ae-missing-release-tag) "OAuthState" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export type OAuthState = {
   nonce: string;
   env: string;
+  origin?: string;
 };
 
+// Warning: (ae-missing-release-tag) "oktaEmailSignInResolver" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
+// @public (undocumented)
+export const oktaEmailSignInResolver: SignInResolver<OAuthResult>;
+
+// Warning: (ae-missing-release-tag) "OktaProviderOptions" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
+// @public (undocumented)
+export type OktaProviderOptions = {
+  authHandler?: AuthHandler<OAuthResult>;
+  signIn?: {
+    resolver?: SignInResolver<OAuthResult>;
+  };
+};
+
+// Warning: (ae-missing-release-tag) "postMessageResponse" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export const postMessageResponse: (
   res: express.Response,
@@ -227,6 +404,8 @@ export const postMessageResponse: (
   response: WebMessageResponse,
 ) => void;
 
+// Warning: (ae-missing-release-tag) "ProfileInfo" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public
 export type ProfileInfo = {
   email?: string;
@@ -234,9 +413,13 @@ export type ProfileInfo = {
   picture?: string;
 };
 
+// Warning: (ae-missing-release-tag) "readState" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export const readState: (stateString: string) => OAuthState;
 
+// Warning: (ae-missing-release-tag) "RouterOptions" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export interface RouterOptions {
   // (undocumented)
@@ -247,13 +430,29 @@ export interface RouterOptions {
   discovery: PluginEndpointDiscovery;
   // (undocumented)
   logger: Logger_2;
+  // Warning: (ae-forgotten-export) The symbol "ProviderFactories" needs to be exported by the entry point index.d.ts
+  //
   // (undocumented)
   providerFactories?: ProviderFactories;
 }
 
+// Warning: (ae-missing-release-tag) "TokenIssuer" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
+// @public
+export type TokenIssuer = {
+  issueToken(params: TokenParams): Promise<string>;
+  listPublicKeys(): Promise<{
+    keys: AnyJWK[];
+  }>;
+};
+
+// Warning: (ae-missing-release-tag) "verifyNonce" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export const verifyNonce: (req: express.Request, providerId: string) => void;
 
+// Warning: (ae-missing-release-tag) "WebMessageResponse" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public
 export type WebMessageResponse =
   | {
@@ -265,5 +464,15 @@ export type WebMessageResponse =
       error: Error;
     };
 
+// Warnings were encountered during analysis:
+//
+// src/identity/types.d.ts:25:5 - (ae-forgotten-export) The symbol "TokenParams" needs to be exported by the entry point index.d.ts
+// src/identity/types.d.ts:31:9 - (ae-forgotten-export) The symbol "AnyJWK" needs to be exported by the entry point index.d.ts
+// src/providers/github/provider.d.ts:50:5 - (ae-forgotten-export) The symbol "AuthHandler" needs to be exported by the entry point index.d.ts
+// src/providers/github/provider.d.ts:58:9 - (ae-forgotten-export) The symbol "SignInResolver" needs to be exported by the entry point index.d.ts
+// src/providers/types.d.ts:109:5 - (ae-forgotten-export) The symbol "AuthProviderConfig" needs to be exported by the entry point index.d.ts
+// src/providers/types.d.ts:115:5 - (ae-forgotten-export) The symbol "ExperimentalIdentityResolver" needs to be exported by the entry point index.d.ts
+// src/providers/types.d.ts:132:8 - (tsdoc-missing-deprecation-message) The @deprecated block must include a deprecation message, e.g. describing the recommended alternative
+
 // (No @packageDocumentation comment for this package)
 ```
diff --git a/plugins/auth-backend/config.d.ts b/plugins/auth-backend/config.d.ts
index e9f24382d9..e1f927dd24 100644
--- a/plugins/auth-backend/config.d.ts
+++ b/plugins/auth-backend/config.d.ts
@@ -48,11 +48,12 @@ export interface Config {
         entryPoint: string;
         logoutUrl?: string;
         issuer: string;
-        cert?: string;
+        cert: string;
         privateKey?: string;
         decryptionPvk?: string;
         signatureAlgorithm?: 'sha256' | 'sha512';
         digestAlgorithm?: string;
+        acceptedClockSkewMs?: number;
       };
       okta?: {
         [authEnv: string]: { [key: string]: string };
@@ -64,6 +65,7 @@ export interface Config {
           authorizationUrl: string;
           tokenUrl: string;
           scope?: string;
+          disableRefresh?: boolean;
         };
       };
       oidc?: {
diff --git a/plugins/auth-backend/package.json b/plugins/auth-backend/package.json
index 0b108e11cd..afd8006596 100644
--- a/plugins/auth-backend/package.json
+++ b/plugins/auth-backend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-auth-backend",
-  "version": "0.3.16",
+  "version": "0.3.24",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -29,12 +29,12 @@
     "clean": "backstage-cli clean"
   },
   "dependencies": {
-    "@backstage/backend-common": "^0.8.5",
-    "@backstage/catalog-client": "^0.3.16",
-    "@backstage/catalog-model": "^0.9.0",
-    "@backstage/config": "^0.1.5",
+    "@backstage/backend-common": "^0.9.1",
+    "@backstage/catalog-client": "^0.3.18",
+    "@backstage/catalog-model": "^0.9.1",
+    "@backstage/config": "^0.1.8",
     "@backstage/errors": "^0.1.1",
-    "@backstage/test-utils": "^0.1.14",
+    "@backstage/test-utils": "^0.1.17",
     "@types/express": "^4.17.6",
     "@types/passport": "^1.0.3",
     "compression": "^1.7.4",
@@ -50,7 +50,9 @@
     "jose": "^1.27.1",
     "jwt-decode": "^3.1.0",
     "knex": "^0.95.1",
-    "luxon": "^1.25.0",
+    "lodash": "^4.17.21",
+    "luxon": "^2.0.2",
+    "minimatch": "^3.0.3",
     "morgan": "^1.10.0",
     "node-cache": "^5.1.2",
     "openid-client": "^4.2.1",
@@ -62,13 +64,13 @@
     "passport-oauth2": "^1.5.0",
     "passport-okta-oauth": "^0.0.1",
     "passport-onelogin-oauth": "^0.0.1",
-    "passport-saml": "^2.0.0",
+    "passport-saml": "^3.1.2",
     "uuid": "^8.0.0",
     "winston": "^3.2.1",
     "yn": "^4.0.0"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.7.3",
+    "@backstage/cli": "^0.7.10",
     "@types/body-parser": "^1.19.0",
     "@types/cookie-parser": "^1.4.2",
     "@types/express-session": "^1.17.2",
@@ -76,7 +78,7 @@
     "@types/passport-github2": "^1.2.4",
     "@types/passport-google-oauth20": "^2.0.3",
     "@types/passport-microsoft": "^0.0.0",
-    "@types/passport-saml": "^1.1.2",
+    "@types/passport-saml": "^1.1.3",
     "@types/passport-strategy": "^0.2.35",
     "@types/xml2js": "^0.4.7",
     "msw": "^0.29.0"
diff --git a/plugins/auth-backend/src/identity/TokenFactory.ts b/plugins/auth-backend/src/identity/TokenFactory.ts
index ae7c674a58..041a292d44 100644
--- a/plugins/auth-backend/src/identity/TokenFactory.ts
+++ b/plugins/auth-backend/src/identity/TokenFactory.ts
@@ -150,7 +150,7 @@ export class TokenFactory implements TokenIssuer {
       //       the new one. This also needs to be implemented cross-service though, meaning new services
       //       that boot up need to be able to grab an existing key to use for signing.
       this.logger.info(`Created new signing key ${key.kid}`);
-      await this.keyStore.addKey((key.toJWK(false) as unknown) as AnyJWK);
+      await this.keyStore.addKey(key.toJWK(false) as unknown as AnyJWK);
 
       // At this point we are allowed to start using the new key
       return key as JSONWebKey;
diff --git a/plugins/auth-backend/src/index.ts b/plugins/auth-backend/src/index.ts
index d3ea83efd6..6b15b1fc81 100644
--- a/plugins/auth-backend/src/index.ts
+++ b/plugins/auth-backend/src/index.ts
@@ -16,6 +16,7 @@
 
 export * from './service/router';
 export { IdentityClient } from './identity';
+export type { TokenIssuer } from './identity';
 export * from './providers';
 
 // flow package provides 2 functions
diff --git a/plugins/auth-backend/src/lib/catalog/CatalogIdentityClient.test.ts b/plugins/auth-backend/src/lib/catalog/CatalogIdentityClient.test.ts
index 329db316ab..6ffcfd6f46 100644
--- a/plugins/auth-backend/src/lib/catalog/CatalogIdentityClient.test.ts
+++ b/plugins/auth-backend/src/lib/catalog/CatalogIdentityClient.test.ts
@@ -15,7 +15,11 @@
  */
 
 import { CatalogApi } from '@backstage/catalog-client';
-import { UserEntity } from '@backstage/catalog-model';
+import {
+  RELATION_MEMBER_OF,
+  UserEntity,
+  UserEntityV1alpha1,
+} from '@backstage/catalog-model';
 import { TokenIssuer } from '../../identity';
 import { CatalogIdentityClient } from './CatalogIdentityClient';
 
@@ -37,12 +41,12 @@ describe('CatalogIdentityClient', () => {
 
   afterEach(() => jest.resetAllMocks());
 
-  it('passes through the correct search params', async () => {
+  it('findUser passes through the correct search params', async () => {
     catalogApi.getEntities.mockResolvedValueOnce({ items: [{} as UserEntity] });
     tokenIssuer.issueToken.mockResolvedValue('my-token');
     const client = new CatalogIdentityClient({
-      catalogApi: catalogApi,
-      tokenIssuer: tokenIssuer,
+      catalogApi,
+      tokenIssuer,
     });
 
     await client.findUser({ annotations: { key: 'value' } });
@@ -62,4 +66,88 @@ describe('CatalogIdentityClient', () => {
       },
     });
   });
+
+  it('resolveCatalogMembership resolves membership', async () => {
+    const mockUsers: Array<UserEntityV1alpha1> = [
+      {
+        apiVersion: 'backstage.io/v1beta1',
+        kind: 'User',
+        metadata: {
+          name: 'inigom',
+        },
+        spec: {
+          memberOf: ['team-a'],
+        },
+        relations: [
+          {
+            type: RELATION_MEMBER_OF,
+            target: {
+              kind: 'Group',
+              namespace: 'default',
+              name: 'team-a',
+            },
+          },
+        ],
+      },
+      {
+        apiVersion: 'backstage.io/v1beta1',
+        kind: 'User',
+        metadata: {
+          name: 'mpatinkin',
+          namespace: 'reality',
+        },
+        spec: {
+          memberOf: ['screen-actors-guild'],
+        },
+        relations: [
+          {
+            type: RELATION_MEMBER_OF,
+            target: {
+              kind: 'Group',
+              namespace: 'reality',
+              name: 'screen-actors-guild',
+            },
+          },
+        ],
+      },
+    ];
+    catalogApi.getEntities.mockResolvedValueOnce({ items: mockUsers });
+
+    const client = new CatalogIdentityClient({
+      catalogApi,
+      tokenIssuer,
+    });
+
+    const claims = await client.resolveCatalogMembership({
+      entityRefs: ['inigom', 'User:default/imontoya', 'User:reality/mpatinkin'],
+    });
+
+    expect(catalogApi.getEntities).toHaveBeenCalledWith({
+      filter: [
+        {
+          kind: 'user',
+          'metadata.namespace': 'default',
+          'metadata.name': 'inigom',
+        },
+        {
+          kind: 'user',
+          'metadata.namespace': 'default',
+          'metadata.name': 'imontoya',
+        },
+        {
+          kind: 'user',
+          'metadata.namespace': 'reality',
+          'metadata.name': 'mpatinkin',
+        },
+      ],
+    });
+
+    expect(claims).toMatchObject([
+      'user:default/inigom',
+      'user:default/imontoya',
+      'user:reality/mpatinkin',
+      'group:default/team-a',
+      'group:reality/screen-actors-guild',
+    ]);
+  });
 });
diff --git a/plugins/auth-backend/src/lib/catalog/CatalogIdentityClient.ts b/plugins/auth-backend/src/lib/catalog/CatalogIdentityClient.ts
index 07a7190503..02fe9818cb 100644
--- a/plugins/auth-backend/src/lib/catalog/CatalogIdentityClient.ts
+++ b/plugins/auth-backend/src/lib/catalog/CatalogIdentityClient.ts
@@ -14,15 +14,27 @@
  * limitations under the License.
  */
 
+import { Logger } from 'winston';
 import { ConflictError, NotFoundError } from '@backstage/errors';
 import { CatalogApi } from '@backstage/catalog-client';
-import { UserEntity } from '@backstage/catalog-model';
+import {
+  EntityName,
+  parseEntityRef,
+  RELATION_MEMBER_OF,
+  stringifyEntityRef,
+  UserEntity,
+} from '@backstage/catalog-model';
 import { TokenIssuer } from '../../identity';
 
 type UserQuery = {
   annotations: Record<string, string>;
 };
 
+type MemberClaimQuery = {
+  entityRefs: string[];
+  logger?: Logger;
+};
+
 /**
  * A catalog client tailored for reading out identity data from the catalog.
  */
@@ -64,4 +76,62 @@ export class CatalogIdentityClient {
 
     return items[0] as UserEntity;
   }
+
+  /**
+   * Resolve additional entity claims from the catalog, using the passed-in entity names. Designed
+   * to be used within a `signInResolver` where additional entity claims might be provided, but
+   * group membership and transient group membership lean on imported catalog relations.
+   *
+   * Returns a superset of the entity names that can be passed directly to `issueToken` as `ent`.
+   */
+  async resolveCatalogMembership({
+    entityRefs,
+    logger,
+  }: MemberClaimQuery): Promise<string[]> {
+    const resolvedEntityRefs = entityRefs
+      .map((ref: string) => {
+        try {
+          const parsedRef = parseEntityRef(ref.toLocaleLowerCase('en-US'), {
+            defaultKind: 'user',
+            defaultNamespace: 'default',
+          });
+          return parsedRef;
+        } catch {
+          logger?.warn(`Failed to parse entityRef from ${ref}, ignoring`);
+          return null;
+        }
+      })
+      .filter((ref): ref is EntityName => ref !== null);
+
+    const filter = resolvedEntityRefs.map(ref => ({
+      kind: ref.kind,
+      'metadata.namespace': ref.namespace,
+      'metadata.name': ref.name,
+    }));
+    const entities = await this.catalogApi
+      .getEntities({ filter })
+      .then(r => r.items);
+
+    if (entityRefs.length !== entities.length) {
+      const foundEntityNames = entities.map(stringifyEntityRef);
+      const missingEntityNames = resolvedEntityRefs
+        .map(stringifyEntityRef)
+        .filter(s => !foundEntityNames.includes(s));
+      logger?.debug(`Entities not found for refs ${missingEntityNames.join()}`);
+    }
+
+    const memberOf = entities.flatMap(
+      e =>
+        e!.relations
+          ?.filter(r => r.type === RELATION_MEMBER_OF)
+          .map(r => r.target) ?? [],
+    );
+
+    const newEntityRefs = [
+      ...new Set(resolvedEntityRefs.concat(memberOf).map(stringifyEntityRef)),
+    ];
+
+    logger?.debug(`Found catalog membership: ${newEntityRefs.join()}`);
+    return newEntityRefs;
+  }
 }
diff --git a/plugins/auth-backend/src/lib/flow/authFlowHelpers.test.ts b/plugins/auth-backend/src/lib/flow/authFlowHelpers.test.ts
index 5446fbd437..117f1b86e4 100644
--- a/plugins/auth-backend/src/lib/flow/authFlowHelpers.test.ts
+++ b/plugins/auth-backend/src/lib/flow/authFlowHelpers.test.ts
@@ -32,10 +32,10 @@ describe('oauth helpers', () => {
   describe('postMessageResponse', () => {
     const appOrigin = 'http://localhost:3000';
     it('should post a message back with payload success', () => {
-      const mockResponse = ({
+      const mockResponse = {
         end: jest.fn().mockReturnThis(),
         setHeader: jest.fn().mockReturnThis(),
-      } as unknown) as express.Response;
+      } as unknown as express.Response;
 
       const data: WebMessageResponse = {
         type: 'authorization_response',
@@ -64,10 +64,10 @@ describe('oauth helpers', () => {
     });
 
     it('should post a message back with payload error', () => {
-      const mockResponse = ({
+      const mockResponse = {
         end: jest.fn().mockReturnThis(),
         setHeader: jest.fn().mockReturnThis(),
-      } as unknown) as express.Response;
+      } as unknown as express.Response;
 
       const data: WebMessageResponse = {
         type: 'authorization_response',
@@ -84,13 +84,13 @@ describe('oauth helpers', () => {
     it('should call postMessage twice but only one of them with target *', () => {
       let responseBody = '';
 
-      const mockResponse = ({
+      const mockResponse = {
         end: jest.fn(body => {
           responseBody = body;
           return this;
         }),
         setHeader: jest.fn().mockReturnThis(),
-      } as unknown) as express.Response;
+      } as unknown as express.Response;
 
       const data: WebMessageResponse = {
         type: 'authorization_response',
@@ -128,10 +128,10 @@ describe('oauth helpers', () => {
     });
 
     it('handles single quotes and unicode chars safely', () => {
-      const mockResponse = ({
+      const mockResponse = {
         end: jest.fn().mockReturnThis(),
         setHeader: jest.fn().mockReturnThis(),
-      } as unknown) as express.Response;
+      } as unknown as express.Response;
 
       const data: WebMessageResponse = {
         type: 'authorization_response',
@@ -164,23 +164,23 @@ describe('oauth helpers', () => {
 
   describe('ensuresXRequestedWith', () => {
     it('should return false if no header present', () => {
-      const mockRequest = ({
+      const mockRequest = {
         header: () => jest.fn(),
-      } as unknown) as express.Request;
+      } as unknown as express.Request;
       expect(ensuresXRequestedWith(mockRequest)).toBe(false);
     });
 
     it('should return false if header present with incorrect value', () => {
-      const mockRequest = ({
+      const mockRequest = {
         header: () => 'INVALID',
-      } as unknown) as express.Request;
+      } as unknown as express.Request;
       expect(ensuresXRequestedWith(mockRequest)).toBe(false);
     });
 
     it('should return true if header present with correct value', () => {
-      const mockRequest = ({
+      const mockRequest = {
         header: () => 'XMLHttpRequest',
-      } as unknown) as express.Request;
+      } as unknown as express.Request;
       expect(ensuresXRequestedWith(mockRequest)).toBe(true);
     });
   });
diff --git a/plugins/auth-backend/src/lib/oauth/OAuthAdapter.test.ts b/plugins/auth-backend/src/lib/oauth/OAuthAdapter.test.ts
index 147cf5216f..27b629cc07 100644
--- a/plugins/auth-backend/src/lib/oauth/OAuthAdapter.test.ts
+++ b/plugins/auth-backend/src/lib/oauth/OAuthAdapter.test.ts
@@ -64,6 +64,7 @@ describe('OAuthAdapter', () => {
       issueToken: async () => 'my-id-token',
       listPublicKeys: async () => ({ keys: [] }),
     },
+    isOriginAllowed: () => false,
   };
 
   it('sets the correct headers in start', async () => {
@@ -71,19 +72,19 @@ describe('OAuthAdapter', () => {
       providerInstance,
       oAuthProviderOptions,
     );
-    const mockRequest = ({
+    const mockRequest = {
       query: {
         scope: 'user',
         env: 'development',
       },
-    } as unknown) as express.Request;
+    } as unknown as express.Request;
 
-    const mockResponse = ({
+    const mockResponse = {
       cookie: jest.fn().mockReturnThis(),
       end: jest.fn().mockReturnThis(),
       setHeader: jest.fn().mockReturnThis(),
       statusCode: jest.fn().mockReturnThis(),
-    } as unknown) as express.Response;
+    } as unknown as express.Response;
 
     await oauthProvider.start(mockRequest, mockResponse);
     // nonce cookie checks
@@ -105,23 +106,24 @@ describe('OAuthAdapter', () => {
     const oauthProvider = new OAuthAdapter(providerInstance, {
       ...oAuthProviderOptions,
       disableRefresh: false,
+      isOriginAllowed: () => false,
     });
 
     const state = { nonce: 'nonce', env: 'development' };
-    const mockRequest = ({
+    const mockRequest = {
       cookies: {
         'test-provider-nonce': 'nonce',
       },
       query: {
         state: encodeState(state),
       },
-    } as unknown) as express.Request;
+    } as unknown as express.Request;
 
-    const mockResponse = ({
+    const mockResponse = {
       cookie: jest.fn().mockReturnThis(),
       setHeader: jest.fn().mockReturnThis(),
       end: jest.fn().mockReturnThis(),
-    } as unknown) as express.Response;
+    } as unknown as express.Response;
 
     await oauthProvider.frameHandler(mockRequest, mockResponse);
     expect(mockResponse.cookie).toHaveBeenCalledTimes(1);
@@ -139,22 +141,23 @@ describe('OAuthAdapter', () => {
     const oauthProvider = new OAuthAdapter(providerInstance, {
       ...oAuthProviderOptions,
       disableRefresh: true,
+      isOriginAllowed: () => false,
     });
 
-    const mockRequest = ({
+    const mockRequest = {
       cookies: {
         'test-provider-nonce': 'nonce',
       },
       query: {
         state: 'nonce',
       },
-    } as unknown) as express.Request;
+    } as unknown as express.Request;
 
-    const mockResponse = ({
+    const mockResponse = {
       cookie: jest.fn().mockReturnThis(),
       setHeader: jest.fn().mockReturnThis(),
       end: jest.fn().mockReturnThis(),
-    } as unknown) as express.Response;
+    } as unknown as express.Response;
 
     await oauthProvider.frameHandler(mockRequest, mockResponse);
     expect(mockResponse.cookie).toHaveBeenCalledTimes(0);
@@ -164,17 +167,18 @@ describe('OAuthAdapter', () => {
     const oauthProvider = new OAuthAdapter(providerInstance, {
       ...oAuthProviderOptions,
       disableRefresh: false,
+      isOriginAllowed: () => false,
     });
 
-    const mockRequest = ({
+    const mockRequest = {
       header: () => 'XMLHttpRequest',
-    } as unknown) as express.Request;
+    } as unknown as express.Request;
 
-    const mockResponse = ({
+    const mockResponse = {
       cookie: jest.fn().mockReturnThis(),
       send: jest.fn().mockReturnThis(),
       status: jest.fn().mockReturnThis(),
-    } as unknown) as express.Response;
+    } as unknown as express.Response;
 
     await oauthProvider.logout(mockRequest, mockResponse);
     expect(mockResponse.cookie).toHaveBeenCalledTimes(1);
@@ -190,20 +194,21 @@ describe('OAuthAdapter', () => {
     const oauthProvider = new OAuthAdapter(providerInstance, {
       ...oAuthProviderOptions,
       disableRefresh: false,
+      isOriginAllowed: () => false,
     });
 
-    const mockRequest = ({
+    const mockRequest = {
       header: () => 'XMLHttpRequest',
       cookies: {
         'test-provider-refresh-token': 'token',
       },
       query: {},
-    } as unknown) as express.Request;
+    } as unknown as express.Request;
 
-    const mockResponse = ({
+    const mockResponse = {
       json: jest.fn().mockReturnThis(),
       status: jest.fn().mockReturnThis(),
-    } as unknown) as express.Response;
+    } as unknown as express.Response;
 
     await oauthProvider.refresh(mockRequest, mockResponse);
     expect(mockResponse.json).toHaveBeenCalledTimes(1);
@@ -220,20 +225,21 @@ describe('OAuthAdapter', () => {
     const oauthProvider = new OAuthAdapter(providerInstance, {
       ...oAuthProviderOptions,
       disableRefresh: true,
+      isOriginAllowed: () => false,
     });
 
-    const mockRequest = ({
+    const mockRequest = {
       header: () => 'XMLHttpRequest',
       cookies: {
         'test-provider-refresh-token': 'token',
       },
       query: {},
-    } as unknown) as express.Request;
+    } as unknown as express.Request;
 
-    const mockResponse = ({
+    const mockResponse = {
       send: jest.fn().mockReturnThis(),
       status: jest.fn().mockReturnThis(),
-    } as unknown) as express.Response;
+    } as unknown as express.Response;
 
     await oauthProvider.refresh(mockRequest, mockResponse);
     expect(mockResponse.send).toHaveBeenCalledTimes(1);
diff --git a/plugins/auth-backend/src/lib/oauth/OAuthAdapter.ts b/plugins/auth-backend/src/lib/oauth/OAuthAdapter.ts
index d9a49e17e8..1f424febf5 100644
--- a/plugins/auth-backend/src/lib/oauth/OAuthAdapter.ts
+++ b/plugins/auth-backend/src/lib/oauth/OAuthAdapter.ts
@@ -22,11 +22,16 @@ import {
   BackstageIdentity,
   AuthProviderConfig,
 } from '../../providers/types';
-import { InputError } from '@backstage/errors';
+import { InputError, NotAllowedError } from '@backstage/errors';
 import { TokenIssuer } from '../../identity/types';
-import { verifyNonce } from './helpers';
+import { readState, verifyNonce } from './helpers';
 import { postMessageResponse, ensuresXRequestedWith } from '../flow';
-import { OAuthHandlers, OAuthStartRequest, OAuthRefreshRequest } from './types';
+import {
+  OAuthHandlers,
+  OAuthStartRequest,
+  OAuthRefreshRequest,
+  OAuthState,
+} from './types';
 
 export const THOUSAND_DAYS_MS = 1000 * 24 * 60 * 60 * 1000;
 export const TEN_MINUTES_MS = 600 * 1000;
@@ -40,6 +45,7 @@ export type Options = {
   cookiePath: string;
   appOrigin: string;
   tokenIssuer: TokenIssuer;
+  isOriginAllowed: (origin: string) => boolean;
 };
 
 export class OAuthAdapter implements AuthProviderRouteHandlers {
@@ -61,6 +67,7 @@ export class OAuthAdapter implements AuthProviderRouteHandlers {
       cookieDomain: url.hostname,
       cookiePath,
       secure,
+      isOriginAllowed: config.isOriginAllowed,
     });
   }
 
@@ -73,6 +80,7 @@ export class OAuthAdapter implements AuthProviderRouteHandlers {
     // retrieve scopes from request
     const scope = req.query.scope?.toString() ?? '';
     const env = req.query.env?.toString();
+    const origin = req.query.origin?.toString();
 
     if (!env) {
       throw new InputError('No env provided in request query parameters');
@@ -86,7 +94,7 @@ export class OAuthAdapter implements AuthProviderRouteHandlers {
     // set a nonce cookie before redirecting to oauth provider
     this.setNonceCookie(res, nonce);
 
-    const state = { nonce: nonce, env: env };
+    const state = { nonce, env, origin };
     const forwardReq = Object.assign(req, { scope, state });
 
     const { url, status } = await this.handlers.start(
@@ -103,7 +111,22 @@ export class OAuthAdapter implements AuthProviderRouteHandlers {
     req: express.Request,
     res: express.Response,
   ): Promise<void> {
+    let appOrigin = this.options.appOrigin;
+
     try {
+      const state: OAuthState = readState(req.query.state?.toString() ?? '');
+
+      if (state.origin) {
+        try {
+          appOrigin = new URL(state.origin).origin;
+        } catch {
+          throw new NotAllowedError('App origin is invalid, failed to parse');
+        }
+        if (!this.options.isOriginAllowed(appOrigin)) {
+          throw new NotAllowedError(`Origin '${appOrigin}' is not allowed`);
+        }
+      }
+
       // verify nonce cookie and state cookie on callback
       verifyNonce(req, this.options.providerId);
 
@@ -117,11 +140,7 @@ export class OAuthAdapter implements AuthProviderRouteHandlers {
         response.providerInfo.scope = grantedScopes;
       }
 
-      if (!this.options.disableRefresh) {
-        if (!refreshToken) {
-          throw new InputError('Missing refresh token');
-        }
-
+      if (refreshToken && !this.options.disableRefresh) {
         // set new refresh token
         this.setRefreshTokenCookie(res, refreshToken);
       }
@@ -129,13 +148,13 @@ export class OAuthAdapter implements AuthProviderRouteHandlers {
       await this.populateIdentity(response.backstageIdentity);
 
       // post message back to popup if successful
-      return postMessageResponse(res, this.options.appOrigin, {
+      return postMessageResponse(res, appOrigin, {
         type: 'authorization_response',
         response,
       });
     } catch (error) {
       // post error message back to popup if failure
-      return postMessageResponse(res, this.options.appOrigin, {
+      return postMessageResponse(res, appOrigin, {
         type: 'authorization_response',
         error: {
           name: error.name,
@@ -151,10 +170,9 @@ export class OAuthAdapter implements AuthProviderRouteHandlers {
       return;
     }
 
-    if (!this.options.disableRefresh) {
-      // remove refresh token cookie before logout
-      this.removeRefreshTokenCookie(res);
-    }
+    // remove refresh token cookie if it is set
+    this.removeRefreshTokenCookie(res);
+
     res.status(200).send('logout!');
   }
 
diff --git a/plugins/auth-backend/src/lib/oauth/helpers.test.ts b/plugins/auth-backend/src/lib/oauth/helpers.test.ts
index 3ef8d74c13..8af1d2f2ad 100644
--- a/plugins/auth-backend/src/lib/oauth/helpers.test.ts
+++ b/plugins/auth-backend/src/lib/oauth/helpers.test.ts
@@ -15,30 +15,60 @@
  */
 
 import express from 'express';
-import { verifyNonce, encodeState } from './helpers';
+import { verifyNonce, encodeState, readState } from './helpers';
 
 describe('OAuthProvider Utils', () => {
+  describe('encodeState', () => {
+    it('should serialized values', () => {
+      const state = {
+        nonce: '123',
+        env: 'development',
+        origin: 'https://example.com',
+      };
+
+      const encoded = encodeState(state);
+      expect(encoded).toBe(
+        Buffer.from(
+          'nonce=123&env=development&origin=https%3A%2F%2Fexample.com',
+        ).toString('hex'),
+      );
+
+      expect(readState(encoded)).toEqual(state);
+    });
+
+    it('should not include undefined values', () => {
+      const state = { nonce: '123', env: 'development', origin: undefined };
+
+      const encoded = encodeState(state);
+      expect(encoded).toBe(
+        Buffer.from('nonce=123&env=development').toString('hex'),
+      );
+
+      expect(readState(encoded)).toEqual(state);
+    });
+  });
+
   describe('verifyNonce', () => {
     it('should throw error if cookie nonce missing', () => {
       const state = { nonce: 'NONCE', env: 'development' };
-      const mockRequest = ({
+      const mockRequest = {
         cookies: {},
         query: {
           state: encodeState(state),
         },
-      } as unknown) as express.Request;
+      } as unknown as express.Request;
       expect(() => {
         verifyNonce(mockRequest, 'providera');
       }).toThrowError('Auth response is missing cookie nonce');
     });
 
     it('should throw error if state nonce missing', () => {
-      const mockRequest = ({
+      const mockRequest = {
         cookies: {
           'providera-nonce': 'NONCE',
         },
         query: {},
-      } as unknown) as express.Request;
+      } as unknown as express.Request;
       expect(() => {
         verifyNonce(mockRequest, 'providera');
       }).toThrowError('Invalid state passed via request');
@@ -46,14 +76,14 @@ describe('OAuthProvider Utils', () => {
 
     it('should throw error if nonce mismatch', () => {
       const state = { nonce: 'NONCEB', env: 'development' };
-      const mockRequest = ({
+      const mockRequest = {
         cookies: {
           'providera-nonce': 'NONCEA',
         },
         query: {
           state: encodeState(state),
         },
-      } as unknown) as express.Request;
+      } as unknown as express.Request;
       expect(() => {
         verifyNonce(mockRequest, 'providera');
       }).toThrowError('Invalid nonce');
@@ -61,14 +91,14 @@ describe('OAuthProvider Utils', () => {
 
     it('should not throw any error if nonce matches', () => {
       const state = { nonce: 'NONCE', env: 'development' };
-      const mockRequest = ({
+      const mockRequest = {
         cookies: {
           'providera-nonce': 'NONCE',
         },
         query: {
           state: encodeState(state),
         },
-      } as unknown) as express.Request;
+      } as unknown as express.Request;
       expect(() => {
         verifyNonce(mockRequest, 'providera');
       }).not.toThrow();
diff --git a/plugins/auth-backend/src/lib/oauth/helpers.ts b/plugins/auth-backend/src/lib/oauth/helpers.ts
index df84d421bd..17e3769d21 100644
--- a/plugins/auth-backend/src/lib/oauth/helpers.ts
+++ b/plugins/auth-backend/src/lib/oauth/helpers.ts
@@ -16,6 +16,7 @@
 
 import express from 'express';
 import { OAuthState } from './types';
+import pickBy from 'lodash/pickBy';
 
 export const readState = (stateString: string): OAuthState => {
   const state = Object.fromEntries(
@@ -29,18 +30,16 @@ export const readState = (stateString: string): OAuthState => {
   ) {
     throw Error(`Invalid state passed via request`);
   }
-  return {
-    nonce: state.nonce,
-    env: state.env,
-  };
+
+  return state as OAuthState;
 };
 
 export const encodeState = (state: OAuthState): string => {
-  const searchParams = new URLSearchParams();
-  searchParams.append('nonce', state.nonce);
-  searchParams.append('env', state.env);
+  const stateString = new URLSearchParams(
+    pickBy(state, value => value !== undefined),
+  ).toString();
 
-  return Buffer.from(searchParams.toString(), 'utf-8').toString('hex');
+  return Buffer.from(stateString, 'utf-8').toString('hex');
 };
 
 export const verifyNonce = (req: express.Request, providerId: string) => {
diff --git a/plugins/auth-backend/src/lib/oauth/types.ts b/plugins/auth-backend/src/lib/oauth/types.ts
index 1c11f8291e..7912dd16a5 100644
--- a/plugins/auth-backend/src/lib/oauth/types.ts
+++ b/plugins/auth-backend/src/lib/oauth/types.ts
@@ -77,6 +77,7 @@ export type OAuthState = {
    */
   nonce: string;
   env: string;
+  origin?: string;
 };
 
 export type OAuthStartRequest = express.Request<{}> & {
@@ -106,9 +107,7 @@ export interface OAuthHandlers {
    * Handles the redirect from the auth provider when the user has signed in.
    * @param {express.Request} req
    */
-  handler(
-    req: express.Request,
-  ): Promise<{
+  handler(req: express.Request): Promise<{
     response: AuthResponse<OAuthProviderInfo>;
     refreshToken?: string;
   }>;
diff --git a/plugins/auth-backend/src/lib/passport/PassportStrategyHelper.test.ts b/plugins/auth-backend/src/lib/passport/PassportStrategyHelper.test.ts
index 48878e9fa6..f7cb500d92 100644
--- a/plugins/auth-backend/src/lib/passport/PassportStrategyHelper.test.ts
+++ b/plugins/auth-backend/src/lib/passport/PassportStrategyHelper.test.ts
@@ -23,7 +23,7 @@ import {
   executeRefreshTokenStrategy,
 } from './PassportStrategyHelper';
 
-const mockRequest = ({} as unknown) as express.Request;
+const mockRequest = {} as unknown as express.Request;
 
 describe('PassportStrategyHelper', () => {
   class MyCustomRedirectStrategy extends passport.Strategy {
diff --git a/plugins/auth-backend/src/lib/passport/PassportStrategyHelper.ts b/plugins/auth-backend/src/lib/passport/PassportStrategyHelper.ts
index 313b4a79bd..6117736e21 100644
--- a/plugins/auth-backend/src/lib/passport/PassportStrategyHelper.ts
+++ b/plugins/auth-backend/src/lib/passport/PassportStrategyHelper.ts
@@ -17,9 +17,11 @@
 import express from 'express';
 import passport from 'passport';
 import jwtDecoder from 'jwt-decode';
-import { ProfileInfo, RedirectInfo } from '../../providers/types';
 import { InternalOAuthError } from 'passport-oauth2';
 
+import { PassportProfile } from './types';
+import { ProfileInfo, RedirectInfo } from '../../providers/types';
+
 export type PassportDoneCallback<Res, Private = never> = (
   err?: Error,
   response?: Res,
@@ -27,11 +29,9 @@ export type PassportDoneCallback<Res, Private = never> = (
 ) => void;
 
 export const makeProfileInfo = (
-  profile: passport.Profile,
+  profile: PassportProfile,
   idToken?: string,
 ): ProfileInfo => {
-  let { displayName } = profile;
-
   let email: string | undefined = undefined;
   if (profile.emails && profile.emails.length > 0) {
     const [firstEmail] = profile.emails;
@@ -39,11 +39,16 @@ export const makeProfileInfo = (
   }
 
   let picture: string | undefined = undefined;
-  if (profile.photos && profile.photos.length > 0) {
+  if (profile.avatarUrl) {
+    picture = profile.avatarUrl;
+  } else if (profile.photos && profile.photos.length > 0) {
     const [firstPhoto] = profile.photos;
     picture = firstPhoto.value;
   }
 
+  let displayName: string | undefined =
+    profile.displayName ?? profile.username ?? profile.id;
+
   if ((!email || !picture || !displayName) && idToken) {
     try {
       const decoded: Record<string, string> = jwtDecoder(idToken);
@@ -193,12 +198,12 @@ type ProviderStrategy = {
 export const executeFetchUserProfileStrategy = async (
   providerStrategy: passport.Strategy,
   accessToken: string,
-): Promise<passport.Profile> => {
+): Promise<PassportProfile> => {
   return new Promise((resolve, reject) => {
-    const anyStrategy = (providerStrategy as unknown) as ProviderStrategy;
+    const anyStrategy = providerStrategy as unknown as ProviderStrategy;
     anyStrategy.userProfile(
       accessToken,
-      (error: Error, rawProfile: passport.Profile) => {
+      (error: Error, rawProfile: PassportProfile) => {
         if (error) {
           reject(error);
         } else {
diff --git a/plugins/auth-backend/src/lib/passport/types.ts b/plugins/auth-backend/src/lib/passport/types.ts
new file mode 100644
index 0000000000..55fe4543fc
--- /dev/null
+++ b/plugins/auth-backend/src/lib/passport/types.ts
@@ -0,0 +1,20 @@
+/*
+ * Copyright 2020 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import passport from 'passport';
+
+export type PassportProfile = passport.Profile & {
+  avatarUrl?: string;
+};
diff --git a/plugins/auth-backend/src/providers/aws-alb/provider.test.ts b/plugins/auth-backend/src/providers/aws-alb/provider.test.ts
index 3785e11d39..a1606e18f2 100644
--- a/plugins/auth-backend/src/providers/aws-alb/provider.test.ts
+++ b/plugins/auth-backend/src/providers/aws-alb/provider.test.ts
@@ -79,22 +79,22 @@ describe('AwsALBAuthProvider', () => {
     getEntityByName: jest.fn(),
   };
 
-  const mockRequest = ({
+  const mockRequest = {
     header: jest.fn(() => {
       return 'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCIsImtpZCI6ImZvbyIsImlzcyI6ImZvbyJ9.eyJzdWIiOiIxMjM0NTY3ODkwIiwibmFtZSI6IkpvaG4gRG9lIiwiaWF0IjoxNTE2MjM5MDIyfQ.T2BNS4G-6RoiFnXc8Q8TiwdWzTpNitY8jcsGM3N3-Yo';
     }),
-  } as unknown) as express.Request;
-  const mockRequestWithoutJwt = ({
+  } as unknown as express.Request;
+  const mockRequestWithoutJwt = {
     header: jest.fn(() => {
       return undefined;
     }),
-  } as unknown) as express.Request;
-  const mockResponse = ({
+  } as unknown as express.Request;
+  const mockResponse = {
     end: jest.fn(),
     header: () => jest.fn(),
     json: jest.fn().mockReturnThis(),
     status: jest.fn(),
-  } as unknown) as express.Response;
+  } as unknown as express.Response;
 
   describe('should transform to type OAuthResponse', () => {
     it('when JWT is valid and identity is resolved successfully', async () => {
diff --git a/plugins/auth-backend/src/providers/github/index.ts b/plugins/auth-backend/src/providers/github/index.ts
index 3e6aff4c24..a855b13b83 100644
--- a/plugins/auth-backend/src/providers/github/index.ts
+++ b/plugins/auth-backend/src/providers/github/index.ts
@@ -15,4 +15,4 @@
  */
 
 export { createGithubProvider } from './provider';
-export type { GithubProviderOptions } from './provider';
+export type { GithubOAuthResult, GithubProviderOptions } from './provider';
diff --git a/plugins/auth-backend/src/providers/github/provider.test.ts b/plugins/auth-backend/src/providers/github/provider.test.ts
index 4e53ce4026..f67c41b461 100644
--- a/plugins/auth-backend/src/providers/github/provider.test.ts
+++ b/plugins/auth-backend/src/providers/github/provider.test.ts
@@ -15,21 +15,47 @@
  */
 
 import { Profile as PassportProfile } from 'passport';
-import { GithubAuthProvider } from './provider';
+import { getVoidLogger } from '@backstage/backend-common';
+import { TokenIssuer } from '../../identity/types';
+import { CatalogIdentityClient } from '../../lib/catalog';
+import {
+  GithubAuthProvider,
+  GithubOAuthResult,
+  githubDefaultSignInResolver,
+} from './provider';
 import * as helpers from '../../lib/passport/PassportStrategyHelper';
-import { OAuthResult } from '../../lib/oauth';
+import { makeProfileInfo } from '../../lib/passport/PassportStrategyHelper';
 
-const mockFrameHandler = (jest.spyOn(
+const mockFrameHandler = jest.spyOn(
   helpers,
   'executeFrameHandlerStrategy',
-) as unknown) as jest.MockedFunction<
+) as unknown as jest.MockedFunction<
   () => Promise<{
-    result: Omit<OAuthResult, 'params'> & { params: { scope: string } };
+    result: GithubOAuthResult;
+    privateInfo: { refreshToken?: string };
   }>
 >;
 
 describe('GithubAuthProvider', () => {
+  const tokenIssuer: TokenIssuer = {
+    listPublicKeys: jest.fn(),
+    async issueToken(params) {
+      return `token-for-${params.claims.sub}`;
+    },
+  };
+  const catalogIdentityClient = {
+    findUser: jest.fn(),
+  };
+
   const provider = new GithubAuthProvider({
+    logger: getVoidLogger(),
+    catalogIdentityClient:
+      catalogIdentityClient as unknown as CatalogIdentityClient,
+    tokenIssuer: tokenIssuer as unknown as TokenIssuer,
+    signInResolver: githubDefaultSignInResolver,
+    authHandler: async ({ fullProfile }) => ({
+      profile: makeProfileInfo(fullProfile),
+    }),
     callbackUrl: 'mock',
     clientId: 'mock',
     clientSecret: 'mock',
@@ -63,11 +89,10 @@ describe('GithubAuthProvider', () => {
       const expected = {
         backstageIdentity: {
           id: 'jimmymarkum',
+          token: 'token-for-jimmymarkum',
         },
         providerInfo: {
           accessToken: '19xasczxcm9n7gacn9jdgm19me',
-          expiresInSeconds: undefined,
-          idToken: undefined,
           scope: 'read:scope',
         },
         profile: {
@@ -80,6 +105,7 @@ describe('GithubAuthProvider', () => {
 
       mockFrameHandler.mockResolvedValueOnce({
         result: { fullProfile, accessToken, params },
+        privateInfo: {},
       });
       const { response } = await provider.handler({} as any);
       expect(response).toEqual(expected);
@@ -87,7 +113,7 @@ describe('GithubAuthProvider', () => {
 
     it('when "email" is missing, it should be able to create the profile without it', async () => {
       const accessToken = '19xasczxcm9n7gacn9jdgm19me';
-      const fullProfile = ({
+      const fullProfile = {
         id: 'uid-123',
         username: 'jimmymarkum',
         provider: 'github',
@@ -99,7 +125,7 @@ describe('GithubAuthProvider', () => {
               'https://a1cf74336522e87f135f-2f21ace9a6cf0052456644b80fa06d4f.ssl.cf2.rackcdn.com/images/characters_opt/p-mystic-river-sean-penn.jpg',
           },
         ],
-      } as unknown) as PassportProfile;
+      } as unknown as PassportProfile;
 
       const params = {
         scope: 'read:scope',
@@ -108,11 +134,10 @@ describe('GithubAuthProvider', () => {
       const expected = {
         backstageIdentity: {
           id: 'jimmymarkum',
+          token: 'token-for-jimmymarkum',
         },
         providerInfo: {
           accessToken: '19xasczxcm9n7gacn9jdgm19me',
-          expiresInSeconds: undefined,
-          idToken: undefined,
           scope: 'read:scope',
         },
         profile: {
@@ -124,6 +149,7 @@ describe('GithubAuthProvider', () => {
 
       mockFrameHandler.mockResolvedValueOnce({
         result: { fullProfile, accessToken, params },
+        privateInfo: {},
       });
       const { response } = await provider.handler({} as any);
       expect(response).toEqual(expected);
@@ -131,7 +157,7 @@ describe('GithubAuthProvider', () => {
 
     it('when "displayName" is missing, it should be able to create the profile and map "displayName" with "username"', async () => {
       const accessToken = '19xasczxcm9n7gacn9jdgm19me';
-      const fullProfile = ({
+      const fullProfile = {
         id: 'uid-123',
         username: 'jimmymarkum',
         provider: 'github',
@@ -143,7 +169,7 @@ describe('GithubAuthProvider', () => {
               'https://a1cf74336522e87f135f-2f21ace9a6cf0052456644b80fa06d4f.ssl.cf2.rackcdn.com/images/characters_opt/p-mystic-river-sean-penn.jpg',
           },
         ],
-      } as unknown) as PassportProfile;
+      } as unknown as PassportProfile;
 
       const params = {
         scope: 'read:scope',
@@ -151,11 +177,10 @@ describe('GithubAuthProvider', () => {
       const expected = {
         backstageIdentity: {
           id: 'jimmymarkum',
+          token: 'token-for-jimmymarkum',
         },
         providerInfo: {
           accessToken: '19xasczxcm9n7gacn9jdgm19me',
-          expiresInSeconds: undefined,
-          idToken: undefined,
           scope: 'read:scope',
         },
         profile: {
@@ -167,6 +192,7 @@ describe('GithubAuthProvider', () => {
 
       mockFrameHandler.mockResolvedValueOnce({
         result: { fullProfile, accessToken, params },
+        privateInfo: {},
       });
       const { response } = await provider.handler({} as any);
       expect(response).toEqual(expected);
@@ -178,11 +204,11 @@ describe('GithubAuthProvider', () => {
       const fullProfile = {
         id: 'ipd12039',
         username: 'daveboyle',
-        provider: 'gitlab',
+        provider: 'github',
         displayName: 'Dave Boyle',
         emails: [
           {
-            value: 'daveboyle@gitlab.org',
+            value: 'daveboyle@github.org',
           },
         ],
       };
@@ -194,25 +220,63 @@ describe('GithubAuthProvider', () => {
       const expected = {
         backstageIdentity: {
           id: 'daveboyle',
+          token: 'token-for-daveboyle',
         },
         providerInfo: {
           accessToken:
             'ajakljsdoiahoawxbrouawucmbawe.awkxjemaneasdxwe.sodijxqeqwexeqwxe',
           scope: 'read:user',
-          expiresInSeconds: undefined,
-          idToken: undefined,
         },
         profile: {
           displayName: 'Dave Boyle',
-          email: 'daveboyle@gitlab.org',
+          email: 'daveboyle@github.org',
         },
       };
 
       mockFrameHandler.mockResolvedValueOnce({
         result: { fullProfile, accessToken, params },
+        privateInfo: {},
       });
       const { response } = await provider.handler({} as any);
       expect(response).toEqual(expected);
     });
+
+    it('should forward a refresh token', async () => {
+      mockFrameHandler.mockResolvedValueOnce({
+        result: {
+          fullProfile: {
+            id: 'ipd12039',
+            provider: 'github',
+            displayName: 'Dave Boyle',
+          },
+          accessToken: 'a.b.c',
+          params: {
+            scope: 'read:user',
+            expires_in: '123',
+          },
+        },
+        privateInfo: { refreshToken: 'refresh-me' },
+      });
+
+      const response = await provider.handler({} as any);
+
+      expect(response).toEqual({
+        response: {
+          backstageIdentity: {
+            id: 'ipd12039',
+            token: 'token-for-ipd12039',
+          },
+          providerInfo: {
+            accessToken: 'a.b.c',
+            scope: 'read:user',
+            expiresInSeconds: 123,
+          },
+          profile: {
+            displayName: 'Dave Boyle',
+          },
+        },
+        refreshToken: 'refresh-me',
+      });
+    });
   });
 });
diff --git a/plugins/auth-backend/src/providers/github/provider.ts b/plugins/auth-backend/src/providers/github/provider.ts
index 62f2534601..b6b198b644 100644
--- a/plugins/auth-backend/src/providers/github/provider.ts
+++ b/plugins/auth-backend/src/providers/github/provider.ts
@@ -15,14 +15,23 @@
  */
 
 import express from 'express';
+import { Logger } from 'winston';
+import { Profile as PassportProfile } from 'passport';
 import { Strategy as GithubStrategy } from 'passport-github2';
 import {
+  executeFetchUserProfileStrategy,
   executeFrameHandlerStrategy,
   executeRedirectStrategy,
+  executeRefreshTokenStrategy,
   makeProfileInfo,
   PassportDoneCallback,
 } from '../../lib/passport';
-import { RedirectInfo, AuthProviderFactory } from '../types';
+import {
+  RedirectInfo,
+  AuthProviderFactory,
+  AuthHandler,
+  SignInResolver,
+} from '../types';
 import {
   OAuthAdapter,
   OAuthProviderOptions,
@@ -30,19 +39,52 @@ import {
   OAuthEnvironmentHandler,
   OAuthStartRequest,
   encodeState,
-  OAuthResult,
+  OAuthRefreshRequest,
+  OAuthResponse,
 } from '../../lib/oauth';
+import { CatalogIdentityClient } from '../../lib/catalog';
+import { TokenIssuer } from '../../identity';
+
+type PrivateInfo = {
+  refreshToken?: string;
+};
+
+export type GithubOAuthResult = {
+  fullProfile: PassportProfile;
+  params: {
+    scope: string;
+    expires_in?: string;
+    refresh_token_expires_in?: string;
+  };
+  accessToken: string;
+  refreshToken?: string;
+};
 
 export type GithubAuthProviderOptions = OAuthProviderOptions & {
   tokenUrl?: string;
   userProfileUrl?: string;
   authorizationUrl?: string;
+  signInResolver?: SignInResolver<GithubOAuthResult>;
+  authHandler: AuthHandler<GithubOAuthResult>;
+  tokenIssuer: TokenIssuer;
+  catalogIdentityClient: CatalogIdentityClient;
+  logger: Logger;
 };
 
 export class GithubAuthProvider implements OAuthHandlers {
   private readonly _strategy: GithubStrategy;
+  private readonly signInResolver?: SignInResolver<GithubOAuthResult>;
+  private readonly authHandler: AuthHandler<GithubOAuthResult>;
+  private readonly tokenIssuer: TokenIssuer;
+  private readonly catalogIdentityClient: CatalogIdentityClient;
+  private readonly logger: Logger;
 
   constructor(options: GithubAuthProviderOptions) {
+    this.signInResolver = options.signInResolver;
+    this.authHandler = options.authHandler;
+    this.tokenIssuer = options.tokenIssuer;
+    this.catalogIdentityClient = options.catalogIdentityClient;
+    this.logger = options.logger;
     this._strategy = new GithubStrategy(
       {
         clientID: options.clientId,
@@ -54,12 +96,12 @@ export class GithubAuthProvider implements OAuthHandlers {
       },
       (
         accessToken: any,
-        _refreshToken: any,
+        refreshToken: any,
         params: any,
         fullProfile: any,
-        done: PassportDoneCallback<OAuthResult>,
+        done: PassportDoneCallback<GithubOAuthResult, PrivateInfo>,
       ) => {
-        done(undefined, { fullProfile, params, accessToken });
+        done(undefined, { fullProfile, params, accessToken }, { refreshToken });
       },
     );
   }
@@ -72,42 +114,109 @@ export class GithubAuthProvider implements OAuthHandlers {
   }
 
   async handler(req: express.Request) {
-    const {
-      result: { fullProfile, accessToken, params },
-    } = await executeFrameHandlerStrategy<OAuthResult>(req, this._strategy);
-
-    const profile = makeProfileInfo(
-      {
-        ...fullProfile,
-        id: fullProfile.username || fullProfile.id,
-        displayName:
-          fullProfile.displayName || fullProfile.username || fullProfile.id,
-      },
-      params.id_token,
-    );
+    const { result, privateInfo } = await executeFrameHandlerStrategy<
+      GithubOAuthResult,
+      PrivateInfo
+    >(req, this._strategy);
 
     return {
-      response: {
-        profile,
-        providerInfo: {
-          accessToken,
-          scope: params.scope,
-          expiresInSeconds: params.expires_in,
-        },
-        backstageIdentity: {
-          id: fullProfile.username || fullProfile.id,
-        },
-      },
+      response: await this.handleResult(result),
+      refreshToken: privateInfo.refreshToken,
     };
   }
+
+  async refresh(req: OAuthRefreshRequest): Promise<OAuthResponse> {
+    const { accessToken, params } = await executeRefreshTokenStrategy(
+      this._strategy,
+      req.refreshToken,
+      req.scope,
+    );
+    const fullProfile = await executeFetchUserProfileStrategy(
+      this._strategy,
+      accessToken,
+    );
+    return this.handleResult({
+      fullProfile,
+      params,
+      accessToken,
+      refreshToken: req.refreshToken,
+    });
+  }
+
+  private async handleResult(result: GithubOAuthResult) {
+    const { profile } = await this.authHandler(result);
+
+    const expiresInStr = result.params.expires_in;
+    const response: OAuthResponse = {
+      providerInfo: {
+        accessToken: result.accessToken,
+        scope: result.params.scope,
+        expiresInSeconds:
+          expiresInStr === undefined ? undefined : Number(expiresInStr),
+      },
+      profile,
+    };
+
+    if (this.signInResolver) {
+      response.backstageIdentity = await this.signInResolver(
+        {
+          result,
+          profile,
+        },
+        {
+          tokenIssuer: this.tokenIssuer,
+          catalogIdentityClient: this.catalogIdentityClient,
+          logger: this.logger,
+        },
+      );
+    }
+
+    return response;
+  }
 }
 
-export type GithubProviderOptions = {};
+export const githubDefaultSignInResolver: SignInResolver<GithubOAuthResult> =
+  async (info, ctx) => {
+    const { fullProfile } = info.result;
+
+    const userId = fullProfile.username || fullProfile.id;
+
+    const token = await ctx.tokenIssuer.issueToken({
+      claims: { sub: userId, ent: [`user:default/${userId}`] },
+    });
+
+    return { id: userId, token };
+  };
+
+export type GithubProviderOptions = {
+  /**
+   * The profile transformation function used to verify and convert the auth response
+   * into the profile that will be presented to the user.
+   */
+  authHandler?: AuthHandler<GithubOAuthResult>;
+
+  /**
+   * Configure sign-in for this provider, without it the provider can not be used to sign users in.
+   */
+  signIn?: {
+    /**
+     * Maps an auth result to a Backstage identity for the user.
+     */
+    resolver?: SignInResolver<GithubOAuthResult>;
+  };
+};
 
 export const createGithubProvider = (
-  _options?: GithubProviderOptions,
+  options?: GithubProviderOptions,
 ): AuthProviderFactory => {
-  return ({ providerId, globalConfig, config, tokenIssuer }) =>
+  return ({
+    providerId,
+    globalConfig,
+    config,
+    tokenIssuer,
+    catalogApi,
+    logger,
+  }) =>
     OAuthEnvironmentHandler.mapConfig(config, envConfig => {
       const clientId = envConfig.getString('clientId');
       const clientSecret = envConfig.getString('clientSecret');
@@ -125,6 +234,27 @@ export const createGithubProvider = (
         : undefined;
       const callbackUrl = `${globalConfig.baseUrl}/${providerId}/handler/frame`;
 
+      const catalogIdentityClient = new CatalogIdentityClient({
+        catalogApi,
+        tokenIssuer,
+      });
+
+      const authHandler: AuthHandler<GithubOAuthResult> = options?.authHandler
+        ? options.authHandler
+        : async ({ fullProfile }) => ({
+            profile: makeProfileInfo(fullProfile),
+          });
+
+      const signInResolverFn =
+        options?.signIn?.resolver ?? githubDefaultSignInResolver;
+
+      const signInResolver: SignInResolver<GithubOAuthResult> = info =>
+        signInResolverFn(info, {
+          catalogIdentityClient,
+          tokenIssuer,
+          logger,
+        });
+
       const provider = new GithubAuthProvider({
         clientId,
         clientSecret,
@@ -132,10 +262,14 @@ export const createGithubProvider = (
         tokenUrl,
         userProfileUrl,
         authorizationUrl,
+        signInResolver,
+        authHandler,
+        tokenIssuer,
+        catalogIdentityClient,
+        logger,
       });
 
       return OAuthAdapter.fromConfig(globalConfig, provider, {
-        disableRefresh: true,
         persistScopes: true,
         providerId,
         tokenIssuer,
diff --git a/plugins/auth-backend/src/providers/gitlab/provider.test.ts b/plugins/auth-backend/src/providers/gitlab/provider.test.ts
index 2277515cc9..d1a84b43e8 100644
--- a/plugins/auth-backend/src/providers/gitlab/provider.test.ts
+++ b/plugins/auth-backend/src/providers/gitlab/provider.test.ts
@@ -14,16 +14,47 @@
  * limitations under the License.
  */
 
-import { GitlabAuthProvider } from './provider';
+import { GitlabAuthProvider, gitlabDefaultSignInResolver } from './provider';
 import * as helpers from '../../lib/passport/PassportStrategyHelper';
+import { PassportProfile } from '../../lib/passport/types';
 import { OAuthResult } from '../../lib/oauth';
+import { getVoidLogger } from '@backstage/backend-common';
+import { TokenIssuer } from '../../identity';
+import { CatalogIdentityClient } from '../../lib/catalog';
 
-const mockFrameHandler = (jest.spyOn(
+const mockFrameHandler = jest.spyOn(
   helpers,
   'executeFrameHandlerStrategy',
-) as unknown) as jest.MockedFunction<() => Promise<{ result: OAuthResult }>>;
+) as unknown as jest.MockedFunction<() => Promise<{ result: OAuthResult }>>;
 
 describe('GitlabAuthProvider', () => {
+  const tokenIssuer = {
+    issueToken: jest.fn(),
+    listPublicKeys: jest.fn(),
+  };
+  const catalogIdentityClient = {
+    findUser: jest.fn(),
+  };
+
+  const provider = new GitlabAuthProvider({
+    clientId: 'mock',
+    clientSecret: 'mock',
+    callbackUrl: 'mock',
+    baseUrl: 'mock',
+    catalogIdentityClient:
+      catalogIdentityClient as unknown as CatalogIdentityClient,
+    tokenIssuer: tokenIssuer as unknown as TokenIssuer,
+    authHandler: async ({ fullProfile }) => ({
+      profile: {
+        email: fullProfile.emails![0]!.value,
+        displayName: fullProfile.displayName,
+        picture: 'http://gitlab.com/lols',
+      },
+    }),
+    signInResolver: gitlabDefaultSignInResolver,
+    logger: getVoidLogger(),
+  });
+
   it('should transform to type OAuthResponse', async () => {
     const tests = [
       {
@@ -60,12 +91,12 @@ describe('GitlabAuthProvider', () => {
             accessToken: '19xasczxcm9n7gacn9jdgm19me',
             expiresInSeconds: 100,
             scope: 'user_read write_repository',
+            idToken: undefined,
           },
           profile: {
             email: 'jimmymarkum@gmail.com',
             displayName: 'Jimmy Markum',
-            picture:
-              'https://a1cf74336522e87f135f-2f21ace9a6cf0052456644b80fa06d4f.ssl.cf2.rackcdn.com/images/characters_opt/p-mystic-river-sean-penn.jpg',
+            picture: 'http://gitlab.com/lols',
           },
         },
       },
@@ -102,26 +133,74 @@ describe('GitlabAuthProvider', () => {
             accessToken:
               'ajakljsdoiahoawxbrouawucmbawe.awkxjemaneasdxwe.sodijxqeqwexeqwxe',
             expiresInSeconds: 200,
+            idToken: undefined,
             scope: 'read_repository',
           },
           profile: {
             displayName: 'Dave Boyle',
             email: 'daveboyle@gitlab.org',
+            picture: 'http://gitlab.com/lols',
           },
         },
       },
     ];
 
-    const provider = new GitlabAuthProvider({
-      clientId: 'mock',
-      clientSecret: 'mock',
-      callbackUrl: 'mock',
-      baseUrl: 'mock',
-    });
     for (const test of tests) {
       mockFrameHandler.mockResolvedValueOnce(test.input);
       const { response } = await provider.handler({} as any);
       expect(response).toEqual(test.expect);
     }
   });
+
+  it('should forward a new refresh token on refresh', async () => {
+    const mockRefreshToken = jest.spyOn(
+      helpers,
+      'executeRefreshTokenStrategy',
+    ) as unknown as jest.MockedFunction<() => Promise<{}>>;
+
+    mockRefreshToken.mockResolvedValueOnce({
+      accessToken: 'a.b.c',
+      refreshToken: 'dont-forget-to-send-refresh',
+      params: {
+        id_token: 'my-id',
+        scope: 'read_user',
+      },
+    });
+
+    const mockUserProfile = jest.spyOn(
+      helpers,
+      'executeFetchUserProfileStrategy',
+    ) as unknown as jest.MockedFunction<() => Promise<PassportProfile>>;
+
+    mockUserProfile.mockResolvedValueOnce({
+      id: 'uid-my-id',
+      username: 'mockuser',
+      provider: 'gitlab',
+      displayName: 'Mocked User',
+      emails: [
+        {
+          value: 'mockuser@gmail.com',
+        },
+      ],
+    });
+
+    const response = await provider.refresh({} as any);
+
+    expect(response).toEqual({
+      backstageIdentity: {
+        id: 'mockuser',
+      },
+      profile: {
+        displayName: 'Mocked User',
+        email: 'mockuser@gmail.com',
+        picture: 'http://gitlab.com/lols',
+      },
+      providerInfo: {
+        accessToken: 'a.b.c',
+        idToken: 'my-id',
+        refreshToken: 'dont-forget-to-send-refresh',
+        scope: 'read_user',
+      },
+    });
+  });
 });
diff --git a/plugins/auth-backend/src/providers/gitlab/provider.ts b/plugins/auth-backend/src/providers/gitlab/provider.ts
index 606d2c76a6..6ca405d15f 100644
--- a/plugins/auth-backend/src/providers/gitlab/provider.ts
+++ b/plugins/auth-backend/src/providers/gitlab/provider.ts
@@ -16,6 +16,8 @@
 
 import express from 'express';
 import { Strategy as GitlabStrategy } from 'passport-gitlab2';
+import { Logger } from 'winston';
+
 import {
   executeRedirectStrategy,
   executeFrameHandlerStrategy,
@@ -24,7 +26,12 @@ import {
   makeProfileInfo,
   PassportDoneCallback,
 } from '../../lib/passport';
-import { RedirectInfo, AuthProviderFactory } from '../types';
+import {
+  RedirectInfo,
+  AuthProviderFactory,
+  SignInResolver,
+  AuthHandler,
+} from '../types';
 import {
   OAuthAdapter,
   OAuthProviderOptions,
@@ -36,10 +43,8 @@ import {
   encodeState,
   OAuthResult,
 } from '../../lib/oauth';
-
-type FullProfile = OAuthResult['fullProfile'] & {
-  avatarUrl?: string;
-};
+import { TokenIssuer } from '../../identity';
+import { CatalogIdentityClient } from '../../lib/catalog';
 
 type PrivateInfo = {
   refreshToken: string;
@@ -47,29 +52,54 @@ type PrivateInfo = {
 
 export type GitlabAuthProviderOptions = OAuthProviderOptions & {
   baseUrl: string;
+  signInResolver?: SignInResolver<OAuthResult>;
+  authHandler: AuthHandler<OAuthResult>;
+  tokenIssuer: TokenIssuer;
+  catalogIdentityClient: CatalogIdentityClient;
+  logger: Logger;
 };
 
-function transformProfile(fullProfile: FullProfile) {
-  const profile = makeProfileInfo({
-    ...fullProfile,
-    photos: [
-      ...(fullProfile.photos ?? []),
-      ...(fullProfile.avatarUrl ? [{ value: fullProfile.avatarUrl }] : []),
-    ],
-  });
+export const gitlabDefaultSignInResolver: SignInResolver<OAuthResult> = async (
+  info,
+  ctx,
+) => {
+  const { profile, result } = info;
+
+  let id = result.fullProfile.id;
 
-  let id = fullProfile.id;
   if (profile.email) {
     id = profile.email.split('@')[0];
   }
 
-  return { id, profile };
-}
+  const token = await ctx.tokenIssuer.issueToken({
+    claims: { sub: id, ent: [`user:default/${id}`] },
+  });
+
+  return { id, token };
+};
+
+export const gitlabDefaultAuthHandler: AuthHandler<OAuthResult> = async ({
+  fullProfile,
+  params,
+}) => ({
+  profile: makeProfileInfo(fullProfile, params.id_token),
+});
 
 export class GitlabAuthProvider implements OAuthHandlers {
   private readonly _strategy: GitlabStrategy;
+  private readonly signInResolver?: SignInResolver<OAuthResult>;
+  private readonly authHandler: AuthHandler<OAuthResult>;
+  private readonly tokenIssuer: TokenIssuer;
+  private readonly catalogIdentityClient: CatalogIdentityClient;
+  private readonly logger: Logger;
 
   constructor(options: GitlabAuthProviderOptions) {
+    this.catalogIdentityClient = options.catalogIdentityClient;
+    this.logger = options.logger;
+    this.tokenIssuer = options.tokenIssuer;
+    this.authHandler = options.authHandler;
+    this.signInResolver = options.signInResolver;
+
     this._strategy = new GitlabStrategy(
       {
         clientID: options.clientId,
@@ -109,23 +139,9 @@ export class GitlabAuthProvider implements OAuthHandlers {
       OAuthResult,
       PrivateInfo
     >(req, this._strategy);
-    const { accessToken, params } = result;
-
-    const { id, profile } = transformProfile(result.fullProfile);
 
     return {
-      response: {
-        profile,
-        providerInfo: {
-          accessToken,
-          scope: params.scope,
-          expiresInSeconds: params.expires_in,
-          idToken: params.id_token,
-        },
-        backstageIdentity: {
-          id,
-        },
-      },
+      response: await this.handleResult(result),
       refreshToken: privateInfo.refreshToken,
     };
   }
@@ -145,30 +161,79 @@ export class GitlabAuthProvider implements OAuthHandlers {
       this._strategy,
       accessToken,
     );
-    const { id, profile } = transformProfile(fullProfile);
 
-    return {
-      profile,
+    return this.handleResult({
+      fullProfile,
+      params,
+      accessToken,
+      refreshToken: newRefreshToken,
+    });
+  }
+
+  private async handleResult(result: OAuthResult): Promise<OAuthResponse> {
+    const { profile } = await this.authHandler(result);
+
+    const response: OAuthResponse = {
       providerInfo: {
-        accessToken,
-        refreshToken: newRefreshToken, // GitLab expires the old refresh token when used
-        idToken: params.id_token,
-        expiresInSeconds: params.expires_in,
-        scope: params.scope,
-      },
-      backstageIdentity: {
-        id,
+        idToken: result.params.id_token,
+        accessToken: result.accessToken,
+        refreshToken: result.refreshToken, // GitLab expires the old refresh token when used
+        scope: result.params.scope,
+        expiresInSeconds: result.params.expires_in,
       },
+      profile,
     };
+
+    if (this.signInResolver) {
+      response.backstageIdentity = await this.signInResolver(
+        {
+          result,
+          profile,
+        },
+        {
+          tokenIssuer: this.tokenIssuer,
+          catalogIdentityClient: this.catalogIdentityClient,
+          logger: this.logger,
+        },
+      );
+    }
+
+    return response;
   }
 }
 
-export type GitlabProviderOptions = {};
+export type GitlabProviderOptions = {
+  /**
+   * The profile transformation function used to verify and convert the auth response
+   * into the profile that will be presented to the user.
+   */
+  authHandler?: AuthHandler<OAuthResult>;
+
+  /**
+   * Configure sign-in for this provider, without it the provider can not be used to sign users in.
+   */
+  /**
+   * Maps an auth result to a Backstage identity for the user.
+   *
+   * Set to `'email'` to use the default email-based sign in resolver, which will search
+   * the catalog for a single user entity that has a matching `microsoft.com/email` annotation.
+   */
+  signIn?: {
+    resolver?: SignInResolver<OAuthResult>;
+  };
+};
 
 export const createGitlabProvider = (
-  _options?: GitlabProviderOptions,
+  options?: GitlabProviderOptions,
 ): AuthProviderFactory => {
-  return ({ providerId, globalConfig, config, tokenIssuer }) =>
+  return ({
+    providerId,
+    globalConfig,
+    config,
+    tokenIssuer,
+    catalogApi,
+    logger,
+  }) =>
     OAuthEnvironmentHandler.mapConfig(config, envConfig => {
       const clientId = envConfig.getString('clientId');
       const clientSecret = envConfig.getString('clientSecret');
@@ -176,11 +241,34 @@ export const createGitlabProvider = (
       const baseUrl = audience || 'https://gitlab.com';
       const callbackUrl = `${globalConfig.baseUrl}/${providerId}/handler/frame`;
 
+      const catalogIdentityClient = new CatalogIdentityClient({
+        catalogApi,
+        tokenIssuer,
+      });
+
+      const authHandler: AuthHandler<OAuthResult> =
+        options?.authHandler ?? gitlabDefaultAuthHandler;
+
+      const signInResolverFn =
+        options?.signIn?.resolver ?? gitlabDefaultSignInResolver;
+
+      const signInResolver: SignInResolver<OAuthResult> = info =>
+        signInResolverFn(info, {
+          catalogIdentityClient,
+          tokenIssuer,
+          logger,
+        });
+
       const provider = new GitlabAuthProvider({
         clientId,
         clientSecret,
         callbackUrl,
         baseUrl,
+        authHandler,
+        signInResolver,
+        catalogIdentityClient,
+        logger,
+        tokenIssuer,
       });
 
       return OAuthAdapter.fromConfig(globalConfig, provider, {
diff --git a/plugins/auth-backend/src/providers/google/provider.test.ts b/plugins/auth-backend/src/providers/google/provider.test.ts
index 68279dc2dd..a69a7b0485 100644
--- a/plugins/auth-backend/src/providers/google/provider.test.ts
+++ b/plugins/auth-backend/src/providers/google/provider.test.ts
@@ -21,10 +21,10 @@ import { getVoidLogger } from '@backstage/backend-common';
 import { TokenIssuer } from '../../identity/types';
 import { CatalogIdentityClient } from '../../lib/catalog';
 
-const mockFrameHandler = (jest.spyOn(
+const mockFrameHandler = jest.spyOn(
   helpers,
   'executeFrameHandlerStrategy',
-) as unknown) as jest.MockedFunction<
+) as unknown as jest.MockedFunction<
   () => Promise<{ result: OAuthResult; privateInfo: any }>
 >;
 
@@ -40,8 +40,9 @@ describe('createGoogleProvider', () => {
 
     const provider = new GoogleAuthProvider({
       logger: getVoidLogger(),
-      catalogIdentityClient: (catalogIdentityClient as unknown) as CatalogIdentityClient,
-      tokenIssuer: (tokenIssuer as unknown) as TokenIssuer,
+      catalogIdentityClient:
+        catalogIdentityClient as unknown as CatalogIdentityClient,
+      tokenIssuer: tokenIssuer as unknown as TokenIssuer,
       authHandler: async ({ fullProfile }) => ({
         profile: {
           email: fullProfile.emails![0]!.value,
diff --git a/plugins/auth-backend/src/providers/google/provider.ts b/plugins/auth-backend/src/providers/google/provider.ts
index e934a94c48..d85fc2de2d 100644
--- a/plugins/auth-backend/src/providers/google/provider.ts
+++ b/plugins/auth-backend/src/providers/google/provider.ts
@@ -240,13 +240,10 @@ export type GoogleProviderOptions = {
   /**
    * Configure sign-in for this provider, without it the provider can not be used to sign users in.
    */
-  /**
-   * Maps an auth result to a Backstage identity for the user.
-   *
-   * Set to `'email'` to use the default email-based sign in resolver, which will search
-   * the catalog for a single user entity that has a matching `google.com/email` annotation.
-   */
   signIn?: {
+    /**
+     * Maps an auth result to a Backstage identity for the user.
+     */
     resolver?: SignInResolver<OAuthResult>;
   };
 };
diff --git a/plugins/auth-backend/src/providers/index.ts b/plugins/auth-backend/src/providers/index.ts
index 6b262dcf68..1f879b311b 100644
--- a/plugins/auth-backend/src/providers/index.ts
+++ b/plugins/auth-backend/src/providers/index.ts
@@ -14,8 +14,13 @@
  * limitations under the License.
  */
 
+export * from './github';
+export * from './gitlab';
 export * from './google';
 export * from './microsoft';
+export * from './oauth2';
+export * from './okta';
+
 export { factories as defaultAuthProviderFactories } from './factories';
 
 // Export the minimal interface required for implementing a
diff --git a/plugins/auth-backend/src/providers/microsoft/provider.test.ts b/plugins/auth-backend/src/providers/microsoft/provider.test.ts
index c979bed582..429e6691b6 100644
--- a/plugins/auth-backend/src/providers/microsoft/provider.test.ts
+++ b/plugins/auth-backend/src/providers/microsoft/provider.test.ts
@@ -21,10 +21,10 @@ import { getVoidLogger } from '@backstage/backend-common';
 import { TokenIssuer } from '../../identity/types';
 import { CatalogIdentityClient } from '../../lib/catalog';
 
-const mockFrameHandler = (jest.spyOn(
+const mockFrameHandler = jest.spyOn(
   helpers,
   'executeFrameHandlerStrategy',
-) as unknown) as jest.MockedFunction<
+) as unknown as jest.MockedFunction<
   () => Promise<{ result: OAuthResult; privateInfo: any }>
 >;
 
@@ -40,8 +40,9 @@ describe('createMicrosoftProvider', () => {
 
     const provider = new MicrosoftAuthProvider({
       logger: getVoidLogger(),
-      catalogIdentityClient: (catalogIdentityClient as unknown) as CatalogIdentityClient,
-      tokenIssuer: (tokenIssuer as unknown) as TokenIssuer,
+      catalogIdentityClient:
+        catalogIdentityClient as unknown as CatalogIdentityClient,
+      tokenIssuer: tokenIssuer as unknown as TokenIssuer,
       authHandler: async ({ fullProfile }) => ({
         profile: {
           email: fullProfile.emails![0]!.value,
diff --git a/plugins/auth-backend/src/providers/microsoft/provider.ts b/plugins/auth-backend/src/providers/microsoft/provider.ts
index 633844a351..2dc259fe74 100644
--- a/plugins/auth-backend/src/providers/microsoft/provider.ts
+++ b/plugins/auth-backend/src/providers/microsoft/provider.ts
@@ -220,24 +220,22 @@ export const microsoftEmailSignInResolver: SignInResolver<OAuthResult> = async (
   return { id: entity.metadata.name, entity, token };
 };
 
-export const microsoftDefaultSignInResolver: SignInResolver<OAuthResult> = async (
-  info,
-  ctx,
-) => {
-  const { profile } = info;
+export const microsoftDefaultSignInResolver: SignInResolver<OAuthResult> =
+  async (info, ctx) => {
+    const { profile } = info;
 
-  if (!profile.email) {
-    throw new Error('Profile contained no email');
-  }
+    if (!profile.email) {
+      throw new Error('Profile contained no email');
+    }
 
-  const userId = profile.email.split('@')[0];
+    const userId = profile.email.split('@')[0];
 
-  const token = await ctx.tokenIssuer.issueToken({
-    claims: { sub: userId, ent: [`user:default/${userId}`] },
-  });
+    const token = await ctx.tokenIssuer.issueToken({
+      claims: { sub: userId, ent: [`user:default/${userId}`] },
+    });
 
-  return { id: userId, token };
-};
+    return { id: userId, token };
+  };
 
 export type MicrosoftProviderOptions = {
   /**
@@ -249,13 +247,10 @@ export type MicrosoftProviderOptions = {
   /**
    * Configure sign-in for this provider, without it the provider can not be used to sign users in.
    */
-  /**
-   * Maps an auth result to a Backstage identity for the user.
-   *
-   * Set to `'email'` to use the default email-based sign in resolver, which will search
-   * the catalog for a single user entity that has a matching `microsoft.com/email` annotation.
-   */
   signIn?: {
+    /**
+     * Maps an auth result to a Backstage identity for the user.
+     */
     resolver?: SignInResolver<OAuthResult>;
   };
 };
diff --git a/plugins/auth-backend/src/providers/oauth2/provider.test.ts b/plugins/auth-backend/src/providers/oauth2/provider.test.ts
new file mode 100644
index 0000000000..7030d91343
--- /dev/null
+++ b/plugins/auth-backend/src/providers/oauth2/provider.test.ts
@@ -0,0 +1,94 @@
+/*
+ * Copyright 2020 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { OAuth2AuthProvider } from './provider';
+import * as helpers from '../../lib/passport/PassportStrategyHelper';
+import { OAuthResult } from '../../lib/oauth';
+import { getVoidLogger } from '@backstage/backend-common';
+import { TokenIssuer } from '../../identity/types';
+import { CatalogIdentityClient } from '../../lib/catalog';
+
+const mockFrameHandler = jest.spyOn(
+  helpers,
+  'executeFrameHandlerStrategy',
+) as unknown as jest.MockedFunction<
+  () => Promise<{ result: OAuthResult; privateInfo: any }>
+>;
+
+describe('createOAuth2Provider', () => {
+  it('should auth', async () => {
+    const tokenIssuer = {
+      issueToken: jest.fn(),
+      listPublicKeys: jest.fn(),
+    };
+    const catalogIdentityClient = {
+      findUser: jest.fn(),
+    };
+
+    const provider = new OAuth2AuthProvider({
+      logger: getVoidLogger(),
+      catalogIdentityClient:
+        catalogIdentityClient as unknown as CatalogIdentityClient,
+      tokenIssuer: tokenIssuer as unknown as TokenIssuer,
+      authHandler: async ({ fullProfile }) => ({
+        profile: {
+          email: fullProfile.emails![0]!.value,
+          displayName: fullProfile.displayName,
+          picture: 'http://backstage.io/lols',
+        },
+      }),
+      clientId: 'mock',
+      clientSecret: 'mock',
+      callbackUrl: 'mock',
+      authorizationUrl: 'mock',
+      tokenUrl: 'mock',
+    });
+
+    mockFrameHandler.mockResolvedValueOnce({
+      result: {
+        fullProfile: {
+          emails: [{ value: 'conrad@example.com' }],
+          displayName: 'Conrad',
+          id: 'conrad',
+          provider: 'oAuth2',
+        },
+        params: {
+          id_token: 'idToken',
+          scope: 'scope',
+          expires_in: 123,
+        },
+        accessToken: 'accessToken',
+      },
+      privateInfo: {
+        refreshToken: 'wacka',
+      },
+    });
+    const { response } = await provider.handler({} as any);
+    expect(response).toEqual({
+      providerInfo: {
+        accessToken: 'accessToken',
+        expiresInSeconds: 123,
+        idToken: 'idToken',
+        scope: 'scope',
+      },
+      profile: {
+        email: 'conrad@example.com',
+        displayName: 'Conrad',
+        picture: 'http://backstage.io/lols',
+      },
+    });
+  });
+});
diff --git a/plugins/auth-backend/src/providers/oauth2/provider.ts b/plugins/auth-backend/src/providers/oauth2/provider.ts
index f174543a63..36e2f6ed99 100644
--- a/plugins/auth-backend/src/providers/oauth2/provider.ts
+++ b/plugins/auth-backend/src/providers/oauth2/provider.ts
@@ -18,15 +18,15 @@ import express from 'express';
 import passport from 'passport';
 import { Strategy as OAuth2Strategy } from 'passport-oauth2';
 import {
-  OAuthAdapter,
-  OAuthProviderOptions,
-  OAuthHandlers,
-  OAuthResponse,
-  OAuthEnvironmentHandler,
-  OAuthStartRequest,
   encodeState,
+  OAuthAdapter,
+  OAuthEnvironmentHandler,
+  OAuthHandlers,
+  OAuthProviderOptions,
   OAuthRefreshRequest,
+  OAuthResponse,
   OAuthResult,
+  OAuthStartRequest,
 } from '../../lib/oauth';
 import {
   executeFetchUserProfileStrategy,
@@ -36,22 +36,46 @@ import {
   makeProfileInfo,
   PassportDoneCallback,
 } from '../../lib/passport';
-import { RedirectInfo, AuthProviderFactory } from '../types';
+import {
+  AuthHandler,
+  AuthProviderFactory,
+  RedirectInfo,
+  SignInResolver,
+} from '../types';
+import { CatalogIdentityClient } from '../../lib/catalog';
+import { TokenIssuer } from '../../identity';
+import { Logger } from 'winston';
 
 type PrivateInfo = {
   refreshToken: string;
 };
 
 export type OAuth2AuthProviderOptions = OAuthProviderOptions & {
+  signInResolver?: SignInResolver<OAuthResult>;
+  authHandler: AuthHandler<OAuthResult>;
+  tokenIssuer: TokenIssuer;
+  catalogIdentityClient: CatalogIdentityClient;
   authorizationUrl: string;
   tokenUrl: string;
   scope?: string;
+  logger: Logger;
 };
 
 export class OAuth2AuthProvider implements OAuthHandlers {
   private readonly _strategy: OAuth2Strategy;
+  private readonly signInResolver?: SignInResolver<OAuthResult>;
+  private readonly authHandler: AuthHandler<OAuthResult>;
+  private readonly tokenIssuer: TokenIssuer;
+  private readonly catalogIdentityClient: CatalogIdentityClient;
+  private readonly logger: Logger;
 
   constructor(options: OAuth2AuthProviderOptions) {
+    this.signInResolver = options.signInResolver;
+    this.authHandler = options.authHandler;
+    this.tokenIssuer = options.tokenIssuer;
+    this.catalogIdentityClient = options.catalogIdentityClient;
+    this.logger = options.logger;
+
     this._strategy = new OAuth2Strategy(
       {
         clientID: options.clientId,
@@ -102,18 +126,8 @@ export class OAuth2AuthProvider implements OAuthHandlers {
       PrivateInfo
     >(req, this._strategy);
 
-    const profile = makeProfileInfo(result.fullProfile, result.params.id_token);
-
     return {
-      response: await this.populateIdentity({
-        profile,
-        providerInfo: {
-          idToken: result.params.id_token,
-          accessToken: result.accessToken,
-          scope: result.params.scope,
-          expiresInSeconds: result.params.expires_in,
-        },
-      }),
+      response: await this.handleResult(result),
       refreshToken: privateInfo.refreshToken,
     };
   }
@@ -130,46 +144,88 @@ export class OAuth2AuthProvider implements OAuthHandlers {
       refreshToken: updatedRefreshToken,
     } = refreshTokenResponse;
 
-    const rawProfile = await executeFetchUserProfileStrategy(
+    const fullProfile = await executeFetchUserProfileStrategy(
       this._strategy,
       accessToken,
     );
-    const profile = makeProfileInfo(rawProfile, params.id_token);
 
-    return this.populateIdentity({
-      providerInfo: {
-        accessToken,
-        refreshToken: updatedRefreshToken,
-        idToken: params.id_token,
-        expiresInSeconds: params.expires_in,
-        scope: params.scope,
-      },
-      profile,
+    return this.handleResult({
+      fullProfile,
+      params,
+      accessToken,
+      refreshToken: updatedRefreshToken,
     });
   }
 
-  // Use this function to grab the user profile info from the token
-  // Then populate the profile with it
-  private async populateIdentity(
-    response: OAuthResponse,
-  ): Promise<OAuthResponse> {
-    const { profile } = response;
+  private async handleResult(result: OAuthResult) {
+    const { profile } = await this.authHandler(result);
 
-    if (!profile.email) {
-      throw new Error('Profile does not contain an email');
+    const response: OAuthResponse = {
+      providerInfo: {
+        idToken: result.params.id_token,
+        accessToken: result.accessToken,
+        scope: result.params.scope,
+        expiresInSeconds: result.params.expires_in,
+      },
+      profile,
+    };
+
+    if (this.signInResolver) {
+      response.backstageIdentity = await this.signInResolver(
+        {
+          result,
+          profile,
+        },
+        {
+          tokenIssuer: this.tokenIssuer,
+          catalogIdentityClient: this.catalogIdentityClient,
+          logger: this.logger,
+        },
+      );
     }
-    const id = profile.email.split('@')[0];
 
-    return { ...response, backstageIdentity: { id } };
+    return response;
   }
 }
 
-export type OAuth2ProviderOptions = {};
+export const oAuth2DefaultSignInResolver: SignInResolver<OAuthResult> = async (
+  info,
+  ctx,
+) => {
+  const { profile } = info;
+
+  if (!profile.email) {
+    throw new Error('Profile contained no email');
+  }
+
+  const userId = profile.email.split('@')[0];
+
+  const token = await ctx.tokenIssuer.issueToken({
+    claims: { sub: userId, ent: [`user:default/${userId}`] },
+  });
+
+  return { id: userId, token };
+};
+
+export type OAuth2ProviderOptions = {
+  authHandler?: AuthHandler<OAuthResult>;
+
+  signIn?: {
+    resolver?: SignInResolver<OAuthResult>;
+  };
+};
 
 export const createOAuth2Provider = (
-  _options?: OAuth2ProviderOptions,
+  options?: OAuth2ProviderOptions,
 ): AuthProviderFactory => {
-  return ({ providerId, globalConfig, config, tokenIssuer }) =>
+  return ({
+    providerId,
+    globalConfig,
+    config,
+    tokenIssuer,
+    catalogApi,
+    logger,
+  }) =>
     OAuthEnvironmentHandler.mapConfig(config, envConfig => {
       const clientId = envConfig.getString('clientId');
       const clientSecret = envConfig.getString('clientSecret');
@@ -177,18 +233,46 @@ export const createOAuth2Provider = (
       const authorizationUrl = envConfig.getString('authorizationUrl');
       const tokenUrl = envConfig.getString('tokenUrl');
       const scope = envConfig.getOptionalString('scope');
+      const disableRefresh =
+        envConfig.getOptionalBoolean('disableRefresh') ?? false;
+
+      const catalogIdentityClient = new CatalogIdentityClient({
+        catalogApi,
+        tokenIssuer,
+      });
+
+      const authHandler: AuthHandler<OAuthResult> = options?.authHandler
+        ? options.authHandler
+        : async ({ fullProfile, params }) => ({
+            profile: makeProfileInfo(fullProfile, params.id_token),
+          });
+
+      const signInResolverFn =
+        options?.signIn?.resolver ?? oAuth2DefaultSignInResolver;
+
+      const signInResolver: SignInResolver<OAuthResult> = info =>
+        signInResolverFn(info, {
+          catalogIdentityClient,
+          tokenIssuer,
+          logger,
+        });
 
       const provider = new OAuth2AuthProvider({
         clientId,
         clientSecret,
+        tokenIssuer,
+        catalogIdentityClient,
         callbackUrl,
+        signInResolver,
+        authHandler,
         authorizationUrl,
         tokenUrl,
         scope,
+        logger,
       });
 
       return OAuthAdapter.fromConfig(globalConfig, provider, {
-        disableRefresh: false,
+        disableRefresh,
         providerId,
         tokenIssuer,
       });
diff --git a/plugins/auth-backend/src/providers/oidc/provider.test.ts b/plugins/auth-backend/src/providers/oidc/provider.test.ts
index 8ad0adb34e..c302c44082 100644
--- a/plugins/auth-backend/src/providers/oidc/provider.test.ts
+++ b/plugins/auth-backend/src/providers/oidc/provider.test.ts
@@ -70,7 +70,7 @@ describe('OidcAuthProvider', () => {
       rest.get('https://oidc.test/.well-known/openid-configuration', handler),
     );
     const provider = new OidcAuthProvider(clientMetadata);
-    const { strategy } = ((await (provider as any).implementation) as any) as {
+    const { strategy } = (await (provider as any).implementation) as any as {
       strategy: {
         _client: ClientMetadata;
         _issuer: IssuerMetadata;
@@ -138,7 +138,7 @@ describe('OidcAuthProvider', () => {
     const req = {
       method: 'GET',
       url: 'https://oidc.test/?code=test2',
-      session: ({ 'oidc:oidc.test': 'test' } as any) as Session,
+      session: { 'oidc:oidc.test': 'test' } as any as Session,
     } as express.Request;
     await provider.handler(req);
     expect(requestSequence).toEqual([0, 1, 2].map(i => requests[i].url));
diff --git a/plugins/auth-backend/src/providers/oidc/provider.ts b/plugins/auth-backend/src/providers/oidc/provider.ts
index 7a13d04a93..092ffa7099 100644
--- a/plugins/auth-backend/src/providers/oidc/provider.ts
+++ b/plugins/auth-backend/src/providers/oidc/provider.ts
@@ -56,26 +56,33 @@ type AuthResult = {
 export type Options = OAuthProviderOptions & {
   metadataUrl: string;
   scope?: string;
+  prompt?: string;
   tokenSignedResponseAlg?: string;
 };
 
 export class OidcAuthProvider implements OAuthHandlers {
   private readonly implementation: Promise<OidcImpl>;
   private readonly scope?: string;
+  private readonly prompt?: string;
 
   constructor(options: Options) {
     this.implementation = this.setupStrategy(options);
     this.scope = options.scope;
+    this.prompt = options.prompt;
   }
 
   async start(req: OAuthStartRequest): Promise<RedirectInfo> {
     const { strategy } = await this.implementation;
-    return await executeRedirectStrategy(req, strategy, {
+    const options: Record<string, string> = {
       accessType: 'offline',
-      prompt: 'none',
-      scope: req.scope || this.scope || '',
+      scope: req.scope || this.scope || 'openid profile email',
       state: encodeState(req.state),
-    });
+    };
+    const prompt = this.prompt || 'none';
+    if (prompt !== 'auto') {
+      options.prompt = prompt;
+    }
+    return await executeRedirectStrategy(req, strategy, options);
   }
 
   async handler(
@@ -150,6 +157,11 @@ export class OidcAuthProvider implements OAuthHandlers {
         userinfo: UserinfoResponse,
         done: PassportDoneCallback<AuthResult, PrivateInfo>,
       ) => {
+        if (typeof done !== 'function') {
+          throw new Error(
+            'OIDC IdP must provide a userinfo_endpoint in the metadata response',
+          );
+        }
         done(
           undefined,
           { tokenset, userinfo },
@@ -190,10 +202,11 @@ export const createOidcProvider = (
       const clientSecret = envConfig.getString('clientSecret');
       const callbackUrl = `${globalConfig.baseUrl}/${providerId}/handler/frame`;
       const metadataUrl = envConfig.getString('metadataUrl');
-      const tokenSignedResponseAlg = envConfig.getString(
+      const tokenSignedResponseAlg = envConfig.getOptionalString(
         'tokenSignedResponseAlg',
       );
       const scope = envConfig.getOptionalString('scope');
+      const prompt = envConfig.getOptionalString('prompt');
 
       const provider = new OidcAuthProvider({
         clientId,
@@ -202,6 +215,7 @@ export const createOidcProvider = (
         tokenSignedResponseAlg,
         metadataUrl,
         scope,
+        prompt,
       });
 
       return OAuthAdapter.fromConfig(globalConfig, provider, {
diff --git a/plugins/auth-backend/src/providers/okta/index.ts b/plugins/auth-backend/src/providers/okta/index.ts
index 37abef181a..fd9ebf46da 100644
--- a/plugins/auth-backend/src/providers/okta/index.ts
+++ b/plugins/auth-backend/src/providers/okta/index.ts
@@ -14,5 +14,5 @@
  * limitations under the License.
  */
 
-export { createOktaProvider } from './provider';
+export { createOktaProvider, oktaEmailSignInResolver } from './provider';
 export type { OktaProviderOptions } from './provider';
diff --git a/plugins/auth-backend/src/providers/okta/provider.test.ts b/plugins/auth-backend/src/providers/okta/provider.test.ts
new file mode 100644
index 0000000000..939981e81c
--- /dev/null
+++ b/plugins/auth-backend/src/providers/okta/provider.test.ts
@@ -0,0 +1,105 @@
+/*
+ * Copyright 2020 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { OktaAuthProvider } from './provider';
+import * as helpers from '../../lib/passport/PassportStrategyHelper';
+import { OAuthResult } from '../../lib/oauth';
+import { getVoidLogger } from '@backstage/backend-common';
+import { TokenIssuer } from '../../identity/types';
+import { CatalogIdentityClient } from '../../lib/catalog';
+
+const mockFrameHandler = jest.spyOn(
+  helpers,
+  'executeFrameHandlerStrategy',
+) as unknown as jest.MockedFunction<
+  () => Promise<{ result: OAuthResult; privateInfo: any }>
+>;
+
+describe('createOktaProvider', () => {
+  it('should auth', async () => {
+    const tokenIssuer = {
+      issueToken: jest.fn(),
+      listPublicKeys: jest.fn(),
+    };
+    const catalogIdentityClient = {
+      findUser: jest.fn(),
+    };
+
+    const provider = new OktaAuthProvider({
+      logger: getVoidLogger(),
+      catalogIdentityClient:
+        catalogIdentityClient as unknown as CatalogIdentityClient,
+      tokenIssuer: tokenIssuer as unknown as TokenIssuer,
+      authHandler: async ({ fullProfile }) => ({
+        profile: {
+          email: fullProfile.emails![0]!.value,
+          displayName: fullProfile.displayName,
+        },
+      }),
+      audience: 'http://example.com',
+      clientId: 'mock',
+      clientSecret: 'mock',
+      callbackUrl: 'mock',
+    });
+
+    mockFrameHandler.mockResolvedValueOnce({
+      result: {
+        fullProfile: {
+          emails: [
+            {
+              type: 'work',
+              value: 'conrad@example.com',
+            },
+          ],
+          displayName: 'Conrad',
+          name: {
+            familyName: 'Ribas',
+            givenName: 'Francisco',
+          },
+          id: 'conrad',
+          provider: 'okta',
+          photos: [
+            {
+              value: 'some-data',
+            },
+          ],
+        },
+        params: {
+          id_token: 'idToken',
+          scope: 'scope',
+          expires_in: 123,
+        },
+        accessToken: 'accessToken',
+      },
+      privateInfo: {
+        refreshToken: 'wacka',
+      },
+    });
+    const { response } = await provider.handler({} as any);
+    expect(response).toEqual({
+      providerInfo: {
+        accessToken: 'accessToken',
+        expiresInSeconds: 123,
+        idToken: 'idToken',
+        scope: 'scope',
+      },
+      profile: {
+        email: 'conrad@example.com',
+        displayName: 'Conrad',
+      },
+    });
+  });
+});
diff --git a/plugins/auth-backend/src/providers/okta/provider.ts b/plugins/auth-backend/src/providers/okta/provider.ts
index 9709b549d7..44e26bb7fe 100644
--- a/plugins/auth-backend/src/providers/okta/provider.ts
+++ b/plugins/auth-backend/src/providers/okta/provider.ts
@@ -35,8 +35,16 @@ import {
   executeFetchUserProfileStrategy,
   PassportDoneCallback,
 } from '../../lib/passport';
-import { RedirectInfo, AuthProviderFactory } from '../types';
+import {
+  AuthProviderFactory,
+  AuthHandler,
+  RedirectInfo,
+  SignInResolver,
+} from '../types';
 import { StateStore } from 'passport-oauth2';
+import { CatalogIdentityClient, getEntityClaims } from '../../lib/catalog';
+import { TokenIssuer } from '../../identity';
+import { Logger } from 'winston';
 
 type PrivateInfo = {
   refreshToken: string;
@@ -44,10 +52,20 @@ type PrivateInfo = {
 
 export type OktaAuthProviderOptions = OAuthProviderOptions & {
   audience: string;
+  signInResolver?: SignInResolver<OAuthResult>;
+  authHandler: AuthHandler<OAuthResult>;
+  tokenIssuer: TokenIssuer;
+  catalogIdentityClient: CatalogIdentityClient;
+  logger: Logger;
 };
 
 export class OktaAuthProvider implements OAuthHandlers {
   private readonly _strategy: any;
+  private readonly _signInResolver?: SignInResolver<OAuthResult>;
+  private readonly _authHandler: AuthHandler<OAuthResult>;
+  private readonly _tokenIssuer: TokenIssuer;
+  private readonly _catalogIdentityClient: CatalogIdentityClient;
+  private readonly _logger: Logger;
 
   /**
    * Due to passport-okta-oauth forcing options.state = true,
@@ -67,6 +85,12 @@ export class OktaAuthProvider implements OAuthHandlers {
   };
 
   constructor(options: OktaAuthProviderOptions) {
+    this._signInResolver = options.signInResolver;
+    this._authHandler = options.authHandler;
+    this._tokenIssuer = options.tokenIssuer;
+    this._catalogIdentityClient = options.catalogIdentityClient;
+    this._logger = options.logger;
+
     this._strategy = new OktaStrategy(
       {
         clientID: options.clientId,
@@ -117,18 +141,8 @@ export class OktaAuthProvider implements OAuthHandlers {
       PrivateInfo
     >(req, this._strategy);
 
-    const profile = makeProfileInfo(result.fullProfile, result.params.id_token);
-
     return {
-      response: await this.populateIdentity({
-        profile,
-        providerInfo: {
-          idToken: result.params.id_token,
-          accessToken: result.accessToken,
-          scope: result.params.scope,
-          expiresInSeconds: result.params.expires_in,
-        },
-      }),
+      response: await this.handleResult(result),
       refreshToken: privateInfo.refreshToken,
     };
   }
@@ -144,52 +158,154 @@ export class OktaAuthProvider implements OAuthHandlers {
       this._strategy,
       accessToken,
     );
-    const profile = makeProfileInfo(fullProfile, params.id_token);
 
-    return this.populateIdentity({
-      providerInfo: {
-        accessToken,
-        idToken: params.id_token,
-        expiresInSeconds: params.expires_in,
-        scope: params.scope,
-      },
-      profile,
+    return this.handleResult({
+      fullProfile,
+      params,
+      accessToken,
+      refreshToken: req.refreshToken,
     });
   }
 
-  private async populateIdentity(
-    response: OAuthResponse,
-  ): Promise<OAuthResponse> {
-    const { profile } = response;
+  private async handleResult(result: OAuthResult) {
+    const { profile } = await this._authHandler(result);
 
-    if (!profile.email) {
-      throw new Error('Okta profile contained no email');
+    const response: OAuthResponse = {
+      providerInfo: {
+        idToken: result.params.id_token,
+        accessToken: result.accessToken,
+        scope: result.params.scope,
+        expiresInSeconds: result.params.expires_in,
+      },
+      profile,
+    };
+
+    if (this._signInResolver) {
+      response.backstageIdentity = await this._signInResolver(
+        {
+          result,
+          profile,
+        },
+        {
+          tokenIssuer: this._tokenIssuer,
+          catalogIdentityClient: this._catalogIdentityClient,
+          logger: this._logger,
+        },
+      );
     }
 
-    // TODO(Rugvip): Hardcoded to the local part of the email for now
-    const id = profile.email.split('@')[0];
-
-    return { ...response, backstageIdentity: { id } };
+    return response;
   }
 }
 
-export type OktaProviderOptions = {};
+export const oktaEmailSignInResolver: SignInResolver<OAuthResult> = async (
+  info,
+  ctx,
+) => {
+  const { profile } = info;
+
+  if (!profile.email) {
+    throw new Error('Okta profile contained no email');
+  }
+
+  const entity = await ctx.catalogIdentityClient.findUser({
+    annotations: {
+      'okta.com/email': profile.email,
+    },
+  });
+
+  const claims = getEntityClaims(entity);
+  const token = await ctx.tokenIssuer.issueToken({ claims });
+
+  return { id: entity.metadata.name, entity, token };
+};
+
+export const oktaDefaultSignInResolver: SignInResolver<OAuthResult> = async (
+  info,
+  ctx,
+) => {
+  const { profile } = info;
+
+  if (!profile.email) {
+    throw new Error('Okta profile contained no email');
+  }
+
+  // TODO(Rugvip): Hardcoded to the local part of the email for now
+  const userId = profile.email.split('@')[0];
+
+  const token = await ctx.tokenIssuer.issueToken({
+    claims: { sub: userId, ent: [`user:default/${userId}`] },
+  });
+
+  return { id: userId, token };
+};
+
+export type OktaProviderOptions = {
+  /**
+   * The profile transformation function used to verify and convert the auth response
+   * into the profile that will be presented to the user.
+   */
+  authHandler?: AuthHandler<OAuthResult>;
+
+  /**
+   * Configure sign-in for this provider, without it the provider can not be used to sign users in.
+   */
+  signIn?: {
+    /**
+     * Maps an auth result to a Backstage identity for the user.
+     */
+    resolver?: SignInResolver<OAuthResult>;
+  };
+};
 
 export const createOktaProvider = (
   _options?: OktaProviderOptions,
 ): AuthProviderFactory => {
-  return ({ providerId, globalConfig, config, tokenIssuer }) =>
+  return ({
+    providerId,
+    globalConfig,
+    config,
+    tokenIssuer,
+    catalogApi,
+    logger,
+  }) =>
     OAuthEnvironmentHandler.mapConfig(config, envConfig => {
       const clientId = envConfig.getString('clientId');
       const clientSecret = envConfig.getString('clientSecret');
       const audience = envConfig.getString('audience');
       const callbackUrl = `${globalConfig.baseUrl}/${providerId}/handler/frame`;
 
+      const catalogIdentityClient = new CatalogIdentityClient({
+        catalogApi,
+        tokenIssuer,
+      });
+
+      const authHandler: AuthHandler<OAuthResult> = _options?.authHandler
+        ? _options.authHandler
+        : async ({ fullProfile, params }) => ({
+            profile: makeProfileInfo(fullProfile, params.id_token),
+          });
+
+      const signInResolverFn =
+        _options?.signIn?.resolver ?? oktaDefaultSignInResolver;
+
+      const signInResolver: SignInResolver<OAuthResult> = info =>
+        signInResolverFn(info, {
+          catalogIdentityClient,
+          tokenIssuer,
+          logger,
+        });
+
       const provider = new OktaAuthProvider({
         audience,
         clientId,
         clientSecret,
         callbackUrl,
+        authHandler,
+        signInResolver,
+        tokenIssuer,
+        catalogIdentityClient,
+        logger,
       });
 
       return OAuthAdapter.fromConfig(globalConfig, provider, {
diff --git a/plugins/auth-backend/src/providers/saml/provider.ts b/plugins/auth-backend/src/providers/saml/provider.ts
index fa8519ea1a..21e6c9080d 100644
--- a/plugins/auth-backend/src/providers/saml/provider.ts
+++ b/plugins/auth-backend/src/providers/saml/provider.ts
@@ -125,23 +125,19 @@ export const createSamlProvider = (
       entryPoint: config.getString('entryPoint'),
       logoutUrl: config.getOptionalString('logoutUrl'),
       issuer: config.getString('issuer'),
-      cert: config.getOptionalString('cert'),
+      cert: config.getString('cert'),
       privateCert: config.getOptionalString('privateKey'),
       decryptionPvk: config.getOptionalString('decryptionPvk'),
       signatureAlgorithm: config.getOptionalString('signatureAlgorithm') as
         | SignatureAlgorithm
         | undefined,
       digestAlgorithm: config.getOptionalString('digestAlgorithm'),
+      acceptedClockSkewMs: config.getOptionalNumber('acceptedClockSkewMs'),
 
       tokenIssuer,
       appUrl: globalConfig.appUrl,
     };
 
-    // passport-saml will return an error if the `cert` key is set, and the value is empty.
-    // Since we read from config (such as environment variables) an empty string should be equal to being unset.
-    if (!opts.cert) {
-      delete opts.cert;
-    }
     return new SamlAuthProvider(opts);
   };
 };
diff --git a/plugins/auth-backend/src/providers/types.ts b/plugins/auth-backend/src/providers/types.ts
index c838005c00..6f6df5d904 100644
--- a/plugins/auth-backend/src/providers/types.ts
+++ b/plugins/auth-backend/src/providers/types.ts
@@ -34,6 +34,11 @@ export type AuthProviderConfig = {
    * The base URL of the app as provided by app.baseUrl
    */
   appUrl: string;
+
+  /**
+   * A function that is called to check whether an origin is allowed to receive the authentication result.
+   */
+  isOriginAllowed: (origin: string) => boolean;
 };
 
 export type RedirectInfo = {
diff --git a/plugins/auth-backend/src/service/router.test.ts b/plugins/auth-backend/src/service/router.test.ts
new file mode 100644
index 0000000000..3a1fde881e
--- /dev/null
+++ b/plugins/auth-backend/src/service/router.test.ts
@@ -0,0 +1,54 @@
+/*
+ * Copyright 2020 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { ConfigReader } from '@backstage/config';
+import { createOriginFilter } from './router';
+
+describe('Auth origin filtering', () => {
+  const config = new ConfigReader({
+    app: {
+      baseUrl: 'http://example.com/extra-path',
+    },
+    auth: {
+      experimentalExtraAllowedOrigins: ['https://test-*.example.net'],
+    },
+  });
+
+  it('Will explode, invalid origin', () => {
+    const origin = 'https://test.example.net';
+    expect(createOriginFilter(config)(origin)).toBeFalsy();
+  });
+
+  it('Will explode, invalid origin domain', () => {
+    const origin = 'https://test-1234.examplee.net';
+    expect(createOriginFilter(config)(origin)).toBeFalsy();
+  });
+
+  it("Won't explode, uses app origin", () => {
+    const origin = 'http://example.com';
+    expect(createOriginFilter(config)(origin)).toBeTruthy();
+  });
+
+  it("Won't explode, valid origin with numbers", () => {
+    const origin = 'https://test-1234.example.net';
+    expect(createOriginFilter(config)(origin)).toBeTruthy();
+  });
+
+  it("Won't explode, valid origin with chars and numbers", () => {
+    const origin = 'https://test-test1234.example.net';
+    expect(createOriginFilter(config)(origin)).toBeTruthy();
+  });
+});
diff --git a/plugins/auth-backend/src/service/router.ts b/plugins/auth-backend/src/service/router.ts
index 8173efcbc1..423975aa75 100644
--- a/plugins/auth-backend/src/service/router.ts
+++ b/plugins/auth-backend/src/service/router.ts
@@ -32,6 +32,7 @@ import { Config } from '@backstage/config';
 import { createOidcRouter, DatabaseKeyStore, TokenFactory } from '../identity';
 import session from 'express-session';
 import passport from 'passport';
+import { Minimatch } from 'minimatch';
 
 type ProviderFactories = { [s: string]: AuthProviderFactory };
 
@@ -88,6 +89,8 @@ export async function createRouter({
   const providersConfig = config.getConfig('auth.providers');
   const configuredProviders = providersConfig.keys();
 
+  const isOriginAllowed = createOriginFilter(config);
+
   for (const [providerId, providerFactory] of Object.entries(
     allProviderFactories,
   )) {
@@ -96,7 +99,7 @@ export async function createRouter({
       try {
         const provider = providerFactory({
           providerId,
-          globalConfig: { baseUrl: authUrl, appUrl },
+          globalConfig: { baseUrl: authUrl, appUrl, isOriginAllowed },
           config: providersConfig.getConfig(providerId),
           logger,
           tokenIssuer,
@@ -158,3 +161,26 @@ export async function createRouter({
 
   return router;
 }
+
+export function createOriginFilter(
+  config: Config,
+): (origin: string) => boolean {
+  const appUrl = config.getString('app.baseUrl');
+  const { origin: appOrigin } = new URL(appUrl);
+
+  const allowedOrigins = config.getOptionalStringArray(
+    'auth.experimentalExtraAllowedOrigins',
+  );
+
+  const allowedOriginPatterns =
+    allowedOrigins?.map(
+      pattern => new Minimatch(pattern, { nocase: true, noglobstar: true }),
+    ) ?? [];
+
+  return origin => {
+    if (origin === appOrigin) {
+      return true;
+    }
+    return allowedOriginPatterns.some(pattern => pattern.match(origin));
+  };
+}
diff --git a/plugins/badges-backend/CHANGELOG.md b/plugins/badges-backend/CHANGELOG.md
index 9b6a9bf433..6ff444fa36 100644
--- a/plugins/badges-backend/CHANGELOG.md
+++ b/plugins/badges-backend/CHANGELOG.md
@@ -1,5 +1,13 @@
 # @backstage/plugin-badges-backend
 
+## 0.1.9
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.9.0
+  - @backstage/config@0.1.8
+
 ## 0.1.8
 
 ### Patch Changes
diff --git a/plugins/badges-backend/api-report.md b/plugins/badges-backend/api-report.md
index 19f5a956e4..5723a3f0b8 100644
--- a/plugins/badges-backend/api-report.md
+++ b/plugins/badges-backend/api-report.md
@@ -9,6 +9,8 @@ import { Entity } from '@backstage/catalog-model';
 import express from 'express';
 import { PluginEndpointDiscovery } from '@backstage/backend-common';
 
+// Warning: (ae-missing-release-tag) "Badge" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export interface Badge {
   color?: string;
@@ -21,6 +23,8 @@ export interface Badge {
   style?: BadgeStyle;
 }
 
+// Warning: (ae-missing-release-tag) "BADGE_STYLES" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export const BADGE_STYLES: readonly [
   'plastic',
@@ -30,6 +34,8 @@ export const BADGE_STYLES: readonly [
   'social',
 ];
 
+// Warning: (ae-missing-release-tag) "BadgeBuilder" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export type BadgeBuilder = {
   getBadges(): Promise<BadgeInfo[]>;
@@ -37,6 +43,8 @@ export type BadgeBuilder = {
   createBadgeSvg(options: BadgeOptions): Promise<string>;
 };
 
+// Warning: (ae-missing-release-tag) "BadgeContext" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export interface BadgeContext {
   // (undocumented)
@@ -47,29 +55,39 @@ export interface BadgeContext {
   entity?: Entity;
 }
 
+// Warning: (ae-missing-release-tag) "BadgeFactories" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export interface BadgeFactories {
   // (undocumented)
   [id: string]: BadgeFactory;
 }
 
+// Warning: (ae-missing-release-tag) "BadgeFactory" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export interface BadgeFactory {
   // (undocumented)
   createBadge(context: BadgeContext): Badge;
 }
 
+// Warning: (ae-missing-release-tag) "BadgeInfo" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export type BadgeInfo = {
   id: string;
 };
 
+// Warning: (ae-missing-release-tag) "BadgeOptions" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export type BadgeOptions = {
   badgeInfo: BadgeInfo;
   context: BadgeContext;
 };
 
+// Warning: (ae-missing-release-tag) "BadgeSpec" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export type BadgeSpec = {
   id: string;
@@ -78,15 +96,23 @@ export type BadgeSpec = {
   markdown: string;
 };
 
+// Warning: (ae-missing-release-tag) "BadgeStyle" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export type BadgeStyle = typeof BADGE_STYLES[number];
 
+// Warning: (ae-missing-release-tag) "createDefaultBadgeFactories" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export const createDefaultBadgeFactories: () => BadgeFactories;
 
+// Warning: (ae-missing-release-tag) "createRouter" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export function createRouter(options: RouterOptions): Promise<express.Router>;
 
+// Warning: (ae-missing-release-tag) "DefaultBadgeBuilder" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export class DefaultBadgeBuilder implements BadgeBuilder {
   constructor(factories: BadgeFactories);
@@ -98,6 +124,8 @@ export class DefaultBadgeBuilder implements BadgeBuilder {
   getBadges(): Promise<BadgeInfo[]>;
 }
 
+// Warning: (ae-missing-release-tag) "RouterOptions" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export interface RouterOptions {
   // (undocumented)
diff --git a/plugins/badges-backend/package.json b/plugins/badges-backend/package.json
index 68b4cdc9fb..13fca312e0 100644
--- a/plugins/badges-backend/package.json
+++ b/plugins/badges-backend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-badges-backend",
-  "version": "0.1.8",
+  "version": "0.1.9",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -30,10 +30,10 @@
     "clean": "backstage-cli clean"
   },
   "dependencies": {
-    "@backstage/backend-common": "^0.8.5",
+    "@backstage/backend-common": "^0.9.0",
     "@backstage/catalog-client": "^0.3.16",
     "@backstage/catalog-model": "^0.9.0",
-    "@backstage/config": "^0.1.5",
+    "@backstage/config": "^0.1.8",
     "@backstage/errors": "^0.1.1",
     "@types/express": "^4.17.6",
     "badge-maker": "^3.3.0",
diff --git a/plugins/badges-backend/src/lib/BadgeBuilder/DefaultBadgeBuilder.test.ts b/plugins/badges-backend/src/lib/BadgeBuilder/DefaultBadgeBuilder.test.ts
index e26d4a406b..039c8b9b77 100644
--- a/plugins/badges-backend/src/lib/BadgeBuilder/DefaultBadgeBuilder.test.ts
+++ b/plugins/badges-backend/src/lib/BadgeBuilder/DefaultBadgeBuilder.test.ts
@@ -42,7 +42,7 @@ describe('DefaultBadgeBuilder', () => {
         createBadge: () => badge,
       },
       failbadge: {
-        createBadge: () => (undefined as unknown) as Badge, // force a bad return value..
+        createBadge: () => undefined as unknown as Badge, // force a bad return value..
       },
       invalidbadge: {
         createBadge: () => ({ style: 'wrong' as BadgeStyle, ...badge }),
diff --git a/plugins/badges/CHANGELOG.md b/plugins/badges/CHANGELOG.md
index e855201853..4809905dc7 100644
--- a/plugins/badges/CHANGELOG.md
+++ b/plugins/badges/CHANGELOG.md
@@ -1,5 +1,46 @@
 # @backstage/plugin-badges
 
+## 0.2.8
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@0.4.5
+  - @backstage/core-components@0.4.0
+  - @backstage/catalog-model@0.9.1
+
+## 0.2.7
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.3.0
+  - @backstage/core-plugin-api@0.1.5
+  - @backstage/plugin-catalog-react@0.4.1
+
+## 0.2.6
+
+### Patch Changes
+
+- 9d40fcb1e: - Bumping `material-ui/core` version to at least `4.12.2` as they made some breaking changes in later versions which broke `Pagination` of the `Table`.
+  - Switching out `material-table` to `@material-table/core` for support for the later versions of `material-ui/core`
+  - This causes a minor API change to `@backstage/core-components` as the interface for `Table` re-exports the `prop` from the underlying `Table` components.
+  - `onChangeRowsPerPage` has been renamed to `onRowsPerPageChange`
+  - `onChangePage` has been renamed to `onPageChange`
+  - Migration guide is here: https://material-table-core.com/docs/breaking-changes
+- Updated dependencies
+  - @backstage/core-components@0.2.0
+  - @backstage/plugin-catalog-react@0.4.0
+  - @backstage/core-plugin-api@0.1.4
+  - @backstage/theme@0.2.9
+
+## 0.2.5
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@0.3.0
+
 ## 0.2.4
 
 ### Patch Changes
diff --git a/plugins/badges/api-report.md b/plugins/badges/api-report.md
index 7e70f65b0e..9005e34c43 100644
--- a/plugins/badges/api-report.md
+++ b/plugins/badges/api-report.md
@@ -7,9 +7,13 @@
 
 import { BackstagePlugin } from '@backstage/core-plugin-api';
 
+// Warning: (ae-missing-release-tag) "badgesPlugin" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export const badgesPlugin: BackstagePlugin<{}, {}>;
 
+// Warning: (ae-missing-release-tag) "EntityBadgesDialog" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export const EntityBadgesDialog: ({
   open,
diff --git a/plugins/badges/package.json b/plugins/badges/package.json
index 67e2ef90e3..8b286599e5 100644
--- a/plugins/badges/package.json
+++ b/plugins/badges/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-badges",
-  "version": "0.2.4",
+  "version": "0.2.8",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -20,13 +20,13 @@
     "clean": "backstage-cli clean"
   },
   "dependencies": {
-    "@backstage/catalog-model": "^0.9.0",
-    "@backstage/core-components": "^0.1.5",
-    "@backstage/core-plugin-api": "^0.1.3",
+    "@backstage/catalog-model": "^0.9.1",
+    "@backstage/core-components": "^0.4.1",
+    "@backstage/core-plugin-api": "^0.1.7",
     "@backstage/errors": "^0.1.1",
-    "@backstage/plugin-catalog-react": "^0.2.6",
-    "@backstage/theme": "^0.2.8",
-    "@material-ui/core": "^4.11.0",
+    "@backstage/plugin-catalog-react": "^0.4.5",
+    "@backstage/theme": "^0.2.10",
+    "@material-ui/core": "^4.12.2",
     "@material-ui/icons": "^4.9.1",
     "@material-ui/lab": "4.0.0-alpha.45",
     "react": "^16.13.1",
@@ -35,10 +35,10 @@
     "react-use": "^17.2.4"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.7.3",
-    "@backstage/core-app-api": "^0.1.4",
-    "@backstage/dev-utils": "^0.2.1",
-    "@backstage/test-utils": "^0.1.14",
+    "@backstage/cli": "^0.7.11",
+    "@backstage/core-app-api": "^0.1.12",
+    "@backstage/dev-utils": "^0.2.9",
+    "@backstage/test-utils": "^0.1.17",
     "@testing-library/jest-dom": "^5.10.1",
     "@testing-library/react": "^11.2.5",
     "@testing-library/user-event": "^13.1.8",
diff --git a/plugins/badges/src/components/EntityBadgesDialog.test.tsx b/plugins/badges/src/components/EntityBadgesDialog.test.tsx
index 7901a69cbd..1f5ee94e04 100644
--- a/plugins/badges/src/components/EntityBadgesDialog.test.tsx
+++ b/plugins/badges/src/components/EntityBadgesDialog.test.tsx
@@ -55,7 +55,7 @@ describe('EntityBadgesDialog', () => {
     );
 
     await expect(
-      rendered.findByText('![test: badge](http://127.0.0.1/catalog/...)'),
+      rendered.findByText('test: badge'),
     ).resolves.toBeInTheDocument();
   });
 });
diff --git a/plugins/badges/src/components/EntityBadgesDialog.tsx b/plugins/badges/src/components/EntityBadgesDialog.tsx
index a1840e75c0..75caca2d9d 100644
--- a/plugins/badges/src/components/EntityBadgesDialog.tsx
+++ b/plugins/badges/src/components/EntityBadgesDialog.tsx
@@ -48,7 +48,11 @@ export const EntityBadgesDialog = ({ open, onClose }: Props) => {
   const fullScreen = useMediaQuery(theme.breakpoints.down('sm'));
   const badgesApi = useApi(badgesApiRef);
 
-  const { value: badges, loading, error } = useAsync(async () => {
+  const {
+    value: badges,
+    loading,
+    error,
+  } = useAsync(async () => {
     if (open && entity) {
       return await badgesApi.getEntityBadgeSpecs(entity);
     }
diff --git a/plugins/bitrise/CHANGELOG.md b/plugins/bitrise/CHANGELOG.md
index ab9d842f1f..c082e6e3d8 100644
--- a/plugins/bitrise/CHANGELOG.md
+++ b/plugins/bitrise/CHANGELOG.md
@@ -1,5 +1,56 @@
 # @backstage/plugin-bitrise
 
+## 0.1.11
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@0.4.5
+  - @backstage/core-components@0.4.0
+  - @backstage/catalog-model@0.9.1
+
+## 0.1.10
+
+### Patch Changes
+
+- 8bedb75ae: Update Luxon dependency to 2.x
+- Updated dependencies
+  - @backstage/core-components@0.3.1
+  - @backstage/core-plugin-api@0.1.6
+  - @backstage/plugin-catalog-react@0.4.2
+
+## 0.1.9
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.3.0
+  - @backstage/core-plugin-api@0.1.5
+  - @backstage/plugin-catalog-react@0.4.1
+
+## 0.1.8
+
+### Patch Changes
+
+- 9d40fcb1e: - Bumping `material-ui/core` version to at least `4.12.2` as they made some breaking changes in later versions which broke `Pagination` of the `Table`.
+  - Switching out `material-table` to `@material-table/core` for support for the later versions of `material-ui/core`
+  - This causes a minor API change to `@backstage/core-components` as the interface for `Table` re-exports the `prop` from the underlying `Table` components.
+  - `onChangeRowsPerPage` has been renamed to `onRowsPerPageChange`
+  - `onChangePage` has been renamed to `onPageChange`
+  - Migration guide is here: https://material-table-core.com/docs/breaking-changes
+- Updated dependencies
+  - @backstage/core-components@0.2.0
+  - @backstage/plugin-catalog-react@0.4.0
+  - @backstage/core-plugin-api@0.1.4
+  - @backstage/theme@0.2.9
+
+## 0.1.7
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@0.3.0
+
 ## 0.1.6
 
 ### Patch Changes
diff --git a/plugins/bitrise/api-report.md b/plugins/bitrise/api-report.md
index 66adb0ec68..4d39353113 100644
--- a/plugins/bitrise/api-report.md
+++ b/plugins/bitrise/api-report.md
@@ -8,12 +8,18 @@
 import { BackstagePlugin } from '@backstage/core-plugin-api';
 import { Entity } from '@backstage/catalog-model';
 
+// Warning: (ae-missing-release-tag) "bitrisePlugin" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export const bitrisePlugin: BackstagePlugin<{}, {}>;
 
+// Warning: (ae-missing-release-tag) "EntityBitriseContent" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export const EntityBitriseContent: () => JSX.Element;
 
+// Warning: (ae-missing-release-tag) "isBitriseAvailable" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export const isBitriseAvailable: (entity: Entity) => boolean;
 
diff --git a/plugins/bitrise/package.json b/plugins/bitrise/package.json
index a73fa64797..a476d0f4cb 100644
--- a/plugins/bitrise/package.json
+++ b/plugins/bitrise/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-bitrise",
-  "version": "0.1.6",
+  "version": "0.1.11",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -20,17 +20,17 @@
     "clean": "backstage-cli clean"
   },
   "dependencies": {
-    "@backstage/catalog-model": "^0.9.0",
-    "@backstage/core-components": "^0.1.5",
-    "@backstage/core-plugin-api": "^0.1.3",
-    "@backstage/plugin-catalog-react": "^0.2.6",
-    "@backstage/theme": "^0.2.8",
-    "@material-ui/core": "^4.11.0",
+    "@backstage/catalog-model": "^0.9.1",
+    "@backstage/core-components": "^0.4.1",
+    "@backstage/core-plugin-api": "^0.1.7",
+    "@backstage/plugin-catalog-react": "^0.4.5",
+    "@backstage/theme": "^0.2.10",
+    "@material-ui/core": "^4.12.2",
     "@material-ui/icons": "^4.9.1",
     "@material-ui/lab": "4.0.0-alpha.45",
     "cross-fetch": "^3.0.6",
     "lodash": "^4.17.21",
-    "luxon": "^1.26.0",
+    "luxon": "^2.0.2",
     "qs": "^6.9.6",
     "react": "^16.13.1",
     "react-dom": "^16.13.1",
@@ -38,10 +38,10 @@
     "recharts": "^1.8.5"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.7.3",
-    "@backstage/core-app-api": "^0.1.4",
-    "@backstage/dev-utils": "^0.2.1",
-    "@backstage/test-utils": "^0.1.14",
+    "@backstage/cli": "^0.7.11",
+    "@backstage/core-app-api": "^0.1.12",
+    "@backstage/dev-utils": "^0.2.9",
+    "@backstage/test-utils": "^0.1.17",
     "@testing-library/jest-dom": "^5.10.1",
     "@testing-library/react": "^11.2.5",
     "@testing-library/user-event": "^13.1.8",
diff --git a/plugins/bitrise/src/components/BitriseBuildsTableComponent/BitriseBuildsTableComponent.tsx b/plugins/bitrise/src/components/BitriseBuildsTableComponent/BitriseBuildsTableComponent.tsx
index d6c7ab166b..0966de3377 100644
--- a/plugins/bitrise/src/components/BitriseBuildsTableComponent/BitriseBuildsTableComponent.tsx
+++ b/plugins/bitrise/src/components/BitriseBuildsTableComponent/BitriseBuildsTableComponent.tsx
@@ -219,10 +219,10 @@ export const BitriseBuildsTable = ({
           }}
           totalCount={builds.value?.paging?.total_item_count || 0}
           page={page}
-          onChangePage={pageIndex => {
+          onPageChange={pageIndex => {
             handleChangePage(pageIndex, builds.value?.paging?.next);
           }}
-          onChangeRowsPerPage={handleChangeRowsPerPage}
+          onRowsPerPageChange={handleChangeRowsPerPage}
           columns={columns}
           data={builds.value?.data || []}
           onSearchChange={(searchTerm: string) =>
diff --git a/plugins/catalog-backend-module-ldap/CHANGELOG.md b/plugins/catalog-backend-module-ldap/CHANGELOG.md
index bd090ff847..c93ba4ed19 100644
--- a/plugins/catalog-backend-module-ldap/CHANGELOG.md
+++ b/plugins/catalog-backend-module-ldap/CHANGELOG.md
@@ -1,5 +1,33 @@
 # @backstage/plugin-catalog-backend-module-ldap
 
+## 0.3.0
+
+### Minor Changes
+
+- 54b441abe: Introduce `LdapOrgEntityProvider` as an alternative to `LdapOrgReaderProcessor`. This also changes the `LdapClient` interface to require a logger.
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-backend@0.13.3
+  - @backstage/config@0.1.7
+
+## 0.2.2
+
+### Patch Changes
+
+- 2a2a2749b: chore(deps): bump `@types/ldapjs` from 1.0.10 to 2.2.0
+- Updated dependencies
+  - @backstage/plugin-catalog-backend@0.13.1
+
+## 0.2.1
+
+### Patch Changes
+
+- afe3e4b54: Expose missing types used by the custom transformers
+- Updated dependencies
+  - @backstage/plugin-catalog-backend@0.13.0
+
 ## 0.2.0
 
 ### Minor Changes
diff --git a/plugins/catalog-backend-module-ldap/api-report.md b/plugins/catalog-backend-module-ldap/api-report.md
index f18ace927c..35f647ec70 100644
--- a/plugins/catalog-backend-module-ldap/api-report.md
+++ b/plugins/catalog-backend-module-ldap/api-report.md
@@ -7,6 +7,8 @@ import { CatalogProcessor } from '@backstage/plugin-catalog-backend';
 import { CatalogProcessorEmit } from '@backstage/plugin-catalog-backend';
 import { Client } from 'ldapjs';
 import { Config } from '@backstage/config';
+import { EntityProvider } from '@backstage/plugin-catalog-backend';
+import { EntityProviderConnection } from '@backstage/plugin-catalog-backend';
 import { GroupEntity } from '@backstage/catalog-model';
 import { JsonValue } from '@backstage/config';
 import { LocationSpec } from '@backstage/catalog-model';
@@ -15,6 +17,8 @@ import { SearchEntry } from 'ldapjs';
 import { SearchOptions } from 'ldapjs';
 import { UserEntity } from '@backstage/catalog-model';
 
+// Warning: (ae-missing-release-tag) "defaultGroupTransformer" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export function defaultGroupTransformer(
   vendor: LdapVendor,
@@ -22,6 +26,8 @@ export function defaultGroupTransformer(
   entry: SearchEntry,
 ): Promise<GroupEntity | undefined>;
 
+// Warning: (ae-missing-release-tag) "defaultUserTransformer" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export function defaultUserTransformer(
   vendor: LdapVendor,
@@ -29,6 +35,8 @@ export function defaultUserTransformer(
   entry: SearchEntry,
 ): Promise<UserEntity | undefined>;
 
+// Warning: (ae-missing-release-tag) "GroupConfig" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public
 export type GroupConfig = {
   dn: string;
@@ -49,6 +57,12 @@ export type GroupConfig = {
   };
 };
 
+// Warning: (tsdoc-param-tag-missing-hyphen) The @param block should be followed by a parameter name and then a hyphen
+// Warning: (tsdoc-param-tag-missing-hyphen) The @param block should be followed by a parameter name and then a hyphen
+// Warning: (tsdoc-param-tag-missing-hyphen) The @param block should be followed by a parameter name and then a hyphen
+// Warning: (tsdoc-undefined-tag) The TSDoc tag "@return" is not defined in this configuration
+// Warning: (ae-missing-release-tag) "GroupTransformer" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public
 export type GroupTransformer = (
   vendor: LdapVendor,
@@ -56,18 +70,28 @@ export type GroupTransformer = (
   group: SearchEntry,
 ) => Promise<GroupEntity | undefined>;
 
+// Warning: (ae-missing-release-tag) "LDAP_DN_ANNOTATION" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public
 export const LDAP_DN_ANNOTATION = 'backstage.io/ldap-dn';
 
+// Warning: (ae-missing-release-tag) "LDAP_RDN_ANNOTATION" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public
 export const LDAP_RDN_ANNOTATION = 'backstage.io/ldap-rdn';
 
+// Warning: (ae-missing-release-tag) "LDAP_UUID_ANNOTATION" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public
 export const LDAP_UUID_ANNOTATION = 'backstage.io/ldap-uuid';
 
+// Warning: (ae-missing-release-tag) "LdapClient" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public
 export class LdapClient {
-  constructor(client: Client);
+  constructor(client: Client, logger: Logger_2);
+  // Warning: (ae-forgotten-export) The symbol "BindConfig" needs to be exported by the entry point index.d.ts
+  //
   // (undocumented)
   static create(
     logger: Logger_2,
@@ -76,9 +100,43 @@ export class LdapClient {
   ): Promise<LdapClient>;
   getRootDSE(): Promise<SearchEntry | undefined>;
   getVendor(): Promise<LdapVendor>;
+  // Warning: (tsdoc-param-tag-missing-hyphen) The @param block should be followed by a parameter name and then a hyphen
+  // Warning: (tsdoc-param-tag-missing-hyphen) The @param block should be followed by a parameter name and then a hyphen
   search(dn: string, options: SearchOptions): Promise<SearchEntry[]>;
 }
 
+// Warning: (ae-missing-release-tag) "LdapOrgEntityProvider" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
+// @public
+export class LdapOrgEntityProvider implements EntityProvider {
+  constructor(options: {
+    id: string;
+    provider: LdapProviderConfig;
+    logger: Logger_2;
+    userTransformer?: UserTransformer;
+    groupTransformer?: GroupTransformer;
+  });
+  // (undocumented)
+  connect(connection: EntityProviderConnection): Promise<void>;
+  // (undocumented)
+  static fromConfig(
+    configRoot: Config,
+    options: {
+      id: string;
+      target: string;
+      userTransformer?: UserTransformer;
+      groupTransformer?: GroupTransformer;
+      logger: Logger_2;
+    },
+  ): LdapOrgEntityProvider;
+  // (undocumented)
+  getProviderName(): string;
+  // (undocumented)
+  read(): Promise<void>;
+}
+
+// Warning: (ae-missing-release-tag) "LdapOrgReaderProcessor" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public
 export class LdapOrgReaderProcessor implements CatalogProcessor {
   constructor(options: {
@@ -104,6 +162,8 @@ export class LdapOrgReaderProcessor implements CatalogProcessor {
   ): Promise<boolean>;
 }
 
+// Warning: (ae-missing-release-tag) "LdapProviderConfig" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public
 export type LdapProviderConfig = {
   target: string;
@@ -112,6 +172,8 @@ export type LdapProviderConfig = {
   groups: GroupConfig;
 };
 
+// Warning: (ae-missing-release-tag) "LdapVendor" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public
 export type LdapVendor = {
   dnAttributeName: string;
@@ -119,6 +181,12 @@ export type LdapVendor = {
   decodeStringAttribute: (entry: SearchEntry, name: string) => string[];
 };
 
+// Warning: (tsdoc-param-tag-missing-hyphen) The @param block should be followed by a parameter name and then a hyphen
+// Warning: (tsdoc-param-tag-missing-hyphen) The @param block should be followed by a parameter name and then a hyphen
+// Warning: (tsdoc-param-tag-missing-hyphen) The @param block should be followed by a parameter name and then a hyphen
+// Warning: (tsdoc-param-tag-missing-hyphen) The @param block should be followed by a parameter name and then a hyphen
+// Warning: (ae-missing-release-tag) "mapStringAttr" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public
 export function mapStringAttr(
   entry: SearchEntry,
@@ -127,9 +195,18 @@ export function mapStringAttr(
   setter: (value: string) => void,
 ): void;
 
+// Warning: (tsdoc-param-tag-missing-hyphen) The @param block should be followed by a parameter name and then a hyphen
+// Warning: (ae-missing-release-tag) "readLdapConfig" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public
 export function readLdapConfig(config: Config): LdapProviderConfig[];
 
+// Warning: (tsdoc-param-tag-missing-hyphen) The @param block should be followed by a parameter name and then a hyphen
+// Warning: (tsdoc-param-tag-missing-hyphen) The @param block should be followed by a parameter name and then a hyphen
+// Warning: (tsdoc-param-tag-missing-hyphen) The @param block should be followed by a parameter name and then a hyphen
+// Warning: (tsdoc-param-tag-missing-hyphen) The @param block should be followed by a parameter name and then a hyphen
+// Warning: (ae-missing-release-tag) "readLdapOrg" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public
 export function readLdapOrg(
   client: LdapClient,
@@ -145,6 +222,8 @@ export function readLdapOrg(
   groups: GroupEntity[];
 }>;
 
+// Warning: (ae-missing-release-tag) "UserConfig" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public
 export type UserConfig = {
   dn: string;
@@ -163,6 +242,12 @@ export type UserConfig = {
   };
 };
 
+// Warning: (tsdoc-param-tag-missing-hyphen) The @param block should be followed by a parameter name and then a hyphen
+// Warning: (tsdoc-param-tag-missing-hyphen) The @param block should be followed by a parameter name and then a hyphen
+// Warning: (tsdoc-param-tag-missing-hyphen) The @param block should be followed by a parameter name and then a hyphen
+// Warning: (tsdoc-undefined-tag) The TSDoc tag "@return" is not defined in this configuration
+// Warning: (ae-missing-release-tag) "UserTransformer" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public
 export type UserTransformer = (
   vendor: LdapVendor,
@@ -170,5 +255,10 @@ export type UserTransformer = (
   user: SearchEntry,
 ) => Promise<UserEntity | undefined>;
 
+// Warnings were encountered during analysis:
+//
+// src/ldap/vendors.d.ts:17:8 - (tsdoc-param-tag-missing-hyphen) The @param block should be followed by a parameter name and then a hyphen
+// src/ldap/vendors.d.ts:18:8 - (tsdoc-param-tag-missing-hyphen) The @param block should be followed by a parameter name and then a hyphen
+
 // (No @packageDocumentation comment for this package)
 ```
diff --git a/plugins/catalog-backend-module-ldap/package.json b/plugins/catalog-backend-module-ldap/package.json
index 27969ca463..1712ef5bfd 100644
--- a/plugins/catalog-backend-module-ldap/package.json
+++ b/plugins/catalog-backend-module-ldap/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-catalog-backend-module-ldap",
-  "version": "0.2.0",
+  "version": "0.3.0",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -29,16 +29,16 @@
   },
   "dependencies": {
     "@backstage/catalog-model": "^0.9.0",
-    "@backstage/config": "^0.1.5",
-    "@backstage/plugin-catalog-backend": "^0.12.0",
-    "@types/ldapjs": "^1.0.10",
+    "@backstage/config": "^0.1.7",
+    "@backstage/plugin-catalog-backend": "^0.13.3",
+    "@types/ldapjs": "^2.2.0",
     "ldapjs": "^2.2.0",
     "lodash": "^4.17.15",
     "winston": "^3.2.1"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.7.3",
-    "@backstage/test-utils": "^0.1.13",
+    "@backstage/cli": "^0.7.9",
+    "@backstage/test-utils": "^0.1.16",
     "@types/lodash": "^4.14.151",
     "msw": "^0.29.0"
   },
diff --git a/plugins/catalog-backend-module-ldap/src/ldap/client.ts b/plugins/catalog-backend-module-ldap/src/ldap/client.ts
index eddd4291d1..a36a96b638 100644
--- a/plugins/catalog-backend-module-ldap/src/ldap/client.ts
+++ b/plugins/catalog-backend-module-ldap/src/ldap/client.ts
@@ -51,7 +51,7 @@ export class LdapClient {
     });
 
     if (!bind) {
-      return new LdapClient(client);
+      return new LdapClient(client, logger);
     }
 
     return new Promise<LdapClient>((resolve, reject) => {
@@ -60,13 +60,16 @@ export class LdapClient {
         if (err) {
           reject(`LDAP bind failed for ${dn}, ${errorString(err)}`);
         } else {
-          resolve(new LdapClient(client));
+          resolve(new LdapClient(client, logger));
         }
       });
     });
   }
 
-  constructor(private readonly client: Client) {}
+  constructor(
+    private readonly client: Client,
+    private readonly logger: Logger,
+  ) {}
 
   /**
    * Performs an LDAP search operation.
@@ -76,9 +79,13 @@ export class LdapClient {
    */
   async search(dn: string, options: SearchOptions): Promise<SearchEntry[]> {
     try {
-      return await new Promise<SearchEntry[]>((resolve, reject) => {
-        const output: SearchEntry[] = [];
+      const output: SearchEntry[] = [];
 
+      const logInterval = setInterval(() => {
+        this.logger.debug(`Read ${output.length} LDAP entries so far...`);
+      }, 5000);
+
+      const search = new Promise<SearchEntry[]>((resolve, reject) => {
         this.client.search(dn, options, (err, res) => {
           if (err) {
             reject(new Error(errorString(err)));
@@ -108,6 +115,10 @@ export class LdapClient {
           });
         });
       });
+
+      return await search.finally(() => {
+        clearInterval(logInterval);
+      });
     } catch (e) {
       throw new Error(`LDAP search at DN "${dn}" failed, ${e.message}`);
     }
diff --git a/plugins/catalog-backend-module-ldap/src/ldap/read.test.ts b/plugins/catalog-backend-module-ldap/src/ldap/read.test.ts
index 3615d8b2ad..5674c041ab 100644
--- a/plugins/catalog-backend-module-ldap/src/ldap/read.test.ts
+++ b/plugins/catalog-backend-module-ldap/src/ldap/read.test.ts
@@ -174,7 +174,6 @@ describe('readLdapUsers', () => {
         });
       },
     );
-
     const config: UserConfig = {
       dn: 'ddd',
       options: {},
diff --git a/plugins/catalog-backend-module-ldap/src/ldap/read.ts b/plugins/catalog-backend-module-ldap/src/ldap/read.ts
index 37e69c5bcf..2d6e3c1608 100644
--- a/plugins/catalog-backend-module-ldap/src/ldap/read.ts
+++ b/plugins/catalog-backend-module-ldap/src/ldap/read.ts
@@ -38,7 +38,7 @@ export async function defaultUserTransformer(
   const { set, map } = config;
 
   const entity: UserEntity = {
-    apiVersion: 'backstage.io/v1alpha1',
+    apiVersion: 'backstage.io/v1beta1',
     kind: 'User',
     metadata: {
       name: '',
@@ -131,7 +131,7 @@ export async function defaultGroupTransformer(
 ): Promise<GroupEntity | undefined> {
   const { set, map } = config;
   const entity: GroupEntity = {
-    apiVersion: 'backstage.io/v1alpha1',
+    apiVersion: 'backstage.io/v1beta1',
     kind: 'Group',
     metadata: {
       name: '',
diff --git a/plugins/catalog-backend-module-ldap/src/processors/LdapOrgEntityProvider.ts b/plugins/catalog-backend-module-ldap/src/processors/LdapOrgEntityProvider.ts
new file mode 100644
index 0000000000..c0cd663052
--- /dev/null
+++ b/plugins/catalog-backend-module-ldap/src/processors/LdapOrgEntityProvider.ts
@@ -0,0 +1,204 @@
+/*
+ * Copyright 2021 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import {
+  Entity,
+  LOCATION_ANNOTATION,
+  ORIGIN_LOCATION_ANNOTATION,
+} from '@backstage/catalog-model';
+import { Config } from '@backstage/config';
+import {
+  EntityProvider,
+  EntityProviderConnection,
+} from '@backstage/plugin-catalog-backend';
+import { merge } from 'lodash';
+import { Logger } from 'winston';
+import {
+  GroupTransformer,
+  LdapClient,
+  LdapProviderConfig,
+  LDAP_DN_ANNOTATION,
+  readLdapConfig,
+  readLdapOrg,
+  UserTransformer,
+} from '../ldap';
+
+/**
+ * Reads user and group entries out of an LDAP service, and provides them as
+ * User and Group entities for the catalog.
+ */
+export class LdapOrgEntityProvider implements EntityProvider {
+  private connection?: EntityProviderConnection;
+
+  static fromConfig(
+    configRoot: Config,
+    options: {
+      /**
+       * A unique, stable identifier for this provider.
+       *
+       * @example "production"
+       */
+      id: string;
+      /**
+       * The target that this provider should consume.
+       *
+       * Should exactly match the "target" field of one of the "ldap.providers"
+       * configuration entries.
+       *
+       * @example "ldaps://ds-read.example.net"
+       */
+      target: string;
+      /**
+       * The function that transforms a user entry in LDAP to an entity.
+       */
+      userTransformer?: UserTransformer;
+      /**
+       * The function that transforms a group entry in LDAP to an entity.
+       */
+      groupTransformer?: GroupTransformer;
+      logger: Logger;
+    },
+  ): LdapOrgEntityProvider {
+    // TODO(freben): Deprecate the old catalog.processors.ldapOrg config
+    const config =
+      configRoot.getOptionalConfig('ldap') ||
+      configRoot.getOptionalConfig('catalog.processors.ldapOrg');
+    if (!config) {
+      throw new TypeError(
+        `There is no LDAP configuration. Please add it as "ldap.providers".`,
+      );
+    }
+
+    const providers = readLdapConfig(config);
+    const provider = providers.find(p => options.target === p.target);
+    if (!provider) {
+      throw new TypeError(
+        `There is no LDAP configuration that matches ${options.target}. Please add a configuration entry for it under "ldap.providers".`,
+      );
+    }
+
+    const logger = options.logger.child({
+      target: options.target,
+    });
+
+    return new LdapOrgEntityProvider({
+      id: options.id,
+      provider,
+      userTransformer: options.userTransformer,
+      groupTransformer: options.groupTransformer,
+      logger,
+    });
+  }
+
+  constructor(
+    private options: {
+      id: string;
+      provider: LdapProviderConfig;
+      logger: Logger;
+      userTransformer?: UserTransformer;
+      groupTransformer?: GroupTransformer;
+    },
+  ) {}
+
+  getProviderName() {
+    return `LdapOrgEntityProvider:${this.options.id}`;
+  }
+
+  async connect(connection: EntityProviderConnection) {
+    this.connection = connection;
+  }
+
+  async read() {
+    if (!this.connection) {
+      throw new Error('Not initialized');
+    }
+
+    const { markReadComplete } = trackProgress(this.options.logger);
+
+    // Be lazy and create the client each time; even though it's pretty
+    // inefficient, we usually only do this once per entire refresh loop and
+    // don't have to worry about timeouts and reconnects etc.
+    const client = await LdapClient.create(
+      this.options.logger,
+      this.options.provider.target,
+      this.options.provider.bind,
+    );
+
+    const { users, groups } = await readLdapOrg(
+      client,
+      this.options.provider.users,
+      this.options.provider.groups,
+      {
+        groupTransformer: this.options.groupTransformer,
+        userTransformer: this.options.userTransformer,
+        logger: this.options.logger,
+      },
+    );
+
+    const { markCommitComplete } = markReadComplete({ users, groups });
+
+    await this.connection.applyMutation({
+      type: 'full',
+      entities: [...users, ...groups].map(entity => ({
+        locationKey: `ldap-org-provider:${this.options.id}`,
+        entity: withLocations(this.options.id, entity),
+      })),
+    });
+
+    markCommitComplete();
+  }
+}
+
+// Helps wrap the timing and logging behaviors
+function trackProgress(logger: Logger) {
+  let timestamp = Date.now();
+  let summary: string;
+
+  logger.info('Reading LDAP users and groups');
+
+  function markReadComplete(read: { users: unknown[]; groups: unknown[] }) {
+    summary = `${read.users.length} LDAP users and ${read.groups.length} LDAP groups`;
+    const readDuration = ((Date.now() - timestamp) / 1000).toFixed(1);
+    timestamp = Date.now();
+    logger.info(`Read ${summary} in ${readDuration} seconds. Committing...`);
+    return { markCommitComplete };
+  }
+
+  function markCommitComplete() {
+    const commitDuration = ((Date.now() - timestamp) / 1000).toFixed(1);
+    logger.info(`Committed ${summary} in ${commitDuration} seconds.`);
+  }
+
+  return { markReadComplete };
+}
+
+// Makes sure that emitted entities have a proper location based on their DN
+function withLocations(providerId: string, entity: Entity): Entity {
+  const dn =
+    entity.metadata.annotations?.[LDAP_DN_ANNOTATION] || entity.metadata.name;
+  const location = `ldap://${providerId}/${encodeURIComponent(dn)}`;
+  return merge(
+    {
+      metadata: {
+        annotations: {
+          [LOCATION_ANNOTATION]: location,
+          [ORIGIN_LOCATION_ANNOTATION]: location,
+        },
+      },
+    },
+    entity,
+  ) as Entity;
+}
diff --git a/plugins/catalog-backend-module-ldap/src/processors/index.ts b/plugins/catalog-backend-module-ldap/src/processors/index.ts
index 6e3f413085..96e1a49cbb 100644
--- a/plugins/catalog-backend-module-ldap/src/processors/index.ts
+++ b/plugins/catalog-backend-module-ldap/src/processors/index.ts
@@ -13,4 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
+export { LdapOrgEntityProvider } from './LdapOrgEntityProvider';
 export { LdapOrgReaderProcessor } from './LdapOrgReaderProcessor';
diff --git a/plugins/catalog-backend-module-msgraph/CHANGELOG.md b/plugins/catalog-backend-module-msgraph/CHANGELOG.md
index 1f23da520f..b226c749aa 100644
--- a/plugins/catalog-backend-module-msgraph/CHANGELOG.md
+++ b/plugins/catalog-backend-module-msgraph/CHANGELOG.md
@@ -1,5 +1,22 @@
 # @backstage/plugin-catalog-backend-module-msgraph
 
+## 0.2.3
+
+### Patch Changes
+
+- 77cdc5a84: Pass along a `UserTransformer` to the read step
+- be498d22f: Pass along a `OrganizationTransformer` to the read step
+- Updated dependencies
+  - @backstage/plugin-catalog-backend@0.13.3
+  - @backstage/config@0.1.7
+
+## 0.2.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-backend@0.13.0
+
 ## 0.2.1
 
 ### Patch Changes
diff --git a/plugins/catalog-backend-module-msgraph/README.md b/plugins/catalog-backend-module-msgraph/README.md
index df141901aa..5dedb800f1 100644
--- a/plugins/catalog-backend-module-msgraph/README.md
+++ b/plugins/catalog-backend-module-msgraph/README.md
@@ -89,9 +89,11 @@ export async function myGroupTransformer(
   groupPhoto?: string,
 ): Promise<GroupEntity | undefined> {
   if (
-    ((group as unknown) as {
-      creationOptions: string[];
-    }).creationOptions.includes('ProvisionGroupHomepage')
+    (
+      group as unknown as {
+        creationOptions: string[];
+      }
+    ).creationOptions.includes('ProvisionGroupHomepage')
   ) {
     return undefined;
   }
diff --git a/plugins/catalog-backend-module-msgraph/api-report.md b/plugins/catalog-backend-module-msgraph/api-report.md
index 1fae2731ad..7a10ad2995 100644
--- a/plugins/catalog-backend-module-msgraph/api-report.md
+++ b/plugins/catalog-backend-module-msgraph/api-report.md
@@ -13,45 +13,63 @@ import * as MicrosoftGraph from '@microsoft/microsoft-graph-types';
 import * as msal from '@azure/msal-node';
 import { UserEntity } from '@backstage/catalog-model';
 
+// Warning: (ae-missing-release-tag) "defaultGroupTransformer" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export function defaultGroupTransformer(
   group: MicrosoftGraph.Group,
   groupPhoto?: string,
 ): Promise<GroupEntity | undefined>;
 
+// Warning: (ae-missing-release-tag) "defaultOrganizationTransformer" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export function defaultOrganizationTransformer(
   organization: MicrosoftGraph.Organization,
 ): Promise<GroupEntity | undefined>;
 
+// Warning: (ae-missing-release-tag) "defaultUserTransformer" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export function defaultUserTransformer(
   user: MicrosoftGraph.User,
   userPhoto?: string,
 ): Promise<UserEntity | undefined>;
 
+// Warning: (ae-missing-release-tag) "GroupTransformer" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export type GroupTransformer = (
   group: MicrosoftGraph.Group,
   groupPhoto?: string,
 ) => Promise<GroupEntity | undefined>;
 
+// Warning: (ae-missing-release-tag) "MICROSOFT_GRAPH_GROUP_ID_ANNOTATION" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public
 export const MICROSOFT_GRAPH_GROUP_ID_ANNOTATION =
   'graph.microsoft.com/group-id';
 
+// Warning: (ae-missing-release-tag) "MICROSOFT_GRAPH_TENANT_ID_ANNOTATION" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public
 export const MICROSOFT_GRAPH_TENANT_ID_ANNOTATION =
   'graph.microsoft.com/tenant-id';
 
+// Warning: (ae-missing-release-tag) "MICROSOFT_GRAPH_USER_ID_ANNOTATION" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public
 export const MICROSOFT_GRAPH_USER_ID_ANNOTATION = 'graph.microsoft.com/user-id';
 
+// Warning: (ae-missing-release-tag) "MicrosoftGraphClient" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export class MicrosoftGraphClient {
   constructor(baseUrl: string, pca: msal.ConfidentialClientApplication);
   // (undocumented)
   static create(config: MicrosoftGraphProviderConfig): MicrosoftGraphClient;
+  // Warning: (ae-forgotten-export) The symbol "GroupMember" needs to be exported by the entry point index.d.ts
+  //
   // (undocumented)
   getGroupMembers(groupId: string): AsyncIterable<GroupMember>;
   // (undocumented)
@@ -78,25 +96,33 @@ export class MicrosoftGraphClient {
   getUsers(query?: ODataQuery): AsyncIterable<MicrosoftGraph.User>;
   // (undocumented)
   requestApi(path: string, query?: ODataQuery): Promise<Response>;
+  // Warning: (ae-forgotten-export) The symbol "ODataQuery" needs to be exported by the entry point index.d.ts
+  //
   // (undocumented)
   requestCollection<T>(path: string, query?: ODataQuery): AsyncIterable<T>;
   // (undocumented)
   requestRaw(url: string): Promise<Response>;
 }
 
+// Warning: (ae-missing-release-tag) "MicrosoftGraphOrgReaderProcessor" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public
 export class MicrosoftGraphOrgReaderProcessor implements CatalogProcessor {
   constructor(options: {
     providers: MicrosoftGraphProviderConfig[];
     logger: Logger_2;
+    userTransformer?: UserTransformer;
     groupTransformer?: GroupTransformer;
+    organizationTransformer?: OrganizationTransformer;
   });
   // (undocumented)
   static fromConfig(
     config: Config,
     options: {
       logger: Logger_2;
+      userTransformer?: UserTransformer;
       groupTransformer?: GroupTransformer;
+      organizationTransformer?: OrganizationTransformer;
     },
   ): MicrosoftGraphOrgReaderProcessor;
   // (undocumented)
@@ -107,6 +133,8 @@ export class MicrosoftGraphOrgReaderProcessor implements CatalogProcessor {
   ): Promise<boolean>;
 }
 
+// Warning: (ae-missing-release-tag) "MicrosoftGraphProviderConfig" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public
 export type MicrosoftGraphProviderConfig = {
   target: string;
@@ -118,19 +146,27 @@ export type MicrosoftGraphProviderConfig = {
   groupFilter?: string;
 };
 
+// Warning: (ae-missing-release-tag) "normalizeEntityName" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export function normalizeEntityName(name: string): string;
 
+// Warning: (ae-missing-release-tag) "OrganizationTransformer" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export type OrganizationTransformer = (
   organization: MicrosoftGraph.Organization,
 ) => Promise<GroupEntity | undefined>;
 
+// Warning: (ae-missing-release-tag) "readMicrosoftGraphConfig" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export function readMicrosoftGraphConfig(
   config: Config,
 ): MicrosoftGraphProviderConfig[];
 
+// Warning: (ae-missing-release-tag) "readMicrosoftGraphOrg" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export function readMicrosoftGraphOrg(
   client: MicrosoftGraphClient,
@@ -138,7 +174,9 @@ export function readMicrosoftGraphOrg(
   options: {
     userFilter?: string;
     groupFilter?: string;
+    userTransformer?: UserTransformer;
     groupTransformer?: GroupTransformer;
+    organizationTransformer?: OrganizationTransformer;
     logger: Logger_2;
   },
 ): Promise<{
@@ -146,11 +184,17 @@ export function readMicrosoftGraphOrg(
   groups: GroupEntity[];
 }>;
 
+// Warning: (ae-missing-release-tag) "UserTransformer" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export type UserTransformer = (
   user: MicrosoftGraph.User,
   userPhoto?: string,
 ) => Promise<UserEntity | undefined>;
 
+// Warnings were encountered during analysis:
+//
+// src/microsoftGraph/config.d.ts:28:8 - (tsdoc-undefined-tag) The TSDoc tag "@visibility" is not defined in this configuration
+
 // (No @packageDocumentation comment for this package)
 ```
diff --git a/plugins/catalog-backend-module-msgraph/package.json b/plugins/catalog-backend-module-msgraph/package.json
index 3d24b9efd6..f9a13b41ee 100644
--- a/plugins/catalog-backend-module-msgraph/package.json
+++ b/plugins/catalog-backend-module-msgraph/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-catalog-backend-module-msgraph",
-  "version": "0.2.1",
+  "version": "0.2.3",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -30,8 +30,8 @@
   "dependencies": {
     "@azure/msal-node": "^1.1.0",
     "@backstage/catalog-model": "^0.9.0",
-    "@backstage/config": "^0.1.5",
-    "@backstage/plugin-catalog-backend": "^0.12.0",
+    "@backstage/config": "^0.1.8",
+    "@backstage/plugin-catalog-backend": "^0.13.5",
     "@microsoft/microsoft-graph-types": "^1.25.0",
     "cross-fetch": "^3.0.6",
     "lodash": "^4.17.15",
@@ -40,8 +40,8 @@
     "qs": "^6.9.4"
   },
   "devDependencies": {
-    "@backstage/backend-common": "^0.8.5",
-    "@backstage/cli": "^0.7.3",
+    "@backstage/backend-common": "^0.9.0",
+    "@backstage/cli": "^0.7.9",
     "@backstage/test-utils": "^0.1.14",
     "@types/lodash": "^4.14.151",
     "msw": "^0.29.0"
diff --git a/plugins/catalog-backend-module-msgraph/src/microsoftGraph/client.test.ts b/plugins/catalog-backend-module-msgraph/src/microsoftGraph/client.test.ts
index 2b5e72033b..cefa4a52ce 100644
--- a/plugins/catalog-backend-module-msgraph/src/microsoftGraph/client.test.ts
+++ b/plugins/catalog-backend-module-msgraph/src/microsoftGraph/client.test.ts
@@ -21,9 +21,10 @@ import { setupServer } from 'msw/node';
 import { MicrosoftGraphClient } from './client';
 
 describe('MicrosoftGraphClient', () => {
-  const confidentialClientApplication: jest.Mocked<msal.ConfidentialClientApplication> = {
-    acquireTokenByClientCredential: jest.fn(),
-  } as any;
+  const confidentialClientApplication: jest.Mocked<msal.ConfidentialClientApplication> =
+    {
+      acquireTokenByClientCredential: jest.fn(),
+    } as any;
   let client: MicrosoftGraphClient;
   const worker = setupServer();
 
diff --git a/plugins/catalog-backend-module-msgraph/src/microsoftGraph/read.test.ts b/plugins/catalog-backend-module-msgraph/src/microsoftGraph/read.test.ts
index 929d01e128..82279b76c6 100644
--- a/plugins/catalog-backend-module-msgraph/src/microsoftGraph/read.test.ts
+++ b/plugins/catalog-backend-module-msgraph/src/microsoftGraph/read.test.ts
@@ -114,6 +114,48 @@ describe('read microsoft graph', () => {
       expect(client.getUserPhotoWithSizeLimit).toBeCalledTimes(1);
       expect(client.getUserPhotoWithSizeLimit).toBeCalledWith('userid', 120);
     });
+
+    it('should read users with custom transformer', async () => {
+      async function* getExampleUsers() {
+        yield {
+          id: 'userid',
+          displayName: 'User Name',
+          mail: 'user.name@example.com',
+        };
+      }
+
+      client.getUsers.mockImplementation(getExampleUsers);
+      client.getUserPhotoWithSizeLimit.mockResolvedValue(
+        'data:image/jpeg;base64,...',
+      );
+
+      const { users } = await readMicrosoftGraphUsers(client, {
+        userFilter: 'accountEnabled eq true',
+        transformer: async () => ({
+          apiVersion: 'backstage.io/v1alpha1',
+          kind: 'User',
+          metadata: { name: 'x' },
+          spec: { memberOf: [] },
+        }),
+        logger: getVoidLogger(),
+      });
+
+      expect(users).toEqual([
+        {
+          apiVersion: 'backstage.io/v1alpha1',
+          kind: 'User',
+          metadata: { name: 'x' },
+          spec: { memberOf: [] },
+        },
+      ]);
+
+      expect(client.getUsers).toBeCalledTimes(1);
+      expect(client.getUsers).toBeCalledWith({
+        filter: 'accountEnabled eq true',
+      });
+      expect(client.getUserPhotoWithSizeLimit).toBeCalledTimes(1);
+      expect(client.getUserPhotoWithSizeLimit).toBeCalledWith('userid', 120);
+    });
   });
 
   describe('readMicrosoftGraphOrganization', () => {
@@ -202,14 +244,10 @@ describe('read microsoft graph', () => {
         'data:image/jpeg;base64,...',
       );
 
-      const {
-        groups,
-        groupMember,
-        groupMemberOf,
-        rootGroup,
-      } = await readMicrosoftGraphGroups(client, 'tenantid', {
-        groupFilter: 'securityEnabled eq false',
-      });
+      const { groups, groupMember, groupMemberOf, rootGroup } =
+        await readMicrosoftGraphGroups(client, 'tenantid', {
+          groupFilter: 'securityEnabled eq false',
+        });
 
       const expectedRootGroup = group({
         metadata: {
diff --git a/plugins/catalog-backend-module-msgraph/src/microsoftGraph/read.ts b/plugins/catalog-backend-module-msgraph/src/microsoftGraph/read.ts
index a9e2465ad7..096cf8a479 100644
--- a/plugins/catalog-backend-module-msgraph/src/microsoftGraph/read.ts
+++ b/plugins/catalog-backend-module-msgraph/src/microsoftGraph/read.ts
@@ -20,6 +20,7 @@ import {
 } from '@backstage/catalog-model';
 import * as MicrosoftGraph from '@microsoft/microsoft-graph-types';
 import limiterFactory from 'p-limit';
+import { Logger } from 'winston';
 import { MicrosoftGraphClient } from './client';
 import {
   MICROSOFT_GRAPH_GROUP_ID_ANNOTATION,
@@ -33,7 +34,6 @@ import {
   OrganizationTransformer,
   UserTransformer,
 } from './types';
-import { Logger } from 'winston';
 
 export async function defaultUserTransformer(
   user: MicrosoftGraph.User,
@@ -212,7 +212,11 @@ export async function defaultGroupTransformer(
 export async function readMicrosoftGraphGroups(
   client: MicrosoftGraphClient,
   tenantId: string,
-  options?: { groupFilter?: string; transformer?: GroupTransformer },
+  options?: {
+    groupFilter?: string;
+    groupTransformer?: GroupTransformer;
+    organizationTransformer?: OrganizationTransformer;
+  },
 ): Promise<{
   groups: GroupEntity[]; // With all relations empty
   rootGroup: GroupEntity | undefined; // With all relations empty
@@ -224,13 +228,15 @@ export async function readMicrosoftGraphGroups(
   const groupMemberOf: Map<string, Set<string>> = new Map();
   const limiter = limiterFactory(10);
 
-  const { rootGroup } = await readMicrosoftGraphOrganization(client, tenantId);
+  const { rootGroup } = await readMicrosoftGraphOrganization(client, tenantId, {
+    transformer: options?.organizationTransformer,
+  });
   if (rootGroup) {
     groupMember.set(rootGroup.metadata.name, new Set<string>());
     groups.push(rootGroup);
   }
 
-  const transformer = options?.transformer ?? defaultGroupTransformer;
+  const transformer = options?.groupTransformer ?? defaultGroupTransformer;
   const promises: Promise<void>[] = [];
 
   for await (const group of client.getGroups({
@@ -318,14 +324,12 @@ export function resolveRelations(
 
   // Make sure every group (except root) has at least one parent. If the parent is missing, add the root.
   if (rootGroup) {
-    const tenantId = rootGroup.metadata.annotations![
-      MICROSOFT_GRAPH_TENANT_ID_ANNOTATION
-    ];
+    const tenantId =
+      rootGroup.metadata.annotations![MICROSOFT_GRAPH_TENANT_ID_ANNOTATION];
 
     groups.forEach(group => {
-      const groupId = group.metadata.annotations![
-        MICROSOFT_GRAPH_GROUP_ID_ANNOTATION
-      ];
+      const groupId =
+        group.metadata.annotations![MICROSOFT_GRAPH_GROUP_ID_ANNOTATION];
 
       if (!groupId) {
         return;
@@ -384,23 +388,23 @@ export async function readMicrosoftGraphOrg(
   options: {
     userFilter?: string;
     groupFilter?: string;
+    userTransformer?: UserTransformer;
     groupTransformer?: GroupTransformer;
+    organizationTransformer?: OrganizationTransformer;
     logger: Logger;
   },
 ): Promise<{ users: UserEntity[]; groups: GroupEntity[] }> {
   const { users } = await readMicrosoftGraphUsers(client, {
     userFilter: options.userFilter,
+    transformer: options.userTransformer,
     logger: options.logger,
   });
-  const {
-    groups,
-    rootGroup,
-    groupMember,
-    groupMemberOf,
-  } = await readMicrosoftGraphGroups(client, tenantId, {
-    groupFilter: options?.groupFilter,
-    transformer: options?.groupTransformer,
-  });
+  const { groups, rootGroup, groupMember, groupMemberOf } =
+    await readMicrosoftGraphGroups(client, tenantId, {
+      groupFilter: options?.groupFilter,
+      groupTransformer: options?.groupTransformer,
+      organizationTransformer: options?.organizationTransformer,
+    });
 
   resolveRelations(rootGroup, groups, users, groupMember, groupMemberOf);
   users.sort((a, b) => a.metadata.name.localeCompare(b.metadata.name));
diff --git a/plugins/catalog-backend-module-msgraph/src/processors/MicrosoftGraphOrgReaderProcessor.ts b/plugins/catalog-backend-module-msgraph/src/processors/MicrosoftGraphOrgReaderProcessor.ts
index 88240db618..161cc8799f 100644
--- a/plugins/catalog-backend-module-msgraph/src/processors/MicrosoftGraphOrgReaderProcessor.ts
+++ b/plugins/catalog-backend-module-msgraph/src/processors/MicrosoftGraphOrgReaderProcessor.ts
@@ -26,8 +26,10 @@ import {
   GroupTransformer,
   MicrosoftGraphClient,
   MicrosoftGraphProviderConfig,
+  OrganizationTransformer,
   readMicrosoftGraphConfig,
   readMicrosoftGraphOrg,
+  UserTransformer,
 } from '../microsoftGraph';
 
 /**
@@ -36,11 +38,18 @@ import {
 export class MicrosoftGraphOrgReaderProcessor implements CatalogProcessor {
   private readonly providers: MicrosoftGraphProviderConfig[];
   private readonly logger: Logger;
+  private readonly userTransformer?: UserTransformer;
   private readonly groupTransformer?: GroupTransformer;
+  private readonly organizationTransformer?: OrganizationTransformer;
 
   static fromConfig(
     config: Config,
-    options: { logger: Logger; groupTransformer?: GroupTransformer },
+    options: {
+      logger: Logger;
+      userTransformer?: UserTransformer;
+      groupTransformer?: GroupTransformer;
+      organizationTransformer?: OrganizationTransformer;
+    },
   ) {
     const c = config.getOptionalConfig('catalog.processors.microsoftGraphOrg');
     return new MicrosoftGraphOrgReaderProcessor({
@@ -52,11 +61,15 @@ export class MicrosoftGraphOrgReaderProcessor implements CatalogProcessor {
   constructor(options: {
     providers: MicrosoftGraphProviderConfig[];
     logger: Logger;
+    userTransformer?: UserTransformer;
     groupTransformer?: GroupTransformer;
+    organizationTransformer?: OrganizationTransformer;
   }) {
     this.providers = options.providers;
     this.logger = options.logger;
+    this.userTransformer = options.userTransformer;
     this.groupTransformer = options.groupTransformer;
+    this.organizationTransformer = options.organizationTransformer;
   }
 
   async readLocation(
@@ -89,7 +102,9 @@ export class MicrosoftGraphOrgReaderProcessor implements CatalogProcessor {
       {
         userFilter: provider.userFilter,
         groupFilter: provider.groupFilter,
+        userTransformer: this.userTransformer,
         groupTransformer: this.groupTransformer,
+        organizationTransformer: this.organizationTransformer,
         logger: this.logger,
       },
     );
diff --git a/plugins/catalog-backend/CHANGELOG.md b/plugins/catalog-backend/CHANGELOG.md
index bc8de4878d..ddf62aa655 100644
--- a/plugins/catalog-backend/CHANGELOG.md
+++ b/plugins/catalog-backend/CHANGELOG.md
@@ -1,5 +1,143 @@
 # @backstage/plugin-catalog-backend
 
+## 0.13.7
+
+### Patch Changes
+
+- ce17a1693: Allow the catalog search collator to filter the entities that it indexes
+- dbb952787: Use `ScmIntegrationRegistry#resolveUrl` in the placeholder processors instead of a custom implementation.
+
+  If you manually instantiate the `PlaceholderProcessor` (you most probably don't), add the new required constructor parameter:
+
+  ```diff
+  + import { ScmIntegrations } from '@backstage/integration';
+    // ...
+  + const integrations = ScmIntegrations.fromConfig(config);
+    // ...
+    new PlaceholderProcessor({
+      resolvers: placeholderResolvers,
+      reader,
+  +   integrations,
+    });
+  ```
+
+  All custom `PlaceholderResolver` can use the new `resolveUrl` parameter to resolve relative URLs.
+
+- 1797c5ce5: This change drops support for deprecated location types which have all been replaced by the `url` type.
+  There has been a deprecation warning in place since the beginning of this year so most should already be migrated and received information at this point.
+
+  The now removed location types are:
+
+  ```
+  github
+  github/api
+  bitbucket/api
+  gitlab/api
+  azure/api
+  ```
+
+- Updated dependencies
+  - @backstage/catalog-client@0.3.19
+  - @backstage/catalog-model@0.9.2
+  - @backstage/errors@0.1.2
+  - @backstage/config@0.1.9
+  - @backstage/backend-common@0.9.2
+
+## 0.13.6
+
+### Patch Changes
+
+- 4d62dc15b: GitHub discovery processor passes over repositories that do not have a default branch
+- 977b1dfbe: Adds optional namespacing for users in the GitHub Multi Org Plugin
+- Updated dependencies
+  - @backstage/integration@0.6.3
+  - @backstage/search-common@0.2.0
+  - @backstage/plugin-search-backend-node@0.4.2
+  - @backstage/catalog-model@0.9.1
+  - @backstage/backend-common@0.9.1
+
+## 0.13.5
+
+### Patch Changes
+
+- 8b39242c4: GitHub discovery processor adds support for discovering the default GitHub branch
+- 96785dce3: Added GitLabDiscoveryProcessor, which allows catalog discovery from a GitLab instance
+- Updated dependencies
+  - @backstage/backend-common@0.9.0
+  - @backstage/integration@0.6.2
+  - @backstage/config@0.1.8
+
+## 0.13.4
+
+### Patch Changes
+
+- 7ab55167d: Properly handle Date objects being returned for timestamps in the database driver
+
+## 0.13.3
+
+### Patch Changes
+
+- 61aa6526f: Avoid duplicate work by comparing previous processing rounds with the next
+- fe960ad0f: Updates the `DefaultProcessingDatabase` to accept a refresh interval function instead of a fixed refresh interval in seconds which used to default to 100s. The catalog now ships with a default refresh interval function that schedules entities for refresh every 100-150 seconds, this should
+  help to smooth out bursts that occur when a lot of entities are scheduled for refresh at the same second.
+
+  Custom `RefreshIntervalFunction` can be implemented and passed to the CatalogBuilder using `.setInterval(fn)`
+
+- 54b441abe: Export the entity provider related types for external use.
+- 03bb05af6: Enabled live reload of locations configured in `catalog.locations`.
+- 2766b2aa5: Add experimental Prometheus metrics instrumentation to the catalog
+- Updated dependencies
+  - @backstage/backend-common@0.8.10
+  - @backstage/config@0.1.7
+  - @backstage/integration@0.6.1
+
+## 0.13.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/integration@0.6.0
+  - @backstage/backend-common@0.8.9
+
+## 0.13.1
+
+### Patch Changes
+
+- 11c370af2: Support filtering entities via property existence. For example you can now query with `/entities?filter=metadata.annotations.blah` to fetch all entities that has the particular property defined.
+- Updated dependencies
+  - @backstage/catalog-client@0.3.18
+
+## 0.13.0
+
+### Minor Changes
+
+- 8bfc0571c: Add a default catalog value for BitBucketDiscoveryProcessor. This allows to have a target like so: https://bitbucket.mycompany.com/projects/backstage/repos/service-*
+  which will be expanded to https://bitbucket.mycompany.com/projects/backstage/repos/service-a/catalog-info.yaml given that repository 'service-a' exists.
+
+  ## Migration
+
+  If you are using a custom [Bitbucket parser](https://backstage.io/docs/integrations/bitbucket/discovery#custom-repository-processing) and your `bitbucket-discovery` target (e.g. in your app-config.yaml) omits the catalog path in any of the following ways:
+
+  - https://bitbucket.mycompany.com/projects/backstage/repos/service-*
+  - https://bitbucket.mycompany.com/projects/backstage/repos/*
+  - https://bitbucket.mycompany.com/projects/backstage/repos/*/
+
+  then you will be affected by this change.
+  The 'target' input to your parser before this commit would be '/', and after this commit it will be '/catalog-info.yaml', and as such needs to be handled to maintain the same functionality.
+
+### Patch Changes
+
+- 8b048934b: The codeowners processor extracts the username of the primary owner and uses this as the owner field.
+  Given the kind isn't specified this is assumed to be a group and so the link to the owner in the about card
+  doesn't work. This change specifies the kind where the entity is a user. e.g:
+
+  `@iain-b` -> `user:iain-b`
+
+- ae84b20cf: Revert the upgrade to `fs-extra@10.0.0` as that seemed to have broken all installs inexplicably.
+- Updated dependencies
+  - @backstage/backend-common@0.8.6
+  - @backstage/plugin-search-backend-node@0.4.0
+
 ## 0.12.0
 
 ### Minor Changes
@@ -403,13 +541,11 @@
   and lets the other processors take care of further processing.
 
   ```typescript
-  const customRepositoryParser: BitbucketRepositoryParser = async function* customRepositoryParser({
-    client,
-    repository,
-  }) {
-    // Custom logic for interpret the matching repository.
-    // See defaultRepositoryParser for an example
-  };
+  const customRepositoryParser: BitbucketRepositoryParser =
+    async function* customRepositoryParser({ client, repository }) {
+      // Custom logic for interpret the matching repository.
+      // See defaultRepositoryParser for an example
+    };
 
   const processor = BitbucketDiscoveryProcessor.fromConfig(env.config, {
     parser: customRepositoryParser,
@@ -881,7 +1017,6 @@
   spec:
     type: website
   ---
-
   ```
 
   This behaves now the same way as Kubernetes handles multiple documents in a single YAML file.
diff --git a/plugins/catalog-backend/api-report.md b/plugins/catalog-backend/api-report.md
index ae7559f5d1..9d542c674d 100644
--- a/plugins/catalog-backend/api-report.md
+++ b/plugins/catalog-backend/api-report.md
@@ -7,6 +7,8 @@
 
 import { Account } from 'aws-sdk/clients/organizations';
 import { BitbucketIntegration } from '@backstage/integration';
+import { CatalogApi } from '@backstage/catalog-client';
+import { CatalogEntitiesRequest } from '@backstage/catalog-client';
 import { Config } from '@backstage/config';
 import { DocumentCollator } from '@backstage/search-common';
 import { Entity } from '@backstage/catalog-model';
@@ -30,25 +32,64 @@ import { ScmIntegrations } from '@backstage/integration';
 import { UrlReader } from '@backstage/backend-common';
 import { Validators } from '@backstage/catalog-model';
 
+// Warning: (ae-missing-release-tag) "AddLocationResult" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export type AddLocationResult = {
   location: Location_2;
   entities: Entity[];
 };
 
+// Warning: (ae-missing-release-tag) "AnalyzeLocationEntityField" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
+// @public (undocumented)
+export type AnalyzeLocationEntityField = {
+  field: string;
+  state:
+    | 'analysisSuggestedValue'
+    | 'analysisSuggestedNoValue'
+    | 'needsUserInput';
+  value: string | null;
+  description: string;
+};
+
+// Warning: (ae-missing-release-tag) "AnalyzeLocationExistingEntity" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
+// @public (undocumented)
+export type AnalyzeLocationExistingEntity = {
+  location: LocationSpec;
+  isRegistered: boolean;
+  entity: Entity;
+};
+
+// Warning: (ae-missing-release-tag) "AnalyzeLocationGenerateEntity" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
+// @public (undocumented)
+export type AnalyzeLocationGenerateEntity = {
+  entity: RecursivePartial<Entity>;
+  fields: AnalyzeLocationEntityField[];
+};
+
+// Warning: (ae-missing-release-tag) "AnalyzeLocationRequest" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export type AnalyzeLocationRequest = {
   location: LocationSpec;
 };
 
+// Warning: (ae-missing-release-tag) "AnalyzeLocationResponse" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export type AnalyzeLocationResponse = {
   existingEntityFiles: AnalyzeLocationExistingEntity[];
   generateEntities: AnalyzeLocationGenerateEntity[];
 };
 
+// Warning: (ae-missing-release-tag) "AnnotateLocationEntityProcessor" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export class AnnotateLocationEntityProcessor implements CatalogProcessor {
+  // Warning: (ae-forgotten-export) The symbol "Options" needs to be exported by the entry point index.d.ts
   constructor(options: Options_2);
   // (undocumented)
   preProcessEntity(
@@ -59,6 +100,8 @@ export class AnnotateLocationEntityProcessor implements CatalogProcessor {
   ): Promise<Entity>;
 }
 
+// Warning: (ae-missing-release-tag) "AnnotateScmSlugEntityProcessor" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export class AnnotateScmSlugEntityProcessor implements CatalogProcessor {
   constructor(opts: { scmIntegrationRegistry: ScmIntegrationRegistry });
@@ -68,6 +111,8 @@ export class AnnotateScmSlugEntityProcessor implements CatalogProcessor {
   preProcessEntity(entity: Entity, location: LocationSpec): Promise<Entity>;
 }
 
+// Warning: (ae-missing-release-tag) "AwsOrganizationCloudAccountProcessor" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public
 export class AwsOrganizationCloudAccountProcessor implements CatalogProcessor {
   constructor(options: {
@@ -75,9 +120,7 @@ export class AwsOrganizationCloudAccountProcessor implements CatalogProcessor {
     logger: Logger_2;
   });
   // (undocumented)
-  extractInformationFromArn(
-    arn: string,
-  ): {
+  extractInformationFromArn(arn: string): {
     accountId: string;
     organizationId: string;
   };
@@ -108,6 +151,15 @@ export class AwsOrganizationCloudAccountProcessor implements CatalogProcessor {
   ): Promise<boolean>;
 }
 
+// Warning: (ae-missing-release-tag) "AwsOrganizationProviderConfig" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
+// @public
+export type AwsOrganizationProviderConfig = {
+  roleArn?: string;
+};
+
+// Warning: (ae-missing-release-tag) "BitbucketDiscoveryProcessor" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export class BitbucketDiscoveryProcessor implements CatalogProcessor {
   constructor(options: {
@@ -131,6 +183,8 @@ export class BitbucketDiscoveryProcessor implements CatalogProcessor {
   ): Promise<boolean>;
 }
 
+// Warning: (ae-missing-release-tag) "BitbucketRepositoryParser" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export type BitbucketRepositoryParser = (options: {
   integration: BitbucketIntegration;
@@ -138,6 +192,8 @@ export type BitbucketRepositoryParser = (options: {
   logger: Logger_2;
 }) => AsyncIterable<CatalogProcessorResult>;
 
+// Warning: (ae-missing-release-tag) "BuiltinKindsEntityProcessor" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export class BuiltinKindsEntityProcessor implements CatalogProcessor {
   // (undocumented)
@@ -150,10 +206,14 @@ export class BuiltinKindsEntityProcessor implements CatalogProcessor {
   validateEntityKind(entity: Entity): Promise<boolean>;
 }
 
+// Warning: (ae-missing-release-tag) "CatalogBuilder" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public
 export class CatalogBuilder {
   constructor(env: CatalogEnvironment);
+  // Warning: (tsdoc-param-tag-missing-hyphen) The @param block should be followed by a parameter name and then a hyphen
   addEntityPolicy(...policies: EntityPolicy[]): CatalogBuilder;
+  // Warning: (tsdoc-param-tag-missing-hyphen) The @param block should be followed by a parameter name and then a hyphen
   addProcessor(...processors: CatalogProcessor[]): CatalogBuilder;
   build(): Promise<{
     entitiesCatalog: EntitiesCatalog;
@@ -163,16 +223,24 @@ export class CatalogBuilder {
   }>;
   // (undocumented)
   static create(env: CatalogEnvironment): Promise<NextCatalogBuilder>;
+  // Warning: (tsdoc-param-tag-missing-hyphen) The @param block should be followed by a parameter name and then a hyphen
   replaceEntityPolicies(policies: EntityPolicy[]): CatalogBuilder;
+  // Warning: (tsdoc-param-tag-missing-hyphen) The @param block should be followed by a parameter name and then a hyphen
   replaceProcessors(processors: CatalogProcessor[]): CatalogBuilder;
+  // Warning: (tsdoc-param-tag-missing-hyphen) The @param block should be followed by a parameter name and then a hyphen
   setEntityDataParser(parser: CatalogProcessorParser): CatalogBuilder;
+  // Warning: (tsdoc-param-tag-missing-hyphen) The @param block should be followed by a parameter name and then a hyphen
   setFieldFormatValidators(validators: Partial<Validators>): CatalogBuilder;
+  // Warning: (tsdoc-param-tag-missing-hyphen) The @param block should be followed by a parameter name and then a hyphen
+  // Warning: (tsdoc-param-tag-missing-hyphen) The @param block should be followed by a parameter name and then a hyphen
   setPlaceholderResolver(
     key: string,
     resolver: PlaceholderResolver,
   ): CatalogBuilder;
 }
 
+// Warning: (ae-missing-release-tag) "CatalogEntityDocument" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export interface CatalogEntityDocument extends IndexableDocument {
   // (undocumented)
@@ -187,12 +255,36 @@ export interface CatalogEntityDocument extends IndexableDocument {
   owner: string;
 }
 
+// Warning: (ae-missing-release-tag) "CatalogEnvironment" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
+// @public (undocumented)
+export type CatalogEnvironment = {
+  logger: Logger_2;
+  database: PluginDatabaseManager;
+  config: Config;
+  reader: UrlReader;
+};
+
+// Warning: (ae-missing-release-tag) "CatalogProcessingEngine" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
+// @public (undocumented)
+export interface CatalogProcessingEngine {
+  // (undocumented)
+  start(): Promise<void>;
+  // (undocumented)
+  stop(): Promise<void>;
+}
+
+// Warning: (ae-missing-release-tag) "CatalogProcessingOrchestrator" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export interface CatalogProcessingOrchestrator {
   // (undocumented)
   process(request: EntityProcessingRequest): Promise<EntityProcessingResult>;
 }
 
+// Warning: (ae-missing-release-tag) "CatalogProcessor" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export type CatalogProcessor = {
   readLocation?(
@@ -220,9 +312,13 @@ export type CatalogProcessor = {
   ): Promise<void>;
 };
 
+// Warning: (ae-missing-release-tag) "CatalogProcessorEmit" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export type CatalogProcessorEmit = (generated: CatalogProcessorResult) => void;
 
+// Warning: (ae-missing-release-tag) "CatalogProcessorEntityResult" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export type CatalogProcessorEntityResult = {
   type: 'entity';
@@ -230,6 +326,8 @@ export type CatalogProcessorEntityResult = {
   location: LocationSpec;
 };
 
+// Warning: (ae-missing-release-tag) "CatalogProcessorErrorResult" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export type CatalogProcessorErrorResult = {
   type: 'error';
@@ -237,6 +335,8 @@ export type CatalogProcessorErrorResult = {
   location: LocationSpec;
 };
 
+// Warning: (ae-missing-release-tag) "CatalogProcessorLocationResult" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export type CatalogProcessorLocationResult = {
   type: 'location';
@@ -244,12 +344,16 @@ export type CatalogProcessorLocationResult = {
   optional: boolean;
 };
 
+// Warning: (ae-missing-release-tag) "CatalogProcessorParser" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public
 export type CatalogProcessorParser = (options: {
   data: Buffer;
   location: LocationSpec;
 }) => AsyncIterable<CatalogProcessorResult>;
 
+// Warning: (ae-missing-release-tag) "CatalogProcessorRelationResult" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export type CatalogProcessorRelationResult = {
   type: 'relation';
@@ -257,6 +361,8 @@ export type CatalogProcessorRelationResult = {
   entityRef?: string;
 };
 
+// Warning: (ae-missing-release-tag) "CatalogProcessorResult" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export type CatalogProcessorResult =
   | CatalogProcessorLocationResult
@@ -264,6 +370,8 @@ export type CatalogProcessorResult =
   | CatalogProcessorRelationResult
   | CatalogProcessorErrorResult;
 
+// Warning: (ae-missing-release-tag) "CodeOwnersProcessor" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export class CodeOwnersProcessor implements CatalogProcessor {
   constructor(options: {
@@ -283,6 +391,8 @@ export class CodeOwnersProcessor implements CatalogProcessor {
   preProcessEntity(entity: Entity, location: LocationSpec): Promise<Entity>;
 }
 
+// Warning: (ae-missing-release-tag) "CommonDatabase" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public
 export class CommonDatabase implements Database {
   constructor(database: Knex, logger: Logger_2);
@@ -345,14 +455,37 @@ export class CommonDatabase implements Database {
   ): Promise<DbEntityResponse>;
 }
 
+// Warning: (ae-missing-release-tag) "CreateDatabaseOptions" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
+// @public (undocumented)
+export type CreateDatabaseOptions = {
+  logger: Logger_2;
+};
+
+// Warning: (ae-missing-release-tag) "createNextRouter" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export function createNextRouter(
-  options: RouterOptions_2,
+  options: NextRouterOptions,
 ): Promise<express.Router>;
 
+// Warning: (tsdoc-escape-right-brace) The "}" character should be escaped using a backslash to avoid confusion with a TSDoc inline tag
+// Warning: (tsdoc-malformed-inline-tag) Expecting a TSDoc tag starting with "{@"
+// Warning: (ae-missing-release-tag) "createRandomRefreshInterval" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
+// @public
+export function createRandomRefreshInterval(options: {
+  minSeconds: number;
+  maxSeconds: number;
+}): RefreshIntervalFunction;
+
+// Warning: (ae-missing-release-tag) "createRouter" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export function createRouter(options: RouterOptions): Promise<express.Router>;
 
+// Warning: (ae-missing-release-tag) "Database" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public
 export type Database = {
   transaction<T>(fn: (tx: Transaction) => Promise<T>): Promise<T>;
@@ -397,6 +530,8 @@ export type Database = {
   ): Promise<void>;
 };
 
+// Warning: (ae-missing-release-tag) "DatabaseEntitiesCatalog" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export class DatabaseEntitiesCatalog implements EntitiesCatalog {
   constructor(database: Database, logger: Logger_2);
@@ -415,6 +550,8 @@ export class DatabaseEntitiesCatalog implements EntitiesCatalog {
   removeEntityByUid(uid: string): Promise<void>;
 }
 
+// Warning: (ae-missing-release-tag) "DatabaseLocationsCatalog" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export class DatabaseLocationsCatalog implements LocationsCatalog {
   constructor(database: Database);
@@ -441,6 +578,30 @@ export class DatabaseLocationsCatalog implements LocationsCatalog {
   removeLocation(id: string): Promise<void>;
 }
 
+// Warning: (ae-missing-release-tag) "DatabaseLocationUpdateLogEvent" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
+// @public (undocumented)
+export type DatabaseLocationUpdateLogEvent = {
+  id: string;
+  status: DatabaseLocationUpdateLogStatus;
+  location_id: string;
+  entity_name: string;
+  created_at?: string;
+  message?: string;
+};
+
+// Warning: (ae-missing-release-tag) "DatabaseLocationUpdateLogStatus" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
+// @public (undocumented)
+export enum DatabaseLocationUpdateLogStatus {
+  // (undocumented)
+  FAIL = 'fail',
+  // (undocumented)
+  SUCCESS = 'success',
+}
+
+// Warning: (ae-missing-release-tag) "DatabaseManager" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export class DatabaseManager {
   // (undocumented)
@@ -458,6 +619,24 @@ export class DatabaseManager {
   static createTestDatabaseConnection(): Promise<Knex>;
 }
 
+// Warning: (ae-missing-release-tag) "DbEntitiesRequest" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
+// @public (undocumented)
+export type DbEntitiesRequest = {
+  filter?: EntityFilter;
+  pagination?: EntityPagination;
+};
+
+// Warning: (ae-missing-release-tag) "DbEntitiesResponse" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
+// @public (undocumented)
+export type DbEntitiesResponse = {
+  entities: DbEntityResponse[];
+  pageInfo: DbPageInfo;
+};
+
+// Warning: (ae-missing-release-tag) "DbEntityRequest" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export type DbEntityRequest = {
   locationId?: string;
@@ -465,20 +644,58 @@ export type DbEntityRequest = {
   relations: EntityRelationSpec[];
 };
 
+// Warning: (ae-missing-release-tag) "DbEntityResponse" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export type DbEntityResponse = {
   locationId?: string;
   entity: Entity;
 };
 
+// Warning: (ae-missing-release-tag) "DbLocationsRow" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
+// @public (undocumented)
+export type DbLocationsRow = {
+  id: string;
+  type: string;
+  target: string;
+};
+
+// Warning: (ae-missing-release-tag) "DbLocationsRowWithStatus" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
+// @public (undocumented)
+export type DbLocationsRowWithStatus = DbLocationsRow & {
+  status: string | null;
+  timestamp: string | null;
+  message: string | null;
+};
+
+// Warning: (ae-missing-release-tag) "DbPageInfo" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
+// @public (undocumented)
+export type DbPageInfo =
+  | {
+      hasNextPage: false;
+    }
+  | {
+      hasNextPage: true;
+      endCursor: string;
+    };
+
+// Warning: (ae-missing-release-tag) "DefaultCatalogCollator" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export class DefaultCatalogCollator implements DocumentCollator {
   constructor({
     discovery,
     locationTemplate,
+    filter,
+    catalogClient,
   }: {
     discovery: PluginEndpointDiscovery;
     locationTemplate?: string;
+    filter?: CatalogEntitiesRequest['filter'];
+    catalogClient?: CatalogApi;
   });
   // (undocumented)
   protected applyArgsToFormat(
@@ -486,18 +703,33 @@ export class DefaultCatalogCollator implements DocumentCollator {
     args: Record<string, string>,
   ): string;
   // (undocumented)
+  protected readonly catalogClient: CatalogApi;
+  // (undocumented)
   protected discovery: PluginEndpointDiscovery;
   // (undocumented)
   execute(): Promise<CatalogEntityDocument[]>;
   // (undocumented)
+  protected filter?: CatalogEntitiesRequest['filter'];
+  // (undocumented)
+  static fromConfig(
+    _config: Config,
+    options: {
+      discovery: PluginEndpointDiscovery;
+      filter?: CatalogEntitiesRequest['filter'];
+    },
+  ): DefaultCatalogCollator;
+  // (undocumented)
   protected locationTemplate: string;
   // (undocumented)
   readonly type: string;
 }
 
+// Warning: (ae-missing-release-tag) "DefaultCatalogProcessingOrchestrator" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export class DefaultCatalogProcessingOrchestrator
-  implements CatalogProcessingOrchestrator {
+  implements CatalogProcessingOrchestrator
+{
   constructor(options: {
     processors: CatalogProcessor[];
     integrations: ScmIntegrationRegistry;
@@ -509,9 +741,22 @@ export class DefaultCatalogProcessingOrchestrator
   process(request: EntityProcessingRequest): Promise<EntityProcessingResult>;
 }
 
+// Warning: (ae-missing-release-tag) "DeferredEntity" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
+// @public (undocumented)
+export type DeferredEntity = {
+  entity: Entity;
+  locationKey?: string;
+};
+
+// Warning: (tsdoc-param-tag-missing-hyphen) The @param block should be followed by a parameter name and then a hyphen
+// Warning: (ae-missing-release-tag) "durationText" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public
 export function durationText(startTimestamp: [number, number]): string;
 
+// Warning: (ae-missing-release-tag) "EntitiesCatalog" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export type EntitiesCatalog = {
   entities(request?: EntitiesRequest): Promise<EntitiesResponse>;
@@ -526,18 +771,42 @@ export type EntitiesCatalog = {
   ): Promise<EntityUpsertResponse[]>;
 };
 
+// Warning: (ae-missing-release-tag) "EntitiesRequest" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
+// @public (undocumented)
+export type EntitiesRequest = {
+  filter?: EntityFilter;
+  fields?: (entity: Entity) => Entity;
+  pagination?: EntityPagination;
+};
+
+// Warning: (ae-missing-release-tag) "EntitiesResponse" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
+// @public (undocumented)
+export type EntitiesResponse = {
+  entities: Entity[];
+  pageInfo: PageInfo;
+};
+
+// Warning: (ae-missing-release-tag) "EntitiesSearchFilter" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public
 export type EntitiesSearchFilter = {
   key: string;
   matchValueIn?: string[];
+  matchValueExists?: boolean;
 };
 
+// Warning: (ae-missing-release-tag) "entity" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 function entity(
   atLocation: LocationSpec,
   newEntity: Entity,
 ): CatalogProcessorResult;
 
+// Warning: (ae-missing-release-tag) "EntityFilter" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public
 export type EntityFilter = {
   anyOf: {
@@ -545,6 +814,8 @@ export type EntityFilter = {
   }[];
 };
 
+// Warning: (ae-missing-release-tag) "EntityPagination" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public
 export type EntityPagination = {
   limit?: number;
@@ -552,12 +823,16 @@ export type EntityPagination = {
   after?: string;
 };
 
+// Warning: (ae-missing-release-tag) "EntityProcessingRequest" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export type EntityProcessingRequest = {
   entity: Entity;
   state: Map<string, JsonObject>;
 };
 
+// Warning: (ae-missing-release-tag) "EntityProcessingResult" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export type EntityProcessingResult =
   | {
@@ -573,6 +848,56 @@ export type EntityProcessingResult =
       errors: Error[];
     };
 
+// Warning: (ae-missing-release-tag) "EntityProvider" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
+// @public (undocumented)
+export interface EntityProvider {
+  // (undocumented)
+  connect(connection: EntityProviderConnection): Promise<void>;
+  // (undocumented)
+  getProviderName(): string;
+}
+
+// Warning: (ae-missing-release-tag) "EntityProviderConnection" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
+// @public (undocumented)
+export interface EntityProviderConnection {
+  // (undocumented)
+  applyMutation(mutation: EntityProviderMutation): Promise<void>;
+}
+
+// Warning: (ae-missing-release-tag) "EntityProviderMutation" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
+// @public (undocumented)
+export type EntityProviderMutation =
+  | {
+      type: 'full';
+      entities: DeferredEntity[];
+    }
+  | {
+      type: 'delta';
+      added: DeferredEntity[];
+      removed: DeferredEntity[];
+    };
+
+// Warning: (ae-missing-release-tag) "EntityUpsertRequest" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
+// @public (undocumented)
+export type EntityUpsertRequest = {
+  entity: Entity;
+  relations: EntityRelationSpec[];
+};
+
+// Warning: (ae-missing-release-tag) "EntityUpsertResponse" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
+// @public (undocumented)
+export type EntityUpsertResponse = {
+  entityId: string;
+  entity?: Entity;
+};
+
+// Warning: (ae-missing-release-tag) "FileReaderProcessor" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export class FileReaderProcessor implements CatalogProcessor {
   // (undocumented)
@@ -583,12 +908,16 @@ export class FileReaderProcessor implements CatalogProcessor {
   ): Promise<boolean>;
 }
 
+// Warning: (ae-missing-release-tag) "generalError" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 function generalError(
   atLocation: LocationSpec,
   message: string,
 ): CatalogProcessorResult;
 
+// Warning: (ae-missing-release-tag) "GithubDiscoveryProcessor" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public
 export class GithubDiscoveryProcessor implements CatalogProcessor {
   constructor(options: { integrations: ScmIntegrations; logger: Logger_2 });
@@ -629,6 +958,8 @@ export class GithubMultiOrgReaderProcessor implements CatalogProcessor {
   ): Promise<boolean>;
 }
 
+// Warning: (ae-missing-release-tag) "GithubOrgReaderProcessor" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public
 export class GithubOrgReaderProcessor implements CatalogProcessor {
   constructor(options: { integrations: ScmIntegrations; logger: Logger_2 });
@@ -647,6 +978,29 @@ export class GithubOrgReaderProcessor implements CatalogProcessor {
   ): Promise<boolean>;
 }
 
+// Warning: (ae-missing-release-tag) "GitLabDiscoveryProcessor" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
+// @public
+export class GitLabDiscoveryProcessor implements CatalogProcessor {
+  // (undocumented)
+  static fromConfig(
+    config: Config,
+    options: {
+      logger: Logger_2;
+    },
+  ): GitLabDiscoveryProcessor;
+  // (undocumented)
+  readLocation(
+    location: LocationSpec,
+    _optional: boolean,
+    emit: CatalogProcessorEmit,
+  ): Promise<boolean>;
+  // (undocumented)
+  updateLastActivity(): Promise<string | undefined>;
+}
+
+// Warning: (ae-missing-release-tag) "HigherOrderOperation" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export type HigherOrderOperation = {
   addLocation(
@@ -658,6 +1012,8 @@ export type HigherOrderOperation = {
   refreshAllLocations(): Promise<void>;
 };
 
+// Warning: (ae-missing-release-tag) "HigherOrderOperations" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public
 export class HigherOrderOperations implements HigherOrderOperation {
   constructor(
@@ -666,6 +1022,7 @@ export class HigherOrderOperations implements HigherOrderOperation {
     locationReader: LocationReader,
     logger: Logger_2,
   );
+  // Warning: (tsdoc-param-tag-missing-hyphen) The @param block should be followed by a parameter name and then a hyphen
   addLocation(
     spec: LocationSpec,
     options?: {
@@ -675,18 +1032,24 @@ export class HigherOrderOperations implements HigherOrderOperation {
   refreshAllLocations(): Promise<void>;
 }
 
+// Warning: (ae-missing-release-tag) "inputError" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 function inputError(
   atLocation: LocationSpec,
   message: string,
 ): CatalogProcessorResult;
 
+// Warning: (ae-missing-release-tag) "location" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 function location_2(
   newLocation: LocationSpec,
   optional: boolean,
 ): CatalogProcessorResult;
 
+// Warning: (ae-missing-release-tag) "LocationAnalyzer" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export type LocationAnalyzer = {
   analyzeLocation(
@@ -694,9 +1057,11 @@ export type LocationAnalyzer = {
   ): Promise<AnalyzeLocationResponse>;
 };
 
+// Warning: (ae-missing-release-tag) "LocationEntityProcessor" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export class LocationEntityProcessor implements CatalogProcessor {
-  constructor(options: Options_3);
+  constructor(options: LocationEntityProcessorOptions);
   // (undocumented)
   postProcessEntity(
     entity: Entity,
@@ -705,18 +1070,40 @@ export class LocationEntityProcessor implements CatalogProcessor {
   ): Promise<Entity>;
 }
 
+// Warning: (ae-missing-release-tag) "LocationEntityProcessorOptions" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
+// @public (undocumented)
+export type LocationEntityProcessorOptions = {
+  integrations: ScmIntegrationRegistry;
+};
+
+// Warning: (ae-missing-release-tag) "LocationReader" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export type LocationReader = {
   read(location: LocationSpec): Promise<ReadLocationResult>;
 };
 
+// Warning: (ae-missing-release-tag) "LocationReaders" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public
 export class LocationReaders implements LocationReader {
+  // Warning: (ae-forgotten-export) The symbol "Options" needs to be exported by the entry point index.d.ts
   constructor(options: Options);
   // (undocumented)
   read(location: LocationSpec): Promise<ReadLocationResult>;
 }
 
+// Warning: (ae-missing-release-tag) "LocationResponse" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
+// @public (undocumented)
+export type LocationResponse = {
+  data: Location_2;
+  currentStatus: LocationUpdateStatus;
+};
+
+// Warning: (ae-missing-release-tag) "LocationsCatalog" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export type LocationsCatalog = {
   addLocation(location: Location_2): Promise<Location_2>;
@@ -735,11 +1122,71 @@ export type LocationsCatalog = {
   ): Promise<void>;
 };
 
+// Warning: (ae-missing-release-tag) "LocationService" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
+// @public (undocumented)
+export interface LocationService {
+  // (undocumented)
+  createLocation(
+    spec: LocationSpec,
+    dryRun: boolean,
+  ): Promise<{
+    location: Location_2;
+    entities: Entity[];
+  }>;
+  // (undocumented)
+  deleteLocation(id: string): Promise<void>;
+  // (undocumented)
+  getLocation(id: string): Promise<Location_2>;
+  // (undocumented)
+  listLocations(): Promise<Location_2[]>;
+}
+
+// Warning: (ae-missing-release-tag) "LocationStore" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
+// @public (undocumented)
+export interface LocationStore {
+  // (undocumented)
+  createLocation(spec: LocationSpec): Promise<Location_2>;
+  // (undocumented)
+  deleteLocation(id: string): Promise<void>;
+  // (undocumented)
+  getLocation(id: string): Promise<Location_2>;
+  // (undocumented)
+  listLocations(): Promise<Location_2[]>;
+}
+
+// Warning: (ae-missing-release-tag) "LocationUpdateLogEvent" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
+// @public (undocumented)
+export type LocationUpdateLogEvent = {
+  id: string;
+  status: 'fail' | 'success';
+  location_id: string;
+  entity_name: string;
+  created_at?: string;
+  message?: string;
+};
+
+// Warning: (ae-missing-release-tag) "LocationUpdateStatus" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
+// @public (undocumented)
+export type LocationUpdateStatus = {
+  timestamp: string | null;
+  status: string | null;
+  message: string | null;
+};
+
+// Warning: (ae-missing-release-tag) "NextCatalogBuilder" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public
 export class NextCatalogBuilder {
-  constructor(env: CatalogEnvironment_2);
+  constructor(env: CatalogEnvironment);
+  // Warning: (tsdoc-param-tag-missing-hyphen) The @param block should be followed by a parameter name and then a hyphen
   addEntityPolicy(...policies: EntityPolicy[]): NextCatalogBuilder;
+  // Warning: (tsdoc-param-tag-missing-hyphen) The @param block should be followed by a parameter name and then a hyphen
   addEntityProvider(...providers: EntityProvider[]): NextCatalogBuilder;
+  // Warning: (tsdoc-param-tag-missing-hyphen) The @param block should be followed by a parameter name and then a hyphen
   addProcessor(...processors: CatalogProcessor[]): NextCatalogBuilder;
   build(): Promise<{
     entitiesCatalog: EntitiesCatalog;
@@ -748,41 +1195,121 @@ export class NextCatalogBuilder {
     processingEngine: CatalogProcessingEngine;
     locationService: LocationService;
   }>;
+  // Warning: (tsdoc-param-tag-missing-hyphen) The @param block should be followed by a parameter name and then a hyphen
   replaceEntityPolicies(policies: EntityPolicy[]): NextCatalogBuilder;
+  // Warning: (tsdoc-param-tag-missing-hyphen) The @param block should be followed by a parameter name and then a hyphen
   replaceProcessors(processors: CatalogProcessor[]): NextCatalogBuilder;
+  // Warning: (tsdoc-param-tag-missing-hyphen) The @param block should be followed by a parameter name and then a hyphen
   setEntityDataParser(parser: CatalogProcessorParser): NextCatalogBuilder;
+  // Warning: (tsdoc-param-tag-missing-hyphen) The @param block should be followed by a parameter name and then a hyphen
   setFieldFormatValidators(validators: Partial<Validators>): NextCatalogBuilder;
+  // Warning: (tsdoc-param-tag-missing-hyphen) The @param block should be followed by a parameter name and then a hyphen
+  // Warning: (tsdoc-param-tag-missing-hyphen) The @param block should be followed by a parameter name and then a hyphen
   setPlaceholderResolver(
     key: string,
     resolver: PlaceholderResolver,
   ): NextCatalogBuilder;
+  setRefreshInterval(
+    refreshInterval: RefreshIntervalFunction,
+  ): NextCatalogBuilder;
   setRefreshIntervalSeconds(seconds: number): NextCatalogBuilder;
 }
 
+// Warning: (ae-missing-release-tag) "NextRouterOptions" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
+// @public (undocumented)
+export interface NextRouterOptions {
+  // (undocumented)
+  config: Config;
+  // (undocumented)
+  entitiesCatalog?: EntitiesCatalog;
+  // (undocumented)
+  locationAnalyzer?: LocationAnalyzer;
+  // (undocumented)
+  locationService: LocationService;
+  // (undocumented)
+  logger: Logger_2;
+}
+
+// Warning: (ae-missing-release-tag) "notFoundError" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 function notFoundError(
   atLocation: LocationSpec,
   message: string,
 ): CatalogProcessorResult;
 
+// Warning: (ae-missing-release-tag) "PageInfo" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
+// @public (undocumented)
+export type PageInfo =
+  | {
+      hasNextPage: false;
+    }
+  | {
+      hasNextPage: true;
+      endCursor: string;
+    };
+
+// Warning: (ae-missing-release-tag) "parseEntityYaml" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export function parseEntityYaml(
   data: Buffer,
   location: LocationSpec,
 ): Iterable<CatalogProcessorResult>;
 
+// Warning: (ae-missing-release-tag) "PlaceholderProcessor" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public
 export class PlaceholderProcessor implements CatalogProcessor {
-  constructor(options: Options_4);
+  constructor(options: PlaceholderProcessorOptions);
   // (undocumented)
   preProcessEntity(entity: Entity, location: LocationSpec): Promise<Entity>;
 }
 
+// Warning: (ae-missing-release-tag) "PlaceholderProcessorOptions" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
+// @public (undocumented)
+export type PlaceholderProcessorOptions = {
+  resolvers: Record<string, PlaceholderResolver>;
+  reader: UrlReader;
+  integrations: ScmIntegrationRegistry;
+};
+
+// Warning: (ae-missing-release-tag) "PlaceholderResolver" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export type PlaceholderResolver = (
-  params: ResolverParams,
+  params: PlaceholderResolverParams,
 ) => Promise<JsonValue>;
 
+// Warning: (ae-missing-release-tag) "PlaceholderResolverParams" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
+// @public (undocumented)
+export type PlaceholderResolverParams = {
+  key: string;
+  value: JsonValue;
+  baseUrl: string;
+  read: PlaceholderResolverRead;
+  resolveUrl: PlaceholderResolverResolveUrl;
+};
+
+// Warning: (ae-missing-release-tag) "PlaceholderResolverRead" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
+// @public (undocumented)
+export type PlaceholderResolverRead = (url: string) => Promise<Buffer>;
+
+// Warning: (ae-missing-release-tag) "PlaceholderResolverResolveUrl" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
+// @public (undocumented)
+export type PlaceholderResolverResolveUrl = (
+  url: string,
+  base: string,
+) => string;
+
+// Warning: (ae-missing-release-tag) "ReadLocationEntity" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export type ReadLocationEntity = {
   location: LocationSpec;
@@ -790,18 +1317,24 @@ export type ReadLocationEntity = {
   relations: EntityRelationSpec[];
 };
 
+// Warning: (ae-missing-release-tag) "ReadLocationError" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export type ReadLocationError = {
   location: LocationSpec;
   error: Error;
 };
 
+// Warning: (ae-missing-release-tag) "ReadLocationResult" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export type ReadLocationResult = {
   entities: ReadLocationEntity[];
   errors: ReadLocationError[];
 };
 
+// Warning: (ae-missing-release-tag) "RecursivePartial" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public
 export type RecursivePartial<T> = {
   [P in keyof T]?: T[P] extends (infer U)[]
@@ -811,6 +1344,13 @@ export type RecursivePartial<T> = {
     : T[P];
 };
 
+// Warning: (ae-missing-release-tag) "RefreshIntervalFunction" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
+// @public
+export type RefreshIntervalFunction = () => number;
+
+// Warning: (ae-missing-release-tag) "relation" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 function relation(spec: EntityRelationSpec): CatalogProcessorResult;
 
@@ -826,6 +1366,8 @@ declare namespace results {
 }
 export { results };
 
+// Warning: (ae-missing-release-tag) "RouterOptions" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export interface RouterOptions {
   // (undocumented)
@@ -844,9 +1386,15 @@ export interface RouterOptions {
   logger: Logger_2;
 }
 
+// Warning: (tsdoc-param-tag-missing-hyphen) The @param block should be followed by a parameter name and then a hyphen
+// Warning: (tsdoc-param-tag-missing-hyphen) The @param block should be followed by a parameter name and then a hyphen
+// Warning: (ae-missing-release-tag) "runPeriodically" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public
 export function runPeriodically(fn: () => any, delayMs: number): () => void;
 
+// Warning: (ae-missing-release-tag) "StaticLocationProcessor" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export class StaticLocationProcessor implements StaticLocationProcessor {
   constructor(staticLocations: LocationSpec[]);
@@ -860,14 +1408,19 @@ export class StaticLocationProcessor implements StaticLocationProcessor {
   ): Promise<boolean>;
 }
 
+// Warning: (ae-missing-release-tag) "Transaction" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public
 export type Transaction = {
   rollback(): Promise<unknown>;
 };
 
+// Warning: (ae-missing-release-tag) "UrlReaderProcessor" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export class UrlReaderProcessor implements CatalogProcessor {
-  constructor(options: Options_5);
+  // Warning: (ae-forgotten-export) The symbol "Options" needs to be exported by the entry point index.d.ts
+  constructor(options: Options_3);
   // (undocumented)
   readLocation(
     location: LocationSpec,
@@ -877,5 +1430,42 @@ export class UrlReaderProcessor implements CatalogProcessor {
   ): Promise<boolean>;
 }
 
+// Warnings were encountered during analysis:
+//
+// src/catalog/types.d.ts:30:8 - (tsdoc-param-tag-missing-hyphen) The @param block should be followed by a parameter name and then a hyphen
+// src/catalog/types.d.ts:36:8 - (tsdoc-param-tag-missing-hyphen) The @param block should be followed by a parameter name and then a hyphen
+// src/catalog/types.d.ts:42:8 - (tsdoc-param-tag-missing-hyphen) The @param block should be followed by a parameter name and then a hyphen
+// src/catalog/types.d.ts:43:8 - (tsdoc-param-tag-with-invalid-name) The @param block should be followed by a valid parameter name: The identifier cannot non-word characters
+// src/catalog/types.d.ts:44:8 - (tsdoc-param-tag-with-invalid-name) The @param block should be followed by a valid parameter name: The identifier cannot non-word characters
+// src/catalog/types.d.ts:45:8 - (tsdoc-param-tag-with-invalid-name) The @param block should be followed by a valid parameter name: The identifier cannot non-word characters
+// src/database/types.d.ts:125:8 - (tsdoc-param-tag-missing-hyphen) The @param block should be followed by a parameter name and then a hyphen
+// src/database/types.d.ts:131:8 - (tsdoc-param-tag-missing-hyphen) The @param block should be followed by a parameter name and then a hyphen
+// src/database/types.d.ts:132:8 - (tsdoc-param-tag-missing-hyphen) The @param block should be followed by a parameter name and then a hyphen
+// src/database/types.d.ts:146:8 - (tsdoc-param-tag-missing-hyphen) The @param block should be followed by a parameter name and then a hyphen
+// src/database/types.d.ts:147:8 - (tsdoc-param-tag-missing-hyphen) The @param block should be followed by a parameter name and then a hyphen
+// src/database/types.d.ts:148:8 - (tsdoc-param-tag-missing-hyphen) The @param block should be followed by a parameter name and then a hyphen
+// src/database/types.d.ts:150:8 - (tsdoc-param-tag-missing-hyphen) The @param block should be followed by a parameter name and then a hyphen
+// src/database/types.d.ts:163:8 - (tsdoc-param-tag-missing-hyphen) The @param block should be followed by a parameter name and then a hyphen
+// src/database/types.d.ts:164:8 - (tsdoc-param-tag-missing-hyphen) The @param block should be followed by a parameter name and then a hyphen
+// src/database/types.d.ts:165:8 - (tsdoc-param-tag-missing-hyphen) The @param block should be followed by a parameter name and then a hyphen
+// src/ingestion/processors/GithubMultiOrgReaderProcessor.d.ts:23:9 - (ae-forgotten-export) The symbol "GithubMultiOrgConfig" needs to be exported by the entry point index.d.ts
+// src/ingestion/processors/types.d.ts:7:8 - (tsdoc-param-tag-missing-hyphen) The @param block should be followed by a parameter name and then a hyphen
+// src/ingestion/processors/types.d.ts:8:8 - (tsdoc-param-tag-missing-hyphen) The @param block should be followed by a parameter name and then a hyphen
+// src/ingestion/processors/types.d.ts:9:8 - (tsdoc-param-tag-missing-hyphen) The @param block should be followed by a parameter name and then a hyphen
+// src/ingestion/processors/types.d.ts:10:8 - (tsdoc-param-tag-missing-hyphen) The @param block should be followed by a parameter name and then a hyphen
+// src/ingestion/processors/types.d.ts:23:8 - (tsdoc-param-tag-missing-hyphen) The @param block should be followed by a parameter name and then a hyphen
+// src/ingestion/processors/types.d.ts:24:8 - (tsdoc-param-tag-missing-hyphen) The @param block should be followed by a parameter name and then a hyphen
+// src/ingestion/processors/types.d.ts:25:8 - (tsdoc-param-tag-missing-hyphen) The @param block should be followed by a parameter name and then a hyphen
+// src/ingestion/processors/types.d.ts:26:8 - (tsdoc-param-tag-missing-hyphen) The @param block should be followed by a parameter name and then a hyphen
+// src/ingestion/processors/types.d.ts:36:8 - (tsdoc-param-tag-missing-hyphen) The @param block should be followed by a parameter name and then a hyphen
+// src/ingestion/processors/types.d.ts:47:8 - (tsdoc-param-tag-missing-hyphen) The @param block should be followed by a parameter name and then a hyphen
+// src/ingestion/processors/types.d.ts:48:8 - (tsdoc-param-tag-missing-hyphen) The @param block should be followed by a parameter name and then a hyphen
+// src/ingestion/processors/types.d.ts:49:8 - (tsdoc-param-tag-missing-hyphen) The @param block should be followed by a parameter name and then a hyphen
+// src/ingestion/processors/types.d.ts:56:8 - (tsdoc-param-tag-missing-hyphen) The @param block should be followed by a parameter name and then a hyphen
+// src/ingestion/processors/types.d.ts:57:8 - (tsdoc-param-tag-missing-hyphen) The @param block should be followed by a parameter name and then a hyphen
+// src/ingestion/processors/types.d.ts:58:8 - (tsdoc-param-tag-missing-hyphen) The @param block should be followed by a parameter name and then a hyphen
+// src/ingestion/types.d.ts:17:8 - (tsdoc-param-tag-missing-hyphen) The @param block should be followed by a parameter name and then a hyphen
+// src/ingestion/types.d.ts:41:8 - (tsdoc-param-tag-missing-hyphen) The @param block should be followed by a parameter name and then a hyphen
+
 // (No @packageDocumentation comment for this package)
 ```
diff --git a/plugins/catalog-backend/config.d.ts b/plugins/catalog-backend/config.d.ts
index 7da9cad139..5701c9df48 100644
--- a/plugins/catalog-backend/config.d.ts
+++ b/plugins/catalog-backend/config.d.ts
@@ -163,6 +163,13 @@ export interface Config {
            * Defaults to org name if omitted.
            */
           groupNamespace?: string;
+
+          /**
+           * The namespace of the users created from this org.
+           *
+           * Defaults to empty string if omitted.
+           */
+          userNamespace?: string;
         }>;
       };
 
diff --git a/plugins/jenkins/src/components/useProjectSlugFromEntity.ts b/plugins/catalog-backend/knexfile.js
similarity index 65%
rename from plugins/jenkins/src/components/useProjectSlugFromEntity.ts
rename to plugins/catalog-backend/knexfile.js
index 10789b383a..4c8be42673 100644
--- a/plugins/jenkins/src/components/useProjectSlugFromEntity.ts
+++ b/plugins/catalog-backend/knexfile.js
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 The Backstage Authors
+ * Copyright 2021 The Backstage Authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,11 +13,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { useEntity } from '@backstage/plugin-catalog-react';
-import { JENKINS_ANNOTATION } from '../constants';
 
-export const useProjectSlugFromEntity = () => {
-  const { entity } = useEntity();
-
-  return entity.metadata.annotations?.[JENKINS_ANNOTATION] ?? '';
+// This file makes it possible to run "yarn knex migrate:make some_file_name"
+// to assist in making new migrations
+module.exports = {
+  client: 'sqlite3',
+  connection: ':memory:',
+  useNullAsDefault: true,
+  migrations: {
+    directory: './migrations',
+  },
 };
diff --git a/plugins/catalog-backend/migrations/20210813143113_add_refresh_state_hash.js b/plugins/catalog-backend/migrations/20210813143113_add_refresh_state_hash.js
new file mode 100644
index 0000000000..29a102e876
--- /dev/null
+++ b/plugins/catalog-backend/migrations/20210813143113_add_refresh_state_hash.js
@@ -0,0 +1,40 @@
+/*
+ * Copyright 2021 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+// @ts-check
+
+/**
+ * @param {import('knex').Knex} knex
+ */
+exports.up = async function up(knex) {
+  await knex.schema.alterTable('refresh_state', table => {
+    table
+      .text('result_hash')
+      .nullable()
+      .comment(
+        'A hash of the processed contents, used to avoid duplicate work',
+      );
+  });
+};
+
+/**
+ * @param {import('knex').Knex} knex
+ */
+exports.down = async function down(knex) {
+  await knex.schema.alterTable('refresh_state', table => {
+    table.dropColumn('result_hash');
+  });
+};
diff --git a/plugins/catalog-backend/package.json b/plugins/catalog-backend/package.json
index a3d0ff14da..91cd38614d 100644
--- a/plugins/catalog-backend/package.json
+++ b/plugins/catalog-backend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-catalog-backend",
-  "version": "0.12.0",
+  "version": "0.13.7",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -29,14 +29,14 @@
     "clean": "backstage-cli clean"
   },
   "dependencies": {
-    "@backstage/backend-common": "^0.8.5",
-    "@backstage/catalog-client": "^0.3.16",
-    "@backstage/catalog-model": "^0.9.0",
-    "@backstage/config": "^0.1.5",
-    "@backstage/errors": "^0.1.1",
-    "@backstage/integration": "^0.5.8",
-    "@backstage/plugin-search-backend-node": "^0.3.0",
-    "@backstage/search-common": "^0.1.2",
+    "@backstage/backend-common": "^0.9.2",
+    "@backstage/catalog-client": "^0.3.19",
+    "@backstage/catalog-model": "^0.9.2",
+    "@backstage/config": "^0.1.9",
+    "@backstage/errors": "^0.1.2",
+    "@backstage/integration": "^0.6.3",
+    "@backstage/plugin-search-backend-node": "^0.4.2",
+    "@backstage/search-common": "^0.2.0",
     "@octokit/graphql": "^4.5.8",
     "@types/express": "^4.17.6",
     "aws-sdk": "^2.840.0",
@@ -47,12 +47,14 @@
     "express-promise-router": "^4.1.0",
     "fast-json-stable-stringify": "^2.1.0",
     "fs-extra": "9.1.0",
-    "git-url-parse": "~11.4.4",
+    "git-url-parse": "^11.6.0",
     "glob": "^7.1.6",
     "knex": "^0.95.1",
     "lodash": "^4.17.15",
+    "luxon": "^2.0.2",
     "morgan": "^1.10.0",
     "p-limit": "^3.0.2",
+    "prom-client": "^13.2.0",
     "qs": "^6.9.4",
     "uuid": "^8.0.0",
     "winston": "^3.2.1",
@@ -61,9 +63,9 @@
     "yup": "^0.29.3"
   },
   "devDependencies": {
-    "@backstage/backend-test-utils": "^0.1.4",
-    "@backstage/cli": "^0.7.3",
-    "@backstage/test-utils": "^0.1.14",
+    "@backstage/backend-test-utils": "^0.1.7",
+    "@backstage/cli": "^0.7.11",
+    "@backstage/test-utils": "^0.1.17",
     "@types/core-js": "^2.5.4",
     "@types/git-url-parse": "^9.0.0",
     "@types/lodash": "^4.14.151",
@@ -73,7 +75,8 @@
     "msw": "^0.29.0",
     "sqlite3": "^5.0.1",
     "supertest": "^6.1.3",
-    "wait-for-expect": "^3.0.2"
+    "wait-for-expect": "^3.0.2",
+    "luxon": "^2.0.2"
   },
   "files": [
     "dist",
diff --git a/plugins/catalog-backend/src/catalog/DatabaseLocationsCatalog.ts b/plugins/catalog-backend/src/catalog/DatabaseLocationsCatalog.ts
index fff34d1d78..e81c72a3da 100644
--- a/plugins/catalog-backend/src/catalog/DatabaseLocationsCatalog.ts
+++ b/plugins/catalog-backend/src/catalog/DatabaseLocationsCatalog.ts
@@ -52,12 +52,8 @@ export class DatabaseLocationsCatalog implements LocationsCatalog {
   }
 
   async location(id: string): Promise<LocationResponse> {
-    const {
-      message,
-      status,
-      timestamp,
-      ...data
-    } = await this.database.location(id);
+    const { message, status, timestamp, ...data } =
+      await this.database.location(id);
     return {
       currentStatus: {
         message,
diff --git a/plugins/catalog-backend/src/catalog/index.ts b/plugins/catalog-backend/src/catalog/index.ts
index bc33031d67..04cc358568 100644
--- a/plugins/catalog-backend/src/catalog/index.ts
+++ b/plugins/catalog-backend/src/catalog/index.ts
@@ -16,4 +16,15 @@
 
 export { DatabaseEntitiesCatalog } from './DatabaseEntitiesCatalog';
 export { DatabaseLocationsCatalog } from './DatabaseLocationsCatalog';
-export type { EntitiesCatalog, LocationsCatalog } from './types';
+export type {
+  EntitiesCatalog,
+  LocationsCatalog,
+  EntityUpsertRequest,
+  EntityUpsertResponse,
+  EntitiesRequest,
+  EntitiesResponse,
+  LocationResponse,
+  PageInfo,
+  LocationUpdateLogEvent,
+  LocationUpdateStatus,
+} from './types';
diff --git a/plugins/catalog-backend/src/database/CommonDatabase.test.ts b/plugins/catalog-backend/src/database/CommonDatabase.test.ts
index 2dc3d91465..f459cbc446 100644
--- a/plugins/catalog-backend/src/database/CommonDatabase.test.ts
+++ b/plugins/catalog-backend/src/database/CommonDatabase.test.ts
@@ -491,6 +491,98 @@ describe('CommonDatabase', () => {
         ]),
       );
     });
+
+    it('can get all specific entities for matching existence filters', async () => {
+      const entities: Entity[] = [
+        {
+          apiVersion: 'A',
+          kind: 'K1',
+          metadata: {
+            name: 'N',
+            annotations: {
+              foo: 'bar',
+            },
+          },
+          spec: { c: 'SOME' },
+        },
+        {
+          apiVersion: 'a',
+          kind: 'k2',
+          metadata: {
+            name: 'N',
+            annotations: {
+              foo: 'bar',
+            },
+          },
+          spec: { c: 'Some' },
+        },
+        {
+          apiVersion: 'a',
+          kind: 'k3',
+          metadata: { name: 'n' },
+          spec: { c: 'somE' },
+        },
+      ];
+
+      await db.transaction(async tx => {
+        await db.addEntities(
+          tx,
+          entities.map(entity => ({ entity, relations: [] })),
+        );
+      });
+
+      const existRows = await db.transaction(async tx =>
+        db.entities(tx, {
+          filter: {
+            anyOf: [
+              {
+                allOf: [
+                  { key: 'metadata.annotations.foo', matchValueExists: true },
+                ],
+              },
+            ],
+          },
+        }),
+      );
+
+      expect(existRows.entities.length).toEqual(2);
+      expect(existRows.entities).toEqual(
+        expect.arrayContaining([
+          {
+            locationId: undefined,
+            entity: expect.objectContaining({ kind: 'K1' }),
+          },
+          {
+            locationId: undefined,
+            entity: expect.objectContaining({ kind: 'k2' }),
+          },
+        ]),
+      );
+
+      const nonExistRows = await db.transaction(async tx =>
+        db.entities(tx, {
+          filter: {
+            anyOf: [
+              {
+                allOf: [
+                  { key: 'metadata.annotations.foo', matchValueExists: false },
+                ],
+              },
+            ],
+          },
+        }),
+      );
+
+      expect(nonExistRows.entities.length).toEqual(1);
+      expect(nonExistRows.entities).toEqual(
+        expect.arrayContaining([
+          {
+            locationId: undefined,
+            entity: expect.objectContaining({ kind: 'k3' }),
+          },
+        ]),
+      );
+    });
   });
 
   describe('setRelations', () => {
diff --git a/plugins/catalog-backend/src/database/CommonDatabase.ts b/plugins/catalog-backend/src/database/CommonDatabase.ts
index b4f76d5cbc..79cad3bd23 100644
--- a/plugins/catalog-backend/src/database/CommonDatabase.ts
+++ b/plugins/catalog-backend/src/database/CommonDatabase.ts
@@ -218,7 +218,11 @@ export class CommonDatabase implements Database {
 
     for (const singleFilter of request?.filter?.anyOf ?? []) {
       entitiesQuery = entitiesQuery.orWhere(function singleFilterFn() {
-        for (const { key, matchValueIn } of singleFilter.allOf) {
+        for (const {
+          key,
+          matchValueIn,
+          matchValueExists,
+        } of singleFilter.allOf) {
           // NOTE(freben): This used to be a set of OUTER JOIN, which may seem to
           // make a lot of sense. However, it had abysmal performance on sqlite
           // when datasets grew large, so we're using IN instead.
@@ -226,7 +230,7 @@ export class CommonDatabase implements Database {
             .select('entity_id')
             .where(function keyFilter() {
               this.andWhere({ key: key.toLowerCase() });
-              if (matchValueIn) {
+              if (matchValueExists !== false && matchValueIn) {
                 if (matchValueIn.length === 1) {
                   this.andWhere({ value: matchValueIn[0].toLowerCase() });
                 } else if (matchValueIn.length > 1) {
@@ -238,7 +242,12 @@ export class CommonDatabase implements Database {
                 }
               }
             });
-          this.andWhere('id', 'in', matchQuery);
+          // Explicitly evaluate matchValueExists as a boolean since it may be undefined
+          this.andWhere(
+            'id',
+            matchValueExists === false ? 'not in' : 'in',
+            matchQuery,
+          );
         }
       });
     }
@@ -547,9 +556,10 @@ export class CommonDatabase implements Database {
   }
 }
 
-function parsePagination(
-  input?: EntityPagination,
-): { limit?: number; offset?: number } {
+function parsePagination(input?: EntityPagination): {
+  limit?: number;
+  offset?: number;
+} {
   if (!input) {
     return {};
   }
diff --git a/plugins/catalog-backend/src/database/index.ts b/plugins/catalog-backend/src/database/index.ts
index 1a07f3825f..028b0caa4b 100644
--- a/plugins/catalog-backend/src/database/index.ts
+++ b/plugins/catalog-backend/src/database/index.ts
@@ -16,6 +16,7 @@
 
 export { CommonDatabase } from './CommonDatabase';
 export { DatabaseManager } from './DatabaseManager';
+export type { CreateDatabaseOptions } from './DatabaseManager';
 export type {
   Database,
   DbEntityRequest,
@@ -24,4 +25,11 @@ export type {
   EntityFilter,
   EntityPagination,
   Transaction,
+  DbEntitiesRequest,
+  DbEntitiesResponse,
+  DbLocationsRowWithStatus,
+  DatabaseLocationUpdateLogEvent,
+  DbLocationsRow,
+  DatabaseLocationUpdateLogStatus,
+  DbPageInfo,
 } from './types';
diff --git a/plugins/catalog-backend/src/database/types.ts b/plugins/catalog-backend/src/database/types.ts
index 3a3bbb7f1e..e1a253decc 100644
--- a/plugins/catalog-backend/src/database/types.ts
+++ b/plugins/catalog-backend/src/database/types.ts
@@ -118,6 +118,11 @@ export type EntitiesSearchFilter = {
    * case insensitive.
    */
   matchValueIn?: string[];
+
+  /**
+   * Match on existence of key.
+   */
+  matchValueExists?: boolean;
 };
 
 /**
diff --git a/plugins/catalog-backend/src/ingestion/index.ts b/plugins/catalog-backend/src/ingestion/index.ts
index eace66b220..e27a3ef0ac 100644
--- a/plugins/catalog-backend/src/ingestion/index.ts
+++ b/plugins/catalog-backend/src/ingestion/index.ts
@@ -16,5 +16,18 @@
 
 export { HigherOrderOperations } from './HigherOrderOperations';
 export { LocationReaders } from './LocationReaders';
-export * from './types';
+export type {
+  AddLocationResult,
+  AnalyzeLocationRequest,
+  AnalyzeLocationResponse,
+  HigherOrderOperation,
+  LocationAnalyzer,
+  LocationReader,
+  ReadLocationEntity,
+  ReadLocationError,
+  ReadLocationResult,
+  AnalyzeLocationEntityField,
+  AnalyzeLocationExistingEntity,
+  AnalyzeLocationGenerateEntity,
+} from './types';
 export * from './processors';
diff --git a/plugins/catalog-backend/src/ingestion/processors/AnnotateLocationEntityProcessor.ts b/plugins/catalog-backend/src/ingestion/processors/AnnotateLocationEntityProcessor.ts
index 5a0c8b8418..54079e13ff 100644
--- a/plugins/catalog-backend/src/ingestion/processors/AnnotateLocationEntityProcessor.ts
+++ b/plugins/catalog-backend/src/ingestion/processors/AnnotateLocationEntityProcessor.ts
@@ -71,9 +71,8 @@ export class AnnotateLocationEntityProcessor implements CatalogProcessor {
           annotations: pickBy(
             {
               [LOCATION_ANNOTATION]: stringifyLocationReference(location),
-              [ORIGIN_LOCATION_ANNOTATION]: stringifyLocationReference(
-                originLocation,
-              ),
+              [ORIGIN_LOCATION_ANNOTATION]:
+                stringifyLocationReference(originLocation),
               [VIEW_URL_ANNOTATION]: viewUrl,
               [EDIT_URL_ANNOTATION]: editUrl,
               [SOURCE_LOCATION_ANNOTATION]: sourceLocation,
diff --git a/plugins/catalog-backend/src/ingestion/processors/AwsOrganizationCloudAccountProcessor.test.ts b/plugins/catalog-backend/src/ingestion/processors/AwsOrganizationCloudAccountProcessor.test.ts
index a3b1dfbfcb..88b033c33f 100644
--- a/plugins/catalog-backend/src/ingestion/processors/AwsOrganizationCloudAccountProcessor.test.ts
+++ b/plugins/catalog-backend/src/ingestion/processors/AwsOrganizationCloudAccountProcessor.test.ts
@@ -37,8 +37,7 @@ describe('AwsOrganizationCloudAccountProcessor', () => {
             return {
               Accounts: [
                 {
-                  Arn:
-                    'arn:aws:organizations::192594491037:account/o-1vl18kc5a3/957140518395',
+                  Arn: 'arn:aws:organizations::192594491037:account/o-1vl18kc5a3/957140518395',
                   Name: 'testaccount',
                 },
               ],
@@ -83,13 +82,11 @@ describe('AwsOrganizationCloudAccountProcessor', () => {
             return {
               Accounts: [
                 {
-                  Arn:
-                    'arn:aws:organizations::192594491037:account/o-1vl18kc5a3/957140518395',
+                  Arn: 'arn:aws:organizations::192594491037:account/o-1vl18kc5a3/957140518395',
                   Name: 'testaccount',
                 },
                 {
-                  Arn:
-                    'arn:aws:organizations::192594491037:account/o-zzzzzzzzz/957140518395',
+                  Arn: 'arn:aws:organizations::192594491037:account/o-zzzzzzzzz/957140518395',
                   Name: 'testaccount2',
                 },
               ],
diff --git a/plugins/catalog-backend/src/ingestion/processors/AwsOrganizationCloudAccountProcessor.ts b/plugins/catalog-backend/src/ingestion/processors/AwsOrganizationCloudAccountProcessor.ts
index beb179a0d2..655f99d14a 100644
--- a/plugins/catalog-backend/src/ingestion/processors/AwsOrganizationCloudAccountProcessor.ts
+++ b/plugins/catalog-backend/src/ingestion/processors/AwsOrganizationCloudAccountProcessor.ts
@@ -89,9 +89,10 @@ export class AwsOrganizationCloudAccountProcessor implements CatalogProcessor {
       .replace(/[^a-zA-Z0-9\-]/g, '-');
   }
 
-  extractInformationFromArn(
-    arn: string,
-  ): { accountId: string; organizationId: string } {
+  extractInformationFromArn(arn: string): {
+    accountId: string;
+    organizationId: string;
+  } {
     const parts = arn.split('/');
 
     return {
diff --git a/plugins/catalog-backend/src/ingestion/processors/BitbucketDiscoveryProcessor.test.ts b/plugins/catalog-backend/src/ingestion/processors/BitbucketDiscoveryProcessor.test.ts
index d33ea7ab26..c067958093 100644
--- a/plugins/catalog-backend/src/ingestion/processors/BitbucketDiscoveryProcessor.test.ts
+++ b/plugins/catalog-backend/src/ingestion/processors/BitbucketDiscoveryProcessor.test.ts
@@ -225,18 +225,47 @@ describe('BitbucketDiscoveryProcessor', () => {
         optional: true,
       });
     });
+
+    it.each`
+      target
+      ${'https://bitbucket.mycompany.com/projects/backstage/repos/*'}
+      ${'https://bitbucket.mycompany.com/projects/backstage/repos/*/'}
+      ${'https://bitbucket.mycompany.com/projects/backstage/repos/techdocs-*/'}
+    `("target '$target' adds default path to catalog", async ({ target }) => {
+      setupStubs([{ key: 'backstage', repos: ['techdocs-cli'] }]);
+
+      const location: LocationSpec = {
+        type: 'bitbucket-discovery',
+        target: target,
+      };
+
+      const emitter = jest.fn();
+      await processor.readLocation(location, false, emitter);
+
+      expect(emitter).toHaveBeenCalledTimes(1);
+      expect(emitter).toHaveBeenCalledWith({
+        type: 'location',
+        location: {
+          type: 'url',
+          target:
+            'https://bitbucket.mycompany.com/projects/backstage/repos/techdocs-cli/browse/catalog-info.yaml',
+        },
+        optional: true,
+      });
+    });
   });
 
   describe('Custom repository parser', () => {
-    const customRepositoryParser: BitbucketRepositoryParser = async function* customRepositoryParser({}) {
-      yield results.location(
-        {
-          type: 'custom-location-type',
-          target: 'custom-target',
-        },
-        true,
-      );
-    };
+    const customRepositoryParser: BitbucketRepositoryParser =
+      async function* customRepositoryParser({}) {
+        yield results.location(
+          {
+            type: 'custom-location-type',
+            target: 'custom-target',
+          },
+          true,
+        );
+      };
 
     const processor = BitbucketDiscoveryProcessor.fromConfig(
       new ConfigReader({
diff --git a/plugins/catalog-backend/src/ingestion/processors/BitbucketDiscoveryProcessor.ts b/plugins/catalog-backend/src/ingestion/processors/BitbucketDiscoveryProcessor.ts
index 877cd08a3e..3b535881d9 100644
--- a/plugins/catalog-backend/src/ingestion/processors/BitbucketDiscoveryProcessor.ts
+++ b/plugins/catalog-backend/src/ingestion/processors/BitbucketDiscoveryProcessor.ts
@@ -84,13 +84,15 @@ export class BitbucketDiscoveryProcessor implements CatalogProcessor {
     this.logger.info(`Reading Bitbucket repositories from ${location.target}`);
 
     const { catalogPath } = parseUrl(location.target);
+    const expandedCatalogPath =
+      catalogPath === '/' ? '/catalog-info.yaml' : catalogPath;
 
     const result = await readBitbucketOrg(client, location.target);
 
     for (const repository of result.matches) {
       for await (const entity of this.parser({
         integration: integration,
-        target: `${repository.links.self[0].href}${catalogPath}`,
+        target: `${repository.links.self[0].href}${expandedCatalogPath}`,
         logger: this.logger,
       })) {
         emit(entity);
@@ -134,9 +136,11 @@ export async function readBitbucketOrg(
   return result;
 }
 
-function parseUrl(
-  urlString: string,
-): { projectSearchPath: RegExp; repoSearchPath: RegExp; catalogPath: string } {
+function parseUrl(urlString: string): {
+  projectSearchPath: RegExp;
+  repoSearchPath: RegExp;
+  catalogPath: string;
+} {
   const url = new URL(urlString);
   const path = url.pathname.substr(1).split('/');
 
diff --git a/plugins/catalog-backend/src/ingestion/processors/GitLabDiscoveryProcessor.test.ts b/plugins/catalog-backend/src/ingestion/processors/GitLabDiscoveryProcessor.test.ts
new file mode 100644
index 0000000000..a0e44d7648
--- /dev/null
+++ b/plugins/catalog-backend/src/ingestion/processors/GitLabDiscoveryProcessor.test.ts
@@ -0,0 +1,368 @@
+/*
+ * Copyright 2021 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { ConfigReader } from '@backstage/config';
+import { getVoidLogger } from '@backstage/backend-common';
+import { LocationSpec } from '@backstage/catalog-model';
+import { GitLabDiscoveryProcessor, parseUrl } from './GitLabDiscoveryProcessor';
+import { setupServer } from 'msw/node';
+import { rest } from 'msw';
+import { GitLabProject } from './gitlab';
+
+const server = setupServer();
+
+const PROJECTS_URL = 'https://gitlab.fake/api/v4/projects';
+const GROUP_PROJECTS_URL =
+  'https://gitlab.fake/api/v4/groups/group%2Fsubgroup/projects';
+
+const PROJECT_LOCATION: LocationSpec = {
+  type: 'gitlab-discovery',
+  target: 'https://gitlab.fake/blob/*/catalog-info.yaml',
+};
+const PROJECT_LOCATION_MASTER_BRANCH: LocationSpec = {
+  type: 'gitlab-discovery',
+  target: 'https://gitlab.fake/blob/master/catalog-info.yaml',
+};
+const GROUP_LOCATION: LocationSpec = {
+  type: 'gitlab-discovery',
+  target: 'https://gitlab.fake/group/subgroup/blob/*/catalog-info.yaml',
+};
+
+function setupFakeServer(
+  url: string,
+  callback: (request: { page: number; include_subgroups: boolean }) => {
+    data: GitLabProject[];
+    nextPage?: number;
+  },
+) {
+  server.use(
+    rest.get(url, (req, res, ctx) => {
+      if (req.headers.get('private-token') !== 'test-token') {
+        return res(ctx.status(401), ctx.json({}));
+      }
+      const page = req.url.searchParams.get('page');
+      const include_subgroups = req.url.searchParams.get('include_subgroups');
+      const response = callback({
+        page: parseInt(page!, 10),
+        include_subgroups: include_subgroups === 'true',
+      });
+
+      // Filter the fake results based on the `last_activity_after` parameter
+      const last_activity_after = req.url.searchParams.get(
+        'last_activity_after',
+      );
+      const filteredData = response.data.filter(
+        v =>
+          !last_activity_after ||
+          Date.parse(v.last_activity_at) >= Date.parse(last_activity_after),
+      );
+
+      return res(
+        ctx.set('x-next-page', response.nextPage?.toString() ?? ''),
+        ctx.json(filteredData),
+      );
+    }),
+  );
+}
+
+function getConfig(): any {
+  return {
+    backend: {
+      cache: { store: 'memory' },
+    },
+    integrations: {
+      gitlab: [
+        {
+          host: 'gitlab.fake',
+          apiBaseUrl: 'https://gitlab.fake/api/v4',
+          token: 'test-token',
+        },
+      ],
+    },
+  };
+}
+
+function getProcessor(config?: any): GitLabDiscoveryProcessor {
+  return GitLabDiscoveryProcessor.fromConfig(
+    new ConfigReader(config || getConfig()),
+    {
+      logger: getVoidLogger(),
+    },
+  );
+}
+
+describe('GitlabDiscoveryProcessor', () => {
+  beforeAll(() => {
+    server.listen();
+    jest.useFakeTimers('modern');
+    jest.setSystemTime(new Date('2001-01-01T12:34:56Z'));
+  });
+  afterEach(() => server.resetHandlers());
+  afterAll(() => {
+    server.close();
+    jest.useRealTimers();
+  });
+
+  describe('parseUrl', () => {
+    it('parses well formed URLs', () => {
+      expect(
+        parseUrl('https://gitlab.com/group/subgroup/blob/master/catalog.yaml'),
+      ).toEqual({
+        group: 'group/subgroup',
+        host: 'gitlab.com',
+        branch: 'master',
+        catalogPath: 'catalog.yaml',
+      });
+      expect(
+        parseUrl('https://gitlab.com/blob/*/subfolder/catalog.yaml'),
+      ).toEqual({
+        group: undefined,
+        host: 'gitlab.com',
+        branch: '*',
+        catalogPath: 'subfolder/catalog.yaml',
+      });
+    });
+
+    it('throws on incorrectly formed URLs', () => {
+      expect(() => parseUrl('https://gitlab.com')).toThrow();
+      expect(() => parseUrl('https://gitlab.com//')).toThrow();
+      expect(() => parseUrl('https://gitlab.com/foo')).toThrow();
+      expect(() => parseUrl('https://gitlab.com//foo')).toThrow();
+      expect(() => parseUrl('https://gitlab.com/org/teams')).toThrow();
+      expect(() => parseUrl('https://gitlab.com/org//teams')).toThrow();
+      expect(() =>
+        parseUrl('https://gitlab.com/org//teams/blob/catalog.yaml'),
+      ).toThrow();
+    });
+  });
+
+  describe('handles repositories', () => {
+    it('pages through all repositories', async () => {
+      const processor = getProcessor();
+      setupFakeServer(PROJECTS_URL, request => {
+        switch (request.page) {
+          case 1:
+            return {
+              data: [
+                {
+                  id: 1,
+                  archived: false,
+                  default_branch: 'main',
+                  last_activity_at: '2021-08-05T11:03:05.774Z',
+                  web_url: 'https://gitlab.fake/1',
+                },
+              ],
+              nextPage: 2,
+            };
+          case 2:
+            return {
+              data: [
+                {
+                  id: 2,
+                  archived: false,
+                  default_branch: 'master',
+                  last_activity_at: '2021-08-05T11:03:05.774Z',
+                  web_url: 'https://gitlab.fake/2',
+                },
+                {
+                  id: 3,
+                  archived: true, // ARCHIVED
+                  default_branch: 'master',
+                  last_activity_at: '2021-08-05T11:03:05.774Z',
+                  web_url: 'https://gitlab.fake/3',
+                },
+              ],
+            };
+          default:
+            throw new Error('Invalid request');
+        }
+      });
+
+      const result: any[] = [];
+      await processor.readLocation(PROJECT_LOCATION, false, e => {
+        result.push(e);
+      });
+      expect(result).toEqual([
+        {
+          type: 'location',
+          location: {
+            type: 'url',
+            target: 'https://gitlab.fake/1/-/blob/main/catalog-info.yaml',
+          },
+          optional: true,
+        },
+        {
+          type: 'location',
+          location: {
+            type: 'url',
+            target: 'https://gitlab.fake/2/-/blob/master/catalog-info.yaml',
+          },
+          optional: true,
+        },
+      ]);
+    });
+
+    it('can force a branch name', async () => {
+      const processor = getProcessor();
+      setupFakeServer(PROJECTS_URL, request => {
+        switch (request.page) {
+          case 1:
+            return {
+              data: [
+                {
+                  id: 1,
+                  archived: false,
+                  default_branch: 'main',
+                  last_activity_at: '2021-08-05T11:03:05.774Z',
+                  web_url: 'https://gitlab.fake/1',
+                },
+              ],
+            };
+          default:
+            throw new Error('Invalid request');
+        }
+      });
+
+      const result: any[] = [];
+      await processor.readLocation(PROJECT_LOCATION_MASTER_BRANCH, false, e => {
+        result.push(e);
+      });
+      expect(result).toEqual([
+        {
+          type: 'location',
+          location: {
+            type: 'url',
+            target: 'https://gitlab.fake/1/-/blob/master/catalog-info.yaml',
+          },
+          optional: true,
+        },
+      ]);
+    });
+
+    it('can filter based on group', async () => {
+      const processor = getProcessor();
+      setupFakeServer(GROUP_PROJECTS_URL, request => {
+        if (!request.include_subgroups) {
+          throw new Error('include_subgroups should be set');
+        }
+        switch (request.page) {
+          case 1:
+            return {
+              data: [
+                {
+                  id: 1,
+                  archived: false,
+                  default_branch: 'main',
+                  last_activity_at: '2021-08-05T11:03:05.774Z',
+                  web_url: 'https://gitlab.fake/1',
+                },
+              ],
+            };
+          default:
+            throw new Error('Invalid request');
+        }
+      });
+
+      const result: any[] = [];
+      await processor.readLocation(GROUP_LOCATION, false, e => {
+        result.push(e);
+      });
+      // If everything was set up correctly, we should have received the fake repo specified above
+      expect(result).toHaveLength(1);
+    });
+
+    it('uses the previous scan timestamp to filter', async () => {
+      const processor = getProcessor();
+      setupFakeServer(PROJECTS_URL, request => {
+        switch (request.page) {
+          case 1:
+            return {
+              data: [
+                {
+                  id: 1,
+                  archived: false,
+                  default_branch: 'main',
+                  last_activity_at: '2000-01-01T00:00:00Z',
+                  web_url: 'https://gitlab.fake/1',
+                },
+                {
+                  id: 2,
+                  archived: false,
+                  default_branch: 'main',
+                  last_activity_at: '2002-01-01T00:00:00Z',
+                  web_url: 'https://gitlab.fake/2',
+                },
+              ],
+            };
+          default:
+            throw new Error('Invalid request');
+        }
+      });
+
+      const result: any[] = [];
+
+      // First scan should find all repos, since no last activity was cached
+      await processor.readLocation(PROJECT_LOCATION, false, e => {
+        result.push(e);
+      });
+      expect(result).toHaveLength(2);
+
+      // Second scan should have used the mocked Date to set the last scanned time to 2001
+      // This should result in only the second repo being scanned, since that has a timestamp of 2002
+      const result2: any[] = [];
+      await processor.readLocation(PROJECT_LOCATION, false, e => {
+        result2.push(e);
+      });
+      expect(result2).toHaveLength(1);
+    });
+  });
+
+  describe('handles failure', () => {
+    it('invalid token', async () => {
+      // Setup an empty fake gitlab, since we don't care about actual results
+      setupFakeServer(PROJECTS_URL, _ => {
+        return {
+          data: [],
+        };
+      });
+
+      const config = getConfig();
+      config.integrations.gitlab[0].token = 'invalid';
+      await expect(
+        getProcessor(config).readLocation(PROJECT_LOCATION, false, _ => {}),
+      ).rejects.toThrow(/Unauthorized/);
+    });
+
+    it('missing integration', async () => {
+      const config = getConfig();
+      delete config.integrations;
+      await expect(
+        getProcessor(config).readLocation(PROJECT_LOCATION, false, _ => {}),
+      ).rejects.toThrow(/no GitLab integration/);
+    });
+
+    it('location type', async () => {
+      const incorrectLocation: LocationSpec = {
+        type: 'something-that-is-not-gitlab-discovery',
+        target: 'https://gitlab.fake/oh-dear',
+      };
+
+      await expect(
+        getProcessor().readLocation(incorrectLocation, false, _ => {}),
+      ).resolves.toBeFalsy();
+    });
+  });
+});
diff --git a/plugins/catalog-backend/src/ingestion/processors/GitLabDiscoveryProcessor.ts b/plugins/catalog-backend/src/ingestion/processors/GitLabDiscoveryProcessor.ts
new file mode 100644
index 0000000000..445f02829e
--- /dev/null
+++ b/plugins/catalog-backend/src/ingestion/processors/GitLabDiscoveryProcessor.ts
@@ -0,0 +1,170 @@
+/*
+ * Copyright 2021 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { LocationSpec } from '@backstage/catalog-model';
+import { Config } from '@backstage/config';
+import { ScmIntegrations } from '@backstage/integration';
+import { Logger } from 'winston';
+import * as results from './results';
+import { CatalogProcessor, CatalogProcessorEmit } from './types';
+import { GitLabClient, GitLabProject, paginated } from './gitlab';
+import {
+  CacheClient,
+  CacheManager,
+  PluginCacheManager,
+} from '@backstage/backend-common';
+
+/**
+ * Extracts repositories out of an GitLab instance.
+ */
+export class GitLabDiscoveryProcessor implements CatalogProcessor {
+  private readonly integrations: ScmIntegrations;
+  private readonly logger: Logger;
+  private readonly cache: CacheClient;
+
+  static fromConfig(config: Config, options: { logger: Logger }) {
+    const integrations = ScmIntegrations.fromConfig(config);
+    const pluginCache =
+      CacheManager.fromConfig(config).forPlugin('gitlab-discovery');
+
+    return new GitLabDiscoveryProcessor({
+      ...options,
+      integrations,
+      pluginCache,
+    });
+  }
+
+  private constructor(options: {
+    integrations: ScmIntegrations;
+    pluginCache: PluginCacheManager;
+    logger: Logger;
+  }) {
+    this.integrations = options.integrations;
+    this.cache = options.pluginCache.getClient();
+    this.logger = options.logger;
+  }
+
+  async readLocation(
+    location: LocationSpec,
+    _optional: boolean,
+    emit: CatalogProcessorEmit,
+  ): Promise<boolean> {
+    if (location.type !== 'gitlab-discovery') {
+      return false;
+    }
+
+    const { group, host, branch, catalogPath } = parseUrl(location.target);
+
+    const integration = this.integrations.gitlab.byUrl(`https://${host}`);
+    if (!integration) {
+      throw new Error(
+        `There is no GitLab integration that matches ${host}. Please add a configuration entry for it under integrations.gitlab`,
+      );
+    }
+
+    const client = new GitLabClient({
+      config: integration.config,
+      logger: this.logger,
+    });
+    const startTimestamp = Date.now();
+    this.logger.debug(`Reading GitLab projects from ${location.target}`);
+
+    const projects = paginated(options => client.listProjects(options), {
+      group,
+      last_activity_after: await this.updateLastActivity(),
+      page: 1,
+    });
+
+    const result: Result = {
+      scanned: 0,
+      matches: [],
+    };
+    for await (const project of projects) {
+      result.scanned++;
+      if (!project.archived) {
+        result.matches.push(project);
+      }
+    }
+
+    for (const project of result.matches) {
+      const project_branch = branch === '*' ? project.default_branch : branch;
+
+      emit(
+        results.location(
+          {
+            type: 'url',
+            // The format expected by the GitLabUrlReader:
+            // https://gitlab.com/groupA/teams/teamA/subgroupA/repoA/-/blob/branch/filepath
+            //
+            // This unfortunately will trigger another API call in `getGitLabFileFetchUrl` to get the project ID.
+            // The alternative is using the `buildRawUrl` function, which does not support subgroups, so providing a raw
+            // URL here won't work either.
+            target: `${project.web_url}/-/blob/${project_branch}/${catalogPath}`,
+          },
+          true,
+        ),
+      );
+    }
+
+    const duration = ((Date.now() - startTimestamp) / 1000).toFixed(1);
+    this.logger.debug(
+      `Read ${result.scanned} GitLab repositories in ${duration} seconds`,
+    );
+
+    return true;
+  }
+
+  async updateLastActivity(): Promise<string | undefined> {
+    const lastActivity = await this.cache.get('last-activity');
+    await this.cache.set('last-activity', new Date().toISOString());
+    return lastActivity as string | undefined;
+  }
+}
+
+type Result = {
+  scanned: number;
+  matches: GitLabProject[];
+};
+
+/*
+ * Helpers
+ */
+
+export function parseUrl(urlString: string): {
+  group?: string;
+  host: string;
+  branch: string;
+  catalogPath: string;
+} {
+  const url = new URL(urlString);
+  const path = url.pathname.substr(1).split('/');
+
+  // (/group/subgroup)/blob/branch|*/filepath
+  const blobIndex = path.findIndex(p => p === 'blob');
+  if (blobIndex !== -1 && path.length > blobIndex + 2) {
+    const group =
+      blobIndex > 0 ? path.slice(0, blobIndex).join('/') : undefined;
+
+    return {
+      group,
+      host: url.host,
+      branch: decodeURIComponent(path[blobIndex + 1]),
+      catalogPath: decodeURIComponent(path.slice(blobIndex + 2).join('/')),
+    };
+  }
+
+  throw new Error(`Failed to parse ${urlString}`);
+}
diff --git a/plugins/catalog-backend/src/ingestion/processors/GithubDiscoveryProcessor.test.ts b/plugins/catalog-backend/src/ingestion/processors/GithubDiscoveryProcessor.test.ts
index 467e9c1ea2..12d9e66659 100644
--- a/plugins/catalog-backend/src/ingestion/processors/GithubDiscoveryProcessor.test.ts
+++ b/plugins/catalog-backend/src/ingestion/processors/GithubDiscoveryProcessor.test.ts
@@ -21,9 +21,10 @@ import { getOrganizationRepositories } from './github';
 import { ConfigReader } from '@backstage/config';
 
 jest.mock('./github');
-const mockGetOrganizationRepositories = getOrganizationRepositories as jest.MockedFunction<
-  typeof getOrganizationRepositories
->;
+const mockGetOrganizationRepositories =
+  getOrganizationRepositories as jest.MockedFunction<
+    typeof getOrganizationRepositories
+  >;
 
 describe('GithubDiscoveryProcessor', () => {
   describe('parseUrl', () => {
@@ -32,22 +33,32 @@ describe('GithubDiscoveryProcessor', () => {
         parseUrl('https://github.com/foo/proj/blob/master/catalog.yaml'),
       ).toEqual({
         org: 'foo',
+        host: 'github.com',
         repoSearchPath: /^proj$/,
-        catalogPath: '/blob/master/catalog.yaml',
+        branch: 'master',
+        catalogPath: '/catalog.yaml',
       });
       expect(
         parseUrl('https://github.com/foo/proj*/blob/master/catalog.yaml'),
       ).toEqual({
         org: 'foo',
+        host: 'github.com',
         repoSearchPath: /^proj.*$/,
-        catalogPath: '/blob/master/catalog.yaml',
+        branch: 'master',
+        catalogPath: '/catalog.yaml',
+      });
+      expect(parseUrl('https://github.com/foo')).toEqual({
+        org: 'foo',
+        host: 'github.com',
+        repoSearchPath: /^.*$/,
+        branch: '-',
+        catalogPath: '/catalog-info.yaml',
       });
     });
 
     it('throws on incorrectly formed URLs', () => {
       expect(() => parseUrl('https://github.com')).toThrow();
       expect(() => parseUrl('https://github.com//')).toThrow();
-      expect(() => parseUrl('https://github.com/foo')).toThrow();
       expect(() => parseUrl('https://github.com//foo')).toThrow();
       expect(() => parseUrl('https://github.com/org/teams')).toThrow();
       expect(() => parseUrl('https://github.com/org//teams')).toThrow();
@@ -122,11 +133,17 @@ describe('GithubDiscoveryProcessor', () => {
             name: 'backstage',
             url: 'https://github.com/backstage/backstage',
             isArchived: false,
+            defaultBranchRef: {
+              name: 'master',
+            },
           },
           {
             name: 'demo',
             url: 'https://github.com/backstage/demo',
             isArchived: false,
+            defaultBranchRef: {
+              name: 'main',
+            },
           },
         ],
       });
@@ -153,6 +170,92 @@ describe('GithubDiscoveryProcessor', () => {
       });
     });
 
+    it('output repositories with wildcards default branch option', async () => {
+      const location: LocationSpec = {
+        type: 'github-discovery',
+        target: 'https://github.com/backstage/*/blob/-/catalog.yaml',
+      };
+      mockGetOrganizationRepositories.mockResolvedValueOnce({
+        repositories: [
+          {
+            name: 'backstage',
+            url: 'https://github.com/backstage/tech-docs',
+            isArchived: false,
+            defaultBranchRef: {
+              name: 'main',
+            },
+          },
+        ],
+      });
+      const emitter = jest.fn();
+
+      await processor.readLocation(location, false, emitter);
+
+      expect(emitter).toHaveBeenCalledWith({
+        type: 'location',
+        location: {
+          type: 'url',
+          target:
+            'https://github.com/backstage/tech-docs/blob/main/catalog.yaml',
+        },
+        optional: true,
+      });
+    });
+
+    it("doesn't output repositories as default branch returned is empty", async () => {
+      const location: LocationSpec = {
+        type: 'github-discovery',
+        target: 'https://github.com/backstage/blob/-/catalog.yaml',
+      };
+      mockGetOrganizationRepositories.mockResolvedValueOnce({
+        repositories: [
+          {
+            name: 'backstage',
+            url: 'https://github.com/backstage/tech-docs',
+            isArchived: false,
+            defaultBranchRef: null,
+          },
+        ],
+      });
+      const emitter = jest.fn();
+
+      await processor.readLocation(location, false, emitter);
+
+      expect(emitter).not.toHaveBeenCalled();
+    });
+
+    it('output repositories with wildcards default branch option without catalog-info patch or branch match', async () => {
+      const location: LocationSpec = {
+        type: 'github-discovery',
+        target: 'https://github.com/backstage',
+      };
+      mockGetOrganizationRepositories.mockResolvedValueOnce({
+        repositories: [
+          {
+            name: 'backstage',
+            url: 'https://github.com/backstage/backstage',
+            isArchived: false,
+            defaultBranchRef: {
+              name: 'master',
+            },
+          },
+        ],
+      });
+      const emitter = jest.fn();
+
+      await processor.readLocation(location, false, emitter);
+
+      expect(emitter).toHaveBeenCalledWith({
+        type: 'location',
+        location: {
+          type: 'url',
+          target:
+            'https://github.com/backstage/backstage/blob/master/catalog-info.yaml',
+        },
+        optional: true,
+      });
+    });
+
     it('output repositories with wildcards', async () => {
       const location: LocationSpec = {
         type: 'github-discovery',
@@ -165,16 +268,31 @@ describe('GithubDiscoveryProcessor', () => {
             name: 'backstage',
             url: 'https://github.com/backstage/backstage',
             isArchived: false,
+            defaultBranchRef: {
+              name: 'main',
+            },
           },
           {
             name: 'techdocs-cli',
             url: 'https://github.com/backstage/techdocs-cli',
             isArchived: false,
+            defaultBranchRef: {
+              name: 'main',
+            },
           },
           {
             name: 'techdocs-container',
             url: 'https://github.com/backstage/techdocs-container',
             isArchived: false,
+            defaultBranchRef: {
+              name: 'main',
+            },
+          },
+          {
+            name: 'techdocs-durp',
+            url: 'https://github.com/backstage/techdocs-durp',
+            isArchived: false,
+            defaultBranchRef: null,
           },
         ],
       });
@@ -201,6 +319,7 @@ describe('GithubDiscoveryProcessor', () => {
         optional: true,
       });
     });
+
     it('filter unrelated and archived repositories', async () => {
       const location: LocationSpec = {
         type: 'github-discovery',
@@ -212,21 +331,33 @@ describe('GithubDiscoveryProcessor', () => {
             name: 'abstest',
             url: 'https://github.com/backstage/abctest',
             isArchived: false,
+            defaultBranchRef: {
+              name: 'main',
+            },
           },
           {
             name: 'test',
             url: 'https://github.com/backstage/test',
             isArchived: false,
+            defaultBranchRef: {
+              name: 'main',
+            },
           },
           {
             name: 'test-archived',
             url: 'https://github.com/backstage/test',
             isArchived: true,
+            defaultBranchRef: {
+              name: 'main',
+            },
           },
           {
             name: 'testxyz',
             url: 'https://github.com/backstage/testxyz',
             isArchived: false,
+            defaultBranchRef: {
+              name: 'main',
+            },
           },
         ],
       });
diff --git a/plugins/catalog-backend/src/ingestion/processors/GithubDiscoveryProcessor.ts b/plugins/catalog-backend/src/ingestion/processors/GithubDiscoveryProcessor.ts
index 2219e02406..b104d87542 100644
--- a/plugins/catalog-backend/src/ingestion/processors/GithubDiscoveryProcessor.ts
+++ b/plugins/catalog-backend/src/ingestion/processors/GithubDiscoveryProcessor.ts
@@ -28,7 +28,18 @@ import { CatalogProcessor, CatalogProcessorEmit } from './types';
 
 /**
  * Extracts repositories out of a GitHub org.
- */
+ *
+ * The following will create locations for all projects which have a catalog-info.yaml
+ * on the default branch. The first is shorthand for the second.
+ *
+ *    target: "https://github.com/backstage"
+ *    or
+ *    target: https://github.com/backstage/*\/blob/-/catalog-info.yaml
+ *
+ * You may also explicitly specify the source branch:
+ *
+ *    target: https://github.com/backstage/*\/blob/main/catalog-info.yaml
+ **/
 export class GithubDiscoveryProcessor implements CatalogProcessor {
   private readonly integrations: ScmIntegrations;
   private readonly logger: Logger;
@@ -56,17 +67,26 @@ export class GithubDiscoveryProcessor implements CatalogProcessor {
       return false;
     }
 
-    const gitHubConfig = this.integrations.github.byUrl(location.target)
-      ?.config;
+    const gitHubConfig = this.integrations.github.byUrl(
+      location.target,
+    )?.config;
     if (!gitHubConfig) {
       throw new Error(
         `There is no GitHub integration that matches ${location.target}. Please add a configuration entry for it under integrations.github`,
       );
     }
+
+    const { org, repoSearchPath, catalogPath, branch, host } = parseUrl(
+      location.target,
+    );
+
+    // Building the org url here so that the github creds provider doesn't need to know
+    // about how to handle the wild card which is special for this processor.
+    const orgUrl = `https://${host}/${org}`;
+
     const { headers } = await GithubCredentialsProvider.create(
       gitHubConfig,
-    ).getCredentials({ url: location.target });
-    const { org, repoSearchPath, catalogPath } = parseUrl(location.target);
+    ).getCredentials({ url: orgUrl });
 
     const client = graphql.defaults({
       baseUrl: gitHubConfig.apiBaseUrl,
@@ -88,11 +108,23 @@ export class GithubDiscoveryProcessor implements CatalogProcessor {
     );
 
     for (const repository of matching) {
+      const branchName =
+        branch === '-' ? repository.defaultBranchRef?.name : branch;
+
+      if (!branchName) {
+        this.logger.info(
+          `the repository ${repository.url} does not have a default branch, skipping`,
+        );
+        continue;
+      }
+
+      const path = `/blob/${branchName}${catalogPath}`;
+
       emit(
         results.location(
           {
             type: 'url',
-            target: `${repository.url}${catalogPath}`,
+            target: `${repository.url}${path}`,
           },
           // Not all locations may actually exist, since the user defined them as a wildcard pattern.
           // Thus, we emit them as optional and let the downstream processor find them while not outputting
@@ -110,18 +142,34 @@ export class GithubDiscoveryProcessor implements CatalogProcessor {
  * Helpers
  */
 
-export function parseUrl(
-  urlString: string,
-): { org: string; repoSearchPath: RegExp; catalogPath: string } {
+export function parseUrl(urlString: string): {
+  org: string;
+  repoSearchPath: RegExp;
+  catalogPath: string;
+  branch: string;
+  host: string;
+} {
   const url = new URL(urlString);
   const path = url.pathname.substr(1).split('/');
 
   // /backstage/techdocs-*/blob/master/catalog-info.yaml
+  // can also be
+  // /backstage
   if (path.length > 2 && path[0].length && path[1].length) {
     return {
       org: decodeURIComponent(path[0]),
       repoSearchPath: escapeRegExp(decodeURIComponent(path[1])),
-      catalogPath: `/${decodeURIComponent(path.slice(2).join('/'))}`,
+      branch: decodeURIComponent(path[3]),
+      catalogPath: `/${decodeURIComponent(path.slice(4).join('/'))}`,
+      host: url.host,
+    };
+  } else if (path.length === 1 && path[0].length) {
+    return {
+      org: decodeURIComponent(path[0]),
+      host: url.host,
+      repoSearchPath: escapeRegExp('*'),
+      catalogPath: '/catalog-info.yaml',
+      branch: '-',
     };
   }
 
diff --git a/plugins/catalog-backend/src/ingestion/processors/GithubMultiOrgReaderProcessor.ts b/plugins/catalog-backend/src/ingestion/processors/GithubMultiOrgReaderProcessor.ts
index 5223acba4a..00b173777d 100644
--- a/plugins/catalog-backend/src/ingestion/processors/GithubMultiOrgReaderProcessor.ts
+++ b/plugins/catalog-backend/src/ingestion/processors/GithubMultiOrgReaderProcessor.ts
@@ -75,8 +75,9 @@ export class GithubMultiOrgReaderProcessor implements CatalogProcessor {
       return false;
     }
 
-    const gitHubConfig = this.integrations.github.byUrl(location.target)
-      ?.config;
+    const gitHubConfig = this.integrations.github.byUrl(
+      location.target,
+    )?.config;
     if (!gitHubConfig) {
       throw new Error(
         `There is no GitHub integration that matches ${location.target}. Please add a configuration entry for it under integrations.github`,
@@ -93,12 +94,10 @@ export class GithubMultiOrgReaderProcessor implements CatalogProcessor {
 
     for (const orgConfig of orgsToProcess) {
       try {
-        const {
-          headers,
-          type: tokenType,
-        } = await credentialsProvider.getCredentials({
-          url: `${baseUrl}/${orgConfig.name}`,
-        });
+        const { headers, type: tokenType } =
+          await credentialsProvider.getCredentials({
+            url: `${baseUrl}/${orgConfig.name}`,
+          });
         const client = graphql.defaults({
           baseUrl: gitHubConfig.apiBaseUrl,
           headers,
@@ -112,6 +111,7 @@ export class GithubMultiOrgReaderProcessor implements CatalogProcessor {
           client,
           orgConfig.name,
           tokenType,
+          orgConfig.userNamespace,
         );
         const { groups, groupMemberUsers } = await getOrganizationTeams(
           client,
@@ -124,15 +124,18 @@ export class GithubMultiOrgReaderProcessor implements CatalogProcessor {
           `Read ${users.length} GitHub users and ${groups.length} GitHub teams from ${orgConfig.name} in ${duration} seconds`,
         );
 
+        let prefix: string = orgConfig.userNamespace ?? '';
+        if (prefix.length > 0) prefix += '/';
+
         users.forEach(u => {
-          if (!allUsersMap.has(u.metadata.name)) {
-            allUsersMap.set(u.metadata.name, u);
+          if (!allUsersMap.has(prefix + u.metadata.name)) {
+            allUsersMap.set(prefix + u.metadata.name, u);
           }
         });
 
         for (const [groupName, userNames] of groupMemberUsers.entries()) {
           for (const userName of userNames) {
-            const user = allUsersMap.get(userName);
+            const user = allUsersMap.get(prefix + userName);
             if (user && !user.spec.memberOf.includes(groupName)) {
               user.spec.memberOf.push(groupName);
             }
diff --git a/plugins/catalog-backend/src/ingestion/processors/GithubOrgReaderProcessor.ts b/plugins/catalog-backend/src/ingestion/processors/GithubOrgReaderProcessor.ts
index 364042f74d..3a82ff6516 100644
--- a/plugins/catalog-backend/src/ingestion/processors/GithubOrgReaderProcessor.ts
+++ b/plugins/catalog-backend/src/ingestion/processors/GithubOrgReaderProcessor.ts
@@ -113,12 +113,10 @@ export class GithubOrgReaderProcessor implements CatalogProcessor {
     }
 
     const credentialsProvider = GithubCredentialsProvider.create(gitHubConfig);
-    const {
-      headers,
-      type: tokenType,
-    } = await credentialsProvider.getCredentials({
-      url: orgUrl,
-    });
+    const { headers, type: tokenType } =
+      await credentialsProvider.getCredentials({
+        url: orgUrl,
+      });
 
     const client = graphql.defaults({
       baseUrl: gitHubConfig.apiBaseUrl,
diff --git a/plugins/catalog-backend/src/ingestion/processors/LocationEntityProcessor.test.ts b/plugins/catalog-backend/src/ingestion/processors/LocationEntityProcessor.test.ts
index b018542fcc..c4551e30f8 100644
--- a/plugins/catalog-backend/src/ingestion/processors/LocationEntityProcessor.test.ts
+++ b/plugins/catalog-backend/src/ingestion/processors/LocationEntityProcessor.test.ts
@@ -26,7 +26,7 @@ import { toAbsoluteUrl } from './LocationEntityProcessor';
 describe('LocationEntityProcessor', () => {
   describe('toAbsoluteUrl', () => {
     it('handles files', () => {
-      const integrations = ({} as unknown) as ScmIntegrationRegistry;
+      const integrations = {} as unknown as ScmIntegrationRegistry;
       const base: LocationSpec = {
         type: 'file',
         target: `some${path.sep}path${path.sep}catalog-info.yaml`,
diff --git a/plugins/catalog-backend/src/ingestion/processors/LocationEntityProcessor.ts b/plugins/catalog-backend/src/ingestion/processors/LocationEntityProcessor.ts
index 964a769e55..c6b7def5fc 100644
--- a/plugins/catalog-backend/src/ingestion/processors/LocationEntityProcessor.ts
+++ b/plugins/catalog-backend/src/ingestion/processors/LocationEntityProcessor.ts
@@ -38,12 +38,12 @@ export function toAbsoluteUrl(
   }
 }
 
-type Options = {
+export type LocationEntityProcessorOptions = {
   integrations: ScmIntegrationRegistry;
 };
 
 export class LocationEntityProcessor implements CatalogProcessor {
-  constructor(private readonly options: Options) {}
+  constructor(private readonly options: LocationEntityProcessorOptions) {}
 
   async postProcessEntity(
     entity: Entity,
diff --git a/plugins/catalog-backend/src/ingestion/processors/PlaceholderProcessor.test.ts b/plugins/catalog-backend/src/ingestion/processors/PlaceholderProcessor.test.ts
index 0254e854e5..c7a49353ae 100644
--- a/plugins/catalog-backend/src/ingestion/processors/PlaceholderProcessor.test.ts
+++ b/plugins/catalog-backend/src/ingestion/processors/PlaceholderProcessor.test.ts
@@ -15,18 +15,22 @@
  */
 import { UrlReader } from '@backstage/backend-common';
 import { Entity } from '@backstage/catalog-model';
+import { ConfigReader } from '@backstage/config';
+import { ScmIntegrations } from '@backstage/integration';
 import {
   jsonPlaceholderResolver,
   PlaceholderProcessor,
   PlaceholderResolver,
-  ResolverParams,
-  ResolverRead,
+  PlaceholderResolverParams,
+  PlaceholderResolverRead,
   textPlaceholderResolver,
   yamlPlaceholderResolver,
 } from './PlaceholderProcessor';
 
+const integrations = ScmIntegrations.fromConfig(new ConfigReader({}));
+
 describe('PlaceholderProcessor', () => {
-  const read: jest.MockedFunction<ResolverRead> = jest.fn();
+  const read: jest.MockedFunction<PlaceholderResolverRead> = jest.fn();
   const reader: UrlReader = { read, readTree: jest.fn(), search: jest.fn() };
 
   beforeEach(() => {
@@ -44,6 +48,7 @@ describe('PlaceholderProcessor', () => {
         foo: async () => 'replaced',
       },
       reader,
+      integrations,
     });
     await expect(
       processor.preProcessEntity(input, { type: 't', target: 'l' }),
@@ -59,6 +64,7 @@ describe('PlaceholderProcessor', () => {
         upper: upperResolver,
       },
       reader,
+      integrations,
     });
 
     await expect(
@@ -95,6 +101,7 @@ describe('PlaceholderProcessor', () => {
         bar: jest.fn(),
       },
       reader,
+      integrations,
     });
     const entity: Entity = {
       apiVersion: 'a',
@@ -115,6 +122,7 @@ describe('PlaceholderProcessor', () => {
         bar: jest.fn(),
       },
       reader,
+      integrations,
     });
     const entity: Entity = {
       apiVersion: 'a',
@@ -134,6 +142,7 @@ describe('PlaceholderProcessor', () => {
     const processor = new PlaceholderProcessor({
       resolvers: { text: textPlaceholderResolver },
       reader,
+      integrations,
     });
 
     await expect(
@@ -169,6 +178,7 @@ describe('PlaceholderProcessor', () => {
     const processor = new PlaceholderProcessor({
       resolvers: { json: jsonPlaceholderResolver },
       reader,
+      integrations,
     });
 
     await expect(
@@ -202,6 +212,7 @@ describe('PlaceholderProcessor', () => {
     const processor = new PlaceholderProcessor({
       resolvers: { yaml: yamlPlaceholderResolver },
       reader,
+      integrations,
     });
 
     await expect(
@@ -235,6 +246,7 @@ describe('PlaceholderProcessor', () => {
     const processor = new PlaceholderProcessor({
       resolvers: { text: textPlaceholderResolver },
       reader,
+      integrations,
     });
 
     await expect(
@@ -272,6 +284,7 @@ describe('PlaceholderProcessor', () => {
     const processor = new PlaceholderProcessor({
       resolvers: { text: textPlaceholderResolver },
       reader,
+      integrations,
     });
 
     await expect(
@@ -311,6 +324,7 @@ describe('PlaceholderProcessor', () => {
     const processor = new PlaceholderProcessor({
       resolvers: { text: textPlaceholderResolver },
       reader,
+      integrations,
     });
 
     await expect(
@@ -331,7 +345,7 @@ describe('PlaceholderProcessor', () => {
         },
       ),
     ).rejects.toThrow(
-      'Placeholder $text could not form a URL out of ./a/b/catalog-info.yaml and ../c/catalog-info.yaml',
+      'Placeholder $text could not form a URL out of ./a/b/catalog-info.yaml and ../c/catalog-info.yaml, TypeError: Invalid base URL: ./a/b/catalog-info.yaml',
     );
 
     expect(read).not.toBeCalled();
@@ -339,12 +353,13 @@ describe('PlaceholderProcessor', () => {
 });
 
 describe('yamlPlaceholderResolver', () => {
-  const read: jest.MockedFunction<ResolverRead> = jest.fn();
-  const params: ResolverParams = {
+  const read: jest.MockedFunction<PlaceholderResolverRead> = jest.fn();
+  const params: PlaceholderResolverParams = {
     key: 'a',
     value: './file.yaml',
     baseUrl: 'https://github.com/backstage/backstage/a/b/catalog-info.yaml',
     read,
+    resolveUrl: (url, base) => integrations.resolveUrl({ url, base }),
   };
 
   beforeEach(() => {
@@ -383,12 +398,13 @@ describe('yamlPlaceholderResolver', () => {
 });
 
 describe('jsonPlaceholderResolver', () => {
-  const read: jest.MockedFunction<ResolverRead> = jest.fn();
-  const params: ResolverParams = {
+  const read: jest.MockedFunction<PlaceholderResolverRead> = jest.fn();
+  const params: PlaceholderResolverParams = {
     key: 'a',
     value: './file.json',
     baseUrl: 'https://github.com/backstage/backstage/a/b/catalog-info.yaml',
     read,
+    resolveUrl: (url, base) => integrations.resolveUrl({ url, base }),
   };
 
   beforeEach(() => {
diff --git a/plugins/catalog-backend/src/ingestion/processors/PlaceholderProcessor.ts b/plugins/catalog-backend/src/ingestion/processors/PlaceholderProcessor.ts
index 1b015d7d93..9ddef1ab3b 100644
--- a/plugins/catalog-backend/src/ingestion/processors/PlaceholderProcessor.ts
+++ b/plugins/catalog-backend/src/ingestion/processors/PlaceholderProcessor.ts
@@ -17,25 +17,32 @@
 import { UrlReader } from '@backstage/backend-common';
 import { Entity, LocationSpec } from '@backstage/catalog-model';
 import { JsonValue } from '@backstage/config';
+import { ScmIntegrationRegistry } from '@backstage/integration';
 import yaml from 'yaml';
 import { CatalogProcessor } from './types';
 
-export type ResolverRead = (url: string) => Promise<Buffer>;
+export type PlaceholderResolverRead = (url: string) => Promise<Buffer>;
+export type PlaceholderResolverResolveUrl = (
+  url: string,
+  base: string,
+) => string;
 
-export type ResolverParams = {
+export type PlaceholderResolverParams = {
   key: string;
   value: JsonValue;
   baseUrl: string;
-  read: ResolverRead;
+  read: PlaceholderResolverRead;
+  resolveUrl: PlaceholderResolverResolveUrl;
 };
 
 export type PlaceholderResolver = (
-  params: ResolverParams,
+  params: PlaceholderResolverParams,
 ) => Promise<JsonValue>;
 
-type Options = {
+export type PlaceholderProcessorOptions = {
   resolvers: Record<string, PlaceholderResolver>;
   reader: UrlReader;
+  integrations: ScmIntegrationRegistry;
 };
 
 /**
@@ -43,7 +50,7 @@ type Options = {
  * that it then fills in with actual data.
  */
 export class PlaceholderProcessor implements CatalogProcessor {
-  constructor(private readonly options: Options) {}
+  constructor(private readonly options: PlaceholderProcessorOptions) {}
 
   async preProcessEntity(
     entity: Entity,
@@ -103,12 +110,19 @@ export class PlaceholderProcessor implements CatalogProcessor {
         return this.options.reader.read(url);
       };
 
+      const resolveUrl = (url: string, base: string): string =>
+        this.options.integrations.resolveUrl({
+          url,
+          base,
+        });
+
       return [
         await resolver({
           key: resolverKey,
           value: resolverValue,
           baseUrl: location.target,
           read,
+          resolveUrl,
         }),
         true,
       ];
@@ -124,7 +138,7 @@ export class PlaceholderProcessor implements CatalogProcessor {
  */
 
 export async function yamlPlaceholderResolver(
-  params: ResolverParams,
+  params: PlaceholderResolverParams,
 ): Promise<JsonValue> {
   const text = await readTextLocation(params);
 
@@ -155,7 +169,7 @@ export async function yamlPlaceholderResolver(
 }
 
 export async function jsonPlaceholderResolver(
-  params: ResolverParams,
+  params: PlaceholderResolverParams,
 ): Promise<JsonValue> {
   const text = await readTextLocation(params);
 
@@ -169,7 +183,7 @@ export async function jsonPlaceholderResolver(
 }
 
 export async function textPlaceholderResolver(
-  params: ResolverParams,
+  params: PlaceholderResolverParams,
 ): Promise<JsonValue> {
   return await readTextLocation(params);
 }
@@ -178,7 +192,9 @@ export async function textPlaceholderResolver(
  * Helpers
  */
 
-async function readTextLocation(params: ResolverParams): Promise<string> {
+async function readTextLocation(
+  params: PlaceholderResolverParams,
+): Promise<string> {
   const newUrl = relativeUrl(params);
 
   try {
@@ -191,31 +207,27 @@ async function readTextLocation(params: ResolverParams): Promise<string> {
   }
 }
 
-function relativeUrl({ key, value, baseUrl }: ResolverParams): string {
+function relativeUrl({
+  key,
+  value,
+  baseUrl,
+  resolveUrl,
+}: PlaceholderResolverParams): string {
   if (typeof value !== 'string') {
     throw new Error(
       `Placeholder \$${key} expected a string value parameter, in the form of an absolute URL or a relative path`,
     );
   }
 
-  let url: URL;
   try {
-    // The two-value form of the URL constructor handles relative paths for us
-    url = new URL(value, baseUrl);
-  } catch {
-    try {
-      // Check whether value is a valid absolute URL on it's own, if not fail.
-      url = new URL(value);
-    } catch {
-      // The only remaining case that isn't support is a relative file path that should be
-      // resolved using a relative file location. Accessing local file paths can lead to
-      // path traversal attacks and access to any file on the host system. Implementing this
-      // would require additional security measures.
-      throw new Error(
-        `Placeholder \$${key} could not form a URL out of ${baseUrl} and ${value}`,
-      );
-    }
+    return resolveUrl(value, baseUrl);
+  } catch (e) {
+    // The only remaining case that isn't support is a relative file path that should be
+    // resolved using a relative file location. Accessing local file paths can lead to
+    // path traversal attacks and access to any file on the host system. Implementing this
+    // would require additional security measures.
+    throw new Error(
+      `Placeholder \$${key} could not form a URL out of ${baseUrl} and ${value}, ${e}`,
+    );
   }
-
-  return url.toString();
 }
diff --git a/plugins/catalog-backend/src/ingestion/processors/UrlReaderProcessor.ts b/plugins/catalog-backend/src/ingestion/processors/UrlReaderProcessor.ts
index da7bee12d8..e3ec8c0480 100644
--- a/plugins/catalog-backend/src/ingestion/processors/UrlReaderProcessor.ts
+++ b/plugins/catalog-backend/src/ingestion/processors/UrlReaderProcessor.ts
@@ -26,16 +26,6 @@ import {
   CatalogProcessorParser,
 } from './types';
 
-// TODO(Rugvip): Added for backwards compatibility when moving to UrlReader, this
-// can be removed in a bit
-const deprecatedTypes = [
-  'github',
-  'github/api',
-  'bitbucket/api',
-  'gitlab/api',
-  'azure/api',
-];
-
 type Options = {
   reader: UrlReader;
   logger: Logger;
@@ -50,13 +40,7 @@ export class UrlReaderProcessor implements CatalogProcessor {
     emit: CatalogProcessorEmit,
     parser: CatalogProcessorParser,
   ): Promise<boolean> {
-    if (deprecatedTypes.includes(location.type)) {
-      // TODO(Rugvip): Remove this warning a month or two into 2021, and remove support for the deprecated types.
-      this.options.logger.warn(
-        `Location '${location.target}' uses deprecated location type '${location.type}', use 'url' instead. ` +
-          'Use "scripts/migrate-location-types.js" in the Backstage repo to migrate existing locations.',
-      );
-    } else if (location.type !== 'url') {
+    if (location.type !== 'url') {
       return false;
     }
 
diff --git a/plugins/catalog-backend/src/ingestion/processors/bitbucket/BitbucketRepositoryParser.ts b/plugins/catalog-backend/src/ingestion/processors/bitbucket/BitbucketRepositoryParser.ts
index 6f33646c54..27f07d58a2 100644
--- a/plugins/catalog-backend/src/ingestion/processors/bitbucket/BitbucketRepositoryParser.ts
+++ b/plugins/catalog-backend/src/ingestion/processors/bitbucket/BitbucketRepositoryParser.ts
@@ -24,17 +24,16 @@ export type BitbucketRepositoryParser = (options: {
   logger: Logger;
 }) => AsyncIterable<CatalogProcessorResult>;
 
-export const defaultRepositoryParser: BitbucketRepositoryParser = async function* defaultRepositoryParser({
-  target,
-}) {
-  yield results.location(
-    {
-      type: 'url',
-      target: target,
-    },
-    // Not all locations may actually exist, since the user defined them as a wildcard pattern.
-    // Thus, we emit them as optional and let the downstream processor find them while not outputting
-    // an error if it couldn't.
-    true,
-  );
-};
+export const defaultRepositoryParser: BitbucketRepositoryParser =
+  async function* defaultRepositoryParser({ target }) {
+    yield results.location(
+      {
+        type: 'url',
+        target: target,
+      },
+      // Not all locations may actually exist, since the user defined them as a wildcard pattern.
+      // Thus, we emit them as optional and let the downstream processor find them while not outputting
+      // an error if it couldn't.
+      true,
+    );
+  };
diff --git a/plugins/catalog-backend/src/ingestion/processors/github/config.test.ts b/plugins/catalog-backend/src/ingestion/processors/github/config.test.ts
index 7bdc28e6dd..a67d2378d0 100644
--- a/plugins/catalog-backend/src/ingestion/processors/github/config.test.ts
+++ b/plugins/catalog-backend/src/ingestion/processors/github/config.test.ts
@@ -78,32 +78,48 @@ describe('config', () => {
   });
 
   describe('readGithubMultiOrgConfig', () => {
-    function config(orgs: { name: string; groupNamespace?: string }[]) {
+    function config(
+      orgs: { name: string; groupNamespace?: string; userNamespace?: string }[],
+    ) {
       return new ConfigReader({ orgs });
     }
 
     it('reads org configs', () => {
       const output = readGithubMultiOrgConfig(
         config([
-          { name: 'foo', groupNamespace: 'apple' },
-          { name: 'bar', groupNamespace: 'Orange' },
+          { name: 'foo', groupNamespace: 'apple', userNamespace: 'red' },
+          { name: 'bar', groupNamespace: 'Orange', userNamespace: 'blue' },
         ]),
       );
 
       expect(output).toEqual([
-        { name: 'foo', groupNamespace: 'apple' },
-        { name: 'bar', groupNamespace: 'orange' },
+        { name: 'foo', groupNamespace: 'apple', userNamespace: 'red' },
+        { name: 'bar', groupNamespace: 'orange', userNamespace: 'blue' },
       ]);
     });
 
     it('defaults groupNamespace to org name if undefined', () => {
+      const output = readGithubMultiOrgConfig(
+        config([
+          { name: 'foo', userNamespace: 'red' },
+          { name: 'bar', userNamespace: 'blue' },
+        ]),
+      );
+
+      expect(output).toEqual([
+        { name: 'foo', groupNamespace: 'foo', userNamespace: 'red' },
+        { name: 'bar', groupNamespace: 'bar', userNamespace: 'blue' },
+      ]);
+    });
+
+    it('defaults userNamespace to undefined if unspecified', () => {
       const output = readGithubMultiOrgConfig(
         config([{ name: 'foo' }, { name: 'bar' }]),
       );
 
       expect(output).toEqual([
-        { name: 'foo', groupNamespace: 'foo' },
-        { name: 'bar', groupNamespace: 'bar' },
+        { name: 'foo', groupNamespace: 'foo', userNamespace: undefined },
+        { name: 'bar', groupNamespace: 'bar', userNamespace: undefined },
       ]);
     });
   });
diff --git a/plugins/catalog-backend/src/ingestion/processors/github/config.ts b/plugins/catalog-backend/src/ingestion/processors/github/config.ts
index 40305ff1f2..df9e19ff10 100644
--- a/plugins/catalog-backend/src/ingestion/processors/github/config.ts
+++ b/plugins/catalog-backend/src/ingestion/processors/github/config.ts
@@ -95,6 +95,10 @@ export type GithubMultiOrgConfig = Array<{
    * The namespace of the group created for this org.
    */
   groupNamespace: string;
+  /**
+   * The namespace of the users created for this org. If not specified defaults to undefined.
+   */
+  userNamespace: string | undefined;
 }>;
 
 export function readGithubMultiOrgConfig(config: Config): GithubMultiOrgConfig {
@@ -104,5 +108,6 @@ export function readGithubMultiOrgConfig(config: Config): GithubMultiOrgConfig {
     groupNamespace: (
       c.getOptionalString('groupNamespace') ?? c.getString('name')
     ).toLowerCase(),
+    userNamespace: c.getOptionalString('userNamespace') ?? undefined,
   }));
 }
diff --git a/plugins/catalog-backend/src/ingestion/processors/github/github.test.ts b/plugins/catalog-backend/src/ingestion/processors/github/github.test.ts
index 11cdf671c3..e481355fb4 100644
--- a/plugins/catalog-backend/src/ingestion/processors/github/github.test.ts
+++ b/plugins/catalog-backend/src/ingestion/processors/github/github.test.ts
@@ -201,11 +201,17 @@ describe('github', () => {
                 name: 'backstage',
                 url: 'https://github.com/backstage/backstage',
                 isArchived: false,
+                defaultBranchRef: {
+                  name: 'main',
+                },
               },
               {
                 name: 'demo',
                 url: 'https://github.com/backstage/demo',
                 isArchived: true,
+                defaultBranchRef: {
+                  name: 'main',
+                },
               },
             ],
             pageInfo: {
@@ -221,11 +227,17 @@ describe('github', () => {
             name: 'backstage',
             url: 'https://github.com/backstage/backstage',
             isArchived: false,
+            defaultBranchRef: {
+              name: 'main',
+            },
           },
           {
             name: 'demo',
             url: 'https://github.com/backstage/demo',
             isArchived: true,
+            defaultBranchRef: {
+              name: 'main',
+            },
           },
         ],
       };
diff --git a/plugins/catalog-backend/src/ingestion/processors/github/github.ts b/plugins/catalog-backend/src/ingestion/processors/github/github.ts
index 7e1ef136eb..547568d8d2 100644
--- a/plugins/catalog-backend/src/ingestion/processors/github/github.ts
+++ b/plugins/catalog-backend/src/ingestion/processors/github/github.ts
@@ -60,6 +60,9 @@ export type Repository = {
   name: string;
   url: string;
   isArchived: boolean;
+  defaultBranchRef: {
+    name: string;
+  } | null;
 };
 
 export type Connection<T> = {
@@ -79,6 +82,7 @@ export async function getOrganizationUsers(
   client: typeof graphql,
   org: string,
   tokenType: GithubCredentialType,
+  userNamespace?: string,
 ): Promise<{ users: UserEntity[] }> {
   const query = `
     query users($org: String!, $email: Boolean!, $cursor: String) {
@@ -114,6 +118,7 @@ export async function getOrganizationUsers(
       },
     };
 
+    if (userNamespace) entity.metadata.namespace = userNamespace;
     if (user.bio) entity.metadata.description = user.bio;
     if (user.name) entity.spec.profile!.displayName = user.name;
     if (user.email) entity.spec.profile!.email = user.email;
@@ -252,6 +257,9 @@ export async function getOrganizationRepositories(
             name
             url
             isArchived
+            defaultBranchRef {
+              name
+            }
           }
           pageInfo {
             hasNextPage
@@ -330,7 +338,7 @@ export async function queryWithPaging<
   GraphqlType,
   OutputType,
   Variables extends {},
-  Response = QueryResponse
+  Response = QueryResponse,
 >(
   client: typeof graphql,
   query: string,
diff --git a/plugins/catalog-backend/src/ingestion/processors/gitlab/client.ts b/plugins/catalog-backend/src/ingestion/processors/gitlab/client.ts
new file mode 100644
index 0000000000..8781e071f7
--- /dev/null
+++ b/plugins/catalog-backend/src/ingestion/processors/gitlab/client.ts
@@ -0,0 +1,107 @@
+/*
+ * Copyright 2021 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import fetch from 'cross-fetch';
+import {
+  getGitLabRequestOptions,
+  GitLabIntegrationConfig,
+} from '@backstage/integration';
+import { Logger } from 'winston';
+
+export class GitLabClient {
+  private readonly config: GitLabIntegrationConfig;
+  private readonly logger: Logger;
+
+  constructor(options: { config: GitLabIntegrationConfig; logger: Logger }) {
+    this.config = options.config;
+    this.logger = options.logger;
+  }
+
+  async listProjects(options?: ListOptions): Promise<PagedResponse<any>> {
+    if (options?.group) {
+      return this.pagedRequest(
+        `${this.config.apiBaseUrl}/groups/${encodeURIComponent(
+          options?.group,
+        )}/projects`,
+        {
+          ...options,
+          include_subgroups: true,
+        },
+      );
+    }
+
+    return this.pagedRequest(`${this.config.apiBaseUrl}/projects`, options);
+  }
+
+  private async pagedRequest(
+    endpoint: string,
+    options?: ListOptions,
+  ): Promise<PagedResponse<any>> {
+    const request = new URL(endpoint);
+    for (const key in options) {
+      if (options[key]) {
+        request.searchParams.append(key, options[key]!.toString());
+      }
+    }
+
+    this.logger.debug(`Fetching: ${request.toString()}`);
+    const response = await fetch(
+      request.toString(),
+      getGitLabRequestOptions(this.config),
+    );
+    if (!response.ok) {
+      throw new Error(
+        `Unexpected response when fetching ${request.toString()}. Expected 200 but got ${
+          response.status
+        } - ${response.statusText}`,
+      );
+    }
+    return response.json().then(items => {
+      const nextPage = response.headers.get('x-next-page');
+
+      return {
+        items,
+        nextPage: nextPage ? Number(nextPage) : null,
+      } as PagedResponse<any>;
+    });
+  }
+}
+
+export type ListOptions = {
+  [key: string]: string | number | boolean | undefined;
+  group?: string;
+  per_page?: number | undefined;
+  page?: number | undefined;
+};
+
+export type PagedResponse<T> = {
+  items: T[];
+  nextPage?: number;
+};
+
+export async function* paginated(
+  request: (options: ListOptions) => Promise<PagedResponse<any>>,
+  options: ListOptions,
+) {
+  let res;
+  do {
+    res = await request(options);
+    options.page = res.nextPage;
+    for (const item of res.items) {
+      yield item;
+    }
+  } while (res.nextPage);
+}
diff --git a/plugins/catalog-backend/src/ingestion/processors/gitlab/index.ts b/plugins/catalog-backend/src/ingestion/processors/gitlab/index.ts
new file mode 100644
index 0000000000..1df3d2cb84
--- /dev/null
+++ b/plugins/catalog-backend/src/ingestion/processors/gitlab/index.ts
@@ -0,0 +1,18 @@
+/*
+ * Copyright 2021 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+export { GitLabClient, paginated } from './client';
+export type { GitLabProject } from './types';
diff --git a/plugins/catalog-backend/src/ingestion/processors/gitlab/types.ts b/plugins/catalog-backend/src/ingestion/processors/gitlab/types.ts
new file mode 100644
index 0000000000..a66411ddc8
--- /dev/null
+++ b/plugins/catalog-backend/src/ingestion/processors/gitlab/types.ts
@@ -0,0 +1,23 @@
+/*
+ * Copyright 2021 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+export type GitLabProject = {
+  id: number;
+  default_branch: string;
+  archived: boolean;
+  last_activity_at: string;
+  web_url: string;
+};
diff --git a/plugins/catalog-backend/src/ingestion/processors/index.ts b/plugins/catalog-backend/src/ingestion/processors/index.ts
index 6a44ea0a8f..fbdadba667 100644
--- a/plugins/catalog-backend/src/ingestion/processors/index.ts
+++ b/plugins/catalog-backend/src/ingestion/processors/index.ts
@@ -19,6 +19,7 @@ import * as results from './results';
 export { AnnotateLocationEntityProcessor } from './AnnotateLocationEntityProcessor';
 export { AnnotateScmSlugEntityProcessor } from './AnnotateScmSlugEntityProcessor';
 export { AwsOrganizationCloudAccountProcessor } from './AwsOrganizationCloudAccountProcessor';
+export type { AwsOrganizationProviderConfig } from './awsOrganization/config';
 export { BitbucketDiscoveryProcessor } from './BitbucketDiscoveryProcessor';
 export { BuiltinKindsEntityProcessor } from './BuiltinKindsEntityProcessor';
 export { CodeOwnersProcessor } from './CodeOwnersProcessor';
@@ -26,9 +27,17 @@ export { FileReaderProcessor } from './FileReaderProcessor';
 export { GithubDiscoveryProcessor } from './GithubDiscoveryProcessor';
 export { GithubOrgReaderProcessor } from './GithubOrgReaderProcessor';
 export { GithubMultiOrgReaderProcessor } from './GithubMultiOrgReaderProcessor';
+export { GitLabDiscoveryProcessor } from './GitLabDiscoveryProcessor';
 export { LocationEntityProcessor } from './LocationEntityProcessor';
+export type { LocationEntityProcessorOptions } from './LocationEntityProcessor';
 export { PlaceholderProcessor } from './PlaceholderProcessor';
-export type { PlaceholderResolver } from './PlaceholderProcessor';
+export type {
+  PlaceholderProcessorOptions,
+  PlaceholderResolver,
+  PlaceholderResolverParams,
+  PlaceholderResolverRead,
+  PlaceholderResolverResolveUrl,
+} from './PlaceholderProcessor';
 export { StaticLocationProcessor } from './StaticLocationProcessor';
 export * from './types';
 export { UrlReaderProcessor } from './UrlReaderProcessor';
diff --git a/plugins/catalog-backend/src/ingestion/processors/util/parse.ts b/plugins/catalog-backend/src/ingestion/processors/util/parse.ts
index e93b2a0200..c9c6c79311 100644
--- a/plugins/catalog-backend/src/ingestion/processors/util/parse.ts
+++ b/plugins/catalog-backend/src/ingestion/processors/util/parse.ts
@@ -58,11 +58,9 @@ export function* parseEntityYaml(
   }
 }
 
-export const defaultEntityDataParser: CatalogProcessorParser = async function* defaultEntityDataParser({
-  data,
-  location,
-}) {
-  for (const e of parseEntityYaml(data, location)) {
-    yield e;
-  }
-};
+export const defaultEntityDataParser: CatalogProcessorParser =
+  async function* defaultEntityDataParser({ data, location }) {
+    for (const e of parseEntityYaml(data, location)) {
+      yield e;
+    }
+  };
diff --git a/plugins/catalog-backend/src/ingestion/types.ts b/plugins/catalog-backend/src/ingestion/types.ts
index 297234b3b4..eb7b84e95f 100644
--- a/plugins/catalog-backend/src/ingestion/types.ts
+++ b/plugins/catalog-backend/src/ingestion/types.ts
@@ -99,7 +99,7 @@ export type AnalyzeLocationResponse = {
 // read and emitted like this so that the frontend can inform the user that it
 // located them and can make sure to register them as well if they weren't
 // already
-type AnalyzeLocationExistingEntity = {
+export type AnalyzeLocationExistingEntity = {
   location: LocationSpec;
   isRegistered: boolean;
   entity: Entity;
@@ -110,7 +110,7 @@ type AnalyzeLocationExistingEntity = {
 // the frontend. It'll probably contain a (possibly incomplete) entity, plus
 // enough info for the frontend to know what form data to show to the user
 // for overriding/completing the info.
-type AnalyzeLocationGenerateEntity = {
+export type AnalyzeLocationGenerateEntity = {
   // Some form of partial representation of the entity
   entity: RecursivePartial<Entity>;
   // Lists the suggestions that the user may want to override
@@ -120,7 +120,7 @@ type AnalyzeLocationGenerateEntity = {
 // This is where I get really vague. Something like this perhaps? Or it could be
 // something like a json-schema that contains enough info for the frontend to
 // be able to present a form and explanations
-type AnalyzeLocationEntityField = {
+export type AnalyzeLocationEntityField = {
   // e.g. "spec.owner"? The frontend needs to know how to "inject" the field into the
   // entity again if the user wants to change it
   field: string;
diff --git a/plugins/catalog-backend/src/next/ConfigLocationEntityProvider.test.ts b/plugins/catalog-backend/src/next/ConfigLocationEntityProvider.test.ts
index d177b1aa32..ef3e47eb8b 100644
--- a/plugins/catalog-backend/src/next/ConfigLocationEntityProvider.test.ts
+++ b/plugins/catalog-backend/src/next/ConfigLocationEntityProvider.test.ts
@@ -31,9 +31,9 @@ describe('ConfigLocationEntityProvider', () => {
       },
     });
 
-    const mockConnection = ({
+    const mockConnection = {
       applyMutation: jest.fn(),
-    } as unknown) as EntityProviderConnection;
+    } as unknown as EntityProviderConnection;
     const locationProvider = new ConfigLocationEntityProvider(mockConfig);
 
     await locationProvider.connect(mockConnection);
@@ -70,4 +70,61 @@ describe('ConfigLocationEntityProvider', () => {
       ]),
     });
   });
+
+  it('should be able to observe the config', async () => {
+    // Grab the subscriber function and use mutable config data to mock a config file change
+    let subscriber: () => void;
+    const mutableConfigData = {
+      catalog: {
+        locations: [{ type: 'url', target: 'https://github.com/a/a' }],
+      },
+    };
+
+    const mockConfig = Object.assign(new ConfigReader(mutableConfigData), {
+      subscribe: (s: () => void) => {
+        subscriber = s;
+        return { unsubscribe: () => {} };
+      },
+    });
+
+    const mockConnection = {
+      applyMutation: jest.fn(),
+    } as unknown as EntityProviderConnection;
+    const locationProvider = new ConfigLocationEntityProvider(mockConfig);
+
+    await locationProvider.connect(mockConnection);
+
+    expect(mockConnection.applyMutation).toHaveBeenCalledWith({
+      type: 'full',
+      entities: [
+        {
+          entity: expect.objectContaining({
+            spec: {
+              target: 'https://github.com/a/a',
+              type: 'url',
+            },
+          }),
+          locationKey: 'url:https://github.com/a/a',
+        },
+      ],
+    });
+
+    mutableConfigData.catalog.locations[0].target = 'https://github.com/b/b';
+    subscriber!();
+
+    expect(mockConnection.applyMutation).toHaveBeenCalledWith({
+      type: 'full',
+      entities: [
+        {
+          entity: expect.objectContaining({
+            spec: {
+              target: 'https://github.com/b/b',
+              type: 'url',
+            },
+          }),
+          locationKey: 'url:https://github.com/b/b',
+        },
+      ],
+    });
+  });
 });
diff --git a/plugins/catalog-backend/src/next/ConfigLocationEntityProvider.ts b/plugins/catalog-backend/src/next/ConfigLocationEntityProvider.ts
index 71ec84dae7..5deca09944 100644
--- a/plugins/catalog-backend/src/next/ConfigLocationEntityProvider.ts
+++ b/plugins/catalog-backend/src/next/ConfigLocationEntityProvider.ts
@@ -21,8 +21,6 @@ import { EntityProvider, EntityProviderConnection } from './types';
 import { locationSpecToLocationEntity } from './util';
 
 export class ConfigLocationEntityProvider implements EntityProvider {
-  private connection: EntityProviderConnection | undefined;
-
   constructor(private readonly config: Config) {}
 
   getProviderName(): string {
@@ -30,12 +28,35 @@ export class ConfigLocationEntityProvider implements EntityProvider {
   }
 
   async connect(connection: EntityProviderConnection): Promise<void> {
-    this.connection = connection;
+    const entities = this.getEntitiesFromConfig();
+    await connection.applyMutation({
+      type: 'full',
+      entities,
+    });
 
+    if (this.config.subscribe) {
+      let currentKey = JSON.stringify(entities);
+
+      this.config.subscribe(() => {
+        const newEntities = this.getEntitiesFromConfig();
+        const newKey = JSON.stringify(newEntities);
+
+        if (currentKey !== newKey) {
+          currentKey = newKey;
+          connection.applyMutation({
+            type: 'full',
+            entities: newEntities,
+          });
+        }
+      });
+    }
+  }
+
+  private getEntitiesFromConfig() {
     const locationConfigs =
       this.config.getOptionalConfigArray('catalog.locations') ?? [];
 
-    const entities = locationConfigs.map(location => {
+    return locationConfigs.map(location => {
       const type = location.getString('type');
       const target = location.getString('target');
       const entity = locationSpecToLocationEntity({
@@ -45,10 +66,5 @@ export class ConfigLocationEntityProvider implements EntityProvider {
       const locationKey = getEntityLocationRef(entity);
       return { entity, locationKey };
     });
-
-    await this.connection.applyMutation({
-      type: 'full',
-      entities,
-    });
   }
 }
diff --git a/plugins/catalog-backend/src/next/DefaultCatalogProcessingEngine.test.ts b/plugins/catalog-backend/src/next/DefaultCatalogProcessingEngine.test.ts
index b87635db85..f7dede4adb 100644
--- a/plugins/catalog-backend/src/next/DefaultCatalogProcessingEngine.test.ts
+++ b/plugins/catalog-backend/src/next/DefaultCatalogProcessingEngine.test.ts
@@ -15,6 +15,8 @@
  */
 
 import { getVoidLogger } from '@backstage/backend-common';
+import { Hash } from 'crypto';
+import { DateTime } from 'luxon';
 import waitForExpect from 'wait-for-expect';
 import { DefaultProcessingDatabase } from './database/DefaultProcessingDatabase';
 import { DefaultCatalogProcessingEngine } from './DefaultCatalogProcessingEngine';
@@ -22,17 +24,21 @@ import { CatalogProcessingOrchestrator } from './processing/types';
 import { Stitcher } from './stitching/Stitcher';
 
 describe('DefaultCatalogProcessingEngine', () => {
-  const db = ({
+  const db = {
     transaction: jest.fn(),
     getProcessableEntities: jest.fn(),
     updateProcessedEntity: jest.fn(),
-  } as unknown) as jest.Mocked<DefaultProcessingDatabase>;
+  } as unknown as jest.Mocked<DefaultProcessingDatabase>;
   const orchestrator: jest.Mocked<CatalogProcessingOrchestrator> = {
     process: jest.fn(),
   };
-  const stitcher = ({
+  const stitcher = {
     stitch: jest.fn(),
-  } as unknown) as jest.Mocked<Stitcher>;
+  } as unknown as jest.Mocked<Stitcher>;
+  const hash = {
+    update: () => hash,
+    digest: jest.fn(),
+  } as unknown as jest.Mocked<Hash>;
 
   beforeEach(() => {
     jest.resetAllMocks();
@@ -57,6 +63,7 @@ describe('DefaultCatalogProcessingEngine', () => {
       db,
       orchestrator,
       stitcher,
+      () => hash,
     );
 
     db.transaction.mockImplementation(cb => cb((() => {}) as any));
@@ -76,9 +83,10 @@ describe('DefaultCatalogProcessingEngine', () => {
               kind: 'Location',
               metadata: { name: 'test' },
             },
+            resultHash: '',
             state: new Map(),
-            nextUpdateAt: '',
-            lastDiscoveryAt: '',
+            nextUpdateAt: DateTime.now(),
+            lastDiscoveryAt: DateTime.now(),
           },
         ],
       });
@@ -117,6 +125,7 @@ describe('DefaultCatalogProcessingEngine', () => {
       db,
       orchestrator,
       stitcher,
+      () => hash,
     );
 
     db.transaction.mockImplementation(cb => cb((() => {}) as any));
@@ -137,9 +146,10 @@ describe('DefaultCatalogProcessingEngine', () => {
               kind: 'Location',
               metadata: { name: 'test' },
             },
+            resultHash: '',
             state: new Map(),
-            nextUpdateAt: '',
-            lastDiscoveryAt: '',
+            nextUpdateAt: DateTime.now(),
+            lastDiscoveryAt: DateTime.now(),
           },
         ],
       });
@@ -158,4 +168,71 @@ describe('DefaultCatalogProcessingEngine', () => {
     });
     await engine.stop();
   });
+
+  it('runs fully when hash mismatches, early-outs when hash matches', async () => {
+    const entity = {
+      apiVersion: '1',
+      kind: 'Location',
+      metadata: { name: 'test' },
+    };
+
+    const refreshState = {
+      id: '',
+      entityRef: '',
+      unprocessedEntity: entity,
+      resultHash: 'the matching hash',
+      state: new Map(),
+      nextUpdateAt: DateTime.now(),
+      lastDiscoveryAt: DateTime.now(),
+    };
+
+    hash.digest.mockReturnValue('the matching hash');
+
+    orchestrator.process.mockResolvedValue({
+      ok: true,
+      completedEntity: entity,
+      relations: [],
+      errors: [],
+      deferredEntities: [],
+      state: new Map(),
+    });
+
+    const engine = new DefaultCatalogProcessingEngine(
+      getVoidLogger(),
+      [],
+      db,
+      orchestrator,
+      stitcher,
+      () => hash,
+    );
+
+    db.transaction.mockImplementation(cb => cb((() => {}) as any));
+
+    db.getProcessableEntities
+      .mockResolvedValueOnce({
+        items: [{ ...refreshState, resultHash: 'NOT RIGHT' }],
+      })
+      .mockResolvedValue({ items: [] });
+
+    await engine.start();
+
+    await waitForExpect(() => {
+      expect(orchestrator.process).toBeCalledTimes(1);
+      expect(hash.digest).toBeCalledTimes(1);
+      expect(db.updateProcessedEntity).toBeCalledTimes(1);
+    });
+
+    db.getProcessableEntities
+      .mockReset()
+      .mockResolvedValueOnce({ items: [refreshState] })
+      .mockResolvedValue({ items: [] });
+
+    await waitForExpect(() => {
+      expect(orchestrator.process).toBeCalledTimes(2);
+      expect(hash.digest).toBeCalledTimes(2);
+      expect(db.updateProcessedEntity).toBeCalledTimes(1);
+    });
+
+    await engine.stop();
+  });
 });
diff --git a/plugins/catalog-backend/src/next/DefaultCatalogProcessingEngine.ts b/plugins/catalog-backend/src/next/DefaultCatalogProcessingEngine.ts
index 0ae20c94b1..d33094ec6d 100644
--- a/plugins/catalog-backend/src/next/DefaultCatalogProcessingEngine.ts
+++ b/plugins/catalog-backend/src/next/DefaultCatalogProcessingEngine.ts
@@ -20,9 +20,15 @@ import {
   stringifyEntityRef,
 } from '@backstage/catalog-model';
 import { serializeError } from '@backstage/errors';
+import { Hash } from 'crypto';
+import stableStringify from 'fast-json-stable-stringify';
 import { Logger } from 'winston';
 import { ProcessingDatabase, RefreshStateItem } from './database/types';
-import { CatalogProcessingOrchestrator } from './processing/types';
+import { createCounterMetric, createSummaryMetric } from './metrics';
+import {
+  CatalogProcessingOrchestrator,
+  EntityProcessingResult,
+} from './processing/types';
 import { Stitcher } from './stitching/Stitcher';
 import { startTaskPipeline } from './TaskPipeline';
 import {
@@ -81,6 +87,7 @@ class Connection implements EntityProviderConnection {
 }
 
 export class DefaultCatalogProcessingEngine implements CatalogProcessingEngine {
+  private readonly tracker = progressTracker();
   private stopFunc?: () => void;
 
   constructor(
@@ -89,9 +96,14 @@ export class DefaultCatalogProcessingEngine implements CatalogProcessingEngine {
     private readonly processingDatabase: ProcessingDatabase,
     private readonly orchestrator: CatalogProcessingOrchestrator,
     private readonly stitcher: Stitcher,
+    private readonly createHash: () => Hash,
   ) {}
 
   async start() {
+    if (this.stopFunc) {
+      throw new Error('Processing engine is already started');
+    }
+
     for (const provider of this.entityProviders) {
       await provider.connect(
         new Connection({
@@ -101,10 +113,6 @@ export class DefaultCatalogProcessingEngine implements CatalogProcessingEngine {
       );
     }
 
-    if (this.stopFunc) {
-      throw new Error('Processing engine is already started');
-    }
-
     this.stopFunc = startTaskPipeline<RefreshStateItem>({
       lowWatermark: 5,
       highWatermark: 10,
@@ -124,13 +132,24 @@ export class DefaultCatalogProcessingEngine implements CatalogProcessingEngine {
         }
       },
       processTask: async item => {
+        const track = this.tracker.processStart(item, this.logger);
+
         try {
-          const { id, state, unprocessedEntity, entityRef, locationKey } = item;
+          const {
+            id,
+            state,
+            unprocessedEntity,
+            entityRef,
+            locationKey,
+            resultHash: previousResultHash,
+          } = item;
           const result = await this.orchestrator.process({
             entity: unprocessedEntity,
             state,
           });
 
+          track.markProcessorsCompleted(result);
+
           for (const error of result.errors) {
             // TODO(freben): Try to extract the location out of the unprocessed
             // entity and add as meta to the log lines
@@ -142,6 +161,24 @@ export class DefaultCatalogProcessingEngine implements CatalogProcessingEngine {
             result.errors.map(e => serializeError(e)),
           );
 
+          let hashBuilder = this.createHash().update(errorsString);
+          if (result.ok) {
+            hashBuilder = hashBuilder
+              .update(stableStringify({ ...result.completedEntity }))
+              .update(stableStringify([...result.deferredEntities]))
+              .update(stableStringify([...result.relations]))
+              .update(stableStringify(Object.fromEntries(result.state)));
+          }
+
+          const resultHash = hashBuilder.digest('hex');
+          if (resultHash === previousResultHash) {
+            // If nothing changed in our produced outputs, we cannot have any
+            // significant effect on our surroundings; therefore, we just abort
+            // without any updates / stitching.
+            track.markSuccessfulWithNoChanges();
+            return;
+          }
+
           // If the result was marked as not OK, it signals that some part of the
           // processing pipeline threw an exception. This can happen both as part of
           // non-catastrophic things such as due to validation errors, as well as if
@@ -154,11 +191,13 @@ export class DefaultCatalogProcessingEngine implements CatalogProcessingEngine {
               await this.processingDatabase.updateProcessedEntityErrors(tx, {
                 id,
                 errors: errorsString,
+                resultHash,
               });
             });
             await this.stitcher.stitch(
               new Set([stringifyEntityRef(unprocessedEntity)]),
             );
+            track.markSuccessfulWithErrors();
             return;
           }
 
@@ -167,6 +206,7 @@ export class DefaultCatalogProcessingEngine implements CatalogProcessingEngine {
             await this.processingDatabase.updateProcessedEntity(tx, {
               id,
               processedEntity: result.completedEntity,
+              resultHash,
               state: result.state,
               errors: errorsString,
               relations: result.relations,
@@ -182,8 +222,10 @@ export class DefaultCatalogProcessingEngine implements CatalogProcessingEngine {
             ),
           ]);
           await this.stitcher.stitch(setOfThingsToStitch);
+
+          track.markSuccessfulWithChanges(setOfThingsToStitch.size);
         } catch (error) {
-          this.logger.warn('Processing failed with:', error);
+          track.markFailed(error);
         }
       },
     });
@@ -196,3 +238,76 @@ export class DefaultCatalogProcessingEngine implements CatalogProcessingEngine {
     }
   }
 }
+
+// Helps wrap the timing and logging behaviors
+function progressTracker() {
+  const stitchedEntities = createCounterMetric({
+    name: 'catalog_stitched_entities_count',
+    help: 'Amount of entities stitched',
+  });
+  const processedEntities = createCounterMetric({
+    name: 'catalog_processed_entities_count',
+    help: 'Amount of entities processed',
+    labelNames: ['result'],
+  });
+  const processingDuration = createSummaryMetric({
+    name: 'catalog_processing_duration_seconds',
+    help: 'Time spent executing the full processing flow',
+    labelNames: ['result'],
+  });
+  const processorsDuration = createSummaryMetric({
+    name: 'catalog_processors_duration_seconds',
+    help: 'Time spent executing catalog processors',
+    labelNames: ['result'],
+  });
+  const processingQueueDelay = createSummaryMetric({
+    name: 'catalog_processing_queue_delay_seconds',
+    help: 'The amount of delay between being scheduled for processing, and the start of actually being processed',
+  });
+
+  function processStart(item: RefreshStateItem, logger: Logger) {
+    logger.debug(`Processing ${item.entityRef}`);
+
+    if (item.nextUpdateAt) {
+      processingQueueDelay.observe(-item.nextUpdateAt.diffNow().as('seconds'));
+    }
+
+    const endOverallTimer = processingDuration.startTimer();
+    const endProcessorsTimer = processorsDuration.startTimer();
+
+    function markProcessorsCompleted(result: EntityProcessingResult) {
+      endProcessorsTimer({ result: result.ok ? 'ok' : 'failed' });
+    }
+
+    function markSuccessfulWithNoChanges() {
+      endOverallTimer({ result: 'unchanged' });
+      processedEntities.inc({ result: 'unchanged' }, 1);
+    }
+
+    function markSuccessfulWithErrors() {
+      endOverallTimer({ result: 'errors' });
+      processedEntities.inc({ result: 'errors' }, 1);
+    }
+
+    function markSuccessfulWithChanges(stitchedCount: number) {
+      endOverallTimer({ result: 'changed' });
+      stitchedEntities.inc(stitchedCount);
+      processedEntities.inc({ result: 'changed' }, 1);
+    }
+
+    function markFailed(error: Error) {
+      processedEntities.inc({ result: 'failed' }, 1);
+      logger.warn(`Processing of ${item.entityRef} failed`, error);
+    }
+
+    return {
+      markProcessorsCompleted,
+      markSuccessfulWithNoChanges,
+      markSuccessfulWithErrors,
+      markSuccessfulWithChanges,
+      markFailed,
+    };
+  }
+
+  return { processStart };
+}
diff --git a/plugins/catalog-backend/src/next/NextCatalogBuilder.ts b/plugins/catalog-backend/src/next/NextCatalogBuilder.ts
index a525dacd51..fa43286777 100644
--- a/plugins/catalog-backend/src/next/NextCatalogBuilder.ts
+++ b/plugins/catalog-backend/src/next/NextCatalogBuilder.ts
@@ -14,11 +14,7 @@
  * limitations under the License.
  */
 
-import {
-  PluginDatabaseManager,
-  resolvePackagePath,
-  UrlReader,
-} from '@backstage/backend-common';
+import { resolvePackagePath } from '@backstage/backend-common';
 import {
   DefaultNamespaceEntityPolicy,
   EntityPolicies,
@@ -29,10 +25,9 @@ import {
   SchemaValidEntityPolicy,
   Validators,
 } from '@backstage/catalog-model';
-import { Config } from '@backstage/config';
 import { ScmIntegrations } from '@backstage/integration';
+import { createHash } from 'crypto';
 import lodash from 'lodash';
-import { Logger } from 'winston';
 import {
   DatabaseLocationsCatalog,
   EntitiesCatalog,
@@ -49,6 +44,7 @@ import {
   FileReaderProcessor,
   GithubDiscoveryProcessor,
   GithubOrgReaderProcessor,
+  GitLabDiscoveryProcessor,
   PlaceholderProcessor,
   PlaceholderResolver,
   UrlReaderProcessor,
@@ -74,13 +70,11 @@ import { DefaultLocationStore } from './DefaultLocationStore';
 import { NextEntitiesCatalog } from './NextEntitiesCatalog';
 import { DefaultCatalogProcessingOrchestrator } from './processing/DefaultCatalogProcessingOrchestrator';
 import { Stitcher } from './stitching/Stitcher';
-
-export type CatalogEnvironment = {
-  logger: Logger;
-  database: PluginDatabaseManager;
-  config: Config;
-  reader: UrlReader;
-};
+import {
+  createRandomRefreshInterval,
+  RefreshIntervalFunction,
+} from './refresh';
+import { CatalogEnvironment } from '../service/CatalogBuilder';
 
 /**
  * A builder that helps wire up all of the component parts of the catalog.
@@ -111,7 +105,11 @@ export class NextCatalogBuilder {
   private processors: CatalogProcessor[];
   private processorsReplace: boolean;
   private parser: CatalogProcessorParser | undefined;
-  private refreshIntervalSeconds = 100;
+  private refreshInterval: RefreshIntervalFunction =
+    createRandomRefreshInterval({
+      minSeconds: 100,
+      maxSeconds: 150,
+    });
 
   constructor(env: CatalogEnvironment) {
     this.env = env;
@@ -143,11 +141,26 @@ export class NextCatalogBuilder {
 
   /**
    * Refresh interval determines how often entities should be refreshed.
-   * The default refresh duration is 100, setting this too low will potentially
-   * deplete request quotas to upstream services.
+   * Seconds provided will be multiplied by 1.5
+   * The default refresh duration is 100-150 seconds.
+   * setting this too low will potentially deplete request quotas to upstream services.
    */
   setRefreshIntervalSeconds(seconds: number): NextCatalogBuilder {
-    this.refreshIntervalSeconds = seconds;
+    this.refreshInterval = createRandomRefreshInterval({
+      minSeconds: seconds,
+      maxSeconds: seconds * 1.5,
+    });
+    return this;
+  }
+
+  /**
+   * Overwrites the default refresh interval function used to spread
+   * entity updates in the catalog.
+   */
+  setRefreshInterval(
+    refreshInterval: RefreshIntervalFunction,
+  ): NextCatalogBuilder {
+    this.refreshInterval = refreshInterval;
     return this;
   }
 
@@ -284,7 +297,7 @@ export class NextCatalogBuilder {
     const processingDatabase = new DefaultProcessingDatabase({
       database: dbClient,
       logger,
-      refreshIntervalSeconds: this.refreshIntervalSeconds,
+      refreshInterval: this.refreshInterval,
     });
     const integrations = ScmIntegrations.fromConfig(config);
     const orchestrator = new DefaultCatalogProcessingOrchestrator({
@@ -310,6 +323,7 @@ export class NextCatalogBuilder {
       processingDatabase,
       orchestrator,
       stitcher,
+      () => createHash('sha1'),
     );
 
     const locationsCatalog = new DatabaseLocationsCatalog(db);
@@ -359,7 +373,11 @@ export class NextCatalogBuilder {
 
     // These are always there no matter what
     const processors: CatalogProcessor[] = [
-      new PlaceholderProcessor({ resolvers: placeholderResolvers, reader }),
+      new PlaceholderProcessor({
+        resolvers: placeholderResolvers,
+        reader,
+        integrations,
+      }),
       new BuiltinKindsEntityProcessor(),
     ];
 
@@ -370,6 +388,7 @@ export class NextCatalogBuilder {
         BitbucketDiscoveryProcessor.fromConfig(config, { logger }),
         GithubDiscoveryProcessor.fromConfig(config, { logger }),
         GithubOrgReaderProcessor.fromConfig(config, { logger }),
+        GitLabDiscoveryProcessor.fromConfig(config, { logger }),
         new UrlReaderProcessor({ reader, logger }),
         CodeOwnersProcessor.fromConfig(config, { logger, reader }),
         new AnnotateLocationEntityProcessor({ integrations }),
diff --git a/plugins/catalog-backend/src/next/NextEntitiesCatalog.ts b/plugins/catalog-backend/src/next/NextEntitiesCatalog.ts
index f3921602e2..e9772b4aa3 100644
--- a/plugins/catalog-backend/src/next/NextEntitiesCatalog.ts
+++ b/plugins/catalog-backend/src/next/NextEntitiesCatalog.ts
@@ -28,9 +28,10 @@ import {
   DbSearchRow,
 } from './database/tables';
 
-function parsePagination(
-  input?: EntityPagination,
-): { limit?: number; offset?: number } {
+function parsePagination(input?: EntityPagination): {
+  limit?: number;
+  offset?: number;
+} {
   if (!input) {
     return {};
   }
@@ -78,7 +79,11 @@ export class NextEntitiesCatalog implements EntitiesCatalog {
 
     for (const singleFilter of request?.filter?.anyOf ?? []) {
       entitiesQuery = entitiesQuery.orWhere(function singleFilterFn() {
-        for (const { key, matchValueIn } of singleFilter.allOf) {
+        for (const {
+          key,
+          matchValueIn,
+          matchValueExists,
+        } of singleFilter.allOf) {
           // NOTE(freben): This used to be a set of OUTER JOIN, which may seem to
           // make a lot of sense. However, it had abysmal performance on sqlite
           // when datasets grew large, so we're using IN instead.
@@ -86,7 +91,7 @@ export class NextEntitiesCatalog implements EntitiesCatalog {
             .select('entity_id')
             .where(function keyFilter() {
               this.andWhere({ key: key.toLowerCase() });
-              if (matchValueIn) {
+              if (matchValueExists !== false && matchValueIn) {
                 if (matchValueIn.length === 1) {
                   this.andWhere({ value: matchValueIn[0].toLowerCase() });
                 } else if (matchValueIn.length > 1) {
@@ -98,7 +103,12 @@ export class NextEntitiesCatalog implements EntitiesCatalog {
                 }
               }
             });
-          this.andWhere('entity_id', 'in', matchQuery);
+          // Explicitly evaluate matchValueExists as a boolean since it may be undefined
+          this.andWhere(
+            'entity_id',
+            matchValueExists === false ? 'not in' : 'in',
+            matchQuery,
+          );
         }
       });
     }
diff --git a/plugins/catalog-backend/src/next/NextRouter.ts b/plugins/catalog-backend/src/next/NextRouter.ts
index eb9e5247ed..99073be421 100644
--- a/plugins/catalog-backend/src/next/NextRouter.ts
+++ b/plugins/catalog-backend/src/next/NextRouter.ts
@@ -36,7 +36,7 @@ import {
 import { disallowReadonlyMode, validateRequestBody } from '../service/util';
 import { LocationService } from './types';
 
-export interface RouterOptions {
+export interface NextRouterOptions {
   entitiesCatalog?: EntitiesCatalog;
   locationAnalyzer?: LocationAnalyzer;
   locationService: LocationService;
@@ -45,15 +45,10 @@ export interface RouterOptions {
 }
 
 export async function createNextRouter(
-  options: RouterOptions,
+  options: NextRouterOptions,
 ): Promise<express.Router> {
-  const {
-    entitiesCatalog,
-    locationAnalyzer,
-    locationService,
-    config,
-    logger,
-  } = options;
+  const { entitiesCatalog, locationAnalyzer, locationService, config, logger } =
+    options;
 
   const router = Router();
   router.use(express.json());
diff --git a/plugins/catalog-backend/src/next/database/DefaultProcessingDatabase.test.ts b/plugins/catalog-backend/src/next/database/DefaultProcessingDatabase.test.ts
index e449e5580c..23829bd33f 100644
--- a/plugins/catalog-backend/src/next/database/DefaultProcessingDatabase.test.ts
+++ b/plugins/catalog-backend/src/next/database/DefaultProcessingDatabase.test.ts
@@ -19,8 +19,9 @@ import { TestDatabaseId, TestDatabases } from '@backstage/backend-test-utils';
 import { Entity, stringifyEntityRef } from '@backstage/catalog-model';
 import { JsonObject } from '@backstage/config';
 import { Knex } from 'knex';
-import { Logger } from 'winston';
 import * as uuid from 'uuid';
+import { Logger } from 'winston';
+import { DateTime } from 'luxon';
 import { DatabaseManager } from './DatabaseManager';
 import { DefaultProcessingDatabase } from './DefaultProcessingDatabase';
 import {
@@ -28,6 +29,7 @@ import {
   DbRefreshStateRow,
   DbRelationsRow,
 } from './tables';
+import { createRandomRefreshInterval } from '../refresh';
 
 describe('Default Processing Database', () => {
   const defaultLogger = getVoidLogger();
@@ -46,7 +48,10 @@ describe('Default Processing Database', () => {
       db: new DefaultProcessingDatabase({
         database: knex,
         logger,
-        refreshIntervalSeconds: 100,
+        refreshInterval: createRandomRefreshInterval({
+          minSeconds: 100,
+          maxSeconds: 150,
+        }),
       }),
     };
   }
@@ -61,6 +66,21 @@ describe('Default Processing Database', () => {
     await db<DbRefreshStateRow>('refresh_state').insert(ref);
   };
 
+  const parseDate = (date: string | Date): DateTime => {
+    const parsedDate =
+      typeof date === 'string'
+        ? DateTime.fromSQL(date, { zone: 'UTC' })
+        : DateTime.fromJSDate(date);
+
+    if (!parsedDate.isValid) {
+      throw new Error(
+        `Failed to parse date, reason: ${parsedDate.invalidReason}, explanation: ${parsedDate.invalidExplanation}`,
+      );
+    }
+
+    return parsedDate;
+  };
+
   describe('addUprocessedEntities', () => {
     function mockEntity(name: string, type: string): Entity {
       return {
@@ -79,10 +99,10 @@ describe('Default Processing Database', () => {
       'updates refresh state with varying location keys, %p',
       async databaseId => {
         const mockWarn = jest.fn();
-        const { db } = await createDatabase(databaseId, ({
+        const { db } = await createDatabase(databaseId, {
           debug: jest.fn(),
           warn: mockWarn,
-        } as unknown) as Logger);
+        } as unknown as Logger);
         await db.transaction(async tx => {
           const knexTx = tx as Knex.Transaction;
 
@@ -206,6 +226,7 @@ describe('Default Processing Database', () => {
             db.updateProcessedEntity(tx, {
               id,
               processedEntity,
+              resultHash: '',
               state: new Map<string, JsonObject>(),
               relations: [],
               deferredEntities: [],
@@ -224,6 +245,7 @@ describe('Default Processing Database', () => {
         const options = {
           id,
           processedEntity,
+          resultHash: '',
           state: new Map<string, JsonObject>(),
           relations: [],
           deferredEntities: [],
@@ -250,7 +272,11 @@ describe('Default Processing Database', () => {
 
         await db.transaction(tx =>
           expect(
-            db.updateProcessedEntity(tx, { ...options, locationKey: 'fail' }),
+            db.updateProcessedEntity(tx, {
+              ...options,
+              resultHash: '',
+              locationKey: 'fail',
+            }),
           ).rejects.toThrow(
             `Conflicting write of processing result for ${id} with location key 'fail'`,
           ),
@@ -280,6 +306,7 @@ describe('Default Processing Database', () => {
           db.updateProcessedEntity(tx, {
             id,
             processedEntity,
+            resultHash: '',
             state,
             relations: [],
             deferredEntities: [],
@@ -295,7 +322,9 @@ describe('Default Processing Database', () => {
         expect(entities[0].processed_entity).toEqual(
           JSON.stringify(processedEntity),
         );
-        expect(entities[0].cache).toEqual(JSON.stringify(state));
+        expect(entities[0].cache).toEqual(
+          JSON.stringify(Object.fromEntries(state)),
+        );
         expect(entities[0].errors).toEqual("['something broke']");
         expect(entities[0].location_key).toEqual('key');
       },
@@ -336,6 +365,7 @@ describe('Default Processing Database', () => {
           db.updateProcessedEntity(tx, {
             id,
             processedEntity,
+            resultHash: '',
             state: new Map<string, JsonObject>(),
             relations: relations,
             deferredEntities: [],
@@ -387,6 +417,7 @@ describe('Default Processing Database', () => {
           db.updateProcessedEntity(tx, {
             id,
             processedEntity,
+            resultHash: '',
             state: new Map<string, JsonObject>(),
             relations: [],
             deferredEntities,
@@ -949,5 +980,41 @@ describe('Default Processing Database', () => {
       },
       60_000,
     );
+
+    it.each(databases.eachSupportedId())(
+      'should update the next_refresh interval with a timestamp that includes refresh spread, %p',
+      async databaseId => {
+        const { knex, db } = await createDatabase(databaseId);
+        const entity = JSON.stringify({
+          kind: 'Location',
+          apiVersion: '1.0.0',
+          metadata: {
+            name: 'xyz',
+          },
+        } as Entity);
+        await knex<DbRefreshStateRow>('refresh_state').insert({
+          entity_id: '2',
+          entity_ref: 'location:default/new-root',
+          unprocessed_entity: entity,
+          errors: '[]',
+          next_update_at: '2019-01-01 23:00:00',
+          last_discovery_at: '2021-04-01 13:37:00',
+        });
+        await db.transaction(async tx => {
+          // Result does not include the updated timestamp
+          await db.getProcessableEntities(tx, {
+            processBatchSize: 1,
+          });
+        });
+        const now = DateTime.local();
+        const result = await knex<DbRefreshStateRow>('refresh_state')
+          .where('entity_ref', 'location:default/new-root')
+          .select();
+        const nextUpdate = parseDate(result[0].next_update_at);
+        const nextUpdateDiff = nextUpdate.diff(now, 'seconds');
+        expect(nextUpdateDiff.seconds).toBeGreaterThanOrEqual(90);
+      },
+      60_000,
+    );
   });
 });
diff --git a/plugins/catalog-backend/src/next/database/DefaultProcessingDatabase.ts b/plugins/catalog-backend/src/next/database/DefaultProcessingDatabase.ts
index 1f1ea4bf84..30457f2cbd 100644
--- a/plugins/catalog-backend/src/next/database/DefaultProcessingDatabase.ts
+++ b/plugins/catalog-backend/src/next/database/DefaultProcessingDatabase.ts
@@ -23,6 +23,9 @@ import { v4 as uuid } from 'uuid';
 import type { Logger } from 'winston';
 import { Transaction } from '../../database';
 import { DeferredEntity } from '../processing/types';
+import { RefreshIntervalFunction } from '../refresh';
+import { rethrowError, timestampToDateTime } from './conversion';
+import { initDatabaseMetrics } from './metrics';
 import {
   DbRefreshStateReferencesRow,
   DbRefreshStateRow,
@@ -48,9 +51,11 @@ export class DefaultProcessingDatabase implements ProcessingDatabase {
     private readonly options: {
       database: Knex;
       logger: Logger;
-      refreshIntervalSeconds: number;
+      refreshInterval: RefreshIntervalFunction;
     },
-  ) {}
+  ) {
+    initDatabaseMetrics(options.database);
+  }
 
   async updateProcessedEntity(
     txOpaque: Transaction,
@@ -60,6 +65,7 @@ export class DefaultProcessingDatabase implements ProcessingDatabase {
     const {
       id,
       processedEntity,
+      resultHash,
       state,
       errors,
       relations,
@@ -69,7 +75,8 @@ export class DefaultProcessingDatabase implements ProcessingDatabase {
     const refreshResult = await tx<DbRefreshStateRow>('refresh_state')
       .update({
         processed_entity: JSON.stringify(processedEntity),
-        cache: JSON.stringify(state),
+        result_hash: resultHash,
+        cache: JSON.stringify(Object.fromEntries(state || [])),
         errors,
         location_key: locationKey,
       })
@@ -122,11 +129,12 @@ export class DefaultProcessingDatabase implements ProcessingDatabase {
     options: UpdateProcessedEntityOptions,
   ): Promise<void> {
     const tx = txOpaque as Knex.Transaction;
-    const { id, errors } = options;
+    const { id, errors, resultHash } = options;
 
     await tx<DbRefreshStateRow>('refresh_state')
       .update({
         errors,
+        result_hash: resultHash,
       })
       .where('entity_id', id);
   }
@@ -464,6 +472,7 @@ export class DefaultProcessingDatabase implements ProcessingDatabase {
       .limit(request.processBatchSize)
       .orderBy('next_update_at', 'asc');
 
+    const interval = this.options.refreshInterval();
     await tx<DbRefreshStateRow>('refresh_state')
       .whereIn(
         'entity_ref',
@@ -472,14 +481,8 @@ export class DefaultProcessingDatabase implements ProcessingDatabase {
       .update({
         next_update_at:
           tx.client.config.client === 'sqlite3'
-            ? tx.raw(`datetime('now', ?)`, [
-                `${this.options.refreshIntervalSeconds} seconds`,
-              ])
-            : tx.raw(
-                `now() + interval '${Number(
-                  this.options.refreshIntervalSeconds,
-                )} seconds'`,
-              ),
+            ? tx.raw(`datetime('now', ?)`, [`${interval} seconds`])
+            : tx.raw(`now() + interval '${interval} seconds'`),
       });
 
     return {
@@ -492,8 +495,9 @@ export class DefaultProcessingDatabase implements ProcessingDatabase {
             processedEntity: i.processed_entity
               ? (JSON.parse(i.processed_entity) as Entity)
               : undefined,
-            nextUpdateAt: i.next_update_at,
-            lastDiscoveryAt: i.last_discovery_at,
+            resultHash: i.result_hash || '',
+            nextUpdateAt: timestampToDateTime(i.next_update_at),
+            lastDiscoveryAt: timestampToDateTime(i.last_discovery_at),
             state: i.cache
               ? JSON.parse(i.cache)
               : new Map<string, JsonObject>(),
@@ -523,15 +527,7 @@ export class DefaultProcessingDatabase implements ProcessingDatabase {
       return result!;
     } catch (e) {
       this.options.logger.debug(`Error during transaction, ${e}`);
-
-      if (
-        /SQLITE_CONSTRAINT: UNIQUE/.test(e.message) ||
-        /unique constraint/.test(e.message)
-      ) {
-        throw new ConflictError(`Rejected due to a conflicting entity`, e);
-      }
-
-      throw e;
+      throw rethrowError(e);
     }
   }
 }
diff --git a/plugins/catalog-backend/src/next/database/conversion.test.ts b/plugins/catalog-backend/src/next/database/conversion.test.ts
new file mode 100644
index 0000000000..b345348827
--- /dev/null
+++ b/plugins/catalog-backend/src/next/database/conversion.test.ts
@@ -0,0 +1,54 @@
+/*
+ * Copyright 2021 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { timestampToDateTime, rethrowError } from './conversion';
+
+describe('timestampToDateTime', () => {
+  it('converts all known types', () => {
+    const js = new Date(Date.UTC(2021, 7, 20, 10, 11, 12));
+    const sql = '2021-08-20 10:11:12';
+    const iso = '2021-08-20T10:11:12Z';
+    expect(timestampToDateTime(js).toISO()).toBe('2021-08-20T10:11:12.000Z');
+    expect(timestampToDateTime(sql).toISO()).toBe('2021-08-20T10:11:12.000Z');
+    expect(timestampToDateTime(iso).toISO()).toBe('2021-08-20T10:11:12.000Z');
+  });
+});
+
+describe('rethrowError', () => {
+  it('leaves regular errors untouched', () => {
+    const e = new Error('nothing special here');
+    expect(() => rethrowError(e)).toThrow(e);
+  });
+
+  it('translates to conflict error when appropriate', () => {
+    const sqliteUnique = new Error('SQLITE_CONSTRAINT: UNIQUE blah');
+    const postgresUnique = new Error('unique constraint foo');
+
+    expect(() => rethrowError(sqliteUnique)).toThrow(
+      expect.objectContaining({
+        name: 'ConflictError',
+        message: expect.stringContaining('SQLITE_CONSTRAINT: UNIQUE blah'),
+      }),
+    );
+
+    expect(() => rethrowError(postgresUnique)).toThrow(
+      expect.objectContaining({
+        name: 'ConflictError',
+        message: expect.stringContaining('unique constraint foo'),
+      }),
+    );
+  });
+});
diff --git a/plugins/catalog-backend/src/next/database/conversion.ts b/plugins/catalog-backend/src/next/database/conversion.ts
new file mode 100644
index 0000000000..54b642f3ff
--- /dev/null
+++ b/plugins/catalog-backend/src/next/database/conversion.ts
@@ -0,0 +1,58 @@
+/*
+ * Copyright 2021 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { ConflictError, InputError } from '@backstage/errors';
+import { DateTime } from 'luxon';
+
+/**
+ * Takes a TIMESTAMP type column and converts it to a DateTime.
+ *
+ * Some engines return the SQL string form (e.g. 'YYYY-MM-DD hh:mm:ss'), some
+ * return ISO string form (e.g. 'YYYY-MM-DDThh:mm:ss.SSSZ'), some return a js
+ * Date object.
+ */
+export function timestampToDateTime(input: Date | string): DateTime {
+  try {
+    if (typeof input === 'object') {
+      return DateTime.fromJSDate(input).toUTC();
+    }
+
+    const result = input.includes(' ')
+      ? DateTime.fromSQL(input, { zone: 'utc' })
+      : DateTime.fromISO(input, { zone: 'utc' });
+    if (!result.isValid) {
+      throw new TypeError('Not valid');
+    }
+
+    return result;
+  } catch (e) {
+    throw new InputError(`Failed to parse database timestamp ${input}`, e);
+  }
+}
+
+/**
+ * Rethrows an error, possibly translating it to a more precise error type.
+ */
+export function rethrowError(e: any): never {
+  if (
+    /SQLITE_CONSTRAINT: UNIQUE/.test(e.message) ||
+    /unique constraint/.test(e.message)
+  ) {
+    throw new ConflictError(`Rejected due to a conflicting entity`, e);
+  }
+
+  throw e;
+}
diff --git a/plugins/catalog-backend/src/next/database/metrics.ts b/plugins/catalog-backend/src/next/database/metrics.ts
new file mode 100644
index 0000000000..a41ad512f0
--- /dev/null
+++ b/plugins/catalog-backend/src/next/database/metrics.ts
@@ -0,0 +1,72 @@
+/*
+ * Copyright 2021 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { Knex } from 'knex';
+import { DbLocationsRow } from '../../database/types';
+import { createGaugeMetric } from '../metrics';
+import { DbRefreshStateRow, DbRelationsRow } from './tables';
+
+export function initDatabaseMetrics(knex: Knex) {
+  const seen = new Set<string>();
+  return {
+    entities_count: createGaugeMetric({
+      name: 'catalog_entities_count',
+      help: 'Total amount of entities in the catalog',
+      labelNames: ['kind'],
+      async collect() {
+        const result = await knex<DbRefreshStateRow>('refresh_state').select(
+          'entity_ref',
+        );
+        const results = result
+          .map(row => row.entity_ref.split(':')[0])
+          .reduce((acc, e) => acc.set(e, (acc.get(e) || 0) + 1), new Map());
+
+        results.forEach((value, key) => {
+          seen.add(key);
+          this.set({ kind: key }, value);
+        });
+
+        // Set all the entities that were not seen to 0 and delete them from the seen set.
+        seen.forEach(key => {
+          if (!results.has(key)) {
+            this.set({ kind: key }, 0);
+            seen.delete(key);
+          }
+        });
+      },
+    }),
+    registered_locations: createGaugeMetric({
+      name: 'catalog_registered_locations_count',
+      help: 'Total amount of registered locations in the catalog',
+      async collect() {
+        const total = await knex<DbLocationsRow>('locations').count({
+          count: '*',
+        });
+        this.set(Number(total[0].count));
+      },
+    }),
+    relations: createGaugeMetric({
+      name: 'catalog_relations_count',
+      help: 'Total amount of relations between entities',
+      async collect() {
+        const total = await knex<DbRelationsRow>('relations').count({
+          count: '*',
+        });
+        this.set(Number(total[0].count));
+      },
+    }),
+  };
+}
diff --git a/plugins/catalog-backend/src/next/database/tables.ts b/plugins/catalog-backend/src/next/database/tables.ts
index 395694131d..b40964d225 100644
--- a/plugins/catalog-backend/src/next/database/tables.ts
+++ b/plugins/catalog-backend/src/next/database/tables.ts
@@ -25,9 +25,10 @@ export type DbRefreshStateRow = {
   entity_ref: string;
   unprocessed_entity: string;
   processed_entity?: string;
+  result_hash?: string;
   cache?: string;
-  next_update_at: string;
-  last_discovery_at: string; // remove?
+  next_update_at: string | Date;
+  last_discovery_at: string | Date; // remove?
   errors?: string;
   location_key?: string;
 };
diff --git a/plugins/catalog-backend/src/next/database/types.ts b/plugins/catalog-backend/src/next/database/types.ts
index 78199900e4..38ca59a431 100644
--- a/plugins/catalog-backend/src/next/database/types.ts
+++ b/plugins/catalog-backend/src/next/database/types.ts
@@ -16,6 +16,7 @@
 
 import { Entity, EntityRelationSpec } from '@backstage/catalog-model';
 import { JsonObject } from '@backstage/config';
+import { DateTime } from 'luxon';
 import { Transaction } from '../../database/types';
 import { DeferredEntity } from '../processing/types';
 
@@ -34,6 +35,7 @@ export type AddUnprocessedEntitiesResult = {};
 export type UpdateProcessedEntityOptions = {
   id: string;
   processedEntity: Entity;
+  resultHash: string;
   state?: Map<string, JsonObject>;
   errors?: string;
   relations: EntityRelationSpec[];
@@ -44,6 +46,7 @@ export type UpdateProcessedEntityOptions = {
 export type UpdateProcessedEntityErrorsOptions = {
   id: string;
   errors?: string;
+  resultHash: string;
 };
 
 export type RefreshStateItem = {
@@ -51,8 +54,9 @@ export type RefreshStateItem = {
   entityRef: string;
   unprocessedEntity: Entity;
   processedEntity?: Entity;
-  nextUpdateAt: string;
-  lastDiscoveryAt: string; // remove?
+  resultHash: string;
+  nextUpdateAt: DateTime;
+  lastDiscoveryAt: DateTime; // remove?
   state: Map<string, JsonObject>;
   errors?: string;
   locationKey?: string;
diff --git a/plugins/catalog-backend/src/next/index.ts b/plugins/catalog-backend/src/next/index.ts
index 8c1921ae8b..cdd81d9f4d 100644
--- a/plugins/catalog-backend/src/next/index.ts
+++ b/plugins/catalog-backend/src/next/index.ts
@@ -16,5 +16,16 @@
 
 export { NextCatalogBuilder } from './NextCatalogBuilder';
 export { createNextRouter } from './NextRouter';
+export type { NextRouterOptions } from './NextRouter';
 export * from './processing';
+export { createRandomRefreshInterval } from './refresh';
+export type { RefreshIntervalFunction } from './refresh';
 export * from './stitching';
+export type {
+  EntityProvider,
+  EntityProviderConnection,
+  EntityProviderMutation,
+  CatalogProcessingEngine,
+  LocationService,
+  LocationStore,
+} from './types';
diff --git a/plugins/catalog-backend/src/next/metrics.ts b/plugins/catalog-backend/src/next/metrics.ts
new file mode 100644
index 0000000000..4988af82ea
--- /dev/null
+++ b/plugins/catalog-backend/src/next/metrics.ts
@@ -0,0 +1,55 @@
+/*
+ * Copyright 2021 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import {
+  Counter,
+  CounterConfiguration,
+  Gauge,
+  GaugeConfiguration,
+  Histogram,
+  HistogramConfiguration,
+  register,
+  Summary,
+  SummaryConfiguration,
+} from 'prom-client';
+
+export function createCounterMetric<T extends string>(
+  config: CounterConfiguration<T>,
+): Counter<T> {
+  const existing = register.getSingleMetric(config.name) as Counter<T>;
+  return existing || new Counter<T>(config);
+}
+
+export function createGaugeMetric<T extends string>(
+  config: GaugeConfiguration<T>,
+): Gauge<T> {
+  const existing = register.getSingleMetric(config.name) as Gauge<T>;
+  return existing || new Gauge<T>(config);
+}
+
+export function createSummaryMetric<T extends string>(
+  config: SummaryConfiguration<T>,
+): Summary<T> {
+  const existing = register.getSingleMetric(config.name) as Summary<T>;
+  return existing || new Summary<T>(config);
+}
+
+export function createHistogramMetric<T extends string>(
+  config: HistogramConfiguration<T>,
+): Histogram<T> {
+  const existing = register.getSingleMetric(config.name) as Histogram<T>;
+  return existing || new Histogram<T>(config);
+}
diff --git a/plugins/catalog-backend/src/next/processing/DefaultCatalogProcessingOrchestrator.ts b/plugins/catalog-backend/src/next/processing/DefaultCatalogProcessingOrchestrator.ts
index bb23b6afb3..d7f51807a3 100644
--- a/plugins/catalog-backend/src/next/processing/DefaultCatalogProcessingOrchestrator.ts
+++ b/plugins/catalog-backend/src/next/processing/DefaultCatalogProcessingOrchestrator.ts
@@ -54,7 +54,8 @@ type Context = {
 };
 
 export class DefaultCatalogProcessingOrchestrator
-  implements CatalogProcessingOrchestrator {
+  implements CatalogProcessingOrchestrator
+{
   constructor(
     private readonly options: {
       processors: CatalogProcessor[];
diff --git a/plugins/catalog-backend/src/next/processing/index.ts b/plugins/catalog-backend/src/next/processing/index.ts
index e2f5a99507..9e03f18f28 100644
--- a/plugins/catalog-backend/src/next/processing/index.ts
+++ b/plugins/catalog-backend/src/next/processing/index.ts
@@ -18,5 +18,6 @@ export type {
   CatalogProcessingOrchestrator,
   EntityProcessingRequest,
   EntityProcessingResult,
+  DeferredEntity,
 } from './types';
 export { DefaultCatalogProcessingOrchestrator } from './DefaultCatalogProcessingOrchestrator';
diff --git a/plugins/catalog-backend/src/next/refresh.ts b/plugins/catalog-backend/src/next/refresh.ts
new file mode 100644
index 0000000000..aae992f391
--- /dev/null
+++ b/plugins/catalog-backend/src/next/refresh.ts
@@ -0,0 +1,34 @@
+/*
+ * Copyright 2021 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * Function that returns the catalog refresh interval in seconds.
+ */
+export type RefreshIntervalFunction = () => number;
+
+/**
+ * Creates a function that returns a random refresh interval between minSeconds and maxSeconds.
+ * @returns {RefreshIntervalFunction} that provides the next refresh interval
+ */
+export function createRandomRefreshInterval(options: {
+  minSeconds: number;
+  maxSeconds: number;
+}): RefreshIntervalFunction {
+  const { minSeconds, maxSeconds } = options;
+  return () => {
+    return Math.random() * (maxSeconds - minSeconds) + minSeconds;
+  };
+}
diff --git a/plugins/catalog-backend/src/search/DefaultCatalogCollator.test.ts b/plugins/catalog-backend/src/search/DefaultCatalogCollator.test.ts
index 2b9745298c..bb556fc49f 100644
--- a/plugins/catalog-backend/src/search/DefaultCatalogCollator.test.ts
+++ b/plugins/catalog-backend/src/search/DefaultCatalogCollator.test.ts
@@ -17,6 +17,11 @@
 import { PluginEndpointDiscovery } from '@backstage/backend-common';
 import { Entity } from '@backstage/catalog-model';
 import { DefaultCatalogCollator } from './DefaultCatalogCollator';
+import { setupServer } from 'msw/node';
+import { rest } from 'msw';
+import { ConfigReader } from '@backstage/config';
+
+const server = setupServer();
 
 const expectedEntities: Entity[] = [
   {
@@ -34,27 +39,37 @@ const expectedEntities: Entity[] = [
   },
 ];
 
-jest.mock('cross-fetch', () => ({
-  __esModule: true,
-  default: async () => {
-    return {
-      json: async () => {
-        return expectedEntities;
-      },
-    };
-  },
-}));
-
 describe('DefaultCatalogCollator', () => {
   let mockDiscoveryApi: jest.Mocked<PluginEndpointDiscovery>;
   let collator: DefaultCatalogCollator;
 
-  beforeEach(() => {
+  beforeAll(() => {
     mockDiscoveryApi = {
-      getBaseUrl: jest.fn().mockResolvedValueOnce('http://localhost:7000'),
+      getBaseUrl: jest.fn().mockResolvedValue('http://localhost:7000'),
       getExternalBaseUrl: jest.fn(),
     };
     collator = new DefaultCatalogCollator({ discovery: mockDiscoveryApi });
+    server.listen();
+  });
+  beforeEach(() => {
+    server.use(
+      rest.get('http://localhost:7000/entities', (req, res, ctx) => {
+        if (req.url.searchParams.has('filter')) {
+          const filter = req.url.searchParams.get('filter');
+          if (filter === 'kind=Foo,kind=Bar') {
+            // When filtering on the 'Foo,Bar' kinds we simply return no items, to simulate a filter
+            return res(ctx.json([]));
+          }
+          throw new Error('Unexpected filter parameter');
+        }
+        return res(ctx.json(expectedEntities));
+      }),
+    );
+  });
+  afterEach(() => server.resetHandlers());
+  afterAll(() => {
+    server.close();
+    jest.useRealTimers();
   });
 
   it('fetches from the configured catalog service', async () => {
@@ -88,4 +103,18 @@ describe('DefaultCatalogCollator', () => {
       location: '/software/test-entity',
     });
   });
+
+  it('allows filtering of the retrieved catalog entities', async () => {
+    // Provide an alternate location template.
+    collator = DefaultCatalogCollator.fromConfig(new ConfigReader({}), {
+      discovery: mockDiscoveryApi,
+      filter: {
+        kind: ['Foo', 'Bar'],
+      },
+    });
+
+    const documents = await collator.execute();
+    // The simulated 'Foo,Bar' filter should return in an empty list
+    expect(documents).toHaveLength(0);
+  });
 });
diff --git a/plugins/catalog-backend/src/search/DefaultCatalogCollator.ts b/plugins/catalog-backend/src/search/DefaultCatalogCollator.ts
index 7ab91560b1..6292b2a833 100644
--- a/plugins/catalog-backend/src/search/DefaultCatalogCollator.ts
+++ b/plugins/catalog-backend/src/search/DefaultCatalogCollator.ts
@@ -17,7 +17,12 @@
 import { PluginEndpointDiscovery } from '@backstage/backend-common';
 import { Entity } from '@backstage/catalog-model';
 import { IndexableDocument, DocumentCollator } from '@backstage/search-common';
-import fetch from 'cross-fetch';
+import { Config } from '@backstage/config';
+import {
+  CatalogApi,
+  CatalogClient,
+  CatalogEntitiesRequest,
+} from '@backstage/catalog-client';
 
 export interface CatalogEntityDocument extends IndexableDocument {
   componentType: string;
@@ -30,18 +35,39 @@ export interface CatalogEntityDocument extends IndexableDocument {
 export class DefaultCatalogCollator implements DocumentCollator {
   protected discovery: PluginEndpointDiscovery;
   protected locationTemplate: string;
+  protected filter?: CatalogEntitiesRequest['filter'];
+  protected readonly catalogClient: CatalogApi;
   public readonly type: string = 'software-catalog';
 
+  static fromConfig(
+    _config: Config,
+    options: {
+      discovery: PluginEndpointDiscovery;
+      filter?: CatalogEntitiesRequest['filter'];
+    },
+  ) {
+    return new DefaultCatalogCollator({
+      ...options,
+    });
+  }
+
   constructor({
     discovery,
     locationTemplate,
+    filter,
+    catalogClient,
   }: {
     discovery: PluginEndpointDiscovery;
     locationTemplate?: string;
+    filter?: CatalogEntitiesRequest['filter'];
+    catalogClient?: CatalogApi;
   }) {
     this.discovery = discovery;
     this.locationTemplate =
       locationTemplate || '/catalog/:namespace/:kind/:name';
+    this.filter = filter;
+    this.catalogClient =
+      catalogClient || new CatalogClient({ discoveryApi: discovery });
   }
 
   protected applyArgsToFormat(
@@ -56,26 +82,24 @@ export class DefaultCatalogCollator implements DocumentCollator {
   }
 
   async execute() {
-    const baseUrl = await this.discovery.getBaseUrl('catalog');
-    const res = await fetch(`${baseUrl}/entities`);
-    const entities: Entity[] = await res.json();
-    return entities.map(
-      (entity: Entity): CatalogEntityDocument => {
-        return {
-          title: entity.metadata.name,
-          location: this.applyArgsToFormat(this.locationTemplate, {
-            namespace: entity.metadata.namespace || 'default',
-            kind: entity.kind,
-            name: entity.metadata.name,
-          }),
-          text: entity.metadata.description || '',
-          componentType: entity.spec?.type?.toString() || 'other',
+    const response = await this.catalogClient.getEntities({
+      filter: this.filter,
+    });
+    return response.items.map((entity: Entity): CatalogEntityDocument => {
+      return {
+        title: entity.metadata.name,
+        location: this.applyArgsToFormat(this.locationTemplate, {
           namespace: entity.metadata.namespace || 'default',
           kind: entity.kind,
-          lifecycle: (entity.spec?.lifecycle as string) || '',
-          owner: (entity.spec?.owner as string) || '',
-        };
-      },
-    );
+          name: entity.metadata.name,
+        }),
+        text: entity.metadata.description || '',
+        componentType: entity.spec?.type?.toString() || 'other',
+        namespace: entity.metadata.namespace || 'default',
+        kind: entity.kind,
+        lifecycle: (entity.spec?.lifecycle as string) || '',
+        owner: (entity.spec?.owner as string) || '',
+      };
+    });
   }
 }
diff --git a/plugins/catalog-backend/src/search/index.ts b/plugins/catalog-backend/src/search/index.ts
index 7e13999864..5641670333 100644
--- a/plugins/catalog-backend/src/search/index.ts
+++ b/plugins/catalog-backend/src/search/index.ts
@@ -14,4 +14,5 @@
  * limitations under the License.
  */
 
-export * from './DefaultCatalogCollator';
+export { DefaultCatalogCollator } from './DefaultCatalogCollator';
+export type { CatalogEntityDocument } from './DefaultCatalogCollator';
diff --git a/plugins/catalog-backend/src/service/CatalogBuilder.test.ts b/plugins/catalog-backend/src/service/CatalogBuilder.test.ts
index 579772dcce..87a26ed3aa 100644
--- a/plugins/catalog-backend/src/service/CatalogBuilder.test.ts
+++ b/plugins/catalog-backend/src/service/CatalogBuilder.test.ts
@@ -166,7 +166,7 @@ describe('CatalogBuilder', () => {
 
     const { entitiesCatalog, higherOrderOperation } = await builder.build();
     await higherOrderOperation.addLocation({
-      type: 'github',
+      type: 'url',
       target: 'https://github.com/a/b/x.yaml',
     });
     const { entities } = await entitiesCatalog.entities();
diff --git a/plugins/catalog-backend/src/service/CatalogBuilder.ts b/plugins/catalog-backend/src/service/CatalogBuilder.ts
index 76b4af7450..e32e071ebc 100644
--- a/plugins/catalog-backend/src/service/CatalogBuilder.ts
+++ b/plugins/catalog-backend/src/service/CatalogBuilder.ts
@@ -46,6 +46,7 @@ import {
   FileReaderProcessor,
   GithubDiscoveryProcessor,
   GithubOrgReaderProcessor,
+  GitLabDiscoveryProcessor,
   HigherOrderOperation,
   HigherOrderOperations,
   LocationEntityProcessor,
@@ -305,7 +306,11 @@ export class CatalogBuilder {
     // These are always there no matter what
     const processors: CatalogProcessor[] = [
       StaticLocationProcessor.fromConfig(config),
-      new PlaceholderProcessor({ resolvers: placeholderResolvers, reader }),
+      new PlaceholderProcessor({
+        resolvers: placeholderResolvers,
+        reader,
+        integrations,
+      }),
       new BuiltinKindsEntityProcessor(),
     ];
 
@@ -316,6 +321,7 @@ export class CatalogBuilder {
         BitbucketDiscoveryProcessor.fromConfig(config, { logger }),
         GithubDiscoveryProcessor.fromConfig(config, { logger }),
         GithubOrgReaderProcessor.fromConfig(config, { logger }),
+        GitLabDiscoveryProcessor.fromConfig(config, { logger }),
         new UrlReaderProcessor({ reader, logger }),
         CodeOwnersProcessor.fromConfig(config, { logger, reader }),
         new LocationEntityProcessor({ integrations }),
diff --git a/plugins/catalog-backend/src/service/index.ts b/plugins/catalog-backend/src/service/index.ts
index baf3f499d7..865e611de4 100644
--- a/plugins/catalog-backend/src/service/index.ts
+++ b/plugins/catalog-backend/src/service/index.ts
@@ -15,5 +15,6 @@
  */
 
 export { CatalogBuilder } from './CatalogBuilder';
+export type { CatalogEnvironment } from './CatalogBuilder';
 export { createRouter } from './router';
 export type { RouterOptions } from './router';
diff --git a/plugins/catalog-backend/src/service/request/parseEntityFilterParams.test.ts b/plugins/catalog-backend/src/service/request/parseEntityFilterParams.test.ts
index e2b953ddef..fc22a638de 100644
--- a/plugins/catalog-backend/src/service/request/parseEntityFilterParams.test.ts
+++ b/plugins/catalog-backend/src/service/request/parseEntityFilterParams.test.ts
@@ -69,9 +69,11 @@ describe('parseEntityFilterParams', () => {
 describe('parseEntityFilterString', () => {
   it('works for the happy path', () => {
     expect(parseEntityFilterString('')).toBeUndefined();
-    expect(parseEntityFilterString('a=1,b=2,a=3')).toEqual([
+    expect(parseEntityFilterString('a=1,b=2,a=3,c,d=')).toEqual([
       { key: 'a', matchValueIn: ['1', '3'] },
       { key: 'b', matchValueIn: ['2'] },
+      { key: 'c', matchValueExists: true },
+      { key: 'd', matchValueIn: [''] },
     ]);
   });
 
@@ -83,17 +85,11 @@ describe('parseEntityFilterString', () => {
   });
 
   it('rejects malformed strings', () => {
-    expect(() => parseEntityFilterString('x=2,a=')).toThrow(
-      "Invalid filter, 'a=' is not a valid statement (expected a string on the form a=b)",
-    );
     expect(() => parseEntityFilterString('x=2,=a')).toThrow(
-      "Invalid filter, '=a' is not a valid statement (expected a string on the form a=b)",
+      "Invalid filter, '=a' is not a valid statement (expected a string on the form a=b or a= or a)",
     );
     expect(() => parseEntityFilterString('x=2,=')).toThrow(
-      "Invalid filter, '=' is not a valid statement (expected a string on the form a=b)",
-    );
-    expect(() => parseEntityFilterString('x=2,a')).toThrow(
-      "Invalid filter, 'a' is not a valid statement (expected a string on the form a=b)",
+      "Invalid filter, '=' is not a valid statement (expected a string on the form a=b or a= or a)",
     );
   });
 });
diff --git a/plugins/catalog-backend/src/service/request/parseEntityFilterParams.ts b/plugins/catalog-backend/src/service/request/parseEntityFilterParams.ts
index 154a25c541..c63b366bc7 100644
--- a/plugins/catalog-backend/src/service/request/parseEntityFilterParams.ts
+++ b/plugins/catalog-backend/src/service/request/parseEntityFilterParams.ts
@@ -61,25 +61,26 @@ export function parseEntityFilterString(
 
   for (const statement of statements) {
     const equalsIndex = statement.indexOf('=');
-    if (equalsIndex < 1) {
-      throw new InputError(
-        `Invalid filter, '${statement}' is not a valid statement (expected a string on the form a=b)`,
-      );
-    }
 
-    const key = statement.substr(0, equalsIndex).trim();
-    const value = statement.substr(equalsIndex + 1).trim();
-    if (!key || !value) {
+    const key =
+      equalsIndex === -1 ? statement : statement.substr(0, equalsIndex).trim();
+    const value =
+      equalsIndex === -1 ? undefined : statement.substr(equalsIndex + 1).trim();
+    if (!key) {
       throw new InputError(
-        `Invalid filter, '${statement}' is not a valid statement (expected a string on the form a=b)`,
+        `Invalid filter, '${statement}' is not a valid statement (expected a string on the form a=b or a= or a)`,
       );
     }
 
     const f =
-      key in filtersByKey
-        ? filtersByKey[key]
-        : (filtersByKey[key] = { key, matchValueIn: [] });
-    f.matchValueIn!.push(value);
+      key in filtersByKey ? filtersByKey[key] : (filtersByKey[key] = { key });
+
+    if (value === undefined) {
+      f.matchValueExists = true;
+    } else {
+      f.matchValueIn = f.matchValueIn || [];
+      f.matchValueIn.push(value);
+    }
   }
 
   return Object.values(filtersByKey);
diff --git a/plugins/catalog-backend/src/service/request/parseEntityTransformParams.test.ts b/plugins/catalog-backend/src/service/request/parseEntityTransformParams.test.ts
index 9f867e241f..1d5d41fc03 100644
--- a/plugins/catalog-backend/src/service/request/parseEntityTransformParams.test.ts
+++ b/plugins/catalog-backend/src/service/request/parseEntityTransformParams.test.ts
@@ -60,8 +60,8 @@ describe('parseEntityTransformParams', () => {
     expect(
       parseEntityTransformParams({ fields: 'kind,metadata.name' })!(entity),
     ).toEqual({ kind: 'k', metadata: { name: 'n' } });
-    expect(
-      parseEntityTransformParams({ fields: 'metadata' })!(entity),
-    ).toEqual({ metadata: { name: 'n', tags: ['t1', 't2'] } });
+    expect(parseEntityTransformParams({ fields: 'metadata' })!(entity)).toEqual(
+      { metadata: { name: 'n', tags: ['t1', 't2'] } },
+    );
   });
 });
diff --git a/plugins/catalog-backend/src/service/router.test.ts b/plugins/catalog-backend/src/service/router.test.ts
index c4631c6c2c..8e8b91d013 100644
--- a/plugins/catalog-backend/src/service/router.test.ts
+++ b/plugins/catalog-backend/src/service/router.test.ts
@@ -291,10 +291,10 @@ describe('createRouter readonly disabled', () => {
 
   describe('POST /locations', () => {
     it('rejects malformed locations', async () => {
-      const spec = ({
+      const spec = {
         typez: 'b',
         target: 'c',
-      } as unknown) as LocationSpec;
+      } as unknown as LocationSpec;
 
       const response = await request(app).post('/locations').send(spec);
 
diff --git a/plugins/catalog-backend/src/service/standaloneServer.ts b/plugins/catalog-backend/src/service/standaloneServer.ts
index ab8d40d74c..7e0bacde32 100644
--- a/plugins/catalog-backend/src/service/standaloneServer.ts
+++ b/plugins/catalog-backend/src/service/standaloneServer.ts
@@ -49,11 +49,8 @@ export async function startStandaloneServer(
     config,
     reader,
   });
-  const {
-    entitiesCatalog,
-    locationsCatalog,
-    higherOrderOperation,
-  } = await builder.build();
+  const { entitiesCatalog, locationsCatalog, higherOrderOperation } =
+    await builder.build();
 
   logger.debug('Starting application server...');
   const router = await createRouter({
diff --git a/plugins/catalog-backend/src/service/util.ts b/plugins/catalog-backend/src/service/util.ts
index 7902458900..d2f9fa0a4c 100644
--- a/plugins/catalog-backend/src/service/util.ts
+++ b/plugins/catalog-backend/src/service/util.ts
@@ -52,7 +52,7 @@ export async function validateRequestBody<T>(
     throw new InputError(`Malformed request: ${e}`);
   }
 
-  return (body as unknown) as T;
+  return body as unknown as T;
 }
 
 export function disallowReadonlyMode(readonly: boolean) {
diff --git a/plugins/catalog-graphql/CHANGELOG.md b/plugins/catalog-graphql/CHANGELOG.md
index c10aa98b53..6a909c57b7 100644
--- a/plugins/catalog-graphql/CHANGELOG.md
+++ b/plugins/catalog-graphql/CHANGELOG.md
@@ -1,5 +1,13 @@
 # @backstage/plugin-catalog-graphql
 
+## 0.2.12
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.9.0
+  - @backstage/config@0.1.8
+
 ## 0.2.11
 
 ### Patch Changes
diff --git a/plugins/catalog-graphql/api-report.md b/plugins/catalog-graphql/api-report.md
index 67beee09da..ac64559f13 100644
--- a/plugins/catalog-graphql/api-report.md
+++ b/plugins/catalog-graphql/api-report.md
@@ -7,9 +7,13 @@ import { Config } from '@backstage/config';
 import { GraphQLModule } from '@graphql-modules/core';
 import { Logger as Logger_2 } from 'winston';
 
+// Warning: (ae-missing-release-tag) "createModule" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export function createModule(options: ModuleOptions): Promise<GraphQLModule>;
 
+// Warning: (ae-missing-release-tag) "ModuleOptions" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export interface ModuleOptions {
   // (undocumented)
diff --git a/plugins/catalog-graphql/package.json b/plugins/catalog-graphql/package.json
index 039ac931f3..da847d9fa9 100644
--- a/plugins/catalog-graphql/package.json
+++ b/plugins/catalog-graphql/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-catalog-graphql",
-  "version": "0.2.11",
+  "version": "0.2.12",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -30,9 +30,9 @@
     "clean": "backstage-cli clean"
   },
   "dependencies": {
-    "@backstage/backend-common": "^0.8.5",
+    "@backstage/backend-common": "^0.9.0",
     "@backstage/catalog-model": "^0.9.0",
-    "@backstage/config": "^0.1.5",
+    "@backstage/config": "^0.1.8",
     "@graphql-modules/core": "^0.7.17",
     "apollo-server": "^2.16.1",
     "cross-fetch": "^3.0.6",
diff --git a/plugins/catalog-graphql/src/graphql/types.ts b/plugins/catalog-graphql/src/graphql/types.ts
index dbcf30152f..5c53a6d1e3 100644
--- a/plugins/catalog-graphql/src/graphql/types.ts
+++ b/plugins/catalog-graphql/src/graphql/types.ts
@@ -27,8 +27,7 @@ export type Exact<T extends { [key: string]: unknown }> = {
 export type Omit<T, K extends keyof T> = Pick<T, Exclude<keyof T, K>>;
 export type RequireFields<T, K extends keyof T> = {
   [X in Exclude<keyof T, K>]?: T[X];
-} &
-  { [P in K]-?: NonNullable<T[P]> };
+} & { [P in K]-?: NonNullable<T[P]> };
 /** All built-in and custom scalars, mapped to their actual values */
 export type Scalars = {
   ID: string;
@@ -219,7 +218,7 @@ export interface SubscriptionSubscriberObject<
   TKey extends string,
   TParent,
   TContext,
-  TArgs
+  TArgs,
 > {
   subscribe: SubscriptionSubscribeFn<
     { [key in TKey]: TResult },
@@ -245,7 +244,7 @@ export type SubscriptionObject<
   TKey extends string,
   TParent,
   TContext,
-  TArgs
+  TArgs,
 > =
   | SubscriptionSubscriberObject<TResult, TKey, TParent, TContext, TArgs>
   | SubscriptionResolverObject<TResult, TParent, TContext, TArgs>;
@@ -255,7 +254,7 @@ export type SubscriptionResolver<
   TKey extends string,
   TParent = {},
   TContext = {},
-  TArgs = {}
+  TArgs = {},
 > =
   | ((
       ...args: any[]
@@ -279,7 +278,7 @@ export type DirectiveResolverFn<
   TResult = {},
   TParent = {},
   TContext = {},
-  TArgs = {}
+  TArgs = {},
 > = (
   next: NextResolverFn<TResult>,
   parent: TParent,
@@ -364,7 +363,7 @@ export interface JsonObjectScalarConfig
 
 export type EntityMetadataResolvers<
   ContextType = ModuleContext,
-  ParentType = ResolversParentTypes['EntityMetadata']
+  ParentType = ResolversParentTypes['EntityMetadata'],
 > = ResolversObject<{
   __resolveType: TypeResolveFn<
     'DefaultEntityMetadata' | 'ComponentMetadata' | 'TemplateMetadata',
@@ -393,7 +392,7 @@ export type EntityMetadataResolvers<
 
 export type DefaultEntityMetadataResolvers<
   ContextType = ModuleContext,
-  ParentType = ResolversParentTypes['DefaultEntityMetadata']
+  ParentType = ResolversParentTypes['DefaultEntityMetadata'],
 > = ResolversObject<{
   name?: Resolver<ResolversTypes['String'], ParentType, ContextType>;
   annotations?: Resolver<ResolversTypes['JSONObject'], ParentType, ContextType>;
@@ -418,7 +417,7 @@ export type DefaultEntityMetadataResolvers<
 
 export type ComponentMetadataResolvers<
   ContextType = ModuleContext,
-  ParentType = ResolversParentTypes['ComponentMetadata']
+  ParentType = ResolversParentTypes['ComponentMetadata'],
 > = ResolversObject<{
   name?: Resolver<ResolversTypes['String'], ParentType, ContextType>;
   annotations?: Resolver<ResolversTypes['JSONObject'], ParentType, ContextType>;
@@ -448,7 +447,7 @@ export type ComponentMetadataResolvers<
 
 export type TemplateMetadataResolvers<
   ContextType = ModuleContext,
-  ParentType = ResolversParentTypes['TemplateMetadata']
+  ParentType = ResolversParentTypes['TemplateMetadata'],
 > = ResolversObject<{
   name?: Resolver<ResolversTypes['String'], ParentType, ContextType>;
   annotations?: Resolver<ResolversTypes['JSONObject'], ParentType, ContextType>;
@@ -478,7 +477,7 @@ export type TemplateMetadataResolvers<
 
 export type TemplateEntitySpecResolvers<
   ContextType = ModuleContext,
-  ParentType = ResolversParentTypes['TemplateEntitySpec']
+  ParentType = ResolversParentTypes['TemplateEntitySpec'],
 > = ResolversObject<{
   type?: Resolver<ResolversTypes['String'], ParentType, ContextType>;
   path?: Resolver<Maybe<ResolversTypes['String']>, ParentType, ContextType>;
@@ -489,7 +488,7 @@ export type TemplateEntitySpecResolvers<
 
 export type ComponentEntitySpecResolvers<
   ContextType = ModuleContext,
-  ParentType = ResolversParentTypes['ComponentEntitySpec']
+  ParentType = ResolversParentTypes['ComponentEntitySpec'],
 > = ResolversObject<{
   title?: Resolver<ResolversTypes['String'], ParentType, ContextType>;
   lifecycle?: Resolver<ResolversTypes['String'], ParentType, ContextType>;
@@ -499,7 +498,7 @@ export type ComponentEntitySpecResolvers<
 
 export type LocationEntitySpecResolvers<
   ContextType = ModuleContext,
-  ParentType = ResolversParentTypes['LocationEntitySpec']
+  ParentType = ResolversParentTypes['LocationEntitySpec'],
 > = ResolversObject<{
   type?: Resolver<ResolversTypes['String'], ParentType, ContextType>;
   target?: Resolver<Maybe<ResolversTypes['String']>, ParentType, ContextType>;
@@ -509,7 +508,7 @@ export type LocationEntitySpecResolvers<
 
 export type DefaultEntitySpecResolvers<
   ContextType = ModuleContext,
-  ParentType = ResolversParentTypes['DefaultEntitySpec']
+  ParentType = ResolversParentTypes['DefaultEntitySpec'],
 > = ResolversObject<{
   raw?: Resolver<Maybe<ResolversTypes['JSONObject']>, ParentType, ContextType>;
   __isTypeOf?: IsTypeOfResolverFn<ParentType>;
@@ -517,7 +516,7 @@ export type DefaultEntitySpecResolvers<
 
 export type EntitySpecResolvers<
   ContextType = ModuleContext,
-  ParentType = ResolversParentTypes['EntitySpec']
+  ParentType = ResolversParentTypes['EntitySpec'],
 > = ResolversObject<{
   __resolveType: TypeResolveFn<
     | 'DefaultEntitySpec'
@@ -531,7 +530,7 @@ export type EntitySpecResolvers<
 
 export type CatalogEntityResolvers<
   ContextType = ModuleContext,
-  ParentType = ResolversParentTypes['CatalogEntity']
+  ParentType = ResolversParentTypes['CatalogEntity'],
 > = ResolversObject<{
   apiVersion?: Resolver<ResolversTypes['String'], ParentType, ContextType>;
   kind?: Resolver<ResolversTypes['String'], ParentType, ContextType>;
@@ -546,7 +545,7 @@ export type CatalogEntityResolvers<
 
 export type CatalogQueryResolvers<
   ContextType = ModuleContext,
-  ParentType = ResolversParentTypes['CatalogQuery']
+  ParentType = ResolversParentTypes['CatalogQuery'],
 > = ResolversObject<{
   list?: Resolver<
     Array<ResolversTypes['CatalogEntity']>,
@@ -558,7 +557,7 @@ export type CatalogQueryResolvers<
 
 export type QueryResolvers<
   ContextType = ModuleContext,
-  ParentType = ResolversParentTypes['Query']
+  ParentType = ResolversParentTypes['Query'],
 > = ResolversObject<{
   catalog?: Resolver<ResolversTypes['CatalogQuery'], ParentType, ContextType>;
 }>;
diff --git a/plugins/catalog-import/CHANGELOG.md b/plugins/catalog-import/CHANGELOG.md
index fb9ae20305..3b5b0fa8fd 100644
--- a/plugins/catalog-import/CHANGELOG.md
+++ b/plugins/catalog-import/CHANGELOG.md
@@ -1,5 +1,97 @@
 # @backstage/plugin-catalog-import
 
+## 0.5.20
+
+### Patch Changes
+
+- e0a6aea82: Bumped `react-hook-form` to `^7.12.2`
+- Updated dependencies
+  - @backstage/plugin-catalog-react@0.4.5
+  - @backstage/integration@0.6.3
+  - @backstage/core-components@0.4.0
+  - @backstage/catalog-model@0.9.1
+  - @backstage/integration-react@0.1.8
+
+## 0.5.19
+
+### Patch Changes
+
+- cfcb486aa: Add system icons for the built-in entity types and use them in the entity list of the `catalog-import` plugin.
+- b5a2896ed: handle azure devops url query parameter for importing .yaml
+- Updated dependencies
+  - @backstage/plugin-catalog-react@0.4.4
+  - @backstage/core-components@0.3.3
+  - @backstage/integration@0.6.2
+
+## 0.5.18
+
+### Patch Changes
+
+- ced85b598: Fix importing yaml files from URLs with trailing query parameters.
+- Updated dependencies
+  - @backstage/plugin-catalog-react@0.4.3
+  - @backstage/core-components@0.3.2
+  - @backstage/integration@0.6.1
+  - @backstage/theme@0.2.10
+
+## 0.5.17
+
+### Patch Changes
+
+- 56c773909: Switched `@types/react` dependency to request `*` rather than a specific version.
+- Updated dependencies
+  - @backstage/integration@0.6.0
+  - @backstage/core-components@0.3.1
+  - @backstage/core-plugin-api@0.1.6
+  - @backstage/plugin-catalog-react@0.4.2
+  - @backstage/integration-react@0.1.7
+
+## 0.5.16
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.3.0
+  - @backstage/core-plugin-api@0.1.5
+  - @backstage/integration@0.5.9
+  - @backstage/integration-react@0.1.6
+  - @backstage/plugin-catalog-react@0.4.1
+
+## 0.5.15
+
+### Patch Changes
+
+- 9d40fcb1e: - Bumping `material-ui/core` version to at least `4.12.2` as they made some breaking changes in later versions which broke `Pagination` of the `Table`.
+  - Switching out `material-table` to `@material-table/core` for support for the later versions of `material-ui/core`
+  - This causes a minor API change to `@backstage/core-components` as the interface for `Table` re-exports the `prop` from the underlying `Table` components.
+  - `onChangeRowsPerPage` has been renamed to `onRowsPerPageChange`
+  - `onChangePage` has been renamed to `onPageChange`
+  - Migration guide is here: https://material-table-core.com/docs/breaking-changes
+- Updated dependencies
+  - @backstage/core-components@0.2.0
+  - @backstage/plugin-catalog-react@0.4.0
+  - @backstage/core-plugin-api@0.1.4
+  - @backstage/integration-react@0.1.5
+  - @backstage/theme@0.2.9
+  - @backstage/catalog-client@0.3.18
+
+## 0.5.14
+
+### Patch Changes
+
+- 903f3323c: Fix heading that wrongly implied catalog-import supports entity discovery for multiple integrations.
+- Updated dependencies
+  - @backstage/core-components@0.1.6
+  - @backstage/catalog-client@0.3.17
+  - @backstage/plugin-catalog-react@0.3.1
+
+## 0.5.13
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@0.3.0
+
 ## 0.5.12
 
 ### Patch Changes
diff --git a/plugins/catalog-import/api-report.md b/plugins/catalog-import/api-report.md
index 808d8f1909..8466749243 100644
--- a/plugins/catalog-import/api-report.md
+++ b/plugins/catalog-import/api-report.md
@@ -9,7 +9,7 @@ import { ApiRef } from '@backstage/core-plugin-api';
 import { BackstagePlugin } from '@backstage/core-plugin-api';
 import { CatalogApi } from '@backstage/catalog-client';
 import { ConfigApi } from '@backstage/core-plugin-api';
-import { Control } from 'react-hook-form';
+import { Controller } from 'react-hook-form';
 import { DiscoveryApi } from '@backstage/core-plugin-api';
 import { Entity } from '@backstage/catalog-model';
 import { EntityName } from '@backstage/catalog-model';
@@ -23,10 +23,11 @@ import { ScmIntegrationRegistry } from '@backstage/integration';
 import { SubmitHandler } from 'react-hook-form';
 import { TextFieldProps } from '@material-ui/core/TextField/TextField';
 import { UnpackNestedValue } from 'react-hook-form';
-import { UseControllerOptions } from 'react-hook-form';
-import { UseFormMethods } from 'react-hook-form';
-import { UseFormOptions } from 'react-hook-form';
+import { UseFormProps } from 'react-hook-form';
+import { UseFormReturn } from 'react-hook-form';
 
+// Warning: (ae-missing-release-tag) "AnalyzeResult" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export type AnalyzeResult =
   | {
@@ -43,12 +44,14 @@ export type AnalyzeResult =
       generatedEntities: PartialEntity[];
     };
 
+// Warning: (ae-forgotten-export) The symbol "Props" needs to be exported by the entry point index.d.ts
+// Warning: (ae-missing-release-tag) "AutocompleteTextField" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export const AutocompleteTextField: <TFieldValue extends string>({
   name,
   options,
   required,
-  control,
   errors,
   rules,
   loading,
@@ -58,6 +61,8 @@ export const AutocompleteTextField: <TFieldValue extends string>({
   textFieldProps,
 }: Props_4<TFieldValue>) => JSX.Element;
 
+// Warning: (ae-missing-release-tag) "CatalogImportApi" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export interface CatalogImportApi {
   // (undocumented)
@@ -74,9 +79,13 @@ export interface CatalogImportApi {
   }>;
 }
 
+// Warning: (ae-missing-release-tag) "catalogImportApiRef" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export const catalogImportApiRef: ApiRef<CatalogImportApi>;
 
+// Warning: (ae-missing-release-tag) "CatalogImportClient" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export class CatalogImportClient implements CatalogImportApi {
   constructor(options: {
@@ -105,9 +114,14 @@ export class CatalogImportClient implements CatalogImportApi {
   }>;
 }
 
+// Warning: (ae-forgotten-export) The symbol "StepperProviderOpts" needs to be exported by the entry point index.d.ts
+// Warning: (ae-missing-release-tag) "CatalogImportPage" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export const CatalogImportPage: (opts: StepperProviderOpts) => JSX.Element;
 
+// Warning: (ae-missing-release-tag) "catalogImportPlugin" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 const catalogImportPlugin: BackstagePlugin<
   {
@@ -118,12 +132,21 @@ const catalogImportPlugin: BackstagePlugin<
 export { catalogImportPlugin };
 export { catalogImportPlugin as plugin };
 
+// Warning: (tsdoc-param-tag-missing-hyphen) The @param block should be followed by a parameter name and then a hyphen
+// Warning: (tsdoc-param-tag-missing-hyphen) The @param block should be followed by a parameter name and then a hyphen
+// Warning: (ae-forgotten-export) The symbol "ImportFlows" needs to be exported by the entry point index.d.ts
+// Warning: (ae-forgotten-export) The symbol "StepperProvider" needs to be exported by the entry point index.d.ts
+// Warning: (ae-missing-release-tag) "defaultGenerateStepper" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public
 export function defaultGenerateStepper(
   flow: ImportFlows,
   defaults: StepperProvider,
 ): StepperProvider;
 
+// Warning: (ae-forgotten-export) The symbol "Props" needs to be exported by the entry point index.d.ts
+// Warning: (ae-missing-release-tag) "EntityListComponent" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export const EntityListComponent: ({
   locations,
@@ -134,6 +157,9 @@ export const EntityListComponent: ({
   withLinks,
 }: Props_2) => JSX.Element;
 
+// Warning: (ae-forgotten-export) The symbol "Props" needs to be exported by the entry point index.d.ts
+// Warning: (ae-missing-release-tag) "ImportStepper" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export const ImportStepper: ({
   initialUrl,
@@ -142,15 +168,24 @@ export const ImportStepper: ({
   opts,
 }: Props) => JSX.Element;
 
+// Warning: (tsdoc-param-tag-missing-hyphen) The @param block should be followed by a parameter name and then a hyphen
+// Warning: (tsdoc-param-tag-missing-hyphen) The @param block should be followed by a parameter name and then a hyphen
+// Warning: (tsdoc-param-tag-missing-hyphen) The @param block should be followed by a parameter name and then a hyphen
+// Warning: (ae-forgotten-export) The symbol "Props" needs to be exported by the entry point index.d.ts
+// Warning: (ae-missing-release-tag) "PreparePullRequestForm" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public
 export const PreparePullRequestForm: <
-  TFieldValues extends Record<string, any>
+  TFieldValues extends Record<string, any>,
 >({
   defaultValues,
   onSubmit,
   render,
 }: Props_5<TFieldValues>) => JSX.Element;
 
+// Warning: (ae-forgotten-export) The symbol "Props" needs to be exported by the entry point index.d.ts
+// Warning: (ae-missing-release-tag) "PreviewCatalogInfoComponent" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export const PreviewCatalogInfoComponent: ({
   repositoryUrl,
@@ -158,6 +193,9 @@ export const PreviewCatalogInfoComponent: ({
   classes,
 }: Props_6) => JSX.Element;
 
+// Warning: (ae-forgotten-export) The symbol "Props" needs to be exported by the entry point index.d.ts
+// Warning: (ae-missing-release-tag) "PreviewPullRequestComponent" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export const PreviewPullRequestComponent: ({
   title,
@@ -165,9 +203,17 @@ export const PreviewPullRequestComponent: ({
   classes,
 }: Props_7) => JSX.Element;
 
+// Warning: (ae-missing-release-tag) "Router" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export const Router: (opts: StepperProviderOpts) => JSX.Element;
 
+// Warning: (tsdoc-param-tag-missing-hyphen) The @param block should be followed by a parameter name and then a hyphen
+// Warning: (tsdoc-param-tag-missing-hyphen) The @param block should be followed by a parameter name and then a hyphen
+// Warning: (tsdoc-param-tag-missing-hyphen) The @param block should be followed by a parameter name and then a hyphen
+// Warning: (ae-forgotten-export) The symbol "Props" needs to be exported by the entry point index.d.ts
+// Warning: (ae-missing-release-tag) "StepInitAnalyzeUrl" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public
 export const StepInitAnalyzeUrl: ({
   onAnalysis,
@@ -175,6 +221,9 @@ export const StepInitAnalyzeUrl: ({
   disablePullRequest,
 }: Props_3) => JSX.Element;
 
+// Warning: (ae-forgotten-export) The symbol "Props" needs to be exported by the entry point index.d.ts
+// Warning: (ae-missing-release-tag) "StepPrepareCreatePullRequest" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export const StepPrepareCreatePullRequest: ({
   analyzeResult,
@@ -185,5 +234,9 @@ export const StepPrepareCreatePullRequest: ({
   defaultBody,
 }: Props_8) => JSX.Element;
 
+// Warnings were encountered during analysis:
+//
+// src/api/CatalogImportApi.d.ts:14:5 - (ae-forgotten-export) The symbol "PartialEntity" needs to be exported by the entry point index.d.ts
+
 // (No @packageDocumentation comment for this package)
 ```
diff --git a/plugins/catalog-import/package.json b/plugins/catalog-import/package.json
index 3b3f441e8a..047a55e716 100644
--- a/plugins/catalog-import/package.json
+++ b/plugins/catalog-import/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-catalog-import",
-  "version": "0.5.12",
+  "version": "0.5.20",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -30,34 +30,34 @@
     "clean": "backstage-cli clean"
   },
   "dependencies": {
-    "@backstage/catalog-client": "^0.3.16",
-    "@backstage/catalog-model": "^0.9.0",
-    "@backstage/core-components": "^0.1.5",
-    "@backstage/core-plugin-api": "^0.1.3",
-    "@backstage/integration": "^0.5.8",
-    "@backstage/integration-react": "^0.1.4",
-    "@backstage/plugin-catalog-react": "^0.2.6",
-    "@backstage/theme": "^0.2.8",
-    "@material-ui/core": "^4.11.0",
+    "@backstage/catalog-client": "^0.3.18",
+    "@backstage/catalog-model": "^0.9.1",
+    "@backstage/core-components": "^0.4.1",
+    "@backstage/core-plugin-api": "^0.1.7",
+    "@backstage/integration": "^0.6.3",
+    "@backstage/integration-react": "^0.1.8",
+    "@backstage/plugin-catalog-react": "^0.4.5",
+    "@backstage/theme": "^0.2.10",
+    "@material-ui/core": "^4.12.2",
     "@material-ui/icons": "^4.9.1",
     "@material-ui/lab": "4.0.0-alpha.45",
     "@octokit/rest": "^18.5.3",
-    "@types/react": "^16.9",
-    "git-url-parse": "~11.4.4",
+    "@types/react": "*",
+    "git-url-parse": "^11.6.0",
     "js-base64": "^3.6.0",
     "react": "^16.13.1",
     "react-dom": "^16.13.1",
-    "react-hook-form": "^6.15.4",
+    "react-hook-form": "^7.12.2",
     "react-router": "6.0.0-beta.0",
     "react-router-dom": "6.0.0-beta.0",
     "react-use": "^17.2.4",
     "yaml": "^1.10.0"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.7.3",
-    "@backstage/core-app-api": "^0.1.4",
-    "@backstage/dev-utils": "^0.2.1",
-    "@backstage/test-utils": "^0.1.14",
+    "@backstage/cli": "^0.7.11",
+    "@backstage/core-app-api": "^0.1.12",
+    "@backstage/dev-utils": "^0.2.9",
+    "@backstage/test-utils": "^0.1.17",
     "@testing-library/jest-dom": "^5.10.1",
     "@testing-library/react": "^11.2.5",
     "@testing-library/react-hooks": "^3.3.0",
diff --git a/plugins/catalog-import/src/api/CatalogImportClient.test.ts b/plugins/catalog-import/src/api/CatalogImportClient.test.ts
index e2c3f2dc47..2936f956e4 100644
--- a/plugins/catalog-import/src/api/CatalogImportClient.test.ts
+++ b/plugins/catalog-import/src/api/CatalogImportClient.test.ts
@@ -17,7 +17,7 @@
 const octokit = {
   repos: {
     get: () => Promise.resolve({ data: { default_branch: 'main' } }),
-    createOrUpdateFileContents: jest.fn().mockImplementation(async () => {}),
+    createOrUpdateFileContents: jest.fn(async () => {}),
   },
   search: {
     code: jest.fn(),
@@ -26,10 +26,10 @@ const octokit = {
     getRef: async () => ({
       data: { object: { sha: 'any' } },
     }),
-    createRef: jest.fn().mockImplementation(async () => {}),
+    createRef: jest.fn(async () => {}),
   },
   pulls: {
-    create: jest.fn().mockImplementation(async () => ({
+    create: jest.fn(async () => ({
       data: {
         html_url: 'http://pull/request/0',
       },
@@ -46,6 +46,8 @@ jest.doMock('@octokit/rest', () => {
   return { Octokit };
 });
 
+import { ConfigReader, UrlPatternDiscovery } from '@backstage/core-app-api';
+import { OAuthApi } from '@backstage/core-plugin-api';
 import { ScmIntegrations } from '@backstage/integration';
 import { catalogApiRef } from '@backstage/plugin-catalog-react';
 import { msw } from '@backstage/test-utils';
@@ -54,9 +56,6 @@ import { rest } from 'msw';
 import { setupServer } from 'msw/node';
 import { CatalogImportClient } from './CatalogImportClient';
 
-import { ConfigReader, UrlPatternDiscovery } from '@backstage/core-app-api';
-import { OAuthApi } from '@backstage/core-plugin-api';
-
 describe('CatalogImportClient', () => {
   const server = setupServer();
   msw.setupDefaultHandlers(server);
@@ -119,6 +118,11 @@ describe('CatalogImportClient', () => {
     });
   });
 
+  afterEach(() => {
+    jest.restoreAllMocks();
+    jest.clearAllMocks();
+  });
+
   describe('analyzeUrl', () => {
     it('should add yaml location', async () => {
       catalogApi.addLocation.mockResolvedValueOnce({
@@ -167,6 +171,103 @@ describe('CatalogImportClient', () => {
       });
     });
 
+    it('should add yaml location, if url includes query parameter named path=', async () => {
+      catalogApi.addLocation.mockResolvedValueOnce({
+        location: {
+          id: 'id-0',
+          type: 'url',
+          target:
+            'https://dev.azure.com/any-org/any-project/_git/any-repository?path=%2Fcatalog-info.yaml',
+        },
+        entities: [
+          {
+            apiVersion: '1',
+            kind: 'Component',
+            metadata: {
+              name: 'my-entity-1',
+              namespace: 'my-namespace-1',
+            },
+          },
+        ],
+      });
+
+      await expect(
+        catalogImportClient.analyzeUrl(
+          'https://dev.azure.com/any-org/any-project/_git/any-repository?path=%2Fcatalog-info.yaml',
+        ),
+      ).resolves.toEqual({
+        locations: [
+          {
+            entities: [
+              {
+                kind: 'Component',
+                name: 'my-entity-1',
+                namespace: 'my-namespace-1',
+              },
+            ],
+            target:
+              'https://dev.azure.com/any-org/any-project/_git/any-repository?path=%2Fcatalog-info.yaml',
+          },
+        ],
+        type: 'locations',
+      });
+
+      expect(catalogApi.addLocation).toBeCalledTimes(1);
+      expect(catalogApi.addLocation.mock.calls[0][0]).toEqual({
+        type: 'url',
+        target:
+          'https://dev.azure.com/any-org/any-project/_git/any-repository?path=%2Fcatalog-info.yaml',
+        dryRun: true,
+      });
+    });
+
+    it('should add yaml location, if url includes query parameters', async () => {
+      catalogApi.addLocation.mockResolvedValueOnce({
+        location: {
+          id: 'id-0',
+          type: 'url',
+          target: 'http://example.com/folder/catalog-info.yaml?branch=test',
+        },
+        entities: [
+          {
+            apiVersion: '1',
+            kind: 'Component',
+            metadata: {
+              name: 'my-entity',
+              namespace: 'my-namespace',
+            },
+          },
+        ],
+      });
+
+      await expect(
+        catalogImportClient.analyzeUrl(
+          'http://example.com/folder/catalog-info.yaml?branch=test',
+        ),
+      ).resolves.toEqual({
+        locations: [
+          {
+            entities: [
+              {
+                kind: 'Component',
+                name: 'my-entity',
+                namespace: 'my-namespace',
+              },
+            ],
+            target: 'http://example.com/folder/catalog-info.yaml?branch=test',
+          },
+        ],
+        type: 'locations',
+      });
+
+      expect(catalogApi.addLocation).toBeCalledTimes(1);
+      expect(catalogApi.addLocation.mock.calls[0][0]).toEqual({
+        type: 'url',
+        target: 'http://example.com/folder/catalog-info.yaml?branch=test',
+        dryRun: true,
+      });
+    });
+
     it('should reject for integrations that are not github ones', async () => {
       await expect(
         catalogImportClient.analyzeUrl(
@@ -192,7 +293,7 @@ describe('CatalogImportClient', () => {
     });
 
     it('should find locations from github', async () => {
-      ((new Octokit().search.code as any) as jest.Mock).mockResolvedValueOnce({
+      (new Octokit().search.code as any as jest.Mock).mockResolvedValueOnce({
         data: {
           total_count: 2,
           items: [
@@ -248,7 +349,7 @@ describe('CatalogImportClient', () => {
     });
 
     it('should find repository from github', async () => {
-      ((new Octokit().search.code as any) as jest.Mock).mockResolvedValueOnce({
+      (new Octokit().search.code as any as jest.Mock).mockResolvedValueOnce({
         data: { total_count: 0, items: [] },
       });
 
@@ -312,7 +413,7 @@ describe('CatalogImportClient', () => {
       });
 
       expect(
-        ((new Octokit().git.createRef as any) as jest.Mock).mock.calls[0][0],
+        (new Octokit().git.createRef as any as jest.Mock).mock.calls[0][0],
       ).toEqual({
         owner: 'backstage',
         repo: 'backstage',
@@ -320,7 +421,7 @@ describe('CatalogImportClient', () => {
         sha: 'any',
       });
       expect(
-        ((new Octokit().repos.createOrUpdateFileContents as any) as jest.Mock)
+        (new Octokit().repos.createOrUpdateFileContents as any as jest.Mock)
           .mock.calls[0][0],
       ).toEqual({
         owner: 'backstage',
@@ -331,7 +432,7 @@ describe('CatalogImportClient', () => {
         branch: 'backstage-integration',
       });
       expect(
-        ((new Octokit().pulls.create as any) as jest.Mock).mock.calls[0][0],
+        (new Octokit().pulls.create as any as jest.Mock).mock.calls[0][0],
       ).toEqual({
         owner: 'backstage',
         repo: 'backstage',
diff --git a/plugins/catalog-import/src/api/CatalogImportClient.ts b/plugins/catalog-import/src/api/CatalogImportClient.ts
index aa29c95247..2497af99d8 100644
--- a/plugins/catalog-import/src/api/CatalogImportClient.ts
+++ b/plugins/catalog-import/src/api/CatalogImportClient.ts
@@ -16,20 +16,20 @@
 
 import { CatalogApi } from '@backstage/catalog-client';
 import { EntityName } from '@backstage/catalog-model';
-import {
-  GitHubIntegrationConfig,
-  ScmIntegrationRegistry,
-} from '@backstage/integration';
-import { Base64 } from 'js-base64';
-import { Octokit } from '@octokit/rest';
-import { PartialEntity } from '../types';
-import { AnalyzeResult, CatalogImportApi } from './CatalogImportApi';
-import { getGithubIntegrationConfig } from './GitHub';
 import {
   DiscoveryApi,
   IdentityApi,
   OAuthApi,
 } from '@backstage/core-plugin-api';
+import {
+  GitHubIntegrationConfig,
+  ScmIntegrationRegistry,
+} from '@backstage/integration';
+import { Octokit } from '@octokit/rest';
+import { Base64 } from 'js-base64';
+import { PartialEntity } from '../types';
+import { AnalyzeResult, CatalogImportApi } from './CatalogImportApi';
+import { getGithubIntegrationConfig } from './GitHub';
 
 export class CatalogImportClient implements CatalogImportApi {
   private readonly discoveryApi: DiscoveryApi;
@@ -53,7 +53,10 @@ export class CatalogImportClient implements CatalogImportApi {
   }
 
   async analyzeUrl(url: string): Promise<AnalyzeResult> {
-    if (url.match(/\.ya?ml$/)) {
+    if (
+      new URL(url).pathname.match(/\.ya?ml$/) ||
+      new URL(url).searchParams.get('path')?.match(/.ya?ml$/)
+    ) {
       const location = await this.catalogApi.addLocation({
         type: 'url',
         target: url,
diff --git a/plugins/catalog-import/src/components/EntityListComponent/EntityListComponent.tsx b/plugins/catalog-import/src/components/EntityListComponent/EntityListComponent.tsx
index 433f7eda5a..b8af9942f6 100644
--- a/plugins/catalog-import/src/components/EntityListComponent/EntityListComponent.tsx
+++ b/plugins/catalog-import/src/components/EntityListComponent/EntityListComponent.tsx
@@ -15,6 +15,7 @@
  */
 
 import { Entity, EntityName } from '@backstage/catalog-model';
+import { useApp } from '@backstage/core-plugin-api';
 import {
   EntityRefLink,
   formatEntityRefTitle,
@@ -29,15 +30,8 @@ import {
   ListItemText,
 } from '@material-ui/core';
 import { makeStyles } from '@material-ui/core/styles';
-import ApartmentIcon from '@material-ui/icons/Apartment';
-import CategoryIcon from '@material-ui/icons/Category';
 import ExpandLessIcon from '@material-ui/icons/ExpandLess';
 import ExpandMoreIcon from '@material-ui/icons/ExpandMore';
-import ExtensionIcon from '@material-ui/icons/Extension';
-import GroupIcon from '@material-ui/icons/Group';
-import LocationOnIcon from '@material-ui/icons/LocationOn';
-import MemoryIcon from '@material-ui/icons/Memory';
-import PersonIcon from '@material-ui/icons/Person';
 import WorkIcon from '@material-ui/icons/Work';
 import React, { useState } from 'react';
 
@@ -53,34 +47,6 @@ function sortEntities(entities: Array<EntityName | Entity>) {
   );
 }
 
-function getEntityIcon(entity: { kind: string }): React.ReactElement {
-  switch (entity.kind.toLocaleLowerCase('en-US')) {
-    case 'api':
-      return <ExtensionIcon />;
-
-    case 'component':
-      return <MemoryIcon />;
-
-    case 'domain':
-      return <ApartmentIcon />;
-
-    case 'group':
-      return <GroupIcon />;
-
-    case 'location':
-      return <LocationOnIcon />;
-
-    case 'system':
-      return <CategoryIcon />;
-
-    case 'user':
-      return <PersonIcon />;
-
-    default:
-      return <WorkIcon />;
-  }
-}
-
 type Props = {
   locations: Array<{ target: string; entities: (Entity | EntityName)[] }>;
   locationListItemIcon: (target: string) => React.ReactElement;
@@ -98,6 +64,7 @@ export const EntityListComponent = ({
   firstListItem,
   withLinks = false,
 }: Props) => {
+  const app = useApp();
   const classes = useStyles();
 
   const [expandedUrls, setExpandedUrls] = useState<string[]>([]);
@@ -144,22 +111,30 @@ export const EntityListComponent = ({
             unmountOnExit
           >
             <List component="div" disablePadding dense>
-              {sortEntities(r.entities).map(entity => (
-                <ListItem
-                  key={formatEntityRefTitle(entity)}
-                  className={classes.nested}
-                  {...(withLinks
-                    ? {
-                        component: EntityRefLink,
-                        entityRef: entity,
-                        button: withLinks as any,
-                      }
-                    : {})}
-                >
-                  <ListItemIcon>{getEntityIcon(entity)}</ListItemIcon>
-                  <ListItemText primary={formatEntityRefTitle(entity)} />
-                </ListItem>
-              ))}
+              {sortEntities(r.entities).map(entity => {
+                const Icon =
+                  app.getSystemIcon(
+                    `kind:${entity.kind.toLocaleLowerCase('en-US')}`,
+                  ) ?? WorkIcon;
+                return (
+                  <ListItem
+                    key={formatEntityRefTitle(entity)}
+                    className={classes.nested}
+                    {...(withLinks
+                      ? {
+                          component: EntityRefLink,
+                          entityRef: entity,
+                          button: withLinks as any,
+                        }
+                      : {})}
+                  >
+                    <ListItemIcon>
+                      <Icon />
+                    </ListItemIcon>
+                    <ListItemText primary={formatEntityRefTitle(entity)} />
+                  </ListItem>
+                );
+              })}
             </List>
           </Collapse>
         </React.Fragment>
diff --git a/plugins/catalog-import/src/components/ImportComponentPage.tsx b/plugins/catalog-import/src/components/ImportComponentPage.tsx
index 6bf5af24ef..bf53af134f 100644
--- a/plugins/catalog-import/src/components/ImportComponentPage.tsx
+++ b/plugins/catalog-import/src/components/ImportComponentPage.tsx
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-import { Grid, Typography } from '@material-ui/core';
+import { Chip, Grid, Typography } from '@material-ui/core';
 import React from 'react';
 import { ImportStepper } from './ImportStepper';
 import { StepperProviderOpts } from './ImportStepper/defaults';
 
-import { ConfigApi, configApiRef, useApi } from '@backstage/core-plugin-api';
+import { configApiRef, useApi } from '@backstage/core-plugin-api';
 import {
   Content,
   ContentHeader,
@@ -29,30 +29,12 @@ import {
   SupportButton,
 } from '@backstage/core-components';
 
-function repositories(configApi: ConfigApi): string[] {
-  const integrations = configApi.getConfig('integrations');
-  const repos = [];
-  if (integrations.has('github')) {
-    repos.push('GitHub');
-  }
-  if (integrations.has('bitbucket')) {
-    repos.push('Bitbucket');
-  }
-  if (integrations.has('gitlab')) {
-    repos.push('GitLab');
-  }
-  if (integrations.has('azure')) {
-    repos.push('Azure');
-  }
-  return repos;
-}
-
 export const ImportComponentPage = (opts: StepperProviderOpts) => {
   const configApi = useApi(configApiRef);
   const appTitle = configApi.getOptional('app.title') || 'Backstage';
 
-  const repos = repositories(configApi);
-  const repositoryString = repos.join(', ').replace(/, (\w*)$/, ' or $1');
+  const integrations = configApi.getConfig('integrations');
+  const hasGithubIntegration = integrations.has('github');
 
   return (
     <Page themeId="home">
@@ -71,12 +53,12 @@ export const ImportComponentPage = (opts: StepperProviderOpts) => {
               title="Register an existing component"
               deepLink={{
                 title: 'Learn more about the Software Catalog',
-                link:
-                  'https://backstage.io/docs/features/software-catalog/software-catalog-overview',
+                link: 'https://backstage.io/docs/features/software-catalog/software-catalog-overview',
               }}
             >
               <Typography variant="body2" paragraph>
-                Enter the URL to your SCM repository to add it to {appTitle}.
+                Enter the URL to your source code repository to add it to{' '}
+                {appTitle}.
               </Typography>
               <Typography variant="h6">
                 Link to an existing entity file
@@ -91,10 +73,11 @@ export const ImportComponentPage = (opts: StepperProviderOpts) => {
                 The wizard analyzes the file, previews the entities, and adds
                 them to the {appTitle} catalog.
               </Typography>
-              {repos.length > 0 && (
+              {hasGithubIntegration && (
                 <>
                   <Typography variant="h6">
-                    Link to a {repositoryString} repository
+                    Link to a repository{' '}
+                    <Chip label="GitHub only" variant="outlined" size="small" />
                   </Typography>
                   <Typography
                     variant="subtitle2"
diff --git a/plugins/catalog-import/src/components/ImportStepper/defaults.tsx b/plugins/catalog-import/src/components/ImportStepper/defaults.tsx
index 51524dae26..79d859ce32 100644
--- a/plugins/catalog-import/src/components/ImportStepper/defaults.tsx
+++ b/plugins/catalog-import/src/components/ImportStepper/defaults.tsx
@@ -14,6 +14,7 @@
  * limitations under the License.
  */
 
+import { ConfigApi } from '@backstage/core-plugin-api';
 import {
   Box,
   Checkbox,
@@ -25,6 +26,7 @@ import {
 } from '@material-ui/core';
 import React from 'react';
 import { BackButton } from '../Buttons';
+import { asInputRef } from '../helpers';
 import { StepFinishImportLocation } from '../StepFinishImportLocation';
 import { StepInitAnalyzeUrl } from '../StepInitAnalyzeUrl';
 import {
@@ -34,14 +36,14 @@ import {
 import { StepPrepareSelectLocations } from '../StepPrepareSelectLocations';
 import { StepReviewLocation } from '../StepReviewLocation';
 import { ImportFlows, ImportState } from '../useImportState';
-import { ConfigApi } from '@backstage/core-plugin-api';
 
 export type StepperProviderOpts = {
   pullRequest?: {
     disable?: boolean;
-    preparePullRequest?: (
-      apis: StepperApis,
-    ) => { title?: string; body?: string };
+    preparePullRequest?: (apis: StepperApis) => {
+      title?: string;
+      body?: string;
+    };
   };
 };
 
@@ -185,8 +187,8 @@ export function defaultGenerateStepper(
                 defaultBody={body}
                 renderFormFields={({
                   values,
-                  control,
-                  errors,
+                  setValue,
+                  formState,
                   groupsLoading,
                   groups,
                   register,
@@ -197,26 +199,32 @@ export function defaultGenerateStepper(
                     </Box>
 
                     <TextField
-                      name="title"
+                      {...asInputRef(
+                        register('title', {
+                          required: true,
+                        }),
+                      )}
                       label="Pull Request Title"
                       placeholder="Add Backstage catalog entity descriptor files"
                       margin="normal"
                       variant="outlined"
                       fullWidth
-                      inputRef={register({ required: true })}
-                      error={Boolean(errors.title)}
+                      error={Boolean(formState.errors.title)}
                       required
                     />
 
                     <TextField
-                      name="body"
+                      {...asInputRef(
+                        register('body', {
+                          required: true,
+                        }),
+                      )}
                       label="Pull Request Body"
                       placeholder="A describing text with Markdown support"
                       margin="normal"
                       variant="outlined"
                       fullWidth
-                      inputRef={register({ required: true })}
-                      error={Boolean(errors.body)}
+                      error={Boolean(formState.errors.body)}
                       multiline
                       required
                     />
@@ -226,22 +234,22 @@ export function defaultGenerateStepper(
                     </Box>
 
                     <TextField
-                      name="componentName"
+                      {...asInputRef(
+                        register('componentName', { required: true }),
+                      )}
                       label="Name of the created component"
                       placeholder="my-component"
                       margin="normal"
                       variant="outlined"
                       fullWidth
-                      inputRef={register({ required: true })}
-                      error={Boolean(errors.componentName)}
+                      error={Boolean(formState.errors.componentName)}
                       required
                     />
 
                     {!values.useCodeowners && (
                       <AutocompleteTextField
                         name="owner"
-                        control={control}
-                        errors={errors}
+                        errors={formState.errors}
                         options={groups || []}
                         loading={groupsLoading}
                         loadingText="Loading groups…"
@@ -259,11 +267,10 @@ export function defaultGenerateStepper(
                     <FormControlLabel
                       control={
                         <Checkbox
-                          name="useCodeowners"
-                          inputRef={register}
+                          {...asInputRef(register('useCodeowners'))}
                           onChange={(_, value) => {
                             if (value) {
-                              control.setValue('owner', '');
+                              setValue('owner', '');
                             }
                           }}
                         />
diff --git a/plugins/catalog-import/src/components/StepInitAnalyzeUrl/StepInitAnalyzeUrl.test.tsx b/plugins/catalog-import/src/components/StepInitAnalyzeUrl/StepInitAnalyzeUrl.test.tsx
index 69f58751b8..9cc9532a3d 100644
--- a/plugins/catalog-import/src/components/StepInitAnalyzeUrl/StepInitAnalyzeUrl.test.tsx
+++ b/plugins/catalog-import/src/components/StepInitAnalyzeUrl/StepInitAnalyzeUrl.test.tsx
@@ -382,7 +382,7 @@ describe('<StepInitAnalyzeUrl />', () => {
     );
 
     catalogImportApi.analyzeUrl.mockReturnValueOnce(
-      Promise.resolve(({ type: 'unknown' } as any) as AnalyzeResult),
+      Promise.resolve({ type: 'unknown' } as any as AnalyzeResult),
     );
 
     await act(async () => {
diff --git a/plugins/catalog-import/src/components/StepInitAnalyzeUrl/StepInitAnalyzeUrl.tsx b/plugins/catalog-import/src/components/StepInitAnalyzeUrl/StepInitAnalyzeUrl.tsx
index 07d0d3b9fd..75910db5a2 100644
--- a/plugins/catalog-import/src/components/StepInitAnalyzeUrl/StepInitAnalyzeUrl.tsx
+++ b/plugins/catalog-import/src/components/StepInitAnalyzeUrl/StepInitAnalyzeUrl.tsx
@@ -14,13 +14,14 @@
  * limitations under the License.
  */
 
+import { errorApiRef, useApi } from '@backstage/core-plugin-api';
 import { FormHelperText, Grid, TextField } from '@material-ui/core';
 import React, { useCallback, useState } from 'react';
 import { useForm } from 'react-hook-form';
 import { AnalyzeResult, catalogImportApiRef } from '../../api';
 import { NextButton } from '../Buttons';
+import { asInputRef } from '../helpers';
 import { ImportFlows, PrepareResult } from '../useImportState';
-import { errorApiRef, useApi } from '@backstage/core-plugin-api';
 
 type FormData = {
   url: string;
@@ -52,7 +53,12 @@ export const StepInitAnalyzeUrl = ({
   const errorApi = useApi(errorApiRef);
   const catalogImportApi = useApi(catalogImportApiRef);
 
-  const { register, handleSubmit, errors, watch } = useForm<FormData>({
+  const {
+    register,
+    handleSubmit,
+    formState: { errors },
+    watch,
+  } = useForm<FormData>({
     mode: 'onTouched',
     defaultValues: {
       url: analysisUrl,
@@ -118,24 +124,25 @@ export const StepInitAnalyzeUrl = ({
   return (
     <form onSubmit={handleSubmit(handleResult)}>
       <TextField
+        {...asInputRef(
+          register('url', {
+            required: true,
+            validate: {
+              httpsValidator: (value: any) =>
+                (typeof value === 'string' &&
+                  value.match(/^http[s]?:\/\//) !== null) ||
+                'Must start with http:// or https://.',
+            },
+          }),
+        )}
         fullWidth
         id="url"
-        name="url"
         label="Repository URL"
         placeholder="https://github.com/backstage/backstage/blob/master/catalog-info.yaml"
         helperText="Enter the full path to your entity file to start tracking your component"
         margin="normal"
         variant="outlined"
         error={Boolean(errors.url)}
-        inputRef={register({
-          required: true,
-          validate: {
-            httpsValidator: (value: any) =>
-              (typeof value === 'string' &&
-                value.match(/^http[s]?:\/\//) !== null) ||
-              'Must start with http:// or https://.',
-          },
-        })}
         required
       />
 
diff --git a/plugins/catalog-import/src/components/StepPrepareCreatePullRequest/AutocompleteTextField.tsx b/plugins/catalog-import/src/components/StepPrepareCreatePullRequest/AutocompleteTextField.tsx
index 52e11ba215..98d741df15 100644
--- a/plugins/catalog-import/src/components/StepPrepareCreatePullRequest/AutocompleteTextField.tsx
+++ b/plugins/catalog-import/src/components/StepPrepareCreatePullRequest/AutocompleteTextField.tsx
@@ -18,21 +18,15 @@ import { CircularProgress, TextField } from '@material-ui/core';
 import { TextFieldProps } from '@material-ui/core/TextField/TextField';
 import { Autocomplete } from '@material-ui/lab';
 import React from 'react';
-import {
-  Control,
-  Controller,
-  FieldErrors,
-  UseControllerOptions,
-} from 'react-hook-form';
+import { Controller, FieldErrors } from 'react-hook-form';
 
 type Props<TFieldValue extends string> = {
   name: TFieldValue;
   options: string[];
   required?: boolean;
 
-  control?: Control<Record<string, any>>;
-  errors?: FieldErrors<Record<TFieldValue, string>>;
-  rules?: UseControllerOptions<Record<TFieldValue, any>>['rules'];
+  errors?: FieldErrors;
+  rules?: React.ComponentProps<typeof Controller>['rules'];
 
   loading?: boolean;
   loadingText?: string;
@@ -47,7 +41,6 @@ export const AutocompleteTextField = <TFieldValue extends string>({
   name,
   options,
   required,
-  control,
   errors,
   rules,
   loading = false,
@@ -59,18 +52,17 @@ export const AutocompleteTextField = <TFieldValue extends string>({
   return (
     <Controller
       name={name}
-      control={control}
       rules={rules}
-      render={({ value, onChange, onBlur }) => (
+      render={({ field: { onChange } }) => (
         <Autocomplete
           loading={loading}
           loadingText={loadingText}
           options={options || []}
-          onChange={(_: any, v: string | null) => onChange(v || '')}
-          onBlur={onBlur}
-          value={value}
           autoSelect
           freeSolo
+          onChange={(_event: React.ChangeEvent<{}>, value: string | null) =>
+            onChange(value)
+          }
           renderInput={params => (
             <TextField
               {...params}
diff --git a/plugins/catalog-import/src/components/StepPrepareCreatePullRequest/PreparePullRequestForm.test.tsx b/plugins/catalog-import/src/components/StepPrepareCreatePullRequest/PreparePullRequestForm.test.tsx
index c628b7a2ed..4e18ae6544 100644
--- a/plugins/catalog-import/src/components/StepPrepareCreatePullRequest/PreparePullRequestForm.test.tsx
+++ b/plugins/catalog-import/src/components/StepPrepareCreatePullRequest/PreparePullRequestForm.test.tsx
@@ -18,6 +18,7 @@ import { FormHelperText, TextField } from '@material-ui/core';
 import { act, render } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 import React from 'react';
+import { asInputRef } from '../helpers';
 import { PreparePullRequestForm } from './PreparePullRequestForm';
 
 describe('<PreparePullRequestForm />', () => {
@@ -29,7 +30,7 @@ describe('<PreparePullRequestForm />', () => {
         defaultValues={{ main: 'default' }}
         render={({ register }) => (
           <>
-            <TextField name="main" inputRef={register()} />
+            <TextField {...asInputRef(register('main'))} />
             <button type="submit">Submit</button>{' '}
           </>
         )}
@@ -54,10 +55,9 @@ describe('<PreparePullRequestForm />', () => {
         render={({ register }) => (
           <>
             <TextField
+              {...asInputRef(register('main'))}
               id="main"
-              name="main"
               label="Main Field"
-              inputRef={register()}
             />
             <button type="submit">Submit</button>
           </>
@@ -82,14 +82,14 @@ describe('<PreparePullRequestForm />', () => {
     const { queryByText, getByRole } = render(
       <PreparePullRequestForm<{ main: string }>
         defaultValues={{}}
-        render={({ errors, register }) => (
+        render={({ formState, register }) => (
           <>
             <TextField
+              {...asInputRef(register('main', { required: true }))}
               name="main"
               required
-              inputRef={register({ required: true })}
             />
-            {errors.main && (
+            {formState.errors.main && (
               <FormHelperText error>
                 Error in required main field
               </FormHelperText>
diff --git a/plugins/catalog-import/src/components/StepPrepareCreatePullRequest/PreparePullRequestForm.tsx b/plugins/catalog-import/src/components/StepPrepareCreatePullRequest/PreparePullRequestForm.tsx
index dea3b4bac9..a1a20381f9 100644
--- a/plugins/catalog-import/src/components/StepPrepareCreatePullRequest/PreparePullRequestForm.tsx
+++ b/plugins/catalog-import/src/components/StepPrepareCreatePullRequest/PreparePullRequestForm.tsx
@@ -16,23 +16,24 @@
 
 import React from 'react';
 import {
+  FormProvider,
   SubmitHandler,
   UnpackNestedValue,
   useForm,
-  UseFormMethods,
-  UseFormOptions,
+  UseFormProps,
+  UseFormReturn,
 } from 'react-hook-form';
 
 type Props<TFieldValues extends Record<string, any>> = Pick<
-  UseFormOptions<TFieldValues>,
+  UseFormProps<TFieldValues>,
   'defaultValues'
 > & {
   onSubmit: SubmitHandler<TFieldValues>;
 
   render: (
     props: Pick<
-      UseFormMethods<TFieldValues>,
-      'errors' | 'register' | 'control'
+      UseFormReturn<TFieldValues>,
+      'formState' | 'register' | 'control' | 'setValue'
     > & {
       values: UnpackNestedValue<TFieldValues>;
     },
@@ -49,23 +50,21 @@ type Props<TFieldValues extends Record<string, any>> = Pick<
  * @param render render the form elements
  */
 export const PreparePullRequestForm = <
-  TFieldValues extends Record<string, any>
+  TFieldValues extends Record<string, any>,
 >({
   defaultValues,
   onSubmit,
   render,
 }: Props<TFieldValues>) => {
-  const {
-    handleSubmit,
-    watch,
-    control,
-    register,
-    errors,
-  } = useForm<TFieldValues>({ mode: 'onTouched', defaultValues });
+  const methods = useForm<TFieldValues>({ mode: 'onTouched', defaultValues });
+  const { handleSubmit, watch, control, register, formState, setValue } =
+    methods;
 
   return (
-    <form onSubmit={handleSubmit(onSubmit)}>
-      {render({ values: watch(), errors, register, control })}
-    </form>
+    <FormProvider {...methods}>
+      <form onSubmit={handleSubmit(onSubmit)}>
+        {render({ values: watch(), formState, register, control, setValue })}
+      </form>
+    </FormProvider>
   );
 };
diff --git a/plugins/catalog-import/src/components/StepPrepareCreatePullRequest/StepPrepareCreatePullRequest.test.tsx b/plugins/catalog-import/src/components/StepPrepareCreatePullRequest/StepPrepareCreatePullRequest.test.tsx
index d6014b329c..08b8177291 100644
--- a/plugins/catalog-import/src/components/StepPrepareCreatePullRequest/StepPrepareCreatePullRequest.test.tsx
+++ b/plugins/catalog-import/src/components/StepPrepareCreatePullRequest/StepPrepareCreatePullRequest.test.tsx
@@ -20,6 +20,7 @@ import { act, render, screen } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 import React from 'react';
 import { AnalyzeResult, catalogImportApiRef } from '../../api';
+import { asInputRef } from '../helpers';
 import {
   generateEntities,
   StepPrepareCreatePullRequest,
@@ -91,10 +92,10 @@ describe('<StepPrepareCreatePullRequest />', () => {
           renderFormFields={({ register }) => {
             return (
               <>
-                <TextField name="title" inputRef={register()} />
-                <TextField name="body" inputRef={register()} />
-                <TextField name="componentName" inputRef={register()} />
-                <TextField name="owner" inputRef={register()} />
+                <TextField {...asInputRef(register('title'))} />
+                <TextField {...asInputRef(register('body'))} />
+                <TextField {...asInputRef(register('componentName'))} />
+                <TextField {...asInputRef(register('owner'))} />
               </>
             );
           }}
@@ -132,19 +133,17 @@ describe('<StepPrepareCreatePullRequest />', () => {
           renderFormFields={({ register }) => {
             return (
               <>
-                <TextField name="title" inputRef={register()} />
-                <TextField name="body" inputRef={register()} />
+                <TextField {...asInputRef(register('title'))} />
+                <TextField {...asInputRef(register('body'))} />
                 <TextField
+                  {...asInputRef(register('componentName'))}
                   id="name"
                   label="name"
-                  name="componentName"
-                  inputRef={register()}
                 />
                 <TextField
+                  {...asInputRef(register('owner'))}
                   id="owner"
                   label="owner"
-                  name="owner"
-                  inputRef={register()}
                 />
               </>
             );
@@ -222,10 +221,10 @@ spec:
           renderFormFields={({ register }) => {
             return (
               <>
-                <TextField name="title" inputRef={register()} />
-                <TextField name="body" inputRef={register()} />
-                <TextField name="componentName" inputRef={register()} />
-                <TextField name="owner" inputRef={register()} />
+                <TextField {...asInputRef(register('title'))} />
+                <TextField {...asInputRef(register('body'))} />
+                <TextField {...asInputRef(register('componentName'))} />
+                <TextField {...asInputRef(register('owner'))} />
               </>
             );
           }}
diff --git a/plugins/catalog-import/src/components/StepPrepareCreatePullRequest/StepPrepareCreatePullRequest.tsx b/plugins/catalog-import/src/components/StepPrepareCreatePullRequest/StepPrepareCreatePullRequest.tsx
index 41db6f600c..52afcdaf83 100644
--- a/plugins/catalog-import/src/components/StepPrepareCreatePullRequest/StepPrepareCreatePullRequest.tsx
+++ b/plugins/catalog-import/src/components/StepPrepareCreatePullRequest/StepPrepareCreatePullRequest.tsx
@@ -15,6 +15,7 @@
  */
 
 import { Entity } from '@backstage/catalog-model';
+import { useApi } from '@backstage/core-plugin-api';
 import {
   catalogApiRef,
   formatEntityRefTitle,
@@ -22,7 +23,7 @@ import {
 import { Box, FormHelperText, Grid, Typography } from '@material-ui/core';
 import { makeStyles } from '@material-ui/core/styles';
 import React, { useCallback, useState } from 'react';
-import { UnpackNestedValue, UseFormMethods } from 'react-hook-form';
+import { UnpackNestedValue, UseFormReturn } from 'react-hook-form';
 import { useAsync } from 'react-use';
 import YAML from 'yaml';
 import { AnalyzeResult, catalogImportApiRef } from '../../api';
@@ -32,7 +33,6 @@ import { PrepareResult } from '../useImportState';
 import { PreparePullRequestForm } from './PreparePullRequestForm';
 import { PreviewCatalogInfoComponent } from './PreviewCatalogInfoComponent';
 import { PreviewPullRequestComponent } from './PreviewPullRequestComponent';
-import { useApi } from '@backstage/core-plugin-api';
 
 const useStyles = makeStyles(theme => ({
   previewCard: {
@@ -63,7 +63,10 @@ type Props = {
   defaultBody: string;
 
   renderFormFields: (
-    props: Pick<UseFormMethods<FormData>, 'errors' | 'register' | 'control'> & {
+    props: Pick<
+      UseFormReturn<FormData>,
+      'register' | 'setValue' | 'formState'
+    > & {
       values: UnpackNestedValue<FormData>;
       groups: string[];
       groupsLoading: boolean;
@@ -192,13 +195,13 @@ export const StepPrepareCreatePullRequest = ({
             analyzeResult.generatedEntities[0]?.metadata?.name || '',
           useCodeowners: false,
         }}
-        render={({ values, errors, control, register }) => (
+        render={({ values, formState, register, setValue }) => (
           <>
             {renderFormFields({
               values,
-              errors,
+              formState,
               register,
-              control,
+              setValue,
               groups: groups ?? [],
               groupsLoading,
             })}
@@ -241,7 +244,11 @@ export const StepPrepareCreatePullRequest = ({
               )}
               <NextButton
                 type="submit"
-                disabled={Boolean(errors.title || errors.body || errors.owner)}
+                disabled={Boolean(
+                  formState.errors.title ||
+                    formState.errors.body ||
+                    formState.errors.owner,
+                )}
                 loading={submitted}
               >
                 Create PR
diff --git a/plugins/catalog-import/src/components/StepPrepareSelectLocations/StepPrepareSelectLocations.test.tsx b/plugins/catalog-import/src/components/StepPrepareSelectLocations/StepPrepareSelectLocations.test.tsx
index 273b41d82d..eb1d95e14d 100644
--- a/plugins/catalog-import/src/components/StepPrepareSelectLocations/StepPrepareSelectLocations.test.tsx
+++ b/plugins/catalog-import/src/components/StepPrepareSelectLocations/StepPrepareSelectLocations.test.tsx
@@ -14,7 +14,8 @@
  * limitations under the License.
  */
 
-import { act, render } from '@testing-library/react';
+import { renderInTestApp } from '@backstage/test-utils';
+import { act } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 import React from 'react';
 import { AnalyzeResult } from '../../api';
@@ -57,7 +58,7 @@ describe('<StepPrepareSelectLocations />', () => {
   });
 
   it('renders without exploding', async () => {
-    const { getByRole } = render(
+    const { getByRole } = await renderInTestApp(
       <StepPrepareSelectLocations
         analyzeResult={analyzeResult}
         onPrepare={() => undefined}
@@ -69,7 +70,7 @@ describe('<StepPrepareSelectLocations />', () => {
   });
 
   it('should select and deselect all', async () => {
-    const { getByRole, getAllByRole } = render(
+    const { getByRole, getAllByRole } = await renderInTestApp(
       <StepPrepareSelectLocations
         analyzeResult={analyzeResult}
         onPrepare={() => undefined}
@@ -97,7 +98,7 @@ describe('<StepPrepareSelectLocations />', () => {
   });
 
   it('should preselect prepared locations', async () => {
-    const { getAllByRole } = render(
+    const { getAllByRole } = await renderInTestApp(
       <StepPrepareSelectLocations
         analyzeResult={analyzeResult}
         prepareResult={{
@@ -117,7 +118,7 @@ describe('<StepPrepareSelectLocations />', () => {
   });
 
   it('should select items', async () => {
-    const { getAllByRole } = render(
+    const { getAllByRole } = await renderInTestApp(
       <StepPrepareSelectLocations
         analyzeResult={analyzeResult}
         onPrepare={() => undefined}
@@ -146,7 +147,7 @@ describe('<StepPrepareSelectLocations />', () => {
   it('should go back', async () => {
     const onGoBack = jest.fn();
 
-    const { getByRole } = render(
+    const { getByRole } = await renderInTestApp(
       <StepPrepareSelectLocations
         analyzeResult={analyzeResult}
         onPrepare={() => undefined}
@@ -164,7 +165,7 @@ describe('<StepPrepareSelectLocations />', () => {
   it('should submit', async () => {
     const onPrepare = jest.fn();
 
-    const { getAllByRole, getByRole } = render(
+    const { getAllByRole, getByRole } = await renderInTestApp(
       <StepPrepareSelectLocations
         analyzeResult={analyzeResult}
         onPrepare={onPrepare}
diff --git a/plugins/catalog-import/src/components/helpers.ts b/plugins/catalog-import/src/components/helpers.ts
new file mode 100644
index 0000000000..4240186459
--- /dev/null
+++ b/plugins/catalog-import/src/components/helpers.ts
@@ -0,0 +1,33 @@
+/*
+ * Copyright 2021 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { UseFormRegisterReturn } from 'react-hook-form';
+
+/**
+ * A helper that converts the result of a render('name', opts) to make it compatible with material-ui.
+ *
+ * See also https://github.com/react-hook-form/react-hook-form/issues/4629#issuecomment-815840872
+ * TODO: remove when updating to material-ui v5 (https://github.com/mui-org/material-ui/pull/23174)
+ *
+ * @param renderResult - the result of a render('name', opts)
+ */
+export function asInputRef(renderResult: UseFormRegisterReturn) {
+  const { ref, ...rest } = renderResult;
+  return {
+    inputRef: ref,
+    ...rest,
+  };
+}
diff --git a/plugins/catalog-react/CHANGELOG.md b/plugins/catalog-react/CHANGELOG.md
index bffefc4936..be858aac38 100644
--- a/plugins/catalog-react/CHANGELOG.md
+++ b/plugins/catalog-react/CHANGELOG.md
@@ -1,5 +1,144 @@
 # @backstage/plugin-catalog-react
 
+## 0.4.5
+
+### Patch Changes
+
+- 3ed78fca3: Added a `useEntityKinds` hook to load a unique list of entity kinds from the catalog.
+  Fixed a bug in `EntityTypePicker` where the component did not hide when no types were available in returned entities.
+- Updated dependencies
+  - @backstage/integration@0.6.3
+  - @backstage/core-components@0.4.0
+  - @backstage/catalog-model@0.9.1
+  - @backstage/core-app-api@0.1.11
+
+## 0.4.4
+
+### Patch Changes
+
+- 5a1eb6bfc: Memoize the context value in `EntityListProvider`.
+
+  This removes quite a few unnecessary rerenders of the inner components.
+
+  When running the full `CatalogPage` test:
+
+  - Before: 98 table render calls total, 16 seconds runtime
+  - After: 57 table render calls total, 14 seconds runtime
+
+  This doesn't account for all of the slowness, but does give a minor difference in perceived speed in the browser too.
+
+- d39e7d141: Use the history API directly in `useEntityListProvider`.
+
+  This replaces `useSearchParams`/`useNavigate`, since they cause at least one additional re-render compared to using this method.
+
+  Table re-render count is down additionally:
+
+  - Initial render of catalog page: 12 -> 9
+  - Full `CatalogPage` test: 57 -> 48
+
+- Updated dependencies
+  - @backstage/core-app-api@0.1.10
+  - @backstage/core-components@0.3.3
+  - @backstage/integration@0.6.2
+
+## 0.4.3
+
+### Patch Changes
+
+- 3bc009287: Clarified messaging around configured locations in the `UnregisterEntityDialog`.
+- 2105d608f: Migrate and export `UnregisterEntityDialog` component from `catalog-react` package
+- Updated dependencies
+  - @backstage/core-app-api@0.1.9
+  - @backstage/core-components@0.3.2
+  - @backstage/integration@0.6.1
+
+## 0.4.2
+
+### Patch Changes
+
+- 56c773909: Switched `@types/react` dependency to request `*` rather than a specific version.
+- a440d3b38: Move and rename `FavoriteEntity` component to `catalog-react`
+- Updated dependencies
+  - @backstage/integration@0.6.0
+  - @backstage/core-app-api@0.1.8
+  - @backstage/core-components@0.3.1
+  - @backstage/core-plugin-api@0.1.6
+
+## 0.4.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.3.0
+  - @backstage/core-plugin-api@0.1.5
+  - @backstage/integration@0.5.9
+  - @backstage/core-app-api@0.1.7
+
+## 0.4.0
+
+### Minor Changes
+
+- c5cb55803: Introduce the `useEntityOwnership` hook, which implements the full new ownership model.
+
+  This also means a breaking change to the interface of `UserListFilter`. It no longer
+  accepts a user entity as input, but rather a function that checks ownership of an
+  entity. This function is taken from the above mentioned hook output. So if you are
+  instantiating the filter yourself, you will change from something like
+
+  ```ts
+  const { entity } = useOwnUser();
+  const filter = new UserListFilter('owned', user, ...);
+  ```
+
+  to
+
+  ```ts
+  const { isOwnedEntity } = useEntityOwnership();
+  const filter = new UserListFilter('owned', isOwnedEntity, ...);
+  ```
+
+### Patch Changes
+
+- 19d9995b6: Improve accessibility of core & catalog components by adjusting them with non-breaking changes.
+- 11c370af2: Export `CATALOG_FILTER_EXISTS` symbol
+- 9d40fcb1e: - Bumping `material-ui/core` version to at least `4.12.2` as they made some breaking changes in later versions which broke `Pagination` of the `Table`.
+  - Switching out `material-table` to `@material-table/core` for support for the later versions of `material-ui/core`
+  - This causes a minor API change to `@backstage/core-components` as the interface for `Table` re-exports the `prop` from the underlying `Table` components.
+  - `onChangeRowsPerPage` has been renamed to `onRowsPerPageChange`
+  - `onChangePage` has been renamed to `onPageChange`
+  - Migration guide is here: https://material-table-core.com/docs/breaking-changes
+- 043a4238f: Fix `EntityListProvider` to not update url if unmounted
+- Updated dependencies
+  - @backstage/core-components@0.2.0
+  - @backstage/core-app-api@0.1.6
+  - @backstage/core-plugin-api@0.1.4
+  - @backstage/catalog-client@0.3.18
+
+## 0.3.1
+
+### Patch Changes
+
+- 221d7d060: added retry callback to useEntity hook
+- Updated dependencies
+  - @backstage/core-components@0.1.6
+  - @backstage/catalog-client@0.3.17
+  - @backstage/core-app-api@0.1.5
+
+## 0.3.0
+
+### Minor Changes
+
+- 976b61080: Updated the software templates list page (`ScaffolderPage`) to use the `useEntityListProvider` hook from #5643. This reduces the code footprint, making it easier to customize the display of this page, and consolidates duplicate approaches to querying the catalog with filters.
+
+  - The `useEntityTypeFilter` hook has been updated along with the underlying `EntityTypeFilter` to work with multiple values, to allow more flexibility for different user interfaces. It's unlikely that this change affects you; however, if you're using either of these directly, you'll need to update your usage.
+  - `SearchToolbar` was renamed to `EntitySearchBar` and moved to `catalog-react` to be usable by other entity list pages
+  - `UserListPicker` now has an `availableTypes` prop to restrict which user-related options to present
+
+### Patch Changes
+
+- d84778c25: Store filter values set in `EntityListProvider` in query parameters. This allows selected filters to be restored when returning to pages that list catalog entities.
+- e13f0fb9d: Fix `EntityTypeFilter` so it produces unique case-insensitive set of available types
+
 ## 0.2.6
 
 ### Patch Changes
diff --git a/plugins/catalog-react/api-report.md b/plugins/catalog-react/api-report.md
index 4cc6a017aa..5f65426ed3 100644
--- a/plugins/catalog-react/api-report.md
+++ b/plugins/catalog-react/api-report.md
@@ -7,11 +7,14 @@
 
 import { ApiRef } from '@backstage/core-plugin-api';
 import { AsyncState } from 'react-use/lib/useAsync';
+import { CATALOG_FILTER_EXISTS } from '@backstage/catalog-client';
 import { CatalogApi } from '@backstage/catalog-client';
 import { ComponentEntity } from '@backstage/catalog-model';
+import { ComponentProps } from 'react';
 import { Context } from 'react';
 import { Entity } from '@backstage/catalog-model';
 import { EntityName } from '@backstage/catalog-model';
+import { IconButton } from '@material-ui/core';
 import { LinkProps } from '@backstage/core-components';
 import { PropsWithChildren } from 'react';
 import { default as React_2 } from 'react';
@@ -22,17 +25,27 @@ import { SystemEntity } from '@backstage/catalog-model';
 import { TableColumn } from '@backstage/core-components';
 import { UserEntity } from '@backstage/catalog-model';
 
+export { CATALOG_FILTER_EXISTS };
+
 export { CatalogApi };
 
+// Warning: (ae-missing-release-tag) "catalogApiRef" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export const catalogApiRef: ApiRef<CatalogApi>;
 
+// Warning: (ae-missing-release-tag) "catalogRouteRef" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export const catalogRouteRef: RouteRef<undefined>;
 
+// Warning: (ae-missing-release-tag) "createDomainColumn" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 function createDomainColumn<T extends Entity>(): TableColumn<T>;
 
+// Warning: (ae-missing-release-tag) "createEntityRefColumn" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 function createEntityRefColumn<T extends Entity>({
   defaultKind,
@@ -40,6 +53,8 @@ function createEntityRefColumn<T extends Entity>({
   defaultKind?: string;
 }): TableColumn<T>;
 
+// Warning: (ae-missing-release-tag) "createEntityRelationColumn" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 function createEntityRelationColumn<T extends Entity>({
   title,
@@ -55,21 +70,33 @@ function createEntityRelationColumn<T extends Entity>({
   };
 }): TableColumn<T>;
 
+// Warning: (ae-missing-release-tag) "createMetadataDescriptionColumn" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 function createMetadataDescriptionColumn<T extends Entity>(): TableColumn<T>;
 
+// Warning: (ae-missing-release-tag) "createOwnerColumn" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 function createOwnerColumn<T extends Entity>(): TableColumn<T>;
 
+// Warning: (ae-missing-release-tag) "createSpecLifecycleColumn" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 function createSpecLifecycleColumn<T extends Entity>(): TableColumn<T>;
 
+// Warning: (ae-missing-release-tag) "createSpecTypeColumn" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 function createSpecTypeColumn<T extends Entity>(): TableColumn<T>;
 
+// Warning: (ae-missing-release-tag) "createSystemColumn" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 function createSystemColumn<T extends Entity>(): TableColumn<T>;
 
+// Warning: (ae-missing-release-tag) "DefaultEntityFilters" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export type DefaultEntityFilters = {
   kind?: EntityKindFilter;
@@ -81,16 +108,26 @@ export type DefaultEntityFilters = {
   text?: EntityTextFilter;
 };
 
+// Warning: (ae-forgotten-export) The symbol "EntityLoadingStatus" needs to be exported by the entry point index.d.ts
+// Warning: (ae-missing-release-tag) "EntityContext" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export const EntityContext: Context<EntityLoadingStatus>;
 
+// Warning: (ae-missing-release-tag) "EntityFilter" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export type EntityFilter = {
-  getCatalogFilters?: () => Record<string, string | string[]>;
+  getCatalogFilters?: () => Record<
+    string,
+    string | symbol | (string | symbol)[]
+  >;
   filterEntity?: (entity: Entity) => boolean;
   toQueryValue?: () => string | string[];
 };
 
+// Warning: (ae-missing-release-tag) "EntityKindFilter" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export class EntityKindFilter implements EntityFilter {
   constructor(value: string);
@@ -102,12 +139,17 @@ export class EntityKindFilter implements EntityFilter {
   readonly value: string;
 }
 
+// Warning: (ae-forgotten-export) The symbol "EntityKindFilterProps" needs to be exported by the entry point index.d.ts
+// Warning: (ae-missing-release-tag) "EntityKindPicker" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export const EntityKindPicker: ({
   initialFilter,
   hidden,
 }: EntityKindFilterProps) => JSX.Element | null;
 
+// Warning: (ae-missing-release-tag) "EntityLifecycleFilter" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export class EntityLifecycleFilter implements EntityFilter {
   constructor(values: string[]);
@@ -119,19 +161,28 @@ export class EntityLifecycleFilter implements EntityFilter {
   readonly values: string[];
 }
 
+// Warning: (ae-missing-release-tag) "EntityLifecyclePicker" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export const EntityLifecyclePicker: () => JSX.Element | null;
 
+// Warning: (ae-forgotten-export) The symbol "EntityListContextProps" needs to be exported by the entry point index.d.ts
+// Warning: (ae-missing-release-tag) "EntityListContext" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export const EntityListContext: React_2.Context<
   EntityListContextProps<any> | undefined
 >;
 
+// Warning: (ae-missing-release-tag) "EntityListProvider" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export const EntityListProvider: <EntityFilters extends DefaultEntityFilters>({
   children,
 }: PropsWithChildren<{}>) => JSX.Element;
 
+// Warning: (ae-missing-release-tag) "EntityOwnerFilter" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export class EntityOwnerFilter implements EntityFilter {
   constructor(values: string[]);
@@ -143,15 +194,23 @@ export class EntityOwnerFilter implements EntityFilter {
   readonly values: string[];
 }
 
+// Warning: (ae-missing-release-tag) "EntityOwnerPicker" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export const EntityOwnerPicker: () => JSX.Element | null;
 
+// Warning: (ae-forgotten-export) The symbol "EntityProviderProps" needs to be exported by the entry point index.d.ts
+// Warning: (ae-missing-release-tag) "EntityProvider" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export const EntityProvider: ({
   entity,
   children,
 }: EntityProviderProps) => JSX.Element;
 
+// Warning: (ae-forgotten-export) The symbol "EntityRefLinkProps" needs to be exported by the entry point index.d.ts
+// Warning: (ae-missing-release-tag) "EntityRefLink" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export const EntityRefLink: React_2.ForwardRefExoticComponent<
   Pick<
@@ -440,6 +499,9 @@ export const EntityRefLink: React_2.ForwardRefExoticComponent<
     React_2.RefAttributes<any>
 >;
 
+// Warning: (ae-forgotten-export) The symbol "EntityRefLinksProps" needs to be exported by the entry point index.d.ts
+// Warning: (ae-missing-release-tag) "EntityRefLinks" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export const EntityRefLinks: ({
   entityRefs,
@@ -447,6 +509,8 @@ export const EntityRefLinks: ({
   ...linkProps
 }: EntityRefLinksProps) => JSX.Element;
 
+// Warning: (ae-missing-release-tag) "entityRoute" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export const entityRoute: RouteRef<{
   name: string;
@@ -454,15 +518,17 @@ export const entityRoute: RouteRef<{
   namespace: string;
 }>;
 
+// Warning: (ae-missing-release-tag) "entityRouteParams" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
-export function entityRouteParams(
-  entity: Entity,
-): {
+export function entityRouteParams(entity: Entity): {
   readonly kind: string;
   readonly namespace: string;
   readonly name: string;
 };
 
+// Warning: (ae-missing-release-tag) "entityRouteRef" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export const entityRouteRef: RouteRef<{
   name: string;
@@ -470,15 +536,23 @@ export const entityRouteRef: RouteRef<{
   namespace: string;
 }>;
 
+// Warning: (ae-missing-release-tag) "EntitySearchBar" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export const EntitySearchBar: () => JSX.Element;
 
+// Warning: (ae-missing-release-tag) "EntitySourceLocation" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export type EntitySourceLocation = {
   locationTargetUrl: string;
   integrationType?: string;
 };
 
+// Warning: (ae-forgotten-export) The symbol "Props" needs to be exported by the entry point index.d.ts
+// Warning: (ae-missing-release-tag) "EntityTable" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+// Warning: (ae-missing-release-tag) "EntityTable" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export function EntityTable<T extends Entity>({
   entities,
@@ -490,7 +564,9 @@ export function EntityTable<T extends Entity>({
 
 // @public (undocumented)
 export namespace EntityTable {
-  var // (undocumented)
+  var // Warning: (ae-forgotten-export) The symbol "columnFactories" needs to be exported by the entry point index.d.ts
+    //
+    // (undocumented)
     columns: typeof columnFactories;
   var // (undocumented)
     systemEntityColumns: TableColumn<SystemEntity>[];
@@ -498,6 +574,8 @@ export namespace EntityTable {
     componentEntityColumns: TableColumn<ComponentEntity>[];
 }
 
+// Warning: (ae-missing-release-tag) "EntityTagFilter" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export class EntityTagFilter implements EntityFilter {
   constructor(values: string[]);
@@ -509,9 +587,13 @@ export class EntityTagFilter implements EntityFilter {
   readonly values: string[];
 }
 
+// Warning: (ae-missing-release-tag) "EntityTagPicker" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export const EntityTagPicker: () => JSX.Element | null;
 
+// Warning: (ae-missing-release-tag) "EntityTextFilter" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export class EntityTextFilter implements EntityFilter {
   constructor(value: string);
@@ -521,6 +603,8 @@ export class EntityTextFilter implements EntityFilter {
   readonly value: string;
 }
 
+// Warning: (ae-missing-release-tag) "EntityTypeFilter" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export class EntityTypeFilter implements EntityFilter {
   constructor(value: string | string[]);
@@ -534,9 +618,32 @@ export class EntityTypeFilter implements EntityFilter {
   readonly value: string | string[];
 }
 
+// Warning: (ae-missing-release-tag) "EntityTypePicker" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export const EntityTypePicker: () => JSX.Element | null;
 
+// Warning: (tsdoc-param-tag-missing-hyphen) The @param block should be followed by a parameter name and then a hyphen
+// Warning: (ae-forgotten-export) The symbol "Props" needs to be exported by the entry point index.d.ts
+// Warning: (ae-missing-release-tag) "FavoriteEntity" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
+// @public
+export const FavoriteEntity: (props: Props_2) => JSX.Element;
+
+// Warning: (ae-missing-release-tag) "favoriteEntityIcon" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
+// @public (undocumented)
+export const favoriteEntityIcon: (isStarred: boolean) => JSX.Element;
+
+// Warning: (ae-missing-release-tag) "favoriteEntityTooltip" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
+// @public (undocumented)
+export const favoriteEntityTooltip: (
+  isStarred: boolean,
+) => 'Remove from favorites' | 'Add to favorites';
+
+// Warning: (ae-missing-release-tag) "formatEntityRefTitle" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export function formatEntityRefTitle(
   entityRef: Entity | EntityName,
@@ -545,12 +652,18 @@ export function formatEntityRefTitle(
   },
 ): string;
 
+// Warning: (ae-missing-release-tag) "getEntityMetadataEditUrl" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export function getEntityMetadataEditUrl(entity: Entity): string | undefined;
 
+// Warning: (ae-missing-release-tag) "getEntityMetadataViewUrl" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export function getEntityMetadataViewUrl(entity: Entity): string | undefined;
 
+// Warning: (ae-missing-release-tag) "getEntityRelations" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public
 export function getEntityRelations(
   entity: Entity | undefined,
@@ -560,43 +673,71 @@ export function getEntityRelations(
   },
 ): EntityName[];
 
+// Warning: (ae-missing-release-tag) "getEntitySourceLocation" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export function getEntitySourceLocation(
   entity: Entity,
   scmIntegrationsApi: ScmIntegrationRegistry,
 ): EntitySourceLocation | undefined;
 
+// Warning: (ae-missing-release-tag) "isOwnerOf" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public
 export function isOwnerOf(owner: Entity, owned: Entity): boolean;
 
+// Warning: (ae-missing-release-tag) "MockEntityListContextProvider" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export const MockEntityListContextProvider: ({
   children,
   value,
 }: React_2.PropsWithChildren<{
-  value: Partial<EntityListContextProps>;
+  value?: Partial<EntityListContextProps<DefaultEntityFilters>> | undefined;
 }>) => JSX.Element;
 
+// Warning: (ae-missing-release-tag) "reduceCatalogFilters" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export function reduceCatalogFilters(
   filters: EntityFilter[],
-): Record<string, string | string[]>;
+): Record<string, string | symbol | (string | symbol)[]>;
 
+// Warning: (ae-missing-release-tag) "reduceEntityFilters" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export function reduceEntityFilters(
   filters: EntityFilter[],
 ): (entity: Entity) => boolean;
 
+// Warning: (ae-missing-release-tag) "rootRoute" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export const rootRoute: RouteRef<undefined>;
 
+// Warning: (ae-forgotten-export) The symbol "Props" needs to be exported by the entry point index.d.ts
+// Warning: (ae-missing-release-tag) "UnregisterEntityDialog" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
+// @public (undocumented)
+export const UnregisterEntityDialog: ({
+  open,
+  onConfirm,
+  onClose,
+  entity,
+}: Props_3) => JSX.Element;
+
+// Warning: (ae-missing-release-tag) "useEntity" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public
 export function useEntity<T extends Entity = Entity>(): {
   entity: T;
   loading: boolean;
   error: Error | undefined;
+  refresh: VoidFunction | undefined;
 };
 
+// Warning: (ae-missing-release-tag) "useEntityCompoundName" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public
 export const useEntityCompoundName: () => {
   kind: string;
@@ -604,20 +745,48 @@ export const useEntityCompoundName: () => {
   name: string;
 };
 
+// Warning: (ae-missing-release-tag) "useEntityFromUrl" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export const useEntityFromUrl: () => EntityLoadingStatus;
 
+// Warning: (ae-missing-release-tag) "useEntityKinds" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
+// @public (undocumented)
+export function useEntityKinds(): {
+  error: Error | undefined;
+  loading: boolean;
+  kinds: string[] | undefined;
+};
+
+// Warning: (ae-missing-release-tag) "useEntityListProvider" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export function useEntityListProvider<
-  EntityFilters extends DefaultEntityFilters = DefaultEntityFilters
+  EntityFilters extends DefaultEntityFilters = DefaultEntityFilters,
 >(): EntityListContextProps<EntityFilters>;
 
+// Warning: (ae-missing-release-tag) "useEntityOwnership" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
+// @public
+export function useEntityOwnership(): {
+  loading: boolean;
+  isOwnedEntity: (entity: Entity | EntityName) => boolean;
+};
+
+// Warning: (ae-forgotten-export) The symbol "EntityTypeReturn" needs to be exported by the entry point index.d.ts
+// Warning: (ae-missing-release-tag) "useEntityTypeFilter" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public
 export function useEntityTypeFilter(): EntityTypeReturn;
 
+// Warning: (ae-missing-release-tag) "useOwnUser" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public
 export function useOwnUser(): AsyncState<UserEntity | undefined>;
 
+// Warning: (ae-missing-release-tag) "useRelatedEntities" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export function useRelatedEntities(
   entity: Entity,
@@ -634,34 +803,43 @@ export function useRelatedEntities(
   error: Error | undefined;
 };
 
+// Warning: (ae-missing-release-tag) "UserListFilter" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export class UserListFilter implements EntityFilter {
   constructor(
     value: UserListFilterKind,
-    user: UserEntity | undefined,
+    isOwnedEntity: (entity: Entity) => boolean,
     isStarredEntity: (entity: Entity) => boolean,
   );
   // (undocumented)
   filterEntity(entity: Entity): boolean;
   // (undocumented)
+  readonly isOwnedEntity: (entity: Entity) => boolean;
+  // (undocumented)
   readonly isStarredEntity: (entity: Entity) => boolean;
   // (undocumented)
   toQueryValue(): string;
   // (undocumented)
-  readonly user: UserEntity | undefined;
-  // (undocumented)
   readonly value: UserListFilterKind;
 }
 
+// Warning: (ae-missing-release-tag) "UserListFilterKind" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export type UserListFilterKind = 'owned' | 'starred' | 'all';
 
+// Warning: (ae-forgotten-export) The symbol "UserListPickerProps" needs to be exported by the entry point index.d.ts
+// Warning: (ae-missing-release-tag) "UserListPicker" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export const UserListPicker: ({
   initialFilter,
   availableFilters,
 }: UserListPickerProps) => JSX.Element;
 
+// Warning: (ae-missing-release-tag) "useStarredEntities" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export const useStarredEntities: () => {
   starredEntities: Set<string>;
@@ -669,5 +847,16 @@ export const useStarredEntities: () => {
   isStarredEntity: (entity: Entity) => boolean;
 };
 
+// Warnings were encountered during analysis:
+//
+// src/types.d.ts:6:49 - (tsdoc-escape-right-brace) The "}" character should be escaped using a backslash to avoid confusion with a TSDoc inline tag
+// src/types.d.ts:6:10 - (tsdoc-malformed-inline-tag) Expecting a TSDoc tag starting with "{@"
+// src/types.d.ts:7:75 - (tsdoc-escape-right-brace) The "}" character should be escaped using a backslash to avoid confusion with a TSDoc inline tag
+// src/types.d.ts:7:10 - (tsdoc-malformed-inline-tag) Expecting a TSDoc tag starting with "{@"
+// src/types.d.ts:15:8 - (tsdoc-param-tag-missing-hyphen) The @param block should be followed by a parameter name and then a hyphen
+// src/types.d.ts:16:8 - (tsdoc-param-tag-missing-hyphen) The @param block should be followed by a parameter name and then a hyphen
+// src/types.d.ts:22:68 - (tsdoc-escape-greater-than) The ">" character should be escaped using a backslash to avoid confusion with an HTML tag
+// src/types.d.ts:22:88 - (tsdoc-escape-greater-than) The ">" character should be escaped using a backslash to avoid confusion with an HTML tag
+
 // (No @packageDocumentation comment for this package)
 ```
diff --git a/plugins/catalog-react/package.json b/plugins/catalog-react/package.json
index c65e06df29..3d9aed01c5 100644
--- a/plugins/catalog-react/package.json
+++ b/plugins/catalog-react/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-catalog-react",
-  "version": "0.2.6",
+  "version": "0.4.5",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -28,16 +28,17 @@
     "clean": "backstage-cli clean"
   },
   "dependencies": {
-    "@backstage/catalog-client": "^0.3.16",
-    "@backstage/catalog-model": "^0.9.0",
-    "@backstage/core-app-api": "^0.1.4",
-    "@backstage/core-components": "^0.1.5",
-    "@backstage/core-plugin-api": "^0.1.3",
-    "@backstage/integration": "^0.5.8",
-    "@material-ui/core": "^4.11.0",
+    "@backstage/catalog-client": "^0.3.18",
+    "@backstage/catalog-model": "^0.9.1",
+    "@backstage/core-app-api": "^0.1.11",
+    "@backstage/core-components": "^0.4.0",
+    "@backstage/core-plugin-api": "^0.1.6",
+    "@backstage/integration": "^0.6.3",
+    "@material-ui/core": "^4.12.2",
     "@material-ui/icons": "^4.9.1",
     "@material-ui/lab": "4.0.0-alpha.45",
-    "@types/react": "^16.9",
+    "@types/react": "*",
+    "jwt-decode": "^3.1.0",
     "lodash": "^4.17.15",
     "qs": "^6.9.4",
     "react": "^16.13.1",
@@ -46,14 +47,15 @@
     "react-use": "^17.2.4"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.7.3",
-    "@backstage/dev-utils": "^0.2.1",
-    "@backstage/test-utils": "^0.1.14",
+    "@backstage/cli": "^0.7.10",
+    "@backstage/dev-utils": "^0.2.8",
+    "@backstage/test-utils": "^0.1.17",
     "@testing-library/jest-dom": "^5.10.1",
     "@testing-library/react": "^11.2.5",
     "@testing-library/react-hooks": "^3.3.0",
     "@testing-library/user-event": "^13.1.8",
     "@types/jest": "^26.0.7",
+    "@types/jwt-decode": "^3.1.0",
     "@types/node": "^14.14.32",
     "cross-fetch": "^3.0.6",
     "msw": "^0.29.0",
diff --git a/plugins/catalog-react/src/components/EntityLifecyclePicker/EntityLifecyclePicker.tsx b/plugins/catalog-react/src/components/EntityLifecyclePicker/EntityLifecyclePicker.tsx
index 9a899e161d..398f619f3f 100644
--- a/plugins/catalog-react/src/components/EntityLifecyclePicker/EntityLifecyclePicker.tsx
+++ b/plugins/catalog-react/src/components/EntityLifecyclePicker/EntityLifecyclePicker.tsx
@@ -34,12 +34,8 @@ const icon = <CheckBoxOutlineBlankIcon fontSize="small" />;
 const checkedIcon = <CheckBoxIcon fontSize="small" />;
 
 export const EntityLifecyclePicker = () => {
-  const {
-    updateFilters,
-    backendEntities,
-    filters,
-    queryParameters,
-  } = useEntityListProvider();
+  const { updateFilters, backendEntities, filters, queryParameters } =
+    useEntityListProvider();
 
   const queryParamLifecycles = [queryParameters.lifecycles]
     .flat()
@@ -76,6 +72,7 @@ export const EntityLifecyclePicker = () => {
     <Box pb={1} pt={1}>
       <Typography variant="button">Lifecycle</Typography>
       <Autocomplete<string>
+        aria-label="Lifecycle"
         multiple
         options={availableLifecycles}
         value={selectedLifecycles}
diff --git a/plugins/catalog-react/src/components/EntityOwnerPicker/EntityOwnerPicker.tsx b/plugins/catalog-react/src/components/EntityOwnerPicker/EntityOwnerPicker.tsx
index 90d94e32b5..896cbc926b 100644
--- a/plugins/catalog-react/src/components/EntityOwnerPicker/EntityOwnerPicker.tsx
+++ b/plugins/catalog-react/src/components/EntityOwnerPicker/EntityOwnerPicker.tsx
@@ -36,12 +36,8 @@ const icon = <CheckBoxOutlineBlankIcon fontSize="small" />;
 const checkedIcon = <CheckBoxIcon fontSize="small" />;
 
 export const EntityOwnerPicker = () => {
-  const {
-    updateFilters,
-    backendEntities,
-    filters,
-    queryParameters,
-  } = useEntityListProvider();
+  const { updateFilters, backendEntities, filters, queryParameters } =
+    useEntityListProvider();
 
   const queryParamOwners = [queryParameters.owners]
     .flat()
@@ -81,6 +77,7 @@ export const EntityOwnerPicker = () => {
       <Typography variant="button">Owner</Typography>
       <Autocomplete<string>
         multiple
+        aria-label="Owner"
         options={availableOwners}
         value={selectedOwners}
         onChange={(_: object, value: string[]) => setSelectedOwners(value)}
diff --git a/plugins/catalog-react/src/components/EntityTable/columns.tsx b/plugins/catalog-react/src/components/EntityTable/columns.tsx
index 37b1c383c7..27bf8854b6 100644
--- a/plugins/catalog-react/src/components/EntityTable/columns.tsx
+++ b/plugins/catalog-react/src/components/EntityTable/columns.tsx
@@ -134,7 +134,7 @@ export function createSystemColumn<T extends Entity>(): TableColumn<T> {
 }
 
 export function createMetadataDescriptionColumn<
-  T extends Entity
+  T extends Entity,
 >(): TableColumn<T> {
   return {
     title: 'Description',
diff --git a/plugins/catalog-react/src/components/EntityTagPicker/EntityTagPicker.tsx b/plugins/catalog-react/src/components/EntityTagPicker/EntityTagPicker.tsx
index b7fa8f1186..78a2911946 100644
--- a/plugins/catalog-react/src/components/EntityTagPicker/EntityTagPicker.tsx
+++ b/plugins/catalog-react/src/components/EntityTagPicker/EntityTagPicker.tsx
@@ -34,12 +34,8 @@ const icon = <CheckBoxOutlineBlankIcon fontSize="small" />;
 const checkedIcon = <CheckBoxIcon fontSize="small" />;
 
 export const EntityTagPicker = () => {
-  const {
-    updateFilters,
-    backendEntities,
-    filters,
-    queryParameters,
-  } = useEntityListProvider();
+  const { updateFilters, backendEntities, filters, queryParameters } =
+    useEntityListProvider();
 
   const queryParamTags = [queryParameters.tags]
     .flat()
@@ -73,6 +69,7 @@ export const EntityTagPicker = () => {
       <Typography variant="button">Tags</Typography>
       <Autocomplete<string>
         multiple
+        aria-label="Tags"
         options={availableTags}
         value={selectedTags}
         onChange={(_: object, value: string[]) => setSelectedTags(value)}
diff --git a/plugins/catalog-react/src/components/EntityTypePicker/EntityTypePicker.test.tsx b/plugins/catalog-react/src/components/EntityTypePicker/EntityTypePicker.test.tsx
index fccf985f4f..9912f3d371 100644
--- a/plugins/catalog-react/src/components/EntityTypePicker/EntityTypePicker.test.tsx
+++ b/plugins/catalog-react/src/components/EntityTypePicker/EntityTypePicker.test.tsx
@@ -15,7 +15,7 @@
  */
 
 import React from 'react';
-import { fireEvent, render, waitFor } from '@testing-library/react';
+import { fireEvent, waitFor } from '@testing-library/react';
 import { capitalize } from 'lodash';
 import { CatalogApi } from '@backstage/catalog-client';
 import { Entity } from '@backstage/catalog-model';
@@ -26,6 +26,7 @@ import { EntityKindFilter, EntityTypeFilter } from '../../filters';
 
 import { AlertApi, alertApiRef } from '@backstage/core-plugin-api';
 import { ApiProvider, ApiRegistry } from '@backstage/core-app-api';
+import { renderWithEffects } from '@backstage/test-utils';
 
 const entities: Entity[] = [
   {
@@ -60,26 +61,15 @@ const entities: Entity[] = [
   },
 ];
 
-const apis = ApiRegistry.from([
-  [
-    catalogApiRef,
-    ({
-      getEntities: jest
-        .fn()
-        .mockImplementation(() => Promise.resolve({ items: entities })),
-    } as unknown) as CatalogApi,
-  ],
-  [
-    alertApiRef,
-    ({
-      post: jest.fn(),
-    } as unknown) as AlertApi,
-  ],
-]);
+const apis = ApiRegistry.with(catalogApiRef, {
+  getEntities: jest.fn().mockResolvedValue({ items: entities }),
+} as unknown as CatalogApi).with(alertApiRef, {
+  post: jest.fn(),
+} as unknown as AlertApi);
 
 describe('<EntityTypePicker/>', () => {
   it('renders available entity types', async () => {
-    const rendered = render(
+    const rendered = await renderWithEffects(
       <ApiProvider apis={apis}>
         <MockEntityListContextProvider
           value={{ filters: { kind: new EntityKindFilter('component') } }}
@@ -104,7 +94,7 @@ describe('<EntityTypePicker/>', () => {
 
   it('sets the selected type filter', async () => {
     const updateFilters = jest.fn();
-    const rendered = render(
+    const rendered = await renderWithEffects(
       <ApiProvider apis={apis}>
         <MockEntityListContextProvider
           value={{
diff --git a/plugins/catalog-react/src/components/EntityTypePicker/EntityTypePicker.tsx b/plugins/catalog-react/src/components/EntityTypePicker/EntityTypePicker.tsx
index 88538d1f65..bc30bf5b17 100644
--- a/plugins/catalog-react/src/components/EntityTypePicker/EntityTypePicker.tsx
+++ b/plugins/catalog-react/src/components/EntityTypePicker/EntityTypePicker.tsx
@@ -24,12 +24,8 @@ import { Select } from '@backstage/core-components';
 
 export const EntityTypePicker = () => {
   const alertApi = useApi(alertApiRef);
-  const {
-    error,
-    availableTypes,
-    selectedTypes,
-    setSelectedTypes,
-  } = useEntityTypeFilter();
+  const { error, availableTypes, selectedTypes, setSelectedTypes } =
+    useEntityTypeFilter();
 
   useEffect(() => {
     if (error) {
@@ -40,7 +36,7 @@ export const EntityTypePicker = () => {
     }
   }, [error, alertApi]);
 
-  if (!availableTypes || error) return null;
+  if (availableTypes.length === 0 || error) return null;
 
   const items = [
     { value: 'all', label: 'All' },
diff --git a/plugins/catalog/src/components/FavouriteEntity/FavouriteEntity.tsx b/plugins/catalog-react/src/components/FavoriteEntity/FavoriteEntity.tsx
similarity index 80%
rename from plugins/catalog/src/components/FavouriteEntity/FavouriteEntity.tsx
rename to plugins/catalog-react/src/components/FavoriteEntity/FavoriteEntity.tsx
index 108697541b..95e617ab7f 100644
--- a/plugins/catalog/src/components/FavouriteEntity/FavouriteEntity.tsx
+++ b/plugins/catalog-react/src/components/FavoriteEntity/FavoriteEntity.tsx
@@ -15,7 +15,7 @@
  */
 
 import React, { ComponentProps } from 'react';
-import { useStarredEntities } from '@backstage/plugin-catalog-react';
+import { useStarredEntities } from '../../hooks/useStarredEntities';
 import { IconButton, Tooltip, withStyles } from '@material-ui/core';
 import StarBorder from '@material-ui/icons/StarBorder';
 import Star from '@material-ui/icons/Star';
@@ -29,17 +29,17 @@ const YellowStar = withStyles({
   },
 })(Star);
 
-export const favouriteEntityTooltip = (isStarred: boolean) =>
+export const favoriteEntityTooltip = (isStarred: boolean) =>
   isStarred ? 'Remove from favorites' : 'Add to favorites';
 
-export const favouriteEntityIcon = (isStarred: boolean) =>
+export const favoriteEntityIcon = (isStarred: boolean) =>
   isStarred ? <YellowStar /> : <StarBorder />;
 
 /**
- * IconButton for showing if a current entity is starred and adding/removing it from the favourite entities
+ * IconButton for showing if a current entity is starred and adding/removing it from the favorite entities
  * @param props MaterialUI IconButton props extended by required `entity` prop
  */
-export const FavouriteEntity = (props: Props) => {
+export const FavoriteEntity = (props: Props) => {
   const { toggleStarredEntity, isStarredEntity } = useStarredEntities();
   const isStarred = isStarredEntity(props.entity);
   return (
@@ -48,8 +48,8 @@ export const FavouriteEntity = (props: Props) => {
       {...props}
       onClick={() => toggleStarredEntity(props.entity)}
     >
-      <Tooltip title={favouriteEntityTooltip(isStarred)}>
-        {favouriteEntityIcon(isStarred)}
+      <Tooltip title={favoriteEntityTooltip(isStarred)}>
+        {favoriteEntityIcon(isStarred)}
       </Tooltip>
     </IconButton>
   );
diff --git a/plugins/catalog-react/src/components/FavoriteEntity/index.ts b/plugins/catalog-react/src/components/FavoriteEntity/index.ts
new file mode 100644
index 0000000000..f731ca7483
--- /dev/null
+++ b/plugins/catalog-react/src/components/FavoriteEntity/index.ts
@@ -0,0 +1,21 @@
+/*
+ * Copyright 2021 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+export {
+  favoriteEntityTooltip,
+  favoriteEntityIcon,
+  FavoriteEntity,
+} from './FavoriteEntity';
diff --git a/plugins/catalog/src/components/UnregisterEntityDialog/UnregisterEntityDialog.test.tsx b/plugins/catalog-react/src/components/UnregisterEntityDialog/UnregisterEntityDialog.test.tsx
similarity index 99%
rename from plugins/catalog/src/components/UnregisterEntityDialog/UnregisterEntityDialog.test.tsx
rename to plugins/catalog-react/src/components/UnregisterEntityDialog/UnregisterEntityDialog.test.tsx
index 55ee42f253..339323c1bf 100644
--- a/plugins/catalog/src/components/UnregisterEntityDialog/UnregisterEntityDialog.test.tsx
+++ b/plugins/catalog-react/src/components/UnregisterEntityDialog/UnregisterEntityDialog.test.tsx
@@ -21,7 +21,7 @@ import React from 'react';
 import { UnregisterEntityDialog } from './UnregisterEntityDialog';
 import { ORIGIN_LOCATION_ANNOTATION } from '@backstage/catalog-model';
 import { CatalogClient } from '@backstage/catalog-client';
-import { catalogApiRef } from '@backstage/plugin-catalog-react';
+import { catalogApiRef } from '../../api';
 import { screen, waitFor } from '@testing-library/react';
 import { renderInTestApp } from '@backstage/test-utils';
 import * as state from './useUnregisterEntityDialogState';
diff --git a/plugins/catalog/src/components/UnregisterEntityDialog/UnregisterEntityDialog.tsx b/plugins/catalog-react/src/components/UnregisterEntityDialog/UnregisterEntityDialog.tsx
similarity index 96%
rename from plugins/catalog/src/components/UnregisterEntityDialog/UnregisterEntityDialog.tsx
rename to plugins/catalog-react/src/components/UnregisterEntityDialog/UnregisterEntityDialog.tsx
index abec90bad1..4dce00e7b7 100644
--- a/plugins/catalog/src/components/UnregisterEntityDialog/UnregisterEntityDialog.tsx
+++ b/plugins/catalog-react/src/components/UnregisterEntityDialog/UnregisterEntityDialog.tsx
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 The Backstage Authors
+ * Copyright 2021 The Backstage Authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,7 +15,7 @@
  */
 
 import { Entity } from '@backstage/catalog-model';
-import { EntityRefLink } from '@backstage/plugin-catalog-react';
+import { EntityRefLink } from '../EntityRefLink';
 import {
   Box,
   Button,
@@ -155,8 +155,8 @@ const Contents = ({
     return (
       <>
         <DialogContentText>
-          This entity does not seem to originate from a location. You therefore
-          only have the option to delete it outright from the catalog.
+          This entity does not seem to originate from a registered location. You
+          therefore only have the option to delete it outright from the catalog.
         </DialogContentText>
         <Button
           variant="contained"
diff --git a/plugins/catalog-react/src/components/UnregisterEntityDialog/index.ts b/plugins/catalog-react/src/components/UnregisterEntityDialog/index.ts
new file mode 100644
index 0000000000..8fc750e706
--- /dev/null
+++ b/plugins/catalog-react/src/components/UnregisterEntityDialog/index.ts
@@ -0,0 +1,17 @@
+/*
+ * Copyright 2021 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+export { UnregisterEntityDialog } from './UnregisterEntityDialog';
diff --git a/plugins/catalog/src/components/UnregisterEntityDialog/useUnregisterEntityDialogState.test.tsx b/plugins/catalog-react/src/components/UnregisterEntityDialog/useUnregisterEntityDialogState.test.tsx
similarity index 96%
rename from plugins/catalog/src/components/UnregisterEntityDialog/useUnregisterEntityDialogState.test.tsx
rename to plugins/catalog-react/src/components/UnregisterEntityDialog/useUnregisterEntityDialogState.test.tsx
index 52b04020a9..8b4f436aed 100644
--- a/plugins/catalog/src/components/UnregisterEntityDialog/useUnregisterEntityDialogState.test.tsx
+++ b/plugins/catalog-react/src/components/UnregisterEntityDialog/useUnregisterEntityDialogState.test.tsx
@@ -19,7 +19,8 @@ import {
   Location,
   ORIGIN_LOCATION_ANNOTATION,
 } from '@backstage/catalog-model';
-import { CatalogApi, catalogApiRef } from '@backstage/plugin-catalog-react';
+import { CatalogApi } from '@backstage/catalog-client';
+import { catalogApiRef } from '../../api';
 import {
   act,
   renderHook,
@@ -47,7 +48,7 @@ describe('useUnregisterEntityDialogState', () => {
     removeLocationById: jest.fn(),
     removeEntityByUid: jest.fn(),
   };
-  const catalogApi = (catalogApiMock as Partial<CatalogApi>) as CatalogApi;
+  const catalogApi = catalogApiMock as Partial<CatalogApi> as CatalogApi;
 
   const Wrapper = ({ children }: { children?: React.ReactNode }) => (
     <ApiProvider apis={ApiRegistry.with(catalogApiRef, catalogApi)}>
diff --git a/plugins/catalog/src/components/UnregisterEntityDialog/useUnregisterEntityDialogState.ts b/plugins/catalog-react/src/components/UnregisterEntityDialog/useUnregisterEntityDialogState.ts
similarity index 98%
rename from plugins/catalog/src/components/UnregisterEntityDialog/useUnregisterEntityDialogState.ts
rename to plugins/catalog-react/src/components/UnregisterEntityDialog/useUnregisterEntityDialogState.ts
index 9b2e68cc5d..ae0a323d36 100644
--- a/plugins/catalog/src/components/UnregisterEntityDialog/useUnregisterEntityDialogState.ts
+++ b/plugins/catalog-react/src/components/UnregisterEntityDialog/useUnregisterEntityDialogState.ts
@@ -20,7 +20,7 @@ import {
   getEntityName,
   ORIGIN_LOCATION_ANNOTATION,
 } from '@backstage/catalog-model';
-import { catalogApiRef } from '@backstage/plugin-catalog-react';
+import { catalogApiRef } from '../../api';
 import { useCallback } from 'react';
 import { useAsync } from 'react-use';
 import { useApi } from '@backstage/core-plugin-api';
diff --git a/plugins/catalog-react/src/components/UserListPicker/UserListPicker.test.tsx b/plugins/catalog-react/src/components/UserListPicker/UserListPicker.test.tsx
index b54284da36..4662e58dd2 100644
--- a/plugins/catalog-react/src/components/UserListPicker/UserListPicker.test.tsx
+++ b/plugins/catalog-react/src/components/UserListPicker/UserListPicker.test.tsx
@@ -15,7 +15,7 @@
  */
 
 import React from 'react';
-import { fireEvent, render } from '@testing-library/react';
+import { fireEvent, render, waitFor } from '@testing-library/react';
 import {
   Entity,
   RELATION_OWNED_BY,
@@ -58,7 +58,8 @@ const mockCatalogApi = {
 } as Partial<CatalogApi>;
 
 const mockIdentityApi = {
-  getUserId: () => '',
+  getUserId: () => 'testUser',
+  getIdToken: async () => undefined,
 } as Partial<IdentityApi>;
 
 const apis = ApiRegistry.from([
@@ -68,6 +69,9 @@ const apis = ApiRegistry.from([
   [storageApiRef, MockStorageApi.create()],
 ]);
 
+const mockIsOwnedEntity = (entity: Entity) =>
+  entity.metadata.name === 'component-1';
+
 const mockIsStarredEntity = (entity: Entity) =>
   entity.metadata.name === 'component-3';
 
@@ -75,7 +79,9 @@ jest.mock('../../hooks', () => {
   const actual = jest.requireActual('../../hooks');
   return {
     ...actual,
-    useOwnUser: () => ({ value: mockUser }),
+    useEntityOwnership: () => ({
+      isOwnedEntity: mockIsOwnedEntity,
+    }),
     useStarredEntities: () => ({
       isStarredEntity: mockIsStarredEntity,
     }),
@@ -161,7 +167,7 @@ describe('<UserListPicker />', () => {
     ).toEqual(['Owned', 'Starred', 'All']);
   });
 
-  it('includes counts alongside each filter', () => {
+  it('includes counts alongside each filter', async () => {
     const { getAllByRole } = render(
       <ApiProvider apis={apis}>
         <MockEntityListContextProvider value={{ backendEntities }}>
@@ -172,14 +178,16 @@ describe('<UserListPicker />', () => {
 
     // Material UI renders ListItemSecondaryActions outside the
     // menuitem itself, so we pick off the next sibling.
-    expect(
-      getAllByRole('menuitem').map(
-        ({ nextSibling }) => nextSibling?.textContent,
-      ),
-    ).toEqual(['2', '1', '4']);
+    await waitFor(() => {
+      expect(
+        getAllByRole('menuitem').map(
+          ({ nextSibling }) => nextSibling?.textContent,
+        ),
+      ).toEqual(['1', '1', '4']);
+    });
   });
 
-  it('respects other frontend filters in counts', () => {
+  it('respects other frontend filters in counts', async () => {
     const { getAllByRole } = render(
       <ApiProvider apis={apis}>
         <MockEntityListContextProvider
@@ -193,11 +201,13 @@ describe('<UserListPicker />', () => {
       </ApiProvider>,
     );
 
-    expect(
-      getAllByRole('menuitem').map(
-        ({ nextSibling }) => nextSibling?.textContent,
-      ),
-    ).toEqual(['1', '0', '2']);
+    await waitFor(() => {
+      expect(
+        getAllByRole('menuitem').map(
+          ({ nextSibling }) => nextSibling?.textContent,
+        ),
+      ).toEqual(['1', '0', '2']);
+    });
   });
 
   it('respects the query parameter filter value', () => {
@@ -214,7 +224,7 @@ describe('<UserListPicker />', () => {
     );
 
     expect(updateFilters).toHaveBeenLastCalledWith({
-      user: new UserListFilter('owned', mockUser, mockIsStarredEntity),
+      user: new UserListFilter('owned', mockIsOwnedEntity, mockIsStarredEntity),
     });
   });
 
@@ -233,7 +243,11 @@ describe('<UserListPicker />', () => {
     fireEvent.click(getByText('Starred'));
 
     expect(updateFilters).toHaveBeenLastCalledWith({
-      user: new UserListFilter('starred', mockUser, mockIsStarredEntity),
+      user: new UserListFilter(
+        'starred',
+        mockIsOwnedEntity,
+        mockIsStarredEntity,
+      ),
     });
   });
 });
diff --git a/plugins/catalog-react/src/components/UserListPicker/UserListPicker.tsx b/plugins/catalog-react/src/components/UserListPicker/UserListPicker.tsx
index 0212c0f0be..bfc55142a6 100644
--- a/plugins/catalog-react/src/components/UserListPicker/UserListPicker.tsx
+++ b/plugins/catalog-react/src/components/UserListPicker/UserListPicker.tsx
@@ -14,15 +14,11 @@
  * limitations under the License.
  */
 
-import React, { Fragment, useEffect, useMemo, useState } from 'react';
-import { compact } from 'lodash';
-import { UserListFilterKind } from '../../types';
-import { UserListFilter } from '../../filters';
 import {
-  useEntityListProvider,
-  useOwnUser,
-  useStarredEntities,
-} from '../../hooks';
+  configApiRef,
+  IconComponent,
+  useApi,
+} from '@backstage/core-plugin-api';
 import {
   Card,
   List,
@@ -36,12 +32,16 @@ import {
 } from '@material-ui/core';
 import SettingsIcon from '@material-ui/icons/Settings';
 import StarIcon from '@material-ui/icons/Star';
-import { reduceEntityFilters } from '../../utils';
+import { compact } from 'lodash';
+import React, { Fragment, useEffect, useMemo, useState } from 'react';
+import { UserListFilter } from '../../filters';
 import {
-  configApiRef,
-  IconComponent,
-  useApi,
-} from '@backstage/core-plugin-api';
+  useEntityListProvider,
+  useStarredEntities,
+  useEntityOwnership,
+} from '../../hooks';
+import { UserListFilterKind } from '../../types';
+import { reduceEntityFilters } from '../../utils';
 
 const useStyles = makeStyles<Theme>(theme => ({
   root: {
@@ -129,27 +129,23 @@ export const UserListPicker = ({
     }))
     .filter(({ items }) => !!items.length);
 
-  const {
-    filters,
-    updateFilters,
-    backendEntities,
-    queryParameters,
-  } = useEntityListProvider();
+  const { filters, updateFilters, backendEntities, queryParameters } =
+    useEntityListProvider();
 
-  const { value: user } = useOwnUser();
   const { isStarredEntity } = useStarredEntities();
+  const { isOwnedEntity } = useEntityOwnership();
   const [selectedUserFilter, setSelectedUserFilter] = useState(
     [queryParameters.user].flat()[0] ?? initialFilter,
   );
 
   // Static filters; used for generating counts of potentially unselected kinds
   const ownedFilter = useMemo(
-    () => new UserListFilter('owned', user, isStarredEntity),
-    [user, isStarredEntity],
+    () => new UserListFilter('owned', isOwnedEntity, isStarredEntity),
+    [isOwnedEntity, isStarredEntity],
   );
   const starredFilter = useMemo(
-    () => new UserListFilter('starred', user, isStarredEntity),
-    [user, isStarredEntity],
+    () => new UserListFilter('starred', isOwnedEntity, isStarredEntity),
+    [isOwnedEntity, isStarredEntity],
   );
 
   useEffect(() => {
@@ -157,18 +153,17 @@ export const UserListPicker = ({
       user: selectedUserFilter
         ? new UserListFilter(
             selectedUserFilter as UserListFilterKind,
-            user,
+            isOwnedEntity,
             isStarredEntity,
           )
         : undefined,
     });
-  }, [selectedUserFilter, user, isStarredEntity, updateFilters]);
+  }, [selectedUserFilter, isOwnedEntity, isStarredEntity, updateFilters]);
 
   // To show proper counts for each section, apply all other frontend filters _except_ the user
   // filter that's controlled by this picker.
-  const [entitiesWithoutUserFilter, setEntitiesWithoutUserFilter] = useState(
-    backendEntities,
-  );
+  const [entitiesWithoutUserFilter, setEntitiesWithoutUserFilter] =
+    useState(backendEntities);
   useEffect(() => {
     const filterFn = reduceEntityFilters(
       compact(Object.values({ ...filters, user: undefined })),
diff --git a/plugins/catalog-react/src/components/index.ts b/plugins/catalog-react/src/components/index.ts
index dd7c4bebc2..434514c4ed 100644
--- a/plugins/catalog-react/src/components/index.ts
+++ b/plugins/catalog-react/src/components/index.ts
@@ -22,4 +22,6 @@ export * from './EntitySearchBar';
 export * from './EntityTable';
 export * from './EntityTagPicker';
 export * from './EntityTypePicker';
+export * from './FavoriteEntity';
+export * from './UnregisterEntityDialog';
 export * from './UserListPicker';
diff --git a/plugins/catalog-react/src/filters.ts b/plugins/catalog-react/src/filters.ts
index 98c66e0c26..46fb708f93 100644
--- a/plugins/catalog-react/src/filters.ts
+++ b/plugins/catalog-react/src/filters.ts
@@ -14,14 +14,10 @@
  * limitations under the License.
  */
 
-import {
-  Entity,
-  UserEntity,
-  RELATION_OWNED_BY,
-} from '@backstage/catalog-model';
-import { EntityFilter, UserListFilterKind } from './types';
-import { getEntityRelations, isOwnerOf } from './utils';
+import { Entity, RELATION_OWNED_BY } from '@backstage/catalog-model';
 import { formatEntityRefTitle } from './components/EntityRefLink';
+import { EntityFilter, UserListFilterKind } from './types';
+import { getEntityRelations } from './utils';
 
 export class EntityKindFilter implements EntityFilter {
   constructor(readonly value: string) {}
@@ -116,14 +112,14 @@ export class EntityLifecycleFilter implements EntityFilter {
 export class UserListFilter implements EntityFilter {
   constructor(
     readonly value: UserListFilterKind,
-    readonly user: UserEntity | undefined,
+    readonly isOwnedEntity: (entity: Entity) => boolean,
     readonly isStarredEntity: (entity: Entity) => boolean,
   ) {}
 
   filterEntity(entity: Entity): boolean {
     switch (this.value) {
       case 'owned':
-        return this.user !== undefined && isOwnerOf(this.user, entity);
+        return this.isOwnedEntity(entity);
       case 'starred':
         return this.isStarredEntity(entity);
       default:
diff --git a/plugins/catalog-react/src/hooks/index.ts b/plugins/catalog-react/src/hooks/index.ts
index 483f1ab787..2f3ce8411d 100644
--- a/plugins/catalog-react/src/hooks/index.ts
+++ b/plugins/catalog-react/src/hooks/index.ts
@@ -22,6 +22,8 @@ export {
 } from './useEntityListProvider';
 export type { DefaultEntityFilters } from './useEntityListProvider';
 export { useEntityTypeFilter } from './useEntityTypeFilter';
+export { useEntityKinds } from './useEntityKinds';
 export { useOwnUser } from './useOwnUser';
 export { useRelatedEntities } from './useRelatedEntities';
 export { useStarredEntities } from './useStarredEntities';
+export { useEntityOwnership } from './useEntityOwnership';
diff --git a/plugins/catalog-react/src/hooks/useEntity.ts b/plugins/catalog-react/src/hooks/useEntity.ts
index 465cffcf9b..a7e6a09ae7 100644
--- a/plugins/catalog-react/src/hooks/useEntity.ts
+++ b/plugins/catalog-react/src/hooks/useEntity.ts
@@ -17,7 +17,7 @@ import { Entity } from '@backstage/catalog-model';
 import { errorApiRef, useApi } from '@backstage/core-plugin-api';
 import { createContext, useContext, useEffect } from 'react';
 import { useNavigate } from 'react-router';
-import { useAsync } from 'react-use';
+import { useAsyncRetry } from 'react-use';
 import { catalogApiRef } from '../api';
 import { useEntityCompoundName } from './useEntityCompoundName';
 
@@ -25,12 +25,14 @@ type EntityLoadingStatus = {
   entity?: Entity;
   loading: boolean;
   error?: Error;
+  refresh?: VoidFunction;
 };
 
 export const EntityContext = createContext<EntityLoadingStatus>({
   entity: undefined,
   loading: true,
   error: undefined,
+  refresh: () => {},
 });
 
 export const useEntityFromUrl = (): EntityLoadingStatus => {
@@ -39,7 +41,12 @@ export const useEntityFromUrl = (): EntityLoadingStatus => {
   const errorApi = useApi(errorApiRef);
   const catalogApi = useApi(catalogApiRef);
 
-  const { value: entity, error, loading } = useAsync(
+  const {
+    value: entity,
+    error,
+    loading,
+    retry: refresh,
+  } = useAsyncRetry(
     () => catalogApi.getEntityByName({ kind, namespace, name }),
     [catalogApi, kind, namespace, name],
   );
@@ -51,13 +58,13 @@ export const useEntityFromUrl = (): EntityLoadingStatus => {
     }
   }, [errorApi, navigate, error, loading, entity, name]);
 
-  return { entity, loading, error };
+  return { entity, loading, error, refresh };
 };
 
 /**
  * Grab the current entity from the context and its current loading state.
  */
 export function useEntity<T extends Entity = Entity>() {
-  const { entity, loading, error } = useContext(EntityContext);
-  return { entity: entity as T, loading, error };
+  const { entity, loading, error, refresh } = useContext(EntityContext);
+  return { entity: entity as T, loading, error, refresh };
 }
diff --git a/plugins/catalog-react/src/hooks/useEntityKinds.test.tsx b/plugins/catalog-react/src/hooks/useEntityKinds.test.tsx
new file mode 100644
index 0000000000..d801e508a6
--- /dev/null
+++ b/plugins/catalog-react/src/hooks/useEntityKinds.test.tsx
@@ -0,0 +1,91 @@
+/*
+ * Copyright 2021 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import React, { PropsWithChildren } from 'react';
+import { ApiProvider, ApiRegistry } from '@backstage/core-app-api';
+import { CatalogApi } from '@backstage/catalog-client';
+import { Entity } from '@backstage/catalog-model';
+import { catalogApiRef } from '../api';
+import { renderHook } from '@testing-library/react-hooks';
+import { useEntityKinds } from './useEntityKinds';
+
+const entities: Entity[] = [
+  {
+    apiVersion: '1',
+    kind: 'Component',
+    metadata: {
+      name: 'component-1',
+    },
+  },
+  {
+    apiVersion: '1',
+    kind: 'Component',
+    metadata: {
+      name: 'component-2',
+    },
+  },
+  {
+    apiVersion: '1',
+    kind: 'Template',
+    metadata: {
+      name: 'template',
+    },
+  },
+  {
+    apiVersion: '1',
+    kind: 'System',
+    metadata: {
+      name: 'system',
+    },
+  },
+];
+
+const mockCatalogApi: Partial<CatalogApi> = {
+  getEntities: jest.fn().mockResolvedValue({ items: entities }),
+};
+
+const wrapper = ({ children }: PropsWithChildren<{}>) => {
+  return (
+    <ApiProvider apis={ApiRegistry.with(catalogApiRef, mockCatalogApi)}>
+      {children}
+    </ApiProvider>
+  );
+};
+
+describe('useEntityKinds', () => {
+  it('does not return duplicate kinds', async () => {
+    const { result, waitForValueToChange } = renderHook(
+      () => useEntityKinds(),
+      {
+        wrapper,
+      },
+    );
+    await waitForValueToChange(() => result.current);
+    expect(result.current.kinds).toBeDefined();
+    expect(result.current.kinds!.length).toBe(3);
+  });
+
+  it('sorts entity kinds', async () => {
+    const { result, waitForValueToChange } = renderHook(
+      () => useEntityKinds(),
+      {
+        wrapper,
+      },
+    );
+    await waitForValueToChange(() => result.current);
+    expect(result.current.kinds).toEqual(['Component', 'System', 'Template']);
+  });
+});
diff --git a/plugins/catalog-react/src/hooks/useEntityKinds.ts b/plugins/catalog-react/src/hooks/useEntityKinds.ts
new file mode 100644
index 0000000000..082e4a207d
--- /dev/null
+++ b/plugins/catalog-react/src/hooks/useEntityKinds.ts
@@ -0,0 +1,37 @@
+/*
+ * Copyright 2021 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { useAsync } from 'react-use';
+import { useApi } from '@backstage/core-plugin-api';
+import { catalogApiRef } from '../api';
+
+// Retrieve a list of unique entity kinds present in the catalog
+export function useEntityKinds() {
+  const catalogApi = useApi(catalogApiRef);
+
+  const {
+    error,
+    loading,
+    value: kinds,
+  } = useAsync(async () => {
+    const entities = await catalogApi
+      .getEntities({ fields: ['kind'] })
+      .then(response => response.items);
+
+    return [...new Set(entities.map(e => e.kind))].sort();
+  });
+  return { error, loading, kinds };
+}
diff --git a/plugins/catalog-react/src/hooks/useEntityListProvider.test.tsx b/plugins/catalog-react/src/hooks/useEntityListProvider.test.tsx
index c66af03da0..5d711016a4 100644
--- a/plugins/catalog-react/src/hooks/useEntityListProvider.test.tsx
+++ b/plugins/catalog-react/src/hooks/useEntityListProvider.test.tsx
@@ -16,11 +16,10 @@
 
 import React, { PropsWithChildren } from 'react';
 import qs from 'qs';
-import { MemoryRouter as Router } from 'react-router-dom';
 import { act, renderHook } from '@testing-library/react-hooks';
 import { MockStorageApi } from '@backstage/test-utils';
 import { CatalogApi } from '@backstage/catalog-client';
-import { Entity, UserEntity } from '@backstage/catalog-model';
+import { Entity } from '@backstage/catalog-model';
 import {
   EntityListProvider,
   useEntityListProvider,
@@ -39,17 +38,6 @@ import {
   storageApiRef,
 } from '@backstage/core-plugin-api';
 
-const mockUser: UserEntity = {
-  apiVersion: 'backstage.io/v1beta1',
-  kind: 'User',
-  metadata: {
-    name: 'guest',
-  },
-  spec: {
-    memberOf: [],
-  },
-};
-
 const entities: Entity[] = [
   {
     apiVersion: '1',
@@ -81,13 +69,12 @@ const mockConfigApi = {
   getOptionalString: () => '',
 } as Partial<ConfigApi>;
 const mockIdentityApi: Partial<IdentityApi> = {
-  getUserId: () => 'guest@example.com',
+  getUserId: () => 'guest',
+  getIdToken: async () => undefined,
 };
 const mockCatalogApi: Partial<CatalogApi> = {
-  getEntities: jest
-    .fn()
-    .mockImplementation(() => Promise.resolve({ items: entities })),
-  getEntityByName: () => Promise.resolve(mockUser),
+  getEntities: jest.fn().mockImplementation(async () => ({ items: entities })),
+  getEntityByName: async () => undefined,
 };
 const apis = ApiRegistry.from([
   [configApiRef, mockConfigApi],
@@ -98,26 +85,30 @@ const apis = ApiRegistry.from([
 
 const wrapper = ({
   userFilter,
-  queryParams,
   children,
 }: PropsWithChildren<{
   userFilter?: UserListFilterKind;
-  queryParams?: string;
 }>) => {
   return (
-    <Router initialEntries={[`/?${queryParams ?? ''}`]}>
-      <ApiProvider apis={apis}>
-        <EntityListProvider>
-          <EntityKindPicker initialFilter="component" hidden />
-          <UserListPicker initialFilter={userFilter} />
-          {children}
-        </EntityListProvider>
-      </ApiProvider>
-    </Router>
+    <ApiProvider apis={apis}>
+      <EntityListProvider>
+        <EntityKindPicker initialFilter="component" hidden />
+        <UserListPicker initialFilter={userFilter} />
+        {children}
+      </EntityListProvider>
+    </ApiProvider>
   );
 };
 
-describe('<EntityListProvider/>', () => {
+describe('<EntityListProvider />', () => {
+  const origReplaceState = window.history.replaceState;
+  beforeEach(() => {
+    window.history.replaceState = jest.fn();
+  });
+  afterEach(() => {
+    window.history.replaceState = origReplaceState;
+  });
+
   beforeEach(() => {
     jest.clearAllMocks();
   });
@@ -149,16 +140,13 @@ describe('<EntityListProvider/>', () => {
   });
 
   it('resolves query param filter values', async () => {
+    const query = qs.stringify({
+      filters: { kind: 'component', type: 'service' },
+    });
+    delete (window as any).location;
+    (window as any).location = new URL(`http://localhost/catalog?${query}`);
     const { result, waitFor } = renderHook(() => useEntityListProvider(), {
       wrapper,
-      initialProps: {
-        queryParams: qs.stringify({
-          filters: {
-            kind: 'component',
-            type: 'service',
-          },
-        }),
-      },
     });
     await waitFor(() => !!result.current.queryParameters);
     expect(result.current.queryParameters).toEqual({
@@ -171,18 +159,26 @@ describe('<EntityListProvider/>', () => {
     const { result, waitFor } = renderHook(() => useEntityListProvider(), {
       wrapper,
     });
-    await waitFor(() => !!result.current.entities.length);
-    expect(result.current.entities.length).toBe(2);
-    expect(mockCatalogApi.getEntities).toHaveBeenCalledTimes(1);
+
+    await waitFor(() => {
+      expect(result.current.entities.length).toBe(2);
+      expect(mockCatalogApi.getEntities).toHaveBeenCalledTimes(1);
+    });
 
     act(() =>
       result.current.updateFilters({
-        user: new UserListFilter('owned', mockUser, () => true),
+        user: new UserListFilter(
+          'owned',
+          entity => entity.metadata.name === 'component-1',
+          () => true,
+        ),
       }),
     );
-    await waitFor(() => result.current.entities.length !== 2);
-    expect(mockCatalogApi.getEntities).toHaveBeenCalledTimes(1);
-    expect(result.current.entities.length).toBe(1);
+
+    await waitFor(() => {
+      expect(result.current.entities.length).toBe(1);
+      expect(mockCatalogApi.getEntities).toHaveBeenCalledTimes(1);
+    });
   });
 
   it('debounces multiple filter changes', async () => {
@@ -205,7 +201,7 @@ describe('<EntityListProvider/>', () => {
   });
 
   it('returns an error on catalogApi failure', async () => {
-    const { result, waitForNextUpdate, waitForValueToChange } = renderHook(
+    const { result, waitForValueToChange, waitFor } = renderHook(
       () => useEntityListProvider(),
       {
         wrapper,
@@ -218,7 +214,8 @@ describe('<EntityListProvider/>', () => {
     act(() => {
       result.current.updateFilters({ kind: new EntityKindFilter('api') });
     });
-    await waitForNextUpdate();
-    expect(result.current.error).toBeDefined();
+    await waitFor(() => {
+      expect(result.current.error).toBeDefined();
+    });
   });
 });
diff --git a/plugins/catalog-react/src/hooks/useEntityListProvider.tsx b/plugins/catalog-react/src/hooks/useEntityListProvider.tsx
index 8ca3efd243..a4e5f6b2ee 100644
--- a/plugins/catalog-react/src/hooks/useEntityListProvider.tsx
+++ b/plugins/catalog-react/src/hooks/useEntityListProvider.tsx
@@ -22,10 +22,10 @@ import React, {
   PropsWithChildren,
   useCallback,
   useContext,
+  useMemo,
   useState,
 } from 'react';
-import { useSearchParams } from 'react-router-dom';
-import { useAsyncFn, useDebounce } from 'react-use';
+import { useAsyncFn, useDebounce, useMountedState } from 'react-use';
 import { catalogApiRef } from '../api';
 import {
   EntityKindFilter,
@@ -51,7 +51,7 @@ export type DefaultEntityFilters = {
 };
 
 export type EntityListContextProps<
-  EntityFilters extends DefaultEntityFilters = DefaultEntityFilters
+  EntityFilters extends DefaultEntityFilters = DefaultEntityFilters,
 > = {
   /**
    * The currently registered filters, adhering to the shape of DefaultEntityFilters or an extension
@@ -102,19 +102,27 @@ type OutputState<EntityFilters extends DefaultEntityFilters> = {
 export const EntityListProvider = <EntityFilters extends DefaultEntityFilters>({
   children,
 }: PropsWithChildren<{}>) => {
+  const isMounted = useMountedState();
   const catalogApi = useApi(catalogApiRef);
-  const [searchParams, setSearchParams] = useSearchParams();
-  const allQueryParams = qs.parse(searchParams.toString());
   const [requestedFilters, setRequestedFilters] = useState<EntityFilters>(
     {} as EntityFilters,
   );
-  const [outputState, setOutputState] = useState<OutputState<EntityFilters>>({
-    appliedFilters: {} as EntityFilters,
-    entities: [],
-    backendEntities: [],
-    queryParameters:
-      (allQueryParams.filters as Record<string, string | string[]>) ?? {},
-  });
+  const [outputState, setOutputState] = useState<OutputState<EntityFilters>>(
+    () => {
+      const query = qs.parse(window.location.search, {
+        ignoreQueryPrefix: true,
+      });
+      return {
+        appliedFilters: {} as EntityFilters,
+        entities: [],
+        backendEntities: [],
+        queryParameters: (query.filters ?? {}) as Record<
+          string,
+          string | string[]
+        >,
+      };
+    },
+  );
 
   // The main async filter worker. Note that while it has a lot of dependencies
   // in terms of its implementation, the triggering only happens (debounced)
@@ -164,12 +172,22 @@ export const EntityListProvider = <EntityFilters extends DefaultEntityFilters>({
         });
       }
 
-      setSearchParams(
-        qs.stringify({ ...allQueryParams, filters: queryParams }),
-        {
-          replace: true,
-        },
-      );
+      if (isMounted()) {
+        const oldParams = qs.parse(window.location.search, {
+          ignoreQueryPrefix: true,
+        });
+        const newParams = qs.stringify(
+          { ...oldParams, filters: queryParams },
+          { addQueryPrefix: true },
+        );
+        const newUrl = `${window.location.pathname}${newParams}`;
+        // We use direct history manipulation since useSearchParams and
+        // useNavigate in react-router-dom cause unnecessary extra rerenders.
+        // Also make sure to replace the state rather than pushing, since we
+        // don't want there to be back/forward slots for every single filter
+        // change.
+        window.history?.replaceState(null, document.title, newUrl);
+      }
     },
     [catalogApi, requestedFilters, outputState],
     { loading: true },
@@ -194,25 +212,28 @@ export const EntityListProvider = <EntityFilters extends DefaultEntityFilters>({
     [],
   );
 
+  const value = useMemo(
+    () => ({
+      filters: outputState.appliedFilters,
+      entities: outputState.entities,
+      backendEntities: outputState.backendEntities,
+      updateFilters,
+      queryParameters: outputState.queryParameters,
+      loading,
+      error,
+    }),
+    [outputState, updateFilters, loading, error],
+  );
+
   return (
-    <EntityListContext.Provider
-      value={{
-        filters: outputState.appliedFilters,
-        entities: outputState.entities,
-        backendEntities: outputState.backendEntities,
-        updateFilters,
-        queryParameters: outputState.queryParameters,
-        loading,
-        error,
-      }}
-    >
+    <EntityListContext.Provider value={value}>
       {children}
     </EntityListContext.Provider>
   );
 };
 
 export function useEntityListProvider<
-  EntityFilters extends DefaultEntityFilters = DefaultEntityFilters
+  EntityFilters extends DefaultEntityFilters = DefaultEntityFilters,
 >(): EntityListContextProps<EntityFilters> {
   const context = useContext(EntityListContext);
   if (!context)
diff --git a/plugins/catalog-react/src/hooks/useEntityOwnership.test.tsx b/plugins/catalog-react/src/hooks/useEntityOwnership.test.tsx
new file mode 100644
index 0000000000..4edad98c12
--- /dev/null
+++ b/plugins/catalog-react/src/hooks/useEntityOwnership.test.tsx
@@ -0,0 +1,255 @@
+/*
+ * Copyright 2021 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { CatalogApi } from '@backstage/catalog-client';
+import {
+  ComponentEntity,
+  RELATION_MEMBER_OF,
+  RELATION_OWNED_BY,
+  UserEntity,
+} from '@backstage/catalog-model';
+import { ApiProvider, ApiRegistry } from '@backstage/core-app-api';
+import { IdentityApi, identityApiRef } from '@backstage/core-plugin-api';
+import { renderHook } from '@testing-library/react-hooks';
+import React from 'react';
+import { catalogApiRef } from '../api';
+import {
+  loadCatalogOwnerRefs,
+  loadIdentityOwnerRefs,
+  useEntityOwnership,
+} from './useEntityOwnership';
+
+describe('useEntityOwnership', () => {
+  type MockIdentityApi = jest.Mocked<
+    Pick<IdentityApi, 'getUserId' | 'getIdToken'>
+  >;
+  type MockCatalogApi = jest.Mocked<Pick<CatalogApi, 'getEntityByName'>>;
+
+  const mockIdentityApi: MockIdentityApi = {
+    getUserId: jest.fn(),
+    getIdToken: jest.fn(),
+  };
+  const mockCatalogApi: MockCatalogApi = {
+    getEntityByName: jest.fn(),
+  };
+
+  const identityApi = mockIdentityApi as unknown as IdentityApi;
+  const catalogApi = mockCatalogApi as unknown as CatalogApi;
+
+  const Wrapper = ({ children }: { children?: React.ReactNode }) => (
+    <ApiProvider
+      apis={ApiRegistry.with(identityApiRef, identityApi).with(
+        catalogApiRef,
+        catalogApi,
+      )}
+    >
+      {children}
+    </ApiProvider>
+  );
+
+  const ownedEntity: ComponentEntity = {
+    apiVersion: 'backstage.io/v1beta1',
+    kind: 'Component',
+    metadata: {
+      name: 'component1',
+      namespace: 'default',
+    },
+    spec: {
+      /* should not be accessed */
+    } as any,
+    relations: [
+      {
+        type: RELATION_OWNED_BY,
+        target: { kind: 'User', namespace: 'default', name: 'user1' },
+      },
+      {
+        type: RELATION_OWNED_BY,
+        target: { kind: 'Group', namespace: 'default', name: 'group1' },
+      },
+    ],
+  };
+
+  const user2Entity: UserEntity = {
+    apiVersion: 'backstage.io/v1beta1',
+    kind: 'User',
+    metadata: {
+      name: 'user2',
+      namespace: 'default',
+    },
+    spec: {
+      /* should not be accessed */
+    } as any,
+    relations: [
+      {
+        type: RELATION_MEMBER_OF,
+        target: { kind: 'Group', namespace: 'default', name: 'group1' },
+      },
+    ],
+  };
+
+  // these were generated on https://jwt.io, based off of its default example token
+  // no ent at all
+  const tokenNoEnt =
+    'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiIxMjM0NTY3ODkwIiwibmFtZSI6IkpvaG4gRG9lIiwiaWF0IjoxNTE2MjM5MDIyfQ.SflKxwRJSMeKKF2QT4fwpMeJf36POk6yJV_adQssw5c';
+  // "ent": []
+  const tokenEmptyEnt =
+    'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiIxMjM0NTY3ODkwIiwibmFtZSI6IkpvaG4gRG9lIiwiaWF0IjoxNTE2MjM5MDIyLCJlbnQiOltdfQ.Khyza2whczkoC4wSCLBhBaBB9-ktIkk7gpXEgQPHhtY';
+  // "ent": ["user:default/user1"]
+  const tokenUserEnt =
+    'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiIxMjM0NTY3ODkwIiwibmFtZSI6IkpvaG4gRG9lIiwiaWF0IjoxNTE2MjM5MDIyLCJlbnQiOlsidXNlcjpkZWZhdWx0L3VzZXIxIl19.CMCxjwI4rj_TD3uUoBNgFjkZI23LwRTbQnSPBxzncoY';
+  // "ent": ["user:default/user1", "group:default/group1"]
+  const tokenUserAndGroupEnt =
+    'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiIxMjM0NTY3ODkwIiwibmFtZSI6IkpvaG4gRG9lIiwiaWF0IjoxNTE2MjM5MDIyLCJlbnQiOlsidXNlcjpkZWZhdWx0L3VzZXIxIiwiZ3JvdXA6ZGVmYXVsdC9ncm91cDEiXX0.ZZmZrogbQKx0hnForw63ETkyAhUyeoBE8Hgloi45rdg';
+
+  afterEach(() => {
+    jest.resetAllMocks();
+  });
+
+  describe('loadIdentityOwnerRefs', () => {
+    it('returns the user id when there is no relevant token info', async () => {
+      mockIdentityApi.getUserId.mockReturnValueOnce('foo');
+      mockIdentityApi.getIdToken.mockResolvedValueOnce(undefined);
+      await expect(loadIdentityOwnerRefs(identityApi)).resolves.toEqual([
+        'user:default/foo',
+      ]);
+
+      mockIdentityApi.getUserId.mockReturnValueOnce('ns/foo');
+      mockIdentityApi.getIdToken.mockResolvedValueOnce(undefined);
+      await expect(loadIdentityOwnerRefs(identityApi)).resolves.toEqual([
+        'user:ns/foo',
+      ]);
+
+      mockIdentityApi.getUserId.mockReturnValueOnce('user:ns/foo');
+      mockIdentityApi.getIdToken.mockResolvedValueOnce(undefined);
+      await expect(loadIdentityOwnerRefs(identityApi)).resolves.toEqual([
+        'user:ns/foo',
+      ]);
+
+      mockIdentityApi.getUserId.mockReturnValueOnce('foo');
+      mockIdentityApi.getIdToken.mockResolvedValueOnce(tokenNoEnt);
+      await expect(loadIdentityOwnerRefs(identityApi)).resolves.toEqual([
+        'user:default/foo',
+      ]);
+
+      mockIdentityApi.getUserId.mockReturnValueOnce('foo');
+      mockIdentityApi.getIdToken.mockResolvedValueOnce(tokenEmptyEnt);
+      await expect(loadIdentityOwnerRefs(identityApi)).resolves.toEqual([
+        'user:default/foo',
+      ]);
+    });
+
+    it('returns both the user id and the token parts', async () => {
+      mockIdentityApi.getUserId.mockReturnValueOnce('foo');
+      mockIdentityApi.getIdToken.mockResolvedValueOnce(tokenUserEnt);
+      await expect(loadIdentityOwnerRefs(identityApi)).resolves.toEqual([
+        'user:default/foo',
+        'user:default/user1',
+      ]);
+
+      mockIdentityApi.getUserId.mockReturnValueOnce('foo');
+      mockIdentityApi.getIdToken.mockResolvedValueOnce(tokenUserAndGroupEnt);
+      await expect(loadIdentityOwnerRefs(identityApi)).resolves.toEqual([
+        'user:default/foo',
+        'user:default/user1',
+        'group:default/group1',
+      ]);
+    });
+
+    it('gracefully ignores broken token', async () => {
+      mockIdentityApi.getUserId.mockReturnValueOnce('foo');
+      mockIdentityApi.getIdToken.mockResolvedValueOnce('not a jwt');
+      await expect(loadIdentityOwnerRefs(identityApi)).resolves.toEqual([
+        'user:default/foo',
+      ]);
+    });
+  });
+
+  describe('loadCatalogOwnerRefs', () => {
+    it('loads the first user from the catalog', async () => {
+      mockCatalogApi.getEntityByName.mockResolvedValueOnce(user2Entity);
+      await expect(
+        loadCatalogOwnerRefs(catalogApi, ['user:default/user2']),
+      ).resolves.toEqual(['group:default/group1']);
+      expect(mockCatalogApi.getEntityByName).toBeCalledWith({
+        kind: 'user',
+        namespace: 'default',
+        name: 'user2',
+      });
+    });
+
+    it('gracefully handles missing user', async () => {
+      mockCatalogApi.getEntityByName.mockResolvedValueOnce(undefined);
+      await expect(
+        loadCatalogOwnerRefs(catalogApi, ['user:default/user2']),
+      ).resolves.toEqual([]);
+      expect(mockCatalogApi.getEntityByName).toBeCalledWith({
+        kind: 'user',
+        namespace: 'default',
+        name: 'user2',
+      });
+    });
+  });
+
+  describe('useEntityOwnership', () => {
+    it('matches ownership via token claims', async () => {
+      mockIdentityApi.getUserId.mockReturnValue('foo');
+      mockIdentityApi.getIdToken.mockResolvedValue(tokenUserAndGroupEnt);
+      mockCatalogApi.getEntityByName.mockResolvedValue(undefined);
+
+      const { result, waitForValueToChange } = renderHook(
+        () => useEntityOwnership(),
+        {
+          wrapper: Wrapper,
+        },
+      );
+
+      expect(result.current.loading).toBe(true);
+      expect(result.current.isOwnedEntity(ownedEntity)).toBe(false);
+
+      await waitForValueToChange(() => result.current.loading);
+
+      expect(result.current.loading).toBe(false);
+      expect(result.current.isOwnedEntity(ownedEntity)).toBe(true);
+    });
+
+    it('matches ownership via catalog user entity', async () => {
+      mockIdentityApi.getUserId.mockReturnValue('user2');
+      mockIdentityApi.getIdToken.mockResolvedValue(undefined);
+      mockCatalogApi.getEntityByName.mockResolvedValue(user2Entity);
+
+      const { result, waitForValueToChange } = renderHook(
+        () => useEntityOwnership(),
+        {
+          wrapper: Wrapper,
+        },
+      );
+
+      expect(result.current.loading).toBe(true);
+      expect(result.current.isOwnedEntity(ownedEntity)).toBe(false);
+
+      await waitForValueToChange(() => result.current.loading);
+
+      expect(result.current.loading).toBe(false);
+      expect(result.current.isOwnedEntity(ownedEntity)).toBe(true);
+
+      expect(mockCatalogApi.getEntityByName).toBeCalledWith({
+        kind: 'user',
+        namespace: 'default',
+        name: 'user2',
+      });
+    });
+  });
+});
diff --git a/plugins/catalog-react/src/hooks/useEntityOwnership.ts b/plugins/catalog-react/src/hooks/useEntityOwnership.ts
new file mode 100644
index 0000000000..aee903603a
--- /dev/null
+++ b/plugins/catalog-react/src/hooks/useEntityOwnership.ts
@@ -0,0 +1,149 @@
+/*
+ * Copyright 2021 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { CatalogApi } from '@backstage/catalog-client';
+import {
+  Entity,
+  EntityName,
+  parseEntityRef,
+  RELATION_MEMBER_OF,
+  RELATION_OWNED_BY,
+  stringifyEntityRef,
+} from '@backstage/catalog-model';
+import {
+  IdentityApi,
+  identityApiRef,
+  useApi,
+} from '@backstage/core-plugin-api';
+import jwtDecoder from 'jwt-decode';
+import { useMemo } from 'react';
+import { useAsync } from 'react-use';
+import { catalogApiRef } from '../api';
+import { getEntityRelations } from '../utils/getEntityRelations';
+
+// Takes a user ID from the identity, which can be on basically any form, and
+// returns an entity ref. E.g. if the input is "foo", it returns
+// "user:default/foo" to make sure it's a full ref.
+function extendUserId(id: string): string {
+  try {
+    const ref = parseEntityRef(id, {
+      defaultKind: 'User',
+      defaultNamespace: 'default',
+    });
+    return stringifyEntityRef(ref);
+  } catch {
+    return id;
+  }
+}
+
+// Takes the relevant parts of the Backstage identity, and translates them into
+// a list of entity refs on string form that represent the user's ownership
+// connections.
+export async function loadIdentityOwnerRefs(
+  identityApi: IdentityApi,
+): Promise<string[]> {
+  const id = identityApi.getUserId();
+  const token = await identityApi.getIdToken();
+  const result: string[] = [];
+
+  if (id) {
+    result.push(extendUserId(id));
+  }
+
+  if (token) {
+    try {
+      const decoded = jwtDecoder(token) as any;
+      if (decoded?.ent) {
+        [decoded.ent]
+          .flat()
+          .filter(x => typeof x === 'string')
+          .map(x => x.toLocaleLowerCase('en-US'))
+          .forEach(x => result.push(x));
+      }
+    } catch {
+      // ignore
+    }
+  }
+
+  return result;
+}
+
+// Takes the relevant parts of the User entity corresponding to the Backstage
+// identity, and translates them into a list of entity refs on string form that
+// represent the user's ownership connections.
+export async function loadCatalogOwnerRefs(
+  catalogApi: CatalogApi,
+  identityOwnerRefs: string[],
+): Promise<string[]> {
+  const result = new Array<string>();
+
+  const primaryUserRef = identityOwnerRefs.find(ref => ref.startsWith('user:'));
+  if (primaryUserRef) {
+    const entity = await catalogApi.getEntityByName(
+      parseEntityRef(primaryUserRef),
+    );
+    if (entity) {
+      const memberOf = getEntityRelations(entity, RELATION_MEMBER_OF, {
+        kind: 'Group',
+      });
+      for (const group of memberOf) {
+        result.push(stringifyEntityRef(group));
+      }
+    }
+  }
+
+  return result;
+}
+
+/**
+ * Returns a function that checks whether the currently signed-in user is an
+ * owner of a given entity. When the hook is initially mounted, the loading
+ * flag will be true and the results returned from the function will always be
+ * false.
+ */
+export function useEntityOwnership(): {
+  loading: boolean;
+  isOwnedEntity: (entity: Entity | EntityName) => boolean;
+} {
+  const identityApi = useApi(identityApiRef);
+  const catalogApi = useApi(catalogApiRef);
+
+  // Trigger load only on mount
+  const { loading, value: refs } = useAsync(async () => {
+    const identityRefs = await loadIdentityOwnerRefs(identityApi);
+    const catalogRefs = await loadCatalogOwnerRefs(catalogApi, identityRefs);
+    return new Set([...identityRefs, ...catalogRefs]);
+  }, []);
+
+  const isOwnedEntity = useMemo(() => {
+    const myOwnerRefs = new Set(refs ?? []);
+    return (entity: Entity | EntityName) => {
+      const entityOwnerRefs = (
+        'metadata' in entity
+          ? getEntityRelations(entity, RELATION_OWNED_BY)
+          : [entity]
+      ).map(stringifyEntityRef);
+      for (const ref of entityOwnerRefs) {
+        if (myOwnerRefs.has(ref)) {
+          return true;
+        }
+      }
+      return false;
+    };
+  }, [refs]);
+
+  return useMemo(() => ({ loading, isOwnedEntity }), [loading, isOwnedEntity]);
+}
diff --git a/plugins/catalog-react/src/hooks/useEntityTypeFilter.tsx b/plugins/catalog-react/src/hooks/useEntityTypeFilter.tsx
index 5fa6b0f1a2..5a8ed6775a 100644
--- a/plugins/catalog-react/src/hooks/useEntityTypeFilter.tsx
+++ b/plugins/catalog-react/src/hooks/useEntityTypeFilter.tsx
@@ -53,7 +53,11 @@ export function useEntityTypeFilter(): EntityTypeReturn {
 
   // Load all valid spec.type values straight from the catalogApi, paying attention to only the
   // kind filter for a complete list.
-  const { error, loading, value: entities } = useAsync(async () => {
+  const {
+    error,
+    loading,
+    value: entities,
+  } = useAsync(async () => {
     if (kind) {
       const items = await catalogApi
         .getEntities({
diff --git a/plugins/catalog-react/src/hooks/useRelatedEntities.ts b/plugins/catalog-react/src/hooks/useRelatedEntities.ts
index 83ed2baa58..6d6553c9e2 100644
--- a/plugins/catalog-react/src/hooks/useRelatedEntities.ts
+++ b/plugins/catalog-react/src/hooks/useRelatedEntities.ts
@@ -30,7 +30,11 @@ export function useRelatedEntities(
   error: Error | undefined;
 } {
   const catalogApi = useApi(catalogApiRef);
-  const { loading, value: entities, error } = useAsync(async () => {
+  const {
+    loading,
+    value: entities,
+    error,
+  } = useAsync(async () => {
     const relations =
       entity.relations &&
       entity.relations.filter(
diff --git a/plugins/catalog-react/src/index.ts b/plugins/catalog-react/src/index.ts
index 4ee613012d..4e005c0cdc 100644
--- a/plugins/catalog-react/src/index.ts
+++ b/plugins/catalog-react/src/index.ts
@@ -14,6 +14,7 @@
  * limitations under the License.
  */
 export type { CatalogApi } from '@backstage/catalog-client';
+export { CATALOG_FILTER_EXISTS } from '@backstage/catalog-client';
 export { catalogApiRef } from './api';
 export * from './components';
 export * from './hooks';
diff --git a/plugins/catalog-react/src/testUtils/providers.tsx b/plugins/catalog-react/src/testUtils/providers.tsx
index 3639715da2..2172f6c5a9 100644
--- a/plugins/catalog-react/src/testUtils/providers.tsx
+++ b/plugins/catalog-react/src/testUtils/providers.tsx
@@ -25,12 +25,12 @@ export const MockEntityListContextProvider = ({
   children,
   value,
 }: PropsWithChildren<{
-  value: Partial<EntityListContextProps>;
+  value?: Partial<EntityListContextProps>;
 }>) => {
   // Provides a default implementation that stores filter state, for testing components that
   // reflect filter state.
   const [filters, setFilters] = useState<DefaultEntityFilters>(
-    value.filters ?? {},
+    value?.filters ?? {},
   );
   const updateFilters = useCallback(
     (
@@ -52,15 +52,15 @@ export const MockEntityListContextProvider = ({
   const defaultContext: EntityListContextProps = {
     entities: [],
     backendEntities: [],
-    updateFilters: updateFilters,
-    filters: filters,
+    updateFilters,
+    filters,
     loading: false,
     queryParameters: {},
   };
 
   // Extract value.filters to avoid overwriting it; some tests exercise filter updates. The value
   // provided is used as the initial seed in useState above.
-  const { filters: _, ...otherContextFields } = value;
+  const { filters: _, ...otherContextFields } = value ?? {};
 
   return (
     <EntityListContext.Provider
diff --git a/plugins/catalog-react/src/types.ts b/plugins/catalog-react/src/types.ts
index 4ac7644ee1..c5612fdf3f 100644
--- a/plugins/catalog-react/src/types.ts
+++ b/plugins/catalog-react/src/types.ts
@@ -23,7 +23,10 @@ export type EntityFilter = {
    *   { field: 'kind', values: ['component'] }
    *   { field: 'metadata.name', values: ['component-1', 'component-2'] }
    */
-  getCatalogFilters?: () => Record<string, string | string[]>;
+  getCatalogFilters?: () => Record<
+    string,
+    string | symbol | (string | symbol)[]
+  >;
 
   /**
    * Filter entities on the frontend after a catalog-backend request. This function will be called
diff --git a/plugins/catalog-react/src/utils/filters.ts b/plugins/catalog-react/src/utils/filters.ts
index b3683beea0..109e864c52 100644
--- a/plugins/catalog-react/src/utils/filters.ts
+++ b/plugins/catalog-react/src/utils/filters.ts
@@ -19,13 +19,13 @@ import { EntityFilter } from '../types';
 
 export function reduceCatalogFilters(
   filters: EntityFilter[],
-): Record<string, string | string[]> {
+): Record<string, string | symbol | (string | symbol)[]> {
   return filters.reduce((compoundFilter, filter) => {
     return {
       ...compoundFilter,
       ...(filter.getCatalogFilters ? filter.getCatalogFilters() : {}),
     };
-  }, {} as Record<string, string | string[]>);
+  }, {} as Record<string, string | symbol | (string | symbol)[]>);
 }
 
 export function reduceEntityFilters(
diff --git a/plugins/catalog-react/src/utils/isOwnerOf.ts b/plugins/catalog-react/src/utils/isOwnerOf.ts
index e62a0db1ba..38ad90e4a6 100644
--- a/plugins/catalog-react/src/utils/isOwnerOf.ts
+++ b/plugins/catalog-react/src/utils/isOwnerOf.ts
@@ -16,10 +16,10 @@
 
 import {
   Entity,
-  EntityName,
   getEntityName,
   RELATION_MEMBER_OF,
   RELATION_OWNED_BY,
+  stringifyEntityRef,
 } from '@backstage/catalog-model';
 import { getEntityRelations } from './getEntityRelations';
 
@@ -27,22 +27,19 @@ import { getEntityRelations } from './getEntityRelations';
  * Get the related entity references.
  */
 export function isOwnerOf(owner: Entity, owned: Entity) {
-  const possibleOwners: EntityName[] = [
-    ...getEntityRelations(owner, RELATION_MEMBER_OF, { kind: 'group' }),
-    ...(owner ? [getEntityName(owner)] : []),
-  ];
+  const possibleOwners = new Set(
+    [
+      ...getEntityRelations(owner, RELATION_MEMBER_OF, { kind: 'group' }),
+      ...(owner ? [getEntityName(owner)] : []),
+    ].map(stringifyEntityRef),
+  );
 
-  const owners = getEntityRelations(owned, RELATION_OWNED_BY);
+  const owners = getEntityRelations(owned, RELATION_OWNED_BY).map(
+    stringifyEntityRef,
+  );
 
   for (const ownerItem of owners) {
-    if (
-      possibleOwners.find(
-        o =>
-          ownerItem.kind.toLowerCase() === o.kind.toLowerCase() &&
-          ownerItem.namespace.toLowerCase() === o.namespace.toLowerCase() &&
-          ownerItem.name.toLowerCase() === o.name.toLowerCase(),
-      ) !== undefined
-    ) {
+    if (possibleOwners.has(ownerItem)) {
       return true;
     }
   }
diff --git a/plugins/catalog/CHANGELOG.md b/plugins/catalog/CHANGELOG.md
index 0faa012cf3..c2d3f7191c 100644
--- a/plugins/catalog/CHANGELOG.md
+++ b/plugins/catalog/CHANGELOG.md
@@ -1,5 +1,150 @@
 # @backstage/plugin-catalog
 
+## 0.6.14
+
+### Patch Changes
+
+- 10db3ce09: Update the `AboutCard` to properly support non-standard entity types and rework the defaults for the build-in kinds.
+
+  This change also uses `useElementFilter(...)` instead of `React.children.count(...)` in `AboutField` to properly recognize whether children are available.
+
+- 7e5f14dda: This change hides pagination counter of search tables and group members list when results fit in one page
+- 3ed78fca3: Added the ability to switch entity kind on the catalog index page. This is a non-breaking change, but if you created a custom `CatalogPage` and wish to use this feature, make the modifications shown on [#6895](https://github.com/backstage/backstage/pull/6895).
+- aaa1dd17b: Use a `Link` for the edit button on the `AboutCard` instead of doing `window.open(...)`
+- Updated dependencies
+  - @backstage/plugin-catalog-react@0.4.5
+  - @backstage/integration@0.6.3
+  - @backstage/core-components@0.4.0
+  - @backstage/catalog-model@0.9.1
+  - @backstage/integration-react@0.1.8
+
+## 0.6.13
+
+### Patch Changes
+
+- 787bc0826: **NOTE**: The entity `<AboutCard />` now uses an external route ref to link to
+  TechDocs sites. This external route must now be bound in order for the "View
+  TechDocs" link to continue working. See the [create-app changelog][cacl] for
+  details.
+
+  [cacl]: https://github.com/backstage/backstage/blob/master/packages/create-app/CHANGELOG.md
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@0.4.4
+  - @backstage/core-components@0.3.3
+  - @backstage/integration@0.6.2
+
+## 0.6.12
+
+### Patch Changes
+
+- fa1e003e0: Show a Not Found message when navigating to a nonexistent entity
+- 2105d608f: Migrate and export `UnregisterEntityDialog` component from `catalog-react` package
+- Updated dependencies
+  - @backstage/plugin-catalog-react@0.4.3
+  - @backstage/core-components@0.3.2
+  - @backstage/integration@0.6.1
+  - @backstage/theme@0.2.10
+
+## 0.6.11
+
+### Patch Changes
+
+- 56c773909: Switched `@types/react` dependency to request `*` rather than a specific version.
+- a440d3b38: Move and rename `FavoriteEntity` component to `catalog-react`
+- Updated dependencies
+  - @backstage/integration@0.6.0
+  - @backstage/core-components@0.3.1
+  - @backstage/core-plugin-api@0.1.6
+  - @backstage/plugin-catalog-react@0.4.2
+  - @backstage/integration-react@0.1.7
+
+## 0.6.10
+
+### Patch Changes
+
+- cf4635f93: Fix bug with re-rendering the EntityRoutes when the entity changes but the route does not
+- 7b8aa8d0d: Move the `CreateComponentButton` from the catalog plugin to the `core-components` & rename it to `CreateButton` to be reused inside the api-docs plugin & scaffolder plugin, but also future plugins. Additionally, improve responsiveness of `CreateButton` & `SupportButton` by shrinking them to `IconButtons` on smaller screens.
+- Updated dependencies
+  - @backstage/core-components@0.3.0
+  - @backstage/core-plugin-api@0.1.5
+  - @backstage/integration@0.5.9
+  - @backstage/integration-react@0.1.6
+  - @backstage/plugin-catalog-react@0.4.1
+
+## 0.6.9
+
+### Patch Changes
+
+- 19d9995b6: Improve accessibility of core & catalog components by adjusting them with non-breaking changes.
+- 9d40fcb1e: - Bumping `material-ui/core` version to at least `4.12.2` as they made some breaking changes in later versions which broke `Pagination` of the `Table`.
+  - Switching out `material-table` to `@material-table/core` for support for the later versions of `material-ui/core`
+  - This causes a minor API change to `@backstage/core-components` as the interface for `Table` re-exports the `prop` from the underlying `Table` components.
+  - `onChangeRowsPerPage` has been renamed to `onRowsPerPageChange`
+  - `onChangePage` has been renamed to `onPageChange`
+  - Migration guide is here: https://material-table-core.com/docs/breaking-changes
+- 224e54484: Added an `EntityProcessingErrorsPanel` component to show any errors that occurred when refreshing an entity from its source location.
+
+  If upgrading, this should be added to your `EntityPage` in your Backstage application:
+
+  ```diff
+  // packages/app/src/components/catalog/EntityPage.tsx
+
+  const overviewContent = (
+  ...
+            <EntityOrphanWarning />
+          </Grid>
+         </EntitySwitch.Case>
+      </EntitySwitch>
+  +   <EntitySwitch>
+  +     <EntitySwitch.Case if={hasCatalogProcessingErrors}>
+  +       <Grid item xs={12}>
+  +         <EntityProcessingErrorsPanel />
+  +       </Grid>
+  +     </EntitySwitch.Case>
+  +   </EntitySwitch>
+
+  ```
+
+  Additionally, `WarningPanel` now changes color based on the provided severity.
+
+- Updated dependencies
+  - @backstage/core-components@0.2.0
+  - @backstage/plugin-catalog-react@0.4.0
+  - @backstage/core-plugin-api@0.1.4
+  - @backstage/integration-react@0.1.5
+  - @backstage/theme@0.2.9
+  - @backstage/catalog-client@0.3.18
+
+## 0.6.8
+
+### Patch Changes
+
+- 221d7d060: added retry callback to useEntity hook
+- 45b5fc3a8: Updated the layout of catalog and API index pages to handle smaller screen sizes. This adds responsive wrappers to the entity tables, and switches filters to a drawer when width-constrained. If you have created a custom catalog or API index page, you will need to update the page structure to match the updated [catalog customization](https://backstage.io/docs/features/software-catalog/catalog-customization) documentation.
+- 71c936eb6: Export `CatalogClientWrapper` class
+- 03bf17e9b: Improve the responsiveness of the EntityPage UI. With this the Header component should scale with the screen size & wrapping should not cause overflowing/blocking of links. Additionally enforce the Pages using the Grid Layout to use it across all screen sizes & to wrap as intended.
+
+  To benefit from the improved responsive layout, the `EntityPage` in existing Backstage applications should be updated to set the `xs` column size on each grid item in the page, as this does not default. For example:
+
+  ```diff
+  -  <Grid item md={6}>
+  +  <Grid item xs={12} md={6}>
+  ```
+
+- Updated dependencies
+  - @backstage/core-components@0.1.6
+  - @backstage/catalog-client@0.3.17
+  - @backstage/plugin-catalog-react@0.3.1
+
+## 0.6.7
+
+### Patch Changes
+
+- 75a532fbe: Add unstable prop for disabling unregister entity menu
+- Updated dependencies
+  - @backstage/plugin-catalog-react@0.3.0
+
 ## 0.6.6
 
 ### Patch Changes
diff --git a/plugins/catalog/README.md b/plugins/catalog/README.md
index 8527c8da7c..ef7b0a2863 100644
--- a/plugins/catalog/README.md
+++ b/plugins/catalog/README.md
@@ -80,7 +80,7 @@ sidebar:
 export const Root = ({ children }: PropsWithChildren<{}>) => (
   <SidebarPage>
     <Sidebar>
-+      <SidebarItem icon={HomeIcon} to="/catalog" text="Home" />
++      <SidebarItem icon={HomeIcon} to="catalog" text="Home" />
       ...
     </Sidebar>
 ```
diff --git a/plugins/catalog/api-report.md b/plugins/catalog/api-report.md
index 86b2322246..689c617158 100644
--- a/plugins/catalog/api-report.md
+++ b/plugins/catalog/api-report.md
@@ -5,12 +5,21 @@
 ```ts
 /// <reference types="react" />
 
+import { AddLocationRequest } from '@backstage/catalog-client';
+import { AddLocationResponse } from '@backstage/catalog-client';
 import { BackstagePlugin } from '@backstage/core-plugin-api';
+import { CatalogApi } from '@backstage/catalog-client';
+import { CatalogClient } from '@backstage/catalog-client';
+import { CatalogEntitiesRequest } from '@backstage/catalog-client';
+import { CatalogListResponse } from '@backstage/catalog-client';
+import { CatalogRequestOptions } from '@backstage/catalog-client';
 import { Entity } from '@backstage/catalog-model';
 import { EntityName } from '@backstage/catalog-model';
 import { ExternalRouteRef } from '@backstage/core-plugin-api';
 import { IconComponent } from '@backstage/core-plugin-api';
+import { IdentityApi } from '@backstage/core-plugin-api';
 import { InfoCardVariants } from '@backstage/core-components';
+import { Location as Location_2 } from '@backstage/catalog-model';
 import { PropsWithChildren } from 'react';
 import { default as React_2 } from 'react';
 import { ReactNode } from 'react';
@@ -20,33 +29,101 @@ import { TableProps } from '@backstage/core-components';
 import { TabProps } from '@material-ui/core';
 import { UserListFilterKind } from '@backstage/plugin-catalog-react';
 
+// Warning: (ae-forgotten-export) The symbol "AboutCardProps" needs to be exported by the entry point index.d.ts
+// Warning: (ae-missing-release-tag) "AboutCard" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export function AboutCard({ variant }: AboutCardProps): JSX.Element;
 
+// Warning: (ae-forgotten-export) The symbol "Props" needs to be exported by the entry point index.d.ts
+// Warning: (ae-missing-release-tag) "AboutContent" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
-export const AboutContent: ({ entity }: Props_2) => JSX.Element;
+export const AboutContent: ({ entity }: Props) => JSX.Element;
 
+// Warning: (ae-forgotten-export) The symbol "Props" needs to be exported by the entry point index.d.ts
+// Warning: (ae-missing-release-tag) "AboutField" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export const AboutField: ({
   label,
   value,
   gridSizes,
   children,
-}: Props_3) => JSX.Element;
+}: Props_2) => JSX.Element;
 
+// Warning: (ae-missing-release-tag) "CatalogClientWrapper" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
+// @public
+export class CatalogClientWrapper implements CatalogApi {
+  constructor(options: { client: CatalogClient; identityApi: IdentityApi });
+  // (undocumented)
+  addLocation(
+    request: AddLocationRequest,
+    options?: CatalogRequestOptions,
+  ): Promise<AddLocationResponse>;
+  // (undocumented)
+  getEntities(
+    request?: CatalogEntitiesRequest,
+    options?: CatalogRequestOptions,
+  ): Promise<CatalogListResponse<Entity>>;
+  // (undocumented)
+  getEntityByName(
+    compoundName: EntityName,
+    options?: CatalogRequestOptions,
+  ): Promise<Entity | undefined>;
+  // (undocumented)
+  getLocationByEntity(
+    entity: Entity,
+    options?: CatalogRequestOptions,
+  ): Promise<Location_2 | undefined>;
+  // (undocumented)
+  getLocationById(
+    id: string,
+    options?: CatalogRequestOptions,
+  ): Promise<Location_2 | undefined>;
+  // (undocumented)
+  getOriginLocationByEntity(
+    entity: Entity,
+    options?: CatalogRequestOptions,
+  ): Promise<Location_2 | undefined>;
+  // (undocumented)
+  removeEntityByUid(
+    uid: string,
+    options?: CatalogRequestOptions,
+  ): Promise<void>;
+  // (undocumented)
+  removeLocationById(
+    id: string,
+    options?: CatalogRequestOptions,
+  ): Promise<void>;
+}
+
+// Warning: (ae-missing-release-tag) "CatalogEntityPage" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export const CatalogEntityPage: () => JSX.Element;
 
+// Warning: (ae-forgotten-export) The symbol "CatalogPageProps" needs to be exported by the entry point index.d.ts
+// Warning: (ae-missing-release-tag) "CatalogIndexPage" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export const CatalogIndexPage: ({
-  initiallySelectedFilter,
   columns,
   actions,
+  initiallySelectedFilter,
 }: CatalogPageProps) => JSX.Element;
 
+// Warning: (ae-forgotten-export) The symbol "CatalogKindHeaderProps" needs to be exported by the entry point index.d.ts
+// Warning: (ae-missing-release-tag) "CatalogKindHeader" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
-export const CatalogLayout: ({ children }: Props) => JSX.Element;
+export const CatalogKindHeader: ({
+  initialFilter,
+}: CatalogKindHeaderProps) => JSX.Element;
 
+// Warning: (ae-missing-release-tag) "catalogPlugin" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 const catalogPlugin: BackstagePlugin<
   {
@@ -59,20 +136,34 @@ const catalogPlugin: BackstagePlugin<
   },
   {
     createComponent: ExternalRouteRef<undefined, true>;
+    viewTechDoc: ExternalRouteRef<
+      {
+        name: string;
+        kind: string;
+        namespace: string;
+      },
+      true
+    >;
   }
 >;
 export { catalogPlugin };
 export { catalogPlugin as plugin };
 
+// Warning: (ae-missing-release-tag) "CatalogResultListItem" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export const CatalogResultListItem: ({ result }: any) => JSX.Element;
 
+// Warning: (ae-missing-release-tag) "CatalogTable" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export const CatalogTable: {
   ({ columns, actions }: CatalogTableProps): JSX.Element;
   columns: typeof columnFactories;
 };
 
+// Warning: (ae-missing-release-tag) "EntityRow" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export type CatalogTableRow = {
   entity: Entity;
@@ -85,35 +176,51 @@ export type CatalogTableRow = {
   };
 };
 
-// @public (undocumented)
-export const CreateComponentButton: () => JSX.Element | null;
-
+// Warning: (ae-missing-release-tag) "createMetadataDescriptionColumn" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export function createMetadataDescriptionColumn(): TableColumn<CatalogTableRow>;
 
+// Warning: (ae-forgotten-export) The symbol "NameColumnProps" needs to be exported by the entry point index.d.ts
+// Warning: (ae-missing-release-tag) "createNameColumn" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export function createNameColumn(
   props?: NameColumnProps,
 ): TableColumn<CatalogTableRow>;
 
+// Warning: (ae-missing-release-tag) "createOwnerColumn" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export function createOwnerColumn(): TableColumn<CatalogTableRow>;
 
+// Warning: (ae-missing-release-tag) "createSpecLifecycleColumn" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export function createSpecLifecycleColumn(): TableColumn<CatalogTableRow>;
 
+// Warning: (ae-missing-release-tag) "createSpecTypeColumn" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export function createSpecTypeColumn(): TableColumn<CatalogTableRow>;
 
+// Warning: (ae-missing-release-tag) "createSystemColumn" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export function createSystemColumn(): TableColumn<CatalogTableRow>;
 
+// Warning: (ae-missing-release-tag) "createTagsColumn" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export function createTagsColumn(): TableColumn<CatalogTableRow>;
 
+// Warning: (ae-missing-release-tag) "EntityAboutCard" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export const EntityAboutCard: AboutCard;
 
+// Warning: (ae-missing-release-tag) "EntityDependencyOfComponentsCard" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export const EntityDependencyOfComponentsCard: ({
   variant,
@@ -123,6 +230,8 @@ export const EntityDependencyOfComponentsCard: ({
   title?: string | undefined;
 }) => JSX.Element;
 
+// Warning: (ae-missing-release-tag) "EntityDependsOnComponentsCard" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export const EntityDependsOnComponentsCard: ({
   variant,
@@ -132,6 +241,8 @@ export const EntityDependsOnComponentsCard: ({
   title?: string | undefined;
 }) => JSX.Element;
 
+// Warning: (ae-missing-release-tag) "EntityDependsOnResourcesCard" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export const EntityDependsOnResourcesCard: ({
   variant,
@@ -139,6 +250,8 @@ export const EntityDependsOnResourcesCard: ({
   variant?: 'gridItem' | undefined;
 }) => JSX.Element;
 
+// Warning: (ae-missing-release-tag) "EntityHasComponentsCard" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export const EntityHasComponentsCard: ({
   variant,
@@ -146,6 +259,8 @@ export const EntityHasComponentsCard: ({
   variant?: 'gridItem' | undefined;
 }) => JSX.Element;
 
+// Warning: (ae-missing-release-tag) "EntityHasResourcesCard" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export const EntityHasResourcesCard: ({
   variant,
@@ -153,6 +268,8 @@ export const EntityHasResourcesCard: ({
   variant?: 'gridItem' | undefined;
 }) => JSX.Element;
 
+// Warning: (ae-missing-release-tag) "EntityHasSubcomponentsCard" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export const EntityHasSubcomponentsCard: ({
   variant,
@@ -160,6 +277,8 @@ export const EntityHasSubcomponentsCard: ({
   variant?: 'gridItem' | undefined;
 }) => JSX.Element;
 
+// Warning: (ae-missing-release-tag) "EntityHasSystemsCard" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export const EntityHasSystemsCard: ({
   variant,
@@ -167,6 +286,8 @@ export const EntityHasSystemsCard: ({
   variant?: 'gridItem' | undefined;
 }) => JSX.Element;
 
+// Warning: (ae-missing-release-tag) "EntityLayout" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public
 export const EntityLayout: {
   ({
@@ -177,6 +298,8 @@ export const EntityLayout: {
   Route: (props: SubRoute) => null;
 };
 
+// Warning: (ae-missing-release-tag) "EntityLinksCard" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export const EntityLinksCard: ({
   cols,
@@ -187,9 +310,20 @@ export const EntityLinksCard: ({
   variant?: 'gridItem' | undefined;
 }) => JSX.Element;
 
+// Warning: (ae-missing-release-tag) "EntityListContainer" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
+// @public (undocumented)
+export const EntityListContainer: ({
+  children,
+}: PropsWithChildren<{}>) => JSX.Element;
+
+// Warning: (ae-missing-release-tag) "EntityOrphanWarning" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public
 export const EntityOrphanWarning: () => JSX.Element;
 
+// Warning: (ae-missing-release-tag) "EntityPageLayout" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export const EntityPageLayout: {
   ({
@@ -204,6 +338,13 @@ export const EntityPageLayout: {
   }) => null;
 };
 
+// Warning: (ae-missing-release-tag) "EntityProcessingErrorsPanel" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
+// @public
+export const EntityProcessingErrorsPanel: () => JSX.Element;
+
+// Warning: (ae-missing-release-tag) "EntitySwitch" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export const EntitySwitch: {
   ({ children }: PropsWithChildren<{}>): JSX.Element | null;
@@ -213,21 +354,53 @@ export const EntitySwitch: {
   }) => null;
 };
 
+// Warning: (ae-forgotten-export) The symbol "SystemDiagramCard" needs to be exported by the entry point index.d.ts
+// Warning: (ae-missing-release-tag) "EntitySystemDiagramCard" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export const EntitySystemDiagramCard: SystemDiagramCard;
 
+// Warning: (ae-missing-release-tag) "FilterContainer" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
+// @public (undocumented)
+export const FilterContainer: ({
+  children,
+}: PropsWithChildren<{}>) => JSX.Element;
+
+// Warning: (ae-missing-release-tag) "FilteredEntityLayout" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
+// @public (undocumented)
+export const FilteredEntityLayout: ({
+  children,
+}: PropsWithChildren<{}>) => JSX.Element;
+
+// Warning: (ae-missing-release-tag) "hasCatalogProcessingErrors" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
+// @public (undocumented)
+export const hasCatalogProcessingErrors: (entity: Entity) => boolean;
+
+// Warning: (ae-missing-release-tag) "isComponentType" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export function isComponentType(type: string): (entity: Entity) => boolean;
 
+// Warning: (ae-missing-release-tag) "isKind" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export function isKind(kind: string): (entity: Entity) => boolean;
 
+// Warning: (ae-missing-release-tag) "isNamespace" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export function isNamespace(namespace: string): (entity: Entity) => boolean;
 
+// Warning: (ae-missing-release-tag) "isOrphan" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export const isOrphan: (entity: Entity) => boolean;
 
+// Warning: (ae-missing-release-tag) "Router" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export const Router: ({
   EntityPage,
@@ -235,5 +408,14 @@ export const Router: ({
   EntityPage?: React_2.ComponentType<{}> | undefined;
 }) => JSX.Element;
 
+// Warnings were encountered during analysis:
+//
+// src/components/CatalogTable/CatalogTable.d.ts:10:5 - (ae-forgotten-export) The symbol "CatalogTableProps" needs to be exported by the entry point index.d.ts
+// src/components/CatalogTable/CatalogTable.d.ts:11:5 - (ae-forgotten-export) The symbol "columnFactories" needs to be exported by the entry point index.d.ts
+// src/components/EntityLayout/EntityLayout.d.ts:43:5 - (ae-forgotten-export) The symbol "EntityLayoutProps" needs to be exported by the entry point index.d.ts
+// src/components/EntityLayout/EntityLayout.d.ts:44:5 - (ae-forgotten-export) The symbol "SubRoute" needs to be exported by the entry point index.d.ts
+// src/components/EntityPageLayout/EntityPageLayout.d.ts:17:5 - (ae-forgotten-export) The symbol "EntityPageLayoutProps" needs to be exported by the entry point index.d.ts
+// src/plugin.d.ts:22:5 - (ae-forgotten-export) The symbol "ColumnBreakpoints" needs to be exported by the entry point index.d.ts
+
 // (No @packageDocumentation comment for this package)
 ```
diff --git a/plugins/catalog/package.json b/plugins/catalog/package.json
index 2c5065755d..b7a843d954 100644
--- a/plugins/catalog/package.json
+++ b/plugins/catalog/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-catalog",
-  "version": "0.6.6",
+  "version": "0.6.14",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -30,21 +30,21 @@
     "clean": "backstage-cli clean"
   },
   "dependencies": {
-    "@backstage/catalog-client": "^0.3.16",
-    "@backstage/catalog-model": "^0.9.0",
-    "@backstage/core-components": "^0.1.5",
-    "@backstage/core-plugin-api": "^0.1.3",
+    "@backstage/catalog-client": "^0.3.18",
+    "@backstage/catalog-model": "^0.9.1",
+    "@backstage/core-components": "^0.4.1",
+    "@backstage/core-plugin-api": "^0.1.7",
     "@backstage/errors": "^0.1.1",
-    "@backstage/integration": "^0.5.8",
-    "@backstage/integration-react": "^0.1.4",
-    "@backstage/plugin-catalog-react": "^0.2.6",
-    "@backstage/theme": "^0.2.8",
-    "@material-ui/core": "^4.11.0",
+    "@backstage/integration": "^0.6.3",
+    "@backstage/integration-react": "^0.1.8",
+    "@backstage/plugin-catalog-react": "^0.4.5",
+    "@backstage/theme": "^0.2.10",
+    "@material-ui/core": "^4.12.2",
     "@material-ui/icons": "^4.9.1",
     "@material-ui/lab": "4.0.0-alpha.45",
-    "@types/react": "^16.9",
+    "@types/react": "*",
     "classnames": "^2.2.6",
-    "git-url-parse": "~11.4.4",
+    "git-url-parse": "^11.6.0",
     "lodash": "^4.17.21",
     "react": "^16.13.1",
     "react-dom": "^16.13.1",
@@ -54,10 +54,10 @@
     "react-use": "^17.2.4"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.7.3",
-    "@backstage/core-app-api": "^0.1.4",
-    "@backstage/dev-utils": "^0.2.1",
-    "@backstage/test-utils": "^0.1.14",
+    "@backstage/cli": "^0.7.11",
+    "@backstage/core-app-api": "^0.1.12",
+    "@backstage/dev-utils": "^0.2.9",
+    "@backstage/test-utils": "^0.1.17",
     "@testing-library/jest-dom": "^5.10.1",
     "@testing-library/react": "^11.2.5",
     "@testing-library/react-hooks": "^3.3.0",
diff --git a/plugins/catalog/src/CatalogClientWrapper.ts b/plugins/catalog/src/CatalogClientWrapper.ts
index a10b968216..a46edb56b7 100644
--- a/plugins/catalog/src/CatalogClientWrapper.ts
+++ b/plugins/catalog/src/CatalogClientWrapper.ts
@@ -19,16 +19,13 @@ import {
   AddLocationRequest,
   AddLocationResponse,
   CatalogApi,
+  CatalogClient,
   CatalogEntitiesRequest,
   CatalogListResponse,
-  CatalogClient,
+  CatalogRequestOptions,
 } from '@backstage/catalog-client';
 import { IdentityApi } from '@backstage/core-plugin-api';
 
-type CatalogRequestOptions = {
-  token?: string;
-};
-
 /**
  * CatalogClient wrapper that injects identity token for all requests
  */
diff --git a/plugins/catalog/src/components/AboutCard/AboutCard.test.tsx b/plugins/catalog/src/components/AboutCard/AboutCard.test.tsx
index 70b9781ec8..6c85ebcab7 100644
--- a/plugins/catalog/src/components/AboutCard/AboutCard.test.tsx
+++ b/plugins/catalog/src/components/AboutCard/AboutCard.test.tsx
@@ -15,20 +15,20 @@
  */
 
 import { RELATION_OWNED_BY } from '@backstage/catalog-model';
+import {
+  ApiProvider,
+  ApiRegistry,
+  ConfigReader,
+} from '@backstage/core-app-api';
 import {
   ScmIntegrationsApi,
   scmIntegrationsApiRef,
 } from '@backstage/integration-react';
 import { EntityProvider } from '@backstage/plugin-catalog-react';
 import { renderInTestApp } from '@backstage/test-utils';
-import { act, fireEvent } from '@testing-library/react';
 import React from 'react';
+import { viewTechDocRouteRef } from '../../routes';
 import { AboutCard } from './AboutCard';
-import {
-  ApiProvider,
-  ApiRegistry,
-  ConfigReader,
-} from '@backstage/core-app-api';
 
 describe('<AboutCard />', () => {
   it('renders info', async () => {
@@ -165,14 +165,10 @@ describe('<AboutCard />', () => {
       </ApiProvider>,
     );
 
-    const editButton = getByTitle('Edit Metadata');
-    window.open = jest.fn();
-    await act(async () => {
-      fireEvent.click(editButton);
-    });
-    expect(window.open).toHaveBeenCalledWith(
-      `https://github.com/backstage/backstage/edit/master/software.yaml`,
-      '_blank',
+    const editLink = getByTitle('Edit Metadata').closest('a');
+    expect(editLink).toHaveAttribute(
+      'href',
+      'https://github.com/backstage/backstage/edit/master/software.yaml',
     );
   });
 
@@ -203,4 +199,138 @@ describe('<AboutCard />', () => {
     );
     expect(getByText('View Source').closest('a')).not.toHaveAttribute('href');
   });
+
+  it('renders techdocs link', async () => {
+    const entity = {
+      apiVersion: 'v1',
+      kind: 'Component',
+      metadata: {
+        name: 'software',
+        annotations: {
+          'backstage.io/techdocs-ref': './',
+        },
+      },
+      spec: {
+        owner: 'guest',
+        type: 'service',
+        lifecycle: 'production',
+      },
+    };
+    const apis = ApiRegistry.with(
+      scmIntegrationsApiRef,
+      ScmIntegrationsApi.fromConfig(
+        new ConfigReader({
+          integrations: {
+            github: [
+              {
+                host: 'github.com',
+                token: '...',
+              },
+            ],
+          },
+        }),
+      ),
+    );
+
+    const { getByText } = await renderInTestApp(
+      <ApiProvider apis={apis}>
+        <EntityProvider entity={entity}>
+          <AboutCard />
+        </EntityProvider>
+      </ApiProvider>,
+      {
+        mountedRoutes: {
+          '/docs/:namespace/:kind/:name': viewTechDocRouteRef,
+        },
+      },
+    );
+
+    expect(getByText('View TechDocs').closest('a')).toHaveAttribute(
+      'href',
+      '/docs/default/Component/software',
+    );
+  });
+
+  it('renders disabled techdocs link when no docs exist', async () => {
+    const entity = {
+      apiVersion: 'v1',
+      kind: 'Component',
+      metadata: {
+        name: 'software',
+      },
+      spec: {
+        owner: 'guest',
+        type: 'service',
+        lifecycle: 'production',
+      },
+    };
+    const apis = ApiRegistry.with(
+      scmIntegrationsApiRef,
+      ScmIntegrationsApi.fromConfig(
+        new ConfigReader({
+          integrations: {
+            github: [
+              {
+                host: 'github.com',
+                token: '...',
+              },
+            ],
+          },
+        }),
+      ),
+    );
+
+    const { getByText } = await renderInTestApp(
+      <ApiProvider apis={apis}>
+        <EntityProvider entity={entity}>
+          <AboutCard />
+        </EntityProvider>
+      </ApiProvider>,
+    );
+
+    expect(getByText('View TechDocs').closest('a')).not.toHaveAttribute('href');
+  });
+
+  it('renders disbaled techdocs link when route is not bound', async () => {
+    const entity = {
+      apiVersion: 'v1',
+      kind: 'Component',
+      metadata: {
+        name: 'software',
+        annotations: {
+          'backstage.io/techdocs-ref': './',
+        },
+      },
+      spec: {
+        owner: 'guest',
+        type: 'service',
+        lifecycle: 'production',
+      },
+    };
+    const apis = ApiRegistry.with(
+      scmIntegrationsApiRef,
+      ScmIntegrationsApi.fromConfig(
+        new ConfigReader({
+          integrations: {
+            github: [
+              {
+                host: 'github.com',
+                token: '...',
+              },
+            ],
+          },
+        }),
+      ),
+    );
+
+    const { getByText } = await renderInTestApp(
+      <ApiProvider apis={apis}>
+        <EntityProvider entity={entity}>
+          <AboutCard />
+        </EntityProvider>
+      </ApiProvider>,
+    );
+
+    expect(getByText('View TechDocs').closest('a')).not.toHaveAttribute('href');
+  });
 });
diff --git a/plugins/catalog/src/components/AboutCard/AboutCard.tsx b/plugins/catalog/src/components/AboutCard/AboutCard.tsx
index d6227f9344..582b464afa 100644
--- a/plugins/catalog/src/components/AboutCard/AboutCard.tsx
+++ b/plugins/catalog/src/components/AboutCard/AboutCard.tsx
@@ -20,6 +20,13 @@ import {
   RELATION_CONSUMES_API,
   RELATION_PROVIDES_API,
 } from '@backstage/catalog-model';
+import {
+  HeaderIconLinkRow,
+  IconLinkVerticalProps,
+  InfoCardVariants,
+  Link,
+} from '@backstage/core-components';
+import { useApi, useRouteRef } from '@backstage/core-plugin-api';
 import {
   ScmIntegrationIcon,
   scmIntegrationsApiRef,
@@ -42,15 +49,9 @@ import DocsIcon from '@material-ui/icons/Description';
 import EditIcon from '@material-ui/icons/Edit';
 import ExtensionIcon from '@material-ui/icons/Extension';
 import React from 'react';
+import { viewTechDocRouteRef } from '../../routes';
 import { AboutContent } from './AboutContent';
 
-import {
-  HeaderIconLinkRow,
-  IconLinkVerticalProps,
-  InfoCardVariants,
-} from '@backstage/core-components';
-import { useApi } from '@backstage/core-plugin-api';
-
 const useStyles = makeStyles({
   gridItemCard: {
     display: 'flex',
@@ -81,6 +82,8 @@ export function AboutCard({ variant }: AboutCardProps) {
   const classes = useStyles();
   const { entity } = useEntity();
   const scmIntegrationsApi = useApi(scmIntegrationsApiRef);
+  const viewTechdocLink = useRouteRef(viewTechDocRouteRef);
+
   const entitySourceLocation = getEntitySourceLocation(
     entity,
     scmIntegrationsApi,
@@ -105,11 +108,17 @@ export function AboutCard({ variant }: AboutCardProps) {
   };
   const viewInTechDocs: IconLinkVerticalProps = {
     label: 'View TechDocs',
-    disabled: !entity.metadata.annotations?.['backstage.io/techdocs-ref'],
+    disabled:
+      !entity.metadata.annotations?.['backstage.io/techdocs-ref'] ||
+      !viewTechdocLink,
     icon: <DocsIcon />,
-    href: `/docs/${entity.metadata.namespace || ENTITY_DEFAULT_NAMESPACE}/${
-      entity.kind
-    }/${entity.metadata.name}`,
+    href:
+      viewTechdocLink &&
+      viewTechdocLink({
+        namespace: entity.metadata.namespace || ENTITY_DEFAULT_NAMESPACE,
+        kind: entity.kind,
+        name: entity.metadata.name,
+      }),
   };
   const viewApi: IconLinkVerticalProps = {
     title: hasApis ? '' : 'No APIs available',
@@ -139,12 +148,11 @@ export function AboutCard({ variant }: AboutCardProps) {
         title="About"
         action={
           <IconButton
+            component={Link}
             aria-label="Edit"
             disabled={!entityMetadataEditUrl}
             title="Edit Metadata"
-            onClick={() => {
-              window.open(entityMetadataEditUrl ?? '#', '_blank');
-            }}
+            to={entityMetadataEditUrl ?? '#'}
           >
             <EditIcon />
           </IconButton>
diff --git a/plugins/catalog/src/components/AboutCard/AboutContent.test.tsx b/plugins/catalog/src/components/AboutCard/AboutContent.test.tsx
new file mode 100644
index 0000000000..a1d16363a5
--- /dev/null
+++ b/plugins/catalog/src/components/AboutCard/AboutContent.test.tsx
@@ -0,0 +1,631 @@
+/*
+ * Copyright 2021 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import {
+  Entity,
+  RELATION_OWNED_BY,
+  RELATION_PART_OF,
+} from '@backstage/catalog-model';
+import { renderInTestApp } from '@backstage/test-utils';
+import React from 'react';
+import { AboutContent } from './AboutContent';
+
+describe('<AboutContent />', () => {
+  describe('An unknown entity', () => {
+    let entity: Entity;
+
+    beforeEach(() => {
+      entity = {
+        apiVersion: 'custom.company/v1',
+        kind: 'Unknown',
+        metadata: {
+          name: 'software',
+          description: 'This is the description',
+          tags: ['tag-1'],
+        },
+        spec: {
+          owner: 'o',
+          domain: 'd',
+          system: 's',
+          type: 't',
+          lifecycle: 'l',
+        },
+        relations: [
+          {
+            type: RELATION_OWNED_BY,
+            target: {
+              kind: 'user',
+              name: 'o',
+              namespace: 'default',
+            },
+          },
+          {
+            type: RELATION_PART_OF,
+            target: {
+              kind: 'system',
+              name: 's',
+              namespace: 'default',
+            },
+          },
+          {
+            type: RELATION_PART_OF,
+            target: {
+              kind: 'domain',
+              name: 'd',
+              namespace: 'default',
+            },
+          },
+        ],
+      };
+    });
+
+    it('renders info', async () => {
+      const { getByText, queryByText } = await renderInTestApp(
+        <AboutContent entity={entity} />,
+      );
+
+      expect(getByText('Description')).toBeInTheDocument();
+      expect(getByText('Description').nextSibling).toHaveTextContent(
+        'This is the description',
+      );
+      expect(getByText('Owner')).toBeInTheDocument();
+      expect(getByText('Owner').nextSibling).toHaveTextContent('user:o');
+      expect(getByText('Domain')).toBeInTheDocument();
+      expect(getByText('Domain').nextSibling).toHaveTextContent('d');
+      expect(getByText('System')).toBeInTheDocument();
+      expect(getByText('System').nextSibling).toHaveTextContent('s');
+      expect(queryByText('Parent Component')).not.toBeInTheDocument();
+      expect(getByText('Type')).toBeInTheDocument();
+      expect(getByText('Type').nextSibling).toHaveTextContent('t');
+      expect(getByText('Lifecycle')).toBeInTheDocument();
+      expect(getByText('Lifecycle').nextSibling).toHaveTextContent('l');
+      expect(getByText('Tags')).toBeInTheDocument();
+      expect(getByText('Tags').nextSibling).toHaveTextContent('tag-1');
+    });
+
+    it('highlights missing required fields', async () => {
+      delete entity.metadata.tags;
+      entity.spec = {};
+      entity.relations = [];
+
+      const { getByText, queryByText } = await renderInTestApp(
+        <AboutContent entity={entity} />,
+      );
+
+      expect(getByText('Description')).toBeInTheDocument();
+      expect(getByText('Description').nextSibling).toHaveTextContent(
+        'This is the description',
+      );
+      expect(getByText('Owner')).toBeInTheDocument();
+      expect(getByText('Owner').nextSibling).toHaveTextContent('No Owner');
+      expect(queryByText('Domain')).not.toBeInTheDocument();
+      expect(queryByText('System')).not.toBeInTheDocument();
+      expect(queryByText('Parent Component')).not.toBeInTheDocument();
+      expect(queryByText('Type')).not.toBeInTheDocument();
+      expect(queryByText('Lifecycle')).not.toBeInTheDocument();
+    });
+  });
+
+  describe('API entity', () => {
+    let entity: Entity;
+
+    beforeEach(() => {
+      entity = {
+        apiVersion: 'backstage.io/v1alpha1',
+        kind: 'API',
+        metadata: {
+          name: 'software',
+          description: 'This is the description',
+          tags: ['tag-1'],
+        },
+        spec: {
+          type: 'openapi',
+          lifecycle: 'production',
+          owner: 'guest',
+          definition: '...',
+          system: 'system',
+        },
+        relations: [
+          {
+            type: RELATION_OWNED_BY,
+            target: {
+              kind: 'user',
+              name: 'guest',
+              namespace: 'default',
+            },
+          },
+          {
+            type: RELATION_PART_OF,
+            target: {
+              kind: 'system',
+              name: 'system',
+              namespace: 'default',
+            },
+          },
+        ],
+      };
+    });
+
+    it('renders info', async () => {
+      const { getByText, queryByText } = await renderInTestApp(
+        <AboutContent entity={entity} />,
+      );
+
+      expect(getByText('Description')).toBeInTheDocument();
+      expect(getByText('Description').nextSibling).toHaveTextContent(
+        'This is the description',
+      );
+      expect(getByText('Owner')).toBeInTheDocument();
+      expect(getByText('Owner').nextSibling).toHaveTextContent('user:guest');
+      expect(queryByText('Domain')).not.toBeInTheDocument();
+      expect(getByText('System')).toBeInTheDocument();
+      expect(getByText('System').nextSibling).toHaveTextContent('system');
+      expect(queryByText('Parent Component')).not.toBeInTheDocument();
+      expect(getByText('Type')).toBeInTheDocument();
+      expect(getByText('Type').nextSibling).toHaveTextContent('openapi');
+      expect(getByText('Lifecycle')).toBeInTheDocument();
+      expect(getByText('Lifecycle').nextSibling).toHaveTextContent(
+        'production',
+      );
+      expect(getByText('Tags')).toBeInTheDocument();
+      expect(getByText('Tags').nextSibling).toHaveTextContent('tag-1');
+    });
+
+    it('highlights missing required fields', async () => {
+      delete entity.metadata.tags;
+      delete entity.spec!.type;
+      delete entity.spec!.lifecycle;
+      delete entity.spec!.system;
+      entity.relations = [];
+
+      const { getByText, queryByText } = await renderInTestApp(
+        <AboutContent entity={entity} />,
+      );
+
+      expect(getByText('Description')).toBeInTheDocument();
+      expect(getByText('Description').nextSibling).toHaveTextContent(
+        'This is the description',
+      );
+      expect(getByText('Owner')).toBeInTheDocument();
+      expect(getByText('Owner').nextSibling).toHaveTextContent('No Owner');
+      expect(queryByText('Domain')).not.toBeInTheDocument();
+      expect(getByText('System')).toBeInTheDocument();
+      expect(getByText('System').nextSibling).toHaveTextContent('No System');
+      expect(queryByText('Parent Component')).not.toBeInTheDocument();
+      expect(getByText('Type')).toBeInTheDocument();
+      expect(getByText('Type').nextSibling).toHaveTextContent('unknown');
+      expect(getByText('Lifecycle')).toBeInTheDocument();
+      expect(getByText('Lifecycle').nextSibling).toHaveTextContent('unknown');
+      expect(getByText('Tags')).toBeInTheDocument();
+      expect(getByText('Tags').nextSibling).toHaveTextContent('No Tags');
+    });
+  });
+
+  describe('Component entity', () => {
+    let entity: Entity;
+
+    beforeEach(() => {
+      entity = {
+        apiVersion: 'v1',
+        kind: 'Component',
+        metadata: {
+          name: 'software',
+          description: 'This is the description',
+          tags: ['tag-1'],
+        },
+        spec: {
+          owner: 'guest',
+          type: 'service',
+          lifecycle: 'production',
+          system: 'system',
+          subcomponentOf: ['parent-software'],
+        },
+        relations: [
+          {
+            type: RELATION_OWNED_BY,
+            target: {
+              kind: 'user',
+              name: 'guest',
+              namespace: 'default',
+            },
+          },
+          {
+            type: RELATION_PART_OF,
+            target: {
+              kind: 'system',
+              name: 'system',
+              namespace: 'default',
+            },
+          },
+          {
+            type: RELATION_PART_OF,
+            target: {
+              kind: 'component',
+              name: 'parent-software',
+              namespace: 'default',
+            },
+          },
+        ],
+      };
+    });
+
+    it('renders info', async () => {
+      const { getByText, queryByText } = await renderInTestApp(
+        <AboutContent entity={entity} />,
+      );
+
+      expect(getByText('Description')).toBeInTheDocument();
+      expect(getByText('Description').nextSibling).toHaveTextContent(
+        'This is the description',
+      );
+      expect(getByText('Owner')).toBeInTheDocument();
+      expect(getByText('Owner').nextSibling).toHaveTextContent('user:guest');
+      expect(queryByText('Domain')).not.toBeInTheDocument();
+      expect(getByText('System')).toBeInTheDocument();
+      expect(getByText('System').nextSibling).toHaveTextContent('system');
+      expect(getByText('Parent Component')).toBeInTheDocument();
+      expect(getByText('Parent Component').nextSibling).toHaveTextContent(
+        'parent-software',
+      );
+      expect(getByText('Type')).toBeInTheDocument();
+      expect(getByText('Type').nextSibling).toHaveTextContent('service');
+      expect(getByText('Lifecycle')).toBeInTheDocument();
+      expect(getByText('Lifecycle').nextSibling).toHaveTextContent(
+        'production',
+      );
+      expect(getByText('Tags')).toBeInTheDocument();
+      expect(getByText('Tags').nextSibling).toHaveTextContent('tag-1');
+    });
+
+    it('highlights missing required fields', async () => {
+      delete entity.metadata.tags;
+      delete entity.spec!.type;
+      delete entity.spec!.lifecycle;
+      delete entity.spec!.system;
+      entity.relations = [];
+
+      const { getByText, queryByText } = await renderInTestApp(
+        <AboutContent entity={entity} />,
+      );
+
+      expect(getByText('Description')).toBeInTheDocument();
+      expect(getByText('Description').nextSibling).toHaveTextContent(
+        'This is the description',
+      );
+      expect(getByText('Owner')).toBeInTheDocument();
+      expect(getByText('Owner').nextSibling).toHaveTextContent('No Owner');
+      expect(queryByText('Domain')).not.toBeInTheDocument();
+      expect(getByText('System')).toBeInTheDocument();
+      expect(getByText('System').nextSibling).toHaveTextContent('No System');
+      expect(queryByText('Parent Component')).not.toBeInTheDocument();
+      expect(getByText('Type')).toBeInTheDocument();
+      expect(getByText('Type').nextSibling).toHaveTextContent('unknown');
+      expect(getByText('Lifecycle')).toBeInTheDocument();
+      expect(getByText('Lifecycle').nextSibling).toHaveTextContent('unknown');
+      expect(getByText('Tags')).toBeInTheDocument();
+      expect(getByText('Tags').nextSibling).toHaveTextContent('No Tags');
+    });
+  });
+
+  describe('Domain entity', () => {
+    let entity: Entity;
+
+    beforeEach(() => {
+      entity = {
+        apiVersion: 'backstage.io/v1alpha1',
+        kind: 'Domain',
+        metadata: {
+          name: 'software',
+          description: 'This is the description',
+          tags: ['tag-1'],
+        },
+        spec: {
+          owner: 'guest',
+        },
+        relations: [
+          {
+            type: RELATION_OWNED_BY,
+            target: {
+              kind: 'user',
+              name: 'guest',
+              namespace: 'default',
+            },
+          },
+        ],
+      };
+    });
+
+    it('renders info', async () => {
+      const { getByText, queryByText } = await renderInTestApp(
+        <AboutContent entity={entity} />,
+      );
+
+      expect(getByText('Description')).toBeInTheDocument();
+      expect(getByText('Description').nextSibling).toHaveTextContent(
+        'This is the description',
+      );
+      expect(getByText('Owner')).toBeInTheDocument();
+      expect(getByText('Owner').nextSibling).toHaveTextContent('user:guest');
+      expect(queryByText('Domain')).not.toBeInTheDocument();
+      expect(queryByText('System')).not.toBeInTheDocument();
+      expect(queryByText('Parent Component')).not.toBeInTheDocument();
+      expect(queryByText('Type')).not.toBeInTheDocument();
+      expect(queryByText('Lifecycle')).not.toBeInTheDocument();
+      expect(getByText('Tags')).toBeInTheDocument();
+      expect(getByText('Tags').nextSibling).toHaveTextContent('tag-1');
+    });
+
+    it('highlights missing required fields', async () => {
+      delete entity.metadata.tags;
+      entity.relations = [];
+
+      const { getByText, queryByText } = await renderInTestApp(
+        <AboutContent entity={entity} />,
+      );
+
+      expect(getByText('Description')).toBeInTheDocument();
+      expect(getByText('Description').nextSibling).toHaveTextContent(
+        'This is the description',
+      );
+      expect(getByText('Owner')).toBeInTheDocument();
+      expect(getByText('Owner').nextSibling).toHaveTextContent('No Owner');
+      expect(queryByText('Domain')).not.toBeInTheDocument();
+      expect(queryByText('System')).not.toBeInTheDocument();
+      expect(queryByText('Parent Component')).not.toBeInTheDocument();
+      expect(queryByText('Type')).not.toBeInTheDocument();
+      expect(queryByText('Lifecycle')).not.toBeInTheDocument();
+      expect(getByText('Tags')).toBeInTheDocument();
+      expect(getByText('Tags').nextSibling).toHaveTextContent('No Tags');
+    });
+  });
+
+  describe('Location entity', () => {
+    let entity: Entity;
+
+    beforeEach(() => {
+      entity = {
+        apiVersion: 'backstage.io/v1alpha1',
+        kind: 'Location',
+        metadata: {
+          name: 'software',
+          description: 'This is the description',
+          tags: ['tag-1'],
+        },
+        spec: {
+          type: 'root',
+        },
+        relations: [],
+      };
+    });
+
+    it('renders info', async () => {
+      const { getByText, queryByText } = await renderInTestApp(
+        <AboutContent entity={entity} />,
+      );
+
+      expect(getByText('Description')).toBeInTheDocument();
+      expect(getByText('Description').nextSibling).toHaveTextContent(
+        'This is the description',
+      );
+      expect(getByText('Owner')).toBeInTheDocument();
+      expect(getByText('Owner').nextSibling).toHaveTextContent('No Owner');
+      expect(queryByText('Domain')).not.toBeInTheDocument();
+      expect(queryByText('System')).not.toBeInTheDocument();
+      expect(queryByText('Parent Component')).not.toBeInTheDocument();
+      expect(getByText('Type')).toBeInTheDocument();
+      expect(getByText('Type').nextSibling).toHaveTextContent('root');
+      expect(queryByText('Lifecycle')).not.toBeInTheDocument();
+      expect(getByText('Tags')).toBeInTheDocument();
+      expect(getByText('Tags').nextSibling).toHaveTextContent('tag-1');
+    });
+
+    it('highlights missing required fields', async () => {
+      delete entity.metadata.tags;
+      delete entity.spec!.type;
+
+      const { getByText, queryByText } = await renderInTestApp(
+        <AboutContent entity={entity} />,
+      );
+
+      expect(getByText('Description')).toBeInTheDocument();
+      expect(getByText('Description').nextSibling).toHaveTextContent(
+        'This is the description',
+      );
+      expect(getByText('Owner')).toBeInTheDocument();
+      expect(getByText('Owner').nextSibling).toHaveTextContent('No Owner');
+      expect(queryByText('Domain')).not.toBeInTheDocument();
+      expect(queryByText('System')).not.toBeInTheDocument();
+      expect(queryByText('Parent Component')).not.toBeInTheDocument();
+      expect(getByText('Type')).toBeInTheDocument();
+      expect(getByText('Type').nextSibling).toHaveTextContent('unknown');
+      expect(queryByText('Lifecycle')).not.toBeInTheDocument();
+      expect(getByText('Tags')).toBeInTheDocument();
+      expect(getByText('Tags').nextSibling).toHaveTextContent('No Tags');
+    });
+  });
+
+  describe('Resource entity', () => {
+    let entity: Entity;
+
+    beforeEach(() => {
+      entity = {
+        apiVersion: 'backstage.io/v1alpha1',
+        kind: 'Resource',
+        metadata: {
+          name: 'software',
+          description: 'This is the description',
+          tags: ['tag-1'],
+        },
+        spec: {
+          type: 's3',
+          owner: 'guest',
+          system: 'system',
+        },
+        relations: [
+          {
+            type: RELATION_OWNED_BY,
+            target: {
+              kind: 'user',
+              name: 'guest',
+              namespace: 'default',
+            },
+          },
+          {
+            type: RELATION_PART_OF,
+            target: {
+              kind: 'system',
+              name: 'system',
+              namespace: 'default',
+            },
+          },
+        ],
+      };
+    });
+
+    it('renders info', async () => {
+      const { getByText, queryByText } = await renderInTestApp(
+        <AboutContent entity={entity} />,
+      );
+
+      expect(getByText('Description')).toBeInTheDocument();
+      expect(getByText('Description').nextSibling).toHaveTextContent(
+        'This is the description',
+      );
+      expect(getByText('Owner')).toBeInTheDocument();
+      expect(getByText('Owner').nextSibling).toHaveTextContent('user:guest');
+      expect(queryByText('Domain')).not.toBeInTheDocument();
+      expect(getByText('System')).toBeInTheDocument();
+      expect(getByText('System').nextSibling).toHaveTextContent('system');
+      expect(queryByText('Parent Component')).not.toBeInTheDocument();
+      expect(getByText('Type')).toBeInTheDocument();
+      expect(getByText('Type').nextSibling).toHaveTextContent('s3');
+      expect(queryByText('Lifecycle')).not.toBeInTheDocument();
+      expect(getByText('Tags')).toBeInTheDocument();
+      expect(getByText('Tags').nextSibling).toHaveTextContent('tag-1');
+    });
+
+    it('highlights missing required fields', async () => {
+      delete entity.metadata.tags;
+      delete entity.spec!.type;
+      delete entity.spec!.system;
+      entity.relations = [];
+
+      const { getByText, queryByText } = await renderInTestApp(
+        <AboutContent entity={entity} />,
+      );
+
+      expect(getByText('Description')).toBeInTheDocument();
+      expect(getByText('Description').nextSibling).toHaveTextContent(
+        'This is the description',
+      );
+      expect(getByText('Owner')).toBeInTheDocument();
+      expect(getByText('Owner').nextSibling).toHaveTextContent('No Owner');
+      expect(queryByText('Domain')).not.toBeInTheDocument();
+      expect(getByText('System')).toBeInTheDocument();
+      expect(getByText('System').nextSibling).toHaveTextContent('No System');
+      expect(queryByText('Parent Component')).not.toBeInTheDocument();
+      expect(getByText('Type')).toBeInTheDocument();
+      expect(getByText('Type').nextSibling).toHaveTextContent('unknown');
+      expect(queryByText('Lifecycle')).not.toBeInTheDocument();
+      expect(getByText('Tags')).toBeInTheDocument();
+      expect(getByText('Tags').nextSibling).toHaveTextContent('No Tags');
+    });
+  });
+
+  describe('System entity', () => {
+    let entity: Entity;
+
+    beforeEach(() => {
+      entity = {
+        apiVersion: 'backstage.io/v1alpha1',
+        kind: 'System',
+        metadata: {
+          name: 'software',
+          description: 'This is the description',
+          tags: ['tag-1'],
+        },
+        spec: {
+          owner: 'guest',
+          domain: 'domain',
+        },
+        relations: [
+          {
+            type: RELATION_OWNED_BY,
+            target: {
+              kind: 'user',
+              name: 'guest',
+              namespace: 'default',
+            },
+          },
+          {
+            type: RELATION_PART_OF,
+            target: {
+              kind: 'domain',
+              name: 'domain',
+              namespace: 'default',
+            },
+          },
+        ],
+      };
+    });
+
+    it('renders info', async () => {
+      const { getByText, queryByText } = await renderInTestApp(
+        <AboutContent entity={entity} />,
+      );
+
+      expect(getByText('Description')).toBeInTheDocument();
+      expect(getByText('Description').nextSibling).toHaveTextContent(
+        'This is the description',
+      );
+      expect(getByText('Owner')).toBeInTheDocument();
+      expect(getByText('Owner').nextSibling).toHaveTextContent('user:guest');
+      expect(getByText('Domain')).toBeInTheDocument();
+      expect(getByText('Domain').nextSibling).toHaveTextContent('domain');
+      expect(queryByText('System')).not.toBeInTheDocument();
+      expect(queryByText('Parent Component')).not.toBeInTheDocument();
+      expect(queryByText('Type')).not.toBeInTheDocument();
+      expect(queryByText('Lifecycle')).not.toBeInTheDocument();
+      expect(getByText('Tags')).toBeInTheDocument();
+      expect(getByText('Tags').nextSibling).toHaveTextContent('tag-1');
+    });
+
+    it('highlights missing required fields', async () => {
+      delete entity.metadata.tags;
+      delete entity.spec!.domain;
+      entity.relations = [];
+
+      const { getByText, queryByText } = await renderInTestApp(
+        <AboutContent entity={entity} />,
+      );
+
+      expect(getByText('Description')).toBeInTheDocument();
+      expect(getByText('Description').nextSibling).toHaveTextContent(
+        'This is the description',
+      );
+      expect(getByText('Owner')).toBeInTheDocument();
+      expect(getByText('Owner').nextSibling).toHaveTextContent('No Owner');
+      expect(getByText('Domain')).toBeInTheDocument();
+      expect(getByText('Domain').nextSibling).toHaveTextContent('No Domain');
+      expect(queryByText('System')).not.toBeInTheDocument();
+      expect(queryByText('Parent Component')).not.toBeInTheDocument();
+      expect(queryByText('Type')).not.toBeInTheDocument();
+      expect(queryByText('Lifecycle')).not.toBeInTheDocument();
+      expect(getByText('Tags')).toBeInTheDocument();
+      expect(getByText('Tags').nextSibling).toHaveTextContent('No Tags');
+    });
+  });
+});
diff --git a/plugins/catalog/src/components/AboutCard/AboutContent.tsx b/plugins/catalog/src/components/AboutCard/AboutContent.tsx
index 968ed3de2a..9c8260c14d 100644
--- a/plugins/catalog/src/components/AboutCard/AboutContent.tsx
+++ b/plugins/catalog/src/components/AboutCard/AboutContent.tsx
@@ -40,9 +40,13 @@ type Props = {
 export const AboutContent = ({ entity }: Props) => {
   const classes = useStyles();
   const isSystem = entity.kind.toLocaleLowerCase('en-US') === 'system';
-  const isDomain = entity.kind.toLocaleLowerCase('en-US') === 'domain';
   const isResource = entity.kind.toLocaleLowerCase('en-US') === 'resource';
   const isComponent = entity.kind.toLocaleLowerCase('en-US') === 'component';
+  const isAPI = entity.kind.toLocaleLowerCase('en-US') === 'api';
+  const isTemplate = entity.kind.toLocaleLowerCase('en-US') === 'template';
+  const isLocation = entity.kind.toLocaleLowerCase('en-US') === 'location';
+  const isGroup = entity.kind.toLocaleLowerCase('en-US') === 'group';
+
   const partOfSystemRelations = getEntityRelations(entity, RELATION_PART_OF, {
     kind: 'system',
   });
@@ -65,31 +69,44 @@ export const AboutContent = ({ entity }: Props) => {
           {entity?.metadata?.description || 'No description'}
         </Typography>
       </AboutField>
-      <AboutField label="Owner" gridSizes={{ xs: 12, sm: 6, lg: 4 }}>
-        <EntityRefLinks entityRefs={ownedByRelations} defaultKind="group" />
+      <AboutField
+        label="Owner"
+        value="No Owner"
+        gridSizes={{ xs: 12, sm: 6, lg: 4 }}
+      >
+        {ownedByRelations.length > 0 && (
+          <EntityRefLinks entityRefs={ownedByRelations} defaultKind="group" />
+        )}
       </AboutField>
-      {isSystem && (
+      {(isSystem || partOfDomainRelations.length > 0) && (
         <AboutField
           label="Domain"
           value="No Domain"
           gridSizes={{ xs: 12, sm: 6, lg: 4 }}
         >
-          <EntityRefLinks
-            entityRefs={partOfDomainRelations}
-            defaultKind="domain"
-          />
+          {partOfDomainRelations.length > 0 && (
+            <EntityRefLinks
+              entityRefs={partOfDomainRelations}
+              defaultKind="domain"
+            />
+          )}
         </AboutField>
       )}
-      {!isSystem && !isDomain && (
+      {(isAPI ||
+        isComponent ||
+        isResource ||
+        partOfSystemRelations.length > 0) && (
         <AboutField
           label="System"
           value="No System"
           gridSizes={{ xs: 12, sm: 6, lg: 4 }}
         >
-          <EntityRefLinks
-            entityRefs={partOfSystemRelations}
-            defaultKind="system"
-          />
+          {partOfSystemRelations.length > 0 && (
+            <EntityRefLinks
+              entityRefs={partOfSystemRelations}
+              defaultKind="system"
+            />
+          )}
         </AboutField>
       )}
       {isComponent && partOfComponentRelations.length > 0 && (
@@ -104,14 +121,22 @@ export const AboutContent = ({ entity }: Props) => {
           />
         </AboutField>
       )}
-      {!isSystem && !isDomain && (
+      {(isAPI ||
+        isComponent ||
+        isResource ||
+        isTemplate ||
+        isGroup ||
+        isLocation ||
+        typeof entity?.spec?.type === 'string') && (
         <AboutField
           label="Type"
           value={entity?.spec?.type as string}
           gridSizes={{ xs: 12, sm: 6, lg: 4 }}
         />
       )}
-      {!isSystem && !isDomain && !isResource && (
+      {(isAPI ||
+        isComponent ||
+        typeof entity?.spec?.lifecycle === 'string') && (
         <AboutField
           label="Lifecycle"
           value={entity?.spec?.lifecycle as string}
diff --git a/plugins/catalog/src/components/AboutCard/AboutField.tsx b/plugins/catalog/src/components/AboutCard/AboutField.tsx
index cb229f5487..c4dd107434 100644
--- a/plugins/catalog/src/components/AboutCard/AboutField.tsx
+++ b/plugins/catalog/src/components/AboutCard/AboutField.tsx
@@ -14,8 +14,9 @@
  * limitations under the License.
  */
 
+import { useElementFilter } from '@backstage/core-plugin-api';
+import { Grid, makeStyles, Typography } from '@material-ui/core';
 import React from 'react';
-import { makeStyles, Typography, Grid } from '@material-ui/core';
 
 const useStyles = makeStyles(theme => ({
   value: {
@@ -45,14 +46,17 @@ type Props = {
 export const AboutField = ({ label, value, gridSizes, children }: Props) => {
   const classes = useStyles();
 
+  const childElements = useElementFilter(children, c => c.getElements());
+
   // Content is either children or a string prop `value`
-  const content = React.Children.count(children) ? (
-    children
-  ) : (
-    <Typography variant="body2" className={classes.value}>
-      {value || `unknown`}
-    </Typography>
-  );
+  const content =
+    childElements.length > 0 ? (
+      childElements
+    ) : (
+      <Typography variant="body2" className={classes.value}>
+        {value || `unknown`}
+      </Typography>
+    );
   return (
     <Grid item {...gridSizes}>
       <Typography variant="subtitle2" className={classes.label}>
diff --git a/plugins/catalog/src/components/CatalogKindHeader/CatalogKindHeader.test.tsx b/plugins/catalog/src/components/CatalogKindHeader/CatalogKindHeader.test.tsx
new file mode 100644
index 0000000000..2730665fb6
--- /dev/null
+++ b/plugins/catalog/src/components/CatalogKindHeader/CatalogKindHeader.test.tsx
@@ -0,0 +1,119 @@
+/*
+ * Copyright 2021 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import React from 'react';
+import { fireEvent } from '@testing-library/react';
+import { Entity } from '@backstage/catalog-model';
+import {
+  CatalogApi,
+  catalogApiRef,
+  EntityKindFilter,
+  MockEntityListContextProvider,
+} from '@backstage/plugin-catalog-react';
+import { ApiProvider, ApiRegistry } from '@backstage/core-app-api';
+import { renderWithEffects } from '@backstage/test-utils';
+import { CatalogKindHeader } from './CatalogKindHeader';
+
+const entities: Entity[] = [
+  {
+    apiVersion: '1',
+    kind: 'Component',
+    metadata: {
+      name: 'component-1',
+    },
+  },
+  {
+    apiVersion: '1',
+    kind: 'Component',
+    metadata: {
+      name: 'component-2',
+    },
+  },
+  {
+    apiVersion: '1',
+    kind: 'Template',
+    metadata: {
+      name: 'template',
+    },
+  },
+  {
+    apiVersion: '1',
+    kind: 'System',
+    metadata: {
+      name: 'system',
+    },
+  },
+];
+
+const apis = ApiRegistry.with(catalogApiRef, {
+  getEntities: jest.fn().mockResolvedValue({ items: entities }),
+} as Partial<CatalogApi>);
+
+describe('<CatalogKindHeader />', () => {
+  it('renders available kinds', async () => {
+    const rendered = await renderWithEffects(
+      <ApiProvider apis={apis}>
+        <MockEntityListContextProvider>
+          <CatalogKindHeader />
+        </MockEntityListContextProvider>
+      </ApiProvider>,
+    );
+
+    const input = rendered.getByText('Components');
+    fireEvent.mouseDown(input);
+
+    entities.map(entity => {
+      expect(
+        rendered.getByRole('option', { name: `${entity.kind}s` }),
+      ).toBeInTheDocument();
+    });
+  });
+
+  it('renders unknown kinds provided in query parameters', async () => {
+    const rendered = await renderWithEffects(
+      <ApiProvider apis={apis}>
+        <MockEntityListContextProvider
+          value={{ queryParameters: { kind: 'frob' } }}
+        >
+          <CatalogKindHeader />
+        </MockEntityListContextProvider>
+      </ApiProvider>,
+    );
+
+    expect(rendered.getByText('Frobs')).toBeInTheDocument();
+  });
+
+  it('updates the kind filter', async () => {
+    const updateFilters = jest.fn();
+    const rendered = await renderWithEffects(
+      <ApiProvider apis={apis}>
+        <MockEntityListContextProvider value={{ updateFilters }}>
+          <CatalogKindHeader />
+        </MockEntityListContextProvider>
+      </ApiProvider>,
+    );
+
+    const input = rendered.getByText('Components');
+    fireEvent.mouseDown(input);
+
+    const option = rendered.getByRole('option', { name: 'Templates' });
+    fireEvent.click(option);
+
+    expect(updateFilters).toHaveBeenCalledWith({
+      kind: new EntityKindFilter('template'),
+    });
+  });
+});
diff --git a/plugins/catalog/src/components/CatalogKindHeader/CatalogKindHeader.tsx b/plugins/catalog/src/components/CatalogKindHeader/CatalogKindHeader.tsx
new file mode 100644
index 0000000000..41c5888d79
--- /dev/null
+++ b/plugins/catalog/src/components/CatalogKindHeader/CatalogKindHeader.tsx
@@ -0,0 +1,91 @@
+/*
+ * Copyright 2021 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import React, { useEffect, useState } from 'react';
+import {
+  capitalize,
+  createStyles,
+  InputBase,
+  makeStyles,
+  MenuItem,
+  Select,
+  Theme,
+} from '@material-ui/core';
+import {
+  EntityKindFilter,
+  useEntityKinds,
+  useEntityListProvider,
+} from '@backstage/plugin-catalog-react';
+
+const useStyles = makeStyles((theme: Theme) =>
+  createStyles({
+    root: {
+      ...theme.typography.h4,
+    },
+  }),
+);
+
+type CatalogKindHeaderProps = {
+  initialFilter?: string;
+};
+
+export const CatalogKindHeader = ({
+  initialFilter = 'component',
+}: CatalogKindHeaderProps) => {
+  const classes = useStyles();
+  const { kinds: allKinds = [] } = useEntityKinds();
+  const { updateFilters, queryParameters } = useEntityListProvider();
+
+  const [selectedKind, setSelectedKind] = useState(
+    ([queryParameters.kind].flat()[0] ?? initialFilter).toLocaleLowerCase(
+      'en-US',
+    ),
+  );
+
+  useEffect(() => {
+    updateFilters({
+      kind: selectedKind ? new EntityKindFilter(selectedKind) : undefined,
+    });
+  }, [selectedKind, updateFilters]);
+
+  // Before allKinds is loaded, or when a kind is entered manually in the URL, selectedKind may not
+  // be present in allKinds. It should still be shown in the dropdown, but may not have the nice
+  // enforced casing from the catalog-backend. This makes a key/value record for the Select options,
+  // including selectedKind if it's unknown - but allows the selectedKind to get clobbered by the
+  // more proper catalog kind if it exists.
+  const options = [capitalize(selectedKind)]
+    .concat(allKinds)
+    .sort()
+    .reduce((acc, kind) => {
+      acc[kind.toLocaleLowerCase('en-US')] = kind;
+      return acc;
+    }, {} as Record<string, string>);
+
+  return (
+    <Select
+      input={<InputBase value={selectedKind} />}
+      value={selectedKind}
+      onChange={e => setSelectedKind(e.target.value as string)}
+      classes={classes}
+    >
+      {Object.keys(options).map(kind => (
+        <MenuItem value={kind} key={kind}>
+          {`${options[kind]}s`}
+        </MenuItem>
+      ))}
+    </Select>
+  );
+};
diff --git a/plugins/catalog/src/components/CatalogKindHeader/index.ts b/plugins/catalog/src/components/CatalogKindHeader/index.ts
new file mode 100644
index 0000000000..0078207d58
--- /dev/null
+++ b/plugins/catalog/src/components/CatalogKindHeader/index.ts
@@ -0,0 +1,16 @@
+/*
+ * Copyright 2021 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+export { CatalogKindHeader } from './CatalogKindHeader';
diff --git a/plugins/catalog/src/components/CatalogPage/CatalogPage.test.tsx b/plugins/catalog/src/components/CatalogPage/CatalogPage.test.tsx
index 584eea0850..15f72b32ea 100644
--- a/plugins/catalog/src/components/CatalogPage/CatalogPage.test.tsx
+++ b/plugins/catalog/src/components/CatalogPage/CatalogPage.test.tsx
@@ -26,6 +26,7 @@ import {
   MockStorageApi,
   renderWithEffects,
   wrapInTestApp,
+  mockBreakpoint,
 } from '@backstage/test-utils';
 import { fireEvent, screen } from '@testing-library/react';
 import React from 'react';
@@ -43,6 +44,14 @@ import {
 } from '@backstage/core-plugin-api';
 
 describe('CatalogPage', () => {
+  const origReplaceState = window.history.replaceState;
+  beforeEach(() => {
+    window.history.replaceState = jest.fn();
+  });
+  afterEach(() => {
+    window.history.replaceState = origReplaceState;
+  });
+
   const catalogApi: Partial<CatalogApi> = {
     getEntities: () =>
       Promise.resolve({
@@ -54,7 +63,7 @@ describe('CatalogPage', () => {
               name: 'Entity1',
             },
             spec: {
-              owner: 'tools@example.com',
+              owner: 'tools',
               type: 'service',
             },
             relations: [
@@ -71,7 +80,7 @@ describe('CatalogPage', () => {
               name: 'Entity2',
             },
             spec: {
-              owner: 'not-tools@example.com',
+              owner: 'not-tools',
               type: 'service',
             },
             relations: [
@@ -107,7 +116,8 @@ describe('CatalogPage', () => {
     displayName: 'Display Name',
   };
   const identityApi: Partial<IdentityApi> = {
-    getUserId: () => 'tools@example.com',
+    getUserId: () => 'tools',
+    getIdToken: async () => undefined,
     getProfile: () => testProfile,
   };
 
@@ -131,6 +141,10 @@ describe('CatalogPage', () => {
       ),
     );
 
+  // TODO(freben): The test timeouts are bumped in this file, because it seems
+  // page and table rerenders accumulate to occasionally go over the default
+  // limit. We should investigate why these timeouts happen.
+
   it('should render the default column of the grid', async () => {
     const { getAllByRole } = await renderWrapped(<CatalogPage />);
 
@@ -149,7 +163,7 @@ describe('CatalogPage', () => {
       'Tags',
       'Actions',
     ]);
-  });
+  }, 20_000);
 
   it('should render the custom column passed as prop', async () => {
     const columns: TableColumn<EntityRow>[] = [
@@ -167,7 +181,7 @@ describe('CatalogPage', () => {
     const columnHeaderLabels = columnHeader.map(c => c.textContent);
 
     expect(columnHeaderLabels).toEqual(['Foo', 'Bar', 'Baz', 'Actions']);
-  });
+  }, 20_000);
 
   it('should render the default actions of an item in the grid', async () => {
     const { findByTitle, findByText } = await renderWrapped(<CatalogPage />);
@@ -175,7 +189,7 @@ describe('CatalogPage', () => {
     expect(await findByTitle(/View/)).toBeInTheDocument();
     expect(await findByTitle(/Edit/)).toBeInTheDocument();
     expect(await findByTitle(/Add to favorites/)).toBeInTheDocument();
-  });
+  }, 20_000);
 
   it('should render the custom actions of an item passed as prop', async () => {
     const actions: TableProps<EntityRow>['actions'] = [
@@ -204,7 +218,7 @@ describe('CatalogPage', () => {
     expect(await findByTitle(/Foo Action/)).toBeInTheDocument();
     expect(await findByTitle(/Bar Action/)).toBeInTheDocument();
     expect((await findByTitle(/Bar Action/)).firstChild).toBeDisabled();
-  });
+  }, 20_000);
 
   // this test right now causes some red lines in the log output when running tests
   // related to some theme issues in mui-table
@@ -214,14 +228,14 @@ describe('CatalogPage', () => {
     await expect(findByText(/Owned \(1\)/)).resolves.toBeInTheDocument();
     fireEvent.click(getByTestId('user-picker-all'));
     await expect(findByText(/All \(2\)/)).resolves.toBeInTheDocument();
-  });
+  }, 20_000);
 
   it('should set initial filter correctly', async () => {
     const { findByText } = await renderWrapped(
       <CatalogPage initiallySelectedFilter="all" />,
     );
     await expect(findByText(/All \(2\)/)).resolves.toBeInTheDocument();
-  });
+  }, 20_000);
 
   // this test is for fixing the bug after favoriting an entity, the matching
   // entities defaulting to "owned" filter and not based on the selected filter
@@ -243,5 +257,14 @@ describe('CatalogPage', () => {
     await expect(
       screen.findByText(/Starred \(1\)/),
     ).resolves.toBeInTheDocument();
-  });
+  }, 20_000);
+
+  it('should wrap filter in drawer on smaller screens', async () => {
+    mockBreakpoint({ matches: true });
+    const { getByRole } = await renderWrapped(<CatalogPage />);
+    const button = getByRole('button', { name: 'Filters' });
+    expect(getByRole('presentation', { hidden: true })).toBeInTheDocument();
+    fireEvent.click(button);
+    expect(getByRole('presentation')).toBeVisible();
+  }, 20_000);
 });
diff --git a/plugins/catalog/src/components/CatalogPage/CatalogPage.tsx b/plugins/catalog/src/components/CatalogPage/CatalogPage.tsx
index 089e61f0fb..ec29d3839b 100644
--- a/plugins/catalog/src/components/CatalogPage/CatalogPage.tsx
+++ b/plugins/catalog/src/components/CatalogPage/CatalogPage.tsx
@@ -14,10 +14,17 @@
  * limitations under the License.
  */
 
-import React from 'react';
-import { Grid } from '@material-ui/core';
 import {
-  EntityKindPicker,
+  Content,
+  ContentHeader,
+  CreateButton,
+  PageWithHeader,
+  SupportButton,
+  TableColumn,
+  TableProps,
+} from '@backstage/core-components';
+import { configApiRef, useApi, useRouteRef } from '@backstage/core-plugin-api';
+import {
   EntityLifecyclePicker,
   EntityListProvider,
   EntityOwnerPicker,
@@ -26,18 +33,16 @@ import {
   UserListFilterKind,
   UserListPicker,
 } from '@backstage/plugin-catalog-react';
+import React from 'react';
+import { createComponentRouteRef } from '../../routes';
 import { CatalogTable } from '../CatalogTable';
-
 import { EntityRow } from '../CatalogTable/types';
-import CatalogLayout from './CatalogLayout';
-import { CreateComponentButton } from '../CreateComponentButton';
 import {
-  Content,
-  ContentHeader,
-  SupportButton,
-  TableColumn,
-  TableProps,
-} from '@backstage/core-components';
+  FilteredEntityLayout,
+  EntityListContainer,
+  FilterContainer,
+} from '../FilteredEntityLayout';
+import { CatalogKindHeader } from '../CatalogKindHeader';
 
 export type CatalogPageProps = {
   initiallySelectedFilter?: UserListFilterKind;
@@ -46,39 +51,39 @@ export type CatalogPageProps = {
 };
 
 export const CatalogPage = ({
-  initiallySelectedFilter = 'owned',
   columns,
   actions,
-}: CatalogPageProps) => (
-  <CatalogLayout>
-    <Content>
-      <ContentHeader title="Components">
-        <CreateComponentButton />
-        <SupportButton>All your software catalog entities</SupportButton>
-      </ContentHeader>
-      <Grid container spacing={2}>
-        <EntityListProvider>
-          <Grid item sm={12} lg={2} alignContent="flex-start">
-            <Grid container>
-              <Grid item xs={12} sm={4} lg={12}>
-                <EntityKindPicker initialFilter="component" hidden />
-                <EntityTypePicker />
-              </Grid>
-              <Grid item xs={12} sm={4} lg={12}>
-                <UserListPicker initialFilter={initiallySelectedFilter} />
-              </Grid>
-              <Grid item xs={12} sm={4} lg={12}>
-                <EntityOwnerPicker />
-                <EntityLifecyclePicker />
-                <EntityTagPicker />
-              </Grid>
-            </Grid>
-          </Grid>
-          <Grid item xs={12} sm={12} lg={10}>
-            <CatalogTable columns={columns} actions={actions} />
-          </Grid>
-        </EntityListProvider>
-      </Grid>
-    </Content>
-  </CatalogLayout>
-);
+  initiallySelectedFilter = 'owned',
+}: CatalogPageProps) => {
+  const orgName =
+    useApi(configApiRef).getOptionalString('organization.name') ?? 'Backstage';
+  const createComponentLink = useRouteRef(createComponentRouteRef);
+
+  return (
+    <PageWithHeader title={`${orgName} Catalog`} themeId="home">
+      <EntityListProvider>
+        <Content>
+          <ContentHeader titleComponent={<CatalogKindHeader />}>
+            <CreateButton
+              title="Create Component"
+              to={createComponentLink && createComponentLink()}
+            />
+            <SupportButton>All your software catalog entities</SupportButton>
+          </ContentHeader>
+          <FilteredEntityLayout>
+            <FilterContainer>
+              <EntityTypePicker />
+              <UserListPicker initialFilter={initiallySelectedFilter} />
+              <EntityOwnerPicker />
+              <EntityLifecyclePicker />
+              <EntityTagPicker />
+            </FilterContainer>
+            <EntityListContainer>
+              <CatalogTable columns={columns} actions={actions} />
+            </EntityListContainer>
+          </FilteredEntityLayout>
+        </Content>
+      </EntityListProvider>
+    </PageWithHeader>
+  );
+};
diff --git a/plugins/catalog/src/components/CatalogPage/index.ts b/plugins/catalog/src/components/CatalogPage/index.ts
index 66c3c2f4b3..dc7ed68229 100644
--- a/plugins/catalog/src/components/CatalogPage/index.ts
+++ b/plugins/catalog/src/components/CatalogPage/index.ts
@@ -13,5 +13,4 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-export { CatalogLayout } from './CatalogLayout';
 export { CatalogPage } from './CatalogPage';
diff --git a/plugins/catalog/src/components/CatalogTable/CatalogTable.test.tsx b/plugins/catalog/src/components/CatalogTable/CatalogTable.test.tsx
index 7867ad6f46..efbd6989e4 100644
--- a/plugins/catalog/src/components/CatalogTable/CatalogTable.test.tsx
+++ b/plugins/catalog/src/components/CatalogTable/CatalogTable.test.tsx
@@ -73,7 +73,11 @@ describe('CatalogTable component', () => {
         value={{
           entities,
           filters: {
-            user: new UserListFilter('owned', undefined, () => false),
+            user: new UserListFilter(
+              'owned',
+              () => false,
+              () => false,
+            ),
           },
         }}
       >
diff --git a/plugins/catalog/src/components/CatalogTable/CatalogTable.tsx b/plugins/catalog/src/components/CatalogTable/CatalogTable.tsx
index 31a9457e2b..f293710847 100644
--- a/plugins/catalog/src/components/CatalogTable/CatalogTable.tsx
+++ b/plugins/catalog/src/components/CatalogTable/CatalogTable.tsx
@@ -15,6 +15,8 @@
  */
 import { RELATION_OWNED_BY, RELATION_PART_OF } from '@backstage/catalog-model';
 import {
+  favoriteEntityIcon,
+  favoriteEntityTooltip,
   formatEntityRefTitle,
   getEntityMetadataEditUrl,
   getEntityMetadataViewUrl,
@@ -25,11 +27,7 @@ import {
 import Edit from '@material-ui/icons/Edit';
 import OpenInNew from '@material-ui/icons/OpenInNew';
 import { capitalize } from 'lodash';
-import React from 'react';
-import {
-  favouriteEntityIcon,
-  favouriteEntityTooltip,
-} from '../FavouriteEntity/FavouriteEntity';
+import React, { useMemo } from 'react';
 import * as columnFactories from './columns';
 import { EntityRow } from './types';
 import {
@@ -40,16 +38,6 @@ import {
   WarningPanel,
 } from '@backstage/core-components';
 
-const defaultColumns: TableColumn<EntityRow>[] = [
-  columnFactories.createNameColumn(),
-  columnFactories.createSystemColumn(),
-  columnFactories.createOwnerColumn(),
-  columnFactories.createSpecTypeColumn(),
-  columnFactories.createSpecLifecycleColumn(),
-  columnFactories.createMetadataDescriptionColumn(),
-  columnFactories.createTagsColumn(),
-];
-
 type CatalogTableProps = {
   columns?: TableColumn<EntityRow>[];
   actions?: TableProps<EntityRow>['actions'];
@@ -59,6 +47,19 @@ export const CatalogTable = ({ columns, actions }: CatalogTableProps) => {
   const { isStarredEntity, toggleStarredEntity } = useStarredEntities();
   const { loading, error, entities, filters } = useEntityListProvider();
 
+  const defaultColumns: TableColumn<EntityRow>[] = useMemo(
+    () => [
+      columnFactories.createNameColumn({ defaultKind: filters.kind?.value }),
+      columnFactories.createSystemColumn(),
+      columnFactories.createOwnerColumn(),
+      columnFactories.createSpecTypeColumn(),
+      columnFactories.createSpecLifecycleColumn(),
+      columnFactories.createMetadataDescriptionColumn(),
+      columnFactories.createTagsColumn(),
+    ],
+    [filters.kind?.value],
+  );
+
   const showTypeColumn = filters.type === undefined;
   // TODO(timbonicus): remove the title from the CatalogTable once using EntitySearchBar
   const titlePreamble = capitalize(filters.user?.value ?? 'all');
@@ -80,7 +81,7 @@ export const CatalogTable = ({ columns, actions }: CatalogTableProps) => {
     ({ entity }) => {
       const url = getEntityMetadataViewUrl(entity);
       return {
-        icon: () => <OpenInNew fontSize="small" />,
+        icon: () => <OpenInNew aria-label="View" fontSize="small" />,
         tooltip: 'View',
         disabled: !url,
         onClick: () => {
@@ -92,7 +93,7 @@ export const CatalogTable = ({ columns, actions }: CatalogTableProps) => {
     ({ entity }) => {
       const url = getEntityMetadataEditUrl(entity);
       return {
-        icon: () => <Edit fontSize="small" />,
+        icon: () => <Edit aria-label="Edit" fontSize="small" />,
         tooltip: 'Edit',
         disabled: !url,
         onClick: () => {
@@ -105,8 +106,8 @@ export const CatalogTable = ({ columns, actions }: CatalogTableProps) => {
       const isStarred = isStarredEntity(entity);
       return {
         cellStyle: { paddingLeft: '1em' },
-        icon: () => favouriteEntityIcon(isStarred),
-        tooltip: favouriteEntityTooltip(isStarred),
+        icon: () => favoriteEntityIcon(isStarred),
+        tooltip: favoriteEntityTooltip(isStarred),
         onClick: () => toggleStarredEntity(entity),
       };
     },
@@ -144,13 +145,14 @@ export const CatalogTable = ({ columns, actions }: CatalogTableProps) => {
   if (typeColumn) {
     typeColumn.hidden = !showTypeColumn;
   }
+  const showPagination = rows.length > 20;
 
   return (
     <Table<EntityRow>
       isLoading={loading}
       columns={columns || defaultColumns}
       options={{
-        paging: true,
+        paging: showPagination,
         pageSize: 20,
         actionsColumnIndex: -1,
         loadingType: 'linear',
diff --git a/plugins/catalog/src/components/EntityLayout/EntityLayout.test.tsx b/plugins/catalog/src/components/EntityLayout/EntityLayout.test.tsx
index e040c6a67f..b61d8bc10c 100644
--- a/plugins/catalog/src/components/EntityLayout/EntityLayout.test.tsx
+++ b/plugins/catalog/src/components/EntityLayout/EntityLayout.test.tsx
@@ -61,6 +61,60 @@ describe('EntityLayout', () => {
     expect(rendered.getByText('tabbed-test-content')).toBeInTheDocument();
   });
 
+  it('renders the entity title if defined', async () => {
+    const mockEntityDataWithTitle = {
+      loading: false,
+      error: undefined,
+      entity: {
+        kind: 'MyKind',
+        metadata: {
+          name: 'my-entity',
+          title: 'My Entity',
+        },
+      } as Entity,
+    };
+
+    const rendered = await renderInTestApp(
+      <ApiProvider apis={mockApis}>
+        <EntityContext.Provider value={mockEntityDataWithTitle}>
+          <EntityLayout>
+            <EntityLayout.Route path="/" title="tabbed-test-title">
+              <div>tabbed-test-content</div>
+            </EntityLayout.Route>
+          </EntityLayout>
+        </EntityContext.Provider>
+      </ApiProvider>,
+    );
+
+    expect(rendered.getByText('My Entity')).toBeInTheDocument();
+    expect(rendered.getByText('tabbed-test-title')).toBeInTheDocument();
+    expect(rendered.getByText('tabbed-test-content')).toBeInTheDocument();
+  });
+
+  it('renders error message when entity is not found', async () => {
+    const noEntityData = {
+      ...mockEntityData,
+      entity: undefined,
+    };
+
+    const rendered = await renderInTestApp(
+      <ApiProvider apis={mockApis}>
+        <EntityContext.Provider value={noEntityData}>
+          <EntityLayout>
+            <EntityLayout.Route path="/" title="tabbed-test-title">
+              <div>tabbed-test-content</div>
+            </EntityLayout.Route>
+          </EntityLayout>
+        </EntityContext.Provider>
+      </ApiProvider>,
+    );
+
+    expect(rendered.getByText('Warning: Entity not found')).toBeInTheDocument();
+    expect(rendered.queryByText('my-entity')).not.toBeInTheDocument();
+    expect(rendered.queryByText('tabbed-test-title')).not.toBeInTheDocument();
+    expect(rendered.queryByText('tabbed-test-content')).not.toBeInTheDocument();
+  });
+
   it('navigates when user clicks different tab', async () => {
     const rendered = await renderInTestApp(
       <Routes>
diff --git a/plugins/catalog/src/components/EntityLayout/EntityLayout.tsx b/plugins/catalog/src/components/EntityLayout/EntityLayout.tsx
index 9cb0b7c961..c5679355e5 100644
--- a/plugins/catalog/src/components/EntityLayout/EntityLayout.tsx
+++ b/plugins/catalog/src/components/EntityLayout/EntityLayout.tsx
@@ -20,14 +20,26 @@ import {
   RELATION_OWNED_BY,
 } from '@backstage/catalog-model';
 import {
-  useElementFilter,
+  Content,
+  Header,
+  HeaderLabel,
+  Link,
+  Page,
+  Progress,
+  RoutedTabs,
+  WarningPanel,
+} from '@backstage/core-components';
+import {
   attachComponentData,
   IconComponent,
+  useElementFilter,
 } from '@backstage/core-plugin-api';
 import {
   EntityContext,
   EntityRefLinks,
+  FavoriteEntity,
   getEntityRelations,
+  UnregisterEntityDialog,
   useEntityCompoundName,
 } from '@backstage/plugin-catalog-react';
 import { Box, TabProps } from '@material-ui/core';
@@ -35,16 +47,6 @@ import { Alert } from '@material-ui/lab';
 import React, { useContext, useState } from 'react';
 import { useNavigate } from 'react-router';
 import { EntityContextMenu } from '../EntityContextMenu/EntityContextMenu';
-import { FavouriteEntity } from '../FavouriteEntity/FavouriteEntity';
-import { UnregisterEntityDialog } from '../UnregisterEntityDialog/UnregisterEntityDialog';
-import {
-  Content,
-  Header,
-  HeaderLabel,
-  Page,
-  Progress,
-  RoutedTabs,
-} from '@backstage/core-components';
 
 type SubRoute = {
   path: string;
@@ -68,12 +70,21 @@ const EntityLayoutTitle = ({
 }: {
   title: string;
   entity: Entity | undefined;
-}) => (
-  <Box display="inline-flex" alignItems="center" height="1em">
-    {title}
-    {entity && <FavouriteEntity entity={entity} />}
-  </Box>
-);
+}) => {
+  return (
+    <Box display="inline-flex" alignItems="center" height="1em" maxWidth="100%">
+      <Box
+        component="span"
+        textOverflow="ellipsis"
+        whiteSpace="nowrap"
+        overflow="hidden"
+      >
+        {title}
+      </Box>
+      {entity && <FavoriteEntity entity={entity} />}
+    </Box>
+  );
+};
 
 const headerProps = (
   paramKind: string | undefined,
@@ -83,7 +94,8 @@ const headerProps = (
 ): { headerTitle: string; headerType: string } => {
   const kind = paramKind ?? entity?.kind ?? '';
   const namespace = paramNamespace ?? entity?.metadata.namespace ?? '';
-  const name = paramName ?? entity?.metadata.name ?? '';
+  const name =
+    entity?.metadata.title ?? paramName ?? entity?.metadata.name ?? '';
   return {
     headerTitle: `${name}${
       namespace && namespace !== ENTITY_DEFAULT_NAMESPACE
@@ -165,28 +177,31 @@ export const EntityLayout = ({
 }: EntityLayoutProps) => {
   const { kind, namespace, name } = useEntityCompoundName();
   const { entity, loading, error } = useContext(EntityContext);
+  const routes = useElementFilter(
+    children,
+    elements =>
+      elements
+        .selectByComponentData({
+          key: dataKey,
+          withStrictError:
+            'Child of EntityLayout must be an EntityLayout.Route',
+        })
+        .getElements<SubRoute>() // all nodes, element data, maintain structure or not?
+        .flatMap(({ props }) => {
+          if (props.if && entity && !props.if(entity)) {
+            return [];
+          }
 
-  const routes = useElementFilter(children, elements =>
-    elements
-      .selectByComponentData({
-        key: dataKey,
-        withStrictError: 'Child of EntityLayout must be an EntityLayout.Route',
-      })
-      .getElements<SubRoute>() // all nodes, element data, maintain structure or not?
-      .flatMap(({ props }) => {
-        if (props.if && entity && !props.if(entity)) {
-          return [];
-        }
-
-        return [
-          {
-            path: props.path,
-            title: props.title,
-            children: props.children,
-            tabProps: props.tabProps,
-          },
-        ];
-      }),
+          return [
+            {
+              path: props.path,
+              title: props.title,
+              children: props.children,
+              tabProps: props.tabProps,
+            },
+          ];
+        }),
+    [entity],
   );
 
   const { headerTitle, headerType } = headerProps(
@@ -233,6 +248,19 @@ export const EntityLayout = ({
           <Alert severity="error">{error.toString()}</Alert>
         </Content>
       )}
+
+      {!loading && !error && !entity && (
+        <Content>
+          <WarningPanel title="Entity not found">
+            There is no {kind} with the requested{' '}
+            <Link to="https://backstage.io/docs/features/software-catalog/references">
+              kind, namespace, and name
+            </Link>
+            .
+          </WarningPanel>
+        </Content>
+      )}
+
       <UnregisterEntityDialog
         open={confirmationDialogOpen}
         entity={entity!}
diff --git a/plugins/catalog/src/components/EntityLoaderProvider/EntityLoaderProvider.tsx b/plugins/catalog/src/components/EntityLoaderProvider/EntityLoaderProvider.tsx
index 7f9f728161..8d2feae7da 100644
--- a/plugins/catalog/src/components/EntityLoaderProvider/EntityLoaderProvider.tsx
+++ b/plugins/catalog/src/components/EntityLoaderProvider/EntityLoaderProvider.tsx
@@ -20,10 +20,10 @@ import {
 import React, { ReactNode } from 'react';
 
 export const EntityLoaderProvider = ({ children }: { children: ReactNode }) => {
-  const { entity, loading, error } = useEntityFromUrl();
+  const { entity, loading, error, refresh } = useEntityFromUrl();
 
   return (
-    <EntityContext.Provider value={{ entity, loading, error }}>
+    <EntityContext.Provider value={{ entity, loading, error, refresh }}>
       {children}
     </EntityContext.Provider>
   );
diff --git a/plugins/catalog/src/components/EntityPageLayout/EntityPageLayout.tsx b/plugins/catalog/src/components/EntityPageLayout/EntityPageLayout.tsx
index 4abac4e01b..c371d6245e 100644
--- a/plugins/catalog/src/components/EntityPageLayout/EntityPageLayout.tsx
+++ b/plugins/catalog/src/components/EntityPageLayout/EntityPageLayout.tsx
@@ -21,15 +21,15 @@ import {
 import {
   EntityContext,
   EntityRefLinks,
+  FavoriteEntity,
   getEntityRelations,
+  UnregisterEntityDialog,
   useEntityCompoundName,
 } from '@backstage/plugin-catalog-react';
 import { Box } from '@material-ui/core';
 import React, { useContext, useState } from 'react';
 import { useNavigate } from 'react-router';
 import { EntityContextMenu } from '../EntityContextMenu/EntityContextMenu';
-import { FavouriteEntity } from '../FavouriteEntity/FavouriteEntity';
-import { UnregisterEntityDialog } from '../UnregisterEntityDialog/UnregisterEntityDialog';
 import { Tabbed } from './Tabbed';
 
 import {
@@ -54,7 +54,7 @@ const EntityPageTitle = ({
 }) => (
   <Box display="inline-flex" alignItems="center" height="1em">
     {title}
-    {entity && <FavouriteEntity entity={entity} />}
+    {entity && <FavoriteEntity entity={entity} />}
   </Box>
 );
 
diff --git a/plugins/catalog/src/components/EntityProcessingErrorsPanel/EntityProcessingErrorsPanel.test.tsx b/plugins/catalog/src/components/EntityProcessingErrorsPanel/EntityProcessingErrorsPanel.test.tsx
new file mode 100644
index 0000000000..a4e284a0eb
--- /dev/null
+++ b/plugins/catalog/src/components/EntityProcessingErrorsPanel/EntityProcessingErrorsPanel.test.tsx
@@ -0,0 +1,103 @@
+/*
+ * Copyright 2020 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { EntityProvider } from '@backstage/plugin-catalog-react';
+
+import { renderInTestApp } from '@backstage/test-utils';
+import React from 'react';
+import { EntityProcessingErrorsPanel } from './EntityProcessingErrorsPanel';
+import { Entity } from '@backstage/catalog-model';
+
+describe('<EntityProcessErrors />', () => {
+  it('renders EntityProcessErrors if the entity has errors', async () => {
+    const entity: Entity = {
+      apiVersion: 'v1',
+      kind: 'Component',
+      metadata: {
+        name: 'software',
+        description: 'This is the description',
+      },
+
+      spec: {
+        owner: 'guest',
+        type: 'service',
+        lifecycle: 'production',
+      },
+      status: {
+        items: [
+          {
+            type: 'backstage.io/catalog-processing',
+            level: 'error',
+            message:
+              'InputError: Policy check failed; caused by Error: Malformed envelope, /metadata/labels should be object',
+            error: {
+              name: 'InputError',
+              message:
+                'Policy check failed; caused by Error: Malformed envelope, /metadata/labels should be object',
+              cause: {
+                name: 'Error',
+                message:
+                  'Malformed envelope, /metadata/labels should be object',
+              },
+            },
+          },
+          {
+            type: 'foo',
+            level: 'error',
+            message: 'InputError: This should not be rendered',
+            error: {
+              name: 'InputError',
+              message: 'Foo',
+              cause: {
+                name: 'Error',
+                message:
+                  'Malformed envelope, /metadata/labels should be object',
+              },
+            },
+          },
+          {
+            type: 'backstage.io/catalog-processing',
+            level: 'error',
+            message: 'InputError: Foo',
+            error: {
+              name: 'InputError',
+              message: 'Foo',
+              cause: {
+                name: 'Error',
+                message:
+                  'Malformed envelope, /metadata/labels should be object',
+              },
+            },
+          },
+        ],
+      },
+    };
+
+    const { getByText, queryByText } = await renderInTestApp(
+      <EntityProvider entity={entity}>
+        <EntityProcessingErrorsPanel />
+      </EntityProvider>,
+    );
+
+    expect(
+      getByText(
+        'Error: Policy check failed; caused by Error: Malformed envelope, /metadata/labels should be object',
+      ),
+    ).toBeInTheDocument();
+    expect(getByText('Error: Foo')).toBeInTheDocument();
+    expect(queryByText('Error: This should not be rendered')).toBeNull();
+  });
+});
diff --git a/plugins/catalog/src/components/EntityProcessingErrorsPanel/EntityProcessingErrorsPanel.tsx b/plugins/catalog/src/components/EntityProcessingErrorsPanel/EntityProcessingErrorsPanel.tsx
new file mode 100644
index 0000000000..833ca74daa
--- /dev/null
+++ b/plugins/catalog/src/components/EntityProcessingErrorsPanel/EntityProcessingErrorsPanel.tsx
@@ -0,0 +1,51 @@
+/*
+ * Copyright 2021 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { Entity, UNSTABLE_EntityStatusItem } from '@backstage/catalog-model';
+import { useEntity } from '@backstage/plugin-catalog-react';
+import { Box } from '@material-ui/core';
+import React from 'react';
+import { ResponseErrorPanel } from '@backstage/core-components';
+import { ENTITY_STATUS_CATALOG_PROCESSING_TYPE } from '@backstage/catalog-client';
+
+const errorfilter = (i: UNSTABLE_EntityStatusItem) =>
+  i.error &&
+  i.level === 'error' &&
+  i.type === ENTITY_STATUS_CATALOG_PROCESSING_TYPE;
+
+export const hasCatalogProcessingErrors = (entity: Entity) =>
+  entity?.status?.items?.filter(errorfilter).length! > 0;
+
+/**
+ * Displays a list of errors if the entity is invalid.
+ */
+export const EntityProcessingErrorsPanel = () => {
+  const { entity } = useEntity();
+  const catalogProcessingErrors =
+    (entity?.status?.items?.filter(
+      errorfilter,
+    ) as Required<UNSTABLE_EntityStatusItem>[]) || [];
+
+  return (
+    <>
+      {catalogProcessingErrors.map(({ error }, index) => (
+        <Box key={index} mb={1}>
+          <ResponseErrorPanel error={error} />
+        </Box>
+      ))}
+    </>
+  );
+};
diff --git a/plugins/catalog/src/components/EntityProcessingErrorsPanel/index.ts b/plugins/catalog/src/components/EntityProcessingErrorsPanel/index.ts
new file mode 100644
index 0000000000..1af2c80484
--- /dev/null
+++ b/plugins/catalog/src/components/EntityProcessingErrorsPanel/index.ts
@@ -0,0 +1,20 @@
+/*
+ * Copyright 2021 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+export {
+  EntityProcessingErrorsPanel,
+  hasCatalogProcessingErrors,
+} from './EntityProcessingErrorsPanel';
diff --git a/plugins/catalog/src/components/FilteredEntityLayout/EntityListContainer.tsx b/plugins/catalog/src/components/FilteredEntityLayout/EntityListContainer.tsx
new file mode 100644
index 0000000000..a39ef76b87
--- /dev/null
+++ b/plugins/catalog/src/components/FilteredEntityLayout/EntityListContainer.tsx
@@ -0,0 +1,24 @@
+/*
+ * Copyright 2021 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { Grid } from '@material-ui/core';
+import React, { PropsWithChildren } from 'react';
+
+export const EntityListContainer = ({ children }: PropsWithChildren<{}>) => (
+  <Grid item xs={12} lg={10}>
+    {children}
+  </Grid>
+);
diff --git a/plugins/catalog/src/components/FilteredEntityLayout/FilterContainer.tsx b/plugins/catalog/src/components/FilteredEntityLayout/FilterContainer.tsx
new file mode 100644
index 0000000000..683dbf8b40
--- /dev/null
+++ b/plugins/catalog/src/components/FilteredEntityLayout/FilterContainer.tsx
@@ -0,0 +1,71 @@
+/*
+ * Copyright 2021 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { BackstageTheme } from '@backstage/theme';
+import {
+  Box,
+  Button,
+  Drawer,
+  Grid,
+  Typography,
+  useMediaQuery,
+  useTheme,
+} from '@material-ui/core';
+import FilterListIcon from '@material-ui/icons/FilterList';
+import React, { useState, PropsWithChildren } from 'react';
+
+export const FilterContainer = ({ children }: PropsWithChildren<{}>) => {
+  const isMidSizeScreen = useMediaQuery<BackstageTheme>(theme =>
+    theme.breakpoints.down('md'),
+  );
+  const theme = useTheme<BackstageTheme>();
+  const [filterDrawerOpen, setFilterDrawerOpen] = useState<boolean>(false);
+
+  return isMidSizeScreen ? (
+    <>
+      <Button
+        style={{ marginTop: theme.spacing(1), marginLeft: theme.spacing(1) }}
+        onClick={() => setFilterDrawerOpen(true)}
+        startIcon={<FilterListIcon />}
+      >
+        Filters
+      </Button>
+      <Drawer
+        open={filterDrawerOpen}
+        onClose={() => setFilterDrawerOpen(false)}
+        anchor="left"
+        disableAutoFocus
+        keepMounted
+        variant="temporary"
+      >
+        <Box m={2}>
+          <Typography
+            variant="h6"
+            component="h2"
+            style={{ marginBottom: theme.spacing(1) }}
+          >
+            Filters
+          </Typography>
+          {children}
+        </Box>
+      </Drawer>
+    </>
+  ) : (
+    <Grid item lg={2}>
+      {children}
+    </Grid>
+  );
+};
diff --git a/plugins/catalog/src/components/FilteredEntityLayout/FilteredEntityLayout.tsx b/plugins/catalog/src/components/FilteredEntityLayout/FilteredEntityLayout.tsx
new file mode 100644
index 0000000000..628ad9fee6
--- /dev/null
+++ b/plugins/catalog/src/components/FilteredEntityLayout/FilteredEntityLayout.tsx
@@ -0,0 +1,24 @@
+/*
+ * Copyright 2021 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { Grid } from '@material-ui/core';
+import React, { PropsWithChildren } from 'react';
+
+export const FilteredEntityLayout = ({ children }: PropsWithChildren<{}>) => (
+  <Grid container style={{ position: 'relative' }}>
+    {children}
+  </Grid>
+);
diff --git a/plugins/catalog/src/components/FilteredEntityLayout/index.ts b/plugins/catalog/src/components/FilteredEntityLayout/index.ts
new file mode 100644
index 0000000000..ded61a4edc
--- /dev/null
+++ b/plugins/catalog/src/components/FilteredEntityLayout/index.ts
@@ -0,0 +1,19 @@
+/*
+ * Copyright 2021 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+export { FilteredEntityLayout } from './FilteredEntityLayout';
+export { FilterContainer } from './FilterContainer';
+export { EntityListContainer } from './EntityListContainer';
diff --git a/plugins/catalog/src/components/SystemDiagramCard/SystemDiagramCard.tsx b/plugins/catalog/src/components/SystemDiagramCard/SystemDiagramCard.tsx
index 272ad8a6d6..b3326abaab 100644
--- a/plugins/catalog/src/components/SystemDiagramCard/SystemDiagramCard.tsx
+++ b/plugins/catalog/src/components/SystemDiagramCard/SystemDiagramCard.tsx
@@ -158,7 +158,11 @@ export function SystemDiagramCard() {
   const systemEdges = new Array<{ from: string; to: string; label: string }>();
 
   const catalogApi = useApi(catalogApiRef);
-  const { loading, error, value: catalogResponse } = useAsync(() => {
+  const {
+    loading,
+    error,
+    value: catalogResponse,
+  } = useAsync(() => {
     return catalogApi.getEntities({
       filter: {
         kind: ['Component', 'API', 'Resource', 'System', 'Domain'],
diff --git a/plugins/catalog/src/index.ts b/plugins/catalog/src/index.ts
index f2f28679a5..31184204a9 100644
--- a/plugins/catalog/src/index.ts
+++ b/plugins/catalog/src/index.ts
@@ -14,16 +14,19 @@
  * limitations under the License.
  */
 
+export { CatalogClientWrapper } from './CatalogClientWrapper';
 export * from './components/AboutCard';
-export { CatalogLayout } from './components/CatalogPage';
-export { CatalogResultListItem } from './components/CatalogResultListItem';
+export * from './components/CatalogKindHeader';
+export * from './components/CatalogResultListItem';
 export { CatalogTable } from './components/CatalogTable';
 export type { EntityRow as CatalogTableRow } from './components/CatalogTable';
-export { CreateComponentButton } from './components/CreateComponentButton';
-export { EntityLayout } from './components/EntityLayout';
+export * from './components/CatalogTable/columns';
+export * from './components/EntityLayout';
 export * from './components/EntityOrphanWarning';
-export { EntityPageLayout } from './components/EntityPageLayout';
+export * from './components/EntityProcessingErrorsPanel';
+export * from './components/EntityPageLayout';
 export * from './components/EntitySwitch';
+export * from './components/FilteredEntityLayout';
 export { Router } from './components/Router';
 export {
   CatalogEntityPage,
@@ -31,8 +34,8 @@ export {
   catalogPlugin,
   catalogPlugin as plugin,
   EntityAboutCard,
-  EntityDependsOnComponentsCard,
   EntityDependencyOfComponentsCard,
+  EntityDependsOnComponentsCard,
   EntityDependsOnResourcesCard,
   EntityHasComponentsCard,
   EntityHasResourcesCard,
@@ -41,4 +44,3 @@ export {
   EntityLinksCard,
   EntitySystemDiagramCard,
 } from './plugin';
-export * from './components/CatalogTable/columns';
diff --git a/plugins/catalog/src/plugin.ts b/plugins/catalog/src/plugin.ts
index c375e76239..c83716b32d 100644
--- a/plugins/catalog/src/plugin.ts
+++ b/plugins/catalog/src/plugin.ts
@@ -21,7 +21,7 @@ import {
   entityRouteRef,
 } from '@backstage/plugin-catalog-react';
 import { CatalogClientWrapper } from './CatalogClientWrapper';
-import { createComponentRouteRef } from './routes';
+import { createComponentRouteRef, viewTechDocRouteRef } from './routes';
 import {
   createApiFactory,
   createComponentExtension,
@@ -50,6 +50,7 @@ export const catalogPlugin = createPlugin({
   },
   externalRoutes: {
     createComponent: createComponentRouteRef,
+    viewTechDoc: viewTechDocRouteRef,
   },
 });
 
diff --git a/plugins/catalog/src/routes.ts b/plugins/catalog/src/routes.ts
index d1ee3e520a..63d9ccfb87 100644
--- a/plugins/catalog/src/routes.ts
+++ b/plugins/catalog/src/routes.ts
@@ -20,3 +20,9 @@ export const createComponentRouteRef = createExternalRouteRef({
   id: 'create-component',
   optional: true,
 });
+
+export const viewTechDocRouteRef = createExternalRouteRef({
+  id: 'view-techdoc',
+  optional: true,
+  params: ['namespace', 'kind', 'name'],
+});
diff --git a/plugins/circleci/CHANGELOG.md b/plugins/circleci/CHANGELOG.md
index 7dbaea83e4..4f070e8025 100644
--- a/plugins/circleci/CHANGELOG.md
+++ b/plugins/circleci/CHANGELOG.md
@@ -1,5 +1,46 @@
 # @backstage/plugin-circleci
 
+## 0.2.22
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@0.4.5
+  - @backstage/core-components@0.4.0
+  - @backstage/catalog-model@0.9.1
+
+## 0.2.21
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.3.0
+  - @backstage/core-plugin-api@0.1.5
+  - @backstage/plugin-catalog-react@0.4.1
+
+## 0.2.20
+
+### Patch Changes
+
+- 9d40fcb1e: - Bumping `material-ui/core` version to at least `4.12.2` as they made some breaking changes in later versions which broke `Pagination` of the `Table`.
+  - Switching out `material-table` to `@material-table/core` for support for the later versions of `material-ui/core`
+  - This causes a minor API change to `@backstage/core-components` as the interface for `Table` re-exports the `prop` from the underlying `Table` components.
+  - `onChangeRowsPerPage` has been renamed to `onRowsPerPageChange`
+  - `onChangePage` has been renamed to `onPageChange`
+  - Migration guide is here: https://material-table-core.com/docs/breaking-changes
+- Updated dependencies
+  - @backstage/core-components@0.2.0
+  - @backstage/plugin-catalog-react@0.4.0
+  - @backstage/core-plugin-api@0.1.4
+  - @backstage/theme@0.2.9
+
+## 0.2.19
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@0.3.0
+
 ## 0.2.18
 
 ### Patch Changes
diff --git a/plugins/circleci/api-report.md b/plugins/circleci/api-report.md
index 7bb1b7766a..76426d8385 100644
--- a/plugins/circleci/api-report.md
+++ b/plugins/circleci/api-report.md
@@ -24,11 +24,16 @@ export { BuildSummary };
 
 export { BuildWithSteps };
 
+// Warning: (ae-missing-release-tag) "CIRCLECI_ANNOTATION" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export const CIRCLECI_ANNOTATION = 'circleci.com/project-slug';
 
+// Warning: (ae-missing-release-tag) "CircleCIApi" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export class CircleCIApi {
+  // Warning: (ae-forgotten-export) The symbol "Options" needs to be exported by the entry point index.d.ts
   constructor(options: Options);
   // (undocumented)
   getBuild(
@@ -55,20 +60,30 @@ export class CircleCIApi {
   ): Promise<BuildSummary>;
 }
 
+// Warning: (ae-missing-release-tag) "circleCIApiRef" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export const circleCIApiRef: ApiRef<CircleCIApi>;
 
+// Warning: (ae-missing-release-tag) "circleCIBuildRouteRef" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export const circleCIBuildRouteRef: RouteRef<undefined>;
 
+// Warning: (ae-missing-release-tag) "circleCIPlugin" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 const circleCIPlugin: BackstagePlugin<{}, {}>;
 export { circleCIPlugin };
 export { circleCIPlugin as plugin };
 
+// Warning: (ae-missing-release-tag) "circleCIRouteRef" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export const circleCIRouteRef: RouteRef<undefined>;
 
+// Warning: (ae-missing-release-tag) "EntityCircleCIContent" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export const EntityCircleCIContent: (_props: {
   entity?: Entity | undefined;
@@ -76,11 +91,16 @@ export const EntityCircleCIContent: (_props: {
 
 export { GitType };
 
+// Warning: (ae-missing-release-tag) "isCircleCIAvailable" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 const isCircleCIAvailable: (entity: Entity) => boolean;
 export { isCircleCIAvailable };
 export { isCircleCIAvailable as isPluginApplicableToEntity };
 
+// Warning: (ae-forgotten-export) The symbol "Props" needs to be exported by the entry point index.d.ts
+// Warning: (ae-missing-release-tag) "Router" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export const Router: (_props: Props) => JSX.Element;
 
diff --git a/plugins/circleci/package.json b/plugins/circleci/package.json
index f03debe9ac..466171e6ac 100644
--- a/plugins/circleci/package.json
+++ b/plugins/circleci/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-circleci",
-  "version": "0.2.18",
+  "version": "0.2.22",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -31,12 +31,12 @@
     "postpack": "backstage-cli postpack"
   },
   "dependencies": {
-    "@backstage/catalog-model": "^0.9.0",
-    "@backstage/core-components": "^0.1.5",
-    "@backstage/core-plugin-api": "^0.1.3",
-    "@backstage/plugin-catalog-react": "^0.2.6",
-    "@backstage/theme": "^0.2.8",
-    "@material-ui/core": "^4.11.0",
+    "@backstage/catalog-model": "^0.9.1",
+    "@backstage/core-components": "^0.4.1",
+    "@backstage/core-plugin-api": "^0.1.7",
+    "@backstage/plugin-catalog-react": "^0.4.5",
+    "@backstage/theme": "^0.2.10",
+    "@material-ui/core": "^4.12.2",
     "@material-ui/icons": "^4.9.1",
     "@material-ui/lab": "4.0.0-alpha.45",
     "circleci-api": "^4.0.0",
@@ -50,10 +50,10 @@
     "react-use": "^17.2.4"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.7.3",
-    "@backstage/core-app-api": "^0.1.4",
-    "@backstage/dev-utils": "^0.2.1",
-    "@backstage/test-utils": "^0.1.14",
+    "@backstage/cli": "^0.7.11",
+    "@backstage/core-app-api": "^0.1.12",
+    "@backstage/dev-utils": "^0.2.9",
+    "@backstage/test-utils": "^0.1.17",
     "@testing-library/jest-dom": "^5.10.1",
     "@testing-library/react": "^11.2.5",
     "@testing-library/user-event": "^13.1.8",
diff --git a/plugins/circleci/src/components/BuildWithStepsPage/BuildWithStepsPage.tsx b/plugins/circleci/src/components/BuildWithStepsPage/BuildWithStepsPage.tsx
index 3cdc0eea7a..137833ee0b 100644
--- a/plugins/circleci/src/components/BuildWithStepsPage/BuildWithStepsPage.tsx
+++ b/plugins/circleci/src/components/BuildWithStepsPage/BuildWithStepsPage.tsx
@@ -35,7 +35,7 @@ import {
   Link,
 } from '@backstage/core-components';
 
-const IconLink = (IconButton as any) as typeof MaterialLink;
+const IconLink = IconButton as any as typeof MaterialLink;
 
 const BuildName = ({ build }: { build?: BuildWithSteps }) => (
   <Box display="flex" alignItems="center">
diff --git a/plugins/circleci/src/components/BuildsPage/lib/CITable/CITable.tsx b/plugins/circleci/src/components/BuildsPage/lib/CITable/CITable.tsx
index 40829e7e66..b33e1b40cc 100644
--- a/plugins/circleci/src/components/BuildsPage/lib/CITable/CITable.tsx
+++ b/plugins/circleci/src/components/BuildsPage/lib/CITable/CITable.tsx
@@ -260,8 +260,8 @@ export const CITable = ({
         },
       ]}
       data={builds}
-      onChangePage={onChangePage}
-      onChangeRowsPerPage={onChangePageSize}
+      onPageChange={onChangePage}
+      onRowsPerPageChange={onChangePageSize}
       title={
         <Box display="flex" alignItems="center">
           <GitHubIcon />
diff --git a/plugins/circleci/src/state/useBuildWithSteps.ts b/plugins/circleci/src/state/useBuildWithSteps.ts
index c5b5bb1dee..eb3c0c1506 100644
--- a/plugins/circleci/src/state/useBuildWithSteps.ts
+++ b/plugins/circleci/src/state/useBuildWithSteps.ts
@@ -62,9 +62,10 @@ export function useBuildWithSteps(buildId: number) {
     }
   };
 
-  const { loading, value, retry } = useAsyncRetry(() => getBuildWithSteps(), [
-    getBuildWithSteps,
-  ]);
+  const { loading, value, retry } = useAsyncRetry(
+    () => getBuildWithSteps(),
+    [getBuildWithSteps],
+  );
 
   const { startPolling, stopPolling } = useAsyncPolling(
     getBuildWithSteps,
diff --git a/plugins/circleci/src/state/useBuilds.ts b/plugins/circleci/src/state/useBuilds.ts
index 9feb16d253..a9869644a3 100644
--- a/plugins/circleci/src/state/useBuilds.ts
+++ b/plugins/circleci/src/state/useBuilds.ts
@@ -26,21 +26,23 @@ import { errorApiRef, useApi } from '@backstage/core-plugin-api';
 
 const makeReadableStatus = (status: string | undefined) => {
   if (!status) return '';
-  return ({
-    retried: 'Retried',
-    canceled: 'Canceled',
-    infrastructure_fail: 'Infra fail',
-    timedout: 'Timedout',
-    not_run: 'Not run',
-    running: 'Running',
-    failed: 'Failed',
-    queued: 'Queued',
-    scheduled: 'Scheduled',
-    not_running: 'Not running',
-    no_tests: 'No tests',
-    fixed: 'Fixed',
-    success: 'Success',
-  } as Record<string, string>)[status];
+  return (
+    {
+      retried: 'Retried',
+      canceled: 'Canceled',
+      infrastructure_fail: 'Infra fail',
+      timedout: 'Timedout',
+      not_run: 'Not run',
+      running: 'Running',
+      failed: 'Failed',
+      queued: 'Queued',
+      scheduled: 'Scheduled',
+      not_running: 'Not running',
+      no_tests: 'No tests',
+      fixed: 'Fixed',
+      success: 'Success',
+    } as Record<string, string>
+  )[status];
 };
 
 const mapWorkflowDetails = (buildData: BuildSummary) => {
diff --git a/plugins/cloudbuild/CHANGELOG.md b/plugins/cloudbuild/CHANGELOG.md
index 4e837d532b..646bd28c65 100644
--- a/plugins/cloudbuild/CHANGELOG.md
+++ b/plugins/cloudbuild/CHANGELOG.md
@@ -1,5 +1,46 @@
 # @backstage/plugin-cloudbuild
 
+## 0.2.22
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@0.4.5
+  - @backstage/core-components@0.4.0
+  - @backstage/catalog-model@0.9.1
+
+## 0.2.21
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.3.0
+  - @backstage/core-plugin-api@0.1.5
+  - @backstage/plugin-catalog-react@0.4.1
+
+## 0.2.20
+
+### Patch Changes
+
+- 9d40fcb1e: - Bumping `material-ui/core` version to at least `4.12.2` as they made some breaking changes in later versions which broke `Pagination` of the `Table`.
+  - Switching out `material-table` to `@material-table/core` for support for the later versions of `material-ui/core`
+  - This causes a minor API change to `@backstage/core-components` as the interface for `Table` re-exports the `prop` from the underlying `Table` components.
+  - `onChangeRowsPerPage` has been renamed to `onRowsPerPageChange`
+  - `onChangePage` has been renamed to `onPageChange`
+  - Migration guide is here: https://material-table-core.com/docs/breaking-changes
+- Updated dependencies
+  - @backstage/core-components@0.2.0
+  - @backstage/plugin-catalog-react@0.4.0
+  - @backstage/core-plugin-api@0.1.4
+  - @backstage/theme@0.2.9
+
+## 0.2.19
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@0.3.0
+
 ## 0.2.18
 
 ### Patch Changes
diff --git a/plugins/cloudbuild/api-report.md b/plugins/cloudbuild/api-report.md
index 8c2d7876b2..8c0ee26539 100644
--- a/plugins/cloudbuild/api-report.md
+++ b/plugins/cloudbuild/api-report.md
@@ -11,6 +11,8 @@ import { Entity } from '@backstage/catalog-model';
 import { OAuthApi } from '@backstage/core-plugin-api';
 import { RouteRef } from '@backstage/core-plugin-api';
 
+// Warning: (ae-missing-release-tag) "ActionsGetWorkflowResponseData" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export type ActionsGetWorkflowResponseData = {
   id: string;
@@ -35,12 +37,16 @@ export type ActionsGetWorkflowResponseData = {
   timing: Timing2;
 };
 
+// Warning: (ae-missing-release-tag) "ActionsListWorkflowRunsForRepoResponseData" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export interface ActionsListWorkflowRunsForRepoResponseData {
   // (undocumented)
   builds: ActionsGetWorkflowResponseData[];
 }
 
+// Warning: (ae-missing-release-tag) "BUILD" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export interface BUILD {
   // (undocumented)
@@ -49,9 +55,13 @@ export interface BUILD {
   startTime: string;
 }
 
+// Warning: (ae-missing-release-tag) "CLOUDBUILD_ANNOTATION" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export const CLOUDBUILD_ANNOTATION = 'google.com/cloudbuild-project-slug';
 
+// Warning: (ae-missing-release-tag) "CloudbuildApi" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export type CloudbuildApi = {
   listWorkflowRuns: (request: {
@@ -80,9 +90,13 @@ export type CloudbuildApi = {
   }) => Promise<any>;
 };
 
+// Warning: (ae-missing-release-tag) "cloudbuildApiRef" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export const cloudbuildApiRef: ApiRef<CloudbuildApi>;
 
+// Warning: (ae-missing-release-tag) "CloudbuildClient" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export class CloudbuildClient implements CloudbuildApi {
   constructor(googleAuthApi: OAuthApi);
@@ -120,6 +134,8 @@ export class CloudbuildClient implements CloudbuildApi {
   }): Promise<void>;
 }
 
+// Warning: (ae-missing-release-tag) "cloudbuildPlugin" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 const cloudbuildPlugin: BackstagePlugin<
   {
@@ -130,11 +146,15 @@ const cloudbuildPlugin: BackstagePlugin<
 export { cloudbuildPlugin };
 export { cloudbuildPlugin as plugin };
 
+// Warning: (ae-missing-release-tag) "EntityCloudbuildContent" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export const EntityCloudbuildContent: (_props: {
   entity?: Entity | undefined;
 }) => JSX.Element;
 
+// Warning: (ae-missing-release-tag) "EntityLatestCloudbuildRunCard" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export const EntityLatestCloudbuildRunCard: ({
   branch,
@@ -143,6 +163,8 @@ export const EntityLatestCloudbuildRunCard: ({
   branch: string;
 }) => JSX.Element;
 
+// Warning: (ae-missing-release-tag) "EntityLatestCloudbuildsForBranchCard" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export const EntityLatestCloudbuildsForBranchCard: ({
   branch,
@@ -151,6 +173,8 @@ export const EntityLatestCloudbuildsForBranchCard: ({
   branch: string;
 }) => JSX.Element;
 
+// Warning: (ae-missing-release-tag) "FETCHSOURCE" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export interface FETCHSOURCE {
   // (undocumented)
@@ -159,11 +183,15 @@ export interface FETCHSOURCE {
   startTime: string;
 }
 
+// Warning: (ae-missing-release-tag) "isCloudbuildAvailable" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 const isCloudbuildAvailable: (entity: Entity) => boolean;
 export { isCloudbuildAvailable };
 export { isCloudbuildAvailable as isPluginApplicableToEntity };
 
+// Warning: (ae-missing-release-tag) "LatestWorkflowRunCard" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export const LatestWorkflowRunCard: ({
   branch,
@@ -172,6 +200,8 @@ export const LatestWorkflowRunCard: ({
   branch: string;
 }) => JSX.Element;
 
+// Warning: (ae-missing-release-tag) "LatestWorkflowsForBranchCard" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export const LatestWorkflowsForBranchCard: ({
   branch,
@@ -180,6 +210,8 @@ export const LatestWorkflowsForBranchCard: ({
   branch: string;
 }) => JSX.Element;
 
+// Warning: (ae-missing-release-tag) "Options" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export interface Options {
   // (undocumented)
@@ -192,6 +224,8 @@ export interface Options {
   substitutionOption: string;
 }
 
+// Warning: (ae-missing-release-tag) "PullTiming" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export interface PullTiming {
   // (undocumented)
@@ -200,6 +234,8 @@ export interface PullTiming {
   startTime: string;
 }
 
+// Warning: (ae-missing-release-tag) "ResolvedStorageSource" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export interface ResolvedStorageSource {
   // (undocumented)
@@ -210,6 +246,8 @@ export interface ResolvedStorageSource {
   object: string;
 }
 
+// Warning: (ae-missing-release-tag) "Results" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export interface Results {
   // (undocumented)
@@ -218,15 +256,22 @@ export interface Results {
   buildStepOutputs: string[];
 }
 
+// Warning: (ae-forgotten-export) The symbol "Props" needs to be exported by the entry point index.d.ts
+// Warning: (ae-missing-release-tag) "Router" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export const Router: (_props: Props) => JSX.Element;
 
+// Warning: (ae-missing-release-tag) "Source" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export interface Source {
   // (undocumented)
   storageSource: StorageSource;
 }
 
+// Warning: (ae-missing-release-tag) "SourceProvenance" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export interface SourceProvenance {
   // (undocumented)
@@ -235,6 +280,8 @@ export interface SourceProvenance {
   resolvedStorageSource: {};
 }
 
+// Warning: (ae-missing-release-tag) "Step" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export interface Step {
   // (undocumented)
@@ -259,6 +306,8 @@ export interface Step {
   waitFor: string[];
 }
 
+// Warning: (ae-missing-release-tag) "StorageSource" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export interface StorageSource {
   // (undocumented)
@@ -267,6 +316,8 @@ export interface StorageSource {
   object: string;
 }
 
+// Warning: (ae-missing-release-tag) "Substitutions" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export interface Substitutions {
   // (undocumented)
@@ -281,6 +332,8 @@ export interface Substitutions {
   SHORT_SHA: string;
 }
 
+// Warning: (ae-missing-release-tag) "Timing" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export interface Timing {
   // (undocumented)
@@ -289,6 +342,8 @@ export interface Timing {
   startTime: string;
 }
 
+// Warning: (ae-missing-release-tag) "Timing2" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export interface Timing2 {
   // (undocumented)
@@ -297,6 +352,8 @@ export interface Timing2 {
   FETCHSOURCE: FETCHSOURCE;
 }
 
+// Warning: (ae-missing-release-tag) "Volume" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export interface Volume {
   // (undocumented)
diff --git a/plugins/cloudbuild/package.json b/plugins/cloudbuild/package.json
index 4fa32a8200..6ae81ba6e4 100644
--- a/plugins/cloudbuild/package.json
+++ b/plugins/cloudbuild/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-cloudbuild",
-  "version": "0.2.18",
+  "version": "0.2.22",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -30,15 +30,15 @@
     "clean": "backstage-cli clean"
   },
   "dependencies": {
-    "@backstage/catalog-model": "^0.9.0",
-    "@backstage/core-components": "^0.1.5",
-    "@backstage/core-plugin-api": "^0.1.3",
-    "@backstage/plugin-catalog-react": "^0.2.6",
-    "@backstage/theme": "^0.2.8",
-    "@material-ui/core": "^4.11.0",
+    "@backstage/catalog-model": "^0.9.1",
+    "@backstage/core-components": "^0.4.1",
+    "@backstage/core-plugin-api": "^0.1.7",
+    "@backstage/plugin-catalog-react": "^0.4.5",
+    "@backstage/theme": "^0.2.10",
+    "@material-ui/core": "^4.12.2",
     "@material-ui/icons": "^4.9.1",
     "@material-ui/lab": "4.0.0-alpha.45",
-    "moment": "^2.27.0",
+    "luxon": "^2.0.2",
     "qs": "^6.9.4",
     "react": "^16.13.1",
     "react-dom": "^16.13.1",
@@ -48,10 +48,10 @@
     "react-use": "^17.2.4"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.7.3",
-    "@backstage/core-app-api": "^0.1.4",
-    "@backstage/dev-utils": "^0.2.1",
-    "@backstage/test-utils": "^0.1.14",
+    "@backstage/cli": "^0.7.11",
+    "@backstage/core-app-api": "^0.1.12",
+    "@backstage/dev-utils": "^0.2.9",
+    "@backstage/test-utils": "^0.1.17",
     "@testing-library/jest-dom": "^5.10.1",
     "@testing-library/react": "^11.2.5",
     "@testing-library/user-event": "^13.1.8",
diff --git a/plugins/cloudbuild/src/api/CloudbuildClient.ts b/plugins/cloudbuild/src/api/CloudbuildClient.ts
index ce9dfb700c..cbd47e84e9 100644
--- a/plugins/cloudbuild/src/api/CloudbuildClient.ts
+++ b/plugins/cloudbuild/src/api/CloudbuildClient.ts
@@ -60,7 +60,8 @@ export class CloudbuildClient implements CloudbuildApi {
       },
     );
 
-    const builds: ActionsListWorkflowRunsForRepoResponseData = await workflowRuns.json();
+    const builds: ActionsListWorkflowRunsForRepoResponseData =
+      await workflowRuns.json();
 
     return builds;
   }
diff --git a/plugins/cloudbuild/src/components/WorkflowRunDetails/useWorkflowRunJobs.ts b/plugins/cloudbuild/src/components/WorkflowRunDetails/useWorkflowRunJobs.ts
index 9bd1ea2c82..0450d3d613 100644
--- a/plugins/cloudbuild/src/components/WorkflowRunDetails/useWorkflowRunJobs.ts
+++ b/plugins/cloudbuild/src/components/WorkflowRunDetails/useWorkflowRunJobs.ts
@@ -17,15 +17,16 @@ import { useAsync } from 'react-use';
 import { ActionsListWorkflowRunsForRepoResponseData } from '../../api/types';
 
 export const useWorkflowRunJobs = (jobsUrl?: string) => {
-  const jobs = useAsync(async (): Promise<ActionsListWorkflowRunsForRepoResponseData> => {
-    if (jobsUrl === undefined) {
-      return {
-        builds: [],
-      };
-    }
+  const jobs =
+    useAsync(async (): Promise<ActionsListWorkflowRunsForRepoResponseData> => {
+      if (jobsUrl === undefined) {
+        return {
+          builds: [],
+        };
+      }
 
-    const data = await fetch(jobsUrl).then(d => d.json());
-    return data;
-  }, [jobsUrl]);
+      const data = await fetch(jobsUrl).then(d => d.json());
+      return data;
+    }, [jobsUrl]);
   return jobs;
 };
diff --git a/plugins/cloudbuild/src/components/WorkflowRunsTable/WorkflowRunsTable.test.tsx b/plugins/cloudbuild/src/components/WorkflowRunsTable/WorkflowRunsTable.test.tsx
new file mode 100644
index 0000000000..ac28c5bedf
--- /dev/null
+++ b/plugins/cloudbuild/src/components/WorkflowRunsTable/WorkflowRunsTable.test.tsx
@@ -0,0 +1,103 @@
+/*
+ * Copyright 2020 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { renderInTestApp } from '@backstage/test-utils';
+import React from 'react';
+import { WorkflowRunsTableView } from './WorkflowRunsTable';
+import { WorkflowRun } from '../useWorkflowRuns';
+
+describe('<WorkflowRunsTableView />', () => {
+  let runs: WorkflowRun[] = [];
+
+  beforeEach(() => {
+    runs = [
+      {
+        id: 'run_id_1',
+        message: 'A workflow message',
+        rerun: jest.fn(),
+        url: 'https://cloudbuild.run/',
+        googleUrl: 'https://google.com',
+        status: 'success',
+        substitutions: {
+          COMMIT_SHA: 'e3adasd2e3adasd2e3adasd2',
+          SHORT_SHA: 'f12j1231',
+          BRANCH_NAME: 'main',
+          REPO_NAME: 'backstage',
+          REVISION_ID: 'g123123',
+        },
+        createTime: '2014-10-02T15:01:23.045123456Z',
+      },
+    ];
+  });
+
+  it('row has a link to the run', async () => {
+    const { getByTestId } = await renderInTestApp(
+      <WorkflowRunsTableView
+        loading={false}
+        page={1}
+        pageSize={10}
+        onChangePage={jest.fn()}
+        onChangePageSize={jest.fn()}
+        projectName="Backstage"
+        retry={jest.fn()}
+        runs={runs}
+        total={runs.length}
+      />,
+    );
+
+    expect(getByTestId('cell-source')).toHaveAttribute('href', '/run_id_1');
+  });
+
+  it('row has the time it was created', async () => {
+    const { getByTestId } = await renderInTestApp(
+      <WorkflowRunsTableView
+        loading={false}
+        page={1}
+        pageSize={10}
+        onChangePage={jest.fn()}
+        onChangePageSize={jest.fn()}
+        projectName="Backstage"
+        retry={jest.fn()}
+        runs={runs}
+        total={runs.length}
+      />,
+    );
+
+    expect(getByTestId('cell-created')).toHaveTextContent(
+      '02-10-2014 03:01:23',
+    );
+  });
+
+  it('row with an action to rerun', async () => {
+    const { getByTestId } = await renderInTestApp(
+      <WorkflowRunsTableView
+        loading={false}
+        page={1}
+        pageSize={10}
+        onChangePage={jest.fn()}
+        onChangePageSize={jest.fn()}
+        projectName="Backstage"
+        retry={jest.fn()}
+        runs={runs}
+        total={runs.length}
+      />,
+    );
+
+    const rerunActionElement = getByTestId('action-rerun');
+    rerunActionElement.click();
+    expect(runs[0].rerun).toHaveBeenCalled();
+  });
+});
diff --git a/plugins/cloudbuild/src/components/WorkflowRunsTable/WorkflowRunsTable.tsx b/plugins/cloudbuild/src/components/WorkflowRunsTable/WorkflowRunsTable.tsx
index acacc8bec5..0d00347183 100644
--- a/plugins/cloudbuild/src/components/WorkflowRunsTable/WorkflowRunsTable.tsx
+++ b/plugins/cloudbuild/src/components/WorkflowRunsTable/WorkflowRunsTable.tsx
@@ -24,7 +24,7 @@ import SyncIcon from '@material-ui/icons/Sync';
 import { useProjectName } from '../useProjectName';
 import { Entity } from '@backstage/catalog-model';
 import { buildRouteRef } from '../../routes';
-import moment from 'moment';
+import { DateTime } from 'luxon';
 import { Table, TableColumn } from '@backstage/core-components';
 
 const generatedColumns: TableColumn[] = [
@@ -45,7 +45,7 @@ const generatedColumns: TableColumn[] = [
     width: '150px',
     render: (row: Partial<WorkflowRun>) => (
       <Typography variant="body2" noWrap>
-        <p>{row.id?.substring(0, 8)}</p>
+        {row.id?.substring(0, 8)}
       </Typography>
     ),
   },
@@ -57,6 +57,7 @@ const generatedColumns: TableColumn[] = [
     render: (row: Partial<WorkflowRun>) => (
       <Link
         component={RouterLink}
+        data-testid="cell-source"
         to={generatePath(buildRouteRef.path, { id: row.id! })}
       >
         {row.message}
@@ -67,7 +68,7 @@ const generatedColumns: TableColumn[] = [
     title: 'Ref',
     render: (row: Partial<WorkflowRun>) => (
       <Typography variant="body2" noWrap>
-        <p>{row.substitutions?.BRANCH_NAME}</p>
+        {row.substitutions?.BRANCH_NAME}
       </Typography>
     ),
   },
@@ -75,15 +76,17 @@ const generatedColumns: TableColumn[] = [
     title: 'Commit',
     render: (row: Partial<WorkflowRun>) => (
       <Typography variant="body2" noWrap>
-        <p>{row.substitutions?.SHORT_SHA}</p>
+        {row.substitutions?.SHORT_SHA}
       </Typography>
     ),
   },
   {
     title: 'Created',
     render: (row: Partial<WorkflowRun>) => (
-      <Typography variant="body2" noWrap>
-        <p>{moment(row.createTime).format('DD-MM-YYYY hh:mm:ss')}</p>
+      <Typography data-testid="cell-created" variant="body2" noWrap>
+        {DateTime.fromISO(row.createTime ?? DateTime.now().toISO()).toFormat(
+          'dd-MM-yyyy hh:mm:ss',
+        )}
       </Typography>
     ),
   },
@@ -91,7 +94,7 @@ const generatedColumns: TableColumn[] = [
     title: 'Actions',
     render: (row: Partial<WorkflowRun>) => (
       <Tooltip title="Rerun workflow">
-        <IconButton onClick={row.rerun}>
+        <IconButton data-testid="action-rerun" onClick={row.rerun}>
           <RetryIcon />
         </IconButton>
       </Tooltip>
@@ -138,8 +141,8 @@ export const WorkflowRunsTableView = ({
         },
       ]}
       data={runs ?? []}
-      onChangePage={onChangePage}
-      onChangeRowsPerPage={onChangePageSize}
+      onPageChange={onChangePage}
+      onRowsPerPageChange={onChangePageSize}
       style={{ width: '100%' }}
       title={
         <Box display="flex" alignItems="center">
diff --git a/plugins/cloudbuild/src/components/useWorkflowRuns.ts b/plugins/cloudbuild/src/components/useWorkflowRuns.ts
index b1efeecbbe..3c4810d4f6 100644
--- a/plugins/cloudbuild/src/components/useWorkflowRuns.ts
+++ b/plugins/cloudbuild/src/components/useWorkflowRuns.ts
@@ -41,9 +41,12 @@ export function useWorkflowRuns({ projectId }: { projectId: string }) {
   const [page, setPage] = useState(0);
   const [pageSize, setPageSize] = useState(5);
 
-  const { loading, value: runs, retry, error } = useAsyncRetry<
-    WorkflowRun[]
-  >(async () => {
+  const {
+    loading,
+    value: runs,
+    retry,
+    error,
+  } = useAsyncRetry<WorkflowRun[]>(async () => {
     return api
       .listWorkflowRuns({
         projectId,
diff --git a/plugins/code-coverage-backend/CHANGELOG.md b/plugins/code-coverage-backend/CHANGELOG.md
index 7e008b4dcf..7b0cd1c83b 100644
--- a/plugins/code-coverage-backend/CHANGELOG.md
+++ b/plugins/code-coverage-backend/CHANGELOG.md
@@ -1,5 +1,22 @@
 # @backstage/plugin-code-coverage-backend
 
+## 0.1.10
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.9.0
+  - @backstage/integration@0.6.2
+  - @backstage/config@0.1.8
+
+## 0.1.9
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/integration@0.6.0
+  - @backstage/backend-common@0.8.9
+
 ## 0.1.8
 
 ### Patch Changes
diff --git a/plugins/code-coverage-backend/api-report.md b/plugins/code-coverage-backend/api-report.md
index fb7e844f13..8d92686f2c 100644
--- a/plugins/code-coverage-backend/api-report.md
+++ b/plugins/code-coverage-backend/api-report.md
@@ -10,18 +10,26 @@ import { PluginDatabaseManager } from '@backstage/backend-common';
 import { PluginEndpointDiscovery } from '@backstage/backend-common';
 import { UrlReader } from '@backstage/backend-common';
 
+// Warning: (ae-missing-release-tag) "CodeCoverageApi" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export interface CodeCoverageApi {
   // (undocumented)
   name: string;
 }
 
+// Warning: (ae-missing-release-tag) "createRouter" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export function createRouter(options: RouterOptions): Promise<express.Router>;
 
+// Warning: (ae-missing-release-tag) "makeRouter" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export const makeRouter: (options: RouterOptions) => Promise<express.Router>;
 
+// Warning: (ae-missing-release-tag) "RouterOptions" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export interface RouterOptions {
   // (undocumented)
diff --git a/plugins/code-coverage-backend/package.json b/plugins/code-coverage-backend/package.json
index fa2f38b3eb..d5c7e21d9c 100644
--- a/plugins/code-coverage-backend/package.json
+++ b/plugins/code-coverage-backend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-code-coverage-backend",
-  "version": "0.1.8",
+  "version": "0.1.10",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -19,12 +19,12 @@
     "clean": "backstage-cli clean"
   },
   "dependencies": {
-    "@backstage/backend-common": "^0.8.5",
+    "@backstage/backend-common": "^0.9.0",
     "@backstage/catalog-client": "^0.3.16",
     "@backstage/catalog-model": "^0.9.0",
-    "@backstage/config": "^0.1.5",
+    "@backstage/config": "^0.1.8",
     "@backstage/errors": "^0.1.1",
-    "@backstage/integration": "^0.5.8",
+    "@backstage/integration": "^0.6.2",
     "@types/express": "^4.17.6",
     "cross-fetch": "^3.0.6",
     "express": "^4.17.1",
@@ -36,7 +36,7 @@
     "yn": "^4.0.0"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.7.1",
+    "@backstage/cli": "^0.7.8",
     "@types/express-xml-bodyparser": "^0.3.2",
     "@types/supertest": "^2.0.8",
     "msw": "^0.29.0",
diff --git a/plugins/code-coverage-backend/src/service/converter/cobertura.ts b/plugins/code-coverage-backend/src/service/converter/cobertura.ts
index 429e645cf2..12893a397d 100644
--- a/plugins/code-coverage-backend/src/service/converter/cobertura.ts
+++ b/plugins/code-coverage-backend/src/service/converter/cobertura.ts
@@ -117,8 +117,8 @@ export class Cobertura implements Converter {
     const lines = [classLines, methodLines].flat().filter(Boolean);
     const lineHits = lines.map(l => {
       return {
-        number: parseInt((l.$.number as unknown) as string, 10),
-        hits: parseInt((l.$.hits as unknown) as string, 10),
+        number: parseInt(l.$.number as unknown as string, 10),
+        hits: parseInt(l.$.hits as unknown as string, 10),
         'condition-coverage': l.$['condition-coverage'],
         branch: l.$.branch,
       };
diff --git a/plugins/code-coverage-backend/src/service/router.ts b/plugins/code-coverage-backend/src/service/router.ts
index f28ff5e0d5..5f136cc8e9 100644
--- a/plugins/code-coverage-backend/src/service/router.ts
+++ b/plugins/code-coverage-backend/src/service/router.ts
@@ -189,12 +189,8 @@ export const makeRouter = async (
       throw new InputError(`Unsupported coverage type '${coverageType}`);
     }
 
-    const {
-      sourceLocation,
-      vcs,
-      scmFiles,
-      body,
-    } = await utils.processCoveragePayload(entityLookup, req);
+    const { sourceLocation, vcs, scmFiles, body } =
+      await utils.processCoveragePayload(entityLookup, req);
 
     const files = converter.convert(body, scmFiles);
     if (!files || files.length === 0) {
diff --git a/plugins/code-coverage/CHANGELOG.md b/plugins/code-coverage/CHANGELOG.md
index 4064ba3f1a..2866f8cbcc 100644
--- a/plugins/code-coverage/CHANGELOG.md
+++ b/plugins/code-coverage/CHANGELOG.md
@@ -1,5 +1,47 @@
 # @backstage/plugin-code-coverage
 
+## 0.1.10
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@0.4.5
+  - @backstage/core-components@0.4.0
+  - @backstage/catalog-model@0.9.1
+
+## 0.1.9
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.3.0
+  - @backstage/config@0.1.6
+  - @backstage/core-plugin-api@0.1.5
+  - @backstage/plugin-catalog-react@0.4.1
+
+## 0.1.8
+
+### Patch Changes
+
+- 9d40fcb1e: - Bumping `material-ui/core` version to at least `4.12.2` as they made some breaking changes in later versions which broke `Pagination` of the `Table`.
+  - Switching out `material-table` to `@material-table/core` for support for the later versions of `material-ui/core`
+  - This causes a minor API change to `@backstage/core-components` as the interface for `Table` re-exports the `prop` from the underlying `Table` components.
+  - `onChangeRowsPerPage` has been renamed to `onRowsPerPageChange`
+  - `onChangePage` has been renamed to `onPageChange`
+  - Migration guide is here: https://material-table-core.com/docs/breaking-changes
+- Updated dependencies
+  - @backstage/core-components@0.2.0
+  - @backstage/plugin-catalog-react@0.4.0
+  - @backstage/core-plugin-api@0.1.4
+  - @backstage/theme@0.2.9
+
+## 0.1.7
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@0.3.0
+
 ## 0.1.6
 
 ### Patch Changes
diff --git a/plugins/code-coverage/api-report.md b/plugins/code-coverage/api-report.md
index cd69066d4f..19c1a8b1d5 100644
--- a/plugins/code-coverage/api-report.md
+++ b/plugins/code-coverage/api-report.md
@@ -9,6 +9,8 @@ import { BackstagePlugin } from '@backstage/core-plugin-api';
 import { Entity } from '@backstage/catalog-model';
 import { RouteRef } from '@backstage/core-plugin-api';
 
+// Warning: (ae-missing-release-tag) "codeCoveragePlugin" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export const codeCoveragePlugin: BackstagePlugin<
   {
@@ -17,14 +19,20 @@ export const codeCoveragePlugin: BackstagePlugin<
   {}
 >;
 
+// Warning: (ae-missing-release-tag) "EntityCodeCoverageContent" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export const EntityCodeCoverageContent: () => JSX.Element;
 
+// Warning: (ae-missing-release-tag) "isCodeCoverageAvailable" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 const isCodeCoverageAvailable: (entity: Entity) => boolean;
 export { isCodeCoverageAvailable };
 export { isCodeCoverageAvailable as isPluginApplicableToEntity };
 
+// Warning: (ae-missing-release-tag) "Router" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export const Router: () => JSX.Element;
 
diff --git a/plugins/code-coverage/package.json b/plugins/code-coverage/package.json
index 2a4f7f4bf6..061e4108c1 100644
--- a/plugins/code-coverage/package.json
+++ b/plugins/code-coverage/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-code-coverage",
-  "version": "0.1.6",
+  "version": "0.1.10",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -20,14 +20,14 @@
     "clean": "backstage-cli clean"
   },
   "dependencies": {
-    "@backstage/catalog-model": "^0.9.0",
-    "@backstage/config": "^0.1.4",
-    "@backstage/core-components": "^0.1.5",
-    "@backstage/core-plugin-api": "^0.1.3",
+    "@backstage/catalog-model": "^0.9.1",
+    "@backstage/config": "^0.1.6",
+    "@backstage/core-components": "^0.4.1",
+    "@backstage/core-plugin-api": "^0.1.7",
     "@backstage/errors": "^0.1.1",
-    "@backstage/plugin-catalog-react": "^0.2.6",
-    "@backstage/theme": "^0.2.8",
-    "@material-ui/core": "^4.11.0",
+    "@backstage/plugin-catalog-react": "^0.4.5",
+    "@backstage/theme": "^0.2.10",
+    "@material-ui/core": "^4.12.2",
     "@material-ui/icons": "^4.9.1",
     "@material-ui/lab": "4.0.0-alpha.45",
     "@material-ui/styles": "^4.11.0",
@@ -40,10 +40,10 @@
     "recharts": "^1.8.5"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.7.3",
-    "@backstage/core-app-api": "^0.1.4",
-    "@backstage/dev-utils": "^0.2.1",
-    "@backstage/test-utils": "^0.1.14",
+    "@backstage/cli": "^0.7.11",
+    "@backstage/core-app-api": "^0.1.12",
+    "@backstage/dev-utils": "^0.2.9",
+    "@backstage/test-utils": "^0.1.17",
     "@testing-library/jest-dom": "^5.10.1",
     "@testing-library/react": "^11.2.5",
     "@testing-library/user-event": "^13.1.8",
diff --git a/plugins/config-schema/CHANGELOG.md b/plugins/config-schema/CHANGELOG.md
index e594b4dbc6..52c29bcbc3 100644
--- a/plugins/config-schema/CHANGELOG.md
+++ b/plugins/config-schema/CHANGELOG.md
@@ -1,5 +1,36 @@
 # @backstage/plugin-config-schema
 
+## 0.1.6
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.4.0
+
+## 0.1.5
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.3.0
+  - @backstage/config@0.1.6
+  - @backstage/core-plugin-api@0.1.5
+
+## 0.1.4
+
+### Patch Changes
+
+- 9d40fcb1e: - Bumping `material-ui/core` version to at least `4.12.2` as they made some breaking changes in later versions which broke `Pagination` of the `Table`.
+  - Switching out `material-table` to `@material-table/core` for support for the later versions of `material-ui/core`
+  - This causes a minor API change to `@backstage/core-components` as the interface for `Table` re-exports the `prop` from the underlying `Table` components.
+  - `onChangeRowsPerPage` has been renamed to `onRowsPerPageChange`
+  - `onChangePage` has been renamed to `onPageChange`
+  - Migration guide is here: https://material-table-core.com/docs/breaking-changes
+- Updated dependencies
+  - @backstage/core-components@0.2.0
+  - @backstage/core-plugin-api@0.1.4
+  - @backstage/theme@0.2.9
+
 ## 0.1.3
 
 ### Patch Changes
diff --git a/plugins/config-schema/api-report.md b/plugins/config-schema/api-report.md
index e01cc67888..6b0ef9a964 100644
--- a/plugins/config-schema/api-report.md
+++ b/plugins/config-schema/api-report.md
@@ -11,18 +11,28 @@ import { Observable } from '@backstage/core-plugin-api';
 import { RouteRef } from '@backstage/core-plugin-api';
 import { Schema } from 'jsonschema';
 
+// Warning: (ae-missing-release-tag) "ConfigSchemaApi" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export interface ConfigSchemaApi {
+  // Warning: (ae-forgotten-export) The symbol "ConfigSchemaResult" needs to be exported by the entry point index.d.ts
+  //
   // (undocumented)
   schema$(): Observable<ConfigSchemaResult>;
 }
 
+// Warning: (ae-missing-release-tag) "configSchemaApiRef" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export const configSchemaApiRef: ApiRef<ConfigSchemaApi>;
 
+// Warning: (ae-missing-release-tag) "ConfigSchemaPage" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export const ConfigSchemaPage: () => JSX.Element;
 
+// Warning: (ae-missing-release-tag) "configSchemaPlugin" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export const configSchemaPlugin: BackstagePlugin<
   {
@@ -31,6 +41,8 @@ export const configSchemaPlugin: BackstagePlugin<
   {}
 >;
 
+// Warning: (ae-missing-release-tag) "StaticSchemaLoader" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public
 export class StaticSchemaLoader implements ConfigSchemaApi {
   constructor({ url }?: { url?: string });
diff --git a/plugins/config-schema/dev/index.tsx b/plugins/config-schema/dev/index.tsx
index ef31dc10ee..135449d808 100644
--- a/plugins/config-schema/dev/index.tsx
+++ b/plugins/config-schema/dev/index.tsx
@@ -31,7 +31,7 @@ createDevApp()
     factory: () => ({
       schema$: () =>
         new Observable<ConfigSchemaResult>(sub =>
-          sub.next({ schema: (exampleSchema as unknown) as Schema }),
+          sub.next({ schema: exampleSchema as unknown as Schema }),
         ),
     }),
   })
diff --git a/plugins/config-schema/package.json b/plugins/config-schema/package.json
index ae88de45b4..b6fb078a6a 100644
--- a/plugins/config-schema/package.json
+++ b/plugins/config-schema/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-config-schema",
-  "version": "0.1.3",
+  "version": "0.1.6",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -20,12 +20,12 @@
     "clean": "backstage-cli clean"
   },
   "dependencies": {
-    "@backstage/config": "^0.1.4",
-    "@backstage/core-components": "^0.1.5",
-    "@backstage/core-plugin-api": "^0.1.3",
+    "@backstage/config": "^0.1.6",
+    "@backstage/core-components": "^0.4.1",
+    "@backstage/core-plugin-api": "^0.1.7",
     "@backstage/errors": "^0.1.1",
-    "@backstage/theme": "^0.2.8",
-    "@material-ui/core": "^4.11.0",
+    "@backstage/theme": "^0.2.10",
+    "@material-ui/core": "^4.12.2",
     "@material-ui/icons": "^4.9.1",
     "@material-ui/lab": "4.0.0-alpha.45",
     "jsonschema": "^1.2.6",
@@ -35,10 +35,10 @@
     "zen-observable": "^0.8.15"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.7.3",
-    "@backstage/core-app-api": "^0.1.4",
-    "@backstage/dev-utils": "^0.2.1",
-    "@backstage/test-utils": "^0.1.14",
+    "@backstage/cli": "^0.7.11",
+    "@backstage/core-app-api": "^0.1.12",
+    "@backstage/dev-utils": "^0.2.9",
+    "@backstage/test-utils": "^0.1.17",
     "@testing-library/jest-dom": "^5.10.1",
     "@testing-library/react": "^11.2.5",
     "@testing-library/user-event": "^13.1.8",
diff --git a/plugins/cost-insights/CHANGELOG.md b/plugins/cost-insights/CHANGELOG.md
index bfecedcedc..f7dd9d27f9 100644
--- a/plugins/cost-insights/CHANGELOG.md
+++ b/plugins/cost-insights/CHANGELOG.md
@@ -1,5 +1,47 @@
 # @backstage/plugin-cost-insights
 
+## 0.11.5
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.4.0
+
+## 0.11.4
+
+### Patch Changes
+
+- 8bedb75ae: Update Luxon dependency to 2.x
+- 56c773909: Switched `@types/react` dependency to request `*` rather than a specific version.
+- Updated dependencies
+  - @backstage/core-components@0.3.1
+  - @backstage/core-plugin-api@0.1.6
+
+## 0.11.3
+
+### Patch Changes
+
+- 260c053b9: Fix All Material UI Warnings
+- Updated dependencies
+  - @backstage/core-components@0.3.0
+  - @backstage/config@0.1.6
+  - @backstage/core-plugin-api@0.1.5
+
+## 0.11.2
+
+### Patch Changes
+
+- 9d40fcb1e: - Bumping `material-ui/core` version to at least `4.12.2` as they made some breaking changes in later versions which broke `Pagination` of the `Table`.
+  - Switching out `material-table` to `@material-table/core` for support for the later versions of `material-ui/core`
+  - This causes a minor API change to `@backstage/core-components` as the interface for `Table` re-exports the `prop` from the underlying `Table` components.
+  - `onChangeRowsPerPage` has been renamed to `onRowsPerPageChange`
+  - `onChangePage` has been renamed to `onPageChange`
+  - Migration guide is here: https://material-table-core.com/docs/breaking-changes
+- Updated dependencies
+  - @backstage/core-components@0.2.0
+  - @backstage/core-plugin-api@0.1.4
+  - @backstage/theme@0.2.9
+
 ## 0.11.1
 
 ### Patch Changes
diff --git a/plugins/cost-insights/api-report.md b/plugins/cost-insights/api-report.md
index 2c32f09c53..61ee64859c 100644
--- a/plugins/cost-insights/api-report.md
+++ b/plugins/cost-insights/api-report.md
@@ -22,6 +22,8 @@ import { SetStateAction } from 'react';
 import { TooltipProps } from 'recharts';
 import { TypographyProps } from '@material-ui/core';
 
+// Warning: (ae-missing-release-tag) "Alert" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public
 export type Alert = {
   title: string | JSX.Element;
@@ -38,6 +40,8 @@ export type Alert = {
   onDismissed?(options: AlertOptions): Promise<Alert[]>;
 };
 
+// Warning: (ae-missing-release-tag) "AlertCost" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export interface AlertCost {
   // (undocumented)
@@ -46,6 +50,8 @@ export interface AlertCost {
   id: string;
 }
 
+// Warning: (ae-missing-release-tag) "AlertDismissFormData" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export interface AlertDismissFormData {
   // (undocumented)
@@ -56,6 +62,8 @@ export interface AlertDismissFormData {
   reason: AlertDismissReason;
 }
 
+// Warning: (ae-missing-release-tag) "AlertDismissOption" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export interface AlertDismissOption {
   // (undocumented)
@@ -64,9 +72,13 @@ export interface AlertDismissOption {
   reason: string;
 }
 
+// Warning: (ae-missing-release-tag) "AlertDismissOptions" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export const AlertDismissOptions: AlertDismissOption[];
 
+// Warning: (ae-missing-release-tag) "AlertDismissReason" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export enum AlertDismissReason {
   // (undocumented)
@@ -83,14 +95,18 @@ export enum AlertDismissReason {
   Seasonal = 'seasonal',
 }
 
+// Warning: (ae-missing-release-tag) "AlertForm" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export type AlertForm<
   A extends Alert = any,
-  Data = any
+  Data = any,
 > = ForwardRefExoticComponent<
   AlertFormProps<A, Data> & RefAttributes<HTMLFormElement>
 >;
 
+// Warning: (ae-missing-release-tag) "AlertFormProps" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export type AlertFormProps<A extends Alert, FormData = {}> = {
   alert: A;
@@ -98,6 +114,8 @@ export type AlertFormProps<A extends Alert, FormData = {}> = {
   disableSubmit: (isDisabled: boolean) => void;
 };
 
+// Warning: (ae-missing-release-tag) "AlertOptions" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export interface AlertOptions<T = any> {
   // (undocumented)
@@ -106,21 +124,29 @@ export interface AlertOptions<T = any> {
   group: string;
 }
 
+// Warning: (ae-missing-release-tag) "AlertSnoozeFormData" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public
 export interface AlertSnoozeFormData {
   // (undocumented)
   intervals: string;
 }
 
+// Warning: (ae-missing-release-tag) "AlertSnoozeOption" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export type AlertSnoozeOption = {
   label: string;
   duration: Duration;
 };
 
+// Warning: (ae-missing-release-tag) "AlertSnoozeOptions" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export const AlertSnoozeOptions: AlertSnoozeOption[];
 
+// Warning: (ae-missing-release-tag) "AlertStatus" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export enum AlertStatus {
   // (undocumented)
@@ -131,6 +157,8 @@ export enum AlertStatus {
   Snoozed = 'snoozed',
 }
 
+// Warning: (ae-missing-release-tag) "BarChart" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export const BarChart: ({
   resources,
@@ -142,9 +170,13 @@ export const BarChart: ({
   onMouseMove,
 }: BarChartProps) => JSX.Element;
 
+// Warning: (ae-missing-release-tag) "BarChartData" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public
 export interface BarChartData extends BarChartOptions {}
 
+// Warning: (ae-missing-release-tag) "BarChartLegend" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export const BarChartLegend: ({
   costStart,
@@ -153,6 +185,8 @@ export const BarChartLegend: ({
   children,
 }: PropsWithChildren<BarChartLegendProps>) => JSX.Element;
 
+// Warning: (ae-missing-release-tag) "BarChartLegendOptions" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export type BarChartLegendOptions = {
   previousName: string;
@@ -162,6 +196,8 @@ export type BarChartLegendOptions = {
   hideMarker?: boolean;
 };
 
+// Warning: (ae-missing-release-tag) "BarChartLegendProps" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export type BarChartLegendProps = {
   costStart: number;
@@ -169,6 +205,8 @@ export type BarChartLegendProps = {
   options?: Partial<BarChartLegendOptions>;
 };
 
+// Warning: (ae-missing-release-tag) "BarChartOptions" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export interface BarChartOptions {
   // (undocumented)
@@ -181,6 +219,8 @@ export interface BarChartOptions {
   previousName: string;
 }
 
+// Warning: (ae-missing-release-tag) "BarChartProps" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export type BarChartProps = {
   resources: ResourceData[];
@@ -192,6 +232,8 @@ export type BarChartProps = {
   onMouseMove?: RechartsFunction;
 };
 
+// Warning: (ae-missing-release-tag) "BarChartTooltip" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export const BarChartTooltip: ({
   title,
@@ -202,16 +244,22 @@ export const BarChartTooltip: ({
   children,
 }: PropsWithChildren<BarChartTooltipProps>) => JSX.Element;
 
+// Warning: (ae-missing-release-tag) "BarChartTooltipItem" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export const BarChartTooltipItem: ({
   item,
 }: BarChartTooltipItemProps) => JSX.Element;
 
+// Warning: (ae-missing-release-tag) "BarChartTooltipItemProps" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export type BarChartTooltipItemProps = {
   item: TooltipItem;
 };
 
+// Warning: (ae-missing-release-tag) "BarChartTooltipProps" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export type BarChartTooltipProps = {
   title: string;
@@ -221,6 +269,8 @@ export type BarChartTooltipProps = {
   actions?: ReactNode;
 };
 
+// Warning: (ae-missing-release-tag) "ChangeStatistic" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export interface ChangeStatistic {
   // (undocumented)
@@ -229,6 +279,8 @@ export interface ChangeStatistic {
   ratio?: number;
 }
 
+// Warning: (ae-missing-release-tag) "ChangeThreshold" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export enum ChangeThreshold {
   // (undocumented)
@@ -237,6 +289,8 @@ export enum ChangeThreshold {
   upper = 0.05,
 }
 
+// Warning: (ae-missing-release-tag) "ChartData" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export type ChartData = {
   date: number;
@@ -245,6 +299,8 @@ export type ChartData = {
   [key: string]: number;
 };
 
+// Warning: (ae-missing-release-tag) "Cost" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export interface Cost {
   // (undocumented)
@@ -259,9 +315,13 @@ export interface Cost {
   trendline?: Trendline;
 }
 
+// Warning: (ae-missing-release-tag) "CostGrowth" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export const CostGrowth: ({ change, duration }: CostGrowthProps) => JSX.Element;
 
+// Warning: (ae-missing-release-tag) "CostGrowthIndicator" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export const CostGrowthIndicator: ({
   change,
@@ -270,18 +330,24 @@ export const CostGrowthIndicator: ({
   ...props
 }: CostGrowthIndicatorProps) => JSX.Element;
 
+// Warning: (ae-missing-release-tag) "CostGrowthIndicatorProps" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export type CostGrowthIndicatorProps = TypographyProps & {
   change: ChangeStatistic;
   formatter?: (change: ChangeStatistic) => Maybe<string>;
 };
 
+// Warning: (ae-missing-release-tag) "CostGrowthProps" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export type CostGrowthProps = {
   change: ChangeStatistic;
   duration: Duration;
 };
 
+// Warning: (ae-missing-release-tag) "CostInsightsApi" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export type CostInsightsApi = {
   getLastCompleteBillingDate(): Promise<string>;
@@ -294,23 +360,36 @@ export type CostInsightsApi = {
   getAlerts(group: string): Promise<Alert[]>;
 };
 
+// Warning: (ae-missing-release-tag) "costInsightsApiRef" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export const costInsightsApiRef: ApiRef<CostInsightsApi>;
 
+// Warning: (ae-missing-release-tag) "CostInsightsLabelDataflowInstructionsPage" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export const CostInsightsLabelDataflowInstructionsPage: () => JSX.Element;
 
+// Warning: (ae-missing-release-tag) "CostInsightsPage" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export const CostInsightsPage: () => JSX.Element;
 
+// Warning: (ae-forgotten-export) The symbol "CostInsightsPaletteAdditions" needs to be exported by the entry point index.d.ts
+// Warning: (ae-missing-release-tag) "CostInsightsPalette" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export type CostInsightsPalette = BackstagePalette &
   CostInsightsPaletteAdditions;
 
+// Warning: (ae-missing-release-tag) "CostInsightsPaletteOptions" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export type CostInsightsPaletteOptions = PaletteOptions &
   CostInsightsPaletteAdditions;
 
+// Warning: (ae-missing-release-tag) "costInsightsPlugin" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 const costInsightsPlugin: BackstagePlugin<
   {
@@ -323,21 +402,29 @@ const costInsightsPlugin: BackstagePlugin<
 export { costInsightsPlugin };
 export { costInsightsPlugin as plugin };
 
+// Warning: (ae-missing-release-tag) "CostInsightsProjectGrowthInstructionsPage" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export const CostInsightsProjectGrowthInstructionsPage: () => JSX.Element;
 
+// Warning: (ae-missing-release-tag) "CostInsightsTheme" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export interface CostInsightsTheme extends BackstageTheme {
   // (undocumented)
   palette: CostInsightsPalette;
 }
 
+// Warning: (ae-missing-release-tag) "CostInsightsThemeOptions" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export interface CostInsightsThemeOptions extends PaletteOptions {
   // (undocumented)
   palette: CostInsightsPaletteOptions;
 }
 
+// Warning: (ae-missing-release-tag) "Currency" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export interface Currency {
   // (undocumented)
@@ -352,6 +439,8 @@ export interface Currency {
   unit: string;
 }
 
+// Warning: (ae-missing-release-tag) "CurrencyType" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export enum CurrencyType {
   // (undocumented)
@@ -364,6 +453,8 @@ export enum CurrencyType {
   USD = 'USD',
 }
 
+// Warning: (ae-missing-release-tag) "DataKey" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export enum DataKey {
   // (undocumented)
@@ -374,15 +465,21 @@ export enum DataKey {
   Previous = 'previous',
 }
 
+// Warning: (ae-missing-release-tag) "DateAggregation" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export type DateAggregation = {
   date: string;
   amount: number;
 };
 
+// Warning: (ae-missing-release-tag) "DEFAULT_DATE_FORMAT" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export const DEFAULT_DATE_FORMAT = 'yyyy-LL-dd';
 
+// Warning: (ae-missing-release-tag) "Duration" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public
 export enum Duration {
   // (undocumented)
@@ -395,9 +492,13 @@ export enum Duration {
   P90D = 'P90D',
 }
 
+// Warning: (ae-missing-release-tag) "EngineerThreshold" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export const EngineerThreshold = 0.5;
 
+// Warning: (ae-missing-release-tag) "Entity" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export interface Entity {
   // (undocumented)
@@ -410,6 +511,8 @@ export interface Entity {
   id: Maybe<string>;
 }
 
+// Warning: (ae-missing-release-tag) "ExampleCostInsightsClient" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export class ExampleCostInsightsClient implements CostInsightsApi {
   // (undocumented)
@@ -430,11 +533,15 @@ export class ExampleCostInsightsClient implements CostInsightsApi {
   getUserGroups(userId: string): Promise<Group[]>;
 }
 
+// Warning: (ae-missing-release-tag) "Group" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export type Group = {
   id: string;
 };
 
+// Warning: (ae-missing-release-tag) "GrowthType" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export enum GrowthType {
   // (undocumented)
@@ -445,12 +552,16 @@ export enum GrowthType {
   Savings = 1,
 }
 
+// Warning: (ae-missing-release-tag) "Icon" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export type Icon = {
   kind: string;
   component: JSX.Element;
 };
 
+// Warning: (ae-missing-release-tag) "IconType" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export enum IconType {
   // (undocumented)
@@ -467,6 +578,8 @@ export enum IconType {
   Storage = 'storage',
 }
 
+// Warning: (ae-missing-release-tag) "LegendItem" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export const LegendItem: ({
   title,
@@ -475,6 +588,8 @@ export const LegendItem: ({
   children,
 }: PropsWithChildren<LegendItemProps>) => JSX.Element;
 
+// Warning: (ae-missing-release-tag) "LegendItemProps" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export type LegendItemProps = {
   title: string;
@@ -482,12 +597,18 @@ export type LegendItemProps = {
   markerColor?: string;
 };
 
+// Warning: (ae-missing-release-tag) "Loading" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export type Loading = Record<string, boolean>;
 
+// Warning: (ae-missing-release-tag) "Maybe" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export type Maybe<T> = T | null;
 
+// Warning: (ae-missing-release-tag) "Metric" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export type Metric = {
   kind: string;
@@ -495,6 +616,8 @@ export type Metric = {
   default: boolean;
 };
 
+// Warning: (ae-missing-release-tag) "MetricData" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export interface MetricData {
   // (undocumented)
@@ -507,18 +630,26 @@ export interface MetricData {
   id: string;
 }
 
+// Warning: (ae-forgotten-export) The symbol "MockConfigProviderProps" needs to be exported by the entry point index.d.ts
+// Warning: (ae-missing-release-tag) "MockConfigProvider" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export const MockConfigProvider: ({
   children,
   ...context
 }: MockConfigProviderProps) => JSX.Element;
 
+// Warning: (ae-forgotten-export) The symbol "MockCurrencyProviderProps" needs to be exported by the entry point index.d.ts
+// Warning: (ae-missing-release-tag) "MockCurrencyProvider" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export const MockCurrencyProvider: ({
   children,
   ...context
 }: MockCurrencyProviderProps) => JSX.Element;
 
+// Warning: (ae-missing-release-tag) "PageFilters" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export interface PageFilters {
   // (undocumented)
@@ -531,6 +662,8 @@ export interface PageFilters {
   project: Maybe<string>;
 }
 
+// Warning: (ae-missing-release-tag) "Product" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export interface Product {
   // (undocumented)
@@ -539,9 +672,13 @@ export interface Product {
   name: string;
 }
 
+// Warning: (ae-missing-release-tag) "ProductFilters" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export type ProductFilters = Array<ProductPeriod>;
 
+// Warning: (ae-missing-release-tag) "ProductInsightsOptions" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export type ProductInsightsOptions = {
   product: string;
@@ -550,6 +687,8 @@ export type ProductInsightsOptions = {
   project: Maybe<string>;
 };
 
+// Warning: (ae-missing-release-tag) "ProductPeriod" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export interface ProductPeriod {
   // (undocumented)
@@ -558,6 +697,8 @@ export interface ProductPeriod {
   productType: string;
 }
 
+// Warning: (ae-missing-release-tag) "Project" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export interface Project {
   // (undocumented)
@@ -566,6 +707,8 @@ export interface Project {
   name?: string;
 }
 
+// Warning: (ae-missing-release-tag) "ProjectGrowthAlert" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public
 export class ProjectGrowthAlert implements Alert {
   constructor(data: ProjectGrowthData);
@@ -581,6 +724,8 @@ export class ProjectGrowthAlert implements Alert {
   get url(): string;
 }
 
+// Warning: (ae-missing-release-tag) "ProjectGrowthData" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export interface ProjectGrowthData {
   // (undocumented)
@@ -597,6 +742,8 @@ export interface ProjectGrowthData {
   project: string;
 }
 
+// Warning: (ae-missing-release-tag) "ResourceData" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export interface ResourceData {
   // (undocumented)
@@ -607,6 +754,8 @@ export interface ResourceData {
   previous: number;
 }
 
+// Warning: (ae-missing-release-tag) "TooltipItem" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export type TooltipItem = {
   fill: string;
@@ -614,12 +763,16 @@ export type TooltipItem = {
   value: string;
 };
 
+// Warning: (ae-missing-release-tag) "Trendline" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export type Trendline = {
   slope: number;
   intercept: number;
 };
 
+// Warning: (ae-missing-release-tag) "UnlabeledDataflowAlert" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public
 export class UnlabeledDataflowAlert implements Alert {
   constructor(data: UnlabeledDataflowData);
@@ -637,6 +790,8 @@ export class UnlabeledDataflowAlert implements Alert {
   get url(): string;
 }
 
+// Warning: (ae-missing-release-tag) "UnlabeledDataflowAlertProject" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export interface UnlabeledDataflowAlertProject {
   // (undocumented)
@@ -647,6 +802,8 @@ export interface UnlabeledDataflowAlertProject {
   unlabeledCost: number;
 }
 
+// Warning: (ae-missing-release-tag) "UnlabeledDataflowData" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export interface UnlabeledDataflowData {
   // (undocumented)
@@ -661,5 +818,17 @@ export interface UnlabeledDataflowData {
   unlabeledCost: number;
 }
 
+// Warnings were encountered during analysis:
+//
+// src/api/CostInsightsApi.d.ts:34:8 - (tsdoc-param-tag-missing-hyphen) The @param block should be followed by a parameter name and then a hyphen
+// src/api/CostInsightsApi.d.ts:42:8 - (tsdoc-param-tag-missing-hyphen) The @param block should be followed by a parameter name and then a hyphen
+// src/api/CostInsightsApi.d.ts:56:8 - (tsdoc-param-tag-missing-hyphen) The @param block should be followed by a parameter name and then a hyphen
+// src/api/CostInsightsApi.d.ts:57:8 - (tsdoc-param-tag-missing-hyphen) The @param block should be followed by a parameter name and then a hyphen
+// src/api/CostInsightsApi.d.ts:73:8 - (tsdoc-param-tag-missing-hyphen) The @param block should be followed by a parameter name and then a hyphen
+// src/api/CostInsightsApi.d.ts:74:8 - (tsdoc-param-tag-missing-hyphen) The @param block should be followed by a parameter name and then a hyphen
+// src/api/CostInsightsApi.d.ts:83:8 - (tsdoc-param-tag-missing-hyphen) The @param block should be followed by a parameter name and then a hyphen
+// src/api/CostInsightsApi.d.ts:84:8 - (tsdoc-param-tag-missing-hyphen) The @param block should be followed by a parameter name and then a hyphen
+// src/api/CostInsightsApi.d.ts:100:8 - (tsdoc-param-tag-missing-hyphen) The @param block should be followed by a parameter name and then a hyphen
+
 // (No @packageDocumentation comment for this package)
 ```
diff --git a/plugins/cost-insights/package.json b/plugins/cost-insights/package.json
index 13b9c9d85a..f4cad51d21 100644
--- a/plugins/cost-insights/package.json
+++ b/plugins/cost-insights/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-cost-insights",
-  "version": "0.11.1",
+  "version": "0.11.5",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -30,19 +30,19 @@
     "clean": "backstage-cli clean"
   },
   "dependencies": {
-    "@backstage/config": "^0.1.5",
-    "@backstage/core-components": "^0.1.5",
-    "@backstage/core-plugin-api": "^0.1.3",
-    "@backstage/theme": "^0.2.8",
-    "@material-ui/core": "^4.11.0",
+    "@backstage/config": "^0.1.6",
+    "@backstage/core-components": "^0.4.1",
+    "@backstage/core-plugin-api": "^0.1.7",
+    "@backstage/theme": "^0.2.10",
+    "@material-ui/core": "^4.12.2",
     "@material-ui/icons": "^4.9.1",
     "@material-ui/lab": "4.0.0-alpha.45",
     "@material-ui/styles": "^4.9.6",
-    "@types/react": "^16.9",
+    "@types/react": "*",
     "@types/recharts": "^1.8.14",
     "classnames": "^2.2.6",
     "history": "^5.0.0",
-    "luxon": "^1.26.0",
+    "luxon": "^2.0.2",
     "pluralize": "^8.0.0",
     "qs": "^6.9.4",
     "react": "^16.13.1",
@@ -54,10 +54,10 @@
     "yup": "^0.29.3"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.7.3",
-    "@backstage/core-app-api": "^0.1.4",
-    "@backstage/dev-utils": "^0.2.1",
-    "@backstage/test-utils": "^0.1.14",
+    "@backstage/cli": "^0.7.11",
+    "@backstage/core-app-api": "^0.1.12",
+    "@backstage/dev-utils": "^0.2.9",
+    "@backstage/test-utils": "^0.1.17",
     "@testing-library/jest-dom": "^5.10.1",
     "@testing-library/react": "^11.2.5",
     "@testing-library/user-event": "^13.1.8",
diff --git a/plugins/cost-insights/src/components/AlertInsights/AlertInsights.tsx b/plugins/cost-insights/src/components/AlertInsights/AlertInsights.tsx
index 01711e5328..2daacda85e 100644
--- a/plugins/cost-insights/src/components/AlertInsights/AlertInsights.tsx
+++ b/plugins/cost-insights/src/components/AlertInsights/AlertInsights.tsx
@@ -41,10 +41,10 @@ import { ScrollAnchor } from '../../utils/scroll';
 
 type MapLoadingtoAlerts = (isLoading: boolean) => void;
 
-const mapLoadingToAlerts: MapLoadingToProps<MapLoadingtoAlerts> = ({
-  dispatch,
-}) => (isLoading: boolean) =>
-  dispatch({ [DefaultLoadingAction.CostInsightsAlerts]: isLoading });
+const mapLoadingToAlerts: MapLoadingToProps<MapLoadingtoAlerts> =
+  ({ dispatch }) =>
+  (isLoading: boolean) =>
+    dispatch({ [DefaultLoadingAction.CostInsightsAlerts]: isLoading });
 
 type AlertInsightsProps = {
   group: string;
diff --git a/plugins/cost-insights/src/components/AlertInsights/AlertInsightsSectionHeader.tsx b/plugins/cost-insights/src/components/AlertInsights/AlertInsightsSectionHeader.tsx
index 8325987a59..e4abf3a3ac 100644
--- a/plugins/cost-insights/src/components/AlertInsights/AlertInsightsSectionHeader.tsx
+++ b/plugins/cost-insights/src/components/AlertInsights/AlertInsightsSectionHeader.tsx
@@ -36,7 +36,12 @@ export const AlertInsightsSectionHeader = ({
   return (
     <Box position="relative" mb={3} textAlign="left">
       <ScrollAnchor id={`alert-${number}`} />
-      <Grid container spacing={2} justify="space-between" alignItems="center">
+      <Grid
+        container
+        spacing={2}
+        justifyContent="space-between"
+        alignItems="center"
+      >
         <Grid item>
           <Box display="flex" alignItems="center">
             <Box mr={2}>
diff --git a/plugins/cost-insights/src/components/BarChart/BarChartSteps.tsx b/plugins/cost-insights/src/components/BarChart/BarChartSteps.tsx
index 682cd2a485..556154d046 100644
--- a/plugins/cost-insights/src/components/BarChart/BarChartSteps.tsx
+++ b/plugins/cost-insights/src/components/BarChart/BarChartSteps.tsx
@@ -30,12 +30,12 @@ export const BarChartSteps = ({
   onClick,
 }: BarChartStepsProps) => {
   const classes = useStyles();
-  const handleOnClick = (index: number) => (
-    event: React.MouseEvent<HTMLButtonElement, MouseEvent>,
-  ) => {
-    event.preventDefault();
-    onClick(index);
-  };
+  const handleOnClick =
+    (index: number) =>
+    (event: React.MouseEvent<HTMLButtonElement, MouseEvent>) => {
+      event.preventDefault();
+      onClick(index);
+    };
 
   return (
     <div className={classes.steps}>
diff --git a/plugins/cost-insights/src/components/CostInsightsPage/CostInsightsThemeProvider.tsx b/plugins/cost-insights/src/components/CostInsightsPage/CostInsightsThemeProvider.tsx
index e56d72cc09..7c64c41116 100644
--- a/plugins/cost-insights/src/components/CostInsightsPage/CostInsightsThemeProvider.tsx
+++ b/plugins/cost-insights/src/components/CostInsightsPage/CostInsightsThemeProvider.tsx
@@ -15,7 +15,10 @@
  */
 
 import React, { PropsWithChildren } from 'react';
-import { createMuiTheme, ThemeProvider } from '@material-ui/core';
+import {
+  createTheme as createMuiTheme,
+  ThemeProvider,
+} from '@material-ui/core';
 import { BackstageTheme } from '@backstage/theme';
 import {
   costInsightsDarkTheme,
diff --git a/plugins/cost-insights/src/components/CostInsightsPage/selector.tsx b/plugins/cost-insights/src/components/CostInsightsPage/selector.tsx
index caafd6ad42..d9591dbdd6 100644
--- a/plugins/cost-insights/src/components/CostInsightsPage/selector.tsx
+++ b/plugins/cost-insights/src/components/CostInsightsPage/selector.tsx
@@ -31,21 +31,18 @@ type CostInsightsPageLoadingProps = {
   dispatchReset: (loadingActions: string[]) => void;
 };
 
-export const mapLoadingToProps: MapLoadingToProps<CostInsightsPageLoadingProps> = ({
-  state,
-  actions,
-  dispatch,
-}) => ({
-  loadingActions: actions,
-  loadingGroups: state[DefaultLoadingAction.UserGroups],
-  loadingBillingDate: state[DefaultLoadingAction.LastCompleteBillingDate],
-  loadingInitial: state[DefaultLoadingAction.CostInsightsInitial],
-  dispatchInitial: (isLoading: boolean) =>
-    dispatch({ [DefaultLoadingAction.CostInsightsInitial]: isLoading }),
-  dispatchInsights: (isLoading: boolean) =>
-    dispatch({ [DefaultLoadingAction.CostInsightsPage]: isLoading }),
-  dispatchNone: (loadingActions: string[]) =>
-    dispatch(getResetState(loadingActions)),
-  dispatchReset: (loadingActions: string[]) =>
-    dispatch(getResetStateWithoutInitial(loadingActions)),
-});
+export const mapLoadingToProps: MapLoadingToProps<CostInsightsPageLoadingProps> =
+  ({ state, actions, dispatch }) => ({
+    loadingActions: actions,
+    loadingGroups: state[DefaultLoadingAction.UserGroups],
+    loadingBillingDate: state[DefaultLoadingAction.LastCompleteBillingDate],
+    loadingInitial: state[DefaultLoadingAction.CostInsightsInitial],
+    dispatchInitial: (isLoading: boolean) =>
+      dispatch({ [DefaultLoadingAction.CostInsightsInitial]: isLoading }),
+    dispatchInsights: (isLoading: boolean) =>
+      dispatch({ [DefaultLoadingAction.CostInsightsPage]: isLoading }),
+    dispatchNone: (loadingActions: string[]) =>
+      dispatch(getResetState(loadingActions)),
+    dispatchReset: (loadingActions: string[]) =>
+      dispatch(getResetStateWithoutInitial(loadingActions)),
+  });
diff --git a/plugins/cost-insights/src/components/CostInsightsTabs/selector.ts b/plugins/cost-insights/src/components/CostInsightsTabs/selector.ts
index c212c0bb73..59b1c9549c 100644
--- a/plugins/cost-insights/src/components/CostInsightsTabs/selector.ts
+++ b/plugins/cost-insights/src/components/CostInsightsTabs/selector.ts
@@ -28,24 +28,20 @@ type CostInsightsTabsLoadingProps = {
   dispatchReset: (loadingActions: string[]) => void;
 };
 
-export const mapFiltersToProps: MapFiltersToProps<CostInsightsTabsFilterProps> = ({
-  pageFilters,
-  setPageFilters,
-}) => ({
-  ...pageFilters,
-  setGroup: (group: Group) =>
-    setPageFilters({
-      ...pageFilters,
-      group: group.id,
-      project: null,
-    }),
-});
+export const mapFiltersToProps: MapFiltersToProps<CostInsightsTabsFilterProps> =
+  ({ pageFilters, setPageFilters }) => ({
+    ...pageFilters,
+    setGroup: (group: Group) =>
+      setPageFilters({
+        ...pageFilters,
+        group: group.id,
+        project: null,
+      }),
+  });
 
-export const mapLoadingToProps: MapLoadingToProps<CostInsightsTabsLoadingProps> = ({
-  actions,
-  dispatch,
-}) => ({
-  loadingActions: actions,
-  dispatchReset: (loadingActions: string[]) =>
-    dispatch(getResetStateWithoutInitial(loadingActions)),
-});
+export const mapLoadingToProps: MapLoadingToProps<CostInsightsTabsLoadingProps> =
+  ({ actions, dispatch }) => ({
+    loadingActions: actions,
+    dispatchReset: (loadingActions: string[]) =>
+      dispatch(getResetStateWithoutInitial(loadingActions)),
+  });
diff --git a/plugins/cost-insights/src/components/CostOverviewCard/CostOverviewCard.tsx b/plugins/cost-insights/src/components/CostOverviewCard/CostOverviewCard.tsx
index a5cd9e524e..1a4bb4ba6e 100644
--- a/plugins/cost-insights/src/components/CostOverviewCard/CostOverviewCard.tsx
+++ b/plugins/cost-insights/src/components/CostOverviewCard/CostOverviewCard.tsx
@@ -51,9 +51,8 @@ export const CostOverviewCard = ({
   const styles = useOverviewTabsStyles(theme);
   const config = useConfig();
   const [tabIndex, setTabIndex] = useState(0);
-  const { setDuration, setProject, setMetric, ...filters } = useFilters(
-    mapFiltersToProps,
-  );
+  const { setDuration, setProject, setMetric, ...filters } =
+    useFilters(mapFiltersToProps);
 
   // Reset tabIndex if breakdowns available change
   useEffect(() => {
diff --git a/plugins/cost-insights/src/components/ProductInsights/ProductInsights.test.tsx b/plugins/cost-insights/src/components/ProductInsights/ProductInsights.test.tsx
index f90f30d2eb..7253febd71 100644
--- a/plugins/cost-insights/src/components/ProductInsights/ProductInsights.test.tsx
+++ b/plugins/cost-insights/src/components/ProductInsights/ProductInsights.test.tsx
@@ -170,7 +170,8 @@ describe('<ProductInsights />', () => {
   }
 
   it('should render each product panel', async () => {
-    const noComputeEngineCostsRgx = /There are no Compute Engine costs within this time frame for your team's projects./;
+    const noComputeEngineCostsRgx =
+      /There are no Compute Engine costs within this time frame for your team's projects./;
     const { getByText } = await renderInContext(
       <ProductInsights
         onLoaded={jest.fn()}
diff --git a/plugins/cost-insights/src/components/ProductInsights/ProductInsights.tsx b/plugins/cost-insights/src/components/ProductInsights/ProductInsights.tsx
index 2247908fb3..3eba868843 100644
--- a/plugins/cost-insights/src/components/ProductInsights/ProductInsights.tsx
+++ b/plugins/cost-insights/src/components/ProductInsights/ProductInsights.tsx
@@ -37,9 +37,10 @@ import { useApi } from '@backstage/core-plugin-api';
 
 type LoadingProps = (isLoading: boolean) => void;
 
-const mapLoadingToProps: MapLoadingToProps<LoadingProps> = ({ dispatch }) => (
-  isLoading: boolean,
-) => dispatch({ [DefaultLoadingAction.CostInsightsProducts]: isLoading });
+const mapLoadingToProps: MapLoadingToProps<LoadingProps> =
+  ({ dispatch }) =>
+  (isLoading: boolean) =>
+    dispatch({ [DefaultLoadingAction.CostInsightsProducts]: isLoading });
 
 type ProductInsightsProps = {
   group: string;
diff --git a/plugins/cost-insights/src/components/ProductInsightsCard/ProductInsightsCard.tsx b/plugins/cost-insights/src/components/ProductInsightsCard/ProductInsightsCard.tsx
index a75141a7a3..2b4ee4b0db 100644
--- a/plugins/cost-insights/src/components/ProductInsightsCard/ProductInsightsCard.tsx
+++ b/plugins/cost-insights/src/components/ProductInsightsCard/ProductInsightsCard.tsx
@@ -49,9 +49,10 @@ export type ProductInsightsCardProps = {
   onSelectAsync: (product: Product, duration: Duration) => Promise<Entity>;
 };
 
-const mapLoadingToProps: MapLoadingToProps<LoadingProps> = ({ dispatch }) => (
-  isLoading: boolean,
-) => dispatch({ [DefaultLoadingAction.CostInsightsProducts]: isLoading });
+const mapLoadingToProps: MapLoadingToProps<LoadingProps> =
+  ({ dispatch }) =>
+  (isLoading: boolean) =>
+    dispatch({ [DefaultLoadingAction.CostInsightsProducts]: isLoading });
 
 export const ProductInsightsCard = ({
   initialState,
diff --git a/plugins/cost-insights/src/components/ProductInsightsCard/selector.ts b/plugins/cost-insights/src/components/ProductInsightsCard/selector.ts
index c4ca0630c9..8d60253c3b 100644
--- a/plugins/cost-insights/src/components/ProductInsightsCard/selector.ts
+++ b/plugins/cost-insights/src/components/ProductInsightsCard/selector.ts
@@ -29,29 +29,22 @@ type ProductInsightsCardLoadingProps = {
   dispatchLoading: (isLoading: boolean) => void;
 };
 
-export const mapFiltersToProps = (
-  product: string,
-): MapFiltersToProps<ProductInsightsCardFilterProps> => ({
-  pageFilters,
-  productFilters,
-  setProductFilters,
-}) => ({
-  ...pageFilters,
-  product: findAlways(productFilters, p => p.productType === product),
-  setProduct: (duration: Duration) =>
-    setProductFilters(
-      productFilters.map(period =>
-        period.productType === product ? { ...period, duration } : period,
+export const mapFiltersToProps =
+  (product: string): MapFiltersToProps<ProductInsightsCardFilterProps> =>
+  ({ pageFilters, productFilters, setProductFilters }) => ({
+    ...pageFilters,
+    product: findAlways(productFilters, p => p.productType === product),
+    setProduct: (duration: Duration) =>
+      setProductFilters(
+        productFilters.map(period =>
+          period.productType === product ? { ...period, duration } : period,
+        ),
       ),
-    ),
-});
+  });
 
-export const mapLoadingToProps = (
-  product: string,
-): MapLoadingToProps<ProductInsightsCardLoadingProps> => ({
-  state,
-  dispatch,
-}) => ({
-  loadingProduct: state[product],
-  dispatchLoading: (isLoading: boolean) => dispatch({ [product]: isLoading }),
-});
+export const mapLoadingToProps =
+  (product: string): MapLoadingToProps<ProductInsightsCardLoadingProps> =>
+  ({ state, dispatch }) => ({
+    loadingProduct: state[product],
+    dispatchLoading: (isLoading: boolean) => dispatch({ [product]: isLoading }),
+  });
diff --git a/plugins/cost-insights/src/components/UnlabeledDataflowAlertCard/UnlabeledDataflowAlertCard.test.tsx b/plugins/cost-insights/src/components/UnlabeledDataflowAlertCard/UnlabeledDataflowAlertCard.test.tsx
index 367af46112..5c226d4cb3 100644
--- a/plugins/cost-insights/src/components/UnlabeledDataflowAlertCard/UnlabeledDataflowAlertCard.test.tsx
+++ b/plugins/cost-insights/src/components/UnlabeledDataflowAlertCard/UnlabeledDataflowAlertCard.test.tsx
@@ -22,14 +22,13 @@ import {
 } from '../../testUtils';
 import { renderInTestApp } from '@backstage/test-utils';
 
-const MockUnlabeledDataflowAlertMultipleProjects = createMockUnlabeledDataflowData(
-  data => ({
+const MockUnlabeledDataflowAlertMultipleProjects =
+  createMockUnlabeledDataflowData(data => ({
     ...data,
     projects: [...Array(10)].map(() =>
       createMockUnlabeledDataflowAlertProject(),
     ),
-  }),
-);
+  }));
 
 const MockUnlabeledDataflowAlertSingleProject = createMockUnlabeledDataflowData(
   data => ({
diff --git a/plugins/cost-insights/src/hooks/useFilters.tsx b/plugins/cost-insights/src/hooks/useFilters.tsx
index 959b280b69..abe7a132cc 100644
--- a/plugins/cost-insights/src/hooks/useFilters.tsx
+++ b/plugins/cost-insights/src/hooks/useFilters.tsx
@@ -54,9 +54,8 @@ export const FilterProvider = ({ children }: PropsWithChildren<{}>) => {
   const groups = useGroups();
   const [error, setError] = useState<Maybe<Error>>(null);
   const [pageFilters, setPageFilters] = useState<Maybe<PageFilters>>(null);
-  const [productFilters, setProductFilters] = useState<Maybe<ProductFilters>>(
-    null,
-  );
+  const [productFilters, setProductFilters] =
+    useState<Maybe<ProductFilters>>(null);
 
   useEffect(() => {
     async function setPageFiltersFromLocation() {
diff --git a/plugins/cost-insights/src/hooks/useLastCompleteBillingDate.tsx b/plugins/cost-insights/src/hooks/useLastCompleteBillingDate.tsx
index 471debbaac..d8236ed61a 100644
--- a/plugins/cost-insights/src/hooks/useLastCompleteBillingDate.tsx
+++ b/plugins/cost-insights/src/hooks/useLastCompleteBillingDate.tsx
@@ -59,9 +59,8 @@ export const BillingDateProvider = ({ children }: PropsWithChildren<{}>) => {
   const [error, setError] = useState<Maybe<Error>>(null);
   const { dispatchLoadingBillingDate } = useLoading(mapLoadingToProps);
 
-  const [lastCompleteBillingDate, setLastCompeteBillingDate] = useState<
-    Maybe<string>
-  >(null);
+  const [lastCompleteBillingDate, setLastCompeteBillingDate] =
+    useState<Maybe<string>>(null);
 
   useEffect(() => {
     dispatchLoadingBillingDate(true);
diff --git a/plugins/cost-insights/src/plugin.ts b/plugins/cost-insights/src/plugin.ts
index 17a512ae9c..08910dcbca 100644
--- a/plugins/cost-insights/src/plugin.ts
+++ b/plugins/cost-insights/src/plugin.ts
@@ -55,22 +55,24 @@ export const CostInsightsPage = costInsightsPlugin.provide(
   }),
 );
 
-export const CostInsightsProjectGrowthInstructionsPage = costInsightsPlugin.provide(
-  createRoutableExtension({
-    component: () =>
-      import('./components/ProjectGrowthInstructionsPage').then(
-        m => m.ProjectGrowthInstructionsPage,
-      ),
-    mountPoint: projectGrowthAlertRef,
-  }),
-);
+export const CostInsightsProjectGrowthInstructionsPage =
+  costInsightsPlugin.provide(
+    createRoutableExtension({
+      component: () =>
+        import('./components/ProjectGrowthInstructionsPage').then(
+          m => m.ProjectGrowthInstructionsPage,
+        ),
+      mountPoint: projectGrowthAlertRef,
+    }),
+  );
 
-export const CostInsightsLabelDataflowInstructionsPage = costInsightsPlugin.provide(
-  createRoutableExtension({
-    component: () =>
-      import('./components/LabelDataflowInstructionsPage').then(
-        m => m.LabelDataflowInstructionsPage,
-      ),
-    mountPoint: unlabeledDataflowAlertRef,
-  }),
-);
+export const CostInsightsLabelDataflowInstructionsPage =
+  costInsightsPlugin.provide(
+    createRoutableExtension({
+      component: () =>
+        import('./components/LabelDataflowInstructionsPage').then(
+          m => m.LabelDataflowInstructionsPage,
+        ),
+      mountPoint: unlabeledDataflowAlertRef,
+    }),
+  );
diff --git a/plugins/cost-insights/src/testUtils/loading.ts b/plugins/cost-insights/src/testUtils/loading.ts
index 576415b61e..48997dc877 100644
--- a/plugins/cost-insights/src/testUtils/loading.ts
+++ b/plugins/cost-insights/src/testUtils/loading.ts
@@ -19,11 +19,13 @@ import {
   getDefaultState as getDefaultLoadingState,
 } from '../utils/loading';
 
-export const MockDefaultLoadingActions = ([
-  DefaultLoadingAction.UserGroups,
-  DefaultLoadingAction.CostInsightsInitial,
-  DefaultLoadingAction.CostInsightsPage,
-] as string[]).concat(MockProducts.map(product => product.kind));
+export const MockDefaultLoadingActions = (
+  [
+    DefaultLoadingAction.UserGroups,
+    DefaultLoadingAction.CostInsightsInitial,
+    DefaultLoadingAction.CostInsightsPage,
+  ] as string[]
+).concat(MockProducts.map(product => product.kind));
 
 export const mockDefaultLoadingState = getDefaultLoadingState(
   MockDefaultLoadingActions,
diff --git a/plugins/cost-insights/src/testUtils/providers.tsx b/plugins/cost-insights/src/testUtils/providers.tsx
index ee92909141..75450c0bb7 100644
--- a/plugins/cost-insights/src/testUtils/providers.tsx
+++ b/plugins/cost-insights/src/testUtils/providers.tsx
@@ -37,7 +37,8 @@ type PartialPropsWithChildren<T> = PropsWithChildren<Partial<T>>;
 
 export const MockGroups: Group[] = [{ id: 'tech' }, { id: 'mock-group' }];
 
-export type MockFilterProviderProps = PartialPropsWithChildren<FilterContextProps>;
+export type MockFilterProviderProps =
+  PartialPropsWithChildren<FilterContextProps>;
 
 export const MockFilterProvider = ({
   children,
@@ -61,7 +62,8 @@ export const MockFilterProvider = ({
   );
 };
 
-export type MockLoadingProviderProps = PartialPropsWithChildren<LoadingContextProps>;
+export type MockLoadingProviderProps =
+  PartialPropsWithChildren<LoadingContextProps>;
 
 export const MockLoadingProvider = ({
   children,
@@ -79,7 +81,8 @@ export const MockLoadingProvider = ({
   );
 };
 
-export type MockConfigProviderProps = PartialPropsWithChildren<ConfigContextProps>;
+export type MockConfigProviderProps =
+  PartialPropsWithChildren<ConfigContextProps>;
 
 export const MockConfigProvider = ({
   children,
@@ -99,7 +102,8 @@ export const MockConfigProvider = ({
   );
 };
 
-export type MockCurrencyProviderProps = PartialPropsWithChildren<CurrencyContextProps>;
+export type MockCurrencyProviderProps =
+  PartialPropsWithChildren<CurrencyContextProps>;
 
 export const MockCurrencyProvider = ({
   children,
@@ -120,7 +124,8 @@ export const MockCurrencyProvider = ({
   );
 };
 
-export type MockBillingDateProviderProps = PartialPropsWithChildren<BillingDateContextProps>;
+export type MockBillingDateProviderProps =
+  PartialPropsWithChildren<BillingDateContextProps>;
 
 export const MockBillingDateProvider = ({
   children,
@@ -150,7 +155,8 @@ export const MockScrollProvider = ({ children }: MockScrollProviderProps) => {
   );
 };
 
-export type MockGroupsProviderProps = PartialPropsWithChildren<GroupsContextProps>;
+export type MockGroupsProviderProps =
+  PartialPropsWithChildren<GroupsContextProps>;
 
 export const MockGroupsProvider = ({
   children,
diff --git a/plugins/cost-insights/src/types/Alert.ts b/plugins/cost-insights/src/types/Alert.ts
index 2ea9b30103..2f220be0e6 100644
--- a/plugins/cost-insights/src/types/Alert.ts
+++ b/plugins/cost-insights/src/types/Alert.ts
@@ -50,7 +50,7 @@ export type Alert = {
 
 export type AlertForm<
   A extends Alert = any,
-  Data = any
+  Data = any,
 > = ForwardRefExoticComponent<
   AlertFormProps<A, Data> & RefAttributes<HTMLFormElement>
 >;
diff --git a/plugins/cost-insights/src/utils/alerts.tsx b/plugins/cost-insights/src/utils/alerts.tsx
index 25680b5507..2039a5b617 100644
--- a/plugins/cost-insights/src/utils/alerts.tsx
+++ b/plugins/cost-insights/src/utils/alerts.tsx
@@ -30,29 +30,30 @@ export const isStatusSnoozed = createStatusHandler(AlertStatus.Snoozed);
 export const isStatusAccepted = createStatusHandler(AlertStatus.Accepted);
 export const isStatusDismissed = createStatusHandler(AlertStatus.Dismissed);
 
-const createAlertEventHandler = (
-  onEvent: 'onSnoozed' | 'onAccepted' | 'onDismissed',
-) => (alert: Maybe<Alert>): boolean => hasProperty(alert, onEvent);
+const createAlertEventHandler =
+  (onEvent: 'onSnoozed' | 'onAccepted' | 'onDismissed') =>
+  (alert: Maybe<Alert>): boolean =>
+    hasProperty(alert, onEvent);
 export const isSnoozeEnabled = createAlertEventHandler('onSnoozed');
 export const isAcceptEnabled = createAlertEventHandler('onAccepted');
 export const isDismissEnabled = createAlertEventHandler('onDismissed');
 
-const createFormEnabledHandler = (
-  Form: 'SnoozeForm' | 'AcceptForm' | 'DismissForm',
-) => (alert: Maybe<Alert>): boolean => {
-  if (!alert) return false;
-  if (alert[Form] === null) return false;
-  switch (Form) {
-    case 'SnoozeForm':
-      return isSnoozeEnabled(alert);
-    case 'AcceptForm':
-      return isAcceptEnabled(alert);
-    case 'DismissForm':
-      return isDismissEnabled(alert);
-    default:
-      return false;
-  }
-};
+const createFormEnabledHandler =
+  (Form: 'SnoozeForm' | 'AcceptForm' | 'DismissForm') =>
+  (alert: Maybe<Alert>): boolean => {
+    if (!alert) return false;
+    if (alert[Form] === null) return false;
+    switch (Form) {
+      case 'SnoozeForm':
+        return isSnoozeEnabled(alert);
+      case 'AcceptForm':
+        return isAcceptEnabled(alert);
+      case 'DismissForm':
+        return isDismissEnabled(alert);
+      default:
+        return false;
+    }
+  };
 export const isSnoozeFormEnabled = createFormEnabledHandler('SnoozeForm');
 export const isAcceptFormEnabled = createFormEnabledHandler('AcceptForm');
 export const isDismissFormEnabled = createFormEnabledHandler('DismissForm');
diff --git a/plugins/cost-insights/src/utils/formatters.test.ts b/plugins/cost-insights/src/utils/formatters.test.ts
index fbddcd1cb0..9fe17f277f 100644
--- a/plugins/cost-insights/src/utils/formatters.test.ts
+++ b/plugins/cost-insights/src/utils/formatters.test.ts
@@ -36,11 +36,7 @@ describe('date formatters', () => {
 
   it('Correctly formats values to two significant digits', () => {
     const values = [
-      0.00000040925,
-      0.21,
-      0.0000004,
-      0.4139877878,
-      0.00000234566,
+      0.00000040925, 0.21, 0.0000004, 0.4139877878, 0.00000234566,
     ];
     const formattedValues = values.map(val =>
       lengthyCurrencyFormatter.format(val),
diff --git a/plugins/explore-react/api-report.md b/plugins/explore-react/api-report.md
index 530c6eedaf..06d7565559 100644
--- a/plugins/explore-react/api-report.md
+++ b/plugins/explore-react/api-report.md
@@ -5,6 +5,8 @@
 ```ts
 import { ApiRef } from '@backstage/core-plugin-api';
 
+// Warning: (ae-missing-release-tag) "ExploreTool" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export type ExploreTool = {
   title: string;
@@ -15,12 +17,16 @@ export type ExploreTool = {
   lifecycle?: string;
 };
 
+// Warning: (ae-missing-release-tag) "ExploreToolsConfig" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export interface ExploreToolsConfig {
   // (undocumented)
   getTools: () => Promise<ExploreTool[]>;
 }
 
+// Warning: (ae-missing-release-tag) "exploreToolsConfigRef" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export const exploreToolsConfigRef: ApiRef<ExploreToolsConfig>;
 
diff --git a/plugins/explore/CHANGELOG.md b/plugins/explore/CHANGELOG.md
index 7049978f85..2e199b02dd 100644
--- a/plugins/explore/CHANGELOG.md
+++ b/plugins/explore/CHANGELOG.md
@@ -1,5 +1,66 @@
 # @backstage/plugin-explore
 
+## 0.3.15
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@0.4.5
+  - @backstage/core-components@0.4.0
+  - @backstage/catalog-model@0.9.1
+
+## 0.3.14
+
+### Patch Changes
+
+- c8e7a7d6e: Collect the routes of a `ExploreLayout` with `useElementFilter`
+- f2f89445f: Handle Group Big Names in explore plugin
+- Updated dependencies
+  - @backstage/plugin-catalog-react@0.4.4
+  - @backstage/core-components@0.3.3
+
+## 0.3.13
+
+### Patch Changes
+
+- 56c773909: Switched `@types/react` dependency to request `*` rather than a specific version.
+- Updated dependencies
+  - @backstage/core-components@0.3.1
+  - @backstage/core-plugin-api@0.1.6
+  - @backstage/plugin-catalog-react@0.4.2
+
+## 0.3.12
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.3.0
+  - @backstage/core-plugin-api@0.1.5
+  - @backstage/plugin-catalog-react@0.4.1
+
+## 0.3.11
+
+### Patch Changes
+
+- 9d40fcb1e: - Bumping `material-ui/core` version to at least `4.12.2` as they made some breaking changes in later versions which broke `Pagination` of the `Table`.
+  - Switching out `material-table` to `@material-table/core` for support for the later versions of `material-ui/core`
+  - This causes a minor API change to `@backstage/core-components` as the interface for `Table` re-exports the `prop` from the underlying `Table` components.
+  - `onChangeRowsPerPage` has been renamed to `onRowsPerPageChange`
+  - `onChangePage` has been renamed to `onPageChange`
+  - Migration guide is here: https://material-table-core.com/docs/breaking-changes
+- Updated dependencies
+  - @backstage/core-components@0.2.0
+  - @backstage/plugin-catalog-react@0.4.0
+  - @backstage/core-plugin-api@0.1.4
+  - @backstage/theme@0.2.9
+
+## 0.3.10
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@0.3.0
+
 ## 0.3.9
 
 ### Patch Changes
diff --git a/plugins/explore/api-report.md b/plugins/explore/api-report.md
index 4084c6a203..2d04574f88 100644
--- a/plugins/explore/api-report.md
+++ b/plugins/explore/api-report.md
@@ -3,62 +3,96 @@
 > Do not edit this file. It is a report generated by [API Extractor](https://api-extractor.com/).
 
 ```ts
-
 /// <reference types="react" />
 
 import { BackstagePlugin } from '@backstage/core-plugin-api';
-import { default } from 'react';
+import { default as default_2 } from 'react';
 import { ExternalRouteRef } from '@backstage/core-plugin-api';
 import { RouteRef } from '@backstage/core-plugin-api';
 import { TabProps } from '@material-ui/core';
 
+// Warning: (ae-missing-release-tag) "catalogEntityRouteRef" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
-export const catalogEntityRouteRef: ExternalRouteRef<    {
-name: string;
-kind: string;
-namespace: string;
-}, false>;
+export const catalogEntityRouteRef: ExternalRouteRef<
+  {
+    name: string;
+    kind: string;
+    namespace: string;
+  },
+  false
+>;
 
+// Warning: (ae-missing-release-tag) "DomainExplorerContent" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
-export const DomainExplorerContent: ({ title, }: {
-    title?: string | undefined;
+export const DomainExplorerContent: ({
+  title,
+}: {
+  title?: string | undefined;
 }) => JSX.Element;
 
+// Warning: (ae-missing-release-tag) "ExploreLayout" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public
 export const ExploreLayout: {
-    ({ title, subtitle, children, }: ExploreLayoutProps): JSX.Element;
-    Route: (props: SubRoute) => null;
+  ({ title, subtitle, children }: ExploreLayoutProps): JSX.Element;
+  Route: (props: SubRoute) => null;
 };
 
+// Warning: (ae-missing-release-tag) "ExplorePage" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export const ExplorePage: () => JSX.Element;
 
+// Warning: (ae-missing-release-tag) "explorePlugin" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
-const explorePlugin: BackstagePlugin<    {
-explore: RouteRef<undefined>;
-}, {
-catalogEntity: ExternalRouteRef<    {
-name: string;
-kind: string;
-namespace: string;
-}, false>;
-}>;
-export { explorePlugin }
-export { explorePlugin as plugin }
+const explorePlugin: BackstagePlugin<
+  {
+    explore: RouteRef<undefined>;
+  },
+  {
+    catalogEntity: ExternalRouteRef<
+      {
+        name: string;
+        kind: string;
+        namespace: string;
+      },
+      false
+    >;
+  }
+>;
+export { explorePlugin };
+export { explorePlugin as plugin };
 
+// Warning: (ae-missing-release-tag) "exploreRouteRef" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export const exploreRouteRef: RouteRef<undefined>;
 
+// Warning: (ae-missing-release-tag) "GroupsExplorerContent" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
-export const GroupsExplorerContent: ({ title, }: {
-    title?: string | undefined;
+export const GroupsExplorerContent: ({
+  title,
+}: {
+  title?: string | undefined;
 }) => JSX.Element;
 
+// Warning: (ae-missing-release-tag) "ToolExplorerContent" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
-export const ToolExplorerContent: ({ title }: {
-    title?: string | undefined;
+export const ToolExplorerContent: ({
+  title,
+}: {
+  title?: string | undefined;
 }) => JSX.Element;
 
+// Warnings were encountered during analysis:
+//
+// src/components/ExploreLayout/ExploreLayout.d.ts:29:5 - (ae-forgotten-export) The symbol "ExploreLayoutProps" needs to be exported by the entry point index.d.ts
+// src/components/ExploreLayout/ExploreLayout.d.ts:30:5 - (ae-forgotten-export) The symbol "SubRoute" needs to be exported by the entry point index.d.ts
+
 // (No @packageDocumentation comment for this package)
-
 ```
diff --git a/plugins/explore/package.json b/plugins/explore/package.json
index 9a4d3b2d88..85e9e32669 100644
--- a/plugins/explore/package.json
+++ b/plugins/explore/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-explore",
-  "version": "0.3.9",
+  "version": "0.3.15",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -30,16 +30,16 @@
     "start": "backstage-cli plugin:serve"
   },
   "dependencies": {
-    "@backstage/catalog-model": "^0.9.0",
-    "@backstage/core-components": "^0.1.5",
-    "@backstage/core-plugin-api": "^0.1.3",
-    "@backstage/plugin-catalog-react": "^0.2.6",
+    "@backstage/catalog-model": "^0.9.1",
+    "@backstage/core-components": "^0.4.1",
+    "@backstage/core-plugin-api": "^0.1.7",
+    "@backstage/plugin-catalog-react": "^0.4.5",
     "@backstage/plugin-explore-react": "^0.0.6",
-    "@backstage/theme": "^0.2.8",
-    "@material-ui/core": "^4.11.0",
+    "@backstage/theme": "^0.2.10",
+    "@material-ui/core": "^4.12.2",
     "@material-ui/icons": "^4.9.1",
     "@material-ui/lab": "4.0.0-alpha.45",
-    "@types/react": "^16.9",
+    "@types/react": "*",
     "classnames": "^2.2.6",
     "react": "^16.13.1",
     "react-dom": "^16.13.1",
@@ -48,10 +48,10 @@
     "react-use": "^17.2.4"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.7.3",
-    "@backstage/core-app-api": "^0.1.4",
-    "@backstage/dev-utils": "^0.2.1",
-    "@backstage/test-utils": "^0.1.14",
+    "@backstage/cli": "^0.7.11",
+    "@backstage/core-app-api": "^0.1.12",
+    "@backstage/dev-utils": "^0.2.9",
+    "@backstage/test-utils": "^0.1.17",
     "@testing-library/jest-dom": "^5.10.1",
     "@testing-library/react": "^11.2.5",
     "@testing-library/user-event": "^13.1.8",
diff --git a/plugins/explore/src/components/DomainExplorerContent/DomainExplorerContent.tsx b/plugins/explore/src/components/DomainExplorerContent/DomainExplorerContent.tsx
index ca1a0a1a20..781d21bd91 100644
--- a/plugins/explore/src/components/DomainExplorerContent/DomainExplorerContent.tsx
+++ b/plugins/explore/src/components/DomainExplorerContent/DomainExplorerContent.tsx
@@ -34,7 +34,11 @@ import { useApi } from '@backstage/core-plugin-api';
 
 const Body = () => {
   const catalogApi = useApi(catalogApiRef);
-  const { value: entities, loading, error } = useAsync(async () => {
+  const {
+    value: entities,
+    loading,
+    error,
+  } = useAsync(async () => {
     const response = await catalogApi.getEntities({
       filter: { kind: 'domain' },
     });
diff --git a/plugins/explore/src/components/ExploreLayout/ExploreLayout.test.tsx b/plugins/explore/src/components/ExploreLayout/ExploreLayout.test.tsx
index 2e398e3dae..80944628da 100644
--- a/plugins/explore/src/components/ExploreLayout/ExploreLayout.test.tsx
+++ b/plugins/explore/src/components/ExploreLayout/ExploreLayout.test.tsx
@@ -14,17 +14,35 @@
  * limitations under the License.
  */
 
+import {
+  ApiProvider,
+  ApiRegistry,
+  FeatureFlagged,
+} from '@backstage/core-app-api';
+import {
+  FeatureFlagsApi,
+  featureFlagsApiRef,
+} from '@backstage/core-plugin-api';
 import { renderInTestApp } from '@backstage/test-utils';
 import { waitFor } from '@testing-library/react';
 import React from 'react';
 import { ExploreLayout } from './ExploreLayout';
 
+const featureFlagsApi: jest.Mocked<FeatureFlagsApi> = {
+  isActive: jest.fn(),
+  save: jest.fn(),
+  getRegisteredFlags: jest.fn(),
+  registerFlag: jest.fn(),
+};
+
+const mockApis = ApiRegistry.with(featureFlagsApiRef, featureFlagsApi);
+
 describe('<ExploreLayout />', () => {
   const Wrapper = ({ children }: { children?: React.ReactNode }) => (
-    <>{children}</>
+    <ApiProvider apis={mockApis}>{children}</ApiProvider>
   );
 
-  beforeEach(() => {
+  afterEach(() => {
     jest.resetAllMocks();
   });
 
@@ -78,4 +96,50 @@ describe('<ExploreLayout />', () => {
       expect(getByText('Browse the ACME Corp ecosystem')).toBeInTheDocument(),
     );
   });
+
+  it('renders feature flagged route', async () => {
+    featureFlagsApi.isActive.mockReturnValue(true);
+
+    const { getByText } = await renderInTestApp(
+      <Wrapper>
+        <ExploreLayout subtitle="Browse the ACME Corp ecosystem">
+          <FeatureFlagged with="test-flag">
+            <ExploreLayout.Route path="/tools" title="Tools">
+              <div>Tools Content</div>
+            </ExploreLayout.Route>
+          </FeatureFlagged>
+          <FeatureFlagged without="test-flag">
+            <ExploreLayout.Route path="/tools-v2" title="Tools V2">
+              <div>Tools V2 Content</div>
+            </ExploreLayout.Route>
+          </FeatureFlagged>
+        </ExploreLayout>
+      </Wrapper>,
+    );
+
+    await waitFor(() => expect(getByText('Tools')).toBeInTheDocument());
+  });
+
+  it('skips feature flagged route', async () => {
+    featureFlagsApi.isActive.mockReturnValue(false);
+
+    const { getByText } = await renderInTestApp(
+      <Wrapper>
+        <ExploreLayout subtitle="Browse the ACME Corp ecosystem">
+          <FeatureFlagged with="test-flag">
+            <ExploreLayout.Route path="/tools" title="Tools">
+              <div>Tools Content</div>
+            </ExploreLayout.Route>
+          </FeatureFlagged>
+          <FeatureFlagged without="test-flag">
+            <ExploreLayout.Route path="/tools-v2" title="Tools V2">
+              <div>Tools V2 Content</div>
+            </ExploreLayout.Route>
+          </FeatureFlagged>
+        </ExploreLayout>
+      </Wrapper>,
+    );
+
+    await waitFor(() => expect(getByText('Tools V2')).toBeInTheDocument());
+  });
 });
diff --git a/plugins/explore/src/components/ExploreLayout/ExploreLayout.tsx b/plugins/explore/src/components/ExploreLayout/ExploreLayout.tsx
index c28238427f..bc9553c612 100644
--- a/plugins/explore/src/components/ExploreLayout/ExploreLayout.tsx
+++ b/plugins/explore/src/components/ExploreLayout/ExploreLayout.tsx
@@ -14,11 +14,13 @@
  * limitations under the License.
  */
 
-import { TabProps } from '@material-ui/core';
-import { Children, default as React, Fragment, isValidElement } from 'react';
-
-import { attachComponentData } from '@backstage/core-plugin-api';
 import { Header, Page, RoutedTabs } from '@backstage/core-components';
+import {
+  attachComponentData,
+  useElementFilter,
+} from '@backstage/core-plugin-api';
+import { TabProps } from '@material-ui/core';
+import { default as React } from 'react';
 
 // TODO: This layout could be a shared based component if it was possible to create custom TabbedLayouts
 //    A generalized version of createSubRoutesFromChildren, etc. would be required
@@ -30,41 +32,14 @@ type SubRoute = {
   tabProps?: TabProps<React.ElementType, { component?: React.ElementType }>;
 };
 
+const dataKey = 'plugin.explore.exploreLayoutRoute';
+
 const Route: (props: SubRoute) => null = () => null;
+attachComponentData(Route, dataKey, true);
 
 // This causes all mount points that are discovered within this route to use the path of the route itself
 attachComponentData(Route, 'core.gatherMountPoints', true);
 
-function createSubRoutesFromChildren(
-  childrenProps: React.ReactNode,
-): SubRoute[] {
-  // Directly comparing child.type with Route will not work with in
-  // combination with react-hot-loader in storybook
-  // https://github.com/gaearon/react-hot-loader/issues/304
-  const routeType = (
-    <Route path="" title="">
-      <div />
-    </Route>
-  ).type;
-
-  return Children.toArray(childrenProps).flatMap(child => {
-    if (!isValidElement(child)) {
-      return [];
-    }
-
-    if (child.type === Fragment) {
-      return createSubRoutesFromChildren(child.props.children);
-    }
-
-    if (child.type !== routeType) {
-      throw new Error('Child of ExploreLayout must be an ExploreLayout.Route');
-    }
-
-    const { path, title, children, tabProps } = child.props;
-    return [{ path, title, children, tabProps }];
-  });
-}
-
 type ExploreLayoutProps = {
   title?: string;
   subtitle?: string;
@@ -88,7 +63,16 @@ export const ExploreLayout = ({
   subtitle,
   children,
 }: ExploreLayoutProps) => {
-  const routes = createSubRoutesFromChildren(children);
+  const routes = useElementFilter(children, elements =>
+    elements
+      .selectByComponentData({
+        key: dataKey,
+        withStrictError:
+          'Child of ExploreLayout must be an ExploreLayout.Route',
+      })
+      .getElements<SubRoute>()
+      .map(child => child.props),
+  );
 
   return (
     <Page themeId="home">
diff --git a/plugins/explore/src/components/GroupsExplorerContent/GroupsDiagram.test.tsx b/plugins/explore/src/components/GroupsExplorerContent/GroupsDiagram.test.tsx
index 3b9b523b02..66f54900c9 100644
--- a/plugins/explore/src/components/GroupsExplorerContent/GroupsDiagram.test.tsx
+++ b/plugins/explore/src/components/GroupsExplorerContent/GroupsDiagram.test.tsx
@@ -33,7 +33,7 @@ describe('<GroupsDiagram />', () => {
     });
   });
 
-  it('shows groups', async () => {
+  it('show single group', async () => {
     const catalogApi: Partial<CatalogApi> = {
       getEntities: () =>
         Promise.resolve({
@@ -66,7 +66,6 @@ describe('<GroupsDiagram />', () => {
         },
       },
     );
-
-    expect(getByText('Group A')).toBeInTheDocument();
+    expect(getByText('Group A', { selector: 'div' })).toBeInTheDocument();
   });
 });
diff --git a/plugins/explore/src/components/GroupsExplorerContent/GroupsDiagram.tsx b/plugins/explore/src/components/GroupsExplorerContent/GroupsDiagram.tsx
index ce09f0d268..49a9481b15 100644
--- a/plugins/explore/src/components/GroupsExplorerContent/GroupsDiagram.tsx
+++ b/plugins/explore/src/components/GroupsExplorerContent/GroupsDiagram.tsx
@@ -15,44 +15,75 @@
  */
 
 import {
+  GroupEntity,
+  parseEntityRef,
   RELATION_CHILD_OF,
   stringifyEntityRef,
-  parseEntityRef,
-  GroupEntity,
 } from '@backstage/catalog-model';
-import {
-  catalogApiRef,
-  entityRouteRef,
-  getEntityRelations,
-  formatEntityRefTitle,
-} from '@backstage/plugin-catalog-react';
-import { makeStyles, Typography } from '@material-ui/core';
-import ZoomOutMap from '@material-ui/icons/ZoomOutMap';
-import React from 'react';
-import { useAsync } from 'react-use';
-import { BackstageTheme } from '@backstage/theme';
-
 import {
   DependencyGraph,
   DependencyGraphTypes,
+  Link,
   Progress,
   ResponseErrorPanel,
-  Link,
 } from '@backstage/core-components';
-import { useApi, useRouteRef, configApiRef } from '@backstage/core-plugin-api';
+import { configApiRef, useApi, useRouteRef } from '@backstage/core-plugin-api';
+import {
+  catalogApiRef,
+  entityRouteRef,
+  formatEntityRefTitle,
+  getEntityRelations,
+} from '@backstage/plugin-catalog-react';
+import { BackstageTheme } from '@backstage/theme';
+import { makeStyles, Typography, useTheme } from '@material-ui/core';
+import ZoomOutMap from '@material-ui/icons/ZoomOutMap';
+import classNames from 'classnames';
+import React from 'react';
+import { useAsync } from 'react-use';
 
 const useStyles = makeStyles((theme: BackstageTheme) => ({
+  graph: {
+    flex: 1,
+    minHeight: 0,
+  },
   organizationNode: {
-    fill: 'coral',
-    stroke: theme.palette.border,
+    fill: theme.palette.secondary.light,
+    stroke: theme.palette.secondary.light,
   },
   groupNode: {
-    fill: 'yellowgreen',
-    stroke: theme.palette.border,
+    fill: theme.palette.primary.light,
+    stroke: theme.palette.primary.light,
+  },
+  centeredContent: {
+    padding: theme.spacing(1),
+    height: '100%',
+    display: 'flex',
+    alignItems: 'center',
+    justifyContent: 'center',
+    color: 'black',
+  },
+  textOrganization: {
+    color: theme.palette.secondary.contrastText,
+  },
+  textGroup: {
+    color: theme.palette.primary.contrastText,
+  },
+  textWrapper: {
+    display: '-webkit-box',
+    WebkitBoxOrient: 'vertical',
+    WebkitLineClamp: 2,
+    overflow: 'hidden',
+    textOverflow: 'ellipsis',
+    textAlign: 'center',
+    fontWeight: 'bold',
+    fontSize: '20px',
   },
 }));
 
 function RenderNode(props: DependencyGraphTypes.RenderNodeProps<any>) {
+  const nodeWidth = 180;
+  const nodeHeight = 60;
+  const theme = useTheme();
   const classes = useStyles();
   const catalogEntityRoute = useRouteRef(entityRouteRef);
 
@@ -60,20 +91,24 @@ function RenderNode(props: DependencyGraphTypes.RenderNodeProps<any>) {
     return (
       <g>
         <rect
-          width={180}
-          height={80}
-          rx={20}
+          width={nodeWidth}
+          height={nodeHeight}
+          rx={theme.shape.borderRadius}
           className={classes.organizationNode}
         />
-        <text
-          x={90}
-          y={45}
-          textAnchor="middle"
-          alignmentBaseline="baseline"
-          style={{ fontWeight: 'bold' }}
-        >
-          {props.node.name}
-        </text>
+        <title>{props.node.name}</title>
+        <foreignObject width={nodeWidth} height={nodeHeight}>
+          <div className={classes.centeredContent}>
+            <div
+              className={classNames(
+                classes.textWrapper,
+                classes.textOrganization,
+              )}
+            >
+              {props.node.name}
+            </div>
+          </div>
+        </foreignObject>
       </g>
     );
   }
@@ -82,7 +117,14 @@ function RenderNode(props: DependencyGraphTypes.RenderNodeProps<any>) {
 
   return (
     <g>
-      <rect width={180} height={80} rx={20} className={classes.groupNode} />
+      <rect
+        width={nodeWidth}
+        height={nodeHeight}
+        rx={theme.shape.borderRadius}
+        className={classes.groupNode}
+      />
+      <title>{props.node.name}</title>
+
       <Link
         to={catalogEntityRoute({
           kind: ref.kind,
@@ -90,15 +132,13 @@ function RenderNode(props: DependencyGraphTypes.RenderNodeProps<any>) {
           name: ref.name,
         })}
       >
-        <text
-          x={90}
-          y={45}
-          textAnchor="middle"
-          alignmentBaseline="baseline"
-          style={{ fontWeight: 'bold' }}
-        >
-          {props.node.name}
-        </text>
+        <foreignObject width={nodeWidth} height={nodeHeight}>
+          <div className={classes.centeredContent}>
+            <div className={classNames(classes.textWrapper, classes.textGroup)}>
+              {props.node.name}
+            </div>
+          </div>
+        </foreignObject>
       </Link>
     </g>
   );
@@ -115,11 +155,16 @@ export function GroupsDiagram() {
   }>();
   const edges = new Array<{ from: string; to: string; label: string }>();
 
+  const classes = useStyles();
   const configApi = useApi(configApiRef);
   const catalogApi = useApi(catalogApiRef);
   const organizationName =
     configApi.getOptionalString('organization.name') ?? 'Backstage';
-  const { loading, error, value: catalogResponse } = useAsync(() => {
+  const {
+    loading,
+    error,
+    value: catalogResponse,
+  } = useAsync(() => {
     return catalogApi.getEntities({
       filter: {
         kind: ['Group'],
@@ -183,6 +228,7 @@ export function GroupsDiagram() {
         nodeMargin={10}
         direction={DependencyGraphTypes.Direction.RIGHT_LEFT}
         renderNode={RenderNode}
+        className={classes.graph}
       />
       <Typography
         variant="caption"
diff --git a/plugins/explore/src/components/GroupsExplorerContent/GroupsExplorerContent.test.tsx b/plugins/explore/src/components/GroupsExplorerContent/GroupsExplorerContent.test.tsx
index 6953cf57a2..52def47f7c 100644
--- a/plugins/explore/src/components/GroupsExplorerContent/GroupsExplorerContent.test.tsx
+++ b/plugins/explore/src/components/GroupsExplorerContent/GroupsExplorerContent.test.tsx
@@ -79,7 +79,9 @@ describe('<GroupsExplorerContent />', () => {
     );
 
     await waitFor(() => {
-      expect(getByText('my-namespace/group-a')).toBeInTheDocument();
+      expect(
+        getByText('my-namespace/group-a', { selector: 'div' }),
+      ).toBeInTheDocument();
     });
   });
 
@@ -93,14 +95,16 @@ describe('<GroupsExplorerContent />', () => {
       mountedRoutes,
     );
 
-    await waitFor(() => expect(getByText('Our Teams')).toBeInTheDocument());
+    await waitFor(() =>
+      expect(getByText('Our Teams', { selector: 'h2' })).toBeInTheDocument(),
+    );
   });
 
   it('renders a friendly error if it cannot collect domains', async () => {
     const catalogError = new Error('Network timeout');
     catalogApi.getEntities.mockRejectedValueOnce(catalogError);
 
-    const { getByText } = await renderInTestApp(
+    const { getAllByText } = await renderInTestApp(
       <Wrapper>
         <GroupsExplorerContent />
       </Wrapper>,
@@ -108,7 +112,7 @@ describe('<GroupsExplorerContent />', () => {
     );
 
     await waitFor(() =>
-      expect(getByText(/Warning: Network timeout/)).toBeInTheDocument(),
+      expect(getAllByText(/Error: Network timeout/).length).not.toBe(0),
     );
   });
 });
diff --git a/plugins/explore/src/components/GroupsExplorerContent/GroupsExplorerContent.tsx b/plugins/explore/src/components/GroupsExplorerContent/GroupsExplorerContent.tsx
index 71252e319c..ae711b85d9 100644
--- a/plugins/explore/src/components/GroupsExplorerContent/GroupsExplorerContent.tsx
+++ b/plugins/explore/src/components/GroupsExplorerContent/GroupsExplorerContent.tsx
@@ -21,6 +21,15 @@ import {
   ContentHeader,
   SupportButton,
 } from '@backstage/core-components';
+import { makeStyles } from '@material-ui/core/styles';
+
+const useStyles = makeStyles({
+  root: {
+    height: '100%',
+    maxHeight: '100%',
+    minHeight: 0,
+  },
+});
 
 type GroupsExplorerContentProps = {
   title?: string;
@@ -29,8 +38,10 @@ type GroupsExplorerContentProps = {
 export const GroupsExplorerContent = ({
   title,
 }: GroupsExplorerContentProps) => {
+  const classes = useStyles();
+
   return (
-    <Content noPadding>
+    <Content noPadding stretch className={classes.root}>
       <ContentHeader title={title ?? 'Groups'}>
         <SupportButton>Explore your groups.</SupportButton>
       </ContentHeader>
diff --git a/plugins/explore/src/components/ToolExplorerContent/ToolExplorerContent.tsx b/plugins/explore/src/components/ToolExplorerContent/ToolExplorerContent.tsx
index afeeb28f6e..ec532f3004 100644
--- a/plugins/explore/src/components/ToolExplorerContent/ToolExplorerContent.tsx
+++ b/plugins/explore/src/components/ToolExplorerContent/ToolExplorerContent.tsx
@@ -33,7 +33,11 @@ import { useApi } from '@backstage/core-plugin-api';
 
 const Body = () => {
   const exploreToolsConfigApi = useApi(exploreToolsConfigRef);
-  const { value: tools, loading, error } = useAsync(async () => {
+  const {
+    value: tools,
+    loading,
+    error,
+  } = useAsync(async () => {
     return await exploreToolsConfigApi.getTools();
   }, [exploreToolsConfigApi]);
 
diff --git a/plugins/firehydrant/.eslintrc.js b/plugins/firehydrant/.eslintrc.js
new file mode 100644
index 0000000000..13573efa9c
--- /dev/null
+++ b/plugins/firehydrant/.eslintrc.js
@@ -0,0 +1,3 @@
+module.exports = {
+  extends: [require.resolve('@backstage/cli/config/eslint')],
+};
diff --git a/plugins/firehydrant/CHANGELOG.md b/plugins/firehydrant/CHANGELOG.md
new file mode 100644
index 0000000000..2fd79e0179
--- /dev/null
+++ b/plugins/firehydrant/CHANGELOG.md
@@ -0,0 +1,9 @@
+# @backstage/plugin-firehydrant
+
+## 0.1.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@0.4.5
+  - @backstage/core-components@0.4.0
diff --git a/plugins/firehydrant/README.md b/plugins/firehydrant/README.md
new file mode 100644
index 0000000000..aaab8b7d0e
--- /dev/null
+++ b/plugins/firehydrant/README.md
@@ -0,0 +1,59 @@
+# FireHydrant Plugin
+
+## Overview
+
+The [FireHydrant](https://firehydrant.io) plugin brings incident management to Backstage, and it displays service incidents information such as active incidents and incident analytics. There are also quick action links that let you create and view incidents in FireHydrant.
+
+<img src="./doc/firehydrant_plugin_screenshot.png" alt="FireHydrant plugin screenshot">
+
+## Features
+
+- View total active incidents for a service declared in FireHydrant
+- Quick links to the top 5 most recent active incidents in FireHydrant
+- View incident metrics for a given service within the last 30 days, including: healthiness, total time impacted, total number of incidents, and MTT* (Mean Time To *) data such as MTTD (detect), MTTA (acknowledge), MTTM (mitigate) and MTTR (resolve).
+
+## Setup
+
+1. Install the plugin:
+
+```bash
+# From your Backstage root directory
+cd packages/app
+yarn add @backstage/plugin-firehydrant
+```
+
+2. Add the plugin to `EntityPage.tsx`, inside the `const overviewContent`'s parent `<Grid>` component:
+
+```ts
+// In packages/app/src/components/catalog/EntityPage.tsx
+import { FirehydrantCard } from '@backstage/plugin-firehydrant';
+
+// Add to code as a grid item
+<Grid item md={6}>
+  <FirehydrantCard />
+</Grid>;
+```
+
+3. Add proxy configuration to `app-config.yaml`:
+
+```yaml
+proxy:
+  '/firehydrant/api':
+    target: 'https://api.firehydrant.io/v1/'
+    changeOrigin: true
+    headers:
+      # Supply the token you generated from https://app.firehydrant.io/organizations/bots
+      Authorization: Bearer ${FIREHYDRANT_BOT_TOKEN}
+```
+
+Note: if you are not using environment variables, you can directly type the API Bot Token into `app-config.yaml`:
+
+```yaml
+proxy:
+'/firehydrant/api':
+  target: 'https://api.firehydrant.io/v1/'
+  changeOrigin: true
+  headers:
+    # Supply the token you generated from https://app.firehydrant.io/organizations/bots
+    Authorization: Bearer fhb-e4911b22bcd788c4a4afeb0c111ffbfa
+```
diff --git a/plugins/firehydrant/api-report.md b/plugins/firehydrant/api-report.md
new file mode 100644
index 0000000000..6cd8270178
--- /dev/null
+++ b/plugins/firehydrant/api-report.md
@@ -0,0 +1,27 @@
+## API Report File for "@backstage/plugin-firehydrant"
+
+> Do not edit this file. It is a report generated by [API Extractor](https://api-extractor.com/).
+
+```ts
+/// <reference types="react" />
+
+import { BackstagePlugin } from '@backstage/core-plugin-api';
+import { RouteRef } from '@backstage/core-plugin-api';
+
+// Warning: (ae-missing-release-tag) "FirehydrantCard" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
+// @public (undocumented)
+export const FirehydrantCard: () => JSX.Element;
+
+// Warning: (ae-missing-release-tag) "firehydrantPlugin" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
+// @public (undocumented)
+export const firehydrantPlugin: BackstagePlugin<
+  {
+    root: RouteRef<undefined>;
+  },
+  {}
+>;
+
+// (No @packageDocumentation comment for this package)
+```
diff --git a/plugins/register-component/dev/index.tsx b/plugins/firehydrant/dev/index.tsx
similarity index 79%
rename from plugins/register-component/dev/index.tsx
rename to plugins/firehydrant/dev/index.tsx
index e93e4f1ed7..237cb2737e 100644
--- a/plugins/register-component/dev/index.tsx
+++ b/plugins/firehydrant/dev/index.tsx
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 The Backstage Authors
+ * Copyright 2021 The Backstage Authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,8 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 import { createDevApp } from '@backstage/dev-utils';
-import { registerComponentPlugin } from '../src/plugin';
+import { firehydrantPlugin } from '../src/plugin';
 
-createDevApp().registerPlugin(registerComponentPlugin).render();
+createDevApp().registerPlugin(firehydrantPlugin).render();
diff --git a/plugins/firehydrant/doc/firehydrant_logo.png b/plugins/firehydrant/doc/firehydrant_logo.png
new file mode 100644
index 0000000000..47cd43b0fc
Binary files /dev/null and b/plugins/firehydrant/doc/firehydrant_logo.png differ
diff --git a/plugins/firehydrant/doc/firehydrant_plugin_screenshot.png b/plugins/firehydrant/doc/firehydrant_plugin_screenshot.png
new file mode 100644
index 0000000000..25b5cbcaa1
Binary files /dev/null and b/plugins/firehydrant/doc/firehydrant_plugin_screenshot.png differ
diff --git a/plugins/firehydrant/package.json b/plugins/firehydrant/package.json
new file mode 100644
index 0000000000..551c6af021
--- /dev/null
+++ b/plugins/firehydrant/package.json
@@ -0,0 +1,68 @@
+{
+  "name": "@backstage/plugin-firehydrant",
+  "version": "0.1.2",
+  "main": "src/index.ts",
+  "types": "src/index.ts",
+  "license": "Apache-2.0",
+  "private": false,
+  "publishConfig": {
+    "access": "public",
+    "main": "dist/index.esm.js",
+    "types": "dist/index.d.ts"
+  },
+  "scripts": {
+    "build": "backstage-cli plugin:build",
+    "start": "backstage-cli plugin:serve",
+    "lint": "backstage-cli lint",
+    "test": "backstage-cli test",
+    "diff": "backstage-cli plugin:diff",
+    "prepack": "backstage-cli prepack",
+    "postpack": "backstage-cli postpack",
+    "clean": "backstage-cli clean"
+  },
+  "dependencies": {
+    "@backstage/core-components": "^0.4.1",
+    "@backstage/core-plugin-api": "^0.1.7",
+    "@backstage/plugin-catalog-react": "^0.4.5",
+    "@backstage/theme": "^0.2.10",
+    "@material-ui/core": "^4.12.2",
+    "@material-ui/icons": "^4.9.1",
+    "@material-ui/lab": "4.0.0-alpha.45",
+    "luxon": "^1.27.0",
+    "react": "^16.13.1",
+    "react-dom": "^16.13.1",
+    "react-use": "^17.2.4"
+  },
+  "devDependencies": {
+    "@backstage/cli": "^0.7.11",
+    "@backstage/core-app-api": "^0.1.12",
+    "@backstage/dev-utils": "^0.2.9",
+    "@backstage/test-utils": "^0.1.17",
+    "@testing-library/jest-dom": "^5.10.1",
+    "@testing-library/react": "^11.2.5",
+    "@testing-library/user-event": "^13.1.8",
+    "@types/jest": "^26.0.7",
+    "@types/node": "^14.14.32",
+    "cross-fetch": "^3.0.6",
+    "msw": "^0.29.0"
+  },
+  "files": [
+    "dist"
+  ],
+  "configSchema": {
+    "$schema": "https://backstage.io/schema/config-v1",
+    "title": "@backstage/plugin-firehydrant",
+    "type": "object",
+    "properties": {
+      "firehydrant": {
+        "type": "object",
+        "properties": {
+          "baseUrl": {
+            "type": "string",
+            "visibility": "frontend"
+          }
+        }
+      }
+    }
+  }
+}
diff --git a/plugins/firehydrant/src/api/index.ts b/plugins/firehydrant/src/api/index.ts
new file mode 100644
index 0000000000..b78e81a024
--- /dev/null
+++ b/plugins/firehydrant/src/api/index.ts
@@ -0,0 +1,136 @@
+/*
+ * Copyright 2021 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import {
+  ServiceAnalyticsResponse,
+  ServiceDetailsResponse,
+  ServiceIncidentsResponse,
+} from './types';
+import { Incident, Service } from '../components/types';
+import { createApiRef, DiscoveryApi } from '@backstage/core-plugin-api';
+
+export interface FireHydrantAPI {
+  getServiceAnalytics(options: {
+    serviceId: string;
+    startDate: string;
+    endDate: string;
+  }): Promise<ServiceAnalyticsResponse>;
+
+  getServiceDetails(options: {
+    serviceName: string;
+  }): Promise<ServiceDetailsResponse>;
+
+  getServiceIncidents(options: {
+    serviceId: string;
+  }): Promise<ServiceIncidentsResponse>;
+}
+
+export const fireHydrantApiRef = createApiRef<FireHydrantAPI>({
+  id: 'plugin.firehydrant.service',
+  description: 'Used by FireHydrant plugin for requests',
+});
+
+export type Options = {
+  discoveryApi: DiscoveryApi;
+  proxyPath?: string;
+};
+
+const DEFAULT_PROXY_PATH = '/firehydrant/api';
+
+export class FireHydrantAPIClient implements FireHydrantAPI {
+  private readonly discoveryApi: DiscoveryApi;
+  private readonly proxyPath: string;
+
+  constructor(options: Options) {
+    this.discoveryApi = options.discoveryApi;
+    this.proxyPath = options.proxyPath ?? DEFAULT_PROXY_PATH;
+  }
+
+  async getServiceAnalytics(options: {
+    serviceId: string;
+    startDate: string;
+    endDate: string;
+  }): Promise<ServiceAnalyticsResponse> {
+    const proxyUrl = await this.getApiUrl();
+    const response = await fetch(
+      `${proxyUrl}/metrics/services/${options.serviceId}?start_date=${options.startDate}&end_date=${options.endDate}`,
+    );
+    if (!response.ok) {
+      throw new Error(
+        `There was a problem fetching FireHydrant analytics data: ${response.statusText}`,
+      );
+    }
+    const json = await response.json();
+    return json;
+  }
+
+  async getServiceDetails(options: {
+    serviceName: string;
+  }): Promise<ServiceDetailsResponse> {
+    const proxyUrl = await this.getApiUrl();
+    const response = await fetch(
+      `${proxyUrl}/services?query=${options.serviceName}`,
+    );
+
+    if (!response.ok) {
+      throw new Error(
+        `There was a problem fetching FireHydrant data: ${response.statusText}`,
+      );
+    }
+
+    const json = await response.json();
+
+    const servicesData: ServiceDetailsResponse = {
+      service: {} as Service,
+      incidents: [] as Incident[],
+    };
+
+    if (json.data?.length === 0) {
+      return servicesData;
+    }
+
+    servicesData.service = json.data[0];
+
+    const incidentsJson = await this.getServiceIncidents({
+      serviceId: json.data[0].id,
+    });
+
+    servicesData.incidents = incidentsJson;
+
+    return servicesData;
+  }
+
+  async getServiceIncidents(options: {
+    serviceId: string;
+  }): Promise<ServiceIncidentsResponse> {
+    const proxyUrl = await this.getApiUrl();
+    const response = await fetch(
+      `${proxyUrl}/incidents?services=${options.serviceId}&active=true`,
+    );
+    if (!response.ok) {
+      throw new Error(
+        `There was a problem fetching FireHydrant incidents data: ${response.statusText}`,
+      );
+    }
+
+    const json = await response.json();
+    return json.data;
+  }
+
+  private async getApiUrl() {
+    const proxyUrl = await this.discoveryApi.getBaseUrl('proxy');
+    return proxyUrl + this.proxyPath;
+  }
+}
diff --git a/plugins/firehydrant/src/api/types.ts b/plugins/firehydrant/src/api/types.ts
new file mode 100644
index 0000000000..089c850c97
--- /dev/null
+++ b/plugins/firehydrant/src/api/types.ts
@@ -0,0 +1,33 @@
+/*
+ * Copyright 2021 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import { Incident, Service } from '../components/types';
+
+export type ServiceDetailsResponse = {
+  service?: Service;
+  incidents?: ServiceIncidentsResponse;
+};
+
+export type ServiceAnalyticsResponse = {
+  id: string;
+  mttd?: number;
+  mtta?: number;
+  mttm?: number;
+  mttr?: number;
+  count: number;
+  total_time: number;
+};
+
+export type ServiceIncidentsResponse = Incident[];
diff --git a/plugins/firehydrant/src/components/ServiceAnalytics/ServiceAnalytics.test.tsx b/plugins/firehydrant/src/components/ServiceAnalytics/ServiceAnalytics.test.tsx
new file mode 100644
index 0000000000..82bbac57c1
--- /dev/null
+++ b/plugins/firehydrant/src/components/ServiceAnalytics/ServiceAnalytics.test.tsx
@@ -0,0 +1,42 @@
+/*
+ * Copyright 2021 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import React from 'react';
+import { screen } from '@testing-library/react';
+import { ServiceAnalytics } from './ServiceAnalytics';
+import { renderInTestApp } from '@backstage/test-utils';
+
+describe('ServiceAnalytics', () => {
+  it('renders service analytics', async () => {
+    await renderInTestApp(
+      <ServiceAnalytics
+        error={null}
+        loading={false}
+        value={{
+          id: 'b20de448-7855-4fb0-8d98-d9eafe82fc2c',
+          mttd: 32,
+          mtta: 44,
+          mttm: 33,
+          mttr: 23,
+          count: 0,
+          total_time: 0,
+        }}
+      />,
+    );
+
+    expect(await screen.findByText(/32/)).toBeInTheDocument();
+    expect(await screen.findByText(/44/)).toBeInTheDocument();
+  });
+});
diff --git a/plugins/firehydrant/src/components/ServiceAnalytics/ServiceAnalytics.tsx b/plugins/firehydrant/src/components/ServiceAnalytics/ServiceAnalytics.tsx
new file mode 100644
index 0000000000..e5818ef484
--- /dev/null
+++ b/plugins/firehydrant/src/components/ServiceAnalytics/ServiceAnalytics.tsx
@@ -0,0 +1,166 @@
+/*
+ * Copyright 2021 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import React from 'react';
+import { makeStyles } from '@material-ui/core/styles';
+import { DateTime } from 'luxon';
+import {
+  ResponseErrorPanel,
+  Table,
+  TableColumn,
+  Progress,
+} from '@backstage/core-components';
+
+const useStyles = makeStyles({
+  container: {
+    overflow: 'auto',
+    width: '100%',
+    '& td': {
+      minWidth: '145px',
+    },
+    '& th': {
+      minWidth: '145px',
+    },
+  },
+});
+
+export const DenseTable = ({
+  service,
+  startDate,
+  endDate,
+}: {
+  service: object;
+  startDate: DateTime;
+  endDate: DateTime;
+}) => {
+  const classes = useStyles();
+
+  const columns: TableColumn[] = [
+    { field: 'healthiness', title: 'Healthiness' },
+    { field: 'impacted', title: 'Impacted' },
+    { field: 'incidents', title: 'Incidents' },
+    { field: 'mttd', title: 'MTTD' },
+    { field: 'mtta', title: 'MTTA' },
+    { field: 'mttm', title: 'MTTM' },
+    { field: 'mttr', title: 'MTTR' },
+  ];
+
+  return (
+    <div className={classes.container}>
+      <Table
+        title="Incident Analytics"
+        subtitle={`${startDate.toFormat('MMMM dd, yyyy')} - ${endDate.toFormat(
+          'MMMM dd, yyyy',
+        )}`}
+        options={{ paging: false, search: false }}
+        columns={columns}
+        data={[service]}
+      />
+    </div>
+  );
+};
+
+export const secondsToDhms = (seconds: number) => {
+  const secs = Number(seconds);
+  const d = Math.floor(secs / (60 * 60 * 24));
+  const h = Math.floor((secs / (60 * 60)) % 24);
+  const m = Math.floor((secs / 60) % 60);
+  const s = secs % 60;
+
+  const dDisplay = d > 0 ? `${d}d ` : '';
+  const hDisplay = h > 0 ? `${h}h ` : '00h ';
+  const mDisplay = m > 0 ? `${m}m ` : '00m ';
+  const sDisplay = s > 0 ? `${s}s` : '00s';
+  return dDisplay + hDisplay + mDisplay + sDisplay;
+};
+
+export const truncateNum = (num: number) => {
+  const matcher = `^-?\\d+(?:\\.\\d{0,3})?`;
+  const re = new RegExp(matcher);
+  const match = num.toString().match(re);
+  const result = (match && match[0]) || '0'; // eslint-disable-line no-mixed-operators
+  return result;
+};
+
+export const calcHealthiness = ({
+  mttm,
+  incidents,
+  range,
+}: {
+  mttm: number;
+  incidents: number;
+  range: number;
+}) => {
+  const num = (1 - (mttm * incidents) / range) * 100;
+  return `${truncateNum(num)}%`;
+};
+
+type AnalyticsDataType = {
+  id?: string;
+  count?: number;
+  mttd?: number;
+  mtta?: number;
+  mttm?: number;
+  mttr?: number;
+  total_time?: number;
+};
+
+export const ServiceAnalytics = ({
+  value,
+  loading,
+  error,
+}: {
+  value: AnalyticsDataType;
+  loading: boolean;
+  error: any;
+}) => {
+  if (loading) {
+    return <Progress />;
+  } else if (error) {
+    return <ResponseErrorPanel error={error} />;
+  }
+  const startDate = DateTime.now().minus({ days: 30 }).toUTC();
+  const endDate = DateTime.now().toUTC();
+
+  // Transform and format the data to display in the table
+  if (value.id) {
+    const serviceData = {
+      healthiness:
+        value.mttm && value.count
+          ? calcHealthiness({
+              mttm: value.mttm,
+              incidents: value.count,
+              range: endDate.diff(startDate, 'seconds').as('seconds'),
+            })
+          : '100%',
+      impacted: value.total_time ? secondsToDhms(value.total_time) : '-',
+      incidents: value.count,
+      mttd: value.mttd ? secondsToDhms(value.mttd) : '-',
+      mtta: value.mtta ? secondsToDhms(value.mtta) : '-',
+      mttm: value.mttm ? secondsToDhms(value.mttm) : '-',
+      mttr: value.mttr ? secondsToDhms(value.mttr) : '-',
+    };
+
+    return (
+      <DenseTable
+        service={serviceData}
+        startDate={startDate}
+        endDate={endDate}
+      />
+    );
+  }
+
+  return null;
+};
diff --git a/plugins/firehydrant/src/components/ServiceDetailsCard/ServiceDetailsCard.test.tsx b/plugins/firehydrant/src/components/ServiceDetailsCard/ServiceDetailsCard.test.tsx
new file mode 100644
index 0000000000..1123f014da
--- /dev/null
+++ b/plugins/firehydrant/src/components/ServiceDetailsCard/ServiceDetailsCard.test.tsx
@@ -0,0 +1,118 @@
+/*
+ * Copyright 2021 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import React from 'react';
+import { ApiProvider, ApiRegistry } from '@backstage/core-app-api';
+import { fireHydrantApiRef } from '../../api';
+import { screen } from '@testing-library/react';
+import { ServiceDetailsCard } from './ServiceDetailsCard';
+import { Service, Incident } from '../types';
+import { renderInTestApp } from '@backstage/test-utils';
+
+const mockFireHydrantApi = {
+  getServiceDetails: () => {},
+  getServiceAnalytics: () => {},
+};
+
+const apis = ApiRegistry.from([[fireHydrantApiRef, mockFireHydrantApi]]);
+
+jest.mock('@backstage/plugin-catalog-react', () => ({
+  useEntity: () => {
+    return { entity: { metadata: { name: 'service-example' } } };
+  },
+}));
+
+describe('ServiceDetailsCard', () => {
+  it('renders service incidents', async () => {
+    mockFireHydrantApi.getServiceDetails = jest.fn().mockImplementationOnce(
+      async () =>
+        [
+          {
+            service: {
+              id: '12345',
+              name: 'service-example',
+              description: 'This is a sample description',
+              active_incidents: ['654321'],
+            } as Service,
+            incidents: [
+              {
+                id: '654321',
+                active: true,
+                description: 'test incident',
+                name: 'incident name here',
+                incident_url: 'http://example.com',
+              } as Incident,
+            ],
+          },
+        ][0],
+    );
+
+    mockFireHydrantApi.getServiceAnalytics = jest.fn().mockImplementationOnce(
+      async () =>
+        [
+          {
+            buckets: [
+              {
+                metrics: {
+                  12345: {
+                    count: 0,
+                    mtta: null,
+                    mttd: null,
+                    mttm: null,
+                    mttr: null,
+                    total_time: null,
+                  },
+                },
+              },
+            ],
+          },
+        ][0],
+    );
+
+    await renderInTestApp(
+      <ApiProvider apis={apis}>
+        <ServiceDetailsCard />
+      </ApiProvider>,
+    );
+
+    expect(
+      await screen.findByText(/View service incidents/),
+    ).toBeInTheDocument();
+    expect(
+      await screen.findByText(/There is 1 active incident/),
+    ).toBeInTheDocument();
+    expect(await screen.findByText(/incident name here/)).toBeInTheDocument();
+  });
+
+  it('handles empty response', async () => {
+    mockFireHydrantApi.getServiceDetails = jest
+      .fn()
+      .mockImplementationOnce(async () => []);
+
+    mockFireHydrantApi.getServiceAnalytics = jest
+      .fn()
+      .mockImplementationOnce(async () => []);
+
+    await renderInTestApp(
+      <ApiProvider apis={apis}>
+        <ServiceDetailsCard />
+      </ApiProvider>,
+    );
+
+    expect(
+      await screen.findByText(/This service does not exist in FireHydrant/),
+    ).toBeInTheDocument();
+  });
+});
diff --git a/plugins/firehydrant/src/components/ServiceDetailsCard/ServiceDetailsCard.tsx b/plugins/firehydrant/src/components/ServiceDetailsCard/ServiceDetailsCard.tsx
new file mode 100644
index 0000000000..b70c578e11
--- /dev/null
+++ b/plugins/firehydrant/src/components/ServiceDetailsCard/ServiceDetailsCard.tsx
@@ -0,0 +1,305 @@
+/*
+ * Copyright 2021 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import React, { useEffect, useState } from 'react';
+import { DateTime } from 'luxon';
+import { ServiceAnalytics } from '../ServiceAnalytics/ServiceAnalytics';
+import {
+  Box,
+  Button as MaterialButton,
+  Typography,
+  makeStyles,
+} from '@material-ui/core';
+import ExitToAppIcon from '@material-ui/icons/ExitToApp';
+import NotesIcon from '@material-ui/icons/Notes';
+import WhatshotIcon from '@material-ui/icons/Whatshot';
+import WarningIcon from '@material-ui/icons/Warning';
+import AddIcon from '@material-ui/icons/Add';
+import { useEntity } from '@backstage/plugin-catalog-react';
+import { Incident } from '../types';
+import { ServiceIncidentsResponse } from '../../api/types';
+import { useServiceDetails } from '../serviceDetails';
+import { useServiceAnalytics } from '../serviceAnalytics';
+import {
+  InfoCard,
+  Link,
+  Progress,
+  ResponseErrorPanel,
+} from '@backstage/core-components';
+import { configApiRef, useApi } from '@backstage/core-plugin-api';
+
+const useStyles = makeStyles(theme => ({
+  button: {
+    color: '#3b2492',
+    display: 'grid',
+    gridGap: '4px',
+    textAlign: 'center',
+    justifyItems: 'center',
+    width: '105px',
+    backgroundColor: theme.palette.type === 'dark' ? '#f1edff' : '',
+    '&:hover, &:focus': {
+      backgroundColor: '#f1edff',
+      color: '#614ab6',
+    },
+    '&:active': {
+      color: '#3b2492',
+      backgroundColor: '#b2a6e3',
+      boxShadow:
+        'rgb(59, 36, 146) 0px 0px 0px 1px inset, rgb(141, 134, 188) 3px 3px 0px 0px inset;',
+    },
+    border: '1px solid #3b2492',
+    borderRadius: '5px',
+    padding: '8px 10px',
+    textTransform: 'none',
+  },
+  buttonLink: {
+    backgroundColor: '#3b2492',
+    color: '#FFF',
+    textTransform: 'none',
+    '&:hover': {
+      backgroundColor: '#614ab6',
+    },
+  },
+  buttonContainer: {
+    display: 'grid',
+    gridGap: '24px',
+    gridAutoFlow: 'column',
+    gridAutoColumns: 'min-content',
+  },
+  icon: {
+    color: '#f1642d',
+  },
+  link: {
+    textDecoration: 'underline',
+    fontSize: '16px',
+    lineHeight: '27px',
+    color: '#3b2492',
+    '&:hover, &:focus': {
+      fontWeight: '500',
+    },
+  },
+  linksContainer: {
+    borderBottom: '1px solid #d5d5d5',
+    padding: '10px 0px 10px 20px',
+    backgroundColor: '#f1edff',
+    marginBottom: '20px',
+  },
+  table: {
+    width: '100%',
+  },
+  warning: {
+    display: 'flex',
+    alignItems: 'center',
+    padding: '10px',
+    background: '#f1edff',
+    color: '#3b2492',
+  },
+}));
+
+const ServiceAnalyticsView = ({
+  serviceId,
+  startDate,
+  endDate,
+}: {
+  serviceId: string;
+  startDate: DateTime;
+  endDate: DateTime;
+}) => {
+  const {
+    loading: analyticsLoading,
+    value: analyticsValue = {},
+    error: analyticsError,
+  } = useServiceAnalytics({
+    serviceId,
+    startDate: startDate.toFormat('YYYY-MM-DD'),
+    endDate: endDate.toFormat('YYYY-MM-DD'),
+  });
+
+  return (
+    <ServiceAnalytics
+      loading={analyticsLoading}
+      value={analyticsValue}
+      error={analyticsError}
+    />
+  );
+};
+
+export const ServiceDetailsCard = () => {
+  const { entity } = useEntity();
+  const classes = useStyles();
+  const [showServiceDetails, setShowServiceDetails] = useState(false);
+  const configApi = useApi(configApiRef);
+
+  const BASE_URL =
+    configApi.getOptionalString('firehydrant.baseUrl') ||
+    'https://app.firehydrant.io';
+
+  const startDate = DateTime.now().minus({ days: 30 }).toUTC();
+  const endDate = DateTime.now().toUTC();
+
+  // The Backstage service name in FireHydrant is a unique formatted string
+  // that requires the entity's kind, name, and namespace.
+  const fireHydrantServiceName = `${entity?.kind}:${
+    entity?.metadata?.namespace ?? 'default'
+  }/${entity?.metadata?.name}`;
+
+  const { loading, value, error } = useServiceDetails({
+    serviceName: fireHydrantServiceName,
+  });
+
+  const activeIncidents: string[] = value?.service?.active_incidents ?? [];
+  const incidents: ServiceIncidentsResponse = value?.incidents ?? [];
+  const serviceId: string = value?.service?.id!;
+
+  useEffect(() => {
+    if (value?.service && Object.keys(value?.service).length > 0) {
+      setShowServiceDetails(true);
+    }
+  }, [value]);
+
+  if (loading) {
+    return <Progress />;
+  }
+
+  if (error) {
+    return <ResponseErrorPanel error={error} />;
+  }
+
+  const headerText: string = showServiceDetails
+    ? `There ${activeIncidents?.length === 1 ? 'is' : 'are'} ${
+        activeIncidents?.length
+      } active incident${activeIncidents?.length === 1 ? '' : 's'}.`
+    : '';
+
+  const serviceIncidentsLink: string = `${BASE_URL}/incidents?search={"services":[{"label":${JSON.stringify(
+    value?.service?.name,
+  )},"value":${JSON.stringify(value?.service?.id)}}]}`;
+
+  return (
+    <InfoCard>
+      {!showServiceDetails && !loading && (
+        <div className={classes.warning}>
+          <WarningIcon />
+          &nbsp;&nbsp;<span>This service does not exist in FireHydrant.</span>
+        </div>
+      )}
+      {showServiceDetails && (
+        <Box
+          alignItems="center"
+          display="flex"
+          justifyContent="space-between"
+          borderBottom="1px solid #d5d5d5"
+        >
+          <Box>
+            <h2>{headerText}</h2>
+          </Box>
+          <Box>
+            <MaterialButton
+              className={classes.buttonLink}
+              color="default"
+              href={serviceIncidentsLink}
+              startIcon={<ExitToAppIcon />}
+              target="_blank"
+              variant="outlined"
+            >
+              View service incidents
+            </MaterialButton>
+          </Box>
+        </Box>
+      )}
+      {activeIncidents && activeIncidents?.length > 0 && (
+        <Box className={classes.linksContainer}>
+          {incidents &&
+            incidents?.slice(0, 5).map((incident: Incident, index: number) => (
+              <div key={index}>
+                <Link
+                  className={classes.link}
+                  to={incident.incident_url}
+                  target="_blank"
+                  rel="noopener noreferrer"
+                >
+                  {incident.name}
+                </Link>
+              </div>
+            ))}
+        </Box>
+      )}
+      <Box paddingLeft="16px" marginTop="10px">
+        <Typography variant="subtitle1">View in FireHydrant </Typography>
+        <Box className={classes.buttonContainer} marginTop="10px">
+          <MaterialButton
+            component={Link}
+            target="_blank"
+            rel="noopener"
+            className={classes.button}
+            to={`${BASE_URL}/incidents/new`}
+          >
+            <Box flexDirection="column">
+              <Box>
+                <AddIcon className={classes.icon} />
+              </Box>
+              <Box>
+                <span>Declare an incident</span>
+              </Box>
+            </Box>
+          </MaterialButton>
+          <MaterialButton
+            component={Link}
+            target="_blank"
+            rel="noopener"
+            className={classes.button}
+            to={`${BASE_URL}/incidents`}
+          >
+            <Box flexDirection="column">
+              <Box>
+                <WhatshotIcon className={classes.icon} />
+              </Box>
+              <Box>
+                <span>View all incidents</span>
+              </Box>
+            </Box>
+          </MaterialButton>
+          {showServiceDetails && (
+            <MaterialButton
+              component={Link}
+              target="_blank"
+              rel="noopener"
+              className={classes.button}
+              to={`${BASE_URL}/services/${value?.service?.id}`}
+            >
+              <Box flexDirection="column">
+                <Box>
+                  <NotesIcon className={classes.icon} />
+                </Box>
+                <Box>
+                  <span>View Service Details</span>
+                </Box>
+              </Box>
+            </MaterialButton>
+          )}
+        </Box>
+      </Box>
+      {showServiceDetails && (
+        <Box>
+          <ServiceAnalyticsView
+            serviceId={serviceId}
+            startDate={startDate}
+            endDate={endDate}
+          />
+        </Box>
+      )}
+    </InfoCard>
+  );
+};
diff --git a/plugins/firehydrant/src/components/ServiceDetailsCard/index.ts b/plugins/firehydrant/src/components/ServiceDetailsCard/index.ts
new file mode 100644
index 0000000000..33e68ecf3b
--- /dev/null
+++ b/plugins/firehydrant/src/components/ServiceDetailsCard/index.ts
@@ -0,0 +1,16 @@
+/*
+ * Copyright 2021 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+export { ServiceDetailsCard } from './ServiceDetailsCard';
diff --git a/plugins/firehydrant/src/components/serviceAnalytics.ts b/plugins/firehydrant/src/components/serviceAnalytics.ts
new file mode 100644
index 0000000000..ba88af86da
--- /dev/null
+++ b/plugins/firehydrant/src/components/serviceAnalytics.ts
@@ -0,0 +1,51 @@
+/*
+ * Copyright 2021 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import { useAsyncRetry } from 'react-use';
+import { fireHydrantApiRef } from '../api';
+import { errorApiRef, useApi } from '@backstage/core-plugin-api';
+
+export const useServiceAnalytics = ({
+  serviceId,
+  startDate,
+  endDate,
+}: {
+  serviceId: string;
+  startDate: string;
+  endDate: string;
+}) => {
+  const api = useApi(fireHydrantApiRef);
+  const errorApi = useApi(errorApiRef);
+
+  const { loading, value, error, retry } = useAsyncRetry(async () => {
+    try {
+      return await api.getServiceAnalytics({
+        serviceId: serviceId,
+        startDate: startDate,
+        endDate: endDate,
+      });
+    } catch (e) {
+      errorApi.post(e);
+      return Promise.reject(e);
+    }
+  });
+
+  return {
+    loading,
+    value,
+    error,
+    retry,
+  };
+};
diff --git a/plugins/firehydrant/src/components/serviceDetails.ts b/plugins/firehydrant/src/components/serviceDetails.ts
new file mode 100644
index 0000000000..b8cac2736a
--- /dev/null
+++ b/plugins/firehydrant/src/components/serviceDetails.ts
@@ -0,0 +1,39 @@
+/*
+ * Copyright 2021 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import { useAsyncRetry } from 'react-use';
+import { fireHydrantApiRef } from '../api';
+import { errorApiRef, useApi } from '@backstage/core-plugin-api';
+
+export const useServiceDetails = ({ serviceName }: { serviceName: string }) => {
+  const api = useApi(fireHydrantApiRef);
+  const errorApi = useApi(errorApiRef);
+
+  const { loading, value, error, retry } = useAsyncRetry(async () => {
+    try {
+      return await api.getServiceDetails({ serviceName: serviceName });
+    } catch (e) {
+      errorApi.post(e);
+      return Promise.reject(e);
+    }
+  });
+
+  return {
+    loading,
+    value,
+    error,
+    retry,
+  };
+};
diff --git a/plugins/firehydrant/src/components/types.ts b/plugins/firehydrant/src/components/types.ts
new file mode 100644
index 0000000000..e607b2357d
--- /dev/null
+++ b/plugins/firehydrant/src/components/types.ts
@@ -0,0 +1,29 @@
+/*
+ * Copyright 2021 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+export type Service = {
+  id: string;
+  name: string;
+  description?: string;
+  active_incidents?: string[];
+};
+
+export type Incident = {
+  id: string;
+  active: boolean;
+  description?: string;
+  name: string;
+  incident_url: string;
+};
diff --git a/plugins/firehydrant/src/index.ts b/plugins/firehydrant/src/index.ts
new file mode 100644
index 0000000000..465e42f1ae
--- /dev/null
+++ b/plugins/firehydrant/src/index.ts
@@ -0,0 +1,16 @@
+/*
+ * Copyright 2021 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+export { firehydrantPlugin, FirehydrantCard } from './plugin';
diff --git a/plugins/firehydrant/src/plugin.test.ts b/plugins/firehydrant/src/plugin.test.ts
new file mode 100644
index 0000000000..ffde182e64
--- /dev/null
+++ b/plugins/firehydrant/src/plugin.test.ts
@@ -0,0 +1,22 @@
+/*
+ * Copyright 2021 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import { firehydrantPlugin } from './plugin';
+
+describe('firehydrant', () => {
+  it('should export plugin', () => {
+    expect(firehydrantPlugin).toBeDefined();
+  });
+});
diff --git a/plugins/firehydrant/src/plugin.ts b/plugins/firehydrant/src/plugin.ts
new file mode 100644
index 0000000000..4277c1833f
--- /dev/null
+++ b/plugins/firehydrant/src/plugin.ts
@@ -0,0 +1,49 @@
+/*
+ * Copyright 2021 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import { fireHydrantApiRef, FireHydrantAPIClient } from './api';
+import {
+  createApiFactory,
+  createPlugin,
+  discoveryApiRef,
+  createComponentExtension,
+} from '@backstage/core-plugin-api';
+
+import { rootRouteRef } from './routes';
+
+export const firehydrantPlugin = createPlugin({
+  id: 'firehydrant',
+  apis: [
+    createApiFactory({
+      api: fireHydrantApiRef,
+      deps: { discoveryApi: discoveryApiRef },
+      factory: ({ discoveryApi }) => new FireHydrantAPIClient({ discoveryApi }),
+    }),
+  ],
+  routes: {
+    root: rootRouteRef,
+  },
+});
+
+export const FirehydrantCard = firehydrantPlugin.provide(
+  createComponentExtension({
+    component: {
+      lazy: () =>
+        import('./components/ServiceDetailsCard').then(
+          m => m.ServiceDetailsCard,
+        ),
+    },
+  }),
+);
diff --git a/plugins/firehydrant/src/routes.ts b/plugins/firehydrant/src/routes.ts
new file mode 100644
index 0000000000..eb2f8b6375
--- /dev/null
+++ b/plugins/firehydrant/src/routes.ts
@@ -0,0 +1,20 @@
+/*
+ * Copyright 2021 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import { createRouteRef } from '@backstage/core-plugin-api';
+
+export const rootRouteRef = createRouteRef({
+  title: 'firehydrant',
+});
diff --git a/plugins/firehydrant/src/setupTests.ts b/plugins/firehydrant/src/setupTests.ts
new file mode 100644
index 0000000000..fc6dbd98f8
--- /dev/null
+++ b/plugins/firehydrant/src/setupTests.ts
@@ -0,0 +1,17 @@
+/*
+ * Copyright 2021 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import '@testing-library/jest-dom';
+import 'cross-fetch/polyfill';
diff --git a/plugins/fossa/CHANGELOG.md b/plugins/fossa/CHANGELOG.md
index e0f30ed179..f99c0d2943 100644
--- a/plugins/fossa/CHANGELOG.md
+++ b/plugins/fossa/CHANGELOG.md
@@ -1,5 +1,57 @@
 # @backstage/plugin-fossa
 
+## 0.2.15
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@0.4.5
+  - @backstage/core-components@0.4.0
+  - @backstage/catalog-model@0.9.1
+
+## 0.2.14
+
+### Patch Changes
+
+- 8bedb75ae: Update Luxon dependency to 2.x
+- Updated dependencies
+  - @backstage/core-components@0.3.1
+  - @backstage/core-plugin-api@0.1.6
+  - @backstage/plugin-catalog-react@0.4.2
+
+## 0.2.13
+
+### Patch Changes
+
+- 260c053b9: Fix All Material UI Warnings
+- Updated dependencies
+  - @backstage/core-components@0.3.0
+  - @backstage/core-plugin-api@0.1.5
+  - @backstage/plugin-catalog-react@0.4.1
+
+## 0.2.12
+
+### Patch Changes
+
+- 9d40fcb1e: - Bumping `material-ui/core` version to at least `4.12.2` as they made some breaking changes in later versions which broke `Pagination` of the `Table`.
+  - Switching out `material-table` to `@material-table/core` for support for the later versions of `material-ui/core`
+  - This causes a minor API change to `@backstage/core-components` as the interface for `Table` re-exports the `prop` from the underlying `Table` components.
+  - `onChangeRowsPerPage` has been renamed to `onRowsPerPageChange`
+  - `onChangePage` has been renamed to `onPageChange`
+  - Migration guide is here: https://material-table-core.com/docs/breaking-changes
+- Updated dependencies
+  - @backstage/core-components@0.2.0
+  - @backstage/plugin-catalog-react@0.4.0
+  - @backstage/core-plugin-api@0.1.4
+  - @backstage/theme@0.2.9
+
+## 0.2.11
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@0.3.0
+
 ## 0.2.10
 
 ### Patch Changes
diff --git a/plugins/fossa/api-report.md b/plugins/fossa/api-report.md
index 2a18f74f1b..e1b2cb0cf2 100644
--- a/plugins/fossa/api-report.md
+++ b/plugins/fossa/api-report.md
@@ -9,6 +9,8 @@ import { BackstagePlugin } from '@backstage/core-plugin-api';
 import { InfoCardVariants } from '@backstage/core-components';
 import { RouteRef } from '@backstage/core-plugin-api';
 
+// Warning: (ae-missing-release-tag) "EntityFossaCard" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export const EntityFossaCard: ({
   variant,
@@ -16,9 +18,13 @@ export const EntityFossaCard: ({
   variant?: InfoCardVariants | undefined;
 }) => JSX.Element;
 
+// Warning: (ae-missing-release-tag) "FossaPage" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export const FossaPage: () => JSX.Element;
 
+// Warning: (ae-missing-release-tag) "fossaPlugin" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export const fossaPlugin: BackstagePlugin<
   {
diff --git a/plugins/fossa/dev/index.tsx b/plugins/fossa/dev/index.tsx
index 83fa209c31..018d3e3acb 100644
--- a/plugins/fossa/dev/index.tsx
+++ b/plugins/fossa/dev/index.tsx
@@ -135,7 +135,7 @@ createDevApp()
     api: catalogApiRef,
     deps: {},
     factory: () =>
-      (({
+      ({
         getEntities: async () => {
           await new Promise(r => setTimeout(r, 1000));
 
@@ -148,7 +148,7 @@ createDevApp()
             ],
           };
         },
-      } as Partial<CatalogApi>) as any),
+      } as Partial<CatalogApi> as any),
   })
   .addPage({
     title: 'Entity Content',
diff --git a/plugins/fossa/package.json b/plugins/fossa/package.json
index 8f6d32eb70..7fb897095b 100644
--- a/plugins/fossa/package.json
+++ b/plugins/fossa/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-fossa",
-  "version": "0.2.10",
+  "version": "0.2.15",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -31,27 +31,27 @@
     "clean": "backstage-cli clean"
   },
   "dependencies": {
-    "@backstage/catalog-model": "^0.9.0",
-    "@backstage/core-components": "^0.1.5",
-    "@backstage/core-plugin-api": "^0.1.3",
+    "@backstage/catalog-model": "^0.9.1",
+    "@backstage/core-components": "^0.4.1",
+    "@backstage/core-plugin-api": "^0.1.7",
     "@backstage/errors": "^0.1.1",
-    "@backstage/plugin-catalog-react": "^0.2.6",
-    "@backstage/theme": "^0.2.8",
-    "@material-ui/core": "^4.11.0",
+    "@backstage/plugin-catalog-react": "^0.4.5",
+    "@backstage/theme": "^0.2.10",
+    "@material-ui/core": "^4.12.2",
     "@material-ui/icons": "^4.9.1",
     "@material-ui/lab": "4.0.0-alpha.45",
     "cross-fetch": "^3.0.6",
-    "luxon": "^1.26.0",
+    "luxon": "^2.0.2",
     "p-limit": "^3.0.2",
     "react": "^16.13.1",
     "react-dom": "^16.13.1",
     "react-use": "^17.2.4"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.7.3",
-    "@backstage/core-app-api": "^0.1.4",
-    "@backstage/dev-utils": "^0.2.1",
-    "@backstage/test-utils": "^0.1.14",
+    "@backstage/cli": "^0.7.11",
+    "@backstage/core-app-api": "^0.1.12",
+    "@backstage/dev-utils": "^0.2.9",
+    "@backstage/test-utils": "^0.1.17",
     "@testing-library/jest-dom": "^5.10.1",
     "@testing-library/react": "^11.2.5",
     "@testing-library/user-event": "^13.1.8",
diff --git a/plugins/fossa/src/components/FossaCard/FossaCard.test.tsx b/plugins/fossa/src/components/FossaCard/FossaCard.test.tsx
index 3c771bd7d6..79b401e4a8 100644
--- a/plugins/fossa/src/components/FossaCard/FossaCard.test.tsx
+++ b/plugins/fossa/src/components/FossaCard/FossaCard.test.tsx
@@ -74,7 +74,7 @@ describe('<FossaCard />', () => {
 
     fossaApi.getFindingSummary.mockRejectedValue(new Error('My Error'));
 
-    const { getByText } = await renderInTestApp(
+    const { getAllByText } = await renderInTestApp(
       <Wrapper>
         <EntityProvider entity={entity}>
           <FossaCard />
@@ -82,7 +82,7 @@ describe('<FossaCard />', () => {
       </Wrapper>,
     );
 
-    expect(getByText(/Warning: My Error/i)).toBeInTheDocument();
+    expect(getAllByText(/Error: My Error/i).length).not.toBe(0);
   });
 
   it('shows empty', async () => {
diff --git a/plugins/fossa/src/components/FossaCard/FossaCard.tsx b/plugins/fossa/src/components/FossaCard/FossaCard.tsx
index a6cedfb931..58ab3163fd 100644
--- a/plugins/fossa/src/components/FossaCard/FossaCard.tsx
+++ b/plugins/fossa/src/components/FossaCard/FossaCard.tsx
@@ -157,7 +157,7 @@ export const FossaCard = ({ variant }: { variant?: InfoCardVariants }) => {
         item
         container
         direction="column"
-        justify="space-between"
+        justifyContent="space-between"
         alignItems="center"
         style={{ height: '100%' }}
         spacing={0}
diff --git a/plugins/gcp-projects/CHANGELOG.md b/plugins/gcp-projects/CHANGELOG.md
index fc99dcbe09..6a7c312294 100644
--- a/plugins/gcp-projects/CHANGELOG.md
+++ b/plugins/gcp-projects/CHANGELOG.md
@@ -1,5 +1,35 @@
 # @backstage/plugin-gcp-projects
 
+## 0.3.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.4.0
+
+## 0.3.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.3.0
+  - @backstage/core-plugin-api@0.1.5
+
+## 0.3.1
+
+### Patch Changes
+
+- 9d40fcb1e: - Bumping `material-ui/core` version to at least `4.12.2` as they made some breaking changes in later versions which broke `Pagination` of the `Table`.
+  - Switching out `material-table` to `@material-table/core` for support for the later versions of `material-ui/core`
+  - This causes a minor API change to `@backstage/core-components` as the interface for `Table` re-exports the `prop` from the underlying `Table` components.
+  - `onChangeRowsPerPage` has been renamed to `onRowsPerPageChange`
+  - `onChangePage` has been renamed to `onPageChange`
+  - Migration guide is here: https://material-table-core.com/docs/breaking-changes
+- Updated dependencies
+  - @backstage/core-components@0.2.0
+  - @backstage/core-plugin-api@0.1.4
+  - @backstage/theme@0.2.9
+
 ## 0.3.0
 
 ### Minor Changes
diff --git a/plugins/gcp-projects/api-report.md b/plugins/gcp-projects/api-report.md
index b2347b42ad..9464a5af6a 100644
--- a/plugins/gcp-projects/api-report.md
+++ b/plugins/gcp-projects/api-report.md
@@ -10,6 +10,8 @@ import { BackstagePlugin } from '@backstage/core-plugin-api';
 import { OAuthApi } from '@backstage/core-plugin-api';
 import { RouteRef } from '@backstage/core-plugin-api';
 
+// Warning: (ae-missing-release-tag) "GcpApi" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export type GcpApi = {
   listProjects(): Promise<Project[]>;
@@ -20,9 +22,13 @@ export type GcpApi = {
   }): Promise<Operation>;
 };
 
+// Warning: (ae-missing-release-tag) "gcpApiRef" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export const gcpApiRef: ApiRef<GcpApi>;
 
+// Warning: (ae-missing-release-tag) "GcpClient" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export class GcpClient implements GcpApi {
   constructor(googleAuthApi: OAuthApi);
@@ -39,9 +45,13 @@ export class GcpClient implements GcpApi {
   listProjects(): Promise<Project[]>;
 }
 
+// Warning: (ae-missing-release-tag) "GcpProjectsPage" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export const GcpProjectsPage: () => JSX.Element;
 
+// Warning: (ae-missing-release-tag) "gcpProjectsPlugin" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 const gcpProjectsPlugin: BackstagePlugin<
   {
@@ -52,6 +62,8 @@ const gcpProjectsPlugin: BackstagePlugin<
 export { gcpProjectsPlugin };
 export { gcpProjectsPlugin as plugin };
 
+// Warning: (ae-missing-release-tag) "Operation" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export type Operation = {
   name: string;
@@ -61,6 +73,8 @@ export type Operation = {
   response: string;
 };
 
+// Warning: (ae-missing-release-tag) "Project" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export type Project = {
   name: string;
@@ -70,11 +84,15 @@ export type Project = {
   createTime?: string;
 };
 
+// Warning: (ae-missing-release-tag) "ProjectDetails" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export type ProjectDetails = {
   details: string;
 };
 
+// Warning: (ae-missing-release-tag) "Status" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export type Status = {
   code: number;
diff --git a/plugins/gcp-projects/package.json b/plugins/gcp-projects/package.json
index 539e9151f5..0e8028d0b8 100644
--- a/plugins/gcp-projects/package.json
+++ b/plugins/gcp-projects/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-gcp-projects",
-  "version": "0.3.0",
+  "version": "0.3.3",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -30,10 +30,10 @@
     "clean": "backstage-cli clean"
   },
   "dependencies": {
-    "@backstage/core-components": "^0.1.5",
-    "@backstage/core-plugin-api": "^0.1.3",
-    "@backstage/theme": "^0.2.8",
-    "@material-ui/core": "^4.11.0",
+    "@backstage/core-components": "^0.4.1",
+    "@backstage/core-plugin-api": "^0.1.7",
+    "@backstage/theme": "^0.2.10",
+    "@material-ui/core": "^4.12.2",
     "@material-ui/icons": "^4.9.1",
     "@material-ui/lab": "4.0.0-alpha.45",
     "react": "^16.13.1",
@@ -42,10 +42,10 @@
     "react-use": "^17.2.4"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.7.3",
-    "@backstage/core-app-api": "^0.1.4",
-    "@backstage/dev-utils": "^0.2.1",
-    "@backstage/test-utils": "^0.1.14",
+    "@backstage/cli": "^0.7.11",
+    "@backstage/core-app-api": "^0.1.12",
+    "@backstage/dev-utils": "^0.2.9",
+    "@backstage/test-utils": "^0.1.17",
     "@testing-library/jest-dom": "^5.10.1",
     "@testing-library/react": "^11.2.5",
     "@testing-library/user-event": "^13.1.8",
diff --git a/plugins/gcp-projects/src/components/ProjectDetailsPage/ProjectDetailsPage.tsx b/plugins/gcp-projects/src/components/ProjectDetailsPage/ProjectDetailsPage.tsx
index 0acc191e8a..f5da97b7eb 100644
--- a/plugins/gcp-projects/src/components/ProjectDetailsPage/ProjectDetailsPage.tsx
+++ b/plugins/gcp-projects/src/components/ProjectDetailsPage/ProjectDetailsPage.tsx
@@ -59,7 +59,11 @@ const DetailsPage = () => {
   const api = useApi(gcpApiRef);
   const classes = useStyles();
 
-  const { loading, error, value: details } = useAsync(
+  const {
+    loading,
+    error,
+    value: details,
+  } = useAsync(
     async () =>
       api.getProject(
         decodeURIComponent(location.search.split('projectId=')[1]),
diff --git a/plugins/git-release-manager/CHANGELOG.md b/plugins/git-release-manager/CHANGELOG.md
index 19538e822a..ee73a71b9f 100644
--- a/plugins/git-release-manager/CHANGELOG.md
+++ b/plugins/git-release-manager/CHANGELOG.md
@@ -1,5 +1,71 @@
 # @backstage/plugin-git-release-manager
 
+## 0.2.5
+
+### Patch Changes
+
+- 27ef7b645: Wrap each feature in custom feature arrays with an element containing a 'key' to avoid missing-key-warnings
+- Updated dependencies
+  - @backstage/integration@0.6.3
+  - @backstage/core-components@0.4.0
+
+## 0.2.4
+
+### Patch Changes
+
+- c9e61d909: Expose internal constants, helpers and components to make it easier for users to build custom features for GRM.
+- Updated dependencies
+  - @backstage/core-components@0.3.3
+  - @backstage/integration@0.6.2
+
+## 0.2.3
+
+### Patch Changes
+
+- 8bedb75ae: Update Luxon dependency to 2.x
+- 56c773909: Switched `@types/react` dependency to request `*` rather than a specific version.
+- Updated dependencies
+  - @backstage/integration@0.6.0
+  - @backstage/core-components@0.3.1
+  - @backstage/core-plugin-api@0.1.6
+
+## 0.2.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.3.0
+  - @backstage/core-plugin-api@0.1.5
+  - @backstage/integration@0.5.9
+
+## 0.2.1
+
+### Patch Changes
+
+- 9d40fcb1e: - Bumping `material-ui/core` version to at least `4.12.2` as they made some breaking changes in later versions which broke `Pagination` of the `Table`.
+  - Switching out `material-table` to `@material-table/core` for support for the later versions of `material-ui/core`
+  - This causes a minor API change to `@backstage/core-components` as the interface for `Table` re-exports the `prop` from the underlying `Table` components.
+  - `onChangeRowsPerPage` has been renamed to `onRowsPerPageChange`
+  - `onChangePage` has been renamed to `onPageChange`
+  - Migration guide is here: https://material-table-core.com/docs/breaking-changes
+- Updated dependencies
+  - @backstage/core-components@0.2.0
+  - @backstage/core-plugin-api@0.1.4
+  - @backstage/theme@0.2.9
+
+## 0.2.0
+
+### Minor Changes
+
+- a2d8922c9: Enable users to add custom features
+
+  Add more metadata to success callbacks
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.1.6
+
 ## 0.1.3
 
 ### Patch Changes
diff --git a/plugins/git-release-manager/api-report.md b/plugins/git-release-manager/api-report.md
index 3039bb033f..f1f9b5181c 100644
--- a/plugins/git-release-manager/api-report.md
+++ b/plugins/git-release-manager/api-report.md
@@ -7,14 +7,197 @@
 
 import { ApiRef } from '@backstage/core-plugin-api';
 import { BackstagePlugin } from '@backstage/core-plugin-api';
+import { PropsWithChildren } from 'react';
+import { default as React_2 } from 'react';
+import { ReactNode } from 'react';
 import { RouteRef } from '@backstage/core-plugin-api';
 
+// Warning: (ae-missing-release-tag) "A_CALVER_VERSION" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
+// @public (undocumented)
+const A_CALVER_VERSION = '2020.01.01_1';
+
+// Warning: (ae-missing-release-tag) "A_SEMVER_VERSION" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
+// @public (undocumented)
+const A_SEMVER_VERSION = '1.2.3';
+
+// Warning: (ae-missing-release-tag) "calverRegexp" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
+// @public (undocumented)
+const calverRegexp: RegExp;
+
+// Warning: (ae-forgotten-export) The symbol "GetBranchResult" needs to be exported by the entry point index.d.ts
+// Warning: (ae-missing-release-tag) "createMockBranch" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
+// @public
+const createMockBranch: ({
+  ...rest
+}?: Partial<GetBranchResult>) => GetBranchResult['branch'];
+
+// Warning: (ae-forgotten-export) The symbol "GetCommitResult" needs to be exported by the entry point index.d.ts
+// Warning: (ae-missing-release-tag) "createMockCommit" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
+// @public (undocumented)
+const createMockCommit: (
+  overrides: Partial<GetCommitResult['commit']>,
+) => GetCommitResult;
+
+// Warning: (ae-forgotten-export) The symbol "GetRecentCommitsResultSingle" needs to be exported by the entry point index.d.ts
+// Warning: (ae-missing-release-tag) "createMockRecentCommit" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
+// @public
+const createMockRecentCommit: ({
+  ...rest
+}: Partial<GetRecentCommitsResultSingle>) => GetRecentCommitsResultSingle;
+
+// Warning: (ae-forgotten-export) The symbol "GetLatestReleaseResult" needs to be exported by the entry point index.d.ts
+// Warning: (ae-missing-release-tag) "createMockRelease" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
+// @public
+const createMockRelease: ({
+  id,
+  prerelease,
+  ...rest
+}?: Partial<
+  NonNullable<GetLatestReleaseResult['latestRelease']>
+>) => NonNullable<GetLatestReleaseResult['latestRelease']>;
+
+// Warning: (ae-forgotten-export) The symbol "GetTagResult" needs to be exported by the entry point index.d.ts
+// Warning: (ae-missing-release-tag) "createMockTag" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
+// @public (undocumented)
+const createMockTag: (overrides: Partial<GetTagResult['tag']>) => GetTagResult;
+
+// Warning: (ae-forgotten-export) The symbol "DifferProps" needs to be exported by the entry point index.d.ts
+// Warning: (ae-missing-release-tag) "Differ" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
+// @public (undocumented)
+const Differ: ({ current, next, icon }: DifferProps) => JSX.Element;
+
+// Warning: (ae-missing-release-tag) "DISABLE_CACHE" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
+// @public (undocumented)
+const DISABLE_CACHE: {
+  readonly headers: {
+    readonly 'If-None-Match': '';
+  };
+};
+
+// Warning: (ae-missing-release-tag) "Divider" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
+// @public (undocumented)
+const Divider: () => JSX.Element;
+
+// Warning: (ae-forgotten-export) The symbol "SemverTagParts" needs to be exported by the entry point index.d.ts
+// Warning: (ae-missing-release-tag) "getBumpedSemverTagParts" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
+// @public
+function getBumpedSemverTagParts(
+  tagParts: SemverTagParts,
+  semverBumpLevel: keyof typeof SEMVER_PARTS,
+): {
+  bumpedTagParts: {
+    prefix: string;
+    major: number;
+    minor: number;
+    patch: number;
+  };
+};
+
+// Warning: (ae-missing-release-tag) "getBumpedTag" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
+// @public
+function getBumpedTag({
+  project,
+  tag,
+  bumpLevel,
+}: {
+  project: Project;
+  tag: string;
+  bumpLevel: keyof typeof SEMVER_PARTS;
+}):
+  | {
+      bumpedTag: string;
+      tagParts: CalverTagParts;
+      error: undefined;
+    }
+  | {
+      bumpedTag: string;
+      tagParts: {
+        prefix: string;
+        major: number;
+        minor: number;
+        patch: number;
+      };
+      error: undefined;
+    }
+  | {
+      error: AlertError;
+    };
+
+// Warning: (ae-missing-release-tag) "getCalverTagParts" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
+// @public (undocumented)
+function getCalverTagParts(tag: string):
+  | {
+      error: AlertError;
+      tagParts?: undefined;
+    }
+  | {
+      tagParts: CalverTagParts;
+      error?: undefined;
+    };
+
+// Warning: (ae-missing-release-tag) "getSemverTagParts" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
+// @public (undocumented)
+function getSemverTagParts(tag: string):
+  | {
+      error: AlertError;
+      tagParts?: undefined;
+    }
+  | {
+      tagParts: SemverTagParts;
+      error?: undefined;
+    };
+
+// Warning: (ae-missing-release-tag) "getShortCommitHash" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
+// @public (undocumented)
+function getShortCommitHash(hash: string): string;
+
+// Warning: (ae-missing-release-tag) "getTagParts" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
+// @public
+function getTagParts({ project, tag }: { project: Project; tag: string }):
+  | {
+      error: AlertError;
+      tagParts?: undefined;
+    }
+  | {
+      tagParts: CalverTagParts;
+      error?: undefined;
+    }
+  | {
+      tagParts: SemverTagParts;
+      error?: undefined;
+    };
+
+// Warning: (ae-forgotten-export) The symbol "GitReleaseApi" needs to be exported by the entry point index.d.ts
+// Warning: (ae-missing-release-tag) "gitReleaseManagerApiRef" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export const gitReleaseManagerApiRef: ApiRef<GitReleaseApi>;
 
+// Warning: (ae-forgotten-export) The symbol "GitReleaseManager" needs to be exported by the entry point index.d.ts
+// Warning: (ae-missing-release-tag) "GitReleaseManagerPage" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export const GitReleaseManagerPage: GitReleaseManager;
 
+// Warning: (ae-missing-release-tag) "gitReleaseManagerPlugin" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export const gitReleaseManagerPlugin: BackstagePlugin<
   {
@@ -23,5 +206,453 @@ export const gitReleaseManagerPlugin: BackstagePlugin<
   {}
 >;
 
+// Warning: (ae-missing-release-tag) "InfoCardPlus" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
+// @public (undocumented)
+const InfoCardPlus: ({
+  children,
+}: {
+  children?: React_2.ReactNode;
+}) => JSX.Element;
+
+// Warning: (ae-missing-release-tag) "internals" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
+// @public (undocumented)
+export const internals: {
+  components: typeof components;
+  constants: typeof constants;
+  helpers: typeof helpers;
+  testHelpers: typeof testHelpers;
+};
+
+// Warning: (ae-missing-release-tag) "isCalverTagParts" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
+// @public (undocumented)
+function isCalverTagParts(
+  project: Project,
+  _tagParts: unknown,
+): _tagParts is CalverTagParts;
+
+// Warning: (ae-missing-release-tag) "isProjectValid" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
+// @public (undocumented)
+function isProjectValid(project: any): project is Project;
+
+// Warning: (ae-missing-release-tag) "LinearProgressWithLabel" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
+// @public (undocumented)
+function LinearProgressWithLabel(props: {
+  progress: number;
+  responseSteps: ResponseStep[];
+}): JSX.Element;
+
+// Warning: (ae-missing-release-tag) "MOCK_RELEASE_BRANCH_NAME_CALVER" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
+// @public (undocumented)
+const MOCK_RELEASE_BRANCH_NAME_CALVER: string;
+
+// Warning: (ae-missing-release-tag) "MOCK_RELEASE_BRANCH_NAME_SEMVER" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
+// @public (undocumented)
+const MOCK_RELEASE_BRANCH_NAME_SEMVER: string;
+
+// Warning: (ae-missing-release-tag) "MOCK_RELEASE_CANDIDATE_TAG_NAME_CALVER" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
+// @public (undocumented)
+const MOCK_RELEASE_CANDIDATE_TAG_NAME_CALVER: string;
+
+// Warning: (ae-missing-release-tag) "MOCK_RELEASE_CANDIDATE_TAG_NAME_SEMVER" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
+// @public (undocumented)
+const MOCK_RELEASE_CANDIDATE_TAG_NAME_SEMVER: string;
+
+// Warning: (ae-missing-release-tag) "MOCK_RELEASE_NAME_CALVER" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
+// @public (undocumented)
+const MOCK_RELEASE_NAME_CALVER: string;
+
+// Warning: (ae-missing-release-tag) "MOCK_RELEASE_NAME_SEMVER" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
+// @public (undocumented)
+const MOCK_RELEASE_NAME_SEMVER: string;
+
+// Warning: (ae-missing-release-tag) "MOCK_RELEASE_VERSION_TAG_NAME_CALVER" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
+// @public (undocumented)
+const MOCK_RELEASE_VERSION_TAG_NAME_CALVER: string;
+
+// Warning: (ae-missing-release-tag) "MOCK_RELEASE_VERSION_TAG_NAME_SEMVER" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
+// @public (undocumented)
+const MOCK_RELEASE_VERSION_TAG_NAME_SEMVER: string;
+
+// Warning: (ae-missing-release-tag) "mockBumpedTag" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
+// @public (undocumented)
+const mockBumpedTag = 'rc-2020.01.01_1337';
+
+// Warning: (ae-missing-release-tag) "mockCalverProject" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
+// @public (undocumented)
+const mockCalverProject: Project;
+
+// Warning: (ae-missing-release-tag) "mockDefaultBranch" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
+// @public (undocumented)
+const mockDefaultBranch = 'mock_defaultBranch';
+
+// Warning: (ae-missing-release-tag) "mockEmail" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
+// @public (undocumented)
+const mockEmail = 'mock_email';
+
+// Warning: (ae-forgotten-export) The symbol "getReleaseCandidateGitInfo" needs to be exported by the entry point index.d.ts
+// Warning: (ae-missing-release-tag) "mockNextGitInfoCalver" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
+// @public (undocumented)
+const mockNextGitInfoCalver: ReturnType<typeof getReleaseCandidateGitInfo>;
+
+// Warning: (ae-missing-release-tag) "mockNextGitInfoSemver" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
+// @public (undocumented)
+const mockNextGitInfoSemver: ReturnType<typeof getReleaseCandidateGitInfo>;
+
+// Warning: (ae-missing-release-tag) "mockOwner" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
+// @public (undocumented)
+const mockOwner = 'mock_owner';
+
+// Warning: (ae-missing-release-tag) "mockReleaseBranch" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
+// @public (undocumented)
+const mockReleaseBranch: {
+  name: string;
+  links: {
+    html: string;
+  };
+  commit: {
+    sha: string;
+    commit: {
+      tree: {
+        sha: string;
+      };
+    };
+  };
+};
+
+// Warning: (ae-missing-release-tag) "mockReleaseCandidateCalver" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
+// @public (undocumented)
+const mockReleaseCandidateCalver: {
+  targetCommitish: string;
+  tagName: string;
+  prerelease: boolean;
+  id: number;
+  htmlUrl: string;
+  body?: string | null | undefined;
+};
+
+// Warning: (ae-missing-release-tag) "mockReleaseCandidateSemver" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
+// @public (undocumented)
+const mockReleaseCandidateSemver: {
+  targetCommitish: string;
+  tagName: string;
+  prerelease: boolean;
+  id: number;
+  htmlUrl: string;
+  body?: string | null | undefined;
+};
+
+// Warning: (ae-forgotten-export) The symbol "ReleaseStats" needs to be exported by the entry point index.d.ts
+// Warning: (ae-missing-release-tag) "mockReleaseStats" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
+// @public (undocumented)
+const mockReleaseStats: ReleaseStats;
+
+// Warning: (ae-missing-release-tag) "mockReleaseVersionCalver" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
+// @public (undocumented)
+const mockReleaseVersionCalver: {
+  targetCommitish: string;
+  tagName: string;
+  prerelease: boolean;
+  id: number;
+  htmlUrl: string;
+  body?: string | null | undefined;
+};
+
+// Warning: (ae-missing-release-tag) "mockReleaseVersionSemver" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
+// @public (undocumented)
+const mockReleaseVersionSemver: {
+  targetCommitish: string;
+  tagName: string;
+  prerelease: boolean;
+  id: number;
+  htmlUrl: string;
+  body?: string | null | undefined;
+};
+
+// Warning: (ae-missing-release-tag) "mockRepo" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
+// @public (undocumented)
+const mockRepo = 'mock_repo';
+
+// Warning: (ae-missing-release-tag) "mockSearchCalver" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
+// @public (undocumented)
+const mockSearchCalver: string;
+
+// Warning: (ae-missing-release-tag) "mockSearchSemver" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
+// @public (undocumented)
+const mockSearchSemver: string;
+
+// Warning: (ae-missing-release-tag) "mockSelectedPatchCommit" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
+// @public (undocumented)
+const mockSelectedPatchCommit: {
+  htmlUrl: string;
+  sha: string;
+  author: {
+    htmlUrl?: string | undefined;
+    login?: string | undefined;
+  };
+  commit: {
+    message: string;
+  };
+  firstParentSha?: string | undefined;
+};
+
+// Warning: (ae-missing-release-tag) "mockSemverProject" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
+// @public (undocumented)
+const mockSemverProject: Project;
+
+// Warning: (ae-missing-release-tag) "mockTagParts" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
+// @public (undocumented)
+const mockTagParts: CalverTagParts;
+
+// Warning: (ae-missing-release-tag) "mockUser" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
+// @public (undocumented)
+const mockUser: {
+  username: string;
+  email: string;
+};
+
+// Warning: (ae-missing-release-tag) "mockUsername" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
+// @public (undocumented)
+const mockUsername = 'mock_username';
+
+// Warning: (ae-missing-release-tag) "NoLatestRelease" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
+// @public (undocumented)
+const NoLatestRelease: () => JSX.Element;
+
+// Warning: (ae-forgotten-export) The symbol "DialogProps" needs to be exported by the entry point index.d.ts
+// Warning: (ae-missing-release-tag) "ResponseStepDialog" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
+// @public (undocumented)
+const ResponseStepDialog: ({
+  progress,
+  responseSteps,
+  title,
+}: DialogProps) => JSX.Element;
+
+// Warning: (ae-forgotten-export) The symbol "ResponseStepListProps" needs to be exported by the entry point index.d.ts
+// Warning: (ae-missing-release-tag) "ResponseStepList" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
+// @public (undocumented)
+const ResponseStepList: ({
+  responseSteps,
+  animationDelay,
+  loading,
+  denseList,
+  children,
+}: PropsWithChildren<ResponseStepListProps>) => JSX.Element;
+
+// Warning: (ae-forgotten-export) The symbol "ResponseStepListItemProps" needs to be exported by the entry point index.d.ts
+// Warning: (ae-missing-release-tag) "ResponseStepListItem" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
+// @public (undocumented)
+const ResponseStepListItem: ({
+  responseStep,
+  animationDelay,
+}: ResponseStepListItemProps) => JSX.Element;
+
+// Warning: (ae-missing-release-tag) "SEMVER_PARTS" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
+// @public (undocumented)
+const SEMVER_PARTS: {
+  major: 'major';
+  minor: 'minor';
+  patch: 'patch';
+};
+
+// Warning: (ae-missing-release-tag) "semverRegexp" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
+// @public (undocumented)
+const semverRegexp: RegExp;
+
+declare namespace stats {
+  export { mockReleaseStats };
+}
+
+// Warning: (ae-missing-release-tag) "TAG_OBJECT_MESSAGE" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
+// @public (undocumented)
+const TAG_OBJECT_MESSAGE =
+  'Tag generated by your friendly neighborhood Backstage Release Manager';
+
+// Warning: (ae-missing-release-tag) "TEST_IDS" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
+// @public (undocumented)
+const TEST_IDS: {
+  info: {
+    info: string;
+    infoFeaturePlus: string;
+  };
+  createRc: {
+    cta: string;
+    semverSelect: string;
+  };
+  promoteRc: {
+    mockedPromoteRcBody: string;
+    notRcWarning: string;
+    promoteRc: string;
+    cta: string;
+  };
+  patch: {
+    error: string;
+    loading: string;
+    notPrerelease: string;
+    body: string;
+  };
+  form: {
+    owner: {
+      loading: string;
+      select: string;
+      error: string;
+      empty: string;
+    };
+    repo: {
+      loading: string;
+      select: string;
+      error: string;
+      empty: string;
+    };
+    versioningStrategy: {
+      radioGroup: string;
+    };
+  };
+  components: {
+    divider: string;
+    noLatestRelease: string;
+    circularProgress: string;
+    responseStepListDialogContent: string;
+    responseStepListItem: string;
+    responseStepListItemIconSuccess: string;
+    responseStepListItemIconFailure: string;
+    responseStepListItemIconLink: string;
+    responseStepListItemIconDefault: string;
+    differ: {
+      current: string;
+      next: string;
+      icons: {
+        tag: string;
+        branch: string;
+        github: string;
+        slack: string;
+        versioning: string;
+      };
+    };
+    linearProgressWithLabel: string;
+  };
+};
+
+declare namespace testHelpers_2 {
+  export {
+    mockUsername,
+    mockEmail,
+    mockOwner,
+    mockRepo,
+    A_CALVER_VERSION,
+    MOCK_RELEASE_NAME_CALVER,
+    MOCK_RELEASE_BRANCH_NAME_CALVER,
+    MOCK_RELEASE_CANDIDATE_TAG_NAME_CALVER,
+    MOCK_RELEASE_VERSION_TAG_NAME_CALVER,
+    A_SEMVER_VERSION,
+    MOCK_RELEASE_NAME_SEMVER,
+    MOCK_RELEASE_BRANCH_NAME_SEMVER,
+    MOCK_RELEASE_CANDIDATE_TAG_NAME_SEMVER,
+    MOCK_RELEASE_VERSION_TAG_NAME_SEMVER,
+    createMockTag,
+    createMockCommit,
+    mockUser,
+    mockSemverProject,
+    mockCalverProject,
+    mockSearchCalver,
+    mockSearchSemver,
+    mockDefaultBranch,
+    mockNextGitInfoSemver,
+    mockNextGitInfoCalver,
+    mockTagParts,
+    mockBumpedTag,
+    createMockRelease,
+    mockReleaseCandidateCalver,
+    mockReleaseVersionCalver,
+    mockReleaseCandidateSemver,
+    mockReleaseVersionSemver,
+    createMockBranch,
+    mockReleaseBranch,
+    createMockRecentCommit,
+    mockSelectedPatchCommit,
+  };
+}
+
+declare namespace testIds {
+  export { TEST_IDS };
+}
+
+// Warning: (ae-missing-release-tag) "validateTagName" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
+// @public (undocumented)
+const validateTagName: ({
+  project,
+  tagName,
+}: {
+  project: Project;
+  tagName?: string | undefined;
+}) =>
+  | {
+      tagNameError: null;
+    }
+  | {
+      tagNameError: AlertError | undefined;
+    };
+
+// Warning: (ae-missing-release-tag) "VERSIONING_STRATEGIES" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
+// @public (undocumented)
+const VERSIONING_STRATEGIES: {
+  semver: 'semver';
+  calver: 'calver';
+};
+
+// Warnings were encountered during analysis:
+//
+// src/components/ResponseStepDialog/LinearProgressWithLabel.d.ts:5:5 - (ae-forgotten-export) The symbol "ResponseStep" needs to be exported by the entry point index.d.ts
+// src/helpers/getBumpedTag.d.ts:14:5 - (ae-forgotten-export) The symbol "Project" needs to be exported by the entry point index.d.ts
+// src/helpers/getBumpedTag.d.ts:19:5 - (ae-forgotten-export) The symbol "CalverTagParts" needs to be exported by the entry point index.d.ts
+// src/helpers/getBumpedTag.d.ts:31:5 - (ae-forgotten-export) The symbol "AlertError" needs to be exported by the entry point index.d.ts
+// src/index.d.ts:4:5 - (ae-forgotten-export) The symbol "components" needs to be exported by the entry point index.d.ts
+// src/index.d.ts:5:5 - (ae-forgotten-export) The symbol "constants" needs to be exported by the entry point index.d.ts
+// src/index.d.ts:6:5 - (ae-forgotten-export) The symbol "helpers" needs to be exported by the entry point index.d.ts
+// src/index.d.ts:7:5 - (ae-forgotten-export) The symbol "testHelpers" needs to be exported by the entry point index.d.ts
+
 // (No @packageDocumentation comment for this package)
 ```
diff --git a/plugins/git-release-manager/dev/index.tsx b/plugins/git-release-manager/dev/index.tsx
index 2a0170a61e..1876995bf1 100644
--- a/plugins/git-release-manager/dev/index.tsx
+++ b/plugins/git-release-manager/dev/index.tsx
@@ -16,7 +16,7 @@
 
 import React from 'react';
 import { createDevApp } from '@backstage/dev-utils';
-import { Box, Typography } from '@material-ui/core';
+import { Box, Button, Typography } from '@material-ui/core';
 
 import { gitReleaseManagerPlugin, GitReleaseManagerPage } from '../src/plugin';
 import { InfoCardPlus } from '../src/components/InfoCardPlus';
@@ -44,10 +44,16 @@ createDevApp()
       <Box padding={4}>
         <InfoCardPlus>
           <Typography variant="h4">Dev notes</Typography>
+
           <Typography>
             Configure plugin statically by passing props to the
             `GitHubReleaseManagerPage` component
           </Typography>
+
+          <Typography variant="body2">
+            Note that the static configuration points towards private
+            repositories and will thus not work for everyone.
+          </Typography>
         </InfoCardPlus>
 
         <GitReleaseManagerPage
@@ -67,8 +73,10 @@ createDevApp()
       <Box padding={4}>
         <InfoCardPlus>
           <Typography variant="h4">Dev notes</Typography>
-          <Typography>Each feature can be omitted</Typography>
-          <Typography>Success callbacks can also be added</Typography>
+          <Typography>
+            Each feature can be individually omitted as well as have success
+            callback attached to them
+          </Typography>
         </InfoCardPlus>
 
         <GitReleaseManagerPage
@@ -79,22 +87,12 @@ createDevApp()
           }}
           features={{
             createRc: {
-              onSuccess: ({
-                comparisonUrl,
-                createdTag,
-                gitReleaseName,
-                gitReleaseUrl,
-                previousTag,
-              }) => {
+              onSuccess: args => {
                 // eslint-disable-next-line no-console
                 console.log(
-                  'Custom success callback for Create RC',
-                  comparisonUrl,
-                  createdTag,
-                  gitReleaseName,
-                  gitReleaseUrl,
-                  previousTag,
+                  'Custom success callback for Create RC with the following args',
                 );
+                console.log(JSON.stringify(args, null, 2)); // eslint-disable-line no-console
               },
             },
             promoteRc: {
@@ -108,4 +106,50 @@ createDevApp()
       </Box>
     ),
   })
+  .addPage({
+    title: 'Custom',
+    path: '/custom',
+    element: (
+      <Box padding={4}>
+        <InfoCardPlus>
+          <Typography variant="h4">Dev notes</Typography>
+          <Typography>
+            The custom feature's return value can either be a React Element or
+            an array of React Elements.
+          </Typography>
+        </InfoCardPlus>
+
+        <GitReleaseManagerPage
+          project={{
+            owner: 'eengervall-playground',
+            repo: 'playground-semver',
+            versioningStrategy: 'semver',
+          }}
+          features={{
+            custom: {
+              factory: args => {
+                return (
+                  <InfoCardPlus>
+                    <Typography variant="h4">I'm a custom feature</Typography>
+
+                    <Button
+                      variant="contained"
+                      color="primary"
+                      onClick={() => {
+                        console.log(`Here's my args 🚀`); // eslint-disable-line no-console
+                        console.log(JSON.stringify(args, null, 2)); // eslint-disable-line no-console
+                      }}
+                    >
+                      View the arguments for this feature in the console by
+                      pressing this button
+                    </Button>
+                  </InfoCardPlus>
+                );
+              },
+            },
+          }}
+        />
+      </Box>
+    ),
+  })
   .render();
diff --git a/plugins/git-release-manager/package.json b/plugins/git-release-manager/package.json
index 19328c4ebd..8a6cd56e37 100644
--- a/plugins/git-release-manager/package.json
+++ b/plugins/git-release-manager/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-git-release-manager",
-  "version": "0.1.3",
+  "version": "0.2.5",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -20,15 +20,16 @@
     "clean": "backstage-cli clean"
   },
   "dependencies": {
-    "@backstage/core-components": "^0.1.5",
-    "@backstage/core-plugin-api": "^0.1.3",
-    "@backstage/integration": "^0.5.6",
-    "@backstage/theme": "^0.2.8",
-    "@material-ui/core": "^4.11.0",
+    "@backstage/core-components": "^0.4.1",
+    "@backstage/core-plugin-api": "^0.1.7",
+    "@backstage/integration": "^0.6.3",
+    "@backstage/theme": "^0.2.10",
+    "@material-ui/core": "^4.12.2",
     "@material-ui/icons": "^4.9.1",
     "@material-ui/lab": "4.0.0-alpha.45",
     "@octokit/rest": "^18.5.3",
-    "luxon": "^1.26.0",
+    "@types/react": "*",
+    "luxon": "^2.0.2",
     "qs": "^6.10.1",
     "react": "^16.13.1",
     "react-dom": "^16.13.1",
@@ -37,10 +38,10 @@
     "recharts": "^1.8.5"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.7.3",
-    "@backstage/core-app-api": "^0.1.4",
-    "@backstage/dev-utils": "^0.2.1",
-    "@backstage/test-utils": "^0.1.14",
+    "@backstage/cli": "^0.7.11",
+    "@backstage/core-app-api": "^0.1.12",
+    "@backstage/dev-utils": "^0.2.9",
+    "@backstage/test-utils": "^0.1.17",
     "@testing-library/jest-dom": "^5.10.1",
     "@testing-library/react": "^11.2.5",
     "@testing-library/react-hooks": "^3.4.2",
diff --git a/plugins/git-release-manager/src/GitReleaseManager.tsx b/plugins/git-release-manager/src/GitReleaseManager.tsx
index 44669f9bc7..bca19b9b13 100644
--- a/plugins/git-release-manager/src/GitReleaseManager.tsx
+++ b/plugins/git-release-manager/src/GitReleaseManager.tsx
@@ -18,12 +18,14 @@ import React from 'react';
 import { useAsync } from 'react-use';
 import { Alert } from '@material-ui/lab';
 import { Box } from '@material-ui/core';
+import { useApi } from '@backstage/core-plugin-api';
+import { ContentHeader, Progress } from '@backstage/core-components';
 
 import {
   ComponentConfig,
-  ComponentConfigCreateRc,
-  ComponentConfigPatch,
-  ComponentConfigPromoteRc,
+  CreateRcOnSuccessArgs,
+  PatchOnSuccessArgs,
+  PromoteRcOnSuccessArgs,
 } from './types/types';
 import { Features } from './features/Features';
 import { gitReleaseManagerApiRef } from './api/serviceApiRef';
@@ -33,18 +35,33 @@ import { ProjectContext, Project } from './contexts/ProjectContext';
 import { RepoDetailsForm } from './features/RepoDetailsForm/RepoDetailsForm';
 import { useQueryHandler } from './hooks/useQueryHandler';
 import { UserContext } from './contexts/UserContext';
-
-import { useApi } from '@backstage/core-plugin-api';
-import { ContentHeader, Progress } from '@backstage/core-components';
+import {
+  GetBranchResult,
+  GetLatestReleaseResult,
+  GetRepositoryResult,
+} from './api/GitReleaseClient';
 
 interface GitReleaseManagerProps {
   project?: Omit<Project, 'isProvidedViaProps'>;
   features?: {
     info?: Pick<ComponentConfig<void>, 'omit'>;
     stats?: Pick<ComponentConfig<void>, 'omit'>;
-    createRc?: ComponentConfigCreateRc;
-    promoteRc?: ComponentConfigPromoteRc;
-    patch?: ComponentConfigPatch;
+    createRc?: ComponentConfig<CreateRcOnSuccessArgs>;
+    promoteRc?: ComponentConfig<PromoteRcOnSuccessArgs>;
+    patch?: ComponentConfig<PatchOnSuccessArgs>;
+    custom?: {
+      factory: ({
+        latestRelease,
+        project,
+        releaseBranch,
+        repository,
+      }: {
+        latestRelease: GetLatestReleaseResult['latestRelease'] | null;
+        project: Project;
+        releaseBranch: GetBranchResult['branch'] | null;
+        repository: GetRepositoryResult['repository'];
+      }) => React.ReactElement | React.ReactElement[];
+    };
   };
 }
 
diff --git a/plugins/git-release-manager/src/api/GitReleaseClient.ts b/plugins/git-release-manager/src/api/GitReleaseClient.ts
index b0f1a163a9..948c77b47a 100644
--- a/plugins/git-release-manager/src/api/GitReleaseClient.ts
+++ b/plugins/git-release-manager/src/api/GitReleaseClient.ts
@@ -37,9 +37,8 @@ export class GitReleaseClient implements GitReleaseApi {
   }) {
     this.githubAuthApi = githubAuthApi;
 
-    const gitHubIntegrations = ScmIntegrations.fromConfig(
-      configApi,
-    ).github.list();
+    const gitHubIntegrations =
+      ScmIntegrations.fromConfig(configApi).github.list();
     const { host, apiBaseUrl } = this.getGithubIntegrationConfig({
       gitHubIntegrations,
     });
@@ -555,15 +554,11 @@ export interface GitReleaseApi {
     owners: string[];
   }>;
 
-  getRepositories: (args: {
-    owner: OwnerRepo['owner'];
-  }) => Promise<{
+  getRepositories: (args: { owner: OwnerRepo['owner'] }) => Promise<{
     repositories: string[];
   }>;
 
-  getUser: (
-    args: OwnerRepo,
-  ) => Promise<{
+  getUser: (args: OwnerRepo) => Promise<{
     user: {
       username: string;
       email?: string;
@@ -589,9 +584,7 @@ export interface GitReleaseApi {
     }[];
   }>;
 
-  getLatestRelease: (
-    args: OwnerRepo,
-  ) => Promise<{
+  getLatestRelease: (args: OwnerRepo) => Promise<{
     latestRelease: {
       targetCommitish: string;
       tagName: string;
@@ -602,9 +595,7 @@ export interface GitReleaseApi {
     } | null;
   }>;
 
-  getRepository: (
-    args: OwnerRepo,
-  ) => Promise<{
+  getRepository: (args: OwnerRepo) => Promise<{
     repository: {
       pushPermissions: boolean | undefined;
       defaultBranch: string;
@@ -765,9 +756,7 @@ export interface GitReleaseApi {
   /**
    * Get all tags in descending order
    */
-  getAllTags: (
-    args: OwnerRepo,
-  ) => Promise<{
+  getAllTags: (args: OwnerRepo) => Promise<{
     tags: Array<{
       tagName: string;
       tagSha: string;
@@ -775,9 +764,7 @@ export interface GitReleaseApi {
     }>;
   }>;
 
-  getAllReleases: (
-    args: OwnerRepo,
-  ) => Promise<{
+  getAllReleases: (args: OwnerRepo) => Promise<{
     releases: Array<{
       id: number;
       name: string | null;
diff --git a/plugins/git-release-manager/src/components/index.tsx b/plugins/git-release-manager/src/components/index.tsx
new file mode 100644
index 0000000000..2ce1edc6d2
--- /dev/null
+++ b/plugins/git-release-manager/src/components/index.tsx
@@ -0,0 +1,24 @@
+/*
+ * Copyright 2021 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+export { Differ } from './Differ';
+export { Divider } from './Divider';
+export { InfoCardPlus } from './InfoCardPlus';
+export { LinearProgressWithLabel } from './ResponseStepDialog/LinearProgressWithLabel';
+export { NoLatestRelease } from './NoLatestRelease';
+export { ResponseStepDialog } from './ResponseStepDialog/ResponseStepDialog';
+export { ResponseStepList } from './ResponseStepDialog/ResponseStepList';
+export { ResponseStepListItem } from './ResponseStepDialog/ResponseStepListItem';
diff --git a/plugins/git-release-manager/src/features/CreateReleaseCandidate/CreateReleaseCandidate.tsx b/plugins/git-release-manager/src/features/CreateReleaseCandidate/CreateReleaseCandidate.tsx
index e99fd9267e..6400f63b40 100644
--- a/plugins/git-release-manager/src/features/CreateReleaseCandidate/CreateReleaseCandidate.tsx
+++ b/plugins/git-release-manager/src/features/CreateReleaseCandidate/CreateReleaseCandidate.tsx
@@ -31,7 +31,7 @@ import {
   GetLatestReleaseResult,
   GetRepositoryResult,
 } from '../../api/GitReleaseClient';
-import { ComponentConfigCreateRc } from '../../types/types';
+import { ComponentConfig, CreateRcOnSuccessArgs } from '../../types/types';
 import { Differ } from '../../components/Differ';
 import { getReleaseCandidateGitInfo } from '../../helpers/getReleaseCandidateGitInfo';
 import { InfoCardPlus } from '../../components/InfoCardPlus';
@@ -45,7 +45,7 @@ interface CreateReleaseCandidateProps {
   defaultBranch: GetRepositoryResult['repository']['defaultBranch'];
   latestRelease: GetLatestReleaseResult['latestRelease'];
   releaseBranch: GetBranchResult['branch'] | null;
-  onSuccess?: ComponentConfigCreateRc['onSuccess'];
+  onSuccess?: ComponentConfig<CreateRcOnSuccessArgs>['onSuccess'];
 }
 
 const InfoCardPlusWrapper = ({ children }: { children: React.ReactNode }) => {
@@ -80,18 +80,14 @@ export const CreateReleaseCandidate = ({
     );
   }, [semverBumpLevel, setReleaseCandidateGitInfo, latestRelease, project]);
 
-  const {
-    progress,
-    responseSteps,
-    run,
-    runInvoked,
-  } = useCreateReleaseCandidate({
-    defaultBranch,
-    latestRelease,
-    releaseCandidateGitInfo,
-    project,
-    onSuccess,
-  });
+  const { progress, responseSteps, run, runInvoked } =
+    useCreateReleaseCandidate({
+      defaultBranch,
+      latestRelease,
+      releaseCandidateGitInfo,
+      project,
+      onSuccess,
+    });
   if (responseSteps.length > 0) {
     return (
       <ResponseStepDialog
diff --git a/plugins/git-release-manager/src/features/CreateReleaseCandidate/hooks/useCreateReleaseCandidate.test.tsx b/plugins/git-release-manager/src/features/CreateReleaseCandidate/hooks/useCreateReleaseCandidate.test.tsx
index b1427058dd..3128fde9c8 100644
--- a/plugins/git-release-manager/src/features/CreateReleaseCandidate/hooks/useCreateReleaseCandidate.test.tsx
+++ b/plugins/git-release-manager/src/features/CreateReleaseCandidate/hooks/useCreateReleaseCandidate.test.tsx
@@ -17,7 +17,6 @@ import { renderHook, act } from '@testing-library/react-hooks';
 import { waitFor } from '@testing-library/react';
 
 import {
-  mockApiClient,
   mockCalverProject,
   mockDefaultBranch,
   mockNextGitInfoCalver,
@@ -25,6 +24,7 @@ import {
   mockUser,
 } from '../../../test-helpers/test-helpers';
 import { useCreateReleaseCandidate } from './useCreateReleaseCandidate';
+import { mockApiClient } from '../../../test-helpers/mock-api-client';
 
 jest.mock('@backstage/core-plugin-api', () => ({
   ...jest.requireActual('@backstage/core-plugin-api'),
diff --git a/plugins/git-release-manager/src/features/CreateReleaseCandidate/hooks/useCreateReleaseCandidate.ts b/plugins/git-release-manager/src/features/CreateReleaseCandidate/hooks/useCreateReleaseCandidate.ts
index 0d6d4ebb4f..1173d6fbbe 100644
--- a/plugins/git-release-manager/src/features/CreateReleaseCandidate/hooks/useCreateReleaseCandidate.ts
+++ b/plugins/git-release-manager/src/features/CreateReleaseCandidate/hooks/useCreateReleaseCandidate.ts
@@ -21,7 +21,11 @@ import {
   GetRepositoryResult,
 } from '../../../api/GitReleaseClient';
 
-import { CardHook, ComponentConfigCreateRc } from '../../../types/types';
+import {
+  CardHook,
+  ComponentConfig,
+  CreateRcOnSuccessArgs,
+} from '../../../types/types';
 import { getReleaseCandidateGitInfo } from '../../../helpers/getReleaseCandidateGitInfo';
 import { gitReleaseManagerApiRef } from '../../../api/serviceApiRef';
 import { GitReleaseManagerError } from '../../../errors/GitReleaseManagerError';
@@ -31,12 +35,12 @@ import { useResponseSteps } from '../../../hooks/useResponseSteps';
 import { useUserContext } from '../../../contexts/UserContext';
 import { useApi } from '@backstage/core-plugin-api';
 
-interface UseCreateReleaseCandidate {
+export interface UseCreateReleaseCandidate {
   defaultBranch: GetRepositoryResult['repository']['defaultBranch'];
   latestRelease: GetLatestReleaseResult['latestRelease'];
   releaseCandidateGitInfo: ReturnType<typeof getReleaseCandidateGitInfo>;
   project: Project;
-  onSuccess?: ComponentConfigCreateRc['onSuccess'];
+  onSuccess?: ComponentConfig<CreateRcOnSuccessArgs>['onSuccess'];
 }
 
 export function useCreateReleaseCandidate({
@@ -59,12 +63,8 @@ export function useCreateReleaseCandidate({
     );
   }
 
-  const {
-    responseSteps,
-    addStepToResponseSteps,
-    asyncCatcher,
-    abortIfError,
-  } = useResponseSteps();
+  const { responseSteps, addStepToResponseSteps, asyncCatcher, abortIfError } =
+    useResponseSteps();
 
   /**
    * (1) Get the default branch's most recent commit
@@ -266,6 +266,12 @@ export function useCreateReleaseCandidate({
 
       try {
         await onSuccess({
+          input: {
+            defaultBranch,
+            latestRelease,
+            releaseCandidateGitInfo,
+            project,
+          },
           comparisonUrl: getComparisonRes.value.htmlUrl,
           createdTag: createReleaseRes.value.tagName,
           gitReleaseName: createReleaseRes.value.name,
diff --git a/plugins/git-release-manager/src/features/Features.test.tsx b/plugins/git-release-manager/src/features/Features.test.tsx
index b5404a21d9..28bd9b6310 100644
--- a/plugins/git-release-manager/src/features/Features.test.tsx
+++ b/plugins/git-release-manager/src/features/Features.test.tsx
@@ -18,8 +18,9 @@ import React from 'react';
 import { render, act, waitFor } from '@testing-library/react';
 
 import { Features } from './Features';
-import { mockApiClient, mockCalverProject } from '../test-helpers/test-helpers';
+import { mockCalverProject } from '../test-helpers/test-helpers';
 import { TEST_IDS } from '../test-helpers/test-ids';
+import { mockApiClient } from '../test-helpers/mock-api-client';
 
 jest.mock('@backstage/core-plugin-api', () => ({
   ...jest.requireActual('@backstage/core-plugin-api'),
@@ -40,6 +41,10 @@ describe('Features', () => {
           createRc: { omit: true },
           promoteRc: { omit: true },
           patch: { omit: true },
+          custom: {
+            // shouldn't trigger "missing key" warning in console
+            factory: () => [<div>Custom 1</div>, <div>Custom 2</div>],
+          },
         }}
       />,
     );
diff --git a/plugins/git-release-manager/src/features/Features.tsx b/plugins/git-release-manager/src/features/Features.tsx
index 4014f26f73..69b255c1ee 100644
--- a/plugins/git-release-manager/src/features/Features.tsx
+++ b/plugins/git-release-manager/src/features/Features.tsx
@@ -89,6 +89,21 @@ export function Features({
     );
   }
 
+  let CustomFeatures =
+    features?.custom?.factory({
+      latestRelease: gitBatchInfo.value.latestRelease,
+      project,
+      releaseBranch: gitBatchInfo.value.releaseBranch,
+      repository: gitBatchInfo.value.repository,
+    }) ?? null;
+  if (Array.isArray(CustomFeatures)) {
+    CustomFeatures = CustomFeatures.map((CustomFeature, index) => (
+      <React.Fragment key={`grm--custom-feature--${index}`}>
+        {CustomFeature}
+      </React.Fragment>
+    ));
+  }
+
   return (
     <RefetchContext.Provider value={{ fetchGitBatchInfo }}>
       <ErrorBoundary>
@@ -142,6 +157,8 @@ export function Features({
             onSuccess={features?.patch?.onSuccess}
           />
         )}
+
+        {CustomFeatures}
       </ErrorBoundary>
     </RefetchContext.Provider>
   );
diff --git a/plugins/git-release-manager/src/features/Patch/Patch.tsx b/plugins/git-release-manager/src/features/Patch/Patch.tsx
index 53fc901da7..c902ab0dc5 100644
--- a/plugins/git-release-manager/src/features/Patch/Patch.tsx
+++ b/plugins/git-release-manager/src/features/Patch/Patch.tsx
@@ -22,7 +22,7 @@ import {
   GetBranchResult,
   GetLatestReleaseResult,
 } from '../../api/GitReleaseClient';
-import { ComponentConfigPatch } from '../../types/types';
+import { ComponentConfig, PatchOnSuccessArgs } from '../../types/types';
 import { getBumpedTag } from '../../helpers/getBumpedTag';
 import { InfoCardPlus } from '../../components/InfoCardPlus';
 import { NoLatestRelease } from '../../components/NoLatestRelease';
@@ -32,7 +32,7 @@ import { useProjectContext } from '../../contexts/ProjectContext';
 interface PatchProps {
   latestRelease: GetLatestReleaseResult['latestRelease'];
   releaseBranch: GetBranchResult['branch'] | null;
-  onSuccess?: ComponentConfigPatch['onSuccess'];
+  onSuccess?: ComponentConfig<PatchOnSuccessArgs>['onSuccess'];
 }
 
 export const Patch = ({
diff --git a/plugins/git-release-manager/src/features/Patch/PatchBody.test.tsx b/plugins/git-release-manager/src/features/Patch/PatchBody.test.tsx
index 85c8194be0..d3e215d6d3 100644
--- a/plugins/git-release-manager/src/features/Patch/PatchBody.test.tsx
+++ b/plugins/git-release-manager/src/features/Patch/PatchBody.test.tsx
@@ -18,7 +18,6 @@ import React from 'react';
 import { render, waitFor, screen } from '@testing-library/react';
 
 import {
-  mockApiClient,
   mockBumpedTag,
   mockCalverProject,
   mockReleaseBranch,
@@ -26,6 +25,7 @@ import {
   mockReleaseVersionCalver,
   mockTagParts,
 } from '../../test-helpers/test-helpers';
+import { mockApiClient } from '../../test-helpers/mock-api-client';
 import { PatchBody } from './PatchBody';
 import { TEST_IDS } from '../../test-helpers/test-ids';
 
diff --git a/plugins/git-release-manager/src/features/Patch/PatchBody.tsx b/plugins/git-release-manager/src/features/Patch/PatchBody.tsx
index b4e705fa58..272363380f 100644
--- a/plugins/git-release-manager/src/features/Patch/PatchBody.tsx
+++ b/plugins/git-release-manager/src/features/Patch/PatchBody.tsx
@@ -38,7 +38,7 @@ import {
   GetLatestReleaseResult,
 } from '../../api/GitReleaseClient';
 import { CalverTagParts } from '../../helpers/tagParts/getCalverTagParts';
-import { ComponentConfigPatch } from '../../types/types';
+import { ComponentConfig, PatchOnSuccessArgs } from '../../types/types';
 import { Differ } from '../../components/Differ';
 import { getPatchCommitSuffix } from './helpers/getPatchCommitSuffix';
 import { gitReleaseManagerApiRef } from '../../api/serviceApiRef';
@@ -56,7 +56,7 @@ interface PatchBodyProps {
   bumpedTag: string;
   latestRelease: NonNullable<GetLatestReleaseResult['latestRelease']>;
   releaseBranch: GetBranchResult['branch'];
-  onSuccess?: ComponentConfigPatch['onSuccess'];
+  onSuccess?: ComponentConfig<PatchOnSuccessArgs>['onSuccess'];
   tagParts: NonNullable<CalverTagParts | SemverTagParts>;
 }
 
@@ -164,15 +164,16 @@ export const PatchBody = ({
         {gitDataResponse.value.recentCommitsOnDefaultBranch.map(
           (commit, index) => {
             // FIXME: Performance improvement opportunity: Convert to object lookup
-            const commitExistsOnReleaseBranch = !!gitDataResponse.value?.recentCommitsOnReleaseBranch.find(
-              releaseBranchCommit =>
-                releaseBranchCommit.sha === commit.sha ||
-                // The selected patch commit's sha is included in the commit message,
-                // which means it's part of a previous patch
-                releaseBranchCommit.commit.message.includes(
-                  getPatchCommitSuffix({ commitSha: commit.sha }),
-                ),
-            );
+            const commitExistsOnReleaseBranch =
+              !!gitDataResponse.value?.recentCommitsOnReleaseBranch.find(
+                releaseBranchCommit =>
+                  releaseBranchCommit.sha === commit.sha ||
+                  // The selected patch commit's sha is included in the commit message,
+                  // which means it's part of a previous patch
+                  releaseBranchCommit.commit.message.includes(
+                    getPatchCommitSuffix({ commitSha: commit.sha }),
+                  ),
+              );
             const hasNoParent = !commit.firstParentSha;
 
             return (
diff --git a/plugins/git-release-manager/src/features/Patch/hooks/usePatch.test.ts b/plugins/git-release-manager/src/features/Patch/hooks/usePatch.test.ts
index 05e3a4dd2f..41eb936d59 100644
--- a/plugins/git-release-manager/src/features/Patch/hooks/usePatch.test.ts
+++ b/plugins/git-release-manager/src/features/Patch/hooks/usePatch.test.ts
@@ -18,7 +18,6 @@ import { renderHook, act } from '@testing-library/react-hooks';
 import { waitFor } from '@testing-library/react';
 
 import {
-  mockApiClient,
   mockBumpedTag,
   mockCalverProject,
   mockReleaseVersionCalver,
@@ -27,6 +26,7 @@ import {
   mockUser,
 } from '../../../test-helpers/test-helpers';
 import { usePatch } from './usePatch';
+import { mockApiClient } from '../../../test-helpers/mock-api-client';
 
 jest.mock('@backstage/core-plugin-api', () => ({
   ...jest.requireActual('@backstage/core-plugin-api'),
diff --git a/plugins/git-release-manager/src/features/Patch/hooks/usePatch.ts b/plugins/git-release-manager/src/features/Patch/hooks/usePatch.ts
index 5d3f9829ad..338fa2a2d1 100644
--- a/plugins/git-release-manager/src/features/Patch/hooks/usePatch.ts
+++ b/plugins/git-release-manager/src/features/Patch/hooks/usePatch.ts
@@ -22,7 +22,11 @@ import {
 } from '../../../api/GitReleaseClient';
 
 import { CalverTagParts } from '../../../helpers/tagParts/getCalverTagParts';
-import { ComponentConfigPatch, CardHook } from '../../../types/types';
+import {
+  CardHook,
+  ComponentConfig,
+  PatchOnSuccessArgs,
+} from '../../../types/types';
 import { getPatchCommitSuffix } from '../helpers/getPatchCommitSuffix';
 import { gitReleaseManagerApiRef } from '../../../api/serviceApiRef';
 import { Project } from '../../../contexts/ProjectContext';
@@ -32,12 +36,12 @@ import { useResponseSteps } from '../../../hooks/useResponseSteps';
 import { useUserContext } from '../../../contexts/UserContext';
 import { useApi } from '@backstage/core-plugin-api';
 
-interface Patch {
+export interface UsePatch {
   bumpedTag: string;
   latestRelease: NonNullable<GetLatestReleaseResult['latestRelease']>;
   project: Project;
   tagParts: NonNullable<CalverTagParts | SemverTagParts>;
-  onSuccess?: ComponentConfigPatch['onSuccess'];
+  onSuccess?: ComponentConfig<PatchOnSuccessArgs>['onSuccess'];
 }
 
 // Inspiration: https://stackoverflow.com/questions/53859199/how-to-cherry-pick-through-githubs-api
@@ -47,15 +51,11 @@ export function usePatch({
   project,
   tagParts,
   onSuccess,
-}: Patch): CardHook<GetRecentCommitsResultSingle> {
+}: UsePatch): CardHook<GetRecentCommitsResultSingle> {
   const pluginApiClient = useApi(gitReleaseManagerApiRef);
   const { user } = useUserContext();
-  const {
-    responseSteps,
-    addStepToResponseSteps,
-    asyncCatcher,
-    abortIfError,
-  } = useResponseSteps();
+  const { responseSteps, addStepToResponseSteps, asyncCatcher, abortIfError } =
+    useResponseSteps();
 
   const releaseBranchName = latestRelease.targetCommitish;
 
@@ -337,13 +337,19 @@ ${selectedPatchCommit.commit.message}`,
 
     try {
       await onSuccess?.({
-        updatedReleaseUrl: updatedReleaseRes.value.htmlUrl,
-        updatedReleaseName: updatedReleaseRes.value.name,
-        previousTag: latestRelease.tagName,
-        patchedTag: updatedReleaseRes.value.tagName,
-        patchCommitUrl: releaseBranchRes.value.selectedPatchCommit.htmlUrl,
+        input: {
+          bumpedTag,
+          latestRelease,
+          project,
+          tagParts,
+        },
         patchCommitMessage:
           releaseBranchRes.value.selectedPatchCommit.commit.message,
+        patchCommitUrl: releaseBranchRes.value.selectedPatchCommit.htmlUrl,
+        patchedTag: updatedReleaseRes.value.tagName,
+        previousTag: latestRelease.tagName,
+        updatedReleaseName: updatedReleaseRes.value.name,
+        updatedReleaseUrl: updatedReleaseRes.value.htmlUrl,
       });
     } catch (error) {
       asyncCatcher(error);
diff --git a/plugins/git-release-manager/src/features/PromoteRc/PromoteRc.tsx b/plugins/git-release-manager/src/features/PromoteRc/PromoteRc.tsx
index 8d42119748..341ecbbce4 100644
--- a/plugins/git-release-manager/src/features/PromoteRc/PromoteRc.tsx
+++ b/plugins/git-release-manager/src/features/PromoteRc/PromoteRc.tsx
@@ -18,7 +18,7 @@ import React from 'react';
 import { Alert, AlertTitle } from '@material-ui/lab';
 import { Box, Typography } from '@material-ui/core';
 
-import { ComponentConfigPromoteRc } from '../../types/types';
+import { ComponentConfig, PromoteRcOnSuccessArgs } from '../../types/types';
 import { GetLatestReleaseResult } from '../../api/GitReleaseClient';
 import { InfoCardPlus } from '../../components/InfoCardPlus';
 import { NoLatestRelease } from '../../components/NoLatestRelease';
@@ -27,7 +27,7 @@ import { TEST_IDS } from '../../test-helpers/test-ids';
 
 interface PromoteRcProps {
   latestRelease: GetLatestReleaseResult['latestRelease'];
-  onSuccess?: ComponentConfigPromoteRc['onSuccess'];
+  onSuccess?: ComponentConfig<PromoteRcOnSuccessArgs>['onSuccess'];
 }
 
 export const PromoteRc = ({ latestRelease, onSuccess }: PromoteRcProps) => {
diff --git a/plugins/git-release-manager/src/features/PromoteRc/PromoteRcBody.tsx b/plugins/git-release-manager/src/features/PromoteRc/PromoteRcBody.tsx
index d3ce5e4a70..3ca4518bbc 100644
--- a/plugins/git-release-manager/src/features/PromoteRc/PromoteRcBody.tsx
+++ b/plugins/git-release-manager/src/features/PromoteRc/PromoteRcBody.tsx
@@ -17,7 +17,7 @@
 import React from 'react';
 import { Button, Typography, Box } from '@material-ui/core';
 
-import { ComponentConfigPromoteRc } from '../../types/types';
+import { ComponentConfig, PromoteRcOnSuccessArgs } from '../../types/types';
 import { Differ } from '../../components/Differ';
 import { GetLatestReleaseResult } from '../../api/GitReleaseClient';
 import { ResponseStepDialog } from '../../components/ResponseStepDialog/ResponseStepDialog';
@@ -26,7 +26,7 @@ import { usePromoteRc } from './hooks/usePromoteRc';
 
 interface PromoteRcBodyProps {
   rcRelease: NonNullable<GetLatestReleaseResult['latestRelease']>;
-  onSuccess?: ComponentConfigPromoteRc['onSuccess'];
+  onSuccess?: ComponentConfig<PromoteRcOnSuccessArgs>['onSuccess'];
 }
 
 export const PromoteRcBody = ({ rcRelease, onSuccess }: PromoteRcBodyProps) => {
diff --git a/plugins/git-release-manager/src/features/PromoteRc/hooks/usePromoteRc.test.ts b/plugins/git-release-manager/src/features/PromoteRc/hooks/usePromoteRc.test.ts
index a2e64fcd38..ff1c58b5be 100644
--- a/plugins/git-release-manager/src/features/PromoteRc/hooks/usePromoteRc.test.ts
+++ b/plugins/git-release-manager/src/features/PromoteRc/hooks/usePromoteRc.test.ts
@@ -18,12 +18,12 @@ import { renderHook, act } from '@testing-library/react-hooks';
 import { waitFor } from '@testing-library/react';
 
 import {
-  mockApiClient,
   mockCalverProject,
   mockReleaseCandidateCalver,
   mockUser,
 } from '../../../test-helpers/test-helpers';
 import { usePromoteRc } from './usePromoteRc';
+import { mockApiClient } from '../../../test-helpers/mock-api-client';
 
 jest.mock('@backstage/core-plugin-api', () => ({
   ...jest.requireActual('@backstage/core-plugin-api'),
diff --git a/plugins/git-release-manager/src/features/PromoteRc/hooks/usePromoteRc.ts b/plugins/git-release-manager/src/features/PromoteRc/hooks/usePromoteRc.ts
index 357ba1e0a6..232bc0b744 100644
--- a/plugins/git-release-manager/src/features/PromoteRc/hooks/usePromoteRc.ts
+++ b/plugins/git-release-manager/src/features/PromoteRc/hooks/usePromoteRc.ts
@@ -16,7 +16,11 @@
 
 import { useState, useEffect } from 'react';
 import { useAsync, useAsyncFn } from 'react-use';
-import { CardHook, ComponentConfigPromoteRc } from '../../../types/types';
+import {
+  CardHook,
+  ComponentConfig,
+  PromoteRcOnSuccessArgs,
+} from '../../../types/types';
 
 import { GetLatestReleaseResult } from '../../../api/GitReleaseClient';
 import { gitReleaseManagerApiRef } from '../../../api/serviceApiRef';
@@ -27,26 +31,22 @@ import { useResponseSteps } from '../../../hooks/useResponseSteps';
 import { useUserContext } from '../../../contexts/UserContext';
 import { useApi } from '@backstage/core-plugin-api';
 
-interface PromoteRc {
+export interface UsePromoteRc {
   rcRelease: NonNullable<GetLatestReleaseResult['latestRelease']>;
   releaseVersion: string;
-  onSuccess?: ComponentConfigPromoteRc['onSuccess'];
+  onSuccess?: ComponentConfig<PromoteRcOnSuccessArgs>['onSuccess'];
 }
 
 export function usePromoteRc({
   rcRelease,
   releaseVersion,
   onSuccess,
-}: PromoteRc): CardHook<void> {
+}: UsePromoteRc): CardHook<void> {
   const pluginApiClient = useApi(gitReleaseManagerApiRef);
   const { user } = useUserContext();
   const { project } = useProjectContext();
-  const {
-    responseSteps,
-    addStepToResponseSteps,
-    asyncCatcher,
-    abortIfError,
-  } = useResponseSteps();
+  const { responseSteps, addStepToResponseSteps, asyncCatcher, abortIfError } =
+    useResponseSteps();
 
   /**
    * (1) Fetch most recent release branch commit
@@ -170,12 +170,16 @@ export function usePromoteRc({
 
       try {
         await onSuccess?.({
-          gitReleaseUrl: promotedReleaseRes.value.htmlUrl,
+          input: {
+            rcRelease,
+            releaseVersion,
+          },
           gitReleaseName: promotedReleaseRes.value.name,
-          previousTagUrl: rcRelease.htmlUrl,
+          gitReleaseUrl: promotedReleaseRes.value.htmlUrl,
           previousTag: rcRelease.tagName,
-          updatedTagUrl: promotedReleaseRes.value.htmlUrl,
+          previousTagUrl: rcRelease.htmlUrl,
           updatedTag: promotedReleaseRes.value.tagName,
+          updatedTagUrl: promotedReleaseRes.value.htmlUrl,
         });
       } catch (error) {
         asyncCatcher(error);
diff --git a/plugins/git-release-manager/src/features/RepoDetailsForm/Owner.test.tsx b/plugins/git-release-manager/src/features/RepoDetailsForm/Owner.test.tsx
index 201577268c..e8798f3ce0 100644
--- a/plugins/git-release-manager/src/features/RepoDetailsForm/Owner.test.tsx
+++ b/plugins/git-release-manager/src/features/RepoDetailsForm/Owner.test.tsx
@@ -18,7 +18,6 @@ import React from 'react';
 import { render, waitFor, screen } from '@testing-library/react';
 
 import {
-  mockApiClient,
   mockCalverProject,
   mockSearchCalver,
   mockUser,
@@ -26,6 +25,7 @@ import {
 import { TEST_IDS } from '../../test-helpers/test-ids';
 import { useProjectContext } from '../../contexts/ProjectContext';
 import { Owner } from './Owner';
+import { mockApiClient } from '../../test-helpers/mock-api-client';
 
 jest.mock('react-router', () => ({
   useNavigate: jest.fn(),
diff --git a/plugins/git-release-manager/src/features/RepoDetailsForm/Repo.test.tsx b/plugins/git-release-manager/src/features/RepoDetailsForm/Repo.test.tsx
index 0fc05fddf2..bc6f2949f8 100644
--- a/plugins/git-release-manager/src/features/RepoDetailsForm/Repo.test.tsx
+++ b/plugins/git-release-manager/src/features/RepoDetailsForm/Repo.test.tsx
@@ -18,13 +18,13 @@ import React from 'react';
 import { render, waitFor, screen } from '@testing-library/react';
 
 import {
-  mockApiClient,
   mockCalverProject,
   mockSearchCalver,
 } from '../../test-helpers/test-helpers';
+import { mockApiClient } from '../../test-helpers/mock-api-client';
+import { Repo } from './Repo';
 import { TEST_IDS } from '../../test-helpers/test-ids';
 import { useProjectContext } from '../../contexts/ProjectContext';
-import { Repo } from './Repo';
 
 jest.mock('react-router', () => ({
   useNavigate: jest.fn(),
diff --git a/plugins/git-release-manager/src/features/Stats/Info/InDepth/InDepth.tsx b/plugins/git-release-manager/src/features/Stats/Info/InDepth/InDepth.tsx
index 8d3862ab1e..b55b0a79b2 100644
--- a/plugins/git-release-manager/src/features/Stats/Info/InDepth/InDepth.tsx
+++ b/plugins/git-release-manager/src/features/Stats/Info/InDepth/InDepth.tsx
@@ -31,12 +31,8 @@ import { useReleaseStatsContext } from '../../contexts/ReleaseStatsContext';
 
 export function InDepth() {
   const { releaseStats } = useReleaseStatsContext();
-  const {
-    averageReleaseTime,
-    progress,
-    releaseCommitPairs,
-    run,
-  } = useGetReleaseTimes();
+  const { averageReleaseTime, progress, releaseCommitPairs, run } =
+    useGetReleaseTimes();
 
   const skipped =
     Object.keys(releaseStats.releases).length - releaseCommitPairs.length;
diff --git a/plugins/git-release-manager/src/features/Stats/Info/hooks/useGetReleaseTimes.tsx b/plugins/git-release-manager/src/features/Stats/Info/hooks/useGetReleaseTimes.tsx
index 8707fc0920..35cb3bc411 100644
--- a/plugins/git-release-manager/src/features/Stats/Info/hooks/useGetReleaseTimes.tsx
+++ b/plugins/git-release-manager/src/features/Stats/Info/hooks/useGetReleaseTimes.tsx
@@ -80,19 +80,16 @@ export function useGetReleaseTimes() {
   }, [averageReleaseTime.length, releaseCommitPairs.length]);
 
   async function getAndSetReleaseTime({ pairIndex }: { pairIndex: number }) {
-    const { baseVersion, startCommit, endCommit } = releaseCommitPairs[
-      pairIndex
-    ];
+    const { baseVersion, startCommit, endCommit } =
+      releaseCommitPairs[pairIndex];
 
-    const {
-      startDate: startCommitCreatedAt,
-      endDate: endCommitCreatedAt,
-    } = await getTagDates({
-      pluginApiClient,
-      project,
-      startTag: startCommit,
-      endTag: endCommit,
-    });
+    const { startDate: startCommitCreatedAt, endDate: endCommitCreatedAt } =
+      await getTagDates({
+        pluginApiClient,
+        project,
+        startTag: startCommit,
+        endTag: endCommit,
+      });
 
     const releaseTime: ReleaseTime = {
       version: baseVersion,
diff --git a/plugins/git-release-manager/src/features/Stats/helpers/getTagDates.test.ts b/plugins/git-release-manager/src/features/Stats/helpers/getTagDates.test.ts
index 4dce308c63..ba17bc0be6 100644
--- a/plugins/git-release-manager/src/features/Stats/helpers/getTagDates.test.ts
+++ b/plugins/git-release-manager/src/features/Stats/helpers/getTagDates.test.ts
@@ -17,10 +17,10 @@
 import {
   createMockCommit,
   createMockTag,
-  mockApiClient,
   mockSemverProject,
 } from '../../../test-helpers/test-helpers';
 import { getTagDates } from './getTagDates';
+import { mockApiClient } from '../../../test-helpers/mock-api-client';
 
 describe('getTagDates', () => {
   beforeEach(() => {
diff --git a/plugins/git-release-manager/src/features/Stats/helpers/getTagDates.ts b/plugins/git-release-manager/src/features/Stats/helpers/getTagDates.ts
index ef274be259..38d1d51604 100644
--- a/plugins/git-release-manager/src/features/Stats/helpers/getTagDates.ts
+++ b/plugins/git-release-manager/src/features/Stats/helpers/getTagDates.ts
@@ -65,21 +65,19 @@ export const getTagDates = async ({
   }
 
   if (startTag.tagType === 'tag' && endTag.tagType === 'tag') {
-    const [
-      { tag: startTagResponse },
-      { tag: endTagResponse },
-    ] = await Promise.all([
-      pluginApiClient.getTag({
-        owner: project.owner,
-        repo: project.repo,
-        tagSha: startTag.tagSha,
-      }),
-      pluginApiClient.getTag({
-        owner: project.owner,
-        repo: project.repo,
-        tagSha: endTag.tagSha,
-      }),
-    ]);
+    const [{ tag: startTagResponse }, { tag: endTagResponse }] =
+      await Promise.all([
+        pluginApiClient.getTag({
+          owner: project.owner,
+          repo: project.repo,
+          tagSha: startTag.tagSha,
+        }),
+        pluginApiClient.getTag({
+          owner: project.owner,
+          repo: project.repo,
+          tagSha: endTag.tagSha,
+        }),
+      ]);
 
     return {
       startDate: startTagResponse.date,
diff --git a/plugins/git-release-manager/src/helpers/getBumpedTag.ts b/plugins/git-release-manager/src/helpers/getBumpedTag.ts
index c368047635..dbfb00818e 100644
--- a/plugins/git-release-manager/src/helpers/getBumpedTag.ts
+++ b/plugins/git-release-manager/src/helpers/getBumpedTag.ts
@@ -21,6 +21,14 @@ import { Project } from '../contexts/ProjectContext';
 import { SEMVER_PARTS } from '../constants/constants';
 import { SemverTagParts } from './tagParts/getSemverTagParts';
 
+/**
+ * Calculates the next version for the project
+ *
+ * For calendar versioning this means a bump in patch
+ *
+ * For semantic versioning this means either a minor or a patch bump
+ * depending on the value of `bumpLevel`
+ */
 export function getBumpedTag({
   project,
   tag,
@@ -74,6 +82,10 @@ function getBumpedSemverTag(
   };
 }
 
+/**
+ * Calculates the next semantic version, taking into account
+ * whether or not it's a minor or patch
+ */
 export function getBumpedSemverTagParts(
   tagParts: SemverTagParts,
   semverBumpLevel: keyof typeof SEMVER_PARTS,
diff --git a/plugins/git-release-manager/src/helpers/index.tsx b/plugins/git-release-manager/src/helpers/index.tsx
new file mode 100644
index 0000000000..1516e192a1
--- /dev/null
+++ b/plugins/git-release-manager/src/helpers/index.tsx
@@ -0,0 +1,24 @@
+/*
+ * Copyright 2021 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+export { calverRegexp, getCalverTagParts } from './tagParts/getCalverTagParts';
+export { getBumpedSemverTagParts, getBumpedTag } from './getBumpedTag';
+export { getSemverTagParts, semverRegexp } from './tagParts/getSemverTagParts';
+export { getShortCommitHash } from './getShortCommitHash';
+export { getTagParts } from './tagParts/getTagParts';
+export { isCalverTagParts } from './isCalverTagParts';
+export { isProjectValid } from './isProjectValid';
+export { validateTagName } from './tagParts/validateTagName';
diff --git a/plugins/git-release-manager/src/helpers/tagParts/getCalverTagParts.ts b/plugins/git-release-manager/src/helpers/tagParts/getCalverTagParts.ts
index 776d1d15dd..9f007938ed 100644
--- a/plugins/git-release-manager/src/helpers/tagParts/getCalverTagParts.ts
+++ b/plugins/git-release-manager/src/helpers/tagParts/getCalverTagParts.ts
@@ -22,7 +22,8 @@ export type CalverTagParts = {
   patch: number;
 };
 
-export const calverRegexp = /(rc|version)-([0-9]{4}\.[0-9]{2}\.[0-9]{2})_([0-9]+)/;
+export const calverRegexp =
+  /(rc|version)-([0-9]{4}\.[0-9]{2}\.[0-9]{2})_([0-9]+)/;
 
 export function getCalverTagParts(tag: string) {
   const match = tag.match(calverRegexp);
diff --git a/plugins/git-release-manager/src/helpers/tagParts/getTagParts.ts b/plugins/git-release-manager/src/helpers/tagParts/getTagParts.ts
index acedf2e8d1..750e4e23c5 100644
--- a/plugins/git-release-manager/src/helpers/tagParts/getTagParts.ts
+++ b/plugins/git-release-manager/src/helpers/tagParts/getTagParts.ts
@@ -18,6 +18,10 @@ import { getCalverTagParts } from './getCalverTagParts';
 import { getSemverTagParts } from './getSemverTagParts';
 import { Project } from '../../contexts/ProjectContext';
 
+/**
+ * Tag parts are the individual parts of a version, e.g. <major>.<minor>.<patch>
+ * are the parts of a semantic version
+ */
 export function getTagParts({
   project,
   tag,
diff --git a/plugins/git-release-manager/src/hooks/useGetGitBatchInfo.test.ts b/plugins/git-release-manager/src/hooks/useGetGitBatchInfo.test.ts
index 65eaa39262..b94dddf8f7 100644
--- a/plugins/git-release-manager/src/hooks/useGetGitBatchInfo.test.ts
+++ b/plugins/git-release-manager/src/hooks/useGetGitBatchInfo.test.ts
@@ -17,7 +17,8 @@
 import { renderHook, act } from '@testing-library/react-hooks';
 import { waitFor } from '@testing-library/react';
 
-import { mockApiClient, mockSemverProject } from '../test-helpers/test-helpers';
+import { mockApiClient } from '../test-helpers/mock-api-client';
+import { mockSemverProject } from '../test-helpers/test-helpers';
 import { useGetGitBatchInfo } from './useGetGitBatchInfo';
 
 describe('useGetHubBatchInfo', () => {
diff --git a/plugins/git-release-manager/src/hooks/useVersioningStrategyMatchesRepoTags.ts b/plugins/git-release-manager/src/hooks/useVersioningStrategyMatchesRepoTags.ts
index 5d1e7670be..1a40712c8c 100644
--- a/plugins/git-release-manager/src/hooks/useVersioningStrategyMatchesRepoTags.ts
+++ b/plugins/git-release-manager/src/hooks/useVersioningStrategyMatchesRepoTags.ts
@@ -28,9 +28,8 @@ export const useVersioningStrategyMatchesRepoTags = ({
   latestReleaseTagName?: string;
   repositoryName?: string;
 }) => {
-  const [versioningStrategyMatches, setVersioningStrategyMatches] = useState(
-    false,
-  );
+  const [versioningStrategyMatches, setVersioningStrategyMatches] =
+    useState(false);
   useEffect(() => {
     setVersioningStrategyMatches(false);
 
diff --git a/plugins/git-release-manager/src/index.ts b/plugins/git-release-manager/src/index.ts
index 767dc5c6e1..c325a3335b 100644
--- a/plugins/git-release-manager/src/index.ts
+++ b/plugins/git-release-manager/src/index.ts
@@ -19,3 +19,12 @@ export {
   GitReleaseManagerPage,
   gitReleaseManagerApiRef,
 } from './plugin';
+
+import { components, constants, helpers, testHelpers } from './plugin';
+
+export const internals = {
+  components,
+  constants,
+  helpers,
+  testHelpers,
+};
diff --git a/plugins/git-release-manager/src/plugin.test.ts b/plugins/git-release-manager/src/plugin.test.ts
index 69e2c47c6a..db60617c24 100644
--- a/plugins/git-release-manager/src/plugin.test.ts
+++ b/plugins/git-release-manager/src/plugin.test.ts
@@ -21,6 +21,10 @@ describe('git-release-manager', () => {
     expect(Object.keys(plugin)).toMatchInlineSnapshot(`
       Array [
         "gitReleaseManagerApiRef",
+        "constants",
+        "helpers",
+        "components",
+        "testHelpers",
         "gitReleaseManagerPlugin",
         "GitReleaseManagerPage",
       ]
diff --git a/plugins/git-release-manager/src/plugin.ts b/plugins/git-release-manager/src/plugin.ts
index 511fd4b92e..a416ab9092 100644
--- a/plugins/git-release-manager/src/plugin.ts
+++ b/plugins/git-release-manager/src/plugin.ts
@@ -14,10 +14,6 @@
  * limitations under the License.
  */
 
-import { gitReleaseManagerApiRef } from './api/serviceApiRef';
-
-import { GitReleaseClient } from './api/GitReleaseClient';
-import { rootRouteRef } from './routes';
 import {
   configApiRef,
   createPlugin,
@@ -26,7 +22,15 @@ import {
   createRoutableExtension,
 } from '@backstage/core-plugin-api';
 
-export { gitReleaseManagerApiRef };
+import { GitReleaseClient } from './api/GitReleaseClient';
+import { gitReleaseManagerApiRef } from './api/serviceApiRef';
+import { rootRouteRef } from './routes';
+import * as constants from './constants/constants';
+import * as helpers from './helpers';
+import * as components from './components';
+import * as testHelpers from './test-helpers';
+
+export { gitReleaseManagerApiRef, constants, helpers, components, testHelpers };
 
 export const gitReleaseManagerPlugin = createPlugin({
   id: 'git-release-manager',
diff --git a/plugins/git-release-manager/src/test-helpers/index.ts b/plugins/git-release-manager/src/test-helpers/index.ts
new file mode 100644
index 0000000000..2a91928321
--- /dev/null
+++ b/plugins/git-release-manager/src/test-helpers/index.ts
@@ -0,0 +1,21 @@
+/*
+ * Copyright 2021 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import * as stats from './stats';
+import * as testHelpers from './test-helpers';
+import * as testIds from './test-ids';
+
+export { stats, testHelpers, testIds };
diff --git a/plugins/git-release-manager/src/test-helpers/mock-api-client.ts b/plugins/git-release-manager/src/test-helpers/mock-api-client.ts
new file mode 100644
index 0000000000..b2e39d6f7c
--- /dev/null
+++ b/plugins/git-release-manager/src/test-helpers/mock-api-client.ts
@@ -0,0 +1,178 @@
+/*
+ * Copyright 2021 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { GitReleaseApi } from '../api/GitReleaseClient';
+import {
+  createMockBranch,
+  createMockRecentCommit,
+  createMockRelease,
+  mockDefaultBranch,
+  mockEmail,
+  mockOwner,
+  mockRepo,
+  MOCK_RELEASE_CANDIDATE_TAG_NAME_CALVER,
+} from './test-helpers';
+
+export const mockApiClient: GitReleaseApi = {
+  getHost: jest.fn(() => 'github.com'),
+
+  getRepoPath: jest.fn(() => `${mockOwner}/${mockRepo}`),
+
+  getOwners: jest.fn(async () => ({
+    owners: [mockOwner, `${mockOwner}2`],
+  })),
+
+  getRepositories: jest.fn(async () => ({
+    repositories: [mockRepo, `${mockRepo}2`],
+  })),
+
+  getUser: jest.fn(async () => ({
+    user: {
+      username: mockOwner,
+      email: mockEmail,
+    },
+  })),
+
+  getRecentCommits: jest.fn(async () => ({
+    recentCommits: [
+      createMockRecentCommit({ sha: 'mock_sha_recent_commits_1' }),
+      createMockRecentCommit({ sha: 'mock_sha_recent_commits_2' }),
+    ],
+  })),
+
+  getLatestRelease: jest.fn(async () => ({
+    latestRelease: createMockRelease(),
+  })),
+
+  getRepository: jest.fn(async () => ({
+    repository: {
+      pushPermissions: true,
+      defaultBranch: mockDefaultBranch,
+      name: mockRepo,
+    },
+  })),
+
+  getCommit: jest.fn(async () => ({
+    commit: {
+      sha: 'latestCommit.sha',
+      htmlUrl: 'https://latestCommit.html_url',
+      commit: {
+        message: 'latestCommit.commit.message',
+      },
+      createdAt: '2021-01-01T10:11:12Z',
+    },
+  })),
+
+  getBranch: jest.fn(async () => ({
+    branch: createMockBranch(),
+  })),
+
+  createRef: jest.fn(async () => ({
+    reference: {
+      ref: 'mock_createRef_ref',
+      objectSha: 'mock_createRef_objectSha',
+    },
+  })),
+
+  createRelease: jest.fn(async () => ({
+    release: {
+      name: 'mock_createRelease_name',
+      htmlUrl: 'https://mock_createRelease_html_url',
+      tagName: 'mock_createRelease_tag_name',
+    },
+  })),
+
+  getComparison: jest.fn(async () => ({
+    comparison: {
+      htmlUrl: 'https://mock_compareCommits_html_url',
+      aheadBy: 1,
+    },
+  })),
+
+  createTagObject: jest.fn(async () => ({
+    tagObject: {
+      tagName: 'mock_tag_object_tag',
+      tagSha: 'mock_tag_object_sha',
+    },
+  })),
+
+  createCommit: jest.fn(async () => ({
+    commit: {
+      message: 'mock_commit_message',
+      sha: 'mock_commit_sha',
+    },
+  })),
+
+  updateRef: jest.fn(async () => ({
+    reference: {
+      ref: 'mock_update_ref_ref',
+      object: {
+        sha: 'mock_update_ref_object_sha',
+      },
+    },
+  })),
+
+  merge: jest.fn(async () => ({
+    merge: {
+      htmlUrl: 'https://mock_merge_html_url',
+      commit: {
+        message: 'mock_merge_commit_message',
+        tree: {
+          sha: 'mock_merge_commit_tree_sha',
+        },
+      },
+    },
+  })),
+
+  updateRelease: jest.fn(async () => ({
+    release: {
+      name: 'mock_update_release_name',
+      tagName: 'mock_update_release_tag_name',
+      htmlUrl: 'https://mock_update_release_html_url',
+    },
+  })),
+
+  getAllTags: jest.fn(async () => ({
+    tags: [
+      {
+        tagName: MOCK_RELEASE_CANDIDATE_TAG_NAME_CALVER,
+        tagSha: 'mock_sha',
+        tagType: 'tag' as const,
+      },
+    ],
+  })),
+
+  getAllReleases: jest.fn(async () => ({
+    releases: [
+      {
+        id: 1,
+        name: 'mock_release_name',
+        tagName: 'mock_release_tag_name',
+        createdAt: 'mock_release_published_at',
+        htmlUrl: 'https://mock_release_html_url',
+      },
+    ],
+  })),
+
+  getTag: jest.fn(async () => ({
+    tag: {
+      date: '2021-04-29T12:48:30.120Z',
+      username: 'mock_user_single_tag_name',
+      userEmail: 'mock_user_single_tag_email',
+      objectSha: 'mock_single_tag_object_sha',
+    },
+  })),
+};
diff --git a/plugins/git-release-manager/src/test-helpers/test-helpers.ts b/plugins/git-release-manager/src/test-helpers/test-helpers.ts
index 4f3d1c0b23..a5f0787a09 100644
--- a/plugins/git-release-manager/src/test-helpers/test-helpers.ts
+++ b/plugins/git-release-manager/src/test-helpers/test-helpers.ts
@@ -19,29 +19,28 @@ import {
   GetLatestReleaseResult,
   GetRecentCommitsResultSingle,
   GetTagResult,
-  GitReleaseApi,
   GetCommitResult,
 } from '../api/GitReleaseClient';
 import { CalverTagParts } from '../helpers/tagParts/getCalverTagParts';
 import { Project } from '../contexts/ProjectContext';
 import { getReleaseCandidateGitInfo } from '../helpers/getReleaseCandidateGitInfo';
 
-const mockUsername = 'mock_username';
-const mockEmail = 'mock_email';
-const mockOwner = 'mock_owner';
-const mockRepo = 'mock_repo';
+export const mockUsername = 'mock_username';
+export const mockEmail = 'mock_email';
+export const mockOwner = 'mock_owner';
+export const mockRepo = 'mock_repo';
 
-const A_CALVER_VERSION = '2020.01.01_1';
-const MOCK_RELEASE_NAME_CALVER = `Version ${A_CALVER_VERSION}`;
-const MOCK_RELEASE_BRANCH_NAME_CALVER = `rc/${A_CALVER_VERSION}`;
-const MOCK_RELEASE_CANDIDATE_TAG_NAME_CALVER = `rc-${A_CALVER_VERSION}`;
-const MOCK_RELEASE_VERSION_TAG_NAME_CALVER = `version-${A_CALVER_VERSION}`;
+export const A_CALVER_VERSION = '2020.01.01_1';
+export const MOCK_RELEASE_NAME_CALVER = `Version ${A_CALVER_VERSION}`;
+export const MOCK_RELEASE_BRANCH_NAME_CALVER = `rc/${A_CALVER_VERSION}`;
+export const MOCK_RELEASE_CANDIDATE_TAG_NAME_CALVER = `rc-${A_CALVER_VERSION}`;
+export const MOCK_RELEASE_VERSION_TAG_NAME_CALVER = `version-${A_CALVER_VERSION}`;
 
-const A_SEMVER_VERSION = '1.2.3';
-const MOCK_RELEASE_NAME_SEMVER = `Version ${A_SEMVER_VERSION}`;
-const MOCK_RELEASE_BRANCH_NAME_SEMVER = `rc/${A_SEMVER_VERSION}`;
-const MOCK_RELEASE_CANDIDATE_TAG_NAME_SEMVER = `rc-${A_SEMVER_VERSION}`;
-const MOCK_RELEASE_VERSION_TAG_NAME_SEMVER = `version-${A_SEMVER_VERSION}`;
+export const A_SEMVER_VERSION = '1.2.3';
+export const MOCK_RELEASE_NAME_SEMVER = `Version ${A_SEMVER_VERSION}`;
+export const MOCK_RELEASE_BRANCH_NAME_SEMVER = `rc/${A_SEMVER_VERSION}`;
+export const MOCK_RELEASE_CANDIDATE_TAG_NAME_SEMVER = `rc-${A_SEMVER_VERSION}`;
+export const MOCK_RELEASE_VERSION_TAG_NAME_SEMVER = `version-${A_SEMVER_VERSION}`;
 
 export const createMockTag = (
   overrides: Partial<GetTagResult['tag']>,
@@ -121,7 +120,7 @@ export const mockBumpedTag = 'rc-2020.01.01_1337';
 /**
  * MOCK RELEASE
  */
-const createMockRelease = ({
+export const createMockRelease = ({
   id = 1,
   prerelease = false,
   ...rest
@@ -162,7 +161,7 @@ export const mockReleaseVersionSemver = createMockRelease({
 /**
  * MOCK BRANCH
  */
-const createMockBranch = ({
+export const createMockBranch = ({
   ...rest
 }: Partial<GetBranchResult> = {}): GetBranchResult['branch'] => ({
   name: MOCK_RELEASE_BRANCH_NAME_SEMVER,
@@ -184,7 +183,7 @@ export const mockReleaseBranch = createMockBranch();
 /**
  * MOCK COMMIT
  */
-const createMockRecentCommit = ({
+export const createMockRecentCommit = ({
   ...rest
 }: Partial<GetRecentCommitsResultSingle>): GetRecentCommitsResultSingle => ({
   author: {
@@ -203,157 +202,3 @@ const createMockRecentCommit = ({
 export const mockSelectedPatchCommit = createMockRecentCommit({
   sha: 'mock_sha_selected_patch_commit',
 });
-
-/**
- * MOCK API CLIENT
- */
-export const mockApiClient: GitReleaseApi = {
-  getHost: jest.fn(() => 'github.com'),
-
-  getRepoPath: jest.fn(() => `${mockOwner}/${mockRepo}`),
-
-  getOwners: jest.fn(async () => ({
-    owners: [mockOwner, `${mockOwner}2`],
-  })),
-
-  getRepositories: jest.fn(async () => ({
-    repositories: [mockRepo, `${mockRepo}2`],
-  })),
-
-  getUser: jest.fn(async () => ({
-    user: {
-      username: mockOwner,
-      email: mockEmail,
-    },
-  })),
-
-  getRecentCommits: jest.fn(async () => ({
-    recentCommits: [
-      createMockRecentCommit({ sha: 'mock_sha_recent_commits_1' }),
-      createMockRecentCommit({ sha: 'mock_sha_recent_commits_2' }),
-    ],
-  })),
-
-  getLatestRelease: jest.fn(async () => ({
-    latestRelease: createMockRelease(),
-  })),
-
-  getRepository: jest.fn(async () => ({
-    repository: {
-      pushPermissions: true,
-      defaultBranch: mockDefaultBranch,
-      name: mockRepo,
-    },
-  })),
-
-  getCommit: jest.fn(async () => ({
-    commit: {
-      sha: 'latestCommit.sha',
-      htmlUrl: 'https://latestCommit.html_url',
-      commit: {
-        message: 'latestCommit.commit.message',
-      },
-      createdAt: '2021-01-01T10:11:12Z',
-    },
-  })),
-
-  getBranch: jest.fn(async () => ({
-    branch: createMockBranch(),
-  })),
-
-  createRef: jest.fn(async () => ({
-    reference: {
-      ref: 'mock_createRef_ref',
-      objectSha: 'mock_createRef_objectSha',
-    },
-  })),
-
-  createRelease: jest.fn(async () => ({
-    release: {
-      name: 'mock_createRelease_name',
-      htmlUrl: 'https://mock_createRelease_html_url',
-      tagName: 'mock_createRelease_tag_name',
-    },
-  })),
-
-  getComparison: jest.fn(async () => ({
-    comparison: {
-      htmlUrl: 'https://mock_compareCommits_html_url',
-      aheadBy: 1,
-    },
-  })),
-
-  createTagObject: jest.fn(async () => ({
-    tagObject: {
-      tagName: 'mock_tag_object_tag',
-      tagSha: 'mock_tag_object_sha',
-    },
-  })),
-
-  createCommit: jest.fn(async () => ({
-    commit: {
-      message: 'mock_commit_message',
-      sha: 'mock_commit_sha',
-    },
-  })),
-
-  updateRef: jest.fn(async () => ({
-    reference: {
-      ref: 'mock_update_ref_ref',
-      object: {
-        sha: 'mock_update_ref_object_sha',
-      },
-    },
-  })),
-
-  merge: jest.fn(async () => ({
-    merge: {
-      htmlUrl: 'https://mock_merge_html_url',
-      commit: {
-        message: 'mock_merge_commit_message',
-        tree: {
-          sha: 'mock_merge_commit_tree_sha',
-        },
-      },
-    },
-  })),
-
-  updateRelease: jest.fn(async () => ({
-    release: {
-      name: 'mock_update_release_name',
-      tagName: 'mock_update_release_tag_name',
-      htmlUrl: 'https://mock_update_release_html_url',
-    },
-  })),
-
-  getAllTags: jest.fn(async () => ({
-    tags: [
-      {
-        tagName: MOCK_RELEASE_CANDIDATE_TAG_NAME_CALVER,
-        tagSha: 'mock_sha',
-        tagType: 'tag' as const,
-      },
-    ],
-  })),
-
-  getAllReleases: jest.fn(async () => ({
-    releases: [
-      {
-        id: 1,
-        name: 'mock_release_name',
-        tagName: 'mock_release_tag_name',
-        createdAt: 'mock_release_published_at',
-        htmlUrl: 'https://mock_release_html_url',
-      },
-    ],
-  })),
-
-  getTag: jest.fn(async () => ({
-    tag: {
-      date: '2021-04-29T12:48:30.120Z',
-      username: 'mock_user_single_tag_name',
-      userEmail: 'mock_user_single_tag_email',
-      objectSha: 'mock_single_tag_object_sha',
-    },
-  })),
-};
diff --git a/plugins/git-release-manager/src/types/helpers.ts b/plugins/git-release-manager/src/types/helpers.ts
index b6cadecdf5..17110b7e7c 100644
--- a/plugins/git-release-manager/src/types/helpers.ts
+++ b/plugins/git-release-manager/src/types/helpers.ts
@@ -18,8 +18,7 @@ export type UnboxPromise<T extends Promise<any>> = T extends Promise<infer U>
   ? U
   : never;
 
-export type UnboxReturnedPromise<
-  T extends (...args: any) => Promise<any>
-> = UnboxPromise<ReturnType<T>>;
+export type UnboxReturnedPromise<T extends (...args: any) => Promise<any>> =
+  UnboxPromise<ReturnType<T>>;
 
 export type UnboxArray<T> = T extends (infer U)[] ? U : T;
diff --git a/plugins/git-release-manager/src/types/types.ts b/plugins/git-release-manager/src/types/types.ts
index fd45e55ba2..39418fa9d3 100644
--- a/plugins/git-release-manager/src/types/types.ts
+++ b/plugins/git-release-manager/src/types/types.ts
@@ -14,21 +14,26 @@
  * limitations under the License.
  */
 
-export type ComponentConfig<Args> = {
+import { UseCreateReleaseCandidate } from '../features/CreateReleaseCandidate/hooks/useCreateReleaseCandidate';
+import { UsePatch } from '../features/Patch/hooks/usePatch';
+import { UsePromoteRc } from '../features/PromoteRc/hooks/usePromoteRc';
+
+export type ComponentConfig<OnSuccessArgs> = {
   omit?: boolean;
-  onSuccess?: (args: Args) => Promise<void> | void;
+  onSuccess?: (args: OnSuccessArgs) => Promise<void> | void;
 };
 
-interface CreateRcOnSuccessArgs {
-  gitReleaseUrl: string;
-  gitReleaseName: string | null;
+export interface CreateRcOnSuccessArgs {
+  input: Omit<UseCreateReleaseCandidate, 'onSuccess'>;
   comparisonUrl: string;
-  previousTag?: string;
   createdTag: string;
+  gitReleaseName: string | null;
+  gitReleaseUrl: string;
+  previousTag?: string;
 }
-export type ComponentConfigCreateRc = ComponentConfig<CreateRcOnSuccessArgs>;
 
-interface PromoteRcOnSuccessArgs {
+export interface PromoteRcOnSuccessArgs {
+  input: Omit<UsePromoteRc, 'onSuccess'>;
   gitReleaseUrl: string;
   gitReleaseName: string | null;
   previousTagUrl: string;
@@ -36,9 +41,9 @@ interface PromoteRcOnSuccessArgs {
   updatedTagUrl: string;
   updatedTag: string;
 }
-export type ComponentConfigPromoteRc = ComponentConfig<PromoteRcOnSuccessArgs>;
 
-interface PatchOnSuccessArgs {
+export interface PatchOnSuccessArgs {
+  input: Omit<UsePatch, 'onSuccess'>;
   updatedReleaseUrl: string;
   updatedReleaseName: string | null;
   previousTag: string;
@@ -46,7 +51,6 @@ interface PatchOnSuccessArgs {
   patchCommitUrl: string;
   patchCommitMessage: string;
 }
-export type ComponentConfigPatch = ComponentConfig<PatchOnSuccessArgs>;
 
 export interface ResponseStep {
   message: string | React.ReactNode;
diff --git a/plugins/github-actions/CHANGELOG.md b/plugins/github-actions/CHANGELOG.md
index 96ec437188..9ab64f6344 100644
--- a/plugins/github-actions/CHANGELOG.md
+++ b/plugins/github-actions/CHANGELOG.md
@@ -1,5 +1,59 @@
 # @backstage/plugin-github-actions
 
+## 0.4.17
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@0.4.5
+  - @backstage/integration@0.6.3
+  - @backstage/core-components@0.4.0
+  - @backstage/catalog-model@0.9.1
+
+## 0.4.16
+
+### Patch Changes
+
+- 8bedb75ae: Update Luxon dependency to 2.x
+- Updated dependencies
+  - @backstage/integration@0.6.0
+  - @backstage/core-components@0.3.1
+  - @backstage/core-plugin-api@0.1.6
+  - @backstage/plugin-catalog-react@0.4.2
+
+## 0.4.15
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.3.0
+  - @backstage/core-plugin-api@0.1.5
+  - @backstage/integration@0.5.9
+  - @backstage/plugin-catalog-react@0.4.1
+
+## 0.4.14
+
+### Patch Changes
+
+- 9d40fcb1e: - Bumping `material-ui/core` version to at least `4.12.2` as they made some breaking changes in later versions which broke `Pagination` of the `Table`.
+  - Switching out `material-table` to `@material-table/core` for support for the later versions of `material-ui/core`
+  - This causes a minor API change to `@backstage/core-components` as the interface for `Table` re-exports the `prop` from the underlying `Table` components.
+  - `onChangeRowsPerPage` has been renamed to `onRowsPerPageChange`
+  - `onChangePage` has been renamed to `onPageChange`
+  - Migration guide is here: https://material-table-core.com/docs/breaking-changes
+- Updated dependencies
+  - @backstage/core-components@0.2.0
+  - @backstage/plugin-catalog-react@0.4.0
+  - @backstage/core-plugin-api@0.1.4
+  - @backstage/theme@0.2.9
+
+## 0.4.13
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@0.3.0
+
 ## 0.4.12
 
 ### Patch Changes
diff --git a/plugins/github-actions/api-report.md b/plugins/github-actions/api-report.md
index e9fb9e09dc..22b5d57d45 100644
--- a/plugins/github-actions/api-report.md
+++ b/plugins/github-actions/api-report.md
@@ -14,6 +14,8 @@ import { OAuthApi } from '@backstage/core-plugin-api';
 import { RestEndpointMethodTypes } from '@octokit/rest';
 import { RouteRef } from '@backstage/core-plugin-api';
 
+// Warning: (ae-missing-release-tag) "BuildStatus" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export enum BuildStatus {
   // (undocumented)
@@ -26,11 +28,15 @@ export enum BuildStatus {
   'success' = 0,
 }
 
+// Warning: (ae-missing-release-tag) "EntityGithubActionsContent" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export const EntityGithubActionsContent: (_props: {
   entity?: Entity | undefined;
 }) => JSX.Element;
 
+// Warning: (ae-missing-release-tag) "EntityLatestGithubActionRunCard" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export const EntityLatestGithubActionRunCard: ({
   branch,
@@ -41,6 +47,8 @@ export const EntityLatestGithubActionRunCard: ({
   variant?: InfoCardVariants | undefined;
 }) => JSX.Element;
 
+// Warning: (ae-missing-release-tag) "EntityLatestGithubActionsForBranchCard" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export const EntityLatestGithubActionsForBranchCard: ({
   branch,
@@ -51,6 +59,9 @@ export const EntityLatestGithubActionsForBranchCard: ({
   variant?: InfoCardVariants | undefined;
 }) => JSX.Element;
 
+// Warning: (ae-forgotten-export) The symbol "Props" needs to be exported by the entry point index.d.ts
+// Warning: (ae-missing-release-tag) "EntityRecentGithubActionsRunsCard" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export const EntityRecentGithubActionsRunsCard: ({
   branch,
@@ -59,9 +70,13 @@ export const EntityRecentGithubActionsRunsCard: ({
   variant,
 }: Props) => JSX.Element;
 
+// Warning: (ae-missing-release-tag) "GITHUB_ACTIONS_ANNOTATION" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export const GITHUB_ACTIONS_ANNOTATION = 'github.com/project-slug';
 
+// Warning: (ae-missing-release-tag) "GithubActionsApi" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export type GithubActionsApi = {
   listWorkflowRuns: ({
@@ -150,9 +165,13 @@ export type GithubActionsApi = {
   >;
 };
 
+// Warning: (ae-missing-release-tag) "githubActionsApiRef" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export const githubActionsApiRef: ApiRef<GithubActionsApi>;
 
+// Warning: (ae-missing-release-tag) "GithubActionsClient" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export class GithubActionsClient implements GithubActionsApi {
   constructor(options: { configApi: ConfigApi; githubAuthApi: OAuthApi });
@@ -248,6 +267,8 @@ export class GithubActionsClient implements GithubActionsApi {
   }): Promise<any>;
 }
 
+// Warning: (ae-missing-release-tag) "githubActionsPlugin" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 const githubActionsPlugin: BackstagePlugin<
   {
@@ -258,11 +279,15 @@ const githubActionsPlugin: BackstagePlugin<
 export { githubActionsPlugin };
 export { githubActionsPlugin as plugin };
 
+// Warning: (ae-missing-release-tag) "isGithubActionsAvailable" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 const isGithubActionsAvailable: (entity: Entity) => boolean;
 export { isGithubActionsAvailable };
 export { isGithubActionsAvailable as isPluginApplicableToEntity };
 
+// Warning: (ae-missing-release-tag) "Job" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export type Job = {
   html_url: string;
@@ -275,24 +300,33 @@ export type Job = {
   steps: Step[];
 };
 
+// Warning: (ae-missing-release-tag) "Jobs" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export type Jobs = {
   total_count: number;
   jobs: Job[];
 };
 
+// Warning: (ae-forgotten-export) The symbol "Props" needs to be exported by the entry point index.d.ts
+// Warning: (ae-missing-release-tag) "LatestWorkflowRunCard" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export const LatestWorkflowRunCard: ({
   branch,
   variant,
 }: Props_3) => JSX.Element;
 
+// Warning: (ae-missing-release-tag) "LatestWorkflowsForBranchCard" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export const LatestWorkflowsForBranchCard: ({
   branch,
   variant,
 }: Props_3) => JSX.Element;
 
+// Warning: (ae-missing-release-tag) "RecentWorkflowRunsCard" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export const RecentWorkflowRunsCard: ({
   branch,
@@ -301,9 +335,14 @@ export const RecentWorkflowRunsCard: ({
   variant,
 }: Props) => JSX.Element;
 
+// Warning: (ae-forgotten-export) The symbol "Props" needs to be exported by the entry point index.d.ts
+// Warning: (ae-missing-release-tag) "Router" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export const Router: (_props: Props_2) => JSX.Element;
 
+// Warning: (ae-missing-release-tag) "Step" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export type Step = {
   name: string;
diff --git a/plugins/github-actions/package.json b/plugins/github-actions/package.json
index 11262a91bc..97bbee8913 100644
--- a/plugins/github-actions/package.json
+++ b/plugins/github-actions/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-github-actions",
-  "version": "0.4.12",
+  "version": "0.4.17",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -32,17 +32,17 @@
     "clean": "backstage-cli clean"
   },
   "dependencies": {
-    "@backstage/catalog-model": "^0.9.0",
-    "@backstage/core-components": "^0.1.5",
-    "@backstage/core-plugin-api": "^0.1.3",
-    "@backstage/integration": "^0.5.8",
-    "@backstage/plugin-catalog-react": "^0.2.6",
-    "@backstage/theme": "^0.2.8",
-    "@material-ui/core": "^4.11.0",
+    "@backstage/catalog-model": "^0.9.1",
+    "@backstage/core-components": "^0.4.1",
+    "@backstage/core-plugin-api": "^0.1.7",
+    "@backstage/integration": "^0.6.3",
+    "@backstage/plugin-catalog-react": "^0.4.5",
+    "@backstage/theme": "^0.2.10",
+    "@material-ui/core": "^4.12.2",
     "@material-ui/icons": "^4.9.1",
     "@material-ui/lab": "4.0.0-alpha.45",
     "@octokit/rest": "^18.5.3",
-    "luxon": "^1.27.0",
+    "luxon": "^2.0.2",
     "react": "^16.13.1",
     "react-dom": "^16.13.1",
     "react-lazylog": "^4.5.3",
@@ -51,10 +51,10 @@
     "react-use": "^17.2.4"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.7.3",
-    "@backstage/core-app-api": "^0.1.4",
-    "@backstage/dev-utils": "^0.2.1",
-    "@backstage/test-utils": "^0.1.14",
+    "@backstage/cli": "^0.7.11",
+    "@backstage/core-app-api": "^0.1.12",
+    "@backstage/dev-utils": "^0.2.9",
+    "@backstage/test-utils": "^0.1.17",
     "@testing-library/jest-dom": "^5.10.1",
     "@testing-library/react": "^11.2.5",
     "@testing-library/user-event": "^13.1.8",
diff --git a/plugins/github-actions/src/components/WorkflowRunsTable/WorkflowRunsTable.tsx b/plugins/github-actions/src/components/WorkflowRunsTable/WorkflowRunsTable.tsx
index 34191bd307..51f26bf5d7 100644
--- a/plugins/github-actions/src/components/WorkflowRunsTable/WorkflowRunsTable.tsx
+++ b/plugins/github-actions/src/components/WorkflowRunsTable/WorkflowRunsTable.tsx
@@ -130,8 +130,8 @@ export const WorkflowRunsTableView = ({
         },
       ]}
       data={runs ?? []}
-      onChangePage={onChangePage}
-      onChangeRowsPerPage={onChangePageSize}
+      onPageChange={onChangePage}
+      onRowsPerPageChange={onChangePageSize}
       style={{ width: '100%' }}
       title={
         <Box display="flex" alignItems="center">
@@ -159,15 +159,13 @@ export const WorkflowRunsTable = ({
     config.getOptionalConfigArray('integrations.github') ?? [],
   )[0].host;
   const [owner, repo] = (projectName ?? '/').split('/');
-  const [
-    { runs, ...tableProps },
-    { retry, setPage, setPageSize },
-  ] = useWorkflowRuns({
-    hostname,
-    owner,
-    repo,
-    branch,
-  });
+  const [{ runs, ...tableProps }, { retry, setPage, setPageSize }] =
+    useWorkflowRuns({
+      hostname,
+      owner,
+      repo,
+      branch,
+    });
 
   const githubHost = hostname || 'github.com';
 
diff --git a/plugins/github-actions/src/components/useWorkflowRuns.ts b/plugins/github-actions/src/components/useWorkflowRuns.ts
index 4610db07e9..eb343601bd 100644
--- a/plugins/github-actions/src/components/useWorkflowRuns.ts
+++ b/plugins/github-actions/src/components/useWorkflowRuns.ts
@@ -57,9 +57,12 @@ export function useWorkflowRuns({
   const [page, setPage] = useState(0);
   const [pageSize, setPageSize] = useState(initialPageSize);
 
-  const { loading, value: runs, retry, error } = useAsyncRetry<
-    WorkflowRun[]
-  >(async () => {
+  const {
+    loading,
+    value: runs,
+    retry,
+    error,
+  } = useAsyncRetry<WorkflowRun[]>(async () => {
     // GitHub API pagination count starts from 1
     const workflowRunsData = await api.listWorkflowRuns({
       hostname,
diff --git a/plugins/github-actions/src/plugin.ts b/plugins/github-actions/src/plugin.ts
index 89333e52d5..6d5b3ce0a6 100644
--- a/plugins/github-actions/src/plugin.ts
+++ b/plugins/github-actions/src/plugin.ts
@@ -56,14 +56,17 @@ export const EntityLatestGithubActionRunCard = githubActionsPlugin.provide(
   }),
 );
 
-export const EntityLatestGithubActionsForBranchCard = githubActionsPlugin.provide(
-  createComponentExtension({
-    component: {
-      lazy: () =>
-        import('./components/Cards').then(m => m.LatestWorkflowsForBranchCard),
-    },
-  }),
-);
+export const EntityLatestGithubActionsForBranchCard =
+  githubActionsPlugin.provide(
+    createComponentExtension({
+      component: {
+        lazy: () =>
+          import('./components/Cards').then(
+            m => m.LatestWorkflowsForBranchCard,
+          ),
+      },
+    }),
+  );
 
 export const EntityRecentGithubActionsRunsCard = githubActionsPlugin.provide(
   createComponentExtension({
diff --git a/plugins/github-deployments/CHANGELOG.md b/plugins/github-deployments/CHANGELOG.md
index 4c525a63dc..a7a47fb396 100644
--- a/plugins/github-deployments/CHANGELOG.md
+++ b/plugins/github-deployments/CHANGELOG.md
@@ -1,5 +1,63 @@
 # @backstage/plugin-github-deployments
 
+## 0.1.15
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@0.4.5
+  - @backstage/integration@0.6.3
+  - @backstage/core-components@0.4.0
+  - @backstage/catalog-model@0.9.1
+  - @backstage/integration-react@0.1.8
+
+## 0.1.14
+
+### Patch Changes
+
+- 8bedb75ae: Update Luxon dependency to 2.x
+- Updated dependencies
+  - @backstage/integration@0.6.0
+  - @backstage/core-components@0.3.1
+  - @backstage/core-plugin-api@0.1.6
+  - @backstage/plugin-catalog-react@0.4.2
+  - @backstage/integration-react@0.1.7
+
+## 0.1.13
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.3.0
+  - @backstage/core-plugin-api@0.1.5
+  - @backstage/integration@0.5.9
+  - @backstage/integration-react@0.1.6
+  - @backstage/plugin-catalog-react@0.4.1
+
+## 0.1.12
+
+### Patch Changes
+
+- 9d40fcb1e: - Bumping `material-ui/core` version to at least `4.12.2` as they made some breaking changes in later versions which broke `Pagination` of the `Table`.
+  - Switching out `material-table` to `@material-table/core` for support for the later versions of `material-ui/core`
+  - This causes a minor API change to `@backstage/core-components` as the interface for `Table` re-exports the `prop` from the underlying `Table` components.
+  - `onChangeRowsPerPage` has been renamed to `onRowsPerPageChange`
+  - `onChangePage` has been renamed to `onPageChange`
+  - Migration guide is here: https://material-table-core.com/docs/breaking-changes
+- Updated dependencies
+  - @backstage/core-components@0.2.0
+  - @backstage/plugin-catalog-react@0.4.0
+  - @backstage/core-plugin-api@0.1.4
+  - @backstage/integration-react@0.1.5
+  - @backstage/theme@0.2.9
+
+## 0.1.11
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@0.3.0
+
 ## 0.1.10
 
 ### Patch Changes
diff --git a/plugins/github-deployments/api-report.md b/plugins/github-deployments/api-report.md
index 3cdf9f0316..fcc5022d7c 100644
--- a/plugins/github-deployments/api-report.md
+++ b/plugins/github-deployments/api-report.md
@@ -9,21 +9,34 @@ import { BackstagePlugin } from '@backstage/core-plugin-api';
 import { Entity } from '@backstage/catalog-model';
 import { TableColumn } from '@backstage/core-components';
 
+// Warning: (ae-forgotten-export) The symbol "GithubDeployment" needs to be exported by the entry point index.d.ts
+// Warning: (ae-missing-release-tag) "createCommitColumn" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 function createCommitColumn(): TableColumn<GithubDeployment>;
 
+// Warning: (ae-missing-release-tag) "createCreatorColumn" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 function createCreatorColumn(): TableColumn<GithubDeployment>;
 
+// Warning: (ae-missing-release-tag) "createEnvironmentColumn" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 function createEnvironmentColumn(): TableColumn<GithubDeployment>;
 
+// Warning: (ae-missing-release-tag) "createLastUpdatedColumn" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 function createLastUpdatedColumn(): TableColumn<GithubDeployment>;
 
+// Warning: (ae-missing-release-tag) "createStatusColumn" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 function createStatusColumn(): TableColumn<GithubDeployment>;
 
+// Warning: (ae-missing-release-tag) "EntityGithubDeploymentsCard" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export const EntityGithubDeploymentsCard: ({
   last,
@@ -35,9 +48,15 @@ export const EntityGithubDeploymentsCard: ({
   columns?: TableColumn<GithubDeployment>[] | undefined;
 }) => JSX.Element;
 
+// Warning: (ae-missing-release-tag) "githubDeploymentsPlugin" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export const githubDeploymentsPlugin: BackstagePlugin<{}, {}>;
 
+// Warning: (ae-forgotten-export) The symbol "GithubDeploymentsTableProps" needs to be exported by the entry point index.d.ts
+// Warning: (ae-missing-release-tag) "GithubDeploymentsTable" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+// Warning: (ae-missing-release-tag) "GithubDeploymentsTable" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export function GithubDeploymentsTable({
   deployments,
@@ -48,15 +67,21 @@ export function GithubDeploymentsTable({
 
 // @public (undocumented)
 export namespace GithubDeploymentsTable {
-  var // (undocumented)
+  var // Warning: (ae-forgotten-export) The symbol "columnFactories" needs to be exported by the entry point index.d.ts
+    //
+    // (undocumented)
     columns: typeof columnFactories;
   var // (undocumented)
     defaultDeploymentColumns: TableColumn<GithubDeployment>[];
 }
 
+// Warning: (ae-missing-release-tag) "GithubStateIndicator" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 const GithubStateIndicator: ({ state }: { state: string }) => JSX.Element;
 
+// Warning: (ae-missing-release-tag) "isGithubDeploymentsAvailable" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export const isGithubDeploymentsAvailable: (entity: Entity) => boolean;
 
diff --git a/plugins/github-deployments/package.json b/plugins/github-deployments/package.json
index 754f1d73bc..f5439d9bc6 100644
--- a/plugins/github-deployments/package.json
+++ b/plugins/github-deployments/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-github-deployments",
-  "version": "0.1.10",
+  "version": "0.1.15",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -20,28 +20,28 @@
     "clean": "backstage-cli clean"
   },
   "dependencies": {
-    "@backstage/catalog-model": "^0.9.0",
-    "@backstage/core-components": "^0.1.5",
-    "@backstage/core-plugin-api": "^0.1.3",
+    "@backstage/catalog-model": "^0.9.1",
+    "@backstage/core-components": "^0.4.1",
+    "@backstage/core-plugin-api": "^0.1.7",
     "@backstage/errors": "^0.1.1",
-    "@backstage/integration": "^0.5.8",
-    "@backstage/integration-react": "^0.1.4",
-    "@backstage/plugin-catalog-react": "^0.2.6",
-    "@backstage/theme": "^0.2.8",
-    "@material-ui/core": "^4.11.0",
+    "@backstage/integration": "^0.6.3",
+    "@backstage/integration-react": "^0.1.8",
+    "@backstage/plugin-catalog-react": "^0.4.5",
+    "@backstage/theme": "^0.2.10",
+    "@material-ui/core": "^4.12.2",
     "@material-ui/icons": "^4.9.1",
     "@material-ui/lab": "4.0.0-alpha.45",
     "@octokit/graphql": "^4.5.8",
-    "luxon": "^1.26.0",
+    "luxon": "^2.0.2",
     "react": "^16.13.1",
     "react-dom": "^16.13.1",
     "react-use": "^17.2.4"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.7.3",
-    "@backstage/core-app-api": "^0.1.4",
-    "@backstage/dev-utils": "^0.2.1",
-    "@backstage/test-utils": "^0.1.14",
+    "@backstage/cli": "^0.7.11",
+    "@backstage/core-app-api": "^0.1.12",
+    "@backstage/dev-utils": "^0.2.9",
+    "@backstage/test-utils": "^0.1.17",
     "@testing-library/jest-dom": "^5.10.1",
     "@testing-library/react": "^11.2.5",
     "@testing-library/user-event": "^13.1.8",
diff --git a/plugins/github-deployments/src/components/GithubDeploymentsCard.test.tsx b/plugins/github-deployments/src/components/GithubDeploymentsCard.test.tsx
index 474b4a5941..4c1b7854c6 100644
--- a/plugins/github-deployments/src/components/GithubDeploymentsCard.test.tsx
+++ b/plugins/github-deployments/src/components/GithubDeploymentsCard.test.tsx
@@ -311,7 +311,7 @@ describe('github-deployments', () => {
 
         expect(
           await rendered.findByText(
-            'Warning: No apiBaseUrl available for host my-github-3.com, please check your integrations config',
+            'Error: No apiBaseUrl available for host my-github-3.com, please check your integrations config',
           ),
         ).toBeInTheDocument();
       });
@@ -336,7 +336,7 @@ describe('github-deployments', () => {
 
         expect(
           await rendered.findByText(
-            'Warning: No matching GitHub integration configuration for host my-github-unknown.com, please check your integrations config',
+            'Error: No matching GitHub integration configuration for host my-github-unknown.com, please check your integrations config',
           ),
         ).toBeInTheDocument();
       });
diff --git a/plugins/github-deployments/src/components/GithubDeploymentsCard.tsx b/plugins/github-deployments/src/components/GithubDeploymentsCard.tsx
index 19cc9ac6e8..c01cd98a45 100644
--- a/plugins/github-deployments/src/components/GithubDeploymentsCard.tsx
+++ b/plugins/github-deployments/src/components/GithubDeploymentsCard.tsx
@@ -50,7 +50,12 @@ const GithubDeploymentsComponent = ({
   const api = useApi(githubDeploymentsApiRef);
   const [owner, repo] = projectSlug.split('/');
 
-  const { loading, value, error, retry: reload } = useAsyncRetry(
+  const {
+    loading,
+    value,
+    error,
+    retry: reload,
+  } = useAsyncRetry(
     async () =>
       await api.listDeployments({
         host,
diff --git a/plugins/gitops-profiles/CHANGELOG.md b/plugins/gitops-profiles/CHANGELOG.md
index 83cea3c807..d49360ccba 100644
--- a/plugins/gitops-profiles/CHANGELOG.md
+++ b/plugins/gitops-profiles/CHANGELOG.md
@@ -1,5 +1,35 @@
 # @backstage/plugin-gitops-profiles
 
+## 0.3.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.4.0
+
+## 0.3.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.3.0
+  - @backstage/core-plugin-api@0.1.5
+
+## 0.3.1
+
+### Patch Changes
+
+- 9d40fcb1e: - Bumping `material-ui/core` version to at least `4.12.2` as they made some breaking changes in later versions which broke `Pagination` of the `Table`.
+  - Switching out `material-table` to `@material-table/core` for support for the later versions of `material-ui/core`
+  - This causes a minor API change to `@backstage/core-components` as the interface for `Table` re-exports the `prop` from the underlying `Table` components.
+  - `onChangeRowsPerPage` has been renamed to `onRowsPerPageChange`
+  - `onChangePage` has been renamed to `onPageChange`
+  - Migration guide is here: https://material-table-core.com/docs/breaking-changes
+- Updated dependencies
+  - @backstage/core-components@0.2.0
+  - @backstage/core-plugin-api@0.1.4
+  - @backstage/theme@0.2.9
+
 ## 0.3.0
 
 ### Minor Changes
diff --git a/plugins/gitops-profiles/api-report.md b/plugins/gitops-profiles/api-report.md
index f38f660c77..aacdaff966 100644
--- a/plugins/gitops-profiles/api-report.md
+++ b/plugins/gitops-profiles/api-report.md
@@ -9,6 +9,8 @@ import { ApiRef } from '@backstage/core-plugin-api';
 import { BackstagePlugin } from '@backstage/core-plugin-api';
 import { RouteRef } from '@backstage/core-plugin-api';
 
+// Warning: (ae-missing-release-tag) "ApplyProfileRequest" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export interface ApplyProfileRequest {
   // (undocumented)
@@ -23,6 +25,8 @@ export interface ApplyProfileRequest {
   targetRepo: string;
 }
 
+// Warning: (ae-missing-release-tag) "ChangeClusterStateRequest" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export interface ChangeClusterStateRequest {
   // (undocumented)
@@ -37,6 +41,8 @@ export interface ChangeClusterStateRequest {
   targetRepo: string;
 }
 
+// Warning: (ae-missing-release-tag) "CloneFromTemplateRequest" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export interface CloneFromTemplateRequest {
   // (undocumented)
@@ -56,6 +62,8 @@ export interface CloneFromTemplateRequest {
   templateRepository: string;
 }
 
+// Warning: (ae-missing-release-tag) "ClusterStatus" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export interface ClusterStatus {
   // (undocumented)
@@ -70,6 +78,8 @@ export interface ClusterStatus {
   status: string;
 }
 
+// Warning: (ae-missing-release-tag) "FetchError" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export class FetchError extends Error {
   // (undocumented)
@@ -78,18 +88,24 @@ export class FetchError extends Error {
   get name(): string;
 }
 
+// Warning: (ae-missing-release-tag) "GithubUserInfoRequest" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export interface GithubUserInfoRequest {
   // (undocumented)
   accessToken: string;
 }
 
+// Warning: (ae-missing-release-tag) "GithubUserInfoResponse" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export interface GithubUserInfoResponse {
   // (undocumented)
   login: string;
 }
 
+// Warning: (ae-missing-release-tag) "GitOpsApi" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export type GitOpsApi = {
   url: string;
@@ -101,18 +117,28 @@ export type GitOpsApi = {
   fetchUserInfo(req: GithubUserInfoRequest): Promise<GithubUserInfoResponse>;
 };
 
+// Warning: (ae-missing-release-tag) "gitOpsApiRef" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export const gitOpsApiRef: ApiRef<GitOpsApi>;
 
+// Warning: (ae-missing-release-tag) "GitopsProfilesClusterListPage" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export const GitopsProfilesClusterListPage: () => JSX.Element;
 
+// Warning: (ae-missing-release-tag) "GitopsProfilesClusterPage" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export const GitopsProfilesClusterPage: () => JSX.Element;
 
+// Warning: (ae-missing-release-tag) "GitopsProfilesCreatePage" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export const GitopsProfilesCreatePage: () => JSX.Element;
 
+// Warning: (ae-missing-release-tag) "gitopsProfilesPlugin" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 const gitopsProfilesPlugin: BackstagePlugin<
   {
@@ -128,6 +154,8 @@ const gitopsProfilesPlugin: BackstagePlugin<
 export { gitopsProfilesPlugin };
 export { gitopsProfilesPlugin as plugin };
 
+// Warning: (ae-missing-release-tag) "GitOpsRestApi" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export class GitOpsRestApi implements GitOpsApi {
   constructor(url?: string);
@@ -147,6 +175,8 @@ export class GitOpsRestApi implements GitOpsApi {
   url: string;
 }
 
+// Warning: (ae-missing-release-tag) "ListClusterRequest" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export interface ListClusterRequest {
   // (undocumented)
@@ -155,12 +185,16 @@ export interface ListClusterRequest {
   gitHubUser: string;
 }
 
+// Warning: (ae-missing-release-tag) "ListClusterStatusesResponse" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export interface ListClusterStatusesResponse {
   // (undocumented)
   result: ClusterStatus[];
 }
 
+// Warning: (ae-missing-release-tag) "PollLogRequest" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export interface PollLogRequest {
   // (undocumented)
@@ -173,6 +207,8 @@ export interface PollLogRequest {
   targetRepo: string;
 }
 
+// Warning: (ae-missing-release-tag) "Status" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export interface Status {
   // (undocumented)
@@ -183,6 +219,8 @@ export interface Status {
   status: string;
 }
 
+// Warning: (ae-missing-release-tag) "StatusResponse" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export interface StatusResponse {
   // (undocumented)
diff --git a/plugins/gitops-profiles/package.json b/plugins/gitops-profiles/package.json
index f9d029b6d6..cec185dadc 100644
--- a/plugins/gitops-profiles/package.json
+++ b/plugins/gitops-profiles/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-gitops-profiles",
-  "version": "0.3.0",
+  "version": "0.3.3",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -31,10 +31,10 @@
     "clean": "backstage-cli clean"
   },
   "dependencies": {
-    "@backstage/core-components": "^0.1.5",
-    "@backstage/core-plugin-api": "^0.1.3",
-    "@backstage/theme": "^0.2.8",
-    "@material-ui/core": "^4.11.0",
+    "@backstage/core-components": "^0.4.1",
+    "@backstage/core-plugin-api": "^0.1.7",
+    "@backstage/theme": "^0.2.10",
+    "@material-ui/core": "^4.12.2",
     "@material-ui/icons": "^4.9.1",
     "@material-ui/lab": "4.0.0-alpha.45",
     "react": "^16.13.1",
@@ -43,10 +43,10 @@
     "react-use": "^17.2.4"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.7.3",
-    "@backstage/core-app-api": "^0.1.4",
-    "@backstage/dev-utils": "^0.2.1",
-    "@backstage/test-utils": "^0.1.14",
+    "@backstage/cli": "^0.7.11",
+    "@backstage/core-app-api": "^0.1.12",
+    "@backstage/dev-utils": "^0.2.9",
+    "@backstage/test-utils": "^0.1.17",
     "@testing-library/jest-dom": "^5.10.1",
     "@testing-library/react": "^11.2.5",
     "@testing-library/user-event": "^13.1.8",
diff --git a/plugins/graphiql/CHANGELOG.md b/plugins/graphiql/CHANGELOG.md
index cfbc2de00a..edc39a63eb 100644
--- a/plugins/graphiql/CHANGELOG.md
+++ b/plugins/graphiql/CHANGELOG.md
@@ -1,5 +1,35 @@
 # @backstage/plugin-graphiql
 
+## 0.2.15
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.4.0
+
+## 0.2.14
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.3.0
+  - @backstage/core-plugin-api@0.1.5
+
+## 0.2.13
+
+### Patch Changes
+
+- 9d40fcb1e: - Bumping `material-ui/core` version to at least `4.12.2` as they made some breaking changes in later versions which broke `Pagination` of the `Table`.
+  - Switching out `material-table` to `@material-table/core` for support for the later versions of `material-ui/core`
+  - This causes a minor API change to `@backstage/core-components` as the interface for `Table` re-exports the `prop` from the underlying `Table` components.
+  - `onChangeRowsPerPage` has been renamed to `onRowsPerPageChange`
+  - `onChangePage` has been renamed to `onPageChange`
+  - Migration guide is here: https://material-table-core.com/docs/breaking-changes
+- Updated dependencies
+  - @backstage/core-components@0.2.0
+  - @backstage/core-plugin-api@0.1.4
+  - @backstage/theme@0.2.9
+
 ## 0.2.12
 
 ### Patch Changes
diff --git a/plugins/graphiql/api-report.md b/plugins/graphiql/api-report.md
index 673f508e03..110d3b315d 100644
--- a/plugins/graphiql/api-report.md
+++ b/plugins/graphiql/api-report.md
@@ -12,6 +12,8 @@ import { IconComponent } from '@backstage/core-plugin-api';
 import { OAuthApi } from '@backstage/core-plugin-api';
 import { RouteRef } from '@backstage/core-plugin-api';
 
+// Warning: (ae-missing-release-tag) "EndpointConfig" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export type EndpointConfig = {
   id: string;
@@ -23,6 +25,8 @@ export type EndpointConfig = {
   };
 };
 
+// Warning: (ae-missing-release-tag) "GithubEndpointConfig" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export type GithubEndpointConfig = {
   id: string;
@@ -32,28 +36,42 @@ export type GithubEndpointConfig = {
   githubAuthApi: OAuthApi;
 };
 
+// Warning: (ae-missing-release-tag) "GraphiQLIcon" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export const GraphiQLIcon: IconComponent;
 
+// Warning: (ae-missing-release-tag) "GraphiQLPage" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export const GraphiQLPage: () => JSX.Element;
 
+// Warning: (ae-missing-release-tag) "graphiqlPlugin" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 const graphiqlPlugin: BackstagePlugin<{}, {}>;
 export { graphiqlPlugin };
 export { graphiqlPlugin as plugin };
 
+// Warning: (ae-missing-release-tag) "graphiQLRouteRef" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export const graphiQLRouteRef: RouteRef<undefined>;
 
+// Warning: (ae-missing-release-tag) "GraphQLBrowseApi" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export type GraphQLBrowseApi = {
   getEndpoints(): Promise<GraphQLEndpoint[]>;
 };
 
+// Warning: (ae-missing-release-tag) "graphQlBrowseApiRef" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export const graphQlBrowseApiRef: ApiRef<GraphQLBrowseApi>;
 
+// Warning: (ae-missing-release-tag) "GraphQLEndpoint" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export type GraphQLEndpoint = {
   id: string;
@@ -61,6 +79,8 @@ export type GraphQLEndpoint = {
   fetcher: (body: any) => Promise<any>;
 };
 
+// Warning: (ae-missing-release-tag) "GraphQLEndpoints" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export class GraphQLEndpoints implements GraphQLBrowseApi {
   // (undocumented)
@@ -72,6 +92,8 @@ export class GraphQLEndpoints implements GraphQLBrowseApi {
   static github(config: GithubEndpointConfig): GraphQLEndpoint;
 }
 
+// Warning: (ae-missing-release-tag) "GraphiQLPage" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export const Router: () => JSX.Element;
 
diff --git a/plugins/graphiql/package.json b/plugins/graphiql/package.json
index 22eab92ba4..302c0361a7 100644
--- a/plugins/graphiql/package.json
+++ b/plugins/graphiql/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@backstage/plugin-graphiql",
   "description": "Backstage plugin for browsing GraphQL APIs",
-  "version": "0.2.12",
+  "version": "0.2.15",
   "private": false,
   "publishConfig": {
     "access": "public",
@@ -31,10 +31,10 @@
     "clean": "backstage-cli clean"
   },
   "dependencies": {
-    "@backstage/core-components": "^0.1.5",
-    "@backstage/core-plugin-api": "^0.1.3",
-    "@backstage/theme": "^0.2.8",
-    "@material-ui/core": "^4.11.0",
+    "@backstage/core-components": "^0.4.1",
+    "@backstage/core-plugin-api": "^0.1.7",
+    "@backstage/theme": "^0.2.10",
+    "@material-ui/core": "^4.12.2",
     "@material-ui/icons": "^4.9.1",
     "@material-ui/lab": "4.0.0-alpha.45",
     "graphiql": "^1.0.0-alpha.10",
@@ -44,10 +44,10 @@
     "react-use": "^17.2.4"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.7.3",
-    "@backstage/core-app-api": "^0.1.4",
-    "@backstage/dev-utils": "^0.2.1",
-    "@backstage/test-utils": "^0.1.14",
+    "@backstage/cli": "^0.7.11",
+    "@backstage/core-app-api": "^0.1.12",
+    "@backstage/dev-utils": "^0.2.9",
+    "@backstage/test-utils": "^0.1.17",
     "@testing-library/jest-dom": "^5.10.1",
     "@testing-library/react": "^11.2.5",
     "@testing-library/user-event": "^13.1.8",
diff --git a/plugins/graphiql/src/index.ts b/plugins/graphiql/src/index.ts
index 8efb4461d7..e4d8a32a05 100644
--- a/plugins/graphiql/src/index.ts
+++ b/plugins/graphiql/src/index.ts
@@ -25,4 +25,5 @@ export {
 export { GraphiQLPage as Router } from './components';
 export * from './lib/api';
 export * from './route-refs';
-export const GraphiQLIcon: IconComponent = GraphiQLIconComponent as IconComponent;
+export const GraphiQLIcon: IconComponent =
+  GraphiQLIconComponent as IconComponent;
diff --git a/plugins/graphiql/src/lib/storage/StorageBucket.test.ts b/plugins/graphiql/src/lib/storage/StorageBucket.test.ts
index 16c5df0f8a..efc196727d 100644
--- a/plugins/graphiql/src/lib/storage/StorageBucket.test.ts
+++ b/plugins/graphiql/src/lib/storage/StorageBucket.test.ts
@@ -42,7 +42,7 @@ describe('StorageBucket', () => {
       removeItem: jest.fn(),
     };
     const bucket = StorageBucket.forStorage(
-      (mockStorage as unknown) as Storage,
+      mockStorage as unknown as Storage,
       'my-bucket',
     );
 
diff --git a/plugins/graphql/CHANGELOG.md b/plugins/graphql/CHANGELOG.md
index 2604a15230..b268a7d9be 100644
--- a/plugins/graphql/CHANGELOG.md
+++ b/plugins/graphql/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @backstage/plugin-graphql-backend
 
+## 0.1.9
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.9.0
+  - @backstage/config@0.1.8
+  - @backstage/plugin-catalog-graphql@0.2.12
+
 ## 0.1.8
 
 ### Patch Changes
diff --git a/plugins/graphql/api-report.md b/plugins/graphql/api-report.md
index c50312ddf6..c09feb7bcc 100644
--- a/plugins/graphql/api-report.md
+++ b/plugins/graphql/api-report.md
@@ -7,9 +7,13 @@ import { Config } from '@backstage/config';
 import express from 'express';
 import { Logger as Logger_2 } from 'winston';
 
+// Warning: (ae-missing-release-tag) "createRouter" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export function createRouter(options: RouterOptions): Promise<express.Router>;
 
+// Warning: (ae-missing-release-tag) "RouterOptions" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export interface RouterOptions {
   // (undocumented)
diff --git a/plugins/graphql/package.json b/plugins/graphql/package.json
index d0d2eac259..a03610f097 100644
--- a/plugins/graphql/package.json
+++ b/plugins/graphql/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-graphql-backend",
-  "version": "0.1.8",
+  "version": "0.1.9",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -29,9 +29,9 @@
     "clean": "backstage-cli clean"
   },
   "dependencies": {
-    "@backstage/backend-common": "^0.8.2",
-    "@backstage/config": "^0.1.5",
-    "@backstage/plugin-catalog-graphql": "^0.2.9",
+    "@backstage/backend-common": "^0.9.0",
+    "@backstage/config": "^0.1.8",
+    "@backstage/plugin-catalog-graphql": "^0.2.12",
     "@graphql-modules/core": "^0.7.17",
     "@types/express": "^4.17.6",
     "apollo-server": "^2.16.1",
diff --git a/plugins/home/.eslintrc.js b/plugins/home/.eslintrc.js
new file mode 100644
index 0000000000..13573efa9c
--- /dev/null
+++ b/plugins/home/.eslintrc.js
@@ -0,0 +1,3 @@
+module.exports = {
+  extends: [require.resolve('@backstage/cli/config/eslint')],
+};
diff --git a/plugins/home/CHANGELOG.md b/plugins/home/CHANGELOG.md
new file mode 100644
index 0000000000..0092442f02
--- /dev/null
+++ b/plugins/home/CHANGELOG.md
@@ -0,0 +1,37 @@
+# @backstage/plugin-home
+
+## 0.3.0
+
+### Minor Changes
+
+- 7f00902d9: Rename RandomJokeHomePageComponent to HomePageRandomJoke to fit convention, and update example app accordingly.
+  **NOTE**: If you're using the RandomJoke component in your instance, it now has to be renamed to `HomePageRandomJoke`
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.4.1
+  - @backstage/core-plugin-api@0.1.7
+
+## 0.2.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.4.0
+
+## 0.2.0
+
+### Minor Changes
+
+- 2b7d3455b: Create the `Home` plugin which exports some basic functionality that's used to compose a homepage. An example of a composed homepage is added to the example app.
+
+  This change also introduces the `createCardExtension` which creates a lazy loaded card that is intended to be used for homepage components.
+
+  Adoption of this homepage requires setup similar to what can be found in the example app.
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.3.2
+  - @backstage/theme@0.2.10
diff --git a/plugins/home/README.md b/plugins/home/README.md
new file mode 100644
index 0000000000..a09c85775b
--- /dev/null
+++ b/plugins/home/README.md
@@ -0,0 +1,95 @@
+# Home
+
+Development is ongoing. You can follow the progress and contribute at the Backstage [Home Project Board](https://github.com/backstage/backstage/projects/7) or reach out to us in the [`#support` Discord channel](https://discord.com/channels/687207715902193673/687235481154617364).
+
+## Overview
+
+The Home plugin introduces a system for composing a Home Page for Backstage in order to surface relevant info and provide convenient shortcuts for common tasks. It's designed with composability in mind with an open ecosystem that allows anyone to contribute with any component, to be included in any Home Page.
+
+For App Integrators, the system is designed to be composable to give total freedom in designing a Home Page that suits the needs of the organization. From the perspective of a Component Developer who wishes to contribute with building blocks to be included in Home Pages, there's a convenient interface for bundling the different parts and exporting them with both error boundary and lazy loading handled under the surface.
+
+## Getting started
+
+If you have a standalone app (you didn't clone this repo), then do
+
+```bash
+# From the Backstage repository root
+cd packages/app
+yarn add @backstage/plugin-home
+```
+
+### Setting up the Home Page
+
+1. Create a Home Page Component that will be used for composition.
+
+`packages/app/src/components/home/HomePage.tsx`
+
+```tsx
+import React from 'react';
+
+export const HomePage = () => {
+  return {
+    /* TODO: Compose a Home Page here */
+  };
+};
+```
+
+2. Add a route where the homepage will live, presumably `/`.
+
+`packages/app/src/App.tsx`
+
+```tsx
+import { HomepageCompositionRoot } from '@backstage/plugin-home';
+import { HomePage } from './components/home/HomePage';
+
+// ...
+<Route path="/" element={<HomepageCompositionRoot />}>
+  <HomePage />
+</Route>;
+// ...
+```
+
+### Creating Components
+
+The Home Page can be composed with regular React components, so there's no magic in creating components to be used for composition 🪄 🎩 . However, in order to assure that your component fits into a diverse set of Home Pages, there's an extension creator for this purpose, that creates a Card-based layout, for consistency between components (read more about extensions [here](https://backstage.io/docs/plugins/composability#extensions)). The extension creator requires two fields: `title` and `components`. The `components` field is expected to be an asynchronous import that should at least contain a `Content` field. Additionally, you can optionally provide `settings`, `actions` and `contextProvider` as well. These parts will be combined to create a card, where the `content`, `actions` and `settings` will be wrapped within the `contextProvider` in order to be able to access to context and effectively communicate with one another.
+
+Finally, the `createCardExtension` also accepts a generic, such that Component Developers can indicate to App Integrators what custom props their component will accept, such as the example below where the default category of the random jokes can be set.
+
+```tsx
+export const RandomJokeHomePageComponent = homePlugin.provide(
+  createCardExtension<{ defaultCategory?: 'programming' | 'any' }>({
+    title: 'Random Joke',
+    components: () => import('./homePageComponents/RandomJoke'),
+  }),
+);
+```
+
+In summary: it is not necessary to use the `createCardExtension` extension creator to register a home page component, although it is convenient since it provides error boundary and lazy loading, and it also may hook into other functionality in the future.
+
+### Composing a Home Page
+
+Composing a Home Page is no different from creating a regular React Component, i.e. the App Integrator is free to include whatever content they like. However, there are components developed with the Home Page in mind, as described in the previous section. If created by the `createCardExtension` extension creator, they are rendered like so
+
+```tsx
+import React from 'react'
+import Grid from '@material-ui/core/Grid'
+import { RandomJokeHomePageComponent } from '@backstage/plugin-home';
+
+export const HomePage = () => {
+  return (
+    <Grid container spacing={3}>
+      <Grid item xs={12} md={4}>
+        <RandomJokeHomePageComponent>
+      </Grid>
+    </Grid>
+  )
+}
+```
+
+Additionally, the App Integrator is provided an escape hatch in case the way the card is rendered does not fit their requirements. They may optionally pass the `Renderer`-prop, which will receive the `title`, `content` and optionally `actions`, `settings` and `contextProvider`, if they exist for the component. This allows the App Integrator to render the content in any way they want.
+
+## Contributing
+
+We believe that people have great ideas for what makes a useful Home Page, and we want to make it easy for every to benefit from the effort you put in to create something cool for the Home Page. Therefore, a great way of contributing is by simply creating more Home Page Components, than can then be used by everyone when composing their own Home Page. If they are tightly coupled to an existing plugin, it is recommended to allow them to live within that plugin, for convenience and to limit complex dependencies. On the other hand, if there's no clear plugin that the component is based on, it's also fine to contribute them into the [home plugin](/plugins/home/src/homePageComponents)
+
+Additionally, the API is at a very early state, so contributing with additional use cases may expose weaknesses in the current solution that we may iterate on, to provide more flexibility and ease of use for those who wish to develop components for the Home Page.
diff --git a/plugins/home/api-report.md b/plugins/home/api-report.md
new file mode 100644
index 0000000000..66b6e55306
--- /dev/null
+++ b/plugins/home/api-report.md
@@ -0,0 +1,130 @@
+## API Report File for "@backstage/plugin-home"
+
+> Do not edit this file. It is a report generated by [API Extractor](https://api-extractor.com/).
+
+```ts
+/// <reference types="react" />
+
+import { BackstagePlugin } from '@backstage/core-plugin-api';
+import { Extension } from '@backstage/core-plugin-api';
+import { ReactNode } from 'react';
+import { RouteRef } from '@backstage/core-plugin-api';
+
+// Warning: (ae-missing-release-tag) "ComponentAccordion" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
+// @public (undocumented)
+export const ComponentAccordion: ({
+  title,
+  Content,
+  Actions,
+  Settings,
+  ContextProvider,
+  ...childProps
+}: {
+  title: string;
+  Content: () => JSX.Element;
+  Actions?: (() => JSX.Element) | undefined;
+  Settings?: (() => JSX.Element) | undefined;
+  ContextProvider?: ((props: any) => JSX.Element) | undefined;
+}) => JSX.Element;
+
+// Warning: (ae-missing-release-tag) "ComponentTab" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
+// @public (undocumented)
+export const ComponentTab: ({
+  title,
+  Content,
+  ContextProvider,
+  ...childProps
+}: {
+  title: string;
+  Content: () => JSX.Element;
+  ContextProvider?: ((props: any) => JSX.Element) | undefined;
+}) => JSX.Element;
+
+// Warning: (ae-missing-release-tag) "ComponentTabs" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
+// @public (undocumented)
+export const ComponentTabs: ({
+  title,
+  tabs,
+}: {
+  title: string;
+  tabs: {
+    label: string;
+    Component: () => JSX.Element;
+  }[];
+}) => JSX.Element;
+
+// Warning: (ae-forgotten-export) The symbol "ComponentRenderer" needs to be exported by the entry point index.d.ts
+// Warning: (ae-missing-release-tag) "createCardExtension" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
+// @public (undocumented)
+export function createCardExtension<T>({
+  title,
+  components,
+}: {
+  title: string;
+  components: () => Promise<ComponentParts>;
+}): Extension<
+  ({
+    Renderer,
+    title: overrideTitle,
+    ...childProps
+  }: ComponentRenderer & {
+    title?: string;
+  } & T) => JSX.Element
+>;
+
+// Warning: (ae-missing-release-tag) "HomepageCompositionRoot" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
+// @public (undocumented)
+export const HomepageCompositionRoot: (props: {
+  title?: string | undefined;
+  children?: ReactNode;
+}) => JSX.Element;
+
+// Warning: (ae-missing-release-tag) "HomePageRandomJoke" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
+// @public (undocumented)
+export const HomePageRandomJoke: ({
+  Renderer,
+  title: overrideTitle,
+  ...childProps
+}: ComponentRenderer & {
+  title?: string | undefined;
+} & {
+  defaultCategory?: 'any' | 'programming' | undefined;
+}) => JSX.Element;
+
+// Warning: (ae-missing-release-tag) "homePlugin" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
+// @public (undocumented)
+export const homePlugin: BackstagePlugin<
+  {
+    root: RouteRef<undefined>;
+  },
+  {}
+>;
+
+// Warning: (ae-missing-release-tag) "SettingsModal" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
+// @public (undocumented)
+export const SettingsModal: ({
+  open,
+  close,
+  componentName,
+  children,
+}: {
+  open: boolean;
+  close: Function;
+  componentName: string;
+  children: JSX.Element;
+}) => JSX.Element;
+
+// Warnings were encountered during analysis:
+//
+// src/extensions.d.ts:16:5 - (ae-forgotten-export) The symbol "ComponentParts" needs to be exported by the entry point index.d.ts
+
+// (No @packageDocumentation comment for this package)
+```
diff --git a/plugins/home/dev/index.tsx b/plugins/home/dev/index.tsx
new file mode 100644
index 0000000000..802203e9f4
--- /dev/null
+++ b/plugins/home/dev/index.tsx
@@ -0,0 +1,27 @@
+/*
+ * Copyright 2021 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import React from 'react';
+import { createDevApp } from '@backstage/dev-utils';
+import { homePlugin, HomepageCompositionRoot } from '../src/plugin';
+
+createDevApp()
+  .registerPlugin(homePlugin)
+  .addPage({
+    element: <HomepageCompositionRoot />,
+    title: 'Root Page',
+    path: '/',
+  })
+  .render();
diff --git a/plugins/register-component/package.json b/plugins/home/package.json
similarity index 57%
rename from plugins/register-component/package.json
rename to plugins/home/package.json
index 5996b865fd..aaf8993d23 100644
--- a/plugins/register-component/package.json
+++ b/plugins/home/package.json
@@ -1,24 +1,14 @@
 {
-  "name": "@backstage/plugin-register-component",
-  "version": "0.2.19",
+  "name": "@backstage/plugin-home",
+  "version": "0.3.0",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
-  "private": false,
   "publishConfig": {
     "access": "public",
     "main": "dist/index.esm.js",
     "types": "dist/index.d.ts"
   },
-  "homepage": "https://backstage.io",
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/backstage/backstage",
-    "directory": "plugins/register-component"
-  },
-  "keywords": [
-    "backstage"
-  ],
   "scripts": {
     "build": "backstage-cli plugin:build",
     "start": "backstage-cli plugin:serve",
@@ -30,26 +20,23 @@
     "clean": "backstage-cli clean"
   },
   "dependencies": {
-    "@backstage/catalog-model": "^0.9.0",
-    "@backstage/core-components": "^0.1.5",
-    "@backstage/core-plugin-api": "^0.1.3",
-    "@backstage/plugin-catalog-react": "^0.2.6",
-    "@backstage/theme": "^0.2.8",
-    "@material-ui/core": "^4.11.0",
+    "@backstage/core-components": "^0.4.1",
+    "@backstage/core-plugin-api": "^0.1.7",
+    "@backstage/theme": "^0.2.10",
+    "@material-ui/core": "^4.12.2",
     "@material-ui/icons": "^4.9.1",
     "@material-ui/lab": "4.0.0-alpha.45",
+    "@types/react": "*",
     "react": "^16.13.1",
     "react-dom": "^16.13.1",
-    "react-hook-form": "^6.15.4",
     "react-router": "6.0.0-beta.0",
-    "react-router-dom": "6.0.0-beta.0",
     "react-use": "^17.2.4"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.7.3",
-    "@backstage/core-app-api": "^0.1.4",
-    "@backstage/dev-utils": "^0.2.1",
-    "@backstage/test-utils": "^0.1.14",
+    "@backstage/cli": "^0.7.11",
+    "@backstage/core-app-api": "^0.1.12",
+    "@backstage/dev-utils": "^0.2.9",
+    "@backstage/test-utils": "^0.1.17",
     "@testing-library/jest-dom": "^5.10.1",
     "@testing-library/react": "^11.2.5",
     "@testing-library/user-event": "^13.1.8",
diff --git a/plugins/home/src/componentRenderers/ComponentAccordion.tsx b/plugins/home/src/componentRenderers/ComponentAccordion.tsx
new file mode 100644
index 0000000000..5cf54d7a0c
--- /dev/null
+++ b/plugins/home/src/componentRenderers/ComponentAccordion.tsx
@@ -0,0 +1,102 @@
+/*
+ * Copyright 2021 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import React from 'react';
+import {
+  Accordion,
+  AccordionDetails,
+  AccordionSummary,
+  Typography,
+  IconButton,
+  Theme,
+} from '@material-ui/core';
+import { makeStyles } from '@material-ui/core/styles';
+import ExpandMoreIcon from '@material-ui/icons/ExpandMore';
+import SettingsIcon from '@material-ui/icons/Settings';
+
+import { SettingsModal } from '../components';
+
+const useStyles = makeStyles((theme: Theme) => ({
+  settingsIconButton: {
+    padding: theme.spacing(0, 1, 0, 0),
+  },
+}));
+
+export const ComponentAccordion = ({
+  title,
+  Content,
+  Actions,
+  Settings,
+  ContextProvider,
+  ...childProps
+}: {
+  title: string;
+  Content: () => JSX.Element;
+  Actions?: () => JSX.Element;
+  Settings?: () => JSX.Element;
+  ContextProvider?: (props: any) => JSX.Element;
+}) => {
+  const classes = useStyles();
+  const [settingsIsExpanded, setSettingsIsExpanded] = React.useState(false);
+  const [isExpanded, setIsExpanded] = React.useState(false);
+
+  const handleOpenSettings = (e: any) => {
+    e.stopPropagation();
+    setSettingsIsExpanded(prevState => !prevState);
+  };
+
+  const innerContent = (
+    <>
+      {Settings && (
+        <SettingsModal
+          open={settingsIsExpanded}
+          close={() => setSettingsIsExpanded(false)}
+          componentName={title}
+        >
+          <Settings />
+        </SettingsModal>
+      )}
+      <Accordion
+        expanded={isExpanded}
+        onChange={(_e: any, expanded: boolean) => setIsExpanded(expanded)}
+      >
+        <AccordionSummary expandIcon={<ExpandMoreIcon />}>
+          {Settings && (
+            <IconButton
+              onClick={handleOpenSettings}
+              className={classes.settingsIconButton}
+            >
+              <SettingsIcon />
+            </IconButton>
+          )}
+          <Typography>{title}</Typography>
+        </AccordionSummary>
+        <AccordionDetails>
+          <div>
+            <Content />
+            {Actions && <Actions />}
+          </div>
+        </AccordionDetails>
+      </Accordion>
+    </>
+  );
+
+  return ContextProvider ? (
+    <ContextProvider {...childProps}>{innerContent}</ContextProvider>
+  ) : (
+    innerContent
+  );
+};
diff --git a/plugins/home/src/componentRenderers/ComponentTabs/ComponentTab.tsx b/plugins/home/src/componentRenderers/ComponentTabs/ComponentTab.tsx
new file mode 100644
index 0000000000..2b3e4e746c
--- /dev/null
+++ b/plugins/home/src/componentRenderers/ComponentTabs/ComponentTab.tsx
@@ -0,0 +1,36 @@
+/*
+ * Copyright 2021 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import React from 'react';
+
+export const ComponentTab = ({
+  title,
+  Content,
+  ContextProvider,
+  ...childProps
+}: {
+  title: string;
+  Content: () => JSX.Element;
+  ContextProvider?: (props: any) => JSX.Element;
+}) => {
+  return ContextProvider ? (
+    <ContextProvider {...childProps}>
+      <Content />
+    </ContextProvider>
+  ) : (
+    <Content />
+  );
+};
diff --git a/plugins/home/src/componentRenderers/ComponentTabs/ComponentTabs.tsx b/plugins/home/src/componentRenderers/ComponentTabs/ComponentTabs.tsx
new file mode 100644
index 0000000000..f404a80980
--- /dev/null
+++ b/plugins/home/src/componentRenderers/ComponentTabs/ComponentTabs.tsx
@@ -0,0 +1,53 @@
+/*
+ * Copyright 2021 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import React from 'react';
+import { Tabs, Tab } from '@material-ui/core';
+import { InfoCard } from '@backstage/core-components';
+
+type TabType = {
+  label: string;
+  Component: () => JSX.Element;
+};
+
+export const ComponentTabs = ({
+  title,
+  tabs,
+}: {
+  title: string;
+  tabs: TabType[];
+}) => {
+  const [value, setValue] = React.useState(0);
+
+  const handleChange = (_event: any, newValue: number) => {
+    setValue(newValue);
+  };
+
+  return (
+    <InfoCard title={title}>
+      <Tabs value={value} onChange={handleChange}>
+        {tabs.map(t => (
+          <Tab key={t.label} label={t.label} />
+        ))}
+      </Tabs>
+      {tabs.map(({ Component }, idx) => (
+        <div {...(idx === value ? { style: { display: 'none' } } : {})}>
+          <Component />
+        </div>
+      ))}
+    </InfoCard>
+  );
+};
diff --git a/plugins/home/src/componentRenderers/ComponentTabs/index.ts b/plugins/home/src/componentRenderers/ComponentTabs/index.ts
new file mode 100644
index 0000000000..672d6e8385
--- /dev/null
+++ b/plugins/home/src/componentRenderers/ComponentTabs/index.ts
@@ -0,0 +1,18 @@
+/*
+ * Copyright 2021 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+export { ComponentTabs } from './ComponentTabs';
+export { ComponentTab } from './ComponentTab';
diff --git a/plugins/home/src/componentRenderers/index.ts b/plugins/home/src/componentRenderers/index.ts
new file mode 100644
index 0000000000..5c5d3a457a
--- /dev/null
+++ b/plugins/home/src/componentRenderers/index.ts
@@ -0,0 +1,18 @@
+/*
+ * Copyright 2021 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+export { ComponentAccordion } from './ComponentAccordion';
+export { ComponentTabs, ComponentTab } from './ComponentTabs';
diff --git a/plugins/home/src/components/HomepageCompositionRoot.tsx b/plugins/home/src/components/HomepageCompositionRoot.tsx
new file mode 100644
index 0000000000..f2c5ad0e8b
--- /dev/null
+++ b/plugins/home/src/components/HomepageCompositionRoot.tsx
@@ -0,0 +1,27 @@
+/*
+ * Copyright 2021 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import React, { ReactNode } from 'react';
+import { useOutlet } from 'react-router';
+
+export const HomepageCompositionRoot = (props: {
+  title?: string;
+  children?: ReactNode;
+}) => {
+  const outlet = useOutlet();
+  const children = props.children ?? outlet;
+  return <>{children}</>;
+};
diff --git a/plugins/home/src/components/SettingsModal.tsx b/plugins/home/src/components/SettingsModal.tsx
new file mode 100644
index 0000000000..25566bccdf
--- /dev/null
+++ b/plugins/home/src/components/SettingsModal.tsx
@@ -0,0 +1,48 @@
+/*
+ * Copyright 2021 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import React from 'react';
+import {
+  Button,
+  Dialog,
+  DialogActions,
+  DialogContent,
+  DialogTitle,
+} from '@material-ui/core';
+
+export const SettingsModal = ({
+  open,
+  close,
+  componentName,
+  children,
+}: {
+  open: boolean;
+  close: Function;
+  componentName: string;
+  children: JSX.Element;
+}) => {
+  return (
+    <Dialog open={open} onClose={() => close()}>
+      <DialogTitle>Settings - {componentName}</DialogTitle>
+      <DialogContent>{children}</DialogContent>
+      <DialogActions>
+        <Button onClick={() => close()} color="primary" variant="contained">
+          Close
+        </Button>
+      </DialogActions>
+    </Dialog>
+  );
+};
diff --git a/plugins/register-component/src/index.ts b/plugins/home/src/components/index.ts
similarity index 78%
rename from plugins/register-component/src/index.ts
rename to plugins/home/src/components/index.ts
index 309893679e..aae0cbe26d 100644
--- a/plugins/register-component/src/index.ts
+++ b/plugins/home/src/components/index.ts
@@ -14,9 +14,5 @@
  * limitations under the License.
  */
 
-export {
-  registerComponentPlugin,
-  registerComponentPlugin as plugin,
-  RegisterComponentPage,
-} from './plugin';
-export { Router } from './components/Router';
+export { HomepageCompositionRoot } from './HomepageCompositionRoot';
+export { SettingsModal } from './SettingsModal';
diff --git a/plugins/home/src/extensions.tsx b/plugins/home/src/extensions.tsx
new file mode 100644
index 0000000000..93fe4ceb4f
--- /dev/null
+++ b/plugins/home/src/extensions.tsx
@@ -0,0 +1,123 @@
+/*
+ * Copyright 2021 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import React, { Suspense } from 'react';
+import { IconButton } from '@material-ui/core';
+import SettingsIcon from '@material-ui/icons/Settings';
+import { InfoCard } from '@backstage/core-components';
+import { SettingsModal } from './components';
+import { createReactExtension, useApp } from '@backstage/core-plugin-api';
+
+export type ComponentRenderer = {
+  Renderer?: (props: RendererProps) => JSX.Element;
+};
+
+type ComponentParts = {
+  Content: () => JSX.Element;
+  Actions?: () => JSX.Element;
+  Settings?: () => JSX.Element;
+  ContextProvider?: (props: any) => JSX.Element;
+};
+
+type RendererProps = { title: string } & ComponentParts;
+
+export function createCardExtension<T>({
+  title,
+  components,
+}: {
+  title: string;
+  components: () => Promise<ComponentParts>;
+}) {
+  return createReactExtension({
+    component: {
+      lazy: () =>
+        components().then(({ Content, Actions, Settings, ContextProvider }) => {
+          const CardExtension = ({
+            Renderer,
+            title: overrideTitle,
+            ...childProps
+          }: ComponentRenderer & { title?: string } & T) => {
+            const app = useApp();
+            const { Progress } = app.getComponents();
+            const [settingsOpen, setSettingsOpen] = React.useState(false);
+
+            if (Renderer) {
+              return (
+                <Suspense fallback={<Progress />}>
+                  <Renderer
+                    title={overrideTitle || title}
+                    {...{
+                      Content,
+                      ...(Actions ? { Actions } : {}),
+                      ...(Settings ? { Settings } : {}),
+                      ...(ContextProvider ? { ContextProvider } : {}),
+                      ...childProps,
+                    }}
+                  />
+                </Suspense>
+              );
+            }
+
+            const cardProps = {
+              title: overrideTitle ?? title,
+              ...(Settings
+                ? {
+                    action: (
+                      <IconButton onClick={() => setSettingsOpen(true)}>
+                        <SettingsIcon>Settings</SettingsIcon>
+                      </IconButton>
+                    ),
+                  }
+                : {}),
+              ...(Actions
+                ? {
+                    actions: <Actions />,
+                  }
+                : {}),
+            };
+
+            const innerContent = (
+              <InfoCard {...cardProps}>
+                {Settings && (
+                  <SettingsModal
+                    open={settingsOpen}
+                    componentName={title}
+                    close={() => setSettingsOpen(false)}
+                  >
+                    <Settings />
+                  </SettingsModal>
+                )}
+                <Content />
+              </InfoCard>
+            );
+
+            return (
+              <Suspense fallback={<Progress />}>
+                {ContextProvider ? (
+                  <ContextProvider {...childProps}>
+                    {innerContent}
+                  </ContextProvider>
+                ) : (
+                  innerContent
+                )}
+              </Suspense>
+            );
+          };
+          return CardExtension;
+        }),
+    },
+  });
+}
diff --git a/plugins/register-component/src/util/validate.ts b/plugins/home/src/homePageComponents/RandomJoke/Actions.tsx
similarity index 61%
rename from plugins/register-component/src/util/validate.ts
rename to plugins/home/src/homePageComponents/RandomJoke/Actions.tsx
index 0b3a6f6940..cebb0400ab 100644
--- a/plugins/register-component/src/util/validate.ts
+++ b/plugins/home/src/homePageComponents/RandomJoke/Actions.tsx
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 The Backstage Authors
+ * Copyright 2021 The Backstage Authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,11 +14,16 @@
  * limitations under the License.
  */
 
-export const ComponentIdValidators = {
-  httpsValidator: (value: any) =>
-    (typeof value === 'string' && value.match(/^https:\/\//) !== null) ||
-    'Must start with https://.',
-  yamlValidator: (value: any) =>
-    (typeof value === 'string' && value.match(/\.yaml/) !== null) ||
-    "Must contain '.yaml'.",
+import React from 'react';
+
+import { Button } from '@material-ui/core';
+import { useRandomJoke } from './Context';
+
+export const Actions = () => {
+  const { rerollJoke } = useRandomJoke();
+  return (
+    <Button variant="contained" color="primary" onClick={() => rerollJoke()}>
+      Reroll
+    </Button>
+  );
 };
diff --git a/plugins/home/src/homePageComponents/RandomJoke/Content.tsx b/plugins/home/src/homePageComponents/RandomJoke/Content.tsx
new file mode 100644
index 0000000000..231e32356a
--- /dev/null
+++ b/plugins/home/src/homePageComponents/RandomJoke/Content.tsx
@@ -0,0 +1,31 @@
+/*
+ * Copyright 2021 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import React from 'react';
+import { useRandomJoke } from './Context';
+
+export const Content = () => {
+  const { joke, loading } = useRandomJoke();
+
+  if (loading) return <p>Loading...</p>;
+
+  return (
+    <div>
+      <p>{joke.setup}</p>
+      <p>{joke.punchline}</p>
+    </div>
+  );
+};
diff --git a/plugins/home/src/homePageComponents/RandomJoke/Context.tsx b/plugins/home/src/homePageComponents/RandomJoke/Context.tsx
new file mode 100644
index 0000000000..5c2790d8a5
--- /dev/null
+++ b/plugins/home/src/homePageComponents/RandomJoke/Context.tsx
@@ -0,0 +1,99 @@
+/*
+ * Copyright 2021 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import React, { createContext } from 'react';
+
+export type JokeType = 'any' | 'programming';
+
+type Joke = {
+  setup: string;
+  punchline: string;
+};
+
+type RandomJokeContextValue = {
+  loading: boolean;
+  joke: Joke;
+  type: JokeType;
+  rerollJoke: Function;
+  handleChangeType: Function;
+};
+
+const Context = createContext<RandomJokeContextValue | undefined>(undefined);
+
+const getNewJoke = (type: string): Promise<Joke> =>
+  fetch(
+    `https://official-joke-api.appspot.com/jokes${
+      type !== 'any' ? `/${type}` : ''
+    }/random`,
+  )
+    .then(res => res.json())
+    .then(data => (Array.isArray(data) ? data[0] : data));
+
+export const ContextProvider = ({
+  children,
+  defaultCategory,
+}: {
+  children: JSX.Element;
+  defaultCategory?: JokeType;
+}) => {
+  const [loading, setLoading] = React.useState(true);
+  const [joke, setJoke] = React.useState<Joke>({
+    setup: '',
+    punchline: '',
+  });
+  const [type, setType] = React.useState<JokeType>(
+    defaultCategory || ('programming' as JokeType),
+  );
+
+  const rerollJoke = React.useCallback(() => {
+    setLoading(true);
+    getNewJoke(type).then(newJoke => setJoke(newJoke));
+  }, [type]);
+
+  const handleChangeType = (newType: JokeType) => {
+    setType(newType);
+  };
+
+  React.useEffect(() => {
+    setLoading(false);
+  }, [joke]);
+
+  React.useEffect(() => {
+    rerollJoke();
+  }, [rerollJoke]);
+
+  const value: RandomJokeContextValue = {
+    loading,
+    joke,
+    type,
+    rerollJoke,
+    handleChangeType,
+  };
+
+  return <Context.Provider value={value}>{children}</Context.Provider>;
+};
+
+export const useRandomJoke = () => {
+  const value = React.useContext(Context);
+
+  if (value === undefined) {
+    throw new Error('useRandomJoke must be used within a RandomJokeProvider');
+  }
+
+  return value;
+};
+
+export default Context;
diff --git a/plugins/home/src/homePageComponents/RandomJoke/Settings.tsx b/plugins/home/src/homePageComponents/RandomJoke/Settings.tsx
new file mode 100644
index 0000000000..ee5de69dc6
--- /dev/null
+++ b/plugins/home/src/homePageComponents/RandomJoke/Settings.tsx
@@ -0,0 +1,48 @@
+/*
+ * Copyright 2021 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import {
+  FormControl,
+  FormLabel,
+  RadioGroup,
+  FormControlLabel,
+  Radio,
+} from '@material-ui/core';
+import React from 'react';
+import { useRandomJoke, JokeType } from './Context';
+
+export const Settings = () => {
+  const { type, handleChangeType } = useRandomJoke();
+  const JOKE_TYPES: JokeType[] = ['any' as JokeType, 'programming' as JokeType];
+  return (
+    <FormControl component="fieldset">
+      <FormLabel component="legend">Joke Type</FormLabel>
+      <RadioGroup
+        aria-label="joke type"
+        value={type}
+        onChange={e => handleChangeType(e.target.value)}
+      >
+        {JOKE_TYPES.map(t => (
+          <FormControlLabel
+            key={t}
+            value={t}
+            control={<Radio />}
+            label={`${t.slice(0, 1).toUpperCase()}${t.slice(1)}`}
+          />
+        ))}
+      </RadioGroup>
+    </FormControl>
+  );
+};
diff --git a/plugins/home/src/homePageComponents/RandomJoke/index.ts b/plugins/home/src/homePageComponents/RandomJoke/index.ts
new file mode 100644
index 0000000000..aafbc17a2e
--- /dev/null
+++ b/plugins/home/src/homePageComponents/RandomJoke/index.ts
@@ -0,0 +1,20 @@
+/*
+ * Copyright 2021 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+export { Actions } from './Actions';
+export { Content } from './Content';
+export { Settings } from './Settings';
+export { ContextProvider } from './Context';
diff --git a/plugins/home/src/index.ts b/plugins/home/src/index.ts
new file mode 100644
index 0000000000..0c7cc2c09f
--- /dev/null
+++ b/plugins/home/src/index.ts
@@ -0,0 +1,26 @@
+/*
+ * Copyright 2021 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+export {
+  homePlugin,
+  HomepageCompositionRoot,
+  HomePageRandomJoke,
+  ComponentAccordion,
+  ComponentTabs,
+  ComponentTab,
+} from './plugin';
+export { SettingsModal } from './components';
+export { createCardExtension } from './extensions';
diff --git a/plugins/home/src/plugin.test.ts b/plugins/home/src/plugin.test.ts
new file mode 100644
index 0000000000..920a9076f4
--- /dev/null
+++ b/plugins/home/src/plugin.test.ts
@@ -0,0 +1,22 @@
+/*
+ * Copyright 2021 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import { homePlugin } from './plugin';
+
+describe('home', () => {
+  it('should export plugin', () => {
+    expect(homePlugin).toBeDefined();
+  });
+});
diff --git a/plugins/home/src/plugin.ts b/plugins/home/src/plugin.ts
new file mode 100644
index 0000000000..46df84c1bf
--- /dev/null
+++ b/plugins/home/src/plugin.ts
@@ -0,0 +1,68 @@
+/*
+ * Copyright 2021 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import {
+  createComponentExtension,
+  createPlugin,
+  createRoutableExtension,
+} from '@backstage/core-plugin-api';
+import { createCardExtension } from './extensions';
+
+import { rootRouteRef } from './routes';
+
+export const homePlugin = createPlugin({
+  id: 'home',
+  routes: {
+    root: rootRouteRef,
+  },
+});
+
+export const HomepageCompositionRoot = homePlugin.provide(
+  createRoutableExtension({
+    component: () =>
+      import('./components').then(m => m.HomepageCompositionRoot),
+    mountPoint: rootRouteRef,
+  }),
+);
+
+export const ComponentAccordion = homePlugin.provide(
+  createComponentExtension({
+    component: {
+      lazy: () =>
+        import('./componentRenderers').then(m => m.ComponentAccordion),
+    },
+  }),
+);
+export const ComponentTabs = homePlugin.provide(
+  createComponentExtension({
+    component: {
+      lazy: () => import('./componentRenderers').then(m => m.ComponentTabs),
+    },
+  }),
+);
+export const ComponentTab = homePlugin.provide(
+  createComponentExtension({
+    component: {
+      lazy: () => import('./componentRenderers').then(m => m.ComponentTab),
+    },
+  }),
+);
+
+export const HomePageRandomJoke = homePlugin.provide(
+  createCardExtension<{ defaultCategory?: 'any' | 'programming' }>({
+    title: 'Random Joke',
+    components: () => import('./homePageComponents/RandomJoke'),
+  }),
+);
diff --git a/plugins/home/src/routes.ts b/plugins/home/src/routes.ts
new file mode 100644
index 0000000000..2c641d8433
--- /dev/null
+++ b/plugins/home/src/routes.ts
@@ -0,0 +1,20 @@
+/*
+ * Copyright 2021 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import { createRouteRef } from '@backstage/core-plugin-api';
+
+export const rootRouteRef = createRouteRef({
+  title: 'home',
+});
diff --git a/plugins/home/src/setupTests.ts b/plugins/home/src/setupTests.ts
new file mode 100644
index 0000000000..fc6dbd98f8
--- /dev/null
+++ b/plugins/home/src/setupTests.ts
@@ -0,0 +1,17 @@
+/*
+ * Copyright 2021 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import '@testing-library/jest-dom';
+import 'cross-fetch/polyfill';
diff --git a/plugins/ilert/CHANGELOG.md b/plugins/ilert/CHANGELOG.md
index 9521e1dfc4..b04017849b 100644
--- a/plugins/ilert/CHANGELOG.md
+++ b/plugins/ilert/CHANGELOG.md
@@ -1,5 +1,56 @@
 # @backstage/plugin-ilert
 
+## 0.1.10
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@0.4.5
+  - @backstage/core-components@0.4.0
+  - @backstage/catalog-model@0.9.1
+
+## 0.1.9
+
+### Patch Changes
+
+- 8bedb75ae: Update Luxon dependency to 2.x
+- Updated dependencies
+  - @backstage/core-components@0.3.1
+  - @backstage/core-plugin-api@0.1.6
+  - @backstage/plugin-catalog-react@0.4.2
+
+## 0.1.8
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.3.0
+  - @backstage/core-plugin-api@0.1.5
+  - @backstage/plugin-catalog-react@0.4.1
+
+## 0.1.7
+
+### Patch Changes
+
+- 9d40fcb1e: - Bumping `material-ui/core` version to at least `4.12.2` as they made some breaking changes in later versions which broke `Pagination` of the `Table`.
+  - Switching out `material-table` to `@material-table/core` for support for the later versions of `material-ui/core`
+  - This causes a minor API change to `@backstage/core-components` as the interface for `Table` re-exports the `prop` from the underlying `Table` components.
+  - `onChangeRowsPerPage` has been renamed to `onRowsPerPageChange`
+  - `onChangePage` has been renamed to `onPageChange`
+  - Migration guide is here: https://material-table-core.com/docs/breaking-changes
+- Updated dependencies
+  - @backstage/core-components@0.2.0
+  - @backstage/plugin-catalog-react@0.4.0
+  - @backstage/core-plugin-api@0.1.4
+  - @backstage/theme@0.2.9
+
+## 0.1.6
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@0.3.0
+
 ## 0.1.5
 
 ### Patch Changes
diff --git a/plugins/ilert/api-report.md b/plugins/ilert/api-report.md
index 94a3657e04..3c6965b2c4 100644
--- a/plugins/ilert/api-report.md
+++ b/plugins/ilert/api-report.md
@@ -13,14 +13,20 @@ import { Entity } from '@backstage/catalog-model';
 import { IconComponent } from '@backstage/core-plugin-api';
 import { RouteRef } from '@backstage/core-plugin-api';
 
+// Warning: (ae-missing-release-tag) "EntityILertCard" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export const EntityILertCard: () => JSX.Element;
 
+// Warning: (ae-missing-release-tag) "GetIncidentsCountOpts" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export type GetIncidentsCountOpts = {
   states?: IncidentStatus[];
 };
 
+// Warning: (ae-missing-release-tag) "GetIncidentsOpts" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export type GetIncidentsOpts = {
   maxResults?: number;
@@ -29,6 +35,8 @@ export type GetIncidentsOpts = {
   alertSources?: number[];
 };
 
+// Warning: (ae-missing-release-tag) "ILertApi" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export interface ILertApi {
   // (undocumented)
@@ -43,6 +51,8 @@ export interface ILertApi {
     incident: Incident,
     responder: IncidentResponder,
   ): Promise<Incident>;
+  // Warning: (ae-forgotten-export) The symbol "EventRequest" needs to be exported by the entry point index.d.ts
+  //
   // (undocumented)
   createIncident(eventRequest: EventRequest): Promise<boolean>;
   // (undocumented)
@@ -51,30 +61,48 @@ export interface ILertApi {
   enableAlertSource(alertSource: AlertSource): Promise<AlertSource>;
   // (undocumented)
   fetchAlertSource(idOrIntegrationKey: number | string): Promise<AlertSource>;
+  // Warning: (ae-forgotten-export) The symbol "OnCall" needs to be exported by the entry point index.d.ts
+  //
   // (undocumented)
   fetchAlertSourceOnCalls(alertSource: AlertSource): Promise<OnCall[]>;
+  // Warning: (ae-forgotten-export) The symbol "AlertSource" needs to be exported by the entry point index.d.ts
+  //
   // (undocumented)
   fetchAlertSources(): Promise<AlertSource[]>;
   // (undocumented)
   fetchIncident(id: number): Promise<Incident>;
+  // Warning: (ae-forgotten-export) The symbol "IncidentAction" needs to be exported by the entry point index.d.ts
+  //
   // (undocumented)
   fetchIncidentActions(incident: Incident): Promise<IncidentAction[]>;
+  // Warning: (ae-forgotten-export) The symbol "IncidentResponder" needs to be exported by the entry point index.d.ts
+  //
   // (undocumented)
   fetchIncidentResponders(incident: Incident): Promise<IncidentResponder[]>;
+  // Warning: (ae-forgotten-export) The symbol "Incident" needs to be exported by the entry point index.d.ts
+  //
   // (undocumented)
   fetchIncidents(opts?: GetIncidentsOpts): Promise<Incident[]>;
   // (undocumented)
   fetchIncidentsCount(opts?: GetIncidentsCountOpts): Promise<number>;
+  // Warning: (ae-forgotten-export) The symbol "Schedule" needs to be exported by the entry point index.d.ts
+  //
   // (undocumented)
   fetchOnCallSchedules(): Promise<Schedule[]>;
   // (undocumented)
   fetchUptimeMonitor(id: number): Promise<UptimeMonitor>;
+  // Warning: (ae-forgotten-export) The symbol "UptimeMonitor" needs to be exported by the entry point index.d.ts
+  //
   // (undocumented)
   fetchUptimeMonitors(): Promise<UptimeMonitor[]>;
+  // Warning: (ae-forgotten-export) The symbol "User" needs to be exported by the entry point index.d.ts
+  //
   // (undocumented)
   fetchUsers(): Promise<User[]>;
   // (undocumented)
   getAlertSourceDetailsURL(alertSource: AlertSource | null): string;
+  // Warning: (ae-forgotten-export) The symbol "EscalationPolicy" needs to be exported by the entry point index.d.ts
+  //
   // (undocumented)
   getEscalationPolicyDetailsURL(escalationPolicy: EscalationPolicy): string;
   // (undocumented)
@@ -107,14 +135,21 @@ export interface ILertApi {
   ): Promise<void>;
 }
 
+// Warning: (ae-missing-release-tag) "ilertApiRef" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export const ilertApiRef: ApiRef<ILertApi>;
 
+// Warning: (ae-missing-release-tag) "ILertCard" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export const ILertCard: () => JSX.Element;
 
+// Warning: (ae-missing-release-tag) "ILertClient" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export class ILertClient implements ILertApi {
+  // Warning: (ae-forgotten-export) The symbol "Options" needs to be exported by the entry point index.d.ts
   constructor(opts: Options);
   // (undocumented)
   acceptIncident(incident: Incident, userName: string): Promise<Incident>;
@@ -197,12 +232,18 @@ export class ILertClient implements ILertApi {
   ): Promise<void>;
 }
 
+// Warning: (ae-missing-release-tag) "ILertIcon" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export const ILertIcon: IconComponent;
 
+// Warning: (ae-missing-release-tag) "ILertPage" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export const ILertPage: () => JSX.Element;
 
+// Warning: (ae-missing-release-tag) "ilertPlugin" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 const ilertPlugin: BackstagePlugin<
   {
@@ -213,22 +254,34 @@ const ilertPlugin: BackstagePlugin<
 export { ilertPlugin };
 export { ilertPlugin as plugin };
 
+// Warning: (ae-missing-release-tag) "iLertRouteRef" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export const iLertRouteRef: RouteRef<undefined>;
 
+// Warning: (ae-missing-release-tag) "isPluginApplicableToEntity" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 const isPluginApplicableToEntity: (entity: Entity) => boolean;
 export { isPluginApplicableToEntity as isILertAvailable };
 export { isPluginApplicableToEntity };
 
+// Warning: (ae-missing-release-tag) "ILertPage" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export const Router: () => JSX.Element;
 
+// Warning: (ae-missing-release-tag) "TableState" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export type TableState = {
   page: number;
   pageSize: number;
 };
 
+// Warnings were encountered during analysis:
+//
+// src/api/types.d.ts:14:5 - (ae-forgotten-export) The symbol "IncidentStatus" needs to be exported by the entry point index.d.ts
+
 // (No @packageDocumentation comment for this package)
 ```
diff --git a/plugins/ilert/package.json b/plugins/ilert/package.json
index e40f6ae310..689a4ec957 100644
--- a/plugins/ilert/package.json
+++ b/plugins/ilert/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-ilert",
-  "version": "0.1.5",
+  "version": "0.1.10",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -20,28 +20,28 @@
     "clean": "backstage-cli clean"
   },
   "dependencies": {
-    "@backstage/catalog-model": "^0.9.0",
-    "@backstage/core-components": "^0.1.5",
-    "@backstage/core-plugin-api": "^0.1.3",
+    "@backstage/catalog-model": "^0.9.1",
+    "@backstage/core-components": "^0.4.1",
+    "@backstage/core-plugin-api": "^0.1.7",
     "@backstage/errors": "^0.1.1",
-    "@backstage/plugin-catalog-react": "^0.2.6",
-    "@backstage/theme": "^0.2.8",
+    "@backstage/plugin-catalog-react": "^0.4.5",
+    "@backstage/theme": "^0.2.10",
     "@date-io/luxon": "2.x",
-    "@material-ui/core": "^4.11.0",
+    "@material-ui/core": "^4.12.2",
     "@material-ui/icons": "^4.9.1",
     "@material-ui/lab": "4.0.0-alpha.45",
     "@material-ui/pickers": "^3.3.10",
     "humanize-duration": "^3.26.0",
-    "luxon": "^1.26.0",
+    "luxon": "^2.0.2",
     "react": "^16.13.1",
     "react-dom": "^16.13.1",
     "react-use": "^17.2.4"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.7.3",
-    "@backstage/core-app-api": "^0.1.4",
-    "@backstage/dev-utils": "^0.2.1",
-    "@backstage/test-utils": "^0.1.14",
+    "@backstage/cli": "^0.7.11",
+    "@backstage/core-app-api": "^0.1.12",
+    "@backstage/dev-utils": "^0.2.9",
+    "@backstage/test-utils": "^0.1.17",
     "@testing-library/jest-dom": "^5.10.1",
     "@testing-library/react": "^11.2.5",
     "@testing-library/user-event": "^13.1.8",
diff --git a/plugins/ilert/src/components/ILertCard/ILertCard.tsx b/plugins/ilert/src/components/ILertCard/ILertCard.tsx
index 8581c717b4..a014c265c2 100644
--- a/plugins/ilert/src/components/ILertCard/ILertCard.tsx
+++ b/plugins/ilert/src/components/ILertCard/ILertCard.tsx
@@ -69,14 +69,10 @@ export const ILertCard = () => {
     },
   ] = useIncidents(false, true, alertSource);
 
-  const [
-    isNewIncidentModalOpened,
-    setIsNewIncidentModalOpened,
-  ] = React.useState(false);
-  const [
-    isMaintenanceModalOpened,
-    setIsMaintenanceModalOpened,
-  ] = React.useState(false);
+  const [isNewIncidentModalOpened, setIsNewIncidentModalOpened] =
+    React.useState(false);
+  const [isMaintenanceModalOpened, setIsMaintenanceModalOpened] =
+    React.useState(false);
 
   if (error) {
     if (error instanceof AuthenticationError) {
diff --git a/plugins/ilert/src/components/Incident/IncidentActionsMenu.tsx b/plugins/ilert/src/components/Incident/IncidentActionsMenu.tsx
index 8d167819d4..46ebc03ba3 100644
--- a/plugins/ilert/src/components/Incident/IncidentActionsMenu.tsx
+++ b/plugins/ilert/src/components/Incident/IncidentActionsMenu.tsx
@@ -44,10 +44,8 @@ export const IncidentActionsMenu = ({
   const [anchorEl, setAnchorEl] = React.useState<null | HTMLElement>(null);
   const callback = onIncidentChanged || ((_: Incident): void => {});
   const setProcessing = setIsLoading || ((_: boolean): void => {});
-  const [
-    isAssignIncidentModalOpened,
-    setIsAssignIncidentModalOpened,
-  ] = React.useState(false);
+  const [isAssignIncidentModalOpened, setIsAssignIncidentModalOpened] =
+    React.useState(false);
 
   const [{ incidentActions, isLoading }] = useIncidentActions(
     incident,
diff --git a/plugins/ilert/src/components/IncidentsPage/IncidentsTable.tsx b/plugins/ilert/src/components/IncidentsPage/IncidentsTable.tsx
index de819c4cc2..9a938256e9 100644
--- a/plugins/ilert/src/components/IncidentsPage/IncidentsTable.tsx
+++ b/plugins/ilert/src/components/IncidentsPage/IncidentsTable.tsx
@@ -253,8 +253,8 @@ export const IncidentsTable = ({
       }
       page={tableState.page}
       totalCount={incidentsCount}
-      onChangePage={onChangePage}
-      onChangeRowsPerPage={onChangeRowsPerPage}
+      onPageChange={onChangePage}
+      onRowsPerPageChange={onChangeRowsPerPage}
       // localization={{ header: { actions: undefined } }}
       columns={columns}
       data={incidents}
diff --git a/plugins/ilert/src/components/OnCallSchedulesPage/OnCallSchedulesPage.tsx b/plugins/ilert/src/components/OnCallSchedulesPage/OnCallSchedulesPage.tsx
index 2cde7a0bf2..0e6bb28e36 100644
--- a/plugins/ilert/src/components/OnCallSchedulesPage/OnCallSchedulesPage.tsx
+++ b/plugins/ilert/src/components/OnCallSchedulesPage/OnCallSchedulesPage.tsx
@@ -26,10 +26,8 @@ import {
 } from '@backstage/core-components';
 
 export const OnCallSchedulesPage = () => {
-  const [
-    { onCallSchedules, isLoading, error },
-    { refetchOnCallSchedules },
-  ] = useOnCallSchedules();
+  const [{ onCallSchedules, isLoading, error }, { refetchOnCallSchedules }] =
+    useOnCallSchedules();
 
   if (error) {
     if (error instanceof AuthenticationError) {
diff --git a/plugins/ilert/src/components/UptimeMonitorsPage/UptimeMonitorsTable.tsx b/plugins/ilert/src/components/UptimeMonitorsPage/UptimeMonitorsTable.tsx
index 6d93385eb2..3099018e91 100644
--- a/plugins/ilert/src/components/UptimeMonitorsPage/UptimeMonitorsTable.tsx
+++ b/plugins/ilert/src/components/UptimeMonitorsPage/UptimeMonitorsTable.tsx
@@ -165,8 +165,8 @@ export const UptimeMonitorsTable = ({
         </Typography>
       }
       page={tableState.page}
-      onChangePage={onChangePage}
-      onChangeRowsPerPage={onChangeRowsPerPage}
+      onPageChange={onChangePage}
+      onRowsPerPageChange={onChangeRowsPerPage}
       localization={{ header: { actions: undefined } }}
       isLoading={isLoading}
       columns={columns}
diff --git a/plugins/ilert/src/hooks/useAlertSource.ts b/plugins/ilert/src/hooks/useAlertSource.ts
index c26aecff6a..4e74b9e857 100644
--- a/plugins/ilert/src/hooks/useAlertSource.ts
+++ b/plugins/ilert/src/hooks/useAlertSource.ts
@@ -28,13 +28,10 @@ export const useAlertSource = (integrationKey: string) => {
     null,
   );
   const [isAlertSourceLoading, setIsAlertSourceLoading] = React.useState(false);
-  const [
-    uptimeMonitor,
-    setUptimeMonitor,
-  ] = React.useState<UptimeMonitor | null>(null);
-  const [isUptimeMonitorLoading, setIsUptimeMonitorLoading] = React.useState(
-    false,
-  );
+  const [uptimeMonitor, setUptimeMonitor] =
+    React.useState<UptimeMonitor | null>(null);
+  const [isUptimeMonitorLoading, setIsUptimeMonitorLoading] =
+    React.useState(false);
 
   const fetchAlertSourceCall = async () => {
     try {
@@ -54,10 +51,10 @@ export const useAlertSource = (integrationKey: string) => {
     }
   };
 
-  const {
-    error: alertSourceError,
-    retry: alertSourceRetry,
-  } = useAsyncRetry(fetchAlertSourceCall, [integrationKey]);
+  const { error: alertSourceError, retry: alertSourceRetry } = useAsyncRetry(
+    fetchAlertSourceCall,
+    [integrationKey],
+  );
 
   const fetchUptimeMonitorCall = async () => {
     try {
@@ -77,10 +74,8 @@ export const useAlertSource = (integrationKey: string) => {
     }
   };
 
-  const {
-    error: uptimeMonitorError,
-    retry: uptimeMonitorRetry,
-  } = useAsyncRetry(fetchUptimeMonitorCall, [alertSource]);
+  const { error: uptimeMonitorError, retry: uptimeMonitorRetry } =
+    useAsyncRetry(fetchUptimeMonitorCall, [alertSource]);
 
   const retry = () => {
     alertSourceRetry();
diff --git a/plugins/ilert/src/hooks/useAssignIncident.ts b/plugins/ilert/src/hooks/useAssignIncident.ts
index d43f6dca6d..2b6935fc8c 100644
--- a/plugins/ilert/src/hooks/useAssignIncident.ts
+++ b/plugins/ilert/src/hooks/useAssignIncident.ts
@@ -27,10 +27,8 @@ export const useAssignIncident = (incident: Incident | null, open: boolean) => {
   const [incidentRespondersList, setIncidentRespondersList] = React.useState<
     IncidentResponder[]
   >([]);
-  const [
-    incidentResponder,
-    setIncidentResponder,
-  ] = React.useState<IncidentResponder | null>(null);
+  const [incidentResponder, setIncidentResponder] =
+    React.useState<IncidentResponder | null>(null);
   const [isLoading, setIsLoading] = React.useState(false);
 
   const { error, retry } = useAsyncRetry(async () => {
diff --git a/plugins/ilert/src/hooks/useUptimeMonitors.ts b/plugins/ilert/src/hooks/useUptimeMonitors.ts
index 6efaf86be8..fc4707c2a4 100644
--- a/plugins/ilert/src/hooks/useUptimeMonitors.ts
+++ b/plugins/ilert/src/hooks/useUptimeMonitors.ts
@@ -50,15 +50,13 @@ export const useUptimeMonitors = () => {
 
   const onUptimeMonitorChanged = (newUptimeMonitor: UptimeMonitor) => {
     setUptimeMonitorsList(
-      uptimeMonitorsList.map(
-        (uptimeMonitor: UptimeMonitor): UptimeMonitor => {
-          if (newUptimeMonitor.id === uptimeMonitor.id) {
-            return newUptimeMonitor;
-          }
+      uptimeMonitorsList.map((uptimeMonitor: UptimeMonitor): UptimeMonitor => {
+        if (newUptimeMonitor.id === uptimeMonitor.id) {
+          return newUptimeMonitor;
+        }
 
-          return uptimeMonitor;
-        },
-      ),
+        return uptimeMonitor;
+      }),
     );
   };
 
diff --git a/packages/docgen/.eslintrc.js b/plugins/jenkins-backend/.eslintrc.js
similarity index 71%
rename from packages/docgen/.eslintrc.js
rename to plugins/jenkins-backend/.eslintrc.js
index 503c048748..16a033dbc6 100644
--- a/packages/docgen/.eslintrc.js
+++ b/plugins/jenkins-backend/.eslintrc.js
@@ -1,6 +1,3 @@
 module.exports = {
   extends: [require.resolve('@backstage/cli/config/eslint.backend')],
-  rules: {
-    'no-console': 0,
-  },
 };
diff --git a/plugins/jenkins-backend/CHANGELOG.md b/plugins/jenkins-backend/CHANGELOG.md
new file mode 100644
index 0000000000..67021b0942
--- /dev/null
+++ b/plugins/jenkins-backend/CHANGELOG.md
@@ -0,0 +1,28 @@
+# @backstage/plugin-jenkins-backend
+
+## 0.1.4
+
+### Patch Changes
+
+- 4c86555a2: Fix the case where lastBuild is null.
+- Updated dependencies
+  - @backstage/backend-common@0.9.0
+  - @backstage/config@0.1.8
+
+## 0.1.3
+
+### Patch Changes
+
+- efbb82dd3: Extract `JenkinsConfig` to make writing a custom `JenkinsInfoProvider` easier.
+- Updated dependencies
+  - @backstage/backend-common@0.8.10
+  - @backstage/config@0.1.7
+
+## 0.1.2
+
+### Patch Changes
+
+- eee05803a: Update `@backstage/backend-common` to `^0.8.6`
+- Updated dependencies
+  - @backstage/catalog-client@0.3.17
+  - @backstage/backend-common@0.8.7
diff --git a/plugins/jenkins-backend/README.md b/plugins/jenkins-backend/README.md
new file mode 100644
index 0000000000..bac56b6eaf
--- /dev/null
+++ b/plugins/jenkins-backend/README.md
@@ -0,0 +1,209 @@
+# Jenkins Plugin (Alpha)
+
+Welcome to the Jenkins backend plugin! Website: [https://jenkins.io/](https://jenkins.io/)
+
+This is the backend half of the 2 Jenkins plugins and is responsible for:
+
+- finding an appropriate instance of Jenkins for an entity
+- finding the appropriate job(s) on that instance for an entity
+- connecting to Jenkins and gathering data to present to the frontend
+
+## Integrating into a backstage instance
+
+This plugin needs to be added to an existing backstage instance.
+
+Typically, this means creating a `src/plugins/jenkins.ts` file and adding a reference to it to `src/index.ts`
+
+### jenkins.ts
+
+```typescript
+import {
+  createRouter,
+  DefaultJenkinsInfoProvider,
+} from '@backstage/plugin-jenkins-backend';
+import { CatalogClient } from '@backstage/catalog-client';
+import { Router } from 'express';
+import { PluginEnvironment } from '../types';
+
+export default async function createPlugin({
+  logger,
+  config,
+  discovery,
+}: PluginEnvironment): Promise<Router> {
+  const catalog = new CatalogClient({ discoveryApi: discovery });
+
+  return await createRouter({
+    logger,
+    jenkinsInfoProvider: DefaultJenkinsInfoProvider.fromConfig({
+      config,
+      catalog,
+    }),
+  });
+}
+```
+
+This plugin must be provided with a JenkinsInfoProvider, this is a strategy object for finding the Jenkins instance and job for an entity.
+
+There is a standard one provided, but the Integrator is free to build their own.
+
+### DefaultJenkinsInfoProvider
+
+Allows configuration of either a single or multiple global Jenkins instances and annotating entities with the job name on that instance (and optionally the name of the instance).
+
+#### Example - Single global instance
+
+The following will look for jobs for this entity at `https://jenkins.example.com/job/teamA/job/artistLookup-build`
+
+Config
+
+```yaml
+jenkins:
+  baseUrl: https://jenkins.example.com
+  username: backstage-bot
+  apiKey: 123456789abcdef0123456789abcedf012
+```
+
+Catalog
+
+```yaml
+apiVersion: backstage.io/v1alpha1
+kind: Component
+metadata:
+  name: artist-lookup
+  annotations:
+    'jenkins.io/job-full-name': teamA/artistLookup-build
+```
+
+The old annotation name of `jenkins.io/github-folder` is equivalent to `jenkins.io/job-full-name`
+
+#### Example - Multiple global instances
+
+The following will look for jobs for this entity at `https://jenkins-foo.example.com/job/teamA/job/artistLookup-build`
+
+Config
+
+```yaml
+jenkins:
+  instances:
+    - name: default
+      baseUrl: https://jenkins.example.com
+      username: backstage-bot
+      apiKey: 123456789abcdef0123456789abcedf012
+    - name: departmentFoo
+      baseUrl: https://jenkins-foo.example.com
+      username: backstage-bot
+      apiKey: 123456789abcdef0123456789abcedf012
+```
+
+Catalog
+
+```yaml
+apiVersion: backstage.io/v1alpha1
+kind: Component
+metadata:
+  name: artist-lookup
+  annotations:
+    'jenkins.io/job-full-name': departmentFoo:teamA/artistLookup-build
+```
+
+If the `departmentFoo:` part is omitted, the default instance will be assumed.
+
+The following config is an equivalent (but less clear) version of the above:
+
+```yaml
+jenkins:
+  baseUrl: https://jenkins.example.com
+  username: backstage-bot
+  apiKey: 123456789abcdef0123456789abcedf012
+  instances:
+    - name: departmentFoo
+      baseUrl: https://jenkins-foo.example.com
+      username: backstage-bot
+      apiKey: 123456789abcdef0123456789abcedf012
+```
+
+### Custom JenkinsInfoProvider
+
+An example of a bespoke JenkinsInfoProvider which uses an organisation specific annotation to look up the Jenkins info (including jobFullName):
+
+```typescript
+class AcmeJenkinsInfoProvider implements JenkinsInfoProvider {
+  constructor(private readonly catalog: CatalogClient) {}
+
+  async getInstance(opt: {
+    entityRef: EntityName;
+    jobFullName?: string;
+  }): Promise<JenkinsInfo> {
+    const PAAS_ANNOTATION = 'acme.example.com/paas-project-name';
+
+    // lookup pass-project-name from entity annotation
+    const entity = await this.catalog.getEntityByName(opt.entityRef);
+    if (!entity) {
+      throw new Error(
+        `Couldn't find entity with name: ${stringifyEntityRef(opt.entityRef)}`,
+      );
+    }
+
+    const paasProjectName = entity.metadata.annotations?.[PAAS_ANNOTATION];
+    if (!paasProjectName) {
+      throw new Error(
+        `Couldn't find paas annotation (${PAAS_ANNOTATION}) on entity with name: ${stringifyEntityRef(
+          opt.entityRef,
+        )}`,
+      );
+    }
+
+    // lookup department and team for paas project name
+    const { team, dept } = this.lookupPaasInfo(paasProjectName);
+
+    const baseUrl = `https://jenkins-${dept}.example.com/`;
+    const jobFullName = `${team}/${paasProjectName}`;
+    const username = 'backstage-bot';
+    const apiKey = this.getJenkinsApiKey(paasProjectName);
+    const creds = btoa(`${username}:${apiKey}`);
+
+    return {
+      baseUrl,
+      headers: {
+        Authorization: `Basic ${creds}`,
+      },
+      jobFullName,
+    };
+  }
+
+  private lookupPaasInfo(_: string): { team: string; dept: string } {
+    // Mock implementation, this would get info from the paas system somehow in reality.
+    return {
+      team: 'teamA',
+      dept: 'DepartmentFoo',
+    };
+  }
+
+  private getJenkinsApiKey(_: string): string {
+    // Mock implementation, this would get info from the paas system somehow in reality.
+    return '123456789abcdef0123456789abcedf012';
+  }
+}
+```
+
+No config would be needed if using this JenkinsInfoProvider
+
+A Catalog entity of the following will look for jobs for this entity at `https://jenkins-departmentFoo.example.com/job/teamA/job/artistLookupService`
+
+```yaml
+apiVersion: backstage.io/v1alpha1
+kind: Component
+metadata:
+  name: artist-lookup
+  annotations:
+    'acme.example.com/paas-project-name': artistLookupService
+```
+
+## Jenkins' terminology notes
+
+The domain model for Jenkins is not particularly clear but for the purposes of this plugin the following model has been assumed:
+
+Jenkins contains a tree of *job*s which have children of either; other *job*s (making it a _folder_) or *build*s (making it a _project_).
+Concepts like _pipeline_ and *view*s are meaningless (pipelines are just jobs for our purposes, views are (as the name suggests) just views of subsets of jobs)
+
+A _job full name_ is a slash separated list of the names of the job, and the folders which contain it. For example `teamA/artistLookupService/develop`, and the same way that a filesystem path has folders and file names.
diff --git a/plugins/jenkins-backend/api-report.md b/plugins/jenkins-backend/api-report.md
new file mode 100644
index 0000000000..01114e74d6
--- /dev/null
+++ b/plugins/jenkins-backend/api-report.md
@@ -0,0 +1,96 @@
+## API Report File for "@backstage/plugin-jenkins-backend"
+
+> Do not edit this file. It is a report generated by [API Extractor](https://api-extractor.com/).
+
+```ts
+import { CatalogClient } from '@backstage/catalog-client';
+import { Config } from '@backstage/config';
+import { EntityName } from '@backstage/catalog-model';
+import express from 'express';
+import { Logger as Logger_2 } from 'winston';
+
+// Warning: (ae-missing-release-tag) "createRouter" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
+// @public (undocumented)
+export function createRouter(options: RouterOptions): Promise<express.Router>;
+
+// Warning: (ae-missing-release-tag) "DefaultJenkinsInfoProvider" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
+// @public
+export class DefaultJenkinsInfoProvider implements JenkinsInfoProvider {
+  // (undocumented)
+  static fromConfig(options: {
+    config: Config;
+    catalog: CatalogClient;
+  }): DefaultJenkinsInfoProvider;
+  // (undocumented)
+  getInstance(opt: {
+    entityRef: EntityName;
+    jobFullName?: string;
+  }): Promise<JenkinsInfo>;
+  // (undocumented)
+  static readonly NEW_JENKINS_ANNOTATION = 'jenkins.io/job-full-name';
+  // (undocumented)
+  static readonly OLD_JENKINS_ANNOTATION = 'jenkins.io/github-folder';
+}
+
+// Warning: (ae-missing-release-tag) "JenkinsConfig" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
+// @public
+export class JenkinsConfig {
+  constructor(instances: JenkinsInstanceConfig[]);
+  static fromConfig(config: Config): JenkinsConfig;
+  getInstanceConfig(jenkinsName?: string): JenkinsInstanceConfig;
+  // (undocumented)
+  readonly instances: JenkinsInstanceConfig[];
+}
+
+// Warning: (ae-missing-release-tag) "JenkinsInfo" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
+// @public (undocumented)
+export interface JenkinsInfo {
+  // (undocumented)
+  baseUrl: string;
+  // (undocumented)
+  headers?: Record<string, string | string[]>;
+  // (undocumented)
+  jobFullName: string;
+}
+
+// Warning: (ae-missing-release-tag) "JenkinsInfoProvider" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
+// @public (undocumented)
+export interface JenkinsInfoProvider {
+  // (undocumented)
+  getInstance(options: {
+    entityRef: EntityName;
+    jobFullName?: string;
+  }): Promise<JenkinsInfo>;
+}
+
+// Warning: (ae-missing-release-tag) "JenkinsInstanceConfig" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
+// @public (undocumented)
+export interface JenkinsInstanceConfig {
+  // (undocumented)
+  apiKey: string;
+  // (undocumented)
+  baseUrl: string;
+  // (undocumented)
+  name: string;
+  // (undocumented)
+  username: string;
+}
+
+// Warning: (ae-missing-release-tag) "RouterOptions" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
+// @public (undocumented)
+export interface RouterOptions {
+  // (undocumented)
+  jenkinsInfoProvider: JenkinsInfoProvider;
+  // (undocumented)
+  logger: Logger_2;
+}
+
+// (No @packageDocumentation comment for this package)
+```
diff --git a/plugins/jenkins-backend/config.d.ts b/plugins/jenkins-backend/config.d.ts
new file mode 100644
index 0000000000..bfb519bb58
--- /dev/null
+++ b/plugins/jenkins-backend/config.d.ts
@@ -0,0 +1,51 @@
+/*
+ * Copyright 2020 Spotify AB
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+export interface Config {
+  jenkins?: {
+    /**
+     * Default instance baseUrl, can be specified on a named instance called "default"
+     * @pattern "^https?://"
+     */
+    baseUrl?: string;
+    /**
+     * Default instance username, can be specified on a named instance called "default"
+     */
+    username?: string;
+    /**
+     * Default Instance apiKey, can be specified on a named instance called "default"
+     * @visibility secret
+     */
+    apiKey?: string;
+
+    instances?: {
+      /**
+       * Name of the instance, this will be used in an annotation on catalog entities to refer to jobs on this instance.
+       *
+       * Use a name of "default" to specify the jenkins instance details if the annotation doesn't explicitly name an
+       * instance.
+       */
+      name: string;
+
+      /**
+       * @pattern "^https?://"
+       */
+      baseUrl: string;
+      username: string;
+      /** @visibility secret */
+      apiKey: string;
+    }[];
+  };
+}
diff --git a/plugins/jenkins-backend/package.json b/plugins/jenkins-backend/package.json
new file mode 100644
index 0000000000..75244f619f
--- /dev/null
+++ b/plugins/jenkins-backend/package.json
@@ -0,0 +1,47 @@
+{
+  "name": "@backstage/plugin-jenkins-backend",
+  "version": "0.1.4",
+  "main": "src/index.ts",
+  "types": "src/index.ts",
+  "license": "Apache-2.0",
+  "private": false,
+  "publishConfig": {
+    "access": "public",
+    "main": "dist/index.cjs.js",
+    "types": "dist/index.d.ts"
+  },
+  "configSchema": "config.d.ts",
+  "scripts": {
+    "start": "backstage-cli backend:dev",
+    "build": "backstage-cli backend:build",
+    "lint": "backstage-cli lint",
+    "test": "backstage-cli test",
+    "prepack": "backstage-cli prepack",
+    "postpack": "backstage-cli postpack",
+    "clean": "backstage-cli clean"
+  },
+  "dependencies": {
+    "@backstage/backend-common": "^0.9.0",
+    "@backstage/catalog-client": "^0.3.17",
+    "@backstage/catalog-model": "^0.9.0",
+    "@backstage/config": "^0.1.8",
+    "@types/express": "^4.17.6",
+    "cross-fetch": "^3.0.6",
+    "express": "^4.17.1",
+    "express-promise-router": "^4.1.0",
+    "jenkins": "^0.28.1",
+    "winston": "^3.2.1",
+    "yn": "^4.0.0"
+  },
+  "devDependencies": {
+    "@backstage/cli": "^0.7.9",
+    "@types/jenkins": "^0.23.1",
+    "@types/supertest": "^2.0.8",
+    "msw": "^0.29.0",
+    "supertest": "^4.0.2"
+  },
+  "files": [
+    "dist",
+    "config.d.ts"
+  ]
+}
diff --git a/plugins/register-component/src/components/RegisterComponentForm/index.ts b/plugins/jenkins-backend/src/index.ts
similarity index 90%
rename from plugins/register-component/src/components/RegisterComponentForm/index.ts
rename to plugins/jenkins-backend/src/index.ts
index b864bacaad..c5c541db2b 100644
--- a/plugins/register-component/src/components/RegisterComponentForm/index.ts
+++ b/plugins/jenkins-backend/src/index.ts
@@ -14,4 +14,4 @@
  * limitations under the License.
  */
 
-export { RegisterComponentForm } from './RegisterComponentForm';
+export * from './service';
diff --git a/plugins/jenkins-backend/src/run.ts b/plugins/jenkins-backend/src/run.ts
new file mode 100644
index 0000000000..b96989e4b8
--- /dev/null
+++ b/plugins/jenkins-backend/src/run.ts
@@ -0,0 +1,33 @@
+/*
+ * Copyright 2020 Spotify AB
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { getRootLogger } from '@backstage/backend-common';
+import yn from 'yn';
+import { startStandaloneServer } from './service/standaloneServer';
+
+const port = process.env.PLUGIN_PORT ? Number(process.env.PLUGIN_PORT) : 7000;
+const enableCors = yn(process.env.PLUGIN_CORS, { default: false });
+const logger = getRootLogger();
+
+startStandaloneServer({ port, enableCors, logger }).catch(err => {
+  logger.error(err);
+  process.exit(1);
+});
+
+process.on('SIGINT', () => {
+  logger.info('CTRL+C pressed; exiting.');
+  process.exit(0);
+});
diff --git a/plugins/jenkins-backend/src/service/index.ts b/plugins/jenkins-backend/src/service/index.ts
new file mode 100644
index 0000000000..af9986c492
--- /dev/null
+++ b/plugins/jenkins-backend/src/service/index.ts
@@ -0,0 +1,27 @@
+/*
+ * Copyright 2020 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+export {
+  DefaultJenkinsInfoProvider,
+  JenkinsConfig,
+} from './jenkinsInfoProvider';
+export type {
+  JenkinsInfo,
+  JenkinsInfoProvider,
+  JenkinsInstanceConfig,
+} from './jenkinsInfoProvider';
+export { createRouter } from './router';
+export type { RouterOptions } from './router';
diff --git a/plugins/jenkins-backend/src/service/jenkinsApi.test.ts b/plugins/jenkins-backend/src/service/jenkinsApi.test.ts
new file mode 100644
index 0000000000..5f74259eef
--- /dev/null
+++ b/plugins/jenkins-backend/src/service/jenkinsApi.test.ts
@@ -0,0 +1,414 @@
+/*
+ * Copyright 2021 Spotify AB
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import { JenkinsApiImpl } from './jenkinsApi';
+import jenkins from 'jenkins';
+import { JenkinsInfo } from './jenkinsInfoProvider';
+import { JenkinsBuild, JenkinsProject } from '../types';
+
+jest.mock('jenkins');
+const mockedJenkinsClient = {
+  job: {
+    get: jest.fn(),
+    build: jest.fn(),
+  },
+  build: {
+    get: jest.fn(),
+  },
+};
+const mockedJenkins = jenkins as jest.Mocked<any>;
+mockedJenkins.mockReturnValue(mockedJenkinsClient);
+
+const jobFullName = 'example-jobName/foo';
+const buildNumber = 19;
+const jenkinsInfo: JenkinsInfo = {
+  baseUrl: 'https://jenkins.example.com',
+  headers: { headerName: 'headerValue' },
+  jobFullName: 'example-jobName',
+};
+
+describe('JenkinsApi', () => {
+  const jenkinsApi = new JenkinsApiImpl();
+
+  describe('getProjects', () => {
+    const project: JenkinsProject = {
+      actions: [],
+      displayName: 'Example Build',
+      fullDisplayName: 'Example jobName » Example Build',
+      fullName: 'example-jobName/exampleBuild',
+      inQueue: false,
+      lastBuild: {
+        actions: [],
+        timestamp: 1,
+        building: false,
+        duration: 10,
+        result: 'success',
+        displayName: '#7',
+        fullDisplayName: 'Example jobName » Example Build #7',
+        url: 'https://jenkins.example.com/job/example-jobName/job/exampleBuild',
+        number: 7,
+      },
+    };
+
+    describe('unfiltered', () => {
+      it('standard github layout', async () => {
+        mockedJenkinsClient.job.get.mockResolvedValueOnce({ jobs: [project] });
+
+        const result = await jenkinsApi.getProjects(jenkinsInfo);
+
+        expect(mockedJenkins).toHaveBeenCalledWith({
+          baseUrl: jenkinsInfo.baseUrl,
+          headers: jenkinsInfo.headers,
+          promisify: true,
+        });
+        expect(mockedJenkinsClient.job.get).toBeCalledWith({
+          name: jenkinsInfo.jobFullName,
+          tree: expect.anything(),
+        });
+        expect(result).toHaveLength(1);
+        expect(result[0]).toEqual({
+          actions: [],
+          displayName: 'Example Build',
+          fullDisplayName: 'Example jobName » Example Build',
+          fullName: 'example-jobName/exampleBuild',
+          inQueue: false,
+          lastBuild: {
+            actions: [],
+            timestamp: 1,
+            building: false,
+            duration: 10,
+            result: 'success',
+            displayName: '#7',
+            fullDisplayName: 'Example jobName » Example Build #7',
+            url: 'https://jenkins.example.com/job/example-jobName/job/exampleBuild',
+            number: 7,
+            status: 'success',
+            source: {},
+          },
+          status: 'success',
+        });
+      });
+    });
+    describe('filtered by branch', () => {
+      it('standard github layout', async () => {
+        mockedJenkinsClient.job.get.mockResolvedValueOnce(project);
+
+        const result = await jenkinsApi.getProjects(
+          jenkinsInfo,
+          'testBranchName',
+        );
+
+        expect(mockedJenkins).toHaveBeenCalledWith({
+          baseUrl: jenkinsInfo.baseUrl,
+          headers: jenkinsInfo.headers,
+          promisify: true,
+        });
+        expect(mockedJenkinsClient.job.get).toBeCalledWith({
+          name: `${jenkinsInfo.jobFullName}/testBranchName`,
+          tree: expect.anything(),
+        });
+        expect(result).toHaveLength(1);
+      });
+    });
+    describe('augmented', () => {
+      const projectWithScmActions: JenkinsProject = {
+        actions: [
+          {},
+          {},
+          {},
+          {},
+          {
+            _class: 'jenkins.scm.api.metadata.ContributorMetadataAction',
+            contributor: 'testuser',
+            contributorDisplayName: 'Mr. T User',
+            contributorEmail: null,
+          },
+          {},
+          {
+            _class: 'jenkins.scm.api.metadata.ObjectMetadataAction',
+            objectDescription: '',
+            objectDisplayName: 'Add LICENSE, CoC etc',
+            objectUrl: 'https://github.com/backstage/backstage/pull/1',
+          },
+          {},
+          {},
+          {
+            _class: 'com.cloudbees.plugins.credentials.ViewCredentialsAction',
+            stores: {},
+          },
+        ],
+        displayName: 'Example Build',
+        fullDisplayName: 'Example jobName » Example Build',
+        fullName: 'example-jobName/exampleBuild',
+        inQueue: false,
+        lastBuild: {
+          actions: [
+            {
+              _class: 'hudson.model.CauseAction',
+              causes: [
+                {
+                  _class: 'jenkins.branch.BranchIndexingCause',
+                  shortDescription: 'Branch indexing',
+                },
+              ],
+            },
+            {},
+            {},
+            {},
+            {
+              _class: 'org.jenkinsci.plugins.workflow.cps.EnvActionImpl',
+              environment: {},
+            },
+            {},
+            {},
+            {},
+            {},
+            {},
+            {
+              _class: 'hudson.plugins.git.util.BuildData',
+              buildsByBranchName: {
+                'PR-1': {
+                  _class: 'hudson.plugins.git.util.Build',
+                  buildNumber: 5,
+                  buildResult: null,
+                  marked: {
+                    SHA1: '14d31bde346fcad64ab939f82d195db36701cfcb',
+                    branch: [
+                      {
+                        SHA1: '14d31bde346fcad64ab939f82d195db36701cfcb',
+                        name: 'PR-1',
+                      },
+                    ],
+                  },
+                  revision: {
+                    SHA1: '6c6b34c0fb91cf077a01fe62d3e8e996b4ea5861',
+                    branch: [
+                      {
+                        SHA1: '14d31bde346fcad64ab939f82d195db36701cfcb',
+                        name: 'PR-1',
+                      },
+                    ],
+                  },
+                },
+              },
+              lastBuiltRevision: {
+                SHA1: '6c6b34c0fb91cf077a01fe62d3e8e996b4ea5861',
+                branch: [
+                  {
+                    SHA1: '14d31bde346fcad64ab939f82d195db36701cfcb',
+                    name: 'PR-1',
+                  },
+                ],
+              },
+              remoteUrls: ['https://github.com/backstage/backstage.git'],
+              scmName: '',
+            },
+            {
+              _class: 'hudson.plugins.git.util.BuildData',
+              buildsByBranchName: {
+                master: {
+                  _class: 'hudson.plugins.git.util.Build',
+                  buildNumber: 5,
+                  buildResult: null,
+                  marked: {
+                    SHA1: '14d31bde346fcad64ab939f82d195db36701cfcb',
+                    branch: [
+                      {
+                        SHA1: '14d31bde346fcad64ab939f82d195db36701cfcb',
+                        name: 'master',
+                      },
+                    ],
+                  },
+                  revision: {
+                    SHA1: '6c6b34c0fb91cf077a01fe62d3e8e996b4ea5861',
+                    branch: [
+                      {
+                        SHA1: '14d31bde346fcad64ab939f82d195db36701cfcb',
+                        name: 'master',
+                      },
+                    ],
+                  },
+                },
+              },
+              lastBuiltRevision: {
+                SHA1: '6c6b34c0fb91cf077a01fe62d3e8e996b4ea5861',
+                branch: [
+                  {
+                    SHA1: '14d31bde346fcad64ab939f82d195db36701cfcb',
+                    name: 'master',
+                  },
+                ],
+              },
+              remoteUrls: ['https://github.com/backstage/backstage.git'],
+              scmName: '',
+            },
+            {},
+            {},
+            {
+              _class: 'hudson.tasks.junit.TestResultAction',
+              failCount: 2,
+              skipCount: 1,
+              totalCount: 635,
+              urlName: 'testReport',
+            },
+            {},
+            {},
+            {
+              _class:
+                'org.jenkinsci.plugins.pipeline.modeldefinition.actions.RestartDeclarativePipelineAction',
+              restartEnabled: false,
+              restartableStages: [],
+            },
+            {},
+          ],
+          timestamp: 1,
+          building: false,
+          duration: 10,
+          result: 'success',
+          displayName: '#7',
+          fullDisplayName: 'Example jobName » Example Build #7',
+          url: 'https://jenkins.example.com/job/example-jobName/job/exampleBuild/7/',
+          number: 7,
+        },
+      };
+
+      const projectWithoutBuild: JenkinsProject = {
+        actions: [],
+        displayName: 'Example Build',
+        fullDisplayName: 'Example jobName » Example Build',
+        fullName: 'example-jobName/exampleBuild',
+        inQueue: false,
+        lastBuild: null,
+      };
+
+      it('augments project', async () => {
+        mockedJenkinsClient.job.get.mockResolvedValueOnce({
+          jobs: [projectWithScmActions],
+        });
+
+        const result = await jenkinsApi.getProjects(jenkinsInfo);
+
+        expect(result).toHaveLength(1);
+        expect(result[0].status).toEqual('success');
+      });
+      it('augments project without build', async () => {
+        mockedJenkinsClient.job.get.mockResolvedValueOnce({
+          jobs: [projectWithoutBuild],
+        });
+
+        const result = await jenkinsApi.getProjects(jenkinsInfo);
+
+        expect(result).toHaveLength(1);
+        expect(result[0].status).toEqual('build not found');
+      });
+      it('augments  build', async () => {
+        mockedJenkinsClient.job.get.mockResolvedValueOnce({
+          jobs: [projectWithScmActions],
+        });
+
+        const result = await jenkinsApi.getProjects(jenkinsInfo);
+
+        expect(result).toHaveLength(1);
+        // TODO: I am really just asserting the previous behaviour wth no understanding here.
+        // In my 2 Jenkins instances, 1 returns a lot of different and confusing BuildData sections and 1 returns none ☹️
+        expect(result[0].lastBuild!.source).toEqual({
+          branchName: 'master',
+          commit: {
+            hash: '14d31bde',
+          },
+          url: 'https://github.com/backstage/backstage/pull/1',
+          displayName: 'Add LICENSE, CoC etc',
+          author: 'Mr. T User',
+        });
+      });
+      it('finds test report', async () => {
+        mockedJenkinsClient.job.get.mockResolvedValueOnce({
+          jobs: [projectWithScmActions],
+        });
+
+        const result = await jenkinsApi.getProjects(jenkinsInfo);
+
+        expect(result).toHaveLength(1);
+        expect(result[0].lastBuild!.tests).toEqual({
+          total: 635,
+          passed: 632,
+          skipped: 1,
+          failed: 2,
+          testUrl:
+            'https://jenkins.example.com/job/example-jobName/job/exampleBuild/7/testReport/',
+        });
+      });
+    });
+  });
+  it('getBuild', async () => {
+    const project: JenkinsProject = {
+      actions: [],
+      displayName: 'Example Build',
+      fullDisplayName: 'Example jobName » Example Build',
+      fullName: 'example-jobName/exampleBuild',
+      inQueue: false,
+      lastBuild: {
+        actions: [],
+        timestamp: 1,
+        building: false,
+        duration: 10,
+        result: 'success',
+        displayName: '#7',
+        fullDisplayName: 'Example jobName » Example Build #7',
+        url: 'https://jenkins.example.com/job/example-jobName/job/exampleBuild',
+        number: 7,
+      },
+    };
+    const build: JenkinsBuild = {
+      actions: [],
+      timestamp: 1,
+      building: false,
+      duration: 10,
+      result: 'success',
+      fullDisplayName: 'example-jobName/exampleBuild',
+      displayName: 'exampleBuild',
+      url: `https://jenkins.example.com/job/example-jobName/job/exampleBuild/build/${buildNumber}`,
+      number: buildNumber,
+    };
+    mockedJenkinsClient.job.get.mockResolvedValueOnce(project);
+    mockedJenkinsClient.build.get.mockResolvedValueOnce(build);
+
+    await jenkinsApi.getBuild(jenkinsInfo, jobFullName, buildNumber);
+
+    expect(mockedJenkins).toHaveBeenCalledWith({
+      baseUrl: jenkinsInfo.baseUrl,
+      headers: jenkinsInfo.headers,
+      promisify: true,
+    });
+    expect(mockedJenkinsClient.job.get).toBeCalledWith({
+      name: jobFullName,
+      depth: 1,
+    });
+    expect(mockedJenkinsClient.build.get).toBeCalledWith(
+      jobFullName,
+      buildNumber,
+    );
+  });
+  it('buildProject', async () => {
+    await jenkinsApi.buildProject(jenkinsInfo, jobFullName);
+
+    expect(mockedJenkins).toHaveBeenCalledWith({
+      baseUrl: jenkinsInfo.baseUrl,
+      headers: jenkinsInfo.headers,
+      promisify: true,
+    });
+    expect(mockedJenkinsClient.job.build).toBeCalledWith(jobFullName);
+  });
+});
diff --git a/plugins/jenkins-backend/src/service/jenkinsApi.ts b/plugins/jenkins-backend/src/service/jenkinsApi.ts
new file mode 100644
index 0000000000..13705ce049
--- /dev/null
+++ b/plugins/jenkins-backend/src/service/jenkinsApi.ts
@@ -0,0 +1,286 @@
+/*
+ * Copyright 2021 Spotify AB
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import { JenkinsInfo } from './jenkinsInfoProvider';
+import jenkins from 'jenkins';
+import {
+  BackstageBuild,
+  BackstageProject,
+  JenkinsBuild,
+  JenkinsProject,
+  ScmDetails,
+} from '../types';
+
+export class JenkinsApiImpl {
+  private static readonly lastBuildTreeSpec = `lastBuild[
+                    number,
+                    url,
+                    fullDisplayName,
+                    displayName,
+                    building,
+                    result,
+                    timestamp,
+                    duration,
+                    actions[
+                      *[
+                        *[
+                          *[
+                            *
+                          ]
+                        ]
+                      ]
+                    ]
+                  ],`;
+
+  private static readonly jobTreeSpec = `actions[*],
+                   ${JenkinsApiImpl.lastBuildTreeSpec}
+                   jobs{0,1},
+                   name,
+                   fullName,
+                   displayName,
+                   fullDisplayName,
+                   inQueue`;
+
+  private static readonly jobsTreeSpec = `jobs[
+                   ${JenkinsApiImpl.jobTreeSpec}
+                 ]{0,50}`;
+
+  /**
+   * Get a list of projects for the given JenkinsInfo.
+   * @see ../../../jenkins/src/api/JenkinsApi.ts#getProjects
+   */
+  async getProjects(jenkinsInfo: JenkinsInfo, branch?: string) {
+    const client = await JenkinsApiImpl.getClient(jenkinsInfo);
+    const projects: BackstageProject[] = [];
+
+    if (branch) {
+      // we have been asked to filter to a single branch.
+      // Assume jenkinsInfo.jobFullName is a folder which contains one job per branch.
+      // TODO: extract a strategy interface for this
+      const job = await client.job.get({
+        name: `${jenkinsInfo.jobFullName}/${branch}`,
+        tree: JenkinsApiImpl.jobTreeSpec.replace(/\s/g, ''),
+      });
+      projects.push(this.augmentProject(job));
+    } else {
+      // We aren't filtering
+      // Assume jenkinsInfo.jobFullName is a folder which contains one job per branch.
+      const folder = await client.job.get({
+        name: jenkinsInfo.jobFullName,
+        // Filter only be the information we need, instead of loading all fields.
+        // Limit to only show the latest build for each job and only load 50 jobs
+        // at all.
+        // Whitespaces are only included for readablity here and stripped out
+        // before sending to Jenkins
+        tree: JenkinsApiImpl.jobsTreeSpec.replace(/\s/g, ''),
+      });
+
+      // TODO: support this being a project itself.
+      for (const jobDetails of folder.jobs) {
+        // for each branch (we assume)
+        if (jobDetails?.jobs) {
+          // skipping folders inside folders for now
+          // TODO: recurse
+        } else {
+          projects.push(this.augmentProject(jobDetails));
+        }
+      }
+    }
+    return projects;
+  }
+
+  /**
+   * Get a single build.
+   * @see ../../../jenkins/src/api/JenkinsApi.ts#getBuild
+   */
+  async getBuild(
+    jenkinsInfo: JenkinsInfo,
+    jobFullName: string,
+    buildNumber: number,
+  ) {
+    const client = await JenkinsApiImpl.getClient(jenkinsInfo);
+
+    const project = await client.job.get({
+      name: jobFullName,
+      depth: 1,
+    });
+
+    const build = await client.build.get(jobFullName, buildNumber);
+    const jobScmInfo = JenkinsApiImpl.extractScmDetailsFromJob(project);
+
+    return this.augmentBuild(build, jobScmInfo);
+  }
+
+  /**
+   * Trigger a build of a project
+   * @see ../../../jenkins/src/api/JenkinsApi.ts#retry
+   */
+  async buildProject(jenkinsInfo: JenkinsInfo, jobFullName: string) {
+    const client = await JenkinsApiImpl.getClient(jenkinsInfo);
+
+    // looks like the current SDK only supports triggering a new build
+    // can't see any support for replay (re-running the specific build with the same SCM info)
+
+    // Note Jenkins itself has concepts of rebuild and replay on a job.
+    // The latter should be possible to trigger with a POST to /replay/rebuild
+    await client.job.build(jobFullName);
+  }
+
+  // private helper methods
+
+  private static async getClient(jenkinsInfo: JenkinsInfo) {
+    // The typings for the jenkins library are out of date so just cast to any
+    return jenkins({
+      baseUrl: jenkinsInfo.baseUrl,
+      headers: jenkinsInfo.headers,
+      promisify: true,
+    }) as any;
+  }
+
+  private augmentProject(project: JenkinsProject): BackstageProject {
+    let status: string;
+
+    if (project.inQueue) {
+      status = 'queued';
+    } else if (!project.lastBuild) {
+      status = 'build not found';
+    } else if (project.lastBuild.building) {
+      status = 'running';
+    } else if (!project.lastBuild.result) {
+      status = 'unknown';
+    } else {
+      status = project.lastBuild.result;
+    }
+
+    const jobScmInfo = JenkinsApiImpl.extractScmDetailsFromJob(project);
+
+    return {
+      ...project,
+      lastBuild: project.lastBuild
+        ? this.augmentBuild(project.lastBuild, jobScmInfo)
+        : null,
+      status,
+      // actions: undefined,
+    };
+  }
+
+  private augmentBuild(
+    build: JenkinsBuild,
+    jobScmInfo: ScmDetails | undefined,
+  ): BackstageBuild {
+    const source =
+      build.actions
+        .filter(
+          (action: any) =>
+            action._class === 'hudson.plugins.git.util.BuildData',
+        )
+        .map((action: any) => {
+          const [first]: any = Object.values(action.buildsByBranchName);
+          const branch = first.revision.branch[0];
+          return {
+            branchName: branch.name,
+            commit: {
+              hash: branch.SHA1.substring(0, 8),
+            },
+          };
+        })
+        .pop() || {};
+
+    if (jobScmInfo) {
+      source.url = jobScmInfo.url;
+      source.displayName = jobScmInfo.displayName;
+      source.author = jobScmInfo.author;
+    }
+
+    let status: string;
+    if (build.building) {
+      status = 'running';
+    } else if (!build.result) {
+      status = 'unknown';
+    } else {
+      status = build.result;
+    }
+    return {
+      ...build,
+      status,
+      source: source,
+      tests: this.getTestReport(build),
+    };
+  }
+
+  private static extractScmDetailsFromJob(
+    project: JenkinsProject,
+  ): ScmDetails | undefined {
+    const scmInfo: ScmDetails | undefined = project.actions
+      .filter(
+        (action: any) =>
+          action._class === 'jenkins.scm.api.metadata.ObjectMetadataAction',
+      )
+      .map((action: any) => {
+        return {
+          url: action?.objectUrl,
+          // https://javadoc.jenkins.io/plugin/scm-api/jenkins/scm/api/metadata/ObjectMetadataAction.html
+          // branch name for regular builds, pull request title on pull requests
+          displayName: action?.objectDisplayName,
+        };
+      })
+      .pop();
+
+    if (!scmInfo) {
+      return undefined;
+    }
+
+    const author = project.actions
+      .filter(
+        (action: any) =>
+          action._class ===
+          'jenkins.scm.api.metadata.ContributorMetadataAction',
+      )
+      .map((action: any) => {
+        return action.contributorDisplayName;
+      })
+      .pop();
+
+    if (author) {
+      scmInfo.author = author;
+    }
+
+    return scmInfo;
+  }
+
+  private getTestReport(build: JenkinsBuild): {
+    total: number;
+    passed: number;
+    skipped: number;
+    failed: number;
+    testUrl: string;
+  } {
+    return build.actions
+      .filter(
+        (action: any) =>
+          action._class === 'hudson.tasks.junit.TestResultAction',
+      )
+      .map((action: any) => {
+        return {
+          total: action.totalCount,
+          passed: action.totalCount - action.failCount - action.skipCount,
+          skipped: action.skipCount,
+          failed: action.failCount,
+          testUrl: `${build.url}${action.urlName}/`,
+        };
+      })
+      .pop();
+  }
+}
diff --git a/plugins/jenkins-backend/src/service/jenkinsInfoProvider.test.ts b/plugins/jenkins-backend/src/service/jenkinsInfoProvider.test.ts
new file mode 100644
index 0000000000..08439297a7
--- /dev/null
+++ b/plugins/jenkins-backend/src/service/jenkinsInfoProvider.test.ts
@@ -0,0 +1,408 @@
+/*
+ * Copyright 2021 Spotify AB
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { CatalogClient } from '@backstage/catalog-client';
+import { Entity, EntityName } from '@backstage/catalog-model';
+import { ConfigReader } from '@backstage/config';
+import {
+  DefaultJenkinsInfoProvider,
+  JenkinsConfig,
+  JenkinsInfo,
+} from './jenkinsInfoProvider';
+
+describe('JenkinsConfig', () => {
+  it('Reads simple config and annotation', async () => {
+    const config = JenkinsConfig.fromConfig(
+      new ConfigReader({
+        jenkins: {
+          baseUrl: 'https://jenkins.example.com',
+          username: 'backstage - bot',
+          apiKey: '123456789abcdef0123456789abcedf012',
+        },
+      }),
+    );
+
+    expect(config.instances).toEqual([
+      {
+        name: 'default',
+        baseUrl: 'https://jenkins.example.com',
+        username: 'backstage - bot',
+        apiKey: '123456789abcdef0123456789abcedf012',
+      },
+    ]);
+  });
+
+  it('Reads named default config and annotation', async () => {
+    const config = JenkinsConfig.fromConfig(
+      new ConfigReader({
+        jenkins: {
+          instances: [
+            {
+              name: 'default',
+              baseUrl: 'https://jenkins.example.com',
+              username: 'backstage - bot',
+              apiKey: '123456789abcdef0123456789abcedf012',
+            },
+          ],
+        },
+      }),
+    );
+
+    expect(config.instances).toEqual([
+      {
+        name: 'default',
+        baseUrl: 'https://jenkins.example.com',
+        username: 'backstage - bot',
+        apiKey: '123456789abcdef0123456789abcedf012',
+      },
+    ]);
+  });
+
+  it('Parses named default config (amongst named other configs)', async () => {
+    const config = JenkinsConfig.fromConfig(
+      new ConfigReader({
+        jenkins: {
+          instances: [
+            {
+              name: 'default',
+              baseUrl: 'https://jenkins.example.com',
+              username: 'backstage - bot',
+              apiKey: '123456789abcdef0123456789abcedf012',
+            },
+            {
+              name: 'other',
+              baseUrl: 'https://jenkins-other.example.com',
+              username: 'backstage - bot',
+              apiKey: '123456789abcdef0123456789abcedf012',
+            },
+          ],
+        },
+      }),
+    );
+
+    expect(config.instances).toEqual([
+      {
+        name: 'default',
+        baseUrl: 'https://jenkins.example.com',
+        username: 'backstage - bot',
+        apiKey: '123456789abcdef0123456789abcedf012',
+      },
+      {
+        name: 'other',
+        baseUrl: 'https://jenkins-other.example.com',
+        username: 'backstage - bot',
+        apiKey: '123456789abcdef0123456789abcedf012',
+      },
+    ]);
+  });
+
+  it('Gets default Jenkins instance', async () => {
+    const config = new JenkinsConfig([
+      {
+        name: 'default',
+        baseUrl: 'https://jenkins.example.com',
+        username: 'backstage - bot',
+        apiKey: '123456789abcdef0123456789abcedf012',
+      },
+      {
+        name: 'other',
+        baseUrl: 'https://jenkins-other.example.com',
+        username: 'backstage - bot',
+        apiKey: '123456789abcdef0123456789abcedf012',
+      },
+    ]);
+
+    expect(config.getInstanceConfig()).toEqual({
+      name: 'default',
+      baseUrl: 'https://jenkins.example.com',
+      username: 'backstage - bot',
+      apiKey: '123456789abcdef0123456789abcedf012',
+    });
+  });
+
+  it('Gets named Jenkins instance', async () => {
+    const config = new JenkinsConfig([
+      {
+        name: 'default',
+        baseUrl: 'https://jenkins.example.com',
+        username: 'backstage - bot',
+        apiKey: '123456789abcdef0123456789abcedf012',
+      },
+      {
+        name: 'other',
+        baseUrl: 'https://jenkins-other.example.com',
+        username: 'backstage - bot',
+        apiKey: '123456789abcdef0123456789abcedf012',
+      },
+    ]);
+
+    expect(config.getInstanceConfig('other')).toEqual({
+      name: 'other',
+      baseUrl: 'https://jenkins-other.example.com',
+      username: 'backstage - bot',
+      apiKey: '123456789abcdef0123456789abcedf012',
+    });
+  });
+});
+
+describe('DefaultJenkinsInfoProvider', () => {
+  const mockCatalog: jest.Mocked<CatalogClient> = {
+    getEntityByName: jest.fn(),
+  } as any as jest.Mocked<CatalogClient>;
+
+  const entityRef: EntityName = {
+    kind: 'Component',
+    namespace: 'foo',
+    name: 'bar',
+  };
+
+  function configureProvider(configData: any, entityData: any) {
+    const config = new ConfigReader(configData);
+    mockCatalog.getEntityByName.mockReturnValueOnce(
+      Promise.resolve(entityData as Entity),
+    );
+
+    return DefaultJenkinsInfoProvider.fromConfig({
+      config,
+      catalog: mockCatalog,
+    });
+  }
+
+  it('Handles entity not found', async () => {
+    const provider = configureProvider({ jenkins: {} }, undefined);
+    await expect(provider.getInstance({ entityRef })).rejects.toThrowError();
+
+    expect(mockCatalog.getEntityByName).toBeCalledWith(entityRef);
+  });
+
+  it('Reads simple config and annotation', async () => {
+    const provider = configureProvider(
+      {
+        jenkins: {
+          baseUrl: 'https://jenkins.example.com',
+          username: 'backstage - bot',
+          apiKey: '123456789abcdef0123456789abcedf012',
+        },
+      },
+      {
+        metadata: {
+          annotations: {
+            'jenkins.io/job-full-name': 'teamA/artistLookup-build',
+          },
+        },
+      },
+    );
+    const info: JenkinsInfo = await provider.getInstance({ entityRef });
+
+    expect(mockCatalog.getEntityByName).toBeCalledWith(entityRef);
+    expect(info).toStrictEqual({
+      baseUrl: 'https://jenkins.example.com',
+      headers: {
+        Authorization:
+          'Basic YmFja3N0YWdlIC0gYm90OjEyMzQ1Njc4OWFiY2RlZjAxMjM0NTY3ODlhYmNlZGYwMTI=',
+      },
+      jobFullName: 'teamA/artistLookup-build',
+    });
+  });
+
+  it('Reads named default config and annotation', async () => {
+    const provider = configureProvider(
+      {
+        jenkins: {
+          instances: [
+            {
+              name: 'default',
+              baseUrl: 'https://jenkins.example.com',
+              username: 'backstage - bot',
+              apiKey: '123456789abcdef0123456789abcedf012',
+            },
+          ],
+        },
+      },
+      {
+        metadata: {
+          annotations: {
+            'jenkins.io/job-full-name': 'teamA/artistLookup-build',
+          },
+        },
+      },
+    );
+    const info: JenkinsInfo = await provider.getInstance({ entityRef });
+
+    expect(mockCatalog.getEntityByName).toBeCalledWith(entityRef);
+    expect(info).toMatchObject({
+      baseUrl: 'https://jenkins.example.com',
+      jobFullName: 'teamA/artistLookup-build',
+    });
+  });
+
+  it('Reads named default config (amongst named other configs) and annotation', async () => {
+    const provider = configureProvider(
+      {
+        jenkins: {
+          instances: [
+            {
+              name: 'default',
+              baseUrl: 'https://jenkins.example.com',
+              username: 'backstage - bot',
+              apiKey: '123456789abcdef0123456789abcedf012',
+            },
+            {
+              name: 'other',
+              baseUrl: 'https://jenkins-other.example.com',
+              username: 'backstage - bot',
+              apiKey: '123456789abcdef0123456789abcedf012',
+            },
+          ],
+        },
+      },
+      {
+        metadata: {
+          annotations: {
+            'jenkins.io/job-full-name': 'teamA/artistLookup-build',
+          },
+        },
+      },
+    );
+    const info: JenkinsInfo = await provider.getInstance({ entityRef });
+
+    expect(mockCatalog.getEntityByName).toBeCalledWith(entityRef);
+    expect(info).toMatchObject({
+      baseUrl: 'https://jenkins.example.com',
+      jobFullName: 'teamA/artistLookup-build',
+    });
+  });
+
+  it('Reads named other config and named annotation', async () => {
+    const provider = configureProvider(
+      {
+        jenkins: {
+          instances: [
+            {
+              name: 'default',
+              baseUrl: 'https://jenkins.example.com',
+              username: 'backstage - bot',
+              apiKey: '123456789abcdef0123456789abcedf012',
+            },
+            {
+              name: 'other',
+              baseUrl: 'https://jenkins-other.example.com',
+              username: 'backstage - bot',
+              apiKey: '123456789abcdef0123456789abcedf012',
+            },
+          ],
+        },
+      },
+      {
+        metadata: {
+          annotations: {
+            'jenkins.io/job-full-name': 'other:teamA/artistLookup-build',
+          },
+        },
+      },
+    );
+    const info: JenkinsInfo = await provider.getInstance({ entityRef });
+
+    expect(mockCatalog.getEntityByName).toBeCalledWith(entityRef);
+    expect(info).toMatchObject({
+      baseUrl: 'https://jenkins-other.example.com',
+      jobFullName: 'teamA/artistLookup-build',
+    });
+  });
+
+  it('Reads simple config and default named annotation', async () => {
+    const provider = configureProvider(
+      {
+        jenkins: {
+          baseUrl: 'https://jenkins.example.com',
+          username: 'backstage - bot',
+          apiKey: '123456789abcdef0123456789abcedf012',
+        },
+      },
+      {
+        metadata: {
+          annotations: {
+            'jenkins.io/job-full-name': 'default:teamA/artistLookup-build',
+          },
+        },
+      },
+    );
+    const info: JenkinsInfo = await provider.getInstance({ entityRef });
+
+    expect(mockCatalog.getEntityByName).toBeCalledWith(entityRef);
+    expect(info).toMatchObject({
+      baseUrl: 'https://jenkins.example.com',
+      jobFullName: 'teamA/artistLookup-build',
+    });
+  });
+
+  it('Reads simple config and old annotation', async () => {
+    const provider = configureProvider(
+      {
+        jenkins: {
+          baseUrl: 'https://jenkins.example.com',
+          username: 'backstage - bot',
+          apiKey: '123456789abcdef0123456789abcedf012',
+        },
+      },
+      {
+        metadata: {
+          annotations: {
+            'jenkins.io/github-folder': 'teamA/artistLookup-build',
+          },
+        },
+      },
+    );
+    const info: JenkinsInfo = await provider.getInstance({ entityRef });
+
+    expect(mockCatalog.getEntityByName).toBeCalledWith(entityRef);
+    expect(info).toMatchObject({
+      baseUrl: 'https://jenkins.example.com',
+      jobFullName: 'teamA/artistLookup-build',
+    });
+  });
+
+  it('Reads named other config (with on default config) and named annotation', async () => {
+    const provider = configureProvider(
+      {
+        jenkins: {
+          instances: [
+            {
+              name: 'other',
+              baseUrl: 'https://jenkins-other.example.com',
+              username: 'backstage - bot',
+              apiKey: '123456789abcdef0123456789abcedf012',
+            },
+          ],
+        },
+      },
+      {
+        metadata: {
+          annotations: {
+            'jenkins.io/job-full-name': 'other:teamA/artistLookup-build',
+          },
+        },
+      },
+    );
+    const info: JenkinsInfo = await provider.getInstance({ entityRef });
+
+    expect(mockCatalog.getEntityByName).toBeCalledWith(entityRef);
+    expect(info).toMatchObject({
+      baseUrl: 'https://jenkins-other.example.com',
+      jobFullName: 'teamA/artistLookup-build',
+    });
+  });
+});
diff --git a/plugins/jenkins-backend/src/service/jenkinsInfoProvider.ts b/plugins/jenkins-backend/src/service/jenkinsInfoProvider.ts
new file mode 100644
index 0000000000..1a992e73f1
--- /dev/null
+++ b/plugins/jenkins-backend/src/service/jenkinsInfoProvider.ts
@@ -0,0 +1,243 @@
+/*
+ * Copyright 2021 Spotify AB
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import { CatalogClient } from '@backstage/catalog-client';
+import {
+  Entity,
+  EntityName,
+  stringifyEntityRef,
+} from '@backstage/catalog-model';
+import { Config } from '@backstage/config';
+
+export interface JenkinsInfoProvider {
+  getInstance(options: {
+    /**
+     * The entity to get the info about.
+     */
+    entityRef: EntityName;
+    /**
+     * A specific job to get. This is only passed in when we know about a job name we are interested in.
+     */
+    jobFullName?: string;
+  }): Promise<JenkinsInfo>;
+}
+
+export interface JenkinsInfo {
+  baseUrl: string;
+  headers?: Record<string, string | string[]>;
+  jobFullName: string; // TODO: make this an array
+}
+
+export interface JenkinsInstanceConfig {
+  name: string;
+  baseUrl: string;
+  username: string;
+  apiKey: string;
+}
+
+/**
+ * Holds multiple Jenkins configurations.
+ */
+export class JenkinsConfig {
+  constructor(public readonly instances: JenkinsInstanceConfig[]) {}
+
+  /**
+   * Read all Jenkins instance configurations.
+   * @param config - Root configuration
+   * @returns A JenkinsConfig that contains all configured Jenkins instances.
+   */
+  static fromConfig(config: Config): JenkinsConfig {
+    const DEFAULT_JENKINS_NAME = 'default';
+
+    const jenkinsConfig = config.getConfig('jenkins');
+
+    // load all named instance config
+    const namedInstanceConfig =
+      jenkinsConfig.getOptionalConfigArray('instances')?.map(c => ({
+        name: c.getString('name'),
+        baseUrl: c.getString('baseUrl'),
+        username: c.getString('username'),
+        apiKey: c.getString('apiKey'),
+      })) || [];
+
+    // load unnamed default config
+    const hasNamedDefault = namedInstanceConfig.some(
+      x => x.name === DEFAULT_JENKINS_NAME,
+    );
+
+    // Get these as optional strings and check to give a better error message
+    const baseUrl = jenkinsConfig.getOptionalString('baseUrl');
+    const username = jenkinsConfig.getOptionalString('username');
+    const apiKey = jenkinsConfig.getOptionalString('apiKey');
+
+    if (hasNamedDefault && (baseUrl || username || apiKey)) {
+      throw new Error(
+        `Found both a named jenkins instance with name ${DEFAULT_JENKINS_NAME} and top level baseUrl, username or apiKey config. Use only one style of config.`,
+      );
+    }
+
+    const unnamedNonePresent = !baseUrl && !username && !apiKey;
+    const unnamedAllPresent = baseUrl && username && apiKey;
+    if (!(unnamedAllPresent || unnamedNonePresent)) {
+      throw new Error(
+        `Found partial default jenkins config. All (or none) of  baseUrl, username ans apiKey must be provided.`,
+      );
+    }
+
+    if (unnamedAllPresent) {
+      const unnamedInstanceConfig = [
+        { name: DEFAULT_JENKINS_NAME, baseUrl, username, apiKey },
+      ] as {
+        name: string;
+        baseUrl: string;
+        username: string;
+        apiKey: string;
+      }[];
+
+      return new JenkinsConfig([
+        ...namedInstanceConfig,
+        ...unnamedInstanceConfig,
+      ]);
+    }
+
+    return new JenkinsConfig(namedInstanceConfig);
+  }
+
+  /**
+   * Gets a Jenkins instance configuration by name, or the default one if no
+   * name is provided.
+   * @param jenkinsName - Optional name of the Jenkins instance.
+   * @returns The requested Jenkins instance.
+   */
+  getInstanceConfig(jenkinsName?: string): JenkinsInstanceConfig {
+    const DEFAULT_JENKINS_NAME = 'default';
+
+    if (!jenkinsName || jenkinsName === DEFAULT_JENKINS_NAME) {
+      // no name provided, use default
+      const instanceConfig = this.instances.find(
+        c => c.name === DEFAULT_JENKINS_NAME,
+      );
+
+      if (!instanceConfig) {
+        throw new Error(
+          `Couldn't find a default jenkins instance in the config. Either configure an instance with name ${DEFAULT_JENKINS_NAME} or add a prefix to your annotation value.`,
+        );
+      }
+
+      return instanceConfig;
+    }
+
+    // A name is provided, look it up.
+    const instanceConfig = this.instances.find(c => c.name === jenkinsName);
+
+    if (!instanceConfig) {
+      throw new Error(
+        `Couldn't find a jenkins instance in the config with name ${jenkinsName}`,
+      );
+    }
+    return instanceConfig;
+  }
+}
+
+/**
+ * Use default config and annotations, build using fromConfig static function.
+ *
+ * This will fallback through various deprecated config and annotation schemes.
+ */
+export class DefaultJenkinsInfoProvider implements JenkinsInfoProvider {
+  static readonly OLD_JENKINS_ANNOTATION = 'jenkins.io/github-folder';
+  static readonly NEW_JENKINS_ANNOTATION = 'jenkins.io/job-full-name';
+
+  private constructor(
+    private readonly config: JenkinsConfig,
+    private readonly catalog: CatalogClient,
+  ) {}
+
+  static fromConfig(options: {
+    config: Config;
+    catalog: CatalogClient;
+  }): DefaultJenkinsInfoProvider {
+    return new DefaultJenkinsInfoProvider(
+      JenkinsConfig.fromConfig(options.config),
+      options.catalog,
+    );
+  }
+
+  async getInstance(opt: {
+    entityRef: EntityName;
+    jobFullName?: string;
+  }): Promise<JenkinsInfo> {
+    // load entity
+    const entity = await this.catalog.getEntityByName(opt.entityRef);
+    if (!entity) {
+      throw new Error(
+        `Couldn't find entity with name: ${stringifyEntityRef(opt.entityRef)}`,
+      );
+    }
+
+    // lookup `[jenkinsName#]jobFullName` from entity annotation
+    const jenkinsAndJobName =
+      DefaultJenkinsInfoProvider.getEntityAnnotationValue(entity);
+    if (!jenkinsAndJobName) {
+      throw new Error(
+        `Couldn't find jenkins annotation (${
+          DefaultJenkinsInfoProvider.NEW_JENKINS_ANNOTATION
+        }) on entity with name: ${stringifyEntityRef(opt.entityRef)}`,
+      );
+    }
+
+    let jobFullName;
+    let jenkinsName: string | undefined;
+    const splitIndex = jenkinsAndJobName.indexOf(':');
+    if (splitIndex === -1) {
+      // no jenkinsName specified, use default
+      jobFullName = jenkinsAndJobName;
+    } else {
+      // There is a jenkinsName specified
+      jenkinsName = jenkinsAndJobName.substring(0, splitIndex);
+      jobFullName = jenkinsAndJobName.substring(
+        splitIndex + 1,
+        jenkinsAndJobName.length,
+      );
+    }
+
+    // lookup baseURL + creds from config
+    const instanceConfig = this.config.getInstanceConfig(jenkinsName);
+
+    const creds = Buffer.from(
+      `${instanceConfig.username}:${instanceConfig.apiKey}`,
+      'binary',
+    ).toString('base64');
+
+    return {
+      baseUrl: instanceConfig.baseUrl,
+      headers: {
+        Authorization: `Basic ${creds}`,
+      },
+      jobFullName,
+    };
+  }
+
+  private static getEntityAnnotationValue(entity: Entity) {
+    return (
+      entity.metadata.annotations?.[
+        DefaultJenkinsInfoProvider.OLD_JENKINS_ANNOTATION
+      ] ||
+      entity.metadata.annotations?.[
+        DefaultJenkinsInfoProvider.NEW_JENKINS_ANNOTATION
+      ]
+    );
+  }
+}
diff --git a/plugins/jenkins-backend/src/service/router.ts b/plugins/jenkins-backend/src/service/router.ts
new file mode 100644
index 0000000000..273086b5ff
--- /dev/null
+++ b/plugins/jenkins-backend/src/service/router.ts
@@ -0,0 +1,123 @@
+/*
+ * Copyright 2020 Spotify AB
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { errorHandler } from '@backstage/backend-common';
+import express from 'express';
+import Router from 'express-promise-router';
+import { Logger } from 'winston';
+import { JenkinsInfoProvider } from './jenkinsInfoProvider';
+import { JenkinsApiImpl } from './jenkinsApi';
+
+export interface RouterOptions {
+  logger: Logger;
+  jenkinsInfoProvider: JenkinsInfoProvider;
+}
+
+export async function createRouter(
+  options: RouterOptions,
+): Promise<express.Router> {
+  const { jenkinsInfoProvider } = options;
+
+  const jenkinsApi = new JenkinsApiImpl();
+
+  const router = Router();
+  router.use(express.json());
+
+  router.get(
+    '/v1/entity/:namespace/:kind/:name/projects',
+    async (request, response) => {
+      const { namespace, kind, name } = request.params;
+      const branch = request.query.branch;
+      let branchStr: string | undefined;
+
+      if (branch === undefined) {
+        branchStr = undefined;
+      } else if (typeof branch === 'string') {
+        branchStr = branch;
+      } else {
+        // this was passed in as something weird -> 400
+        // https://evanhahn.com/gotchas-with-express-query-parsing-and-how-to-avoid-them/
+        response
+          .status(400)
+          .send('Something was unexpected about the branch queryString');
+
+        return;
+      }
+
+      const jenkinsInfo = await jenkinsInfoProvider.getInstance({
+        entityRef: {
+          kind,
+          namespace,
+          name,
+        },
+      });
+      const projects = await jenkinsApi.getProjects(jenkinsInfo, branchStr);
+
+      response.json({
+        projects: projects,
+      });
+    },
+  );
+
+  router.get(
+    '/v1/entity/:namespace/:kind/:name/job/:jobFullName/:buildNumber',
+    async (request, response) => {
+      const { namespace, kind, name, jobFullName, buildNumber } =
+        request.params;
+
+      const jenkinsInfo = await jenkinsInfoProvider.getInstance({
+        entityRef: {
+          kind,
+          namespace,
+          name,
+        },
+        jobFullName,
+      });
+
+      const build = await jenkinsApi.getBuild(
+        jenkinsInfo,
+        jobFullName,
+        parseInt(buildNumber, 10),
+      );
+
+      response.json({
+        build: build,
+      });
+    },
+  );
+
+  router.post(
+    '/v1/entity/:namespace/:kind/:name/job/:jobFullName/:buildNumber::rebuild',
+    async (request, response) => {
+      const { namespace, kind, name, jobFullName } = request.params;
+
+      const jenkinsInfo = await jenkinsInfoProvider.getInstance({
+        entityRef: {
+          kind,
+          namespace,
+          name,
+        },
+        jobFullName,
+      });
+
+      await jenkinsApi.buildProject(jenkinsInfo, jobFullName);
+      response.json({});
+    },
+  );
+
+  router.use(errorHandler());
+  return router;
+}
diff --git a/plugins/jenkins-backend/src/service/standaloneServer.ts b/plugins/jenkins-backend/src/service/standaloneServer.ts
new file mode 100644
index 0000000000..a1bc5dd256
--- /dev/null
+++ b/plugins/jenkins-backend/src/service/standaloneServer.ts
@@ -0,0 +1,57 @@
+/*
+ * Copyright 2021 Spotify AB
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { createServiceBuilder } from '@backstage/backend-common';
+import { Server } from 'http';
+import { Logger } from 'winston';
+import { createRouter } from './router';
+import { EntityRef } from '@backstage/catalog-model';
+import { JenkinsInfo } from './jenkinsInfoProvider';
+
+export interface ServerOptions {
+  port: number;
+  enableCors: boolean;
+  logger: Logger;
+}
+
+export async function startStandaloneServer(
+  options: ServerOptions,
+): Promise<Server> {
+  const logger = options.logger.child({ service: 'jenkins-backend' });
+  logger.debug('Starting application server...');
+  const router = await createRouter({
+    logger,
+    jenkinsInfoProvider: {
+      async getInstance(_: { entityRef: EntityRef }): Promise<JenkinsInfo> {
+        return { baseUrl: 'https://example.com/', jobFullName: 'build-foo' };
+      },
+    },
+  });
+
+  let service = createServiceBuilder(module)
+    .setPort(options.port)
+    .addRouter('/jenkins', router);
+  if (options.enableCors) {
+    service = service.enableCors({ origin: 'http://localhost:3000' });
+  }
+
+  return await service.start().catch(err => {
+    logger.error(err);
+    process.exit(1);
+  });
+}
+
+module.hot?.accept();
diff --git a/plugins/jenkins-backend/src/setupTests.ts b/plugins/jenkins-backend/src/setupTests.ts
new file mode 100644
index 0000000000..ba33cf996b
--- /dev/null
+++ b/plugins/jenkins-backend/src/setupTests.ts
@@ -0,0 +1,17 @@
+/*
+ * Copyright 2020 Spotify AB
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+export {};
diff --git a/plugins/jenkins-backend/src/types.ts b/plugins/jenkins-backend/src/types.ts
new file mode 100644
index 0000000000..4dceecd0cc
--- /dev/null
+++ b/plugins/jenkins-backend/src/types.ts
@@ -0,0 +1,87 @@
+/*
+ * Copyright 2021 Spotify AB
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+export interface ScmDetails {
+  url?: string;
+  displayName?: string;
+  author?: string;
+}
+
+interface CommonBuild {
+  // standard Jenkins
+  timestamp: number;
+  building: boolean;
+  duration: number;
+  result?: string;
+  fullDisplayName: string;
+  displayName: string;
+  url: string;
+  number: number;
+}
+
+export interface JenkinsBuild extends CommonBuild {
+  // read by us from jenkins but not passed to frontend
+  actions: any;
+}
+
+/**
+ * A build as presented by this plugin to the backstage jenkins plugin
+ */
+export interface BackstageBuild extends CommonBuild {
+  // added by us
+  source?: {
+    branchName: string;
+    displayName: string;
+    url: string;
+    commit: {
+      hash: string;
+    };
+    author: string;
+  };
+  tests: {
+    passed: number;
+    skipped: number;
+    failed: number;
+    total: number;
+    testUrl: string;
+  };
+  status: string; // == building ? 'running' : result,
+}
+
+export interface CommonProject {
+  // standard Jenkins
+  lastBuild: CommonBuild | null;
+  displayName: string;
+  fullDisplayName: string;
+  fullName: string;
+  inQueue: boolean;
+}
+
+export interface JenkinsProject extends CommonProject {
+  // standard Jenkins
+  lastBuild: JenkinsBuild | null;
+
+  // read by us from jenkins but not passed to frontend
+  actions: object[];
+}
+
+export interface BackstageProject extends CommonProject {
+  // standard Jenkins
+  lastBuild: BackstageBuild | null;
+
+  // added by us
+  status: string; // == inQueue ? 'queued' : lastBuild.building ? 'running' : lastBuild.result,
+}
diff --git a/plugins/jenkins/CHANGELOG.md b/plugins/jenkins/CHANGELOG.md
index fbfb17926b..ca5e4c3ed8 100644
--- a/plugins/jenkins/CHANGELOG.md
+++ b/plugins/jenkins/CHANGELOG.md
@@ -1,5 +1,139 @@
 # @backstage/plugin-jenkins
 
+## 0.5.5
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@0.4.5
+  - @backstage/core-components@0.4.0
+  - @backstage/catalog-model@0.9.1
+
+## 0.5.4
+
+### Patch Changes
+
+- d7d1f6fb9: Make `isJenkinsAvailable` recognise both the old and the new Jenkins annotation.
+- Updated dependencies
+  - @backstage/plugin-catalog-react@0.4.3
+  - @backstage/core-components@0.3.2
+  - @backstage/theme@0.2.10
+
+## 0.5.3
+
+### Patch Changes
+
+- 8bedb75ae: Update Luxon dependency to 2.x
+- Updated dependencies
+  - @backstage/core-components@0.3.1
+  - @backstage/core-plugin-api@0.1.6
+  - @backstage/plugin-catalog-react@0.4.2
+
+## 0.5.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.3.0
+  - @backstage/core-plugin-api@0.1.5
+  - @backstage/plugin-catalog-react@0.4.1
+
+## 0.5.1
+
+### Patch Changes
+
+- 9d40fcb1e: - Bumping `material-ui/core` version to at least `4.12.2` as they made some breaking changes in later versions which broke `Pagination` of the `Table`.
+  - Switching out `material-table` to `@material-table/core` for support for the later versions of `material-ui/core`
+  - This causes a minor API change to `@backstage/core-components` as the interface for `Table` re-exports the `prop` from the underlying `Table` components.
+  - `onChangeRowsPerPage` has been renamed to `onRowsPerPageChange`
+  - `onChangePage` has been renamed to `onPageChange`
+  - Migration guide is here: https://material-table-core.com/docs/breaking-changes
+- Updated dependencies
+  - @backstage/core-components@0.2.0
+  - @backstage/plugin-catalog-react@0.4.0
+  - @backstage/core-plugin-api@0.1.4
+  - @backstage/theme@0.2.9
+
+## 0.5.0
+
+### Minor Changes
+
+- 6c7f00eb0: ## Extract an entity-oriented Jenkins Backend
+
+  Change the Jenkins plugin from talking directly with a single Jenkins instance (via the proxy) to having a specific
+  backend plugin which talks to the Jenkins instances.
+
+  Existing users of the Jenkins plugin will need to configure a Jenkins backend instead of a proxy.
+  Typically, this means creating a `src/plugins/jenkins.ts` file, adding a reference to it to `src/index.ts` and changing app-config.yaml
+
+  ### jenkins.ts
+
+  ```typescript
+  import {
+    createRouter,
+    DefaultJenkinsInfoProvider,
+  } from '@backstage/plugin-jenkins-backend';
+  import { CatalogClient } from '@backstage/catalog-client';
+  import { Router } from 'express';
+  import { PluginEnvironment } from '../types';
+
+  export default async function createPlugin({
+    logger,
+    config,
+    discovery,
+  }: PluginEnvironment): Promise<Router> {
+    const catalogClient = new CatalogClient({ discoveryApi: discovery });
+
+    return await createRouter({
+      logger,
+      jenkinsInfoProvider: new DefaultJenkinsInfoProvider(
+        catalogClient,
+        config,
+      ),
+    });
+  }
+  ```
+
+  ### app-config.yaml
+
+  For example
+
+  ```yaml
+  proxy:
+    '/jenkins/api':
+      target: 'https://jenkins.example.com:8080' # your Jenkins URL
+      changeOrigin: true
+      headers:
+        Authorization: Basic ${JENKINS_BASIC_AUTH_HEADER}
+  ```
+
+  Would become:
+
+  ```yaml
+  jenkins:
+    baseUrl: https://jenkins.example.com:8080
+    username: backstage-bot
+    apiKey: ${JENKINS_PASSWORD}
+  ```
+
+  ## Change JavaScript API
+
+  As part of the above change, the JavaScript API exposed by the plugin as a possible place for customisation has changed.
+  The ApiRef now has an id of `plugin.jenkins.service2` and has entity-based functions to match the endpoints exposed by
+  the new backend plugin
+
+  ## Change BuildWithStepsPage route
+
+  The plugin originally provided a route to view a particular build of a particular branch so that if you wanted to view
+  the master branch of an entity annotated with `'jenkins.io/github-folder': teamA/artistLookup-build` you could typically
+  access `/catalog/default/component/artist-lookup/ci-cd/run/master/7` but would now have to access
+  `/catalog/default/component/artist-lookup/ci-cd/build/teamA%2FartistLookup-build%2Fmaster/7`
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@0.3.0
+
 ## 0.4.7
 
 ### Patch Changes
diff --git a/plugins/jenkins/README.md b/plugins/jenkins/README.md
index 69304cb847..1af511b16f 100644
--- a/plugins/jenkins/README.md
+++ b/plugins/jenkins/README.md
@@ -16,45 +16,54 @@ cd packages/app
 yarn add @backstage/plugin-jenkins
 ```
 
-2. Add the `EntityJenkinsContent` extension to the entity page in the app:
+2. Add and configure the backend plugin according to it's instructions
+
+3. Add the `EntityJenkinsContent` extension to the `CI/CD` page and `EntityLatestJenkinsRunCard` to the `overview` page in the app (or wherever you'd prefer):
+
+Note that if you configured a custom JenkinsInfoProvider in step 2, you may need a custom isJenkinsAvailable.
 
 ```tsx
 // In packages/app/src/components/catalog/EntityPage.tsx
-import { EntityJenkinsContent } from '@backstage/plugin-jenkins';
+import {
+  EntityJenkinsContent,
+  EntityLatestJenkinsRunCard,
+  isJenkinsAvailable,
+} from '@backstage/plugin-jenkins';
 
 // You can add the tab to any number of pages, the service page is shown as an
 // example here
 const serviceEntityPage = (
   <EntityLayout>
-    {/* other tabs... */}
-    <EntityLayout.Route path="/jenkins" title="Jenkins">
-      <EntityJenkinsContent />
+    <EntityLayout.Route path="/" title="Overview">
+      {/* ... */}
+      <EntitySwitch>
+        <EntitySwitch.Case if={isJenkinsAvailable}>
+          <Grid item sm={6}>
+            <EntityLatestJenkinsRunCard branch="master" variant="gridItem" />
+          </Grid>
+        </EntitySwitch.Case>
+        {/* ... */}
+      </EntitySwitch>
     </EntityLayout.Route>
+    {/* other tabs... */}
+    <EntityLayout.Route path="/ci-cd" title="CI/CD">
+      <EntitySwitch>
+        <EntitySwitch.Case if={isJenkinsAvailable}>
+          <EntityJenkinsContent />
+        </EntitySwitch.Case>
+        {/* ... */}
+      </EntitySwitch>
+    </EntityLayout.Route>
+    {/* ... */}
+  </EntityLayout>
+);
 ```
 
-3. Add proxy configuration to `app-config.yaml`
+4. Run app with `yarn start`
+5. Add the Jenkins folder annotation to your `catalog-info.yaml`.
 
-```yaml
-proxy:
-  '/jenkins/api':
-    target: 'http://localhost:8080' # your Jenkins URL
-    changeOrigin: true
-    headers:
-      Authorization: Basic ${JENKINS_BASIC_AUTH_HEADER}
-```
-
-4. Add an environment variable which contains the Jenkins credentials (NOTE:
-   use an API token, not your password). Here `user` is the name of the user
-   created in Jenkins.
-
-```shell
-export JENKINS_BASIC_AUTH_HEADER=$(echo -n user:api-token | base64)
-```
-
-5. Run the app with `yarn start`
-
-6. Add the Jenkins folder annotation to your `catalog-info.yaml`, (NOTE:
-   currently this plugin only supports folders and Git SCM)
+Currently, this plugin only supports folders and Git SCM.
+Note that if you configured a custom JenkinsInfoProvider in step 2, you may need to use a different annotation scheme here
 
 ```yaml
 apiVersion: backstage.io/v1alpha1
@@ -75,21 +84,6 @@ spec:
 8. Click the component in the catalog. You should now see Jenkins builds, and a
    last build result for your master build.
 
-Note: If you are not using environment variables, you can directly type the API
-token into `app-config.yaml`.
-
-```yaml
-proxy:
-  '/jenkins/api':
-    target: 'http://localhost:8080' # your Jenkins URL
-    changeOrigin: true
-    headers:
-      Authorization: Basic YWRtaW46MTFlYzI1NmU0Mzg1MDFjM2Y1Yzc2Yjc1MWE3ZTQ3YWY4Mw==
-```
-
-The string starting with `YWR...` is the base64 encoding of the user and their
-API token, e.g. `admin:11ec256e438501c3f5c76b751a7e47af83`.
-
 ## Features
 
 - View all runs inside a folder
diff --git a/plugins/jenkins/api-report.md b/plugins/jenkins/api-report.md
index 47ec8d655f..5a50c14f87 100644
--- a/plugins/jenkins/api-report.md
+++ b/plugins/jenkins/api-report.md
@@ -9,14 +9,21 @@ import { ApiRef } from '@backstage/core-plugin-api';
 import { BackstagePlugin } from '@backstage/core-plugin-api';
 import { DiscoveryApi } from '@backstage/core-plugin-api';
 import { Entity } from '@backstage/catalog-model';
+import { EntityName } from '@backstage/catalog-model';
+import { EntityRef } from '@backstage/catalog-model';
+import { IdentityApi } from '@backstage/core-plugin-api';
 import { InfoCardVariants } from '@backstage/core-components';
 import { RouteRef } from '@backstage/core-plugin-api';
 
+// Warning: (ae-missing-release-tag) "EntityJenkinsContent" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export const EntityJenkinsContent: (_props: {
   entity?: Entity | undefined;
 }) => JSX.Element;
 
+// Warning: (ae-missing-release-tag) "EntityLatestJenkinsRunCard" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export const EntityLatestJenkinsRunCard: ({
   branch,
@@ -26,46 +33,95 @@ export const EntityLatestJenkinsRunCard: ({
   variant?: InfoCardVariants | undefined;
 }) => JSX.Element;
 
+// Warning: (ae-missing-release-tag) "isJenkinsAvailable" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 const isJenkinsAvailable: (entity: Entity) => boolean;
 export { isJenkinsAvailable };
 export { isJenkinsAvailable as isPluginApplicableToEntity };
 
+// Warning: (ae-missing-release-tag) "JENKINS_ANNOTATION" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
-export const JENKINS_ANNOTATION = 'jenkins.io/github-folder';
+export const JENKINS_ANNOTATION = 'jenkins.io/job-full-name';
 
+// Warning: (ae-missing-release-tag) "JenkinsApi" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
-export class JenkinsApi {
-  constructor(options: Options);
+export interface JenkinsApi {
+  // Warning: (tsdoc-param-tag-with-invalid-name) The @param block should be followed by a valid parameter name: The identifier cannot non-word characters
+  // Warning: (tsdoc-param-tag-with-invalid-name) The @param block should be followed by a valid parameter name: The identifier cannot non-word characters
+  // Warning: (tsdoc-param-tag-with-invalid-name) The @param block should be followed by a valid parameter name: The identifier cannot non-word characters
+  // Warning: (ae-forgotten-export) The symbol "Build" needs to be exported by the entry point index.d.ts
+  getBuild(options: {
+    entity: EntityName;
+    jobFullName: string;
+    buildNumber: string;
+  }): Promise<Build>;
+  // Warning: (tsdoc-param-tag-with-invalid-name) The @param block should be followed by a valid parameter name: The identifier cannot non-word characters
+  // Warning: (tsdoc-param-tag-with-invalid-name) The @param block should be followed by a valid parameter name: The identifier cannot non-word characters
+  // Warning: (ae-forgotten-export) The symbol "Project" needs to be exported by the entry point index.d.ts
+  getProjects(options: {
+    entity: EntityRef;
+    filter: {
+      branch?: string;
+    };
+  }): Promise<Project[]>;
   // (undocumented)
-  extractJobDetailsFromBuildName(
-    buildName: string,
-  ): {
-    jobName: string;
-    buildNumber: number;
-  };
-  // (undocumented)
-  extractScmDetailsFromJob(jobDetails: any): any | undefined;
-  // (undocumented)
-  getBuild(buildName: string): Promise<any>;
-  // (undocumented)
-  getFolder(folderName: string): Promise<CITableBuildInfo[]>;
-  // (undocumented)
-  getJob(jobName: string): Promise<any>;
-  // (undocumented)
-  getLastBuild(jobName: string): Promise<any>;
-  // (undocumented)
-  mapJenkinsBuildToCITable(
-    jenkinsResult: any,
-    jobScmInfo?: any,
-  ): CITableBuildInfo;
-  // (undocumented)
-  retry(buildName: string): Promise<any>;
+  retry(options: {
+    entity: EntityName;
+    jobFullName: string;
+    buildNumber: string;
+  }): Promise<void>;
 }
 
+// Warning: (ae-missing-release-tag) "jenkinsApiRef" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export const jenkinsApiRef: ApiRef<JenkinsApi>;
 
+// Warning: (ae-missing-release-tag) "JenkinsClient" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
+// @public (undocumented)
+export class JenkinsClient implements JenkinsApi {
+  constructor(options: {
+    discoveryApi: DiscoveryApi;
+    identityApi: IdentityApi;
+  });
+  // (undocumented)
+  getBuild({
+    entity,
+    jobFullName,
+    buildNumber,
+  }: {
+    entity: EntityName;
+    jobFullName: string;
+    buildNumber: string;
+  }): Promise<Build>;
+  // (undocumented)
+  getProjects({
+    entity,
+    filter,
+  }: {
+    entity: EntityName;
+    filter: {
+      branch?: string;
+    };
+  }): Promise<Project[]>;
+  // (undocumented)
+  retry({
+    entity,
+    jobFullName,
+    buildNumber,
+  }: {
+    entity: EntityName;
+    jobFullName: string;
+    buildNumber: string;
+  }): Promise<void>;
+}
+
+// Warning: (ae-missing-release-tag) "jenkinsPlugin" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 const jenkinsPlugin: BackstagePlugin<
   {
@@ -76,6 +132,8 @@ const jenkinsPlugin: BackstagePlugin<
 export { jenkinsPlugin };
 export { jenkinsPlugin as plugin };
 
+// Warning: (ae-missing-release-tag) "LatestRunCard" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export const LatestRunCard: ({
   branch,
@@ -85,6 +143,14 @@ export const LatestRunCard: ({
   variant?: InfoCardVariants | undefined;
 }) => JSX.Element;
 
+// Warning: (ae-missing-release-tag) "LEGACY_JENKINS_ANNOTATION" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
+// @public (undocumented)
+export const LEGACY_JENKINS_ANNOTATION = 'jenkins.io/github-folder';
+
+// Warning: (ae-forgotten-export) The symbol "Props" needs to be exported by the entry point index.d.ts
+// Warning: (ae-missing-release-tag) "Router" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export const Router: (_props: Props) => JSX.Element;
 
diff --git a/plugins/jenkins/package.json b/plugins/jenkins/package.json
index 6cc5436574..b25cffef61 100644
--- a/plugins/jenkins/package.json
+++ b/plugins/jenkins/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-jenkins",
-  "version": "0.4.7",
+  "version": "0.5.5",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -31,16 +31,15 @@
     "clean": "backstage-cli clean"
   },
   "dependencies": {
-    "@backstage/catalog-model": "^0.9.0",
-    "@backstage/core-components": "^0.1.5",
-    "@backstage/core-plugin-api": "^0.1.3",
-    "@backstage/plugin-catalog-react": "^0.2.6",
-    "@backstage/theme": "^0.2.8",
-    "@material-ui/core": "^4.11.0",
+    "@backstage/catalog-model": "^0.9.1",
+    "@backstage/core-components": "^0.4.1",
+    "@backstage/core-plugin-api": "^0.1.7",
+    "@backstage/plugin-catalog-react": "^0.4.5",
+    "@backstage/theme": "^0.2.10",
+    "@material-ui/core": "^4.12.2",
     "@material-ui/icons": "^4.9.1",
     "@material-ui/lab": "4.0.0-alpha.45",
-    "jenkins": "^0.28.0",
-    "luxon": "^1.25.0",
+    "luxon": "^2.0.2",
     "react": "^16.13.1",
     "react-dom": "^16.13.1",
     "react-router": "6.0.0-beta.0",
@@ -48,10 +47,10 @@
     "react-use": "^17.2.4"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.7.3",
-    "@backstage/core-app-api": "^0.1.4",
-    "@backstage/dev-utils": "^0.2.1",
-    "@backstage/test-utils": "^0.1.14",
+    "@backstage/cli": "^0.7.11",
+    "@backstage/core-app-api": "^0.1.12",
+    "@backstage/dev-utils": "^0.2.9",
+    "@backstage/test-utils": "^0.1.17",
     "@testing-library/jest-dom": "^5.10.1",
     "@testing-library/react": "^11.2.5",
     "@testing-library/user-event": "^13.1.8",
diff --git a/plugins/jenkins/src/api/JenkinsApi.ts b/plugins/jenkins/src/api/JenkinsApi.ts
index c378e15693..4b23fb4292 100644
--- a/plugins/jenkins/src/api/JenkinsApi.ts
+++ b/plugins/jenkins/src/api/JenkinsApi.ts
@@ -14,246 +14,205 @@
  * limitations under the License.
  */
 
-import { CITableBuildInfo } from '../components/BuildsPage/lib/CITable';
-import { createApiRef, DiscoveryApi } from '@backstage/core-plugin-api';
-
-const jenkins = require('jenkins');
+import {
+  createApiRef,
+  DiscoveryApi,
+  IdentityApi,
+} from '@backstage/core-plugin-api';
+import { EntityName, EntityRef } from '@backstage/catalog-model';
 
 export const jenkinsApiRef = createApiRef<JenkinsApi>({
-  id: 'plugin.jenkins.service',
+  id: 'plugin.jenkins.service2',
   description: 'Used by the Jenkins plugin to make requests',
 });
 
-const DEFAULT_PROXY_PATH = '/jenkins/api';
+export interface Build {
+  // standard Jenkins
+  timestamp: number;
+  building: boolean;
+  duration: number;
+  result?: string;
+  fullDisplayName: string;
+  displayName: string;
+  url: string;
+  number: number;
 
-type Options = {
-  discoveryApi: DiscoveryApi;
-  /**
-   * Path to use for requests via the proxy, defaults to /jenkins/api
-   */
-  proxyPath?: string;
-};
-
-export class JenkinsApi {
-  private readonly discoveryApi: DiscoveryApi;
-  private readonly proxyPath: string;
-
-  constructor(options: Options) {
-    this.discoveryApi = options.discoveryApi;
-    this.proxyPath = options.proxyPath ?? DEFAULT_PROXY_PATH;
-  }
-
-  private async getClient() {
-    const proxyUrl = await this.discoveryApi.getBaseUrl('proxy');
-    return jenkins({ baseUrl: proxyUrl + this.proxyPath, promisify: true });
-  }
-
-  async retry(buildName: string) {
-    const client = await this.getClient();
-    // looks like the current SDK only supports triggering a new build
-    // can't see any support for replay (re-running the specific build with the same SCM info)
-    return await client.job.build(buildName);
-  }
-
-  async getLastBuild(jobName: string) {
-    const client = await this.getClient();
-    const job = await client.job.get(jobName);
-
-    const lastBuild = await client.build.get(jobName, job.lastBuild.number);
-    return lastBuild;
-  }
-
-  extractScmDetailsFromJob(jobDetails: any): any | undefined {
-    const scmInfo = jobDetails.actions
-      .filter(
-        (action: any) =>
-          action._class === 'jenkins.scm.api.metadata.ObjectMetadataAction',
-      )
-      .map((action: any) => {
-        return {
-          url: action?.objectUrl,
-          // https://javadoc.jenkins.io/plugin/scm-api/jenkins/scm/api/metadata/ObjectMetadataAction.html
-          // branch name for regular builds, pull request title on pull requests
-          displayName: action?.objectDisplayName,
-        };
-      })
-      .pop();
-
-    if (!scmInfo) {
-      return undefined;
-    }
-
-    const author = jobDetails.actions
-      .filter(
-        (action: any) =>
-          action._class ===
-          'jenkins.scm.api.metadata.ContributorMetadataAction',
-      )
-      .map((action: any) => {
-        return action.contributorDisplayName;
-      })
-      .pop();
-
-    if (author) {
-      scmInfo.author = author;
-    }
-
-    return scmInfo;
-  }
-
-  async getJob(jobName: string) {
-    const client = await this.getClient();
-    return client.job.get({
-      name: jobName,
-      depth: 1,
-    });
-  }
-
-  async getFolder(folderName: string) {
-    const client = await this.getClient();
-    const folder = await client.job.get({
-      name: folderName,
-      // Filter only be the information we need, instead of loading all fields.
-      // Limit to only show the latest build for each job and only load 50 jobs
-      // at all.
-      // Whitespaces are only included for readablity here and stripped out
-      // before sending to Jenkins
-      tree: `jobs[
-               actions[*],
-               builds[
-                number,
-                url,
-                fullDisplayName,
-                building,
-                result,
-                actions[
-                  *[
-                    *[
-                      *[
-                        *
-                      ]
-                    ]
-                  ]
-                ]
-              ]{0,1},
-              jobs{0,1},
-              name
-            ]{0,50}
-            `.replace(/\s/g, ''),
-    });
-    const results = [];
-
-    for (const jobDetails of folder.jobs) {
-      const jobScmInfo = this.extractScmDetailsFromJob(jobDetails);
-      if (jobDetails?.jobs) {
-        // skipping folders inside folders for now
-      } else {
-        for (const buildDetails of jobDetails.builds) {
-          const ciTable = this.mapJenkinsBuildToCITable(
-            buildDetails,
-            jobScmInfo,
-          );
-          results.push(ciTable);
-        }
-      }
-    }
-    return results;
-  }
-
-  private getTestReport(
-    jenkinsResult: any,
-  ): {
-    total: number;
+  // added by us
+  source?: {
+    branchName: string;
+    displayName: string;
+    url: string;
+    commit: {
+      hash: string;
+    };
+    author: string;
+  };
+  tests: {
     passed: number;
     skipped: number;
     failed: number;
+    total: number;
     testUrl: string;
-  } {
-    return jenkinsResult.actions
-      .filter(
-        (action: any) =>
-          action._class === 'hudson.tasks.junit.TestResultAction',
-      )
-      .map((action: any) => {
-        return {
-          total: action.totalCount,
-          passed: action.totalCount - action.failCount - action.skipCount,
-          skipped: action.skipCount,
-          failed: action.failCount,
-          testUrl: `${jenkinsResult.url}${action.urlName}/`,
-        };
-      })
-      .pop();
+  };
+  status: string; // == building ? 'running' : result,
+}
+
+export interface Project {
+  // standard Jenkins
+  lastBuild: Build;
+  displayName: string;
+  fullDisplayName: string;
+  fullName: string;
+  inQueue: string;
+  // added by us
+  status: string; // == inQueue ? 'queued' : lastBuild.building ? 'running' : lastBuild.result,
+  onRestartClick: () => Promise<void>; // TODO rename to handle.* ? also, should this be on lastBuild?
+}
+
+export interface JenkinsApi {
+  /**
+   * Get the projects (jobs which have builds, not folders) including info about their lastBuild.
+   *
+   * Deciding what jobs are for an entity can be configured by the backstage _Integrator_ in the plugin-jenkins-backend setup
+   * and by the _Software Engineer_ using annotations agreed with the _Integrator_.
+   *
+   * Typically, a folder job will be identified and the backend plugin will recursively look for projects (jobs with builds) within that folder.
+   *
+   * @param options.entity the entity whose jobs should be retrieved.
+   * @param options.filter a filter on jobs. Currently this just takes a branch (and assumes certain structures in jenkins)
+   */
+  getProjects(options: {
+    entity: EntityRef;
+    filter: { branch?: string };
+  }): Promise<Project[]>;
+
+  /**
+   * Get a single build.
+   *
+   * This takes an entity to support selecting between multiple jenkins instances.
+   *
+   * TODO: abstract jobFullName (so we could support differentiating between the same named job on multiple instances).
+   * @param options.entity
+   * @param options.jobFullName
+   * @param options.buildNumber
+   */
+  getBuild(options: {
+    entity: EntityName;
+    jobFullName: string;
+    buildNumber: string;
+  }): Promise<Build>;
+
+  retry(options: {
+    entity: EntityName;
+    jobFullName: string;
+    buildNumber: string;
+  }): Promise<void>;
+}
+
+export class JenkinsClient implements JenkinsApi {
+  private readonly discoveryApi: DiscoveryApi;
+  private readonly identityApi: IdentityApi;
+
+  constructor(options: {
+    discoveryApi: DiscoveryApi;
+    identityApi: IdentityApi;
+  }) {
+    this.discoveryApi = options.discoveryApi;
+    this.identityApi = options.identityApi;
   }
 
-  mapJenkinsBuildToCITable(
-    jenkinsResult: any,
-    jobScmInfo?: any,
-  ): CITableBuildInfo {
-    const source =
-      jenkinsResult.actions
-        .filter(
-          (action: any) =>
-            action._class === 'hudson.plugins.git.util.BuildData',
-        )
-        .map((action: any) => {
-          const [first]: any = Object.values(action.buildsByBranchName);
-          const branch = first.revision.branch[0];
-          return {
-            branchName: branch.name,
-            commit: {
-              hash: branch.SHA1.substring(0, 8),
-            },
-          };
-        })
-        .pop() || {};
+  async getProjects({
+    entity,
+    filter,
+  }: {
+    entity: EntityName;
+    filter: { branch?: string };
+  }): Promise<Project[]> {
+    const url = new URL(
+      `${await this.discoveryApi.getBaseUrl(
+        'jenkins',
+      )}/v1/entity/${encodeURIComponent(entity.namespace)}/${encodeURIComponent(
+        entity.kind,
+      )}/${encodeURIComponent(entity.name)}/projects`,
+    );
 
-    if (jobScmInfo) {
-      source.url = jobScmInfo?.url;
-      source.displayName = jobScmInfo?.displayName;
-      source.author = jobScmInfo?.author;
+    if (filter.branch) {
+      url.searchParams.append('branch', filter.branch);
     }
 
-    const path = new URL(jenkinsResult.url).pathname;
-
-    return {
-      id: path,
-      buildNumber: jenkinsResult.number,
-      buildUrl: jenkinsResult.url,
-      buildName: jenkinsResult.fullDisplayName,
-      status: jenkinsResult.building ? 'running' : jenkinsResult.result,
-      onRestartClick: () => {
-        // TODO: this won't handle non root context path, need a better way to get the job name
-        const { jobName } = this.extractJobDetailsFromBuildName(path);
-        return this.retry(jobName);
+    const idToken = await this.identityApi.getIdToken();
+    const response = await fetch(url.href, {
+      method: 'GET',
+      headers: {
+        ...(idToken && { Authorization: `Bearer ${idToken}` }),
       },
-      source: source,
-      tests: this.getTestReport(jenkinsResult),
-    };
+    });
+
+    return (
+      (await response.json()).projects?.map((p: Project) => ({
+        ...p,
+        onRestartClick: async () => {
+          await this.retry({
+            entity,
+            jobFullName: p.fullName,
+            buildNumber: String(p.lastBuild.number),
+          });
+        },
+      })) || []
+    );
   }
 
-  async getBuild(buildName: string) {
-    const client = await this.getClient();
-    const { jobName, buildNumber } = this.extractJobDetailsFromBuildName(
-      buildName,
-    );
-    const buildResult = await client.build.get(jobName, buildNumber);
-    return buildResult;
+  async getBuild({
+    entity,
+    jobFullName,
+    buildNumber,
+  }: {
+    entity: EntityName;
+    jobFullName: string;
+    buildNumber: string;
+  }): Promise<Build> {
+    const url = `${await this.discoveryApi.getBaseUrl(
+      'jenkins',
+    )}/v1/entity/${encodeURIComponent(entity.namespace)}/${encodeURIComponent(
+      entity.kind,
+    )}/${encodeURIComponent(entity.name)}/job/${encodeURIComponent(
+      jobFullName,
+    )}/${encodeURIComponent(buildNumber)}`;
+
+    const idToken = await this.identityApi.getIdToken();
+    const response = await fetch(url, {
+      method: 'GET',
+      headers: {
+        ...(idToken && { Authorization: `Bearer ${idToken}` }),
+      },
+    });
+
+    return (await response.json()).build;
   }
 
-  extractJobDetailsFromBuildName(buildName: string) {
-    const trimmedBuild = buildName.replace(/\/job/g, '').replace(/\/$/, '');
+  async retry({
+    entity,
+    jobFullName,
+    buildNumber,
+  }: {
+    entity: EntityName;
+    jobFullName: string;
+    buildNumber: string;
+  }): Promise<void> {
+    const url = `${await this.discoveryApi.getBaseUrl(
+      'jenkins',
+    )}/v1/entity/${encodeURIComponent(entity.namespace)}/${encodeURIComponent(
+      entity.kind,
+    )}/${encodeURIComponent(entity.name)}/job/${encodeURIComponent(
+      jobFullName,
+    )}/${encodeURIComponent(buildNumber)}:rebuild`;
 
-    const split = trimmedBuild.split('/');
-    const buildNumber = parseInt(split[split.length - 1], 10);
-    const jobName = trimmedBuild.slice(
-      0,
-      trimmedBuild.length - buildNumber.toString(10).length - 1,
-    );
-
-    return {
-      jobName,
-      buildNumber,
-    };
+    const idToken = await this.identityApi.getIdToken();
+    await fetch(url, {
+      method: 'POST',
+      headers: {
+        ...(idToken && { Authorization: `Bearer ${idToken}` }),
+      },
+    });
   }
 }
diff --git a/plugins/jenkins/src/api/index.ts b/plugins/jenkins/src/api/index.ts
index 7bf664fbed..af1829c0b4 100644
--- a/plugins/jenkins/src/api/index.ts
+++ b/plugins/jenkins/src/api/index.ts
@@ -14,4 +14,6 @@
  * limitations under the License.
  */
 
-export { JenkinsApi, jenkinsApiRef } from './JenkinsApi';
+export { JenkinsClient, jenkinsApiRef } from './JenkinsApi';
+
+export type { JenkinsApi } from './JenkinsApi';
diff --git a/plugins/jenkins/src/components/BuildWithStepsPage/BuildWithStepsPage.tsx b/plugins/jenkins/src/components/BuildWithStepsPage/BuildWithStepsPage.tsx
index 0bfd2bb5d8..e06332f8f0 100644
--- a/plugins/jenkins/src/components/BuildWithStepsPage/BuildWithStepsPage.tsx
+++ b/plugins/jenkins/src/components/BuildWithStepsPage/BuildWithStepsPage.tsx
@@ -30,7 +30,6 @@ import React from 'react';
 import { buildRouteRef } from '../../plugin';
 import { JenkinsRunStatus } from '../BuildsPage/lib/Status';
 import { useBuildWithSteps } from '../useBuildWithSteps';
-import { useProjectSlugFromEntity } from '../useProjectSlugFromEntity';
 
 import { Breadcrumbs, Content, Link } from '@backstage/core-components';
 import { useRouteRefParams } from '@backstage/core-plugin-api';
@@ -49,17 +48,16 @@ const useStyles = makeStyles(theme => ({
 }));
 
 const BuildWithStepsView = () => {
-  const projectName = useProjectSlugFromEntity();
-  const { branch, buildNumber } = useRouteRefParams(buildRouteRef);
+  // TODO: Add a test that react-router decodes this (even though `generatePath` doesn't encode it for you!)
+  const { jobFullName, buildNumber } = useRouteRefParams(buildRouteRef);
   const classes = useStyles();
-  const buildPath = `${projectName}/${encodeURIComponent(
-    branch,
-  )}/${buildNumber}`;
-  const [{ value }] = useBuildWithSteps(buildPath);
+
+  const [{ value }] = useBuildWithSteps({ jobFullName, buildNumber });
 
   return (
     <div className={classes.root}>
       <Breadcrumbs aria-label="breadcrumb">
+        {/* TODO: don't hardcode this link */}
         <Link to="../../..">Projects</Link>
         <Typography>Run</Typography>
       </Breadcrumbs>
@@ -104,7 +102,7 @@ const BuildWithStepsView = () => {
                 <Typography noWrap>Jenkins</Typography>
               </TableCell>
               <TableCell>
-                <MaterialLink target="_blank" href={value?.buildUrl}>
+                <MaterialLink target="_blank" href={value?.url}>
                   View on Jenkins{' '}
                   <ExternalLinkIcon className={classes.externalLinkIcon} />
                 </MaterialLink>
@@ -112,10 +110,11 @@ const BuildWithStepsView = () => {
             </TableRow>
             <TableRow>
               <TableCell>
+                {/* TODO: be SCM agnostic */}
                 <Typography noWrap>GitHub</Typography>
               </TableCell>
               <TableCell>
-                <MaterialLink target="_blank" href={value?.source.url}>
+                <MaterialLink target="_blank" href={value?.source?.url}>
                   View on GitHub{' '}
                   <ExternalLinkIcon className={classes.externalLinkIcon} />
                 </MaterialLink>
diff --git a/plugins/jenkins/src/components/BuildsPage/lib/CITable/CITable.tsx b/plugins/jenkins/src/components/BuildsPage/lib/CITable/CITable.tsx
index 6e456bd281..0519ed3816 100644
--- a/plugins/jenkins/src/components/BuildsPage/lib/CITable/CITable.tsx
+++ b/plugins/jenkins/src/components/BuildsPage/lib/CITable/CITable.tsx
@@ -20,34 +20,9 @@ import JenkinsLogo from '../../../../assets/JenkinsLogo.svg';
 import { generatePath, Link as RouterLink } from 'react-router-dom';
 import { JenkinsRunStatus } from '../Status';
 import { useBuilds } from '../../../useBuilds';
-import { useProjectSlugFromEntity } from '../../../useProjectSlugFromEntity';
 import { buildRouteRef } from '../../../../plugin';
 import { Table, TableColumn } from '@backstage/core-components';
-
-export type CITableBuildInfo = {
-  id: string;
-  buildName: string;
-  buildNumber: number;
-  buildUrl: string;
-  source: {
-    branchName: string;
-    url: string;
-    displayName: string;
-    author?: string;
-    commit: {
-      hash: string;
-    };
-  };
-  status: string;
-  tests?: {
-    total: number;
-    passed: number;
-    skipped: number;
-    failed: number;
-    testUrl: string;
-  };
-  onRestartClick: () => void;
-};
+import { Project } from '../../../../api/JenkinsApi';
 
 const FailCount = ({ count }: { count: number }): JSX.Element | null => {
   if (count !== 0) {
@@ -107,44 +82,51 @@ const FailSkippedWidget = ({
 const generatedColumns: TableColumn[] = [
   {
     title: 'Build',
-    field: 'buildName',
+    field: 'fullName',
     highlight: true,
-    render: (row: Partial<CITableBuildInfo>) => {
-      if (!row.source?.branchName || !row.buildNumber) {
-        return <>{row.buildName}</>;
+    render: (row: Partial<Project>) => {
+      if (!row.fullName || !row.lastBuild?.number) {
+        return (
+          <>
+            {row.fullName ||
+              row.fullDisplayName ||
+              row.displayName ||
+              'Unknown'}
+          </>
+        );
       }
 
       return (
         <Link
           component={RouterLink}
           to={generatePath(buildRouteRef.path, {
-            branch: encodeURIComponent(row.source.branchName),
-            buildNumber: row.buildNumber.toString(),
+            jobFullName: encodeURIComponent(row.fullName),
+            buildNumber: String(row.lastBuild?.number),
           })}
         >
-          {row.buildName}
+          {row.fullDisplayName}
         </Link>
       );
     },
   },
   {
     title: 'Source',
-    field: 'source.branchName',
-    render: (row: Partial<CITableBuildInfo>) => (
+    field: 'lastBuild.source.branchName',
+    render: (row: Partial<Project>) => (
       <>
         <p>
-          <Link href={row.source?.url || ''} target="_blank">
-            {row.source?.branchName}
+          <Link href={row.lastBuild?.source?.url || ''} target="_blank">
+            {row.lastBuild?.source?.branchName}
           </Link>
         </p>
-        <p>{row.source?.commit?.hash}</p>
+        <p>{row.lastBuild?.source?.commit?.hash}</p>
       </>
     ),
   },
   {
     title: 'Status',
     field: 'status',
-    render: (row: Partial<CITableBuildInfo>) => {
+    render: (row: Partial<Project>) => {
       return (
         <Box display="flex" alignItems="center">
           <JenkinsRunStatus status={row.status} />
@@ -155,21 +137,22 @@ const generatedColumns: TableColumn[] = [
   {
     title: 'Tests',
     sorting: false,
-    render: (row: Partial<CITableBuildInfo>) => {
+    render: (row: Partial<Project>) => {
       return (
         <>
           <p>
-            {row.tests && (
-              <Link href={row.tests.testUrl || ''} target="_blank">
-                {row.tests.passed} / {row.tests.total} passed
+            {row.lastBuild?.tests && (
+              <Link href={row.lastBuild?.tests.testUrl || ''} target="_blank">
+                {row.lastBuild?.tests.passed} / {row.lastBuild?.tests.total}{' '}
+                passed
                 <FailSkippedWidget
-                  skipped={row.tests.skipped}
-                  failed={row.tests.failed}
+                  skipped={row.lastBuild?.tests.skipped}
+                  failed={row.lastBuild?.tests.failed}
                 />
               </Link>
             )}
 
-            {!row.tests && 'n/a'}
+            {!row.lastBuild?.tests && 'n/a'}
           </p>
         </>
       );
@@ -178,7 +161,7 @@ const generatedColumns: TableColumn[] = [
   {
     title: 'Actions',
     sorting: false,
-    render: (row: Partial<CITableBuildInfo>) => (
+    render: (row: Partial<Project>) => (
       <Tooltip title="Rerun build">
         <IconButton onClick={row.onRestartClick}>
           <RetryIcon />
@@ -192,8 +175,7 @@ const generatedColumns: TableColumn[] = [
 type Props = {
   loading: boolean;
   retry: () => void;
-  builds: CITableBuildInfo[];
-  projectName: string;
+  projects?: Project[];
   page: number;
   onChangePage: (page: number) => void;
   total: number;
@@ -202,12 +184,11 @@ type Props = {
 };
 
 export const CITableView = ({
-  projectName,
   loading,
   pageSize,
   page,
   retry,
-  builds,
+  projects,
   onChangePage,
   onChangePageSize,
   total,
@@ -226,14 +207,14 @@ export const CITableView = ({
           onClick: () => retry(),
         },
       ]}
-      data={builds ?? []}
-      onChangePage={onChangePage}
-      onChangeRowsPerPage={onChangePageSize}
+      data={projects ?? []}
+      onPageChange={onChangePage}
+      onRowsPerPageChange={onChangePageSize}
       title={
         <Box display="flex" alignItems="center">
           <img src={JenkinsLogo} alt="Jenkins logo" height="50px" />
           <Box mr={2} />
-          <Typography variant="h6">Project: {projectName}</Typography>
+          <Typography variant="h6">Projects</Typography>
         </Box>
       }
       columns={generatedColumns}
@@ -242,9 +223,7 @@ export const CITableView = ({
 };
 
 export const CITable = () => {
-  const projectName = useProjectSlugFromEntity();
-
-  const [tableProps, { setPage, retry, setPageSize }] = useBuilds(projectName);
+  const [tableProps, { setPage, retry, setPageSize }] = useBuilds();
 
   return (
     <CITableView
diff --git a/plugins/jenkins/src/components/BuildsPage/lib/CITable/index.ts b/plugins/jenkins/src/components/BuildsPage/lib/CITable/index.ts
index 30263bfb4d..3be4dae9ce 100644
--- a/plugins/jenkins/src/components/BuildsPage/lib/CITable/index.ts
+++ b/plugins/jenkins/src/components/BuildsPage/lib/CITable/index.ts
@@ -14,4 +14,3 @@
  * limitations under the License.
  */
 export { CITable } from './CITable';
-export type { CITableBuildInfo } from './CITable';
diff --git a/plugins/jenkins/src/components/Cards/Cards.test.tsx b/plugins/jenkins/src/components/Cards/Cards.test.tsx
index a2f3009099..2508461710 100644
--- a/plugins/jenkins/src/components/Cards/Cards.test.tsx
+++ b/plugins/jenkins/src/components/Cards/Cards.test.tsx
@@ -20,6 +20,7 @@ import { LatestRunCard } from './Cards';
 import { EntityProvider } from '@backstage/plugin-catalog-react';
 import { JenkinsApi, jenkinsApiRef } from '../../api';
 import { ApiProvider, ApiRegistry } from '@backstage/core-app-api';
+import { Project } from '../../api/JenkinsApi';
 
 describe('<LatestRunCard />', () => {
   const entity = {
@@ -33,7 +34,10 @@ describe('<LatestRunCard />', () => {
   };
 
   const jenkinsApi: Partial<JenkinsApi> = {
-    getLastBuild: () => Promise.resolve({ timestamp: 0, result: 'success' }),
+    getProjects: () =>
+      Promise.resolve([
+        { lastBuild: { timestamp: 0, status: 'success' } },
+      ] as Project[]),
   };
 
   it('should show success status of latest build', async () => {
@@ -52,7 +56,7 @@ describe('<LatestRunCard />', () => {
 
   it('should show the appropriate error in case of a connection error', async () => {
     const jenkinsApiWithError: Partial<JenkinsApi> = {
-      getLastBuild: () => Promise.reject(new Error('Unauthorized')),
+      getProjects: () => Promise.reject(new Error('Unauthorized')),
     };
 
     const apis = ApiRegistry.from([[jenkinsApiRef, jenkinsApiWithError]]);
@@ -71,7 +75,7 @@ describe('<LatestRunCard />', () => {
 
   it('should show the appropriate error in case Jenkins project is not found', async () => {
     const jenkinsApiWithError: Partial<JenkinsApi> = {
-      getLastBuild: () =>
+      getProjects: () =>
         Promise.reject({
           notFound: true,
           message: 'jenkins-project not found',
diff --git a/plugins/jenkins/src/components/Cards/Cards.tsx b/plugins/jenkins/src/components/Cards/Cards.tsx
index 21044a194d..f0b1ff2bca 100644
--- a/plugins/jenkins/src/components/Cards/Cards.tsx
+++ b/plugins/jenkins/src/components/Cards/Cards.tsx
@@ -19,13 +19,13 @@ import { DateTime, Duration } from 'luxon';
 import React from 'react';
 import { JenkinsRunStatus } from '../BuildsPage/lib/Status';
 import { ErrorType, useBuilds } from '../useBuilds';
-import { useProjectSlugFromEntity } from '../useProjectSlugFromEntity';
 import {
   InfoCard,
   InfoCardVariants,
   StructuredMetadataTable,
   WarningPanel,
 } from '@backstage/core-components';
+import { Project } from '../../api/JenkinsApi';
 
 const useStyles = makeStyles<Theme>({
   externalLinkIcon: {
@@ -39,16 +39,18 @@ const WidgetContent = ({
   latestRun,
 }: {
   loading?: boolean;
-  latestRun: any;
+  latestRun?: Project;
   branch: string;
 }) => {
   const classes = useStyles();
   if (loading || !latestRun) return <LinearProgress />;
-  const displayDate = DateTime.fromMillis(latestRun.timestamp).toRelative();
+  const displayDate = DateTime.fromMillis(
+    latestRun.lastBuild.timestamp,
+  ).toRelative();
   const displayDuration =
-    (latestRun.building ? 'Running for ' : '') +
+    (latestRun.lastBuild.building ? 'Running for ' : '') +
     DateTime.local()
-      .minus(Duration.fromMillis(latestRun.duration))
+      .minus(Duration.fromMillis(latestRun.lastBuild.duration))
       .toRelative({ locale: 'en' })
       ?.replace(' ago', '');
 
@@ -57,16 +59,14 @@ const WidgetContent = ({
       metadata={{
         status: (
           <>
-            <JenkinsRunStatus
-              status={latestRun.building ? 'running' : latestRun.result}
-            />
+            <JenkinsRunStatus status={latestRun.lastBuild.status} />
           </>
         ),
         build: latestRun.fullDisplayName,
         'latest run': displayDate,
         duration: displayDuration,
         link: (
-          <Link href={latestRun.url} target="_blank">
+          <Link href={latestRun.lastBuild.url} target="_blank">
             See more on Jenkins{' '}
             <ExternalLinkIcon className={classes.externalLinkIcon} />
           </Link>
@@ -100,9 +100,8 @@ export const LatestRunCard = ({
   branch: string;
   variant?: InfoCardVariants;
 }) => {
-  const projectName = useProjectSlugFromEntity();
-  const [{ builds, loading, error }] = useBuilds(projectName, branch);
-  const latestRun = builds ?? {};
+  const [{ projects, loading, error }] = useBuilds({ branch });
+  const latestRun = projects?.[0];
   return (
     <InfoCard title={`Latest ${branch} build`} variant={variant}>
       {!error ? (
diff --git a/plugins/jenkins/src/components/Router.tsx b/plugins/jenkins/src/components/Router.tsx
index bb5d7b9108..35b769e9d9 100644
--- a/plugins/jenkins/src/components/Router.tsx
+++ b/plugins/jenkins/src/components/Router.tsx
@@ -13,18 +13,19 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+import { Entity } from '@backstage/catalog-model';
+import { MissingAnnotationEmptyState } from '@backstage/core-components';
+import { useEntity } from '@backstage/plugin-catalog-react';
 import React from 'react';
 import { Route, Routes } from 'react-router';
-import { useEntity } from '@backstage/plugin-catalog-react';
+import { JENKINS_ANNOTATION, LEGACY_JENKINS_ANNOTATION } from '../constants';
 import { buildRouteRef, rootRouteRef } from '../plugin';
-import { DetailedViewPage } from './BuildWithStepsPage/';
-import { JENKINS_ANNOTATION } from '../constants';
-import { Entity } from '@backstage/catalog-model';
 import { CITable } from './BuildsPage/lib/CITable';
-import { MissingAnnotationEmptyState } from '@backstage/core-components';
+import { DetailedViewPage } from './BuildWithStepsPage/';
 
 export const isJenkinsAvailable = (entity: Entity) =>
-  Boolean(entity.metadata.annotations?.[JENKINS_ANNOTATION]);
+  Boolean(entity.metadata.annotations?.[JENKINS_ANNOTATION]) ||
+  Boolean(entity.metadata.annotations?.[LEGACY_JENKINS_ANNOTATION]);
 
 type Props = {
   /** @deprecated The entity is now grabbed from context instead */
diff --git a/plugins/jenkins/src/components/useBuildWithSteps.ts b/plugins/jenkins/src/components/useBuildWithSteps.ts
index 9625d8abbb..64b3bf2535 100644
--- a/plugins/jenkins/src/components/useBuildWithSteps.ts
+++ b/plugins/jenkins/src/components/useBuildWithSteps.ts
@@ -18,38 +18,41 @@ import { useAsyncRetry } from 'react-use';
 import { jenkinsApiRef } from '../api';
 import { useAsyncPolling } from './useAsyncPolling';
 import { errorApiRef, useApi } from '@backstage/core-plugin-api';
+import { useEntity } from '@backstage/plugin-catalog-react';
+import { getEntityName } from '@backstage/catalog-model';
 
 const INTERVAL_AMOUNT = 1500;
-export function useBuildWithSteps(buildName: string) {
+
+/**
+ * Hook to expose a specific build.
+ * @param jobFullName the full name of the project (job with builds, not a folder). e.g. "department-A/team-1/project-foo/master"
+ * @param buildNumber the number of the build. e.g. "13"
+ */
+export function useBuildWithSteps({
+  jobFullName,
+  buildNumber,
+}: {
+  jobFullName: string;
+  buildNumber: string;
+}) {
   const api = useApi(jenkinsApiRef);
   const errorApi = useApi(errorApiRef);
+  const { entity } = useEntity();
 
   const getBuildWithSteps = useCallback(async () => {
     try {
-      const build = await api.getBuild(buildName);
-
-      const { jobName } = api.extractJobDetailsFromBuildName(buildName);
-      const job = await api.getJob(jobName);
-      const jobInfo = api.extractScmDetailsFromJob(job);
-
-      return Promise.resolve(api.mapJenkinsBuildToCITable(build, jobInfo));
+      const entityName = await getEntityName(entity);
+      return api.getBuild({ entity: entityName, jobFullName, buildNumber });
     } catch (e) {
       errorApi.post(e);
       return Promise.reject(e);
     }
-  }, [buildName, api, errorApi]);
+  }, [buildNumber, jobFullName, entity, api, errorApi]);
 
-  const restartBuild = async () => {
-    try {
-      await api.retry(buildName);
-    } catch (e) {
-      errorApi.post(e);
-    }
-  };
-
-  const { loading, value, retry } = useAsyncRetry(() => getBuildWithSteps(), [
-    getBuildWithSteps,
-  ]);
+  const { loading, value, retry } = useAsyncRetry(
+    () => getBuildWithSteps(),
+    [getBuildWithSteps],
+  );
 
   const { startPolling, stopPolling } = useAsyncPolling(
     getBuildWithSteps,
@@ -59,7 +62,6 @@ export function useBuildWithSteps(buildName: string) {
   return [
     { loading, value, retry },
     {
-      restartBuild,
       getBuildWithSteps,
       startPolling,
       stopPolling,
diff --git a/plugins/jenkins/src/components/useBuilds.ts b/plugins/jenkins/src/components/useBuilds.ts
index 49be4893a7..b0959671e1 100644
--- a/plugins/jenkins/src/components/useBuilds.ts
+++ b/plugins/jenkins/src/components/useBuilds.ts
@@ -17,13 +17,23 @@ import { useState } from 'react';
 import { useAsyncRetry } from 'react-use';
 import { jenkinsApiRef } from '../api';
 import { errorApiRef, useApi } from '@backstage/core-plugin-api';
+import { useEntity } from '@backstage/plugin-catalog-react';
+import { getEntityName } from '@backstage/catalog-model';
 
 export enum ErrorType {
   CONNECTION_ERROR,
   NOT_FOUND,
 }
 
-export function useBuilds(projectName: string, branch?: string) {
+/**
+ * Hook to expose the latest build for all the pipelines/projects for an entity.
+ * If `branch` is provided, the latest build for only that branch will be given (but still as a list)
+ *
+ * TODO: deprecate branch and add a generic filter concept.
+ */
+export function useBuilds({ branch }: { branch?: string } = {}) {
+  const { entity } = useEntity();
+  const entityName = getEntityName(entity);
   const api = useApi(jenkinsApiRef);
   const errorApi = useApi(errorApiRef);
 
@@ -35,27 +45,28 @@ export function useBuilds(projectName: string, branch?: string) {
     errorType: ErrorType;
   }>();
 
-  const restartBuild = async (buildName: string) => {
+  const restartBuild = async (jobFullName: string, buildNumber: string) => {
     try {
-      await api.retry(buildName);
+      await api.retry({ entity: entityName, jobFullName, buildNumber });
     } catch (e) {
       errorApi.post(e);
     }
   };
 
-  const { loading, value: builds, retry } = useAsyncRetry(async () => {
+  const {
+    loading,
+    value: projects,
+    retry,
+  } = useAsyncRetry(async () => {
     try {
-      let build;
-      if (branch) {
-        build = await api.getLastBuild(`${projectName}/${branch}`);
-      } else {
-        build = await api.getFolder(`${projectName}`);
-      }
+      const build = await api.getProjects({
+        entity: getEntityName(entity),
+        filter: { branch },
+      });
 
-      const size = Array.isArray(build) ? build?.[0].build_num! : 1;
-      setTotal(size);
+      setTotal(build.length);
 
-      return build || [];
+      return build;
     } catch (e) {
       const errorType = e.notFound
         ? ErrorType.NOT_FOUND
@@ -63,24 +74,22 @@ export function useBuilds(projectName: string, branch?: string) {
       setError({ message: e.message, errorType });
       throw e;
     }
-  }, [api, errorApi, projectName, branch]);
+  }, [api, errorApi, entity, branch]);
 
   return [
     {
       page,
       pageSize,
       loading,
-      builds,
-      projectName,
+      projects,
       total,
       error,
     },
     {
-      builds,
       setPage,
       setPageSize,
       restartBuild,
-      retry,
+      retry, // fetch data again
     },
   ] as const;
 }
diff --git a/plugins/jenkins/src/constants.ts b/plugins/jenkins/src/constants.ts
index 28aa50057e..e1be37ee46 100644
--- a/plugins/jenkins/src/constants.ts
+++ b/plugins/jenkins/src/constants.ts
@@ -13,4 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-export const JENKINS_ANNOTATION = 'jenkins.io/github-folder';
+export const JENKINS_ANNOTATION = 'jenkins.io/job-full-name';
+// @deprecated The legacy annotation used for identifing Jenkins jobs, use
+// JENKINS_ANNOTATION instead.
+export const LEGACY_JENKINS_ANNOTATION = 'jenkins.io/github-folder';
diff --git a/plugins/jenkins/src/index.ts b/plugins/jenkins/src/index.ts
index fb0a27cb26..2f11e03f3f 100644
--- a/plugins/jenkins/src/index.ts
+++ b/plugins/jenkins/src/index.ts
@@ -26,5 +26,5 @@ export {
   isJenkinsAvailable,
   isJenkinsAvailable as isPluginApplicableToEntity,
 } from './components/Router';
-export { JENKINS_ANNOTATION } from './constants';
+export { JENKINS_ANNOTATION, LEGACY_JENKINS_ANNOTATION } from './constants';
 export * from './api';
diff --git a/plugins/jenkins/src/plugin.ts b/plugins/jenkins/src/plugin.ts
index 2548612896..e975361da2 100644
--- a/plugins/jenkins/src/plugin.ts
+++ b/plugins/jenkins/src/plugin.ts
@@ -14,7 +14,6 @@
  * limitations under the License.
  */
 
-import { JenkinsApi, jenkinsApiRef } from './api';
 import {
   createApiFactory,
   createComponentExtension,
@@ -22,7 +21,9 @@ import {
   createRoutableExtension,
   createRouteRef,
   discoveryApiRef,
+  identityApiRef,
 } from '@backstage/core-plugin-api';
+import { JenkinsClient, jenkinsApiRef } from './api';
 
 export const rootRouteRef = createRouteRef({
   path: '',
@@ -30,9 +31,9 @@ export const rootRouteRef = createRouteRef({
 });
 
 export const buildRouteRef = createRouteRef({
-  path: 'run/:branch/:buildNumber',
-  params: ['branch', 'buildNumber'],
-  title: 'Jenkins run',
+  path: 'build/:jobFullName/:buildNumber',
+  params: ['jobFullName', 'buildNumber'],
+  title: 'Jenkins build',
 });
 
 export const jenkinsPlugin = createPlugin({
@@ -40,8 +41,9 @@ export const jenkinsPlugin = createPlugin({
   apis: [
     createApiFactory({
       api: jenkinsApiRef,
-      deps: { discoveryApi: discoveryApiRef },
-      factory: ({ discoveryApi }) => new JenkinsApi({ discoveryApi }),
+      deps: { discoveryApi: discoveryApiRef, identityApi: identityApiRef },
+      factory: ({ discoveryApi, identityApi }) =>
+        new JenkinsClient({ discoveryApi, identityApi }),
     }),
   ],
   routes: {
diff --git a/plugins/kafka-backend/CHANGELOG.md b/plugins/kafka-backend/CHANGELOG.md
index 9fae449a97..0bbfb2a45a 100644
--- a/plugins/kafka-backend/CHANGELOG.md
+++ b/plugins/kafka-backend/CHANGELOG.md
@@ -1,5 +1,13 @@
 # @backstage/plugin-kafka-backend
 
+## 0.2.9
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.9.0
+  - @backstage/config@0.1.8
+
 ## 0.2.8
 
 ### Patch Changes
diff --git a/plugins/kafka-backend/api-report.md b/plugins/kafka-backend/api-report.md
index f817da4a3b..4065244e6a 100644
--- a/plugins/kafka-backend/api-report.md
+++ b/plugins/kafka-backend/api-report.md
@@ -7,6 +7,9 @@ import { Config } from '@backstage/config';
 import express from 'express';
 import { Logger as Logger_2 } from 'winston';
 
+// Warning: (ae-forgotten-export) The symbol "RouterOptions" needs to be exported by the entry point index.d.ts
+// Warning: (ae-missing-release-tag) "createRouter" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export function createRouter(options: RouterOptions): Promise<express.Router>;
 
diff --git a/plugins/kafka-backend/package.json b/plugins/kafka-backend/package.json
index 9e1b1d52c5..9ff315b3f7 100644
--- a/plugins/kafka-backend/package.json
+++ b/plugins/kafka-backend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-kafka-backend",
-  "version": "0.2.8",
+  "version": "0.2.9",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -31,9 +31,9 @@
     "clean": "backstage-cli clean"
   },
   "dependencies": {
-    "@backstage/backend-common": "^0.8.5",
+    "@backstage/backend-common": "^0.9.0",
     "@backstage/catalog-model": "^0.9.0",
-    "@backstage/config": "^0.1.5",
+    "@backstage/config": "^0.1.8",
     "@backstage/errors": "^0.1.1",
     "@types/express": "^4.17.6",
     "express": "^4.17.1",
diff --git a/plugins/kafka/CHANGELOG.md b/plugins/kafka/CHANGELOG.md
index c7cb9c99ad..6bee3e5e6a 100644
--- a/plugins/kafka/CHANGELOG.md
+++ b/plugins/kafka/CHANGELOG.md
@@ -1,5 +1,46 @@
 # @backstage/plugin-kafka
 
+## 0.2.14
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@0.4.5
+  - @backstage/core-components@0.4.0
+  - @backstage/catalog-model@0.9.1
+
+## 0.2.13
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.3.0
+  - @backstage/core-plugin-api@0.1.5
+  - @backstage/plugin-catalog-react@0.4.1
+
+## 0.2.12
+
+### Patch Changes
+
+- 9d40fcb1e: - Bumping `material-ui/core` version to at least `4.12.2` as they made some breaking changes in later versions which broke `Pagination` of the `Table`.
+  - Switching out `material-table` to `@material-table/core` for support for the later versions of `material-ui/core`
+  - This causes a minor API change to `@backstage/core-components` as the interface for `Table` re-exports the `prop` from the underlying `Table` components.
+  - `onChangeRowsPerPage` has been renamed to `onRowsPerPageChange`
+  - `onChangePage` has been renamed to `onPageChange`
+  - Migration guide is here: https://material-table-core.com/docs/breaking-changes
+- Updated dependencies
+  - @backstage/core-components@0.2.0
+  - @backstage/plugin-catalog-react@0.4.0
+  - @backstage/core-plugin-api@0.1.4
+  - @backstage/theme@0.2.9
+
+## 0.2.11
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@0.3.0
+
 ## 0.2.10
 
 ### Patch Changes
diff --git a/plugins/kafka/api-report.md b/plugins/kafka/api-report.md
index 2a1001773e..6bc169dd24 100644
--- a/plugins/kafka/api-report.md
+++ b/plugins/kafka/api-report.md
@@ -9,20 +9,28 @@ import { BackstagePlugin } from '@backstage/core-plugin-api';
 import { Entity } from '@backstage/catalog-model';
 import { RouteRef } from '@backstage/core-plugin-api';
 
+// Warning: (ae-missing-release-tag) "EntityKafkaContent" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export const EntityKafkaContent: (_props: {
   entity?: Entity | undefined;
 }) => JSX.Element;
 
+// Warning: (ae-missing-release-tag) "isPluginApplicableToEntity" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 const isPluginApplicableToEntity: (entity: Entity) => boolean;
 export { isPluginApplicableToEntity as isKafkaAvailable };
 export { isPluginApplicableToEntity };
 
+// Warning: (ae-missing-release-tag) "KAFKA_CONSUMER_GROUP_ANNOTATION" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export const KAFKA_CONSUMER_GROUP_ANNOTATION =
   'kafka.apache.org/consumer-groups';
 
+// Warning: (ae-missing-release-tag) "kafkaPlugin" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 const kafkaPlugin: BackstagePlugin<
   {
@@ -33,6 +41,9 @@ const kafkaPlugin: BackstagePlugin<
 export { kafkaPlugin };
 export { kafkaPlugin as plugin };
 
+// Warning: (ae-forgotten-export) The symbol "Props" needs to be exported by the entry point index.d.ts
+// Warning: (ae-missing-release-tag) "Router" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export const Router: (_props: Props) => JSX.Element;
 
diff --git a/plugins/kafka/package.json b/plugins/kafka/package.json
index 882edcd462..06fb56a17e 100644
--- a/plugins/kafka/package.json
+++ b/plugins/kafka/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-kafka",
-  "version": "0.2.10",
+  "version": "0.2.14",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -20,12 +20,12 @@
     "clean": "backstage-cli clean"
   },
   "dependencies": {
-    "@backstage/catalog-model": "^0.9.0",
-    "@backstage/core-components": "^0.1.5",
-    "@backstage/core-plugin-api": "^0.1.3",
-    "@backstage/plugin-catalog-react": "^0.2.6",
-    "@backstage/theme": "^0.2.8",
-    "@material-ui/core": "^4.11.0",
+    "@backstage/catalog-model": "^0.9.1",
+    "@backstage/core-components": "^0.4.1",
+    "@backstage/core-plugin-api": "^0.1.7",
+    "@backstage/plugin-catalog-react": "^0.4.5",
+    "@backstage/theme": "^0.2.10",
+    "@material-ui/core": "^4.12.2",
     "@material-ui/icons": "^4.9.1",
     "@material-ui/lab": "4.0.0-alpha.45",
     "react": "^16.13.1",
@@ -34,10 +34,10 @@
     "react-use": "^17.2.4"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.7.3",
-    "@backstage/core-app-api": "^0.1.4",
-    "@backstage/dev-utils": "^0.2.1",
-    "@backstage/test-utils": "^0.1.14",
+    "@backstage/cli": "^0.7.11",
+    "@backstage/core-app-api": "^0.1.12",
+    "@backstage/dev-utils": "^0.2.9",
+    "@backstage/test-utils": "^0.1.17",
     "@testing-library/jest-dom": "^5.10.1",
     "@testing-library/react": "^11.2.5",
     "@testing-library/react-hooks": "^3.4.2",
diff --git a/plugins/kubernetes-backend/CHANGELOG.md b/plugins/kubernetes-backend/CHANGELOG.md
index dff8e1833d..4d2158d6a1 100644
--- a/plugins/kubernetes-backend/CHANGELOG.md
+++ b/plugins/kubernetes-backend/CHANGELOG.md
@@ -1,5 +1,55 @@
 # @backstage/plugin-kubernetes-backend
 
+## 0.3.15
+
+### Patch Changes
+
+- 22fc579fe: Fixes bug reading ExternalId from k8s backend config
+- Updated dependencies
+  - @backstage/backend-common@0.9.0
+  - @backstage/config@0.1.8
+
+## 0.3.14
+
+### Patch Changes
+
+- bbcd92afa: Adds ability to send an ExternalId with the assume role request to AWS
+- Updated dependencies
+  - @backstage/backend-common@0.8.9
+
+## 0.3.13
+
+### Patch Changes
+
+- a0a8d3571: Add configuration option to the kubernetes object types. Config option is under `kubernetes.objectTypes`. Defaults to ['pods', 'services', 'configmaps', 'deployments', 'replicasets', 'horizontalpodautoscalers', 'ingresses']
+- Updated dependencies
+  - @backstage/backend-common@0.8.8
+  - @backstage/config@0.1.6
+
+## 0.3.12
+
+### Patch Changes
+
+- 7f24f4088: chore(deps): bump `@kubernetes/client-node` from 0.14.3 to 0.15.0
+- Updated dependencies
+  - @backstage/plugin-kubernetes-common@0.1.3
+
+## 0.3.11
+
+### Patch Changes
+
+- 5bd57f8f5: Support assume role on kubernetes api configuration for AWS.
+- Updated dependencies
+  - @backstage/backend-common@0.8.7
+
+## 0.3.10
+
+### Patch Changes
+
+- ae84b20cf: Revert the upgrade to `fs-extra@10.0.0` as that seemed to have broken all installs inexplicably.
+- Updated dependencies
+  - @backstage/backend-common@0.8.6
+
 ## 0.3.9
 
 ### Patch Changes
diff --git a/plugins/kubernetes-backend/api-report.md b/plugins/kubernetes-backend/api-report.md
index bd8a7038c5..f69977f5ad 100644
--- a/plugins/kubernetes-backend/api-report.md
+++ b/plugins/kubernetes-backend/api-report.md
@@ -10,6 +10,18 @@ import { KubernetesFetchError } from '@backstage/plugin-kubernetes-common';
 import { KubernetesRequestBody } from '@backstage/plugin-kubernetes-common';
 import { Logger as Logger_2 } from 'winston';
 
+// Warning: (ae-missing-release-tag) "AWSClusterDetails" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
+// @public (undocumented)
+export interface AWSClusterDetails extends ClusterDetails {
+  // (undocumented)
+  assumeRole?: string;
+  // (undocumented)
+  externalId?: string;
+}
+
+// Warning: (ae-missing-release-tag) "ClusterDetails" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export interface ClusterDetails {
   // (undocumented)
@@ -24,9 +36,13 @@ export interface ClusterDetails {
   url: string;
 }
 
+// Warning: (ae-missing-release-tag) "createRouter" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export function createRouter(options: RouterOptions): Promise<express.Router>;
 
+// Warning: (ae-missing-release-tag) "CustomResource" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export interface CustomResource {
   // (undocumented)
@@ -37,6 +53,13 @@ export interface CustomResource {
   plural: string;
 }
 
+// Warning: (ae-missing-release-tag) "DEFAULT_OBJECTS" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
+// @public (undocumented)
+export const DEFAULT_OBJECTS: KubernetesObjectTypes[];
+
+// Warning: (ae-missing-release-tag) "FetchResponseWrapper" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export interface FetchResponseWrapper {
   // (undocumented)
@@ -45,12 +68,21 @@ export interface FetchResponseWrapper {
   responses: FetchResponse[];
 }
 
+// Warning: (ae-missing-release-tag) "GKEClusterDetails" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
+// @public (undocumented)
+export interface GKEClusterDetails extends ClusterDetails {}
+
+// Warning: (ae-missing-release-tag) "KubernetesClustersSupplier" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export interface KubernetesClustersSupplier {
   // (undocumented)
   getClusters(): Promise<ClusterDetails[]>;
 }
 
+// Warning: (ae-missing-release-tag) "KubernetesFetcher" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export interface KubernetesFetcher {
   // (undocumented)
@@ -59,6 +91,8 @@ export interface KubernetesFetcher {
   ): Promise<FetchResponseWrapper>;
 }
 
+// Warning: (ae-missing-release-tag) "KubernetesObjectTypes" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export type KubernetesObjectTypes =
   | 'pods'
@@ -70,12 +104,17 @@ export type KubernetesObjectTypes =
   | 'ingresses'
   | 'customresources';
 
+// Warning: (ae-missing-release-tag) "KubernetesServiceLocator" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export interface KubernetesServiceLocator {
   // (undocumented)
   getClustersByServiceId(serviceId: string): Promise<ClusterDetails[]>;
 }
 
+// Warning: (ae-forgotten-export) The symbol "KubernetesFanOutHandler" needs to be exported by the entry point index.d.ts
+// Warning: (ae-missing-release-tag) "makeRouter" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export const makeRouter: (
   logger: Logger_2,
@@ -83,10 +122,16 @@ export const makeRouter: (
   clusterDetails: ClusterDetails[],
 ) => express.Router;
 
+// Warning: (ae-missing-release-tag) "ObjectFetchParams" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export interface ObjectFetchParams {
   // (undocumented)
-  clusterDetails: ClusterDetails;
+  clusterDetails:
+    | AWSClusterDetails
+    | GKEClusterDetails
+    | ServiceAccountClusterDetails
+    | ClusterDetails;
   // (undocumented)
   customResources: CustomResource[];
   // (undocumented)
@@ -97,6 +142,8 @@ export interface ObjectFetchParams {
   serviceId: string;
 }
 
+// Warning: (ae-missing-release-tag) "RouterOptions" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export interface RouterOptions {
   // (undocumented)
@@ -107,6 +154,13 @@ export interface RouterOptions {
   logger: Logger_2;
 }
 
+// Warning: (ae-missing-release-tag) "ServiceAccountClusterDetails" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
+// @public (undocumented)
+export interface ServiceAccountClusterDetails extends ClusterDetails {}
+
+// Warning: (ae-missing-release-tag) "ServiceLocatorMethod" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export type ServiceLocatorMethod = 'multiTenant' | 'http';
 
diff --git a/plugins/kubernetes-backend/package.json b/plugins/kubernetes-backend/package.json
index 9888447464..ce41e216b3 100644
--- a/plugins/kubernetes-backend/package.json
+++ b/plugins/kubernetes-backend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-kubernetes-backend",
-  "version": "0.3.9",
+  "version": "0.3.15",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -31,12 +31,12 @@
     "clean": "backstage-cli clean"
   },
   "dependencies": {
-    "@backstage/backend-common": "^0.8.5",
+    "@backstage/backend-common": "^0.9.0",
     "@backstage/catalog-model": "^0.9.0",
-    "@backstage/config": "^0.1.5",
-    "@backstage/plugin-kubernetes-common": "^0.1.2",
+    "@backstage/config": "^0.1.8",
+    "@backstage/plugin-kubernetes-common": "^0.1.3",
     "@google-cloud/container": "^2.2.0",
-    "@kubernetes/client-node": "^0.14.0",
+    "@kubernetes/client-node": "^0.15.0",
     "@types/express": "^4.17.6",
     "aws-sdk": "^2.840.0",
     "aws4": "^1.11.0",
@@ -53,9 +53,11 @@
     "yn": "^4.0.0"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.7.0",
+    "@backstage/cli": "^0.7.8",
     "@types/aws4": "^1.5.1",
-    "supertest": "^6.1.3"
+    "supertest": "^6.1.3",
+    "aws-sdk-mock": "^5.2.1",
+    "bdd-lazy-var": "^2.6.0"
   },
   "files": [
     "dist",
diff --git a/plugins/kubernetes-backend/schema.d.ts b/plugins/kubernetes-backend/schema.d.ts
index 9d002670b9..8b96d5ceca 100644
--- a/plugins/kubernetes-backend/schema.d.ts
+++ b/plugins/kubernetes-backend/schema.d.ts
@@ -16,6 +16,15 @@
 
 export interface Config {
   kubernetes?: {
+    objectTypes?: Array<
+      | 'pods'
+      | 'services'
+      | 'configmaps'
+      | 'deployments'
+      | 'replicasets'
+      | 'horizontalpodautoscalers'
+      | 'ingresses'
+    >;
     serviceLocatorMethod: {
       type: 'multiTenant';
     };
diff --git a/plugins/kubernetes-backend/src/cluster-locator/ConfigClusterLocator.test.ts b/plugins/kubernetes-backend/src/cluster-locator/ConfigClusterLocator.test.ts
index ac4a742828..dac96e4cef 100644
--- a/plugins/kubernetes-backend/src/cluster-locator/ConfigClusterLocator.test.ts
+++ b/plugins/kubernetes-backend/src/cluster-locator/ConfigClusterLocator.test.ts
@@ -97,4 +97,67 @@ describe('ConfigClusterLocator', () => {
       },
     ]);
   });
+
+  it('one aws cluster with assumeRole and one without', async () => {
+    const config: Config = new ConfigReader({
+      clusters: [
+        {
+          name: 'cluster1',
+          serviceAccountToken: 'token',
+          url: 'http://localhost:8080',
+          authProvider: 'aws',
+          skipTLSVerify: false,
+        },
+        {
+          assumeRole: 'SomeRole',
+          name: 'cluster2',
+          url: 'http://localhost:8081',
+          authProvider: 'aws',
+          skipTLSVerify: true,
+        },
+        {
+          assumeRole: 'SomeRole',
+          name: 'cluster2',
+          externalId: 'SomeExternalId',
+          url: 'http://localhost:8081',
+          authProvider: 'aws',
+          skipTLSVerify: true,
+        },
+      ],
+    });
+
+    const sut = ConfigClusterLocator.fromConfig(config);
+
+    const result = await sut.getClusters();
+
+    expect(result).toStrictEqual([
+      {
+        assumeRole: undefined,
+        name: 'cluster1',
+        serviceAccountToken: 'token',
+        externalId: undefined,
+        url: 'http://localhost:8080',
+        authProvider: 'aws',
+        skipTLSVerify: false,
+      },
+      {
+        assumeRole: 'SomeRole',
+        name: 'cluster2',
+        externalId: undefined,
+        serviceAccountToken: undefined,
+        url: 'http://localhost:8081',
+        authProvider: 'aws',
+        skipTLSVerify: true,
+      },
+      {
+        assumeRole: 'SomeRole',
+        name: 'cluster2',
+        externalId: 'SomeExternalId',
+        url: 'http://localhost:8081',
+        serviceAccountToken: undefined,
+        authProvider: 'aws',
+        skipTLSVerify: true,
+      },
+    ]);
+  });
 });
diff --git a/plugins/kubernetes-backend/src/cluster-locator/ConfigClusterLocator.ts b/plugins/kubernetes-backend/src/cluster-locator/ConfigClusterLocator.ts
index 268cca0193..8352db6754 100644
--- a/plugins/kubernetes-backend/src/cluster-locator/ConfigClusterLocator.ts
+++ b/plugins/kubernetes-backend/src/cluster-locator/ConfigClusterLocator.ts
@@ -29,13 +29,34 @@ export class ConfigClusterLocator implements KubernetesClustersSupplier {
     // is required if authProvider is serviceAccount
     return new ConfigClusterLocator(
       config.getConfigArray('clusters').map(c => {
-        return {
+        const authProvider = c.getString('authProvider');
+        const clusterDetails = {
           name: c.getString('name'),
           url: c.getString('url'),
           serviceAccountToken: c.getOptionalString('serviceAccountToken'),
           skipTLSVerify: c.getOptionalBoolean('skipTLSVerify') ?? false,
-          authProvider: c.getString('authProvider'),
+          authProvider: authProvider,
         };
+
+        switch (authProvider) {
+          case 'google': {
+            return clusterDetails;
+          }
+          case 'aws': {
+            const assumeRole = c.getOptionalString('assumeRole');
+            const externalId = c.getOptionalString('externalId');
+
+            return { assumeRole, externalId, ...clusterDetails };
+          }
+          case 'serviceAccount': {
+            return clusterDetails;
+          }
+          default: {
+            throw new Error(
+              `authProvider "${authProvider}" has no config associated with it`,
+            );
+          }
+        }
       }),
     );
   }
diff --git a/plugins/kubernetes-backend/src/cluster-locator/GkeClusterLocator.ts b/plugins/kubernetes-backend/src/cluster-locator/GkeClusterLocator.ts
index 92212d0224..3cc6c216ae 100644
--- a/plugins/kubernetes-backend/src/cluster-locator/GkeClusterLocator.ts
+++ b/plugins/kubernetes-backend/src/cluster-locator/GkeClusterLocator.ts
@@ -16,7 +16,7 @@
 
 import { Config } from '@backstage/config';
 import * as container from '@google-cloud/container';
-import { ClusterDetails, KubernetesClustersSupplier } from '../types/types';
+import { GKEClusterDetails, KubernetesClustersSupplier } from '../types/types';
 
 type GkeClusterLocatorOptions = {
   projectId: string;
@@ -49,7 +49,7 @@ export class GkeClusterLocator implements KubernetesClustersSupplier {
     );
   }
 
-  async getClusters(): Promise<ClusterDetails[]> {
+  async getClusters(): Promise<GKEClusterDetails[]> {
     const { projectId, region, skipTLSVerify } = this.options;
     const request = {
       parent: `projects/${projectId}/locations/${region}`,
diff --git a/plugins/kubernetes-backend/src/index.ts b/plugins/kubernetes-backend/src/index.ts
index 155c4967d5..e5eb5e7c62 100644
--- a/plugins/kubernetes-backend/src/index.ts
+++ b/plugins/kubernetes-backend/src/index.ts
@@ -16,3 +16,5 @@
 
 export * from './service/router';
 export * from './types/types';
+
+export { DEFAULT_OBJECTS } from './service/KubernetesFanOutHandler';
diff --git a/plugins/kubernetes-backend/src/kubernetes-auth-translator/AwsIamKubernetesAuthTranslator.test.ts b/plugins/kubernetes-backend/src/kubernetes-auth-translator/AwsIamKubernetesAuthTranslator.test.ts
index 348ad541d5..9060ce9239 100644
--- a/plugins/kubernetes-backend/src/kubernetes-auth-translator/AwsIamKubernetesAuthTranslator.test.ts
+++ b/plugins/kubernetes-backend/src/kubernetes-auth-translator/AwsIamKubernetesAuthTranslator.test.ts
@@ -14,15 +14,58 @@
  * limitations under the License.
  */
 import AWS from 'aws-sdk';
+import AWSMock from 'aws-sdk-mock';
 import { AwsIamKubernetesAuthTranslator } from './AwsIamKubernetesAuthTranslator';
+import { get, def } from 'bdd-lazy-var';
 
 describe('AwsIamKubernetesAuthTranslator tests', () => {
+  let role: any = undefined;
+  const credentials: any = {
+    accessKeyId: 'bloop',
+    secretAccessKey: 'omg-so-secret',
+    sessionToken: 'token',
+  };
+
+  let assumeResponse: any = {
+    Credentials: {
+      AccessKeyId: credentials.accessKeyId,
+      SecretAccessKey: credentials.secretAccessKey,
+      SessionToken: credentials.sessionToken,
+    },
+  };
+
+  let credentialsResponse: any = new AWS.Credentials(credentials);
+
+  AWSMock.setSDKInstance(AWS);
+
   beforeEach(() => {
     jest.resetAllMocks();
   });
-  it('returns a signed url for aws credentials', async () => {
+
+  afterAll(() => {
+    jest.resetAllMocks();
+  });
+
+  def('subject', () => {
+    AWSMock.mock('STS', 'assumeRole', (_params: any, callback: Function) => {
+      callback(null, assumeResponse);
+    });
+
     const authTranslator = new AwsIamKubernetesAuthTranslator();
 
+    jest
+      .spyOn(authTranslator, 'awsGetCredentials')
+      .mockImplementation(async () => credentialsResponse);
+
+    return authTranslator.decorateClusterDetailsWithAuth({
+      assumeRole: role,
+      name: 'test-cluster',
+      url: '',
+      authProvider: 'aws',
+    });
+  });
+
+  it('returns a signed url for aws credentials', async () => {
     // These credentials are not real.
     // Pulled from example in docs: https://docs.aws.amazon.com/general/latest/gr/aws-sec-cred-types.html
     AWS.config.credentials = new AWS.Credentials(
@@ -30,24 +73,47 @@ describe('AwsIamKubernetesAuthTranslator tests', () => {
       'wJalrXUtnFEMI/K7MDENG/bPxRfiCYEXAMPLEKEY',
     );
 
-    const clusterDetails = await authTranslator.decorateClusterDetailsWithAuth({
-      name: 'test-cluster',
-      url: '',
-      authProvider: 'aws',
-    });
-    expect(clusterDetails.serviceAccountToken).toBeDefined();
+    const subject = await get('subject');
+    expect(subject.serviceAccountToken).toBeDefined();
   });
 
-  it('throws when unable to get aws credentials', async () => {
-    AWS.config.credentials = undefined;
-    const authTranslator = new AwsIamKubernetesAuthTranslator();
-    const promise = authTranslator.decorateClusterDetailsWithAuth({
-      name: 'test-cluster',
-      url: '',
-      authProvider: 'aws',
-    });
-    await expect(promise).rejects.toThrow(
-      'Could not load credentials from any providers',
+  describe('When the role is assumed', () => {
+    // These credentials are not real.
+    // Pulled from example in docs: https://docs.aws.amazon.com/general/latest/gr/aws-sec-cred-types.html
+    AWS.config.credentials = new AWS.Credentials(
+      'AKIAIOSFODNN7EXAMPLE',
+      'wJalrXUtnFEMI/K7MDENG/bPxRfiCYEXAMPLEKEY',
     );
+    role = 'SomeRole';
+
+    describe('When the role is valid', () => {
+      it('returns a signed url for aws credentials', async () => {
+        const subject = await get('subject');
+        expect(subject.serviceAccountToken).toBeDefined();
+      });
+    });
+
+    describe('When the role is invalid', () => {
+      it('returns the original AWS credentials', async () => {
+        assumeResponse = undefined;
+        await expect(get('subject')).rejects.toThrow(/Unable to assume role:/);
+      });
+    });
+  });
+
+  describe('When no creds are returned from AWS', () => {
+    it('throws unable to get aws credentials', async () => {
+      credentialsResponse = new Error();
+      await expect(get('subject')).rejects.toThrow('No AWS credentials found.');
+    });
+  });
+
+  describe('When invalid creds are returned from AWS', () => {
+    it('throws credentials are invalid to get aws credentials', async () => {
+      credentialsResponse = new AWS.Credentials(credentialsResponse);
+      await expect(get('subject')).rejects.toThrow(
+        'Invalid AWS credentials found.',
+      );
+    });
   });
 });
diff --git a/plugins/kubernetes-backend/src/kubernetes-auth-translator/AwsIamKubernetesAuthTranslator.ts b/plugins/kubernetes-backend/src/kubernetes-auth-translator/AwsIamKubernetesAuthTranslator.ts
index 0909926d0d..916067ebc5 100644
--- a/plugins/kubernetes-backend/src/kubernetes-auth-translator/AwsIamKubernetesAuthTranslator.ts
+++ b/plugins/kubernetes-backend/src/kubernetes-auth-translator/AwsIamKubernetesAuthTranslator.ts
@@ -15,37 +15,101 @@
  */
 import AWS, { Credentials } from 'aws-sdk';
 import { sign } from 'aws4';
-import { ClusterDetails } from '../types/types';
+import { AWSClusterDetails } from '../types/types';
 import { KubernetesAuthTranslator } from './types';
 
 const base64 = (str: string) =>
   Buffer.from(str.toString(), 'binary').toString('base64');
 const prepend = (prep: string) => (str: string) => prep + str;
-const replace = (search: string | RegExp, substitution: string) => (
-  str: string,
-) => str.replace(search, substitution);
-const pipe = (fns: ReadonlyArray<any>) => (thing: string): string =>
-  fns.reduce((val, fn) => fn(val), thing);
+const replace =
+  (search: string | RegExp, substitution: string) => (str: string) =>
+    str.replace(search, substitution);
+const pipe =
+  (fns: ReadonlyArray<any>) =>
+  (thing: string): string =>
+    fns.reduce((val, fn) => fn(val), thing);
 const removePadding = replace(/=+$/, '');
 const makeUrlSafe = pipe([replace('+', '-'), replace('/', '_')]);
 
+type SigningCreds = {
+  accessKeyId: string | undefined;
+  secretAccessKey: string | undefined;
+  sessionToken: string | undefined;
+};
+
 export class AwsIamKubernetesAuthTranslator
-  implements KubernetesAuthTranslator {
-  async getBearerToken(clusterName: string): Promise<string> {
-    const credentials = await new Promise((resolve, reject) => {
+  implements KubernetesAuthTranslator
+{
+  validCredentials(creds: SigningCreds): boolean {
+    return (creds?.accessKeyId &&
+      creds?.secretAccessKey &&
+      creds?.sessionToken) as unknown as boolean;
+  }
+
+  awsGetCredentials = async (): Promise<Credentials> => {
+    return new Promise((resolve, reject) => {
       AWS.config.getCredentials(err => {
         if (err) {
-          reject(err);
-        } else {
-          resolve(AWS.config.credentials);
+          return reject(err);
         }
+
+        return resolve(AWS.config.credentials as Credentials);
       });
     });
+  };
+
+  async getCredentials(
+    assumeRole?: string,
+    externalId?: string,
+  ): Promise<SigningCreds> {
+    return new Promise<SigningCreds>(async (resolve, reject) => {
+      const awsCreds = await this.awsGetCredentials();
+
+      if (!(awsCreds instanceof Credentials))
+        return reject(Error('No AWS credentials found.'));
+
+      let creds: SigningCreds = {
+        accessKeyId: awsCreds.accessKeyId,
+        secretAccessKey: awsCreds.secretAccessKey,
+        sessionToken: awsCreds.sessionToken,
+      };
+
+      if (!this.validCredentials(creds))
+        return reject(Error('Invalid AWS credentials found.'));
+      if (!assumeRole) return resolve(creds);
+
+      try {
+        const params: AWS.STS.Types.AssumeRoleRequest = {
+          RoleArn: assumeRole,
+          RoleSessionName: 'backstage-login',
+        };
+        if (externalId) params.ExternalId = externalId;
+
+        const assumedRole = await new AWS.STS().assumeRole(params).promise();
+
+        if (!assumedRole.Credentials) {
+          throw new Error(`No credentials returned for role ${assumeRole}`);
+        }
+
+        creds = {
+          accessKeyId: assumedRole.Credentials.AccessKeyId,
+          secretAccessKey: assumedRole.Credentials.SecretAccessKey,
+          sessionToken: assumedRole.Credentials.SessionToken,
+        };
+      } catch (e) {
+        console.warn(`There was an error assuming the role: ${e}`);
+        return reject(Error(`Unable to assume role: ${e}`));
+      }
+      return resolve(creds);
+    });
+  }
+  async getBearerToken(
+    clusterName: string,
+    assumeRole?: string,
+    externalId?: string,
+  ): Promise<string> {
+    const credentials = await this.getCredentials(assumeRole, externalId);
 
-    if (!(credentials instanceof Credentials)) {
-      throw new Error('no AWS credentials found.');
-    }
-    await credentials.getPromise();
     const request = {
       host: `sts.amazonaws.com`,
       path: `/?Action=GetCallerIdentity&Version=2011-06-15&X-Amz-Expires=60`,
@@ -54,11 +118,8 @@ export class AwsIamKubernetesAuthTranslator
       },
       signQuery: true,
     };
-    const signedRequest = sign(request, {
-      accessKeyId: credentials.accessKeyId,
-      secretAccessKey: credentials.secretAccessKey,
-      sessionToken: credentials.sessionToken,
-    });
+
+    const signedRequest = sign(request, credentials);
 
     return pipe([
       (signed: any) => `https://${signed.host}${signed.path}`,
@@ -70,15 +131,17 @@ export class AwsIamKubernetesAuthTranslator
   }
 
   async decorateClusterDetailsWithAuth(
-    clusterDetails: ClusterDetails,
-  ): Promise<ClusterDetails> {
-    const clusterDetailsWithAuthToken: ClusterDetails = Object.assign(
+    clusterDetails: AWSClusterDetails,
+  ): Promise<AWSClusterDetails> {
+    const clusterDetailsWithAuthToken: AWSClusterDetails = Object.assign(
       {},
       clusterDetails,
     );
 
     clusterDetailsWithAuthToken.serviceAccountToken = await this.getBearerToken(
       clusterDetails.name,
+      clusterDetails.assumeRole,
+      clusterDetails.externalId,
     );
     return clusterDetailsWithAuthToken;
   }
diff --git a/plugins/kubernetes-backend/src/kubernetes-auth-translator/GoogleKubernetesAuthTranslator.ts b/plugins/kubernetes-backend/src/kubernetes-auth-translator/GoogleKubernetesAuthTranslator.ts
index 02a7f314af..8c74945ec7 100644
--- a/plugins/kubernetes-backend/src/kubernetes-auth-translator/GoogleKubernetesAuthTranslator.ts
+++ b/plugins/kubernetes-backend/src/kubernetes-auth-translator/GoogleKubernetesAuthTranslator.ts
@@ -15,16 +15,17 @@
  */
 
 import { KubernetesAuthTranslator } from './types';
-import { ClusterDetails } from '../types/types';
+import { GKEClusterDetails } from '../types/types';
 import { KubernetesRequestBody } from '@backstage/plugin-kubernetes-common';
 
 export class GoogleKubernetesAuthTranslator
-  implements KubernetesAuthTranslator {
+  implements KubernetesAuthTranslator
+{
   async decorateClusterDetailsWithAuth(
-    clusterDetails: ClusterDetails,
+    clusterDetails: GKEClusterDetails,
     requestBody: KubernetesRequestBody,
-  ): Promise<ClusterDetails> {
-    const clusterDetailsWithAuthToken: ClusterDetails = Object.assign(
+  ): Promise<GKEClusterDetails> {
+    const clusterDetailsWithAuthToken: GKEClusterDetails = Object.assign(
       {},
       clusterDetails,
     );
diff --git a/plugins/kubernetes-backend/src/kubernetes-auth-translator/KubernetesAuthTranslatorGenerator.test.ts b/plugins/kubernetes-backend/src/kubernetes-auth-translator/KubernetesAuthTranslatorGenerator.test.ts
index 2d900b0bd1..33592b1c41 100644
--- a/plugins/kubernetes-backend/src/kubernetes-auth-translator/KubernetesAuthTranslatorGenerator.test.ts
+++ b/plugins/kubernetes-backend/src/kubernetes-auth-translator/KubernetesAuthTranslatorGenerator.test.ts
@@ -24,23 +24,20 @@ describe('getKubernetesAuthTranslatorInstance', () => {
   const sut = KubernetesAuthTranslatorGenerator;
 
   it('can return an auth translator for google auth', () => {
-    const authTranslator: KubernetesAuthTranslator = sut.getKubernetesAuthTranslatorInstance(
-      'google',
-    );
+    const authTranslator: KubernetesAuthTranslator =
+      sut.getKubernetesAuthTranslatorInstance('google');
     expect(authTranslator instanceof GoogleKubernetesAuthTranslator).toBe(true);
   });
 
   it('can return an auth translator for aws auth', () => {
-    const authTranslator: KubernetesAuthTranslator = sut.getKubernetesAuthTranslatorInstance(
-      'aws',
-    );
+    const authTranslator: KubernetesAuthTranslator =
+      sut.getKubernetesAuthTranslatorInstance('aws');
     expect(authTranslator instanceof AwsIamKubernetesAuthTranslator).toBe(true);
   });
 
   it('can return an auth translator for serviceAccount auth', () => {
-    const authTranslator: KubernetesAuthTranslator = sut.getKubernetesAuthTranslatorInstance(
-      'serviceAccount',
-    );
+    const authTranslator: KubernetesAuthTranslator =
+      sut.getKubernetesAuthTranslatorInstance('serviceAccount');
     expect(
       authTranslator instanceof ServiceAccountKubernetesAuthTranslator,
     ).toBe(true);
diff --git a/plugins/kubernetes-backend/src/kubernetes-auth-translator/ServiceAccountKubernetesAuthTranslator.ts b/plugins/kubernetes-backend/src/kubernetes-auth-translator/ServiceAccountKubernetesAuthTranslator.ts
index c433abf4de..6e5b8b9558 100644
--- a/plugins/kubernetes-backend/src/kubernetes-auth-translator/ServiceAccountKubernetesAuthTranslator.ts
+++ b/plugins/kubernetes-backend/src/kubernetes-auth-translator/ServiceAccountKubernetesAuthTranslator.ts
@@ -15,18 +15,19 @@
  */
 
 import { KubernetesAuthTranslator } from './types';
-import { ClusterDetails } from '../types/types';
+import { ServiceAccountClusterDetails } from '../types/types';
 import { KubernetesRequestBody } from '@backstage/plugin-kubernetes-common';
 
 export class ServiceAccountKubernetesAuthTranslator
-  implements KubernetesAuthTranslator {
+  implements KubernetesAuthTranslator
+{
   async decorateClusterDetailsWithAuth(
-    clusterDetails: ClusterDetails,
+    clusterDetails: ServiceAccountClusterDetails,
     // To ignore TS6133 linting error where it detects 'requestBody' is declared but its value is never read.
     // @ts-ignore-start
     requestBody: KubernetesRequestBody, // eslint-disable-line @typescript-eslint/no-unused-vars
     // @ts-ignore-end
-  ): Promise<ClusterDetails> {
+  ): Promise<ServiceAccountClusterDetails> {
     return clusterDetails;
   }
 }
diff --git a/plugins/kubernetes-backend/src/service/KubernetesFanOutHandler.test.ts b/plugins/kubernetes-backend/src/service/KubernetesFanOutHandler.test.ts
index 666b441226..a867efaaee 100644
--- a/plugins/kubernetes-backend/src/service/KubernetesFanOutHandler.test.ts
+++ b/plugins/kubernetes-backend/src/service/KubernetesFanOutHandler.test.ts
@@ -129,16 +129,16 @@ describe('handleGetKubernetesObjectsForService', () => {
 
     mockFetch(fetchObjectsForService);
 
-    const sut = new KubernetesFanOutHandler(
-      getVoidLogger(),
-      {
+    const sut = new KubernetesFanOutHandler({
+      logger: getVoidLogger(),
+      fetcher: {
         fetchObjectsForService,
       },
-      {
+      serviceLocator: {
         getClustersByServiceId,
       },
-      [],
-    );
+      customResources: [],
+    });
 
     const result = await sut.getKubernetesObjectsByEntity({
       entity: {
@@ -221,16 +221,16 @@ describe('handleGetKubernetesObjectsForService', () => {
 
     mockFetch(fetchObjectsForService);
 
-    const sut = new KubernetesFanOutHandler(
-      getVoidLogger(),
-      {
+    const sut = new KubernetesFanOutHandler({
+      logger: getVoidLogger(),
+      fetcher: {
         fetchObjectsForService,
       },
-      {
+      serviceLocator: {
         getClustersByServiceId,
       },
-      [],
-    );
+      customResources: [],
+    });
 
     const result = await sut.getKubernetesObjectsByEntity({
       auth: {
@@ -357,16 +357,16 @@ describe('handleGetKubernetesObjectsForService', () => {
 
     mockFetch(fetchObjectsForService);
 
-    const sut = new KubernetesFanOutHandler(
-      getVoidLogger(),
-      {
+    const sut = new KubernetesFanOutHandler({
+      logger: getVoidLogger(),
+      fetcher: {
         fetchObjectsForService,
       },
-      {
+      serviceLocator: {
         getClustersByServiceId,
       },
-      [],
-    );
+      customResources: [],
+    });
 
     const result = await sut.getKubernetesObjectsByEntity({
       auth: {
@@ -497,16 +497,16 @@ describe('handleGetKubernetesObjectsForService', () => {
 
     mockFetch(fetchObjectsForService);
 
-    const sut = new KubernetesFanOutHandler(
-      getVoidLogger(),
-      {
+    const sut = new KubernetesFanOutHandler({
+      logger: getVoidLogger(),
+      fetcher: {
         fetchObjectsForService,
       },
-      {
+      serviceLocator: {
         getClustersByServiceId,
       },
-      [],
-    );
+      customResources: [],
+    });
 
     const result = await sut.getKubernetesObjectsByEntity({
       auth: {
diff --git a/plugins/kubernetes-backend/src/service/KubernetesFanOutHandler.ts b/plugins/kubernetes-backend/src/service/KubernetesFanOutHandler.ts
index 3039560aad..fb1876733d 100644
--- a/plugins/kubernetes-backend/src/service/KubernetesFanOutHandler.ts
+++ b/plugins/kubernetes-backend/src/service/KubernetesFanOutHandler.ts
@@ -26,7 +26,7 @@ import { KubernetesRequestBody } from '@backstage/plugin-kubernetes-common';
 import { KubernetesAuthTranslator } from '../kubernetes-auth-translator/types';
 import { KubernetesAuthTranslatorGenerator } from '../kubernetes-auth-translator/KubernetesAuthTranslatorGenerator';
 
-const DEFAULT_OBJECTS = new Set<KubernetesObjectTypes>([
+export const DEFAULT_OBJECTS: KubernetesObjectTypes[] = [
   'pods',
   'services',
   'configmaps',
@@ -34,44 +34,52 @@ const DEFAULT_OBJECTS = new Set<KubernetesObjectTypes>([
   'replicasets',
   'horizontalpodautoscalers',
   'ingresses',
-]);
+];
+
+export interface KubernetesFanOutHandlerOptions {
+  logger: Logger;
+  fetcher: KubernetesFetcher;
+  serviceLocator: KubernetesServiceLocator;
+  customResources: CustomResource[];
+  objectTypesToFetch?: KubernetesObjectTypes[];
+}
 
 export class KubernetesFanOutHandler {
   private readonly logger: Logger;
   private readonly fetcher: KubernetesFetcher;
   private readonly serviceLocator: KubernetesServiceLocator;
   private readonly customResources: CustomResource[];
+  private readonly objectTypesToFetch: KubernetesObjectTypes[];
 
-  constructor(
-    logger: Logger,
-    fetcher: KubernetesFetcher,
-    serviceLocator: KubernetesServiceLocator,
-    customResources: CustomResource[],
-  ) {
+  constructor({
+    logger,
+    fetcher,
+    serviceLocator,
+    customResources,
+    objectTypesToFetch = DEFAULT_OBJECTS,
+  }: KubernetesFanOutHandlerOptions) {
     this.logger = logger;
     this.fetcher = fetcher;
     this.serviceLocator = serviceLocator;
     this.customResources = customResources;
+    this.objectTypesToFetch = objectTypesToFetch;
   }
 
-  async getKubernetesObjectsByEntity(
-    requestBody: KubernetesRequestBody,
-    objectTypesToFetch: Set<KubernetesObjectTypes> = DEFAULT_OBJECTS,
-  ) {
+  async getKubernetesObjectsByEntity(requestBody: KubernetesRequestBody) {
     const entityName =
       requestBody.entity?.metadata?.annotations?.[
         'backstage.io/kubernetes-id'
       ] || requestBody.entity?.metadata?.name;
 
-    const clusterDetails: ClusterDetails[] = await this.serviceLocator.getClustersByServiceId(
-      entityName,
-    );
+    const clusterDetails: ClusterDetails[] =
+      await this.serviceLocator.getClustersByServiceId(entityName);
 
     // Execute all of these async actions simultaneously/without blocking sequentially as no common object is modified by them
     const promises: Promise<ClusterDetails>[] = clusterDetails.map(cd => {
-      const kubernetesAuthTranslator: KubernetesAuthTranslator = KubernetesAuthTranslatorGenerator.getKubernetesAuthTranslatorInstance(
-        cd.authProvider,
-      );
+      const kubernetesAuthTranslator: KubernetesAuthTranslator =
+        KubernetesAuthTranslatorGenerator.getKubernetesAuthTranslatorInstance(
+          cd.authProvider,
+        );
       return kubernetesAuthTranslator.decorateClusterDetailsWithAuth(
         cd,
         requestBody,
@@ -98,7 +106,7 @@ export class KubernetesFanOutHandler {
           .fetchObjectsForService({
             serviceId: entityName,
             clusterDetails: clusterDetailsItem,
-            objectTypesToFetch,
+            objectTypesToFetch: new Set(this.objectTypesToFetch),
             labelSelector,
             customResources: this.customResources,
           })
diff --git a/plugins/kubernetes-backend/src/service/KubernetesFetcher.ts b/plugins/kubernetes-backend/src/service/KubernetesFetcher.ts
index 76c3b0aac0..e17b47e17a 100644
--- a/plugins/kubernetes-backend/src/service/KubernetesFetcher.ts
+++ b/plugins/kubernetes-backend/src/service/KubernetesFetcher.ts
@@ -167,10 +167,9 @@ export class KubernetesClientBasedFetcher implements KubernetesFetcher {
           labelSelector,
         ).then(r => ({ type: type, resources: r }));
       case 'services':
-        return this.fetchServicesForService(
-          clusterDetails,
-          labelSelector,
-        ).then(r => ({ type: type, resources: r }));
+        return this.fetchServicesForService(clusterDetails, labelSelector).then(
+          r => ({ type: type, resources: r }),
+        );
       case 'horizontalpodautoscalers':
         return this.fetchHorizontalPodAutoscalersForService(
           clusterDetails,
@@ -192,9 +191,8 @@ export class KubernetesClientBasedFetcher implements KubernetesFetcher {
     customResource: CustomResource,
     labelSelector: string,
   ): Promise<FetchResponse> {
-    const customObjects = this.kubernetesClientProvider.getCustomObjectsClient(
-      clusterDetails,
-    );
+    const customObjects =
+      this.kubernetesClientProvider.getCustomObjectsClient(clusterDetails);
 
     return customObjects
       .listClusterCustomObject(
@@ -217,18 +215,20 @@ export class KubernetesClientBasedFetcher implements KubernetesFetcher {
       client: Clients,
     ) => Promise<{ body: { items: Array<T> }; response: http.IncomingMessage }>,
   ): Promise<Array<T>> {
-    const core = this.kubernetesClientProvider.getCoreClientByClusterDetails(
-      clusterDetails,
-    );
-    const apps = this.kubernetesClientProvider.getAppsClientByClusterDetails(
-      clusterDetails,
-    );
-    const autoscaling = this.kubernetesClientProvider.getAutoscalingClientByClusterDetails(
-      clusterDetails,
-    );
-    const networkingBeta1 = this.kubernetesClientProvider.getNetworkingBeta1Client(
-      clusterDetails,
-    );
+    const core =
+      this.kubernetesClientProvider.getCoreClientByClusterDetails(
+        clusterDetails,
+      );
+    const apps =
+      this.kubernetesClientProvider.getAppsClientByClusterDetails(
+        clusterDetails,
+      );
+    const autoscaling =
+      this.kubernetesClientProvider.getAutoscalingClientByClusterDetails(
+        clusterDetails,
+      );
+    const networkingBeta1 =
+      this.kubernetesClientProvider.getNetworkingBeta1Client(clusterDetails);
 
     this.logger.debug(`calling cluster=${clusterDetails.name}`);
     return fn({ core, apps, autoscaling, networkingBeta1 }).then(({ body }) => {
diff --git a/plugins/kubernetes-backend/src/service/router.ts b/plugins/kubernetes-backend/src/service/router.ts
index 984b3f14a0..4792ae708f 100644
--- a/plugins/kubernetes-backend/src/service/router.ts
+++ b/plugins/kubernetes-backend/src/service/router.ts
@@ -23,6 +23,7 @@ import { MultiTenantServiceLocator } from '../service-locator/MultiTenantService
 import {
   ClusterDetails,
   KubernetesClustersSupplier,
+  KubernetesObjectTypes,
   KubernetesServiceLocator,
   ServiceLocatorMethod,
   CustomResource,
@@ -70,9 +71,8 @@ export const makeRouter = (
     const serviceId = req.params.serviceId;
     const requestBody: KubernetesRequestBody = req.body;
     try {
-      const response = await kubernetesFanOutHandler.getKubernetesObjectsByEntity(
-        requestBody,
-      );
+      const response =
+        await kubernetesFanOutHandler.getKubernetesObjectsByEntity(requestBody);
       res.json(response);
     } catch (e) {
       logger.error(
@@ -133,13 +133,17 @@ export async function createRouter(
   );
 
   const serviceLocator = getServiceLocator(options.config, clusterDetails);
+  const objectTypesToFetch = options.config.getOptionalStringArray(
+    'kubernetes.objectTypes',
+  ) as KubernetesObjectTypes[];
 
-  const kubernetesFanOutHandler = new KubernetesFanOutHandler(
+  const kubernetesFanOutHandler = new KubernetesFanOutHandler({
     logger,
     fetcher,
     serviceLocator,
     customResources,
-  );
+    objectTypesToFetch,
+  });
 
   return makeRouter(logger, kubernetesFanOutHandler, clusterDetails);
 }
diff --git a/plugins/kubernetes-backend/src/types/types.ts b/plugins/kubernetes-backend/src/types/types.ts
index c6e1668a5a..f4bb019108 100644
--- a/plugins/kubernetes-backend/src/types/types.ts
+++ b/plugins/kubernetes-backend/src/types/types.ts
@@ -27,7 +27,11 @@ export interface CustomResource {
 
 export interface ObjectFetchParams {
   serviceId: string;
-  clusterDetails: ClusterDetails;
+  clusterDetails:
+    | AWSClusterDetails
+    | GKEClusterDetails
+    | ServiceAccountClusterDetails
+    | ClusterDetails;
   objectTypesToFetch: Set<KubernetesObjectTypes>;
   labelSelector: string;
   customResources: CustomResource[];
@@ -77,3 +81,10 @@ export interface ClusterDetails {
   serviceAccountToken?: string | undefined;
   skipTLSVerify?: boolean;
 }
+
+export interface GKEClusterDetails extends ClusterDetails {}
+export interface ServiceAccountClusterDetails extends ClusterDetails {}
+export interface AWSClusterDetails extends ClusterDetails {
+  assumeRole?: string;
+  externalId?: string;
+}
diff --git a/plugins/kubernetes-common/CHANGELOG.md b/plugins/kubernetes-common/CHANGELOG.md
index 3f6c1ea7db..49a312fa46 100644
--- a/plugins/kubernetes-common/CHANGELOG.md
+++ b/plugins/kubernetes-common/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @backstage/plugin-kubernetes-common
 
+## 0.1.3
+
+### Patch Changes
+
+- 7f24f4088: chore(deps): bump `@kubernetes/client-node` from 0.14.3 to 0.15.0
+
 ## 0.1.2
 
 ### Patch Changes
diff --git a/plugins/kubernetes-common/api-report.md b/plugins/kubernetes-common/api-report.md
index 34d6bd8414..04f54b1f1a 100644
--- a/plugins/kubernetes-common/api-report.md
+++ b/plugins/kubernetes-common/api-report.md
@@ -12,9 +12,13 @@ import { V1Pod } from '@kubernetes/client-node';
 import { V1ReplicaSet } from '@kubernetes/client-node';
 import { V1Service } from '@kubernetes/client-node';
 
+// Warning: (ae-missing-release-tag) "AuthProviderType" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export type AuthProviderType = 'google' | 'serviceAccount' | 'aws';
 
+// Warning: (ae-missing-release-tag) "ClusterObjects" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export interface ClusterObjects {
   // (undocumented)
@@ -27,6 +31,8 @@ export interface ClusterObjects {
   resources: FetchResponse[];
 }
 
+// Warning: (ae-missing-release-tag) "ConfigMapFetchResponse" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export interface ConfigMapFetchResponse {
   // (undocumented)
@@ -35,6 +41,8 @@ export interface ConfigMapFetchResponse {
   type: 'configmaps';
 }
 
+// Warning: (ae-missing-release-tag) "CustomResourceFetchResponse" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export interface CustomResourceFetchResponse {
   // (undocumented)
@@ -43,6 +51,8 @@ export interface CustomResourceFetchResponse {
   type: 'customresources';
 }
 
+// Warning: (ae-missing-release-tag) "DeploymentFetchResponse" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export interface DeploymentFetchResponse {
   // (undocumented)
@@ -51,6 +61,8 @@ export interface DeploymentFetchResponse {
   type: 'deployments';
 }
 
+// Warning: (ae-missing-release-tag) "FetchResponse" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export type FetchResponse =
   | PodFetchResponse
@@ -62,6 +74,8 @@ export type FetchResponse =
   | IngressesFetchResponse
   | CustomResourceFetchResponse;
 
+// Warning: (ae-missing-release-tag) "HorizontalPodAutoscalersFetchResponse" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export interface HorizontalPodAutoscalersFetchResponse {
   // (undocumented)
@@ -70,6 +84,8 @@ export interface HorizontalPodAutoscalersFetchResponse {
   type: 'horizontalpodautoscalers';
 }
 
+// Warning: (ae-missing-release-tag) "IngressesFetchResponse" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export interface IngressesFetchResponse {
   // (undocumented)
@@ -78,6 +94,8 @@ export interface IngressesFetchResponse {
   type: 'ingresses';
 }
 
+// Warning: (ae-missing-release-tag) "KubernetesErrorTypes" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export type KubernetesErrorTypes =
   | 'BAD_REQUEST'
@@ -85,6 +103,8 @@ export type KubernetesErrorTypes =
   | 'SYSTEM_ERROR'
   | 'UNKNOWN_ERROR';
 
+// Warning: (ae-missing-release-tag) "KubernetesFetchError" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export interface KubernetesFetchError {
   // (undocumented)
@@ -95,6 +115,8 @@ export interface KubernetesFetchError {
   statusCode?: number;
 }
 
+// Warning: (ae-missing-release-tag) "KubernetesRequestBody" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export interface KubernetesRequestBody {
   // (undocumented)
@@ -105,12 +127,16 @@ export interface KubernetesRequestBody {
   entity: Entity;
 }
 
+// Warning: (ae-missing-release-tag) "ObjectsByEntityResponse" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export interface ObjectsByEntityResponse {
   // (undocumented)
   items: ClusterObjects[];
 }
 
+// Warning: (ae-missing-release-tag) "PodFetchResponse" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export interface PodFetchResponse {
   // (undocumented)
@@ -119,6 +145,8 @@ export interface PodFetchResponse {
   type: 'pods';
 }
 
+// Warning: (ae-missing-release-tag) "ReplicaSetsFetchResponse" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export interface ReplicaSetsFetchResponse {
   // (undocumented)
@@ -127,6 +155,8 @@ export interface ReplicaSetsFetchResponse {
   type: 'replicasets';
 }
 
+// Warning: (ae-missing-release-tag) "ServiceFetchResponse" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export interface ServiceFetchResponse {
   // (undocumented)
diff --git a/plugins/kubernetes-common/package.json b/plugins/kubernetes-common/package.json
index 1b645690b6..445ba3f7d9 100644
--- a/plugins/kubernetes-common/package.json
+++ b/plugins/kubernetes-common/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@backstage/plugin-kubernetes-common",
   "description": "Common functionalities for kubernetes, to be shared between kubernetes and kubernetes-backend plugin",
-  "version": "0.1.2",
+  "version": "0.1.3",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -36,10 +36,10 @@
   },
   "dependencies": {
     "@backstage/catalog-model": "^0.9.0",
-    "@kubernetes/client-node": "^0.14.0"
+    "@kubernetes/client-node": "^0.15.0"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.7.0"
+    "@backstage/cli": "^0.7.6"
   },
   "jest": {
     "roots": [
diff --git a/plugins/kubernetes/CHANGELOG.md b/plugins/kubernetes/CHANGELOG.md
index dd9f4d8bfa..2e389256ef 100644
--- a/plugins/kubernetes/CHANGELOG.md
+++ b/plugins/kubernetes/CHANGELOG.md
@@ -1,5 +1,60 @@
 # @backstage/plugin-kubernetes
 
+## 0.4.12
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@0.4.5
+  - @backstage/core-components@0.4.0
+  - @backstage/catalog-model@0.9.1
+
+## 0.4.11
+
+### Patch Changes
+
+- 8bedb75ae: Update Luxon dependency to 2.x
+- Updated dependencies
+  - @backstage/core-components@0.3.1
+  - @backstage/core-plugin-api@0.1.6
+  - @backstage/plugin-catalog-react@0.4.2
+
+## 0.4.10
+
+### Patch Changes
+
+- 260c053b9: Fix All Material UI Warnings
+- Updated dependencies
+  - @backstage/core-components@0.3.0
+  - @backstage/config@0.1.6
+  - @backstage/core-plugin-api@0.1.5
+  - @backstage/plugin-catalog-react@0.4.1
+
+## 0.4.9
+
+### Patch Changes
+
+- 9d40fcb1e: - Bumping `material-ui/core` version to at least `4.12.2` as they made some breaking changes in later versions which broke `Pagination` of the `Table`.
+  - Switching out `material-table` to `@material-table/core` for support for the later versions of `material-ui/core`
+  - This causes a minor API change to `@backstage/core-components` as the interface for `Table` re-exports the `prop` from the underlying `Table` components.
+  - `onChangeRowsPerPage` has been renamed to `onRowsPerPageChange`
+  - `onChangePage` has been renamed to `onPageChange`
+  - Migration guide is here: https://material-table-core.com/docs/breaking-changes
+- 7f24f4088: chore(deps): bump `@kubernetes/client-node` from 0.14.3 to 0.15.0
+- Updated dependencies
+  - @backstage/core-components@0.2.0
+  - @backstage/plugin-catalog-react@0.4.0
+  - @backstage/core-plugin-api@0.1.4
+  - @backstage/theme@0.2.9
+  - @backstage/plugin-kubernetes-common@0.1.3
+
+## 0.4.8
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@0.3.0
+
 ## 0.4.7
 
 ### Patch Changes
diff --git a/plugins/kubernetes/api-report.md b/plugins/kubernetes/api-report.md
index 9fe56bc5ca..0a3b466942 100644
--- a/plugins/kubernetes/api-report.md
+++ b/plugins/kubernetes/api-report.md
@@ -12,11 +12,16 @@ import { KubernetesRequestBody } from '@backstage/plugin-kubernetes-common';
 import { OAuthApi } from '@backstage/core-plugin-api';
 import { RouteRef } from '@backstage/core-plugin-api';
 
+// Warning: (ae-missing-release-tag) "EntityKubernetesContent" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export const EntityKubernetesContent: (_props: {
   entity?: Entity | undefined;
 }) => JSX.Element;
 
+// Warning: (ae-forgotten-export) The symbol "KubernetesAuthProvidersApi" needs to be exported by the entry point index.d.ts
+// Warning: (ae-missing-release-tag) "KubernetesAuthProviders" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export class KubernetesAuthProviders implements KubernetesAuthProvidersApi {
   constructor(options: { googleAuthApi: OAuthApi });
@@ -27,9 +32,13 @@ export class KubernetesAuthProviders implements KubernetesAuthProvidersApi {
   ): Promise<KubernetesRequestBody>;
 }
 
+// Warning: (ae-missing-release-tag) "kubernetesAuthProvidersApiRef" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export const kubernetesAuthProvidersApiRef: ApiRef<KubernetesAuthProvidersApi>;
 
+// Warning: (ae-missing-release-tag) "kubernetesPlugin" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 const kubernetesPlugin: BackstagePlugin<
   {
@@ -40,6 +49,9 @@ const kubernetesPlugin: BackstagePlugin<
 export { kubernetesPlugin };
 export { kubernetesPlugin as plugin };
 
+// Warning: (ae-forgotten-export) The symbol "Props" needs to be exported by the entry point index.d.ts
+// Warning: (ae-missing-release-tag) "Router" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export const Router: (_props: Props) => JSX.Element;
 
diff --git a/plugins/kubernetes/package.json b/plugins/kubernetes/package.json
index fdfb2a3431..fe4391e1f7 100644
--- a/plugins/kubernetes/package.json
+++ b/plugins/kubernetes/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-kubernetes",
-  "version": "0.4.7",
+  "version": "0.4.12",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -30,30 +30,30 @@
     "clean": "backstage-cli clean"
   },
   "dependencies": {
-    "@backstage/catalog-model": "^0.9.0",
-    "@backstage/config": "^0.1.5",
-    "@backstage/core-components": "^0.1.5",
-    "@backstage/core-plugin-api": "^0.1.3",
-    "@backstage/plugin-catalog-react": "^0.2.6",
-    "@backstage/plugin-kubernetes-common": "^0.1.2",
-    "@backstage/theme": "^0.2.8",
-    "@kubernetes/client-node": "^0.14.0",
-    "@material-ui/core": "^4.11.0",
+    "@backstage/catalog-model": "^0.9.1",
+    "@backstage/config": "^0.1.6",
+    "@backstage/core-components": "^0.4.1",
+    "@backstage/core-plugin-api": "^0.1.7",
+    "@backstage/plugin-catalog-react": "^0.4.5",
+    "@backstage/plugin-kubernetes-common": "^0.1.3",
+    "@backstage/theme": "^0.2.10",
+    "@kubernetes/client-node": "^0.15.0",
+    "@material-ui/core": "^4.12.2",
     "@material-ui/icons": "^4.9.1",
     "@material-ui/lab": "4.0.0-alpha.45",
     "js-yaml": "^4.0.0",
     "lodash": "^4.17.21",
-    "luxon": "^1.26.0",
+    "luxon": "^2.0.2",
     "react": "^16.13.1",
     "react-dom": "^16.13.1",
     "react-router-dom": "6.0.0-beta.0",
     "react-use": "^17.2.4"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.7.3",
-    "@backstage/core-app-api": "^0.1.4",
-    "@backstage/dev-utils": "^0.2.1",
-    "@backstage/test-utils": "^0.1.14",
+    "@backstage/cli": "^0.7.11",
+    "@backstage/core-app-api": "^0.1.12",
+    "@backstage/dev-utils": "^0.2.9",
+    "@backstage/test-utils": "^0.1.17",
     "@testing-library/jest-dom": "^5.10.1",
     "@testing-library/react": "^11.2.5",
     "@testing-library/react-hooks": "^3.4.2",
diff --git a/plugins/kubernetes/src/components/CustomResources/ArgoRollouts/Rollout.test.tsx b/plugins/kubernetes/src/components/CustomResources/ArgoRollouts/Rollout.test.tsx
index 15e8237d3b..f3e1d47479 100644
--- a/plugins/kubernetes/src/components/CustomResources/ArgoRollouts/Rollout.test.tsx
+++ b/plugins/kubernetes/src/components/CustomResources/ArgoRollouts/Rollout.test.tsx
@@ -58,10 +58,10 @@ describe('Rollout', () => {
   it('should render Paused Rollout with pause text', async () => {
     const wrapper = kubernetesProviders(groupedResources, new Set([]));
 
-    (pausedRollout.status.pauseConditions[0]
-      .startTime as any) = DateTime.local()
-      // millis * secs * mins = 45 mins
-      .minus(Duration.fromMillis(1000 * 60 * 45));
+    (pausedRollout.status.pauseConditions[0].startTime as any) =
+      DateTime.local()
+        // millis * secs * mins = 45 mins
+        .minus(Duration.fromMillis(1000 * 60 * 45));
 
     const { getByText } = render(
       wrapper(
diff --git a/plugins/kubernetes/src/components/CustomResources/ArgoRollouts/Rollout.tsx b/plugins/kubernetes/src/components/CustomResources/ArgoRollouts/Rollout.tsx
index ae98e4e668..e14cd9093a 100644
--- a/plugins/kubernetes/src/components/CustomResources/ArgoRollouts/Rollout.tsx
+++ b/plugins/kubernetes/src/components/CustomResources/ArgoRollouts/Rollout.tsx
@@ -97,7 +97,12 @@ const RolloutSummary = ({
   const abortedMessage = findAbortedMessage(rollout);
 
   return (
-    <Grid container direction="row" justify="flex-start" alignItems="center">
+    <Grid
+      container
+      direction="row"
+      justifyContent="flex-start"
+      alignItems="center"
+    >
       <Grid xs={3} item>
         <RolloutDrawer rollout={rollout} />
       </Grid>
@@ -111,7 +116,7 @@ const RolloutSummary = ({
               item
               container
               direction="column"
-              justify="flex-start"
+              justifyContent="flex-start"
               alignItems="flex-start"
               spacing={0}
             >
@@ -142,7 +147,7 @@ const RolloutSummary = ({
         container
         xs={3}
         direction="column"
-        justify="flex-start"
+        justifyContent="flex-start"
         alignItems="flex-start"
       >
         <Grid item>
@@ -250,7 +255,7 @@ export const RolloutAccordions = ({
     <Grid
       container
       direction="column"
-      justify="flex-start"
+      justifyContent="flex-start"
       alignItems="flex-start"
     >
       {rollouts.map((rollout, i) => (
diff --git a/plugins/kubernetes/src/components/CustomResources/ArgoRollouts/RolloutDrawer.tsx b/plugins/kubernetes/src/components/CustomResources/ArgoRollouts/RolloutDrawer.tsx
index 2e116c0881..d719f707d1 100644
--- a/plugins/kubernetes/src/components/CustomResources/ArgoRollouts/RolloutDrawer.tsx
+++ b/plugins/kubernetes/src/components/CustomResources/ArgoRollouts/RolloutDrawer.tsx
@@ -35,7 +35,7 @@ export const RolloutDrawer = ({
       <Grid
         container
         direction="column"
-        justify="flex-start"
+        justifyContent="flex-start"
         alignItems="flex-start"
         spacing={0}
       >
diff --git a/plugins/kubernetes/src/components/CustomResources/DefaultCustomResource.tsx b/plugins/kubernetes/src/components/CustomResources/DefaultCustomResource.tsx
index f0bd92c5bf..36d38d3fe0 100644
--- a/plugins/kubernetes/src/components/CustomResources/DefaultCustomResource.tsx
+++ b/plugins/kubernetes/src/components/CustomResources/DefaultCustomResource.tsx
@@ -51,7 +51,12 @@ const DefaultCustomResourceSummary = ({
   customResourceName,
 }: DefaultCustomResourceSummaryProps) => {
   return (
-    <Grid container direction="row" justify="flex-start" alignItems="center">
+    <Grid
+      container
+      direction="row"
+      justifyContent="flex-start"
+      alignItems="center"
+    >
       <Grid xs={3} item>
         <DefaultCustomResourceDrawer
           customResource={customResource}
@@ -99,7 +104,7 @@ export const DefaultCustomResourceAccordions = ({
     <Grid
       container
       direction="column"
-      justify="flex-start"
+      justifyContent="flex-start"
       alignItems="flex-start"
     >
       {customResources.map((cr, i) => (
diff --git a/plugins/kubernetes/src/components/CustomResources/DefaultCustomResourceDrawer.tsx b/plugins/kubernetes/src/components/CustomResources/DefaultCustomResourceDrawer.tsx
index 906e9fd616..ba6169cdf3 100644
--- a/plugins/kubernetes/src/components/CustomResources/DefaultCustomResourceDrawer.tsx
+++ b/plugins/kubernetes/src/components/CustomResources/DefaultCustomResourceDrawer.tsx
@@ -42,7 +42,7 @@ export const DefaultCustomResourceDrawer = ({
       <Grid
         container
         direction="column"
-        justify="flex-start"
+        justifyContent="flex-start"
         alignItems="flex-start"
         spacing={0}
       >
diff --git a/plugins/kubernetes/src/components/DeploymentsAccordions/DeploymentDrawer.tsx b/plugins/kubernetes/src/components/DeploymentsAccordions/DeploymentDrawer.tsx
index 2173f9bfe4..2d22caec7c 100644
--- a/plugins/kubernetes/src/components/DeploymentsAccordions/DeploymentDrawer.tsx
+++ b/plugins/kubernetes/src/components/DeploymentsAccordions/DeploymentDrawer.tsx
@@ -52,7 +52,7 @@ export const DeploymentDrawer = ({
       <Grid
         container
         direction="column"
-        justify="flex-start"
+        justifyContent="flex-start"
         alignItems="flex-start"
         spacing={0}
       >
diff --git a/plugins/kubernetes/src/components/DeploymentsAccordions/DeploymentsAccordions.tsx b/plugins/kubernetes/src/components/DeploymentsAccordions/DeploymentsAccordions.tsx
index 5bbeee1c64..e27c2bfbe1 100644
--- a/plugins/kubernetes/src/components/DeploymentsAccordions/DeploymentsAccordions.tsx
+++ b/plugins/kubernetes/src/components/DeploymentsAccordions/DeploymentsAccordions.tsx
@@ -68,7 +68,12 @@ const DeploymentSummary = ({
   hpa,
 }: DeploymentSummaryProps) => {
   return (
-    <Grid container direction="row" justify="flex-start" alignItems="center">
+    <Grid
+      container
+      direction="row"
+      justifyContent="flex-start"
+      alignItems="center"
+    >
       <Grid xs={3} item>
         <DeploymentDrawer deployment={deployment} />
       </Grid>
@@ -82,7 +87,7 @@ const DeploymentSummary = ({
               item
               container
               direction="column"
-              justify="flex-start"
+              justifyContent="flex-start"
               alignItems="flex-start"
               spacing={0}
             >
@@ -113,7 +118,7 @@ const DeploymentSummary = ({
         container
         xs={3}
         direction="column"
-        justify="flex-start"
+        justifyContent="flex-start"
         alignItems="flex-start"
       >
         <Grid item>
@@ -169,7 +174,7 @@ export const DeploymentsAccordions = ({}: DeploymentsAccordionsProps) => {
     <Grid
       container
       direction="column"
-      justify="flex-start"
+      justifyContent="flex-start"
       alignItems="flex-start"
     >
       {groupedResponses.deployments.map((deployment, i) => (
diff --git a/plugins/kubernetes/src/components/ErrorReporting/ErrorReporting.tsx b/plugins/kubernetes/src/components/ErrorReporting/ErrorReporting.tsx
index 29107ac210..62af1d9d14 100644
--- a/plugins/kubernetes/src/components/ErrorReporting/ErrorReporting.tsx
+++ b/plugins/kubernetes/src/components/ErrorReporting/ErrorReporting.tsx
@@ -90,7 +90,7 @@ export const ErrorEmptyState = () => {
   return (
     <Grid
       container
-      justify="space-around"
+      justifyContent="space-around"
       direction="row"
       alignItems="center"
       spacing={2}
diff --git a/plugins/kubernetes/src/components/IngressesAccordions/IngressDrawer.tsx b/plugins/kubernetes/src/components/IngressesAccordions/IngressDrawer.tsx
index 6c840e1783..0018c4b070 100644
--- a/plugins/kubernetes/src/components/IngressesAccordions/IngressDrawer.tsx
+++ b/plugins/kubernetes/src/components/IngressesAccordions/IngressDrawer.tsx
@@ -38,7 +38,7 @@ export const IngressDrawer = ({
       <Grid
         container
         direction="column"
-        justify="flex-start"
+        justifyContent="flex-start"
         alignItems="flex-start"
         spacing={0}
       >
diff --git a/plugins/kubernetes/src/components/IngressesAccordions/IngressesAccordions.tsx b/plugins/kubernetes/src/components/IngressesAccordions/IngressesAccordions.tsx
index d8632488ad..c1d94fef7b 100644
--- a/plugins/kubernetes/src/components/IngressesAccordions/IngressesAccordions.tsx
+++ b/plugins/kubernetes/src/components/IngressesAccordions/IngressesAccordions.tsx
@@ -40,7 +40,12 @@ type IngressSummaryProps = {
 
 const IngressSummary = ({ ingress }: IngressSummaryProps) => {
   return (
-    <Grid container direction="row" justify="flex-start" alignItems="center">
+    <Grid
+      container
+      direction="row"
+      justifyContent="flex-start"
+      alignItems="center"
+    >
       <Grid xs={3} item>
         <IngressDrawer ingress={ingress} />
       </Grid>
@@ -84,7 +89,7 @@ export const IngressesAccordions = ({}: IngressesAccordionsProps) => {
     <Grid
       container
       direction="row"
-      justify="flex-start"
+      justifyContent="flex-start"
       alignItems="flex-start"
     >
       {groupedResponses.ingresses.map((ingress, i) => (
diff --git a/plugins/kubernetes/src/components/KubernetesContent/KubernetesContent.tsx b/plugins/kubernetes/src/components/KubernetesContent/KubernetesContent.tsx
index 004473dd63..c0dd6d5003 100644
--- a/plugins/kubernetes/src/components/KubernetesContent/KubernetesContent.tsx
+++ b/plugins/kubernetes/src/components/KubernetesContent/KubernetesContent.tsx
@@ -65,7 +65,7 @@ const ClusterSummary = ({
     <Grid
       container
       direction="row"
-      justify="flex-start"
+      justifyContent="flex-start"
       alignItems="flex-start"
     >
       <Grid
@@ -73,7 +73,7 @@ const ClusterSummary = ({
         item
         container
         direction="column"
-        justify="flex-start"
+        justifyContent="flex-start"
         alignItems="flex-start"
         spacing={0}
       >
@@ -92,7 +92,7 @@ const ClusterSummary = ({
         container
         xs={3}
         direction="column"
-        justify="flex-start"
+        justifyContent="flex-start"
         alignItems="flex-start"
       >
         <Grid item>
@@ -208,7 +208,7 @@ export const KubernetesContent = ({ entity }: KubernetesContentProps) => {
               {kubernetesObjects?.items.length <= 0 && (
                 <Grid
                   container
-                  justify="space-around"
+                  justifyContent="space-around"
                   direction="row"
                   alignItems="center"
                   spacing={2}
diff --git a/plugins/kubernetes/src/components/KubernetesDrawer/KubernetesDrawer.tsx b/plugins/kubernetes/src/components/KubernetesDrawer/KubernetesDrawer.tsx
index 274643b2da..bf714530ce 100644
--- a/plugins/kubernetes/src/components/KubernetesDrawer/KubernetesDrawer.tsx
+++ b/plugins/kubernetes/src/components/KubernetesDrawer/KubernetesDrawer.tsx
@@ -112,7 +112,7 @@ const KubernetesDrawerContent = <T extends KubernetesDrawerable>({
         <Grid
           container
           direction="column"
-          justify="flex-start"
+          justifyContent="flex-start"
           alignItems="flex-start"
         >
           <Grid item>
diff --git a/plugins/kubernetes/src/components/ServicesAccordions/ServiceDrawer.tsx b/plugins/kubernetes/src/components/ServicesAccordions/ServiceDrawer.tsx
index 1d214ac276..5d17fd7213 100644
--- a/plugins/kubernetes/src/components/ServicesAccordions/ServiceDrawer.tsx
+++ b/plugins/kubernetes/src/components/ServicesAccordions/ServiceDrawer.tsx
@@ -38,7 +38,7 @@ export const ServiceDrawer = ({
       <Grid
         container
         direction="column"
-        justify="flex-start"
+        justifyContent="flex-start"
         alignItems="flex-start"
         spacing={0}
       >
diff --git a/plugins/kubernetes/src/components/ServicesAccordions/ServicesAccordions.tsx b/plugins/kubernetes/src/components/ServicesAccordions/ServicesAccordions.tsx
index f96bdc8e0b..a51b93b3bc 100644
--- a/plugins/kubernetes/src/components/ServicesAccordions/ServicesAccordions.tsx
+++ b/plugins/kubernetes/src/components/ServicesAccordions/ServicesAccordions.tsx
@@ -35,7 +35,12 @@ type ServiceSummaryProps = {
 
 const ServiceSummary = ({ service }: ServiceSummaryProps) => {
   return (
-    <Grid container direction="row" justify="flex-start" alignItems="center">
+    <Grid
+      container
+      direction="row"
+      justifyContent="flex-start"
+      alignItems="center"
+    >
       <Grid xs={3} item>
         <ServiceDrawer service={service} />
       </Grid>
@@ -107,7 +112,7 @@ export const ServicesAccordions = ({}: ServicesAccordionsProps) => {
     <Grid
       container
       direction="row"
-      justify="flex-start"
+      justifyContent="flex-start"
       alignItems="flex-start"
     >
       {groupedResponses.services.map((service, i) => (
diff --git a/plugins/kubernetes/src/hooks/useKubernetesObjects.test.ts b/plugins/kubernetes/src/hooks/useKubernetesObjects.test.ts
index 0acbef8af3..1d46eb14ea 100644
--- a/plugins/kubernetes/src/hooks/useKubernetesObjects.test.ts
+++ b/plugins/kubernetes/src/hooks/useKubernetesObjects.test.ts
@@ -94,12 +94,10 @@ describe('useKubernetesObjects', () => {
   it('should return objects', async () => {
     (useApi as any).mockReturnValue({
       getClusters: mockGetClusters.mockResolvedValue(getClustersResponse),
-      getObjectsByEntity: mockGetObjectsByEntity.mockResolvedValue(
-        mockResponse,
-      ),
-      decorateRequestBodyForAuth: mockDecorateRequestBodyForAuth.mockResolvedValue(
-        entityWithAuthToken,
-      ),
+      getObjectsByEntity:
+        mockGetObjectsByEntity.mockResolvedValue(mockResponse),
+      decorateRequestBodyForAuth:
+        mockDecorateRequestBodyForAuth.mockResolvedValue(entityWithAuthToken),
     });
     const { result, waitForNextUpdate } = renderHook(() =>
       useKubernetesObjects(entity),
@@ -118,9 +116,8 @@ describe('useKubernetesObjects', () => {
       getObjectsByEntity: mockGetObjectsByEntity.mockRejectedValue({
         message: 'some error',
       }),
-      decorateRequestBodyForAuth: mockDecorateRequestBodyForAuth.mockResolvedValue(
-        entityWithAuthToken,
-      ),
+      decorateRequestBodyForAuth:
+        mockDecorateRequestBodyForAuth.mockResolvedValue(entityWithAuthToken),
     });
     const { result, waitForNextUpdate } = renderHook(() =>
       useKubernetesObjects(entity),
@@ -157,9 +154,10 @@ describe('useKubernetesObjects', () => {
   it('should return error when decorateRequestBodyForAuth throws', async () => {
     (useApi as any).mockReturnValue({
       getClusters: mockGetClusters.mockResolvedValue(getClustersResponse),
-      decorateRequestBodyForAuth: mockDecorateRequestBodyForAuth.mockRejectedValue(
-        { message: 'some-error' },
-      ),
+      decorateRequestBodyForAuth:
+        mockDecorateRequestBodyForAuth.mockRejectedValue({
+          message: 'some-error',
+        }),
       getObjectsByEntity: mockGetObjectsByEntity,
     });
     const { result, waitForNextUpdate } = renderHook(() =>
diff --git a/plugins/kubernetes/src/hooks/useKubernetesObjects.ts b/plugins/kubernetes/src/hooks/useKubernetesObjects.ts
index 0c4fbdef54..4f19816296 100644
--- a/plugins/kubernetes/src/hooks/useKubernetesObjects.ts
+++ b/plugins/kubernetes/src/hooks/useKubernetesObjects.ts
@@ -59,10 +59,11 @@ export const useKubernetesObjects = (entity: Entity): KubernetesObjects => {
       for (const authProviderStr of authProviders) {
         // Multiple asyncs done sequentially instead of all at once to prevent same requestBody from being modified simultaneously
         try {
-          requestBody = await kubernetesAuthProvidersApi.decorateRequestBodyForAuth(
-            authProviderStr,
-            requestBody,
-          );
+          requestBody =
+            await kubernetesAuthProvidersApi.decorateRequestBodyForAuth(
+              authProviderStr,
+              requestBody,
+            );
         } catch (e) {
           setError(e.message);
           return;
diff --git a/plugins/kubernetes/src/kubernetes-auth-provider/KubernetesAuthProviders.ts b/plugins/kubernetes/src/kubernetes-auth-provider/KubernetesAuthProviders.ts
index 118d5904a4..dfe0d746d1 100644
--- a/plugins/kubernetes/src/kubernetes-auth-provider/KubernetesAuthProviders.ts
+++ b/plugins/kubernetes/src/kubernetes-auth-provider/KubernetesAuthProviders.ts
@@ -44,9 +44,8 @@ export class KubernetesAuthProviders implements KubernetesAuthProvidersApi {
     authProvider: string,
     requestBody: KubernetesRequestBody,
   ): Promise<KubernetesRequestBody> {
-    const kubernetesAuthProvider:
-      | KubernetesAuthProvider
-      | undefined = this.kubernetesAuthProviderMap.get(authProvider);
+    const kubernetesAuthProvider: KubernetesAuthProvider | undefined =
+      this.kubernetesAuthProviderMap.get(authProvider);
     if (kubernetesAuthProvider) {
       return await kubernetesAuthProvider.decorateRequestBodyForAuth(
         requestBody,
diff --git a/plugins/kubernetes/src/kubernetes-auth-provider/ServiceAccountKubernetesAuthProvider.ts b/plugins/kubernetes/src/kubernetes-auth-provider/ServiceAccountKubernetesAuthProvider.ts
index 8f766152a0..5671112ac8 100644
--- a/plugins/kubernetes/src/kubernetes-auth-provider/ServiceAccountKubernetesAuthProvider.ts
+++ b/plugins/kubernetes/src/kubernetes-auth-provider/ServiceAccountKubernetesAuthProvider.ts
@@ -18,7 +18,8 @@ import { KubernetesAuthProvider } from './types';
 import { KubernetesRequestBody } from '@backstage/plugin-kubernetes-common';
 
 export class ServiceAccountKubernetesAuthProvider
-  implements KubernetesAuthProvider {
+  implements KubernetesAuthProvider
+{
   async decorateRequestBodyForAuth(
     requestBody: KubernetesRequestBody,
   ): Promise<KubernetesRequestBody> {
diff --git a/plugins/kubernetes/src/kubernetes-auth-provider/types.ts b/plugins/kubernetes/src/kubernetes-auth-provider/types.ts
index fb6f773d84..3c5564e7cc 100644
--- a/plugins/kubernetes/src/kubernetes-auth-provider/types.ts
+++ b/plugins/kubernetes/src/kubernetes-auth-provider/types.ts
@@ -23,13 +23,12 @@ export interface KubernetesAuthProvider {
   ): Promise<KubernetesRequestBody>;
 }
 
-export const kubernetesAuthProvidersApiRef = createApiRef<KubernetesAuthProvidersApi>(
-  {
+export const kubernetesAuthProvidersApiRef =
+  createApiRef<KubernetesAuthProvidersApi>({
     id: 'plugin.kubernetes-auth-providers.service',
     description:
       'Used by the Kubernetes plugin to fetch KubernetesAuthProviders',
-  },
-);
+  });
 
 export interface KubernetesAuthProvidersApi {
   decorateRequestBodyForAuth(
diff --git a/plugins/lighthouse/CHANGELOG.md b/plugins/lighthouse/CHANGELOG.md
index 9bee12436d..b43c9c9fb7 100644
--- a/plugins/lighthouse/CHANGELOG.md
+++ b/plugins/lighthouse/CHANGELOG.md
@@ -1,5 +1,58 @@
 # @backstage/plugin-lighthouse
 
+## 0.2.24
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@0.4.5
+  - @backstage/core-components@0.4.0
+  - @backstage/catalog-model@0.9.1
+
+## 0.2.23
+
+### Patch Changes
+
+- 56c773909: Switched `@types/react` dependency to request `*` rather than a specific version.
+- Updated dependencies
+  - @backstage/core-components@0.3.1
+  - @backstage/core-plugin-api@0.1.6
+  - @backstage/plugin-catalog-react@0.4.2
+
+## 0.2.22
+
+### Patch Changes
+
+- 260c053b9: Fix All Material UI Warnings
+- Updated dependencies
+  - @backstage/core-components@0.3.0
+  - @backstage/config@0.1.6
+  - @backstage/core-plugin-api@0.1.5
+  - @backstage/plugin-catalog-react@0.4.1
+
+## 0.2.21
+
+### Patch Changes
+
+- 9d40fcb1e: - Bumping `material-ui/core` version to at least `4.12.2` as they made some breaking changes in later versions which broke `Pagination` of the `Table`.
+  - Switching out `material-table` to `@material-table/core` for support for the later versions of `material-ui/core`
+  - This causes a minor API change to `@backstage/core-components` as the interface for `Table` re-exports the `prop` from the underlying `Table` components.
+  - `onChangeRowsPerPage` has been renamed to `onRowsPerPageChange`
+  - `onChangePage` has been renamed to `onPageChange`
+  - Migration guide is here: https://material-table-core.com/docs/breaking-changes
+- Updated dependencies
+  - @backstage/core-components@0.2.0
+  - @backstage/plugin-catalog-react@0.4.0
+  - @backstage/core-plugin-api@0.1.4
+  - @backstage/theme@0.2.9
+
+## 0.2.20
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@0.3.0
+
 ## 0.2.19
 
 ### Patch Changes
diff --git a/plugins/lighthouse/api-report.md b/plugins/lighthouse/api-report.md
index 840daa3987..dca8f80471 100644
--- a/plugins/lighthouse/api-report.md
+++ b/plugins/lighthouse/api-report.md
@@ -12,9 +12,14 @@ import { Entity } from '@backstage/catalog-model';
 import { InfoCardVariants } from '@backstage/core-components';
 import { RouteRef } from '@backstage/core-plugin-api';
 
+// Warning: (ae-missing-release-tag) "Audit" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export type Audit = AuditRunning | AuditFailed | AuditCompleted;
 
+// Warning: (ae-forgotten-export) The symbol "AuditBase" needs to be exported by the entry point index.d.ts
+// Warning: (ae-missing-release-tag) "AuditCompleted" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export interface AuditCompleted extends AuditBase {
   // (undocumented)
@@ -27,6 +32,8 @@ export interface AuditCompleted extends AuditBase {
   timeCompleted: string;
 }
 
+// Warning: (ae-missing-release-tag) "AuditFailed" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export interface AuditFailed extends AuditBase {
   // (undocumented)
@@ -35,15 +42,22 @@ export interface AuditFailed extends AuditBase {
   timeCompleted: string;
 }
 
+// Warning: (ae-missing-release-tag) "AuditRunning" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export interface AuditRunning extends AuditBase {
   // (undocumented)
   status: 'RUNNING';
 }
 
+// Warning: (ae-forgotten-export) The symbol "Props" needs to be exported by the entry point index.d.ts
+// Warning: (ae-missing-release-tag) "EmbeddedRouter" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export const EmbeddedRouter: (_props: Props) => JSX.Element;
 
+// Warning: (ae-missing-release-tag) "EntityLastLighthouseAuditCard" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export const EntityLastLighthouseAuditCard: ({
   dense,
@@ -53,11 +67,15 @@ export const EntityLastLighthouseAuditCard: ({
   variant?: InfoCardVariants | undefined;
 }) => JSX.Element;
 
+// Warning: (ae-missing-release-tag) "EntityLighthouseContent" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export const EntityLighthouseContent: (_props: {
   entity?: Entity | undefined;
 }) => JSX.Element;
 
+// Warning: (ae-missing-release-tag) "FetchError" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export class FetchError extends Error {
   // (undocumented)
@@ -66,11 +84,15 @@ export class FetchError extends Error {
   get name(): string;
 }
 
+// Warning: (ae-missing-release-tag) "isLighthouseAvailable" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 const isLighthouseAvailable: (entity: Entity) => boolean;
 export { isLighthouseAvailable };
 export { isLighthouseAvailable as isPluginApplicableToEntity };
 
+// Warning: (ae-missing-release-tag) "LASListRequest" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export interface LASListRequest {
   // (undocumented)
@@ -79,6 +101,8 @@ export interface LASListRequest {
   offset?: number;
 }
 
+// Warning: (ae-missing-release-tag) "LASListResponse" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export interface LASListResponse<Item> {
   // (undocumented)
@@ -91,6 +115,8 @@ export interface LASListResponse<Item> {
   total: number;
 }
 
+// Warning: (ae-missing-release-tag) "LastLighthouseAuditCard" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export const LastLighthouseAuditCard: ({
   dense,
@@ -100,6 +126,8 @@ export const LastLighthouseAuditCard: ({
   variant?: InfoCardVariants | undefined;
 }) => JSX.Element;
 
+// Warning: (ae-missing-release-tag) "LighthouseApi" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export type LighthouseApi = {
   url: string;
@@ -109,9 +137,13 @@ export type LighthouseApi = {
   getWebsiteByUrl: (websiteUrl: string) => Promise<Website>;
 };
 
+// Warning: (ae-missing-release-tag) "lighthouseApiRef" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export const lighthouseApiRef: ApiRef<LighthouseApi>;
 
+// Warning: (ae-missing-release-tag) "LighthouseCategoryAbbr" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export interface LighthouseCategoryAbbr {
   // (undocumented)
@@ -122,6 +154,8 @@ export interface LighthouseCategoryAbbr {
   title: string;
 }
 
+// Warning: (ae-missing-release-tag) "LighthouseCategoryId" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export type LighthouseCategoryId =
   | 'pwa'
@@ -130,9 +164,13 @@ export type LighthouseCategoryId =
   | 'accessibility'
   | 'best-practices';
 
+// Warning: (ae-missing-release-tag) "LighthousePage" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export const LighthousePage: () => JSX.Element;
 
+// Warning: (ae-missing-release-tag) "lighthousePlugin" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 const lighthousePlugin: BackstagePlugin<
   {
@@ -144,6 +182,8 @@ const lighthousePlugin: BackstagePlugin<
 export { lighthousePlugin };
 export { lighthousePlugin as plugin };
 
+// Warning: (ae-missing-release-tag) "LighthouseRestApi" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export class LighthouseRestApi implements LighthouseApi {
   constructor(url: string);
@@ -164,9 +204,13 @@ export class LighthouseRestApi implements LighthouseApi {
   url: string;
 }
 
+// Warning: (ae-missing-release-tag) "Router" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export const Router: () => JSX.Element;
 
+// Warning: (ae-missing-release-tag) "TriggerAuditPayload" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export interface TriggerAuditPayload {
   // (undocumented)
@@ -181,6 +225,8 @@ export interface TriggerAuditPayload {
   url: string;
 }
 
+// Warning: (ae-missing-release-tag) "Website" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export interface Website {
   // (undocumented)
@@ -191,6 +237,8 @@ export interface Website {
   url: string;
 }
 
+// Warning: (ae-missing-release-tag) "WebsiteListResponse" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export type WebsiteListResponse = LASListResponse<Website>;
 
diff --git a/plugins/lighthouse/package.json b/plugins/lighthouse/package.json
index f648041655..8702dc8f99 100644
--- a/plugins/lighthouse/package.json
+++ b/plugins/lighthouse/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-lighthouse",
-  "version": "0.2.19",
+  "version": "0.2.24",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -31,13 +31,13 @@
     "start": "backstage-cli plugin:serve"
   },
   "dependencies": {
-    "@backstage/catalog-model": "^0.9.0",
-    "@backstage/config": "^0.1.4",
-    "@backstage/core-components": "^0.1.5",
-    "@backstage/core-plugin-api": "^0.1.3",
-    "@backstage/plugin-catalog-react": "^0.2.6",
-    "@backstage/theme": "^0.2.8",
-    "@material-ui/core": "^4.11.0",
+    "@backstage/catalog-model": "^0.9.1",
+    "@backstage/config": "^0.1.6",
+    "@backstage/core-components": "^0.4.1",
+    "@backstage/core-plugin-api": "^0.1.7",
+    "@backstage/plugin-catalog-react": "^0.4.5",
+    "@backstage/theme": "^0.2.10",
+    "@material-ui/core": "^4.12.2",
     "@material-ui/icons": "^4.9.1",
     "@material-ui/lab": "4.0.0-alpha.45",
     "@testing-library/react-hooks": "^3.4.2",
@@ -47,16 +47,16 @@
     "react-use": "^17.2.4"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.7.3",
-    "@backstage/core-app-api": "^0.1.4",
-    "@backstage/dev-utils": "^0.2.1",
-    "@backstage/test-utils": "^0.1.14",
+    "@backstage/cli": "^0.7.11",
+    "@backstage/core-app-api": "^0.1.12",
+    "@backstage/dev-utils": "^0.2.9",
+    "@backstage/test-utils": "^0.1.17",
     "@testing-library/jest-dom": "^5.10.1",
     "@testing-library/react": "^11.2.5",
     "@testing-library/user-event": "^13.1.8",
     "@types/jest": "^26.0.7",
     "@types/node": "^14.14.32",
-    "@types/react": "^16.9",
+    "@types/react": "*",
     "cross-fetch": "^3.0.6",
     "msw": "^0.29.0"
   },
diff --git a/plugins/lighthouse/src/components/AuditList/AuditListTable.tsx b/plugins/lighthouse/src/components/AuditList/AuditListTable.tsx
index ef9ec34a6a..10f29f3fd5 100644
--- a/plugins/lighthouse/src/components/AuditList/AuditListTable.tsx
+++ b/plugins/lighthouse/src/components/AuditList/AuditListTable.tsx
@@ -69,9 +69,8 @@ export const AuditListTable = ({ items }: { items: Website[] }) => {
       const auditStatus = response.lastAudit.status;
       if (auditStatus === 'COMPLETED' || auditStatus === 'FAILED') {
         const newWebsiteData = websiteState.slice(0);
-        newWebsiteData[
-          newWebsiteData.findIndex(w => w.url === response.url)
-        ] = response;
+        newWebsiteData[newWebsiteData.findIndex(w => w.url === response.url)] =
+          response;
         setWebsiteState(newWebsiteData);
       }
     });
diff --git a/plugins/lighthouse/src/components/AuditView/index.test.tsx b/plugins/lighthouse/src/components/AuditView/index.test.tsx
index 0614f5f183..8a8146199d 100644
--- a/plugins/lighthouse/src/components/AuditView/index.test.tsx
+++ b/plugins/lighthouse/src/components/AuditView/index.test.tsx
@@ -37,9 +37,8 @@ import * as data from '../../__fixtures__/website-response.json';
 import AuditView from './index';
 import { ApiProvider, ApiRegistry } from '@backstage/core-app-api';
 
-const { useParams }: { useParams: jest.Mock } = jest.requireMock(
-  'react-router-dom',
-);
+const { useParams }: { useParams: jest.Mock } =
+  jest.requireMock('react-router-dom');
 const websiteResponse = data as Website;
 
 describe('AuditView', () => {
diff --git a/plugins/lighthouse/src/components/AuditView/index.tsx b/plugins/lighthouse/src/components/AuditView/index.tsx
index 7f9e7e7113..30f7b61eb9 100644
--- a/plugins/lighthouse/src/components/AuditView/index.tsx
+++ b/plugins/lighthouse/src/components/AuditView/index.tsx
@@ -123,7 +123,11 @@ export const AuditViewContent = () => {
   const classes = useStyles();
   const navigate = useNavigate();
 
-  const { loading, error, value: nextValue } = useAsync(
+  const {
+    loading,
+    error,
+    value: nextValue,
+  } = useAsync(
     async () => await lighthouseApi.getWebsiteForAuditId(params.id),
     [params.id],
   );
diff --git a/plugins/lighthouse/src/components/Cards/LastLighthouseAuditCard.test.tsx b/plugins/lighthouse/src/components/Cards/LastLighthouseAuditCard.test.tsx
index 48eec99b0a..9a9ac7781e 100644
--- a/plugins/lighthouse/src/components/Cards/LastLighthouseAuditCard.test.tsx
+++ b/plugins/lighthouse/src/components/Cards/LastLighthouseAuditCard.test.tsx
@@ -93,7 +93,9 @@ describe('<LastLighthouseAuditCard />', () => {
     describe('where a category score is not a number', () => {
       beforeEach(() => {
         entityWebsite = { ...entityWebsite };
-        (entityWebsite.lastAudit as AuditCompleted).categories.accessibility.score = NaN;
+        (
+          entityWebsite.lastAudit as AuditCompleted
+        ).categories.accessibility.score = NaN;
       });
 
       afterEach(() => {
diff --git a/plugins/lighthouse/src/components/CreateAudit/index.test.tsx b/plugins/lighthouse/src/components/CreateAudit/index.test.tsx
index 6bdf6d779f..ca078c7e84 100644
--- a/plugins/lighthouse/src/components/CreateAudit/index.test.tsx
+++ b/plugins/lighthouse/src/components/CreateAudit/index.test.tsx
@@ -35,9 +35,8 @@ import CreateAudit from './index';
 import { ApiProvider, ApiRegistry } from '@backstage/core-app-api';
 import { ErrorApi, errorApiRef } from '@backstage/core-plugin-api';
 
-const { useNavigate }: { useNavigate: jest.Mock } = jest.requireMock(
-  'react-router-dom',
-);
+const { useNavigate }: { useNavigate: jest.Mock } =
+  jest.requireMock('react-router-dom');
 const createAuditResponse = data as Audit;
 
 // TODO add act() to these tests without breaking them!
diff --git a/plugins/lighthouse/src/components/Intro/index.tsx b/plugins/lighthouse/src/components/Intro/index.tsx
index b569429b03..509f9e468a 100644
--- a/plugins/lighthouse/src/components/Intro/index.tsx
+++ b/plugins/lighthouse/src/components/Intro/index.tsx
@@ -105,7 +105,7 @@ function GettingStartedCard() {
       divider
       actions={
         <>
-          <Grid container direction="row" justify="flex-end">
+          <Grid container direction="row" justifyContent="flex-end">
             <Grid item>
               <Button
                 component="a"
@@ -155,7 +155,7 @@ export default function LighthouseIntro({ onDismiss = () => {} }: Props) {
         <Grid item xs={12} sm={6} md={8}>
           <Grid
             container
-            justify="flex-end"
+            justifyContent="flex-end"
             alignItems="flex-end"
             className={classes.closeButtonContainer}
           >
diff --git a/plugins/lighthouse/src/hooks/useWebsiteForEntity.ts b/plugins/lighthouse/src/hooks/useWebsiteForEntity.ts
index dc6695eccc..1ea1e3f8e4 100644
--- a/plugins/lighthouse/src/hooks/useWebsiteForEntity.ts
+++ b/plugins/lighthouse/src/hooks/useWebsiteForEntity.ts
@@ -27,9 +27,10 @@ export const useWebsiteForEntity = () => {
     entity.metadata.annotations?.[LIGHTHOUSE_WEBSITE_URL_ANNOTATION] ?? '';
   const lighthouseApi = useApi(lighthouseApiRef);
   const errorApi = useApi(errorApiRef);
-  const response = useAsync(() => lighthouseApi.getWebsiteByUrl(websiteUrl), [
-    websiteUrl,
-  ]);
+  const response = useAsync(
+    () => lighthouseApi.getWebsiteByUrl(websiteUrl),
+    [websiteUrl],
+  );
   if (response.error) {
     errorApi.post(response.error);
   }
diff --git a/plugins/newrelic/CHANGELOG.md b/plugins/newrelic/CHANGELOG.md
index 9f5d70354a..f43f625238 100644
--- a/plugins/newrelic/CHANGELOG.md
+++ b/plugins/newrelic/CHANGELOG.md
@@ -1,5 +1,35 @@
 # @backstage/plugin-newrelic
 
+## 0.3.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.4.0
+
+## 0.3.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.3.0
+  - @backstage/core-plugin-api@0.1.5
+
+## 0.3.1
+
+### Patch Changes
+
+- 9d40fcb1e: - Bumping `material-ui/core` version to at least `4.12.2` as they made some breaking changes in later versions which broke `Pagination` of the `Table`.
+  - Switching out `material-table` to `@material-table/core` for support for the later versions of `material-ui/core`
+  - This causes a minor API change to `@backstage/core-components` as the interface for `Table` re-exports the `prop` from the underlying `Table` components.
+  - `onChangeRowsPerPage` has been renamed to `onRowsPerPageChange`
+  - `onChangePage` has been renamed to `onPageChange`
+  - Migration guide is here: https://material-table-core.com/docs/breaking-changes
+- Updated dependencies
+  - @backstage/core-components@0.2.0
+  - @backstage/core-plugin-api@0.1.4
+  - @backstage/theme@0.2.9
+
 ## 0.3.0
 
 ### Minor Changes
diff --git a/plugins/newrelic/api-report.md b/plugins/newrelic/api-report.md
index 005097c442..94c3278df1 100644
--- a/plugins/newrelic/api-report.md
+++ b/plugins/newrelic/api-report.md
@@ -8,9 +8,13 @@
 import { BackstagePlugin } from '@backstage/core-plugin-api';
 import { RouteRef } from '@backstage/core-plugin-api';
 
+// Warning: (ae-missing-release-tag) "NewRelicPage" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export const NewRelicPage: () => JSX.Element;
 
+// Warning: (ae-missing-release-tag) "newRelicPlugin" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 const newRelicPlugin: BackstagePlugin<
   {
diff --git a/plugins/newrelic/package.json b/plugins/newrelic/package.json
index dc5dbecf19..16a03ec473 100644
--- a/plugins/newrelic/package.json
+++ b/plugins/newrelic/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-newrelic",
-  "version": "0.3.0",
+  "version": "0.3.3",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -31,10 +31,10 @@
     "clean": "backstage-cli clean"
   },
   "dependencies": {
-    "@backstage/core-components": "^0.1.5",
-    "@backstage/core-plugin-api": "^0.1.3",
-    "@backstage/theme": "^0.2.8",
-    "@material-ui/core": "^4.11.0",
+    "@backstage/core-components": "^0.4.1",
+    "@backstage/core-plugin-api": "^0.1.7",
+    "@backstage/theme": "^0.2.10",
+    "@material-ui/core": "^4.12.2",
     "@material-ui/icons": "^4.9.1",
     "@material-ui/lab": "4.0.0-alpha.45",
     "react": "^16.13.1",
@@ -42,10 +42,10 @@
     "react-use": "^17.2.4"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.7.3",
-    "@backstage/core-app-api": "^0.1.4",
-    "@backstage/dev-utils": "^0.2.1",
-    "@backstage/test-utils": "^0.1.14",
+    "@backstage/cli": "^0.7.11",
+    "@backstage/core-app-api": "^0.1.12",
+    "@backstage/dev-utils": "^0.2.9",
+    "@backstage/test-utils": "^0.1.17",
     "@testing-library/jest-dom": "^5.10.1",
     "@testing-library/react": "^11.2.5",
     "@testing-library/user-event": "^13.1.8",
diff --git a/plugins/newrelic/src/components/NewRelicFetchComponent/NewRelicFetchComponent.tsx b/plugins/newrelic/src/components/NewRelicFetchComponent/NewRelicFetchComponent.tsx
index 72945155fc..40f82d4beb 100644
--- a/plugins/newrelic/src/components/NewRelicFetchComponent/NewRelicFetchComponent.tsx
+++ b/plugins/newrelic/src/components/NewRelicFetchComponent/NewRelicFetchComponent.tsx
@@ -54,7 +54,7 @@ export const NewRelicAPMTable = ({ applications }: NewRelicApplications) => {
   return (
     <Table
       title="Application Performance Monitoring"
-      options={{ search: false, paging: false }}
+      options={{ search: true, paging: true }}
       columns={columns}
       data={data}
     />
diff --git a/plugins/org/CHANGELOG.md b/plugins/org/CHANGELOG.md
index f6042fc618..ff6ed74c6b 100644
--- a/plugins/org/CHANGELOG.md
+++ b/plugins/org/CHANGELOG.md
@@ -1,5 +1,69 @@
 # @backstage/plugin-org
 
+## 0.3.22
+
+### Patch Changes
+
+- 6ad8fe1a0: Make ownership card style customizable via custom `theme.getPageTheme()`.
+- 70718686f: Use correct `Link` in ownership card to avoid a full reload of the app while navigating.
+- Updated dependencies
+  - @backstage/core-components@0.4.1
+  - @backstage/catalog-model@0.9.2
+  - @backstage/core-plugin-api@0.1.7
+
+## 0.3.21
+
+### Patch Changes
+
+- c9927b1c7: Don't open a new tab when clicking on the ownership card.
+- 7e5f14dda: This change hides pagination counter of search tables and group members list when results fit in one page
+- ff304cfc3: Fix OwnershipCard links to support namespaced owners
+- Updated dependencies
+  - @backstage/plugin-catalog-react@0.4.5
+  - @backstage/core-components@0.4.0
+  - @backstage/catalog-model@0.9.1
+
+## 0.3.20
+
+### Patch Changes
+
+- a60143c37: Link group ownership boxes through filtered catalog page
+- Updated dependencies
+  - @backstage/plugin-catalog-react@0.4.4
+  - @backstage/core-components@0.3.3
+
+## 0.3.19
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.3.0
+  - @backstage/core-plugin-api@0.1.5
+  - @backstage/plugin-catalog-react@0.4.1
+
+## 0.3.18
+
+### Patch Changes
+
+- 9d40fcb1e: - Bumping `material-ui/core` version to at least `4.12.2` as they made some breaking changes in later versions which broke `Pagination` of the `Table`.
+  - Switching out `material-table` to `@material-table/core` for support for the later versions of `material-ui/core`
+  - This causes a minor API change to `@backstage/core-components` as the interface for `Table` re-exports the `prop` from the underlying `Table` components.
+  - `onChangeRowsPerPage` has been renamed to `onRowsPerPageChange`
+  - `onChangePage` has been renamed to `onPageChange`
+  - Migration guide is here: https://material-table-core.com/docs/breaking-changes
+- Updated dependencies
+  - @backstage/core-components@0.2.0
+  - @backstage/plugin-catalog-react@0.4.0
+  - @backstage/core-plugin-api@0.1.4
+  - @backstage/theme@0.2.9
+
+## 0.3.17
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@0.3.0
+
 ## 0.3.16
 
 ### Patch Changes
diff --git a/plugins/org/api-report.md b/plugins/org/api-report.md
index d541505265..78a2f82561 100644
--- a/plugins/org/api-report.md
+++ b/plugins/org/api-report.md
@@ -11,6 +11,8 @@ import { GroupEntity } from '@backstage/catalog-model';
 import { InfoCardVariants } from '@backstage/core-components';
 import { UserEntity } from '@backstage/catalog-model';
 
+// Warning: (ae-missing-release-tag) "EntityGroupProfileCard" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export const EntityGroupProfileCard: ({
   variant,
@@ -19,11 +21,15 @@ export const EntityGroupProfileCard: ({
   variant?: InfoCardVariants | undefined;
 }) => JSX.Element;
 
+// Warning: (ae-missing-release-tag) "EntityMembersListCard" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export const EntityMembersListCard: (_props: {
   entity?: GroupEntity | undefined;
 }) => JSX.Element;
 
+// Warning: (ae-missing-release-tag) "EntityOwnershipCard" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export const EntityOwnershipCard: ({
   variant,
@@ -32,6 +38,8 @@ export const EntityOwnershipCard: ({
   variant?: InfoCardVariants | undefined;
 }) => JSX.Element;
 
+// Warning: (ae-missing-release-tag) "EntityUserProfileCard" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export const EntityUserProfileCard: ({
   variant,
@@ -40,6 +48,8 @@ export const EntityUserProfileCard: ({
   variant?: InfoCardVariants | undefined;
 }) => JSX.Element;
 
+// Warning: (ae-missing-release-tag) "GroupProfileCard" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export const GroupProfileCard: ({
   variant,
@@ -48,14 +58,20 @@ export const GroupProfileCard: ({
   variant?: InfoCardVariants | undefined;
 }) => JSX.Element;
 
+// Warning: (ae-missing-release-tag) "MembersListCard" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export const MembersListCard: (_props: { entity?: GroupEntity }) => JSX.Element;
 
+// Warning: (ae-missing-release-tag) "orgPlugin" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 const orgPlugin: BackstagePlugin<{}, {}>;
 export { orgPlugin };
 export { orgPlugin as plugin };
 
+// Warning: (ae-missing-release-tag) "OwnershipCard" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export const OwnershipCard: ({
   variant,
@@ -64,6 +80,8 @@ export const OwnershipCard: ({
   variant?: InfoCardVariants | undefined;
 }) => JSX.Element;
 
+// Warning: (ae-missing-release-tag) "UserProfileCard" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export const UserProfileCard: ({
   variant,
diff --git a/plugins/org/package.json b/plugins/org/package.json
index 3962121289..60abb61e74 100644
--- a/plugins/org/package.json
+++ b/plugins/org/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-org",
-  "version": "0.3.16",
+  "version": "0.3.22",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -20,25 +20,26 @@
     "clean": "backstage-cli clean"
   },
   "dependencies": {
-    "@backstage/catalog-model": "^0.9.0",
-    "@backstage/core-components": "^0.1.5",
-    "@backstage/core-plugin-api": "^0.1.3",
-    "@backstage/plugin-catalog-react": "^0.2.6",
-    "@backstage/theme": "^0.2.8",
-    "@material-ui/core": "^4.11.0",
+    "@backstage/catalog-model": "^0.9.2",
+    "@backstage/core-components": "^0.4.1",
+    "@backstage/core-plugin-api": "^0.1.7",
+    "@backstage/plugin-catalog-react": "^0.4.5",
+    "@backstage/theme": "^0.2.10",
+    "@material-ui/core": "^4.12.2",
     "@material-ui/icons": "^4.9.1",
     "@material-ui/lab": "4.0.0-alpha.45",
     "react": "^16.13.1",
     "react-dom": "^16.13.1",
     "react-router": "6.0.0-beta.0",
     "react-router-dom": "6.0.0-beta.0",
-    "react-use": "^17.2.4"
+    "react-use": "^17.2.4",
+    "qs": "^6.10.1"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.7.3",
-    "@backstage/core-app-api": "^0.1.4",
-    "@backstage/dev-utils": "^0.2.1",
-    "@backstage/test-utils": "^0.1.14",
+    "@backstage/cli": "^0.7.11",
+    "@backstage/core-app-api": "^0.1.12",
+    "@backstage/dev-utils": "^0.2.9",
+    "@backstage/test-utils": "^0.1.17",
     "@testing-library/jest-dom": "^5.10.1",
     "@testing-library/react": "^11.2.5",
     "@testing-library/user-event": "^13.1.8",
diff --git a/plugins/org/src/components/Cards/Group/MembersList/MembersListCard.tsx b/plugins/org/src/components/Cards/Group/MembersList/MembersListCard.tsx
index 31b5c3f5c0..0642e80a7b 100644
--- a/plugins/org/src/components/Cards/Group/MembersList/MembersListCard.tsx
+++ b/plugins/org/src/components/Cards/Group/MembersList/MembersListCard.tsx
@@ -128,7 +128,11 @@ export const MembersListCard = (_props: {
   };
   const pageSize = 50;
 
-  const { loading, error, value: members } = useAsync(async () => {
+  const {
+    loading,
+    error,
+    value: members,
+  } = useAsync(async () => {
     const membersList = await catalogApi.getEntities({
       filter: { kind: 'User' },
     });
@@ -170,7 +174,7 @@ export const MembersListCard = (_props: {
       <InfoCard
         title={`Members (${members?.length || 0}${paginationLabel})`}
         subheader={`of ${displayName}`}
-        actions={pagination}
+        {...(nbPages <= 1 ? {} : { actions: pagination })}
       >
         <Grid container spacing={3}>
           {members && members.length > 0 ? (
diff --git a/plugins/org/src/components/Cards/OwnershipCard/OwnershipCard.stories.tsx b/plugins/org/src/components/Cards/OwnershipCard/OwnershipCard.stories.tsx
index b40ef6d54b..7ebdf31ae4 100644
--- a/plugins/org/src/components/Cards/OwnershipCard/OwnershipCard.stories.tsx
+++ b/plugins/org/src/components/Cards/OwnershipCard/OwnershipCard.stories.tsx
@@ -19,8 +19,10 @@ import { ApiProvider, ApiRegistry } from '@backstage/core-app-api';
 import {
   CatalogApi,
   catalogApiRef,
+  catalogRouteRef,
   EntityContext,
 } from '@backstage/plugin-catalog-react';
+import { wrapInTestApp } from '@backstage/test-utils';
 import {
   BackstageTheme,
   createTheme,
@@ -29,7 +31,6 @@ import {
 } from '@backstage/theme';
 import { Grid, ThemeProvider } from '@material-ui/core';
 import React from 'react';
-import { MemoryRouter } from 'react-router';
 import { OwnershipCard } from './OwnershipCard';
 
 export default {
@@ -87,8 +88,8 @@ const catalogApi: Partial<CatalogApi> = {
 
 const apiRegistry = ApiRegistry.from([[catalogApiRef, catalogApi]]);
 
-export const Default = () => (
-  <MemoryRouter>
+export const Default = () =>
+  wrapInTestApp(
     <ApiProvider apis={apiRegistry}>
       <EntityContext.Provider value={{ entity: defaultEntity, loading: false }}>
         <Grid container spacing={4}>
@@ -97,9 +98,11 @@ export const Default = () => (
           </Grid>
         </Grid>
       </EntityContext.Provider>
-    </ApiProvider>
-  </MemoryRouter>
-);
+    </ApiProvider>,
+    {
+      mountedRoutes: { '/catalog': catalogRouteRef },
+    },
+  );
 
 const monochromeTheme = (outer: BackstageTheme) =>
   createTheme({
@@ -117,8 +120,8 @@ const monochromeTheme = (outer: BackstageTheme) =>
     },
   });
 
-export const Themed = () => (
-  <MemoryRouter>
+export const Themed = () =>
+  wrapInTestApp(
     <ThemeProvider theme={monochromeTheme}>
       <ApiProvider apis={apiRegistry}>
         <EntityContext.Provider
@@ -131,6 +134,8 @@ export const Themed = () => (
           </Grid>
         </EntityContext.Provider>
       </ApiProvider>
-    </ThemeProvider>
-  </MemoryRouter>
-);
+    </ThemeProvider>,
+    {
+      mountedRoutes: { '/catalog': catalogRouteRef },
+    },
+  );
diff --git a/plugins/org/src/components/Cards/OwnershipCard/OwnershipCard.test.tsx b/plugins/org/src/components/Cards/OwnershipCard/OwnershipCard.test.tsx
index bfaca73bc0..eab3606f77 100644
--- a/plugins/org/src/components/Cards/OwnershipCard/OwnershipCard.test.tsx
+++ b/plugins/org/src/components/Cards/OwnershipCard/OwnershipCard.test.tsx
@@ -19,6 +19,7 @@ import {
   CatalogApi,
   catalogApiRef,
   EntityProvider,
+  catalogRouteRef,
 } from '@backstage/plugin-catalog-react';
 import { renderInTestApp } from '@backstage/test-utils';
 import { queryByText } from '@testing-library/react';
@@ -123,31 +124,24 @@ describe('OwnershipCard', () => {
           <OwnershipCard />
         </EntityProvider>
       </ApiProvider>,
+      {
+        mountedRoutes: {
+          '/create': catalogRouteRef,
+        },
+      },
     );
 
-    expect(getByText('Services')).toBeInTheDocument();
+    expect(getByText('OPENAPI')).toBeInTheDocument();
     expect(
-      queryByText(getByText('Services').parentElement!, '1'),
+      queryByText(getByText('OPENAPI').parentElement!, '1'),
     ).toBeInTheDocument();
-    expect(getByText('Documentation')).toBeInTheDocument();
+    expect(getByText('SERVICE')).toBeInTheDocument();
     expect(
-      queryByText(getByText('Documentation').parentElement!, '0'),
+      queryByText(getByText('SERVICE').parentElement!, '1'),
     ).toBeInTheDocument();
-    expect(getByText('APIs')).toBeInTheDocument();
+    expect(getByText('LIBRARY')).toBeInTheDocument();
     expect(
-      queryByText(getByText('APIs').parentElement!, '1'),
-    ).toBeInTheDocument();
-    expect(getByText('Libraries')).toBeInTheDocument();
-    expect(
-      queryByText(getByText('Libraries').parentElement!, '1'),
-    ).toBeInTheDocument();
-    expect(getByText('Websites')).toBeInTheDocument();
-    expect(
-      queryByText(getByText('Websites').parentElement!, '0'),
-    ).toBeInTheDocument();
-    expect(getByText('Tools')).toBeInTheDocument();
-    expect(
-      queryByText(getByText('Tools').parentElement!, '0'),
+      queryByText(getByText('LIBRARY').parentElement!, '1'),
     ).toBeInTheDocument();
   });
 });
diff --git a/plugins/org/src/components/Cards/OwnershipCard/OwnershipCard.tsx b/plugins/org/src/components/Cards/OwnershipCard/OwnershipCard.tsx
index 1b82b58389..96e7d08c31 100644
--- a/plugins/org/src/components/Cards/OwnershipCard/OwnershipCard.tsx
+++ b/plugins/org/src/components/Cards/OwnershipCard/OwnershipCard.tsx
@@ -15,48 +15,37 @@
  */
 
 import { Entity } from '@backstage/catalog-model';
+import {
+  InfoCard,
+  InfoCardVariants,
+  Link,
+  Progress,
+  ResponseErrorPanel,
+} from '@backstage/core-components';
+import { useApi, useRouteRef } from '@backstage/core-plugin-api';
 import {
   catalogApiRef,
+  catalogRouteRef,
+  formatEntityRefTitle,
   isOwnerOf,
   useEntity,
 } from '@backstage/plugin-catalog-react';
-import { BackstageTheme, genPageTheme } from '@backstage/theme';
+import { BackstageTheme } from '@backstage/theme';
 import {
   Box,
   createStyles,
   Grid,
   makeStyles,
-  Tooltip,
   Typography,
 } from '@material-ui/core';
+import qs from 'qs';
 import React from 'react';
 import { useAsync } from 'react-use';
 
-import {
-  InfoCard,
-  InfoCardVariants,
-  Progress,
-  ResponseErrorPanel,
-} from '@backstage/core-components';
-import { useApi } from '@backstage/core-plugin-api';
-
-type EntitiesKinds = 'Component' | 'API';
-type EntitiesTypes =
-  | 'service'
-  | 'website'
-  | 'library'
-  | 'documentation'
-  | 'api'
-  | 'tool';
-
-const createPageTheme = (
-  theme: BackstageTheme,
-  shapeKey: string,
-  colorsKey: string,
-) => {
-  const { colors } = theme.getPageTheme({ themeId: colorsKey });
-  const { shape } = theme.getPageTheme({ themeId: shapeKey });
-  return genPageTheme(colors, shape).backgroundImage;
+type EntityTypeProps = {
+  kind: string;
+  type: string;
+  count: number;
 };
 
 const useStyles = makeStyles((theme: BackstageTheme) =>
@@ -75,69 +64,30 @@ const useStyles = makeStyles((theme: BackstageTheme) =>
     bold: {
       fontWeight: theme.typography.fontWeightBold,
     },
-    service: {
-      background: createPageTheme(theme, 'home', 'service'),
-    },
-    website: {
-      background: createPageTheme(theme, 'home', 'website'),
-    },
-    library: {
-      background: createPageTheme(theme, 'home', 'library'),
-    },
-    documentation: {
-      background: createPageTheme(theme, 'home', 'documentation'),
-    },
-    api: {
-      background: createPageTheme(theme, 'home', 'home'),
-    },
-    tool: {
-      background: createPageTheme(theme, 'home', 'tool'),
+    entityTypeBox: {
+      background: (props: { type: string }) =>
+        theme.getPageTheme({ themeId: props.type }).backgroundImage,
     },
   }),
 );
 
-const listEntitiesBy = (
-  entities: Array<Entity>,
-  kind: EntitiesKinds,
-  type?: EntitiesTypes,
-) =>
-  entities.filter(
-    e => e.kind === kind && (type ? e?.spec?.type === type : true),
-  );
-
-const countEntitiesBy = (
-  entities: Array<Entity>,
-  kind: EntitiesKinds,
-  type?: EntitiesTypes,
-) => listEntitiesBy(entities, kind, type).length;
-
 const EntityCountTile = ({
   counter,
-  className,
-  entities,
+  type,
   name,
+  url,
 }: {
   counter: number;
-  className: EntitiesTypes;
-  entities: Entity[];
+  type: string;
   name: string;
+  url: string;
 }) => {
-  let entityNames;
-  const classes = useStyles();
-
-  if (entities.length < 20) {
-    entityNames = entities.map(e => e.metadata.name).join(', ');
-  } else {
-    entityNames = `${entities
-      .map(e => e.metadata.name)
-      .slice(0, 20)
-      .join(', ')}, ...`;
-  }
+  const classes = useStyles({ type });
 
   return (
-    <Tooltip title={entityNames} arrow>
+    <Link to={url} variant="body2">
       <Box
-        className={`${classes.card} ${classes[className]}`}
+        className={`${classes.card} ${classes.entityTypeBox}`}
         display="flex"
         flexDirection="column"
         alignItems="center"
@@ -149,10 +99,28 @@ const EntityCountTile = ({
           {name}
         </Typography>
       </Box>
-    </Tooltip>
+    </Link>
   );
 };
 
+const getQueryParams = (
+  owner: Entity,
+  selectedEntity: EntityTypeProps,
+): string => {
+  const ownerName = formatEntityRefTitle(owner, { defaultKind: 'group' });
+  const { kind, type } = selectedEntity;
+  const queryParams = qs.stringify({
+    filters: {
+      kind,
+      type,
+      owners: ownerName,
+      user: 'all',
+    },
+  });
+
+  return queryParams;
+};
+
 export const OwnershipCard = ({
   variant,
 }: {
@@ -162,6 +130,8 @@ export const OwnershipCard = ({
 }) => {
   const { entity } = useEntity();
   const catalogApi = useApi(catalogApiRef);
+  const catalogLink = useRouteRef(catalogRouteRef);
+
   const {
     loading,
     error,
@@ -185,56 +155,40 @@ export const OwnershipCard = ({
       isOwnerOf(entity, component),
     );
 
-    return [
-      {
-        counter: countEntitiesBy(ownedEntitiesList, 'Component', 'service'),
-        className: 'service',
-        entities: listEntitiesBy(ownedEntitiesList, 'Component', 'service'),
-        name: 'Services',
+    const counts = ownedEntitiesList.reduce(
+      (acc: EntityTypeProps[], ownedEntity) => {
+        if (typeof ownedEntity.spec?.type !== 'string') return acc;
+
+        const match = acc.find(
+          x => x.kind === ownedEntity.kind && x.type === ownedEntity.spec?.type,
+        );
+        if (match) {
+          match.count += 1;
+        } else {
+          acc.push({
+            kind: ownedEntity.kind,
+            type: ownedEntity.spec?.type,
+            count: 1,
+          });
+        }
+        return acc;
       },
-      {
-        counter: countEntitiesBy(
-          ownedEntitiesList,
-          'Component',
-          'documentation',
-        ),
-        className: 'documentation',
-        entities: listEntitiesBy(
-          ownedEntitiesList,
-          'Component',
-          'documentation',
-        ),
-        name: 'Documentation',
-      },
-      {
-        counter: countEntitiesBy(ownedEntitiesList, 'API'),
-        className: 'api',
-        entities: listEntitiesBy(ownedEntitiesList, 'API'),
-        name: 'APIs',
-      },
-      {
-        counter: countEntitiesBy(ownedEntitiesList, 'Component', 'library'),
-        className: 'library',
-        entities: listEntitiesBy(ownedEntitiesList, 'Component', 'library'),
-        name: 'Libraries',
-      },
-      {
-        counter: countEntitiesBy(ownedEntitiesList, 'Component', 'website'),
-        className: 'website',
-        entities: listEntitiesBy(ownedEntitiesList, 'Component', 'website'),
-        name: 'Websites',
-      },
-      {
-        counter: countEntitiesBy(ownedEntitiesList, 'Component', 'tool'),
-        className: 'tool',
-        entities: listEntitiesBy(ownedEntitiesList, 'Component', 'tool'),
-        name: 'Tools',
-      },
-    ] as Array<{
+      [],
+    );
+
+    // Return top N (six) entities to be displayed in ownership boxes
+    const topN = counts.sort((a, b) => b.count - a.count).slice(0, 6);
+
+    return topN.map(topOwnedEntity => ({
+      counter: topOwnedEntity.count,
+      type: topOwnedEntity.type,
+      name: topOwnedEntity.type.toLocaleUpperCase('en-US'),
+      queryParams: getQueryParams(entity, topOwnedEntity),
+    })) as Array<{
       counter: number;
-      className: EntitiesTypes;
-      entities: Entity[];
+      type: string;
       name: string;
+      queryParams: string;
     }>;
   }, [catalogApi, entity]);
 
@@ -251,9 +205,9 @@ export const OwnershipCard = ({
           <Grid item xs={6} md={6} lg={4} key={c.name}>
             <EntityCountTile
               counter={c.counter}
-              className={c.className}
-              entities={c.entities}
+              type={c.type}
               name={c.name}
+              url={`${catalogLink()}/?${c.queryParams}`}
             />
           </Grid>
         ))}
diff --git a/plugins/pagerduty/CHANGELOG.md b/plugins/pagerduty/CHANGELOG.md
index 9cb7fe11b4..cd838eb5b7 100644
--- a/plugins/pagerduty/CHANGELOG.md
+++ b/plugins/pagerduty/CHANGELOG.md
@@ -1,5 +1,58 @@
 # @backstage/plugin-pagerduty
 
+## 0.3.12
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@0.4.5
+  - @backstage/core-components@0.4.0
+  - @backstage/catalog-model@0.9.1
+
+## 0.3.11
+
+### Patch Changes
+
+- 8bedb75ae: Update Luxon dependency to 2.x
+- 56c773909: Switched `@types/react` dependency to request `*` rather than a specific version.
+- Updated dependencies
+  - @backstage/core-components@0.3.1
+  - @backstage/core-plugin-api@0.1.6
+  - @backstage/plugin-catalog-react@0.4.2
+
+## 0.3.10
+
+### Patch Changes
+
+- 260c053b9: Fix All Material UI Warnings
+- Updated dependencies
+  - @backstage/core-components@0.3.0
+  - @backstage/core-plugin-api@0.1.5
+  - @backstage/plugin-catalog-react@0.4.1
+
+## 0.3.9
+
+### Patch Changes
+
+- 9d40fcb1e: - Bumping `material-ui/core` version to at least `4.12.2` as they made some breaking changes in later versions which broke `Pagination` of the `Table`.
+  - Switching out `material-table` to `@material-table/core` for support for the later versions of `material-ui/core`
+  - This causes a minor API change to `@backstage/core-components` as the interface for `Table` re-exports the `prop` from the underlying `Table` components.
+  - `onChangeRowsPerPage` has been renamed to `onRowsPerPageChange`
+  - `onChangePage` has been renamed to `onPageChange`
+  - Migration guide is here: https://material-table-core.com/docs/breaking-changes
+- Updated dependencies
+  - @backstage/core-components@0.2.0
+  - @backstage/plugin-catalog-react@0.4.0
+  - @backstage/core-plugin-api@0.1.4
+  - @backstage/theme@0.2.9
+
+## 0.3.8
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@0.3.0
+
 ## 0.3.7
 
 ### Patch Changes
diff --git a/plugins/pagerduty/README.md b/plugins/pagerduty/README.md
index 2a898fc740..478031d36a 100644
--- a/plugins/pagerduty/README.md
+++ b/plugins/pagerduty/README.md
@@ -35,34 +35,59 @@ If you need help with this plugin, please reach out on the [Backstage Discord se
 
 ### Install the plugin
 
-Install the plugin via a CLI:
+The file paths mentioned in the following steps are relative to your app's root directory — for example, the directory created by following the [Getting Started](https://backstage.io/docs/getting-started/) guide and creating your app with `npx @backstage/create-app`.
+
+First, install the PagerDuty plugin via a CLI:
 
 ```bash
-# From your Backstage root directory
+# From your Backstage app root directory
 cd packages/app
 yarn add @backstage/plugin-pagerduty
 ```
 
-Next, add the plugin to `EntityPage.tsx` by adding the following code snippet where appropriate:
+Next, add the plugin to `EntityPage.tsx` in `packages/app/src/components/catalog` by adding the following code snippets.
+
+Add the following imports to the top of the file:
 
 ```ts
 import {
   isPluginApplicableToEntity as isPagerDutyAvailable,
   EntityPagerDutyCard,
 } from '@backstage/plugin-pagerduty';
-// add to code
-{
-  isPagerDutyAvailable(entity) && (
+```
+
+Find `const overviewContent` in `EntityPage.tsx`, and add the following snippet inside the outermost `Grid` defined there, just before the closing `</Grid>` tag:
+
+```ts
+<EntitySwitch>
+  <EntitySwitch.Case if={isPagerDutyAvailable}>
     <Grid item md={6}>
       <EntityPagerDutyCard />
     </Grid>
-  );
-}
+  </EntitySwitch.Case>
+</EntitySwitch>
+```
+
+When you're done, the `overviewContent` definition should look something like this:
+
+```ts
+const overviewContent = (
+  <Grid ...>
+    ...
+    <EntitySwitch>
+      <EntitySwitch.Case if={isPagerDutyAvailable}>
+        <Grid item md={6}>
+          <EntityPagerDutyCard />
+        </Grid>
+      </EntitySwitch.Case>
+    </EntitySwitch>
+  </Grid>
+);
 ```
 
 ### Configure the plugin
 
-First, annotate the appropriate entity with the PagerDuty integration key:
+First, [annotate](https://backstage.io/docs/features/software-catalog/descriptor-format#annotations-optional) the appropriate entity with the PagerDuty integration key in its `.yaml` configuration file:
 
 ```yaml
 annotations:
diff --git a/plugins/pagerduty/api-report.md b/plugins/pagerduty/api-report.md
index e0278c5d27..0740b440ee 100644
--- a/plugins/pagerduty/api-report.md
+++ b/plugins/pagerduty/api-report.md
@@ -12,34 +12,54 @@ import { DiscoveryApi } from '@backstage/core-plugin-api';
 import { Entity } from '@backstage/catalog-model';
 import { PropsWithChildren } from 'react';
 
+// Warning: (ae-missing-release-tag) "EntityPagerDutyCard" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export const EntityPagerDutyCard: () => JSX.Element;
 
+// Warning: (ae-missing-release-tag) "isPluginApplicableToEntity" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 const isPluginApplicableToEntity: (entity: Entity) => boolean;
 export { isPluginApplicableToEntity as isPagerDutyAvailable };
 export { isPluginApplicableToEntity };
 
+// Warning: (ae-forgotten-export) The symbol "PagerDutyApi" needs to be exported by the entry point index.d.ts
+// Warning: (ae-missing-release-tag) "pagerDutyApiRef" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export const pagerDutyApiRef: ApiRef<PagerDutyApi>;
 
+// Warning: (ae-missing-release-tag) "PagerDutyCard" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export const PagerDutyCard: () => JSX.Element;
 
+// Warning: (ae-missing-release-tag) "PagerDutyClient" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export class PagerDutyClient implements PagerDutyApi {
+  // Warning: (ae-forgotten-export) The symbol "ClientApiConfig" needs to be exported by the entry point index.d.ts
   constructor(config: ClientApiConfig);
   // (undocumented)
   static fromConfig(
     configApi: ConfigApi,
     discoveryApi: DiscoveryApi,
   ): PagerDutyClient;
+  // Warning: (ae-forgotten-export) The symbol "Incident" needs to be exported by the entry point index.d.ts
+  //
   // (undocumented)
   getIncidentsByServiceId(serviceId: string): Promise<Incident[]>;
+  // Warning: (ae-forgotten-export) The symbol "OnCall" needs to be exported by the entry point index.d.ts
+  //
   // (undocumented)
   getOnCallByPolicyId(policyId: string): Promise<OnCall[]>;
+  // Warning: (ae-forgotten-export) The symbol "Service" needs to be exported by the entry point index.d.ts
+  //
   // (undocumented)
   getServiceByIntegrationKey(integrationKey: string): Promise<Service[]>;
+  // Warning: (ae-forgotten-export) The symbol "TriggerAlarmRequest" needs to be exported by the entry point index.d.ts
+  //
   // (undocumented)
   triggerAlarm({
     integrationKey,
@@ -49,16 +69,23 @@ export class PagerDutyClient implements PagerDutyApi {
   }: TriggerAlarmRequest): Promise<Response>;
 }
 
+// Warning: (ae-missing-release-tag) "pagerDutyPlugin" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 const pagerDutyPlugin: BackstagePlugin<{}, {}>;
 export { pagerDutyPlugin };
 export { pagerDutyPlugin as plugin };
 
+// Warning: (ae-forgotten-export) The symbol "TriggerButtonProps" needs to be exported by the entry point index.d.ts
+// Warning: (ae-missing-release-tag) "TriggerButton" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export function TriggerButton({
   children,
 }: PropsWithChildren<TriggerButtonProps>): JSX.Element;
 
+// Warning: (ae-missing-release-tag) "UnauthorizedError" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export class UnauthorizedError extends Error {}
 
diff --git a/plugins/pagerduty/doc/pd1.png b/plugins/pagerduty/doc/pd1.png
index 8242792b5a..dc5a1a94a2 100644
Binary files a/plugins/pagerduty/doc/pd1.png and b/plugins/pagerduty/doc/pd1.png differ
diff --git a/plugins/pagerduty/doc/pd3.png b/plugins/pagerduty/doc/pd3.png
index 89d7f1820d..0546b4e7b5 100644
Binary files a/plugins/pagerduty/doc/pd3.png and b/plugins/pagerduty/doc/pd3.png differ
diff --git a/plugins/pagerduty/doc/pd4.png b/plugins/pagerduty/doc/pd4.png
index 70584bc59e..a9aa93c2ba 100644
Binary files a/plugins/pagerduty/doc/pd4.png and b/plugins/pagerduty/doc/pd4.png differ
diff --git a/plugins/pagerduty/package.json b/plugins/pagerduty/package.json
index 9cb95c25d7..ddeaecb462 100644
--- a/plugins/pagerduty/package.json
+++ b/plugins/pagerduty/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-pagerduty",
-  "version": "0.3.7",
+  "version": "0.3.12",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -30,27 +30,27 @@
     "clean": "backstage-cli clean"
   },
   "dependencies": {
-    "@backstage/catalog-model": "^0.9.0",
-    "@backstage/core-components": "^0.1.5",
-    "@backstage/core-plugin-api": "^0.1.3",
-    "@backstage/plugin-catalog-react": "^0.2.6",
-    "@backstage/theme": "^0.2.8",
-    "@material-ui/core": "^4.11.0",
+    "@backstage/catalog-model": "^0.9.1",
+    "@backstage/core-components": "^0.4.1",
+    "@backstage/core-plugin-api": "^0.1.7",
+    "@backstage/plugin-catalog-react": "^0.4.5",
+    "@backstage/theme": "^0.2.10",
+    "@material-ui/core": "^4.12.2",
     "@material-ui/icons": "^4.9.1",
     "@material-ui/lab": "4.0.0-alpha.45",
-    "@types/react": "^16.9",
+    "@types/react": "*",
     "classnames": "^2.2.6",
-    "luxon": "1.25.0",
+    "luxon": "2.0.2",
     "react": "^16.13.1",
     "react-dom": "^16.13.1",
     "react-router-dom": "6.0.0-beta.0",
     "react-use": "^17.2.4"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.7.3",
-    "@backstage/core-app-api": "^0.1.4",
-    "@backstage/dev-utils": "^0.2.1",
-    "@backstage/test-utils": "^0.1.14",
+    "@backstage/cli": "^0.7.11",
+    "@backstage/core-app-api": "^0.1.12",
+    "@backstage/dev-utils": "^0.2.9",
+    "@backstage/test-utils": "^0.1.17",
     "@testing-library/jest-dom": "^5.10.1",
     "@testing-library/react": "^11.2.5",
     "@testing-library/user-event": "^13.1.8",
diff --git a/plugins/pagerduty/src/components/Escalation/EscalationPolicy.tsx b/plugins/pagerduty/src/components/Escalation/EscalationPolicy.tsx
index 7dc3c3d118..9cbdddca17 100644
--- a/plugins/pagerduty/src/components/Escalation/EscalationPolicy.tsx
+++ b/plugins/pagerduty/src/components/Escalation/EscalationPolicy.tsx
@@ -32,7 +32,11 @@ type Props = {
 export const EscalationPolicy = ({ policyId }: Props) => {
   const api = useApi(pagerDutyApiRef);
 
-  const { value: users, loading, error } = useAsync(async () => {
+  const {
+    value: users,
+    loading,
+    error,
+  } = useAsync(async () => {
     const oncalls = await api.getOnCallByPolicyId(policyId);
     const usersItem = oncalls
       .sort((a, b) => a.escalation_level - b.escalation_level)
diff --git a/plugins/pagerduty/src/components/Incident/IncidentEmptyState.tsx b/plugins/pagerduty/src/components/Incident/IncidentEmptyState.tsx
index d567fa43b0..87108f3d74 100644
--- a/plugins/pagerduty/src/components/Incident/IncidentEmptyState.tsx
+++ b/plugins/pagerduty/src/components/Incident/IncidentEmptyState.tsx
@@ -20,7 +20,12 @@ import EmptyStateImage from '../../assets/emptystate.svg';
 
 export const IncidentsEmptyState = () => {
   return (
-    <Grid container justify="center" direction="column" alignItems="center">
+    <Grid
+      container
+      justifyContent="center"
+      direction="column"
+      alignItems="center"
+    >
       <Grid item xs={12}>
         <Typography variant="h5">Nice! No incidents found!</Typography>
       </Grid>
diff --git a/plugins/pagerduty/src/components/PagerDutyCard/index.tsx b/plugins/pagerduty/src/components/PagerDutyCard/index.tsx
index 7d370d9b87..5c0c18135e 100644
--- a/plugins/pagerduty/src/components/PagerDutyCard/index.tsx
+++ b/plugins/pagerduty/src/components/PagerDutyCard/index.tsx
@@ -55,7 +55,11 @@ export const PagerDutyCard = () => {
     setRefreshIncidents(x => !x);
   }, []);
 
-  const { value: service, loading, error } = useAsync(async () => {
+  const {
+    value: service,
+    loading,
+    error,
+  } = useAsync(async () => {
     const services = await api.getServiceByIntegrationKey(
       integrationKey as string,
     );
diff --git a/plugins/pagerduty/src/components/TriggerDialog/TriggerDialog.test.tsx b/plugins/pagerduty/src/components/TriggerDialog/TriggerDialog.test.tsx
index 3e873d704c..444e820b98 100644
--- a/plugins/pagerduty/src/components/TriggerDialog/TriggerDialog.test.tsx
+++ b/plugins/pagerduty/src/components/TriggerDialog/TriggerDialog.test.tsx
@@ -92,9 +92,8 @@ describe('TriggerDialog', () => {
     });
     expect(mockTriggerAlarmFn).toHaveBeenCalled();
     expect(mockTriggerAlarmFn).toHaveBeenCalledWith({
-      integrationKey: entity!.metadata!.annotations![
-        'pagerduty.com/integration-key'
-      ],
+      integrationKey:
+        entity!.metadata!.annotations!['pagerduty.com/integration-key'],
       source: window.location.toString(),
       description,
       userName: 'guest@example.com',
diff --git a/plugins/proxy-backend/CHANGELOG.md b/plugins/proxy-backend/CHANGELOG.md
index 6b76b1f26e..c7ffd55129 100644
--- a/plugins/proxy-backend/CHANGELOG.md
+++ b/plugins/proxy-backend/CHANGELOG.md
@@ -1,5 +1,13 @@
 # @backstage/plugin-proxy-backend
 
+## 0.2.12
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.9.0
+  - @backstage/config@0.1.8
+
 ## 0.2.11
 
 ### Patch Changes
diff --git a/plugins/proxy-backend/api-report.md b/plugins/proxy-backend/api-report.md
index 812c3f7221..eb7fbec12e 100644
--- a/plugins/proxy-backend/api-report.md
+++ b/plugins/proxy-backend/api-report.md
@@ -8,6 +8,9 @@ import express from 'express';
 import { Logger as Logger_2 } from 'winston';
 import { PluginEndpointDiscovery } from '@backstage/backend-common';
 
+// Warning: (ae-forgotten-export) The symbol "RouterOptions" needs to be exported by the entry point index.d.ts
+// Warning: (ae-missing-release-tag) "createRouter" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export function createRouter(options: RouterOptions): Promise<express.Router>;
 
diff --git a/plugins/proxy-backend/package.json b/plugins/proxy-backend/package.json
index 389aedfb99..d19a6fffda 100644
--- a/plugins/proxy-backend/package.json
+++ b/plugins/proxy-backend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-proxy-backend",
-  "version": "0.2.11",
+  "version": "0.2.12",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -28,8 +28,8 @@
     "clean": "backstage-cli clean"
   },
   "dependencies": {
-    "@backstage/backend-common": "^0.8.3",
-    "@backstage/config": "^0.1.5",
+    "@backstage/backend-common": "^0.9.0",
+    "@backstage/config": "^0.1.8",
     "@types/express": "^4.17.6",
     "express": "^4.17.1",
     "express-promise-router": "^4.1.0",
diff --git a/plugins/register-component/CHANGELOG.md b/plugins/register-component/CHANGELOG.md
deleted file mode 100644
index 642f465f54..0000000000
--- a/plugins/register-component/CHANGELOG.md
+++ /dev/null
@@ -1,310 +0,0 @@
-# @backstage/plugin-register-component
-
-## 0.2.19
-
-### Patch Changes
-
-- Updated dependencies
-  - @backstage/core-components@0.1.5
-  - @backstage/catalog-model@0.9.0
-  - @backstage/plugin-catalog-react@0.2.6
-
-## 0.2.18
-
-### Patch Changes
-
-- b47fc34bc: Update "service catalog" references to "software catalog"
-- Updated dependencies
-  - @backstage/plugin-catalog-react@0.2.5
-  - @backstage/core-components@0.1.4
-
-## 0.2.17
-
-### Patch Changes
-
-- 48c9fcd33: Migrated to use the new `@backstage/core-*` packages rather than `@backstage/core`.
-- Updated dependencies
-  - @backstage/core-plugin-api@0.1.3
-  - @backstage/catalog-model@0.8.4
-  - @backstage/plugin-catalog-react@0.2.4
-
-## 0.2.16
-
-### Patch Changes
-
-- Updated dependencies [add62a455]
-- Updated dependencies [cc592248b]
-- Updated dependencies [17c497b81]
-- Updated dependencies [704875e26]
-  - @backstage/catalog-model@0.8.0
-  - @backstage/core@0.7.11
-  - @backstage/plugin-catalog-react@0.2.0
-
-## 0.2.15
-
-### Patch Changes
-
-- 062bbf90f: chore: bump `@testing-library/user-event` from 12.8.3 to 13.1.8
-- 675a569a9: chore: bump `react-use` dependency in all packages
-- Updated dependencies [062bbf90f]
-- Updated dependencies [10c008a3a]
-- Updated dependencies [889d89b6e]
-- Updated dependencies [16be1d093]
-- Updated dependencies [3f988cb63]
-- Updated dependencies [675a569a9]
-  - @backstage/core@0.7.9
-  - @backstage/plugin-catalog-react@0.1.6
-  - @backstage/catalog-model@0.7.9
-
-## 0.2.14
-
-### Patch Changes
-
-- c614ede9a: Updated README to have up-to-date install instructions.
-- Updated dependencies [9afcac5af]
-- Updated dependencies [e0c9ed759]
-- Updated dependencies [6eaecbd81]
-  - @backstage/core@0.7.7
-
-## 0.2.13
-
-### Patch Changes
-
-- 676ede643: Added the `getOriginLocationByEntity` and `removeLocationById` methods to the catalog client
-- Updated dependencies [9f48b548c]
-- Updated dependencies [8488a1a96]
-  - @backstage/plugin-catalog-react@0.1.4
-  - @backstage/catalog-model@0.7.5
-
-## 0.2.12
-
-### Patch Changes
-
-- Updated dependencies [12d8f27a6]
-- Updated dependencies [40c0fdbaa]
-- Updated dependencies [2a271d89e]
-- Updated dependencies [bece09057]
-- Updated dependencies [169f48deb]
-- Updated dependencies [8a1566719]
-- Updated dependencies [9d455f69a]
-- Updated dependencies [4c049a1a1]
-- Updated dependencies [02816ecd7]
-  - @backstage/catalog-model@0.7.3
-  - @backstage/core@0.7.0
-  - @backstage/plugin-catalog-react@0.1.1
-
-## 0.2.11
-
-### Patch Changes
-
-- Updated dependencies [3a58084b6]
-- Updated dependencies [e799e74d4]
-- Updated dependencies [d0760ecdf]
-- Updated dependencies [1407b34c6]
-- Updated dependencies [88f1f1b60]
-- Updated dependencies [bad21a085]
-- Updated dependencies [9615e68fb]
-- Updated dependencies [49f9b7346]
-- Updated dependencies [5c2e2863f]
-- Updated dependencies [3a58084b6]
-- Updated dependencies [2c1f2a7c2]
-  - @backstage/core@0.6.3
-  - @backstage/plugin-catalog-react@0.1.0
-  - @backstage/catalog-model@0.7.2
-
-## 0.2.10
-
-### Patch Changes
-
-- Updated dependencies [fd3f2a8c0]
-- Updated dependencies [d34d26125]
-- Updated dependencies [0af242b6d]
-- Updated dependencies [f4c2bcf54]
-- Updated dependencies [10a0124e0]
-- Updated dependencies [07e226872]
-- Updated dependencies [f62e7abe5]
-- Updated dependencies [96f378d10]
-- Updated dependencies [688b73110]
-  - @backstage/core@0.6.2
-  - @backstage/plugin-catalog-react@0.0.4
-
-## 0.2.9
-
-### Patch Changes
-
-- 9ec66c345: Migrated to new composability API, exporting the plugin instance as `registerComponentPlugin`, and page as `RegisterComponentPage`.
-- Updated dependencies [19d354c78]
-- Updated dependencies [b51ee6ece]
-  - @backstage/plugin-catalog-react@0.0.3
-  - @backstage/core@0.6.1
-
-## 0.2.8
-
-### Patch Changes
-
-- 019fe39a0: Switch dependency from `@backstage/plugin-catalog` to `@backstage/plugin-catalog-react`.
-- Updated dependencies [12ece98cd]
-- Updated dependencies [d82246867]
-- Updated dependencies [7fc89bae2]
-- Updated dependencies [c810082ae]
-- Updated dependencies [5fa3bdb55]
-- Updated dependencies [6e612ce25]
-- Updated dependencies [025e122c3]
-- Updated dependencies [21e624ba9]
-- Updated dependencies [da9f53c60]
-- Updated dependencies [32c95605f]
-- Updated dependencies [7881f2117]
-- Updated dependencies [54c7d02f7]
-- Updated dependencies [11cb5ef94]
-  - @backstage/core@0.6.0
-  - @backstage/plugin-catalog-react@0.0.2
-  - @backstage/theme@0.2.3
-  - @backstage/catalog-model@0.7.1
-
-## 0.2.7
-
-### Patch Changes
-
-- Updated dependencies [def2307f3]
-- Updated dependencies [efd6ef753]
-- Updated dependencies [593632f07]
-- Updated dependencies [33846acfc]
-- Updated dependencies [a187b8ad0]
-- Updated dependencies [f04db53d7]
-- Updated dependencies [a93f42213]
-  - @backstage/catalog-model@0.7.0
-  - @backstage/core@0.5.0
-  - @backstage/plugin-catalog@0.2.12
-
-## 0.2.6
-
-### Patch Changes
-
-- 1517876fd: Register component plugin is deprecated in favor of @backstage/plugin-catalog-import
-- Updated dependencies [a08c32ced]
-- Updated dependencies [7e0b8cac5]
-- Updated dependencies [87c0c53c2]
-  - @backstage/core@0.4.3
-  - @backstage/plugin-catalog@0.2.9
-
-## 0.2.5
-
-### Patch Changes
-
-- Updated dependencies [c911061b7]
-- Updated dependencies [8ef71ed32]
-- Updated dependencies [0e6298f7e]
-- Updated dependencies [ac3560b42]
-  - @backstage/catalog-model@0.6.0
-  - @backstage/core@0.4.1
-  - @backstage/plugin-catalog@0.2.7
-
-## 0.2.4
-
-### Patch Changes
-
-- Updated dependencies [2527628e1]
-- Updated dependencies [6011b7d3e]
-- Updated dependencies [1c69d4716]
-- Updated dependencies [83b6e0c1f]
-- Updated dependencies [1665ae8bb]
-- Updated dependencies [04f26f88d]
-- Updated dependencies [ff243ce96]
-  - @backstage/core@0.4.0
-  - @backstage/plugin-catalog@0.2.6
-  - @backstage/catalog-model@0.5.0
-  - @backstage/theme@0.2.2
-
-## 0.2.3
-
-### Patch Changes
-
-- Updated dependencies [08835a61d]
-- Updated dependencies [a9fd599f7]
-- Updated dependencies [bcc211a08]
-- Updated dependencies [ebf37bbae]
-  - @backstage/catalog-model@0.4.0
-  - @backstage/plugin-catalog@0.2.5
-
-## 0.2.2
-
-### Patch Changes
-
-- 2a71f4bab: Remove catalog link on validate popup
-- Updated dependencies [475fc0aaa]
-- Updated dependencies [1166fcc36]
-- Updated dependencies [1185919f3]
-  - @backstage/core@0.3.2
-  - @backstage/catalog-model@0.3.0
-  - @backstage/plugin-catalog@0.2.3
-
-## 0.2.1
-
-### Patch Changes
-
-- Updated dependencies [7b37d65fd]
-- Updated dependencies [4aca74e08]
-- Updated dependencies [e8f69ba93]
-- Updated dependencies [0c0798f08]
-- Updated dependencies [0c0798f08]
-- Updated dependencies [199237d2f]
-- Updated dependencies [6627b626f]
-- Updated dependencies [4577e377b]
-- Updated dependencies [2d0bd1be7]
-  - @backstage/core@0.3.0
-  - @backstage/theme@0.2.1
-  - @backstage/plugin-catalog@0.2.1
-
-## 0.2.0
-
-### Minor Changes
-
-- 28edd7d29: Create backend plugin through CLI
-- 2ebcfac8d: Add a validate button to the register-component page
-
-  This allows the user to validate his location before adding it.
-
-### Patch Changes
-
-- 8b9c8196f: Locations registered through the catalog client now default to the 'url' type. The type selection dropdown in the register-component form has been removed.
-- Updated dependencies [28edd7d29]
-- Updated dependencies [819a70229]
-- Updated dependencies [3a4236570]
-- Updated dependencies [ae5983387]
-- Updated dependencies [0d4459c08]
-- Updated dependencies [482b6313d]
-- Updated dependencies [e0be86b6f]
-- Updated dependencies [f70a52868]
-- Updated dependencies [12b5fe940]
-- Updated dependencies [368fd8243]
-- Updated dependencies [1c60f716e]
-- Updated dependencies [144c66d50]
-- Updated dependencies [a768a07fb]
-- Updated dependencies [b79017fd3]
-- Updated dependencies [6d97d2d6f]
-- Updated dependencies [5adfc005e]
-- Updated dependencies [f0aa01bcc]
-- Updated dependencies [0aecfded0]
-- Updated dependencies [93a3fa3ae]
-- Updated dependencies [782f3b354]
-- Updated dependencies [8b9c8196f]
-- Updated dependencies [2713f28f4]
-- Updated dependencies [406015b0d]
-- Updated dependencies [82759d3e4]
-- Updated dependencies [60d40892c]
-- Updated dependencies [ac8d5d5c7]
-- Updated dependencies [2ebcfac8d]
-- Updated dependencies [fa56f4615]
-- Updated dependencies [ebca83d48]
-- Updated dependencies [aca79334f]
-- Updated dependencies [c0d5242a0]
-- Updated dependencies [b3d57961c]
-- Updated dependencies [0b956f21b]
-- Updated dependencies [97c2cb19b]
-- Updated dependencies [3beb5c9fc]
-- Updated dependencies [754e31db5]
-- Updated dependencies [1611c6dbc]
-  - @backstage/plugin-catalog@0.2.0
-  - @backstage/core@0.2.0
-  - @backstage/catalog-model@0.2.0
-  - @backstage/theme@0.2.0
diff --git a/plugins/register-component/README.md b/plugins/register-component/README.md
deleted file mode 100644
index 47db1a7a55..0000000000
--- a/plugins/register-component/README.md
+++ /dev/null
@@ -1,50 +0,0 @@
-# Register component plugin
-
-> This plugin is deprecated in favor of [`@backstage/catalog-import`](https://github.com/backstage/backstage/tree/master/plugins/catalog-import), and will be soon removed from the project.
-
-Welcome to the register-component plugin!
-
-This plugin allows you to submit your Backstage component using your software's YAML config.
-
-When installed it is accessible on [localhost:3000/register-component](localhost:3000/register-component).
-
-<img src="./src/assets/screenshot-1.png" />
-<img src="./src/assets/screenshot-2.png" />
-<img src="./src/assets/screenshot-3.png" />
-<img src="./src/assets/screenshot-4.png" />
-<img src="./src/assets/screenshot-5.png" />
-
-## Standalone setup
-
-1. Install plugin and its dependency `plugin-catalog`
-
-```bash
-# From your Backstage root directory
-cd packages/app
-yarn add @backstage/plugin-register-component
-```
-
-2. Add the `RegisterComponentPage` extension to your `App.tsx`:
-
-```tsx
-// packages/app/src/App.tsx
-import { RegisterComponentPage } from '@backstage/plugin-cost-insights';
-
-<FlatRoutes>
-  ...
-  <Route path="/register-component" element={<RegisterComponentPage />} />
-  ...
-</FlatRoutes>;
-```
-
-## Running
-
-Just run the backstage.
-
-```
-yarn start && yarn --cwd packages/backend start
-```
-
-## Usage
-
-Pretty straightforward, navigate to [localhost:3000/register-component](localhost:3000/register-component) and enter your component's YAML config URL.
diff --git a/plugins/register-component/api-report.md b/plugins/register-component/api-report.md
deleted file mode 100644
index a150f4be2c..0000000000
--- a/plugins/register-component/api-report.md
+++ /dev/null
@@ -1,36 +0,0 @@
-## API Report File for "@backstage/plugin-register-component"
-
-> Do not edit this file. It is a report generated by [API Extractor](https://api-extractor.com/).
-
-```ts
-/// <reference types="react" />
-
-import { BackstagePlugin } from '@backstage/core-plugin-api';
-import { RouteRef } from '@backstage/core-plugin-api';
-
-// @public (undocumented)
-export const RegisterComponentPage: ({
-  catalogRouteRef,
-}: {
-  catalogRouteRef: RouteRef<any>;
-}) => JSX.Element;
-
-// @public (undocumented)
-const registerComponentPlugin: BackstagePlugin<
-  {
-    root: RouteRef<undefined>;
-  },
-  {}
->;
-export { registerComponentPlugin as plugin };
-export { registerComponentPlugin };
-
-// @public @deprecated
-export const Router: ({
-  catalogRouteRef,
-}: {
-  catalogRouteRef: RouteRef;
-}) => JSX.Element;
-
-// (No @packageDocumentation comment for this package)
-```
diff --git a/plugins/register-component/src/assets/screenshot-1.png b/plugins/register-component/src/assets/screenshot-1.png
deleted file mode 100644
index ffaebbb2f5..0000000000
Binary files a/plugins/register-component/src/assets/screenshot-1.png and /dev/null differ
diff --git a/plugins/register-component/src/assets/screenshot-2.png b/plugins/register-component/src/assets/screenshot-2.png
deleted file mode 100644
index e4e5dc579c..0000000000
Binary files a/plugins/register-component/src/assets/screenshot-2.png and /dev/null differ
diff --git a/plugins/register-component/src/assets/screenshot-3.png b/plugins/register-component/src/assets/screenshot-3.png
deleted file mode 100644
index 4bbac74d82..0000000000
Binary files a/plugins/register-component/src/assets/screenshot-3.png and /dev/null differ
diff --git a/plugins/register-component/src/assets/screenshot-4.png b/plugins/register-component/src/assets/screenshot-4.png
deleted file mode 100644
index f45f333135..0000000000
Binary files a/plugins/register-component/src/assets/screenshot-4.png and /dev/null differ
diff --git a/plugins/register-component/src/assets/screenshot-5.png b/plugins/register-component/src/assets/screenshot-5.png
deleted file mode 100644
index a50decd748..0000000000
Binary files a/plugins/register-component/src/assets/screenshot-5.png and /dev/null differ
diff --git a/plugins/register-component/src/components/RegisterComponentForm/RegisterComponentForm.test.tsx b/plugins/register-component/src/components/RegisterComponentForm/RegisterComponentForm.test.tsx
deleted file mode 100644
index 499290493f..0000000000
--- a/plugins/register-component/src/components/RegisterComponentForm/RegisterComponentForm.test.tsx
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Copyright 2020 The Backstage Authors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import { act, render, screen } from '@testing-library/react';
-import userEvent from '@testing-library/user-event';
-import React from 'react';
-import { RegisterComponentForm } from './RegisterComponentForm';
-
-describe('RegisterComponentForm', () => {
-  it('should initially render disabled buttons', async () => {
-    render(<RegisterComponentForm onSubmit={jest.fn()} />);
-
-    expect(
-      await screen.findByText(/Enter the full path to the catalog-info.yaml/),
-    ).toBeInTheDocument();
-
-    expect(screen.getByText('Validate').closest('button')).toBeDisabled();
-    expect(screen.getByText('Register').closest('button')).toBeDisabled();
-  });
-
-  it('should enable the submit buttons when the target url is set', async () => {
-    render(<RegisterComponentForm onSubmit={jest.fn()} />);
-
-    await act(async () => {
-      await userEvent.type(
-        await screen.findByLabelText('Entity file URL', { exact: false }),
-        'https://example.com/blob/master/component.yaml',
-      );
-    });
-
-    expect(screen.getByText('Validate').closest('button')).not.toBeDisabled();
-    expect(screen.getByText('Register').closest('button')).not.toBeDisabled();
-  });
-
-  it('should show spinner while submitting', async () => {
-    render(<RegisterComponentForm onSubmit={jest.fn()} submitting />);
-
-    expect(screen.getByTestId('loading-progress')).toBeInTheDocument();
-  });
-});
diff --git a/plugins/register-component/src/components/RegisterComponentForm/RegisterComponentForm.tsx b/plugins/register-component/src/components/RegisterComponentForm/RegisterComponentForm.tsx
deleted file mode 100644
index 8dceaeafca..0000000000
--- a/plugins/register-component/src/components/RegisterComponentForm/RegisterComponentForm.tsx
+++ /dev/null
@@ -1,125 +0,0 @@
-/*
- * Copyright 2020 The Backstage Authors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import { BackstageTheme } from '@backstage/theme';
-import {
-  Button,
-  FormControl,
-  FormHelperText,
-  LinearProgress,
-  TextField,
-} from '@material-ui/core';
-import { makeStyles } from '@material-ui/core/styles';
-import React from 'react';
-import { useForm } from 'react-hook-form';
-import { ComponentIdValidators } from '../../util/validate';
-
-const useStyles = makeStyles<BackstageTheme>(theme => ({
-  form: {
-    alignItems: 'flex-start',
-    display: 'flex',
-    flexFlow: 'column nowrap',
-  },
-  buttonSpacing: {
-    marginLeft: theme.spacing(1),
-  },
-  buttons: {
-    marginTop: theme.spacing(2),
-  },
-  select: {
-    minWidth: 120,
-  },
-}));
-
-export type Props = {
-  onSubmit: (formData: Record<string, string>) => Promise<void>;
-  submitting?: boolean;
-};
-
-export const RegisterComponentForm = ({ onSubmit, submitting }: Props) => {
-  const { register, handleSubmit, errors, formState } = useForm({
-    mode: 'onChange',
-  });
-  const classes = useStyles();
-  const hasErrors = !!errors.entityLocation;
-  const dirty = formState?.isDirty;
-
-  const onSubmitValidate = handleSubmit(data => {
-    data.mode = 'validate';
-    onSubmit(data);
-  });
-
-  const onSubmitRegister = handleSubmit(data => {
-    data.mode = 'register';
-    onSubmit(data);
-  });
-
-  return submitting ? (
-    <LinearProgress data-testid="loading-progress" />
-  ) : (
-    <form
-      autoComplete="off"
-      className={classes.form}
-      data-testid="register-form"
-    >
-      <FormControl>
-        <TextField
-          id="registerComponentInput"
-          variant="outlined"
-          label="Entity file URL"
-          error={hasErrors}
-          placeholder="https://example.com/user/some-service/blob/master/catalog-info.yaml"
-          name="entityLocation"
-          required
-          margin="normal"
-          helperText="Enter the full path to the catalog-info.yaml file in GitHub, GitLab, Bitbucket or Azure to start tracking your component."
-          inputRef={register({
-            required: true,
-            validate: ComponentIdValidators,
-          })}
-        />
-
-        {errors.entityLocation && (
-          <FormHelperText error={hasErrors} id="register-component-helper-text">
-            {errors.entityLocation.message}
-          </FormHelperText>
-        )}
-      </FormControl>
-
-      <div className={classes.buttons}>
-        <Button
-          variant="outlined"
-          color="primary"
-          type="submit"
-          disabled={!dirty || hasErrors}
-          onClick={onSubmitValidate}
-        >
-          Validate
-        </Button>
-        <Button
-          variant="contained"
-          color="primary"
-          type="submit"
-          className={classes.buttonSpacing}
-          disabled={!dirty || hasErrors}
-          onClick={onSubmitRegister}
-        >
-          Register
-        </Button>
-      </div>
-    </form>
-  );
-};
diff --git a/plugins/register-component/src/components/RegisterComponentPage/RegisterComponentPage.test.tsx b/plugins/register-component/src/components/RegisterComponentPage/RegisterComponentPage.test.tsx
deleted file mode 100644
index 2874e77eb6..0000000000
--- a/plugins/register-component/src/components/RegisterComponentPage/RegisterComponentPage.test.tsx
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * Copyright 2020 The Backstage Authors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import { catalogApiRef } from '@backstage/plugin-catalog-react';
-import { renderInTestApp } from '@backstage/test-utils';
-import { lightTheme } from '@backstage/theme';
-import { ThemeProvider } from '@material-ui/core';
-import React from 'react';
-import { RegisterComponentPage } from './RegisterComponentPage';
-
-import { ApiProvider, ApiRegistry } from '@backstage/core-app-api';
-import { createRouteRef, errorApiRef } from '@backstage/core-plugin-api';
-
-const errorApi: jest.Mocked<typeof errorApiRef.T> = {
-  post: jest.fn(),
-  error$: jest.fn(),
-};
-
-const catalogApi: jest.Mocked<typeof catalogApiRef.T> = {
-  /* eslint-disable-next-line @typescript-eslint/no-unused-vars */
-  addLocation: jest.fn(_a => new Promise(() => {})),
-  getEntities: jest.fn(),
-  getOriginLocationByEntity: jest.fn(),
-  getLocationByEntity: jest.fn(),
-  getLocationById: jest.fn(),
-  removeLocationById: jest.fn(),
-  removeEntityByUid: jest.fn(),
-  getEntityByName: jest.fn(),
-};
-
-const Wrapper = ({ children }: { children?: React.ReactNode }) => (
-  <ApiProvider
-    apis={ApiRegistry.with(errorApiRef, errorApi).with(
-      catalogApiRef,
-      catalogApi,
-    )}
-  >
-    <ThemeProvider theme={lightTheme}>{children}</ThemeProvider>
-  </ApiProvider>
-);
-
-describe('RegisterComponentPage', () => {
-  it('should render', async () => {
-    const { getByText } = await renderInTestApp(
-      <Wrapper>
-        <RegisterComponentPage
-          catalogRouteRef={createRouteRef({
-            path: '/catalog',
-            title: 'Software Catalog',
-          })}
-        />
-      </Wrapper>,
-    );
-
-    expect(getByText('Register existing component')).toBeInTheDocument();
-  });
-});
diff --git a/plugins/register-component/src/components/RegisterComponentPage/RegisterComponentPage.tsx b/plugins/register-component/src/components/RegisterComponentPage/RegisterComponentPage.tsx
deleted file mode 100644
index 27ed7346ea..0000000000
--- a/plugins/register-component/src/components/RegisterComponentPage/RegisterComponentPage.tsx
+++ /dev/null
@@ -1,137 +0,0 @@
-/*
- * Copyright 2020 The Backstage Authors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import { Entity, Location } from '@backstage/catalog-model';
-import { catalogApiRef } from '@backstage/plugin-catalog-react';
-import { Grid, makeStyles } from '@material-ui/core';
-import React, { useState } from 'react';
-import { useMountedState } from 'react-use';
-import { RegisterComponentForm } from '../RegisterComponentForm';
-import { RegisterComponentResultDialog } from '../RegisterComponentResultDialog';
-
-import {
-  Content,
-  ContentHeader,
-  Header,
-  InfoCard,
-  Page,
-  SupportButton,
-} from '@backstage/core-components';
-import { errorApiRef, RouteRef, useApi } from '@backstage/core-plugin-api';
-
-const useStyles = makeStyles(theme => ({
-  dialogPaper: {
-    minHeight: 250,
-    minWidth: 600,
-  },
-  icon: {
-    width: 20,
-    marginRight: theme.spacing(1),
-  },
-  contentText: {
-    paddingBottom: theme.spacing(2),
-  },
-}));
-
-const FormStates = {
-  Idle: 'idle',
-  Success: 'success',
-  Submitting: 'submitting',
-} as const;
-
-type ValuesOf<T> = T extends Record<any, infer V> ? V : never;
-
-export const RegisterComponentPage = ({
-  catalogRouteRef,
-}: {
-  catalogRouteRef: RouteRef;
-}) => {
-  const classes = useStyles();
-  const catalogApi = useApi(catalogApiRef);
-  const [formState, setFormState] = useState<ValuesOf<typeof FormStates>>(
-    FormStates.Idle,
-  );
-  const isMounted = useMountedState();
-
-  const errorApi = useApi(errorApiRef);
-
-  const [result, setResult] = useState<{
-    data: {
-      entities: Entity[];
-      location: Location;
-    } | null;
-    error: null | Error;
-    dryRun: boolean;
-  }>({
-    data: null,
-    error: null,
-    dryRun: false,
-  });
-
-  const handleSubmit = async (formData: Record<string, string>) => {
-    setFormState(FormStates.Submitting);
-    const { entityLocation: target, mode } = formData;
-    const dryRun = mode === 'validate';
-    try {
-      const data = await catalogApi.addLocation({ target, dryRun });
-
-      if (!isMounted()) return;
-
-      setResult({ error: null, data, dryRun });
-      setFormState(FormStates.Success);
-    } catch (e) {
-      errorApi.post(e);
-
-      if (!isMounted()) return;
-
-      setResult({ error: e, data: null, dryRun });
-      setFormState(FormStates.Idle);
-    }
-  };
-
-  return (
-    <Page themeId="home">
-      <Header title="Register existing component" />
-      <Content>
-        <ContentHeader title="Start tracking your component in Backstage">
-          <SupportButton>
-            Start tracking your component in Backstage. TODO: Add more
-            information about what this is.
-          </SupportButton>
-        </ContentHeader>
-        <Grid container spacing={3} direction="column">
-          <Grid item>
-            <InfoCard>
-              <RegisterComponentForm
-                onSubmit={handleSubmit}
-                submitting={formState === FormStates.Submitting}
-              />
-            </InfoCard>
-          </Grid>
-        </Grid>
-      </Content>
-      {formState === FormStates.Success && (
-        <RegisterComponentResultDialog
-          entities={result.data!.entities}
-          dryRun={result.dryRun}
-          onClose={() => setFormState(FormStates.Idle)}
-          classes={{ paper: classes.dialogPaper }}
-          catalogRouteRef={catalogRouteRef}
-        />
-      )}
-    </Page>
-  );
-};
diff --git a/plugins/register-component/src/components/RegisterComponentResultDialog/RegisterComponentResultDialog.test.tsx b/plugins/register-component/src/components/RegisterComponentResultDialog/RegisterComponentResultDialog.test.tsx
deleted file mode 100644
index 0cc36c98bc..0000000000
--- a/plugins/register-component/src/components/RegisterComponentResultDialog/RegisterComponentResultDialog.test.tsx
+++ /dev/null
@@ -1,93 +0,0 @@
-/*
- * Copyright 2020 The Backstage Authors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import { Entity } from '@backstage/catalog-model';
-import { lightTheme } from '@backstage/theme';
-import { ThemeProvider } from '@material-ui/core';
-import { render, screen } from '@testing-library/react';
-import React from 'react';
-import { MemoryRouter } from 'react-router-dom';
-import { RegisterComponentResultDialog } from './RegisterComponentResultDialog';
-import { createRouteRef } from '@backstage/core-plugin-api';
-
-const Wrapper = ({ children }: { children?: React.ReactNode }) => (
-  <MemoryRouter>
-    <ThemeProvider theme={lightTheme}>{children}</ThemeProvider>
-  </MemoryRouter>
-);
-
-describe('RegisterComponentResultDialog', () => {
-  it('should render', () => {
-    render(
-      <RegisterComponentResultDialog
-        onClose={() => {}}
-        entities={[]}
-        catalogRouteRef={createRouteRef({
-          path: '/catalog',
-          title: 'Software Catalog',
-        })}
-      />,
-      { wrapper: Wrapper },
-    );
-
-    expect(screen.getByText('Registration Result')).toBeInTheDocument();
-  });
-
-  it('should show a list of components if success', async () => {
-    const entities: Entity[] = [
-      {
-        apiVersion: 'backstage.io/v1alpha1',
-        kind: 'Component',
-        metadata: {
-          name: 'Component1',
-        },
-        spec: {
-          type: 'website',
-        },
-      },
-      {
-        apiVersion: 'backstage.io/v1alpha1',
-        kind: 'Component',
-        metadata: {
-          name: 'Component2',
-        },
-        spec: {
-          type: 'service',
-        },
-      },
-    ];
-
-    render(
-      <RegisterComponentResultDialog
-        onClose={() => {}}
-        entities={entities}
-        catalogRouteRef={createRouteRef({
-          path: '/catalog',
-          title: 'Software Catalog',
-        })}
-      />,
-      { wrapper: Wrapper },
-    );
-
-    expect(
-      screen.getByText(
-        'The following entities have been successfully created:',
-      ),
-    ).toBeInTheDocument();
-    expect(screen.getByText('Component1')).toBeInTheDocument();
-    expect(screen.getByText('Component2')).toBeInTheDocument();
-  });
-});
diff --git a/plugins/register-component/src/components/RegisterComponentResultDialog/RegisterComponentResultDialog.tsx b/plugins/register-component/src/components/RegisterComponentResultDialog/RegisterComponentResultDialog.tsx
deleted file mode 100644
index e13f2ac229..0000000000
--- a/plugins/register-component/src/components/RegisterComponentResultDialog/RegisterComponentResultDialog.tsx
+++ /dev/null
@@ -1,142 +0,0 @@
-/*
- * Copyright 2020 The Backstage Authors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import { Entity } from '@backstage/catalog-model';
-import {
-  entityRoute,
-  entityRouteParams,
-} from '@backstage/plugin-catalog-react';
-import {
-  Button,
-  Dialog,
-  DialogActions,
-  DialogContent,
-  DialogContentText,
-  DialogTitle,
-  Divider,
-  Link,
-  List,
-  ListItem,
-} from '@material-ui/core';
-import React, { useState } from 'react';
-import { generatePath, resolvePath } from 'react-router';
-import { Link as RouterLink } from 'react-router-dom';
-
-import { RouteRef } from '@backstage/core-plugin-api';
-import { StructuredMetadataTable } from '@backstage/core-components';
-
-type Props = {
-  onClose: () => void;
-  classes?: Record<string, string>;
-  entities: Entity[];
-  dryRun?: boolean;
-  catalogRouteRef: RouteRef;
-};
-
-const getEntityCatalogPath = ({
-  entity,
-  catalogRouteRef,
-}: {
-  entity: Entity;
-  catalogRouteRef: RouteRef;
-}) => {
-  const relativeEntityPathInsideCatalog = generatePath(
-    entityRoute.path,
-    entityRouteParams(entity),
-  );
-
-  const resolvedAbsolutePath = resolvePath(
-    relativeEntityPathInsideCatalog,
-    catalogRouteRef.path,
-  )?.pathname;
-
-  return resolvedAbsolutePath;
-};
-
-export const RegisterComponentResultDialog = ({
-  onClose,
-  classes,
-  entities,
-  dryRun,
-  catalogRouteRef,
-}: Props) => {
-  const [open, setOpen] = useState(true);
-  const handleClose = () => {
-    setOpen(false);
-  };
-
-  return (
-    <Dialog open={open} onClose={onClose} classes={classes}>
-      <DialogTitle>
-        {dryRun ? 'Validation Result' : 'Registration Result'}
-      </DialogTitle>
-      <DialogContent>
-        <DialogContentText>
-          {dryRun
-            ? 'The following entities would be created:'
-            : 'The following entities have been successfully created:'}
-        </DialogContentText>
-        <List>
-          {entities.map((entity: any, index: number) => {
-            const entityPath = getEntityCatalogPath({
-              entity,
-              catalogRouteRef,
-            });
-            return (
-              <React.Fragment
-                key={`${entity.metadata.namespace}-${entity.metadata.name}`}
-              >
-                <ListItem>
-                  <StructuredMetadataTable
-                    dense
-                    metadata={{
-                      name: entity.metadata.name,
-                      type: entity.spec.type,
-                      link: dryRun ? (
-                        entityPath
-                      ) : (
-                        <Link component={RouterLink} to={entityPath}>
-                          {entityPath}
-                        </Link>
-                      ),
-                    }}
-                  />
-                </ListItem>
-                {index < entities.length - 1 && <Divider component="li" />}
-              </React.Fragment>
-            );
-          })}
-        </List>
-      </DialogContent>
-      <DialogActions>
-        {dryRun && (
-          <Button onClick={handleClose} color="default">
-            Close
-          </Button>
-        )}
-        {!dryRun && (
-          <Button
-            component={RouterLink}
-            to={`/${catalogRouteRef.path}`}
-            color="default"
-          >
-            To Catalog
-          </Button>
-        )}
-      </DialogActions>
-    </Dialog>
-  );
-};
diff --git a/plugins/register-component/src/components/Router.tsx b/plugins/register-component/src/components/Router.tsx
deleted file mode 100644
index 88f8d22f38..0000000000
--- a/plugins/register-component/src/components/Router.tsx
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright 2020 The Backstage Authors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-import React from 'react';
-import { Route, Routes } from 'react-router';
-import { RegisterComponentPage } from './RegisterComponentPage';
-import { RouteRef } from '@backstage/core-plugin-api';
-
-// As we don't know which path the catalog's router mounted on
-// We need to inject this from the app
-
-/**
- * Provides a router for registering a component.
- *
- * @deprecated The router for this component is deprecated and replaced with the `catalog-import` plugin.
- * @see https://github.com/backstage/backstage/tree/master/plugins/catalog-import
- */
-export const Router = ({ catalogRouteRef }: { catalogRouteRef: RouteRef }) => (
-  <Routes>
-    <Route
-      element={<RegisterComponentPage catalogRouteRef={catalogRouteRef} />}
-    />
-  </Routes>
-);
diff --git a/plugins/register-component/src/util/validate.test.ts b/plugins/register-component/src/util/validate.test.ts
deleted file mode 100644
index 576dc9f367..0000000000
--- a/plugins/register-component/src/util/validate.test.ts
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Copyright 2020 The Backstage Authors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import { ComponentIdValidators } from './validate';
-
-describe('ComponentIdValidators', () => {
-  describe('httpsValidator validator', () => {
-    const errorMessage = 'Must start with https://.';
-    test.each([
-      [true, 'https://example.com'],
-      [errorMessage, 'http://example.com'],
-      [errorMessage, 'example.com'],
-      [errorMessage, 'www.example.com'],
-      [errorMessage, ''],
-      [errorMessage, undefined],
-    ])('should return %p for %s', (expected: string | boolean, arg: any) => {
-      expect(ComponentIdValidators.httpsValidator(arg)).toBe(expected);
-    });
-  });
-  describe('yamlValidator', () => {
-    const errorMessage = "Must contain '.yaml'.";
-    test.each([
-      [true, '.yaml'],
-      [true, 'http://example.com/blob/master/service.yaml'],
-      [true, 'https://example.yaml'],
-      [true, 'https://example.com?path=abc.yaml&c=1'],
-      [errorMessage, 'https://example.com?path=abc_yaml&c=1'],
-      [errorMessage, '.yml'],
-      [errorMessage, 'http://example.com/blob/master/service'],
-      [errorMessage, undefined],
-    ])('should return %p for %s', (expected: string | boolean, arg: any) => {
-      expect(ComponentIdValidators.yamlValidator(arg)).toBe(expected);
-    });
-  });
-});
diff --git a/plugins/register-component/tsconfig.json b/plugins/register-component/tsconfig.json
deleted file mode 100644
index b663b01fa2..0000000000
--- a/plugins/register-component/tsconfig.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "extends": "../../tsconfig.json",
-  "include": ["src", "dev"],
-  "compilerOptions": {}
-}
diff --git a/plugins/rollbar-backend/CHANGELOG.md b/plugins/rollbar-backend/CHANGELOG.md
index 7f4a7e1b8e..01d9ff10ba 100644
--- a/plugins/rollbar-backend/CHANGELOG.md
+++ b/plugins/rollbar-backend/CHANGELOG.md
@@ -1,5 +1,21 @@
 # @backstage/plugin-rollbar-backend
 
+## 0.1.14
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.9.0
+  - @backstage/config@0.1.8
+
+## 0.1.13
+
+### Patch Changes
+
+- ae84b20cf: Revert the upgrade to `fs-extra@10.0.0` as that seemed to have broken all installs inexplicably.
+- Updated dependencies
+  - @backstage/backend-common@0.8.6
+
 ## 0.1.12
 
 ### Patch Changes
diff --git a/plugins/rollbar-backend/api-report.md b/plugins/rollbar-backend/api-report.md
index 02a79fa267..6ac27447d8 100644
--- a/plugins/rollbar-backend/api-report.md
+++ b/plugins/rollbar-backend/api-report.md
@@ -7,18 +7,22 @@ import { Config } from '@backstage/config';
 import express from 'express';
 import { Logger as Logger_2 } from 'winston';
 
+// Warning: (ae-missing-release-tag) "createRouter" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export function createRouter(options: RouterOptions): Promise<express.Router>;
 
+// Warning: (ae-missing-release-tag) "getRequestHeaders" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
-export function getRequestHeaders(
-  token: string,
-): {
+export function getRequestHeaders(token: string): {
   headers: {
     'X-Rollbar-Access-Token': string;
   };
 };
 
+// Warning: (ae-missing-release-tag) "RollbarApi" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export class RollbarApi {
   constructor(accessToken: string, logger: Logger_2);
@@ -30,8 +34,12 @@ export class RollbarApi {
       item_id?: number;
     },
   ): Promise<RollbarItemCount[]>;
+  // Warning: (ae-forgotten-export) The symbol "RollbarProject" needs to be exported by the entry point index.d.ts
+  //
   // (undocumented)
   getAllProjects(): Promise<RollbarProject[]>;
+  // Warning: (ae-forgotten-export) The symbol "RollbarItemCount" needs to be exported by the entry point index.d.ts
+  //
   // (undocumented)
   getOccuranceCounts(
     projectName: string,
@@ -42,8 +50,12 @@ export class RollbarApi {
   ): Promise<RollbarItemCount[]>;
   // (undocumented)
   getProject(projectName: string): Promise<RollbarProject>;
+  // Warning: (ae-forgotten-export) The symbol "RollbarItemsResponse" needs to be exported by the entry point index.d.ts
+  //
   // (undocumented)
   getProjectItems(projectName: string): Promise<RollbarItemsResponse>;
+  // Warning: (ae-forgotten-export) The symbol "RollbarTopActiveItem" needs to be exported by the entry point index.d.ts
+  //
   // (undocumented)
   getTopActiveItems(
     projectName: string,
@@ -54,6 +66,8 @@ export class RollbarApi {
   ): Promise<RollbarTopActiveItem[]>;
 }
 
+// Warning: (ae-missing-release-tag) "RouterOptions" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export interface RouterOptions {
   // (undocumented)
diff --git a/plugins/rollbar-backend/package.json b/plugins/rollbar-backend/package.json
index 6f6d87e30e..c10b7a6583 100644
--- a/plugins/rollbar-backend/package.json
+++ b/plugins/rollbar-backend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-rollbar-backend",
-  "version": "0.1.12",
+  "version": "0.1.14",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -30,8 +30,8 @@
     "clean": "backstage-cli clean"
   },
   "dependencies": {
-    "@backstage/backend-common": "^0.8.3",
-    "@backstage/config": "^0.1.5",
+    "@backstage/backend-common": "^0.9.0",
+    "@backstage/config": "^0.1.8",
     "@types/express": "^4.17.6",
     "axios": "^0.21.1",
     "camelcase-keys": "^6.2.2",
@@ -47,7 +47,7 @@
     "yn": "^4.0.0"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.7.1",
+    "@backstage/cli": "^0.7.4",
     "@types/supertest": "^2.0.8",
     "supertest": "^6.1.3"
   },
diff --git a/plugins/rollbar/CHANGELOG.md b/plugins/rollbar/CHANGELOG.md
index 5ba8a5fee2..62b50ffa41 100644
--- a/plugins/rollbar/CHANGELOG.md
+++ b/plugins/rollbar/CHANGELOG.md
@@ -1,5 +1,56 @@
 # @backstage/plugin-rollbar
 
+## 0.3.13
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@0.4.5
+  - @backstage/core-components@0.4.0
+  - @backstage/catalog-model@0.9.1
+
+## 0.3.12
+
+### Patch Changes
+
+- 56c773909: Switched `@types/react` dependency to request `*` rather than a specific version.
+- Updated dependencies
+  - @backstage/core-components@0.3.1
+  - @backstage/core-plugin-api@0.1.6
+  - @backstage/plugin-catalog-react@0.4.2
+
+## 0.3.11
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.3.0
+  - @backstage/core-plugin-api@0.1.5
+  - @backstage/plugin-catalog-react@0.4.1
+
+## 0.3.10
+
+### Patch Changes
+
+- 9d40fcb1e: - Bumping `material-ui/core` version to at least `4.12.2` as they made some breaking changes in later versions which broke `Pagination` of the `Table`.
+  - Switching out `material-table` to `@material-table/core` for support for the later versions of `material-ui/core`
+  - This causes a minor API change to `@backstage/core-components` as the interface for `Table` re-exports the `prop` from the underlying `Table` components.
+  - `onChangeRowsPerPage` has been renamed to `onRowsPerPageChange`
+  - `onChangePage` has been renamed to `onPageChange`
+  - Migration guide is here: https://material-table-core.com/docs/breaking-changes
+- Updated dependencies
+  - @backstage/core-components@0.2.0
+  - @backstage/plugin-catalog-react@0.4.0
+  - @backstage/core-plugin-api@0.1.4
+  - @backstage/theme@0.2.9
+
+## 0.3.9
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@0.3.0
+
 ## 0.3.8
 
 ### Patch Changes
diff --git a/plugins/rollbar/api-report.md b/plugins/rollbar/api-report.md
index c2ea5bb364..4009702da4 100644
--- a/plugins/rollbar/api-report.md
+++ b/plugins/rollbar/api-report.md
@@ -12,30 +12,47 @@ import { Entity } from '@backstage/catalog-model';
 import { IdentityApi } from '@backstage/core-plugin-api';
 import { RouteRef } from '@backstage/core-plugin-api';
 
+// Warning: (ae-forgotten-export) The symbol "Props" needs to be exported by the entry point index.d.ts
+// Warning: (ae-missing-release-tag) "EntityPageRollbar" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export const EntityPageRollbar: (_props: Props) => JSX.Element;
 
+// Warning: (ae-missing-release-tag) "EntityRollbarContent" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export const EntityRollbarContent: (_props: {
   entity?: Entity | undefined;
 }) => JSX.Element;
 
+// Warning: (ae-missing-release-tag) "isPluginApplicableToEntity" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 const isPluginApplicableToEntity: (entity: Entity) => boolean;
 export { isPluginApplicableToEntity };
 export { isPluginApplicableToEntity as isRollbarAvailable };
 
+// Warning: (ae-missing-release-tag) "ROLLBAR_ANNOTATION" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export const ROLLBAR_ANNOTATION = 'rollbar.com/project-slug';
 
+// Warning: (ae-missing-release-tag) "RollbarApi" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export interface RollbarApi {
+  // Warning: (ae-forgotten-export) The symbol "RollbarProject" needs to be exported by the entry point index.d.ts
+  //
   // (undocumented)
   getAllProjects(): Promise<RollbarProject[]>;
   // (undocumented)
   getProject(projectName: string): Promise<RollbarProject>;
+  // Warning: (ae-forgotten-export) The symbol "RollbarItemsResponse" needs to be exported by the entry point index.d.ts
+  //
   // (undocumented)
   getProjectItems(project: string): Promise<RollbarItemsResponse>;
+  // Warning: (ae-forgotten-export) The symbol "RollbarTopActiveItem" needs to be exported by the entry point index.d.ts
+  //
   // (undocumented)
   getTopActiveItems(
     project: string,
@@ -43,9 +60,13 @@ export interface RollbarApi {
   ): Promise<RollbarTopActiveItem[]>;
 }
 
+// Warning: (ae-missing-release-tag) "rollbarApiRef" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export const rollbarApiRef: ApiRef<RollbarApi>;
 
+// Warning: (ae-missing-release-tag) "RollbarClient" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export class RollbarClient implements RollbarApi {
   constructor(options: {
@@ -66,6 +87,8 @@ export class RollbarClient implements RollbarApi {
   ): Promise<RollbarTopActiveItem[]>;
 }
 
+// Warning: (ae-missing-release-tag) "rollbarPlugin" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 const rollbarPlugin: BackstagePlugin<
   {
@@ -76,6 +99,9 @@ const rollbarPlugin: BackstagePlugin<
 export { rollbarPlugin as plugin };
 export { rollbarPlugin };
 
+// Warning: (ae-forgotten-export) The symbol "Props" needs to be exported by the entry point index.d.ts
+// Warning: (ae-missing-release-tag) "Router" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export const Router: (_props: Props_2) => JSX.Element;
 
diff --git a/plugins/rollbar/package.json b/plugins/rollbar/package.json
index 4cbffe3fff..e2384b6b1b 100644
--- a/plugins/rollbar/package.json
+++ b/plugins/rollbar/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-rollbar",
-  "version": "0.3.8",
+  "version": "0.3.13",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -31,12 +31,12 @@
     "clean": "backstage-cli clean"
   },
   "dependencies": {
-    "@backstage/catalog-model": "^0.9.0",
-    "@backstage/core-components": "^0.1.5",
-    "@backstage/core-plugin-api": "^0.1.3",
-    "@backstage/plugin-catalog-react": "^0.2.6",
-    "@backstage/theme": "^0.2.8",
-    "@material-ui/core": "^4.11.0",
+    "@backstage/catalog-model": "^0.9.1",
+    "@backstage/core-components": "^0.4.1",
+    "@backstage/core-plugin-api": "^0.1.7",
+    "@backstage/plugin-catalog-react": "^0.4.5",
+    "@backstage/theme": "^0.2.10",
+    "@material-ui/core": "^4.12.2",
     "@material-ui/icons": "^4.9.1",
     "@material-ui/lab": "4.0.0-alpha.45",
     "lodash": "^4.17.15",
@@ -48,17 +48,17 @@
     "react-use": "^17.2.4"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.7.3",
-    "@backstage/core-app-api": "^0.1.4",
-    "@backstage/dev-utils": "^0.2.1",
-    "@backstage/test-utils": "^0.1.14",
+    "@backstage/cli": "^0.7.11",
+    "@backstage/core-app-api": "^0.1.12",
+    "@backstage/dev-utils": "^0.2.9",
+    "@backstage/test-utils": "^0.1.17",
     "@testing-library/jest-dom": "^5.10.1",
     "@testing-library/react": "^11.2.5",
     "@testing-library/react-hooks": "^3.3.0",
     "@testing-library/user-event": "^13.1.8",
     "@types/jest": "^26.0.7",
     "@types/node": "^14.14.32",
-    "@types/react": "^16.9",
+    "@types/react": "*",
     "cross-fetch": "^3.0.6",
     "msw": "^0.29.0"
   },
diff --git a/plugins/rollbar/src/components/RollbarProject/RollbarProject.tsx b/plugins/rollbar/src/components/RollbarProject/RollbarProject.tsx
index edb2afc0ca..ef7cc155b1 100644
--- a/plugins/rollbar/src/components/RollbarProject/RollbarProject.tsx
+++ b/plugins/rollbar/src/components/RollbarProject/RollbarProject.tsx
@@ -24,9 +24,8 @@ type Props = {
 };
 
 export const RollbarProject = ({ entity }: Props) => {
-  const { items, organization, project, loading, error } = useTopActiveItems(
-    entity,
-  );
+  const { items, organization, project, loading, error } =
+    useTopActiveItems(entity);
 
   return (
     <RollbarTopItemsTable
diff --git a/plugins/rollbar/src/hooks/useCatalogEntity.ts b/plugins/rollbar/src/hooks/useCatalogEntity.ts
index eeb2a6eded..b64369af7b 100644
--- a/plugins/rollbar/src/hooks/useCatalogEntity.ts
+++ b/plugins/rollbar/src/hooks/useCatalogEntity.ts
@@ -25,7 +25,11 @@ export function useCatalogEntity() {
   const catalogApi = useApi(catalogApiRef);
   const { namespace, name } = useEntityCompoundName();
 
-  const { value: entity, error, loading } = useAsync(
+  const {
+    value: entity,
+    error,
+    loading,
+  } = useAsync(
     () => catalogApi.getEntityByName({ kind: 'Component', namespace, name }),
     [catalogApi, namespace, name],
   );
diff --git a/plugins/scaffolder-backend-module-cookiecutter/.eslintrc.js b/plugins/scaffolder-backend-module-cookiecutter/.eslintrc.js
new file mode 100644
index 0000000000..16a033dbc6
--- /dev/null
+++ b/plugins/scaffolder-backend-module-cookiecutter/.eslintrc.js
@@ -0,0 +1,3 @@
+module.exports = {
+  extends: [require.resolve('@backstage/cli/config/eslint.backend')],
+};
diff --git a/plugins/scaffolder-backend-module-cookiecutter/CHANGELOG.md b/plugins/scaffolder-backend-module-cookiecutter/CHANGELOG.md
new file mode 100644
index 0000000000..bf7db656c5
--- /dev/null
+++ b/plugins/scaffolder-backend-module-cookiecutter/CHANGELOG.md
@@ -0,0 +1,20 @@
+# @backstage/plugin-scaffolder-backend-module-cookiecutter
+
+## 0.1.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.9.0
+  - @backstage/plugin-scaffolder-backend@0.15.2
+  - @backstage/integration@0.6.2
+  - @backstage/config@0.1.8
+
+## 0.1.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/integration@0.6.0
+  - @backstage/plugin-scaffolder-backend@0.15.0
+  - @backstage/backend-common@0.8.9
diff --git a/plugins/scaffolder-backend/sample-templates/v1beta2-demo/template.yaml b/plugins/scaffolder-backend-module-cookiecutter/README.md
similarity index 55%
rename from plugins/scaffolder-backend/sample-templates/v1beta2-demo/template.yaml
rename to plugins/scaffolder-backend-module-cookiecutter/README.md
index b3228a20d0..77ae93c5f3 100644
--- a/plugins/scaffolder-backend/sample-templates/v1beta2-demo/template.yaml
+++ b/plugins/scaffolder-backend-module-cookiecutter/README.md
@@ -1,9 +1,55 @@
+# scaffolder-backend-module-cookiecutter
+
+Welcome to the `fetch:cookiecutter` action for the `scaffolder-backend`.
+
+## Getting started
+
+You need to configure the action in your backend:
+
+## From your Backstage root directory
+
+```
+cd packages/backend
+yarn add @backstage/plugin-scaffolder-backend-module-cookiecutter
+```
+
+Configure the action:
+(you can check the [docs](https://backstage.io/docs/features/software-templates/writing-custom-actions#registering-custom-actions) to see all options):
+
+```typescript
+// packages/backend/src/plugins/scaffolder.ts
+
+const actions = [
+  createFetchCookiecutterAction({
+    integrations,
+    reader,
+    containerRunner,
+  }),
+  ...createBuiltInActions({
+    ...
+  })
+];
+
+return await createRouter({
+  containerRunner,
+  logger,
+  config,
+  database,
+  catalogClient,
+  reader,
+  actions,
+});
+```
+
+After that you can use the action in your template:
+
+```yaml
 apiVersion: backstage.io/v1beta2
 kind: Template
 metadata:
-  name: v1beta2-demo
-  title: Test Action template
-  description: scaffolder v1beta2 template demo publishing to github
+  name: cookiecutter-demo
+  title: Cookiecutter Test
+  description: Cookiecutter example
 spec:
   owner: backstage/techdocs-core
   type: service
@@ -27,7 +73,7 @@ spec:
           description: Owner of the component
           ui:field: OwnerPicker
           ui:options:
-            allowedKinds: 
+            allowedKinds:
               - Group
         system:
           title: System
@@ -38,7 +84,7 @@ spec:
             allowedKinds:
               - System
             defaultKind: System
-            
+
     - title: Choose a location
       required:
         - repoUrl
@@ -64,17 +110,10 @@ spec:
         url: ./template
         values:
           name: '{{ parameters.name }}'
-          owner: '{{ parameters.owner }}'         
+          owner: '{{ parameters.owner }}'
           system: '{{ parameters.system }}'
           destination: '{{ parseRepoUrl parameters.repoUrl }}'
 
-    - id: fetch-docs
-      name: Fetch Docs
-      action: fetch:plain
-      input:
-        targetPath: ./community
-        url: https://github.com/backstage/community/tree/main/backstage-community-sessions
-
     - id: publish
       if: '{{ not parameters.dryRun }}'
       name: Publish
@@ -105,3 +144,19 @@ spec:
       - title: Open in catalog
         icon: 'catalog'
         entityRef: '{{ steps.register.output.entityRef }}'
+```
+
+You can also visit the `/create/actions` route in your Backstage application to find out more about the parameters this action accepts when it's installed to configure how you like.
+
+### Environment setup
+
+The environment needs to have either `cookiecutter` installed and be available in the `PATH` or access to a `docker` daemon so it can spin up a docker container with `cookiecutter` available.
+
+If you are running Backstage from a Docker container and you want to avoid calling a container inside a container, you can set up `cookiecutter` in your own image, this will use the local installation instead.
+
+You can do so by including the following lines in the last step of your Dockerfile:
+
+```dockerfile
+RUN apt-get update && apt-get install -y python3 python3-pip
+RUN pip3 install cookiecutter
+```
diff --git a/plugins/scaffolder-backend-module-cookiecutter/api-report.md b/plugins/scaffolder-backend-module-cookiecutter/api-report.md
new file mode 100644
index 0000000000..8e46667fce
--- /dev/null
+++ b/plugins/scaffolder-backend-module-cookiecutter/api-report.md
@@ -0,0 +1,23 @@
+## API Report File for "@backstage/plugin-scaffolder-backend-module-cookiecutter"
+
+> Do not edit this file. It is a report generated by [API Extractor](https://api-extractor.com/).
+
+```ts
+/// <reference types="node" />
+
+import { ContainerRunner } from '@backstage/backend-common';
+import { ScmIntegrations } from '@backstage/integration';
+import { TemplateAction } from '@backstage/plugin-scaffolder-backend';
+import { UrlReader } from '@backstage/backend-common';
+
+// Warning: (ae-missing-release-tag) "createFetchCookiecutterAction" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
+// @public (undocumented)
+export function createFetchCookiecutterAction(options: {
+  reader: UrlReader;
+  integrations: ScmIntegrations;
+  containerRunner: ContainerRunner;
+}): TemplateAction<any>;
+
+// (No @packageDocumentation comment for this package)
+```
diff --git a/plugins/scaffolder-backend-module-cookiecutter/package.json b/plugins/scaffolder-backend-module-cookiecutter/package.json
new file mode 100644
index 0000000000..18a5d93596
--- /dev/null
+++ b/plugins/scaffolder-backend-module-cookiecutter/package.json
@@ -0,0 +1,45 @@
+{
+  "name": "@backstage/plugin-scaffolder-backend-module-cookiecutter",
+  "version": "0.1.2",
+  "main": "src/index.ts",
+  "types": "src/index.ts",
+  "license": "Apache-2.0",
+  "publishConfig": {
+    "access": "public",
+    "main": "dist/index.cjs.js",
+    "types": "dist/index.d.ts"
+  },
+  "scripts": {
+    "start": "backstage-cli backend:dev",
+    "build": "backstage-cli backend:build",
+    "lint": "backstage-cli lint",
+    "test": "backstage-cli test",
+    "prepack": "backstage-cli prepack",
+    "postpack": "backstage-cli postpack",
+    "clean": "backstage-cli clean"
+  },
+  "dependencies": {
+    "@backstage/backend-common": "^0.9.0",
+    "@backstage/errors": "^0.1.1",
+    "@backstage/integration": "^0.6.2",
+    "@backstage/plugin-scaffolder-backend": "^0.15.2",
+    "@backstage/config": "^0.1.8",
+    "command-exists": "^1.2.9",
+    "fs-extra": "10.0.0",
+    "winston": "^3.2.1",
+    "cross-fetch": "^3.0.6",
+    "yn": "^4.0.0"
+  },
+  "devDependencies": {
+    "@backstage/cli": "^0.7.8",
+    "@types/fs-extra": "^9.0.1",
+    "@types/mock-fs": "^4.13.0",
+    "@types/jest": "^26.0.7",
+    "@types/command-exists": "^1.2.0",
+    "mock-fs": "^4.13.0",
+    "msw": "^0.29.0"
+  },
+  "files": [
+    "dist"
+  ]
+}
diff --git a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/fetch/cookiecutter.test.ts b/plugins/scaffolder-backend-module-cookiecutter/src/actions/fetch/cookiecutter.test.ts
similarity index 96%
rename from plugins/scaffolder-backend/src/scaffolder/actions/builtin/fetch/cookiecutter.test.ts
rename to plugins/scaffolder-backend-module-cookiecutter/src/actions/fetch/cookiecutter.test.ts
index 86f953a6a5..bc3fe3eca2 100644
--- a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/fetch/cookiecutter.test.ts
+++ b/plugins/scaffolder-backend-module-cookiecutter/src/actions/fetch/cookiecutter.test.ts
@@ -17,9 +17,12 @@ const runCommand = jest.fn();
 const commandExists = jest.fn();
 const fetchContents = jest.fn();
 
-jest.mock('./helpers', () => ({ fetchContents }));
+jest.mock('@backstage/plugin-scaffolder-backend', () => ({
+  ...jest.requireActual('@backstage/plugin-scaffolder-backend'),
+  fetchContents,
+  runCommand,
+}));
 jest.mock('command-exists', () => commandExists);
-jest.mock('../helpers', () => ({ runCommand }));
 
 import {
   getVoidLogger,
@@ -33,7 +36,7 @@ import os from 'os';
 import { PassThrough } from 'stream';
 import { createFetchCookiecutterAction } from './cookiecutter';
 import { join } from 'path';
-import { ActionContext } from '../../types';
+import type { ActionContext } from '@backstage/plugin-scaffolder-backend';
 
 describe('fetch:cookiecutter', () => {
   const integrations = ScmIntegrations.fromConfig(
diff --git a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/fetch/cookiecutter.ts b/plugins/scaffolder-backend-module-cookiecutter/src/actions/fetch/cookiecutter.ts
similarity index 94%
rename from plugins/scaffolder-backend/src/scaffolder/actions/builtin/fetch/cookiecutter.ts
rename to plugins/scaffolder-backend-module-cookiecutter/src/actions/fetch/cookiecutter.ts
index 048b2bba64..1f6fbdb7d8 100644
--- a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/fetch/cookiecutter.ts
+++ b/plugins/scaffolder-backend-module-cookiecutter/src/actions/fetch/cookiecutter.ts
@@ -26,9 +26,11 @@ import commandExists from 'command-exists';
 import fs from 'fs-extra';
 import path, { resolve as resolvePath } from 'path';
 import { Writable } from 'stream';
-import { runCommand } from '../helpers';
-import { createTemplateAction } from '../../createTemplateAction';
-import { fetchContents } from './helpers';
+import {
+  runCommand,
+  createTemplateAction,
+  fetchContents,
+} from '@backstage/plugin-scaffolder-backend';
 
 export class CookiecutterRunner {
   private readonly containerRunner: ContainerRunner;
@@ -136,7 +138,7 @@ export function createFetchCookiecutterAction(options: {
   }>({
     id: 'fetch:cookiecutter',
     description:
-      "Downloads a template from the given URL into the workspace, and runs cookiecutter on it. This action is deprecated in favor of 'fetch:template'. See https://backstage.io/docs/features/software-templates/builtin-actions#migrating-from-fetch-cookiecutter-to-fetch-template for more details.",
+      'Downloads a template from the given URL into the workspace, and runs cookiecutter on it.',
     schema: {
       input: {
         type: 'object',
diff --git a/plugins/scaffolder-backend-module-cookiecutter/src/actions/fetch/index.ts b/plugins/scaffolder-backend-module-cookiecutter/src/actions/fetch/index.ts
new file mode 100644
index 0000000000..bbe5a16a04
--- /dev/null
+++ b/plugins/scaffolder-backend-module-cookiecutter/src/actions/fetch/index.ts
@@ -0,0 +1,16 @@
+/*
+ * Copyright 2021 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+export { createFetchCookiecutterAction } from './cookiecutter';
diff --git a/plugins/scaffolder-backend-module-cookiecutter/src/actions/index.ts b/plugins/scaffolder-backend-module-cookiecutter/src/actions/index.ts
new file mode 100644
index 0000000000..1b47db9e03
--- /dev/null
+++ b/plugins/scaffolder-backend-module-cookiecutter/src/actions/index.ts
@@ -0,0 +1,16 @@
+/*
+ * Copyright 2021 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+export * from './fetch';
diff --git a/plugins/scaffolder-backend-module-cookiecutter/src/index.ts b/plugins/scaffolder-backend-module-cookiecutter/src/index.ts
new file mode 100644
index 0000000000..4f06b14a86
--- /dev/null
+++ b/plugins/scaffolder-backend-module-cookiecutter/src/index.ts
@@ -0,0 +1,16 @@
+/*
+ * Copyright 2021 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+export * from './actions';
diff --git a/plugins/scaffolder-backend-module-rails/CHANGELOG.md b/plugins/scaffolder-backend-module-rails/CHANGELOG.md
index 45ba753e34..721160b06e 100644
--- a/plugins/scaffolder-backend-module-rails/CHANGELOG.md
+++ b/plugins/scaffolder-backend-module-rails/CHANGELOG.md
@@ -1,5 +1,33 @@
 # @backstage/plugin-scaffolder-backend-module-rails
 
+## 0.1.5
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.9.0
+  - @backstage/plugin-scaffolder-backend@0.15.2
+  - @backstage/integration@0.6.2
+  - @backstage/config@0.1.8
+
+## 0.1.4
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/integration@0.6.0
+  - @backstage/plugin-scaffolder-backend@0.15.0
+  - @backstage/backend-common@0.8.9
+
+## 0.1.3
+
+### Patch Changes
+
+- e114cc7e0: updated paths to consider differences between platform (windows corrected)
+- Updated dependencies
+  - @backstage/backend-common@0.8.6
+  - @backstage/plugin-scaffolder-backend@0.14.0
+
 ## 0.1.2
 
 ### Patch Changes
diff --git a/plugins/scaffolder-backend-module-rails/api-report.md b/plugins/scaffolder-backend-module-rails/api-report.md
index dc26d22fe4..7d1576c7f1 100644
--- a/plugins/scaffolder-backend-module-rails/api-report.md
+++ b/plugins/scaffolder-backend-module-rails/api-report.md
@@ -8,6 +8,8 @@ import { ScmIntegrations } from '@backstage/integration';
 import { TemplateAction } from '@backstage/plugin-scaffolder-backend';
 import { UrlReader } from '@backstage/backend-common';
 
+// Warning: (ae-missing-release-tag) "createFetchRailsAction" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export function createFetchRailsAction(options: {
   reader: UrlReader;
diff --git a/plugins/scaffolder-backend-module-rails/package.json b/plugins/scaffolder-backend-module-rails/package.json
index 4d734f8440..6e78586532 100644
--- a/plugins/scaffolder-backend-module-rails/package.json
+++ b/plugins/scaffolder-backend-module-rails/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-scaffolder-backend-module-rails",
-  "version": "0.1.2",
+  "version": "0.1.5",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -20,16 +20,16 @@
     "clean": "backstage-cli clean"
   },
   "dependencies": {
-    "@backstage/backend-common": "^0.8.5",
-    "@backstage/plugin-scaffolder-backend": "^0.13.0",
-    "@backstage/config": "^0.1.5",
+    "@backstage/backend-common": "^0.9.0",
+    "@backstage/plugin-scaffolder-backend": "^0.15.2",
+    "@backstage/config": "^0.1.8",
     "@backstage/errors": "^0.1.1",
-    "@backstage/integration": "^0.5.8",
+    "@backstage/integration": "^0.6.2",
     "command-exists": "^1.2.9",
     "fs-extra": "^9.0.0"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.7.1",
+    "@backstage/cli": "^0.7.8",
     "@types/jest": "^26.0.7",
     "@types/node": "^14.14.32",
     "@types/command-exists": "^1.2.0",
diff --git a/plugins/scaffolder-backend/CHANGELOG.md b/plugins/scaffolder-backend/CHANGELOG.md
index 5563bb0570..1024798587 100644
--- a/plugins/scaffolder-backend/CHANGELOG.md
+++ b/plugins/scaffolder-backend/CHANGELOG.md
@@ -1,5 +1,124 @@
 # @backstage/plugin-scaffolder-backend
 
+## 0.15.4
+
+### Patch Changes
+
+- 04aad2dab: Fix issue #7021 scaffolder action fetch:template preserves templates file permissions
+- 21ccd4997: GitHub Webhook action in Scaffolder Backend has been improved to validate event names against Octokit Webhook event names list.
+- Updated dependencies
+  - @backstage/catalog-client@0.3.19
+  - @backstage/catalog-model@0.9.2
+  - @backstage/errors@0.1.2
+  - @backstage/config@0.1.9
+  - @backstage/backend-common@0.9.2
+
+## 0.15.3
+
+### Patch Changes
+
+- 3f9dd1759: GitHub create repository webhook action: `github:webhook` for Backstage plugin Scaffolder has been added.
+- 774b08a5c: GitHubWebhook Action can be created with a default webhook secret. This allows getting secret from environment variable as an alternative to get it from context.
+- 536f4d844: Updated dependencies
+- 0b92a1e74: refactor: extract common Octokit related code and use it in actions: `publish:github`, `github:actions:dispatch`, `github:webhook`.
+- Updated dependencies
+  - @backstage/integration@0.6.3
+  - @backstage/catalog-model@0.9.1
+  - @backstage/backend-common@0.9.1
+
+## 0.15.2
+
+### Patch Changes
+
+- b438caf63: Add partial templating to `fetch:template` action.
+
+  If an `templateFileExtension` input is given, only files with that extension get their content processed. If `templateFileExtension` is `true`, the `.njk` extension is used. The `templateFileExtension` input is incompatible with both `cookiecutterCompat` and `copyWithoutRender`.
+
+  All other files get copied.
+
+  All output paths are subject to applying templating logic.
+
+- 1ce9b9571: Use more efficient approach to staging files in git during scaffolder actions
+- Updated dependencies
+  - @backstage/backend-common@0.9.0
+  - @backstage/integration@0.6.2
+  - @backstage/config@0.1.8
+  - @backstage/plugin-scaffolder-backend-module-cookiecutter@0.1.2
+
+## 0.15.1
+
+### Patch Changes
+
+- d622cfad1: GitHub branch protection option 'Require review from Code Owners' can be enabled by adding `requireCodeOwnersReview: true` in context input.
+
+## 0.15.0
+
+### Minor Changes
+
+- e30646aeb: Add Bitbucket workspace and project fields to RepoUrlPicker to support Bitbucket cloud and server
+
+### Patch Changes
+
+- 8bedb75ae: Update Luxon dependency to 2.x
+- Updated dependencies
+  - @backstage/integration@0.6.0
+  - @backstage/backend-common@0.8.9
+  - @backstage/plugin-scaffolder-backend-module-cookiecutter@0.1.1
+
+## 0.14.2
+
+### Patch Changes
+
+- 6cf48c609: Add the `scaffolder.defaultCommitMessage`, which defaults to `Initial commit`, so it can be customized.
+- 48ea3d25b: The recommended value for a `backstage.io/techdocs-ref` annotation is now
+  `dir:.`, indicating "documentation source files are located in the same
+  directory relative to the catalog entity." Note that `url:<location>` values
+  are still supported.
+- Updated dependencies
+  - @backstage/backend-common@0.8.8
+  - @backstage/config@0.1.6
+  - @backstage/integration@0.5.9
+
+## 0.14.1
+
+### Patch Changes
+
+- c73f53bc2: Add new built-in action ci:github-actions-dispatch
+- 7cea90592: - Move out the `cookiecutter` templating to its own module that is depended on by the `scaffolder-backend` plugin. No breaking change yet, but we will drop first class support for `cookiecutter` in the future and it will become an opt-in feature.
+- eb740ee24: Moved sample software templates to the [backstage/software-templates](https://github.com/backstage/software-templates) repository. If you previously referenced the sample templates straight from `scaffolder-backend` plugin in the main [backstage/backstage](https://github.com/backstage/backstage) repository in your `app-config.yaml`, these references will need to be updated.
+
+  See https://github.com/backstage/software-templates
+
+- Updated dependencies
+  - @backstage/catalog-client@0.3.17
+  - @backstage/backend-common@0.8.7
+
+## 0.14.0
+
+### Minor Changes
+
+- 96fc27698: Updated inputs for the `publish:github:pull-request` action.
+
+  Now requires a `repoUrl` instead of separate `owner` and `repo` inputs. This aligns with the output of the `RepoUrlPicker` ui field used by the pull-request sample template.
+
+### Patch Changes
+
+- e75506fe7: Unsubscribe from broker after response is flushed
+- ea1d956ef: Updating fs-extra to 10.0.0 to handle broken symbolic links correctly
+- 31de5f27f: Add new `fetch:template` action which handles the same responsibilities as `fetch:cookiecutter` without the external dependency on `cookiecutter`. For information on migrating from `fetch:cookiecutter` to `fetch:template`, see the [migration guide](https://backstage.io/docs/features/software-templates/builtin-actions#migrating-from-fetch-cookiecutter-to-fetch-template) in the docs.
+- 84d329e2a: Scaffolder: Added an 'eq' handlebars helper for use in software template YAML files. This can be used to execute a step depending on the value of an input, e.g.:
+
+  ```yaml
+  steps:
+    id: 'conditional-step'
+    action: 'custom-action'
+    if: '{{ eq parameters.myvalue "custom" }}',
+  ```
+
+- ae84b20cf: Revert the upgrade to `fs-extra@10.0.0` as that seemed to have broken all installs inexplicably.
+- Updated dependencies
+  - @backstage/backend-common@0.8.6
+
 ## 0.13.0
 
 ### Minor Changes
diff --git a/plugins/scaffolder-backend/api-report.md b/plugins/scaffolder-backend/api-report.md
index d6aa1e4e75..b43adc189a 100644
--- a/plugins/scaffolder-backend/api-report.md
+++ b/plugins/scaffolder-backend/api-report.md
@@ -8,11 +8,13 @@
 import { CatalogApi } from '@backstage/catalog-client';
 import { Config } from '@backstage/config';
 import { ContainerRunner } from '@backstage/backend-common';
+import { createFetchCookiecutterAction } from '@backstage/plugin-scaffolder-backend-module-cookiecutter';
 import { createPullRequest } from 'octokit-plugin-create-pull-request';
 import express from 'express';
 import { JsonObject } from '@backstage/config';
 import { JsonValue } from '@backstage/config';
 import { Logger as Logger_2 } from 'winston';
+import { Octokit } from '@octokit/rest';
 import { PluginDatabaseManager } from '@backstage/backend-common';
 import { Schema } from 'jsonschema';
 import { ScmIntegrationRegistry } from '@backstage/integration';
@@ -21,6 +23,9 @@ import { TemplateEntityV1beta2 } from '@backstage/catalog-model';
 import { UrlReader } from '@backstage/backend-common';
 import { Writable } from 'stream';
 
+// Warning: (ae-forgotten-export) The symbol "InputBase" needs to be exported by the entry point index.d.ts
+// Warning: (ae-missing-release-tag) "ActionContext" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export type ActionContext<Input extends InputBase> = {
   baseUrl?: string;
@@ -33,6 +38,8 @@ export type ActionContext<Input extends InputBase> = {
   createTemporaryDirectory(): Promise<string>;
 };
 
+// Warning: (ae-missing-release-tag) "CatalogEntityClient" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public
 export class CatalogEntityClient {
   constructor(catalogClient: CatalogApi);
@@ -44,6 +51,8 @@ export class CatalogEntityClient {
   ): Promise<TemplateEntityV1beta2>;
 }
 
+// Warning: (ae-missing-release-tag) "createBuiltinActions" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export const createBuiltinActions: (options: {
   reader: UrlReader;
@@ -53,88 +62,131 @@ export const createBuiltinActions: (options: {
   config: Config;
 }) => TemplateAction<any>[];
 
+// Warning: (ae-missing-release-tag) "createCatalogRegisterAction" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export function createCatalogRegisterAction(options: {
   catalogClient: CatalogApi;
   integrations: ScmIntegrations;
 }): TemplateAction<any>;
 
+// Warning: (ae-missing-release-tag) "createCatalogWriteAction" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export function createCatalogWriteAction(): TemplateAction<any>;
 
+// Warning: (ae-missing-release-tag) "createDebugLogAction" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public
 export function createDebugLogAction(): TemplateAction<any>;
 
-// @public (undocumented)
-export function createFetchCookiecutterAction(options: {
-  reader: UrlReader;
-  integrations: ScmIntegrations;
-  containerRunner: ContainerRunner;
-}): TemplateAction<any>;
+export { createFetchCookiecutterAction };
 
+// Warning: (ae-missing-release-tag) "createFetchPlainAction" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export function createFetchPlainAction(options: {
   reader: UrlReader;
   integrations: ScmIntegrations;
 }): TemplateAction<any>;
 
+// Warning: (ae-missing-release-tag) "createFetchTemplateAction" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export function createFetchTemplateAction(options: {
   reader: UrlReader;
   integrations: ScmIntegrations;
 }): TemplateAction<any>;
 
+// Warning: (ae-missing-release-tag) "createFilesystemDeleteAction" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export const createFilesystemDeleteAction: () => TemplateAction<any>;
 
+// Warning: (ae-missing-release-tag) "createFilesystemRenameAction" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export const createFilesystemRenameAction: () => TemplateAction<any>;
 
+// Warning: (ae-missing-release-tag) "createGithubActionsDispatchAction" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
+// @public (undocumented)
+export function createGithubActionsDispatchAction(options: {
+  integrations: ScmIntegrationRegistry;
+}): TemplateAction<any>;
+
+// Warning: (ae-missing-release-tag) "createGithubWebhookAction" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
+// @public (undocumented)
+export function createGithubWebhookAction(options: {
+  integrations: ScmIntegrationRegistry;
+  defaultWebhookSecret?: string;
+}): TemplateAction<any>;
+
+// Warning: (ae-missing-release-tag) "createPublishAzureAction" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export function createPublishAzureAction(options: {
   integrations: ScmIntegrationRegistry;
   config: Config;
 }): TemplateAction<any>;
 
+// Warning: (ae-missing-release-tag) "createPublishBitbucketAction" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export function createPublishBitbucketAction(options: {
   integrations: ScmIntegrationRegistry;
   config: Config;
 }): TemplateAction<any>;
 
+// Warning: (ae-missing-release-tag) "createPublishFileAction" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public
 export function createPublishFileAction(): TemplateAction<any>;
 
+// Warning: (ae-missing-release-tag) "createPublishGithubAction" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export function createPublishGithubAction(options: {
   integrations: ScmIntegrationRegistry;
   config: Config;
 }): TemplateAction<any>;
 
+// Warning: (ae-forgotten-export) The symbol "CreateGithubPullRequestActionOptions" needs to be exported by the entry point index.d.ts
+// Warning: (ae-missing-release-tag) "createPublishGithubPullRequestAction" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export const createPublishGithubPullRequestAction: ({
   integrations,
   clientFactory,
 }: CreateGithubPullRequestActionOptions) => TemplateAction<any>;
 
+// Warning: (ae-missing-release-tag) "createPublishGitlabAction" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export function createPublishGitlabAction(options: {
   integrations: ScmIntegrationRegistry;
   config: Config;
 }): TemplateAction<any>;
 
+// Warning: (ae-missing-release-tag) "createRouter" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export function createRouter(options: RouterOptions): Promise<express.Router>;
 
+// Warning: (ae-missing-release-tag) "createTemplateAction" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export const createTemplateAction: <
   Input extends Partial<{
     [name: string]: JsonValue | Partial<JsonObject> | undefined;
-  }>
+  }>,
 >(
   templateAction: TemplateAction<Input>,
 ) => TemplateAction<any>;
 
+// Warning: (ae-missing-release-tag) "fetchContents" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export function fetchContents({
   reader,
@@ -150,6 +202,18 @@ export function fetchContents({
   outputPath: string;
 }): Promise<void>;
 
+// Warning: (ae-missing-release-tag) "OctokitProvider" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
+// @public
+export class OctokitProvider {
+  constructor(integrations: ScmIntegrationRegistry);
+  // Warning: (tsdoc-param-tag-missing-hyphen) The @param block should be followed by a parameter name and then a hyphen
+  // Warning: (ae-forgotten-export) The symbol "OctokitIntegration" needs to be exported by the entry point index.d.ts
+  getOctokit(repoUrl: string): Promise<OctokitIntegration>;
+}
+
+// Warning: (ae-missing-release-tag) "RouterOptions" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export interface RouterOptions {
   // (undocumented)
@@ -170,6 +234,9 @@ export interface RouterOptions {
   taskWorkers?: number;
 }
 
+// Warning: (ae-forgotten-export) The symbol "RunCommandOptions" needs to be exported by the entry point index.d.ts
+// Warning: (ae-missing-release-tag) "runCommand" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export const runCommand: ({
   command,
@@ -177,6 +244,8 @@ export const runCommand: ({
   logStream,
 }: RunCommandOptions) => Promise<void>;
 
+// Warning: (ae-missing-release-tag) "TemplateAction" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export type TemplateAction<Input extends InputBase> = {
   id: string;
@@ -188,6 +257,8 @@ export type TemplateAction<Input extends InputBase> = {
   handler: (ctx: ActionContext<Input>) => Promise<void>;
 };
 
+// Warning: (ae-missing-release-tag) "TemplateActionRegistry" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export class TemplateActionRegistry {
   // (undocumented)
diff --git a/plugins/scaffolder-backend/config.d.ts b/plugins/scaffolder-backend/config.d.ts
index 795fe5b112..126c55e166 100644
--- a/plugins/scaffolder-backend/config.d.ts
+++ b/plugins/scaffolder-backend/config.d.ts
@@ -24,6 +24,10 @@ export interface Config {
       name?: string;
       email?: string;
     };
+    /**
+     * The commit message used when new components are created.
+     */
+    defaultCommitMessage?: string;
     github?: {
       [key: string]: string;
       /**
diff --git a/plugins/scaffolder-backend/package.json b/plugins/scaffolder-backend/package.json
index d31e6c0d5f..6be563abaa 100644
--- a/plugins/scaffolder-backend/package.json
+++ b/plugins/scaffolder-backend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-scaffolder-backend",
-  "version": "0.13.0",
+  "version": "0.15.4",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -29,17 +29,19 @@
     "clean": "backstage-cli clean"
   },
   "dependencies": {
-    "@backstage/backend-common": "^0.8.5",
-    "@backstage/catalog-client": "^0.3.16",
-    "@backstage/catalog-model": "^0.9.0",
-    "@backstage/config": "^0.1.5",
-    "@backstage/errors": "^0.1.1",
-    "@backstage/integration": "^0.5.8",
+    "@backstage/backend-common": "^0.9.2",
+    "@backstage/catalog-client": "^0.3.19",
+    "@backstage/catalog-model": "^0.9.2",
+    "@backstage/config": "^0.1.9",
+    "@backstage/errors": "^0.1.2",
+    "@backstage/integration": "^0.6.3",
+    "@backstage/plugin-scaffolder-backend-module-cookiecutter": "^0.1.2",
     "@gitbeaker/core": "^30.2.0",
     "@gitbeaker/node": "^30.2.0",
     "@octokit/rest": "^18.5.3",
+    "@octokit/webhooks": "^9.14.1",
     "@types/express": "^4.17.6",
-    "azure-devops-node-api": "^10.2.2",
+    "azure-devops-node-api": "^11.0.1",
     "command-exists": "^1.2.9",
     "compression": "^1.7.4",
     "cors": "^2.8.5",
@@ -47,7 +49,7 @@
     "express": "^4.17.1",
     "express-promise-router": "^4.1.0",
     "fs-extra": "10.0.0",
-    "git-url-parse": "~11.4.4",
+    "git-url-parse": "^11.6.0",
     "globby": "^11.0.0",
     "handlebars": "^4.7.6",
     "helmet": "^4.0.0",
@@ -56,7 +58,7 @@
     "jsonschema": "^1.2.6",
     "knex": "^0.95.1",
     "lodash": "^4.17.21",
-    "luxon": "^1.26.0",
+    "luxon": "^2.0.2",
     "morgan": "^1.10.0",
     "nunjucks": "^3.2.3",
     "octokit-plugin-create-pull-request": "^3.9.3",
@@ -65,8 +67,8 @@
     "yaml": "^1.10.0"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.7.3",
-    "@backstage/test-utils": "^0.1.14",
+    "@backstage/cli": "^0.7.11",
+    "@backstage/test-utils": "^0.1.17",
     "@types/command-exists": "^1.2.0",
     "@types/fs-extra": "^9.0.1",
     "@types/git-url-parse": "^9.0.0",
diff --git a/plugins/scaffolder-backend/sample-templates/all-templates.yaml b/plugins/scaffolder-backend/sample-templates/all-templates.yaml
index a5bcd864b1..2d5adb8e3b 100644
--- a/plugins/scaffolder-backend/sample-templates/all-templates.yaml
+++ b/plugins/scaffolder-backend/sample-templates/all-templates.yaml
@@ -5,5 +5,10 @@ metadata:
   description: A collection of all Backstage example templates
 spec:
   targets:
-    - ./local-templates.yaml
     - ./remote-templates.yaml
+
+# For local development of a template, you can reference your local templates here.
+# Examples:
+#
+#   - ./local-template/template.yaml
+#   - ../all-templates/local/template.yaml
diff --git a/plugins/scaffolder-backend/sample-templates/docs-template/template.yaml b/plugins/scaffolder-backend/sample-templates/bitbucket-demo/template.yaml
similarity index 60%
rename from plugins/scaffolder-backend/sample-templates/docs-template/template.yaml
rename to plugins/scaffolder-backend/sample-templates/bitbucket-demo/template.yaml
index 1e81242e7a..87f4d449f5 100644
--- a/plugins/scaffolder-backend/sample-templates/docs-template/template.yaml
+++ b/plugins/scaffolder-backend/sample-templates/bitbucket-demo/template.yaml
@@ -1,44 +1,14 @@
 apiVersion: backstage.io/v1beta2
 kind: Template
 metadata:
-  name: docs-template
-  title: Documentation Template
-  description: Create a new standalone documentation project
-  tags:
-    - recommended
-    - techdocs
-    - mkdocs
+  name: bitbucket-demo
+  title: Test Bitbucket RepoUrlPicker template
+  description: scaffolder v1beta2 template demo publishing to bitbucket
 spec:
   owner: backstage/techdocs-core
-  type: documentation
+  type: service
 
   parameters:
-    - title: Fill in some steps
-      required:
-        - name
-        - description
-      properties:
-        name:
-          title: Name
-          type: string
-          description: Unique name of the component
-          ui:autofocus: true
-          ui:options:
-            rows: 5
-        description:
-          title: Description
-          type: string
-          description: A description for the component
-          ui:options:
-            rows: 5
-        owner:
-          title: Owner
-          type: string
-          description: Owner of the component
-          ui:field: OwnerPicker
-          ui:options:
-            allowedKinds:
-              - Group
     - title: Choose a location
       required:
         - repoUrl
@@ -49,29 +19,51 @@ spec:
           ui:field: RepoUrlPicker
           ui:options:
             allowedHosts:
-              - github.com
+              - bitbucket.org
+              - server.bitbucket.com
+    - title: Fill in some steps
+      required:
+        - name
+        - owner
+      properties:
+        name:
+          title: Name
+          type: string
+          description: Unique name of the component
+          ui:autofocus: true
+          ui:options:
+            rows: 5
+        owner:
+          title: Owner
+          type: string
+          description: Owner of the component
+          ui:field: OwnerPicker
+          ui:options:
+            allowedKinds:
+              - Group
 
-  # This template is meant to be used on top of an existing tmeplate.
-  # By adding the following and fetching from an absolute URL you can 
-  # add in the docs template
   steps:
-    - id: fetch
-      name: Template Docs Skeleton
+    - id: fetch-base
+      name: Fetch Base
       action: fetch:cookiecutter
       input:
-        url: ./skeleton
+        url: ./template
         values:
           name: '{{ parameters.name }}'
-          description: '{{ parameters.description }}' 
-          destination: '{{ parseRepoUrl parameters.repoUrl }}'
           owner: '{{ parameters.owner }}'
 
+    - id: fetch-docs
+      name: Fetch Docs
+      action: fetch:plain
+      input:
+        targetPath: ./community
+        url: https://github.com/backstage/community/tree/main/backstage-community-sessions
+
     - id: publish
       name: Publish
-      action: publish:github
+      action: publish:bitbucket
       input:
-        allowedHosts: ['github.com']
-        description: 'This is {{ parameters.component_id }}'
+        description: 'This is {{ parameters.name }}'
         repoUrl: '{{ parameters.repoUrl }}'
 
     - id: register
diff --git a/plugins/scaffolder-backend/sample-templates/pull-request/template/catalog-info.yaml b/plugins/scaffolder-backend/sample-templates/bitbucket-demo/template/catalog-info.yaml
similarity index 77%
rename from plugins/scaffolder-backend/sample-templates/pull-request/template/catalog-info.yaml
rename to plugins/scaffolder-backend/sample-templates/bitbucket-demo/template/catalog-info.yaml
index 04f055bd46..875664d2a8 100644
--- a/plugins/scaffolder-backend/sample-templates/pull-request/template/catalog-info.yaml
+++ b/plugins/scaffolder-backend/sample-templates/bitbucket-demo/template/catalog-info.yaml
@@ -5,4 +5,4 @@ metadata:
 spec:
   type: website
   lifecycle: experimental
-  owner: user:guest
+  owner: {{cookiecutter.owner | jsonify}}
diff --git a/plugins/scaffolder-backend/sample-templates/create-react-app/skeleton/.gitignore b/plugins/scaffolder-backend/sample-templates/create-react-app/skeleton/.gitignore
deleted file mode 100644
index 4d29575de8..0000000000
--- a/plugins/scaffolder-backend/sample-templates/create-react-app/skeleton/.gitignore
+++ /dev/null
@@ -1,23 +0,0 @@
-# See https://help.github.com/articles/ignoring-files/ for more about ignoring files.
-
-# dependencies
-/node_modules
-/.pnp
-.pnp.js
-
-# testing
-/coverage
-
-# production
-/build
-
-# misc
-.DS_Store
-.env.local
-.env.development.local
-.env.test.local
-.env.production.local
-
-npm-debug.log*
-yarn-debug.log*
-yarn-error.log*
diff --git a/plugins/scaffolder-backend/sample-templates/create-react-app/skeleton/README.md b/plugins/scaffolder-backend/sample-templates/create-react-app/skeleton/README.md
deleted file mode 100644
index 305d413b8e..0000000000
--- a/plugins/scaffolder-backend/sample-templates/create-react-app/skeleton/README.md
+++ /dev/null
@@ -1,46 +0,0 @@
-# Getting Started with Create React App
-
-This project was bootstrapped with [Create React App](https://github.com/facebook/create-react-app).
-
-## Available Scripts
-
-In the project directory, you can run:
-
-### `yarn start`
-
-Runs the app in the development mode.\
-Open [http://localhost:3000](http://localhost:3000) to view it in the browser.
-
-The page will reload if you make edits.\
-You will also see any lint errors in the console.
-
-### `yarn test`
-
-Launches the test runner in the interactive watch mode.\
-See the section about [running tests](https://facebook.github.io/create-react-app/docs/running-tests) for more information.
-
-### `yarn build`
-
-Builds the app for production to the `build` folder.\
-It correctly bundles React in production mode and optimizes the build for the best performance.
-
-The build is minified and the filenames include the hashes.\
-Your app is ready to be deployed!
-
-See the section about [deployment](https://facebook.github.io/create-react-app/docs/deployment) for more information.
-
-### `yarn eject`
-
-**Note: this is a one-way operation. Once you `eject`, you can’t go back!**
-
-If you aren’t satisfied with the build tool and configuration choices, you can `eject` at any time. This command will remove the single build dependency from your project.
-
-Instead, it will copy all the configuration files and the transitive dependencies (`webpack`, Babel, ESLint, etc) right into your project so you have full control over them. All of the commands except `eject` will still work, but they will point to the copied scripts so you can tweak them. At this point you’re on your own.
-
-You don’t have to ever use `eject`. The curated feature set is suitable for small and middle deployments, and you shouldn’t feel obligated to use this feature. However we understand that this tool wouldn’t be useful if you couldn’t customize it when you are ready for it.
-
-## Learn More
-
-You can learn more in the [Create React App documentation](https://facebook.github.io/create-react-app/docs/getting-started).
-
-To learn React, check out the [React documentation](https://reactjs.org/).
diff --git a/plugins/scaffolder-backend/sample-templates/create-react-app/skeleton/catalog-info.yaml b/plugins/scaffolder-backend/sample-templates/create-react-app/skeleton/catalog-info.yaml
deleted file mode 100644
index bac97e4bea..0000000000
--- a/plugins/scaffolder-backend/sample-templates/create-react-app/skeleton/catalog-info.yaml
+++ /dev/null
@@ -1,12 +0,0 @@
-apiVersion: backstage.io/v1alpha1
-kind: Component
-metadata:
-  name: {{cookiecutter.component_id | jsonify}}
-  description: {{cookiecutter.description | jsonify}}
-  annotations:
-    github.com/project-slug: {{cookiecutter.destination.owner + "/" + cookiecutter.destination.repo}}
-    backstage.io/techdocs-ref: url:{{"https://" + cookiecutter.destination.host + "/" + cookiecutter.destination.owner + "/" + cookiecutter.destination.repo}}
-spec:
-  type: website
-  lifecycle: experimental
-  owner: {{cookiecutter.owner | jsonify}}
diff --git a/plugins/scaffolder-backend/sample-templates/create-react-app/skeleton/package.json b/plugins/scaffolder-backend/sample-templates/create-react-app/skeleton/package.json
deleted file mode 100644
index 2ce9bf6266..0000000000
--- a/plugins/scaffolder-backend/sample-templates/create-react-app/skeleton/package.json
+++ /dev/null
@@ -1,43 +0,0 @@
-{
-  "name": "{{cookiecutter.component_id}}",
-  "version": "0.1.0",
-  "private": true,
-  "dependencies": {
-    "@testing-library/jest-dom": "^5.11.4",
-    "@testing-library/react": "^11.1.0",
-    "@testing-library/user-event": "^12.1.10",
-    "@types/jest": "^26.0.15",
-    "@types/node": "^12.0.0",
-    "@types/react": "^17.0.0",
-    "@types/react-dom": "^17.0.0",
-    "react": "^17.0.2",
-    "react-dom": "^17.0.2",
-    "react-scripts": "4.0.3",
-    "typescript": "^4.1.2",
-    "web-vitals": "^1.0.1"
-  },
-  "scripts": {
-    "start": "react-scripts start",
-    "build": "react-scripts build",
-    "test": "react-scripts test",
-    "eject": "react-scripts eject"
-  },
-  "eslintConfig": {
-    "extends": [
-      "react-app",
-      "react-app/jest"
-    ]
-  },
-  "browserslist": {
-    "production": [
-      ">0.2%",
-      "not dead",
-      "not op_mini all"
-    ],
-    "development": [
-      "last 1 chrome version",
-      "last 1 firefox version",
-      "last 1 safari version"
-    ]
-  }
-}
diff --git a/plugins/scaffolder-backend/sample-templates/create-react-app/skeleton/public/favicon.ico b/plugins/scaffolder-backend/sample-templates/create-react-app/skeleton/public/favicon.ico
deleted file mode 100644
index a11777cc47..0000000000
Binary files a/plugins/scaffolder-backend/sample-templates/create-react-app/skeleton/public/favicon.ico and /dev/null differ
diff --git a/plugins/scaffolder-backend/sample-templates/create-react-app/skeleton/public/index.html b/plugins/scaffolder-backend/sample-templates/create-react-app/skeleton/public/index.html
deleted file mode 100644
index aa069f27cb..0000000000
--- a/plugins/scaffolder-backend/sample-templates/create-react-app/skeleton/public/index.html
+++ /dev/null
@@ -1,43 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-  <head>
-    <meta charset="utf-8" />
-    <link rel="icon" href="%PUBLIC_URL%/favicon.ico" />
-    <meta name="viewport" content="width=device-width, initial-scale=1" />
-    <meta name="theme-color" content="#000000" />
-    <meta
-      name="description"
-      content="Web site created using create-react-app"
-    />
-    <link rel="apple-touch-icon" href="%PUBLIC_URL%/logo192.png" />
-    <!--
-      manifest.json provides metadata used when your web app is installed on a
-      user's mobile device or desktop. See https://developers.google.com/web/fundamentals/web-app-manifest/
-    -->
-    <link rel="manifest" href="%PUBLIC_URL%/manifest.json" />
-    <!--
-      Notice the use of %PUBLIC_URL% in the tags above.
-      It will be replaced with the URL of the `public` folder during the build.
-      Only files inside the `public` folder can be referenced from the HTML.
-
-      Unlike "/favicon.ico" or "favicon.ico", "%PUBLIC_URL%/favicon.ico" will
-      work correctly both with client-side routing and a non-root public URL.
-      Learn how to configure a non-root public URL by running `npm run build`.
-    -->
-    <title>React App</title>
-  </head>
-  <body>
-    <noscript>You need to enable JavaScript to run this app.</noscript>
-    <div id="root"></div>
-    <!--
-      This HTML file is a template.
-      If you open it directly in the browser, you will see an empty page.
-
-      You can add webfonts, meta tags, or analytics to this file.
-      The build step will place the bundled scripts into the <body> tag.
-
-      To begin the development, run `npm start` or `yarn start`.
-      To create a production bundle, use `npm run build` or `yarn build`.
-    -->
-  </body>
-</html>
diff --git a/plugins/scaffolder-backend/sample-templates/create-react-app/skeleton/public/logo192.png b/plugins/scaffolder-backend/sample-templates/create-react-app/skeleton/public/logo192.png
deleted file mode 100644
index fc44b0a379..0000000000
Binary files a/plugins/scaffolder-backend/sample-templates/create-react-app/skeleton/public/logo192.png and /dev/null differ
diff --git a/plugins/scaffolder-backend/sample-templates/create-react-app/skeleton/public/logo512.png b/plugins/scaffolder-backend/sample-templates/create-react-app/skeleton/public/logo512.png
deleted file mode 100644
index a4e47a6545..0000000000
Binary files a/plugins/scaffolder-backend/sample-templates/create-react-app/skeleton/public/logo512.png and /dev/null differ
diff --git a/plugins/scaffolder-backend/sample-templates/create-react-app/skeleton/public/manifest.json b/plugins/scaffolder-backend/sample-templates/create-react-app/skeleton/public/manifest.json
deleted file mode 100644
index 080d6c77ac..0000000000
--- a/plugins/scaffolder-backend/sample-templates/create-react-app/skeleton/public/manifest.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-  "short_name": "React App",
-  "name": "Create React App Sample",
-  "icons": [
-    {
-      "src": "favicon.ico",
-      "sizes": "64x64 32x32 24x24 16x16",
-      "type": "image/x-icon"
-    },
-    {
-      "src": "logo192.png",
-      "type": "image/png",
-      "sizes": "192x192"
-    },
-    {
-      "src": "logo512.png",
-      "type": "image/png",
-      "sizes": "512x512"
-    }
-  ],
-  "start_url": ".",
-  "display": "standalone",
-  "theme_color": "#000000",
-  "background_color": "#ffffff"
-}
diff --git a/plugins/scaffolder-backend/sample-templates/create-react-app/skeleton/public/robots.txt b/plugins/scaffolder-backend/sample-templates/create-react-app/skeleton/public/robots.txt
deleted file mode 100644
index e9e57dc4d4..0000000000
--- a/plugins/scaffolder-backend/sample-templates/create-react-app/skeleton/public/robots.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-# https://www.robotstxt.org/robotstxt.html
-User-agent: *
-Disallow:
diff --git a/plugins/scaffolder-backend/sample-templates/create-react-app/skeleton/src/App.css b/plugins/scaffolder-backend/sample-templates/create-react-app/skeleton/src/App.css
deleted file mode 100644
index 74b5e05345..0000000000
--- a/plugins/scaffolder-backend/sample-templates/create-react-app/skeleton/src/App.css
+++ /dev/null
@@ -1,38 +0,0 @@
-.App {
-  text-align: center;
-}
-
-.App-logo {
-  height: 40vmin;
-  pointer-events: none;
-}
-
-@media (prefers-reduced-motion: no-preference) {
-  .App-logo {
-    animation: App-logo-spin infinite 20s linear;
-  }
-}
-
-.App-header {
-  background-color: #282c34;
-  min-height: 100vh;
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-  justify-content: center;
-  font-size: calc(10px + 2vmin);
-  color: white;
-}
-
-.App-link {
-  color: #61dafb;
-}
-
-@keyframes App-logo-spin {
-  from {
-    transform: rotate(0deg);
-  }
-  to {
-    transform: rotate(360deg);
-  }
-}
diff --git a/plugins/scaffolder-backend/sample-templates/create-react-app/skeleton/src/App.test.tsx b/plugins/scaffolder-backend/sample-templates/create-react-app/skeleton/src/App.test.tsx
deleted file mode 100644
index 2a68616d98..0000000000
--- a/plugins/scaffolder-backend/sample-templates/create-react-app/skeleton/src/App.test.tsx
+++ /dev/null
@@ -1,9 +0,0 @@
-import React from 'react';
-import { render, screen } from '@testing-library/react';
-import App from './App';
-
-test('renders learn react link', () => {
-  render(<App />);
-  const linkElement = screen.getByText(/learn react/i);
-  expect(linkElement).toBeInTheDocument();
-});
diff --git a/plugins/scaffolder-backend/sample-templates/create-react-app/skeleton/src/App.tsx b/plugins/scaffolder-backend/sample-templates/create-react-app/skeleton/src/App.tsx
deleted file mode 100644
index a53698aab3..0000000000
--- a/plugins/scaffolder-backend/sample-templates/create-react-app/skeleton/src/App.tsx
+++ /dev/null
@@ -1,26 +0,0 @@
-import React from 'react';
-import logo from './logo.svg';
-import './App.css';
-
-function App() {
-  return (
-    <div className="App">
-      <header className="App-header">
-        <img src={logo} className="App-logo" alt="logo" />
-        <p>
-          Edit <code>src/App.tsx</code> and save to reload.
-        </p>
-        <a
-          className="App-link"
-          href="https://reactjs.org"
-          target="_blank"
-          rel="noopener noreferrer"
-        >
-          Learn React
-        </a>
-      </header>
-    </div>
-  );
-}
-
-export default App;
diff --git a/plugins/scaffolder-backend/sample-templates/create-react-app/skeleton/src/index.css b/plugins/scaffolder-backend/sample-templates/create-react-app/skeleton/src/index.css
deleted file mode 100644
index ec2585e8c0..0000000000
--- a/plugins/scaffolder-backend/sample-templates/create-react-app/skeleton/src/index.css
+++ /dev/null
@@ -1,13 +0,0 @@
-body {
-  margin: 0;
-  font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', 'Roboto', 'Oxygen',
-    'Ubuntu', 'Cantarell', 'Fira Sans', 'Droid Sans', 'Helvetica Neue',
-    sans-serif;
-  -webkit-font-smoothing: antialiased;
-  -moz-osx-font-smoothing: grayscale;
-}
-
-code {
-  font-family: source-code-pro, Menlo, Monaco, Consolas, 'Courier New',
-    monospace;
-}
diff --git a/plugins/scaffolder-backend/sample-templates/create-react-app/skeleton/src/index.tsx b/plugins/scaffolder-backend/sample-templates/create-react-app/skeleton/src/index.tsx
deleted file mode 100644
index ef2edf8ea3..0000000000
--- a/plugins/scaffolder-backend/sample-templates/create-react-app/skeleton/src/index.tsx
+++ /dev/null
@@ -1,17 +0,0 @@
-import React from 'react';
-import ReactDOM from 'react-dom';
-import './index.css';
-import App from './App';
-import reportWebVitals from './reportWebVitals';
-
-ReactDOM.render(
-  <React.StrictMode>
-    <App />
-  </React.StrictMode>,
-  document.getElementById('root')
-);
-
-// If you want to start measuring performance in your app, pass a function
-// to log results (for example: reportWebVitals(console.log))
-// or send to an analytics endpoint. Learn more: https://bit.ly/CRA-vitals
-reportWebVitals();
diff --git a/plugins/scaffolder-backend/sample-templates/create-react-app/skeleton/src/logo.svg b/plugins/scaffolder-backend/sample-templates/create-react-app/skeleton/src/logo.svg
deleted file mode 100644
index 9dfc1c058c..0000000000
--- a/plugins/scaffolder-backend/sample-templates/create-react-app/skeleton/src/logo.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 841.9 595.3"><g fill="#61DAFB"><path d="M666.3 296.5c0-32.5-40.7-63.3-103.1-82.4 14.4-63.6 8-114.2-20.2-130.4-6.5-3.8-14.1-5.6-22.4-5.6v22.3c4.6 0 8.3.9 11.4 2.6 13.6 7.8 19.5 37.5 14.9 75.7-1.1 9.4-2.9 19.3-5.1 29.4-19.6-4.8-41-8.5-63.5-10.9-13.5-18.5-27.5-35.3-41.6-50 32.6-30.3 63.2-46.9 84-46.9V78c-27.5 0-63.5 19.6-99.9 53.6-36.4-33.8-72.4-53.2-99.9-53.2v22.3c20.7 0 51.4 16.5 84 46.6-14 14.7-28 31.4-41.3 49.9-22.6 2.4-44 6.1-63.6 11-2.3-10-4-19.7-5.2-29-4.7-38.2 1.1-67.9 14.6-75.8 3-1.8 6.9-2.6 11.5-2.6V78.5c-8.4 0-16 1.8-22.6 5.6-28.1 16.2-34.4 66.7-19.9 130.1-62.2 19.2-102.7 49.9-102.7 82.3 0 32.5 40.7 63.3 103.1 82.4-14.4 63.6-8 114.2 20.2 130.4 6.5 3.8 14.1 5.6 22.5 5.6 27.5 0 63.5-19.6 99.9-53.6 36.4 33.8 72.4 53.2 99.9 53.2 8.4 0 16-1.8 22.6-5.6 28.1-16.2 34.4-66.7 19.9-130.1 62-19.1 102.5-49.9 102.5-82.3zm-130.2-66.7c-3.7 12.9-8.3 26.2-13.5 39.5-4.1-8-8.4-16-13.1-24-4.6-8-9.5-15.8-14.4-23.4 14.2 2.1 27.9 4.7 41 7.9zm-45.8 106.5c-7.8 13.5-15.8 26.3-24.1 38.2-14.9 1.3-30 2-45.2 2-15.1 0-30.2-.7-45-1.9-8.3-11.9-16.4-24.6-24.2-38-7.6-13.1-14.5-26.4-20.8-39.8 6.2-13.4 13.2-26.8 20.7-39.9 7.8-13.5 15.8-26.3 24.1-38.2 14.9-1.3 30-2 45.2-2 15.1 0 30.2.7 45 1.9 8.3 11.9 16.4 24.6 24.2 38 7.6 13.1 14.5 26.4 20.8 39.8-6.3 13.4-13.2 26.8-20.7 39.9zm32.3-13c5.4 13.4 10 26.8 13.8 39.8-13.1 3.2-26.9 5.9-41.2 8 4.9-7.7 9.8-15.6 14.4-23.7 4.6-8 8.9-16.1 13-24.1zM421.2 430c-9.3-9.6-18.6-20.3-27.8-32 9 .4 18.2.7 27.5.7 9.4 0 18.7-.2 27.8-.7-9 11.7-18.3 22.4-27.5 32zm-74.4-58.9c-14.2-2.1-27.9-4.7-41-7.9 3.7-12.9 8.3-26.2 13.5-39.5 4.1 8 8.4 16 13.1 24 4.7 8 9.5 15.8 14.4 23.4zM420.7 163c9.3 9.6 18.6 20.3 27.8 32-9-.4-18.2-.7-27.5-.7-9.4 0-18.7.2-27.8.7 9-11.7 18.3-22.4 27.5-32zm-74 58.9c-4.9 7.7-9.8 15.6-14.4 23.7-4.6 8-8.9 16-13 24-5.4-13.4-10-26.8-13.8-39.8 13.1-3.1 26.9-5.8 41.2-7.9zm-90.5 125.2c-35.4-15.1-58.3-34.9-58.3-50.6 0-15.7 22.9-35.6 58.3-50.6 8.6-3.7 18-7 27.7-10.1 5.7 19.6 13.2 40 22.5 60.9-9.2 20.8-16.6 41.1-22.2 60.6-9.9-3.1-19.3-6.5-28-10.2zM310 490c-13.6-7.8-19.5-37.5-14.9-75.7 1.1-9.4 2.9-19.3 5.1-29.4 19.6 4.8 41 8.5 63.5 10.9 13.5 18.5 27.5 35.3 41.6 50-32.6 30.3-63.2 46.9-84 46.9-4.5-.1-8.3-1-11.3-2.7zm237.2-76.2c4.7 38.2-1.1 67.9-14.6 75.8-3 1.8-6.9 2.6-11.5 2.6-20.7 0-51.4-16.5-84-46.6 14-14.7 28-31.4 41.3-49.9 22.6-2.4 44-6.1 63.6-11 2.3 10.1 4.1 19.8 5.2 29.1zm38.5-66.7c-8.6 3.7-18 7-27.7 10.1-5.7-19.6-13.2-40-22.5-60.9 9.2-20.8 16.6-41.1 22.2-60.6 9.9 3.1 19.3 6.5 28.1 10.2 35.4 15.1 58.3 34.9 58.3 50.6-.1 15.7-23 35.6-58.4 50.6zM320.8 78.4z"/><circle cx="420.9" cy="296.5" r="45.7"/><path d="M520.5 78.1z"/></g></svg>
\ No newline at end of file
diff --git a/plugins/scaffolder-backend/sample-templates/create-react-app/skeleton/src/react-app-env.d.ts b/plugins/scaffolder-backend/sample-templates/create-react-app/skeleton/src/react-app-env.d.ts
deleted file mode 100644
index 6431bc5fc6..0000000000
--- a/plugins/scaffolder-backend/sample-templates/create-react-app/skeleton/src/react-app-env.d.ts
+++ /dev/null
@@ -1 +0,0 @@
-/// <reference types="react-scripts" />
diff --git a/plugins/scaffolder-backend/sample-templates/create-react-app/skeleton/src/reportWebVitals.ts b/plugins/scaffolder-backend/sample-templates/create-react-app/skeleton/src/reportWebVitals.ts
deleted file mode 100644
index 49a2a16e0f..0000000000
--- a/plugins/scaffolder-backend/sample-templates/create-react-app/skeleton/src/reportWebVitals.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-import { ReportHandler } from 'web-vitals';
-
-const reportWebVitals = (onPerfEntry?: ReportHandler) => {
-  if (onPerfEntry && onPerfEntry instanceof Function) {
-    import('web-vitals').then(({ getCLS, getFID, getFCP, getLCP, getTTFB }) => {
-      getCLS(onPerfEntry);
-      getFID(onPerfEntry);
-      getFCP(onPerfEntry);
-      getLCP(onPerfEntry);
-      getTTFB(onPerfEntry);
-    });
-  }
-};
-
-export default reportWebVitals;
diff --git a/plugins/scaffolder-backend/sample-templates/create-react-app/skeleton/src/setupTests.ts b/plugins/scaffolder-backend/sample-templates/create-react-app/skeleton/src/setupTests.ts
deleted file mode 100644
index 8f2609b7b3..0000000000
--- a/plugins/scaffolder-backend/sample-templates/create-react-app/skeleton/src/setupTests.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-// jest-dom adds custom jest matchers for asserting on DOM nodes.
-// allows you to do things like:
-// expect(element).toHaveTextContent(/react/i)
-// learn more: https://github.com/testing-library/jest-dom
-import '@testing-library/jest-dom';
diff --git a/plugins/scaffolder-backend/sample-templates/create-react-app/skeleton/tsconfig.json b/plugins/scaffolder-backend/sample-templates/create-react-app/skeleton/tsconfig.json
deleted file mode 100644
index a273b0cfc0..0000000000
--- a/plugins/scaffolder-backend/sample-templates/create-react-app/skeleton/tsconfig.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-  "compilerOptions": {
-    "target": "es5",
-    "lib": [
-      "dom",
-      "dom.iterable",
-      "esnext"
-    ],
-    "allowJs": true,
-    "skipLibCheck": true,
-    "esModuleInterop": true,
-    "allowSyntheticDefaultImports": true,
-    "strict": true,
-    "forceConsistentCasingInFileNames": true,
-    "noFallthroughCasesInSwitch": true,
-    "module": "esnext",
-    "moduleResolution": "node",
-    "resolveJsonModule": true,
-    "isolatedModules": true,
-    "noEmit": true,
-    "jsx": "react-jsx"
-  },
-  "include": [
-    "src"
-  ]
-}
diff --git a/plugins/scaffolder-backend/sample-templates/create-react-app/template.yaml b/plugins/scaffolder-backend/sample-templates/create-react-app/template.yaml
deleted file mode 100644
index 664b405f29..0000000000
--- a/plugins/scaffolder-backend/sample-templates/create-react-app/template.yaml
+++ /dev/null
@@ -1,77 +0,0 @@
-apiVersion: backstage.io/v1beta2
-kind: Template
-metadata:
-  name: create-react-app-template
-  title: Create React App Template
-  description: Create a new CRA website project
-  tags:
-    - react
-    - cra
-spec:
-  owner: web@example.com
-  type: website
-  parameters:
-    - title: Provide some simple information
-      required:
-        - component_id
-        - owner
-      properties:
-        component_id:
-          title: Name
-          type: string
-          description: Unique name of the component
-        description:
-          title: Description
-          type: string
-          description: Help others understand what this website is for.
-        owner:
-          title: Owner
-          type: string
-          description: Owner of the component
-          ui:field: OwnerPicker
-          ui:options:
-            allowedKinds: 
-              - Group
-    - title: Choose a location  
-      required:
-        - repoUrl
-      properties: 
-        repoUrl:
-          title: Repository Location
-          type: string
-          ui:field: RepoUrlPicker
-          ui:options:
-            allowedHosts:
-              - github.com
-  steps:
-    - id: template
-      name: Fetch Skeleton + Template
-      action: fetch:cookiecutter
-      input:
-        url: ./skeleton
-        copyWithoutRender:
-          - .github/workflows/*
-        values:
-          component_id: '{{ parameters.component_id }}'
-          description: '{{ parameters.description }}'
-          destination: '{{ parseRepoUrl parameters.repoUrl }}'
-          owner: '{{ parameters.owner }}'
-
-    - id: publish
-      name: Publish
-      action: publish:github
-      input:
-        allowedHosts: ['github.com']
-        description: 'This is {{ parameters.component_id }}'
-        repoUrl: '{{ parameters.repoUrl }}'
-
-    - id: register
-      name: Register
-      action: catalog:register
-      input:
-        repoContentsUrl: '{{ steps.publish.output.repoContentsUrl }}'
-        catalogInfoPath: '/catalog-info.yaml'
-
-  output:
-    remoteUrl: '{{ steps.publish.output.remoteUrl }}'
-    entityRef: '{{ steps.register.output.entityRef }}'
diff --git a/plugins/scaffolder-backend/sample-templates/docs-template/skeleton/catalog-info.yaml b/plugins/scaffolder-backend/sample-templates/docs-template/skeleton/catalog-info.yaml
deleted file mode 100644
index 7233525ac5..0000000000
--- a/plugins/scaffolder-backend/sample-templates/docs-template/skeleton/catalog-info.yaml
+++ /dev/null
@@ -1,12 +0,0 @@
-apiVersion: backstage.io/v1alpha1
-kind: Component
-metadata:
-  name: {{cookiecutter.name | jsonify}}
-  description: {{cookiecutter.description | jsonify}}
-  annotations:
-    github.com/project-slug: {{cookiecutter.destination.owner + "/" + cookiecutter.destination.repo}}
-    backstage.io/techdocs-ref: url:{{"https://" + cookiecutter.destination.host + "/" + cookiecutter.destination.owner + "/" + cookiecutter.destination.repo}}
-spec:
-  type: documentation
-  lifecycle: experimental
-  owner: {{cookiecutter.owner | jsonify}}
diff --git a/plugins/scaffolder-backend/sample-templates/docs-template/skeleton/docs/index.md b/plugins/scaffolder-backend/sample-templates/docs-template/skeleton/docs/index.md
deleted file mode 100644
index b6f7344334..0000000000
--- a/plugins/scaffolder-backend/sample-templates/docs-template/skeleton/docs/index.md
+++ /dev/null
@@ -1,28 +0,0 @@
-## {{ cookiecutter.name }}
-
-{{ cookiecutter.description }}
-
-## Getting started
-
-Start write your documentation by adding more markdown (.md) files to this folder (/docs) or replace the content in this file.
-
-## Table of Contents
-
-The Table of Contents on the right is generated automatically based on the hierarchy
-of headings. Only use one H1 (`#` in Markdown) per file.
-
-## Site navigation
-
-For new pages to appear in the left hand navigation you need edit the `mkdocs.yml`
-file in root of your repo. The navigation can also link out to other sites.
-
-Alternatively, if there is no `nav` section in `mkdocs.yml`, a navigation section
-will be created for you. However, you will not be able to use alternate titles for
-pages, or include links to other sites.
-
-Note that MkDocs uses `mkdocs.yml`, not `mkdocs.yaml`, although both appear to work.
-See also <https://www.mkdocs.org/user-guide/configuration/>.
-
-## Support
-
-That's it. If you need support, reach out in [#docs-like-code](https://discord.com/channels/687207715902193673/714754240933003266) on Discord.
diff --git a/plugins/scaffolder-backend/sample-templates/docs-template/skeleton/mkdocs.yml b/plugins/scaffolder-backend/sample-templates/docs-template/skeleton/mkdocs.yml
deleted file mode 100644
index 7e1c015f28..0000000000
--- a/plugins/scaffolder-backend/sample-templates/docs-template/skeleton/mkdocs.yml
+++ /dev/null
@@ -1,8 +0,0 @@
-site_name: {{cookiecutter.name | jsonify}}
-site_description: {{cookiecutter.description | jsonify}}
-
-nav:
-  - Introduction: index.md
-
-plugins:
-  - techdocs-core
diff --git a/plugins/scaffolder-backend/sample-templates/local-templates.yaml b/plugins/scaffolder-backend/sample-templates/local-templates.yaml
deleted file mode 100644
index 3b3acbae7e..0000000000
--- a/plugins/scaffolder-backend/sample-templates/local-templates.yaml
+++ /dev/null
@@ -1,13 +0,0 @@
-apiVersion: backstage.io/v1alpha1
-kind: Location
-metadata:
-  name: example-templates-local
-  description: A collection of locally available Backstage example templates
-spec:
-  targets:
-    - ./docs-template/template.yaml
-    - ./react-ssr-template/template.yaml
-    - ./create-react-app/template.yaml
-    - ./springboot-grpc-template/template.yaml
-    - ./v1beta2-demo/template.yaml
-    - ./pull-request/template.yaml
diff --git a/plugins/scaffolder-backend/sample-templates/pull-request/template.yaml b/plugins/scaffolder-backend/sample-templates/pull-request/template.yaml
deleted file mode 100644
index b6de1c29ca..0000000000
--- a/plugins/scaffolder-backend/sample-templates/pull-request/template.yaml
+++ /dev/null
@@ -1,77 +0,0 @@
-apiVersion: backstage.io/v1beta2
-kind: Template
-metadata:
-  name: pull-request
-  title: Pull Request Action template
-  description: scaffolder v1beta2 template demo publishing to PR on existing git repository
-spec:
-  owner: backstage/techdocs-core
-  type: service
-
-  parameters:
-    - title: Fill in some steps
-      required:
-        - name
-      properties:
-        name:
-          title: Name
-          type: string
-          description: Unique name of the component
-          ui:autofocus: true
-          ui:options:
-            rows: 5
-        description:
-          title: Description
-          type: string
-          description: Description of the component
-        targetPath:
-          title: Target Path in repo
-          type: string
-          description: Name of the directory to create in the repository
-    - title: Choose a location
-      required:
-        - repoUrl
-      properties:
-        repoUrl:
-          title: Repository Location
-          type: string
-          ui:field: RepoUrlPicker
-          ui:options:
-            allowedHosts:
-              - github.com
-
-  steps:
-    - id: fetch-base
-      name: Fetch Base
-      action: fetch:cookiecutter
-      input:
-        url: ./template
-        values:
-          name: '{{parameters.name}}'
-
-    - id: fetch-docs
-      name: Fetch Docs
-      action: fetch:plain
-      input:
-        targetPath: ./community
-        url: https://github.com/backstage/community/tree/main/backstage-community-sessions
-
-    - id: publish
-      name: Publish
-      action: publish:github:pull-request
-      input:
-        repoUrl: '{{ parameters.repoUrl }}'
-        title: 'Create new project: {{parameters.name}}'
-        branchName: 'create-{{parameters.name}}'
-        description: |
-          # New project: {{parameters.name}}
-
-          {{#if parameters.description}}
-          {{parameters.description}}
-          {{/if}}
-        targetPath: '{{#if parameters.targetPath}}{{parameters.targetPath}}{{else}}{{parameters.name}}{{/if}}'
-
-  output:
-    links: 
-      - url: '{{steps.publish.output.remoteUrl}}'
-        text: 'Go to PR'
diff --git a/plugins/scaffolder-backend/sample-templates/rails-demo/template.yaml b/plugins/scaffolder-backend/sample-templates/rails-demo/template.yaml
deleted file mode 100644
index 174c58741b..0000000000
--- a/plugins/scaffolder-backend/sample-templates/rails-demo/template.yaml
+++ /dev/null
@@ -1,174 +0,0 @@
-apiVersion: backstage.io/v1beta2
-kind: Template
-metadata:
-  name: rails-demo
-  title: Rails template
-  description: scaffolder Rails app
-spec:
-  owner: backstage/techdocs-core
-  type: service
-
-  parameters:
-    - title: Fill in some steps
-      required:
-        - name
-        - owner
-      properties:
-        name:
-          title: Name
-          type: string
-          description: Unique name of the component
-          ui:autofocus: true
-          ui:options:
-            rows: 5
-        owner:
-          title: Owner
-          type: string
-          description: Owner of the component
-          ui:field: OwnerPicker
-          ui:options:
-            allowedKinds: 
-              - Group
-        system:
-          title: System
-          type: string
-          description: System of the component
-          ui:field: EntityPicker
-          ui:options:
-            allowedKinds:
-              - System
-            defaultKind: System
-            
-    - title: Choose a location
-      required:
-        - repoUrl
-        - dryRun
-      properties:
-        repoUrl:
-          title: Repository Location
-          type: string
-          ui:field: RepoUrlPicker
-          ui:options:
-            allowedHosts:
-              - github.com
-        dryRun:
-          title: Only perform a dry run, don't publish anything
-          type: boolean
-          default: false
-        railsArguments:
-          title: arguments to run the rails new command
-          type: object
-          properties:
-            minimal:
-              title: minimal
-              description: Preconfigure a minimal rails app
-              type: boolean
-            skipBundle:
-              title: skipBundle
-              description: Don't run bundle install
-              type: boolean
-            skipWebpackInstall:
-              title: skipWebpackInstall
-              description: Don't run Webpack install
-              type: boolean
-            api:
-              title: api
-              description: Preconfigure smaller stack for API only apps
-              type: boolean
-            template:
-              title: template
-              description: Path to some application template (can be a filesystem path or URL)
-              type: string
-              default: './rails-template-file.rb'
-            webpacker:
-              title: webpacker
-              description: 'Preconfigure Webpack with a particular framework (options: react,
-                vue, angular, elm, stimulus)'
-              type: string
-              enum:
-                - react
-                - vue
-                - angular
-                - elm
-                - stimulus
-            database:
-              title: database
-              description: 'Preconfigure for selected database (options: mysql/postgresql/sqlite3/oracle/sqlserver/jdbcmysql/jdbcsqlite3/jdbcpostgresql/jdbc)'
-              type: string
-              enum:
-                - mysql
-                - postgresql
-                - sqlite3
-                - oracle
-                - sqlserver
-                - jdbcmysql
-                - jdbcsqlite3
-                - jdbcpostgresql
-                - jdbc
-            railsVersion:
-              title: Rails version in Gemfile
-              description: 'Set up the application with Gemfile pointing to a specific version
-                (options: dev, edge, master)'
-              type: string
-              enum:
-                - dev
-                - edge
-                - master
-
-  steps:
-    - id: fetch-base
-      name: Fetch Base
-      action: fetch:rails
-      input:
-        url: ./template
-        values:
-          name: '{{ parameters.name }}'
-          owner: '{{ parameters.owner }}'         
-          system: '{{ parameters.system }}'
-          railsArguments: '{{ json parameters.railsArguments }}'
-
-    - name: Write Catalog information
-      action: catalog:write
-      input:
-        component:
-          apiVersion: 'backstage.io/v1alpha1'
-          kind: Component
-          metadata:
-            name: '{{ parameters.name }}'
-            annotations:
-              github.com/project-slug: '{{ projectSlug parameters.repoUrl }}'
-          spec:
-            type: service
-            lifecycle: production
-            owner: '{{ parameters.owner }}'
-
-    - id: publish
-      if: '{{ not parameters.dryRun }}'
-      name: Publish
-      action: publish:github
-      input:
-        allowedHosts: ['github.com']
-        description: 'This is {{ parameters.name }}'
-        repoUrl: '{{ parameters.repoUrl }}'
-
-    - id: register
-      if: '{{ not parameters.dryRun }}'
-      name: Register
-      action: catalog:register
-      input:
-        repoContentsUrl: '{{ steps.publish.output.repoContentsUrl }}'
-        catalogInfoPath: '/catalog-info.yaml'
-
-    - name: Results
-      if: '{{ parameters.dryRun }}'
-      action: debug:log
-      input:
-        listWorkspace: true
-
-  output:
-    links:
-      - title: Repository
-        url: '{{ steps.publish.output.remoteUrl }}'
-      - title: Open in catalog
-        icon: 'catalog'
-        entityRef: '{{ steps.register.output.entityRef }}'
diff --git a/plugins/scaffolder-backend/sample-templates/rails-demo/template/rails-template-file.rb b/plugins/scaffolder-backend/sample-templates/rails-demo/template/rails-template-file.rb
deleted file mode 100644
index 90c0d53ddc..0000000000
--- a/plugins/scaffolder-backend/sample-templates/rails-demo/template/rails-template-file.rb
+++ /dev/null
@@ -1,14 +0,0 @@
-gem_group :development, :test do
-  gem "rspec"
-  gem "rspec-rails"
-end
-
-rakefile("example.rake") do
-  <<-TASK
-    namespace :example do
-      task :backstage do
-        puts "i like backstage!"
-      end
-    end
-  TASK
-end
diff --git a/plugins/scaffolder-backend/sample-templates/react-ssr-template/skeleton/.editorconfig b/plugins/scaffolder-backend/sample-templates/react-ssr-template/skeleton/.editorconfig
deleted file mode 100644
index 23c3268a0f..0000000000
--- a/plugins/scaffolder-backend/sample-templates/react-ssr-template/skeleton/.editorconfig
+++ /dev/null
@@ -1,13 +0,0 @@
-# editorconfig.org
-root = true
-
-[*]
-indent_style = space
-indent_size = 2
-end_of_line = lf
-charset = utf-8
-trim_trailing_whitespace = true
-insert_final_newline = true
-
-[*.md]
-insert_final_newline = false
\ No newline at end of file
diff --git a/plugins/scaffolder-backend/sample-templates/react-ssr-template/skeleton/.eslintignore b/plugins/scaffolder-backend/sample-templates/react-ssr-template/skeleton/.eslintignore
deleted file mode 100644
index 8b13789179..0000000000
--- a/plugins/scaffolder-backend/sample-templates/react-ssr-template/skeleton/.eslintignore
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/plugins/scaffolder-backend/sample-templates/react-ssr-template/skeleton/.eslintrc.js b/plugins/scaffolder-backend/sample-templates/react-ssr-template/skeleton/.eslintrc.js
deleted file mode 100644
index 8623614899..0000000000
--- a/plugins/scaffolder-backend/sample-templates/react-ssr-template/skeleton/.eslintrc.js
+++ /dev/null
@@ -1 +0,0 @@
-module.exports = require('@spotify/web-scripts/config/eslintrc.js');
diff --git a/plugins/scaffolder-backend/sample-templates/react-ssr-template/skeleton/.github/workflows/build.yml b/plugins/scaffolder-backend/sample-templates/react-ssr-template/skeleton/.github/workflows/build.yml
deleted file mode 100644
index 907da7e820..0000000000
--- a/plugins/scaffolder-backend/sample-templates/react-ssr-template/skeleton/.github/workflows/build.yml
+++ /dev/null
@@ -1,41 +0,0 @@
-name: Frontend CI
-
-on:
-  push:
-    branches: [ master ]
-  pull_request:
-    branches: [ master ]
-
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-
-    strategy:
-      matrix:
-        node-version: [12.x]
-
-    steps:
-    - name: checkout code
-      uses: actions/checkout@v1
-    - name: get yarn cache
-      id: yarn-cache
-      run: echo "::set-output name=dir::$(yarn cache dir)"
-    - uses: actions/cache@v2
-      with:
-        path: ${{ steps.yarn-cache.outputs.dir }}
-        key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
-        restore-keys: |
-          ${{ runner.os }}-yarn-
-    - name: use node.js ${{ matrix.node-version }}
-      uses: actions/setup-node@v1
-      with:
-        node-version: ${{ matrix.node-version }}
-    - name: yarn install, build, and test
-      working-directory: .
-      run: |
-        yarn install
-        yarn build
-        yarn test
-      env:
-        CI: true
diff --git a/plugins/scaffolder-backend/sample-templates/react-ssr-template/skeleton/.gitignore b/plugins/scaffolder-backend/sample-templates/react-ssr-template/skeleton/.gitignore
deleted file mode 100644
index 4d1e0d9635..0000000000
--- a/plugins/scaffolder-backend/sample-templates/react-ssr-template/skeleton/.gitignore
+++ /dev/null
@@ -1,18 +0,0 @@
-# See https://help.github.com/ignore-files/ for more about ignoring files.
-
-# dependencies
-/node_modules
-
-# testing
-/coverage
-junit.xml
-
-# build
-/build
-
-# misc
-.DS_Store
-
-npm-debug.log*
-yarn-debug.log*
-yarn-error.log*
diff --git a/plugins/scaffolder-backend/sample-templates/react-ssr-template/skeleton/README.md b/plugins/scaffolder-backend/sample-templates/react-ssr-template/skeleton/README.md
deleted file mode 100644
index 415065179b..0000000000
--- a/plugins/scaffolder-backend/sample-templates/react-ssr-template/skeleton/README.md
+++ /dev/null
@@ -1,14 +0,0 @@
-# {{ cookiecutter.component_id }}
-
-## Description
-
-{{ cookiecutter.description }}
-
-## Develop
-
-```bash
-# install dependencies
-$ yarn
-# start development server
-$ yarn dev
-```
\ No newline at end of file
diff --git a/plugins/scaffolder-backend/sample-templates/react-ssr-template/skeleton/babel.config.js b/plugins/scaffolder-backend/sample-templates/react-ssr-template/skeleton/babel.config.js
deleted file mode 100644
index db2d280677..0000000000
--- a/plugins/scaffolder-backend/sample-templates/react-ssr-template/skeleton/babel.config.js
+++ /dev/null
@@ -1,4 +0,0 @@
-module.exports = {
-  plugins: ['babel-plugin-styled-components'],
-  presets: ['next/babel', '@zeit/next-typescript/babel'],
-};
diff --git a/plugins/scaffolder-backend/sample-templates/react-ssr-template/skeleton/catalog-info.yaml b/plugins/scaffolder-backend/sample-templates/react-ssr-template/skeleton/catalog-info.yaml
deleted file mode 100644
index bac97e4bea..0000000000
--- a/plugins/scaffolder-backend/sample-templates/react-ssr-template/skeleton/catalog-info.yaml
+++ /dev/null
@@ -1,12 +0,0 @@
-apiVersion: backstage.io/v1alpha1
-kind: Component
-metadata:
-  name: {{cookiecutter.component_id | jsonify}}
-  description: {{cookiecutter.description | jsonify}}
-  annotations:
-    github.com/project-slug: {{cookiecutter.destination.owner + "/" + cookiecutter.destination.repo}}
-    backstage.io/techdocs-ref: url:{{"https://" + cookiecutter.destination.host + "/" + cookiecutter.destination.owner + "/" + cookiecutter.destination.repo}}
-spec:
-  type: website
-  lifecycle: experimental
-  owner: {{cookiecutter.owner | jsonify}}
diff --git a/plugins/scaffolder-backend/sample-templates/react-ssr-template/skeleton/docs/index.md b/plugins/scaffolder-backend/sample-templates/react-ssr-template/skeleton/docs/index.md
deleted file mode 100644
index 2a0f572ff2..0000000000
--- a/plugins/scaffolder-backend/sample-templates/react-ssr-template/skeleton/docs/index.md
+++ /dev/null
@@ -1,28 +0,0 @@
-# {{ cookiecutter.component_id }}
-
-{{ cookiecutter.description }}
-
-## Getting started
-
-Start writing your documentation by adding more markdown (.md) files to this folder (/docs) or replace the content in this file.
-
-## Table of Contents
-
-The Table of Contents on the right is generated automatically based on the hierarchy
-of headings. Only use one H1 (`#` in Markdown) per file.
-
-## Site navigation
-
-For new pages to appear in the left hand navigation you need edit the `mkdocs.yml`
-file in root of your repo. The navigation can also link out to other sites.
-
-Alternatively, if there is no `nav` section in `mkdocs.yml`, a navigation section
-will be created for you. However, you will not be able to use alternate titles for
-pages, or include links to other sites.
-
-Note that MkDocs uses `mkdocs.yml`, not `mkdocs.yaml`, although both appear to work.
-See also <https://www.mkdocs.org/user-guide/configuration/>.
-
-## Support
-
-That's it. If you need support, reach out in [#docs-like-code](https://discord.com/channels/687207715902193673/714754240933003266) on Discord.
diff --git a/plugins/scaffolder-backend/sample-templates/react-ssr-template/skeleton/jest.config.js b/plugins/scaffolder-backend/sample-templates/react-ssr-template/skeleton/jest.config.js
deleted file mode 100644
index 0dc2a9c0ca..0000000000
--- a/plugins/scaffolder-backend/sample-templates/react-ssr-template/skeleton/jest.config.js
+++ /dev/null
@@ -1,8 +0,0 @@
-module.exports = {
-  ...require('@spotify/web-scripts/config/jest.config.js'),
-  testEnvironment: 'jsdom',
-  testPathIgnorePatterns: ['/node_modules/', '/build/'],
-  transform: {
-    '^.+\\.tsx?$': 'babel-jest',
-  },
-};
diff --git a/plugins/scaffolder-backend/sample-templates/react-ssr-template/skeleton/mkdocs.yml b/plugins/scaffolder-backend/sample-templates/react-ssr-template/skeleton/mkdocs.yml
deleted file mode 100644
index 64f1e9ee8e..0000000000
--- a/plugins/scaffolder-backend/sample-templates/react-ssr-template/skeleton/mkdocs.yml
+++ /dev/null
@@ -1,8 +0,0 @@
-site_name: {{cookiecutter.component_id | jsonify}}
-site_description: {{cookiecutter.description | jsonify}}
-
-nav:
-  - Introduction: index.md
-
-plugins:
-  - techdocs-core
diff --git a/plugins/scaffolder-backend/sample-templates/react-ssr-template/skeleton/next-env.d.ts b/plugins/scaffolder-backend/sample-templates/react-ssr-template/skeleton/next-env.d.ts
deleted file mode 100644
index fd10310f68..0000000000
--- a/plugins/scaffolder-backend/sample-templates/react-ssr-template/skeleton/next-env.d.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-// read more about this file here ---> https://github.com/zeit/next.js/blob/canary/docs/basic-features/typescript.md
-/* eslint spaced-comment: ["error", "always", { "markers": ["/"] }] */
-
-/// <reference types="next" />
-/// <reference types="next/types/global" />
diff --git a/plugins/scaffolder-backend/sample-templates/react-ssr-template/skeleton/next.config.js b/plugins/scaffolder-backend/sample-templates/react-ssr-template/skeleton/next.config.js
deleted file mode 100644
index be8b159307..0000000000
--- a/plugins/scaffolder-backend/sample-templates/react-ssr-template/skeleton/next.config.js
+++ /dev/null
@@ -1,3 +0,0 @@
-module.exports = {
-  distDir: 'build',
-};
diff --git a/plugins/scaffolder-backend/sample-templates/react-ssr-template/skeleton/package.json b/plugins/scaffolder-backend/sample-templates/react-ssr-template/skeleton/package.json
deleted file mode 100644
index 75925bf567..0000000000
--- a/plugins/scaffolder-backend/sample-templates/react-ssr-template/skeleton/package.json
+++ /dev/null
@@ -1,52 +0,0 @@
-{
-  "name": "{{ cookiecutter.component_id }}",
-  "version": "0.0.0",
-  "description": "{{ cookiecutter.description }}",
-  "license": "UNLICENSED",
-  "scripts": {
-    "dev": "next",
-    "build": "next build",
-    "start": "next start",
-    "lint": "web-scripts lint --ignore-path=.gitignore",
-    "test": "web-scripts test --config jest.config.js",
-    "pretest:ci": "yarn lint",
-    "test:ci": "yarn test --ci --coverage --reporters=default --reporters=jest-junit"
-  },
-  "dependencies": {
-    "@zeit/next-typescript": "^1.1.1",
-    "babel-plugin-styled-components": "^1.10.6",
-    "next": "^9.1.1",
-    "react": "^16.8.5",
-    "react-dom": "^16.8.5",
-    "styled-components": "^4.3.2"
-  },
-  "devDependencies": {
-    "@spotify/tsconfig": "^5.0.0",
-    "@spotify/web-scripts": "^5.0.0",
-    "@testing-library/react": "^8.0.1",
-    "@types/node": "^14.14.32",
-    "@types/react": "^16.8.7",
-    "@types/react-dom": "^16.8.2",
-    "@types/styled-components": "^4.1.18",
-    "husky": "^2.7.0",
-    "jest-junit": "^8.0.0",
-    "typescript": "^3.9.2"
-  },
-  "husky": {
-    "hooks": {
-      "pre-commit": "web-scripts precommit"
-    }
-  },
-  "browserslist": {
-    "production": [
-      ">0.2%",
-      "not dead",
-      "not op_mini all"
-    ],
-    "development": [
-      "last 1 chrome version",
-      "last 1 firefox version",
-      "last 1 safari version"
-    ]
-  }
-}
diff --git a/plugins/scaffolder-backend/sample-templates/react-ssr-template/skeleton/prettier.config.js b/plugins/scaffolder-backend/sample-templates/react-ssr-template/skeleton/prettier.config.js
deleted file mode 100644
index 93df970dd6..0000000000
--- a/plugins/scaffolder-backend/sample-templates/react-ssr-template/skeleton/prettier.config.js
+++ /dev/null
@@ -1 +0,0 @@
-module.exports = require('@spotify/web-scripts/config/prettier.config.js');
diff --git a/plugins/scaffolder-backend/sample-templates/react-ssr-template/skeleton/public/static/fonts.css b/plugins/scaffolder-backend/sample-templates/react-ssr-template/skeleton/public/static/fonts.css
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/plugins/scaffolder-backend/sample-templates/react-ssr-template/skeleton/src/__tests__/index.test.tsx b/plugins/scaffolder-backend/sample-templates/react-ssr-template/skeleton/src/__tests__/index.test.tsx
deleted file mode 100644
index 8612ead08f..0000000000
--- a/plugins/scaffolder-backend/sample-templates/react-ssr-template/skeleton/src/__tests__/index.test.tsx
+++ /dev/null
@@ -1,13 +0,0 @@
-import React from 'react';
-import { cleanup, render } from '@testing-library/react';
-
-import Index from '../pages/index';
-
-afterEach(cleanup);
-
-describe('Index', () => {
-  it('Says hello', () => {
-    const { queryByText } = render(<Index />);
-    expect(queryByText('Hello!')).toBeTruthy();
-  });
-});
diff --git a/plugins/scaffolder-backend/sample-templates/react-ssr-template/skeleton/src/components/Header.tsx b/plugins/scaffolder-backend/sample-templates/react-ssr-template/skeleton/src/components/Header.tsx
deleted file mode 100644
index f8ba94310a..0000000000
--- a/plugins/scaffolder-backend/sample-templates/react-ssr-template/skeleton/src/components/Header.tsx
+++ /dev/null
@@ -1,3 +0,0 @@
-import React from 'react';
-
-export const Header = () => <h1>Header</h1>;
diff --git a/plugins/scaffolder-backend/sample-templates/react-ssr-template/skeleton/src/pages/_app.tsx b/plugins/scaffolder-backend/sample-templates/react-ssr-template/skeleton/src/pages/_app.tsx
deleted file mode 100644
index a3853e47c9..0000000000
--- a/plugins/scaffolder-backend/sample-templates/react-ssr-template/skeleton/src/pages/_app.tsx
+++ /dev/null
@@ -1,37 +0,0 @@
-import React from 'react';
-import App from 'next/app';
-import Head from 'next/head';
-import styled from 'styled-components';
-import { Header } from '../components/Header';
-
-const StyledApp = styled.div`
-  > * {
-    padding-left: 16px;
-    padding-right: 16px;
-  }
-`;
-
-const Main = styled.div`
-  margin: 2em auto;
-  height: 85vh;
-`;
-
-class CustomApp extends App {
-  render() {
-    const { Component, pageProps } = this.props;
-
-    return (
-      <StyledApp>
-        <Head>
-          <link rel="stylesheet" href="/static/fonts.css" />
-        </Head>
-        <Header />
-        <Main>
-          <Component {...pageProps} />
-        </Main>
-      </StyledApp>
-    );
-  }
-}
-
-export default CustomApp;
diff --git a/plugins/scaffolder-backend/sample-templates/react-ssr-template/skeleton/src/pages/_document.tsx b/plugins/scaffolder-backend/sample-templates/react-ssr-template/skeleton/src/pages/_document.tsx
deleted file mode 100644
index 9b01a6a74c..0000000000
--- a/plugins/scaffolder-backend/sample-templates/react-ssr-template/skeleton/src/pages/_document.tsx
+++ /dev/null
@@ -1,41 +0,0 @@
-/**
- * This file extends the <Document /> and injects the server side rendered styles into the <head>
- * By server-side rendering CSS we avoid visual changes in the layout while loading the JS.
- *
- * Taken from this example:
- * https://github.com/zeit/next.js/tree/master/examples/with-styled-components
- */
-
-import React from 'react';
-import Document, { DocumentContext, DocumentInitialProps } from 'next/document';
-import { ServerStyleSheet } from 'styled-components';
-
-export default class MyDocument extends Document {
-  static async getInitialProps(
-    ctx: DocumentContext,
-  ): Promise<DocumentInitialProps> {
-    const sheet = new ServerStyleSheet();
-    const originalRenderPage = ctx.renderPage;
-
-    try {
-      ctx.renderPage = () =>
-        originalRenderPage({
-          enhanceApp: (App: any) => (props) =>
-            sheet.collectStyles(<App {...props} />),
-        });
-
-      const initialProps = await Document.getInitialProps(ctx);
-      return {
-        ...initialProps,
-        styles: (
-          <>
-            {initialProps.styles}
-            {sheet.getStyleElement()}
-          </>
-        ),
-      };
-    } finally {
-      sheet.seal();
-    }
-  }
-}
diff --git a/plugins/scaffolder-backend/sample-templates/react-ssr-template/skeleton/src/pages/api/ping.ts b/plugins/scaffolder-backend/sample-templates/react-ssr-template/skeleton/src/pages/api/ping.ts
deleted file mode 100644
index 8bc772c182..0000000000
--- a/plugins/scaffolder-backend/sample-templates/react-ssr-template/skeleton/src/pages/api/ping.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-import { NextApiRequest, NextApiResponse } from 'next';
-
-export default function handle(_: NextApiRequest, res: NextApiResponse) {
-  res.status(200).send('ok');
-}
diff --git a/plugins/scaffolder-backend/sample-templates/react-ssr-template/skeleton/src/pages/index.tsx b/plugins/scaffolder-backend/sample-templates/react-ssr-template/skeleton/src/pages/index.tsx
deleted file mode 100644
index c01d844f9f..0000000000
--- a/plugins/scaffolder-backend/sample-templates/react-ssr-template/skeleton/src/pages/index.tsx
+++ /dev/null
@@ -1,5 +0,0 @@
-import React from 'react';
-
-const Index = () => <h1>Hello!</h1>;
-
-export default Index;
diff --git a/plugins/scaffolder-backend/sample-templates/react-ssr-template/skeleton/tsconfig.json b/plugins/scaffolder-backend/sample-templates/react-ssr-template/skeleton/tsconfig.json
deleted file mode 100644
index 03508ff043..0000000000
--- a/plugins/scaffolder-backend/sample-templates/react-ssr-template/skeleton/tsconfig.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "extends": "@spotify/tsconfig",
-  "compilerOptions": {
-    "target": "es5",
-    "lib": ["dom", "dom.iterable", "esnext"],
-    "allowJs": true,
-    "skipLibCheck": true,
-    "strict": false,
-    "forceConsistentCasingInFileNames": true,
-    "noEmit": true,
-    "esModuleInterop": true,
-    "module": "esnext",
-    "moduleResolution": "node",
-    "resolveJsonModule": true,
-    "isolatedModules": true,
-    "jsx": "preserve"
-  },
-  "exclude": ["node_modules", "output/node_modules"],
-  "include": ["next-env.d.ts", "**/*.ts", "**/*.tsx"]
-}
diff --git a/plugins/scaffolder-backend/sample-templates/react-ssr-template/template.yaml b/plugins/scaffolder-backend/sample-templates/react-ssr-template/template.yaml
deleted file mode 100644
index 49802a9d62..0000000000
--- a/plugins/scaffolder-backend/sample-templates/react-ssr-template/template.yaml
+++ /dev/null
@@ -1,77 +0,0 @@
-apiVersion: backstage.io/v1beta2
-kind: Template
-metadata:
-  name: react-ssr-template
-  title: React SSR Template
-  description: Create a website powered with Next.js
-  tags:
-    - recommended
-    - react
-spec:
-  owner: web@example.com
-  type: website
-  parameters:
-    - title: Provide some simple information
-      required:
-        - component_id
-        - owner
-      properties:
-        component_id:
-          title: Name
-          type: string
-          description: Unique name of the component
-        description:
-          title: Description
-          type: string
-          description: Help others understand what this website is for.
-        owner:
-          title: Owner
-          type: string
-          description: Owner of the component
-          ui:field: OwnerPicker
-          ui:options:
-            allowedKinds: 
-              - Group
-    - title: Choose a location  
-      required:
-        - repoUrl
-      properties: 
-        repoUrl:
-          title: Repository Location
-          type: string
-          ui:field: RepoUrlPicker
-          ui:options:
-            allowedHosts:
-              - github.com
-  steps:
-    - id: template
-      name: Fetch Skeleton + Template
-      action: fetch:cookiecutter
-      input:
-        url: ./skeleton
-        copyWithoutRender:
-          - .github/workflows/*
-        values:
-          component_id: '{{ parameters.component_id }}'
-          description: '{{ parameters.description }}'
-          destination: '{{ parseRepoUrl parameters.repoUrl }}'
-          owner: '{{ parameters.owner }}'
-
-    - id: publish
-      name: Publish
-      action: publish:github
-      input:
-        allowedHosts: ['github.com']
-        description: 'This is {{ parameters.component_id }}'
-        repoUrl: '{{ parameters.repoUrl }}'
-
-    - id: register
-      name: Register
-      action: catalog:register
-      input:
-        repoContentsUrl: '{{ steps.publish.output.repoContentsUrl }}'
-        catalogInfoPath: '/catalog-info.yaml'
-
-  output:
-    remoteUrl: '{{ steps.publish.output.remoteUrl }}'
-    entityRef: '{{ steps.register.output.entityRef }}'
diff --git a/plugins/scaffolder-backend/sample-templates/remote-templates.yaml b/plugins/scaffolder-backend/sample-templates/remote-templates.yaml
index 7846a0994e..81787b4297 100644
--- a/plugins/scaffolder-backend/sample-templates/remote-templates.yaml
+++ b/plugins/scaffolder-backend/sample-templates/remote-templates.yaml
@@ -7,3 +7,9 @@ spec:
   type: url
   targets:
     - https://github.com/spotify/cookiecutter-golang/blob/master/template.yaml
+    - https://github.com/backstage/software-templates/blob/main/scaffolder-templates/create-react-app/template.yaml
+    - https://github.com/backstage/software-templates/blob/main/scaffolder-templates/docs-template/template.yaml
+    - https://github.com/backstage/software-templates/blob/main/scaffolder-templates/pull-request/template.yaml
+    - https://github.com/backstage/software-templates/blob/main/scaffolder-templates/react-ssr-template/template.yaml
+    - https://github.com/backstage/software-templates/blob/main/scaffolder-templates/springboot-grpc-template/template.yaml
+    - https://github.com/backstage/software-templates/blob/main/scaffolder-templates/v1beta2-demo/template.yaml
diff --git a/plugins/scaffolder-backend/sample-templates/springboot-grpc-template/skeleton/.editorconfig b/plugins/scaffolder-backend/sample-templates/springboot-grpc-template/skeleton/.editorconfig
deleted file mode 100644
index 03eb226ef0..0000000000
--- a/plugins/scaffolder-backend/sample-templates/springboot-grpc-template/skeleton/.editorconfig
+++ /dev/null
@@ -1,10 +0,0 @@
-root = true
-
-[*]
-indent_style = space
-indent_size = 2
-continuation_indent_size = 4
-end_of_line = lf
-charset = utf-8
-trim_trailing_whitespace = true
-insert_final_newline = true
diff --git a/plugins/scaffolder-backend/sample-templates/springboot-grpc-template/skeleton/.github/workflows/build.yml b/plugins/scaffolder-backend/sample-templates/springboot-grpc-template/skeleton/.github/workflows/build.yml
deleted file mode 100644
index 04e1d10b47..0000000000
--- a/plugins/scaffolder-backend/sample-templates/springboot-grpc-template/skeleton/.github/workflows/build.yml
+++ /dev/null
@@ -1,21 +0,0 @@
-name: Java CI with Maven
-
-on:
-  push:
-    branches: [ master ]
-  pull_request:
-    branches: [ master ]
-
-jobs:
-  build:
-
-    runs-on: ubuntu-latest
-
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up JDK 11
-      uses: actions/setup-java@v1
-      with:
-        java-version: 11
-    - name: Build with Maven
-      run: mvn -B package --file pom.xml
diff --git a/plugins/scaffolder-backend/sample-templates/springboot-grpc-template/skeleton/.gitignore b/plugins/scaffolder-backend/sample-templates/springboot-grpc-template/skeleton/.gitignore
deleted file mode 100644
index 1504daa184..0000000000
--- a/plugins/scaffolder-backend/sample-templates/springboot-grpc-template/skeleton/.gitignore
+++ /dev/null
@@ -1,7 +0,0 @@
-target/
-## IntelliJ
-.idea
-*.iml
-
-## Temp
-dependency-reduced-pom.xml
diff --git a/plugins/scaffolder-backend/sample-templates/springboot-grpc-template/skeleton/Dockerfile b/plugins/scaffolder-backend/sample-templates/springboot-grpc-template/skeleton/Dockerfile
deleted file mode 100644
index 1c8a969c8c..0000000000
--- a/plugins/scaffolder-backend/sample-templates/springboot-grpc-template/skeleton/Dockerfile
+++ /dev/null
@@ -1,5 +0,0 @@
-FROM openjdk:11-alpine
-ENTRYPOINT ["/usr/bin/{{cookiecutter.artifact_id}}.sh"]
-
-COPY {{cookiecutter.artifact_id}}.sh /usr/bin/{{cookiecutter.artifact_id}}.sh
-COPY target/{{cookiecutter.artifact_id}}.jar /usr/share/{{cookiecutter.artifact_id}}/{{cookiecutter.artifact_id}}.jar
diff --git a/plugins/scaffolder-backend/sample-templates/springboot-grpc-template/skeleton/README.md b/plugins/scaffolder-backend/sample-templates/springboot-grpc-template/skeleton/README.md
deleted file mode 100644
index 710b6b557e..0000000000
--- a/plugins/scaffolder-backend/sample-templates/springboot-grpc-template/skeleton/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# {{cookiecutter.component_id}}
-
-{{cookiecutter.description}}
diff --git a/plugins/scaffolder-backend/sample-templates/springboot-grpc-template/skeleton/SERVICE.marker b/plugins/scaffolder-backend/sample-templates/springboot-grpc-template/skeleton/SERVICE.marker
deleted file mode 100644
index 1dcf39a3b3..0000000000
--- a/plugins/scaffolder-backend/sample-templates/springboot-grpc-template/skeleton/SERVICE.marker
+++ /dev/null
@@ -1 +0,0 @@
-(This marker file causes Maven to build this artifact as a service)
diff --git a/plugins/scaffolder-backend/sample-templates/springboot-grpc-template/skeleton/catalog-info.yaml b/plugins/scaffolder-backend/sample-templates/springboot-grpc-template/skeleton/catalog-info.yaml
deleted file mode 100644
index aeae2f816a..0000000000
--- a/plugins/scaffolder-backend/sample-templates/springboot-grpc-template/skeleton/catalog-info.yaml
+++ /dev/null
@@ -1,12 +0,0 @@
-apiVersion: backstage.io/v1alpha1
-kind: Component
-metadata:
-  name: {{cookiecutter.component_id | jsonify}}
-  description: {{cookiecutter.description | jsonify}}
-  annotations:
-    github.com/project-slug: {{cookiecutter.destination.owner + "/" + cookiecutter.destination.repo}}
-    backstage.io/techdocs-ref: url:{{"https://" + cookiecutter.destination.host + "/" + cookiecutter.destination.owner + "/" + cookiecutter.destination.repo}}
-spec:
-  type: service
-  lifecycle: experimental
-  owner: {{cookiecutter.owner | jsonify}}
diff --git a/plugins/scaffolder-backend/sample-templates/springboot-grpc-template/skeleton/docs/index.md b/plugins/scaffolder-backend/sample-templates/springboot-grpc-template/skeleton/docs/index.md
deleted file mode 100644
index 5352ef7801..0000000000
--- a/plugins/scaffolder-backend/sample-templates/springboot-grpc-template/skeleton/docs/index.md
+++ /dev/null
@@ -1,28 +0,0 @@
-## {{ cookiecutter.component_id }}
-
-{{ cookiecutter.description }}
-
-## Getting started
-
-Start write your documentation by adding more markdown (.md) files to this folder (/docs) or replace the content in this file.
-
-## Table of Contents
-
-The Table of Contents on the right is generated automatically based on the hierarchy
-of headings. Only use one H1 (`#` in Markdown) per file.
-
-## Site navigation
-
-For new pages to appear in the left hand navigation you need edit the `mkdocs.yml`
-file in root of your repo. The navigation can also link out to other sites.
-
-Alternatively, if there is no `nav` section in `mkdocs.yml`, a navigation section
-will be created for you. However, you will not be able to use alternate titles for
-pages, or include links to other sites.
-
-Note that MkDocs uses `mkdocs.yml`, not `mkdocs.yaml`, although both appear to work.
-See also <https://www.mkdocs.org/user-guide/configuration/>.
-
-## Support
-
-That's it. If you need support, reach out in [#docs-like-code](https://discord.com/channels/687207715902193673/714754240933003266) on Discord.
diff --git a/plugins/scaffolder-backend/sample-templates/springboot-grpc-template/skeleton/mkdocs.yml b/plugins/scaffolder-backend/sample-templates/springboot-grpc-template/skeleton/mkdocs.yml
deleted file mode 100644
index 64f1e9ee8e..0000000000
--- a/plugins/scaffolder-backend/sample-templates/springboot-grpc-template/skeleton/mkdocs.yml
+++ /dev/null
@@ -1,8 +0,0 @@
-site_name: {{cookiecutter.component_id | jsonify}}
-site_description: {{cookiecutter.description | jsonify}}
-
-nav:
-  - Introduction: index.md
-
-plugins:
-  - techdocs-core
diff --git a/plugins/scaffolder-backend/sample-templates/springboot-grpc-template/skeleton/pom.xml b/plugins/scaffolder-backend/sample-templates/springboot-grpc-template/skeleton/pom.xml
deleted file mode 100644
index d5e81cf5e0..0000000000
--- a/plugins/scaffolder-backend/sample-templates/springboot-grpc-template/skeleton/pom.xml
+++ /dev/null
@@ -1,221 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>org.springframework.boot</groupId>
-        <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.2.4.RELEASE</version>
-    </parent>
-
-    <groupId>com.example</groupId>
-    <artifactId>{{cookiecutter.artifact_id}}</artifactId>
-    <version>0.0.1-SNAPSHOT</version>
-    <packaging>jar</packaging>
-
-    <name>{{cookiecutter.artifact_id}}</name>
-    <description>{{cookiecutter.description}}</description>
-
-    <properties>
-        <java.version>11</java.version>
-        <maven.compiler.release>${java.version}</maven.compiler.release>
-        <maven.compiler.source>${java.version}</maven.compiler.source>
-        <maven.compiler.target>${java.version}</maven.compiler.target>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-    </properties>
-    <repositories>
-      <repository>
-        <id>jcenter</id>
-        <url>https://jcenter.bintray.com/</url>
-      </repository>
-    </repositories>
-    <dependencies>
-    	<dependency>
-          <groupId>io.github.lognet</groupId>
-          <artifactId>grpc-spring-boot-starter</artifactId>
-          <version>3.5.1</version>
-      </dependency>
-
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-test</artifactId>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency> <!-- necessary for Java 9+ -->
-          <groupId>org.apache.tomcat</groupId>
-          <artifactId>annotations-api</artifactId>
-          <version>6.0.53</version>
-          <scope>provided</scope>
-        </dependency>
-    </dependencies>
-
-
-    <build>
-        <finalName>${project.artifactId}</finalName>
-        <extensions>
-            <extension>
-                <groupId>kr.motd.maven</groupId>
-                <artifactId>os-maven-plugin</artifactId>
-                <version>1.4.0.Final</version>
-            </extension>
-        </extensions>
-        <plugins>
-            <!-- Compiler Configuration -->
-            <plugin>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.8.1</version>
-                <configuration>
-                    <showWarnings>true</showWarnings>
-                    <forceJavacCompilerUse>true</forceJavacCompilerUse>
-                    <compilerArgs>
-                        <arg>-Xlint:all</arg>
-                    </compilerArgs>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.xolstice.maven.plugins</groupId>
-                <artifactId>protobuf-maven-plugin</artifactId>
-                <version>0.6.1</version>
-                <configuration>
-                    <!--
-                      The version of protoc must match protobuf-java. If you don't depend on
-                      protobuf-java directly, you will be transitively depending on the
-                      protobuf-java version that grpc depends on.
-                    -->
-                    <protoSourceRoot>${project.basedir}/src/main/resources</protoSourceRoot>
-                    <protocArtifact>
-                        com.google.protobuf:protoc:3.9.1:exe:${os.detected.classifier}
-                    </protocArtifact>
-                    <pluginId>grpc-java</pluginId>
-                    <pluginArtifact>
-                        io.grpc:protoc-gen-grpc-java:1.13.1:exe:${os.detected.classifier}
-                    </pluginArtifact>
-                </configuration>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>compile</goal>
-                            <goal>compile-custom</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-
-            <!-- Testing Configuration -->
-            <plugin>
-                <artifactId>maven-failsafe-plugin</artifactId>
-                <version>2.22.2</version>
-                <configuration>
-                    <includes>
-                        <include>**/*IT.java</include>
-                        <include>**/integrationtests/*.java</include>
-                        <include>**/it/**/*.java</include>
-                    </includes>
-                </configuration>
-            </plugin>
-
-            <!-- Quality Configuration -->
-            <plugin>
-                <groupId>com.coveo</groupId>
-                <artifactId>fmt-maven-plugin</artifactId>
-                <version>2.8</version>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>format</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.jacoco</groupId>
-                <artifactId>jacoco-maven-plugin</artifactId>
-                <version>0.8.5</version>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>prepare-agent</goal>
-                            <goal>report</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <artifactId>maven-enforcer-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>enforce</id>
-                        <goals>
-                            <goal>enforce</goal>
-                        </goals>
-                        <configuration>
-                            <rules>
-                                <requireUpperBoundDeps/>
-                            </rules>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-
-            <plugin>
-                <artifactId>maven-jar-plugin</artifactId>
-                <configuration>
-                    <archive>
-                        <addMavenDescriptor>true</addMavenDescriptor>
-                        <manifest>
-                            <mainClass>${start-class}</mainClass>
-                            <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
-                            <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
-                        </manifest>
-                        <manifestEntries>
-                            <Implementation-Version>
-                                ${project.version}-${buildTimestamp}-${buildNumber}
-                            </Implementation-Version>
-                        </manifestEntries>
-                    </archive>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>build-info</id>
-                        <goals>
-                            <goal>build-info</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <artifactId>maven-source-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>attach-sources</id>
-                        <goals>
-                            <goal>jar</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <artifactId>maven-javadoc-plugin</artifactId>
-                <configuration>
-                    <show>private</show>
-                </configuration>
-                <executions>
-                    <execution>
-                        <id>attach-javadocs</id>
-                        <goals>
-                            <goal>jar</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-</project>
diff --git a/plugins/scaffolder-backend/sample-templates/springboot-grpc-template/skeleton/src/main/java/com/example/{{cookiecutter.java_package_name}}/Application.java b/plugins/scaffolder-backend/sample-templates/springboot-grpc-template/skeleton/src/main/java/com/example/{{cookiecutter.java_package_name}}/Application.java
deleted file mode 100644
index 7ead2562d0..0000000000
--- a/plugins/scaffolder-backend/sample-templates/springboot-grpc-template/skeleton/src/main/java/com/example/{{cookiecutter.java_package_name}}/Application.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.example.{{cookiecutter.java_package_name}};
-
-import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.SpringBootApplication;
-
-@SpringBootApplication
-public class Application {
-
-  public static void main(String[] args) {
-    SpringApplication.run(Application.class, args);
-  }
-}
diff --git a/plugins/scaffolder-backend/sample-templates/springboot-grpc-template/skeleton/src/main/java/com/example/{{cookiecutter.java_package_name}}/GreeterService.java b/plugins/scaffolder-backend/sample-templates/springboot-grpc-template/skeleton/src/main/java/com/example/{{cookiecutter.java_package_name}}/GreeterService.java
deleted file mode 100644
index 90b8412a04..0000000000
--- a/plugins/scaffolder-backend/sample-templates/springboot-grpc-template/skeleton/src/main/java/com/example/{{cookiecutter.java_package_name}}/GreeterService.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package com.example.{{cookiecutter.java_package_name}};
-
-import com.example.{{cookiecutter.java_package_name}}.proto.GreeterGrpc;
-import com.example.{{cookiecutter.java_package_name}}.proto.GreeterOuterClass;
-import io.grpc.stub.StreamObserver;
-import org.lognet.springboot.grpc.GRpcService;
-
-@GRpcService
-public class GreeterService extends GreeterGrpc.GreeterImplBase {
-
-  @Override
-  public void sayHello(final GreeterOuterClass.HelloRequest request,
-                       final StreamObserver<GreeterOuterClass.HelloReply> responseObserver) {
-    final GreeterOuterClass.HelloReply.Builder replyBuilder =
-        GreeterOuterClass.HelloReply.newBuilder().setMessage("Hello " + request.getName());
-    responseObserver.onNext(replyBuilder.build());
-    responseObserver.onCompleted();
-  }
-}
diff --git a/plugins/scaffolder-backend/sample-templates/springboot-grpc-template/skeleton/src/main/resources/application.properties b/plugins/scaffolder-backend/sample-templates/springboot-grpc-template/skeleton/src/main/resources/application.properties
deleted file mode 100644
index 03be3b6ebf..0000000000
--- a/plugins/scaffolder-backend/sample-templates/springboot-grpc-template/skeleton/src/main/resources/application.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-spring.application.name={{cookiecutter.component_id}}
-server.port={{cookiecutter.http_port}}
-grpc.enableReflection=true
diff --git a/plugins/scaffolder-backend/sample-templates/springboot-grpc-template/skeleton/src/main/resources/banner.txt b/plugins/scaffolder-backend/sample-templates/springboot-grpc-template/skeleton/src/main/resources/banner.txt
deleted file mode 100644
index 46846ba35e..0000000000
--- a/plugins/scaffolder-backend/sample-templates/springboot-grpc-template/skeleton/src/main/resources/banner.txt
+++ /dev/null
@@ -1,22 +0,0 @@
-${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE}
-${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE}
-${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE}
-${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE}
-${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE}
-${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE}
-${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE}
-${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE}
-${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE}
-${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE}
-${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE}
-${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE}
-${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE}
-${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE}
-${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE}
-${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE}
-${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE}
-${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE}
-${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE}
-${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE}
-${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE}
-${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE}
diff --git a/plugins/scaffolder-backend/sample-templates/springboot-grpc-template/skeleton/src/main/resources/greeter.proto b/plugins/scaffolder-backend/sample-templates/springboot-grpc-template/skeleton/src/main/resources/greeter.proto
deleted file mode 100644
index 8015d914ee..0000000000
--- a/plugins/scaffolder-backend/sample-templates/springboot-grpc-template/skeleton/src/main/resources/greeter.proto
+++ /dev/null
@@ -1,17 +0,0 @@
-syntax = "proto3";
-
-option java_package = "com.example.{{cookiecutter.java_package_name}}.proto";
-
-service Greeter {
-    rpc SayHello ( HelloRequest) returns (  HelloReply) {}
-}
-
-// The request message containing the user's name.
-message HelloRequest {
-    string name = 1;
-}
-
-// The response message containing the greetings
-message HelloReply {
-    string message = 1;
-}
diff --git a/plugins/scaffolder-backend/sample-templates/springboot-grpc-template/skeleton/src/test/java/com/example/{{cookiecutter.java_package_name}}/ApplicationTest.java b/plugins/scaffolder-backend/sample-templates/springboot-grpc-template/skeleton/src/test/java/com/example/{{cookiecutter.java_package_name}}/ApplicationTest.java
deleted file mode 100644
index 1d7298172a..0000000000
--- a/plugins/scaffolder-backend/sample-templates/springboot-grpc-template/skeleton/src/test/java/com/example/{{cookiecutter.java_package_name}}/ApplicationTest.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package com.example.{{cookiecutter.java_package_name}};
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.context.junit4.SpringRunner;
-
-@RunWith(SpringRunner.class)
-@SpringBootTest
-public class ApplicationTest {
-
-	@Test
-	public void contextLoads() {
-	}
-}
diff --git a/plugins/scaffolder-backend/sample-templates/springboot-grpc-template/skeleton/{{cookiecutter.artifact_id}}.sh b/plugins/scaffolder-backend/sample-templates/springboot-grpc-template/skeleton/{{cookiecutter.artifact_id}}.sh
deleted file mode 100755
index c69b980dc8..0000000000
--- a/plugins/scaffolder-backend/sample-templates/springboot-grpc-template/skeleton/{{cookiecutter.artifact_id}}.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec /usr/bin/java $JVM_DEFAULT_ARGS $JVM_ARGS -jar /usr/share/{{cookiecutter.artifact_id}}/{{cookiecutter.artifact_id}}.jar "$@"
diff --git a/plugins/scaffolder-backend/sample-templates/springboot-grpc-template/template.yaml b/plugins/scaffolder-backend/sample-templates/springboot-grpc-template/template.yaml
deleted file mode 100644
index c306187581..0000000000
--- a/plugins/scaffolder-backend/sample-templates/springboot-grpc-template/template.yaml
+++ /dev/null
@@ -1,88 +0,0 @@
-apiVersion: backstage.io/v1beta2
-kind: Template
-metadata:
-  name: springboot-template
-  title: Spring Boot gRPC Service
-  description: Create a simple microservice using gRPC and Spring Boot Java
-  tags:
-    - recommended
-    - java
-    - grpc
-spec:
-  owner: service@example.com
-  type: service
-  
-  parameters:
-    - title: Provide some simple information
-      required:
-        - component_id
-        - owner
-        - java_package_name
-      properties:
-        component_id:
-          title: Name
-          type: string
-          description: Unique name of the component
-        java_package_name:
-          title: Java Package Name
-          type: string
-          description: Name for the java package. eg (io.backstage.blah)
-        description:
-          title: Description
-          type: string
-          description: Help others understand what this website is for.
-        owner:
-          title: Owner
-          type: string
-          description: Owner of the component
-          ui:field: OwnerPicker
-          ui:options:
-            allowedKinds: 
-              - Group
-    - title: Choose a location  
-      required:
-        - repoUrl
-      properties: 
-        repoUrl:
-          title: Repository Location
-          type: string
-          ui:field: RepoUrlPicker
-          ui:options:
-            allowedHosts:
-              - github.com
-
-  steps:
-    - id: template
-      name: Fetch Skeleton + Template
-      action: fetch:cookiecutter
-      input:
-        url: ./skeleton
-        copyWithoutRender:
-          - .github/workflows/*
-        values:
-          component_id: '{{ parameters.component_id }}'
-          description: '{{ parameters.description }}'
-          artifact_id: '{{ parameters.component_id }}'
-          java_package_name: '{{ parameters.java_package_name }}'
-          owner: '{{ parameters.owner }}'
-          destination: '{{ parseRepoUrl parameters.repoUrl }}'
-          http_port: 8080
-
-    - id: publish
-      name: Publish
-      action: publish:github
-      input:
-        allowedHosts: ['github.com']
-        description: 'This is {{ parameters.component_id }}'
-        repoUrl: '{{ parameters.repoUrl }}'
-
-    - id: register
-      name: Register
-      action: catalog:register
-      input:
-        repoContentsUrl: '{{ steps.publish.output.repoContentsUrl }}'
-        catalogInfoPath: '/catalog-info.yaml'
-
-  output:
-    remoteUrl: '{{ steps.publish.output.remoteUrl }}'
-    entityRef: '{{ steps.register.output.entityRef }}'
diff --git a/plugins/scaffolder-backend/sample-templates/v1beta2-demo/template/catalog-info.yaml b/plugins/scaffolder-backend/sample-templates/v1beta2-demo/template/catalog-info.yaml
deleted file mode 100644
index 02da577b39..0000000000
--- a/plugins/scaffolder-backend/sample-templates/v1beta2-demo/template/catalog-info.yaml
+++ /dev/null
@@ -1,12 +0,0 @@
-apiVersion: backstage.io/v1alpha1
-kind: Component
-metadata:
-  name: {{cookiecutter.name | jsonify}}
-  github.com/project-slug: {{cookiecutter.destination.owner + "/" + cookiecutter.destination.repo}}
-spec:
-  type: website
-  lifecycle: experimental
-  owner: {{cookiecutter.owner | jsonify}}
-{%- if 'system' in cookiecutter %}
-  system: {{ cookiecutter.system | jsonify }}
-{%- endif %}
diff --git a/plugins/scaffolder-backend/src/scaffolder/__mocks__/@octokit/rest/index.ts b/plugins/scaffolder-backend/src/scaffolder/__mocks__/@octokit/rest/index.ts
index 75cdfc208f..b60c3fcb2d 100644
--- a/plugins/scaffolder-backend/src/scaffolder/__mocks__/@octokit/rest/index.ts
+++ b/plugins/scaffolder-backend/src/scaffolder/__mocks__/@octokit/rest/index.ts
@@ -15,9 +15,15 @@
  */
 
 export const mockGithubClient = {
+  rest: {
+    actions: {
+      createWorkflowDispatch: jest.fn(),
+    },
+  },
   repos: {
     createInOrg: jest.fn(),
     createForAuthenticatedUser: jest.fn(),
+    createWebhook: jest.fn(),
     addCollaborator: jest.fn(),
     replaceAllTopics: jest.fn(),
   },
diff --git a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/catalog/register.test.ts b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/catalog/register.test.ts
index fff2b28ff0..68e2450ca0 100644
--- a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/catalog/register.test.ts
+++ b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/catalog/register.test.ts
@@ -39,7 +39,7 @@ describe('catalog:register', () => {
 
   const action = createCatalogRegisterAction({
     integrations,
-    catalogClient: (catalogClient as unknown) as CatalogApi,
+    catalogClient: catalogClient as unknown as CatalogApi,
   });
 
   const mockContext = {
diff --git a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/catalog/register.ts b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/catalog/register.ts
index 72b86cbf79..70170b8b90 100644
--- a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/catalog/register.ts
+++ b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/catalog/register.ts
@@ -76,10 +76,8 @@ export function createCatalogRegisterAction(options: {
       if ('catalogInfoUrl' in input) {
         catalogInfoUrl = input.catalogInfoUrl;
       } else {
-        const {
-          repoContentsUrl,
-          catalogInfoPath = '/catalog-info.yaml',
-        } = input;
+        const { repoContentsUrl, catalogInfoPath = '/catalog-info.yaml' } =
+          input;
         const integration = integrations.byUrl(repoContentsUrl);
         if (!integration) {
           throw new InputError(
diff --git a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/createBuiltinActions.ts b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/createBuiltinActions.ts
index 6541625035..d38dfe3cdc 100644
--- a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/createBuiltinActions.ts
+++ b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/createBuiltinActions.ts
@@ -24,11 +24,8 @@ import {
 } from './catalog';
 
 import { createDebugLogAction } from './debug';
-import {
-  createFetchCookiecutterAction,
-  createFetchPlainAction,
-  createFetchTemplateAction,
-} from './fetch';
+import { createFetchPlainAction, createFetchTemplateAction } from './fetch';
+import { createFetchCookiecutterAction } from '@backstage/plugin-scaffolder-backend-module-cookiecutter';
 import {
   createFilesystemDeleteAction,
   createFilesystemRenameAction,
@@ -40,6 +37,10 @@ import {
   createPublishGithubPullRequestAction,
   createPublishGitlabAction,
 } from './publish';
+import {
+  createGithubActionsDispatchAction,
+  createGithubWebhookAction,
+} from './github';
 
 export const createBuiltinActions = (options: {
   reader: UrlReader;
@@ -48,13 +49,8 @@ export const createBuiltinActions = (options: {
   containerRunner: ContainerRunner;
   config: Config;
 }) => {
-  const {
-    reader,
-    integrations,
-    containerRunner,
-    catalogClient,
-    config,
-  } = options;
+  const { reader, integrations, containerRunner, catalogClient, config } =
+    options;
 
   return [
     createFetchPlainAction({
@@ -94,5 +90,11 @@ export const createBuiltinActions = (options: {
     createCatalogWriteAction(),
     createFilesystemDeleteAction(),
     createFilesystemRenameAction(),
+    createGithubActionsDispatchAction({
+      integrations,
+    }),
+    createGithubWebhookAction({
+      integrations,
+    }),
   ];
 };
diff --git a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/debug/log.test.ts b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/debug/log.test.ts
index efcd1507ef..38c50afecc 100644
--- a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/debug/log.test.ts
+++ b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/debug/log.test.ts
@@ -22,9 +22,9 @@ import { createDebugLogAction } from './log';
 import { join } from 'path';
 
 describe('debug:log', () => {
-  const logStream = ({
+  const logStream = {
     write: jest.fn(),
-  } as jest.Mocked<Partial<Writable>>) as jest.Mocked<Writable>;
+  } as jest.Mocked<Partial<Writable>> as jest.Mocked<Writable>;
 
   const mockTmpDir = os.tmpdir();
   const mockContext = {
diff --git a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/fetch/index.ts b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/fetch/index.ts
index fea32df39c..c9a16c274e 100644
--- a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/fetch/index.ts
+++ b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/fetch/index.ts
@@ -15,6 +15,5 @@
  */
 
 export { createFetchPlainAction } from './plain';
-export { createFetchCookiecutterAction } from './cookiecutter';
 export { createFetchTemplateAction } from './template';
 export { fetchContents } from './helpers';
diff --git a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/fetch/plain.test.ts b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/fetch/plain.test.ts
index 1a4428e3f0..0ef095bf79 100644
--- a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/fetch/plain.test.ts
+++ b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/fetch/plain.test.ts
@@ -56,8 +56,7 @@ describe('fetch:plain', () => {
       action.handler({
         ...mockContext,
         input: {
-          url:
-            'https://github.com/backstage/community/tree/main/backstage-community-sessions/assets',
+          url: 'https://github.com/backstage/community/tree/main/backstage-community-sessions/assets',
           targetPath: '/foobar',
         },
       }),
@@ -70,8 +69,7 @@ describe('fetch:plain', () => {
     await action.handler({
       ...mockContext,
       input: {
-        url:
-          'https://github.com/backstage/community/tree/main/backstage-community-sessions/assets',
+        url: 'https://github.com/backstage/community/tree/main/backstage-community-sessions/assets',
         targetPath: 'lol',
       },
     });
diff --git a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/fetch/template.test.ts b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/fetch/template.test.ts
index bd2beae47a..d676af56ca 100644
--- a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/fetch/template.test.ts
+++ b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/fetch/template.test.ts
@@ -75,8 +75,8 @@ describe('fetch:template', () => {
     mockFs();
 
     action = createFetchTemplateAction({
-      reader: (Symbol('UrlReader') as unknown) as UrlReader,
-      integrations: (Symbol('Integrations') as unknown) as ScmIntegrations,
+      reader: Symbol('UrlReader') as unknown as UrlReader,
+      integrations: Symbol('Integrations') as unknown as ScmIntegrations,
     });
   });
 
@@ -100,11 +100,37 @@ describe('fetch:template', () => {
     it('throws if copyWithoutRender parameter is not an array', async () => {
       await expect(() =>
         action.handler(
-          mockContext({ copyWithoutRender: ('abc' as unknown) as string[] }),
+          mockContext({ copyWithoutRender: 'abc' as unknown as string[] }),
         ),
       ).rejects.toThrowError(/copyWithoutRender must be an array/i);
     });
 
+    it('throws if copyWithoutRender is used with extension', async () => {
+      await expect(() =>
+        action.handler(
+          mockContext({
+            copyWithoutRender: ['abc'],
+            templateFileExtension: true,
+          }),
+        ),
+      ).rejects.toThrowError(
+        /input extension incompatible with copyWithoutRender and cookiecutterCompat/,
+      );
+    });
+
+    it('throws if cookiecutterCompat is used with extension', async () => {
+      await expect(() =>
+        action.handler(
+          mockContext({
+            cookiecutterCompat: true,
+            templateFileExtension: true,
+          }),
+        ),
+      ).rejects.toThrowError(
+        /input extension incompatible with copyWithoutRender and cookiecutterCompat/,
+      );
+    });
+
     describe('with valid input', () => {
       let context: ActionContext<FetchTemplateInput>;
 
@@ -120,6 +146,10 @@ describe('fetch:template', () => {
         mockFetchContents.mockImplementation(({ outputPath }) => {
           mockFs({
             [outputPath]: {
+              'an-executable.sh': mockFs.file({
+                content: '#!/usr/bin/env bash',
+                mode: parseInt('100755', 8),
+              }),
               'empty-dir-${{ values.count }}': {},
               'static.txt': 'static content',
               '${{ values.name }}.txt': 'static content',
@@ -185,6 +215,13 @@ describe('fetch:template', () => {
           fs.readFile(`${workspacePath}/target/a-binary-file.png`),
         ).resolves.toEqual(aBinaryFile);
       });
+      it('copies files and maintains the original file permissions', async () => {
+        await expect(
+          fs
+            .stat(`${workspacePath}/target/an-executable.sh`)
+            .then(fObj => fObj.mode),
+        ).resolves.toEqual(parseInt('100755', 8));
+      });
     });
 
     describe('copyWithoutRender', () => {
@@ -292,4 +329,126 @@ describe('fetch:template', () => {
       ).resolves.toEqual('["first","second","third"]');
     });
   });
+
+  describe('with extension=true', () => {
+    let context: ActionContext<FetchTemplateInput>;
+
+    beforeEach(async () => {
+      context = mockContext({
+        values: {
+          name: 'test-project',
+          count: 1234,
+          itemList: ['first', 'second', 'third'],
+        },
+        templateFileExtension: true,
+      });
+
+      mockFetchContents.mockImplementation(({ outputPath }) => {
+        mockFs({
+          [outputPath]: {
+            'empty-dir-${{ values.count }}': {},
+            'static.txt': 'static content',
+            '${{ values.name }}.txt': 'static content',
+            '${{ values.name }}.txt.jinja2':
+              '${{ values.name }}: ${{ values.count }}',
+            subdir: {
+              'templated-content.txt.njk':
+                '${{ values.name }}: ${{ values.count }}',
+            },
+            '.${{ values.name }}.njk': '${{ values.itemList | dump }}',
+            'a-binary-file.png': aBinaryFile,
+          },
+        });
+
+        return Promise.resolve();
+      });
+
+      await action.handler(context);
+    });
+
+    it('copies files with no templating in names or content successfully', async () => {
+      await expect(
+        fs.readFile(`${workspacePath}/target/static.txt`, 'utf-8'),
+      ).resolves.toEqual('static content');
+    });
+
+    it('copies files with templated names successfully', async () => {
+      await expect(
+        fs.readFile(`${workspacePath}/target/test-project.txt`, 'utf-8'),
+      ).resolves.toEqual('static content');
+    });
+
+    it('copies jinja2 files with templated names successfully', async () => {
+      await expect(
+        fs.readFile(`${workspacePath}/target/test-project.txt.jinja2`, 'utf-8'),
+      ).resolves.toEqual('${{ values.name }}: ${{ values.count }}');
+    });
+
+    it('copies files with templated content successfully', async () => {
+      await expect(
+        fs.readFile(
+          `${workspacePath}/target/subdir/templated-content.txt`,
+          'utf-8',
+        ),
+      ).resolves.toEqual('test-project: 1234');
+    });
+
+    it('processes dotfiles', async () => {
+      await expect(
+        fs.readFile(`${workspacePath}/target/.test-project`, 'utf-8'),
+      ).resolves.toEqual('["first","second","third"]');
+    });
+
+    it('copies empty directories', async () => {
+      await expect(
+        fs.readdir(`${workspacePath}/target/empty-dir-1234`, 'utf-8'),
+      ).resolves.toEqual([]);
+    });
+
+    it('copies binary files as-is without processing them', async () => {
+      await expect(
+        fs.readFile(`${workspacePath}/target/a-binary-file.png`),
+      ).resolves.toEqual(aBinaryFile);
+    });
+  });
+
+  describe('with specified .jinja2 extension', () => {
+    let context: ActionContext<FetchTemplateInput>;
+
+    beforeEach(async () => {
+      context = mockContext({
+        templateFileExtension: '.jinja2',
+        values: {
+          name: 'test-project',
+          count: 1234,
+        },
+      });
+
+      mockFetchContents.mockImplementation(({ outputPath }) => {
+        mockFs({
+          [outputPath]: {
+            '${{ values.name }}.njk': '${{ values.name }}: ${{ values.count }}',
+            '${{ values.name }}.txt.jinja2':
+              '${{ values.name }}: ${{ values.count }}',
+          },
+        });
+
+        return Promise.resolve();
+      });
+
+      await action.handler(context);
+    });
+
+    it('does not process .njk files', async () => {
+      await expect(
+        fs.readFile(`${workspacePath}/target/test-project.njk`, 'utf-8'),
+      ).resolves.toEqual('${{ values.name }}: ${{ values.count }}');
+    });
+
+    it('does process .jinja2 files', async () => {
+      await expect(
+        fs.readFile(`${workspacePath}/target/test-project.txt`, 'utf-8'),
+      ).resolves.toEqual('test-project: 1234');
+    });
+  });
 });
diff --git a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/fetch/template.ts b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/fetch/template.ts
index 87e67f76be..bb568c25e6 100644
--- a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/fetch/template.ts
+++ b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/fetch/template.ts
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import { resolve as resolvePath } from 'path';
+import { resolve as resolvePath, extname } from 'path';
 import { resolveSafeChildPath, UrlReader } from '@backstage/backend-common';
 import { InputError } from '@backstage/errors';
 import { ScmIntegrations } from '@backstage/integration';
@@ -38,13 +38,21 @@ import { isBinaryFile } from 'isbinaryfile';
  */
 nunjucks.installJinjaCompat();
 
+type CookieCompatInput = {
+  copyWithoutRender?: string[];
+  cookiecutterCompat?: boolean;
+};
+
+type ExtensionInput = {
+  templateFileExtension?: string | boolean;
+};
+
 export type FetchTemplateInput = {
   url: string;
   targetPath?: string;
   values: any;
-  copyWithoutRender?: string[];
-  cookiecutterCompat?: boolean;
-};
+} & CookieCompatInput &
+  ExtensionInput;
 
 export function createFetchTemplateAction(options: {
   reader: UrlReader;
@@ -93,6 +101,12 @@ export function createFetchTemplateAction(options: {
               'Enable features to maximise compatibility with templates built for fetch:cookiecutter',
             type: 'boolean',
           },
+          templateFileExtension: {
+            title: 'Template File Extension',
+            description:
+              'If set, only files with the given extension will be templated. If set to `true`, the default extension `.njk` is used.',
+            type: ['string', 'boolean'],
+          },
         },
       },
     },
@@ -114,6 +128,26 @@ export function createFetchTemplateAction(options: {
         );
       }
 
+      if (
+        ctx.input.templateFileExtension &&
+        (ctx.input.copyWithoutRender || ctx.input.cookiecutterCompat)
+      ) {
+        throw new InputError(
+          'Fetch action input extension incompatible with copyWithoutRender and cookiecutterCompat',
+        );
+      }
+
+      let extension: string | false = false;
+      if (ctx.input.templateFileExtension) {
+        extension =
+          ctx.input.templateFileExtension === true
+            ? '.njk'
+            : ctx.input.templateFileExtension;
+        if (!extension.startsWith('.')) {
+          extension = `.${extension}`;
+        }
+      }
+
       await fetchContents({
         reader,
         integrations,
@@ -190,18 +224,27 @@ export function createFetchTemplateAction(options: {
       );
 
       for (const location of allEntriesInTemplate) {
-        const shouldCopyWithoutRender = nonTemplatedEntries.has(location);
+        let renderFilename: boolean;
+        let renderContents: boolean;
 
-        const outputPath = resolvePath(
-          outputDir,
-          shouldCopyWithoutRender
-            ? location
-            : templater.renderString(location, context),
-        );
+        let localOutputPath = location;
+        if (extension) {
+          renderFilename = true;
+          renderContents = extname(localOutputPath) === extension;
+          if (renderContents) {
+            localOutputPath = localOutputPath.slice(0, -extension.length);
+          }
+        } else {
+          renderFilename = renderContents = !nonTemplatedEntries.has(location);
+        }
+        if (renderFilename) {
+          localOutputPath = templater.renderString(localOutputPath, context);
+        }
+        const outputPath = resolvePath(outputDir, localOutputPath);
 
-        if (shouldCopyWithoutRender) {
+        if (!renderContents && !extension) {
           ctx.logger.info(
-            `Copying file/directory ${location} without processing since it matches a pattern in "copyWithoutRender".`,
+            `Copying file/directory ${location} without processing.`,
           );
         }
 
@@ -219,15 +262,17 @@ export function createFetchTemplateAction(options: {
             );
             await fs.copy(inputFilePath, outputPath);
           } else {
+            const statsObj = await fs.stat(inputFilePath);
             ctx.logger.info(
-              `Writing file ${location} to template output path.`,
+              `Writing file ${location} to template output path with mode ${statsObj.mode}.`,
             );
             const inputFileContents = await fs.readFile(inputFilePath, 'utf-8');
             await fs.outputFile(
               outputPath,
-              shouldCopyWithoutRender
-                ? inputFileContents
-                : templater.renderString(inputFileContents, context),
+              renderContents
+                ? templater.renderString(inputFileContents, context)
+                : inputFileContents,
+              { mode: statsObj.mode },
             );
           }
         }
diff --git a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/OctokitProvider.test.ts b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/OctokitProvider.test.ts
new file mode 100644
index 0000000000..91b23f40dd
--- /dev/null
+++ b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/OctokitProvider.test.ts
@@ -0,0 +1,69 @@
+/*
+ * Copyright 2021 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { OctokitProvider } from './OctokitProvider';
+import { ScmIntegrations } from '@backstage/integration';
+import { ConfigReader } from '@backstage/config';
+
+describe('getOctokit', () => {
+  const config = new ConfigReader({
+    integrations: {
+      github: [
+        { host: 'github.com', token: 'tokenlols' },
+        { host: 'ghe.github.com' },
+      ],
+    },
+  });
+
+  const integrations = ScmIntegrations.fromConfig(config);
+  const octokitProvider = new OctokitProvider(integrations);
+
+  beforeEach(() => {
+    jest.resetAllMocks();
+  });
+
+  it('should throw an error when the repoUrl is not well formed', async () => {
+    await expect(
+      octokitProvider.getOctokit('github.com?repo=bob'),
+    ).rejects.toThrow(/missing owner/);
+
+    await expect(
+      octokitProvider.getOctokit('github.com?owner=owner'),
+    ).rejects.toThrow(/missing repo/);
+  });
+
+  it('should throw if there is no integration config provided', async () => {
+    await expect(
+      octokitProvider.getOctokit('missing.com?repo=bob&owner=owner'),
+    ).rejects.toThrow(/No matching integration configuration/);
+  });
+
+  it('should throw if there is no token in the integration config that is returned', async () => {
+    await expect(
+      octokitProvider.getOctokit('ghe.github.com?repo=bob&owner=owner'),
+    ).rejects.toThrow(/No token available for host/);
+  });
+
+  it('should return proper Octokit', async () => {
+    const { client, token, owner, repo } = await octokitProvider.getOctokit(
+      'github.com?repo=bob&owner=owner',
+    );
+    expect(client).toBeDefined();
+    expect(token).toBe('tokenlols');
+    expect(owner).toBe('owner');
+    expect(repo).toBe('bob');
+  });
+});
diff --git a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/OctokitProvider.ts b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/OctokitProvider.ts
new file mode 100644
index 0000000000..bea027a91b
--- /dev/null
+++ b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/OctokitProvider.ts
@@ -0,0 +1,97 @@
+/*
+ * Copyright 2021 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { InputError } from '@backstage/errors';
+import {
+  GithubCredentialsProvider,
+  ScmIntegrationRegistry,
+} from '@backstage/integration';
+import { Octokit } from '@octokit/rest';
+import { parseRepoUrl } from '../publish/util';
+
+export type OctokitIntegration = {
+  client: Octokit;
+  token: string;
+  owner: string;
+  repo: string;
+};
+/**
+ * OctokitProvider provides Octokit client based on ScmIntegrationsRegistry configuration.
+ * OctokitProvider supports GitHub credentials caching out of the box.
+ */
+export class OctokitProvider {
+  private readonly integrations: ScmIntegrationRegistry;
+  private readonly credentialsProviders: Map<string, GithubCredentialsProvider>;
+
+  constructor(integrations: ScmIntegrationRegistry) {
+    this.integrations = integrations;
+    this.credentialsProviders = new Map(
+      integrations.github.list().map(integration => {
+        const provider = GithubCredentialsProvider.create(integration.config);
+        return [integration.config.host, provider];
+      }),
+    );
+  }
+
+  /**
+   * gets standard Octokit client based on repository URL.
+   *
+   * @param repoUrl Repository URL
+   */
+  async getOctokit(repoUrl: string): Promise<OctokitIntegration> {
+    const { owner, repo, host } = parseRepoUrl(repoUrl, this.integrations);
+
+    if (!owner) {
+      throw new InputError(`No owner provided for repo ${repoUrl}`);
+    }
+
+    const integrationConfig = this.integrations.github.byHost(host)?.config;
+
+    if (!integrationConfig) {
+      throw new InputError(`No integration for host ${host}`);
+    }
+
+    const credentialsProvider = this.credentialsProviders.get(host);
+
+    if (!credentialsProvider) {
+      throw new InputError(
+        `No matching credentials for host ${host}, please check your integrations config`,
+      );
+    }
+
+    // TODO(blam): Consider changing this API to have owner, repo interface instead of URL as the it's
+    // needless to create URL and then parse again the other side.
+    const { token } = await credentialsProvider.getCredentials({
+      url: `https://${host}/${encodeURIComponent(owner)}/${encodeURIComponent(
+        repo,
+      )}`,
+    });
+
+    if (!token) {
+      throw new InputError(
+        `No token available for host: ${host}, with owner ${owner}, and repo ${repo}`,
+      );
+    }
+
+    const client = new Octokit({
+      auth: token,
+      baseUrl: integrationConfig.apiBaseUrl,
+      previews: ['nebula-preview'],
+    });
+
+    return { client, token, owner, repo };
+  }
+}
diff --git a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/githubActionsDispatch.test.ts b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/githubActionsDispatch.test.ts
new file mode 100644
index 0000000000..ab1bbfc488
--- /dev/null
+++ b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/githubActionsDispatch.test.ts
@@ -0,0 +1,81 @@
+/*
+ * Copyright 2021 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+jest.mock('@octokit/rest');
+
+import { createGithubActionsDispatchAction } from './githubActionsDispatch';
+import { ScmIntegrations } from '@backstage/integration';
+import { ConfigReader } from '@backstage/config';
+import { getVoidLogger } from '@backstage/backend-common';
+import { PassThrough } from 'stream';
+
+describe('github:actions:dispatch', () => {
+  const config = new ConfigReader({
+    integrations: {
+      github: [
+        { host: 'github.com', token: 'tokenlols' },
+        { host: 'ghe.github.com' },
+      ],
+    },
+  });
+
+  const integrations = ScmIntegrations.fromConfig(config);
+  const action = createGithubActionsDispatchAction({ integrations });
+
+  const mockContext = {
+    input: {
+      repoUrl: 'github.com?repo=repo&owner=owner',
+      workflowId: 'a-workflow-id',
+      branchOrTagName: 'main',
+    },
+    workspacePath: 'lol',
+    logger: getVoidLogger(),
+    logStream: new PassThrough(),
+    output: jest.fn(),
+    createTemporaryDirectory: jest.fn(),
+  };
+
+  const { mockGithubClient } = require('@octokit/rest');
+
+  beforeEach(() => {
+    jest.resetAllMocks();
+  });
+
+  it('should call the githubApis for creating WorkflowDispatch', async () => {
+    mockGithubClient.rest.actions.createWorkflowDispatch.mockResolvedValue({
+      data: {
+        foo: 'bar',
+      },
+    });
+
+    const repoUrl = 'github.com?repo=repo&owner=owner';
+    const workflowId = 'dispatch_workflow';
+    const branchOrTagName = 'main';
+    const ctx = Object.assign({}, mockContext, {
+      input: { repoUrl, workflowId, branchOrTagName },
+    });
+    await action.handler(ctx);
+
+    expect(
+      mockGithubClient.rest.actions.createWorkflowDispatch,
+    ).toHaveBeenCalledWith({
+      owner: 'owner',
+      repo: 'repo',
+      workflow_id: workflowId,
+      ref: branchOrTagName,
+    });
+  });
+});
diff --git a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/githubActionsDispatch.ts b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/githubActionsDispatch.ts
new file mode 100644
index 0000000000..661101d184
--- /dev/null
+++ b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/githubActionsDispatch.ts
@@ -0,0 +1,77 @@
+/*
+ * Copyright 2021 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import { ScmIntegrationRegistry } from '@backstage/integration';
+import { createTemplateAction } from '../../createTemplateAction';
+import { OctokitProvider } from './OctokitProvider';
+
+export function createGithubActionsDispatchAction(options: {
+  integrations: ScmIntegrationRegistry;
+}) {
+  const { integrations } = options;
+  const octokitProvider = new OctokitProvider(integrations);
+
+  return createTemplateAction<{
+    repoUrl: string;
+    workflowId: string;
+    branchOrTagName: string;
+  }>({
+    id: 'github:actions:dispatch',
+    description:
+      'Dispatches a GitHub Action workflow for a given branch or tag',
+    schema: {
+      input: {
+        type: 'object',
+        required: ['repoUrl', 'workflowId', 'branchOrTagName'],
+        properties: {
+          repoUrl: {
+            title: 'Repository Location',
+            description: `Accepts the format 'github.com?repo=reponame&owner=owner' where 'reponame' is the new repository name and 'owner' is an organization or username`,
+            type: 'string',
+          },
+          workflowId: {
+            title: 'Workflow ID',
+            description: 'The GitHub Action Workflow filename',
+            type: 'string',
+          },
+          branchOrTagName: {
+            title: 'Branch or Tag name',
+            description:
+              'The git branch or tag name used to dispatch the workflow',
+            type: 'string',
+          },
+        },
+      },
+    },
+    async handler(ctx) {
+      const { repoUrl, workflowId, branchOrTagName } = ctx.input;
+
+      ctx.logger.info(
+        `Dispatching workflow ${workflowId} for repo ${repoUrl} on ${branchOrTagName}`,
+      );
+
+      const { client, owner, repo } = await octokitProvider.getOctokit(repoUrl);
+
+      await client.rest.actions.createWorkflowDispatch({
+        owner,
+        repo,
+        workflow_id: workflowId,
+        ref: branchOrTagName,
+      });
+
+      ctx.logger.info(`Workflow ${workflowId} dispatched successfully`);
+    },
+  });
+}
diff --git a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/githubWebhook.test.ts b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/githubWebhook.test.ts
new file mode 100644
index 0000000000..0da08bbf9d
--- /dev/null
+++ b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/githubWebhook.test.ts
@@ -0,0 +1,266 @@
+/*
+ * Copyright 2021 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+jest.mock('@octokit/rest');
+
+import { createGithubWebhookAction } from './githubWebhook';
+import { ScmIntegrations } from '@backstage/integration';
+import { ConfigReader } from '@backstage/config';
+import { getVoidLogger } from '@backstage/backend-common';
+import { PassThrough } from 'stream';
+
+describe('github:repository:webhook:create', () => {
+  const config = new ConfigReader({
+    integrations: {
+      github: [
+        { host: 'github.com', token: 'tokenlols' },
+        { host: 'ghe.github.com' },
+      ],
+    },
+  });
+
+  const integrations = ScmIntegrations.fromConfig(config);
+  const defaultWebhookSecret = 'aafdfdivierernfdk23f';
+  const action = createGithubWebhookAction({
+    integrations,
+    defaultWebhookSecret,
+  });
+
+  const mockContext = {
+    input: {
+      repoUrl: 'github.com?repo=repo&owner=owner',
+      webhookUrl: 'https://example.com/payload',
+    },
+    workspacePath: 'lol',
+    logger: getVoidLogger(),
+    logStream: new PassThrough(),
+    output: jest.fn(),
+    createTemporaryDirectory: jest.fn(),
+  };
+
+  const { mockGithubClient } = require('@octokit/rest');
+
+  beforeEach(() => {
+    jest.resetAllMocks();
+  });
+
+  it('should call the githubApi for creating repository Webhook', async () => {
+    const repoUrl = 'github.com?repo=repo&owner=owner';
+    const webhookUrl = 'https://example.com/payload';
+    const ctx = Object.assign({}, mockContext, {
+      input: { repoUrl, webhookUrl },
+    });
+    await action.handler(ctx);
+
+    expect(mockGithubClient.repos.createWebhook).toHaveBeenCalledWith({
+      owner: 'owner',
+      repo: 'repo',
+      events: ['push'],
+      active: true,
+      config: {
+        url: webhookUrl,
+        content_type: 'form',
+        secret: defaultWebhookSecret,
+        insecure_ssl: '0',
+      },
+    });
+
+    const webhookSecret = 'yet_another_secret';
+    await action.handler({
+      ...mockContext,
+      input: {
+        ...mockContext.input,
+        webhookSecret,
+      },
+    });
+
+    expect(mockGithubClient.repos.createWebhook).toHaveBeenCalledWith({
+      owner: 'owner',
+      repo: 'repo',
+      events: ['push'],
+      active: true,
+      config: {
+        url: webhookUrl,
+        content_type: 'form',
+        secret: webhookSecret,
+        insecure_ssl: '0',
+      },
+    });
+
+    await action.handler({
+      ...mockContext,
+      input: {
+        ...mockContext.input,
+        events: ['push', 'pull_request'],
+      },
+    });
+
+    expect(mockGithubClient.repos.createWebhook).toHaveBeenCalledWith({
+      owner: 'owner',
+      repo: 'repo',
+      events: ['push', 'pull_request'],
+      active: true,
+      config: {
+        url: webhookUrl,
+        content_type: 'form',
+        secret: defaultWebhookSecret,
+        insecure_ssl: '0',
+      },
+    });
+
+    await action.handler({
+      ...mockContext,
+      input: {
+        ...mockContext.input,
+        contentType: 'json',
+      },
+    });
+
+    expect(mockGithubClient.repos.createWebhook).toHaveBeenCalledWith({
+      owner: 'owner',
+      repo: 'repo',
+      events: ['push'],
+      active: true,
+      config: {
+        url: webhookUrl,
+        content_type: 'json',
+        secret: defaultWebhookSecret,
+        insecure_ssl: '0',
+      },
+    });
+
+    await action.handler({
+      ...mockContext,
+      input: {
+        ...mockContext.input,
+        insecureSsl: true,
+      },
+    });
+
+    expect(mockGithubClient.repos.createWebhook).toHaveBeenCalledWith({
+      owner: 'owner',
+      repo: 'repo',
+      events: ['push'],
+      active: true,
+      config: {
+        url: webhookUrl,
+        content_type: 'form',
+        secret: defaultWebhookSecret,
+        insecure_ssl: '1',
+      },
+    });
+
+    await action.handler({
+      ...mockContext,
+      input: {
+        ...mockContext.input,
+        insecureSsl: true,
+      },
+    });
+
+    expect(mockGithubClient.repos.createWebhook).toHaveBeenCalledWith({
+      owner: 'owner',
+      repo: 'repo',
+      events: ['push'],
+      active: true,
+      config: {
+        url: webhookUrl,
+        content_type: 'form',
+        secret: defaultWebhookSecret,
+        insecure_ssl: '1',
+      },
+    });
+
+    await action.handler({
+      ...mockContext,
+      input: {
+        ...mockContext.input,
+        active: false,
+      },
+    });
+
+    expect(mockGithubClient.repos.createWebhook).toHaveBeenCalledWith({
+      owner: 'owner',
+      repo: 'repo',
+      events: ['push'],
+      active: false,
+      config: {
+        url: webhookUrl,
+        content_type: 'form',
+        secret: defaultWebhookSecret,
+        insecure_ssl: '0',
+      },
+    });
+  });
+
+  it('should validate input', async () => {
+    const Validator = require('jsonschema').Validator;
+    const v = new Validator();
+
+    // validate default input without events specified
+    expect(v.validate(mockContext.input, action.schema?.input).valid).toBe(
+      true,
+    );
+
+    const inputWithValidEvent = {
+      ...mockContext.input,
+      events: ['push'],
+    };
+    expect(v.validate(inputWithValidEvent, action.schema?.input).valid).toBe(
+      true,
+    );
+
+    const inputWithMultipleValidEvents = {
+      ...mockContext.input,
+      events: ['push', 'pull_request'],
+    };
+    expect(
+      v.validate(inputWithMultipleValidEvents, action.schema?.input).valid,
+    ).toBe(true);
+
+    const inputWithInvalidEvent = {
+      ...mockContext.input,
+      events: ['unexpected_event'],
+    };
+    expect(v.validate(inputWithInvalidEvent, action.schema?.input).valid).toBe(
+      false,
+    );
+
+    const inputWithOneInvalidEvent = {
+      ...mockContext.input,
+      events: ['push', 'unexpected_event'],
+    };
+    expect(
+      v.validate(inputWithOneInvalidEvent, action.schema?.input).valid,
+    ).toBe(false);
+
+    const inputWithAllEvents = {
+      ...mockContext.input,
+      events: ['*'],
+    };
+    expect(v.validate(inputWithAllEvents, action.schema?.input).valid).toBe(
+      true,
+    );
+
+    const inputWithAllEventsAndMore = {
+      ...mockContext.input,
+      events: ['*', 'push'],
+    };
+    expect(
+      v.validate(inputWithAllEventsAndMore, action.schema?.input).valid,
+    ).toBe(false);
+  });
+});
diff --git a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/githubWebhook.ts b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/githubWebhook.ts
new file mode 100644
index 0000000000..6d8324768e
--- /dev/null
+++ b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/githubWebhook.ts
@@ -0,0 +1,139 @@
+/*
+ * Copyright 2021 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import { ScmIntegrationRegistry } from '@backstage/integration';
+import { createTemplateAction } from '../../createTemplateAction';
+import { OctokitProvider } from './OctokitProvider';
+import { emitterEventNames } from '@octokit/webhooks';
+
+type ContentType = 'form' | 'json';
+
+export function createGithubWebhookAction(options: {
+  integrations: ScmIntegrationRegistry;
+  defaultWebhookSecret?: string;
+}) {
+  const { integrations, defaultWebhookSecret } = options;
+  const octokitProvider = new OctokitProvider(integrations);
+  const eventNames = emitterEventNames.filter(event => !event.includes('.'));
+
+  return createTemplateAction<{
+    repoUrl: string;
+    webhookUrl: string;
+    webhookSecret?: string;
+    events?: string[];
+    active?: boolean;
+    contentType?: ContentType;
+    insecureSsl?: boolean;
+  }>({
+    id: 'github:webhook',
+    description: 'Creates webhook for a repository on GitHub.',
+    schema: {
+      input: {
+        type: 'object',
+        required: ['repoUrl', 'webhookUrl'],
+        properties: {
+          repoUrl: {
+            title: 'Repository Location',
+            description: `Accepts the format 'github.com?repo=reponame&owner=owner' where 'reponame' is the new repository name and 'owner' is an organization or username`,
+            type: 'string',
+          },
+          webhookUrl: {
+            title: 'Webhook URL',
+            description: 'The URL to which the payloads will be delivered',
+            type: 'string',
+          },
+          webhookSecret: {
+            title: 'Webhook Secret',
+            description:
+              'Webhook secret value. The default can be provided internally in action creation',
+            type: 'string',
+          },
+          events: {
+            title: 'Triggering Events',
+            description:
+              'Determines what events the hook is triggered for. Default: push',
+            type: 'array',
+            oneOf: [
+              {
+                items: {
+                  type: 'string',
+                  enum: eventNames,
+                },
+              },
+              {
+                items: {
+                  type: 'string',
+                  const: '*',
+                },
+              },
+            ],
+          },
+          active: {
+            title: 'Active',
+            type: 'boolean',
+            description: `Determines if notifications are sent when the webhook is triggered. Default: true`,
+          },
+          contentType: {
+            title: 'Content Type',
+            type: 'string',
+            enum: ['form', 'json'],
+            description: `The media type used to serialize the payloads. The default is 'form'`,
+          },
+          insecureSsl: {
+            title: 'Insecure SSL',
+            type: 'boolean',
+            description: `Determines whether the SSL certificate of the host for url will be verified when delivering payloads. Default 'false'`,
+          },
+        },
+      },
+    },
+    async handler(ctx) {
+      const {
+        repoUrl,
+        webhookUrl,
+        webhookSecret = defaultWebhookSecret,
+        events = ['push'],
+        active = true,
+        contentType = 'form',
+        insecureSsl = false,
+      } = ctx.input;
+
+      ctx.logger.info(`Creating webhook ${webhookUrl} for repo ${repoUrl}`);
+
+      const { client, owner, repo } = await octokitProvider.getOctokit(repoUrl);
+
+      try {
+        const insecure_ssl = insecureSsl ? '1' : '0';
+        await client.repos.createWebhook({
+          owner,
+          repo,
+          config: {
+            url: webhookUrl,
+            content_type: contentType,
+            secret: webhookSecret,
+            insecure_ssl,
+          },
+          events,
+          active,
+        });
+        ctx.logger.info(`Webhook '${webhookUrl}' created successfully`);
+      } catch (e) {
+        ctx.logger.warn(
+          `Failed: create webhook '${webhookUrl}' on repo: '${repo}', ${e.message}`,
+        );
+      }
+    },
+  });
+}
diff --git a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/index.ts b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/index.ts
new file mode 100644
index 0000000000..865c433c16
--- /dev/null
+++ b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/index.ts
@@ -0,0 +1,19 @@
+/*
+ * Copyright 2021 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+export { createGithubActionsDispatchAction } from './githubActionsDispatch';
+export { createGithubWebhookAction } from './githubWebhook';
+export { OctokitProvider } from './OctokitProvider';
diff --git a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/helpers.test.ts b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/helpers.test.ts
new file mode 100644
index 0000000000..78156a1075
--- /dev/null
+++ b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/helpers.test.ts
@@ -0,0 +1,148 @@
+/*
+ * Copyright 2021 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { Git, getVoidLogger } from '@backstage/backend-common';
+import { initRepoAndPush } from './helpers';
+
+jest.mock('@backstage/backend-common', () => ({
+  Git: {
+    fromAuth: jest.fn().mockReturnValue({
+      init: jest.fn(),
+      add: jest.fn(),
+      commit: jest.fn(),
+      addRemote: jest.fn(),
+      push: jest.fn(),
+    }),
+  },
+  getVoidLogger: jest.requireActual('@backstage/backend-common').getVoidLogger,
+}));
+
+const mockedGit = Git.fromAuth({
+  username: 'test-user',
+  password: 'test-password',
+  logger: getVoidLogger(),
+});
+
+describe('initRepoAndPush', () => {
+  afterEach(() => {
+    jest.clearAllMocks();
+  });
+
+  describe('with minimal parameters', () => {
+    beforeEach(async () => {
+      await initRepoAndPush({
+        dir: '/test/repo/dir/',
+        remoteUrl: 'git@github.com:test/repo.git',
+        auth: {
+          username: 'test-user',
+          password: 'test-password',
+        },
+        logger: getVoidLogger(),
+      });
+    });
+
+    it('initializes the repo', () => {
+      expect(mockedGit.init).toHaveBeenCalledWith({
+        dir: '/test/repo/dir/',
+        defaultBranch: 'master',
+      });
+    });
+
+    it('stages all files in the repo', () => {
+      expect(mockedGit.add).toHaveBeenCalledWith({
+        dir: '/test/repo/dir/',
+        filepath: '.',
+      });
+    });
+
+    it('creates an initial commit', () => {
+      expect(mockedGit.commit).toHaveBeenCalledWith({
+        dir: '/test/repo/dir/',
+        message: 'Initial commit',
+        author: {
+          name: 'Scaffolder',
+          email: 'scaffolder@backstage.io',
+        },
+        committer: {
+          name: 'Scaffolder',
+          email: 'scaffolder@backstage.io',
+        },
+      });
+    });
+
+    it('adds the appropriate remote', () => {
+      expect(mockedGit.addRemote).toHaveBeenCalledWith({
+        dir: '/test/repo/dir/',
+        url: 'git@github.com:test/repo.git',
+        remote: 'origin',
+      });
+    });
+
+    it('pushes to the remote', () => {
+      expect(mockedGit.push).toHaveBeenCalledWith({
+        dir: '/test/repo/dir/',
+        remote: 'origin',
+      });
+    });
+  });
+
+  it('allows overriding the default branch', async () => {
+    await initRepoAndPush({
+      dir: '/test/repo/dir/',
+      defaultBranch: 'trunk',
+      remoteUrl: 'git@github.com:test/repo.git',
+      auth: {
+        username: 'test-user',
+        password: 'test-password',
+      },
+      logger: getVoidLogger(),
+    });
+
+    expect(mockedGit.init).toHaveBeenCalledWith({
+      dir: '/test/repo/dir/',
+      defaultBranch: 'trunk',
+    });
+  });
+
+  it('allows overriding the author', async () => {
+    await initRepoAndPush({
+      dir: '/test/repo/dir/',
+      gitAuthorInfo: {
+        name: 'Custom Scaffolder Author',
+        email: 'scaffolder@example.org',
+      },
+      remoteUrl: 'git@github.com:test/repo.git',
+      auth: {
+        username: 'test-user',
+        password: 'test-password',
+      },
+      logger: getVoidLogger(),
+    });
+
+    expect(mockedGit.commit).toHaveBeenCalledWith({
+      dir: '/test/repo/dir/',
+      message: 'Initial commit',
+      author: {
+        name: 'Custom Scaffolder Author',
+        email: 'scaffolder@example.org',
+      },
+      committer: {
+        name: 'Custom Scaffolder Author',
+        email: 'scaffolder@example.org',
+      },
+    });
+  });
+});
diff --git a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/helpers.ts b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/helpers.ts
index e2459a8ca7..3907bc1d4e 100644
--- a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/helpers.ts
+++ b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/helpers.ts
@@ -16,7 +16,6 @@
 
 import { spawn } from 'child_process';
 import { PassThrough, Writable } from 'stream';
-import globby from 'globby';
 import { Logger } from 'winston';
 import { Git } from '@backstage/backend-common';
 import { Octokit } from '@octokit/rest';
@@ -62,6 +61,7 @@ export async function initRepoAndPush({
   auth,
   logger,
   defaultBranch = 'master',
+  commitMessage = 'Initial commit',
   gitAuthorInfo,
 }: {
   dir: string;
@@ -69,6 +69,7 @@ export async function initRepoAndPush({
   auth: { username: string; password: string };
   logger: Logger;
   defaultBranch?: string;
+  commitMessage?: string;
   gitAuthorInfo?: { name?: string; email?: string };
 }): Promise<void> {
   const git = Git.fromAuth({
@@ -82,15 +83,7 @@ export async function initRepoAndPush({
     defaultBranch,
   });
 
-  const paths = await globby(['./**', './**/.*', '!.git'], {
-    cwd: dir,
-    gitignore: true,
-    dot: true,
-  });
-
-  for (const filepath of paths) {
-    await git.add({ dir, filepath });
-  }
+  await git.add({ dir, filepath: '.' });
 
   // use provided info if possible, otherwise use fallbacks
   const authorInfo = {
@@ -100,7 +93,7 @@ export async function initRepoAndPush({
 
   await git.commit({
     dir,
-    message: 'Initial commit',
+    message: commitMessage,
     author: authorInfo,
     committer: authorInfo,
   });
@@ -122,6 +115,7 @@ type BranchProtectionOptions = {
   owner: string;
   repoName: string;
   logger: Logger;
+  requireCodeOwnerReviews: boolean;
   defaultBranch?: string;
 };
 
@@ -130,6 +124,7 @@ export const enableBranchProtectionOnDefaultRepoBranch = async ({
   client,
   owner,
   logger,
+  requireCodeOwnerReviews,
   defaultBranch = 'master',
 }: BranchProtectionOptions): Promise<void> => {
   const tryOnce = async () => {
@@ -151,7 +146,10 @@ export const enableBranchProtectionOnDefaultRepoBranch = async ({
         required_status_checks: { strict: true, contexts: [] },
         restrictions: null,
         enforce_admins: true,
-        required_pull_request_reviews: { required_approving_review_count: 1 },
+        required_pull_request_reviews: {
+          required_approving_review_count: 1,
+          require_code_owner_reviews: requireCodeOwnerReviews,
+        },
       });
     } catch (e) {
       if (
diff --git a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/index.ts b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/index.ts
index 849b056ac9..2265f9b4f7 100644
--- a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/index.ts
+++ b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/index.ts
@@ -20,4 +20,7 @@ export * from './debug';
 export * from './fetch';
 export * from './filesystem';
 export * from './publish';
+export * from './github';
+
+export { createFetchCookiecutterAction } from '@backstage/plugin-scaffolder-backend-module-cookiecutter';
 export { runCommand } from './helpers';
diff --git a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/publish/azure.test.ts b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/publish/azure.test.ts
index 30995dee38..cee99e1646 100644
--- a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/publish/azure.test.ts
+++ b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/publish/azure.test.ts
@@ -58,7 +58,7 @@ describe('publish:azure', () => {
     getGitApi: jest.fn().mockReturnValue(mockGitClient),
   };
 
-  ((WebApi as unknown) as jest.Mock).mockImplementation(() => mockGitApi);
+  (WebApi as unknown as jest.Mock).mockImplementation(() => mockGitApi);
 
   beforeEach(() => {
     jest.restoreAllMocks();
@@ -68,21 +68,21 @@ describe('publish:azure', () => {
     await expect(
       action.handler({
         ...mockContext,
-        input: { repoUrl: 'azure.com?repo=bob' },
+        input: { repoUrl: 'dev.azure.com?repo=bob' },
       }),
     ).rejects.toThrow(/missing owner/);
 
     await expect(
       action.handler({
         ...mockContext,
-        input: { repoUrl: 'azure.com?owner=owner' },
+        input: { repoUrl: 'dev.azure.com?owner=owner' },
       }),
     ).rejects.toThrow(/missing repo/);
 
     await expect(
       action.handler({
         ...mockContext,
-        input: { repoUrl: 'azure.com?owner=owner&repo=repo' },
+        input: { repoUrl: 'dev.azure.com?owner=owner&repo=repo' },
       }),
     ).rejects.toThrow(/missing organization/);
   });
@@ -209,9 +209,8 @@ describe('publish:azure', () => {
       },
     });
 
-    const customAuthorIntegrations = ScmIntegrations.fromConfig(
-      customAuthorConfig,
-    );
+    const customAuthorIntegrations =
+      ScmIntegrations.fromConfig(customAuthorConfig);
     const customAuthorAction = createPublishAzureAction({
       integrations: customAuthorIntegrations,
       config: customAuthorConfig,
@@ -233,6 +232,43 @@ describe('publish:azure', () => {
     });
   });
 
+  it('should call initRepoAndPush with the configured defaultCommitMessage', async () => {
+    const customAuthorConfig = new ConfigReader({
+      integrations: {
+        azure: [
+          { host: 'dev.azure.com', token: 'tokenlols' },
+          { host: 'myazurehostnotoken.com' },
+        ],
+      },
+      scaffolder: {
+        defaultCommitMessage: 'Test commit message',
+      },
+    });
+
+    const customAuthorIntegrations =
+      ScmIntegrations.fromConfig(customAuthorConfig);
+    const customAuthorAction = createPublishAzureAction({
+      integrations: customAuthorIntegrations,
+      config: customAuthorConfig,
+    });
+
+    mockGitClient.createRepository.mockImplementation(() => ({
+      remoteUrl: 'https://dev.azure.com/organization/project/_git/repo',
+    }));
+
+    await customAuthorAction.handler(mockContext);
+
+    expect(initRepoAndPush).toHaveBeenCalledWith({
+      dir: mockContext.workspacePath,
+      remoteUrl: 'https://dev.azure.com/organization/project/_git/repo',
+      auth: { username: 'notempty', password: 'tokenlols' },
+      logger: mockContext.logger,
+      defaultBranch: 'master',
+      commitMessage: 'Test commit message',
+      gitAuthorInfo: { email: undefined, name: undefined },
+    });
+  });
+
   it('should call output with the remoteUrl and the repoContentsUrl', async () => {
     mockGitClient.createRepository.mockImplementation(() => ({
       remoteUrl: 'https://dev.azure.com/organization/project/_git/repo',
diff --git a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/publish/azure.ts b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/publish/azure.ts
index c58dd69424..7e394a8d8b 100644
--- a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/publish/azure.ts
+++ b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/publish/azure.ts
@@ -80,7 +80,10 @@ export function createPublishAzureAction(options: {
     async handler(ctx) {
       const { repoUrl, defaultBranch = 'master' } = ctx.input;
 
-      const { owner, repo, host, organization } = parseRepoUrl(repoUrl);
+      const { owner, repo, host, organization } = parseRepoUrl(
+        repoUrl,
+        integrations,
+      );
 
       if (!organization) {
         throw new InputError(
@@ -139,6 +142,9 @@ export function createPublishAzureAction(options: {
           password: integrationConfig.config.token,
         },
         logger: ctx.logger,
+        commitMessage: config.getOptionalString(
+          'scaffolder.defaultCommitMessage',
+        ),
         gitAuthorInfo,
       });
 
diff --git a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/publish/bitbucket.test.ts b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/publish/bitbucket.test.ts
index 9fe245935b..4eee4b4b96 100644
--- a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/publish/bitbucket.test.ts
+++ b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/publish/bitbucket.test.ts
@@ -50,7 +50,7 @@ describe('publish:bitbucket', () => {
   const action = createPublishBitbucketAction({ integrations, config });
   const mockContext = {
     input: {
-      repoUrl: 'bitbucket.org?repo=repo&owner=owner',
+      repoUrl: 'bitbucket.org?workspace=workspace&project=project&repo=repo',
       repoVisibility: 'private',
     },
     workspacePath: 'lol',
@@ -70,14 +70,21 @@ describe('publish:bitbucket', () => {
     await expect(
       action.handler({
         ...mockContext,
-        input: { repoUrl: 'bitbucket.com?repo=bob' },
+        input: { repoUrl: 'bitbucket.org?project=project&repo=repo' },
       }),
-    ).rejects.toThrow(/missing owner/);
+    ).rejects.toThrow(/missing workspace/);
 
     await expect(
       action.handler({
         ...mockContext,
-        input: { repoUrl: 'bitbucket.com?owner=owner' },
+        input: { repoUrl: 'bitbucket.org?workspace=workspace&repo=repo' },
+      }),
+    ).rejects.toThrow(/missing project/);
+
+    await expect(
+      action.handler({
+        ...mockContext,
+        input: { repoUrl: 'bitbucket.org?workspace=workspace&project=project' },
       }),
     ).rejects.toThrow(/missing repo/);
   });
@@ -86,7 +93,9 @@ describe('publish:bitbucket', () => {
     await expect(
       action.handler({
         ...mockContext,
-        input: { repoUrl: 'missing.com?repo=bob&owner=owner' },
+        input: {
+          repoUrl: 'missing.com?workspace=workspace&project=project&repo=repo',
+        },
       }),
     ).rejects.toThrow(/No matching integration configuration/);
   });
@@ -96,7 +105,8 @@ describe('publish:bitbucket', () => {
       action.handler({
         ...mockContext,
         input: {
-          repoUrl: 'notoken.bitbucket.com?repo=bob&owner=owner',
+          repoUrl:
+            'notoken.bitbucket.com?workspace=workspace&project=project&repo=repo',
         },
       }),
     ).rejects.toThrow(/Authorization has not been provided for Bitbucket/);
@@ -106,22 +116,26 @@ describe('publish:bitbucket', () => {
     expect.assertions(2);
     server.use(
       rest.post(
-        'https://api.bitbucket.org/2.0/repositories/owner/repo',
+        'https://api.bitbucket.org/2.0/repositories/workspace/repo',
         (req, res, ctx) => {
           expect(req.headers.get('Authorization')).toBe('Bearer tokenlols');
-          expect(req.body).toEqual({ is_private: true, scm: 'git' });
+          expect(req.body).toEqual({
+            is_private: true,
+            scm: 'git',
+            project: { key: 'project' },
+          });
           return res(
             ctx.status(200),
             ctx.set('Content-Type', 'application/json'),
             ctx.json({
               links: {
                 html: {
-                  href: 'https://bitbucket.org/owner/repo',
+                  href: 'https://bitbucket.org/workspace/repo',
                 },
                 clone: [
                   {
                     name: 'https',
-                    href: 'https://bitbucket.org/owner/repo',
+                    href: 'https://bitbucket.org/workspace/repo',
                   },
                 ],
               },
@@ -131,14 +145,20 @@ describe('publish:bitbucket', () => {
       ),
     );
 
-    await action.handler(mockContext);
+    await action.handler({
+      ...mockContext,
+      input: {
+        ...mockContext.input,
+        repoUrl: 'bitbucket.org?workspace=workspace&project=project&repo=repo',
+      },
+    });
   });
 
   it('should call the correct APIs when the host is hosted bitbucket', async () => {
     expect.assertions(2);
     server.use(
       rest.post(
-        'https://hosted.bitbucket.com/rest/api/1.0/projects/owner/repos',
+        'https://hosted.bitbucket.com/rest/api/1.0/projects/project/repos',
         (req, res, ctx) => {
           expect(req.headers.get('Authorization')).toBe('Bearer thing');
           expect(req.body).toEqual({ public: false, name: 'repo' });
@@ -149,8 +169,7 @@ describe('publish:bitbucket', () => {
               links: {
                 self: [
                   {
-                    href:
-                      'https://bitbucket.mycompany.com/projects/project/repos/repo',
+                    href: 'https://bitbucket.mycompany.com/projects/project/repos/repo',
                   },
                 ],
                 clone: [
@@ -170,7 +189,7 @@ describe('publish:bitbucket', () => {
       ...mockContext,
       input: {
         ...mockContext.input,
-        repoUrl: 'hosted.bitbucket.com?owner=owner&repo=repo',
+        repoUrl: 'hosted.bitbucket.com?project=project&repo=repo',
       },
     });
   });
@@ -196,7 +215,7 @@ describe('publish:bitbucket', () => {
       expect.assertions(1);
       server.use(
         rest.post(
-          'https://hosted.bitbucket.com/rest/api/1.0/projects/owner/repos',
+          'https://hosted.bitbucket.com/rest/api/1.0/projects/project/repos',
           (_, res, ctx) => {
             return res(
               ctx.status(201),
@@ -206,7 +225,7 @@ describe('publish:bitbucket', () => {
           },
         ),
         rest.put(
-          'https://hosted.bitbucket.com/rest/git-lfs/admin/projects/owner/repos/repo/enabled',
+          'https://hosted.bitbucket.com/rest/git-lfs/admin/projects/project/repos/repo/enabled',
           (req, res, ctx) => {
             expect(req.headers.get('Authorization')).toBe('Bearer thing');
             return res(ctx.status(204));
@@ -218,7 +237,7 @@ describe('publish:bitbucket', () => {
         ...mockContext,
         input: {
           ...mockContext.input,
-          repoUrl: 'hosted.bitbucket.com?owner=owner&repo=repo',
+          repoUrl: 'hosted.bitbucket.com?project=project&repo=repo',
           enableLFS: true,
         },
       });
@@ -227,7 +246,7 @@ describe('publish:bitbucket', () => {
     it('should report an error if enabling LFS fails', async () => {
       server.use(
         rest.post(
-          'https://hosted.bitbucket.com/rest/api/1.0/projects/owner/repos',
+          'https://hosted.bitbucket.com/rest/api/1.0/projects/project/repos',
           (_, res, ctx) => {
             return res(
               ctx.status(201),
@@ -237,7 +256,7 @@ describe('publish:bitbucket', () => {
           },
         ),
         rest.put(
-          'https://hosted.bitbucket.com/rest/git-lfs/admin/projects/owner/repos/repo/enabled',
+          'https://hosted.bitbucket.com/rest/git-lfs/admin/projects/project/repos/repo/enabled',
           (_, res, ctx) => {
             return res(ctx.status(500));
           },
@@ -249,7 +268,7 @@ describe('publish:bitbucket', () => {
           ...mockContext,
           input: {
             ...mockContext.input,
-            repoUrl: 'hosted.bitbucket.com?owner=owner&repo=repo',
+            repoUrl: 'hosted.bitbucket.com?project=project&repo=repo',
             enableLFS: true,
           },
         }),
@@ -260,7 +279,7 @@ describe('publish:bitbucket', () => {
   it('should call initAndPush with the correct values', async () => {
     server.use(
       rest.post(
-        'https://api.bitbucket.org/2.0/repositories/owner/repo',
+        'https://api.bitbucket.org/2.0/repositories/workspace/repo',
         (_, res, ctx) =>
           res(
             ctx.status(200),
@@ -268,12 +287,12 @@ describe('publish:bitbucket', () => {
             ctx.json({
               links: {
                 html: {
-                  href: 'https://bitbucket.org/owner/repo',
+                  href: 'https://bitbucket.org/workspace/repo',
                 },
                 clone: [
                   {
                     name: 'https',
-                    href: 'https://bitbucket.org/owner/cloneurl',
+                    href: 'https://bitbucket.org/workspace/cloneurl',
                   },
                 ],
               },
@@ -286,7 +305,7 @@ describe('publish:bitbucket', () => {
 
     expect(initRepoAndPush).toHaveBeenCalledWith({
       dir: mockContext.workspacePath,
-      remoteUrl: 'https://bitbucket.org/owner/cloneurl',
+      remoteUrl: 'https://bitbucket.org/workspace/cloneurl',
       defaultBranch: 'master',
       auth: { username: 'x-token-auth', password: 'tokenlols' },
       logger: mockContext.logger,
@@ -297,7 +316,7 @@ describe('publish:bitbucket', () => {
   it('should call initAndPush with the correct default branch', async () => {
     server.use(
       rest.post(
-        'https://api.bitbucket.org/2.0/repositories/owner/repo',
+        'https://api.bitbucket.org/2.0/repositories/workspace/repo',
         (_, res, ctx) =>
           res(
             ctx.status(200),
@@ -305,12 +324,12 @@ describe('publish:bitbucket', () => {
             ctx.json({
               links: {
                 html: {
-                  href: 'https://bitbucket.org/owner/repo',
+                  href: 'https://bitbucket.org/workspace/repo',
                 },
                 clone: [
                   {
                     name: 'https',
-                    href: 'https://bitbucket.org/owner/cloneurl',
+                    href: 'https://bitbucket.org/workspace/cloneurl',
                   },
                 ],
               },
@@ -329,7 +348,7 @@ describe('publish:bitbucket', () => {
 
     expect(initRepoAndPush).toHaveBeenCalledWith({
       dir: mockContext.workspacePath,
-      remoteUrl: 'https://bitbucket.org/owner/cloneurl',
+      remoteUrl: 'https://bitbucket.org/workspace/cloneurl',
       defaultBranch: 'main',
       auth: { username: 'x-token-auth', password: 'tokenlols' },
       logger: mockContext.logger,
@@ -363,9 +382,8 @@ describe('publish:bitbucket', () => {
       },
     });
 
-    const customAuthorIntegrations = ScmIntegrations.fromConfig(
-      customAuthorConfig,
-    );
+    const customAuthorIntegrations =
+      ScmIntegrations.fromConfig(customAuthorConfig);
     const customAuthorAction = createPublishBitbucketAction({
       integrations: customAuthorIntegrations,
       config: customAuthorConfig,
@@ -373,7 +391,7 @@ describe('publish:bitbucket', () => {
 
     server.use(
       rest.post(
-        'https://api.bitbucket.org/2.0/repositories/owner/repo',
+        'https://api.bitbucket.org/2.0/repositories/workspace/repo',
         (_, res, ctx) =>
           res(
             ctx.status(200),
@@ -381,12 +399,12 @@ describe('publish:bitbucket', () => {
             ctx.json({
               links: {
                 html: {
-                  href: 'https://bitbucket.org/owner/repo',
+                  href: 'https://bitbucket.org/workspace/repo',
                 },
                 clone: [
                   {
                     name: 'https',
-                    href: 'https://bitbucket.org/owner/cloneurl',
+                    href: 'https://bitbucket.org/workspace/cloneurl',
                   },
                 ],
               },
@@ -399,7 +417,7 @@ describe('publish:bitbucket', () => {
 
     expect(initRepoAndPush).toHaveBeenCalledWith({
       dir: mockContext.workspacePath,
-      remoteUrl: 'https://bitbucket.org/owner/cloneurl',
+      remoteUrl: 'https://bitbucket.org/workspace/cloneurl',
       auth: { username: 'x-token-auth', password: 'tokenlols' },
       logger: mockContext.logger,
       defaultBranch: 'master',
@@ -407,10 +425,39 @@ describe('publish:bitbucket', () => {
     });
   });
 
-  it('should call outputs with the correct urls', async () => {
+  it('should call initAndPush with the configured defaultCommitMessage', async () => {
+    const customAuthorConfig = new ConfigReader({
+      integrations: {
+        bitbucket: [
+          {
+            host: 'bitbucket.org',
+            token: 'tokenlols',
+          },
+          {
+            host: 'hosted.bitbucket.com',
+            token: 'thing',
+            apiBaseUrl: 'https://hosted.bitbucket.com/rest/api/1.0',
+          },
+          {
+            host: 'notoken.bitbucket.com',
+          },
+        ],
+      },
+      scaffolder: {
+        defaultCommitMessage: 'Test commit message',
+      },
+    });
+
+    const customAuthorIntegrations =
+      ScmIntegrations.fromConfig(customAuthorConfig);
+    const customAuthorAction = createPublishBitbucketAction({
+      integrations: customAuthorIntegrations,
+      config: customAuthorConfig,
+    });
+
     server.use(
       rest.post(
-        'https://api.bitbucket.org/2.0/repositories/owner/repo',
+        'https://api.bitbucket.org/2.0/repositories/workspace/repo',
         (_, res, ctx) =>
           res(
             ctx.status(200),
@@ -418,12 +465,50 @@ describe('publish:bitbucket', () => {
             ctx.json({
               links: {
                 html: {
-                  href: 'https://bitbucket.org/owner/repo',
+                  href: 'https://bitbucket.org/workspace/repo',
                 },
                 clone: [
                   {
                     name: 'https',
-                    href: 'https://bitbucket.org/owner/cloneurl',
+                    href: 'https://bitbucket.org/workspace/cloneurl',
+                  },
+                ],
+              },
+            }),
+          ),
+      ),
+    );
+
+    await customAuthorAction.handler(mockContext);
+
+    expect(initRepoAndPush).toHaveBeenCalledWith({
+      dir: mockContext.workspacePath,
+      remoteUrl: 'https://bitbucket.org/workspace/cloneurl',
+      auth: { username: 'x-token-auth', password: 'tokenlols' },
+      logger: mockContext.logger,
+      defaultBranch: 'master',
+      commitMessage: 'Test commit message',
+      gitAuthorInfo: { email: undefined, name: undefined },
+    });
+  });
+
+  it('should call outputs with the correct urls', async () => {
+    server.use(
+      rest.post(
+        'https://api.bitbucket.org/2.0/repositories/workspace/repo',
+        (_, res, ctx) =>
+          res(
+            ctx.status(200),
+            ctx.set('Content-Type', 'application/json'),
+            ctx.json({
+              links: {
+                html: {
+                  href: 'https://bitbucket.org/workspace/repo',
+                },
+                clone: [
+                  {
+                    name: 'https',
+                    href: 'https://bitbucket.org/workspace/cloneurl',
                   },
                 ],
               },
@@ -436,11 +521,11 @@ describe('publish:bitbucket', () => {
 
     expect(mockContext.output).toHaveBeenCalledWith(
       'remoteUrl',
-      'https://bitbucket.org/owner/cloneurl',
+      'https://bitbucket.org/workspace/cloneurl',
     );
     expect(mockContext.output).toHaveBeenCalledWith(
       'repoContentsUrl',
-      'https://bitbucket.org/owner/repo/src/master',
+      'https://bitbucket.org/workspace/repo/src/master',
     );
   });
 });
diff --git a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/publish/bitbucket.ts b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/publish/bitbucket.ts
index ffd2e4d6a7..daa6bc249b 100644
--- a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/publish/bitbucket.ts
+++ b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/publish/bitbucket.ts
@@ -26,13 +26,21 @@ import { getRepoSourceDirectory, parseRepoUrl } from './util';
 import { Config } from '@backstage/config';
 
 const createBitbucketCloudRepository = async (opts: {
-  owner: string;
+  workspace: string;
+  project: string;
   repo: string;
   description: string;
   repoVisibility: 'private' | 'public';
   authorization: string;
 }) => {
-  const { owner, repo, description, repoVisibility, authorization } = opts;
+  const {
+    workspace,
+    project,
+    repo,
+    description,
+    repoVisibility,
+    authorization,
+  } = opts;
 
   const options: RequestInit = {
     method: 'POST',
@@ -40,6 +48,7 @@ const createBitbucketCloudRepository = async (opts: {
       scm: 'git',
       description: description,
       is_private: repoVisibility === 'private',
+      project: { key: project },
     }),
     headers: {
       Authorization: authorization,
@@ -50,7 +59,7 @@ const createBitbucketCloudRepository = async (opts: {
   let response: Response;
   try {
     response = await fetch(
-      `https://api.bitbucket.org/2.0/repositories/${owner}/${repo}`,
+      `https://api.bitbucket.org/2.0/repositories/${workspace}/${repo}`,
       options,
     );
   } catch (e) {
@@ -80,7 +89,7 @@ const createBitbucketCloudRepository = async (opts: {
 
 const createBitbucketServerRepository = async (opts: {
   host: string;
-  owner: string;
+  project: string;
   repo: string;
   description: string;
   repoVisibility: 'private' | 'public';
@@ -89,7 +98,7 @@ const createBitbucketServerRepository = async (opts: {
 }) => {
   const {
     host,
-    owner,
+    project,
     repo,
     description,
     authorization,
@@ -113,7 +122,7 @@ const createBitbucketServerRepository = async (opts: {
 
   try {
     const baseUrl = apiBaseUrl ? apiBaseUrl : `https://${host}/rest/api/1.0`;
-    response = await fetch(`${baseUrl}/projects/${owner}/repos`, options);
+    response = await fetch(`${baseUrl}/projects/${project}/repos`, options);
   } catch (e) {
     throw new Error(`Unable to create repository, ${e}`);
   }
@@ -160,10 +169,10 @@ const getAuthorizationHeader = (config: BitbucketIntegrationConfig) => {
 const performEnableLFS = async (opts: {
   authorization: string;
   host: string;
-  owner: string;
+  project: string;
   repo: string;
 }) => {
-  const { authorization, host, owner, repo } = opts;
+  const { authorization, host, project, repo } = opts;
 
   const options: RequestInit = {
     method: 'PUT',
@@ -173,7 +182,7 @@ const performEnableLFS = async (opts: {
   };
 
   const { ok, status, statusText } = await fetch(
-    `https://${host}/rest/git-lfs/admin/projects/${owner}/repos/${repo}/enabled`,
+    `https://${host}/rest/git-lfs/admin/projects/${project}/repos/${repo}/enabled`,
     options,
   );
 
@@ -258,7 +267,26 @@ export function createPublishBitbucketAction(options: {
         enableLFS = false,
       } = ctx.input;
 
-      const { owner, repo, host } = parseRepoUrl(repoUrl);
+      const { workspace, project, repo, host } = parseRepoUrl(
+        repoUrl,
+        integrations,
+      );
+
+      // Workspace is only required for bitbucket cloud
+      if (host === 'bitbucket.org') {
+        if (!workspace) {
+          throw new InputError(
+            `Invalid URL provider was included in the repo URL to create ${ctx.input.repoUrl}, missing workspace`,
+          );
+        }
+      }
+
+      // Project is required for both bitbucket cloud and bitbucket server
+      if (!project) {
+        throw new InputError(
+          `Invalid URL provider was included in the repo URL to create ${ctx.input.repoUrl}, missing project`,
+        );
+      }
 
       const integrationConfig = integrations.bitbucket.byHost(host);
 
@@ -279,7 +307,8 @@ export function createPublishBitbucketAction(options: {
       const { remoteUrl, repoContentsUrl } = await createMethod({
         authorization,
         host,
-        owner,
+        workspace: workspace || '',
+        project,
         repo,
         repoVisibility,
         description,
@@ -304,11 +333,14 @@ export function createPublishBitbucketAction(options: {
         },
         defaultBranch,
         logger: ctx.logger,
+        commitMessage: config.getOptionalString(
+          'scaffolder.defaultCommitMessage',
+        ),
         gitAuthorInfo,
       });
 
       if (enableLFS && host !== 'bitbucket.org') {
-        await performEnableLFS({ authorization, host, owner, repo });
+        await performEnableLFS({ authorization, host, project, repo });
       }
 
       ctx.output('remoteUrl', remoteUrl);
diff --git a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/publish/github.test.ts b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/publish/github.test.ts
index f0725d6e8e..6a3ccf5e38 100644
--- a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/publish/github.test.ts
+++ b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/publish/github.test.ts
@@ -22,7 +22,10 @@ import { ScmIntegrations } from '@backstage/integration';
 import { ConfigReader } from '@backstage/config';
 import { getVoidLogger } from '@backstage/backend-common';
 import { PassThrough } from 'stream';
-import { initRepoAndPush } from '../helpers';
+import {
+  enableBranchProtectionOnDefaultRepoBranch,
+  initRepoAndPush,
+} from '../helpers';
 import { when } from 'jest-when';
 
 describe('publish:github', () => {
@@ -57,42 +60,6 @@ describe('publish:github', () => {
     jest.resetAllMocks();
   });
 
-  it('should throw an error when the repoUrl is not well formed', async () => {
-    await expect(
-      action.handler({
-        ...mockContext,
-        input: { repoUrl: 'github.com?repo=bob' },
-      }),
-    ).rejects.toThrow(/missing owner/);
-
-    await expect(
-      action.handler({
-        ...mockContext,
-        input: { repoUrl: 'github.com?owner=owner' },
-      }),
-    ).rejects.toThrow(/missing repo/);
-  });
-
-  it('should throw if there is no integration config provided', async () => {
-    await expect(
-      action.handler({
-        ...mockContext,
-        input: { repoUrl: 'missing.com?repo=bob&owner=owner' },
-      }),
-    ).rejects.toThrow(/No matching integration configuration/);
-  });
-
-  it('should throw if there is no token in the integration config that is returned', async () => {
-    await expect(
-      action.handler({
-        ...mockContext,
-        input: {
-          repoUrl: 'ghe.github.com?repo=bob&owner=owner',
-        },
-      }),
-    ).rejects.toThrow(/No token available for host/);
-  });
-
   it('should call the githubApis with the correct values for createInOrg', async () => {
     mockGithubClient.users.getByUsername.mockResolvedValue({
       data: { type: 'Organization' },
@@ -229,9 +196,8 @@ describe('publish:github', () => {
       },
     });
 
-    const customAuthorIntegrations = ScmIntegrations.fromConfig(
-      customAuthorConfig,
-    );
+    const customAuthorIntegrations =
+      ScmIntegrations.fromConfig(customAuthorConfig);
     const customAuthorAction = createPublishGithubAction({
       integrations: customAuthorIntegrations,
       config: customAuthorConfig,
@@ -260,6 +226,50 @@ describe('publish:github', () => {
     });
   });
 
+  it('should call initRepoAndPush with the configured defaultCommitMessage', async () => {
+    const customAuthorConfig = new ConfigReader({
+      integrations: {
+        github: [
+          { host: 'github.com', token: 'tokenlols' },
+          { host: 'ghe.github.com' },
+        ],
+      },
+      scaffolder: {
+        defaultCommitMessage: 'Test commit message',
+      },
+    });
+
+    const customAuthorIntegrations =
+      ScmIntegrations.fromConfig(customAuthorConfig);
+    const customAuthorAction = createPublishGithubAction({
+      integrations: customAuthorIntegrations,
+      config: customAuthorConfig,
+    });
+
+    mockGithubClient.users.getByUsername.mockResolvedValue({
+      data: { type: 'User' },
+    });
+
+    mockGithubClient.repos.createForAuthenticatedUser.mockResolvedValue({
+      data: {
+        clone_url: 'https://github.com/clone/url.git',
+        html_url: 'https://github.com/html/url',
+      },
+    });
+
+    await customAuthorAction.handler(mockContext);
+
+    expect(initRepoAndPush).toHaveBeenCalledWith({
+      dir: mockContext.workspacePath,
+      remoteUrl: 'https://github.com/clone/url.git',
+      defaultBranch: 'master',
+      auth: { username: 'x-access-token', password: 'tokenlols' },
+      logger: mockContext.logger,
+      commitMessage: 'Test commit message',
+      gitAuthorInfo: { email: undefined, name: undefined },
+    });
+  });
+
   it('should add access for the team when it starts with the owner', async () => {
     mockGithubClient.users.getByUsername.mockResolvedValue({
       data: { type: 'User' },
@@ -540,4 +550,61 @@ describe('publish:github', () => {
       'https://github.com/html/url/blob/main',
     );
   });
+
+  it('should call enableBranchProtectionOnDefaultRepoBranch with the correct values of requireCodeOwnerReviews', async () => {
+    mockGithubClient.users.getByUsername.mockResolvedValue({
+      data: { type: 'User' },
+    });
+
+    mockGithubClient.repos.createForAuthenticatedUser.mockResolvedValue({
+      data: {
+        name: 'repository',
+      },
+    });
+
+    await action.handler(mockContext);
+
+    expect(enableBranchProtectionOnDefaultRepoBranch).toHaveBeenCalledWith({
+      owner: 'owner',
+      client: mockGithubClient,
+      repoName: 'repository',
+      logger: mockContext.logger,
+      defaultBranch: 'master',
+      requireCodeOwnerReviews: false,
+    });
+
+    await action.handler({
+      ...mockContext,
+      input: {
+        ...mockContext.input,
+        requireCodeOwnerReviews: true,
+      },
+    });
+
+    expect(enableBranchProtectionOnDefaultRepoBranch).toHaveBeenCalledWith({
+      owner: 'owner',
+      client: mockGithubClient,
+      repoName: 'repository',
+      logger: mockContext.logger,
+      defaultBranch: 'master',
+      requireCodeOwnerReviews: true,
+    });
+
+    await action.handler({
+      ...mockContext,
+      input: {
+        ...mockContext.input,
+        requireCodeOwnerReviews: false,
+      },
+    });
+
+    expect(enableBranchProtectionOnDefaultRepoBranch).toHaveBeenCalledWith({
+      owner: 'owner',
+      client: mockGithubClient,
+      repoName: 'repository',
+      logger: mockContext.logger,
+      defaultBranch: 'master',
+      requireCodeOwnerReviews: false,
+    });
+  });
 });
diff --git a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/publish/github.ts b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/publish/github.ts
index 05301bda85..b32f9b5b3f 100644
--- a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/publish/github.ts
+++ b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/publish/github.ts
@@ -13,19 +13,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { InputError } from '@backstage/errors';
-import {
-  GithubCredentialsProvider,
-  ScmIntegrationRegistry,
-} from '@backstage/integration';
-import { Octokit } from '@octokit/rest';
+import { ScmIntegrationRegistry } from '@backstage/integration';
 import {
   enableBranchProtectionOnDefaultRepoBranch,
   initRepoAndPush,
 } from '../helpers';
-import { getRepoSourceDirectory, parseRepoUrl } from './util';
+import { getRepoSourceDirectory } from './util';
 import { createTemplateAction } from '../../createTemplateAction';
 import { Config } from '@backstage/config';
+import { OctokitProvider } from '../github/OctokitProvider';
 
 type Permission = 'pull' | 'push' | 'admin' | 'maintain' | 'triage';
 type Collaborator = { access: Permission; username: string };
@@ -35,13 +31,7 @@ export function createPublishGithubAction(options: {
   config: Config;
 }) {
   const { integrations, config } = options;
-
-  const credentialsProviders = new Map(
-    integrations.github.list().map(integration => {
-      const provider = GithubCredentialsProvider.create(integration.config);
-      return [integration.config.host, provider];
-    }),
-  );
+  const octokitProvider = new OctokitProvider(integrations);
 
   return createTemplateAction<{
     repoUrl: string;
@@ -49,6 +39,7 @@ export function createPublishGithubAction(options: {
     access?: string;
     defaultBranch?: string;
     sourcePath?: string;
+    requireCodeOwnerReviews?: boolean;
     repoVisibility: 'private' | 'internal' | 'public';
     collaborators: Collaborator[];
     topics?: string[];
@@ -75,6 +66,11 @@ export function createPublishGithubAction(options: {
             description: `Sets an admin collaborator on the repository. Can either be a user reference different from 'owner' in 'repoUrl' or team reference, eg. 'org/team-name'`,
             type: 'string',
           },
+          requireCodeOwnerReviews: {
+            title:
+              'Require an approved review in PR including files with a designated Code Owner',
+            type: 'boolean',
+          },
           repoVisibility: {
             title: 'Repository Visibility',
             type: 'string',
@@ -138,42 +134,16 @@ export function createPublishGithubAction(options: {
         repoUrl,
         description,
         access,
+        requireCodeOwnerReviews = false,
         repoVisibility = 'private',
         defaultBranch = 'master',
         collaborators,
         topics,
       } = ctx.input;
 
-      const { owner, repo, host } = parseRepoUrl(repoUrl);
-
-      const credentialsProvider = credentialsProviders.get(host);
-      const integrationConfig = integrations.github.byHost(host);
-
-      if (!credentialsProvider || !integrationConfig) {
-        throw new InputError(
-          `No matching integration configuration for host ${host}, please check your integrations config`,
-        );
-      }
-
-      // TODO(blam): Consider changing this API to have owner, repo interface instead of URL as the it's
-      // needless to create URL and then parse again the other side.
-      const { token } = await credentialsProvider.getCredentials({
-        url: `https://${host}/${encodeURIComponent(owner)}/${encodeURIComponent(
-          repo,
-        )}`,
-      });
-
-      if (!token) {
-        throw new InputError(
-          `No token available for host: ${host}, with owner ${owner}, and repo ${repo}`,
-        );
-      }
-
-      const client = new Octokit({
-        auth: token,
-        baseUrl: integrationConfig.config.apiBaseUrl,
-        previews: ['nebula-preview'],
-      });
+      const { client, token, owner, repo } = await octokitProvider.getOctokit(
+        repoUrl,
+      );
 
       const user = await client.users.getByUsername({
         username: owner,
@@ -264,6 +234,9 @@ export function createPublishGithubAction(options: {
           password: token,
         },
         logger: ctx.logger,
+        commitMessage: config.getOptionalString(
+          'scaffolder.defaultCommitMessage',
+        ),
         gitAuthorInfo,
       });
 
@@ -274,6 +247,7 @@ export function createPublishGithubAction(options: {
           repoName: newRepo.name,
           logger: ctx.logger,
           defaultBranch,
+          requireCodeOwnerReviews,
         });
       } catch (e) {
         ctx.logger.warn(
diff --git a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/publish/githubPullRequest.ts b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/publish/githubPullRequest.ts
index 1c46e80d03..e21ffc5cd0 100644
--- a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/publish/githubPullRequest.ts
+++ b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/publish/githubPullRequest.ts
@@ -73,9 +73,8 @@ export const defaultClientFactory = async ({
     throw new InputError(`No integration for host ${host}`);
   }
 
-  const credentialsProvider = GithubCredentialsProvider.create(
-    integrationConfig,
-  );
+  const credentialsProvider =
+    GithubCredentialsProvider.create(integrationConfig);
 
   if (!credentialsProvider) {
     throw new InputError(
@@ -174,7 +173,13 @@ export const createPublishGithubPullRequestAction = ({
         sourcePath,
       } = ctx.input;
 
-      const { owner, repo, host } = parseRepoUrl(repoUrl);
+      const { owner, repo, host } = parseRepoUrl(repoUrl, integrations);
+
+      if (!owner) {
+        throw new InputError(
+          `No owner provided for host: ${host}, and repo ${repo}`,
+        );
+      }
 
       const client = await clientFactory({ integrations, host, owner, repo });
       const fileRoot = sourcePath
diff --git a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/publish/gitlab.test.ts b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/publish/gitlab.test.ts
index 5150205a08..2cd27da359 100644
--- a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/publish/gitlab.test.ts
+++ b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/publish/gitlab.test.ts
@@ -194,9 +194,8 @@ describe('publish:gitlab', () => {
       },
     });
 
-    const customAuthorIntegrations = ScmIntegrations.fromConfig(
-      customAuthorConfig,
-    );
+    const customAuthorIntegrations =
+      ScmIntegrations.fromConfig(customAuthorConfig);
     const customAuthorAction = createPublishGitlabAction({
       integrations: customAuthorIntegrations,
       config: customAuthorConfig,
@@ -219,6 +218,51 @@ describe('publish:gitlab', () => {
     });
   });
 
+  it('should call initRepoAndPush with the configured defaultCommitMessage', async () => {
+    const customAuthorConfig = new ConfigReader({
+      integrations: {
+        gitlab: [
+          {
+            host: 'gitlab.com',
+            token: 'tokenlols',
+            apiBaseUrl: 'https://api.gitlab.com',
+          },
+          {
+            host: 'hosted.gitlab.com',
+            apiBaseUrl: 'https://api.hosted.gitlab.com',
+          },
+        ],
+      },
+      scaffolder: {
+        defaultCommitMessage: 'Test commit message',
+      },
+    });
+
+    const customAuthorIntegrations =
+      ScmIntegrations.fromConfig(customAuthorConfig);
+    const customAuthorAction = createPublishGitlabAction({
+      integrations: customAuthorIntegrations,
+      config: customAuthorConfig,
+    });
+
+    mockGitlabClient.Namespaces.show.mockResolvedValue({ id: 1234 });
+    mockGitlabClient.Projects.create.mockResolvedValue({
+      http_url_to_repo: 'http://mockurl.git',
+    });
+
+    await customAuthorAction.handler(mockContext);
+
+    expect(initRepoAndPush).toHaveBeenCalledWith({
+      dir: mockContext.workspacePath,
+      remoteUrl: 'http://mockurl.git',
+      auth: { username: 'oauth2', password: 'tokenlols' },
+      logger: mockContext.logger,
+      defaultBranch: 'master',
+      commitMessage: 'Test commit message',
+      gitAuthorInfo: { email: undefined, name: undefined },
+    });
+  });
+
   it('should call output with the remoteUrl and repoContentsUrl', async () => {
     mockGitlabClient.Namespaces.show.mockResolvedValue({ id: 1234 });
     mockGitlabClient.Projects.create.mockResolvedValue({
diff --git a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/publish/gitlab.ts b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/publish/gitlab.ts
index b99d40b1f7..eead310777 100644
--- a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/publish/gitlab.ts
+++ b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/publish/gitlab.ts
@@ -84,7 +84,13 @@ export function createPublishGitlabAction(options: {
         defaultBranch = 'master',
       } = ctx.input;
 
-      const { owner, repo, host } = parseRepoUrl(repoUrl);
+      const { owner, repo, host } = parseRepoUrl(repoUrl, integrations);
+
+      if (!owner) {
+        throw new InputError(
+          `No owner provided for host: ${host}, and repo ${repo}`,
+        );
+      }
 
       const integrationConfig = integrations.gitlab.byHost(host);
 
@@ -137,6 +143,9 @@ export function createPublishGitlabAction(options: {
           password: integrationConfig.config.token,
         },
         logger: ctx.logger,
+        commitMessage: config.getOptionalString(
+          'scaffolder.defaultCommitMessage',
+        ),
         gitAuthorInfo,
       });
 
diff --git a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/publish/util.ts b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/publish/util.ts
index e7d4e75f6a..dea180dc04 100644
--- a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/publish/util.ts
+++ b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/publish/util.ts
@@ -16,6 +16,7 @@
 
 import { InputError } from '@backstage/errors';
 import { join as joinPath, normalize as normalizePath } from 'path';
+import { ScmIntegrationRegistry } from '@backstage/integration';
 
 export const getRepoSourceDirectory = (
   workspacePath: string,
@@ -33,11 +34,16 @@ export const getRepoSourceDirectory = (
 export type RepoSpec = {
   repo: string;
   host: string;
-  owner: string;
+  owner?: string;
   organization?: string;
+  workspace?: string;
+  project?: string;
 };
 
-export const parseRepoUrl = (repoUrl: string): RepoSpec => {
+export const parseRepoUrl = (
+  repoUrl: string,
+  integrations: ScmIntegrationRegistry,
+): RepoSpec => {
   let parsed;
   try {
     parsed = new URL(`https://${repoUrl}`);
@@ -47,13 +53,40 @@ export const parseRepoUrl = (repoUrl: string): RepoSpec => {
     );
   }
   const host = parsed.host;
-  const owner = parsed.searchParams.get('owner');
+  const owner = parsed.searchParams.get('owner') ?? undefined;
+  const organization = parsed.searchParams.get('organization') ?? undefined;
+  const workspace = parsed.searchParams.get('workspace') ?? undefined;
+  const project = parsed.searchParams.get('project') ?? undefined;
 
-  if (!owner) {
+  const type = integrations.byHost(host)?.type;
+
+  if (!type) {
     throw new InputError(
-      `Invalid repo URL passed to publisher: ${repoUrl}, missing owner`,
+      `No matching integration configuration for host ${host}, please check your integrations config`,
     );
   }
+
+  if (type === 'bitbucket') {
+    if (host === 'bitbucket.org') {
+      if (!workspace) {
+        throw new InputError(
+          `Invalid repo URL passed to publisher: ${repoUrl}, missing workspace`,
+        );
+      }
+    }
+    if (!project) {
+      throw new InputError(
+        `Invalid repo URL passed to publisher: ${repoUrl}, missing project`,
+      );
+    }
+  } else {
+    if (!owner) {
+      throw new InputError(
+        `Invalid repo URL passed to publisher: ${repoUrl}, missing owner`,
+      );
+    }
+  }
+
   const repo = parsed.searchParams.get('repo');
   if (!repo) {
     throw new InputError(
@@ -61,7 +94,5 @@ export const parseRepoUrl = (repoUrl: string): RepoSpec => {
     );
   }
 
-  const organization = parsed.searchParams.get('organization') ?? undefined;
-
-  return { host, owner, repo, organization };
+  return { host, owner, repo, organization, workspace, project };
 };
diff --git a/plugins/scaffolder-backend/src/scaffolder/tasks/DatabaseTaskStore.ts b/plugins/scaffolder-backend/src/scaffolder/tasks/DatabaseTaskStore.ts
index b48941e3d4..09cba596b1 100644
--- a/plugins/scaffolder-backend/src/scaffolder/tasks/DatabaseTaskStore.ts
+++ b/plugins/scaffolder-backend/src/scaffolder/tasks/DatabaseTaskStore.ts
@@ -153,11 +153,7 @@ export class DatabaseTaskStore implements TaskStore {
     }
   }
 
-  async listStaleTasks({
-    timeoutS,
-  }: {
-    timeoutS: number;
-  }): Promise<{
+  async listStaleTasks({ timeoutS }: { timeoutS: number }): Promise<{
     tasks: { taskId: string }[];
   }> {
     const rawRows = await this.db<RawDbTaskRow>('tasks')
diff --git a/plugins/scaffolder-backend/src/scaffolder/tasks/TaskWorker.test.ts b/plugins/scaffolder-backend/src/scaffolder/tasks/TaskWorker.test.ts
index b5e8d19e62..2c274df7fc 100644
--- a/plugins/scaffolder-backend/src/scaffolder/tasks/TaskWorker.test.ts
+++ b/plugins/scaffolder-backend/src/scaffolder/tasks/TaskWorker.test.ts
@@ -22,6 +22,7 @@ import { RepoSpec } from '../actions/builtin/publish/util';
 import { DatabaseTaskStore } from './DatabaseTaskStore';
 import { StorageTaskBroker } from './StorageTaskBroker';
 import { TaskWorker } from './TaskWorker';
+import { ScmIntegrations } from '@backstage/integration';
 
 async function createStore(): Promise<DatabaseTaskStore> {
   const manager = DatabaseManager.fromConfig(
@@ -41,6 +42,14 @@ describe('TaskWorker', () => {
   let storage: DatabaseTaskStore;
   let actionRegistry = new TemplateActionRegistry();
 
+  const integrations = ScmIntegrations.fromConfig(
+    new ConfigReader({
+      integrations: {
+        github: [{ host: 'github.com', token: 'token' }],
+      },
+    }),
+  );
+
   beforeAll(async () => {
     storage = await createStore();
   });
@@ -65,6 +74,7 @@ describe('TaskWorker', () => {
       workingDirectory: os.tmpdir(),
       actionRegistry,
       taskBroker: broker,
+      integrations,
     });
     const { taskId } = await broker.dispatch({
       steps: [{ id: 'test', name: 'test', action: 'not-found-action' }],
@@ -90,6 +100,7 @@ describe('TaskWorker', () => {
       workingDirectory: os.tmpdir(),
       actionRegistry,
       taskBroker: broker,
+      integrations,
     });
 
     const { taskId } = await broker.dispatch({
@@ -142,6 +153,7 @@ describe('TaskWorker', () => {
       workingDirectory: os.tmpdir(),
       actionRegistry,
       taskBroker: broker,
+      integrations,
     });
 
     const { taskId } = await broker.dispatch({
@@ -177,6 +189,7 @@ describe('TaskWorker', () => {
       workingDirectory: os.tmpdir(),
       actionRegistry,
       taskBroker: broker,
+      integrations,
     });
 
     const { taskId } = await broker.dispatch({
@@ -210,6 +223,7 @@ describe('TaskWorker', () => {
       workingDirectory: os.tmpdir(),
       actionRegistry,
       taskBroker: broker,
+      integrations,
     });
 
     const { taskId } = await broker.dispatch({
@@ -243,6 +257,7 @@ describe('TaskWorker', () => {
       workingDirectory: os.tmpdir(),
       actionRegistry,
       taskBroker: broker,
+      integrations,
     });
 
     const { taskId } = await broker.dispatch({
@@ -331,6 +346,7 @@ describe('TaskWorker', () => {
       workingDirectory: os.tmpdir(),
       actionRegistry,
       taskBroker: broker,
+      integrations,
     });
 
     const { taskId } = await broker.dispatch({
@@ -388,6 +404,12 @@ describe('TaskWorker', () => {
                 organization: {
                   type: 'string',
                 },
+                workspace: {
+                  type: 'string',
+                },
+                project: {
+                  type: 'string',
+                },
               },
             },
           },
@@ -396,7 +418,10 @@ describe('TaskWorker', () => {
       async handler(ctx) {
         ctx.output('host', ctx.input.destination.host);
         ctx.output('repo', ctx.input.destination.repo);
-        ctx.output('owner', ctx.input.destination.owner);
+
+        if (ctx.input.destination.owner) {
+          ctx.output('owner', ctx.input.destination.owner);
+        }
 
         if (ctx.input.destination.host !== 'github.com') {
           throw new Error(
@@ -410,7 +435,10 @@ describe('TaskWorker', () => {
           );
         }
 
-        if (ctx.input.destination.owner !== 'owner') {
+        if (
+          ctx.input.destination.owner &&
+          ctx.input.destination.owner !== 'owner'
+        ) {
           throw new Error(
             `expected repo to be "owner" got ${ctx.input.destination.owner}`,
           );
@@ -425,6 +453,7 @@ describe('TaskWorker', () => {
       workingDirectory: os.tmpdir(),
       actionRegistry,
       taskBroker: broker,
+      integrations,
     });
 
     const { taskId } = await broker.dispatch({
diff --git a/plugins/scaffolder-backend/src/scaffolder/tasks/TaskWorker.ts b/plugins/scaffolder-backend/src/scaffolder/tasks/TaskWorker.ts
index b4ba936719..819df56109 100644
--- a/plugins/scaffolder-backend/src/scaffolder/tasks/TaskWorker.ts
+++ b/plugins/scaffolder-backend/src/scaffolder/tasks/TaskWorker.ts
@@ -27,12 +27,14 @@ import { parseRepoUrl } from '../actions/builtin/publish/util';
 import { TemplateActionRegistry } from '../actions/TemplateActionRegistry';
 import { isTruthy } from './helper';
 import { Task, TaskBroker } from './types';
+import { ScmIntegrations } from '@backstage/integration';
 
 type Options = {
   logger: Logger;
   taskBroker: TaskBroker;
   workingDirectory: string;
   actionRegistry: TemplateActionRegistry;
+  integrations: ScmIntegrations;
 };
 
 export class TaskWorker {
@@ -45,11 +47,11 @@ export class TaskWorker {
     // scary right now, so we're going to lock it off like the component API is
     // in the frontend until we can work out a nice way to do it.
     this.handlebars.registerHelper('parseRepoUrl', repoUrl => {
-      return JSON.stringify(parseRepoUrl(repoUrl));
+      return JSON.stringify(parseRepoUrl(repoUrl, options.integrations));
     });
 
     this.handlebars.registerHelper('projectSlug', repoUrl => {
-      const { owner, repo } = parseRepoUrl(repoUrl);
+      const { owner, repo } = parseRepoUrl(repoUrl, options.integrations);
       return `${owner}/${repo}`;
     });
 
diff --git a/plugins/scaffolder-backend/src/scaffolder/tasks/types.ts b/plugins/scaffolder-backend/src/scaffolder/tasks/types.ts
index e61d989bc3..3b1805f117 100644
--- a/plugins/scaffolder-backend/src/scaffolder/tasks/types.ts
+++ b/plugins/scaffolder-backend/src/scaffolder/tasks/types.ts
@@ -112,9 +112,7 @@ export interface TaskStore {
     eventBody: JsonObject;
   }): Promise<void>;
   heartbeatTask(taskId: string): Promise<void>;
-  listStaleTasks(options: {
-    timeoutS: number;
-  }): Promise<{
+  listStaleTasks(options: { timeoutS: number }): Promise<{
     tasks: { taskId: string }[];
   }>;
 
diff --git a/plugins/scaffolder-backend/src/service/router.ts b/plugins/scaffolder-backend/src/service/router.ts
index 2b5bdb3bf8..f2a9c5b708 100644
--- a/plugins/scaffolder-backend/src/service/router.ts
+++ b/plugins/scaffolder-backend/src/service/router.ts
@@ -90,6 +90,7 @@ export async function createRouter(
       taskBroker,
       actionRegistry,
       workingDirectory,
+      integrations,
     });
     workers.push(worker);
   }
@@ -233,17 +234,19 @@ export async function createRouter(
             );
           }
 
+          let shouldUnsubscribe = false;
           for (const event of events) {
             res.write(
               `event: ${event.type}\ndata: ${JSON.stringify(event)}\n\n`,
             );
             if (event.type === 'completion') {
-              unsubscribe();
+              shouldUnsubscribe = true;
               // Closing the event stream here would cause the frontend
               // to automatically reconnect because it lost connection.
             }
           }
           res.flush();
+          if (shouldUnsubscribe) unsubscribe();
         },
       );
       // When client closes connection we update the clients list
diff --git a/plugins/scaffolder/CHANGELOG.md b/plugins/scaffolder/CHANGELOG.md
index 53a2043456..922d583a57 100644
--- a/plugins/scaffolder/CHANGELOG.md
+++ b/plugins/scaffolder/CHANGELOG.md
@@ -1,5 +1,143 @@
 # @backstage/plugin-scaffolder
 
+## 0.11.3
+
+### Patch Changes
+
+- c299e90a2: Disable all buttons in the final step when 'Create' button is clicked in template.
+- 3acf5988f: Fix display error when it fails to load a template (/create) page
+- Updated dependencies
+  - @backstage/core-components@0.4.1
+  - @backstage/catalog-client@0.3.19
+  - @backstage/catalog-model@0.9.2
+  - @backstage/errors@0.1.2
+  - @backstage/config@0.1.9
+  - @backstage/core-plugin-api@0.1.7
+
+## 0.11.2
+
+### Patch Changes
+
+- 34e14fdf7: Allow to pass custom TemplateCard to ScaffolderPage
+- 957ae8059: Use themeId in TemplateCard from theme object
+- Updated dependencies
+  - @backstage/plugin-catalog-react@0.4.5
+  - @backstage/integration@0.6.3
+  - @backstage/core-components@0.4.0
+  - @backstage/catalog-model@0.9.1
+  - @backstage/integration-react@0.1.8
+
+## 0.11.1
+
+### Patch Changes
+
+- 5bab4fe2a: Previously when supplying custom scaffolder field extensions, it was necessary to also include the default ones if they were needed. Since the field extensions are keyed by name, there's no harm in leaving the default ones in place when adding custom ones - if templates don't refer to them they will be ignored, and if custom ones are introduced with the same name, the custom ones will take priority over the default ones.
+
+  Users configuring custom field extensions can remove the default ones from the scaffolder route after this change, and they'll still be available:
+
+  ```diff
+      <Route path="/create" element={<ScaffolderPage />}>
+        <ScaffolderFieldExtensions>
+  -        <EntityPickerFieldExtension />
+  -        <EntityNamePickerFieldExtension />
+  -        <RepoUrlPickerFieldExtension />
+  -        <OwnerPickerFieldExtension />
+          <LowerCaseValuePickerFieldExtension />
+        </ScaffolderFieldExtensions>
+      </Route>
+  ```
+
+- 24d0e1ea1: Set `id` in `<TextValuePicker>`.
+- Updated dependencies
+  - @backstage/plugin-catalog-react@0.4.3
+  - @backstage/config@0.1.7
+  - @backstage/core-components@0.3.2
+  - @backstage/integration@0.6.1
+  - @backstage/theme@0.2.10
+
+## 0.11.0
+
+### Minor Changes
+
+- e30646aeb: Add Bitbucket workspace and project fields to RepoUrlPicker to support Bitbucket cloud and server
+
+### Patch Changes
+
+- 8bedb75ae: Update Luxon dependency to 2.x
+- 7894421f1: Added UI Schema support for array items for example, support EntityPicker within an array field
+- fa84fe44e: - Adds a new field `EntityNamePicker` that can be used in scaffolder templates to accept and validate an entity name. This field is registered by default, and can be used in templates by setting the `ui:field` property to `EntityNamePicker`. If you've customized your scaffolder field extensions, you can include this one by adding it when registering the scaffolder route:
+
+  ```diff
+  import {
+    ScaffolderFieldExtensions,
+  +   EntityNamePickerFieldExtension,
+  } from '@backstage/plugin-scaffolder';
+
+    <Route path="/create" element={<ScaffolderPage />}>
+      <ScaffolderFieldExtensions>
+        {/* ...custom field extensions... */}
+
+  +       <EntityNamePickerFieldExtension />
+      </ScaffolderFieldExtensions>
+    </Route>;
+  ```
+
+  - Adds a new generic field `TextValuePicker` to be used when writing custom field extensions that use a standard UI with custom validation. An example of doing this can be found in `packages/app/src/components/scaffolder/customScaffolderExtensions.tsx`.
+
+- 56c773909: Switched `@types/react` dependency to request `*` rather than a specific version.
+- Updated dependencies
+  - @backstage/integration@0.6.0
+  - @backstage/core-components@0.3.1
+  - @backstage/core-plugin-api@0.1.6
+  - @backstage/plugin-catalog-react@0.4.2
+  - @backstage/integration-react@0.1.7
+
+## 0.10.3
+
+### Patch Changes
+
+- 7b8aa8d0d: Move the `CreateComponentButton` from the catalog plugin to the `core-components` & rename it to `CreateButton` to be reused inside the api-docs plugin & scaffolder plugin, but also future plugins. Additionally, improve responsiveness of `CreateButton` & `SupportButton` by shrinking them to `IconButtons` on smaller screens.
+- Updated dependencies
+  - @backstage/core-components@0.3.0
+  - @backstage/config@0.1.6
+  - @backstage/core-plugin-api@0.1.5
+  - @backstage/integration@0.5.9
+  - @backstage/integration-react@0.1.6
+  - @backstage/plugin-catalog-react@0.4.1
+
+## 0.10.2
+
+### Patch Changes
+
+- 0d5d0e2e6: chore: set the lifecycle as beta logo
+- 9d40fcb1e: - Bumping `material-ui/core` version to at least `4.12.2` as they made some breaking changes in later versions which broke `Pagination` of the `Table`.
+  - Switching out `material-table` to `@material-table/core` for support for the later versions of `material-ui/core`
+  - This causes a minor API change to `@backstage/core-components` as the interface for `Table` re-exports the `prop` from the underlying `Table` components.
+  - `onChangeRowsPerPage` has been renamed to `onRowsPerPageChange`
+  - `onChangePage` has been renamed to `onPageChange`
+  - Migration guide is here: https://material-table-core.com/docs/breaking-changes
+- Updated dependencies
+  - @backstage/core-components@0.2.0
+  - @backstage/plugin-catalog-react@0.4.0
+  - @backstage/core-plugin-api@0.1.4
+  - @backstage/integration-react@0.1.5
+  - @backstage/theme@0.2.9
+  - @backstage/catalog-client@0.3.18
+
+## 0.10.1
+
+### Patch Changes
+
+- 73951fc44: Add options to mask or hide values on review state
+- 976b61080: Updated the software templates list page (`ScaffolderPage`) to use the `useEntityListProvider` hook from #5643. This reduces the code footprint, making it easier to customize the display of this page, and consolidates duplicate approaches to querying the catalog with filters.
+
+  - The `useEntityTypeFilter` hook has been updated along with the underlying `EntityTypeFilter` to work with multiple values, to allow more flexibility for different user interfaces. It's unlikely that this change affects you; however, if you're using either of these directly, you'll need to update your usage.
+  - `SearchToolbar` was renamed to `EntitySearchBar` and moved to `catalog-react` to be usable by other entity list pages
+  - `UserListPicker` now has an `availableTypes` prop to restrict which user-related options to present
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@0.3.0
+
 ## 0.10.0
 
 ### Minor Changes
diff --git a/plugins/scaffolder/api-report.md b/plugins/scaffolder/api-report.md
index 2f9d10b7ac..8887810a02 100644
--- a/plugins/scaffolder/api-report.md
+++ b/plugins/scaffolder/api-report.md
@@ -8,12 +8,16 @@
 import { ApiHolder } from '@backstage/core-plugin-api';
 import { ApiRef } from '@backstage/core-plugin-api';
 import { BackstagePlugin } from '@backstage/core-plugin-api';
+import { ComponentProps } from 'react';
+import { ComponentType } from 'react';
 import { DiscoveryApi } from '@backstage/core-plugin-api';
+import { Entity } from '@backstage/catalog-model';
 import { EntityName } from '@backstage/catalog-model';
 import { Extension } from '@backstage/core-plugin-api';
 import { ExternalRouteRef } from '@backstage/core-plugin-api';
 import { FieldProps } from '@rjsf/core';
 import { FieldValidation } from '@rjsf/core';
+import { IconButton } from '@material-ui/core';
 import { IdentityApi } from '@backstage/core-plugin-api';
 import { JsonObject } from '@backstage/config';
 import { JSONSchema } from '@backstage/catalog-model';
@@ -22,12 +26,17 @@ import { Observable } from '@backstage/core-plugin-api';
 import { default as React_2 } from 'react';
 import { RouteRef } from '@backstage/core-plugin-api';
 import { ScmIntegrationRegistry } from '@backstage/integration';
+import { TemplateEntityV1beta2 } from '@backstage/catalog-model';
 
+// Warning: (ae-missing-release-tag) "createScaffolderFieldExtension" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export function createScaffolderFieldExtension<T = any>(
   options: FieldExtensionOptions<T>,
 ): Extension<() => null>;
 
+// Warning: (ae-missing-release-tag) "CustomFieldValidator" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export type CustomFieldValidator<T> =
   | ((data: T, field: FieldValidation) => void)
@@ -39,9 +48,46 @@ export type CustomFieldValidator<T> =
       },
     ) => void);
 
+// Warning: (ae-missing-release-tag) "EntityNamePicker" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
+// @public (undocumented)
+export const EntityNamePicker: ({
+  schema: { title, description },
+  ...props
+}: FieldProps<string>) => JSX.Element;
+
+// Warning: (ae-missing-release-tag) "EntityNamePickerFieldExtension" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
+// @public (undocumented)
+export const EntityNamePickerFieldExtension: () => null;
+
+// Warning: (ae-missing-release-tag) "EntityPicker" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
+// @public (undocumented)
+export const EntityPicker: ({
+  onChange,
+  schema: { title, description },
+  required,
+  uiSchema,
+  rawErrors,
+  formData,
+  idSchema,
+}: FieldProps<string>) => JSX.Element;
+
+// Warning: (ae-missing-release-tag) "EntityPickerFieldExtension" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export const EntityPickerFieldExtension: () => null;
 
+// Warning: (tsdoc-param-tag-missing-hyphen) The @param block should be followed by a parameter name and then a hyphen
+// Warning: (ae-forgotten-export) The symbol "Props" needs to be exported by the entry point index.d.ts
+// Warning: (ae-missing-release-tag) "FavouriteTemplate" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
+// @public
+export const FavouriteTemplate: (props: Props) => JSX.Element;
+
+// Warning: (ae-missing-release-tag) "FieldExtensionOptions" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export type FieldExtensionOptions<T = any> = {
   name: string;
@@ -49,33 +95,66 @@ export type FieldExtensionOptions<T = any> = {
   validation?: CustomFieldValidator<T>;
 };
 
+// Warning: (ae-missing-release-tag) "OwnerPicker" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
+// @public (undocumented)
+export const OwnerPicker: ({
+  schema: { title, description },
+  uiSchema,
+  ...props
+}: FieldProps<string>) => JSX.Element;
+
+// Warning: (ae-missing-release-tag) "OwnerPickerFieldExtension" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export const OwnerPickerFieldExtension: () => null;
 
+// Warning: (ae-missing-release-tag) "RepoUrlPicker" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
+// @public (undocumented)
+export const RepoUrlPicker: ({
+  onChange,
+  uiSchema,
+  rawErrors,
+  formData,
+}: FieldProps<string>) => JSX.Element;
+
+// Warning: (ae-missing-release-tag) "RepoUrlPickerFieldExtension" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export const RepoUrlPickerFieldExtension: () => null;
 
+// Warning: (ae-missing-release-tag) "ScaffolderApi" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export interface ScaffolderApi {
   // (undocumented)
-  getIntegrationsList(options: {
-    allowedHosts: string[];
-  }): Promise<
+  getIntegrationsList(options: { allowedHosts: string[] }): Promise<
     {
       type: string;
       title: string;
       host: string;
     }[]
   >;
+  // Warning: (ae-forgotten-export) The symbol "ScaffolderTask" needs to be exported by the entry point index.d.ts
+  //
   // (undocumented)
   getTask(taskId: string): Promise<ScaffolderTask>;
+  // Warning: (ae-forgotten-export) The symbol "TemplateParameterSchema" needs to be exported by the entry point index.d.ts
+  //
   // (undocumented)
   getTemplateParameterSchema(
     templateName: EntityName,
   ): Promise<TemplateParameterSchema>;
+  // Warning: (ae-forgotten-export) The symbol "ListActionsResponse" needs to be exported by the entry point index.d.ts
+  //
   // (undocumented)
   listActions(): Promise<ListActionsResponse>;
+  // Warning: (tsdoc-param-tag-missing-hyphen) The @param block should be followed by a parameter name and then a hyphen
+  // Warning: (tsdoc-param-tag-missing-hyphen) The @param block should be followed by a parameter name and then a hyphen
   scaffold(templateName: string, values: Record<string, any>): Promise<string>;
+  // Warning: (ae-forgotten-export) The symbol "LogEvent" needs to be exported by the entry point index.d.ts
+  //
   // (undocumented)
   streamLogs({
     taskId,
@@ -86,9 +165,13 @@ export interface ScaffolderApi {
   }): Observable<LogEvent>;
 }
 
+// Warning: (ae-missing-release-tag) "scaffolderApiRef" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export const scaffolderApiRef: ApiRef<ScaffolderApi>;
 
+// Warning: (ae-missing-release-tag) "ScaffolderClient" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export class ScaffolderClient implements ScaffolderApi {
   constructor(options: {
@@ -97,9 +180,7 @@ export class ScaffolderClient implements ScaffolderApi {
     scmIntegrationsApi: ScmIntegrationRegistry;
   });
   // (undocumented)
-  getIntegrationsList(options: {
-    allowedHosts: string[];
-  }): Promise<
+  getIntegrationsList(options: { allowedHosts: string[] }): Promise<
     {
       type: string;
       title: string;
@@ -114,6 +195,8 @@ export class ScaffolderClient implements ScaffolderApi {
   ): Promise<TemplateParameterSchema>;
   // (undocumented)
   listActions(): Promise<ListActionsResponse>;
+  // Warning: (tsdoc-param-tag-missing-hyphen) The @param block should be followed by a parameter name and then a hyphen
+  // Warning: (tsdoc-param-tag-missing-hyphen) The @param block should be followed by a parameter name and then a hyphen
   scaffold(templateName: string, values: Record<string, any>): Promise<string>;
   // (undocumented)
   streamLogs({
@@ -125,12 +208,26 @@ export class ScaffolderClient implements ScaffolderApi {
   }): Observable<LogEvent>;
 }
 
+// Warning: (ae-missing-release-tag) "ScaffolderFieldExtensions" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export const ScaffolderFieldExtensions: React_2.ComponentType;
 
+// Warning: (ae-missing-release-tag) "ScaffolderPage" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
-export const ScaffolderPage: () => JSX.Element;
+export const ScaffolderPage: ({
+  TemplateCardComponent,
+}: {
+  TemplateCardComponent?:
+    | ComponentType<{
+        template: TemplateEntityV1beta2;
+      }>
+    | undefined;
+}) => JSX.Element;
 
+// Warning: (ae-missing-release-tag) "scaffolderPlugin" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 const scaffolderPlugin: BackstagePlugin<
   {
@@ -143,5 +240,19 @@ const scaffolderPlugin: BackstagePlugin<
 export { scaffolderPlugin as plugin };
 export { scaffolderPlugin };
 
+// Warning: (ae-missing-release-tag) "TextValuePicker" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
+// @public (undocumented)
+export const TextValuePicker: ({
+  onChange,
+  required,
+  schema: { title, description },
+  rawErrors,
+  formData,
+  uiSchema: { 'ui:autofocus': autoFocus },
+  idSchema,
+  placeholder,
+}: FieldProps<string>) => JSX.Element;
+
 // (No @packageDocumentation comment for this package)
 ```
diff --git a/plugins/scaffolder/package.json b/plugins/scaffolder/package.json
index 24b48e7fd1..55f9d3b934 100644
--- a/plugins/scaffolder/package.json
+++ b/plugins/scaffolder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-scaffolder",
-  "version": "0.10.0",
+  "version": "0.11.3",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -30,29 +30,29 @@
     "clean": "backstage-cli clean"
   },
   "dependencies": {
-    "@backstage/catalog-client": "^0.3.16",
-    "@backstage/catalog-model": "^0.9.0",
-    "@backstage/config": "^0.1.5",
-    "@backstage/core-components": "^0.1.5",
-    "@backstage/core-plugin-api": "^0.1.3",
-    "@backstage/errors": "^0.1.1",
-    "@backstage/integration": "^0.5.8",
-    "@backstage/integration-react": "^0.1.4",
-    "@backstage/plugin-catalog-react": "^0.2.6",
-    "@backstage/theme": "^0.2.8",
-    "@material-ui/core": "^4.11.0",
+    "@backstage/catalog-client": "^0.3.19",
+    "@backstage/catalog-model": "^0.9.2",
+    "@backstage/config": "^0.1.9",
+    "@backstage/core-components": "^0.4.1",
+    "@backstage/core-plugin-api": "^0.1.7",
+    "@backstage/errors": "^0.1.2",
+    "@backstage/integration": "^0.6.3",
+    "@backstage/integration-react": "^0.1.8",
+    "@backstage/plugin-catalog-react": "^0.4.5",
+    "@backstage/theme": "^0.2.10",
+    "@material-ui/core": "^4.12.2",
     "@material-ui/icons": "^4.9.1",
     "@material-ui/lab": "4.0.0-alpha.45",
     "@rjsf/core": "^3.0.0",
     "@rjsf/material-ui": "^3.0.0",
-    "@types/react": "^16.9",
+    "@types/react": "*",
     "classnames": "^2.2.6",
-    "git-url-parse": "~11.4.4",
+    "git-url-parse": "^11.6.0",
     "humanize-duration": "^3.25.1",
     "immer": "^9.0.1",
     "json-schema": "^0.3.0",
     "lodash": "^4.17.21",
-    "luxon": "^1.25.0",
+    "luxon": "^2.0.2",
     "react": "^16.13.1",
     "react-dom": "^16.13.1",
     "react-lazylog": "^4.5.2",
@@ -63,10 +63,10 @@
     "zen-observable": "^0.8.15"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.7.3",
-    "@backstage/core-app-api": "^0.1.4",
-    "@backstage/dev-utils": "^0.2.1",
-    "@backstage/test-utils": "^0.1.14",
+    "@backstage/cli": "^0.7.11",
+    "@backstage/core-app-api": "^0.1.12",
+    "@backstage/dev-utils": "^0.2.9",
+    "@backstage/test-utils": "^0.1.17",
     "@testing-library/jest-dom": "^5.10.1",
     "@testing-library/react": "^11.2.5",
     "@testing-library/react-hooks": "^3.3.0",
diff --git a/plugins/scaffolder/src/api.ts b/plugins/scaffolder/src/api.ts
index 37d78d0fda..3e0ac3eccb 100644
--- a/plugins/scaffolder/src/api.ts
+++ b/plugins/scaffolder/src/api.ts
@@ -136,7 +136,7 @@ export class ScaffolderClient implements ScaffolderApi {
     });
 
     if (!response.ok) {
-      throw ResponseError.fromResponse(response);
+      throw await ResponseError.fromResponse(response);
     }
 
     const schema: TemplateParameterSchema = await response.json();
diff --git a/plugins/scaffolder/src/components/ActionsPage/ActionsPage.tsx b/plugins/scaffolder/src/components/ActionsPage/ActionsPage.tsx
index 78960c8297..caddadfd2e 100644
--- a/plugins/scaffolder/src/components/ActionsPage/ActionsPage.tsx
+++ b/plugins/scaffolder/src/components/ActionsPage/ActionsPage.tsx
@@ -95,7 +95,7 @@ export const ActionsPage = () => {
 
     return Object.entries(properties).map(entry => {
       const [key] = entry;
-      const props = (entry[1] as unknown) as JSONSchema;
+      const props = entry[1] as unknown as JSONSchema;
       const codeClassname = classNames(classes.code, {
         [classes.codeRequired]: input.required?.includes(key),
       });
@@ -145,7 +145,7 @@ export const ActionsPage = () => {
       <>
         <Typography variant="h6">{name}</Typography>
         {input.map((i, index) => (
-          <div key={index}>{renderTable((i as unknown) as JSONSchema)}</div>
+          <div key={index}>{renderTable(i as unknown as JSONSchema)}</div>
         ))}
       </>
     );
diff --git a/plugins/scaffolder/src/components/FavouriteTemplate/FavouriteTemplate.tsx b/plugins/scaffolder/src/components/FavouriteTemplate/FavouriteTemplate.tsx
index 3b8c165697..d158315130 100644
--- a/plugins/scaffolder/src/components/FavouriteTemplate/FavouriteTemplate.tsx
+++ b/plugins/scaffolder/src/components/FavouriteTemplate/FavouriteTemplate.tsx
@@ -57,10 +57,10 @@ export const favouriteTemplateIcon = (isStarred: boolean) =>
 export const FavouriteTemplate = (props: Props) => {
   const classes = useStyles();
   const { toggleStarredEntity, isStarredEntity } = useStarredEntities();
-  const isStarred = useMemo(() => isStarredEntity(props.entity), [
-    isStarredEntity,
-    props.entity,
-  ]);
+  const isStarred = useMemo(
+    () => isStarredEntity(props.entity),
+    [isStarredEntity, props.entity],
+  );
   return (
     <IconButton
       color="inherit"
diff --git a/plugins/register-component/src/components/RegisterComponentResultDialog/index.ts b/plugins/scaffolder/src/components/FavouriteTemplate/index.ts
similarity index 88%
rename from plugins/register-component/src/components/RegisterComponentResultDialog/index.ts
rename to plugins/scaffolder/src/components/FavouriteTemplate/index.ts
index 933125fd40..5955e88c01 100644
--- a/plugins/register-component/src/components/RegisterComponentResultDialog/index.ts
+++ b/plugins/scaffolder/src/components/FavouriteTemplate/index.ts
@@ -14,4 +14,4 @@
  * limitations under the License.
  */
 
-export { RegisterComponentResultDialog } from './RegisterComponentResultDialog';
+export * from './FavouriteTemplate';
diff --git a/plugins/scaffolder/src/components/MultistepJsonForm/MultistepJsonForm.test.tsx b/plugins/scaffolder/src/components/MultistepJsonForm/MultistepJsonForm.test.tsx
new file mode 100644
index 0000000000..5f7091832f
--- /dev/null
+++ b/plugins/scaffolder/src/components/MultistepJsonForm/MultistepJsonForm.test.tsx
@@ -0,0 +1,88 @@
+/*
+ * Copyright 2021 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { getReviewData } from './MultistepJsonForm';
+
+describe('MultistepJsonForm', () => {
+  const formDataMock = {
+    password: 'password',
+    masked: 'Some info to mask',
+    open: 'Some open info',
+    hidden: 'Some info to hide',
+    'other-open': 'Other open info',
+  };
+
+  const stepsMock = [
+    {
+      title: 'The test template',
+      schema: {
+        title: 'The test template',
+        properties: {
+          password: {
+            title: 'Password',
+            type: 'string',
+            'ui:widget': 'password',
+          },
+          masked: {
+            title: 'Masked',
+            type: 'string',
+            'ui:backstage': {
+              review: {
+                show: true,
+                mask: '******',
+              },
+            },
+          },
+          open: {
+            title: 'Open info',
+            type: 'string',
+          },
+        },
+      },
+    },
+    {
+      title: 'Other fields',
+      schema: {
+        title: 'Other fields',
+        properties: {
+          hidden: {
+            title: 'Hidden',
+            type: 'string',
+            'ui:backstage': {
+              review: {
+                show: false,
+              },
+            },
+          },
+          'other-open': {
+            title: 'Other Open Info',
+            type: 'string',
+          },
+        },
+      },
+    },
+  ];
+
+  test('Fields are defined to be hidden or masked', () => {
+    const reviewData = getReviewData(formDataMock, stepsMock);
+
+    expect(reviewData.password).toBe('******');
+    expect(reviewData.masked).toBe('******');
+    expect(reviewData.open).toBe('Some open info');
+    expect(reviewData.hidden).toBeUndefined();
+    expect(reviewData['other-open']).toBe('Other open info');
+  });
+});
diff --git a/plugins/scaffolder/src/components/MultistepJsonForm/MultistepJsonForm.tsx b/plugins/scaffolder/src/components/MultistepJsonForm/MultistepJsonForm.tsx
index 0fc998f82e..62c2881ab0 100644
--- a/plugins/scaffolder/src/components/MultistepJsonForm/MultistepJsonForm.tsx
+++ b/plugins/scaffolder/src/components/MultistepJsonForm/MultistepJsonForm.tsx
@@ -24,7 +24,7 @@ import {
   Stepper,
   Typography,
 } from '@material-ui/core';
-import { FormProps, IChangeEvent, withTheme } from '@rjsf/core';
+import { FormProps, IChangeEvent, UiSchema, withTheme } from '@rjsf/core';
 import { Theme as MuiTheme } from '@rjsf/material-ui';
 import React, { useState } from 'react';
 import { transformSchemaToProps } from './schema';
@@ -49,6 +49,59 @@ type Props = {
   fields?: FormProps<any>['fields'];
 };
 
+export function getUiSchemasFromSteps(steps: Step[]): UiSchema[] {
+  const uiSchemas: Array<UiSchema> = [];
+  steps.forEach(step => {
+    const schemaProps = step.schema.properties as JsonObject;
+    for (const key in schemaProps) {
+      if (schemaProps.hasOwnProperty(key)) {
+        const uiSchema = schemaProps[key] as UiSchema;
+        uiSchema.name = key;
+        uiSchemas.push(uiSchema);
+      }
+    }
+  });
+  return uiSchemas;
+}
+
+export function getReviewData(formData: Record<string, any>, steps: Step[]) {
+  const uiSchemas = getUiSchemasFromSteps(steps);
+  const reviewData: Record<string, any> = {};
+  for (const key in formData) {
+    if (formData.hasOwnProperty(key)) {
+      const uiSchema = uiSchemas.find(us => us.name === key);
+
+      if (!uiSchema) {
+        reviewData[key] = formData[key];
+        continue;
+      }
+
+      if (uiSchema['ui:widget'] === 'password') {
+        reviewData[key] = '******';
+        continue;
+      }
+
+      if (!uiSchema['ui:backstage'] || !uiSchema['ui:backstage'].review) {
+        reviewData[key] = formData[key];
+        continue;
+      }
+
+      const review = uiSchema['ui:backstage'].review as JsonObject;
+      if (!review.show) {
+        continue;
+      }
+
+      if (review.mask) {
+        reviewData[key] = review.mask;
+        continue;
+      }
+      reviewData[key] = formData[key];
+    }
+  }
+
+  return reviewData;
+}
+
 export const MultistepJsonForm = ({
   steps,
   formData,
@@ -59,14 +112,20 @@ export const MultistepJsonForm = ({
   widgets,
 }: Props) => {
   const [activeStep, setActiveStep] = useState(0);
+  const [disableButtons, setDisableButtons] = useState(false);
 
   const handleReset = () => {
     setActiveStep(0);
     onReset();
   };
-  const handleNext = () =>
+  const handleNext = () => {
     setActiveStep(Math.min(activeStep + 1, steps.length));
+  };
   const handleBack = () => setActiveStep(Math.max(activeStep - 1, 0));
+  const handleCreate = () => {
+    setDisableButtons(true);
+    onFinish();
+  };
 
   return (
     <>
@@ -113,11 +172,23 @@ export const MultistepJsonForm = ({
         <Content>
           <Paper square elevation={0}>
             <Typography variant="h6">Review and create</Typography>
-            <StructuredMetadataTable dense metadata={formData} />
+            <StructuredMetadataTable
+              dense
+              metadata={getReviewData(formData, steps)}
+            />
             <Box mb={4} />
-            <Button onClick={handleBack}>Back</Button>
-            <Button onClick={handleReset}>Reset</Button>
-            <Button variant="contained" color="primary" onClick={onFinish}>
+            <Button onClick={handleBack} disabled={disableButtons}>
+              Back
+            </Button>
+            <Button onClick={handleReset} disabled={disableButtons}>
+              Reset
+            </Button>
+            <Button
+              variant="contained"
+              color="primary"
+              onClick={handleCreate}
+              disabled={disableButtons}
+            >
               Create
             </Button>
           </Paper>
diff --git a/plugins/scaffolder/src/components/MultistepJsonForm/schema.test.ts b/plugins/scaffolder/src/components/MultistepJsonForm/schema.test.ts
index b51d01f719..ef6b582021 100644
--- a/plugins/scaffolder/src/components/MultistepJsonForm/schema.test.ts
+++ b/plugins/scaffolder/src/components/MultistepJsonForm/schema.test.ts
@@ -346,4 +346,68 @@ describe('transformSchemaToProps', () => {
       uiSchema: expectedUiSchema,
     });
   });
+
+  it('transforms schema with array items', () => {
+    const inputSchema = {
+      type: 'object',
+      properties: {
+        person: {
+          type: 'array',
+          items: {
+            type: 'object',
+            properties: {
+              name: {
+                type: 'string',
+              },
+              address: {
+                type: 'string',
+                'ui:widget': 'textarea',
+              },
+            },
+          },
+        },
+        accountNumber: {
+          type: 'number',
+        },
+      },
+    };
+    const expectedSchema = {
+      type: 'object',
+      properties: {
+        person: {
+          type: 'array',
+          items: {
+            type: 'object',
+            properties: {
+              name: {
+                type: 'string',
+              },
+              address: {
+                type: 'string',
+              },
+            },
+          },
+        },
+        accountNumber: {
+          type: 'number',
+        },
+      },
+    };
+    const expectedUiSchema = {
+      accountNumber: {},
+      person: {
+        items: {
+          name: {},
+          address: {
+            'ui:widget': 'textarea',
+          },
+        },
+      },
+    };
+
+    expect(transformSchemaToProps(inputSchema)).toEqual({
+      schema: expectedSchema,
+      uiSchema: expectedUiSchema,
+    });
+  });
 });
diff --git a/plugins/scaffolder/src/components/MultistepJsonForm/schema.ts b/plugins/scaffolder/src/components/MultistepJsonForm/schema.ts
index ee2dbce406..dd86784275 100644
--- a/plugins/scaffolder/src/components/MultistepJsonForm/schema.ts
+++ b/plugins/scaffolder/src/components/MultistepJsonForm/schema.ts
@@ -26,7 +26,7 @@ function extractUiSchema(schema: JsonObject, uiSchema: JsonObject) {
     return;
   }
 
-  const { properties, anyOf, oneOf, allOf, dependencies } = schema;
+  const { properties, items, anyOf, oneOf, allOf, dependencies } = schema;
 
   for (const propName in schema) {
     if (!schema.hasOwnProperty(propName)) {
@@ -55,6 +55,12 @@ function extractUiSchema(schema: JsonObject, uiSchema: JsonObject) {
     }
   }
 
+  if (isObject(items)) {
+    const innerUiSchema = {};
+    uiSchema.items = innerUiSchema;
+    extractUiSchema(items, innerUiSchema);
+  }
+
   if (Array.isArray(anyOf)) {
     for (const schemaNode of anyOf) {
       if (!isObject(schemaNode)) {
@@ -93,9 +99,10 @@ function extractUiSchema(schema: JsonObject, uiSchema: JsonObject) {
   }
 }
 
-export function transformSchemaToProps(
-  inputSchema: JsonObject,
-): { schema: FormProps<any>['schema']; uiSchema: FormProps<any>['uiSchema'] } {
+export function transformSchemaToProps(inputSchema: JsonObject): {
+  schema: FormProps<any>['schema'];
+  uiSchema: FormProps<any>['uiSchema'];
+} {
   inputSchema.type = inputSchema.type || 'object';
   const schema = JSON.parse(JSON.stringify(inputSchema));
   delete schema.title; // Rendered separately
diff --git a/plugins/scaffolder/src/components/Router.tsx b/plugins/scaffolder/src/components/Router.tsx
index 43c8dd6ebb..9e4736ab9f 100644
--- a/plugins/scaffolder/src/components/Router.tsx
+++ b/plugins/scaffolder/src/components/Router.tsx
@@ -14,8 +14,9 @@
  * limitations under the License.
  */
 
-import React from 'react';
+import React, { ComponentType } from 'react';
 import { Routes, Route, useOutlet } from 'react-router';
+import { TemplateEntityV1beta2 } from '@backstage/catalog-model';
 import { ScaffolderPage } from './ScaffolderPage';
 import { TemplatePage } from './TemplatePage';
 import { TaskPage } from './TaskPage';
@@ -29,10 +30,16 @@ import {
 } from '../extensions';
 import { useElementFilter } from '@backstage/core-plugin-api';
 
-export const Router = () => {
+type RouterProps = {
+  TemplateCardComponent?:
+    | ComponentType<{ template: TemplateEntityV1beta2 }>
+    | undefined;
+};
+
+export const Router = ({ TemplateCardComponent }: RouterProps) => {
   const outlet = useOutlet();
 
-  const foundExtensions = useElementFilter(outlet, elements =>
+  const customFieldExtensions = useElementFilter(outlet, elements =>
     elements
       .selectByComponentData({
         key: FIELD_EXTENSION_WRAPPER_KEY,
@@ -42,13 +49,24 @@ export const Router = () => {
       }),
   );
 
-  const fieldExtensions = foundExtensions.length
-    ? foundExtensions
-    : DEFAULT_SCAFFOLDER_FIELD_EXTENSIONS;
+  const fieldExtensions = [
+    ...customFieldExtensions,
+    ...DEFAULT_SCAFFOLDER_FIELD_EXTENSIONS.filter(
+      ({ name }) =>
+        !customFieldExtensions.some(
+          customFieldExtension => customFieldExtension.name === name,
+        ),
+    ),
+  ];
 
   return (
     <Routes>
-      <Route path="/" element={<ScaffolderPage />} />
+      <Route
+        path="/"
+        element={
+          <ScaffolderPage TemplateCardComponent={TemplateCardComponent} />
+        }
+      />
       <Route
         path="/templates/:templateName"
         element={<TemplatePage customFieldExtensions={fieldExtensions} />}
diff --git a/plugins/scaffolder/src/components/ScaffolderPage/ScaffolderPage.tsx b/plugins/scaffolder/src/components/ScaffolderPage/ScaffolderPage.tsx
index 3fed099500..ec7bd6f468 100644
--- a/plugins/scaffolder/src/components/ScaffolderPage/ScaffolderPage.tsx
+++ b/plugins/scaffolder/src/components/ScaffolderPage/ScaffolderPage.tsx
@@ -17,11 +17,13 @@
 import {
   Content,
   ContentHeader,
+  CreateButton,
   Header,
   Lifecycle,
   Page,
   SupportButton,
 } from '@backstage/core-components';
+import { TemplateEntityV1beta2 } from '@backstage/catalog-model';
 import { useRouteRef } from '@backstage/core-plugin-api';
 import {
   EntityKindPicker,
@@ -30,9 +32,8 @@ import {
   EntityTagPicker,
   UserListPicker,
 } from '@backstage/plugin-catalog-react';
-import { Button, makeStyles } from '@material-ui/core';
-import React from 'react';
-import { Link as RouterLink } from 'react-router-dom';
+import { makeStyles } from '@material-ui/core';
+import React, { ComponentType } from 'react';
 import { registerComponentRouteRef } from '../../routes';
 import { TemplateList } from '../TemplateList';
 import { TemplateTypePicker } from '../TemplateTypePicker';
@@ -46,7 +47,15 @@ const useStyles = makeStyles(theme => ({
   },
 }));
 
-export const ScaffolderPageContents = () => {
+export type ScaffolderPageProps = {
+  TemplateCardComponent?:
+    | ComponentType<{ template: TemplateEntityV1beta2 }>
+    | undefined;
+};
+
+export const ScaffolderPageContents = ({
+  TemplateCardComponent,
+}: ScaffolderPageProps) => {
   const styles = useStyles();
 
   const registerComponentLink = useRouteRef(registerComponentRouteRef);
@@ -57,23 +66,17 @@ export const ScaffolderPageContents = () => {
         pageTitleOverride="Create a New Component"
         title={
           <>
-            Create a New Component <Lifecycle alpha shorthand />
+            Create a New Component <Lifecycle shorthand />
           </>
         }
         subtitle="Create new software components using standard templates"
       />
       <Content>
         <ContentHeader title="Available Templates">
-          {registerComponentLink && (
-            <Button
-              component={RouterLink}
-              variant="contained"
-              color="primary"
-              to={registerComponentLink()}
-            >
-              Register Existing Component
-            </Button>
-          )}
+          <CreateButton
+            title="Register Existing Component"
+            to={registerComponentLink && registerComponentLink()}
+          />
           <SupportButton>
             Create new software components using standard templates. Different
             templates create different kinds of components (services, websites,
@@ -93,7 +96,7 @@ export const ScaffolderPageContents = () => {
             <EntityTagPicker />
           </div>
           <div>
-            <TemplateList />
+            <TemplateList TemplateCardComponent={TemplateCardComponent} />
           </div>
         </div>
       </Content>
@@ -101,8 +104,10 @@ export const ScaffolderPageContents = () => {
   );
 };
 
-export const ScaffolderPage = () => (
+export const ScaffolderPage = ({
+  TemplateCardComponent,
+}: ScaffolderPageProps) => (
   <EntityListProvider>
-    <ScaffolderPageContents />
+    <ScaffolderPageContents TemplateCardComponent={TemplateCardComponent} />
   </EntityListProvider>
 );
diff --git a/plugins/scaffolder/src/components/TemplateCard/TemplateCard.tsx b/plugins/scaffolder/src/components/TemplateCard/TemplateCard.tsx
index 9d2e827be9..a02e6d3b14 100644
--- a/plugins/scaffolder/src/components/TemplateCard/TemplateCard.tsx
+++ b/plugins/scaffolder/src/components/TemplateCard/TemplateCard.tsx
@@ -27,7 +27,7 @@ import {
   getEntityRelations,
   getEntitySourceLocation,
 } from '@backstage/plugin-catalog-react';
-import { BackstageTheme, pageTheme } from '@backstage/theme';
+import { BackstageTheme } from '@backstage/theme';
 import {
   Box,
   Card,
@@ -149,7 +149,9 @@ export const TemplateCard = ({ template, deprecated }: TemplateCardProps) => {
     template as Entity,
     RELATION_OWNED_BY,
   );
-  const themeId = pageTheme[templateProps.type] ? templateProps.type : 'other';
+  const themeId = backstageTheme.getPageTheme({ themeId: templateProps.type })
+    ? templateProps.type
+    : 'other';
   const theme = backstageTheme.getPageTheme({ themeId });
   const classes = useStyles({ backgroundImage: theme.backgroundImage });
   const href = generatePath(`${rootLink()}/templates/:templateName`, {
diff --git a/plugins/scaffolder/src/components/TemplateList/TemplateList.tsx b/plugins/scaffolder/src/components/TemplateList/TemplateList.tsx
index 009342c379..dcf708db10 100644
--- a/plugins/scaffolder/src/components/TemplateList/TemplateList.tsx
+++ b/plugins/scaffolder/src/components/TemplateList/TemplateList.tsx
@@ -14,8 +14,11 @@
  * limitations under the License.
  */
 
-import React from 'react';
-import { TemplateEntityV1beta2 } from '@backstage/catalog-model';
+import React, { ComponentType } from 'react';
+import {
+  stringifyEntityRef,
+  TemplateEntityV1beta2,
+} from '@backstage/catalog-model';
 import {
   ItemCardGrid,
   Progress,
@@ -25,8 +28,15 @@ import { useEntityListProvider } from '@backstage/plugin-catalog-react';
 import { Link, Typography } from '@material-ui/core';
 import { TemplateCard } from '../TemplateCard';
 
-export const TemplateList = () => {
+export type TemplateListProps = {
+  TemplateCardComponent?:
+    | ComponentType<{ template: TemplateEntityV1beta2 }>
+    | undefined;
+};
+
+export const TemplateList = ({ TemplateCardComponent }: TemplateListProps) => {
   const { loading, error, entities } = useEntityListProvider();
+  const Card = TemplateCardComponent || TemplateCard;
   return (
     <>
       {loading && <Progress />}
@@ -50,9 +60,9 @@ export const TemplateList = () => {
       <ItemCardGrid>
         {entities &&
           entities?.length > 0 &&
-          entities.map((template, i) => (
-            <TemplateCard
-              key={i}
+          entities.map(template => (
+            <Card
+              key={stringifyEntityRef(template)}
               template={template as TemplateEntityV1beta2}
             />
           ))}
diff --git a/plugins/scaffolder/src/components/TemplatePage/TemplatePage.test.tsx b/plugins/scaffolder/src/components/TemplatePage/TemplatePage.test.tsx
index 51e1ee5fbc..e42bcbdbdc 100644
--- a/plugins/scaffolder/src/components/TemplatePage/TemplatePage.test.tsx
+++ b/plugins/scaffolder/src/components/TemplatePage/TemplatePage.test.tsx
@@ -161,21 +161,17 @@ describe('TemplatePage', () => {
       ],
     });
 
-    const {
-      findByText,
-      findByLabelText,
-      findAllByRole,
-      findByRole,
-    } = await renderInTestApp(
-      <ApiProvider apis={apis}>
-        <TemplatePage />
-      </ApiProvider>,
-      {
-        mountedRoutes: {
-          '/create/actions': rootRouteRef,
+    const { findByText, findByLabelText, findAllByRole, findByRole } =
+      await renderInTestApp(
+        <ApiProvider apis={apis}>
+          <TemplatePage />
+        </ApiProvider>,
+        {
+          mountedRoutes: {
+            '/create/actions': rootRouteRef,
+          },
         },
-      },
-    );
+      );
 
     expect(await findByText('Fill in some steps')).toBeInTheDocument();
 
diff --git a/plugins/scaffolder/src/components/TemplatePage/TemplatePage.tsx b/plugins/scaffolder/src/components/TemplatePage/TemplatePage.tsx
index e72255f129..05533376db 100644
--- a/plugins/scaffolder/src/components/TemplatePage/TemplatePage.tsx
+++ b/plugins/scaffolder/src/components/TemplatePage/TemplatePage.tsx
@@ -160,7 +160,7 @@ export const TemplatePage = ({
         pageTitleOverride="Create a New Component"
         title={
           <>
-            Create a New Component <Lifecycle alpha shorthand />
+            Create a New Component <Lifecycle shorthand />
           </>
         }
         subtitle="Create new software components using standard templates"
diff --git a/plugins/scaffolder/src/components/TemplateTypePicker/TemplateTypePicker.test.tsx b/plugins/scaffolder/src/components/TemplateTypePicker/TemplateTypePicker.test.tsx
index baeefc7d99..3d0267ff1f 100644
--- a/plugins/scaffolder/src/components/TemplateTypePicker/TemplateTypePicker.test.tsx
+++ b/plugins/scaffolder/src/components/TemplateTypePicker/TemplateTypePicker.test.tsx
@@ -27,7 +27,7 @@ import {
 } from '@backstage/plugin-catalog-react';
 import { AlertApi, alertApiRef } from '@backstage/core-plugin-api';
 import { ApiProvider, ApiRegistry } from '@backstage/core-app-api';
-import { renderWithEffects } from '../../../../../packages/test-utils-core/src';
+import { renderWithEffects } from '@backstage/test-utils';
 
 const entities: Entity[] = [
   {
@@ -65,17 +65,17 @@ const entities: Entity[] = [
 const apis = ApiRegistry.from([
   [
     catalogApiRef,
-    ({
+    {
       getEntities: jest
         .fn()
         .mockImplementation(() => Promise.resolve({ items: entities })),
-    } as unknown) as CatalogApi,
+    } as unknown as CatalogApi,
   ],
   [
     alertApiRef,
-    ({
+    {
       post: jest.fn(),
-    } as unknown) as AlertApi,
+    } as unknown as AlertApi,
   ],
 ]);
 
@@ -94,6 +94,7 @@ describe('<TemplateTypePicker/>', () => {
       </ApiProvider>,
     );
     expect(rendered.getByText('Categories')).toBeInTheDocument();
+    fireEvent.click(rendered.getByTestId('categories-picker-expand'));
 
     entities.forEach(entity => {
       expect(
@@ -116,22 +117,27 @@ describe('<TemplateTypePicker/>', () => {
       </ApiProvider>,
     );
 
+    fireEvent.click(rendered.getByTestId('categories-picker-expand'));
     expect(rendered.getByLabelText('Service')).not.toBeChecked();
     expect(rendered.getByLabelText('Website')).not.toBeChecked();
 
     fireEvent.click(rendered.getByLabelText('Service'));
+    fireEvent.click(rendered.getByTestId('categories-picker-expand'));
     expect(rendered.getByLabelText('Service')).toBeChecked();
     expect(rendered.getByLabelText('Website')).not.toBeChecked();
 
     fireEvent.click(rendered.getByLabelText('Website'));
+    fireEvent.click(rendered.getByTestId('categories-picker-expand'));
     expect(rendered.getByLabelText('Service')).toBeChecked();
     expect(rendered.getByLabelText('Website')).toBeChecked();
 
     fireEvent.click(rendered.getByLabelText('Service'));
+    fireEvent.click(rendered.getByTestId('categories-picker-expand'));
     expect(rendered.getByLabelText('Service')).not.toBeChecked();
     expect(rendered.getByLabelText('Website')).toBeChecked();
 
     fireEvent.click(rendered.getByLabelText('Website'));
+    fireEvent.click(rendered.getByTestId('categories-picker-expand'));
     expect(rendered.getByLabelText('Service')).not.toBeChecked();
     expect(rendered.getByLabelText('Website')).not.toBeChecked();
   });
diff --git a/plugins/scaffolder/src/components/TemplateTypePicker/TemplateTypePicker.tsx b/plugins/scaffolder/src/components/TemplateTypePicker/TemplateTypePicker.tsx
index b547af6143..a8418cfded 100644
--- a/plugins/scaffolder/src/components/TemplateTypePicker/TemplateTypePicker.tsx
+++ b/plugins/scaffolder/src/components/TemplateTypePicker/TemplateTypePicker.tsx
@@ -21,30 +21,23 @@ import {
   Box,
   Checkbox,
   FormControlLabel,
-  FormGroup,
-  makeStyles,
-  Theme,
+  TextField,
   Typography,
 } from '@material-ui/core';
+import CheckBoxIcon from '@material-ui/icons/CheckBox';
+import CheckBoxOutlineBlankIcon from '@material-ui/icons/CheckBoxOutlineBlank';
+import ExpandMoreIcon from '@material-ui/icons/ExpandMore';
+import { Autocomplete } from '@material-ui/lab';
 import { useEntityTypeFilter } from '@backstage/plugin-catalog-react';
 import { alertApiRef, useApi } from '@backstage/core-plugin-api';
 
-const useStyles = makeStyles<Theme>(theme => ({
-  checkbox: {
-    padding: theme.spacing(1, 1, 1, 2),
-  },
-}));
+const icon = <CheckBoxOutlineBlankIcon fontSize="small" />;
+const checkedIcon = <CheckBoxIcon fontSize="small" />;
 
 export const TemplateTypePicker = () => {
-  const classes = useStyles();
   const alertApi = useApi(alertApiRef);
-  const {
-    error,
-    loading,
-    availableTypes,
-    selectedTypes,
-    setSelectedTypes,
-  } = useEntityTypeFilter();
+  const { error, loading, availableTypes, selectedTypes, setSelectedTypes } =
+    useEntityTypeFilter();
 
   if (loading) return <Progress />;
 
@@ -58,32 +51,31 @@ export const TemplateTypePicker = () => {
     return null;
   }
 
-  function toggleSelection(type: string) {
-    setSelectedTypes(
-      selectedTypes.includes(type)
-        ? selectedTypes.filter(t => t !== type)
-        : [...selectedTypes, type],
-    );
-  }
-
   return (
     <Box pb={1} pt={1}>
       <Typography variant="button">Categories</Typography>
-      <FormGroup>
-        {availableTypes.map(type => (
+      <Autocomplete<string>
+        multiple
+        aria-label="Categories"
+        options={availableTypes}
+        value={selectedTypes}
+        onChange={(_: object, value: string[]) => setSelectedTypes(value)}
+        renderOption={(option, { selected }) => (
           <FormControlLabel
             control={
               <Checkbox
-                checked={selectedTypes.includes(type)}
-                onChange={() => toggleSelection(type)}
-                className={classes.checkbox}
+                icon={icon}
+                checkedIcon={checkedIcon}
+                checked={selected}
               />
             }
-            label={capitalize(type)}
-            key={type}
+            label={capitalize(option)}
           />
-        ))}
-      </FormGroup>
+        )}
+        size="small"
+        popupIcon={<ExpandMoreIcon data-testid="categories-picker-expand" />}
+        renderInput={params => <TextField {...params} variant="outlined" />}
+      />
     </Box>
   );
 };
diff --git a/plugins/scaffolder/src/components/fields/EntityNamePicker/EntityNamePicker.tsx b/plugins/scaffolder/src/components/fields/EntityNamePicker/EntityNamePicker.tsx
new file mode 100644
index 0000000000..8e7c0b0bea
--- /dev/null
+++ b/plugins/scaffolder/src/components/fields/EntityNamePicker/EntityNamePicker.tsx
@@ -0,0 +1,25 @@
+/*
+ * Copyright 2021 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import React from 'react';
+import { FieldProps } from '@rjsf/core';
+import { TextValuePicker } from '../TextValuePicker';
+
+export const EntityNamePicker = ({
+  schema: { title = 'Name', description = 'Unique name of the component' },
+  ...props
+}: FieldProps<string>) => (
+  <TextValuePicker schema={{ title, description }} {...props} />
+);
diff --git a/plugins/scaffolder/src/components/fields/EntityNamePicker/index.ts b/plugins/scaffolder/src/components/fields/EntityNamePicker/index.ts
new file mode 100644
index 0000000000..0ba88d1277
--- /dev/null
+++ b/plugins/scaffolder/src/components/fields/EntityNamePicker/index.ts
@@ -0,0 +1,17 @@
+/*
+ * Copyright 2021 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+export { EntityNamePicker } from './EntityNamePicker';
+export { entityNamePickerValidation } from './validation';
diff --git a/plugins/scaffolder/src/components/fields/EntityNamePicker/validation.test.ts b/plugins/scaffolder/src/components/fields/EntityNamePicker/validation.test.ts
new file mode 100644
index 0000000000..290650387e
--- /dev/null
+++ b/plugins/scaffolder/src/components/fields/EntityNamePicker/validation.test.ts
@@ -0,0 +1,66 @@
+/*
+ * Copyright 2021 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { FieldValidation } from '@rjsf/core';
+import { KubernetesValidatorFunctions } from '@backstage/catalog-model';
+import { entityNamePickerValidation } from './validation';
+
+jest.mock('@backstage/catalog-model', () => ({
+  KubernetesValidatorFunctions: {
+    isValidObjectName: jest.fn(),
+  },
+}));
+
+const mockIsValidObjectName =
+  KubernetesValidatorFunctions.isValidObjectName as jest.MockedFunction<
+    typeof KubernetesValidatorFunctions.isValidObjectName
+  >;
+
+describe('EntityNamePicker Validation', () => {
+  let mockFieldValidation: FieldValidation;
+
+  beforeEach(() => {
+    mockFieldValidation = {
+      addError: jest.fn(),
+    } as unknown as FieldValidation;
+  });
+
+  it('calls isValidObjectName to validate value', () => {
+    entityNamePickerValidation('test value', mockFieldValidation);
+
+    expect(mockIsValidObjectName).toHaveBeenCalled();
+  });
+
+  it('does not add an error when isValidObjectName returns true', () => {
+    mockIsValidObjectName.mockReturnValue(true);
+
+    entityNamePickerValidation('test value', mockFieldValidation);
+
+    expect(mockFieldValidation.addError).not.toHaveBeenCalled();
+  });
+
+  it('adds an error when isValidObjectName returns false', () => {
+    mockIsValidObjectName.mockReturnValue(false);
+
+    entityNamePickerValidation('test value', mockFieldValidation);
+
+    expect(mockFieldValidation.addError).toHaveBeenCalledWith(
+      expect.stringMatching(
+        /contain only alphanumeric characters, hyphens, underscores, and periods/,
+      ),
+    );
+  });
+});
diff --git a/plugins/scaffolder/src/components/fields/EntityNamePicker/validation.ts b/plugins/scaffolder/src/components/fields/EntityNamePicker/validation.ts
new file mode 100644
index 0000000000..7a40a460ba
--- /dev/null
+++ b/plugins/scaffolder/src/components/fields/EntityNamePicker/validation.ts
@@ -0,0 +1,29 @@
+/*
+ * Copyright 2021 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { FieldValidation } from '@rjsf/core';
+import { KubernetesValidatorFunctions } from '@backstage/catalog-model';
+
+export const entityNamePickerValidation = (
+  value: string,
+  validation: FieldValidation,
+) => {
+  if (!KubernetesValidatorFunctions.isValidObjectName(value)) {
+    validation.addError(
+      'must start and end with an alphanumeric character, and contain only alphanumeric characters, hyphens, underscores, and periods. Maximum length is 63 characters.',
+    );
+  }
+};
diff --git a/plugins/scaffolder/src/components/fields/EntityPicker/EntityPicker.test.tsx b/plugins/scaffolder/src/components/fields/EntityPicker/EntityPicker.test.tsx
index 380a5e810e..f293969dff 100644
--- a/plugins/scaffolder/src/components/fields/EntityPicker/EntityPicker.test.tsx
+++ b/plugins/scaffolder/src/components/fields/EntityPicker/EntityPicker.test.tsx
@@ -69,14 +69,14 @@ describe('<EntityPicker />', () => {
   describe('without allowedKinds', () => {
     beforeEach(() => {
       uiSchema = { 'ui:options': {} };
-      props = ({
+      props = {
         onChange,
         schema,
         required,
         uiSchema,
         rawErrors,
         formData,
-      } as unknown) as FieldProps<any>;
+      } as unknown as FieldProps<any>;
 
       catalogApi.getEntities.mockResolvedValue({ items: entities });
     });
@@ -109,14 +109,14 @@ describe('<EntityPicker />', () => {
   describe('with allowedKinds', () => {
     beforeEach(() => {
       uiSchema = { 'ui:options': { allowedKinds: ['User'] } };
-      props = ({
+      props = {
         onChange,
         schema,
         required,
         uiSchema,
         rawErrors,
         formData,
-      } as unknown) as FieldProps<any>;
+      } as unknown as FieldProps<any>;
 
       catalogApi.getEntities.mockResolvedValue({ items: entities });
     });
diff --git a/plugins/scaffolder/src/components/fields/EntityPicker/EntityPicker.tsx b/plugins/scaffolder/src/components/fields/EntityPicker/EntityPicker.tsx
index 04693a94cd..a8ef524a13 100644
--- a/plugins/scaffolder/src/components/fields/EntityPicker/EntityPicker.tsx
+++ b/plugins/scaffolder/src/components/fields/EntityPicker/EntityPicker.tsx
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+import { useApi } from '@backstage/core-plugin-api';
 import {
   catalogApiRef,
   formatEntityRefTitle,
@@ -23,7 +24,6 @@ import Autocomplete from '@material-ui/lab/Autocomplete';
 import { FieldProps } from '@rjsf/core';
 import React from 'react';
 import { useAsync } from 'react-use';
-import { useApi } from '@backstage/core-plugin-api';
 
 export const EntityPicker = ({
   onChange,
@@ -32,6 +32,7 @@ export const EntityPicker = ({
   uiSchema,
   rawErrors,
   formData,
+  idSchema,
 }: FieldProps<string>) => {
   const allowedKinds = uiSchema['ui:options']?.allowedKinds as string[];
   const defaultKind = uiSchema['ui:options']?.defaultKind as string | undefined;
@@ -58,6 +59,7 @@ export const EntityPicker = ({
       error={rawErrors?.length > 0 && !formData}
     >
       <Autocomplete
+        id={idSchema?.$id}
         value={(formData as string) || ''}
         loading={loading}
         onChange={onSelect}
diff --git a/plugins/scaffolder/src/components/fields/OwnerPicker/OwnerPicker.test.tsx b/plugins/scaffolder/src/components/fields/OwnerPicker/OwnerPicker.test.tsx
index 5e47f9f0f9..18d6fd7e5c 100644
--- a/plugins/scaffolder/src/components/fields/OwnerPicker/OwnerPicker.test.tsx
+++ b/plugins/scaffolder/src/components/fields/OwnerPicker/OwnerPicker.test.tsx
@@ -66,14 +66,14 @@ describe('<OwnerPicker />', () => {
   describe('without allowedKinds', () => {
     beforeEach(() => {
       uiSchema = { 'ui:options': {} };
-      props = ({
+      props = {
         onChange,
         schema,
         required,
         uiSchema,
         rawErrors,
         formData,
-      } as unknown) as FieldProps<any>;
+      } as unknown as FieldProps<any>;
 
       catalogApi.getEntities.mockResolvedValue({ items: entities });
     });
@@ -96,14 +96,14 @@ describe('<OwnerPicker />', () => {
   describe('with allowedKinds', () => {
     beforeEach(() => {
       uiSchema = { 'ui:options': { allowedKinds: ['User'] } };
-      props = ({
+      props = {
         onChange,
         schema,
         required,
         uiSchema,
         rawErrors,
         formData,
-      } as unknown) as FieldProps<any>;
+      } as unknown as FieldProps<any>;
 
       catalogApi.getEntities.mockResolvedValue({ items: entities });
     });
diff --git a/plugins/scaffolder/src/components/fields/RepoUrlPicker/RepoUrlPicker.tsx b/plugins/scaffolder/src/components/fields/RepoUrlPicker/RepoUrlPicker.tsx
index 4287d1147b..f862fa66fe 100644
--- a/plugins/scaffolder/src/components/fields/RepoUrlPicker/RepoUrlPicker.tsx
+++ b/plugins/scaffolder/src/components/fields/RepoUrlPicker/RepoUrlPicker.tsx
@@ -16,6 +16,7 @@
 import React, { useCallback, useEffect } from 'react';
 import { FieldProps } from '@rjsf/core';
 import { scaffolderApiRef } from '../../../api';
+import { scmIntegrationsApiRef } from '@backstage/integration-react';
 import { useAsync } from 'react-use';
 import Select from '@material-ui/core/Select';
 import InputLabel from '@material-ui/core/InputLabel';
@@ -31,6 +32,8 @@ function splitFormData(url: string | undefined) {
   let owner = undefined;
   let repo = undefined;
   let organization = undefined;
+  let workspace = undefined;
+  let project = undefined;
 
   try {
     if (url) {
@@ -40,12 +43,15 @@ function splitFormData(url: string | undefined) {
       repo = parsed.searchParams.get('repo') || undefined;
       // This is azure dev ops specific. not used for any other provider.
       organization = parsed.searchParams.get('organization') || undefined;
+      // These are bitbucket specific, not used for any other provider.
+      workspace = parsed.searchParams.get('workspace') || undefined;
+      project = parsed.searchParams.get('project') || undefined;
     }
   } catch {
     /* ok */
   }
 
-  return { host, owner, repo, organization };
+  return { host, owner, repo, organization, workspace, project };
 }
 
 function serializeFormData(data: {
@@ -53,10 +59,13 @@ function serializeFormData(data: {
   owner?: string;
   repo?: string;
   organization?: string;
+  workspace?: string;
+  project?: string;
 }) {
   if (!data.host) {
     return undefined;
   }
+
   const params = new URLSearchParams();
   if (data.owner) {
     params.set('owner', data.owner);
@@ -67,6 +76,12 @@ function serializeFormData(data: {
   if (data.organization) {
     params.set('organization', data.organization);
   }
+  if (data.workspace) {
+    params.set('workspace', data.workspace);
+  }
+  if (data.project) {
+    params.set('project', data.project);
+  }
 
   return `${data.host}?${params.toString()}`;
 }
@@ -77,25 +92,30 @@ export const RepoUrlPicker = ({
   rawErrors,
   formData,
 }: FieldProps<string>) => {
-  const api = useApi(scaffolderApiRef);
+  const scaffolderApi = useApi(scaffolderApiRef);
+  const integrationApi = useApi(scmIntegrationsApiRef);
   const allowedHosts = uiSchema['ui:options']?.allowedHosts as string[];
 
   const { value: integrations, loading } = useAsync(async () => {
-    return await api.getIntegrationsList({ allowedHosts });
+    return await scaffolderApi.getIntegrationsList({ allowedHosts });
   });
 
-  const { host, owner, repo, organization } = splitFormData(formData);
+  const { host, owner, repo, organization, workspace, project } =
+    splitFormData(formData);
   const updateHost = useCallback(
-    (evt: React.ChangeEvent<{ name?: string; value: unknown }>) =>
+    (evt: React.ChangeEvent<{ name?: string; value: unknown }>) => {
       onChange(
         serializeFormData({
           host: evt.target.value as string,
           owner,
           repo,
           organization,
+          workspace,
+          project,
         }),
-      ),
-    [onChange, owner, repo, organization],
+      );
+    },
+    [onChange, owner, repo, organization, workspace, project],
   );
 
   const updateOwner = useCallback(
@@ -106,9 +126,11 @@ export const RepoUrlPicker = ({
           owner: evt.target.value as string,
           repo,
           organization,
+          workspace,
+          project,
         }),
       ),
-    [onChange, host, repo, organization],
+    [onChange, host, repo, organization, workspace, project],
   );
 
   const updateRepo = useCallback(
@@ -119,9 +141,11 @@ export const RepoUrlPicker = ({
           owner,
           repo: evt.target.value as string,
           organization,
+          workspace,
+          project,
         }),
       ),
-    [onChange, host, owner, organization],
+    [onChange, host, owner, organization, workspace, project],
   );
 
   const updateOrganization = useCallback(
@@ -132,9 +156,41 @@ export const RepoUrlPicker = ({
           owner,
           repo,
           organization: evt.target.value as string,
+          workspace,
+          project,
         }),
       ),
-    [onChange, host, owner, repo],
+    [onChange, host, owner, repo, workspace, project],
+  );
+
+  const updateWorkspace = useCallback(
+    (evt: React.ChangeEvent<{ name?: string; value: unknown }>) =>
+      onChange(
+        serializeFormData({
+          host,
+          owner,
+          repo,
+          organization,
+          workspace: evt.target.value as string,
+          project,
+        }),
+      ),
+    [onChange, host, owner, repo, organization, project],
+  );
+
+  const updateProject = useCallback(
+    (evt: React.ChangeEvent<{ name?: string; value: unknown }>) =>
+      onChange(
+        serializeFormData({
+          host,
+          owner,
+          repo,
+          organization,
+          workspace,
+          project: evt.target.value as string,
+        }),
+      ),
+    [onChange, host, owner, repo, organization, workspace],
   );
 
   useEffect(() => {
@@ -145,10 +201,21 @@ export const RepoUrlPicker = ({
           owner,
           repo,
           organization,
+          workspace,
+          project,
         }),
       );
     }
-  }, [onChange, integrations, host, owner, repo, organization]);
+  }, [
+    onChange,
+    integrations,
+    host,
+    owner,
+    repo,
+    organization,
+    workspace,
+    project,
+  ]);
 
   if (loading) {
     return <Progress />;
@@ -179,6 +246,7 @@ export const RepoUrlPicker = ({
           The host where the repository will be created
         </FormHelperText>
       </FormControl>
+      {/* Show this for dev.azure.com only */}
       {host === 'dev.azure.com' && (
         <FormControl
           margin="normal"
@@ -194,17 +262,60 @@ export const RepoUrlPicker = ({
           <FormHelperText>The name of the organization</FormHelperText>
         </FormControl>
       )}
-      <FormControl
-        margin="normal"
-        required
-        error={rawErrors?.length > 0 && !owner}
-      >
-        <InputLabel htmlFor="ownerInput">Owner</InputLabel>
-        <Input id="ownerInput" onChange={updateOwner} value={owner} />
-        <FormHelperText>
-          The organization, user or project that this repo will belong to
-        </FormHelperText>
-      </FormControl>
+      {host && integrationApi.byHost(host)?.type === 'bitbucket' && (
+        <>
+          {/* Show this for bitbucket.org only */}
+          {host === 'bitbucket.org' && (
+            <FormControl
+              margin="normal"
+              required
+              error={rawErrors?.length > 0 && !workspace}
+            >
+              <InputLabel htmlFor="wokrspaceInput">Workspace</InputLabel>
+              <Input
+                id="wokrspaceInput"
+                onChange={updateWorkspace}
+                value={workspace}
+              />
+              <FormHelperText>
+                The workspace where the repository will be created
+              </FormHelperText>
+            </FormControl>
+          )}
+          <FormControl
+            margin="normal"
+            required
+            error={rawErrors?.length > 0 && !project}
+          >
+            <InputLabel htmlFor="wokrspaceInput">Project</InputLabel>
+            <Input
+              id="wokrspaceInput"
+              onChange={updateProject}
+              value={project}
+            />
+            <FormHelperText>
+              The project where the repository will be created
+            </FormHelperText>
+          </FormControl>
+        </>
+      )}
+      {/* Show this for all hosts except bitbucket */}
+      {host && integrationApi.byHost(host)?.type !== 'bitbucket' && (
+        <>
+          <FormControl
+            margin="normal"
+            required
+            error={rawErrors?.length > 0 && !owner}
+          >
+            <InputLabel htmlFor="ownerInput">Owner</InputLabel>
+            <Input id="ownerInput" onChange={updateOwner} value={owner} />
+            <FormHelperText>
+              The organization, user or project that this repo will belong to
+            </FormHelperText>
+          </FormControl>
+        </>
+      )}
+      {/* Show this for all hosts */}
       <FormControl
         margin="normal"
         required
diff --git a/plugins/scaffolder/src/components/fields/RepoUrlPicker/validation.test.ts b/plugins/scaffolder/src/components/fields/RepoUrlPicker/validation.test.ts
index 1ea66e7df9..45e44b4072 100644
--- a/plugins/scaffolder/src/components/fields/RepoUrlPicker/validation.test.ts
+++ b/plugins/scaffolder/src/components/fields/RepoUrlPicker/validation.test.ts
@@ -16,37 +16,70 @@
 
 import { repoPickerValidation } from './validation';
 import { FieldValidation } from '@rjsf/core';
+import { ScmIntegrations } from '@backstage/integration';
+import { ConfigReader } from '@backstage/core-app-api';
+import { ApiHolder } from '@backstage/core-plugin-api';
 
 describe('RepoPicker Validation', () => {
   const fieldValidator = () =>
-    (({
+    ({
       addError: jest.fn(),
-    } as unknown) as FieldValidation);
+    } as unknown as FieldValidation);
+
+  const config = new ConfigReader({
+    integrations: {
+      bitbucket: [
+        {
+          host: 'bitbucket.org',
+        },
+        {
+          host: 'server.bitbucket.com',
+        },
+      ],
+      github: [
+        {
+          host: 'github.com',
+        },
+      ],
+    },
+  });
+
+  const scmIntegrations = ScmIntegrations.fromConfig(config);
+
+  const apiHolderMock: jest.Mocked<ApiHolder> = {
+    get: jest.fn().mockImplementation(() => {
+      return scmIntegrations;
+    }),
+  };
 
   it('validates when no repo', () => {
     const mockFieldValidation = fieldValidator();
 
-    repoPickerValidation('github.com?owner=a', mockFieldValidation);
+    repoPickerValidation('github.com?owner=a', mockFieldValidation, {
+      apiHolder: apiHolderMock,
+    });
 
     expect(mockFieldValidation.addError).toHaveBeenCalledWith(
-      'Incomplete repository location provided',
+      'Incomplete repository location provided, repo not provided',
     );
   });
 
   it('validates when no owner', () => {
     const mockFieldValidation = fieldValidator();
 
-    repoPickerValidation('github.com?repo=a', mockFieldValidation);
+    repoPickerValidation('github.com?repo=a', mockFieldValidation, {
+      apiHolder: apiHolderMock,
+    });
 
     expect(mockFieldValidation.addError).toHaveBeenCalledWith(
-      'Incomplete repository location provided',
+      'Incomplete repository location provided, owner not provided',
     );
   });
 
   it('validates when not a real url', () => {
     const mockFieldValidation = fieldValidator();
 
-    repoPickerValidation('', mockFieldValidation);
+    repoPickerValidation('', mockFieldValidation, { apiHolder: apiHolderMock });
 
     expect(mockFieldValidation.addError).toHaveBeenCalledWith(
       'Unable to parse the Repository URL',
@@ -56,8 +89,116 @@ describe('RepoPicker Validation', () => {
   it('validates properly with proper input', () => {
     const mockFieldValidation = fieldValidator();
 
-    repoPickerValidation('github.com?owner=a&repo=b', mockFieldValidation);
+    repoPickerValidation('github.com?owner=a&repo=b', mockFieldValidation, {
+      apiHolder: apiHolderMock,
+    });
 
     expect(mockFieldValidation.addError).not.toHaveBeenCalled();
   });
+
+  it('validates when no workspace, project or repo provided for bitbucket cloud', () => {
+    const mockFieldValidation = fieldValidator();
+
+    repoPickerValidation('bitbucket.org', mockFieldValidation, {
+      apiHolder: apiHolderMock,
+    });
+
+    expect(mockFieldValidation.addError).toHaveBeenNthCalledWith(
+      1,
+      'Incomplete repository location provided, workspace not provided',
+    );
+    expect(mockFieldValidation.addError).toHaveBeenNthCalledWith(
+      2,
+      'Incomplete repository location provided, project not provided',
+    );
+    expect(mockFieldValidation.addError).toHaveBeenNthCalledWith(
+      3,
+      'Incomplete repository location provided, repo not provided',
+    );
+  });
+
+  it('validates when no workspace provided for bitbucket cloud', () => {
+    const mockFieldValidation = fieldValidator();
+
+    repoPickerValidation(
+      'bitbucket.org?project=p&repo=r',
+      mockFieldValidation,
+      { apiHolder: apiHolderMock },
+    );
+
+    expect(mockFieldValidation.addError).toHaveBeenCalledWith(
+      'Incomplete repository location provided, workspace not provided',
+    );
+  });
+
+  it('validates when no project provided for bitbucket cloud', () => {
+    const mockFieldValidation = fieldValidator();
+
+    repoPickerValidation(
+      'bitbucket.org?workspace=w&repo=r',
+      mockFieldValidation,
+      { apiHolder: apiHolderMock },
+    );
+
+    expect(mockFieldValidation.addError).toHaveBeenCalledWith(
+      'Incomplete repository location provided, project not provided',
+    );
+  });
+
+  it('validates when no repo provided for bitbucket cloud', () => {
+    const mockFieldValidation = fieldValidator();
+
+    repoPickerValidation(
+      'bitbucket.org?workspace=w&project=p',
+      mockFieldValidation,
+      { apiHolder: apiHolderMock },
+    );
+
+    expect(mockFieldValidation.addError).toHaveBeenCalledWith(
+      'Incomplete repository location provided, repo not provided',
+    );
+  });
+
+  it('validates when no project or repo provided for bitbucket server', () => {
+    const mockFieldValidation = fieldValidator();
+
+    repoPickerValidation('server.bitbucket.com', mockFieldValidation, {
+      apiHolder: apiHolderMock,
+    });
+
+    expect(mockFieldValidation.addError).toHaveBeenNthCalledWith(
+      1,
+      'Incomplete repository location provided, project not provided',
+    );
+    expect(mockFieldValidation.addError).toHaveBeenNthCalledWith(
+      2,
+      'Incomplete repository location provided, repo not provided',
+    );
+  });
+
+  it('validates when no project provided for bitbucket server', () => {
+    const mockFieldValidation = fieldValidator();
+
+    repoPickerValidation('server.bitbucket.com?repo=r', mockFieldValidation, {
+      apiHolder: apiHolderMock,
+    });
+
+    expect(mockFieldValidation.addError).toHaveBeenCalledWith(
+      'Incomplete repository location provided, project not provided',
+    );
+  });
+
+  it('validates when no repo provided for bitbucket server', () => {
+    const mockFieldValidation = fieldValidator();
+
+    repoPickerValidation(
+      'server.bitbucket.com?project=p',
+      mockFieldValidation,
+      { apiHolder: apiHolderMock },
+    );
+
+    expect(mockFieldValidation.addError).toHaveBeenCalledWith(
+      'Incomplete repository location provided, repo not provided',
+    );
+  });
 });
diff --git a/plugins/scaffolder/src/components/fields/RepoUrlPicker/validation.ts b/plugins/scaffolder/src/components/fields/RepoUrlPicker/validation.ts
index 760b9f7890..24a1c2f5ce 100644
--- a/plugins/scaffolder/src/components/fields/RepoUrlPicker/validation.ts
+++ b/plugins/scaffolder/src/components/fields/RepoUrlPicker/validation.ts
@@ -15,15 +15,53 @@
  */
 
 import { FieldValidation } from '@rjsf/core';
+import { ApiHolder } from '@backstage/core-plugin-api';
+import { scmIntegrationsApiRef } from '@backstage/integration-react';
 
 export const repoPickerValidation = (
   value: string,
   validation: FieldValidation,
+  context: { apiHolder: ApiHolder },
 ) => {
   try {
     const { host, searchParams } = new URL(`https://${value}`);
-    if (!host || !searchParams.get('owner') || !searchParams.get('repo')) {
-      validation.addError('Incomplete repository location provided');
+
+    const integrationApi = context.apiHolder.get(scmIntegrationsApiRef);
+
+    if (!host) {
+      validation.addError(
+        'Incomplete repository location provided, host not provided',
+      );
+    } else {
+      if (integrationApi?.byHost(host)?.type === 'bitbucket') {
+        // workspace is only applicable for bitbucket cloud
+        if (host === 'bitbucket.org' && !searchParams.get('workspace')) {
+          validation.addError(
+            'Incomplete repository location provided, workspace not provided',
+          );
+        }
+
+        if (!searchParams.get('project')) {
+          validation.addError(
+            'Incomplete repository location provided, project not provided',
+          );
+        }
+      }
+      // For anything other than bitbucket
+      else {
+        if (!searchParams.get('owner')) {
+          validation.addError(
+            'Incomplete repository location provided, owner not provided',
+          );
+        }
+      }
+
+      // Do this for all hosts
+      if (!searchParams.get('repo')) {
+        validation.addError(
+          'Incomplete repository location provided, repo not provided',
+        );
+      }
     }
   } catch {
     validation.addError('Unable to parse the Repository URL');
diff --git a/plugins/scaffolder/src/components/fields/TextValuePicker/TextValuePicker.tsx b/plugins/scaffolder/src/components/fields/TextValuePicker/TextValuePicker.tsx
new file mode 100644
index 0000000000..7bed7eedb9
--- /dev/null
+++ b/plugins/scaffolder/src/components/fields/TextValuePicker/TextValuePicker.tsx
@@ -0,0 +1,42 @@
+/*
+ * Copyright 2021 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import { TextField } from '@material-ui/core';
+import { FieldProps } from '@rjsf/core';
+import React from 'react';
+
+export const TextValuePicker = ({
+  onChange,
+  required,
+  schema: { title, description },
+  rawErrors,
+  formData,
+  uiSchema: { 'ui:autofocus': autoFocus },
+  idSchema,
+  placeholder,
+}: FieldProps<string>) => (
+  <TextField
+    id={idSchema?.$id}
+    label={title}
+    placeholder={placeholder}
+    helperText={description}
+    required={required}
+    value={formData ?? ''}
+    onChange={({ target: { value } }) => onChange(value)}
+    margin="normal"
+    error={rawErrors?.length > 0 && !formData}
+    inputProps={{ autoFocus }}
+  />
+);
diff --git a/plugins/scaffolder/src/components/fields/TextValuePicker/index.ts b/plugins/scaffolder/src/components/fields/TextValuePicker/index.ts
new file mode 100644
index 0000000000..8ab810b6ed
--- /dev/null
+++ b/plugins/scaffolder/src/components/fields/TextValuePicker/index.ts
@@ -0,0 +1,16 @@
+/*
+ * Copyright 2021 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+export { TextValuePicker } from './TextValuePicker';
diff --git a/plugins/scaffolder/src/components/fields/index.ts b/plugins/scaffolder/src/components/fields/index.ts
index 3d7875a742..5adc3d3141 100644
--- a/plugins/scaffolder/src/components/fields/index.ts
+++ b/plugins/scaffolder/src/components/fields/index.ts
@@ -13,6 +13,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+export * from './EntityNamePicker';
 export * from './EntityPicker';
 export * from './OwnerPicker';
 export * from './RepoUrlPicker';
+export * from './TextValuePicker';
diff --git a/plugins/scaffolder/src/extensions/default.ts b/plugins/scaffolder/src/extensions/default.ts
index b7af2f4a6b..be934546b3 100644
--- a/plugins/scaffolder/src/extensions/default.ts
+++ b/plugins/scaffolder/src/extensions/default.ts
@@ -14,6 +14,10 @@
  * limitations under the License.
  */
 import { EntityPicker } from '../components/fields/EntityPicker';
+import {
+  EntityNamePicker,
+  entityNamePickerValidation,
+} from '../components/fields/EntityNamePicker';
 import { OwnerPicker } from '../components/fields/OwnerPicker';
 import {
   repoPickerValidation,
@@ -26,6 +30,11 @@ export const DEFAULT_SCAFFOLDER_FIELD_EXTENSIONS: FieldExtensionOptions[] = [
     component: EntityPicker,
     name: 'EntityPicker',
   },
+  {
+    component: EntityNamePicker,
+    name: 'EntityNamePicker',
+    validation: entityNamePickerValidation,
+  },
   {
     component: RepoUrlPicker,
     name: 'RepoUrlPicker',
diff --git a/plugins/scaffolder/src/index.ts b/plugins/scaffolder/src/index.ts
index 74091a1a85..c0e652b44c 100644
--- a/plugins/scaffolder/src/index.ts
+++ b/plugins/scaffolder/src/index.ts
@@ -23,9 +23,18 @@ export {
 export type { CustomFieldValidator, FieldExtensionOptions } from './extensions';
 export {
   EntityPickerFieldExtension,
+  EntityNamePickerFieldExtension,
   OwnerPickerFieldExtension,
   RepoUrlPickerFieldExtension,
   ScaffolderPage,
   scaffolderPlugin as plugin,
   scaffolderPlugin,
 } from './plugin';
+export {
+  EntityNamePicker,
+  EntityPicker,
+  OwnerPicker,
+  RepoUrlPicker,
+  TextValuePicker,
+} from './components/fields';
+export { FavouriteTemplate } from './components/FavouriteTemplate';
diff --git a/plugins/scaffolder/src/plugin.ts b/plugins/scaffolder/src/plugin.ts
index e12305639e..8b543b52eb 100644
--- a/plugins/scaffolder/src/plugin.ts
+++ b/plugins/scaffolder/src/plugin.ts
@@ -17,6 +17,10 @@
 import { scmIntegrationsApiRef } from '@backstage/integration-react';
 import { scaffolderApiRef, ScaffolderClient } from './api';
 import { EntityPicker } from './components/fields/EntityPicker';
+import {
+  entityNamePickerValidation,
+  EntityNamePicker,
+} from './components/fields/EntityNamePicker';
 import { OwnerPicker } from './components/fields/OwnerPicker';
 import {
   repoPickerValidation,
@@ -61,6 +65,14 @@ export const EntityPickerFieldExtension = scaffolderPlugin.provide(
   }),
 );
 
+export const EntityNamePickerFieldExtension = scaffolderPlugin.provide(
+  createScaffolderFieldExtension({
+    component: EntityNamePicker,
+    name: 'EntityNamePicker',
+    validation: entityNamePickerValidation,
+  }),
+);
+
 export const RepoUrlPickerFieldExtension = scaffolderPlugin.provide(
   createScaffolderFieldExtension({
     component: RepoUrlPicker,
diff --git a/plugins/search-backend-module-elasticsearch/.eslintrc.js b/plugins/search-backend-module-elasticsearch/.eslintrc.js
new file mode 100644
index 0000000000..16a033dbc6
--- /dev/null
+++ b/plugins/search-backend-module-elasticsearch/.eslintrc.js
@@ -0,0 +1,3 @@
+module.exports = {
+  extends: [require.resolve('@backstage/cli/config/eslint.backend')],
+};
diff --git a/plugins/search-backend-module-elasticsearch/CHANGELOG.md b/plugins/search-backend-module-elasticsearch/CHANGELOG.md
new file mode 100644
index 0000000000..af7b9c23f5
--- /dev/null
+++ b/plugins/search-backend-module-elasticsearch/CHANGELOG.md
@@ -0,0 +1,19 @@
+# @backstage/plugin-search-backend-module-elasticsearch
+
+## 0.0.3
+
+### Patch Changes
+
+- a13f21cdc: Implement optional `pageCursor` based paging in search.
+
+  To use paging in your app, add a `<SearchResultPager />` to your
+  `SearchPage.tsx`.
+
+- Updated dependencies
+  - @backstage/search-common@0.2.0
+
+## 0.0.2
+
+### Patch Changes
+
+- 76872096b: Fix to allow optionally reading `auth` parameter for custom hosted ElasticSearch instances. Also remove `bearer` auth config since it's currently unsupported.
diff --git a/plugins/search-backend-module-elasticsearch/README.md b/plugins/search-backend-module-elasticsearch/README.md
new file mode 100644
index 0000000000..09534ceb67
--- /dev/null
+++ b/plugins/search-backend-module-elasticsearch/README.md
@@ -0,0 +1,9 @@
+# search-backend-module-elasticsearch
+
+This is an extension to module to search-backend-node plugin, which provides basic types, interfaces and functionality to implement search process within Backstage.
+
+This module provides functionality to index and implement querying using ElasticSearch engine. The module exposes configuration options to connect Backstage to your ElasticSearch cluster to be used as search engine.
+
+## Getting started
+
+See [Backstage documentation](https://backstage.io/docs/features/search/search-engines#elasticsearch) for details on how to install and configure ElasticSearch for your Backstage instance.
diff --git a/plugins/search-backend-module-elasticsearch/api-report.md b/plugins/search-backend-module-elasticsearch/api-report.md
new file mode 100644
index 0000000000..1644ce65ea
--- /dev/null
+++ b/plugins/search-backend-module-elasticsearch/api-report.md
@@ -0,0 +1,53 @@
+## API Report File for "@backstage/plugin-search-backend-module-elasticsearch"
+
+> Do not edit this file. It is a report generated by [API Extractor](https://api-extractor.com/).
+
+```ts
+import { Client } from '@elastic/elasticsearch';
+import { Config } from '@backstage/config';
+import { IndexableDocument } from '@backstage/search-common';
+import { Logger as Logger_2 } from 'winston';
+import { SearchEngine } from '@backstage/search-common';
+import { SearchQuery } from '@backstage/search-common';
+import { SearchResultSet } from '@backstage/search-common';
+
+// Warning: (ae-missing-release-tag) "ElasticSearchSearchEngine" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
+// @public (undocumented)
+export class ElasticSearchSearchEngine implements SearchEngine {
+  constructor(
+    elasticSearchClient: Client,
+    aliasPostfix: string,
+    indexPrefix: string,
+    logger: Logger_2,
+  );
+  // Warning: (ae-forgotten-export) The symbol "ElasticSearchOptions" needs to be exported by the entry point index.d.ts
+  //
+  // (undocumented)
+  static fromConfig({
+    logger,
+    config,
+    aliasPostfix,
+    indexPrefix,
+  }: ElasticSearchOptions): Promise<ElasticSearchSearchEngine>;
+  // (undocumented)
+  index(type: string, documents: IndexableDocument[]): Promise<void>;
+  // (undocumented)
+  query(query: SearchQuery): Promise<SearchResultSet>;
+  // Warning: (ae-forgotten-export) The symbol "ElasticSearchQueryTranslator" needs to be exported by the entry point index.d.ts
+  //
+  // (undocumented)
+  setTranslator(translator: ElasticSearchQueryTranslator): void;
+  // Warning: (ae-forgotten-export) The symbol "ConcreteElasticSearchQuery" needs to be exported by the entry point index.d.ts
+  //
+  // (undocumented)
+  protected translator({
+    term,
+    filters,
+    types,
+    pageCursor,
+  }: SearchQuery): ConcreteElasticSearchQuery;
+}
+
+// (No @packageDocumentation comment for this package)
+```
diff --git a/plugins/search-backend-module-elasticsearch/config.d.ts b/plugins/search-backend-module-elasticsearch/config.d.ts
new file mode 100644
index 0000000000..da403370cd
--- /dev/null
+++ b/plugins/search-backend-module-elasticsearch/config.d.ts
@@ -0,0 +1,122 @@
+/*
+ * Copyright 2021 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+export interface Config {
+  /** Configuration options for the search plugin */
+  search?: {
+    /**
+     * Options for ElasticSearch
+     */
+    elasticsearch?: {
+      /** Miscellaneous options for the client */
+      clientOptions?: {
+        ssl?: {
+          /**
+           * If true the server will reject any connection which is not
+           * authorized with the list of supplied CAs.
+           * @default true
+           */
+          rejectUnauthorized?: boolean;
+        };
+      } & (
+        | {
+            // elastic = Elastic.co ElasticSearch provider
+            provider: 'elastic';
+
+            /**
+             * Elastic.co CloudID
+             * See: https://www.elastic.co/guide/en/elasticsearch/client/javascript-api/current/client-connecting.html#authentication
+             */
+            cloudId: string;
+
+            auth: {
+              username: string;
+
+              /**
+               * @visibility secret
+               */
+              password: string;
+            };
+          }
+
+        /**
+         *  AWS = Amazon Elasticsearch Service provider
+         *
+         *  Authentication is handled using the default AWS credentials provider chain
+         */
+        | {
+            provider: 'aws';
+
+            /**
+             * Node configuration.
+             * URL AWS ES endpoint to connect to.
+             * Eg. https://my-es-cluster.eu-west-1.es.amazonaws.com
+             */
+            node: string;
+          }
+
+        /**
+         * Standard ElasticSearch
+         *
+         * Includes self-hosted clusters and others that provide direct connection via an endpoint
+         * and authentication method (see possible authentication options below)
+         */
+        | {
+            /**
+             * Node configuration.
+             * URL/URLS to ElasticSearch node to connect to.
+             * Either direct URL like 'https://localhost:9200' or with credentials like 'https://username:password@localhost:9200'
+             */
+            node: string | string[];
+
+            /**
+             * Authentication credentials for ElasticSearch
+             * If both ApiKey/Bearer token and username+password is provided, tokens take precedence
+             */
+            auth?:
+              | {
+                  username: string;
+
+                  /**
+                   * @visibility secret
+                   */
+                  password: string;
+                }
+              | {
+                  /**
+                   * Base64 Encoded API key to be used to connect to the cluster.
+                   * See: https://www.elastic.co/guide/en/elasticsearch/reference/current/security-api-create-api-key.html
+                   *
+                   * @visibility secret
+                   */
+                  apiKey: string;
+                };
+            /* TODO(kuangp): unsupported until @elastic/elasticsearch@7.14 is released
+    | {
+ 
+      /**
+       * Bearer authentication token to connect to the cluster.
+       * See: https://www.elastic.co/guide/en/elasticsearch/reference/current/security-api-create-service-token.html
+       *
+       * @visibility secret
+       *
+      bearer: string;
+    };*/
+          }
+      );
+    };
+  };
+}
diff --git a/plugins/search-backend-module-elasticsearch/package.json b/plugins/search-backend-module-elasticsearch/package.json
new file mode 100644
index 0000000000..9cfd2422d7
--- /dev/null
+++ b/plugins/search-backend-module-elasticsearch/package.json
@@ -0,0 +1,44 @@
+{
+  "name": "@backstage/plugin-search-backend-module-elasticsearch",
+  "version": "0.0.3",
+  "main": "src/index.ts",
+  "types": "src/index.ts",
+  "license": "Apache-2.0",
+  "publishConfig": {
+    "access": "public",
+    "main": "dist/index.cjs.js",
+    "types": "dist/index.d.ts"
+  },
+  "scripts": {
+    "start": "backstage-cli backend:dev",
+    "build": "backstage-cli backend:build",
+    "lint": "backstage-cli lint",
+    "test": "backstage-cli test",
+    "prepack": "backstage-cli prepack",
+    "postpack": "backstage-cli postpack",
+    "clean": "backstage-cli clean"
+  },
+  "dependencies": {
+    "@backstage/config": "^0.1.8",
+    "@backstage/search-common": "^0.2.0",
+    "@elastic/elasticsearch": "^7.13.0",
+    "@acuris/aws-es-connection": "^2.2.0",
+    "aws-sdk": "^2.948.0",
+    "elastic-builder": "^2.16.0",
+    "lodash": "^4.17.21",
+    "winston": "^3.2.1"
+  },
+  "devDependencies": {
+    "@backstage/backend-common": "^0.9.1",
+    "@backstage/cli": "^0.7.10",
+    "@elastic/elasticsearch-mock": "^0.3.0"
+  },
+  "files": [
+    "dist",
+    "config.d.ts"
+  ],
+  "jest": {
+    "testEnvironment": "node"
+  },
+  "configSchema": "config.d.ts"
+}
diff --git a/plugins/search-backend-module-elasticsearch/src/engines/ElasticSearchSearchEngine.test.ts b/plugins/search-backend-module-elasticsearch/src/engines/ElasticSearchSearchEngine.test.ts
new file mode 100644
index 0000000000..2877632013
--- /dev/null
+++ b/plugins/search-backend-module-elasticsearch/src/engines/ElasticSearchSearchEngine.test.ts
@@ -0,0 +1,627 @@
+/*
+ * Copyright 2021 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { getVoidLogger } from '@backstage/backend-common';
+import { SearchEngine } from '@backstage/search-common';
+import { Client } from '@elastic/elasticsearch';
+import Mock from '@elastic/elasticsearch-mock';
+import {
+  ConcreteElasticSearchQuery,
+  decodePageCursor,
+  ElasticSearchSearchEngine,
+  encodePageCursor,
+} from './ElasticSearchSearchEngine';
+import { ConfigReader } from '@backstage/config';
+
+class ElasticSearchSearchEngineForTranslatorTests extends ElasticSearchSearchEngine {
+  getTranslator() {
+    return this.translator;
+  }
+}
+
+const mock = new Mock();
+const client = new Client({
+  node: 'http://localhost:9200',
+  Connection: mock.getConnection(),
+});
+
+describe('ElasticSearchSearchEngine', () => {
+  let testSearchEngine: SearchEngine;
+  let inspectableSearchEngine: ElasticSearchSearchEngineForTranslatorTests;
+
+  beforeEach(() => {
+    testSearchEngine = new ElasticSearchSearchEngine(
+      client,
+      'search',
+      '',
+      getVoidLogger(),
+    );
+    inspectableSearchEngine = new ElasticSearchSearchEngineForTranslatorTests(
+      client,
+      'search',
+      '',
+      getVoidLogger(),
+    );
+  });
+
+  describe('queryTranslator', () => {
+    beforeAll(() => {
+      mock.clearAll();
+      mock.add(
+        {
+          method: 'POST',
+          path: '/*__search/_search',
+        },
+        () => ({
+          hits: {
+            total: { value: 0, relation: 'eq' },
+            hits: [],
+          },
+        }),
+      );
+    });
+    it('should invoke the query translator', async () => {
+      const translatorSpy = jest.fn().mockReturnValue({
+        elasticSearchQuery: () => ({
+          toJSON: () =>
+            JSON.stringify({
+              query: {
+                match_all: {},
+              },
+            }),
+        }),
+        documentTypes: [],
+      });
+      testSearchEngine.setTranslator(translatorSpy);
+
+      await testSearchEngine.query({
+        term: 'testTerm',
+        filters: {},
+      });
+
+      expect(translatorSpy).toHaveBeenCalledWith({
+        term: 'testTerm',
+        filters: {},
+      });
+    });
+
+    it('should return translated query with 1 filter', async () => {
+      const translatorUnderTest = inspectableSearchEngine.getTranslator();
+
+      const actualTranslatedQuery = translatorUnderTest({
+        types: ['indexName'],
+        term: 'testTerm',
+        filters: { kind: 'testKind' },
+      }) as ConcreteElasticSearchQuery;
+
+      expect(actualTranslatedQuery).toMatchObject({
+        documentTypes: ['indexName'],
+        elasticSearchQuery: expect.any(Object),
+      });
+
+      const queryBody = actualTranslatedQuery.elasticSearchQuery;
+
+      expect(queryBody).toEqual({
+        query: {
+          bool: {
+            must: {
+              multi_match: {
+                query: 'testTerm',
+                fields: ['*'],
+                fuzziness: 'auto',
+                minimum_should_match: 1,
+              },
+            },
+            filter: {
+              match: {
+                kind: 'testKind',
+              },
+            },
+          },
+        },
+        from: 0,
+        size: 25,
+      });
+    });
+
+    it('should pass page cursor', async () => {
+      const translatorUnderTest = inspectableSearchEngine.getTranslator();
+
+      const actualTranslatedQuery = translatorUnderTest({
+        types: ['indexName'],
+        term: 'testTerm',
+        pageCursor: 'MQ==',
+      }) as ConcreteElasticSearchQuery;
+
+      expect(actualTranslatedQuery).toMatchObject({
+        documentTypes: ['indexName'],
+        elasticSearchQuery: expect.any(Object),
+      });
+
+      const queryBody = actualTranslatedQuery.elasticSearchQuery;
+
+      expect(queryBody).toEqual({
+        query: {
+          bool: {
+            filter: [],
+            must: {
+              multi_match: {
+                query: 'testTerm',
+                fields: ['*'],
+                fuzziness: 'auto',
+                minimum_should_match: 1,
+              },
+            },
+          },
+        },
+        from: 25,
+        size: 25,
+      });
+    });
+
+    it('should return translated query with multiple filters', async () => {
+      const translatorUnderTest = inspectableSearchEngine.getTranslator();
+
+      const actualTranslatedQuery = translatorUnderTest({
+        types: ['indexName'],
+        term: 'testTerm',
+        filters: { kind: 'testKind', namespace: 'testNameSpace' },
+      }) as ConcreteElasticSearchQuery;
+
+      expect(actualTranslatedQuery).toMatchObject({
+        documentTypes: ['indexName'],
+        elasticSearchQuery: expect.any(Object),
+      });
+
+      const queryBody = actualTranslatedQuery.elasticSearchQuery;
+
+      expect(queryBody).toEqual({
+        query: {
+          bool: {
+            must: {
+              multi_match: {
+                query: 'testTerm',
+                fields: ['*'],
+                fuzziness: 'auto',
+                minimum_should_match: 1,
+              },
+            },
+            filter: [
+              {
+                match: {
+                  kind: 'testKind',
+                },
+              },
+              {
+                match: {
+                  namespace: 'testNameSpace',
+                },
+              },
+            ],
+          },
+        },
+        from: 0,
+        size: 25,
+      });
+    });
+
+    it('should return translated query with filter with multiple values', async () => {
+      const translatorUnderTest = inspectableSearchEngine.getTranslator();
+
+      const actualTranslatedQuery = translatorUnderTest({
+        types: ['indexName'],
+        term: 'testTerm',
+        filters: { kind: ['testKind', 'kastTeint'] },
+      }) as ConcreteElasticSearchQuery;
+
+      expect(actualTranslatedQuery).toMatchObject({
+        documentTypes: ['indexName'],
+        elasticSearchQuery: expect.any(Object),
+      });
+
+      const queryBody = actualTranslatedQuery.elasticSearchQuery;
+
+      expect(queryBody).toEqual({
+        query: {
+          bool: {
+            must: {
+              multi_match: {
+                query: 'testTerm',
+                fields: ['*'],
+                fuzziness: 'auto',
+                minimum_should_match: 1,
+              },
+            },
+            filter: {
+              bool: {
+                should: [
+                  {
+                    match: {
+                      kind: 'testKind',
+                    },
+                  },
+                  {
+                    match: {
+                      kind: 'kastTeint',
+                    },
+                  },
+                ],
+              },
+            },
+          },
+        },
+        from: 0,
+        size: 25,
+      });
+    });
+
+    it('should throw if unsupported filter shapes passed in', async () => {
+      const translatorUnderTest = inspectableSearchEngine.getTranslator();
+      const actualTranslatedQuery = () =>
+        translatorUnderTest({
+          types: ['indexName'],
+          term: 'testTerm',
+          filters: { kind: { a: 'b' } },
+        }) as ConcreteElasticSearchQuery;
+      expect(actualTranslatedQuery).toThrow();
+    });
+  });
+
+  describe('query functionality', () => {
+    beforeEach(() => {
+      mock.clearAll();
+      mock.add(
+        {
+          method: 'GET',
+          path: '/_cat/aliases/test-index__search',
+        },
+        () => [
+          {
+            alias: 'test-index__search',
+            index: 'test-index-index__1626850643538',
+            filter: '-',
+            'routing.index': '-',
+            'routing.search': '-',
+            is_write_index: '-',
+          },
+        ],
+      );
+      mock.add(
+        {
+          method: 'POST',
+          path: ['/_bulk'],
+        },
+        () => ({
+          took: 30,
+          errors: false,
+          items: [
+            {
+              index: {
+                _index: 'test',
+                _type: '_doc',
+                _id: '1',
+                _version: 1,
+                result: 'created',
+                _shards: {
+                  total: 2,
+                  successful: 1,
+                  failed: 0,
+                },
+                status: 201,
+                _seq_no: 0,
+                _primary_term: 1,
+              },
+            },
+          ],
+        }),
+      );
+
+      mock.add(
+        {
+          method: 'POST',
+          path: '/*__search/_search',
+        },
+        () => ({
+          hits: {
+            total: { value: 0, relation: 'eq' },
+            hits: [],
+          },
+        }),
+      );
+    });
+
+    // Mostly useless test since we are more or less testing the mock, runs through the whole flow though
+    // We might want to spin up ES test container to run against the real engine.
+    // That container eats GBs of memory so opting out of that for now...
+    it('should perform search query and return 0 results on empty index', async () => {
+      const mockedSearchResult = await testSearchEngine.query({
+        term: 'testTerm',
+        filters: {},
+      });
+
+      // Should return 0 results as nothing is indexed here
+      expect(mockedSearchResult).toMatchObject({
+        results: [],
+        nextPageCursor: undefined,
+      });
+    });
+
+    it('should perform search query with more results than one page', async () => {
+      mock.clear({
+        method: 'POST',
+        path: '/*__search/_search',
+      });
+      mock.add(
+        {
+          method: 'POST',
+          path: '/*__search/_search',
+        },
+        () => {
+          return {
+            hits: {
+              total: { value: 30, relation: 'eq' },
+              hits: Array(25)
+                .fill(null)
+                .map((_, i) => ({
+                  _index: 'mytype-index__',
+                  _source: {
+                    value: `${i}`,
+                  },
+                })),
+            },
+          };
+        },
+      );
+
+      const mockedSearchResult = await testSearchEngine.query({
+        term: 'testTerm',
+        filters: {},
+      });
+
+      expect(mockedSearchResult).toMatchObject({
+        results: expect.arrayContaining(
+          Array(25)
+            .fill(null)
+            .map((_, i) => ({
+              type: 'mytype',
+              document: { value: `${i}` },
+            })),
+        ),
+        nextPageCursor: 'MQ==',
+      });
+    });
+
+    it('should perform search query for second page', async () => {
+      mock.clear({
+        method: 'POST',
+        path: '/*__search/_search',
+      });
+      mock.add(
+        {
+          method: 'POST',
+          path: '/*__search/_search',
+        },
+        () => {
+          return {
+            hits: {
+              total: { value: 30, relation: 'eq' },
+              hits: Array(30)
+                .fill(null)
+                .map((_, i) => ({
+                  _index: 'mytype-index__',
+                  _source: {
+                    value: `${i}`,
+                  },
+                }))
+                .slice(25),
+            },
+          };
+        },
+      );
+
+      const mockedSearchResult = await testSearchEngine.query({
+        term: 'testTerm',
+        filters: {},
+        pageCursor: 'MQ==',
+      });
+
+      expect(mockedSearchResult).toMatchObject({
+        results: expect.arrayContaining(
+          Array(30)
+            .fill(null)
+            .map((_, i) => ({
+              type: 'mytype',
+              document: { value: `${i}` },
+            }))
+            .slice(25),
+        ),
+        previousPageCursor: 'MA==',
+      });
+    });
+
+    it('should handle index/search type filtering correctly', async () => {
+      const elasticSearchQuerySpy = jest.spyOn(client, 'search');
+      await testSearchEngine.query({
+        term: 'testTerm',
+        filters: {},
+      });
+
+      expect(elasticSearchQuerySpy).toHaveBeenCalled();
+      expect(elasticSearchQuerySpy).toHaveBeenCalledWith({
+        body: {
+          query: {
+            bool: {
+              must: {
+                multi_match: {
+                  query: 'testTerm',
+                  fields: ['*'],
+                  fuzziness: 'auto',
+                  minimum_should_match: 1,
+                },
+              },
+              filter: [],
+            },
+          },
+          from: 0,
+          size: 25,
+        },
+        index: '*__search',
+      });
+
+      elasticSearchQuerySpy.mockClear();
+    });
+
+    it('should create matchAll query if no term defined', async () => {
+      const elasticSearchQuerySpy = jest.spyOn(client, 'search');
+      await testSearchEngine.query({
+        term: '',
+        filters: {},
+      });
+
+      expect(elasticSearchQuerySpy).toHaveBeenCalled();
+      expect(elasticSearchQuerySpy).toHaveBeenCalledWith({
+        body: {
+          query: {
+            bool: {
+              must: {
+                match_all: {},
+              },
+              filter: [],
+            },
+          },
+          from: 0,
+          size: 25,
+        },
+        index: '*__search',
+      });
+
+      elasticSearchQuerySpy.mockClear();
+    });
+
+    it('should query only specified indices if defined', async () => {
+      const elasticSearchQuerySpy = jest.spyOn(client, 'search');
+      await testSearchEngine.query({
+        term: '',
+        filters: {},
+        types: ['test-type'],
+      });
+
+      expect(elasticSearchQuerySpy).toHaveBeenCalled();
+      expect(elasticSearchQuerySpy).toHaveBeenCalledWith({
+        body: {
+          query: {
+            bool: {
+              must: {
+                match_all: {},
+              },
+              filter: [],
+            },
+          },
+          from: 0,
+          size: 25,
+        },
+        index: ['test-type__search'],
+      });
+
+      elasticSearchQuerySpy.mockClear();
+    });
+  });
+
+  describe('index', () => {
+    it('should index document', async () => {
+      const indexSpy = jest.spyOn(testSearchEngine, 'index');
+      const mockDocuments = [
+        {
+          title: 'testTerm',
+          text: 'testText',
+          location: 'test/location',
+        },
+      ];
+
+      // call index func and ensure the index func was invoked.
+      await testSearchEngine.index('test-index', mockDocuments);
+      expect(indexSpy).toHaveBeenCalled();
+      expect(indexSpy).toHaveBeenCalledWith('test-index', [
+        { title: 'testTerm', text: 'testText', location: 'test/location' },
+      ]);
+    });
+  });
+
+  describe('ElasticSearchSearchEngine.fromConfig', () => {
+    it('accesses the clientOptions config', async () => {
+      const esOptions = {
+        clientOptions: {
+          ssl: {
+            rejectUnauthorized: true,
+          },
+        },
+        node: 'http://test-node',
+        auth: {
+          apiKey: 'key',
+        },
+      };
+
+      const config = new ConfigReader({});
+      const esConfig = new ConfigReader(esOptions);
+      jest.spyOn(config, 'getConfig').mockImplementation(() => esConfig);
+      const getOptionalConfig = jest.spyOn(esConfig, 'getOptionalConfig');
+
+      await ElasticSearchSearchEngine.fromConfig({
+        logger: getVoidLogger(),
+        config,
+      });
+
+      expect(getOptionalConfig.mock.calls[0][0]).toEqual('clientOptions');
+    });
+
+    it('does not require the clientOptions config', async () => {
+      const config = new ConfigReader({
+        search: {
+          elasticsearch: {
+            node: 'http://test-node',
+            auth: {
+              apiKey: 'test-key',
+            },
+          },
+        },
+      });
+
+      expect(
+        async () =>
+          await ElasticSearchSearchEngine.fromConfig({
+            logger: getVoidLogger(),
+            config,
+          }),
+      ).not.toThrowError();
+    });
+  });
+});
+
+describe('decodePageCursor', () => {
+  test('should decode page', () => {
+    expect(decodePageCursor('MQ==')).toEqual({ page: 1 });
+  });
+
+  test('should fallback to first page if empty', () => {
+    expect(decodePageCursor()).toEqual({ page: 0 });
+  });
+});
+
+describe('encodePageCursor', () => {
+  test('should encode page', () => {
+    expect(encodePageCursor({ page: 1 })).toEqual('MQ==');
+  });
+});
diff --git a/plugins/search-backend-module-elasticsearch/src/engines/ElasticSearchSearchEngine.ts b/plugins/search-backend-module-elasticsearch/src/engines/ElasticSearchSearchEngine.ts
new file mode 100644
index 0000000000..1a41099c9c
--- /dev/null
+++ b/plugins/search-backend-module-elasticsearch/src/engines/ElasticSearchSearchEngine.ts
@@ -0,0 +1,349 @@
+/*
+ * Copyright 2021 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import {
+  awsGetCredentials,
+  createAWSConnection,
+} from '@acuris/aws-es-connection';
+import { Config } from '@backstage/config';
+import {
+  IndexableDocument,
+  SearchEngine,
+  SearchQuery,
+  SearchResultSet,
+} from '@backstage/search-common';
+import { Client } from '@elastic/elasticsearch';
+import esb from 'elastic-builder';
+import { isEmpty, isNaN as nan, isNumber } from 'lodash';
+import { Logger } from 'winston';
+
+export type ConcreteElasticSearchQuery = {
+  documentTypes?: string[];
+  elasticSearchQuery: Object;
+  pageSize: number;
+};
+
+type ElasticSearchQueryTranslator = (
+  query: SearchQuery,
+) => ConcreteElasticSearchQuery;
+
+type ElasticSearchOptions = {
+  logger: Logger;
+  config: Config;
+  aliasPostfix?: string;
+  indexPrefix?: string;
+};
+
+type ElasticSearchResult = {
+  _index: string;
+  _type: string;
+  _score: number;
+  _source: IndexableDocument;
+};
+
+function duration(startTimestamp: [number, number]): string {
+  const delta = process.hrtime(startTimestamp);
+  const seconds = delta[0] + delta[1] / 1e9;
+  return `${seconds.toFixed(1)}s`;
+}
+
+function isBlank(str: string) {
+  return (isEmpty(str) && !isNumber(str)) || nan(str);
+}
+
+export class ElasticSearchSearchEngine implements SearchEngine {
+  constructor(
+    private readonly elasticSearchClient: Client,
+    private readonly aliasPostfix: string,
+    private readonly indexPrefix: string,
+    private readonly logger: Logger,
+  ) {}
+
+  static async fromConfig({
+    logger,
+    config,
+    aliasPostfix = `search`,
+    indexPrefix = ``,
+  }: ElasticSearchOptions) {
+    return new ElasticSearchSearchEngine(
+      await ElasticSearchSearchEngine.constructElasticSearchClient(
+        logger,
+        config.getConfig('search.elasticsearch'),
+      ),
+      aliasPostfix,
+      indexPrefix,
+      logger,
+    );
+  }
+
+  private static async constructElasticSearchClient(
+    logger: Logger,
+    config?: Config,
+  ) {
+    if (!config) {
+      throw new Error('No elastic search config found');
+    }
+
+    const clientOptionsConfig = config.getOptionalConfig('clientOptions');
+    const sslConfig = clientOptionsConfig?.getOptionalConfig('ssl');
+
+    if (config.getOptionalString('provider') === 'elastic') {
+      logger.info('Initializing Elastic.co ElasticSearch search engine.');
+      const authConfig = config.getConfig('auth');
+      return new Client({
+        cloud: {
+          id: config.getString('cloudId'),
+        },
+        auth: {
+          username: authConfig.getString('username'),
+          password: authConfig.getString('password'),
+        },
+        ...(sslConfig
+          ? {
+              ssl: {
+                rejectUnauthorized:
+                  sslConfig?.getOptionalBoolean('rejectUnauthorized'),
+              },
+            }
+          : {}),
+      });
+    }
+    if (config.getOptionalString('provider') === 'aws') {
+      logger.info('Initializing AWS ElasticSearch search engine.');
+      const awsCredentials = await awsGetCredentials();
+      const AWSConnection = createAWSConnection(awsCredentials);
+      return new Client({
+        node: config.getString('node'),
+        ...AWSConnection,
+        ...(sslConfig
+          ? {
+              ssl: {
+                rejectUnauthorized:
+                  sslConfig?.getOptionalBoolean('rejectUnauthorized'),
+              },
+            }
+          : {}),
+      });
+    }
+    logger.info('Initializing ElasticSearch search engine.');
+    const authConfig = config.getOptionalConfig('auth');
+    const auth =
+      authConfig &&
+      (authConfig.has('apiKey')
+        ? {
+            apiKey: authConfig.getString('apiKey'),
+          }
+        : {
+            username: authConfig.getString('username'),
+            password: authConfig.getString('password'),
+          });
+    return new Client({
+      node: config.getString('node'),
+      auth,
+      ...(sslConfig
+        ? {
+            ssl: {
+              rejectUnauthorized:
+                sslConfig?.getOptionalBoolean('rejectUnauthorized'),
+            },
+          }
+        : {}),
+    });
+  }
+
+  protected translator({
+    term,
+    filters = {},
+    types,
+    pageCursor,
+  }: SearchQuery): ConcreteElasticSearchQuery {
+    const filter = Object.entries(filters)
+      .filter(([_, value]) => Boolean(value))
+      .map(([key, value]: [key: string, value: any]) => {
+        if (['string', 'number', 'boolean'].includes(typeof value)) {
+          return esb.matchQuery(key, value.toString());
+        }
+        if (Array.isArray(value)) {
+          return esb
+            .boolQuery()
+            .should(value.map(it => esb.matchQuery(key, it.toString())));
+        }
+        this.logger.error(
+          'Failed to query, unrecognized filter type',
+          key,
+          value,
+        );
+        throw new Error(
+          'Failed to add filters to query. Unrecognized filter type',
+        );
+      });
+    const query = isBlank(term)
+      ? esb.matchAllQuery()
+      : esb
+          .multiMatchQuery(['*'], term)
+          .fuzziness('auto')
+          .minimumShouldMatch(1);
+    const pageSize = 25;
+    const { page } = decodePageCursor(pageCursor);
+
+    return {
+      elasticSearchQuery: esb
+        .requestBodySearch()
+        .query(esb.boolQuery().filter(filter).must([query]))
+        .from(page * pageSize)
+        .size(pageSize)
+        .toJSON(),
+      documentTypes: types,
+      pageSize,
+    };
+  }
+
+  setTranslator(translator: ElasticSearchQueryTranslator) {
+    this.translator = translator;
+  }
+
+  async index(type: string, documents: IndexableDocument[]): Promise<void> {
+    this.logger.info(
+      `Started indexing ${documents.length} documents for index ${type}`,
+    );
+    const startTimestamp = process.hrtime();
+    const alias = this.constructSearchAlias(type);
+    const index = this.constructIndexName(type, `${Date.now()}`);
+    try {
+      const aliases = await this.elasticSearchClient.cat.aliases({
+        format: 'json',
+        name: alias,
+      });
+      const removableIndices = aliases.body.map(
+        (r: Record<string, any>) => r.index,
+      );
+
+      await this.elasticSearchClient.indices.create({
+        index,
+      });
+      const result = await this.elasticSearchClient.helpers.bulk({
+        datasource: documents,
+        onDocument() {
+          return {
+            index: { _index: index },
+          };
+        },
+        refreshOnCompletion: index,
+      });
+
+      this.logger.info(
+        `Indexing completed for index ${type} in ${duration(startTimestamp)}`,
+        result,
+      );
+      await this.elasticSearchClient.indices.updateAliases({
+        body: {
+          actions: [
+            { remove: { index: this.constructIndexName(type, '*'), alias } },
+            { add: { index, alias } },
+          ],
+        },
+      });
+
+      this.logger.info('Removing stale search indices', removableIndices);
+      if (removableIndices.length) {
+        await this.elasticSearchClient.indices.delete({
+          index: removableIndices,
+        });
+      }
+    } catch (e) {
+      this.logger.error(`Failed to index documents for type ${type}`, e);
+      const response = await this.elasticSearchClient.indices.exists({
+        index,
+      });
+      const indexCreated = response.body;
+      if (indexCreated) {
+        this.logger.info(`Removing created index ${index}`);
+        await this.elasticSearchClient.indices.delete({
+          index,
+        });
+      }
+    }
+  }
+
+  async query(query: SearchQuery): Promise<SearchResultSet> {
+    const { elasticSearchQuery, documentTypes, pageSize } =
+      this.translator(query);
+    const queryIndices = documentTypes
+      ? documentTypes.map(it => this.constructSearchAlias(it))
+      : this.constructSearchAlias('*');
+    try {
+      const result = await this.elasticSearchClient.search({
+        index: queryIndices,
+        body: elasticSearchQuery,
+      });
+      const { page } = decodePageCursor(query.pageCursor);
+      const hasNextPage = result.body.hits.total.value > page * pageSize;
+      const hasPreviousPage = page > 0;
+      const nextPageCursor = hasNextPage
+        ? encodePageCursor({ page: page + 1 })
+        : undefined;
+      const previousPageCursor = hasPreviousPage
+        ? encodePageCursor({ page: page - 1 })
+        : undefined;
+
+      return {
+        results: result.body.hits.hits.map((d: ElasticSearchResult) => ({
+          type: this.getTypeFromIndex(d._index),
+          document: d._source,
+        })),
+        nextPageCursor,
+        previousPageCursor,
+      };
+    } catch (e) {
+      this.logger.error(
+        `Failed to query documents for indices ${queryIndices}`,
+        e,
+      );
+      return Promise.reject({ results: [] });
+    }
+  }
+
+  private readonly indexSeparator = '-index__';
+
+  private constructIndexName(type: string, postFix: string) {
+    return `${this.indexPrefix}${type}${this.indexSeparator}${postFix}`;
+  }
+
+  private getTypeFromIndex(index: string) {
+    return index
+      .substring(this.indexPrefix.length)
+      .split(this.indexSeparator)[0];
+  }
+
+  private constructSearchAlias(type: string) {
+    const postFix = this.aliasPostfix ? `__${this.aliasPostfix}` : '';
+    return `${this.indexPrefix}${type}${postFix}`;
+  }
+}
+
+export function decodePageCursor(pageCursor?: string): { page: number } {
+  if (!pageCursor) {
+    return { page: 0 };
+  }
+
+  return {
+    page: Number(Buffer.from(pageCursor, 'base64').toString('utf-8')),
+  };
+}
+
+export function encodePageCursor({ page }: { page: number }): string {
+  return Buffer.from(`${page}`, 'utf-8').toString('base64');
+}
diff --git a/plugins/search-backend-module-elasticsearch/src/engines/index.ts b/plugins/search-backend-module-elasticsearch/src/engines/index.ts
new file mode 100644
index 0000000000..2f3641c114
--- /dev/null
+++ b/plugins/search-backend-module-elasticsearch/src/engines/index.ts
@@ -0,0 +1,18 @@
+/*
+ * Copyright 2021 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+export { ElasticSearchSearchEngine } from './ElasticSearchSearchEngine';
+export type { ConcreteElasticSearchQuery } from './ElasticSearchSearchEngine';
diff --git a/plugins/search-backend-module-elasticsearch/src/index.ts b/plugins/search-backend-module-elasticsearch/src/index.ts
new file mode 100644
index 0000000000..4cfeec6598
--- /dev/null
+++ b/plugins/search-backend-module-elasticsearch/src/index.ts
@@ -0,0 +1,17 @@
+/*
+ * Copyright 2021 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+export { ElasticSearchSearchEngine } from './engines';
diff --git a/plugins/search-backend-module-pg/.eslintrc.js b/plugins/search-backend-module-pg/.eslintrc.js
new file mode 100644
index 0000000000..16a033dbc6
--- /dev/null
+++ b/plugins/search-backend-module-pg/.eslintrc.js
@@ -0,0 +1,3 @@
+module.exports = {
+  extends: [require.resolve('@backstage/cli/config/eslint.backend')],
+};
diff --git a/plugins/search-backend-module-pg/CHANGELOG.md b/plugins/search-backend-module-pg/CHANGELOG.md
new file mode 100644
index 0000000000..ee9953942a
--- /dev/null
+++ b/plugins/search-backend-module-pg/CHANGELOG.md
@@ -0,0 +1,43 @@
+# @backstage/plugin-search-backend-module-pg
+
+## 0.2.0
+
+### Minor Changes
+
+- a13f21cdc: Implement optional `pageCursor` based paging in search.
+
+  To use paging in your app, add a `<SearchResultPager />` to your
+  `SearchPage.tsx`.
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/search-common@0.2.0
+  - @backstage/plugin-search-backend-node@0.4.2
+  - @backstage/backend-common@0.9.1
+
+## 0.1.3
+
+### Patch Changes
+
+- 80c562039: Sanitize special characters before building search query for postgres
+- Updated dependencies
+  - @backstage/backend-common@0.9.0
+
+## 0.1.2
+
+### Patch Changes
+
+- ee99798da: Correct version requirements on postgres from 11 to 12. Postgres 12 is required
+  due the use of generated columns.
+- Updated dependencies
+  - @backstage/backend-common@0.8.10
+
+## 0.1.1
+
+### Patch Changes
+
+- 9255e1430: Add `plugin-search-backend-module-pg` providing a postgres based search engine.
+  See the [README of `search-backend-module-pg`](https://github.com/backstage/backstage/blob/master/plugins/search-backend-module-pg/README.md) for usage instructions.
+- Updated dependencies
+  - @backstage/backend-common@0.8.9
diff --git a/plugins/search-backend-module-pg/README.md b/plugins/search-backend-module-pg/README.md
new file mode 100644
index 0000000000..d3f98132aa
--- /dev/null
+++ b/plugins/search-backend-module-pg/README.md
@@ -0,0 +1,16 @@
+# search-backend-module-pg
+
+This plugin provides an easy to use `SearchEngine` implementation to use with the
+`@backstage/plugin-search-backend` based on Postgres.
+Therefore it targets setups that want to avoid maintaining another external
+service like elastic search. The search provides decent results and performs
+well with ten thousands of indexed documents.
+The connection to postgres is established via the database manager also used by
+other plugins.
+
+> **Important**: The search plugin requires at least Postgres 12!
+
+## Getting started
+
+See [Backstage documentation](https://backstage.io/docs/features/search/search-engines#postgres)
+for details on how to setup Postgres based search for your Backstage instance.
diff --git a/plugins/search-backend-module-pg/api-report.md b/plugins/search-backend-module-pg/api-report.md
new file mode 100644
index 0000000000..6a56daa8d7
--- /dev/null
+++ b/plugins/search-backend-module-pg/api-report.md
@@ -0,0 +1,128 @@
+## API Report File for "@backstage/plugin-search-backend-module-pg"
+
+> Do not edit this file. It is a report generated by [API Extractor](https://api-extractor.com/).
+
+```ts
+import { IndexableDocument } from '@backstage/search-common';
+import { Knex } from 'knex';
+import { PluginDatabaseManager } from '@backstage/backend-common';
+import { SearchEngine } from '@backstage/plugin-search-backend-node';
+import { SearchQuery } from '@backstage/search-common';
+import { SearchResultSet } from '@backstage/search-common';
+
+// Warning: (ae-missing-release-tag) "ConcretePgSearchQuery" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
+// @public (undocumented)
+export type ConcretePgSearchQuery = {
+  pgQuery: PgSearchQuery;
+  pageSize: number;
+};
+
+// Warning: (ae-missing-release-tag) "DatabaseDocumentStore" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
+// @public (undocumented)
+export class DatabaseDocumentStore implements DatabaseStore {
+  constructor(db: Knex);
+  // (undocumented)
+  completeInsert(tx: Knex.Transaction, type: string): Promise<void>;
+  // (undocumented)
+  static create(knex: Knex): Promise<DatabaseDocumentStore>;
+  // (undocumented)
+  insertDocuments(
+    tx: Knex.Transaction,
+    type: string,
+    documents: IndexableDocument[],
+  ): Promise<void>;
+  // (undocumented)
+  prepareInsert(tx: Knex.Transaction): Promise<void>;
+  // Warning: (ae-forgotten-export) The symbol "DocumentResultRow" needs to be exported by the entry point index.d.ts
+  //
+  // (undocumented)
+  query(
+    tx: Knex.Transaction,
+    { types, pgTerm, fields, offset, limit }: PgSearchQuery,
+  ): Promise<DocumentResultRow[]>;
+  // (undocumented)
+  static supported(knex: Knex): Promise<boolean>;
+  // (undocumented)
+  transaction<T>(fn: (tx: Knex.Transaction) => Promise<T>): Promise<T>;
+}
+
+// Warning: (ae-missing-release-tag) "DatabaseStore" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
+// @public (undocumented)
+export interface DatabaseStore {
+  // (undocumented)
+  completeInsert(tx: Knex.Transaction, type: string): Promise<void>;
+  // (undocumented)
+  insertDocuments(
+    tx: Knex.Transaction,
+    type: string,
+    documents: IndexableDocument[],
+  ): Promise<void>;
+  // (undocumented)
+  prepareInsert(tx: Knex.Transaction): Promise<void>;
+  // (undocumented)
+  query(
+    tx: Knex.Transaction,
+    pgQuery: PgSearchQuery,
+  ): Promise<DocumentResultRow[]>;
+  // (undocumented)
+  transaction<T>(fn: (tx: Knex.Transaction) => Promise<T>): Promise<T>;
+}
+
+// Warning: (ae-missing-release-tag) "PgSearchEngine" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
+// @public (undocumented)
+export class PgSearchEngine implements SearchEngine {
+  constructor(databaseStore: DatabaseStore);
+  // (undocumented)
+  static from({
+    database,
+  }: {
+    database: PluginDatabaseManager;
+  }): Promise<PgSearchEngine>;
+  // (undocumented)
+  index(type: string, documents: IndexableDocument[]): Promise<void>;
+  // (undocumented)
+  query(query: SearchQuery): Promise<SearchResultSet>;
+  // (undocumented)
+  setTranslator(
+    translator: (query: SearchQuery) => ConcretePgSearchQuery,
+  ): void;
+  // (undocumented)
+  static supported(database: PluginDatabaseManager): Promise<boolean>;
+  // (undocumented)
+  translator(query: SearchQuery): ConcretePgSearchQuery;
+}
+
+// Warning: (ae-missing-release-tag) "PgSearchQuery" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
+// @public (undocumented)
+export interface PgSearchQuery {
+  // (undocumented)
+  fields?: Record<string, string | string[]>;
+  // (undocumented)
+  limit: number;
+  // (undocumented)
+  offset: number;
+  // (undocumented)
+  pgTerm?: string;
+  // (undocumented)
+  types?: string[];
+}
+
+// Warning: (ae-missing-release-tag) "RawDocumentRow" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
+// @public (undocumented)
+export interface RawDocumentRow {
+  // (undocumented)
+  document: IndexableDocument;
+  // (undocumented)
+  hash: unknown;
+  // (undocumented)
+  type: string;
+}
+
+// (No @packageDocumentation comment for this package)
+```
diff --git a/plugins/search-backend-module-pg/migrations/20210311110000_init.js b/plugins/search-backend-module-pg/migrations/20210311110000_init.js
new file mode 100644
index 0000000000..70ccf9406b
--- /dev/null
+++ b/plugins/search-backend-module-pg/migrations/20210311110000_init.js
@@ -0,0 +1,54 @@
+/*
+ * Copyright 2021 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * @param {import('knex').Knex} knex
+ */
+exports.up = async function up(knex) {
+  // This database schema uses some postgres specific features (like tsvector
+  // and jsonb columns) and can not be used with other database engines.
+  await knex.schema.createTable('documents', table => {
+    table.comment('The table of documents');
+    table
+      .text('type')
+      .notNullable()
+      .index()
+      .comment('The index type of the document');
+    table.jsonb('document').notNullable().comment('The document');
+    table.specificType(
+      'body',
+      'tsvector NOT NULL GENERATED ALWAYS AS (' +
+        "setweight(to_tsvector('english', document->>'title'), 'A') || " +
+        "setweight(to_tsvector('english', document->>'text'), 'B') || " +
+        "setweight(to_tsvector('english', document - 'location' - 'title' - 'text'), 'C')" +
+        ') STORED',
+    );
+
+    table
+      .index(['body'], 'documents_body_index', 'GIN')
+      .comment('Optimize full text queries on documents');
+    table
+      .index(['document'], 'documents_document_index', 'GIN')
+      .comment('Optimize filter queries on documents');
+  });
+};
+
+/**
+ * @param {import('knex').Knex} knex
+ */
+exports.down = async function down(knex) {
+  await knex.schema.dropTable('documents');
+};
diff --git a/plugins/search-backend-module-pg/migrations/20210727180000_delta_update.js b/plugins/search-backend-module-pg/migrations/20210727180000_delta_update.js
new file mode 100644
index 0000000000..429c8aa805
--- /dev/null
+++ b/plugins/search-backend-module-pg/migrations/20210727180000_delta_update.js
@@ -0,0 +1,48 @@
+/*
+ * Copyright 2021 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * @param {import('knex').Knex} knex
+ */
+exports.up = async function up(knex) {
+  // This database migration uses some postgres specific features (like bytea
+  // columns and build in functions) and can not be used with other database
+  // engines.
+  await knex.schema.alterTable('documents', table => {
+    // Extend the documents table with a column that allows to check whether a
+    // document with the same content is already indexed.
+    table.specificType('hash', 'bytea');
+  });
+
+  await knex('documents').update({
+    hash: knex.raw(
+      "sha256(replace(document::text || type, '\\', '\\\\')::bytea)",
+    ),
+  });
+
+  await knex.schema.alterTable('documents', table => {
+    table.specificType('hash', 'bytea').notNullable().primary().alter();
+  });
+};
+
+/**
+ * @param {import('knex').Knex} knex
+ */
+exports.down = async function down(knex) {
+  await knex.schema.alterTable('documents', table => {
+    table.dropColumn('hash');
+  });
+};
diff --git a/plugins/search-backend-module-pg/package.json b/plugins/search-backend-module-pg/package.json
new file mode 100644
index 0000000000..08ecd93967
--- /dev/null
+++ b/plugins/search-backend-module-pg/package.json
@@ -0,0 +1,36 @@
+{
+  "name": "@backstage/plugin-search-backend-module-pg",
+  "version": "0.2.0",
+  "main": "src/index.ts",
+  "types": "src/index.ts",
+  "license": "Apache-2.0",
+  "publishConfig": {
+    "access": "public",
+    "main": "dist/index.cjs.js",
+    "types": "dist/index.d.ts"
+  },
+  "scripts": {
+    "start": "backstage-cli backend:dev",
+    "build": "backstage-cli backend:build",
+    "lint": "backstage-cli lint",
+    "test": "backstage-cli test",
+    "prepack": "backstage-cli prepack",
+    "postpack": "backstage-cli postpack",
+    "clean": "backstage-cli clean"
+  },
+  "dependencies": {
+    "@backstage/backend-common": "^0.9.1",
+    "@backstage/search-common": "^0.2.0",
+    "@backstage/plugin-search-backend-node": "^0.4.2",
+    "lodash": "^4.17.15",
+    "knex": "^0.95.1"
+  },
+  "devDependencies": {
+    "@backstage/backend-test-utils": "^0.1.6",
+    "@backstage/cli": "^0.7.10"
+  },
+  "files": [
+    "dist",
+    "migrations"
+  ]
+}
diff --git a/plugins/search-backend-module-pg/src/PgSearchEngine/PgSearchEngine.test.ts b/plugins/search-backend-module-pg/src/PgSearchEngine/PgSearchEngine.test.ts
new file mode 100644
index 0000000000..56a3a6e643
--- /dev/null
+++ b/plugins/search-backend-module-pg/src/PgSearchEngine/PgSearchEngine.test.ts
@@ -0,0 +1,306 @@
+/*
+ * Copyright 2021 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import { range } from 'lodash';
+import { DatabaseStore } from '../database';
+import {
+  ConcretePgSearchQuery,
+  decodePageCursor,
+  encodePageCursor,
+  PgSearchEngine,
+} from './PgSearchEngine';
+
+describe('PgSearchEngine', () => {
+  const tx: any = {} as any;
+  let searchEngine: PgSearchEngine;
+  let database: jest.Mocked<DatabaseStore>;
+
+  beforeEach(() => {
+    database = {
+      transaction: jest.fn(),
+      insertDocuments: jest.fn(),
+      query: jest.fn(),
+      completeInsert: jest.fn(),
+      prepareInsert: jest.fn(),
+    };
+    searchEngine = new PgSearchEngine(database);
+  });
+
+  describe('translator', () => {
+    it('query translator invoked', async () => {
+      database.transaction.mockResolvedValue([]);
+      const translatorSpy = jest.fn().mockReturnValue({
+        pgSearchTerm: 'testTerm',
+      });
+      searchEngine.setTranslator(translatorSpy);
+
+      await searchEngine.query({
+        term: 'testTerm',
+        filters: {},
+      });
+
+      expect(translatorSpy).toHaveBeenCalledWith({
+        term: 'testTerm',
+        filters: {},
+      });
+    });
+
+    it('should pass page cursor', async () => {
+      const actualTranslatedQuery = searchEngine.translator({
+        term: 'Hello',
+        pageCursor: 'MQ==',
+      });
+
+      expect(actualTranslatedQuery).toMatchObject({
+        pgQuery: {
+          pgTerm: '("Hello" | "Hello":*)',
+          offset: 25,
+          limit: 26,
+        },
+        pageSize: 25,
+      });
+    });
+
+    it('should return translated query term', async () => {
+      const actualTranslatedQuery = searchEngine.translator({
+        term: 'Hello World',
+      });
+
+      expect(actualTranslatedQuery).toMatchObject({
+        pgQuery: {
+          pgTerm: '("Hello" | "Hello":*)&("World" | "World":*)',
+          offset: 0,
+          limit: 26,
+        },
+        pageSize: 25,
+      });
+    });
+
+    it('should sanitize query term', async () => {
+      const actualTranslatedQuery = searchEngine.translator({
+        term: 'H&e|l!l*o W\0o(r)l:d',
+        pageCursor: '',
+      }) as ConcretePgSearchQuery;
+
+      expect(actualTranslatedQuery).toMatchObject({
+        pgQuery: {
+          pgTerm: '("Hello" | "Hello":*)&("World" | "World":*)',
+        },
+        pageSize: 25,
+      });
+    });
+
+    it('should return translated query with filters', async () => {
+      const actualTranslatedQuery = searchEngine.translator({
+        term: 'testTerm',
+        filters: { kind: 'testKind' },
+        types: ['my-filter'],
+      });
+
+      expect(actualTranslatedQuery).toMatchObject({
+        pgQuery: {
+          pgTerm: '("testTerm" | "testTerm":*)',
+          fields: { kind: 'testKind' },
+          types: ['my-filter'],
+          offset: 0,
+          limit: 26,
+        },
+        pageSize: 25,
+      });
+    });
+  });
+
+  describe('insert', () => {
+    it('should insert documents', async () => {
+      database.transaction.mockImplementation(fn => fn(tx));
+
+      const documents = [
+        { title: 'Hello World', text: 'Lorem Ipsum', location: 'location-1' },
+        {
+          location: 'location-2',
+          text: 'Hello World',
+          title: 'Dolor sit amet',
+        },
+      ];
+
+      await searchEngine.index('my-type', documents);
+
+      expect(database.transaction).toHaveBeenCalledTimes(1);
+      expect(database.prepareInsert).toHaveBeenCalledTimes(1);
+      expect(database.insertDocuments).toHaveBeenCalledWith(
+        tx,
+        'my-type',
+        documents,
+      );
+      expect(database.completeInsert).toHaveBeenCalledWith(tx, 'my-type');
+    });
+
+    it('should batch insert documents', async () => {
+      database.transaction.mockImplementation(fn => fn(tx));
+
+      const documents = range(350).map(i => ({
+        title: `Hello World ${i}`,
+        text: 'Lorem Ipsum',
+        location: `location-${i}`,
+      }));
+
+      await searchEngine.index('my-type', documents);
+
+      expect(database.transaction).toHaveBeenCalledTimes(1);
+      expect(database.prepareInsert).toHaveBeenCalledTimes(1);
+      expect(database.insertDocuments).toBeCalledTimes(4);
+      expect(database.completeInsert).toHaveBeenCalledWith(tx, 'my-type');
+    });
+  });
+
+  describe('query', () => {
+    it('should perform query', async () => {
+      database.transaction.mockImplementation(fn => fn(tx));
+      database.query.mockResolvedValue([
+        {
+          document: {
+            title: 'Hello World',
+            text: 'Lorem Ipsum',
+            location: 'location-1',
+          },
+          type: 'my-type',
+        },
+      ]);
+
+      const results = await searchEngine.query({
+        term: 'Hello World',
+      });
+
+      expect(results).toEqual({
+        results: [
+          {
+            document: {
+              title: 'Hello World',
+              text: 'Lorem Ipsum',
+              location: 'location-1',
+            },
+            type: 'my-type',
+          },
+        ],
+        nextPageCursor: undefined,
+      });
+      expect(database.transaction).toHaveBeenCalledTimes(1);
+      expect(database.query).toHaveBeenCalledWith(tx, {
+        pgTerm: '("Hello" | "Hello":*)&("World" | "World":*)',
+        offset: 0,
+        limit: 26,
+      });
+    });
+
+    it('should include next page cursor if results exceed page size', async () => {
+      database.transaction.mockImplementation(fn => fn(tx));
+      database.query.mockResolvedValue(
+        Array(30)
+          .fill(0)
+          .map((_, i) => ({
+            document: {
+              title: 'Hello World',
+              text: 'Lorem Ipsum',
+              location: `location-${i}`,
+            },
+            type: 'my-type',
+          })),
+      );
+
+      const results = await searchEngine.query({
+        term: 'Hello World',
+      });
+
+      expect(results).toEqual({
+        results: Array(25)
+          .fill(0)
+          .map((_, i) => ({
+            document: {
+              title: 'Hello World',
+              text: 'Lorem Ipsum',
+              location: `location-${i}`,
+            },
+            type: 'my-type',
+          })),
+        nextPageCursor: 'MQ==',
+      });
+      expect(database.transaction).toHaveBeenCalledTimes(1);
+      expect(database.query).toHaveBeenCalledWith(tx, {
+        pgTerm: '("Hello" | "Hello":*)&("World" | "World":*)',
+        offset: 0,
+        limit: 26,
+      });
+    });
+
+    it('should include previous page cursor if on another page', async () => {
+      database.transaction.mockImplementation(fn => fn(tx));
+      database.query.mockResolvedValue(
+        Array(30)
+          .fill(0)
+          .map((_, i) => ({
+            document: {
+              title: 'Hello World',
+              text: 'Lorem Ipsum',
+              location: `location-${i}`,
+            },
+            type: 'my-type',
+          }))
+          .slice(25),
+      );
+
+      const results = await searchEngine.query({
+        term: 'Hello World',
+        pageCursor: 'MQ==',
+      });
+
+      expect(results).toEqual({
+        results: Array(30)
+          .fill(0)
+          .map((_, i) => ({
+            document: {
+              title: 'Hello World',
+              text: 'Lorem Ipsum',
+              location: `location-${i}`,
+            },
+            type: 'my-type',
+          }))
+          .slice(25),
+        previousPageCursor: 'MA==',
+      });
+      expect(database.transaction).toHaveBeenCalledTimes(1);
+      expect(database.query).toHaveBeenCalledWith(tx, {
+        pgTerm: '("Hello" | "Hello":*)&("World" | "World":*)',
+        offset: 25,
+        limit: 26,
+      });
+    });
+  });
+});
+
+describe('decodePageCursor', () => {
+  test('should decode page', () => {
+    expect(decodePageCursor('MQ==')).toEqual({ page: 1 });
+  });
+
+  test('should fallback to first page if empty', () => {
+    expect(decodePageCursor()).toEqual({ page: 0 });
+  });
+});
+
+describe('encodePageCursor', () => {
+  test('should encode page', () => {
+    expect(encodePageCursor({ page: 1 })).toEqual('MQ==');
+  });
+});
diff --git a/plugins/search-backend-module-pg/src/PgSearchEngine/PgSearchEngine.ts b/plugins/search-backend-module-pg/src/PgSearchEngine/PgSearchEngine.ts
new file mode 100644
index 0000000000..a032dd783e
--- /dev/null
+++ b/plugins/search-backend-module-pg/src/PgSearchEngine/PgSearchEngine.ts
@@ -0,0 +1,136 @@
+/*
+ * Copyright 2021 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import { PluginDatabaseManager } from '@backstage/backend-common';
+import { SearchEngine } from '@backstage/plugin-search-backend-node';
+import {
+  IndexableDocument,
+  SearchQuery,
+  SearchResultSet,
+} from '@backstage/search-common';
+import { chunk } from 'lodash';
+import {
+  DatabaseDocumentStore,
+  DatabaseStore,
+  PgSearchQuery,
+} from '../database';
+
+export type ConcretePgSearchQuery = {
+  pgQuery: PgSearchQuery;
+  pageSize: number;
+};
+
+export class PgSearchEngine implements SearchEngine {
+  constructor(private readonly databaseStore: DatabaseStore) {}
+
+  static async from({
+    database,
+  }: {
+    database: PluginDatabaseManager;
+  }): Promise<PgSearchEngine> {
+    return new PgSearchEngine(
+      await DatabaseDocumentStore.create(await database.getClient()),
+    );
+  }
+
+  static async supported(database: PluginDatabaseManager): Promise<boolean> {
+    return await DatabaseDocumentStore.supported(await database.getClient());
+  }
+
+  translator(query: SearchQuery): ConcretePgSearchQuery {
+    const pageSize = 25;
+    const { page } = decodePageCursor(query.pageCursor);
+    const offset = page * pageSize;
+    // We request more result to know whether there is another page
+    const limit = pageSize + 1;
+
+    return {
+      pgQuery: {
+        pgTerm: query.term
+          .split(/\s/)
+          .map(p => p.replace(/[\0()|&:*!]/g, '').trim())
+          .filter(p => p !== '')
+          .map(p => `(${JSON.stringify(p)} | ${JSON.stringify(p)}:*)`)
+          .join('&'),
+        fields: query.filters as Record<string, string | string[]>,
+        types: query.types,
+        offset,
+        limit,
+      },
+      pageSize,
+    };
+  }
+
+  setTranslator(
+    translator: (query: SearchQuery) => ConcretePgSearchQuery,
+  ): void {
+    this.translator = translator;
+  }
+
+  async index(type: string, documents: IndexableDocument[]): Promise<void> {
+    await this.databaseStore.transaction(async tx => {
+      await this.databaseStore.prepareInsert(tx);
+
+      const batchSize = 100;
+      for (const documentBatch of chunk(documents, batchSize)) {
+        await this.databaseStore.insertDocuments(tx, type, documentBatch);
+      }
+
+      await this.databaseStore.completeInsert(tx, type);
+    });
+  }
+
+  async query(query: SearchQuery): Promise<SearchResultSet> {
+    const { pgQuery, pageSize } = this.translator(query);
+
+    const rows = await this.databaseStore.transaction(async tx =>
+      this.databaseStore.query(tx, pgQuery),
+    );
+
+    // We requested one result more than the page size to know whether there is
+    // another page.
+    const { page } = decodePageCursor(query.pageCursor);
+    const hasNextPage = rows.length > pageSize;
+    const hasPreviousPage = page > 0;
+    const pageRows = rows.slice(0, pageSize);
+    const nextPageCursor = hasNextPage
+      ? encodePageCursor({ page: page + 1 })
+      : undefined;
+    const previousPageCursor = hasPreviousPage
+      ? encodePageCursor({ page: page - 1 })
+      : undefined;
+
+    const results = pageRows.map(({ type, document }) => ({
+      type,
+      document,
+    }));
+
+    return { results, nextPageCursor, previousPageCursor };
+  }
+}
+
+export function decodePageCursor(pageCursor?: string): { page: number } {
+  if (!pageCursor) {
+    return { page: 0 };
+  }
+
+  return {
+    page: Number(Buffer.from(pageCursor, 'base64').toString('utf-8')),
+  };
+}
+
+export function encodePageCursor({ page }: { page: number }): string {
+  return Buffer.from(`${page}`, 'utf-8').toString('base64');
+}
diff --git a/plugins/search-backend-module-pg/src/PgSearchEngine/index.ts b/plugins/search-backend-module-pg/src/PgSearchEngine/index.ts
new file mode 100644
index 0000000000..7994998baf
--- /dev/null
+++ b/plugins/search-backend-module-pg/src/PgSearchEngine/index.ts
@@ -0,0 +1,17 @@
+/*
+ * Copyright 2021 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+export { PgSearchEngine } from './PgSearchEngine';
+export type { ConcretePgSearchQuery } from './PgSearchEngine';
diff --git a/plugins/search-backend-module-pg/src/database/DatabaseDocumentStore.test.ts b/plugins/search-backend-module-pg/src/database/DatabaseDocumentStore.test.ts
new file mode 100644
index 0000000000..71c012ec00
--- /dev/null
+++ b/plugins/search-backend-module-pg/src/database/DatabaseDocumentStore.test.ts
@@ -0,0 +1,571 @@
+/*
+ * Copyright 2021 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import { TestDatabaseId, TestDatabases } from '@backstage/backend-test-utils';
+import { IndexableDocument } from '@backstage/search-common';
+import { DatabaseDocumentStore } from './DatabaseDocumentStore';
+
+describe('DatabaseDocumentStore', () => {
+  describe('unsupported', () => {
+    const databases = TestDatabases.create({
+      ids: ['MYSQL_8', 'POSTGRES_9', 'SQLITE_3'],
+    });
+
+    it.each(databases.eachSupportedId())(
+      'should return support state, %p',
+      async databaseId => {
+        const knex = await databases.init(databaseId);
+        const supported = await DatabaseDocumentStore.supported(knex);
+
+        expect(supported).toBe(false);
+      },
+      60_000,
+    );
+
+    it.each(databases.eachSupportedId())(
+      'should fail to create, %p',
+      async databaseId => {
+        const knex = await databases.init(databaseId);
+
+        await expect(
+          async () => await DatabaseDocumentStore.create(knex),
+        ).rejects.toThrow();
+      },
+      60_000,
+    );
+  });
+
+  describe('supported', () => {
+    const databases = TestDatabases.create({
+      ids: ['POSTGRES_13'],
+    });
+
+    async function createStore(databaseId: TestDatabaseId) {
+      const knex = await databases.init(databaseId);
+      const store = await DatabaseDocumentStore.create(knex);
+      return { store, knex };
+    }
+
+    if (databases.eachSupportedId().length < 1) {
+      // Only execute tests if at least on database engine is available, e.g. if
+      // not in CI=1. it.each doesn't support an empty array.
+      return;
+    }
+
+    it.each(databases.eachSupportedId())(
+      'should return support state, %p',
+      async databaseId => {
+        const knex = await databases.init(databaseId);
+        const supported = await DatabaseDocumentStore.supported(knex);
+
+        expect(supported).toBe(true);
+      },
+      60_000,
+    );
+
+    it.each(databases.eachSupportedId())(
+      'should insert documents, %p',
+      async databaseId => {
+        const { store, knex } = await createStore(databaseId);
+
+        await store.transaction(async tx => {
+          await store.prepareInsert(tx);
+          await store.insertDocuments(tx, 'my-type', [
+            {
+              title: 'TITLE 1',
+              text: 'TEXT 1',
+              location: 'LOCATION-1',
+            },
+            {
+              title: 'TITLE 2',
+              text: 'TEXT 2',
+              location: 'LOCATION-2',
+            },
+          ]);
+          await store.completeInsert(tx, 'my-type');
+        });
+
+        expect(
+          await knex.count('*').where('type', 'my-type').from('documents'),
+        ).toEqual([{ count: '2' }]);
+      },
+      60_000,
+    );
+
+    it.each(databases.eachSupportedId())(
+      'should insert documents in batches, %p',
+      async databaseId => {
+        const { store, knex } = await createStore(databaseId);
+
+        await store.transaction(async tx => {
+          await store.prepareInsert(tx);
+          await store.insertDocuments(tx, 'my-type', [
+            {
+              title: 'TITLE 1',
+              text: 'TEXT 1',
+              location: 'LOCATION-1',
+            },
+            {
+              title: 'TITLE 2',
+              text: 'TEXT 2',
+              location: 'LOCATION-2',
+            },
+          ]);
+          await store.insertDocuments(tx, 'my-type', [
+            {
+              title: 'TITLE 3',
+              text: 'TEXT 3',
+              location: 'LOCATION-3',
+            },
+            {
+              title: 'TITLE 4',
+              text: 'TEXT 4',
+              location: 'LOCATION-4',
+            },
+          ]);
+          await store.completeInsert(tx, 'my-type');
+        });
+
+        expect(
+          await knex.count('*').where('type', 'my-type').from('documents'),
+        ).toEqual([{ count: '4' }]);
+      },
+      60_000,
+    );
+
+    it.each(databases.eachSupportedId())(
+      'should clear index for type, %p',
+      async databaseId => {
+        const { store, knex } = await createStore(databaseId);
+
+        await store.transaction(async tx => {
+          await store.prepareInsert(tx);
+          await store.insertDocuments(tx, 'test', [
+            {
+              title: 'TITLE 1',
+              text: 'TEXT 1',
+              location: 'LOCATION-1',
+            },
+          ]);
+          await store.completeInsert(tx, 'test');
+        });
+        await store.transaction(async tx => {
+          await store.prepareInsert(tx);
+          await store.insertDocuments(tx, 'my-type', [
+            {
+              title: 'TITLE 1',
+              text: 'TEXT 1',
+              location: 'LOCATION-1',
+            },
+            {
+              title: 'TITLE 2',
+              text: 'TEXT 2',
+              location: 'LOCATION-2',
+            },
+          ]);
+          await store.completeInsert(tx, 'my-type');
+        });
+        await store.transaction(async tx => {
+          await store.prepareInsert(tx);
+          await store.completeInsert(tx, 'my-type');
+        });
+
+        expect(
+          await knex.count('*').where('type', 'test').from('documents'),
+        ).toEqual([{ count: '1' }]);
+        expect(
+          await knex.count('*').where('type', 'my-type').from('documents'),
+        ).toEqual([{ count: '0' }]);
+      },
+      60_000,
+    );
+
+    it.each(databases.eachSupportedId())(
+      'should return requested range, %p',
+      async databaseId => {
+        const { store } = await createStore(databaseId);
+
+        await store.transaction(async tx => {
+          await store.prepareInsert(tx);
+          await store.insertDocuments(tx, 'test', [
+            {
+              title: 'Lorem Ipsum',
+              text: 'Hello World',
+              location: 'LOCATION-1',
+            },
+            {
+              title: 'Hello World',
+              text: 'Around the world',
+              location: 'LOCATION-1',
+            },
+            {
+              title: 'Another one',
+              text: 'From the next page',
+              location: 'LOCATION-1',
+            },
+          ]);
+          await store.completeInsert(tx, 'test');
+        });
+
+        const rows = await store.transaction(tx =>
+          store.query(tx, { pgTerm: 'Hello & World', offset: 1, limit: 1 }),
+        );
+
+        expect(rows).toEqual([
+          {
+            document: {
+              location: 'LOCATION-1',
+              text: 'Hello World',
+              title: 'Lorem Ipsum',
+            },
+            rank: expect.any(Number),
+            type: 'test',
+          },
+        ]);
+      },
+      60_000,
+    );
+
+    it.each(databases.eachSupportedId())(
+      'query by term, %p',
+      async databaseId => {
+        const { store } = await createStore(databaseId);
+
+        await store.transaction(async tx => {
+          await store.prepareInsert(tx);
+          await store.insertDocuments(tx, 'test', [
+            {
+              title: 'Lorem Ipsum',
+              text: 'Hello World',
+              location: 'LOCATION-1',
+            },
+            {
+              title: 'Hello World',
+              text: 'Around the world',
+              location: 'LOCATION-1',
+            },
+          ]);
+          await store.completeInsert(tx, 'test');
+        });
+
+        const rows = await store.transaction(tx =>
+          store.query(tx, { pgTerm: 'Hello & World', offset: 0, limit: 25 }),
+        );
+
+        expect(rows).toEqual([
+          {
+            document: {
+              location: 'LOCATION-1',
+              text: 'Around the world',
+              title: 'Hello World',
+            },
+            rank: expect.any(Number),
+            type: 'test',
+          },
+          {
+            document: {
+              location: 'LOCATION-1',
+              text: 'Hello World',
+              title: 'Lorem Ipsum',
+            },
+            rank: expect.any(Number),
+            type: 'test',
+          },
+        ]);
+      },
+      60_000,
+    );
+
+    it.each(databases.eachSupportedId())(
+      'query by term for specific type, %p',
+      async databaseId => {
+        const { store } = await createStore(databaseId);
+
+        await store.transaction(async tx => {
+          await store.prepareInsert(tx);
+          await store.insertDocuments(tx, 'my-type', [
+            {
+              title: 'Lorem Ipsum',
+              text: 'Hello World',
+              location: 'LOCATION-1',
+            },
+          ]);
+          await store.completeInsert(tx, 'my-type');
+        });
+        await store.transaction(async tx => {
+          await store.prepareInsert(tx);
+          await store.insertDocuments(tx, 'test', [
+            {
+              title: 'Hello World',
+              text: 'Around the world',
+              location: 'LOCATION-1',
+            },
+          ]);
+          await store.completeInsert(tx, 'test');
+        });
+
+        const rows = await store.transaction(tx =>
+          store.query(tx, {
+            pgTerm: 'Hello & World',
+            types: ['my-type'],
+            offset: 0,
+            limit: 25,
+          }),
+        );
+
+        expect(rows).toEqual([
+          {
+            document: {
+              location: 'LOCATION-1',
+              text: 'Hello World',
+              title: 'Lorem Ipsum',
+            },
+            rank: expect.any(Number),
+            type: 'my-type',
+          },
+        ]);
+      },
+      60_000,
+    );
+
+    it.each(databases.eachSupportedId())(
+      'query by term and filter by field, %p',
+      async databaseId => {
+        const { store } = await createStore(databaseId);
+
+        await store.transaction(async tx => {
+          await store.prepareInsert(tx);
+          await store.insertDocuments(tx, 'my-type', [
+            {
+              title: 'Lorem Ipsum',
+              text: 'Hello World',
+              myField: 'this',
+              location: 'LOCATION-1',
+            } as unknown as IndexableDocument,
+            {
+              title: 'Dolor sit amet',
+              text: 'Hello World',
+              myField: 'that',
+              location: 'LOCATION-1',
+            } as unknown as IndexableDocument,
+            {
+              title: 'Hello World',
+              text: 'Around the world',
+              location: 'LOCATION-1',
+            },
+          ]);
+          await store.completeInsert(tx, 'my-type');
+        });
+
+        const rows = await store.transaction(tx =>
+          store.query(tx, {
+            pgTerm: 'Hello & World',
+            fields: { myField: 'this' },
+            offset: 0,
+            limit: 25,
+          }),
+        );
+
+        expect(rows).toEqual([
+          {
+            document: {
+              location: 'LOCATION-1',
+              text: 'Hello World',
+              title: 'Lorem Ipsum',
+              myField: 'this',
+            },
+            rank: expect.any(Number),
+            type: 'my-type',
+          },
+        ]);
+      },
+      60_000,
+    );
+
+    it.each(databases.eachSupportedId())(
+      'query by term and filter by field (any of), %p',
+      async databaseId => {
+        const { store } = await createStore(databaseId);
+
+        await store.transaction(async tx => {
+          await store.prepareInsert(tx);
+          await store.insertDocuments(tx, 'my-type', [
+            {
+              title: 'Lorem Ipsum',
+              text: 'Hello World',
+              myField: 'this',
+              location: 'LOCATION-1',
+            } as unknown as IndexableDocument,
+            {
+              title: 'Dolor sit amet',
+              text: 'Hello World',
+              myField: 'that',
+              location: 'LOCATION-1',
+            } as unknown as IndexableDocument,
+            {
+              title: 'Hello World',
+              text: 'Around the world',
+              location: 'LOCATION-1',
+            },
+          ]);
+          await store.completeInsert(tx, 'my-type');
+        });
+
+        const rows = await store.transaction(tx =>
+          store.query(tx, {
+            pgTerm: 'Hello & World',
+            fields: { myField: ['this', 'that'] },
+            offset: 0,
+            limit: 25,
+          }),
+        );
+
+        expect(rows).toEqual([
+          {
+            document: {
+              location: 'LOCATION-1',
+              text: 'Hello World',
+              title: 'Lorem Ipsum',
+              myField: 'this',
+            },
+            rank: expect.any(Number),
+            type: 'my-type',
+          },
+          {
+            document: {
+              location: 'LOCATION-1',
+              text: 'Hello World',
+              title: 'Dolor sit amet',
+              myField: 'that',
+            },
+            rank: expect.any(Number),
+            type: 'my-type',
+          },
+        ]);
+      },
+      60_000,
+    );
+
+    it.each(databases.eachSupportedId())(
+      'query by term and filter by fields, %p',
+      async databaseId => {
+        const { store } = await createStore(databaseId);
+
+        await store.transaction(async tx => {
+          await store.prepareInsert(tx);
+          await store.insertDocuments(tx, 'my-type', [
+            {
+              title: 'Lorem Ipsum',
+              text: 'Hello World',
+              myField: 'this',
+              otherField: 'another',
+              location: 'LOCATION-1',
+            } as unknown as IndexableDocument,
+            {
+              title: 'Dolor sit amet',
+              text: 'Hello World',
+              myField: 'this',
+              otherField: 'unknown',
+              location: 'LOCATION-1',
+            } as unknown as IndexableDocument,
+          ]);
+          await store.completeInsert(tx, 'my-type');
+        });
+
+        const rows = await store.transaction(tx =>
+          store.query(tx, {
+            pgTerm: 'Hello & World',
+            fields: { myField: 'this', otherField: 'another' },
+            offset: 0,
+            limit: 25,
+          }),
+        );
+
+        expect(rows).toEqual([
+          {
+            document: {
+              location: 'LOCATION-1',
+              text: 'Hello World',
+              title: 'Lorem Ipsum',
+              myField: 'this',
+              otherField: 'another',
+            },
+            rank: expect.any(Number),
+            type: 'my-type',
+          },
+        ]);
+      },
+      60_000,
+    );
+
+    it.each(databases.eachSupportedId())(
+      'query without term and filter by field, %p',
+      async databaseId => {
+        const { store } = await createStore(databaseId);
+
+        await store.transaction(async tx => {
+          await store.prepareInsert(tx);
+          await store.insertDocuments(tx, 'my-type', [
+            {
+              title: 'Lorem Ipsum',
+              text: 'Hello World',
+              myField: 'this',
+              location: 'LOCATION-1',
+            } as unknown as IndexableDocument,
+            {
+              title: 'Dolor sit amet',
+              text: 'Hello World',
+              myField: 'this',
+              location: 'LOCATION-1',
+            } as unknown as IndexableDocument,
+          ]);
+          await store.completeInsert(tx, 'my-type');
+        });
+
+        const rows = await store.transaction(tx =>
+          store.query(tx, {
+            fields: { myField: 'this' },
+            offset: 0,
+            limit: 25,
+          }),
+        );
+
+        expect(rows).toEqual([
+          {
+            document: {
+              title: 'Lorem Ipsum',
+              text: 'Hello World',
+              myField: 'this',
+              location: 'LOCATION-1',
+            } as unknown as IndexableDocument,
+            rank: expect.any(Number),
+            type: 'my-type',
+          },
+          {
+            document: {
+              title: 'Dolor sit amet',
+              text: 'Hello World',
+              myField: 'this',
+              location: 'LOCATION-1',
+            } as unknown as IndexableDocument,
+            rank: expect.any(Number),
+            type: 'my-type',
+          },
+        ]);
+      },
+      60_000,
+    );
+  });
+});
diff --git a/plugins/search-backend-module-pg/src/database/DatabaseDocumentStore.ts b/plugins/search-backend-module-pg/src/database/DatabaseDocumentStore.ts
new file mode 100644
index 0000000000..8c180ea019
--- /dev/null
+++ b/plugins/search-backend-module-pg/src/database/DatabaseDocumentStore.ts
@@ -0,0 +1,179 @@
+/*
+ * Copyright 2021 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import { resolvePackagePath } from '@backstage/backend-common';
+import { IndexableDocument } from '@backstage/search-common';
+import { Knex } from 'knex';
+import {
+  DatabaseStore,
+  DocumentResultRow,
+  PgSearchQuery,
+  RawDocumentRow,
+} from './types';
+import { queryPostgresMajorVersion } from './util';
+
+const migrationsDir = resolvePackagePath(
+  '@backstage/plugin-search-backend-module-pg',
+  'migrations',
+);
+
+export class DatabaseDocumentStore implements DatabaseStore {
+  static async create(knex: Knex): Promise<DatabaseDocumentStore> {
+    try {
+      const majorVersion = await queryPostgresMajorVersion(knex);
+
+      if (majorVersion < 12) {
+        // We are using some features (like generated columns) that aren't
+        // available in older postgres versions.
+        throw new Error(
+          `The PgSearchEngine requires at least postgres version 12 (but is running on ${majorVersion})`,
+        );
+      }
+    } catch {
+      // Actually both mysql and sqlite have a full text search, too. We could
+      // implement them separately or add them here.
+      throw new Error(
+        'The PgSearchEngine is only supported when using a postgres database (>=12.x)',
+      );
+    }
+
+    await knex.migrate.latest({
+      directory: migrationsDir,
+    });
+    return new DatabaseDocumentStore(knex);
+  }
+
+  static async supported(knex: Knex): Promise<boolean> {
+    try {
+      const majorVersion = await queryPostgresMajorVersion(knex);
+
+      return majorVersion >= 12;
+    } catch {
+      return false;
+    }
+  }
+
+  constructor(private readonly db: Knex) {}
+
+  async transaction<T>(fn: (tx: Knex.Transaction) => Promise<T>): Promise<T> {
+    return await this.db.transaction(fn);
+  }
+
+  async prepareInsert(tx: Knex.Transaction): Promise<void> {
+    // We create a temporary table to collect the hashes of the documents that
+    // we expect to be in the documents table at the end. The table is deleted
+    // at the end of the transaction.
+    // The hash makes sure that we generate a new row for every change.
+    await tx.raw(
+      'CREATE TEMP TABLE documents_to_insert (' +
+        'type text NOT NULL, ' +
+        'document jsonb NOT NULL, ' +
+        // Generating the hash requires a trick, as the text to bytea
+        // conversation runs into errors in case the text contains a backslash.
+        // Therefore we have to escape them.
+        "hash bytea NOT NULL GENERATED ALWAYS AS (sha256(replace(document::text || type, '\\', '\\\\')::bytea)) STORED" +
+        ') ON COMMIT DROP',
+    );
+  }
+
+  async completeInsert(tx: Knex.Transaction, type: string): Promise<void> {
+    // Copy all new rows into the documents table
+    await tx
+      .insert(
+        tx<RawDocumentRow>('documents_to_insert').select(
+          'type',
+          'document',
+          'hash',
+        ),
+      )
+      .into(tx.raw('documents (type, document, hash)'))
+      .onConflict('hash')
+      .ignore();
+
+    // Delete all documents that we don't expect (deleted and changed)
+    await tx<RawDocumentRow>('documents')
+      .where({ type })
+      .whereNotIn(
+        'hash',
+        tx<RawDocumentRow>('documents_to_insert').select('hash'),
+      )
+      .delete();
+  }
+
+  async insertDocuments(
+    tx: Knex.Transaction,
+    type: string,
+    documents: IndexableDocument[],
+  ): Promise<void> {
+    // Insert all documents into the temporary table to process them later
+    await tx<DocumentResultRow>('documents_to_insert').insert(
+      documents.map(document => ({
+        type,
+        document,
+      })),
+    );
+  }
+
+  async query(
+    tx: Knex.Transaction,
+    { types, pgTerm, fields, offset, limit }: PgSearchQuery,
+  ): Promise<DocumentResultRow[]> {
+    // Builds a query like:
+    // SELECT ts_rank_cd(body, query) AS rank,  type, document
+    // FROM documents, to_tsquery('english', 'consent') query
+    // WHERE query @@ body AND (document @> '{"kind": "API"}')
+    // ORDER BY rank DESC
+    // LIMIT 10;
+    const query = tx<DocumentResultRow>('documents');
+
+    if (pgTerm) {
+      query
+        .from(tx.raw("documents, to_tsquery('english', ?) query", pgTerm))
+        .whereRaw('query @@ body');
+    } else {
+      query.from('documents');
+    }
+
+    if (types) {
+      query.whereIn('type', types);
+    }
+
+    if (fields) {
+      Object.keys(fields).forEach(key => {
+        const value = fields[key];
+        const valueArray = Array.isArray(value) ? value : [value];
+        const valueCompare = valueArray
+          .map(v => ({ [key]: v }))
+          .map(v => JSON.stringify(v));
+        query.whereRaw(
+          `(${valueCompare.map(() => 'document @> ?').join(' OR ')})`,
+          valueCompare,
+        );
+      });
+    }
+
+    query.select('type', 'document');
+
+    if (pgTerm) {
+      query
+        .select(tx.raw('ts_rank_cd(body, query) AS "rank"'))
+        .orderBy('rank', 'desc');
+    } else {
+      query.select(tx.raw('1 as rank'));
+    }
+
+    return await query.offset(offset).limit(limit);
+  }
+}
diff --git a/plugins/search-backend-module-pg/src/database/index.ts b/plugins/search-backend-module-pg/src/database/index.ts
new file mode 100644
index 0000000000..d2ca3ba3da
--- /dev/null
+++ b/plugins/search-backend-module-pg/src/database/index.ts
@@ -0,0 +1,17 @@
+/*
+ * Copyright 2021 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+export { DatabaseDocumentStore } from './DatabaseDocumentStore';
+export type { DatabaseStore, PgSearchQuery, RawDocumentRow } from './types';
diff --git a/plugins/search-backend-module-pg/src/database/types.ts b/plugins/search-backend-module-pg/src/database/types.ts
new file mode 100644
index 0000000000..0c0596160e
--- /dev/null
+++ b/plugins/search-backend-module-pg/src/database/types.ts
@@ -0,0 +1,51 @@
+/*
+ * Copyright 2021 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import { IndexableDocument } from '@backstage/search-common';
+import { Knex } from 'knex';
+
+export interface PgSearchQuery {
+  fields?: Record<string, string | string[]>;
+  types?: string[];
+  pgTerm?: string;
+  offset: number;
+  limit: number;
+}
+
+export interface DatabaseStore {
+  transaction<T>(fn: (tx: Knex.Transaction) => Promise<T>): Promise<T>;
+  prepareInsert(tx: Knex.Transaction): Promise<void>;
+  insertDocuments(
+    tx: Knex.Transaction,
+    type: string,
+    documents: IndexableDocument[],
+  ): Promise<void>;
+  completeInsert(tx: Knex.Transaction, type: string): Promise<void>;
+  query(
+    tx: Knex.Transaction,
+    pgQuery: PgSearchQuery,
+  ): Promise<DocumentResultRow[]>;
+}
+
+export interface RawDocumentRow {
+  document: IndexableDocument;
+  type: string;
+  hash: unknown;
+}
+
+export interface DocumentResultRow {
+  document: IndexableDocument;
+  type: string;
+}
diff --git a/plugins/search-backend-module-pg/src/database/util.test.ts b/plugins/search-backend-module-pg/src/database/util.test.ts
new file mode 100644
index 0000000000..09eb70c096
--- /dev/null
+++ b/plugins/search-backend-module-pg/src/database/util.test.ts
@@ -0,0 +1,62 @@
+/*
+ * Copyright 2021 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import { TestDatabases } from '@backstage/backend-test-utils';
+import { queryPostgresMajorVersion } from './util';
+
+describe('util', () => {
+  describe('unsupported', () => {
+    const databases = TestDatabases.create({
+      ids: ['SQLITE_3', 'MYSQL_8'],
+    });
+
+    it.each(databases.eachSupportedId())(
+      'should fail on get postgres major version, %p',
+      async databaseId => {
+        const knex = await databases.init(databaseId);
+
+        await expect(
+          async () => await queryPostgresMajorVersion(knex),
+        ).rejects.toThrow();
+      },
+      60_000,
+    );
+  });
+
+  describe('supported', () => {
+    const databases = TestDatabases.create({
+      ids: ['POSTGRES_13', 'POSTGRES_9'],
+    });
+
+    if (databases.eachSupportedId().length < 1) {
+      // Only execute tests if at least on database engine is available, e.g. if
+      // not in CI=1. it.each doesn't support an empty array.
+      return;
+    }
+
+    it.each(databases.eachSupportedId())(
+      'should get postgres major version, %p',
+      async databaseId => {
+        const knex = await databases.init(databaseId);
+        const expectedVersion = +databaseId.substr(9);
+
+        await expect(queryPostgresMajorVersion(knex)).resolves.toBe(
+          expectedVersion,
+        );
+      },
+      60_000,
+    );
+  });
+});
diff --git a/plugins/search-backend-module-pg/src/database/util.ts b/plugins/search-backend-module-pg/src/database/util.ts
new file mode 100644
index 0000000000..3ee4ffcdeb
--- /dev/null
+++ b/plugins/search-backend-module-pg/src/database/util.ts
@@ -0,0 +1,28 @@
+/*
+ * Copyright 2021 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import { Knex } from 'knex';
+
+export async function queryPostgresMajorVersion(knex: Knex): Promise<number> {
+  if (knex.client.config.client !== 'pg') {
+    throw new Error("Can't resolve version, not a postgres database");
+  }
+
+  const { rows } = await knex.raw('SHOW server_version_num');
+  const [result] = rows;
+  const version = +result.server_version_num;
+  const majorVersion = Math.floor(version / 10000);
+  return majorVersion;
+}
diff --git a/plugins/search-backend-module-pg/src/index.ts b/plugins/search-backend-module-pg/src/index.ts
new file mode 100644
index 0000000000..7c5716cfc4
--- /dev/null
+++ b/plugins/search-backend-module-pg/src/index.ts
@@ -0,0 +1,17 @@
+/*
+ * Copyright 2021 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+export * from './database';
+export * from './PgSearchEngine';
diff --git a/plugins/search-backend-module-pg/src/setupTests.ts b/plugins/search-backend-module-pg/src/setupTests.ts
new file mode 100644
index 0000000000..fb7d1a181a
--- /dev/null
+++ b/plugins/search-backend-module-pg/src/setupTests.ts
@@ -0,0 +1,16 @@
+/*
+ * Copyright 2021 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+export {};
diff --git a/plugins/search-backend-node/CHANGELOG.md b/plugins/search-backend-node/CHANGELOG.md
index 1a231c252e..95ed3ad2d4 100644
--- a/plugins/search-backend-node/CHANGELOG.md
+++ b/plugins/search-backend-node/CHANGELOG.md
@@ -1,5 +1,98 @@
 # @backstage/plugin-search-backend-node
 
+## 0.4.2
+
+### Patch Changes
+
+- a13f21cdc: Implement optional `pageCursor` based paging in search.
+
+  To use paging in your app, add a `<SearchResultPager />` to your
+  `SearchPage.tsx`.
+
+- Updated dependencies
+  - @backstage/search-common@0.2.0
+
+## 0.4.1
+
+### Patch Changes
+
+- d9c13d535: Implements configuration and indexing functionality for ElasticSearch search engine. Adds indexing, searching and default translator for ElasticSearch and modifies default backend example-app to use ES if it is configured.
+
+  ## Example configurations:
+
+  ### AWS
+
+  Using AWS hosted ElasticSearch the only configuration options needed is the URL to the ElasticSearch service. The implementation assumes
+  that environment variables for AWS access key id and secret access key are defined in accordance to the [default AWS credential chain.](https://docs.aws.amazon.com/sdk-for-javascript/v2/developer-guide/setting-credentials-node.html).
+
+  ```yaml
+  search:
+    elasticsearch:
+      provider: aws
+      node: https://my-backstage-search-asdfqwerty.eu-west-1.es.amazonaws.com
+  ```
+
+  ### Elastic.co
+
+  Elastic Cloud hosted ElasticSearch uses a Cloud ID to determine the instance of hosted ElasticSearch to connect to. Additionally, username and password needs to be provided either directly or using environment variables like defined in [Backstage documentation.](https://backstage.io/docs/conf/writing#includes-and-dynamic-data)
+
+  ```yaml
+  search:
+    elasticsearch:
+      provider: elastic
+      cloudId: backstage-elastic:asdfqwertyasdfqwertyasdfqwertyasdfqwerty==
+      auth:
+        username: elastic
+        password: changeme
+  ```
+
+  ### Others
+
+  Other ElasticSearch instances can be connected to by using standard ElasticSearch authentication methods and exposed URL, provided that the cluster supports that. The configuration options needed are the URL to the node and authentication information. Authentication can be handled by either providing username/password or and API key or a bearer token. In case both username/password combination and one of the tokens are provided, token takes precedence. For more information how to create an API key, see [Elastic documentation on API keys](https://www.elastic.co/guide/en/elasticsearch/reference/current/security-api-create-api-key.html) and how to create a bearer token, see [Elastic documentation on tokens.](https://www.elastic.co/guide/en/elasticsearch/reference/current/security-api-create-service-token.html)
+
+  #### Configuration examples
+
+  ##### With username and password
+
+  ```yaml
+  search:
+    elasticsearch:
+      node: http://localhost:9200
+      auth:
+        username: elastic
+        password: changeme
+  ```
+
+  ##### With bearer token
+
+  ```yaml
+  search:
+    elasticsearch:
+      node: http://localhost:9200
+      auth:
+        bearer: token
+  ```
+
+  ##### With API key
+
+  ```yaml
+  search:
+    elasticsearch:
+      node: http://localhost:9200
+      auth:
+        apiKey: base64EncodedKey
+  ```
+
+- Updated dependencies
+  - @backstage/search-common@0.1.3
+
+## 0.4.0
+
+### Minor Changes
+
+- 97b2eb37b: Change return value of `SearchEngine.index` to `Promise<void>` to support
+  implementation of external search engines.
+
 ## 0.3.0
 
 ### Minor Changes
diff --git a/plugins/search-backend-node/api-report.md b/plugins/search-backend-node/api-report.md
index d327dee01b..beb1234e6a 100644
--- a/plugins/search-backend-node/api-report.md
+++ b/plugins/search-backend-node/api-report.md
@@ -8,16 +8,23 @@ import { DocumentDecorator } from '@backstage/search-common';
 import { IndexableDocument } from '@backstage/search-common';
 import { Logger as Logger_2 } from 'winston';
 import { default as lunr_2 } from 'lunr';
+import { QueryTranslator } from '@backstage/search-common';
+import { SearchEngine } from '@backstage/search-common';
 import { SearchQuery } from '@backstage/search-common';
 import { SearchResultSet } from '@backstage/search-common';
 
+// Warning: (ae-missing-release-tag) "IndexBuilder" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export class IndexBuilder {
+  // Warning: (ae-forgotten-export) The symbol "IndexBuilderOptions" needs to be exported by the entry point index.d.ts
   constructor({ logger, searchEngine }: IndexBuilderOptions);
+  // Warning: (ae-forgotten-export) The symbol "RegisterCollatorParameters" needs to be exported by the entry point index.d.ts
   addCollator({
     collator,
     defaultRefreshIntervalSeconds,
   }: RegisterCollatorParameters): void;
+  // Warning: (ae-forgotten-export) The symbol "RegisterDecoratorParameters" needs to be exported by the entry point index.d.ts
   addDecorator({ decorator }: RegisterDecoratorParameters): void;
   build(): Promise<{
     scheduler: Scheduler;
@@ -26,6 +33,8 @@ export class IndexBuilder {
   getSearchEngine(): SearchEngine;
 }
 
+// Warning: (ae-missing-release-tag) "LunrSearchEngine" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export class LunrSearchEngine implements SearchEngine {
   constructor({ logger }: { logger: Logger_2 });
@@ -39,12 +48,16 @@ export class LunrSearchEngine implements SearchEngine {
   protected lunrIndices: Record<string, lunr_2.Index>;
   // (undocumented)
   query(query: SearchQuery): Promise<SearchResultSet>;
+  // Warning: (ae-forgotten-export) The symbol "LunrQueryTranslator" needs to be exported by the entry point index.d.ts
+  //
   // (undocumented)
   setTranslator(translator: LunrQueryTranslator): void;
   // (undocumented)
   protected translator: QueryTranslator;
 }
 
+// Warning: (ae-missing-release-tag) "Scheduler" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public
 export class Scheduler {
   constructor({ logger }: { logger: Logger_2 });
@@ -53,12 +66,7 @@ export class Scheduler {
   stop(): void;
 }
 
-// @public
-export interface SearchEngine {
-  index(type: string, documents: IndexableDocument[]): Promise<void>;
-  query(query: SearchQuery): Promise<SearchResultSet>;
-  setTranslator(translator: QueryTranslator): void;
-}
+export { SearchEngine };
 
 // (No @packageDocumentation comment for this package)
 ```
diff --git a/plugins/search-backend-node/package.json b/plugins/search-backend-node/package.json
index f889c10188..f57ad81e18 100644
--- a/plugins/search-backend-node/package.json
+++ b/plugins/search-backend-node/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-search-backend-node",
-  "version": "0.3.0",
+  "version": "0.4.2",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -19,14 +19,14 @@
     "clean": "backstage-cli clean"
   },
   "dependencies": {
-    "@backstage/search-common": "^0.1.2",
+    "@backstage/search-common": "^0.2.0",
     "winston": "^3.2.1",
     "lunr": "^2.3.9",
     "@types/lunr": "^2.3.3"
   },
   "devDependencies": {
-    "@backstage/backend-common": "^0.8.5",
-    "@backstage/cli": "^0.7.2"
+    "@backstage/backend-common": "^0.9.1",
+    "@backstage/cli": "^0.7.10"
   },
   "files": [
     "dist"
diff --git a/plugins/search-backend-node/src/IndexBuilder.ts b/plugins/search-backend-node/src/IndexBuilder.ts
index 9bbbd73067..5268caf58b 100644
--- a/plugins/search-backend-node/src/IndexBuilder.ts
+++ b/plugins/search-backend-node/src/IndexBuilder.ts
@@ -18,13 +18,13 @@ import {
   DocumentCollator,
   DocumentDecorator,
   IndexableDocument,
+  SearchEngine,
 } from '@backstage/search-common';
 import { Logger } from 'winston';
 import { Scheduler } from './index';
 import {
   RegisterCollatorParameters,
   RegisterDecoratorParameters,
-  SearchEngine,
 } from './types';
 
 interface CollatorEnvelope {
diff --git a/plugins/search-backend-node/src/engines/LunrSearchEngine.test.ts b/plugins/search-backend-node/src/engines/LunrSearchEngine.test.ts
index 3d59ba4b6f..a2cbb4ecc3 100644
--- a/plugins/search-backend-node/src/engines/LunrSearchEngine.test.ts
+++ b/plugins/search-backend-node/src/engines/LunrSearchEngine.test.ts
@@ -16,8 +16,13 @@
 
 import { getVoidLogger } from '@backstage/backend-common';
 import lunr from 'lunr';
-import { SearchEngine } from '../types';
-import { ConcreteLunrQuery, LunrSearchEngine } from './LunrSearchEngine';
+import { SearchEngine } from '@backstage/search-common';
+import {
+  ConcreteLunrQuery,
+  LunrSearchEngine,
+  decodePageCursor,
+  encodePageCursor,
+} from './LunrSearchEngine';
 
 /**
  * Just used to test the default translator shipped with LunrSearchEngine.
@@ -48,14 +53,14 @@ describe('LunrSearchEngine', () => {
       await testLunrSearchEngine.query({
         term: 'testTerm',
         filters: {},
-        pageCursor: '',
+        pageCursor: 'MQ==',
       });
 
       // Then: the translator is invoked with expected args.
       expect(translatorSpy).toHaveBeenCalledWith({
         term: 'testTerm',
         filters: {},
-        pageCursor: '',
+        pageCursor: 'MQ==',
       });
     });
 
@@ -68,12 +73,53 @@ describe('LunrSearchEngine', () => {
       const actualTranslatedQuery = translatorUnderTest({
         term: 'testTerm',
         filters: {},
-        pageCursor: '',
       }) as ConcreteLunrQuery;
 
       expect(actualTranslatedQuery).toMatchObject({
         documentTypes: undefined,
         lunrQueryBuilder: expect.any(Function),
+        pageSize: 25,
+      });
+
+      const query: jest.Mocked<lunr.Query> = {
+        allFields: [],
+        clauses: [],
+        term: jest.fn(),
+        clause: jest.fn(),
+      };
+
+      actualTranslatedQuery.lunrQueryBuilder.bind(query)(query);
+
+      expect(query.term).toBeCalledWith(lunr.tokenizer('testTerm'), {
+        boost: 100,
+        usePipeline: true,
+      });
+      expect(query.term).toBeCalledWith(lunr.tokenizer('testTerm'), {
+        boost: 10,
+        usePipeline: false,
+        wildcard: lunr.Query.wildcard.TRAILING,
+      });
+      expect(query.term).toBeCalledWith(lunr.tokenizer('testTerm'), {
+        boost: 1,
+        usePipeline: false,
+        editDistance: 2,
+      });
+    });
+
+    it('should have default offset and limit', async () => {
+      const inspectableSearchEngine = new LunrSearchEngineForTranslatorTests({
+        logger: getVoidLogger(),
+      });
+      const translatorUnderTest = inspectableSearchEngine.getTranslator();
+
+      const actualTranslatedQuery = translatorUnderTest({
+        term: 'testTerm',
+      }) as ConcreteLunrQuery;
+
+      expect(actualTranslatedQuery).toMatchObject({
+        documentTypes: undefined,
+        lunrQueryBuilder: expect.any(Function),
+        pageSize: 25,
       });
 
       const query: jest.Mocked<lunr.Query> = {
@@ -110,7 +156,6 @@ describe('LunrSearchEngine', () => {
       const actualTranslatedQuery = translatorUnderTest({
         term: 'testTerm',
         filters: { kind: 'testKind' },
-        pageCursor: '',
       }) as ConcreteLunrQuery;
 
       expect(actualTranslatedQuery).toMatchObject({
@@ -156,7 +201,6 @@ describe('LunrSearchEngine', () => {
       const actualTranslatedQuery = translatorUnderTest({
         term: 'testTerm',
         filters: { kind: 'testKind', namespace: 'testNameSpace' },
-        pageCursor: '',
       }) as ConcreteLunrQuery;
 
       expect(actualTranslatedQuery).toMatchObject({
@@ -206,7 +250,6 @@ describe('LunrSearchEngine', () => {
       const actualTranslatedQuery = translatorUnderTest({
         term: 'testTerm',
         filters: { kind: 'testKind' },
-        pageCursor: '',
       }) as ConcreteLunrQuery;
 
       expect(actualTranslatedQuery).toMatchObject({
@@ -235,18 +278,19 @@ describe('LunrSearchEngine', () => {
       const mockedSearchResult = await testLunrSearchEngine.query({
         term: 'testTerm',
         filters: {},
-        pageCursor: '',
       });
 
       expect(querySpy).toHaveBeenCalled();
       expect(querySpy).toHaveBeenCalledWith({
         term: 'testTerm',
         filters: {},
-        pageCursor: '',
       });
 
       // Should return 0 results as nothing is indexed here
-      expect(mockedSearchResult).toMatchObject({ results: [] });
+      expect(mockedSearchResult).toMatchObject({
+        results: [],
+        nextPageCursor: undefined,
+      });
     });
 
     it('should perform search query and return 0 results on no match', async () => {
@@ -265,11 +309,13 @@ describe('LunrSearchEngine', () => {
       const mockedSearchResult = await testLunrSearchEngine.query({
         term: 'unknown',
         filters: {},
-        pageCursor: '',
       });
 
       // Should return 0 results as we are mocking the indexing of 1 document but with no match on the fields
-      expect(mockedSearchResult).toMatchObject({ results: [] });
+      expect(mockedSearchResult).toMatchObject({
+        results: [],
+        nextPageCursor: undefined,
+      });
     });
 
     it('should perform search query and return all results on empty term', async () => {
@@ -288,7 +334,6 @@ describe('LunrSearchEngine', () => {
       const mockedSearchResult = await testLunrSearchEngine.query({
         term: '',
         filters: {},
-        pageCursor: '',
       });
 
       expect(mockedSearchResult).toMatchObject({
@@ -302,6 +347,7 @@ describe('LunrSearchEngine', () => {
             type: 'test-index',
           },
         ],
+        nextPageCursor: undefined,
       });
     });
 
@@ -321,7 +367,6 @@ describe('LunrSearchEngine', () => {
       const mockedSearchResult = await testLunrSearchEngine.query({
         term: 'testTitle',
         filters: {},
-        pageCursor: '',
       });
 
       expect(mockedSearchResult).toMatchObject({
@@ -334,6 +379,7 @@ describe('LunrSearchEngine', () => {
             },
           },
         ],
+        nextPageCursor: undefined,
       });
     });
 
@@ -353,7 +399,6 @@ describe('LunrSearchEngine', () => {
       const mockedSearchResult = await testLunrSearchEngine.query({
         term: 'testTitle',
         filters: {},
-        pageCursor: '',
       });
 
       expect(mockedSearchResult).toMatchObject({
@@ -366,6 +411,7 @@ describe('LunrSearchEngine', () => {
             },
           },
         ],
+        nextPageCursor: undefined,
       });
     });
 
@@ -385,7 +431,6 @@ describe('LunrSearchEngine', () => {
       const mockedSearchResult = await testLunrSearchEngine.query({
         term: 'testTitel', // Intentional typo
         filters: {},
-        pageCursor: '',
       });
 
       // Should return 1 result as we are mocking the indexing of 1 document with match on the title field
@@ -399,6 +444,7 @@ describe('LunrSearchEngine', () => {
             },
           },
         ],
+        nextPageCursor: undefined,
       });
     });
 
@@ -418,7 +464,6 @@ describe('LunrSearchEngine', () => {
       const mockedSearchResult = await testLunrSearchEngine.query({
         term: 'World',
         filters: {},
-        pageCursor: '',
       });
 
       // Should return 1 result as we are mocking the indexing of 1 document with match on the title field
@@ -432,6 +477,7 @@ describe('LunrSearchEngine', () => {
             },
           },
         ],
+        nextPageCursor: undefined,
       });
     });
 
@@ -451,7 +497,6 @@ describe('LunrSearchEngine', () => {
       const mockedSearchResult = await testLunrSearchEngine.query({
         term: 'Search',
         filters: {},
-        pageCursor: '',
       });
 
       // Should return 1 result as we are mocking the indexing of 1 document with match on the title field
@@ -465,6 +510,7 @@ describe('LunrSearchEngine', () => {
             },
           },
         ],
+        nextPageCursor: undefined,
       });
     });
 
@@ -489,7 +535,6 @@ describe('LunrSearchEngine', () => {
       const mockedSearchResult = await testLunrSearchEngine.query({
         term: 'testTitle',
         filters: { location: 'test/location2' },
-        pageCursor: '',
       });
 
       // Should return 1 of 2 results as we are
@@ -505,6 +550,7 @@ describe('LunrSearchEngine', () => {
             },
           },
         ],
+        nextPageCursor: undefined,
       });
     });
 
@@ -532,7 +578,6 @@ describe('LunrSearchEngine', () => {
       // Perform search query scoped to "test-index-2" with a filter on the field "extraField"
       const mockedSearchResult = await testLunrSearchEngine.query({
         term: 'testTitle',
-        pageCursor: '',
         filters: { extraField: 'testExtraField' },
       });
 
@@ -547,6 +592,7 @@ describe('LunrSearchEngine', () => {
             },
           },
         ],
+        nextPageCursor: undefined,
       });
     });
 
@@ -571,7 +617,6 @@ describe('LunrSearchEngine', () => {
       const mockedSearchResult = await testLunrSearchEngine.query({
         term: 'testTitle',
         filters: { location: 'test:location2' },
-        pageCursor: '',
       });
 
       // Should return 1 of 2 results as we are
@@ -587,6 +632,7 @@ describe('LunrSearchEngine', () => {
             },
           },
         ],
+        nextPageCursor: undefined,
       });
     });
 
@@ -625,7 +671,6 @@ describe('LunrSearchEngine', () => {
       const mockedSearchResult = await testLunrSearchEngine.query({
         term: 'testTitle',
         types: ['test-index-2'],
-        pageCursor: '',
       });
 
       expect(mockedSearchResult).toMatchObject({
@@ -645,8 +690,75 @@ describe('LunrSearchEngine', () => {
             },
           },
         ],
+        nextPageCursor: undefined,
       });
     });
+
+    it('should return next page cursor if results exceed page size', async () => {
+      const mockDocuments = Array(30)
+        .fill(0)
+        .map((_, i) => ({
+          title: 'testTitle',
+          text: 'testText',
+          location: `test/location/${i}`,
+        }));
+
+      await testLunrSearchEngine.index('test-index', mockDocuments);
+
+      const mockedSearchResult = await testLunrSearchEngine.query({
+        term: 'testTitle',
+        types: ['test-index'],
+      });
+
+      expect(mockedSearchResult).toMatchObject({
+        results: Array(25)
+          .fill(0)
+          .map((_, i) => ({
+            document: {
+              title: 'testTitle',
+              text: 'testText',
+              location: `test/location/${i}`,
+            },
+            type: 'test-index',
+          })),
+        nextPageCursor: 'MQ==',
+        previousPageCursor: undefined,
+      });
+    });
+  });
+
+  it('should return previous page cursor if on another page', async () => {
+    const mockDocuments = Array(30)
+      .fill(0)
+      .map((_, i) => ({
+        title: 'testTitle',
+        text: 'testText',
+        location: `test/location/${i}`,
+      }));
+
+    await testLunrSearchEngine.index('test-index', mockDocuments);
+
+    const mockedSearchResult = await testLunrSearchEngine.query({
+      term: 'testTitle',
+      types: ['test-index'],
+      pageCursor: 'MQ==',
+    });
+
+    expect(mockedSearchResult).toMatchObject({
+      results: Array(30)
+        .fill(0)
+        .map((_, i) => ({
+          document: {
+            title: 'testTitle',
+            text: 'testText',
+            location: `test/location/${i}`,
+          },
+          type: 'test-index',
+        }))
+        .slice(25),
+      nextPageCursor: undefined,
+      previousPageCursor: 'MA==',
+    });
   });
 
   describe('index', () => {
@@ -669,3 +781,19 @@ describe('LunrSearchEngine', () => {
     });
   });
 });
+
+describe('decodePageCursor', () => {
+  test('should decode page', () => {
+    expect(decodePageCursor('MQ==')).toEqual({ page: 1 });
+  });
+
+  test('should fallback to first page if empty', () => {
+    expect(decodePageCursor()).toEqual({ page: 0 });
+  });
+});
+
+describe('encodePageCursor', () => {
+  test('should encode page', () => {
+    expect(encodePageCursor({ page: 1 })).toEqual('MQ==');
+  });
+});
diff --git a/plugins/search-backend-node/src/engines/LunrSearchEngine.ts b/plugins/search-backend-node/src/engines/LunrSearchEngine.ts
index e832e49f85..f22762cb9f 100644
--- a/plugins/search-backend-node/src/engines/LunrSearchEngine.ts
+++ b/plugins/search-backend-node/src/engines/LunrSearchEngine.ts
@@ -18,14 +18,16 @@ import {
   IndexableDocument,
   SearchQuery,
   SearchResultSet,
+  QueryTranslator,
+  SearchEngine,
 } from '@backstage/search-common';
 import lunr from 'lunr';
 import { Logger } from 'winston';
-import { QueryTranslator, SearchEngine } from '../types';
 
 export type ConcreteLunrQuery = {
   lunrQueryBuilder: lunr.Index.QueryBuilder;
   documentTypes?: string[];
+  pageSize: number;
 };
 
 type LunrResultEnvelope = {
@@ -50,6 +52,8 @@ export class LunrSearchEngine implements SearchEngine {
     filters,
     types,
   }: SearchQuery): ConcreteLunrQuery => {
+    const pageSize = 25;
+
     return {
       lunrQueryBuilder: q => {
         const termToken = lunr.tokenizer(term);
@@ -106,6 +110,7 @@ export class LunrSearchEngine implements SearchEngine {
         }
       },
       documentTypes: types,
+      pageSize,
     };
   };
 
@@ -140,7 +145,7 @@ export class LunrSearchEngine implements SearchEngine {
   }
 
   async query(query: SearchQuery): Promise<SearchResultSet> {
-    const { lunrQueryBuilder, documentTypes } = this.translator(
+    const { lunrQueryBuilder, documentTypes, pageSize } = this.translator(
       query,
     ) as ConcreteLunrQuery;
 
@@ -176,13 +181,41 @@ export class LunrSearchEngine implements SearchEngine {
       return doc2.result.score - doc1.result.score;
     });
 
+    // Perform paging
+    const { page } = decodePageCursor(query.pageCursor);
+    const offset = page * pageSize;
+    const hasPreviousPage = page > 0;
+    const hasNextPage = results.length > offset + pageSize;
+    const nextPageCursor = hasNextPage
+      ? encodePageCursor({ page: page + 1 })
+      : undefined;
+    const previousPageCursor = hasPreviousPage
+      ? encodePageCursor({ page: page - 1 })
+      : undefined;
+
     // Translate results into SearchResultSet
     const realResultSet: SearchResultSet = {
-      results: results.map(d => {
+      results: results.slice(offset, offset + pageSize).map(d => {
         return { type: d.type, document: this.docStore[d.result.ref] };
       }),
+      nextPageCursor,
+      previousPageCursor,
     };
 
     return realResultSet;
   }
 }
+
+export function decodePageCursor(pageCursor?: string): { page: number } {
+  if (!pageCursor) {
+    return { page: 0 };
+  }
+
+  return {
+    page: Number(Buffer.from(pageCursor, 'base64').toString('utf-8')),
+  };
+}
+
+export function encodePageCursor({ page }: { page: number }): string {
+  return Buffer.from(`${page}`, 'utf-8').toString('base64');
+}
diff --git a/plugins/search-backend-node/src/index.ts b/plugins/search-backend-node/src/index.ts
index b52a1ef20c..a0a1109211 100644
--- a/plugins/search-backend-node/src/index.ts
+++ b/plugins/search-backend-node/src/index.ts
@@ -17,4 +17,8 @@
 export { IndexBuilder } from './IndexBuilder';
 export { Scheduler } from './Scheduler';
 export { LunrSearchEngine } from './engines';
-export type { SearchEngine } from './types';
+
+/**
+ * @deprecated Import from @backstage/search-common instead
+ */
+export type { SearchEngine } from '@backstage/search-common';
diff --git a/plugins/search-backend-node/src/types.ts b/plugins/search-backend-node/src/types.ts
index 28dc1237ba..df83357f6c 100644
--- a/plugins/search-backend-node/src/types.ts
+++ b/plugins/search-backend-node/src/types.ts
@@ -14,13 +14,7 @@
  * limitations under the License.
  */
 
-import {
-  DocumentCollator,
-  DocumentDecorator,
-  IndexableDocument,
-  SearchQuery,
-  SearchResultSet,
-} from '@backstage/search-common';
+import { DocumentCollator, DocumentDecorator } from '@backstage/search-common';
 
 /**
  * Parameters required to register a collator.
@@ -46,31 +40,3 @@ export interface RegisterDecoratorParameters {
    */
   decorator: DocumentDecorator;
 }
-
-/**
- * A type of function responsible for translating an abstract search query into
- * a concrete query relevant to a particular search engine.
- */
-export type QueryTranslator = (query: SearchQuery) => unknown;
-
-/**
- * Interface that must be implemented by specific search engines, responsible
- * for performing indexing and querying and translating abstract queries into
- * concrete, search engine-specific queries.
- */
-export interface SearchEngine {
-  /**
-   * Override the default translator provided by the SearchEngine.
-   */
-  setTranslator(translator: QueryTranslator): void;
-
-  /**
-   * Add the given documents to the SearchEngine index of the given type.
-   */
-  index(type: string, documents: IndexableDocument[]): Promise<void>;
-
-  /**
-   * Perform a search query against the SearchEngine.
-   */
-  query(query: SearchQuery): Promise<SearchResultSet>;
-}
diff --git a/plugins/search-backend/CHANGELOG.md b/plugins/search-backend/CHANGELOG.md
index 678bcc8169..af8fcfa79a 100644
--- a/plugins/search-backend/CHANGELOG.md
+++ b/plugins/search-backend/CHANGELOG.md
@@ -1,5 +1,42 @@
 # @backstage/plugin-search-backend
 
+## 0.2.6
+
+### Patch Changes
+
+- a13f21cdc: Implement optional `pageCursor` based paging in search.
+
+  To use paging in your app, add a `<SearchResultPager />` to your
+  `SearchPage.tsx`.
+
+- Updated dependencies
+  - @backstage/search-common@0.2.0
+  - @backstage/plugin-search-backend-node@0.4.2
+  - @backstage/backend-common@0.9.1
+
+## 0.2.5
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.9.0
+
+## 0.2.4
+
+### Patch Changes
+
+- 64baedea5: Improve search query logging message
+- Updated dependencies
+  - @backstage/backend-common@0.8.10
+
+## 0.2.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.8.6
+  - @backstage/plugin-search-backend-node@0.4.0
+
 ## 0.2.2
 
 ### Patch Changes
diff --git a/plugins/search-backend/api-report.md b/plugins/search-backend/api-report.md
index b4202a1916..2a7457eb81 100644
--- a/plugins/search-backend/api-report.md
+++ b/plugins/search-backend/api-report.md
@@ -7,6 +7,9 @@ import express from 'express';
 import { Logger as Logger_2 } from 'winston';
 import { SearchEngine } from '@backstage/plugin-search-backend-node';
 
+// Warning: (ae-forgotten-export) The symbol "RouterOptions" needs to be exported by the entry point index.d.ts
+// Warning: (ae-missing-release-tag) "createRouter" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export function createRouter({
   engine,
diff --git a/plugins/search-backend/package.json b/plugins/search-backend/package.json
index d7e163198f..300ff80ba1 100644
--- a/plugins/search-backend/package.json
+++ b/plugins/search-backend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-search-backend",
-  "version": "0.2.2",
+  "version": "0.2.6",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -19,9 +19,9 @@
     "clean": "backstage-cli clean"
   },
   "dependencies": {
-    "@backstage/backend-common": "^0.8.5",
-    "@backstage/search-common": "^0.1.2",
-    "@backstage/plugin-search-backend-node": "^0.3.0",
+    "@backstage/backend-common": "^0.9.1",
+    "@backstage/search-common": "^0.2.0",
+    "@backstage/plugin-search-backend-node": "^0.4.2",
     "@types/express": "^4.17.6",
     "express": "^4.17.1",
     "express-promise-router": "^4.1.0",
@@ -29,7 +29,7 @@
     "yn": "^4.0.0"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.7.1",
+    "@backstage/cli": "^0.7.10",
     "@types/supertest": "^2.0.8",
     "supertest": "^6.1.3"
   },
diff --git a/plugins/search-backend/src/service/router.ts b/plugins/search-backend/src/service/router.ts
index 27b8acf9cb..6df39ca1eb 100644
--- a/plugins/search-backend/src/service/router.ts
+++ b/plugins/search-backend/src/service/router.ts
@@ -36,11 +36,13 @@ export async function createRouter({
       req: express.Request<any, unknown, unknown, SearchQuery>,
       res: express.Response<SearchResultSet>,
     ) => {
-      const { term, filters = {}, pageCursor = '' } = req.query;
+      const { term, filters = {}, types, pageCursor } = req.query;
       logger.info(
-        `Search request received: ${term}, ${JSON.stringify(
+        `Search request received: term="${term}", filters=${JSON.stringify(
           filters,
-        )}, ${pageCursor}`,
+        )}, types=${types ? types.join(',') : ''}, pageCursor=${
+          pageCursor ?? ''
+        }`,
       );
 
       try {
diff --git a/plugins/search/CHANGELOG.md b/plugins/search/CHANGELOG.md
index 18fe34c720..cb869810dc 100644
--- a/plugins/search/CHANGELOG.md
+++ b/plugins/search/CHANGELOG.md
@@ -1,5 +1,98 @@
 # @backstage/plugin-search
 
+## 0.4.10
+
+### Patch Changes
+
+- 7f00902d9: Add Home Page Search Bar Component, to be included in composable Home Page.
+- Updated dependencies
+  - @backstage/core-components@0.4.1
+  - @backstage/catalog-model@0.9.2
+  - @backstage/errors@0.1.2
+  - @backstage/config@0.1.9
+  - @backstage/core-plugin-api@0.1.7
+
+## 0.4.9
+
+### Patch Changes
+
+- a13f21cdc: Implement optional `pageCursor` based paging in search.
+
+  To use paging in your app, add a `<SearchResultPager />` to your
+  `SearchPage.tsx`.
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@0.4.5
+  - @backstage/core-components@0.4.0
+  - @backstage/search-common@0.2.0
+  - @backstage/catalog-model@0.9.1
+
+## 0.4.8
+
+### Patch Changes
+
+- 16ec8381a: Fix search page to respond to searches made from sidebar search
+- Updated dependencies
+  - @backstage/plugin-catalog-react@0.4.4
+  - @backstage/core-components@0.3.3
+  - @backstage/config@0.1.8
+
+## 0.4.7
+
+### Patch Changes
+
+- 56c773909: Switched `@types/react` dependency to request `*` rather than a specific version.
+- Updated dependencies
+  - @backstage/core-components@0.3.1
+  - @backstage/core-plugin-api@0.1.6
+  - @backstage/plugin-catalog-react@0.4.2
+
+## 0.4.6
+
+### Patch Changes
+
+- b917365cf: Change `<SearchType>` design to follow Figma and be similar to existing multi
+  selects in Backstage.
+- Updated dependencies
+  - @backstage/core-components@0.3.0
+  - @backstage/config@0.1.6
+  - @backstage/core-plugin-api@0.1.5
+  - @backstage/search-common@0.1.3
+  - @backstage/plugin-catalog-react@0.4.1
+
+## 0.4.5
+
+### Patch Changes
+
+- 9d40fcb1e: - Bumping `material-ui/core` version to at least `4.12.2` as they made some breaking changes in later versions which broke `Pagination` of the `Table`.
+  - Switching out `material-table` to `@material-table/core` for support for the later versions of `material-ui/core`
+  - This causes a minor API change to `@backstage/core-components` as the interface for `Table` re-exports the `prop` from the underlying `Table` components.
+  - `onChangeRowsPerPage` has been renamed to `onRowsPerPageChange`
+  - `onChangePage` has been renamed to `onPageChange`
+  - Migration guide is here: https://material-table-core.com/docs/breaking-changes
+- Updated dependencies
+  - @backstage/core-components@0.2.0
+  - @backstage/plugin-catalog-react@0.4.0
+  - @backstage/core-plugin-api@0.1.4
+  - @backstage/theme@0.2.9
+
+## 0.4.4
+
+### Patch Changes
+
+- 9266b80ab: Adding a type filter to new search
+- Updated dependencies
+  - @backstage/core-components@0.1.6
+  - @backstage/plugin-catalog-react@0.3.1
+
+## 0.4.3
+
+### Patch Changes
+
+- 078d4973e: Handle request errors properly and display them in the results list.
+- Updated dependencies
+  - @backstage/plugin-catalog-react@0.3.0
+
 ## 0.4.2
 
 ### Patch Changes
diff --git a/plugins/search/api-report.md b/plugins/search/api-report.md
index 27ecf213bb..bdb2ab2a54 100644
--- a/plugins/search/api-report.md
+++ b/plugins/search/api-report.md
@@ -17,6 +17,8 @@ import { SearchQuery } from '@backstage/search-common';
 import { SearchResult as SearchResult_2 } from '@backstage/search-common';
 import { SearchResultSet } from '@backstage/search-common';
 
+// Warning: (ae-missing-release-tag) "DefaultResultListItem" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export const DefaultResultListItem: ({
   result,
@@ -24,6 +26,9 @@ export const DefaultResultListItem: ({
   result: IndexableDocument;
 }) => JSX.Element;
 
+// Warning: (ae-forgotten-export) The symbol "FiltersProps" needs to be exported by the entry point index.d.ts
+// Warning: (ae-missing-release-tag) "Filters" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export const Filters: ({
   filters,
@@ -33,27 +38,51 @@ export const Filters: ({
   updateChecked,
 }: FiltersProps) => JSX.Element;
 
+// Warning: (ae-forgotten-export) The symbol "FiltersButtonProps" needs to be exported by the entry point index.d.ts
+// Warning: (ae-missing-release-tag) "FiltersButton" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export const FiltersButton: ({
   numberOfSelectedFilters,
   handleToggleFilters,
 }: FiltersButtonProps) => JSX.Element;
 
+// Warning: (ae-missing-release-tag) "FiltersState" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export type FiltersState = {
   selected: string;
   checked: Array<string>;
 };
 
+// Warning: (ae-missing-release-tag) "HomePageSearchBar" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
+// @public (undocumented)
+export const HomePageSearchBar: ({
+  placeholder,
+}: {
+  placeholder?: string | undefined;
+}) => JSX.Element;
+
+// Warning: (ae-missing-release-tag) "SearchPage" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export const Router: () => JSX.Element;
 
+// Warning: (ae-forgotten-export) The symbol "SearchApi" needs to be exported by the entry point index.d.ts
+// Warning: (ae-missing-release-tag) "searchApiRef" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export const searchApiRef: ApiRef<SearchApi>;
 
+// Warning: (ae-forgotten-export) The symbol "Props" needs to be exported by the entry point index.d.ts
+// Warning: (ae-missing-release-tag) "SearchBar" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export const SearchBar: ({ className, debounceTime }: Props) => JSX.Element;
 
+// Warning: (ae-missing-release-tag) "SearchBarNext" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public @deprecated (undocumented)
 export const SearchBarNext: ({
   className,
@@ -63,6 +92,8 @@ export const SearchBarNext: ({
   debounceTime?: number | undefined;
 }) => JSX.Element;
 
+// Warning: (ae-missing-release-tag) "SearchContextProvider" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export const SearchContextProvider: ({
   initialState,
@@ -71,6 +102,8 @@ export const SearchContextProvider: ({
   initialState?: SettableSearchContext | undefined;
 }>) => JSX.Element;
 
+// Warning: (ae-missing-release-tag) "SearchFilter" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export const SearchFilter: {
   ({ component: Element, ...props }: Props_2): JSX.Element;
@@ -78,6 +111,8 @@ export const SearchFilter: {
   Select(props: Omit<Props_2, 'component'> & Component): JSX.Element;
 };
 
+// Warning: (ae-missing-release-tag) "SearchFilterNext" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public @deprecated (undocumented)
 export const SearchFilterNext: {
   ({ component: Element, ...props }: Props_2): JSX.Element;
@@ -85,12 +120,18 @@ export const SearchFilterNext: {
   Select(props: Omit<Props_2, 'component'> & Component): JSX.Element;
 };
 
+// Warning: (ae-missing-release-tag) "SearchPage" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export const SearchPage: () => JSX.Element;
 
+// Warning: (ae-missing-release-tag) "SearchPageNext" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public @deprecated (undocumented)
 export const SearchPageNext: () => JSX.Element;
 
+// Warning: (ae-missing-release-tag) "searchPlugin" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 const searchPlugin: BackstagePlugin<
   {
@@ -102,6 +143,8 @@ const searchPlugin: BackstagePlugin<
 export { searchPlugin as plugin };
 export { searchPlugin };
 
+// Warning: (ae-missing-release-tag) "SearchResult" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export const SearchResult: ({
   children,
@@ -109,11 +152,38 @@ export const SearchResult: ({
   children: (results: { results: SearchResult_2[] }) => JSX.Element;
 }) => JSX.Element;
 
+// Warning: (ae-missing-release-tag) "SearchResultPager" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
+// @public (undocumented)
+export const SearchResultPager: () => JSX.Element;
+
+// Warning: (ae-forgotten-export) The symbol "SearchTypeProps" needs to be exported by the entry point index.d.ts
+// Warning: (ae-missing-release-tag) "SearchType" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
+// @public (undocumented)
+export const SearchType: ({
+  values,
+  className,
+  name,
+  defaultValue,
+}: SearchTypeProps) => JSX.Element;
+
+// Warning: (ae-missing-release-tag) "SidebarSearch" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export const SidebarSearch: () => JSX.Element;
 
+// Warning: (ae-forgotten-export) The symbol "SearchContextValue" needs to be exported by the entry point index.d.ts
+// Warning: (ae-missing-release-tag) "useSearch" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export const useSearch: () => SearchContextValue;
 
+// Warnings were encountered during analysis:
+//
+// src/components/SearchContext/SearchContext.d.ts:21:5 - (ae-forgotten-export) The symbol "SettableSearchContext" needs to be exported by the entry point index.d.ts
+// src/components/SearchFilter/SearchFilter.d.ts:13:5 - (ae-forgotten-export) The symbol "Props" needs to be exported by the entry point index.d.ts
+// src/components/SearchFilter/SearchFilter.d.ts:14:5 - (ae-forgotten-export) The symbol "Component" needs to be exported by the entry point index.d.ts
+
 // (No @packageDocumentation comment for this package)
 ```
diff --git a/plugins/search/package.json b/plugins/search/package.json
index c40885e357..c60ae7c5d8 100644
--- a/plugins/search/package.json
+++ b/plugins/search/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-search",
-  "version": "0.4.2",
+  "version": "0.4.10",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -29,17 +29,18 @@
     "clean": "backstage-cli clean"
   },
   "dependencies": {
-    "@backstage/catalog-model": "^0.9.0",
-    "@backstage/config": "^0.1.5",
-    "@backstage/core-components": "^0.1.5",
-    "@backstage/core-plugin-api": "^0.1.3",
-    "@backstage/plugin-catalog-react": "^0.2.6",
-    "@backstage/search-common": "^0.1.2",
-    "@backstage/theme": "^0.2.8",
-    "@material-ui/core": "^4.11.0",
+    "@backstage/catalog-model": "^0.9.2",
+    "@backstage/config": "^0.1.9",
+    "@backstage/core-components": "^0.4.1",
+    "@backstage/core-plugin-api": "^0.1.7",
+    "@backstage/errors": "^0.1.2",
+    "@backstage/plugin-catalog-react": "^0.4.5",
+    "@backstage/search-common": "^0.2.0",
+    "@backstage/theme": "^0.2.10",
+    "@material-ui/core": "^4.12.2",
     "@material-ui/icons": "^4.9.1",
     "@material-ui/lab": "4.0.0-alpha.45",
-    "@types/react": "^16.9",
+    "@types/react": "*",
     "qs": "^6.9.4",
     "react": "^16.13.1",
     "react-dom": "^16.13.1",
@@ -48,17 +49,16 @@
     "react-use": "^17.2.4"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.7.3",
-    "@backstage/core-app-api": "^0.1.4",
-    "@backstage/dev-utils": "^0.2.1",
-    "@backstage/test-utils": "^0.1.14",
+    "@backstage/cli": "^0.7.11",
+    "@backstage/core-app-api": "^0.1.12",
+    "@backstage/dev-utils": "^0.2.9",
+    "@backstage/test-utils": "^0.1.17",
     "@testing-library/jest-dom": "^5.10.1",
     "@testing-library/react": "^11.2.5",
     "@testing-library/react-hooks": "^3.4.2",
     "@testing-library/user-event": "^13.1.8",
     "@types/jest": "^26.0.7",
     "@types/node": "^14.14.32",
-    "@types/react": "^16.9",
     "cross-fetch": "^3.0.6",
     "msw": "^0.29.0"
   },
diff --git a/plugins/search/src/apis.test.ts b/plugins/search/src/apis.test.ts
index 43b77e4927..91395d1f0b 100644
--- a/plugins/search/src/apis.test.ts
+++ b/plugins/search/src/apis.test.ts
@@ -21,7 +21,6 @@ describe('apis', () => {
     term: '',
     filters: {},
     types: [],
-    pageCursor: '',
   };
 
   const baseUrl = 'https://base-url.com/';
@@ -44,7 +43,7 @@ describe('apis', () => {
 
   const json = jest.fn();
   const originalFetch = window.fetch;
-  window.fetch = jest.fn().mockResolvedValue({ json });
+  window.fetch = jest.fn().mockResolvedValue({ json, ok: true });
 
   afterAll(() => {
     window.fetch = originalFetch;
@@ -53,7 +52,7 @@ describe('apis', () => {
   it('Fetch is called with expected URL (including stringified Q params)', async () => {
     await client.query(query);
     expect(getBaseUrl).toHaveBeenLastCalledWith('search/query');
-    expect(fetch).toHaveBeenLastCalledWith(`${baseUrl}?term=&pageCursor=`, {
+    expect(fetch).toHaveBeenLastCalledWith(`${baseUrl}?term=`, {
       headers: {},
     });
   });
@@ -65,7 +64,7 @@ describe('apis', () => {
     });
     await authedClient.query(query);
     expect(getBaseUrl).toHaveBeenLastCalledWith('search/query');
-    expect(fetch).toHaveBeenLastCalledWith(`${baseUrl}?term=&pageCursor=`, {
+    expect(fetch).toHaveBeenLastCalledWith(`${baseUrl}?term=`, {
       headers: { Authorization: `Bearer ${token}` },
     });
   });
diff --git a/plugins/search/src/apis.ts b/plugins/search/src/apis.ts
index da8332bd44..fa6d9ce908 100644
--- a/plugins/search/src/apis.ts
+++ b/plugins/search/src/apis.ts
@@ -14,13 +14,14 @@
  * limitations under the License.
  */
 
-import { SearchQuery, SearchResultSet } from '@backstage/search-common';
-import qs from 'qs';
 import {
   createApiRef,
   DiscoveryApi,
   IdentityApi,
 } from '@backstage/core-plugin-api';
+import { ResponseError } from '@backstage/errors';
+import { SearchQuery, SearchResultSet } from '@backstage/search-common';
+import qs from 'qs';
 
 export const searchApiRef = createApiRef<SearchApi>({
   id: 'plugin.search.queryservice',
@@ -52,6 +53,11 @@ export class SearchClient implements SearchApi {
     const response = await fetch(url, {
       headers: token ? { Authorization: `Bearer ${token}` } : {},
     });
+
+    if (!response.ok) {
+      throw await ResponseError.fromResponse(response);
+    }
+
     return response.json();
   }
 }
diff --git a/plugins/search/src/components/DefaultResultListItem/DefaultResultListItem.stories.tsx b/plugins/search/src/components/DefaultResultListItem/DefaultResultListItem.stories.tsx
new file mode 100644
index 0000000000..34436f9f93
--- /dev/null
+++ b/plugins/search/src/components/DefaultResultListItem/DefaultResultListItem.stories.tsx
@@ -0,0 +1,43 @@
+/*
+ * Copyright 2021 Spotify AB
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import React from 'react';
+import { Grid } from '@material-ui/core';
+import { DefaultResultListItem } from '../index';
+import { MemoryRouter } from 'react-router';
+
+export default {
+  title: 'Plugins/Search/DefaultResultListItem',
+  component: DefaultResultListItem,
+};
+
+export const Default = () => {
+  return (
+    <MemoryRouter>
+      <Grid container direction="row">
+        <Grid item xs={12}>
+          <DefaultResultListItem
+            result={{
+              location: 'search/search-result',
+              title: 'Search Result 1',
+              text: 'some text from the search result',
+            }}
+          />
+        </Grid>
+      </Grid>
+    </MemoryRouter>
+  );
+};
diff --git a/plugins/search/src/components/DefaultResultListItem/DefaultResultListItem.tsx b/plugins/search/src/components/DefaultResultListItem/DefaultResultListItem.tsx
index 8cb560b7e5..ed508aa671 100644
--- a/plugins/search/src/components/DefaultResultListItem/DefaultResultListItem.tsx
+++ b/plugins/search/src/components/DefaultResultListItem/DefaultResultListItem.tsx
@@ -33,7 +33,7 @@ export const DefaultResultListItem = ({ result }: Props) => {
           secondary={result.text}
         />
       </ListItem>
-      <Divider component="li" />
+      <Divider />
     </Link>
   );
 };
diff --git a/plugins/search/src/components/HomePageComponent/HomePageSearchBar.tsx b/plugins/search/src/components/HomePageComponent/HomePageSearchBar.tsx
new file mode 100644
index 0000000000..94c72df3a8
--- /dev/null
+++ b/plugins/search/src/components/HomePageComponent/HomePageSearchBar.tsx
@@ -0,0 +1,60 @@
+/*
+ * Copyright 2021 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import React from 'react';
+import { makeStyles } from '@material-ui/core/styles';
+
+import { SearchBarBase } from '../SearchBar';
+import { useNavigateToQuery } from '../util';
+
+const useStyles = makeStyles({
+  searchBar: {
+    border: '1px solid #555',
+    borderRadius: '6px',
+    fontSize: '1.5em',
+  },
+});
+
+type Props = {
+  placeholder?: string;
+};
+
+export const HomePageSearchBar = ({ placeholder }: Props) => {
+  const [query, setQuery] = React.useState('');
+  const handleSearch = useNavigateToQuery();
+  const classes = useStyles();
+
+  const handleSubmit = () => {
+    handleSearch({ query });
+  };
+
+  const handleChange = React.useCallback(
+    value => {
+      setQuery(value);
+    },
+    [setQuery],
+  );
+
+  return (
+    <SearchBarBase
+      onSubmit={handleSubmit}
+      onChange={handleChange}
+      value={query}
+      className={classes.searchBar}
+      placeholder={placeholder}
+    />
+  );
+};
diff --git a/plugins/search/src/components/HomePageComponent/index.ts b/plugins/search/src/components/HomePageComponent/index.ts
new file mode 100644
index 0000000000..2b1cfe27b3
--- /dev/null
+++ b/plugins/search/src/components/HomePageComponent/index.ts
@@ -0,0 +1,17 @@
+/*
+ * Copyright 2021 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+export { HomePageSearchBar } from './HomePageSearchBar';
diff --git a/plugins/search/src/components/LegacySearchPage/LegacySearchResult.tsx b/plugins/search/src/components/LegacySearchPage/LegacySearchResult.tsx
index 95148c1a76..5efce583fd 100644
--- a/plugins/search/src/components/LegacySearchPage/LegacySearchResult.tsx
+++ b/plugins/search/src/components/LegacySearchPage/LegacySearchResult.tsx
@@ -138,7 +138,11 @@ export const SearchResult = ({ searchQuery }: SearchResultProps) => {
 
   const [filteredResults, setFilteredResults] = useState<SearchResults>([]);
 
-  const { loading, error, value: results } = useAsync(async () => {
+  const {
+    loading,
+    error,
+    value: results,
+  } = useAsync(async () => {
     const entities = await catalogApi.getEntities();
     return entities.items.map((entity: Entity) => ({
       name: entity.metadata.name,
diff --git a/plugins/search/src/components/SearchBar/SearchBar.stories.tsx b/plugins/search/src/components/SearchBar/SearchBar.stories.tsx
new file mode 100644
index 0000000000..fa2ba0d94e
--- /dev/null
+++ b/plugins/search/src/components/SearchBar/SearchBar.stories.tsx
@@ -0,0 +1,47 @@
+/*
+ * Copyright 2021 Spotify AB
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import React from 'react';
+import { Paper, Grid } from '@material-ui/core';
+import { SearchBar, SearchContext } from '../index';
+import { MemoryRouter } from 'react-router';
+
+export default {
+  title: 'Plugins/Search/SearchBar',
+  component: SearchBar,
+};
+
+const defaultValue = {
+  term: '',
+  setTerm: () => {},
+};
+
+export const Default = () => {
+  return (
+    <MemoryRouter>
+      {/* @ts-ignore (defaultValue requires more than what is used here) */}
+      <SearchContext.Provider value={defaultValue}>
+        <Grid container direction="row">
+          <Grid item xs={12}>
+            <Paper style={{ padding: '8px 0' }}>
+              <SearchBar />
+            </Paper>
+          </Grid>
+        </Grid>
+      </SearchContext.Provider>
+    </MemoryRouter>
+  );
+};
diff --git a/plugins/search/src/components/SearchBar/SearchBar.test.tsx b/plugins/search/src/components/SearchBar/SearchBar.test.tsx
index b99b375252..de8ea9a5a7 100644
--- a/plugins/search/src/components/SearchBar/SearchBar.test.tsx
+++ b/plugins/search/src/components/SearchBar/SearchBar.test.tsx
@@ -20,26 +20,35 @@ import userEvent from '@testing-library/user-event';
 import { SearchContextProvider } from '../SearchContext';
 
 import { SearchBar } from './SearchBar';
-import { useApi } from '@backstage/core-plugin-api';
+import { configApiRef } from '@backstage/core-plugin-api';
+import {
+  ApiProvider,
+  ApiRegistry,
+  ConfigReader,
+} from '@backstage/core-app-api';
+import { searchApiRef } from '../../apis';
 
 jest.mock('@backstage/core-plugin-api', () => ({
   ...jest.requireActual('@backstage/core-plugin-api'),
-  useApi: jest.fn().mockReturnValue({}),
 }));
 
 describe('SearchBar', () => {
   const initialState = {
     term: '',
-    pageCursor: '',
     filters: {},
     types: ['*'],
+    pageCursor: '',
   };
 
-  const name = 'Search term';
-  const term = 'term';
-
   const query = jest.fn().mockResolvedValue({});
-  (useApi as jest.Mock).mockReturnValue({ query });
+
+  const apiRegistry = ApiRegistry.from([
+    [configApiRef, new ConfigReader({ app: { title: 'Mock title' } })],
+    [searchApiRef, { query }],
+  ]);
+
+  const name = 'Search';
+  const term = 'term';
 
   afterAll(() => {
     jest.resetAllMocks();
@@ -47,9 +56,11 @@ describe('SearchBar', () => {
 
   it('Renders without exploding', async () => {
     render(
-      <SearchContextProvider initialState={initialState}>
-        <SearchBar />
-      </SearchContextProvider>,
+      <ApiProvider apis={apiRegistry}>
+        <SearchContextProvider initialState={initialState}>
+          <SearchBar />
+        </SearchContextProvider>
+      </ApiProvider>,
     );
 
     await waitFor(() => {
@@ -59,9 +70,12 @@ describe('SearchBar', () => {
 
   it('Renders based on initial search', async () => {
     render(
-      <SearchContextProvider initialState={{ ...initialState, term }}>
-        <SearchBar />
-      </SearchContextProvider>,
+      <ApiProvider apis={apiRegistry}>
+        <SearchContextProvider initialState={{ ...initialState, term }}>
+          <SearchBar />
+        </SearchContextProvider>
+        ,
+      </ApiProvider>,
     );
 
     await waitFor(() => {
@@ -71,9 +85,12 @@ describe('SearchBar', () => {
 
   it('Updates term state when text is entered', async () => {
     render(
-      <SearchContextProvider initialState={initialState}>
-        <SearchBar />
-      </SearchContextProvider>,
+      <ApiProvider apis={apiRegistry}>
+        <SearchContextProvider initialState={initialState}>
+          <SearchBar />
+        </SearchContextProvider>
+        ,
+      </ApiProvider>,
     );
 
     const textbox = screen.getByRole('textbox', { name });
@@ -93,16 +110,18 @@ describe('SearchBar', () => {
 
   it('Clear button clears term state', async () => {
     render(
-      <SearchContextProvider initialState={{ ...initialState, term }}>
-        <SearchBar />
-      </SearchContextProvider>,
+      <ApiProvider apis={apiRegistry}>
+        <SearchContextProvider initialState={{ ...initialState, term }}>
+          <SearchBar />
+        </SearchContextProvider>
+      </ApiProvider>,
     );
 
     await waitFor(() => {
       expect(screen.getByRole('textbox', { name })).toHaveValue(term);
     });
 
-    userEvent.click(screen.getByRole('button', { name: 'Clear term' }));
+    userEvent.click(screen.getByRole('button', { name: 'Clear' }));
 
     await waitFor(() => {
       expect(screen.getByRole('textbox', { name })).toHaveValue('');
@@ -119,9 +138,12 @@ describe('SearchBar', () => {
     const debounceTime = 600;
 
     render(
-      <SearchContextProvider initialState={initialState}>
-        <SearchBar debounceTime={debounceTime} />
-      </SearchContextProvider>,
+      <ApiProvider apis={apiRegistry}>
+        <SearchContextProvider initialState={initialState}>
+          <SearchBar debounceTime={debounceTime} />
+        </SearchContextProvider>
+        ,
+      </ApiProvider>,
     );
 
     await waitFor(() => {
diff --git a/plugins/search/src/components/SearchBar/SearchBar.tsx b/plugins/search/src/components/SearchBar/SearchBar.tsx
index a1db818488..214e22520c 100644
--- a/plugins/search/src/components/SearchBar/SearchBar.tsx
+++ b/plugins/search/src/components/SearchBar/SearchBar.tsx
@@ -14,7 +14,8 @@
  * limitations under the License.
  */
 
-import React, { ChangeEvent, useState } from 'react';
+import React, { useEffect, KeyboardEvent, useState } from 'react';
+import { configApiRef, useApi } from '@backstage/core-plugin-api';
 import { useDebounce } from 'react-use';
 import { InputBase, InputAdornment, IconButton } from '@material-ui/core';
 import SearchIcon from '@material-ui/icons/Search';
@@ -22,6 +23,69 @@ import ClearButton from '@material-ui/icons/Clear';
 
 import { useSearch } from '../SearchContext';
 
+type PresenterProps = {
+  value: string;
+  onChange: (value: string) => void;
+  onClear?: () => void;
+  onSubmit?: () => void;
+  className?: string;
+  placeholder?: string;
+};
+
+export const SearchBarBase = ({
+  value,
+  onChange,
+  onSubmit,
+  className,
+  placeholder: overridePlaceholder,
+}: PresenterProps) => {
+  const configApi = useApi(configApiRef);
+
+  const onKeyDown = React.useCallback(
+    (e: KeyboardEvent<HTMLInputElement>) => {
+      if (onSubmit && e.key === 'Enter') {
+        onSubmit();
+      }
+    },
+    [onSubmit],
+  );
+
+  const handleClear = React.useCallback(() => {
+    onChange('');
+  }, [onChange]);
+
+  const placeholder =
+    overridePlaceholder ??
+    `Search in ${configApi.getOptionalString('app.title') || 'Backstage'}`;
+
+  return (
+    <InputBase
+      data-testid="search-bar-next"
+      fullWidth
+      placeholder={placeholder}
+      value={value}
+      onChange={e => onChange(e.target.value)}
+      inputProps={{ 'aria-label': 'Search' }}
+      startAdornment={
+        <InputAdornment position="start">
+          <IconButton aria-label="Query" disabled>
+            <SearchIcon />
+          </IconButton>
+        </InputAdornment>
+      }
+      endAdornment={
+        <InputAdornment position="end">
+          <IconButton aria-label="Clear" onClick={handleClear}>
+            <ClearButton />
+          </IconButton>
+        </InputAdornment>
+      }
+      {...(className && { className })}
+      {...(onSubmit && { onKeyDown })}
+    />
+  );
+};
+
 type Props = {
   className?: string;
   debounceTime?: number;
@@ -31,37 +95,24 @@ export const SearchBar = ({ className, debounceTime = 0 }: Props) => {
   const { term, setTerm } = useSearch();
   const [value, setValue] = useState<string>(term);
 
+  useEffect(() => {
+    setValue(prevValue => (prevValue !== term ? term : prevValue));
+  }, [term]);
+
   useDebounce(() => setTerm(value), debounceTime, [value]);
 
-  const handleQuery = (e: ChangeEvent<HTMLInputElement>) => {
-    setValue(e.target.value);
+  const handleQuery = (newValue: string) => {
+    setValue(newValue);
   };
 
   const handleClear = () => setValue('');
 
   return (
-    <InputBase
+    <SearchBarBase
       className={className}
-      data-testid="search-bar-next"
-      fullWidth
-      placeholder="Search in Backstage"
       value={value}
       onChange={handleQuery}
-      inputProps={{ 'aria-label': 'Search term' }}
-      startAdornment={
-        <InputAdornment position="start">
-          <IconButton aria-label="Query term" disabled>
-            <SearchIcon />
-          </IconButton>
-        </InputAdornment>
-      }
-      endAdornment={
-        <InputAdornment position="end">
-          <IconButton aria-label="Clear term" onClick={handleClear}>
-            <ClearButton />
-          </IconButton>
-        </InputAdornment>
-      }
+      onClear={handleClear}
     />
   );
 };
diff --git a/plugins/search/src/components/SearchBar/index.tsx b/plugins/search/src/components/SearchBar/index.tsx
index 840142264e..5adbda282b 100644
--- a/plugins/search/src/components/SearchBar/index.tsx
+++ b/plugins/search/src/components/SearchBar/index.tsx
@@ -14,4 +14,4 @@
  * limitations under the License.
  */
 
-export { SearchBar } from './SearchBar';
+export { SearchBar, SearchBarBase } from './SearchBar';
diff --git a/plugins/search/src/components/SearchContext/SearchContext.test.tsx b/plugins/search/src/components/SearchContext/SearchContext.test.tsx
index 4de2a8f0a6..6513dc21bb 100644
--- a/plugins/search/src/components/SearchContext/SearchContext.test.tsx
+++ b/plugins/search/src/components/SearchContext/SearchContext.test.tsx
@@ -14,13 +14,11 @@
  * limitations under the License.
  */
 
-import React from 'react';
-import { render, screen, waitFor } from '@testing-library/react';
-import { renderHook, act } from '@testing-library/react-hooks';
-
-import { useSearch, SearchContextProvider } from './SearchContext';
-
 import { useApi } from '@backstage/core-plugin-api';
+import { render, screen, waitFor } from '@testing-library/react';
+import { act, renderHook } from '@testing-library/react-hooks';
+import React from 'react';
+import { SearchContextProvider, useSearch } from './SearchContext';
 
 jest.mock('@backstage/core-plugin-api', () => ({
   ...jest.requireActual('@backstage/core-plugin-api'),
@@ -38,7 +36,6 @@ describe('SearchContext', () => {
 
   const initialState = {
     term: '',
-    pageCursor: '',
     filters: {},
     types: ['*'],
   };
@@ -93,22 +90,26 @@ describe('SearchContext', () => {
       initialProps: {
         initialState: {
           ...initialState,
-          pageCursor: '1',
+          pageCursor: 'SOMEPAGE',
         },
       },
     });
 
     await waitForNextUpdate();
 
-    expect(result.current.pageCursor).toBe('1');
+    expect(result.current.pageCursor).toEqual('SOMEPAGE');
 
     act(() => {
       result.current.setTerm('first term');
     });
 
+    act(() => {
+      result.current.setPageCursor('OTHERPAGE');
+    });
+
     await waitForNextUpdate();
 
-    expect(result.current.pageCursor).toBe('1');
+    expect(result.current.pageCursor).toEqual('OTHERPAGE');
 
     act(() => {
       result.current.setTerm('second term');
@@ -116,7 +117,7 @@ describe('SearchContext', () => {
 
     await waitForNextUpdate();
 
-    expect(result.current.pageCursor).toBe('');
+    expect(result.current.pageCursor).toEqual(undefined);
   });
 
   describe('Performs search (and sets results)', () => {
@@ -139,7 +140,8 @@ describe('SearchContext', () => {
       await waitForNextUpdate();
 
       expect(query).toHaveBeenLastCalledWith({
-        ...initialState,
+        filters: {},
+        types: ['*'],
         term,
       });
     });
@@ -163,12 +165,13 @@ describe('SearchContext', () => {
       await waitForNextUpdate();
 
       expect(query).toHaveBeenLastCalledWith({
-        ...initialState,
         filters,
+        types: ['*'],
+        term: '',
       });
     });
 
-    it('When pageCursor is set', async () => {
+    it('When page is set', async () => {
       const { result, waitForNextUpdate } = renderHook(() => useSearch(), {
         wrapper,
         initialProps: {
@@ -178,17 +181,17 @@ describe('SearchContext', () => {
 
       await waitForNextUpdate();
 
-      const pageCursor = 'pageCursor';
-
       act(() => {
-        result.current.setPageCursor(pageCursor);
+        result.current.setPageCursor('SOMEPAGE');
       });
 
       await waitForNextUpdate();
 
       expect(query).toHaveBeenLastCalledWith({
-        ...initialState,
-        pageCursor,
+        filters: {},
+        types: ['*'],
+        pageCursor: 'SOMEPAGE',
+        term: '',
       });
     });
 
@@ -211,8 +214,73 @@ describe('SearchContext', () => {
       await waitForNextUpdate();
 
       expect(query).toHaveBeenLastCalledWith({
-        ...initialState,
         types,
+        filters: {},
+        term: '',
+      });
+    });
+
+    it('provides function for fetch the next page', async () => {
+      query.mockResolvedValue({
+        results: [],
+        nextPageCursor: 'NEXT',
+      });
+
+      const { result, waitForNextUpdate } = renderHook(() => useSearch(), {
+        wrapper,
+        initialProps: {
+          initialState,
+        },
+      });
+
+      await waitForNextUpdate();
+
+      expect(result.current.fetchNextPage).toBeDefined();
+      expect(result.current.fetchPreviousPage).toBeUndefined();
+
+      act(() => {
+        result.current.fetchNextPage!();
+      });
+
+      await waitForNextUpdate();
+
+      expect(query).toHaveBeenLastCalledWith({
+        types: ['*'],
+        filters: {},
+        term: '',
+        pageCursor: 'NEXT',
+      });
+    });
+
+    it('provides function for fetch the previous page', async () => {
+      query.mockResolvedValue({
+        results: [],
+        previousPageCursor: 'PREVIOUS',
+      });
+
+      const { result, waitForNextUpdate } = renderHook(() => useSearch(), {
+        wrapper,
+        initialProps: {
+          initialState,
+        },
+      });
+
+      await waitForNextUpdate();
+
+      expect(result.current.fetchNextPage).toBeUndefined();
+      expect(result.current.fetchPreviousPage).toBeDefined();
+
+      act(() => {
+        result.current.fetchPreviousPage!();
+      });
+
+      await waitForNextUpdate();
+
+      expect(query).toHaveBeenLastCalledWith({
+        types: ['*'],
+        filters: {},
+        term: '',
+        pageCursor: 'PREVIOUS',
       });
     });
   });
diff --git a/plugins/search/src/components/SearchContext/SearchContext.tsx b/plugins/search/src/components/SearchContext/SearchContext.tsx
index eee72d9fc5..16d1371964 100644
--- a/plugins/search/src/components/SearchContext/SearchContext.tsx
+++ b/plugins/search/src/components/SearchContext/SearchContext.tsx
@@ -14,19 +14,20 @@
  * limitations under the License.
  */
 
-import React, {
-  PropsWithChildren,
-  createContext,
-  useContext,
-  useState,
-  useEffect,
-} from 'react';
-import { useAsync, usePrevious } from 'react-use';
-import { SearchResultSet } from '@backstage/search-common';
-import { searchApiRef } from '../../apis';
-import { AsyncState } from 'react-use/lib/useAsync';
 import { JsonObject } from '@backstage/config';
 import { useApi } from '@backstage/core-plugin-api';
+import { SearchResultSet } from '@backstage/search-common';
+import React, {
+  createContext,
+  PropsWithChildren,
+  useCallback,
+  useContext,
+  useEffect,
+  useState,
+} from 'react';
+import { useAsync, usePrevious } from 'react-use';
+import { AsyncState } from 'react-use/lib/useAsync';
+import { searchApiRef } from '../../apis';
 
 type SearchContextValue = {
   result: AsyncState<SearchResultSet>;
@@ -36,28 +37,40 @@ type SearchContextValue = {
   setTypes: React.Dispatch<React.SetStateAction<string[]>>;
   filters: JsonObject;
   setFilters: React.Dispatch<React.SetStateAction<JsonObject>>;
-  pageCursor: string;
-  setPageCursor: React.Dispatch<React.SetStateAction<string>>;
+  pageCursor?: string;
+  setPageCursor: React.Dispatch<React.SetStateAction<string | undefined>>;
+  fetchNextPage?: React.DispatchWithoutAction;
+  fetchPreviousPage?: React.DispatchWithoutAction;
 };
 
 type SettableSearchContext = Omit<
   SearchContextValue,
-  'result' | 'setTerm' | 'setTypes' | 'setFilters' | 'setPageCursor'
+  | 'result'
+  | 'setTerm'
+  | 'setTypes'
+  | 'setFilters'
+  | 'setPageCursor'
+  | 'fetchNextPage'
+  | 'fetchPreviousPage'
 >;
 
-const SearchContext = createContext<SearchContextValue | undefined>(undefined);
+export const SearchContext = createContext<SearchContextValue | undefined>(
+  undefined,
+);
 
 export const SearchContextProvider = ({
   initialState = {
     term: '',
-    pageCursor: '',
+    pageCursor: undefined,
     filters: {},
-    types: ['*'],
+    types: [],
   },
   children,
 }: PropsWithChildren<{ initialState?: SettableSearchContext }>) => {
   const searchApi = useApi(searchApiRef);
-  const [pageCursor, setPageCursor] = useState<string>(initialState.pageCursor);
+  const [pageCursor, setPageCursor] = useState<string | undefined>(
+    initialState.pageCursor,
+  );
   const [filters, setFilters] = useState<JsonObject>(initialState.filters);
   const [term, setTerm] = useState<string>(initialState.term);
   const [types, setTypes] = useState<string[]>(initialState.types);
@@ -68,18 +81,29 @@ export const SearchContextProvider = ({
       searchApi.query({
         term,
         filters,
-        pageCursor,
+        pageCursor: pageCursor,
         types,
       }),
     [term, filters, types, pageCursor],
   );
 
+  const hasNextPage =
+    !result.loading && !result.error && result.value?.nextPageCursor;
+  const hasPreviousPage =
+    !result.loading && !result.error && result.value?.previousPageCursor;
+  const fetchNextPage = useCallback(() => {
+    setPageCursor(result.value?.nextPageCursor);
+  }, [result.value?.nextPageCursor]);
+  const fetchPreviousPage = useCallback(() => {
+    setPageCursor(result.value?.previousPageCursor);
+  }, [result.value?.previousPageCursor]);
+
   useEffect(() => {
     // Any time a term is reset, we want to start from page 0.
     if (term && prevTerm && term !== prevTerm) {
-      setPageCursor('');
+      setPageCursor(undefined);
     }
-  }, [term, prevTerm]);
+  }, [term, prevTerm, initialState.pageCursor]);
 
   const value: SearchContextValue = {
     result,
@@ -91,6 +115,8 @@ export const SearchContextProvider = ({
     setTypes,
     pageCursor,
     setPageCursor,
+    fetchNextPage: hasNextPage ? fetchNextPage : undefined,
+    fetchPreviousPage: hasPreviousPage ? fetchPreviousPage : undefined,
   };
 
   return <SearchContext.Provider value={value} children={children} />;
diff --git a/plugins/search/src/components/SearchContext/index.tsx b/plugins/search/src/components/SearchContext/index.tsx
index 895e66a9e5..682ade916f 100644
--- a/plugins/search/src/components/SearchContext/index.tsx
+++ b/plugins/search/src/components/SearchContext/index.tsx
@@ -14,4 +14,8 @@
  * limitations under the License.
  */
 
-export { SearchContextProvider, useSearch } from './SearchContext';
+export {
+  SearchContextProvider,
+  SearchContext,
+  useSearch,
+} from './SearchContext';
diff --git a/plugins/search/src/components/SearchFilter/SearchFilter.stories.tsx b/plugins/search/src/components/SearchFilter/SearchFilter.stories.tsx
new file mode 100644
index 0000000000..190856fca8
--- /dev/null
+++ b/plugins/search/src/components/SearchFilter/SearchFilter.stories.tsx
@@ -0,0 +1,69 @@
+/*
+ * Copyright 2021 Spotify AB
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import React from 'react';
+import { Grid, Paper } from '@material-ui/core';
+import { SearchFilter, SearchContext } from '../index';
+import { MemoryRouter } from 'react-router';
+
+export default {
+  title: 'Plugins/Search/SearchFilter',
+  component: SearchFilter,
+};
+
+const defaultValue = {
+  filters: {},
+};
+
+export const CheckBoxFilter = () => {
+  return (
+    <MemoryRouter>
+      {/* @ts-ignore (defaultValue requires more than what is used here) */}
+      <SearchContext.Provider value={defaultValue}>
+        <Grid container direction="row">
+          <Grid item xs={4}>
+            <Paper style={{ padding: 10 }}>
+              <SearchFilter.Checkbox
+                name="Search Checkbox Filter"
+                values={['value1', 'value2']}
+              />
+            </Paper>
+          </Grid>
+        </Grid>
+      </SearchContext.Provider>
+    </MemoryRouter>
+  );
+};
+
+export const SelectFilter = () => {
+  return (
+    <MemoryRouter>
+      {/* @ts-ignore (defaultValue requires more than what is used here) */}
+      <SearchContext.Provider value={defaultValue}>
+        <Grid container direction="row">
+          <Grid item xs={4}>
+            <Paper style={{ padding: 10 }}>
+              <SearchFilter.Select
+                name="Search Select Filter"
+                values={['value1', 'value2']}
+              />
+            </Paper>
+          </Grid>
+        </Grid>
+      </SearchContext.Provider>
+    </MemoryRouter>
+  );
+};
diff --git a/plugins/search/src/components/SearchFilter/SearchFilter.test.tsx b/plugins/search/src/components/SearchFilter/SearchFilter.test.tsx
index e8c2f048b9..8f716caf4b 100644
--- a/plugins/search/src/components/SearchFilter/SearchFilter.test.tsx
+++ b/plugins/search/src/components/SearchFilter/SearchFilter.test.tsx
@@ -32,7 +32,6 @@ describe('SearchFilter', () => {
     term: '',
     filters: {},
     types: [],
-    pageCursor: '',
   };
 
   const name = 'field';
diff --git a/plugins/search/src/components/SearchPage/SearchPage.test.tsx b/plugins/search/src/components/SearchPage/SearchPage.test.tsx
index 4c1ae38005..5ff61a3dbe 100644
--- a/plugins/search/src/components/SearchPage/SearchPage.test.tsx
+++ b/plugins/search/src/components/SearchPage/SearchPage.test.tsx
@@ -14,11 +14,10 @@
  * limitations under the License.
  */
 
-import React from 'react';
 import { renderInTestApp } from '@backstage/test-utils';
+import React from 'react';
 import { useLocation, useOutlet } from 'react-router';
-
-import { useSearch, SearchContextProvider } from '../SearchContext';
+import { useSearch } from '../SearchContext';
 import { SearchPage } from './';
 
 jest.mock('react-router', () => ({
@@ -29,6 +28,11 @@ jest.mock('react-router', () => ({
   useOutlet: jest.fn().mockReturnValue('Route Children'),
 }));
 
+const setTermMock = jest.fn();
+const setTypesMock = jest.fn();
+const setFiltersMock = jest.fn();
+const setPageCursorMock = jest.fn();
+
 jest.mock('../SearchContext', () => ({
   ...jest.requireActual('../SearchContext'),
   SearchContextProvider: jest
@@ -36,9 +40,13 @@ jest.mock('../SearchContext', () => ({
     .mockImplementation(({ children }) => children),
   useSearch: jest.fn().mockReturnValue({
     term: '',
+    setTerm: (term: any) => setTermMock(term),
     types: [],
+    setTypes: (types: any) => setTypesMock(types),
     filters: {},
+    setFilters: (filters: any) => setFiltersMock(filters),
     pageCursor: '',
+    setPageCursor: (pageCursor: any) => setPageCursorMock(pageCursor),
   }),
 }));
 
@@ -58,16 +66,16 @@ describe('SearchPage', () => {
     window.history.replaceState = origReplaceState;
   });
 
-  it('uses initial term state from location', async () => {
+  it('sets term state from location', async () => {
     // Given this initial location.search value...
     const expectedFilterField = 'anyKey';
     const expectedFilterValue = 'anyValue';
     const expectedTerm = 'justin bieber';
     const expectedTypes = ['software-catalog'];
     const expectedFilters = { [expectedFilterField]: expectedFilterValue };
-    const expectedPageCursor = 'page2-or-something';
+    const expectedPageCursor = 'SOMEPAGE';
 
-    // e.g. ?query=petstore&pageCursor=1&filters[lifecycle][]=experimental&filters[kind]=Component
+    // e.g. ?query=petstore&pageCursor=SOMEPAGE&filters[lifecycle][]=experimental&filters[kind]=Component
     (useLocation as jest.Mock).mockReturnValueOnce({
       search: `?query=${expectedTerm}&types[]=${expectedTypes[0]}&filters[${expectedFilterField}]=${expectedFilterValue}&pageCursor=${expectedPageCursor}`,
     });
@@ -75,13 +83,11 @@ describe('SearchPage', () => {
     // When we render the page...
     await renderInTestApp(<SearchPage />);
 
-    // Then search context should be initialized with these values...
-    const calls = (SearchContextProvider as jest.Mock).mock.calls[0];
-    const actualInitialState = calls[0].initialState;
-    expect(actualInitialState.term).toEqual(expectedTerm);
-    expect(actualInitialState.types).toEqual(expectedTypes);
-    expect(actualInitialState.pageCursor).toEqual(expectedPageCursor);
-    expect(actualInitialState.filters).toStrictEqual(expectedFilters);
+    // Then search context should be set with these values...
+    expect(setTermMock).toHaveBeenCalledWith(expectedTerm);
+    expect(setTypesMock).toHaveBeenCalledWith(expectedTypes);
+    expect(setPageCursorMock).toHaveBeenCalledWith(expectedPageCursor);
+    expect(setFiltersMock).toHaveBeenCalledWith(expectedFilters);
   });
 
   it('renders provided router element', async () => {
@@ -101,11 +107,15 @@ describe('SearchPage', () => {
     (useSearch as jest.Mock).mockReturnValueOnce({
       term: 'bieber',
       types: ['software-catalog'],
-      pageCursor: 'page2-or-something',
+      pageCursor: 'SOMEPAGE',
       filters: { anyKey: 'anyValue' },
+      setTerm: setTermMock,
+      setTypes: setTypesMock,
+      setFilters: setFiltersMock,
+      setPageCursor: setPageCursorMock,
     });
     const expectedLocation = encodeURI(
-      '?query=bieber&types[]=software-catalog&pageCursor=page2-or-something&filters[anyKey]=anyValue',
+      '?query=bieber&types[]=software-catalog&pageCursor=SOMEPAGE&filters[anyKey]=anyValue',
     );
 
     await renderInTestApp(<SearchPage />);
diff --git a/plugins/search/src/components/SearchPage/SearchPage.tsx b/plugins/search/src/components/SearchPage/SearchPage.tsx
index 8a85879a48..fb18833da6 100644
--- a/plugins/search/src/components/SearchPage/SearchPage.tsx
+++ b/plugins/search/src/components/SearchPage/SearchPage.tsx
@@ -14,7 +14,8 @@
  * limitations under the License.
  */
 
-import React from 'react';
+import React, { useEffect } from 'react';
+import { usePrevious } from 'react-use';
 import qs from 'qs';
 import { useLocation, useOutlet } from 'react-router';
 import { SearchContextProvider, useSearch } from '../SearchContext';
@@ -22,46 +23,72 @@ import { JsonObject } from '@backstage/config';
 import { LegacySearchPage } from '../LegacySearchPage';
 
 export const UrlUpdater = () => {
-  const { term, types, pageCursor, filters } = useSearch();
+  const location = useLocation();
+  const {
+    term,
+    setTerm,
+    types,
+    setTypes,
+    pageCursor,
+    setPageCursor,
+    filters,
+    setFilters,
+  } = useSearch();
 
-  const newParams = qs.stringify(
-    {
-      query: term,
-      types,
-      pageCursor,
-      filters,
-    },
-    { arrayFormat: 'brackets' },
-  );
-  const newUrl = `${window.location.pathname}?${newParams}`;
+  const prevQueryParams = usePrevious(location.search);
+  useEffect(() => {
+    // Only respond to changes to url query params
+    if (location.search === prevQueryParams) {
+      return;
+    }
 
-  // We directly manipulate window history here in order to not re-render
-  // infinitely (state => location => state => etc). The intention of this
-  // code is just to ensure the right query/filters are loaded when a user
-  // clicks the "back" button after clicking a result.
-  window.history.replaceState(null, document.title, newUrl);
+    const query =
+      qs.parse(location.search.substring(1), { arrayLimit: 0 }) || {};
+
+    if (query.filters) {
+      setFilters(query.filters as JsonObject);
+    }
+
+    if (query.query) {
+      setTerm(query.query as string);
+    }
+
+    if (query.pageCursor) {
+      setPageCursor(query.pageCursor as string);
+    }
+
+    if (query.types) {
+      setTypes(query.types as string[]);
+    }
+  }, [prevQueryParams, location, setTerm, setTypes, setPageCursor, setFilters]);
+
+  useEffect(() => {
+    const newParams = qs.stringify(
+      {
+        query: term,
+        types,
+        pageCursor,
+        filters,
+      },
+      { arrayFormat: 'brackets' },
+    );
+    const newUrl = `${window.location.pathname}?${newParams}`;
+
+    // We directly manipulate window history here in order to not re-render
+    // infinitely (state => location => state => etc). The intention of this
+    // code is just to ensure the right query/filters are loaded when a user
+    // clicks the "back" button after clicking a result.
+    window.history.replaceState(null, document.title, newUrl);
+  }, [term, types, pageCursor, filters]);
 
   return null;
 };
 
 export const SearchPage = () => {
-  const location = useLocation();
   const outlet = useOutlet();
-  const query = qs.parse(location.search.substring(1), { arrayLimit: 0 }) || {};
-  const filters = (query.filters as JsonObject) || {};
-  const queryString = (query.query as string) || '';
-  const pageCursor = (query.pageCursor as string) || '';
-  const types = (query.types as string[]) || [];
-
-  const initialState = {
-    term: queryString || '',
-    types,
-    pageCursor,
-    filters,
-  };
 
   return (
-    <SearchContextProvider initialState={initialState}>
+    <SearchContextProvider>
       <UrlUpdater />
       {outlet || <LegacySearchPage />}
     </SearchContextProvider>
diff --git a/plugins/search/src/components/SearchResult/SearchResult.stories.tsx b/plugins/search/src/components/SearchResult/SearchResult.stories.tsx
new file mode 100644
index 0000000000..bf83b8b1ad
--- /dev/null
+++ b/plugins/search/src/components/SearchResult/SearchResult.stories.tsx
@@ -0,0 +1,95 @@
+/*
+ * Copyright 2021 Spotify AB
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import React from 'react';
+import { List, Link, ListItem } from '@material-ui/core';
+import { SearchResult, SearchContext, DefaultResultListItem } from '../index';
+import { MemoryRouter } from 'react-router';
+
+export default {
+  title: 'Plugins/Search/SearchResult',
+  component: SearchResult,
+};
+
+const defaultValue = {
+  result: {
+    loading: false,
+    error: '',
+    value: {
+      results: [
+        {
+          type: 'custom-result-item',
+          document: {
+            location: 'search/search-result-1',
+            title: 'Search Result 1',
+            text: 'some text from the search result',
+          },
+        },
+        {
+          type: 'no-custom-result-item',
+          document: {
+            location: 'search/search-result-2',
+            title: 'Search Result 2',
+            text: 'some text from the search result',
+          },
+        },
+        {
+          type: 'no-custom-result-item',
+          document: {
+            location: 'search/search-result-3',
+            title: 'Search Result 3',
+            text: 'some text from the search result',
+          },
+        },
+      ],
+    },
+  },
+};
+
+export const Default = () => {
+  return (
+    <MemoryRouter>
+      {/* @ts-ignore (defaultValue requires more than what is used here) */}
+      <SearchContext.Provider value={defaultValue}>
+        <SearchResult>
+          {({ results }) => (
+            <List>
+              {results.map(({ type, document }) => {
+                switch (type) {
+                  case 'custom-result-item':
+                    return (
+                      <DefaultResultListItem
+                        key={document.location}
+                        result={document}
+                      />
+                    );
+                  default:
+                    return (
+                      <ListItem>
+                        <Link href={document.location}>
+                          {document.title} - {document.text}
+                        </Link>
+                      </ListItem>
+                    );
+                }
+              })}
+            </List>
+          )}
+        </SearchResult>
+      </SearchContext.Provider>
+    </MemoryRouter>
+  );
+};
diff --git a/plugins/search/src/components/SearchResult/SearchResult.test.tsx b/plugins/search/src/components/SearchResult/SearchResult.test.tsx
index 9508eec259..43a9cdb022 100644
--- a/plugins/search/src/components/SearchResult/SearchResult.test.tsx
+++ b/plugins/search/src/components/SearchResult/SearchResult.test.tsx
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
+import { renderInTestApp } from '@backstage/test-utils';
+import { waitFor } from '@testing-library/react';
 import React from 'react';
-import { render, waitFor } from '@testing-library/react';
-
-import { SearchResult } from './SearchResult';
 import { useSearch } from '../SearchContext';
+import { SearchResult } from './SearchResult';
 
 jest.mock('../SearchContext', () => ({
   ...jest.requireActual('../SearchContext'),
@@ -33,7 +33,9 @@ describe('SearchResult', () => {
       result: { loading: true },
     });
 
-    const { getByRole } = render(<SearchResult>{() => <></>}</SearchResult>);
+    const { getByRole } = await renderInTestApp(
+      <SearchResult>{() => <></>}</SearchResult>,
+    );
 
     await waitFor(() => {
       expect(getByRole('progressbar')).toBeInTheDocument();
@@ -41,16 +43,18 @@ describe('SearchResult', () => {
   });
 
   it('Alert rendered on Error state', async () => {
-    const error = 'error';
+    const error = new Error('some error');
     (useSearch as jest.Mock).mockReturnValueOnce({
       result: { loading: false, error },
     });
 
-    const { getByRole } = render(<SearchResult>{() => <></>}</SearchResult>);
+    const { getByRole } = await renderInTestApp(
+      <SearchResult>{() => <></>}</SearchResult>,
+    );
 
     await waitFor(() => {
       expect(getByRole('alert')).toHaveTextContent(
-        `Error encountered while fetching search results. ${error}`,
+        new RegExp(`Error encountered while fetching search results.*${error}`),
       );
     });
   });
@@ -60,7 +64,9 @@ describe('SearchResult', () => {
       result: { loading: false, error: '', value: undefined },
     });
 
-    const { getByRole } = render(<SearchResult>{() => <></>}</SearchResult>);
+    const { getByRole } = await renderInTestApp(
+      <SearchResult>{() => <></>}</SearchResult>,
+    );
 
     await waitFor(() => {
       expect(
@@ -74,7 +80,9 @@ describe('SearchResult', () => {
       result: { loading: false, error: '', value: { results: [] } },
     });
 
-    const { getByRole } = render(<SearchResult>{() => <></>}</SearchResult>);
+    const { getByRole } = await renderInTestApp(
+      <SearchResult>{() => <></>}</SearchResult>,
+    );
 
     await waitFor(() => {
       expect(
@@ -83,18 +91,35 @@ describe('SearchResult', () => {
     });
   });
 
-  it('Calls children with results set to result.value', () => {
+  it('Calls children with results set to result.value', async () => {
     (useSearch as jest.Mock).mockReturnValueOnce({
-      result: { loading: false, error: '', value: { results: [] } },
+      result: {
+        loading: false,
+        error: '',
+        value: {
+          totalCount: 1,
+          results: [
+            {
+              type: 'some-type',
+              document: {
+                title: 'some-title',
+                text: 'some-text',
+                location: 'some-location',
+              },
+            },
+          ],
+        },
+      },
     });
 
-    render(
+    const { getByText } = await renderInTestApp(
       <SearchResult>
         {({ results }) => {
-          expect(results).toEqual([]);
-          return <></>;
+          return <>Results {results.length}</>;
         }}
       </SearchResult>,
     );
+
+    expect(getByText('Results 1')).toBeInTheDocument();
   });
 });
diff --git a/plugins/search/src/components/SearchResult/SearchResult.tsx b/plugins/search/src/components/SearchResult/SearchResult.tsx
index 7ca5964d21..34b6840f21 100644
--- a/plugins/search/src/components/SearchResult/SearchResult.tsx
+++ b/plugins/search/src/components/SearchResult/SearchResult.tsx
@@ -14,18 +14,20 @@
  * limitations under the License.
  */
 
-import React from 'react';
+import {
+  EmptyState,
+  Progress,
+  ResponseErrorPanel,
+} from '@backstage/core-components';
 import { SearchResult } from '@backstage/search-common';
-import { Alert } from '@material-ui/lab';
+import React from 'react';
 import { useSearch } from '../SearchContext';
 
-import { EmptyState, Progress } from '@backstage/core-components';
-
 type Props = {
   children: (results: { results: SearchResult[] }) => JSX.Element;
 };
 
-const SearchResultComponent = ({ children }: Props) => {
+export const SearchResultComponent = ({ children }: Props) => {
   const {
     result: { loading, error, value },
   } = useSearch();
@@ -35,9 +37,10 @@ const SearchResultComponent = ({ children }: Props) => {
   }
   if (error) {
     return (
-      <Alert severity="error">
-        Error encountered while fetching search results. {error.toString()}
-      </Alert>
+      <ResponseErrorPanel
+        title="Error encountered while fetching search results"
+        error={error}
+      />
     );
   }
 
@@ -45,7 +48,7 @@ const SearchResultComponent = ({ children }: Props) => {
     return <EmptyState missing="data" title="Sorry, no results were found" />;
   }
 
-  return children({ results: value.results });
+  return <>{children({ results: value.results })}</>;
 };
 
 export { SearchResultComponent as SearchResult };
diff --git a/plugins/search/src/components/SearchResultPager/SearchResultPager.test.tsx b/plugins/search/src/components/SearchResultPager/SearchResultPager.test.tsx
new file mode 100644
index 0000000000..ab46d77938
--- /dev/null
+++ b/plugins/search/src/components/SearchResultPager/SearchResultPager.test.tsx
@@ -0,0 +1,59 @@
+/*
+ * Copyright 2021 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { renderInTestApp } from '@backstage/test-utils';
+import { waitFor } from '@testing-library/react';
+import userEvent from '@testing-library/user-event';
+import React from 'react';
+import { useSearch } from '../SearchContext';
+import { SearchResultPager } from './SearchResultPager';
+
+jest.mock('../SearchContext', () => ({
+  ...jest.requireActual('../SearchContext'),
+  useSearch: jest.fn().mockReturnValue({
+    result: {},
+  }),
+}));
+
+describe('SearchResultPager', () => {
+  it('renders pager buttons', async () => {
+    const fetchNextPage = jest.fn();
+    const fetchPreviousPage = jest.fn();
+    (useSearch as jest.Mock).mockReturnValueOnce({
+      result: { loading: false, value: [] },
+      fetchNextPage,
+      fetchPreviousPage,
+    });
+
+    const { getByLabelText } = await renderInTestApp(<SearchResultPager />);
+
+    await waitFor(() => {
+      expect(getByLabelText('previous page')).toBeInTheDocument();
+
+      userEvent.click(getByLabelText('previous page'));
+    });
+
+    expect(fetchPreviousPage).toBeCalled();
+
+    await waitFor(() => {
+      expect(getByLabelText('next page')).toBeInTheDocument();
+
+      userEvent.click(getByLabelText('next page'));
+    });
+
+    expect(fetchNextPage).toBeCalled();
+  });
+});
diff --git a/plugins/search/src/components/SearchResultPager/SearchResultPager.tsx b/plugins/search/src/components/SearchResultPager/SearchResultPager.tsx
new file mode 100644
index 0000000000..f1850772bb
--- /dev/null
+++ b/plugins/search/src/components/SearchResultPager/SearchResultPager.tsx
@@ -0,0 +1,63 @@
+/*
+ * Copyright 2021 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { Button, makeStyles } from '@material-ui/core';
+import ArrowBackIosIcon from '@material-ui/icons/ArrowBackIos';
+import ArrowForwardIosIcon from '@material-ui/icons/ArrowForwardIos';
+import React from 'react';
+import { useSearch } from '../SearchContext';
+
+const useStyles = makeStyles(theme => ({
+  root: {
+    display: 'flex',
+    justifyContent: 'space-between',
+    gap: theme.spacing(2),
+    margin: theme.spacing(4),
+  },
+}));
+
+export const SearchResultPager = () => {
+  const { fetchNextPage, fetchPreviousPage } = useSearch();
+  const classes = useStyles();
+
+  if (!fetchNextPage && !fetchPreviousPage) {
+    return <></>;
+  }
+
+  return (
+    <nav arial-label="pagination navigation" className={classes.root}>
+      <Button
+        aria-label="previous page"
+        disabled={!fetchPreviousPage}
+        onClick={fetchPreviousPage}
+        startIcon={<ArrowBackIosIcon />}
+        size="small"
+      >
+        Back
+      </Button>
+
+      <Button
+        aria-label="next page"
+        disabled={!fetchNextPage}
+        onClick={fetchNextPage}
+        endIcon={<ArrowForwardIosIcon />}
+        size="small"
+      >
+        Next
+      </Button>
+    </nav>
+  );
+};
diff --git a/plugins/search/src/components/SearchResultPager/index.ts b/plugins/search/src/components/SearchResultPager/index.ts
new file mode 100644
index 0000000000..39b72ec71f
--- /dev/null
+++ b/plugins/search/src/components/SearchResultPager/index.ts
@@ -0,0 +1,17 @@
+/*
+ * Copyright 2021 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+export { SearchResultPager } from './SearchResultPager';
diff --git a/plugins/search/src/components/SearchType/SearchType.stories.tsx b/plugins/search/src/components/SearchType/SearchType.stories.tsx
new file mode 100644
index 0000000000..da662d8fef
--- /dev/null
+++ b/plugins/search/src/components/SearchType/SearchType.stories.tsx
@@ -0,0 +1,36 @@
+/*
+ * Copyright 2021 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import React, { useState } from 'react';
+
+import { SearchType } from '../index';
+import { SearchContext } from '../SearchContext';
+
+export default {
+  title: 'Plugins/Search/SearchType',
+  component: SearchType,
+};
+
+const values = ['value-1', 'value-2', 'value-3'];
+
+export const Default = () => {
+  const [types, setTypes] = useState<string[]>([]);
+
+  return (
+    <SearchContext.Provider value={{ types, setTypes } as any}>
+      <SearchType name="Search type" values={values} defaultValue={values[0]} />
+    </SearchContext.Provider>
+  );
+};
diff --git a/plugins/search/src/components/SearchType/SearchType.test.tsx b/plugins/search/src/components/SearchType/SearchType.test.tsx
new file mode 100644
index 0000000000..d3792bb9f4
--- /dev/null
+++ b/plugins/search/src/components/SearchType/SearchType.test.tsx
@@ -0,0 +1,213 @@
+/*
+ * Copyright 2021 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { useApi } from '@backstage/core-plugin-api';
+import { render, screen, waitFor } from '@testing-library/react';
+import userEvent from '@testing-library/user-event';
+import React from 'react';
+import { SearchContextProvider } from '../SearchContext';
+import { SearchType } from './SearchType';
+
+jest.mock('@backstage/core-plugin-api', () => ({
+  ...jest.requireActual('@backstage/core-plugin-api'),
+  useApi: jest.fn().mockReturnValue({}),
+}));
+
+describe('SearchType', () => {
+  const initialState = {
+    term: '',
+    filters: {},
+    types: [],
+  };
+
+  const name = 'field';
+  const values = ['value1', 'value2'];
+  const typeValues = ['preselected'];
+
+  const query = jest.fn().mockResolvedValue({});
+  (useApi as jest.Mock).mockReturnValue({ query: query });
+
+  afterAll(() => {
+    jest.resetAllMocks();
+  });
+
+  describe('Type Filter', () => {
+    it('Renders field name and values when provided as props', async () => {
+      render(
+        <SearchContextProvider initialState={initialState}>
+          <SearchType name={name} values={values} />
+        </SearchContextProvider>,
+      );
+
+      await waitFor(() => {
+        expect(screen.getByText(name)).toBeInTheDocument();
+      });
+
+      userEvent.click(screen.getByRole('button'));
+
+      await waitFor(() => {
+        expect(screen.getByRole('listbox')).toBeInTheDocument();
+      });
+
+      expect(
+        screen.getByRole('option', { name: values[0] }),
+      ).toBeInTheDocument();
+      expect(
+        screen.getByRole('option', { name: values[1] }),
+      ).toBeInTheDocument();
+    });
+
+    it('Renders correctly based on type filter state', async () => {
+      render(
+        <SearchContextProvider
+          initialState={{
+            ...initialState,
+            types: [values[0]],
+          }}
+        >
+          <SearchType name={name} values={values} />
+        </SearchContextProvider>,
+      );
+
+      await waitFor(() => {
+        expect(screen.getByText(name)).toBeInTheDocument();
+      });
+
+      userEvent.click(screen.getByRole('button'));
+
+      await waitFor(() => {
+        expect(screen.getByRole('listbox')).toBeInTheDocument();
+      });
+
+      expect(screen.getByRole('option', { name: values[0] })).toHaveAttribute(
+        'aria-selected',
+        'true',
+      );
+      expect(
+        screen.getByRole('option', { name: values[1] }),
+      ).not.toHaveAttribute('aria-selected');
+    });
+
+    it('Renders correctly based on type filter defaultValue', async () => {
+      render(
+        <SearchContextProvider initialState={initialState}>
+          <SearchType name={name} values={values} defaultValue={values[0]} />
+        </SearchContextProvider>,
+      );
+
+      await waitFor(() => {
+        expect(screen.getByText(name)).toBeInTheDocument();
+      });
+
+      userEvent.click(screen.getByRole('button'));
+
+      await waitFor(() => {
+        expect(screen.getByRole('listbox')).toBeInTheDocument();
+      });
+
+      expect(screen.getByRole('option', { name: values[0] })).toHaveAttribute(
+        'aria-selected',
+        'true',
+      );
+      expect(
+        screen.getByRole('option', { name: values[1] }),
+      ).not.toHaveAttribute('aria-selected');
+    });
+
+    it('Selecting a value sets type filter state', async () => {
+      render(
+        <SearchContextProvider initialState={initialState}>
+          <SearchType name={name} values={values} />
+        </SearchContextProvider>,
+      );
+
+      await waitFor(() => {
+        expect(screen.getByText(name)).toBeInTheDocument();
+      });
+
+      const button = screen.getByRole('button');
+
+      userEvent.click(button);
+
+      await waitFor(() => {
+        expect(screen.getByRole('listbox')).toBeInTheDocument();
+      });
+
+      userEvent.click(screen.getByRole('option', { name: values[0] }));
+
+      await waitFor(() => {
+        expect(query).toHaveBeenLastCalledWith(
+          expect.objectContaining({
+            types: [values[0]],
+          }),
+        );
+      });
+
+      userEvent.click(button);
+
+      await waitFor(() => {
+        expect(screen.getByRole('listbox')).toBeInTheDocument();
+      });
+    });
+
+    it('Selecting none defaults to empty state', async () => {
+      render(
+        <SearchContextProvider
+          initialState={{
+            ...initialState,
+            types: typeValues,
+          }}
+        >
+          <SearchType name={name} values={values} />
+        </SearchContextProvider>,
+      );
+
+      await waitFor(() => {
+        expect(screen.getByText(name)).toBeInTheDocument();
+      });
+
+      const button = screen.getByRole('button');
+
+      userEvent.click(button);
+
+      await waitFor(() => {
+        expect(screen.getByRole('listbox')).toBeInTheDocument();
+      });
+
+      userEvent.click(screen.getByRole('option', { name: values[0] }));
+
+      await waitFor(() => {
+        expect(query).toHaveBeenLastCalledWith(
+          expect.objectContaining({
+            types: [...typeValues, values[0]],
+          }),
+        );
+      });
+
+      userEvent.click(button);
+
+      await waitFor(() => {
+        expect(screen.getByRole('listbox')).toBeInTheDocument();
+      });
+
+      userEvent.click(screen.getByRole('option', { name: values[0] }));
+
+      await waitFor(() => {
+        expect(query).toHaveBeenLastCalledWith(expect.objectContaining([]));
+      });
+    });
+  });
+});
diff --git a/plugins/search/src/components/SearchType/SearchType.tsx b/plugins/search/src/components/SearchType/SearchType.tsx
new file mode 100644
index 0000000000..5290caa0b7
--- /dev/null
+++ b/plugins/search/src/components/SearchType/SearchType.tsx
@@ -0,0 +1,115 @@
+/*
+ * Copyright 2021 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import {
+  Checkbox,
+  Chip,
+  FormControl,
+  InputLabel,
+  ListItemText,
+  makeStyles,
+  MenuItem,
+  Select,
+} from '@material-ui/core';
+import React, { ChangeEvent } from 'react';
+import { useEffectOnce } from 'react-use';
+import { useSearch } from '../SearchContext';
+
+const useStyles = makeStyles(theme => ({
+  label: {
+    textTransform: 'capitalize',
+  },
+  chips: {
+    display: 'flex',
+    flexWrap: 'wrap',
+    marginTop: theme.spacing(1),
+  },
+  chip: {
+    margin: 2,
+  },
+}));
+
+export type SearchTypeProps = {
+  className?: string;
+  name: string;
+  values?: string[];
+  defaultValue?: string[] | string | null;
+};
+
+const SearchType = ({
+  values = [],
+  className,
+  name,
+  defaultValue,
+}: SearchTypeProps) => {
+  const classes = useStyles();
+  const { types, setTypes } = useSearch();
+
+  useEffectOnce(() => {
+    if (!types.length) {
+      if (defaultValue && Array.isArray(defaultValue)) {
+        setTypes(defaultValue);
+      } else if (defaultValue) {
+        setTypes([defaultValue]);
+      }
+    }
+  });
+
+  const handleChange = (e: ChangeEvent<{ value: unknown }>) => {
+    const value = e.target.value as string[];
+    setTypes(value as string[]);
+  };
+
+  return (
+    <FormControl
+      className={className}
+      variant="filled"
+      fullWidth
+      data-testid="search-typefilter-next"
+    >
+      <InputLabel className={classes.label} margin="dense">
+        {name}
+      </InputLabel>
+      <Select
+        multiple
+        variant="outlined"
+        value={types}
+        onChange={handleChange}
+        placeholder="All Results"
+        renderValue={selected => (
+          <div className={classes.chips}>
+            {(selected as string[]).map(value => (
+              <Chip
+                key={value}
+                label={value}
+                className={classes.chip}
+                size="small"
+              />
+            ))}
+          </div>
+        )}
+      >
+        {values.map((value: string) => (
+          <MenuItem key={value} value={value}>
+            <Checkbox checked={types.indexOf(value) > -1} />
+            <ListItemText primary={value} />
+          </MenuItem>
+        ))}
+      </Select>
+    </FormControl>
+  );
+};
+
+export { SearchType };
diff --git a/plugins/search/src/components/SearchType/index.ts b/plugins/search/src/components/SearchType/index.ts
new file mode 100644
index 0000000000..400f3d2a46
--- /dev/null
+++ b/plugins/search/src/components/SearchType/index.ts
@@ -0,0 +1,17 @@
+/*
+ * Copyright 2021 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+export { SearchType } from './SearchType';
diff --git a/plugins/search/src/components/index.tsx b/plugins/search/src/components/index.tsx
index 245c31598d..8b6493ae9b 100644
--- a/plugins/search/src/components/index.tsx
+++ b/plugins/search/src/components/index.tsx
@@ -14,11 +14,13 @@
  * limitations under the License.
  */
 
+export * from './DefaultResultListItem';
 export * from './Filters';
-export * from './SearchFilter';
 export * from './SearchBar';
+export * from './SearchContext';
+export * from './SearchFilter';
 export * from './SearchPage';
 export * from './SearchResult';
-export * from './DefaultResultListItem';
+export * from './SearchResultPager';
+export * from './SearchType';
 export * from './SidebarSearch';
-export * from './SearchContext';
diff --git a/plugins/search/src/components/util.test.tsx b/plugins/search/src/components/util.test.tsx
new file mode 100644
index 0000000000..a5b82370e3
--- /dev/null
+++ b/plugins/search/src/components/util.test.tsx
@@ -0,0 +1,59 @@
+/*
+ * Copyright 2021 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import React from 'react';
+import { wrapInTestApp } from '@backstage/test-utils';
+import { render } from '@testing-library/react';
+import { useNavigateToQuery } from './util';
+import { Routes, Route } from 'react-router-dom';
+import { rootRouteRef } from '../plugin';
+import { act } from 'react-dom/test-utils';
+
+const navigate = jest.fn();
+jest.mock('react-router-dom', () => ({
+  ...jest.requireActual('react-router-dom'),
+  useNavigate: () => navigate,
+}));
+
+describe('util', () => {
+  describe('useNavigateToQuery', () => {
+    it('navigates to query', async () => {
+      const MyComponent = () => {
+        const navigateToQuery = useNavigateToQuery();
+        navigateToQuery({ query: 'test' });
+        return <div>test</div>;
+      };
+
+      await act(async () => {
+        await render(
+          wrapInTestApp(
+            <Routes>
+              <Route element={<MyComponent />} />
+            </Routes>,
+            {
+              mountedRoutes: {
+                '/search': rootRouteRef,
+              },
+            },
+          ),
+        );
+
+        expect(navigate).toHaveBeenCalledTimes(1);
+        expect(navigate).toHaveBeenCalledWith('/search?query=test');
+      });
+    });
+  });
+});
diff --git a/plugins/catalog/src/components/CreateComponentButton/CreateComponentButton.tsx b/plugins/search/src/components/util.ts
similarity index 56%
rename from plugins/catalog/src/components/CreateComponentButton/CreateComponentButton.tsx
rename to plugins/search/src/components/util.ts
index 482a0c0a3c..1e50a44b91 100644
--- a/plugins/catalog/src/components/CreateComponentButton/CreateComponentButton.tsx
+++ b/plugins/search/src/components/util.ts
@@ -13,26 +13,22 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+import qs from 'qs';
+import { useCallback } from 'react';
+import { useNavigate } from 'react-router-dom';
+import { rootRouteRef } from '../plugin';
 
-import React from 'react';
-import { Link as RouterLink } from 'react-router-dom';
-import { Button } from '@material-ui/core';
-import { createComponentRouteRef } from '../../routes';
 import { useRouteRef } from '@backstage/core-plugin-api';
 
-export const CreateComponentButton = () => {
-  const createComponentLink = useRouteRef(createComponentRouteRef);
+export const useNavigateToQuery = () => {
+  const searchRoute = useRouteRef(rootRouteRef);
+  const navigate = useNavigate();
+  return useCallback(
+    ({ query }: { query: string }): void => {
+      const queryString = qs.stringify({ query }, { addQueryPrefix: true });
 
-  if (!createComponentLink) return null;
-
-  return (
-    <Button
-      component={RouterLink}
-      variant="contained"
-      color="primary"
-      to={createComponentLink()}
-    >
-      Create Component
-    </Button>
+      navigate(`${searchRoute()}${queryString}`);
+    },
+    [navigate, searchRoute],
   );
 };
diff --git a/plugins/search/src/index.ts b/plugins/search/src/index.ts
index ecd6015b1c..d98d5416cc 100644
--- a/plugins/search/src/index.ts
+++ b/plugins/search/src/index.ts
@@ -15,24 +15,27 @@
  */
 
 export { searchApiRef } from './apis';
-export {
-  searchPlugin,
-  searchPlugin as plugin,
-  SearchPage,
-  SearchPageNext,
-  SearchBarNext,
-  SearchResult,
-  DefaultResultListItem,
-} from './plugin';
 export {
   Filters,
   FiltersButton,
   SearchBar,
   SearchContextProvider,
-  useSearch,
-  SearchPage as Router,
   SearchFilter,
   SearchFilterNext,
+  SearchPage as Router,
+  SearchResultPager,
+  SearchType,
   SidebarSearch,
+  useSearch,
 } from './components';
 export type { FiltersState } from './components';
+export {
+  DefaultResultListItem,
+  SearchBarNext,
+  SearchPage,
+  SearchPageNext,
+  searchPlugin as plugin,
+  searchPlugin,
+  SearchResult,
+  HomePageSearchBar,
+} from './plugin';
diff --git a/plugins/search/src/plugin.ts b/plugins/search/src/plugin.ts
index d89bb566e9..36094234a0 100644
--- a/plugins/search/src/plugin.ts
+++ b/plugins/search/src/plugin.ts
@@ -126,3 +126,12 @@ export const DefaultResultListItem = searchPlugin.provide(
     },
   }),
 );
+
+export const HomePageSearchBar = searchPlugin.provide(
+  createComponentExtension({
+    component: {
+      lazy: () =>
+        import('./components/HomePageComponent').then(m => m.HomePageSearchBar),
+    },
+  }),
+);
diff --git a/plugins/sentry/CHANGELOG.md b/plugins/sentry/CHANGELOG.md
index 5153be2b93..4092a460f1 100644
--- a/plugins/sentry/CHANGELOG.md
+++ b/plugins/sentry/CHANGELOG.md
@@ -1,5 +1,68 @@
 # @backstage/plugin-sentry
 
+## 0.3.20
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@0.4.5
+  - @backstage/core-components@0.4.0
+  - @backstage/catalog-model@0.9.1
+
+## 0.3.19
+
+### Patch Changes
+
+- 0e7595d19: Do not show [No Type] when issue metadata includes title instead of type
+- d8e4afc62: Render the statsFor property in sentry issues table
+- Updated dependencies
+  - @backstage/plugin-catalog-react@0.4.3
+  - @backstage/core-components@0.3.2
+  - @backstage/theme@0.2.10
+
+## 0.3.18
+
+### Patch Changes
+
+- 8bedb75ae: Update Luxon dependency to 2.x
+- 56c773909: Switched `@types/react` dependency to request `*` rather than a specific version.
+- Updated dependencies
+  - @backstage/core-components@0.3.1
+  - @backstage/core-plugin-api@0.1.6
+  - @backstage/plugin-catalog-react@0.4.2
+
+## 0.3.17
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.3.0
+  - @backstage/core-plugin-api@0.1.5
+  - @backstage/plugin-catalog-react@0.4.1
+
+## 0.3.16
+
+### Patch Changes
+
+- 9d40fcb1e: - Bumping `material-ui/core` version to at least `4.12.2` as they made some breaking changes in later versions which broke `Pagination` of the `Table`.
+  - Switching out `material-table` to `@material-table/core` for support for the later versions of `material-ui/core`
+  - This causes a minor API change to `@backstage/core-components` as the interface for `Table` re-exports the `prop` from the underlying `Table` components.
+  - `onChangeRowsPerPage` has been renamed to `onRowsPerPageChange`
+  - `onChangePage` has been renamed to `onPageChange`
+  - Migration guide is here: https://material-table-core.com/docs/breaking-changes
+- Updated dependencies
+  - @backstage/core-components@0.2.0
+  - @backstage/plugin-catalog-react@0.4.0
+  - @backstage/core-plugin-api@0.1.4
+  - @backstage/theme@0.2.9
+
+## 0.3.15
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@0.3.0
+
 ## 0.3.14
 
 ### Patch Changes
diff --git a/plugins/sentry/api-report.md b/plugins/sentry/api-report.md
index ebb4cfa357..92ea326f87 100644
--- a/plugins/sentry/api-report.md
+++ b/plugins/sentry/api-report.md
@@ -12,18 +12,26 @@ import { Entity } from '@backstage/catalog-model';
 import { InfoCardVariants } from '@backstage/core-components';
 import { RouteRef } from '@backstage/core-plugin-api';
 
+// Warning: (ae-missing-release-tag) "EntitySentryCard" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export const EntitySentryCard: () => JSX.Element;
 
+// Warning: (ae-missing-release-tag) "EntitySentryContent" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export const EntitySentryContent: () => JSX.Element;
 
+// Warning: (ae-missing-release-tag) "MockSentryApi" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export class MockSentryApi implements SentryApi {
   // (undocumented)
   fetchIssues(): Promise<SentryIssue[]>;
 }
 
+// Warning: (ae-missing-release-tag) "ProductionSentryApi" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export class ProductionSentryApi implements SentryApi {
   constructor(discoveryApi: DiscoveryApi, organization: string);
@@ -31,18 +39,26 @@ export class ProductionSentryApi implements SentryApi {
   fetchIssues(project: string, statsFor: string): Promise<SentryIssue[]>;
 }
 
+// Warning: (ae-missing-release-tag) "Router" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export const Router: ({ entity }: { entity: Entity }) => JSX.Element;
 
+// Warning: (ae-missing-release-tag) "SentryApi" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export interface SentryApi {
   // (undocumented)
   fetchIssues(project: string, statsFor: string): Promise<SentryIssue[]>;
 }
 
+// Warning: (ae-missing-release-tag) "sentryApiRef" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export const sentryApiRef: ApiRef<SentryApi>;
 
+// Warning: (ae-missing-release-tag) "SentryIssue" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export type SentryIssue = {
   platform: SentryPlatform;
@@ -77,6 +93,8 @@ export type SentryIssue = {
   statusDetails: any;
 };
 
+// Warning: (ae-missing-release-tag) "SentryIssuesWidget" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export const SentryIssuesWidget: ({
   entity,
@@ -88,6 +106,8 @@ export const SentryIssuesWidget: ({
   variant?: InfoCardVariants | undefined;
 }) => JSX.Element;
 
+// Warning: (ae-missing-release-tag) "sentryPlugin" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 const sentryPlugin: BackstagePlugin<
   {
@@ -98,5 +118,12 @@ const sentryPlugin: BackstagePlugin<
 export { sentryPlugin as plugin };
 export { sentryPlugin };
 
+// Warnings were encountered during analysis:
+//
+// src/api/sentry-issue.d.ts:16:5 - (ae-forgotten-export) The symbol "SentryPlatform" needs to be exported by the entry point index.d.ts
+// src/api/sentry-issue.d.ts:21:9 - (ae-forgotten-export) The symbol "EventPoint" needs to be exported by the entry point index.d.ts
+// src/api/sentry-issue.d.ts:31:5 - (ae-forgotten-export) The symbol "SentryIssueMetadata" needs to be exported by the entry point index.d.ts
+// src/api/sentry-issue.d.ts:44:5 - (ae-forgotten-export) The symbol "SentryProject" needs to be exported by the entry point index.d.ts
+
 // (No @packageDocumentation comment for this package)
 ```
diff --git a/plugins/sentry/package.json b/plugins/sentry/package.json
index 4d670a8a7f..7241858e78 100644
--- a/plugins/sentry/package.json
+++ b/plugins/sentry/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-sentry",
-  "version": "0.3.14",
+  "version": "0.3.20",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -31,15 +31,15 @@
     "clean": "backstage-cli clean"
   },
   "dependencies": {
-    "@backstage/catalog-model": "^0.9.0",
-    "@backstage/core-components": "^0.1.5",
-    "@backstage/core-plugin-api": "^0.1.3",
-    "@backstage/plugin-catalog-react": "^0.2.6",
-    "@backstage/theme": "^0.2.8",
-    "@material-ui/core": "^4.11.0",
+    "@backstage/catalog-model": "^0.9.1",
+    "@backstage/core-components": "^0.4.1",
+    "@backstage/core-plugin-api": "^0.1.7",
+    "@backstage/plugin-catalog-react": "^0.4.5",
+    "@backstage/theme": "^0.2.10",
+    "@material-ui/core": "^4.12.2",
     "@material-ui/icons": "^4.9.1",
     "@material-ui/lab": "4.0.0-alpha.45",
-    "luxon": "^1.27.0",
+    "luxon": "^2.0.2",
     "react": "^16.13.1",
     "react-dom": "^16.13.1",
     "react-router": "6.0.0-beta.0",
@@ -47,17 +47,17 @@
     "react-use": "^17.2.4"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.7.3",
-    "@backstage/core-app-api": "^0.1.4",
-    "@backstage/dev-utils": "^0.2.1",
-    "@backstage/test-utils": "^0.1.14",
+    "@backstage/cli": "^0.7.11",
+    "@backstage/core-app-api": "^0.1.12",
+    "@backstage/dev-utils": "^0.2.9",
+    "@backstage/test-utils": "^0.1.17",
     "@testing-library/jest-dom": "^5.10.1",
     "@testing-library/react": "^11.2.5",
     "@testing-library/user-event": "^13.1.8",
     "@types/jest": "^26.0.7",
     "@types/luxon": "^1.27.0",
     "@types/node": "^14.14.32",
-    "@types/react": "^16.9",
+    "@types/react": "*",
     "cross-fetch": "^3.0.6",
     "msw": "^0.29.0"
   },
diff --git a/plugins/sentry/src/components/ErrorCell/ErrorCell.test.tsx b/plugins/sentry/src/components/ErrorCell/ErrorCell.test.tsx
index 98833aaeba..ff1960aa4f 100644
--- a/plugins/sentry/src/components/ErrorCell/ErrorCell.test.tsx
+++ b/plugins/sentry/src/components/ErrorCell/ErrorCell.test.tsx
@@ -44,4 +44,24 @@ describe('Sentry error cell component', () => {
       'http://example.com',
     );
   });
+  it('should render the title if type is not present', async () => {
+    const testIssue = {
+      ...mockIssue,
+      title: 'Exception: Could not load credentials from any providers',
+      count: '1',
+      metadata: {},
+      userCount: 2,
+      permalink: 'http://example.com',
+    };
+    const cell = render(
+      <ThemeProvider theme={lightTheme}>
+        <ErrorCell sentryIssue={testIssue} />
+      </ThemeProvider>,
+    );
+    const errorType = await cell.findByText('Exception: Could not load cr...');
+    expect(errorType.closest('a')).toHaveAttribute(
+      'href',
+      'http://example.com',
+    );
+  });
 });
diff --git a/plugins/sentry/src/components/ErrorCell/ErrorCell.tsx b/plugins/sentry/src/components/ErrorCell/ErrorCell.tsx
index 57f9cddc05..d2da63f01f 100644
--- a/plugins/sentry/src/components/ErrorCell/ErrorCell.tsx
+++ b/plugins/sentry/src/components/ErrorCell/ErrorCell.tsx
@@ -44,13 +44,18 @@ const useStyles = makeStyles<BackstageTheme>(theme => ({
 
 export const ErrorCell = ({ sentryIssue }: { sentryIssue: SentryIssue }) => {
   const classes = useStyles();
+  let issueType = '[No Type]';
+  if (sentryIssue.metadata.type) {
+    issueType = sentryIssue.metadata.type;
+  } else if (sentryIssue.title) {
+    issueType = sentryIssue.title;
+  }
+
   return (
     <div className={classes.root}>
       <Link href={sentryIssue.permalink}>
         <Typography variant="body1" gutterBottom className={classes.text}>
-          {sentryIssue.metadata.type
-            ? stripText(sentryIssue.metadata.type, 28)
-            : '[No type]'}
+          {stripText(issueType, 28)}
         </Typography>
       </Link>
       <Typography
diff --git a/plugins/sentry/src/components/SentryIssuesTable/SentryIssuesTable.test.tsx b/plugins/sentry/src/components/SentryIssuesTable/SentryIssuesTable.test.tsx
index b1ac7daad6..85e87dbc28 100644
--- a/plugins/sentry/src/components/SentryIssuesTable/SentryIssuesTable.test.tsx
+++ b/plugins/sentry/src/components/SentryIssuesTable/SentryIssuesTable.test.tsx
@@ -69,4 +69,23 @@ describe('SentryIssuesTable', () => {
     expect(await table.findByText('101')).toBeInTheDocument();
     expect(await table.findByText('202')).toBeInTheDocument();
   });
+  it('should render statsFor in table subtitle', async () => {
+    const issues: SentryIssue[] = [
+      {
+        ...mockIssue,
+        metadata: {
+          type: 'Exception',
+          value: 'exception was thrown',
+        },
+        count: '101',
+        userCount: 202,
+      },
+    ];
+    const table = await render(
+      <ThemeProvider theme={lightTheme}>
+        <SentryIssuesTable sentryIssues={issues} statsFor="24h" />
+      </ThemeProvider>,
+    );
+    expect(await table.findByText('Last 24h')).toBeInTheDocument();
+  });
 });
diff --git a/plugins/sentry/src/components/SentryIssuesTable/SentryIssuesTable.tsx b/plugins/sentry/src/components/SentryIssuesTable/SentryIssuesTable.tsx
index 67cd354d93..637f2c4355 100644
--- a/plugins/sentry/src/components/SentryIssuesTable/SentryIssuesTable.tsx
+++ b/plugins/sentry/src/components/SentryIssuesTable/SentryIssuesTable.tsx
@@ -59,14 +59,19 @@ const columns: TableColumn[] = [
 
 type SentryIssuesTableProps = {
   sentryIssues: SentryIssue[];
+  statsFor?: '24h' | '12h';
 };
 
-const SentryIssuesTable = ({ sentryIssues }: SentryIssuesTableProps) => {
+const SentryIssuesTable = ({
+  sentryIssues,
+  statsFor,
+}: SentryIssuesTableProps) => {
   return (
     <Table
       columns={columns}
       options={{ padding: 'dense', paging: true, search: false, pageSize: 5 }}
       title="Sentry issues"
+      subtitle={statsFor ? `Last ${statsFor}` : undefined}
       data={sentryIssues}
     />
   );
diff --git a/plugins/sentry/src/components/SentryIssuesWidget/SentryIssuesWidget.tsx b/plugins/sentry/src/components/SentryIssuesWidget/SentryIssuesWidget.tsx
index 01a2b8be1b..46198e4b93 100644
--- a/plugins/sentry/src/components/SentryIssuesWidget/SentryIssuesWidget.tsx
+++ b/plugins/sentry/src/components/SentryIssuesWidget/SentryIssuesWidget.tsx
@@ -81,5 +81,5 @@ export const SentryIssuesWidget = ({
     );
   }
 
-  return <SentryIssuesTable sentryIssues={value || []} />;
+  return <SentryIssuesTable sentryIssues={value || []} statsFor={statsFor} />;
 };
diff --git a/plugins/shortcuts/CHANGELOG.md b/plugins/shortcuts/CHANGELOG.md
index 77748cd722..b06b2abbfa 100644
--- a/plugins/shortcuts/CHANGELOG.md
+++ b/plugins/shortcuts/CHANGELOG.md
@@ -1,5 +1,37 @@
 # @backstage/plugin-shortcuts
 
+## 0.1.7
+
+### Patch Changes
+
+- e0a6aea82: Bumped `react-hook-form` to `^7.12.2`
+- b8e8a3424: Fix material-ui warning about deprecated `onExit` prop
+- Updated dependencies
+  - @backstage/core-components@0.4.0
+
+## 0.1.6
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.3.0
+  - @backstage/core-plugin-api@0.1.5
+
+## 0.1.5
+
+### Patch Changes
+
+- 9d40fcb1e: - Bumping `material-ui/core` version to at least `4.12.2` as they made some breaking changes in later versions which broke `Pagination` of the `Table`.
+  - Switching out `material-table` to `@material-table/core` for support for the later versions of `material-ui/core`
+  - This causes a minor API change to `@backstage/core-components` as the interface for `Table` re-exports the `prop` from the underlying `Table` components.
+  - `onChangeRowsPerPage` has been renamed to `onRowsPerPageChange`
+  - `onChangePage` has been renamed to `onPageChange`
+  - Migration guide is here: https://material-table-core.com/docs/breaking-changes
+- Updated dependencies
+  - @backstage/core-components@0.2.0
+  - @backstage/core-plugin-api@0.1.4
+  - @backstage/theme@0.2.9
+
 ## 0.1.4
 
 ### Patch Changes
diff --git a/plugins/shortcuts/README.md b/plugins/shortcuts/README.md
index 162afe009b..a3da6bc4ee 100644
--- a/plugins/shortcuts/README.md
+++ b/plugins/shortcuts/README.md
@@ -4,20 +4,24 @@ The shortcuts plugin allows a user to have easy access to pages within a Backsta
 
 ## Usage
 
-Install the package:
+### Install the package:
 
 ```bash
 yarn add @backstage/plugin-shortcuts
 ```
 
-Add it to your App's `plugins.ts` file:
+### Register plugin:
+
+This plugin requires explicit registration, so you will need to add it to your App's `plugins.ts` file:
 
 ```ts
 // ...
 export { shortcutsPlugin } from '@backstage/plugin-shortcuts';
 ```
 
-Add the `<Shortcuts />` component within your `<Sidebar>`:
+If you don't have a `plugins.ts` file see: [troubleshooting](#troubleshooting)
+
+### Add the `<Shortcuts />` component within your `<Sidebar>`:
 
 ```tsx
 import { Sidebar, SidebarDivider, SidebarSpace } from '@backstage/core';
@@ -50,3 +54,33 @@ export const apis = [
   }),
 ];
 ```
+
+# Troubleshooting
+
+If you don't have a `plugins.ts` file, you can create it with the path `packages/app/src/plugins.ts` and then import it into your `App.tsx`:
+
+```diff
++ import * as plugins from './plugins';
+
+const app = createApp({
+  apis,
++   plugins: Object.values(plugins),
+  bindRoutes({ bind }) {
+    /* ... */
+  },
+});
+```
+
+Or simply edit `App.tsx` with:
+
+```diff
++ import { shortcutsPlugin } from '@backstage/plugin-shortcuts
+
+const app = createApp({
+  apis,
++   plugins: [shortcutsPlugin],
+  bindRoutes({ bind }) {
+    /* ... */
+  },
+});
+```
diff --git a/plugins/shortcuts/api-report.md b/plugins/shortcuts/api-report.md
index 7aa54b8c3b..3d6a56244a 100644
--- a/plugins/shortcuts/api-report.md
+++ b/plugins/shortcuts/api-report.md
@@ -11,6 +11,8 @@ import { Observable } from '@backstage/core-plugin-api';
 import ObservableImpl from 'zen-observable';
 import { StorageApi } from '@backstage/core-plugin-api';
 
+// Warning: (ae-missing-release-tag) "LocalStoredShortcuts" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public
 export class LocalStoredShortcuts implements ShortcutApi {
   constructor(storageApi: StorageApi);
@@ -26,6 +28,8 @@ export class LocalStoredShortcuts implements ShortcutApi {
   update(shortcut: Shortcut): Promise<void>;
 }
 
+// Warning: (ae-missing-release-tag) "Shortcut" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export type Shortcut = {
   id: string;
@@ -33,6 +37,8 @@ export type Shortcut = {
   title: string;
 };
 
+// Warning: (ae-missing-release-tag) "ShortcutApi" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export interface ShortcutApi {
   add(shortcut: Omit<Shortcut, 'id'>): Promise<void>;
@@ -42,12 +48,18 @@ export interface ShortcutApi {
   update(shortcut: Shortcut): Promise<void>;
 }
 
+// Warning: (ae-missing-release-tag) "Shortcuts" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export const Shortcuts: () => JSX.Element;
 
+// Warning: (ae-missing-release-tag) "shortcutsApiRef" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export const shortcutsApiRef: ApiRef<ShortcutApi>;
 
+// Warning: (ae-missing-release-tag) "shortcutsPlugin" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export const shortcutsPlugin: BackstagePlugin<{}, {}>;
 
diff --git a/plugins/shortcuts/package.json b/plugins/shortcuts/package.json
index 1dbbbb1a18..a5e03e97e4 100644
--- a/plugins/shortcuts/package.json
+++ b/plugins/shortcuts/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-shortcuts",
-  "version": "0.1.4",
+  "version": "0.1.7",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -20,26 +20,26 @@
     "clean": "backstage-cli clean"
   },
   "dependencies": {
-    "@backstage/core-components": "^0.1.5",
-    "@backstage/core-plugin-api": "^0.1.3",
-    "@backstage/theme": "^0.2.8",
-    "@material-ui/core": "^4.11.0",
+    "@backstage/core-components": "^0.4.1",
+    "@backstage/core-plugin-api": "^0.1.7",
+    "@backstage/theme": "^0.2.10",
+    "@material-ui/core": "^4.12.2",
     "@material-ui/icons": "^4.9.1",
     "@material-ui/lab": "4.0.0-alpha.45",
     "@types/zen-observable": "^0.8.2",
     "react": "^16.13.1",
     "react-dom": "^16.13.1",
-    "react-hook-form": "^7.1.1",
+    "react-hook-form": "^7.12.2",
     "react-router": "6.0.0-beta.0",
     "react-use": "^17.2.4",
     "uuid": "^8.3.2",
     "zen-observable": "^0.8.15"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.7.3",
-    "@backstage/core-app-api": "^0.1.4",
-    "@backstage/dev-utils": "^0.2.1",
-    "@backstage/test-utils": "^0.1.14",
+    "@backstage/cli": "^0.7.11",
+    "@backstage/core-app-api": "^0.1.12",
+    "@backstage/dev-utils": "^0.2.9",
+    "@backstage/test-utils": "^0.1.17",
     "@testing-library/jest-dom": "^5.10.1",
     "@testing-library/react": "^11.2.5",
     "@testing-library/user-event": "^13.1.8",
diff --git a/plugins/shortcuts/src/AddShortcut.tsx b/plugins/shortcuts/src/AddShortcut.tsx
index 4429dbaeb0..87c2750206 100644
--- a/plugins/shortcuts/src/AddShortcut.tsx
+++ b/plugins/shortcuts/src/AddShortcut.tsx
@@ -86,7 +86,7 @@ export const AddShortcut = ({ onClose, anchorEl, api }: Props) => {
     <Popover
       open={open}
       anchorEl={anchorEl}
-      onExit={handleClose}
+      TransitionProps={{ onExit: handleClose }}
       onClose={onClose}
       anchorOrigin={{
         vertical: 'top',
diff --git a/plugins/sonarqube/CHANGELOG.md b/plugins/sonarqube/CHANGELOG.md
index 390d8e4a68..04b6d2ed40 100644
--- a/plugins/sonarqube/CHANGELOG.md
+++ b/plugins/sonarqube/CHANGELOG.md
@@ -1,5 +1,61 @@
 # @backstage/plugin-sonarqube
 
+## 0.2.1
+
+### Patch Changes
+
+- 38fd73fb5: Update README to show a simpler proxy configuration.
+- Updated dependencies
+  - @backstage/plugin-catalog-react@0.4.5
+  - @backstage/core-components@0.4.0
+  - @backstage/catalog-model@0.9.1
+
+## 0.2.0
+
+### Minor Changes
+
+- 8db48b968: Use IdentityApi to provide Auth Token for SonarQubeClient Api calls
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.3.1
+  - @backstage/core-plugin-api@0.1.6
+  - @backstage/plugin-catalog-react@0.4.2
+
+## 0.1.24
+
+### Patch Changes
+
+- 260c053b9: Fix All Material UI Warnings
+- Updated dependencies
+  - @backstage/core-components@0.3.0
+  - @backstage/core-plugin-api@0.1.5
+  - @backstage/plugin-catalog-react@0.4.1
+
+## 0.1.23
+
+### Patch Changes
+
+- 9d40fcb1e: - Bumping `material-ui/core` version to at least `4.12.2` as they made some breaking changes in later versions which broke `Pagination` of the `Table`.
+  - Switching out `material-table` to `@material-table/core` for support for the later versions of `material-ui/core`
+  - This causes a minor API change to `@backstage/core-components` as the interface for `Table` re-exports the `prop` from the underlying `Table` components.
+  - `onChangeRowsPerPage` has been renamed to `onRowsPerPageChange`
+  - `onChangePage` has been renamed to `onPageChange`
+  - Migration guide is here: https://material-table-core.com/docs/breaking-changes
+- Updated dependencies
+  - @backstage/core-components@0.2.0
+  - @backstage/plugin-catalog-react@0.4.0
+  - @backstage/core-plugin-api@0.1.4
+  - @backstage/theme@0.2.9
+
+## 0.1.22
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@0.3.0
+
 ## 0.1.21
 
 ### Patch Changes
diff --git a/plugins/sonarqube/README.md b/plugins/sonarqube/README.md
index d0251e91ef..87242f6788 100644
--- a/plugins/sonarqube/README.md
+++ b/plugins/sonarqube/README.md
@@ -45,10 +45,9 @@ proxy:
   '/sonarqube':
     target: https://sonarcloud.io/api
     allowedMethods: ['GET']
-    headers:
-      Authorization: Basic ${SONARQUBE_AUTH}
-      # Content: 'base64("<api-key>:")' <-- note the trailing ':'
-      # Example: bXktYXBpLWtleTo=
+    auth: '${SONARQUBE_TOKEN}:'
+    # Environmental variable: SONARQUBE_TOKEN
+    # Fetch the sonar-auth-token from https://sonarcloud.io/account/security/
 ```
 
 **SonarQube**
@@ -58,20 +57,15 @@ proxy:
   '/sonarqube':
     target: https://your.sonarqube.instance.com/api
     allowedMethods: ['GET']
-    headers:
-      Authorization: Basic ${SONARQUBE_AUTH}
-      # Environmental variable: SONARQUBE_AUTH
-      # Value: 'base64("<sonar-auth-token>:")'
-      # Encode the "<sonar-auth-token>:" string using base64 encoder.
-      # Note the trailing colon (:) at the end of the token.
-      # Example environmental config: SONARQUBE_AUTH=bXktYXBpLWtleTo=
-      # Fetch the sonar-auth-token from https://sonarcloud.io/account/security/
+    auth: '${SONARQUBE_TOKEN}:'
+    # Environmental variable: SONARQUBE_TOKEN
+    # Fetch the sonar-auth-token from https://sonarcloud.io/account/security/
 
 sonarQube:
   baseUrl: https://your.sonarqube.instance.com
 ```
 
-4. Get and provide `SONARQUBE_AUTH` as an env variable (https://sonarcloud.io/account/security or https://docs.sonarqube.org/latest/user-guide/user-token/)
+4. Get and provide `SONARQUBE_TOKEN` as an env variable (https://sonarcloud.io/account/security or https://docs.sonarqube.org/latest/user-guide/user-token/)
 
 5. Run the following commands in the root folder of the project to install and compile the changes.
 
diff --git a/plugins/sonarqube/api-report.md b/plugins/sonarqube/api-report.md
index 92d0cfa476..642e1d956f 100644
--- a/plugins/sonarqube/api-report.md
+++ b/plugins/sonarqube/api-report.md
@@ -9,6 +9,8 @@ import { BackstagePlugin } from '@backstage/core-plugin-api';
 import { Entity } from '@backstage/catalog-model';
 import { InfoCardVariants } from '@backstage/core-components';
 
+// Warning: (ae-missing-release-tag) "EntitySonarQubeCard" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export const EntitySonarQubeCard: ({
   variant,
@@ -24,9 +26,13 @@ export const EntitySonarQubeCard: ({
     | undefined;
 }) => JSX.Element;
 
+// Warning: (ae-missing-release-tag) "isSonarQubeAvailable" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export const isSonarQubeAvailable: (entity: Entity) => boolean;
 
+// Warning: (ae-missing-release-tag) "SonarQubeCard" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export const SonarQubeCard: ({
   variant,
@@ -37,10 +43,16 @@ export const SonarQubeCard: ({
   duplicationRatings?: DuplicationRating[] | undefined;
 }) => JSX.Element;
 
+// Warning: (ae-missing-release-tag) "sonarQubePlugin" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 const sonarQubePlugin: BackstagePlugin<{}, {}>;
 export { sonarQubePlugin as plugin };
 export { sonarQubePlugin };
 
+// Warnings were encountered during analysis:
+//
+// src/components/SonarQubeCard/SonarQubeCard.d.ts:11:5 - (ae-forgotten-export) The symbol "DuplicationRating" needs to be exported by the entry point index.d.ts
+
 // (No @packageDocumentation comment for this package)
 ```
diff --git a/plugins/sonarqube/package.json b/plugins/sonarqube/package.json
index 3d120abf49..e821dd0bf5 100644
--- a/plugins/sonarqube/package.json
+++ b/plugins/sonarqube/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-sonarqube",
-  "version": "0.1.21",
+  "version": "0.2.1",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -32,12 +32,12 @@
     "clean": "backstage-cli clean"
   },
   "dependencies": {
-    "@backstage/catalog-model": "^0.9.0",
-    "@backstage/core-components": "^0.1.5",
-    "@backstage/core-plugin-api": "^0.1.3",
-    "@backstage/plugin-catalog-react": "^0.2.6",
-    "@backstage/theme": "^0.2.8",
-    "@material-ui/core": "^4.11.0",
+    "@backstage/catalog-model": "^0.9.1",
+    "@backstage/core-components": "^0.4.1",
+    "@backstage/core-plugin-api": "^0.1.7",
+    "@backstage/plugin-catalog-react": "^0.4.5",
+    "@backstage/theme": "^0.2.10",
+    "@material-ui/core": "^4.12.2",
     "@material-ui/icons": "^4.9.1",
     "@material-ui/lab": "4.0.0-alpha.45",
     "@material-ui/styles": "^4.10.0",
@@ -48,10 +48,10 @@
     "react-use": "^17.2.4"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.7.3",
-    "@backstage/core-app-api": "^0.1.4",
-    "@backstage/dev-utils": "^0.2.1",
-    "@backstage/test-utils": "^0.1.14",
+    "@backstage/cli": "^0.7.11",
+    "@backstage/core-app-api": "^0.1.12",
+    "@backstage/dev-utils": "^0.2.9",
+    "@backstage/test-utils": "^0.1.17",
     "@testing-library/jest-dom": "^5.10.1",
     "@testing-library/react": "^11.2.5",
     "@testing-library/user-event": "^13.1.8",
diff --git a/plugins/sonarqube/src/api/SonarQubeClient.test.ts b/plugins/sonarqube/src/api/SonarQubeClient.test.ts
index 816cf19b5e..dbc65ee59e 100644
--- a/plugins/sonarqube/src/api/SonarQubeClient.test.ts
+++ b/plugins/sonarqube/src/api/SonarQubeClient.test.ts
@@ -20,9 +20,39 @@ import { setupServer } from 'msw/node';
 import { FindingSummary, SonarQubeClient } from './index';
 import { ComponentWrapper, MeasuresWrapper } from './types';
 import { UrlPatternDiscovery } from '@backstage/core-app-api';
+import { IdentityApi } from '@backstage/core-plugin-api';
 
 const server = setupServer();
 
+const identityApiAuthenticated: IdentityApi = {
+  getUserId() {
+    return 'jane-fonda';
+  },
+  getProfile() {
+    return { email: 'jane-fonda@spotify.com' };
+  },
+  async getIdToken() {
+    return Promise.resolve('fake-id-token');
+  },
+  async signOut() {
+    return Promise.resolve();
+  },
+};
+const identityApiGuest: IdentityApi = {
+  getUserId() {
+    return 'guest';
+  },
+  getProfile() {
+    return {};
+  },
+  async getIdToken() {
+    return Promise.resolve(undefined);
+  },
+  async signOut() {
+    return Promise.resolve();
+  },
+};
+
 describe('SonarQubeClient', () => {
   msw.setupDefaultHandlers(server);
 
@@ -161,7 +191,10 @@ describe('SonarQubeClient', () => {
   it('should report finding summary', async () => {
     setupHandlers();
 
-    const client = new SonarQubeClient({ discoveryApi });
+    const client = new SonarQubeClient({
+      discoveryApi,
+      identityApi: identityApiAuthenticated,
+    });
 
     const summary = await client.getFindingSummary('our:service');
     expect(summary).toEqual(
@@ -197,6 +230,7 @@ describe('SonarQubeClient', () => {
     const client = new SonarQubeClient({
       discoveryApi,
       baseUrl: 'http://a.instance.local',
+      identityApi: identityApiAuthenticated,
     });
 
     const summary = await client.getFindingSummary('our:service');
@@ -234,6 +268,7 @@ describe('SonarQubeClient', () => {
     const client = new SonarQubeClient({
       discoveryApi,
       baseUrl: 'http://a.instance.local',
+      identityApi: identityApiAuthenticated,
     });
 
     const summary = await client.getFindingSummary('our:service');
@@ -255,4 +290,56 @@ describe('SonarQubeClient', () => {
       'http://a.instance.local/component_measures?id=our%3Aservice&metric=coverage&resolved=false&view=list',
     );
   });
+
+  it('should add identity token for logged in users', async () => {
+    setupHandlers();
+    server.use(
+      rest.get(`${mockBaseUrl}/sonarqube/components/show`, (req, res, ctx) => {
+        expect(req.url.searchParams.toString()).toBe('component=our%3Aservice');
+        expect(req.headers.get('Authorization')).toBe('Bearer fake-id-token');
+        return res(
+          ctx.json({
+            component: {
+              analysisDate: '2020-01-01T00:00:00Z',
+            },
+          } as ComponentWrapper),
+        );
+      }),
+    );
+
+    const client = new SonarQubeClient({
+      discoveryApi,
+      baseUrl: 'http://a.instance.local',
+      identityApi: identityApiAuthenticated,
+    });
+    const summary = await client.getFindingSummary('our:service');
+
+    expect(summary?.lastAnalysis).toBe('2020-01-01T00:00:00Z');
+  });
+
+  it('should omit identity token for guest users', async () => {
+    setupHandlers();
+    server.use(
+      rest.get(`${mockBaseUrl}/sonarqube/components/show`, (req, res, ctx) => {
+        expect(req.url.searchParams.toString()).toBe('component=our%3Aservice');
+        expect(req.headers.has('Authorization')).toBeFalsy();
+        return res(
+          ctx.json({
+            component: {
+              analysisDate: '2020-01-01T00:00:00Z',
+            },
+          } as ComponentWrapper),
+        );
+      }),
+    );
+
+    const client = new SonarQubeClient({
+      discoveryApi,
+      baseUrl: 'http://a.instance.local',
+      identityApi: identityApiGuest,
+    });
+    const summary = await client.getFindingSummary('our:service');
+
+    expect(summary?.lastAnalysis).toBe('2020-01-01T00:00:00Z');
+  });
 });
diff --git a/plugins/sonarqube/src/api/SonarQubeClient.ts b/plugins/sonarqube/src/api/SonarQubeClient.ts
index f7f1cac92d..d2283693ea 100644
--- a/plugins/sonarqube/src/api/SonarQubeClient.ts
+++ b/plugins/sonarqube/src/api/SonarQubeClient.ts
@@ -17,20 +17,24 @@
 import fetch from 'cross-fetch';
 import { FindingSummary, Metrics, SonarQubeApi } from './SonarQubeApi';
 import { ComponentWrapper, MeasuresWrapper } from './types';
-import { DiscoveryApi } from '@backstage/core-plugin-api';
+import { DiscoveryApi, IdentityApi } from '@backstage/core-plugin-api';
 
 export class SonarQubeClient implements SonarQubeApi {
   discoveryApi: DiscoveryApi;
   baseUrl: string;
+  identityApi: IdentityApi;
 
   constructor({
     discoveryApi,
+    identityApi,
     baseUrl = 'https://sonarcloud.io/',
   }: {
     discoveryApi: DiscoveryApi;
+    identityApi: IdentityApi;
     baseUrl?: string;
   }) {
     this.discoveryApi = discoveryApi;
+    this.identityApi = identityApi;
     this.baseUrl = baseUrl.endsWith('/') ? baseUrl : `${baseUrl}/`;
   }
 
@@ -38,9 +42,17 @@ export class SonarQubeClient implements SonarQubeApi {
     path: string,
     query: { [key in string]: any },
   ): Promise<T | undefined> {
+    const idToken = await this.identityApi.getIdToken();
+
     const apiUrl = `${await this.discoveryApi.getBaseUrl('proxy')}/sonarqube`;
     const response = await fetch(
       `${apiUrl}/${path}?${new URLSearchParams(query).toString()}`,
+      {
+        headers: {
+          'Content-Type': 'application/json',
+          ...(idToken && { Authorization: `Bearer ${idToken}` }),
+        },
+      },
     );
     if (response.status === 200) {
       return (await response.json()) as T;
diff --git a/plugins/sonarqube/src/components/SonarQubeCard/SonarQubeCard.tsx b/plugins/sonarqube/src/components/SonarQubeCard/SonarQubeCard.tsx
index 03c952a384..dede699203 100644
--- a/plugins/sonarqube/src/components/SonarQubeCard/SonarQubeCard.tsx
+++ b/plugins/sonarqube/src/components/SonarQubeCard/SonarQubeCard.tsx
@@ -183,12 +183,12 @@ export const SonarQubeCard = ({
             item
             container
             direction="column"
-            justify="space-between"
+            justifyContent="space-between"
             alignItems="center"
             style={{ height: '100%' }}
             spacing={0}
           >
-            <Grid item container justify="space-around">
+            <Grid item container justifyContent="space-around">
               <RatingCard
                 titleIcon={<BugReport />}
                 title="Bugs"
diff --git a/plugins/sonarqube/src/plugin.ts b/plugins/sonarqube/src/plugin.ts
index d542d40b17..d8e1b7f89a 100644
--- a/plugins/sonarqube/src/plugin.ts
+++ b/plugins/sonarqube/src/plugin.ts
@@ -21,6 +21,7 @@ import {
   createComponentExtension,
   createPlugin,
   discoveryApiRef,
+  identityApiRef,
 } from '@backstage/core-plugin-api';
 
 export const sonarQubePlugin = createPlugin({
@@ -28,11 +29,16 @@ export const sonarQubePlugin = createPlugin({
   apis: [
     createApiFactory({
       api: sonarQubeApiRef,
-      deps: { configApi: configApiRef, discoveryApi: discoveryApiRef },
-      factory: ({ configApi, discoveryApi }) =>
+      deps: {
+        configApi: configApiRef,
+        discoveryApi: discoveryApiRef,
+        identityApi: identityApiRef,
+      },
+      factory: ({ configApi, discoveryApi, identityApi }) =>
         new SonarQubeClient({
           discoveryApi,
           baseUrl: configApi.getOptionalString('sonarQube.baseUrl'),
+          identityApi,
         }),
     }),
   ],
diff --git a/plugins/splunk-on-call/CHANGELOG.md b/plugins/splunk-on-call/CHANGELOG.md
index a3a60c1b9d..e396bc8f9e 100644
--- a/plugins/splunk-on-call/CHANGELOG.md
+++ b/plugins/splunk-on-call/CHANGELOG.md
@@ -1,5 +1,57 @@
 # @backstage/plugin-splunk-on-call
 
+## 0.3.9
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@0.4.5
+  - @backstage/core-components@0.4.0
+  - @backstage/catalog-model@0.9.1
+
+## 0.3.8
+
+### Patch Changes
+
+- 8bedb75ae: Update Luxon dependency to 2.x
+- Updated dependencies
+  - @backstage/core-components@0.3.1
+  - @backstage/core-plugin-api@0.1.6
+  - @backstage/plugin-catalog-react@0.4.2
+
+## 0.3.7
+
+### Patch Changes
+
+- 260c053b9: Fix All Material UI Warnings
+- Updated dependencies
+  - @backstage/core-components@0.3.0
+  - @backstage/core-plugin-api@0.1.5
+  - @backstage/plugin-catalog-react@0.4.1
+
+## 0.3.6
+
+### Patch Changes
+
+- 9d40fcb1e: - Bumping `material-ui/core` version to at least `4.12.2` as they made some breaking changes in later versions which broke `Pagination` of the `Table`.
+  - Switching out `material-table` to `@material-table/core` for support for the later versions of `material-ui/core`
+  - This causes a minor API change to `@backstage/core-components` as the interface for `Table` re-exports the `prop` from the underlying `Table` components.
+  - `onChangeRowsPerPage` has been renamed to `onRowsPerPageChange`
+  - `onChangePage` has been renamed to `onPageChange`
+  - Migration guide is here: https://material-table-core.com/docs/breaking-changes
+- Updated dependencies
+  - @backstage/core-components@0.2.0
+  - @backstage/plugin-catalog-react@0.4.0
+  - @backstage/core-plugin-api@0.1.4
+  - @backstage/theme@0.2.9
+
+## 0.3.5
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@0.3.0
+
 ## 0.3.4
 
 ### Patch Changes
diff --git a/plugins/splunk-on-call/api-report.md b/plugins/splunk-on-call/api-report.md
index d17eb01564..02ebcc324f 100644
--- a/plugins/splunk-on-call/api-report.md
+++ b/plugins/splunk-on-call/api-report.md
@@ -12,33 +12,55 @@ import { DiscoveryApi } from '@backstage/core-plugin-api';
 import { Entity } from '@backstage/catalog-model';
 import { RouteRef } from '@backstage/core-plugin-api';
 
+// Warning: (ae-missing-release-tag) "EntitySplunkOnCallCard" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export const EntitySplunkOnCallCard: () => JSX.Element;
 
+// Warning: (ae-missing-release-tag) "isSplunkOnCallAvailable" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export const isSplunkOnCallAvailable: (entity: Entity) => boolean;
 
+// Warning: (ae-forgotten-export) The symbol "SplunkOnCallApi" needs to be exported by the entry point index.d.ts
+// Warning: (ae-missing-release-tag) "splunkOnCallApiRef" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export const splunkOnCallApiRef: ApiRef<SplunkOnCallApi>;
 
+// Warning: (ae-missing-release-tag) "SplunkOnCallClient" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export class SplunkOnCallClient implements SplunkOnCallApi {
+  // Warning: (ae-forgotten-export) The symbol "ClientApiConfig" needs to be exported by the entry point index.d.ts
   constructor(config: ClientApiConfig);
   // (undocumented)
   static fromConfig(
     configApi: ConfigApi,
     discoveryApi: DiscoveryApi,
   ): SplunkOnCallClient;
+  // Warning: (ae-forgotten-export) The symbol "EscalationPolicyInfo" needs to be exported by the entry point index.d.ts
+  //
   // (undocumented)
   getEscalationPolicies(): Promise<EscalationPolicyInfo[]>;
+  // Warning: (ae-forgotten-export) The symbol "Incident" needs to be exported by the entry point index.d.ts
+  //
   // (undocumented)
   getIncidents(): Promise<Incident[]>;
+  // Warning: (ae-forgotten-export) The symbol "OnCall" needs to be exported by the entry point index.d.ts
+  //
   // (undocumented)
   getOnCallUsers(): Promise<OnCall[]>;
+  // Warning: (ae-forgotten-export) The symbol "Team" needs to be exported by the entry point index.d.ts
+  //
   // (undocumented)
   getTeams(): Promise<Team[]>;
+  // Warning: (ae-forgotten-export) The symbol "User" needs to be exported by the entry point index.d.ts
+  //
   // (undocumented)
   getUsers(): Promise<User[]>;
+  // Warning: (ae-forgotten-export) The symbol "TriggerAlarmRequest" needs to be exported by the entry point index.d.ts
+  //
   // (undocumented)
   incidentAction({
     routingKey,
@@ -50,6 +72,8 @@ export class SplunkOnCallClient implements SplunkOnCallApi {
   }: TriggerAlarmRequest): Promise<Response>;
 }
 
+// Warning: (ae-missing-release-tag) "SplunkOnCallPage" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export const SplunkOnCallPage: {
   ({ title, subtitle, pageTitle }: SplunkOnCallPageProps): JSX.Element;
@@ -60,6 +84,8 @@ export const SplunkOnCallPage: {
   };
 };
 
+// Warning: (ae-missing-release-tag) "splunkOnCallPlugin" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 const splunkOnCallPlugin: BackstagePlugin<
   {
@@ -70,8 +96,14 @@ const splunkOnCallPlugin: BackstagePlugin<
 export { splunkOnCallPlugin as plugin };
 export { splunkOnCallPlugin };
 
+// Warning: (ae-missing-release-tag) "UnauthorizedError" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export class UnauthorizedError extends Error {}
 
+// Warnings were encountered during analysis:
+//
+// src/plugin.d.ts:7:5 - (ae-forgotten-export) The symbol "SplunkOnCallPageProps" needs to be exported by the entry point index.d.ts
+
 // (No @packageDocumentation comment for this package)
 ```
diff --git a/plugins/splunk-on-call/package.json b/plugins/splunk-on-call/package.json
index b553c4510d..b3704d7551 100644
--- a/plugins/splunk-on-call/package.json
+++ b/plugins/splunk-on-call/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-splunk-on-call",
-  "version": "0.3.4",
+  "version": "0.3.9",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -30,26 +30,26 @@
     "clean": "backstage-cli clean"
   },
   "dependencies": {
-    "@backstage/catalog-model": "^0.9.0",
-    "@backstage/core-components": "^0.1.5",
-    "@backstage/core-plugin-api": "^0.1.3",
-    "@backstage/plugin-catalog-react": "^0.2.6",
-    "@backstage/theme": "^0.2.8",
-    "@material-ui/core": "^4.11.0",
+    "@backstage/catalog-model": "^0.9.1",
+    "@backstage/core-components": "^0.4.1",
+    "@backstage/core-plugin-api": "^0.1.7",
+    "@backstage/plugin-catalog-react": "^0.4.5",
+    "@backstage/theme": "^0.2.10",
+    "@material-ui/core": "^4.12.2",
     "@material-ui/icons": "^4.9.1",
     "@material-ui/lab": "4.0.0-alpha.45",
     "classnames": "^2.2.6",
-    "luxon": "^1.25.0",
+    "luxon": "^2.0.2",
     "react": "^16.13.1",
     "react-dom": "^16.13.1",
     "react-router-dom": "6.0.0-beta.0",
     "react-use": "^17.2.4"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.7.3",
-    "@backstage/core-app-api": "^0.1.4",
-    "@backstage/dev-utils": "^0.2.1",
-    "@backstage/test-utils": "^0.1.14",
+    "@backstage/cli": "^0.7.11",
+    "@backstage/core-app-api": "^0.1.12",
+    "@backstage/dev-utils": "^0.2.9",
+    "@backstage/test-utils": "^0.1.17",
     "@testing-library/jest-dom": "^5.10.1",
     "@testing-library/react": "^11.2.5",
     "@testing-library/user-event": "^13.1.8",
diff --git a/plugins/splunk-on-call/src/components/EntitySplunkOnCallCard.tsx b/plugins/splunk-on-call/src/components/EntitySplunkOnCallCard.tsx
index 98a706d67f..5a645f0559 100644
--- a/plugins/splunk-on-call/src/components/EntitySplunkOnCallCard.tsx
+++ b/plugins/splunk-on-call/src/components/EntitySplunkOnCallCard.tsx
@@ -92,7 +92,11 @@ export const EntitySplunkOnCallCard = () => {
     setShowDialog(x => !x);
   }, []);
 
-  const { value: usersAndTeam, loading, error } = useAsync(async () => {
+  const {
+    value: usersAndTeam,
+    loading,
+    error,
+  } = useAsync(async () => {
     const allUsers = await api.getUsers();
     const usersHashMap = allUsers.reduce(
       (map: Record<string, User>, obj: User) => {
diff --git a/plugins/splunk-on-call/src/components/Escalation/EscalationPolicy.tsx b/plugins/splunk-on-call/src/components/Escalation/EscalationPolicy.tsx
index 53b37b0a7a..066fa954ad 100644
--- a/plugins/splunk-on-call/src/components/Escalation/EscalationPolicy.tsx
+++ b/plugins/splunk-on-call/src/components/Escalation/EscalationPolicy.tsx
@@ -56,7 +56,11 @@ export const EscalationPolicy = ({ users, team }: Props) => {
   const classes = useStyles();
   const api = useApi(splunkOnCallApiRef);
 
-  const { value: userNames, loading, error } = useAsync(async () => {
+  const {
+    value: userNames,
+    loading,
+    error,
+  } = useAsync(async () => {
     const oncalls = await api.getOnCallUsers();
     const teamUsernames = oncalls
       .filter(oncall => oncall.team?.name === team)
diff --git a/plugins/splunk-on-call/src/components/Incident/IncidentEmptyState.tsx b/plugins/splunk-on-call/src/components/Incident/IncidentEmptyState.tsx
index d567fa43b0..87108f3d74 100644
--- a/plugins/splunk-on-call/src/components/Incident/IncidentEmptyState.tsx
+++ b/plugins/splunk-on-call/src/components/Incident/IncidentEmptyState.tsx
@@ -20,7 +20,12 @@ import EmptyStateImage from '../../assets/emptystate.svg';
 
 export const IncidentsEmptyState = () => {
   return (
-    <Grid container justify="center" direction="column" alignItems="center">
+    <Grid
+      container
+      justifyContent="center"
+      direction="column"
+      alignItems="center"
+    >
       <Grid item xs={12}>
         <Typography variant="h5">Nice! No incidents found!</Typography>
       </Grid>
diff --git a/plugins/splunk-on-call/src/components/Incident/IncidentListItem.tsx b/plugins/splunk-on-call/src/components/Incident/IncidentListItem.tsx
index fac8f5e2f7..21bc7c35d2 100644
--- a/plugins/splunk-on-call/src/components/Incident/IncidentListItem.tsx
+++ b/plugins/splunk-on-call/src/components/Incident/IncidentListItem.tsx
@@ -160,17 +160,15 @@ export const IncidentListItem = ({
     return incident.monitorName;
   };
 
-  const [
-    { value: resolveValue, error: resolveError },
-    handleResolveIncident,
-  ] = useAsyncFn(
-    async ({ incidentId, incidentType }: TriggerAlarmRequest) =>
-      await api.incidentAction({
-        routingKey: team,
-        incidentType,
-        incidentId,
-      }),
-  );
+  const [{ value: resolveValue, error: resolveError }, handleResolveIncident] =
+    useAsyncFn(
+      async ({ incidentId, incidentType }: TriggerAlarmRequest) =>
+        await api.incidentAction({
+          routingKey: team,
+          incidentType,
+          incidentId,
+        }),
+    );
 
   const [
     { value: acknowledgeValue, error: acknowledgeError },
diff --git a/plugins/tech-radar/CHANGELOG.md b/plugins/tech-radar/CHANGELOG.md
index 20602282c6..139e44ea58 100644
--- a/plugins/tech-radar/CHANGELOG.md
+++ b/plugins/tech-radar/CHANGELOG.md
@@ -1,5 +1,44 @@
 # @backstage/plugin-tech-radar
 
+## 0.4.6
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.4.0
+
+## 0.4.5
+
+### Patch Changes
+
+- 56c773909: Switched `@types/react` dependency to request `*` rather than a specific version.
+- Updated dependencies
+  - @backstage/core-components@0.3.1
+  - @backstage/core-plugin-api@0.1.6
+
+## 0.4.4
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.3.0
+  - @backstage/core-plugin-api@0.1.5
+
+## 0.4.3
+
+### Patch Changes
+
+- 9d40fcb1e: - Bumping `material-ui/core` version to at least `4.12.2` as they made some breaking changes in later versions which broke `Pagination` of the `Table`.
+  - Switching out `material-table` to `@material-table/core` for support for the later versions of `material-ui/core`
+  - This causes a minor API change to `@backstage/core-components` as the interface for `Table` re-exports the `prop` from the underlying `Table` components.
+  - `onChangeRowsPerPage` has been renamed to `onRowsPerPageChange`
+  - `onChangePage` has been renamed to `onPageChange`
+  - Migration guide is here: https://material-table-core.com/docs/breaking-changes
+- Updated dependencies
+  - @backstage/core-components@0.2.0
+  - @backstage/core-plugin-api@0.1.4
+  - @backstage/theme@0.2.9
+
 ## 0.4.2
 
 ### Patch Changes
diff --git a/plugins/tech-radar/api-report.md b/plugins/tech-radar/api-report.md
index 4087e0d196..c93c10cb47 100644
--- a/plugins/tech-radar/api-report.md
+++ b/plugins/tech-radar/api-report.md
@@ -9,6 +9,8 @@ import { ApiRef } from '@backstage/core-plugin-api';
 import { BackstagePlugin } from '@backstage/core-plugin-api';
 import { RouteRef } from '@backstage/core-plugin-api';
 
+// Warning: (ae-missing-release-tag) "RadarEntry" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export interface RadarEntry {
   // (undocumented)
@@ -27,18 +29,24 @@ export interface RadarEntry {
   url: string;
 }
 
+// Warning: (ae-missing-release-tag) "RadarEntrySnapshot" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export interface RadarEntrySnapshot {
   // (undocumented)
   date: Date;
   // (undocumented)
   description?: string;
+  // Warning: (ae-forgotten-export) The symbol "MovedState" needs to be exported by the entry point index.d.ts
+  //
   // (undocumented)
   moved?: MovedState;
   // (undocumented)
   ringId: string;
 }
 
+// Warning: (ae-missing-release-tag) "RadarQuadrant" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export interface RadarQuadrant {
   // (undocumented)
@@ -47,6 +55,8 @@ export interface RadarQuadrant {
   name: string;
 }
 
+// Warning: (ae-missing-release-tag) "RadarRing" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export interface RadarRing {
   // (undocumented)
@@ -57,6 +67,8 @@ export interface RadarRing {
   name: string;
 }
 
+// Warning: (ae-missing-release-tag) "RadarPage" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export const Router: {
   ({ title, subtitle, pageTitle, ...props }: TechRadarPageProps): JSX.Element;
@@ -67,19 +79,27 @@ export const Router: {
   };
 };
 
+// Warning: (ae-missing-release-tag) "TechRadarApi" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export interface TechRadarApi {
   load: (id: string | undefined) => Promise<TechRadarLoaderResponse>;
 }
 
+// Warning: (ae-missing-release-tag) "techRadarApiRef" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export const techRadarApiRef: ApiRef<TechRadarApi>;
 
+// Warning: (ae-missing-release-tag) "RadarComponent" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export const TechRadarComponent: (
   props: TechRadarComponentProps,
 ) => JSX.Element;
 
+// Warning: (ae-missing-release-tag) "TechRadarComponentProps" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export interface TechRadarComponentProps {
   // (undocumented)
@@ -92,6 +112,8 @@ export interface TechRadarComponentProps {
   width: number;
 }
 
+// Warning: (ae-missing-release-tag) "TechRadarLoaderResponse" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export interface TechRadarLoaderResponse {
   // (undocumented)
@@ -102,6 +124,8 @@ export interface TechRadarLoaderResponse {
   rings: RadarRing[];
 }
 
+// Warning: (ae-missing-release-tag) "TechRadarPage" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export const TechRadarPage: {
   ({ title, subtitle, pageTitle, ...props }: TechRadarPageProps): JSX.Element;
@@ -112,6 +136,8 @@ export const TechRadarPage: {
   };
 };
 
+// Warning: (ae-missing-release-tag) "techRadarPlugin" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 const techRadarPlugin: BackstagePlugin<
   {
@@ -122,5 +148,9 @@ const techRadarPlugin: BackstagePlugin<
 export { techRadarPlugin as plugin };
 export { techRadarPlugin };
 
+// Warnings were encountered during analysis:
+//
+// src/components/RadarPage.d.ts:9:5 - (ae-forgotten-export) The symbol "TechRadarPageProps" needs to be exported by the entry point index.d.ts
+
 // (No @packageDocumentation comment for this package)
 ```
diff --git a/plugins/tech-radar/package.json b/plugins/tech-radar/package.json
index b6e9ccacc8..46b279c3fd 100644
--- a/plugins/tech-radar/package.json
+++ b/plugins/tech-radar/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-tech-radar",
-  "version": "0.4.2",
+  "version": "0.4.6",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -30,13 +30,13 @@
     "start": "backstage-cli plugin:serve"
   },
   "dependencies": {
-    "@backstage/core-components": "^0.1.5",
-    "@backstage/core-plugin-api": "^0.1.3",
-    "@backstage/theme": "^0.2.8",
-    "@material-ui/core": "^4.11.0",
+    "@backstage/core-components": "^0.4.1",
+    "@backstage/core-plugin-api": "^0.1.7",
+    "@backstage/theme": "^0.2.10",
+    "@material-ui/core": "^4.12.2",
     "@material-ui/icons": "^4.9.1",
     "@material-ui/lab": "4.0.0-alpha.45",
-    "color": "^3.1.2",
+    "color": "^4.0.1",
     "d3-force": "^2.0.1",
     "prop-types": "^15.7.2",
     "react": "^16.13.1",
@@ -44,10 +44,10 @@
     "react-use": "^17.2.4"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.7.3",
-    "@backstage/core-app-api": "^0.1.4",
-    "@backstage/dev-utils": "^0.2.1",
-    "@backstage/test-utils": "^0.1.14",
+    "@backstage/cli": "^0.7.11",
+    "@backstage/core-app-api": "^0.1.12",
+    "@backstage/dev-utils": "^0.2.9",
+    "@backstage/test-utils": "^0.1.17",
     "@testing-library/jest-dom": "^5.10.1",
     "@testing-library/react": "^11.2.5",
     "@testing-library/user-event": "^13.1.8",
@@ -55,7 +55,7 @@
     "@types/d3-force": "^2.1.1",
     "@types/jest": "^26.0.7",
     "@types/node": "^14.14.32",
-    "@types/react": "^16.9",
+    "@types/react": "*",
     "cross-fetch": "^3.0.6",
     "msw": "^0.29.0"
   },
diff --git a/plugins/tech-radar/src/components/RadarLegend/RadarLegend.tsx b/plugins/tech-radar/src/components/RadarLegend/RadarLegend.tsx
index ca55eb0c9d..b9bc6a59a6 100644
--- a/plugins/tech-radar/src/components/RadarLegend/RadarLegend.tsx
+++ b/plugins/tech-radar/src/components/RadarLegend/RadarLegend.tsx
@@ -271,13 +271,8 @@ const RadarLegend = (props: Props): JSX.Element => {
     return segments;
   };
 
-  const {
-    quadrants,
-    rings,
-    entries,
-    onEntryMouseEnter,
-    onEntryMouseLeave,
-  } = props;
+  const { quadrants, rings, entries, onEntryMouseEnter, onEntryMouseLeave } =
+    props;
 
   const segments: Segments = setupSegments(entries);
 
diff --git a/plugins/techdocs-backend/CHANGELOG.md b/plugins/techdocs-backend/CHANGELOG.md
index c6dc26cb63..8b8b059b02 100644
--- a/plugins/techdocs-backend/CHANGELOG.md
+++ b/plugins/techdocs-backend/CHANGELOG.md
@@ -1,5 +1,244 @@
 # @backstage/plugin-techdocs-backend
 
+## 0.10.1
+
+### Patch Changes
+
+- 30ed662a3: Adding in-context search to TechDocs Reader component. Using existing search-backend to query for indexed search results scoped into a specific entity's techdocs. Needs TechDocsCollator enabled on the backend to work.
+
+  Adding extra information to indexed tech docs documents for search.
+
+- a42a142c2: Errors encountered while attempting to load TechDocs search indices at
+  collation-time are now logged at `DEBUG` instead of `WARN` level.
+- Updated dependencies
+  - @backstage/techdocs-common@0.10.0
+  - @backstage/integration@0.6.3
+  - @backstage/search-common@0.2.0
+  - @backstage/catalog-model@0.9.1
+  - @backstage/backend-common@0.9.1
+
+## 0.10.0
+
+### Minor Changes
+
+- 58452cdb7: OpenStack Swift Client changed with Trendyol's OpenStack Swift SDK.
+
+  ## Migration from old OpenStack Swift Configuration
+
+  Let's assume we have the old OpenStack Swift configuration here.
+
+  ```yaml
+  techdocs:
+    publisher:
+      type: 'openStackSwift'
+      openStackSwift:
+        containerName: 'name-of-techdocs-storage-bucket'
+        credentials:
+          username: ${OPENSTACK_SWIFT_STORAGE_USERNAME}
+          password: ${OPENSTACK_SWIFT_STORAGE_PASSWORD}
+        authUrl: ${OPENSTACK_SWIFT_STORAGE_AUTH_URL}
+        keystoneAuthVersion: ${OPENSTACK_SWIFT_STORAGE_AUTH_VERSION}
+        domainId: ${OPENSTACK_SWIFT_STORAGE_DOMAIN_ID}
+        domainName: ${OPENSTACK_SWIFT_STORAGE_DOMAIN_NAME}
+        region: ${OPENSTACK_SWIFT_STORAGE_REGION}
+  ```
+
+  ##### Step 1: Change the credential keys
+
+  Since the new SDK uses _Application Credentials_ to authenticate OpenStack, we
+  need to change the keys `credentials.username` to `credentials.id`,
+  `credentials.password` to `credentials.secret` and use Application Credential ID
+  and secret here. For more detail about credentials look
+  [here](https://docs.openstack.org/api-ref/identity/v3/?expanded=password-authentication-with-unscoped-authorization-detail,authenticating-with-an-application-credential-detail#authenticating-with-an-application-credential).
+
+  ##### Step 2: Remove the unused keys
+
+  Since the new SDK doesn't use the old way authentication, we don't need the keys
+  `openStackSwift.keystoneAuthVersion`, `openStackSwift.domainId`,
+  `openStackSwift.domainName` and `openStackSwift.region`. So you can remove them.
+
+  ##### Step 3: Add Swift URL
+
+  The new SDK needs the OpenStack Swift connection URL for connecting the Swift.
+  So you need to add a new key called `openStackSwift.swiftUrl` and give the
+  OpenStack Swift url here. Example url should look like that:
+  `https://example.com:6780/swift/v1`
+
+  ##### That's it!
+
+  Your new configuration should look like that!
+
+  ```yaml
+  techdocs:
+    publisher:
+      type: 'openStackSwift'
+      openStackSwift:
+        containerName: 'name-of-techdocs-storage-bucket'
+        credentials:
+          id: ${OPENSTACK_SWIFT_STORAGE_APPLICATION_CREDENTIALS_ID}
+          secret: ${OPENSTACK_SWIFT_STORAGE_APPLICATION_CREDENTIALS_SECRET}
+        authUrl: ${OPENSTACK_SWIFT_STORAGE_AUTH_URL}
+        swiftUrl: ${OPENSTACK_SWIFT_STORAGE_SWIFT_URL}
+  ```
+
+- c772d9a84: TechDocs sites can now be accessed using paths containing entity triplets of
+  any case (e.g. `/docs/namespace/KIND/name` or `/docs/namespace/kind/name`).
+
+  If you do not use an external storage provider for serving TechDocs, this is a
+  transparent change and no action is required from you.
+
+  If you _do_ use an external storage provider for serving TechDocs (one of\* GCS,
+  AWS S3, or Azure Blob Storage), you must run a migration command against your
+  storage provider before updating.
+
+  [A migration guide is available here](https://backstage.io/docs/features/techdocs/how-to-guides#how-to-migrate-from-techdocs-alpha-to-beta).
+
+  - (\*) We're seeking help from the community to bring OpenStack Swift support
+    [to feature parity](https://github.com/backstage/backstage/issues/6763) with the above.
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.9.0
+  - @backstage/integration@0.6.2
+  - @backstage/config@0.1.8
+  - @backstage/techdocs-common@0.9.0
+
+## 0.9.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/integration@0.6.0
+  - @backstage/backend-common@0.8.9
+  - @backstage/techdocs-common@0.8.1
+
+## 0.9.1
+
+### Patch Changes
+
+- 48ea3d25b: The recommended value for a `backstage.io/techdocs-ref` annotation is now
+  `dir:.`, indicating "documentation source files are located in the same
+  directory relative to the catalog entity." Note that `url:<location>` values
+  are still supported.
+- Updated dependencies
+  - @backstage/backend-common@0.8.8
+  - @backstage/config@0.1.6
+  - @backstage/integration@0.5.9
+  - @backstage/techdocs-common@0.8.0
+  - @backstage/search-common@0.1.3
+
+## 0.9.0
+
+### Minor Changes
+
+- d32d01e5b: Improve the annotation `backstage.io/techdocs-ref: dir:<relative-target>` that links to a path that is relative to the source of the annotated entity.
+  This annotation works with the basic and the recommended flow, however, it will be most useful with the basic approach.
+
+  This change remove the deprecation of the `dir` reference and provides first-class support for it.
+  In addition, this change removes the support of the deprecated `github`, `gitlab`, and `azure/api` locations from the `dir` reference preparer.
+
+  #### Example Usage
+
+  The annotation is convenient if the documentation is stored in the same location, i.e. the same git repository, as the `catalog-info.yaml`.
+  While it is still supported to add full URLs such as `backstage.io/techdocs-ref: url:https://...` for custom setups, documentation is mostly stored in the same repository as the entity definition.
+  By automatically resolving the target relative to the registration location of the entity, the configuration overhead for this default setup is minimized.
+  Since it leverages the `@backstage/integrations` package for the URL resolution, this is compatible with every supported source.
+
+  Consider the following examples:
+
+  1. "I have a repository with a single `catalog-info.yaml` and a TechDocs page in the root folder!"
+
+  ```
+  https://github.com/backstage/example/tree/main/
+   |- catalog-info.yaml
+   |  > apiVersion: backstage.io/v1alpha1
+   |  > kind: Component
+   |  > metadata:
+   |  >   name: example
+   |  >   annotations:
+   |  >     backstage.io/techdocs-ref: dir:. # -> same folder
+   |  > spec: {}
+   |- docs/
+   |- mkdocs.yml
+  ```
+
+  2. "I have a repository with a single `catalog-info.yaml` and my TechDocs page in located in a folder!"
+
+  ```
+  https://bitbucket.org/my-owner/my-project/src/master/
+   |- catalog-info.yaml
+   |  > apiVersion: backstage.io/v1alpha1
+   |  > kind: Component
+   |  > metadata:
+   |  >   name: example
+   |  >   annotations:
+   |  >     backstage.io/techdocs-ref: dir:./some-folder # -> subfolder
+   |  > spec: {}
+   |- some-folder/
+     |- docs/
+     |- mkdocs.yml
+  ```
+
+  3. "I have a mono repository that hosts multiple components!"
+
+  ```
+  https://dev.azure.com/organization/project/_git/repository
+   |- my-1st-module/
+     |- catalog-info.yaml
+     |  > apiVersion: backstage.io/v1alpha1
+     |  > kind: Component
+     |  > metadata:
+     |  >   name: my-1st-module
+     |  >   annotations:
+     |  >     backstage.io/techdocs-ref: dir:. # -> same folder
+     |  > spec: {}
+     |- docs/
+     |- mkdocs.yml
+   |- my-2nd-module/
+     |- catalog-info.yaml
+     |  > apiVersion: backstage.io/v1alpha1
+     |  > kind: Component
+     |  > metadata:
+     |  >   name: my-2nd-module
+     |  >   annotations:
+     |  >     backstage.io/techdocs-ref: dir:. # -> same folder
+     |  > spec: {}
+     |- docs/
+     |- mkdocs.yml
+   |- catalog-info.yaml
+   |  > apiVersion: backstage.io/v1alpha1
+   |  > kind: Location
+   |  > metadata:
+   |  >   name: example
+   |  > spec:
+   |  >   targets:
+   |  >     - ./*/catalog-info.yaml
+  ```
+
+### Patch Changes
+
+- 9266b80ab: Implements tech docs collator to retrieve and expose search indexes for entities that have tech docs configured
+- Updated dependencies
+  - @backstage/techdocs-common@0.7.0
+  - @backstage/catalog-client@0.3.17
+  - @backstage/backend-common@0.8.7
+
+## 0.8.7
+
+### Patch Changes
+
+- f1200f44c: Rewrite the `/sync/:namespace/:kind/:name` endpoint to support an event-stream as response.
+  This change allows the sync process to take longer than a normal HTTP timeout.
+  The stream also emits log events, so the caller can follow the build process in the frontend.
+- 35a67722b: It is no longer required to provide a generator and a preparer to the TechDocs
+  router factory when running TechDocs in the "recommended" (e.g. externally
+  prepared and generated docs) configuration.
+- ae84b20cf: Revert the upgrade to `fs-extra@10.0.0` as that seemed to have broken all installs inexplicably.
+- Updated dependencies
+  - @backstage/backend-common@0.8.6
+  - @backstage/techdocs-common@0.6.8
+
 ## 0.8.6
 
 ### Patch Changes
diff --git a/plugins/techdocs-backend/api-report.md b/plugins/techdocs-backend/api-report.md
index 5777a3fd56..4190b3e67c 100644
--- a/plugins/techdocs-backend/api-report.md
+++ b/plugins/techdocs-backend/api-report.md
@@ -3,7 +3,9 @@
 > Do not edit this file. It is a report generated by [API Extractor](https://api-extractor.com/).
 
 ```ts
+import { CatalogApi } from '@backstage/catalog-client';
 import { Config } from '@backstage/config';
+import { DocumentCollator } from '@backstage/search-common';
 import express from 'express';
 import { GeneratorBuilder } from '@backstage/techdocs-common';
 import { Knex } from 'knex';
@@ -11,10 +13,48 @@ import { Logger as Logger_2 } from 'winston';
 import { PluginEndpointDiscovery } from '@backstage/backend-common';
 import { PreparerBuilder } from '@backstage/techdocs-common';
 import { PublisherBase } from '@backstage/techdocs-common';
+import { TechDocsDocument } from '@backstage/techdocs-common';
 
+// Warning: (ae-forgotten-export) The symbol "RouterOptions" needs to be exported by the entry point index.d.ts
+// Warning: (ae-missing-release-tag) "createRouter" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export function createRouter(options: RouterOptions): Promise<express.Router>;
 
+// Warning: (ae-missing-release-tag) "DefaultTechDocsCollator" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
+// @public (undocumented)
+export class DefaultTechDocsCollator implements DocumentCollator {
+  constructor({
+    discovery,
+    locationTemplate,
+    logger,
+    catalogClient,
+    parallelismLimit,
+  }: {
+    discovery: PluginEndpointDiscovery;
+    logger: Logger_2;
+    locationTemplate?: string;
+    catalogClient?: CatalogApi;
+    parallelismLimit?: number;
+  });
+  // (undocumented)
+  protected applyArgsToFormat(
+    format: string,
+    args: Record<string, string>,
+  ): string;
+  // (undocumented)
+  protected discovery: PluginEndpointDiscovery;
+  // (undocumented)
+  execute(): Promise<TechDocsDocument[]>;
+  // (undocumented)
+  protected locationTemplate: string;
+  // (undocumented)
+  readonly type: string;
+}
+
+export { TechDocsDocument };
+
 export * from '@backstage/techdocs-common';
 
 // (No @packageDocumentation comment for this package)
diff --git a/plugins/techdocs-backend/config.d.ts b/plugins/techdocs-backend/config.d.ts
index b19e7af175..ac31474fa9 100644
--- a/plugins/techdocs-backend/config.d.ts
+++ b/plugins/techdocs-backend/config.d.ts
@@ -29,7 +29,31 @@ export interface Config {
     /**
      * Techdocs generator information
      */
+    generator?: {
+      /**
+       * Where to run the techdocs (mkdocs) generator
+       */
+      runIn: 'local' | 'docker';
+
+      /**
+       * Override the default techdocs docker image
+       */
+      dockerImage?: string;
+
+      /**
+       * Pull the latest docker image
+       */
+      pullImage?: boolean;
+    };
+
+    /**
+     * Techdocs generator information
+     * @deprecated Replaced with techdocs.generator
+     */
     generators?: {
+      /**
+       * @deprecated Use techdocs.generator.runIn
+       */
       techdocs: 'local' | 'docker';
     };
 
@@ -113,15 +137,15 @@ export interface Config {
              */
             credentials: {
               /**
-               * (Required) Root user name
+               * (Required) Application Credential ID
                * @visibility secret
                */
-              username: string;
+              id: string;
               /**
-               * (Required) Root user password
+               * (Required) Application Credential Secret
                * @visibility secret
                */
-              password: string; // required
+              secret: string; // required
             };
             /**
              * (Required) Cloud Storage Container Name
@@ -134,26 +158,10 @@ export interface Config {
              */
             authUrl: string;
             /**
-             * (Optional) Auth version
-             * If not set, 'v2.0' will be used.
+             * (Required) Swift URL
              * @visibility backend
              */
-            keystoneAuthVersion: string;
-            /**
-             * (Required) Domain Id
-             * @visibility backend
-             */
-            domainId: string;
-            /**
-             * (Required) Domain Name
-             * @visibility backend
-             */
-            domainName: string;
-            /**
-             * (Required) Region
-             * @visibility backend
-             */
-            region: string;
+            swiftUrl: string;
           };
         }
       | {
@@ -222,5 +230,15 @@ export interface Config {
      * @deprecated
      */
     storageUrl?: string;
+
+    /**
+     * (Optional and not recommended) Prior to version [0.x.y] of TechDocs, docs
+     * sites could only be accessed over paths with case-sensitive entity triplets
+     * e.g. (namespace/Kind/name). If you are upgrading from an older version of
+     * TechDocs and are unable to perform the necessary migration of files in your
+     * external storage, you can set this value to `true` to temporarily revert to
+     * the old, case-sensitive entity triplet behavior.
+     */
+    legacyUseCaseSensitiveTripletPaths?: boolean;
   };
 }
diff --git a/plugins/techdocs-backend/examples/documented-component/catalog-info.yaml b/plugins/techdocs-backend/examples/documented-component/catalog-info.yaml
index ccdf8d3183..e6d14025e1 100644
--- a/plugins/techdocs-backend/examples/documented-component/catalog-info.yaml
+++ b/plugins/techdocs-backend/examples/documented-component/catalog-info.yaml
@@ -2,9 +2,10 @@ apiVersion: backstage.io/v1alpha1
 kind: Component
 metadata:
   name: documented-component
+  title: Documented Component
   description: A Service with TechDocs documentation
   annotations:
-    backstage.io/techdocs-ref: 'url:https://github.com/backstage/backstage/tree/master/plugins/techdocs-backend/examples/documented-component'
+    backstage.io/techdocs-ref: dir:.
 spec:
   type: service
   lifecycle: experimental
diff --git a/plugins/techdocs-backend/package.json b/plugins/techdocs-backend/package.json
index 714f3ad442..24317a0146 100644
--- a/plugins/techdocs-backend/package.json
+++ b/plugins/techdocs-backend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-techdocs-backend",
-  "version": "0.8.6",
+  "version": "0.10.1",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -30,11 +30,14 @@
     "clean": "backstage-cli clean"
   },
   "dependencies": {
-    "@backstage/backend-common": "^0.8.5",
-    "@backstage/catalog-model": "^0.9.0",
-    "@backstage/config": "^0.1.5",
+    "@backstage/backend-common": "^0.9.1",
+    "@backstage/catalog-client": "^0.3.17",
+    "@backstage/catalog-model": "^0.9.1",
+    "@backstage/config": "^0.1.8",
     "@backstage/errors": "^0.1.1",
-    "@backstage/techdocs-common": "^0.6.7",
+    "@backstage/integration": "^0.6.3",
+    "@backstage/search-common": "^0.2.0",
+    "@backstage/techdocs-common": "^0.10.0",
     "@types/express": "^4.17.6",
     "cross-fetch": "^3.0.6",
     "dockerode": "^3.2.1",
@@ -42,11 +45,15 @@
     "express-promise-router": "^4.1.0",
     "fs-extra": "9.1.0",
     "knex": "^0.95.1",
+    "lodash": "^4.17.21",
+    "p-limit": "^3.1.0",
     "winston": "^3.2.1"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.7.3",
+    "@backstage/cli": "^0.7.10",
+    "@backstage/test-utils": "^0.1.17",
     "@types/dockerode": "^3.2.1",
+    "msw": "^0.29.0",
     "supertest": "^6.1.3"
   },
   "files": [
diff --git a/plugins/techdocs-backend/src/DocsBuilder/builder.ts b/plugins/techdocs-backend/src/DocsBuilder/builder.ts
index e9df0b8400..5327062233 100644
--- a/plugins/techdocs-backend/src/DocsBuilder/builder.ts
+++ b/plugins/techdocs-backend/src/DocsBuilder/builder.ts
@@ -18,7 +18,9 @@ import {
   ENTITY_DEFAULT_NAMESPACE,
   stringifyEntityRef,
 } from '@backstage/catalog-model';
+import { Config } from '@backstage/config';
 import { NotModifiedError } from '@backstage/errors';
+import { ScmIntegrationRegistry } from '@backstage/integration';
 import {
   GeneratorBase,
   GeneratorBuilder,
@@ -31,8 +33,8 @@ import {
 import fs from 'fs-extra';
 import os from 'os';
 import path from 'path';
+import { Writable } from 'stream';
 import { Logger } from 'winston';
-import { Config } from '@backstage/config';
 import { BuildMetadataStorage } from './BuildMetadataStorage';
 
 type DocsBuilderArguments = {
@@ -42,6 +44,8 @@ type DocsBuilderArguments = {
   entity: Entity;
   logger: Logger;
   config: Config;
+  scmIntegrations: ScmIntegrationRegistry;
+  logStream?: Writable;
 };
 
 export class DocsBuilder {
@@ -51,6 +55,8 @@ export class DocsBuilder {
   private entity: Entity;
   private logger: Logger;
   private config: Config;
+  private scmIntegrations: ScmIntegrationRegistry;
+  private logStream: Writable | undefined;
 
   constructor({
     preparers,
@@ -59,6 +65,8 @@ export class DocsBuilder {
     entity,
     logger,
     config,
+    scmIntegrations,
+    logStream,
   }: DocsBuilderArguments) {
     this.preparer = preparers.get(entity);
     this.generator = generators.get(entity);
@@ -66,6 +74,8 @@ export class DocsBuilder {
     this.entity = entity;
     this.logger = logger;
     this.config = config;
+    this.scmIntegrations = scmIntegrations;
+    this.logStream = logStream;
   }
 
   /**
@@ -115,6 +125,7 @@ export class DocsBuilder {
     try {
       const preparerResponse = await this.preparer.prepare(this.entity, {
         etag: storedEtag,
+        logger: this.logger,
       });
 
       preparedDir = preparerResponse.preparedDir;
@@ -159,12 +170,18 @@ export class DocsBuilder {
     const outputDir = await fs.mkdtemp(
       path.join(tmpdirResolvedPath, 'techdocs-tmp-'),
     );
-    const parsedLocationAnnotation = getLocationForEntity(this.entity);
+
+    const parsedLocationAnnotation = getLocationForEntity(
+      this.entity,
+      this.scmIntegrations,
+    );
     await this.generator.run({
       inputDir: preparedDir,
       outputDir,
       parsedLocationAnnotation,
       etag: newEtag,
+      logger: this.logger,
+      logStream: this.logStream,
     });
 
     // Remove Prepared directory since it is no longer needed.
diff --git a/plugins/techdocs-backend/src/index.ts b/plugins/techdocs-backend/src/index.ts
index afbf04aba9..e2a89237db 100644
--- a/plugins/techdocs-backend/src/index.ts
+++ b/plugins/techdocs-backend/src/index.ts
@@ -14,5 +14,6 @@
  * limitations under the License.
  */
 
-export * from './service/router';
+export { createRouter } from './service/router';
+export * from './search';
 export * from '@backstage/techdocs-common';
diff --git a/plugins/techdocs-backend/src/search/DefaultTechDocsCollator.test.ts b/plugins/techdocs-backend/src/search/DefaultTechDocsCollator.test.ts
new file mode 100644
index 0000000000..618bb54d60
--- /dev/null
+++ b/plugins/techdocs-backend/src/search/DefaultTechDocsCollator.test.ts
@@ -0,0 +1,149 @@
+/*
+ * Copyright 2021 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import {
+  PluginEndpointDiscovery,
+  getVoidLogger,
+} from '@backstage/backend-common';
+import { Entity } from '@backstage/catalog-model';
+import { DefaultTechDocsCollator } from './DefaultTechDocsCollator';
+import { msw } from '@backstage/test-utils';
+import { setupServer } from 'msw/node';
+import { rest } from 'msw';
+
+const logger = getVoidLogger();
+
+const mockSearchDocIndex = {
+  config: {
+    lang: ['en'],
+    min_search_length: 3,
+    prebuild_index: false,
+    separator: '[\\s\\-]+',
+  },
+  docs: [
+    {
+      location: '',
+      text: 'docs docs docs',
+      title: 'Home',
+    },
+    {
+      location: 'local-development/',
+      text: 'Docs for first subtitle',
+      title: 'Local development',
+    },
+    {
+      location: 'local-development/#development',
+      text: 'Docs for sub-subtitle',
+      title: 'Development',
+    },
+  ],
+};
+
+const expectedEntities: Entity[] = [
+  {
+    apiVersion: 'backstage.io/v1alpha1',
+    kind: 'Component',
+    metadata: {
+      name: 'test-entity-with-docs',
+      description: 'Documented description',
+      annotations: {
+        'backstage.io/techdocs-ref': './',
+      },
+    },
+    spec: {
+      type: 'dog',
+      lifecycle: 'experimental',
+      owner: 'someone',
+    },
+  },
+  {
+    apiVersion: 'backstage.io/v1alpha1',
+    kind: 'Component',
+    metadata: {
+      name: 'test-entity',
+      description: 'The expected description',
+    },
+    spec: {
+      type: 'some-type',
+      lifecycle: 'experimental',
+    },
+  },
+];
+
+describe('DefaultTechDocsCollator', () => {
+  let mockDiscoveryApi: jest.Mocked<PluginEndpointDiscovery>;
+  let collator: DefaultTechDocsCollator;
+
+  const worker = setupServer();
+  msw.setupDefaultHandlers(worker);
+  beforeEach(() => {
+    mockDiscoveryApi = {
+      getBaseUrl: jest.fn().mockResolvedValue('http://test-backend'),
+      getExternalBaseUrl: jest.fn(),
+    };
+    collator = new DefaultTechDocsCollator({
+      discovery: mockDiscoveryApi,
+      logger,
+    });
+
+    worker.use(
+      rest.get(
+        'http://test-backend/static/docs/default/Component/test-entity-with-docs/search/search_index.json',
+        (_, res, ctx) => res(ctx.status(200), ctx.json(mockSearchDocIndex)),
+      ),
+      rest.get('http://test-backend/entities', (_, res, ctx) =>
+        res(ctx.status(200), ctx.json(expectedEntities)),
+      ),
+    );
+  });
+
+  it('fetches from the configured catalog and tech docs services', async () => {
+    const documents = await collator.execute();
+    expect(mockDiscoveryApi.getBaseUrl).toHaveBeenCalledWith('catalog');
+    expect(mockDiscoveryApi.getBaseUrl).toHaveBeenCalledWith('techdocs');
+    expect(documents).toHaveLength(mockSearchDocIndex.docs.length);
+  });
+
+  it('should create documents for each tech docs search index', async () => {
+    const documents = await collator.execute();
+    const entity = expectedEntities[0];
+    documents.forEach((document, idx) => {
+      expect(document).toMatchObject({
+        title: mockSearchDocIndex.docs[idx].title,
+        location: `/docs/default/Component/${entity.metadata.name}/${mockSearchDocIndex.docs[idx].location}`,
+        text: mockSearchDocIndex.docs[idx].text,
+        namespace: 'default',
+        componentType: entity!.spec!.type,
+        lifecycle: entity!.spec!.lifecycle,
+        owner: '',
+      });
+    });
+  });
+
+  it('maps a returned entity with a custom locationTemplate', async () => {
+    // Provide an alternate location template.
+    collator = new DefaultTechDocsCollator({
+      discovery: mockDiscoveryApi,
+      locationTemplate: '/software/:name',
+      logger,
+    });
+
+    const documents = await collator.execute();
+    expect(documents[0]).toMatchObject({
+      location: '/software/test-entity-with-docs',
+    });
+  });
+});
diff --git a/plugins/techdocs-backend/src/search/DefaultTechDocsCollator.ts b/plugins/techdocs-backend/src/search/DefaultTechDocsCollator.ts
new file mode 100644
index 0000000000..850be2823c
--- /dev/null
+++ b/plugins/techdocs-backend/src/search/DefaultTechDocsCollator.ts
@@ -0,0 +1,141 @@
+/*
+ * Copyright 2021 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { PluginEndpointDiscovery } from '@backstage/backend-common';
+import { Entity, RELATION_OWNED_BY } from '@backstage/catalog-model';
+import { DocumentCollator } from '@backstage/search-common';
+import fetch from 'cross-fetch';
+import unescape from 'lodash/unescape';
+import { Logger } from 'winston';
+import pLimit from 'p-limit';
+import { CatalogApi, CatalogClient } from '@backstage/catalog-client';
+import { TechDocsDocument } from '@backstage/techdocs-common';
+
+interface MkSearchIndexDoc {
+  title: string;
+  text: string;
+  location: string;
+}
+
+export class DefaultTechDocsCollator implements DocumentCollator {
+  protected discovery: PluginEndpointDiscovery;
+  protected locationTemplate: string;
+  private readonly logger: Logger;
+  private readonly catalogClient: CatalogApi;
+  private readonly parallelismLimit: number;
+  public readonly type: string = 'techdocs';
+
+  constructor({
+    discovery,
+    locationTemplate,
+    logger,
+    catalogClient,
+    parallelismLimit = 10,
+  }: {
+    discovery: PluginEndpointDiscovery;
+    logger: Logger;
+    locationTemplate?: string;
+    catalogClient?: CatalogApi;
+    parallelismLimit?: number;
+  }) {
+    this.discovery = discovery;
+    this.locationTemplate =
+      locationTemplate || '/docs/:namespace/:kind/:name/:path';
+    this.logger = logger;
+    this.catalogClient =
+      catalogClient || new CatalogClient({ discoveryApi: discovery });
+    this.parallelismLimit = parallelismLimit;
+  }
+
+  async execute() {
+    const limit = pLimit(this.parallelismLimit);
+    const techDocsBaseUrl = await this.discovery.getBaseUrl('techdocs');
+    const entities = await this.catalogClient.getEntities({
+      fields: [
+        'kind',
+        'namespace',
+        'metadata.annotations',
+        'metadata.name',
+        'metadata.namespace',
+        'spec.type',
+        'spec.lifecycle',
+        'relations',
+      ],
+    });
+    const docPromises = entities.items
+      .filter(it => it.metadata?.annotations?.['backstage.io/techdocs-ref'])
+      .map((entity: Entity) =>
+        limit(async (): Promise<TechDocsDocument[]> => {
+          const entityInfo = {
+            kind: entity.kind,
+            namespace: entity.metadata.namespace || 'default',
+            name: entity.metadata.name,
+          };
+
+          try {
+            const searchIndexResponse = await fetch(
+              DefaultTechDocsCollator.constructDocsIndexUrl(
+                techDocsBaseUrl,
+                entityInfo,
+              ),
+            );
+            const searchIndex = await searchIndexResponse.json();
+
+            return searchIndex.docs.map((doc: MkSearchIndexDoc) => ({
+              title: unescape(doc.title),
+              text: unescape(doc.text || ''),
+              location: this.applyArgsToFormat(this.locationTemplate, {
+                ...entityInfo,
+                path: doc.location,
+              }),
+              path: doc.location,
+              ...entityInfo,
+              componentType: entity.spec?.type?.toString() || 'other',
+              lifecycle: (entity.spec?.lifecycle as string) || '',
+              owner:
+                entity.relations?.find(r => r.type === RELATION_OWNED_BY)
+                  ?.target?.name || '',
+            }));
+          } catch (e) {
+            this.logger.debug(
+              `Failed to retrieve tech docs search index for entity ${entityInfo.namespace}/${entityInfo.kind}/${entityInfo.name}`,
+              e,
+            );
+            return [];
+          }
+        }),
+      );
+    return (await Promise.all(docPromises)).flat();
+  }
+
+  protected applyArgsToFormat(
+    format: string,
+    args: Record<string, string>,
+  ): string {
+    let formatted = format;
+    for (const [key, value] of Object.entries(args)) {
+      formatted = formatted.replace(`:${key}`, value);
+    }
+    return formatted;
+  }
+
+  private static constructDocsIndexUrl(
+    techDocsBaseUrl: string,
+    entityInfo: { kind: string; namespace: string; name: string },
+  ) {
+    return `${techDocsBaseUrl}/static/docs/${entityInfo.namespace}/${entityInfo.kind}/${entityInfo.name}/search/search_index.json`;
+  }
+}
diff --git a/plugins/techdocs-backend/src/search/index.ts b/plugins/techdocs-backend/src/search/index.ts
new file mode 100644
index 0000000000..fcb970bcee
--- /dev/null
+++ b/plugins/techdocs-backend/src/search/index.ts
@@ -0,0 +1,21 @@
+/*
+ * Copyright 2021 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+export { DefaultTechDocsCollator } from './DefaultTechDocsCollator';
+
+/**
+ * @deprecated Use directly from @backstage/techdocs-common
+ */
+export type { TechDocsDocument } from '@backstage/techdocs-common';
diff --git a/plugins/techdocs-backend/src/service/DocsSynchronizer.test.ts b/plugins/techdocs-backend/src/service/DocsSynchronizer.test.ts
new file mode 100644
index 0000000000..ac60f3da3a
--- /dev/null
+++ b/plugins/techdocs-backend/src/service/DocsSynchronizer.test.ts
@@ -0,0 +1,196 @@
+/*
+ * Copyright 2021 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import {
+  getVoidLogger,
+  PluginEndpointDiscovery,
+} from '@backstage/backend-common';
+import { ConfigReader } from '@backstage/config';
+import { ScmIntegrations } from '@backstage/integration';
+import {
+  GeneratorBuilder,
+  PreparerBuilder,
+  PublisherBase,
+} from '@backstage/techdocs-common';
+import { DocsBuilder, shouldCheckForUpdate } from '../DocsBuilder';
+import { DocsSynchronizer, DocsSynchronizerSyncOpts } from './DocsSynchronizer';
+
+jest.mock('../DocsBuilder');
+
+const MockedDocsBuilder = DocsBuilder as jest.MockedClass<typeof DocsBuilder>;
+
+describe('DocsSynchronizer', () => {
+  const preparers: jest.Mocked<PreparerBuilder> = {
+    register: jest.fn(),
+    get: jest.fn(),
+  };
+  const generators: jest.Mocked<GeneratorBuilder> = {
+    register: jest.fn(),
+    get: jest.fn(),
+  };
+  const publisher: jest.Mocked<PublisherBase> = {
+    docsRouter: jest.fn(),
+    fetchTechDocsMetadata: jest.fn(),
+    getReadiness: jest.fn(),
+    hasDocsBeenGenerated: jest.fn(),
+    publish: jest.fn(),
+  };
+  const discovery: jest.Mocked<PluginEndpointDiscovery> = {
+    getBaseUrl: jest.fn(),
+    getExternalBaseUrl: jest.fn(),
+  };
+
+  let docsSynchronizer: DocsSynchronizer;
+  const mockResponseHandler: jest.Mocked<DocsSynchronizerSyncOpts> = {
+    log: jest.fn(),
+    finish: jest.fn(),
+    error: jest.fn(),
+  };
+
+  beforeEach(async () => {
+    publisher.docsRouter.mockReturnValue(() => {});
+    discovery.getBaseUrl.mockImplementation(async type => {
+      return `http://backstage.local/api/${type}`;
+    });
+
+    docsSynchronizer = new DocsSynchronizer({
+      publisher,
+      config: new ConfigReader({}),
+      logger: getVoidLogger(),
+      scmIntegrations: ScmIntegrations.fromConfig(new ConfigReader({})),
+    });
+  });
+
+  afterEach(() => {
+    jest.resetAllMocks();
+  });
+
+  describe('doSync', () => {
+    it('should execute an update', async () => {
+      (shouldCheckForUpdate as jest.Mock).mockReturnValue(true);
+
+      const entity = {
+        apiVersion: 'backstage.io/v1alpha1',
+        kind: 'Component',
+        metadata: {
+          uid: '0',
+          name: 'test',
+          namespace: 'default',
+        },
+      };
+
+      MockedDocsBuilder.prototype.build.mockImplementation(async () => {
+        // extract the logStream from the constructor call
+        const logStream = MockedDocsBuilder.mock.calls[0][0].logStream;
+
+        logStream?.write('Some log');
+        logStream?.write('Another log');
+
+        const logger = MockedDocsBuilder.mock.calls[0][0].logger;
+
+        logger.info('Some more log');
+
+        return true;
+      });
+
+      publisher.hasDocsBeenGenerated.mockResolvedValue(true);
+
+      await docsSynchronizer.doSync({
+        responseHandler: mockResponseHandler,
+        entity,
+        preparers,
+        generators,
+      });
+
+      expect(mockResponseHandler.log).toBeCalledTimes(3);
+      expect(mockResponseHandler.log).toBeCalledWith('Some log');
+      expect(mockResponseHandler.log).toBeCalledWith('Another log');
+      expect(mockResponseHandler.log).toBeCalledWith(
+        expect.stringMatching(/info.*Some more log/),
+      );
+
+      expect(mockResponseHandler.finish).toBeCalledWith({ updated: true });
+
+      expect(mockResponseHandler.error).toBeCalledTimes(0);
+
+      expect(shouldCheckForUpdate).toBeCalledTimes(1);
+      expect(DocsBuilder.prototype.build).toBeCalledTimes(1);
+    });
+
+    it('should not check for an update too often', async () => {
+      (shouldCheckForUpdate as jest.Mock).mockReturnValue(false);
+
+      const entity = {
+        apiVersion: 'backstage.io/v1alpha1',
+        kind: 'Component',
+        metadata: {
+          uid: '0',
+          name: 'test',
+          namespace: 'default',
+        },
+      };
+
+      await docsSynchronizer.doSync({
+        responseHandler: mockResponseHandler,
+        entity,
+        preparers,
+        generators,
+      });
+
+      expect(mockResponseHandler.finish).toBeCalledWith({ updated: false });
+
+      expect(mockResponseHandler.log).toBeCalledTimes(0);
+      expect(mockResponseHandler.error).toBeCalledTimes(0);
+
+      expect(shouldCheckForUpdate).toBeCalledTimes(1);
+      expect(DocsBuilder.prototype.build).toBeCalledTimes(0);
+    });
+
+    it('should forward build errors', async () => {
+      (shouldCheckForUpdate as jest.Mock).mockReturnValue(true);
+
+      const entity = {
+        apiVersion: 'backstage.io/v1alpha1',
+        kind: 'Component',
+        metadata: {
+          uid: '0',
+          name: 'test',
+          namespace: 'default',
+        },
+      };
+
+      const error = new Error('Some random error');
+      MockedDocsBuilder.prototype.build.mockRejectedValue(error);
+
+      await docsSynchronizer.doSync({
+        responseHandler: mockResponseHandler,
+        entity,
+        preparers,
+        generators,
+      });
+
+      expect(mockResponseHandler.log).toBeCalledTimes(1);
+      expect(mockResponseHandler.log).toBeCalledWith(
+        expect.stringMatching(
+          /error.*: Failed to build the docs page: Some random error/,
+        ),
+      );
+      expect(mockResponseHandler.finish).toBeCalledTimes(0);
+      expect(mockResponseHandler.error).toBeCalledTimes(1);
+      expect(mockResponseHandler.error).toBeCalledWith(error);
+    });
+  });
+});
diff --git a/plugins/techdocs-backend/src/service/DocsSynchronizer.ts b/plugins/techdocs-backend/src/service/DocsSynchronizer.ts
new file mode 100644
index 0000000000..463b895564
--- /dev/null
+++ b/plugins/techdocs-backend/src/service/DocsSynchronizer.ts
@@ -0,0 +1,147 @@
+/*
+ * Copyright 2021 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { Entity } from '@backstage/catalog-model';
+import { Config } from '@backstage/config';
+import { NotFoundError } from '@backstage/errors';
+import { ScmIntegrationRegistry } from '@backstage/integration';
+import {
+  GeneratorBuilder,
+  PreparerBuilder,
+  PublisherBase,
+} from '@backstage/techdocs-common';
+import { PassThrough } from 'stream';
+import * as winston from 'winston';
+import { DocsBuilder, shouldCheckForUpdate } from '../DocsBuilder';
+
+export type DocsSynchronizerSyncOpts = {
+  log: (message: string) => void;
+  error: (e: Error) => void;
+  finish: (result: { updated: boolean }) => void;
+};
+
+export class DocsSynchronizer {
+  private readonly publisher: PublisherBase;
+  private readonly logger: winston.Logger;
+  private readonly config: Config;
+  private readonly scmIntegrations: ScmIntegrationRegistry;
+
+  constructor({
+    publisher,
+    logger,
+    config,
+    scmIntegrations,
+  }: {
+    publisher: PublisherBase;
+    logger: winston.Logger;
+    config: Config;
+    scmIntegrations: ScmIntegrationRegistry;
+  }) {
+    this.config = config;
+    this.logger = logger;
+    this.publisher = publisher;
+    this.scmIntegrations = scmIntegrations;
+  }
+
+  async doSync({
+    responseHandler: { log, error, finish },
+    entity,
+    preparers,
+    generators,
+  }: {
+    responseHandler: DocsSynchronizerSyncOpts;
+    entity: Entity;
+    preparers: PreparerBuilder;
+    generators: GeneratorBuilder;
+  }) {
+    // create a new logger to log data to the caller
+    const taskLogger = winston.createLogger({
+      level: process.env.LOG_LEVEL || 'info',
+      format: winston.format.combine(
+        winston.format.colorize(),
+        winston.format.timestamp(),
+        winston.format.simple(),
+      ),
+      defaultMeta: {},
+    });
+
+    // create an in-memory stream to forward logs to the event-stream
+    const logStream = new PassThrough();
+    logStream.on('data', async data => {
+      log(data.toString().trim());
+    });
+
+    taskLogger.add(new winston.transports.Stream({ stream: logStream }));
+
+    // check if the last update check was too recent
+    if (!shouldCheckForUpdate(entity.metadata.uid!)) {
+      finish({ updated: false });
+      return;
+    }
+
+    let foundDocs = false;
+
+    try {
+      const docsBuilder = new DocsBuilder({
+        preparers,
+        generators,
+        publisher: this.publisher,
+        logger: taskLogger,
+        entity,
+        config: this.config,
+        scmIntegrations: this.scmIntegrations,
+        logStream,
+      });
+
+      const updated = await docsBuilder.build();
+
+      if (!updated) {
+        finish({ updated: false });
+        return;
+      }
+    } catch (e) {
+      const msg = `Failed to build the docs page: ${e.message}`;
+      taskLogger.error(msg);
+      this.logger.error(msg, e);
+      error(e);
+      return;
+    }
+
+    // With a maximum of ~5 seconds wait, check if the files got published and if docs will be fetched
+    // on the user's page. If not, respond with a message asking them to check back later.
+    // The delay here is to make sure GCS/AWS/etc. registers newly uploaded files which is usually <1 second
+    for (let attempt = 0; attempt < 5; attempt++) {
+      if (await this.publisher.hasDocsBeenGenerated(entity)) {
+        foundDocs = true;
+        break;
+      }
+      await new Promise(r => setTimeout(r, 1000));
+    }
+    if (!foundDocs) {
+      this.logger.error(
+        'Published files are taking longer to show up in storage. Something went wrong.',
+      );
+      error(
+        new NotFoundError(
+          'Sorry! It took too long for the generated docs to show up in storage. Check back later.',
+        ),
+      );
+      return;
+    }
+
+    finish({ updated: true });
+  }
+}
diff --git a/plugins/techdocs-backend/src/service/router.test.ts b/plugins/techdocs-backend/src/service/router.test.ts
new file mode 100644
index 0000000000..84ab0c6d88
--- /dev/null
+++ b/plugins/techdocs-backend/src/service/router.test.ts
@@ -0,0 +1,469 @@
+/*
+ * Copyright 2021 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import {
+  errorHandler,
+  getVoidLogger,
+  PluginEndpointDiscovery,
+} from '@backstage/backend-common';
+import { CatalogClient } from '@backstage/catalog-client';
+import { ConfigReader } from '@backstage/config';
+import { NotModifiedError } from '@backstage/errors';
+import {
+  GeneratorBuilder,
+  PreparerBuilder,
+  PublisherBase,
+} from '@backstage/techdocs-common';
+import express, { Response } from 'express';
+import request from 'supertest';
+import { DocsSynchronizer, DocsSynchronizerSyncOpts } from './DocsSynchronizer';
+import { createEventStream, createHttpResponse, createRouter } from './router';
+
+jest.mock('@backstage/catalog-client');
+jest.mock('@backstage/config');
+jest.mock('./DocsSynchronizer');
+
+const MockedConfigReader = ConfigReader as jest.MockedClass<
+  typeof ConfigReader
+>;
+const MockCatalogClient = CatalogClient as jest.MockedClass<
+  typeof CatalogClient
+>;
+const MockDocsSynchronizer = DocsSynchronizer as jest.MockedClass<
+  typeof DocsSynchronizer
+>;
+
+describe('createRouter', () => {
+  const entity = {
+    apiVersion: 'backstage.io/v1alpha1',
+    kind: 'Component',
+    metadata: {
+      uid: '0',
+      name: 'test',
+    },
+  };
+  const entityWithoutMetadata = {
+    ...entity,
+    metadata: {
+      ...entity.metadata,
+      uid: undefined,
+    },
+  };
+
+  const preparers: jest.Mocked<PreparerBuilder> = {
+    register: jest.fn(),
+    get: jest.fn(),
+  };
+  const generators: jest.Mocked<GeneratorBuilder> = {
+    register: jest.fn(),
+    get: jest.fn(),
+  };
+  const publisher: jest.Mocked<PublisherBase> = {
+    docsRouter: jest.fn(),
+    fetchTechDocsMetadata: jest.fn(),
+    getReadiness: jest.fn(),
+    hasDocsBeenGenerated: jest.fn(),
+    publish: jest.fn(),
+  };
+  const discovery: jest.Mocked<PluginEndpointDiscovery> = {
+    getBaseUrl: jest.fn(),
+    getExternalBaseUrl: jest.fn(),
+  };
+
+  let app: express.Express;
+
+  beforeEach(() => {
+    jest.resetAllMocks();
+  });
+
+  beforeEach(async () => {
+    publisher.docsRouter.mockReturnValue(() => {});
+    discovery.getBaseUrl.mockImplementation(async type => {
+      return `http://backstage.local/api/${type}`;
+    });
+
+    const outOfTheBoxRouter = await createRouter({
+      preparers,
+      generators,
+      publisher,
+      config: new ConfigReader({}),
+      logger: getVoidLogger(),
+      discovery,
+    });
+    const recommendedRouter = await createRouter({
+      publisher,
+      config: new ConfigReader({}),
+      logger: getVoidLogger(),
+      discovery,
+    });
+
+    app = express();
+    app.use(outOfTheBoxRouter);
+    app.use('/recommended', recommendedRouter);
+    app.use(errorHandler());
+  });
+
+  describe('GET /sync/:namespace/:kind/:name', () => {
+    describe('accept application/json', () => {
+      it('should return not found if entity is not found', async () => {
+        MockCatalogClient.prototype.getEntityByName.mockResolvedValue(
+          undefined,
+        );
+
+        const response = await request(app)
+          .get('/sync/default/Component/test')
+          .send();
+
+        expect(response.status).toBe(404);
+      });
+
+      it('should return not found if entity has no uid', async () => {
+        MockCatalogClient.prototype.getEntityByName.mockResolvedValue(
+          entityWithoutMetadata,
+        );
+
+        const response = await request(app)
+          .get('/sync/default/Component/test')
+          .send();
+
+        expect(response.status).toBe(404);
+      });
+
+      it('should not check for an update without local builder', async () => {
+        MockedConfigReader.prototype.getString.mockReturnValue('external');
+        MockCatalogClient.prototype.getEntityByName.mockResolvedValue(entity);
+
+        const response = await request(app)
+          .get('/sync/default/Component/test')
+          .send();
+
+        expect(response.status).toBe(304);
+      });
+
+      it('should error if missing builder', async () => {
+        MockedConfigReader.prototype.getString.mockReturnValue('local');
+        MockCatalogClient.prototype.getEntityByName.mockResolvedValue(entity);
+
+        const response = await request(app)
+          .get('/recommended/sync/default/Component/test')
+          .send();
+
+        expect(response.status).toBe(500);
+        expect(response.text).toMatch(
+          /Invalid configuration\. 'techdocs\.builder' was set to 'local' but no 'preparer' was provided to the router initialization/,
+        );
+
+        expect(MockDocsSynchronizer.prototype.doSync).toBeCalledTimes(0);
+      });
+
+      it('should execute synchronization', async () => {
+        MockedConfigReader.prototype.getString.mockReturnValue('local');
+        MockCatalogClient.prototype.getEntityByName.mockResolvedValue(entity);
+        MockDocsSynchronizer.prototype.doSync.mockImplementation(
+          async ({ responseHandler }) =>
+            responseHandler.finish({ updated: true }),
+        );
+
+        await request(app).get('/sync/default/Component/test').send();
+
+        expect(MockDocsSynchronizer.prototype.doSync).toBeCalledTimes(1);
+        expect(MockDocsSynchronizer.prototype.doSync).toBeCalledWith({
+          responseHandler: {
+            log: expect.any(Function),
+            error: expect.any(Function),
+            finish: expect.any(Function),
+          },
+          entity,
+          generators,
+          preparers,
+        });
+      });
+
+      it('should return on updated', async () => {
+        MockedConfigReader.prototype.getString.mockReturnValue('local');
+        MockCatalogClient.prototype.getEntityByName.mockResolvedValue(entity);
+        MockDocsSynchronizer.prototype.doSync.mockImplementation(
+          async ({ responseHandler }) => {
+            const { log, finish } = responseHandler;
+
+            log('Some log');
+
+            finish({ updated: true });
+          },
+        );
+
+        const response = await request(app)
+          .get('/sync/default/Component/test')
+          .send();
+
+        expect(response.status).toBe(201);
+        expect(response.get('content-type')).toMatch(/application\/json/);
+        expect(response.text).toEqual(
+          '{"message":"Docs updated or did not need updating"}',
+        );
+      });
+    });
+
+    describe('accept text/event-stream', () => {
+      it('should return not found if entity is not found', async () => {
+        MockCatalogClient.prototype.getEntityByName.mockResolvedValue(
+          undefined,
+        );
+
+        const response = await request(app)
+          .get('/sync/default/Component/test')
+          .set('accept', 'text/event-stream')
+          .send();
+
+        expect(response.status).toBe(404);
+      });
+
+      it('should return not found if entity has no uid', async () => {
+        MockCatalogClient.prototype.getEntityByName.mockResolvedValue(
+          entityWithoutMetadata,
+        );
+
+        const response = await request(app)
+          .get('/sync/default/Component/test')
+          .set('accept', 'text/event-stream')
+          .send();
+
+        expect(response.status).toBe(404);
+      });
+
+      it('should not check for an update without local builder', async () => {
+        MockedConfigReader.prototype.getString.mockReturnValue('external');
+        MockCatalogClient.prototype.getEntityByName.mockResolvedValue(entity);
+
+        const response = await request(app)
+          .get('/sync/default/Component/test')
+          .set('accept', 'text/event-stream')
+          .send();
+
+        expect(response.status).toBe(200);
+        expect(response.get('content-type')).toBe('text/event-stream');
+        expect(response.text).toEqual(
+          `event: finish
+data: {"updated":false}
+
+`,
+        );
+      });
+
+      it('should error if missing builder', async () => {
+        MockedConfigReader.prototype.getString.mockReturnValue('local');
+        MockCatalogClient.prototype.getEntityByName.mockResolvedValue(entity);
+
+        const response = await request(app)
+          .get('/recommended/sync/default/Component/test')
+          .set('accept', 'text/event-stream')
+          .send();
+
+        expect(response.status).toBe(200);
+        expect(response.get('content-type')).toBe('text/event-stream');
+        expect(response.text).toEqual(
+          `event: error
+data: "Invalid configuration. 'techdocs.builder' was set to 'local' but no 'preparer' was provided to the router initialization."
+
+`,
+        );
+
+        expect(MockDocsSynchronizer.prototype.doSync).toBeCalledTimes(0);
+      });
+
+      it('should execute synchronization', async () => {
+        MockedConfigReader.prototype.getString.mockReturnValue('local');
+        MockCatalogClient.prototype.getEntityByName.mockResolvedValue(entity);
+        MockDocsSynchronizer.prototype.doSync.mockImplementation(
+          async ({ responseHandler }) =>
+            responseHandler.finish({ updated: true }),
+        );
+
+        await request(app)
+          .get('/sync/default/Component/test')
+          .set('accept', 'text/event-stream')
+          .send();
+
+        expect(MockDocsSynchronizer.prototype.doSync).toBeCalledTimes(1);
+        expect(MockDocsSynchronizer.prototype.doSync).toBeCalledWith({
+          responseHandler: {
+            log: expect.any(Function),
+            error: expect.any(Function),
+            finish: expect.any(Function),
+          },
+          entity,
+          generators,
+          preparers,
+        });
+      });
+
+      it('should return an event-stream', async () => {
+        MockedConfigReader.prototype.getString.mockReturnValue('local');
+        MockCatalogClient.prototype.getEntityByName.mockResolvedValue(entity);
+        MockDocsSynchronizer.prototype.doSync.mockImplementation(
+          async ({ responseHandler }) => {
+            const { log, finish } = responseHandler;
+
+            log('Some log');
+            log('Another log');
+
+            finish({ updated: true });
+          },
+        );
+
+        const response = await request(app)
+          .get('/sync/default/Component/test')
+          .set('accept', 'text/event-stream')
+          .send();
+
+        expect(response.status).toBe(200);
+        expect(response.get('content-type')).toBe('text/event-stream');
+        expect(response.text).toEqual(
+          `event: log
+data: "Some log"
+
+event: log
+data: "Another log"
+
+event: finish
+data: {"updated":true}
+
+`,
+        );
+      });
+    });
+  });
+});
+
+describe('createEventStream', () => {
+  const res: jest.Mocked<Response> = {
+    writeHead: jest.fn(),
+    write: jest.fn(),
+    end: jest.fn(),
+  } as any;
+
+  let handlers: DocsSynchronizerSyncOpts;
+
+  beforeEach(() => {
+    handlers = createEventStream(res);
+  });
+  afterEach(() => {
+    jest.resetAllMocks();
+  });
+
+  it('should return correct event stream', async () => {
+    // called in beforeEach
+
+    expect(res.writeHead).toBeCalledTimes(1);
+    expect(res.writeHead).toBeCalledWith(200, {
+      'Cache-Control': 'no-cache',
+      Connection: 'keep-alive',
+      'Content-Type': 'text/event-stream',
+    });
+  });
+
+  it('should flush after write if defined', async () => {
+    res.flush = jest.fn();
+
+    handlers.log('A Message');
+
+    expect(res.write).toBeCalledTimes(1);
+    expect(res.write).toBeCalledWith(`event: log
+data: "A Message"
+
+`);
+    expect(res.flush).toBeCalledTimes(1);
+  });
+
+  it('should write log', async () => {
+    handlers.log('A Message');
+
+    expect(res.write).toBeCalledTimes(1);
+    expect(res.write).toBeCalledWith(`event: log
+data: "A Message"
+
+`);
+    expect(res.end).toBeCalledTimes(0);
+  });
+
+  it('should write error and end the connection', async () => {
+    handlers.error(new Error('Some Error'));
+
+    expect(res.write).toBeCalledTimes(1);
+    expect(res.write).toBeCalledWith(`event: error
+data: "Some Error"
+
+`);
+    expect(res.end).toBeCalledTimes(1);
+  });
+
+  it('should finish and end the connection', async () => {
+    handlers.finish({ updated: true });
+
+    expect(res.write).toBeCalledTimes(1);
+    expect(res.write).toBeCalledWith(`event: finish
+data: {"updated":true}
+
+`);
+
+    expect(res.end).toBeCalledTimes(1);
+  });
+});
+
+describe('createHttpResponse', () => {
+  const res: jest.Mocked<Response> = {
+    status: jest.fn(),
+    json: jest.fn(),
+  } as any;
+
+  let handlers: DocsSynchronizerSyncOpts;
+
+  beforeEach(() => {
+    res.status.mockImplementation(() => res);
+    handlers = createHttpResponse(res);
+  });
+  afterEach(() => {
+    jest.resetAllMocks();
+  });
+
+  it('should return CREATED if updated', async () => {
+    handlers.finish({ updated: true });
+
+    expect(res.status).toBeCalledTimes(1);
+    expect(res.status).toBeCalledWith(201);
+
+    expect(res.json).toBeCalledTimes(1);
+    expect(res.json).toBeCalledWith({
+      message: 'Docs updated or did not need updating',
+    });
+  });
+
+  it('should return NOT_MODIFIED if not updated', async () => {
+    expect(() => handlers.finish({ updated: false })).toThrowError(
+      NotModifiedError,
+    );
+  });
+
+  it('should throw custom error', async () => {
+    expect(() => handlers.error(new Error('Some Error'))).toThrowError(
+      /Some Error/,
+    );
+  });
+
+  it('should ignore logs', async () => {
+    expect(() => handlers.log('Some Message')).not.toThrow();
+  });
+});
diff --git a/plugins/techdocs-backend/src/service/router.ts b/plugins/techdocs-backend/src/service/router.ts
index 7563dfa2f9..e560a895b6 100644
--- a/plugins/techdocs-backend/src/service/router.ts
+++ b/plugins/techdocs-backend/src/service/router.ts
@@ -14,6 +14,7 @@
  * limitations under the License.
  */
 import { PluginEndpointDiscovery } from '@backstage/backend-common';
+import { CatalogClient } from '@backstage/catalog-client';
 import { Entity, stringifyEntityRef } from '@backstage/catalog-model';
 import { Config } from '@backstage/config';
 import { NotFoundError, NotModifiedError } from '@backstage/errors';
@@ -24,12 +25,12 @@ import {
   PublisherBase,
 } from '@backstage/techdocs-common';
 import fetch from 'cross-fetch';
-import express from 'express';
+import express, { Response } from 'express';
 import Router from 'express-promise-router';
 import { Knex } from 'knex';
 import { Logger } from 'winston';
-import { DocsBuilder } from '../DocsBuilder';
-import { shouldCheckForUpdate } from '../DocsBuilder/BuildMetadataStorage';
+import { ScmIntegrations } from '@backstage/integration';
+import { DocsSynchronizer, DocsSynchronizerSyncOpts } from './DocsSynchronizer';
 
 /**
  * All of the required dependencies for running TechDocs in the "out-of-the-box"
@@ -78,6 +79,14 @@ export async function createRouter(
 ): Promise<express.Router> {
   const router = Router();
   const { publisher, config, logger, discovery } = options;
+  const catalogClient = new CatalogClient({ discoveryApi: discovery });
+  const scmIntegrations = ScmIntegrations.fromConfig(config);
+  const docsSynchronizer = new DocsSynchronizer({
+    publisher,
+    logger,
+    config,
+    scmIntegrations,
+  });
 
   router.get('/metadata/techdocs/:namespace/:kind/:name', async (req, res) => {
     const { kind, namespace, name } = req.params;
@@ -120,7 +129,7 @@ export async function createRouter(
         )
       ).json()) as Entity;
 
-      const locationMetadata = getLocationForEntity(entity);
+      const locationMetadata = getLocationForEntity(entity, scmIntegrations);
       res.json({ ...entity, locationMetadata });
     } catch (err) {
       logger.info(
@@ -136,114 +145,58 @@ export async function createRouter(
   });
 
   // Check if docs are the latest version and trigger rebuilds if not
-  // Responds with immediate success if rebuild not needed
+  // Responds with an event-stream that closes after the build finished
+  // Responds with an immediate success if rebuild not needed
   // If a build is required, responds with a success when finished
   router.get('/sync/:namespace/:kind/:name', async (req, res) => {
     const { kind, namespace, name } = req.params;
-    const catalogUrl = await discovery.getBaseUrl('catalog');
-    const triple = [kind, namespace, name].map(encodeURIComponent).join('/');
-
     const token = getBearerToken(req.headers.authorization);
-    const catalogRes = await fetch(`${catalogUrl}/entities/by-name/${triple}`, {
-      headers: token ? { Authorization: `Bearer ${token}` } : {},
-    });
-    if (!catalogRes.ok) {
-      const catalogResText = await catalogRes.text();
-      res.status(catalogRes.status);
-      res.send(catalogResText);
-      return;
-    }
 
-    const entity: Entity = await catalogRes.json();
+    const entity = await catalogClient.getEntityByName(
+      { kind, namespace, name },
+      { token },
+    );
 
-    if (!entity.metadata.uid) {
+    if (!entity?.metadata?.uid) {
       throw new NotFoundError('Entity metadata UID missing');
     }
-    if (!shouldCheckForUpdate(entity.metadata.uid)) {
-      res.status(200).json({
-        message: `Last check for documentation update is recent, did not retry.`,
-      });
-      return;
+
+    let responseHandler: DocsSynchronizerSyncOpts;
+    if (req.header('accept') !== 'text/event-stream') {
+      console.warn(
+        "The call to /sync/:namespace/:kind/:name wasn't done by an EventSource. This behavior is deprecated and will be removed soon. Make sure to update the @backstage/plugin-techdocs package in the frontend to the latest version.",
+      );
+      responseHandler = createHttpResponse(res);
+    } else {
+      responseHandler = createEventStream(res);
     }
 
-    let publisherType = '';
-    try {
-      publisherType = config.getString('techdocs.publisher.type');
-    } catch (err) {
-      throw new Error(
-        'Unable to get techdocs.publisher.type in your app config. Set it to either ' +
-          "'local', 'googleGcs' or other support storage providers. Read more here " +
-          'https://backstage.io/docs/features/techdocs/architecture',
-      );
-    }
     // techdocs-backend will only try to build documentation for an entity if techdocs.builder is set to 'local'
     // If set to 'external', it will assume that an external process (e.g. CI/CD pipeline
     // of the repository) is responsible for building and publishing documentation to the storage provider
     if (config.getString('techdocs.builder') !== 'local') {
-      res.status(200).json({
-        message:
-          '`techdocs.builder` app config is not set to `local`, so docs will not be generated locally and sync is not required.',
+      responseHandler.finish({ updated: false });
+      return;
+    }
+
+    // Set the synchronization and build process if "out-of-the-box" configuration is provided.
+    if (isOutOfTheBoxOption(options)) {
+      const { preparers, generators } = options;
+
+      await docsSynchronizer.doSync({
+        responseHandler,
+        entity,
+        preparers,
+        generators,
       });
       return;
     }
 
-    // Set up a DocsBuilder if "out-of-the-box" configuration is provided.
-    if (isOutOfTheBoxOption(options)) {
-      const { preparers, generators } = options;
-      const docsBuilder = new DocsBuilder({
-        preparers,
-        generators,
-        publisher,
-        logger,
-        entity,
-        config,
-      });
-      let foundDocs = false;
-      switch (publisherType) {
-        case 'local':
-        case 'awsS3':
-        case 'azureBlobStorage':
-        case 'openStackSwift':
-        case 'googleGcs': {
-          // This block should be valid for all storage implementations. So no need to duplicate in future,
-          // add the publisher type in the list here.
-          const updated = await docsBuilder.build();
-
-          if (!updated) {
-            throw new NotModifiedError();
-          }
-
-          // With a maximum of ~5 seconds wait, check if the files got published and if docs will be fetched
-          // on the user's page. If not, respond with a message asking them to check back later.
-          // The delay here is to make sure GCS/AWS/etc. registers newly uploaded files which is usually <1 second
-          for (let attempt = 0; attempt < 5; attempt++) {
-            if (await publisher.hasDocsBeenGenerated(entity)) {
-              foundDocs = true;
-              break;
-            }
-            await new Promise(r => setTimeout(r, 1000));
-          }
-          if (!foundDocs) {
-            logger.error(
-              'Published files are taking longer to show up in storage. Something went wrong.',
-            );
-            throw new NotFoundError(
-              'Sorry! It took too long for the generated docs to show up in storage. Check back later.',
-            );
-          }
-
-          res
-            .status(201)
-            .json({ message: 'Docs updated or did not need updating' });
-          break;
-        }
-
-        default:
-          throw new NotFoundError(
-            `Publisher type ${publisherType} is not supported by techdocs-backend docs builder.`,
-          );
-      }
-    }
+    responseHandler.error(
+      new Error(
+        "Invalid configuration. 'techdocs.builder' was set to 'local' but no 'preparer' was provided to the router initialization.",
+      ),
+    );
   });
 
   // Route middleware which serves files from the storage set in the publisher.
@@ -255,3 +208,79 @@ export async function createRouter(
 function getBearerToken(header?: string): string | undefined {
   return header?.match(/(?:Bearer)\s+(\S+)/i)?.[1];
 }
+
+/**
+ * Create an event-stream response that emits the events 'log', 'error', and 'finish'.
+ *
+ * @param res the response to write the event-stream to
+ * @returns A tuple of <log, error, finish> callbacks to emit messages. A call to 'error' or 'finish'
+ *          will close the event-stream.
+ */
+export function createEventStream(
+  res: Response<any, any>,
+): DocsSynchronizerSyncOpts {
+  // Mandatory headers and http status to keep connection open
+  res.writeHead(200, {
+    Connection: 'keep-alive',
+    'Cache-Control': 'no-cache',
+    'Content-Type': 'text/event-stream',
+  });
+
+  // client closes connection
+  res.socket?.on('close', () => {
+    res.end();
+  });
+
+  // write the event to the stream
+  const send = (type: 'error' | 'finish' | 'log', data: any) => {
+    res.write(`event: ${type}\ndata: ${JSON.stringify(data)}\n\n`);
+
+    // res.flush() is only available with the compression middleware
+    if (res.flush) {
+      res.flush();
+    }
+  };
+
+  return {
+    log: data => {
+      send('log', data);
+    },
+
+    error: e => {
+      send('error', e.message);
+      res.end();
+    },
+
+    finish: result => {
+      send('finish', result);
+      res.end();
+    },
+  };
+}
+
+/**
+ * Create a HTTP response. This is used for the legacy non-event-stream implementation of the sync endpoint.
+ *
+ * @param res the response to write the event-stream to
+ * @returns A tuple of <log, error, finish> callbacks to emit messages. A call to 'error' or 'finish'
+ *          will close the event-stream.
+ */
+export function createHttpResponse(
+  res: Response<any, any>,
+): DocsSynchronizerSyncOpts {
+  return {
+    log: () => {},
+    error: e => {
+      throw e;
+    },
+    finish: ({ updated }) => {
+      if (!updated) {
+        throw new NotModifiedError();
+      }
+
+      res
+        .status(201)
+        .json({ message: 'Docs updated or did not need updating' });
+    },
+  };
+}
diff --git a/plugins/techdocs-backend/src/service/standaloneServer.ts b/plugins/techdocs-backend/src/service/standaloneServer.ts
index 57298d8852..e8981963f1 100644
--- a/plugins/techdocs-backend/src/service/standaloneServer.ts
+++ b/plugins/techdocs-backend/src/service/standaloneServer.ts
@@ -70,10 +70,9 @@ export async function startStandaloneServer(
   const containerRunner = new DockerContainerRunner({ dockerClient });
 
   const generators = new Generators();
-  const techdocsGenerator = new TechdocsGenerator({
+  const techdocsGenerator = TechdocsGenerator.fromConfig(config, {
     logger,
     containerRunner,
-    config,
   });
   generators.register('techdocs', techdocsGenerator);
 
diff --git a/plugins/techdocs/CHANGELOG.md b/plugins/techdocs/CHANGELOG.md
index d0419ffd58..f920a0dd17 100644
--- a/plugins/techdocs/CHANGELOG.md
+++ b/plugins/techdocs/CHANGELOG.md
@@ -1,5 +1,172 @@
 # @backstage/plugin-techdocs
 
+## 0.11.1
+
+### Patch Changes
+
+- 30ed662a3: Adding in-context search to TechDocs Reader component. Using existing search-backend to query for indexed search results scoped into a specific entity's techdocs. Needs TechDocsCollator enabled on the backend to work.
+
+  Adding extra information to indexed tech docs documents for search.
+
+- 434dfc5d4: Display [metadata.title](https://backstage.io/docs/features/software-catalog/descriptor-format#title-optional) for components on the TechDocs homepage, if defined; otherwise fall back to `metadata.name` as displayed before.
+- Updated dependencies
+  - @backstage/plugin-catalog-react@0.4.5
+  - @backstage/integration@0.6.3
+  - @backstage/core-components@0.4.0
+  - @backstage/plugin-catalog@0.6.14
+  - @backstage/plugin-search@0.4.9
+  - @backstage/catalog-model@0.9.1
+  - @backstage/integration-react@0.1.8
+
+## 0.11.0
+
+### Minor Changes
+
+- c772d9a84: TechDocs sites can now be accessed using paths containing entity triplets of
+  any case (e.g. `/docs/namespace/KIND/name` or `/docs/namespace/kind/name`).
+
+  If you do not use an external storage provider for serving TechDocs, this is a
+  transparent change and no action is required from you.
+
+  If you _do_ use an external storage provider for serving TechDocs (one of\* GCS,
+  AWS S3, or Azure Blob Storage), you must run a migration command against your
+  storage provider before updating.
+
+  [A migration guide is available here](https://backstage.io/docs/features/techdocs/how-to-guides#how-to-migrate-from-techdocs-alpha-to-beta).
+
+  - (\*) We're seeking help from the community to bring OpenStack Swift support
+    [to feature parity](https://github.com/backstage/backstage/issues/6763) with the above.
+
+- 787bc0826: The TechDocs plugin has completed the migration to the Composability API. In
+  order to update to this version, please ensure you've made all necessary
+  changes to your `App.tsx` file as outlined in the [create-app changelog][cacl].
+
+  [cacl]: https://github.com/backstage/backstage/blob/master/packages/create-app/CHANGELOG.md
+
+### Patch Changes
+
+- 90c68a2ca: Fix Techdocs feedback icon link for GitHub URLs
+- Updated dependencies
+  - @backstage/plugin-catalog@0.6.13
+  - @backstage/plugin-catalog-react@0.4.4
+  - @backstage/core-components@0.3.3
+  - @backstage/integration@0.6.2
+  - @backstage/config@0.1.8
+
+## 0.10.4
+
+### Patch Changes
+
+- a440d3b38: Expose a new composable `TechDocsIndexPage` and a `DefaultTechDocsHome` with support for starring docs and filtering on owned, starred, owner, and tags.
+
+  You can migrate to the new UI view by making the following changes in your `App.tsx`:
+
+  ```diff
+  -    <Route path="/docs" element={<TechdocsPage />} />
+  +    <Route path="/docs" element={<TechDocsIndexPage />}>
+  +      <DefaultTechDocsHome />
+  +    </Route>
+  +    <Route
+  +      path="/docs/:namespace/:kind/:name/*"
+  +      element={<TechDocsReaderPage />}
+  +    />
+  ```
+
+- 56c773909: Switched `@types/react` dependency to request `*` rather than a specific version.
+- 8a3e46591: Switch `EventSource` implementation with header support from a Node.js API-based one to an XHR-based one.
+- Updated dependencies
+  - @backstage/integration@0.6.0
+  - @backstage/core-components@0.3.1
+  - @backstage/core-plugin-api@0.1.6
+  - @backstage/plugin-catalog@0.6.11
+  - @backstage/plugin-catalog-react@0.4.2
+  - @backstage/integration-react@0.1.7
+
+## 0.10.3
+
+### Patch Changes
+
+- 260c053b9: Fix All Material UI Warnings
+- db58cf06c: Avoid sanitize safe links in the header of document pages.
+- 1d65bd490: Fix Techdocs feedback icon link for GitLab URLs with subgroup(s) in path
+- Updated dependencies
+  - @backstage/core-components@0.3.0
+  - @backstage/config@0.1.6
+  - @backstage/core-plugin-api@0.1.5
+  - @backstage/integration@0.5.9
+  - @backstage/integration-react@0.1.6
+  - @backstage/plugin-catalog-react@0.4.1
+
+## 0.10.2
+
+### Patch Changes
+
+- 9d40fcb1e: - Bumping `material-ui/core` version to at least `4.12.2` as they made some breaking changes in later versions which broke `Pagination` of the `Table`.
+  - Switching out `material-table` to `@material-table/core` for support for the later versions of `material-ui/core`
+  - This causes a minor API change to `@backstage/core-components` as the interface for `Table` re-exports the `prop` from the underlying `Table` components.
+  - `onChangeRowsPerPage` has been renamed to `onRowsPerPageChange`
+  - `onChangePage` has been renamed to `onPageChange`
+  - Migration guide is here: https://material-table-core.com/docs/breaking-changes
+- 11c370af2: Optimize load times by only fetching entities with the `backstage.io/techdocs-ref` annotation
+- 2b1ac002d: TechDocs now uses a "safe by default" sanitization library, rather than relying on its own, hard-coded list of allowable tags and attributes.
+- Updated dependencies
+  - @backstage/core-components@0.2.0
+  - @backstage/plugin-catalog-react@0.4.0
+  - @backstage/core-plugin-api@0.1.4
+  - @backstage/integration-react@0.1.5
+  - @backstage/theme@0.2.9
+
+## 0.10.1
+
+### Patch Changes
+
+- 9266b80ab: Add search list item to display tech docs search results
+- 03bf17e9b: Improve the responsiveness of the EntityPage UI. With this the Header component should scale with the screen size & wrapping should not cause overflowing/blocking of links. Additionally enforce the Pages using the Grid Layout to use it across all screen sizes & to wrap as intended.
+
+  To benefit from the improved responsive layout, the `EntityPage` in existing Backstage applications should be updated to set the `xs` column size on each grid item in the page, as this does not default. For example:
+
+  ```diff
+  -  <Grid item md={6}>
+  +  <Grid item xs={12} md={6}>
+  ```
+
+- 378cc6a54: Only update the `path` when the content is updated.
+  If content and path are updated independently, the frontend rendering is triggered twice on each navigation: Once for the `path` change (with the old content) and once for the new content.
+  This might result in a flickering rendering that is caused by the async frontend preprocessing, and the fact that replacing the shadow dom content is expensive.
+- 214e7c52d: Refactor the techdocs transformers to return `Promise`s and await all transformations.
+- e35b13afa: Handle error responses in `getTechDocsMetadata` and `getEntityMetadata` such that `<TechDocsPageHeader>` doesn't throw errors.
+- Updated dependencies
+  - @backstage/core-components@0.1.6
+  - @backstage/plugin-catalog-react@0.3.1
+
+## 0.10.0
+
+### Minor Changes
+
+- 94a54dd47: Added a `migrateDocsCase()` method to TechDocs publishers, along with
+  implementations for AWS, Azure, and GCS.
+
+  This change is in support of a future update to TechDocs that will allow for
+  case-insensitive entity triplet URL access to documentation pages which will
+  require a migration of existing documentation objects in external storage
+  solutions.
+
+  See [#4367](https://github.com/backstage/backstage/issues/4367) for details.
+
+### Patch Changes
+
+- 537c37b0f: Fix displaying owned documents list by fetching associated entity relations
+- 136a91974: Show a "Refresh" button to if the content is stale.
+  This removes the need to do a full page-reload to display more recent TechDocs content.
+- f1200f44c: Rewrite the `/sync/:namespace/:kind/:name` endpoint to support an event-stream as response.
+  This change allows the sync process to take longer than a normal HTTP timeout.
+  The stream also emits log events, so the caller can follow the build process in the frontend.
+- 3af126cdd: Provide a Drawer component to follow a running build.
+  This can be used to debug the rendering and get build logs in case an error occurs.
+- 2a4a3b32d: Techdocs: fix sidebars not adjusting position automatically
+- Updated dependencies
+  - @backstage/plugin-catalog-react@0.3.0
+
 ## 0.9.9
 
 ### Patch Changes
diff --git a/plugins/techdocs/api-report.md b/plugins/techdocs/api-report.md
index 943831d91c..b9e776184a 100644
--- a/plugins/techdocs/api-report.md
+++ b/plugins/techdocs/api-report.md
@@ -5,6 +5,7 @@
 ```ts
 /// <reference types="react" />
 
+import { Action } from '@material-table/core';
 import { ApiRef } from '@backstage/core-plugin-api';
 import { BackstagePlugin } from '@backstage/core-plugin-api';
 import { Config } from '@backstage/config';
@@ -13,9 +14,69 @@ import { DiscoveryApi } from '@backstage/core-plugin-api';
 import { Entity } from '@backstage/catalog-model';
 import { EntityName } from '@backstage/catalog-model';
 import { IdentityApi } from '@backstage/core-plugin-api';
-import { Location as Location_2 } from '@backstage/catalog-model';
+import { LocationSpec } from '@backstage/catalog-model';
+import { default as React_2 } from 'react';
 import { RouteRef } from '@backstage/core-plugin-api';
+import { TableColumn } from '@backstage/core-components';
+import { TableProps } from '@backstage/core-components';
+import { UserListFilterKind } from '@backstage/plugin-catalog-react';
 
+// Warning: (ae-missing-release-tag) "createCopyDocsUrlAction" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
+// @public (undocumented)
+function createCopyDocsUrlAction(copyToClipboard: Function): (
+  row: DocsTableRow,
+) => {
+  icon: () => JSX.Element;
+  tooltip: string;
+  onClick: () => any;
+};
+
+// Warning: (ae-missing-release-tag) "createNameColumn" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
+// @public (undocumented)
+function createNameColumn(): TableColumn<DocsTableRow>;
+
+// Warning: (ae-missing-release-tag) "createOwnerColumn" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
+// @public (undocumented)
+function createOwnerColumn(): TableColumn<DocsTableRow>;
+
+// Warning: (ae-missing-release-tag) "createStarEntityAction" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
+// @public (undocumented)
+function createStarEntityAction(
+  isStarredEntity: Function,
+  toggleStarredEntity: Function,
+): ({ entity }: DocsTableRow) => {
+  cellStyle: {
+    paddingLeft: string;
+  };
+  icon: () => JSX.Element;
+  tooltip: string;
+  onClick: () => any;
+};
+
+// Warning: (ae-missing-release-tag) "createTypeColumn" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
+// @public (undocumented)
+function createTypeColumn(): TableColumn<DocsTableRow>;
+
+// Warning: (ae-missing-release-tag) "DefaultTechDocsHome" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
+// @public (undocumented)
+export const DefaultTechDocsHome: ({
+  initialFilter,
+  columns,
+  actions,
+}: {
+  initialFilter?: UserListFilterKind | undefined;
+  columns?: TableColumn<DocsTableRow>[] | undefined;
+  actions?: TableProps<DocsTableRow>['actions'];
+}) => JSX.Element;
+
+// Warning: (ae-missing-release-tag) "DocsCardGrid" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export const DocsCardGrid: ({
   entities,
@@ -23,48 +84,140 @@ export const DocsCardGrid: ({
   entities: Entity[] | undefined;
 }) => JSX.Element | null;
 
+// Warning: (ae-missing-release-tag) "DocsResultListItem" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
+// @public (undocumented)
+export const DocsResultListItem: ({
+  result,
+  lineClamp,
+  asListItem,
+  asLink,
+  title,
+}: {
+  result: any;
+  lineClamp?: number | undefined;
+  asListItem?: boolean | undefined;
+  asLink?: boolean | undefined;
+  title?: string | undefined;
+}) => JSX.Element;
+
+// Warning: (ae-missing-release-tag) "DocsTable" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export const DocsTable: ({
   entities,
   title,
+  loading,
+  columns,
+  actions,
 }: {
   entities: Entity[] | undefined;
   title?: string | undefined;
+  loading?: boolean | undefined;
+  columns?: TableColumn<DocsTableRow>[] | undefined;
+  actions?:
+    | (
+        | Action<DocsTableRow>
+        | {
+            action: (rowData: DocsTableRow) => Action<DocsTableRow>;
+            position: string;
+          }
+        | ((rowData: DocsTableRow) => Action<DocsTableRow>)
+      )[]
+    | undefined;
 }) => JSX.Element | null;
 
+// Warning: (ae-missing-release-tag) "DocsTableRow" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
-export const EmbeddedDocsRouter: (_props: Props) => JSX.Element;
+export type DocsTableRow = {
+  entity: Entity;
+  resolved: {
+    docsUrl: string;
+    ownedByRelationsTitle: string;
+    ownedByRelations: EntityName[];
+  };
+};
 
+// Warning: (ae-forgotten-export) The symbol "Props" needs to be exported by the entry point index.d.ts
+// Warning: (ae-missing-release-tag) "EmbeddedDocsRouter" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
+// @public (undocumented)
+export const EmbeddedDocsRouter: (_props: Props_2) => JSX.Element;
+
+// Warning: (ae-missing-release-tag) "EntityListDocsTable" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
+// @public (undocumented)
+export const EntityListDocsTable: {
+  ({
+    columns,
+    actions,
+  }: {
+    columns?: TableColumn<DocsTableRow>[] | undefined;
+    actions?: TableProps<DocsTableRow>['actions'];
+  }): JSX.Element;
+  columns: typeof columnFactories;
+  actions: typeof actionFactories;
+};
+
+// Warning: (ae-missing-release-tag) "EntityTechdocsContent" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export const EntityTechdocsContent: (_props: {
   entity?: Entity | undefined;
 }) => JSX.Element;
 
+// Warning: (ae-missing-release-tag) "PanelType" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export type PanelType = 'DocsCardGrid' | 'DocsTable';
 
+// Warning: (ae-forgotten-export) The symbol "Props" needs to be exported by the entry point index.d.ts
+// Warning: (ae-missing-release-tag) "Reader" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
-export const Reader: ({ entityId, onReady }: Props_2) => JSX.Element;
+export const Reader: ({
+  entityId,
+  onReady,
+  withSearch,
+}: Props_3) => JSX.Element;
 
+// Warning: (ae-missing-release-tag) "Router" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export const Router: () => JSX.Element;
 
+// Warning: (ae-missing-release-tag) "SyncResult" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
-export type SyncResult = 'cached' | 'updated' | 'timeout';
+export type SyncResult = 'cached' | 'updated';
 
+// Warning: (ae-missing-release-tag) "TechDocsApi" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export interface TechDocsApi {
   // (undocumented)
   getApiOrigin(): Promise<string>;
+  // Warning: (ae-forgotten-export) The symbol "TechDocsEntityMetadata" needs to be exported by the entry point index.d.ts
+  //
   // (undocumented)
   getEntityMetadata(entityId: EntityName): Promise<TechDocsEntityMetadata>;
+  // Warning: (ae-forgotten-export) The symbol "TechDocsMetadata" needs to be exported by the entry point index.d.ts
+  //
   // (undocumented)
   getTechDocsMetadata(entityId: EntityName): Promise<TechDocsMetadata>;
 }
 
+// Warning: (ae-missing-release-tag) "techdocsApiRef" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export const techdocsApiRef: ApiRef<TechDocsApi>;
 
+// Warning: (tsdoc-escape-right-brace) The "}" character should be escaped using a backslash to avoid confusion with a TSDoc inline tag
+// Warning: (tsdoc-malformed-inline-tag) Expecting a TSDoc tag starting with "{@"
+// Warning: (tsdoc-undefined-tag) The TSDoc tag "@property" is not defined in this configuration
+// Warning: (ae-missing-release-tag) "TechDocsClient" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public
 export class TechDocsClient implements TechDocsApi {
   constructor({
@@ -82,12 +235,18 @@ export class TechDocsClient implements TechDocsApi {
   discoveryApi: DiscoveryApi;
   // (undocumented)
   getApiOrigin(): Promise<string>;
+  // Warning: (tsdoc-param-tag-missing-hyphen) The @param block should be followed by a parameter name and then a hyphen
+  // Warning: (tsdoc-param-tag-with-invalid-type) The @param block should not include a JSDoc-style '{type}'
   getEntityMetadata(entityId: EntityName): Promise<TechDocsEntityMetadata>;
+  // Warning: (tsdoc-param-tag-missing-hyphen) The @param block should be followed by a parameter name and then a hyphen
+  // Warning: (tsdoc-param-tag-with-invalid-type) The @param block should not include a JSDoc-style '{type}'
   getTechDocsMetadata(entityId: EntityName): Promise<TechDocsMetadata>;
   // (undocumented)
   identityApi: IdentityApi;
 }
 
+// Warning: (ae-missing-release-tag) "TechDocsCustomHome" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export const TechDocsCustomHome: ({
   tabsConfig,
@@ -95,13 +254,38 @@ export const TechDocsCustomHome: ({
   tabsConfig: TabsConfig;
 }) => JSX.Element;
 
+// Warning: (ae-missing-release-tag) "TechDocsIndexPage" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
+// @public (undocumented)
+export const TechDocsIndexPage: () => JSX.Element;
+
+// Warning: (ae-missing-release-tag) "TechdocsPage" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export const TechdocsPage: () => JSX.Element;
 
+// Warning: (ae-forgotten-export) The symbol "Props" needs to be exported by the entry point index.d.ts
+// Warning: (ae-missing-release-tag) "TechDocsPageWrapper" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
+// @public (undocumented)
+export const TechDocsPageWrapper: ({ children }: Props) => JSX.Element;
+
+// Warning: (ae-missing-release-tag) "TechDocsPicker" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
+// @public (undocumented)
+export const TechDocsPicker: () => null;
+
+// Warning: (ae-missing-release-tag) "techdocsPlugin" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 const techdocsPlugin: BackstagePlugin<
   {
     root: RouteRef<undefined>;
+    docRoot: RouteRef<{
+      name: string;
+      kind: string;
+      namespace: string;
+    }>;
     entityContent: RouteRef<undefined>;
   },
   {}
@@ -109,9 +293,13 @@ const techdocsPlugin: BackstagePlugin<
 export { techdocsPlugin as plugin };
 export { techdocsPlugin };
 
+// Warning: (ae-missing-release-tag) "TechDocsReaderPage" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export const TechDocsReaderPage: () => JSX.Element;
 
+// Warning: (ae-missing-release-tag) "TechDocsStorageApi" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export interface TechDocsStorageApi {
   // (undocumented)
@@ -129,12 +317,22 @@ export interface TechDocsStorageApi {
   // (undocumented)
   getStorageUrl(): Promise<string>;
   // (undocumented)
-  syncEntityDocs(entityId: EntityName): Promise<SyncResult>;
+  syncEntityDocs(
+    entityId: EntityName,
+    logHandler?: (line: string) => void,
+  ): Promise<SyncResult>;
 }
 
+// Warning: (ae-missing-release-tag) "techdocsStorageApiRef" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export const techdocsStorageApiRef: ApiRef<TechDocsStorageApi>;
 
+// Warning: (tsdoc-escape-right-brace) The "}" character should be escaped using a backslash to avoid confusion with a TSDoc inline tag
+// Warning: (tsdoc-malformed-inline-tag) Expecting a TSDoc tag starting with "{@"
+// Warning: (tsdoc-undefined-tag) The TSDoc tag "@property" is not defined in this configuration
+// Warning: (ae-missing-release-tag) "TechDocsStorageClient" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public
 export class TechDocsStorageClient implements TechDocsStorageApi {
   constructor({
@@ -160,13 +358,38 @@ export class TechDocsStorageClient implements TechDocsStorageApi {
   ): Promise<string>;
   // (undocumented)
   getBuilder(): Promise<string>;
+  // Warning: (tsdoc-param-tag-missing-hyphen) The @param block should be followed by a parameter name and then a hyphen
+  // Warning: (tsdoc-param-tag-with-invalid-type) The @param block should not include a JSDoc-style '{type}'
+  // Warning: (tsdoc-param-tag-missing-hyphen) The @param block should be followed by a parameter name and then a hyphen
+  // Warning: (tsdoc-param-tag-with-invalid-type) The @param block should not include a JSDoc-style '{type}'
+  // Warning: (tsdoc-escape-right-brace) The "}" character should be escaped using a backslash to avoid confusion with a TSDoc inline tag
+  // Warning: (tsdoc-malformed-inline-tag) Expecting a TSDoc tag starting with "{@"
+  // Warning: (tsdoc-escape-right-brace) The "}" character should be escaped using a backslash to avoid confusion with a TSDoc inline tag
+  // Warning: (tsdoc-malformed-inline-tag) Expecting a TSDoc tag starting with "{@"
   getEntityDocs(entityId: EntityName, path: string): Promise<string>;
   // (undocumented)
   getStorageUrl(): Promise<string>;
   // (undocumented)
   identityApi: IdentityApi;
-  syncEntityDocs(entityId: EntityName): Promise<SyncResult>;
+  // Warning: (tsdoc-param-tag-missing-hyphen) The @param block should be followed by a parameter name and then a hyphen
+  // Warning: (tsdoc-param-tag-with-invalid-type) The @param block should not include a JSDoc-style '{type}'
+  // Warning: (tsdoc-param-tag-missing-hyphen) The @param block should be followed by a parameter name and then a hyphen
+  // Warning: (tsdoc-param-tag-with-invalid-type) The @param block should not include a JSDoc-style '{type}'
+  // Warning: (tsdoc-escape-right-brace) The "}" character should be escaped using a backslash to avoid confusion with a TSDoc inline tag
+  // Warning: (tsdoc-malformed-inline-tag) Expecting a TSDoc tag starting with "{@"
+  // Warning: (tsdoc-escape-right-brace) The "}" character should be escaped using a backslash to avoid confusion with a TSDoc inline tag
+  // Warning: (tsdoc-malformed-inline-tag) Expecting a TSDoc tag starting with "{@"
+  syncEntityDocs(
+    entityId: EntityName,
+    logHandler?: (line: string) => void,
+  ): Promise<SyncResult>;
 }
 
+// Warnings were encountered during analysis:
+//
+// src/home/components/EntityListDocsTable.d.ts:11:5 - (ae-forgotten-export) The symbol "columnFactories" needs to be exported by the entry point index.d.ts
+// src/home/components/EntityListDocsTable.d.ts:12:5 - (ae-forgotten-export) The symbol "actionFactories" needs to be exported by the entry point index.d.ts
+// src/plugin.d.ts:29:5 - (ae-forgotten-export) The symbol "TabsConfig" needs to be exported by the entry point index.d.ts
+
 // (No @packageDocumentation comment for this package)
 ```
diff --git a/plugins/techdocs/config.d.ts b/plugins/techdocs/config.d.ts
index ebc2aa2fd7..d6bf21b10b 100644
--- a/plugins/techdocs/config.d.ts
+++ b/plugins/techdocs/config.d.ts
@@ -26,6 +26,13 @@ export interface Config {
      */
     builder: 'local' | 'external';
 
+    /**
+     * Allows fallback to case-sensitive triplets in case of migration issues.
+     * @visibility frontend
+     * @see https://backstage.io/docs/features/techdocs/how-to-guides#how-to-migrate-from-techdocs-alpha-to-beta
+     */
+    legacyUseCaseSensitiveTripletPaths?: boolean;
+
     /**
      * @example http://localhost:7000/api/techdocs
      * @visibility frontend
diff --git a/plugins/techdocs/dev/index.tsx b/plugins/techdocs/dev/index.tsx
index cdc81caa5a..659a4e2caf 100644
--- a/plugins/techdocs/dev/index.tsx
+++ b/plugins/techdocs/dev/index.tsx
@@ -17,6 +17,7 @@
 import { createDevApp } from '@backstage/dev-utils';
 import { NotFoundError } from '@backstage/errors';
 import React from 'react';
+import { EntityName } from '@backstage/catalog-model';
 import {
   Reader,
   SyncResult,
@@ -81,9 +82,18 @@ function createPage({
       });
     }
 
-    async syncEntityDocs() {
+    async syncEntityDocs(_: EntityName, logHandler?: (line: string) => void) {
       if (syncDocsDelay) {
-        await new Promise(resolve => setTimeout(resolve, syncDocsDelay));
+        for (let i = 0; i < 10; i++) {
+          setTimeout(
+            () => logHandler?.call(this, `Log line ${i}`),
+            ((i + 1) * syncDocsDelay) / 10,
+          );
+        }
+
+        await new Promise(resolve => {
+          setTimeout(resolve, syncDocsDelay);
+        });
       }
 
       return syncDocs();
@@ -138,6 +148,11 @@ createDevApp()
 
           <TabbedLayout.Route path="/stale" title="Stale">
             {createPage({
+              entityDocs: ({ called, content }) => {
+                return called === 0
+                  ? content
+                  : content.replace(/World/, 'New World');
+              },
               syncDocs: () => 'updated',
               syncDocsDelay: 2000,
             })}
@@ -195,13 +210,6 @@ createDevApp()
               syncDocsDelay: 2000,
             })}
           </TabbedLayout.Route>
-
-          <TabbedLayout.Route path="/timeout" title="Sync Timeout">
-            {createPage({
-              syncDocs: () => 'timeout',
-              syncDocsDelay: 2000,
-            })}
-          </TabbedLayout.Route>
         </TabbedLayout>
       </Page>
     ),
diff --git a/plugins/techdocs/package.json b/plugins/techdocs/package.json
index 3b348873aa..2628ac925c 100644
--- a/plugins/techdocs/package.json
+++ b/plugins/techdocs/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-techdocs",
-  "version": "0.9.9",
+  "version": "0.11.1",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -31,38 +31,46 @@
     "clean": "backstage-cli clean"
   },
   "dependencies": {
-    "@backstage/catalog-model": "^0.9.0",
-    "@backstage/config": "^0.1.5",
-    "@backstage/core-components": "^0.1.5",
-    "@backstage/core-plugin-api": "^0.1.3",
+    "@backstage/catalog-model": "^0.9.1",
+    "@backstage/config": "^0.1.8",
+    "@backstage/core-components": "^0.4.1",
+    "@backstage/core-plugin-api": "^0.1.7",
     "@backstage/errors": "^0.1.1",
-    "@backstage/integration": "^0.5.8",
-    "@backstage/integration-react": "^0.1.4",
-    "@backstage/plugin-catalog-react": "^0.2.6",
-    "@backstage/theme": "^0.2.8",
-    "@material-ui/core": "^4.11.0",
+    "@backstage/integration": "^0.6.3",
+    "@backstage/integration-react": "^0.1.8",
+    "@backstage/plugin-catalog": "^0.6.14",
+    "@backstage/plugin-catalog-react": "^0.4.5",
+    "@backstage/plugin-search": "^0.4.9",
+    "@backstage/theme": "^0.2.10",
+    "@material-ui/core": "^4.12.2",
     "@material-ui/icons": "^4.9.1",
     "@material-ui/lab": "4.0.0-alpha.45",
     "@material-ui/styles": "^4.10.0",
+    "@types/react": "*",
+    "dompurify": "^2.2.9",
+    "event-source-polyfill": "^1.0.25",
+    "git-url-parse": "^11.6.0",
+    "lodash": "^4.17.21",
     "react": "^16.13.1",
     "react-dom": "^16.13.1",
+    "react-lazylog": "^4.5.2",
     "react-router": "6.0.0-beta.0",
     "react-router-dom": "6.0.0-beta.0",
-    "react-use": "^17.2.4",
-    "sanitize-html": "^2.3.2"
+    "react-text-truncate": "^0.16.0",
+    "react-use": "^17.2.4"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.7.3",
-    "@backstage/core-app-api": "^0.1.4",
-    "@backstage/dev-utils": "^0.2.1",
-    "@backstage/test-utils": "^0.1.14",
+    "@backstage/cli": "^0.7.11",
+    "@backstage/core-app-api": "^0.1.12",
+    "@backstage/dev-utils": "^0.2.9",
+    "@backstage/test-utils": "^0.1.17",
     "@testing-library/jest-dom": "^5.10.1",
     "@testing-library/react": "^11.2.5",
     "@testing-library/react-hooks": "^3.4.2",
     "@testing-library/user-event": "^13.1.8",
+    "@types/dompurify": "^2.2.2",
     "@types/jest": "^26.0.7",
     "@types/node": "^14.14.32",
-    "@types/react": "^16.9",
     "canvas": "^2.6.1",
     "cross-fetch": "^3.0.6",
     "msw": "^0.29.0"
diff --git a/plugins/techdocs/src/EntityPageDocs.tsx b/plugins/techdocs/src/EntityPageDocs.tsx
index 1e4957ab8e..f3d3e2cc88 100644
--- a/plugins/techdocs/src/EntityPageDocs.tsx
+++ b/plugins/techdocs/src/EntityPageDocs.tsx
@@ -21,6 +21,7 @@ import { Reader } from './reader';
 export const EntityPageDocs = ({ entity }: { entity: Entity }) => {
   return (
     <Reader
+      withSearch={false}
       entityId={{
         kind: entity.kind,
         namespace: entity.metadata.namespace ?? 'default',
diff --git a/plugins/techdocs/src/Router.tsx b/plugins/techdocs/src/Router.tsx
index 6218f7520d..45b0dc756c 100644
--- a/plugins/techdocs/src/Router.tsx
+++ b/plugins/techdocs/src/Router.tsx
@@ -18,13 +18,8 @@ import React from 'react';
 import { Entity } from '@backstage/catalog-model';
 import { useEntity } from '@backstage/plugin-catalog-react';
 import { Route, Routes } from 'react-router-dom';
-import {
-  rootRouteRef,
-  rootDocsRouteRef,
-  rootCatalogDocsRouteRef,
-} from './routes';
-import { TechDocsHome } from './home/components/TechDocsHome';
-import { TechDocsPage } from './reader/components/TechDocsPage';
+import { TechDocsIndexPage } from './home/components/TechDocsIndexPage';
+import { TechDocsPage as TechDocsReaderPage } from './reader/components/TechDocsPage';
 import { EntityPageDocs } from './EntityPageDocs';
 import { MissingAnnotationEmptyState } from '@backstage/core-components';
 
@@ -33,8 +28,11 @@ const TECHDOCS_ANNOTATION = 'backstage.io/techdocs-ref';
 export const Router = () => {
   return (
     <Routes>
-      <Route path={`/${rootRouteRef.path}`} element={<TechDocsHome />} />
-      <Route path={`/${rootDocsRouteRef.path}`} element={<TechDocsPage />} />
+      <Route path="/" element={<TechDocsIndexPage />} />
+      <Route
+        path="/:namespace/:kind/:name/*"
+        element={<TechDocsReaderPage />}
+      />
     </Routes>
   );
 };
@@ -55,10 +53,7 @@ export const EmbeddedDocsRouter = (_props: Props) => {
 
   return (
     <Routes>
-      <Route
-        path={`/${rootCatalogDocsRouteRef.path}`}
-        element={<EntityPageDocs entity={entity} />}
-      />
+      <Route path="/*" element={<EntityPageDocs entity={entity} />} />
     </Routes>
   );
 };
diff --git a/plugins/techdocs/src/api.ts b/plugins/techdocs/src/api.ts
index 739c5fc133..a23d9fc7f0 100644
--- a/plugins/techdocs/src/api.ts
+++ b/plugins/techdocs/src/api.ts
@@ -28,14 +28,17 @@ export const techdocsApiRef = createApiRef<TechDocsApi>({
   description: 'Used to make requests towards techdocs API',
 });
 
-export type SyncResult = 'cached' | 'updated' | 'timeout';
+export type SyncResult = 'cached' | 'updated';
 
 export interface TechDocsStorageApi {
   getApiOrigin(): Promise<string>;
   getStorageUrl(): Promise<string>;
   getBuilder(): Promise<string>;
   getEntityDocs(entityId: EntityName, path: string): Promise<string>;
-  syncEntityDocs(entityId: EntityName): Promise<SyncResult>;
+  syncEntityDocs(
+    entityId: EntityName,
+    logHandler?: (line: string) => void,
+  ): Promise<SyncResult>;
   getBaseUrl(
     oldBaseUrl: string,
     entityId: EntityName,
diff --git a/plugins/techdocs/src/client.test.ts b/plugins/techdocs/src/client.test.ts
index 329d3cbcb6..7624f250d9 100644
--- a/plugins/techdocs/src/client.test.ts
+++ b/plugins/techdocs/src/client.test.ts
@@ -13,9 +13,19 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 import { Config } from '@backstage/config';
-import { TechDocsStorageClient } from './client';
 import { UrlPatternDiscovery } from '@backstage/core-app-api';
+import { IdentityApi } from '@backstage/core-plugin-api';
+import { NotFoundError } from '@backstage/errors';
+import { EventSourcePolyfill } from 'event-source-polyfill';
+import { TechDocsStorageClient } from './client';
+
+const MockedEventSource = EventSourcePolyfill as jest.MockedClass<
+  typeof EventSourcePolyfill
+>;
+
+jest.mock('event-source-polyfill');
 
 const mockEntity = {
   kind: 'Component',
@@ -29,6 +39,16 @@ describe('TechDocsStorageClient', () => {
     getOptionalString: () => 'http://backstage:9191/api/techdocs',
   } as Partial<Config>;
   const discoveryApi = UrlPatternDiscovery.compile(mockBaseUrl);
+  const identityApi: jest.Mocked<IdentityApi> = {
+    getIdToken: jest.fn(),
+    getProfile: jest.fn(),
+    getUserId: jest.fn(),
+    signOut: jest.fn(),
+  };
+
+  beforeEach(() => {
+    jest.resetAllMocks();
+  });
 
   it('should return correct base url based on defined storage', async () => {
     // @ts-ignore Partial<Config> not assignable to Config.
@@ -51,4 +71,179 @@ describe('TechDocsStorageClient', () => {
       `${mockBaseUrl}/static/docs/${mockEntity.namespace}/${mockEntity.kind}/${mockEntity.name}/test/`,
     );
   });
+
+  describe('syncEntityDocs', () => {
+    it('should create eventsource without headers', async () => {
+      const storageApi = new TechDocsStorageClient({
+        // @ts-ignore Partial<Config> not assignable to Config.
+        configApi,
+        discoveryApi,
+        identityApi,
+      });
+
+      MockedEventSource.prototype.addEventListener.mockImplementation(
+        (type, fn) => {
+          if (type === 'finish' && typeof fn === 'function') {
+            fn({ data: '{"updated": false}' } as any);
+          }
+        },
+      );
+
+      await storageApi.syncEntityDocs(mockEntity);
+
+      expect(MockedEventSource).toBeCalledWith(
+        'http://backstage:9191/api/techdocs/sync/default/Component/test-component',
+        { withCredentials: true, headers: {} },
+      );
+    });
+
+    it('should create eventsource with headers', async () => {
+      const storageApi = new TechDocsStorageClient({
+        // @ts-ignore Partial<Config> not assignable to Config.
+        configApi,
+        discoveryApi,
+        identityApi,
+      });
+
+      MockedEventSource.prototype.addEventListener.mockImplementation(
+        (type, fn) => {
+          if (type === 'finish' && typeof fn === 'function') {
+            fn({ data: '{"updated": false}' } as any);
+          }
+        },
+      );
+
+      identityApi.getIdToken.mockResolvedValue('token');
+
+      await storageApi.syncEntityDocs(mockEntity);
+
+      expect(MockedEventSource).toBeCalledWith(
+        'http://backstage:9191/api/techdocs/sync/default/Component/test-component',
+        { withCredentials: true, headers: { Authorization: 'Bearer token' } },
+      );
+    });
+
+    it('should resolve to cached', async () => {
+      const storageApi = new TechDocsStorageClient({
+        // @ts-ignore Partial<Config> not assignable to Config.
+        configApi,
+        discoveryApi,
+        identityApi,
+      });
+
+      MockedEventSource.prototype.addEventListener.mockImplementation(
+        (type, fn) => {
+          if (type === 'finish' && typeof fn === 'function') {
+            fn({ data: '{"updated": false}' } as any);
+          }
+        },
+      );
+
+      await expect(storageApi.syncEntityDocs(mockEntity)).resolves.toEqual(
+        'cached',
+      );
+    });
+
+    it('should resolve to updated', async () => {
+      const storageApi = new TechDocsStorageClient({
+        // @ts-ignore Partial<Config> not assignable to Config.
+        configApi,
+        discoveryApi,
+        identityApi,
+      });
+
+      MockedEventSource.prototype.addEventListener.mockImplementation(
+        (type, fn) => {
+          if (type === 'finish' && typeof fn === 'function') {
+            fn({ data: '{"updated": true}' } as any);
+          }
+        },
+      );
+
+      await expect(storageApi.syncEntityDocs(mockEntity)).resolves.toEqual(
+        'updated',
+      );
+    });
+
+    it('should log values', async () => {
+      const storageApi = new TechDocsStorageClient({
+        // @ts-ignore Partial<Config> not assignable to Config.
+        configApi,
+        discoveryApi,
+        identityApi,
+      });
+
+      MockedEventSource.prototype.addEventListener.mockImplementation(
+        (type, fn) => {
+          if (type === 'log' && typeof fn === 'function') {
+            fn({ data: '"A log message"' } as any);
+          }
+
+          if (type === 'finish' && typeof fn === 'function') {
+            fn({ data: '{"updated": false}' } as any);
+          }
+        },
+      );
+
+      const logHandler = jest.fn();
+      await expect(
+        storageApi.syncEntityDocs(mockEntity, logHandler),
+      ).resolves.toEqual('cached');
+
+      expect(logHandler).toBeCalledTimes(1);
+      expect(logHandler).toBeCalledWith('A log message');
+    });
+
+    it('should throw NotFoundError', async () => {
+      const storageApi = new TechDocsStorageClient({
+        // @ts-ignore Partial<Config> not assignable to Config.
+        configApi,
+        discoveryApi,
+        identityApi,
+      });
+
+      // we await later after we emitted the error
+      const promise = storageApi.syncEntityDocs(mockEntity).then();
+
+      // flush the event loop
+      await new Promise(setImmediate);
+
+      const instance = MockedEventSource.mock
+        .instances[0] as jest.Mocked<EventSource>;
+
+      instance.onerror?.({
+        status: 404,
+        message: 'Some not found warning',
+      } as any);
+
+      await expect(promise).rejects.toThrow(NotFoundError);
+      await expect(promise).rejects.toThrowError('Some not found warning');
+    });
+
+    it('should throw generic errors', async () => {
+      const storageApi = new TechDocsStorageClient({
+        // @ts-ignore Partial<Config> not assignable to Config.
+        configApi,
+        discoveryApi,
+        identityApi,
+      });
+
+      // we await later after we emitted the error
+      const promise = storageApi.syncEntityDocs(mockEntity).then();
+
+      // flush the event loop
+      await new Promise(setImmediate);
+
+      const instance = MockedEventSource.mock
+        .instances[0] as jest.Mocked<EventSource>;
+
+      instance.onerror?.({
+        type: 'error',
+        data: 'Some other error',
+      } as any);
+
+      await expect(promise).rejects.toThrow(Error);
+      await expect(promise).rejects.toThrowError('Some other error');
+    });
+  });
 });
diff --git a/plugins/techdocs/src/client.ts b/plugins/techdocs/src/client.ts
index 19fc565a2f..8a3ad59c03 100644
--- a/plugins/techdocs/src/client.ts
+++ b/plugins/techdocs/src/client.ts
@@ -16,10 +16,11 @@
 
 import { EntityName } from '@backstage/catalog-model';
 import { Config } from '@backstage/config';
-import { NotFoundError } from '@backstage/errors';
+import { DiscoveryApi, IdentityApi } from '@backstage/core-plugin-api';
+import { NotFoundError, ResponseError } from '@backstage/errors';
+import { EventSourcePolyfill } from 'event-source-polyfill';
 import { SyncResult, TechDocsApi, TechDocsStorageApi } from './api';
 import { TechDocsEntityMetadata, TechDocsMetadata } from './types';
-import { DiscoveryApi, IdentityApi } from '@backstage/core-plugin-api';
 
 /**
  * API to talk to techdocs-backend.
@@ -71,9 +72,12 @@ export class TechDocsClient implements TechDocsApi {
     const request = await fetch(`${requestUrl}`, {
       headers: token ? { Authorization: `Bearer ${token}` } : {},
     });
-    const res = await request.json();
 
-    return res;
+    if (!request.ok) {
+      throw await ResponseError.fromResponse(request);
+    }
+
+    return await request.json();
   }
 
   /**
@@ -96,9 +100,12 @@ export class TechDocsClient implements TechDocsApi {
     const request = await fetch(`${requestUrl}`, {
       headers: token ? { Authorization: `Bearer ${token}` } : {},
     });
-    const res = await request.json();
 
-    return res;
+    if (!request.ok) {
+      throw await ResponseError.fromResponse(request);
+    }
+
+    return await request.json();
   }
 }
 
@@ -192,44 +199,60 @@ export class TechDocsStorageClient implements TechDocsStorageApi {
    * Check if docs are on the latest version and trigger rebuild if not
    *
    * @param {EntityName} entityId Object containing entity data like name, namespace, etc.
+   * @param {Function} logHandler Callback to receive log messages from the build process
    * @returns {SyncResult} Whether documents are currently synchronized to newest version
    * @throws {Error} Throws error on error from sync endpoint in Techdocs Backend
    */
-  async syncEntityDocs(entityId: EntityName): Promise<SyncResult> {
+  async syncEntityDocs(
+    entityId: EntityName,
+    logHandler: (line: string) => void = () => {},
+  ): Promise<SyncResult> {
     const { kind, namespace, name } = entityId;
 
     const apiOrigin = await this.getApiOrigin();
     const url = `${apiOrigin}/sync/${namespace}/${kind}/${name}`;
     const token = await this.identityApi.getIdToken();
-    let request;
-    let attempts: number = 0;
-    // retry if request times out, up to 5 times
-    // can happen due to docs taking too long to generate
-    while (!request || (request.status === 408 && attempts < 5)) {
-      attempts++;
-      request = await fetch(url, {
+
+    return new Promise((resolve, reject) => {
+      // Polyfill is used to add support for custom headers and auth
+      const source = new EventSourcePolyfill(url, {
+        withCredentials: true,
         headers: token ? { Authorization: `Bearer ${token}` } : {},
       });
-    }
 
-    switch (request.status) {
-      case 404:
-        throw new NotFoundError((await request.json()).error);
+      source.addEventListener('log', (e: any) => {
+        if (e.data) {
+          logHandler(JSON.parse(e.data));
+        }
+      });
 
-      case 200:
-      case 304:
-        return 'cached';
+      source.addEventListener('finish', (e: any) => {
+        let updated: boolean = false;
 
-      case 201:
-        return 'updated';
+        if (e.data) {
+          ({ updated } = JSON.parse(e.data));
+        }
 
-      // for timeout and misc errors, handle without error to allow viewing older docs
-      // if older docs not available,
-      // Reader will show 404 error coming from getEntityDocs
-      case 408:
-      default:
-        return 'timeout';
-    }
+        resolve(updated ? 'updated' : 'cached');
+      });
+
+      source.onerror = (e: any) => {
+        source.close();
+
+        switch (e.status) {
+          // the endpoint returned a 404 status
+          case 404:
+            reject(new NotFoundError(e.message));
+            return;
+
+          // also handles the event-stream close. the reject is ignored if the Promise was already
+          // resolved by a finish event.
+          default:
+            reject(new Error(e.data));
+            return;
+        }
+      };
+    });
   }
 
   async getBaseUrl(
diff --git a/plugins/techdocs/src/components/DocsResultListItem/DocsResultListItem.test.tsx b/plugins/techdocs/src/components/DocsResultListItem/DocsResultListItem.test.tsx
new file mode 100644
index 0000000000..22dc86f440
--- /dev/null
+++ b/plugins/techdocs/src/components/DocsResultListItem/DocsResultListItem.test.tsx
@@ -0,0 +1,62 @@
+/*
+ * Copyright 2021 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import React from 'react';
+import { render } from '@testing-library/react';
+import { DocsResultListItem } from './DocsResultListItem';
+
+// Using canvas to render text..
+jest.mock('react-text-truncate', () => {
+  return ({ text }: { text: string }) => <span>{text}</span>;
+});
+
+const validResult = {
+  location: 'https://backstage.io/docs',
+  title: 'Documentation',
+  text: 'Backstage is an open-source developer portal that puts the developer experience first.',
+  kind: 'library',
+  namespace: '',
+  name: 'Backstage',
+  lifecycle: 'production',
+};
+
+describe('DocsResultListItem test', () => {
+  it('should render search doc passed in', async () => {
+    const { findByText } = render(<DocsResultListItem result={validResult} />);
+
+    expect(
+      await findByText('Documentation | Backstage docs'),
+    ).toBeInTheDocument();
+    expect(
+      await findByText(
+        'Backstage is an open-source developer portal that puts the developer experience first.',
+      ),
+    ).toBeInTheDocument();
+  });
+
+  it('should use title if defined', async () => {
+    const { findByText } = render(
+      <DocsResultListItem result={validResult} title="Count Dookumentation" />,
+    );
+
+    expect(await findByText('Count Dookumentation')).toBeInTheDocument();
+    expect(
+      await findByText(
+        'Backstage is an open-source developer portal that puts the developer experience first.',
+      ),
+    ).toBeInTheDocument();
+  });
+});
diff --git a/plugins/techdocs/src/components/DocsResultListItem/DocsResultListItem.tsx b/plugins/techdocs/src/components/DocsResultListItem/DocsResultListItem.tsx
new file mode 100644
index 0000000000..54e6110b88
--- /dev/null
+++ b/plugins/techdocs/src/components/DocsResultListItem/DocsResultListItem.tsx
@@ -0,0 +1,84 @@
+/*
+ * Copyright 2021 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import React, { PropsWithChildren } from 'react';
+import { Divider, ListItem, ListItemText, makeStyles } from '@material-ui/core';
+import { Link } from '@backstage/core-components';
+import TextTruncate from 'react-text-truncate';
+
+const useStyles = makeStyles({
+  flexContainer: {
+    flexWrap: 'wrap',
+  },
+  itemText: {
+    width: '100%',
+    marginBottom: '1rem',
+  },
+});
+
+export const DocsResultListItem = ({
+  result,
+  lineClamp = 5,
+  asListItem = true,
+  asLink = true,
+  title,
+}: {
+  result: any;
+  lineClamp?: number;
+  asListItem?: boolean;
+  asLink?: boolean;
+  title?: string;
+}) => {
+  const classes = useStyles();
+  const TextItem = () => (
+    <ListItemText
+      className={classes.itemText}
+      primaryTypographyProps={{ variant: 'h6' }}
+      primary={title ? title : `${result.title} | ${result.name} docs`}
+      secondary={
+        <TextTruncate
+          line={lineClamp}
+          truncateText="…"
+          text={result.text}
+          element="span"
+        />
+      }
+    />
+  );
+
+  const LinkWrapper = ({ children }: PropsWithChildren<{}>) =>
+    asLink ? <Link to={result.location}>{children}</Link> : <>{children}</>;
+
+  const ListItemWrapper = ({ children }: PropsWithChildren<{}>) =>
+    asListItem ? (
+      <>
+        <ListItem alignItems="flex-start" className={classes.flexContainer}>
+          {children}
+        </ListItem>
+        <Divider component="li" />
+      </>
+    ) : (
+      <>{children}</>
+    );
+
+  return (
+    <LinkWrapper>
+      <ListItemWrapper>
+        <TextItem />
+      </ListItemWrapper>
+    </LinkWrapper>
+  );
+};
diff --git a/plugins/techdocs/src/components/DocsResultListItem/index.ts b/plugins/techdocs/src/components/DocsResultListItem/index.ts
new file mode 100644
index 0000000000..4e1e511ea1
--- /dev/null
+++ b/plugins/techdocs/src/components/DocsResultListItem/index.ts
@@ -0,0 +1,17 @@
+/*
+ * Copyright 2021 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+export { DocsResultListItem } from './DocsResultListItem';
diff --git a/plugins/techdocs/src/event-source-polyfill.d.ts b/plugins/techdocs/src/event-source-polyfill.d.ts
new file mode 100644
index 0000000000..8e298bde38
--- /dev/null
+++ b/plugins/techdocs/src/event-source-polyfill.d.ts
@@ -0,0 +1,27 @@
+/*
+ * Copyright 2021 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+declare module 'event-source-polyfill' {
+  export class EventSourcePolyfill extends EventSource {
+    constructor(
+      url: string,
+      options?: {
+        withCredentials?: boolean;
+        headers?: HeadersInit;
+      },
+    );
+  }
+}
diff --git a/plugins/techdocs/src/home/components/DefaultTechDocsHome.test.tsx b/plugins/techdocs/src/home/components/DefaultTechDocsHome.test.tsx
new file mode 100644
index 0000000000..48ea67585b
--- /dev/null
+++ b/plugins/techdocs/src/home/components/DefaultTechDocsHome.test.tsx
@@ -0,0 +1,90 @@
+/*
+ * Copyright 2021 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { CatalogApi, catalogApiRef } from '@backstage/plugin-catalog-react';
+import { MockStorageApi, renderInTestApp } from '@backstage/test-utils';
+import { screen } from '@testing-library/react';
+import React from 'react';
+import { DefaultTechDocsHome } from './DefaultTechDocsHome';
+
+import {
+  ApiProvider,
+  ApiRegistry,
+  ConfigReader,
+} from '@backstage/core-app-api';
+import {
+  ConfigApi,
+  configApiRef,
+  storageApiRef,
+} from '@backstage/core-plugin-api';
+import { rootDocsRouteRef } from '../../routes';
+
+jest.mock('@backstage/plugin-catalog-react', () => {
+  const actual = jest.requireActual('@backstage/plugin-catalog-react');
+  return {
+    ...actual,
+    useOwnUser: () => 'test-user',
+  };
+});
+
+const mockCatalogApi = {
+  getEntityByName: () => Promise.resolve(),
+  getEntities: async () => ({
+    items: [
+      {
+        apiVersion: 'version',
+        kind: 'User',
+        metadata: {
+          name: 'owned',
+          namespace: 'default',
+        },
+      },
+    ],
+  }),
+} as Partial<CatalogApi>;
+
+describe('TechDocs Home', () => {
+  const configApi: ConfigApi = new ConfigReader({
+    organization: {
+      name: 'My Company',
+    },
+  });
+
+  const apiRegistry = ApiRegistry.from([
+    [catalogApiRef, mockCatalogApi],
+    [configApiRef, configApi],
+    [storageApiRef, MockStorageApi.create()],
+  ]);
+
+  it('should render a TechDocs home page', async () => {
+    await renderInTestApp(
+      <ApiProvider apis={apiRegistry}>
+        <DefaultTechDocsHome />
+      </ApiProvider>,
+      {
+        mountedRoutes: {
+          '/docs/:namespace/:kind/:name/*': rootDocsRouteRef,
+        },
+      },
+    );
+
+    // Header
+    expect(await screen.findByText('Documentation')).toBeInTheDocument();
+    expect(
+      await screen.findByText(/Documentation available in My Company/i),
+    ).toBeInTheDocument();
+  });
+});
diff --git a/plugins/techdocs/src/home/components/DefaultTechDocsHome.tsx b/plugins/techdocs/src/home/components/DefaultTechDocsHome.tsx
new file mode 100644
index 0000000000..ff4bf63724
--- /dev/null
+++ b/plugins/techdocs/src/home/components/DefaultTechDocsHome.tsx
@@ -0,0 +1,75 @@
+/*
+ * Copyright 2021 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import React from 'react';
+import {
+  Content,
+  ContentHeader,
+  SupportButton,
+  TableColumn,
+  TableProps,
+} from '@backstage/core-components';
+import {
+  EntityListContainer,
+  FilterContainer,
+  FilteredEntityLayout,
+} from '@backstage/plugin-catalog';
+import {
+  EntityListProvider,
+  EntityOwnerPicker,
+  EntityTagPicker,
+  UserListFilterKind,
+  UserListPicker,
+} from '@backstage/plugin-catalog-react';
+import { EntityListDocsTable } from './EntityListDocsTable';
+import { TechDocsPageWrapper } from './TechDocsPageWrapper';
+import { TechDocsPicker } from './TechDocsPicker';
+import { DocsTableRow } from './types';
+
+export const DefaultTechDocsHome = ({
+  initialFilter = 'all',
+  columns,
+  actions,
+}: {
+  initialFilter?: UserListFilterKind;
+  columns?: TableColumn<DocsTableRow>[];
+  actions?: TableProps<DocsTableRow>['actions'];
+}) => {
+  return (
+    <TechDocsPageWrapper>
+      <Content>
+        <ContentHeader title="">
+          <SupportButton>
+            Discover documentation in your ecosystem.
+          </SupportButton>
+        </ContentHeader>
+        <EntityListProvider>
+          <FilteredEntityLayout>
+            <FilterContainer>
+              <TechDocsPicker />
+              <UserListPicker initialFilter={initialFilter} />
+              <EntityOwnerPicker />
+              <EntityTagPicker />
+            </FilterContainer>
+            <EntityListContainer>
+              <EntityListDocsTable actions={actions} columns={columns} />
+            </EntityListContainer>
+          </FilteredEntityLayout>
+        </EntityListProvider>
+      </Content>
+    </TechDocsPageWrapper>
+  );
+};
diff --git a/plugins/techdocs/src/home/components/DocsCardGrid.test.tsx b/plugins/techdocs/src/home/components/DocsCardGrid.test.tsx
index f9831e2fa4..8b0e31326c 100644
--- a/plugins/techdocs/src/home/components/DocsCardGrid.test.tsx
+++ b/plugins/techdocs/src/home/components/DocsCardGrid.test.tsx
@@ -17,11 +17,36 @@
 import { wrapInTestApp } from '@backstage/test-utils';
 import { render } from '@testing-library/react';
 import React from 'react';
+import { configApiRef } from '@backstage/core-plugin-api';
 import { DocsCardGrid } from './DocsCardGrid';
+import { rootDocsRouteRef } from '../../routes';
+
+// Hacky way to mock a specific boolean config value.
+const getOptionalBooleanMock = jest.fn().mockReturnValue(false);
+jest.mock('@backstage/core-plugin-api', () => ({
+  ...jest.requireActual('@backstage/core-plugin-api'),
+  useApi: (apiRef: any) => {
+    const actualUseApi = jest.requireActual(
+      '@backstage/core-plugin-api',
+    ).useApi;
+    const actualApi = actualUseApi(apiRef);
+    if (apiRef === configApiRef) {
+      const configReader = actualApi;
+      configReader.getOptionalBoolean = getOptionalBooleanMock;
+      return configReader;
+    }
+
+    return actualApi;
+  },
+}));
 
 describe('Entity Docs Card Grid', () => {
+  beforeEach(() => {
+    jest.resetAllMocks();
+  });
+
   it('should render all entities passed ot it', async () => {
-    const { findByText } = render(
+    const { findByText, findAllByRole } = render(
       wrapInTestApp(
         <DocsCardGrid
           entities={[
@@ -47,9 +72,58 @@ describe('Entity Docs Card Grid', () => {
             },
           ]}
         />,
+        {
+          mountedRoutes: {
+            '/docs/:namespace/:kind/:name/*': rootDocsRouteRef,
+          },
+        },
       ),
     );
     expect(await findByText('testName')).toBeInTheDocument();
     expect(await findByText('testName2')).toBeInTheDocument();
+    const [button1, button2] = await findAllByRole('button');
+    expect(button1.getAttribute('href')).toContain(
+      '/docs/default/testkind/testname',
+    );
+    expect(button2.getAttribute('href')).toContain(
+      '/docs/default/testkind2/testname2',
+    );
+  });
+
+  it('should fall back to case-sensitive links when configured', async () => {
+    getOptionalBooleanMock.mockReturnValue(true);
+
+    const { findByRole } = render(
+      wrapInTestApp(
+        <DocsCardGrid
+          entities={[
+            {
+              apiVersion: 'version',
+              kind: 'TestKind',
+              metadata: {
+                name: 'testName',
+                namespace: 'SomeNamespace',
+              },
+              spec: {
+                owner: 'techdocs@example.com',
+              },
+            },
+          ]}
+        />,
+        {
+          mountedRoutes: {
+            '/techdocs/:namespace/:kind/:name/*': rootDocsRouteRef,
+          },
+        },
+      ),
+    );
+
+    const button = await findByRole('button');
+    expect(getOptionalBooleanMock).toHaveBeenCalledWith(
+      'techdocs.legacyUseCaseSensitiveTripletPaths',
+    );
+    expect(button.getAttribute('href')).toContain(
+      '/techdocs/SomeNamespace/TestKind/testName',
+    );
   });
 });
diff --git a/plugins/techdocs/src/home/components/DocsCardGrid.tsx b/plugins/techdocs/src/home/components/DocsCardGrid.tsx
index 500debaf2d..c8b856032f 100644
--- a/plugins/techdocs/src/home/components/DocsCardGrid.tsx
+++ b/plugins/techdocs/src/home/components/DocsCardGrid.tsx
@@ -15,9 +15,9 @@
  */
 
 import React from 'react';
-import { generatePath } from 'react-router-dom';
 
 import { Entity } from '@backstage/catalog-model';
+import { configApiRef, useApi, useRouteRef } from '@backstage/core-plugin-api';
 import { Card, CardActions, CardContent, CardMedia } from '@material-ui/core';
 import { rootDocsRouteRef } from '../../routes';
 
@@ -32,6 +32,15 @@ export const DocsCardGrid = ({
 }: {
   entities: Entity[] | undefined;
 }) => {
+  const getRouteToReaderPageFor = useRouteRef(rootDocsRouteRef);
+
+  // Lower-case entity triplets by default, but allow override.
+  const toLowerMaybe = useApi(configApiRef).getOptionalBoolean(
+    'techdocs.legacyUseCaseSensitiveTripletPaths',
+  )
+    ? (str: string) => str
+    : (str: string) => str.toLocaleLowerCase();
+
   if (!entities) return null;
   return (
     <ItemCardGrid data-testid="docs-explore">
@@ -45,10 +54,12 @@ export const DocsCardGrid = ({
               <CardContent>{entity.metadata.description}</CardContent>
               <CardActions>
                 <Button
-                  to={generatePath(rootDocsRouteRef.path, {
-                    namespace: entity.metadata.namespace ?? 'default',
-                    kind: entity.kind,
-                    name: entity.metadata.name,
+                  to={getRouteToReaderPageFor({
+                    namespace: toLowerMaybe(
+                      entity.metadata.namespace ?? 'default',
+                    ),
+                    kind: toLowerMaybe(entity.kind),
+                    name: toLowerMaybe(entity.metadata.name),
                   })}
                   color="primary"
                 >
diff --git a/plugins/techdocs/src/home/components/DocsTable.test.tsx b/plugins/techdocs/src/home/components/DocsTable.test.tsx
index a1e4b7ed53..2e5ada78a7 100644
--- a/plugins/techdocs/src/home/components/DocsTable.test.tsx
+++ b/plugins/techdocs/src/home/components/DocsTable.test.tsx
@@ -16,9 +16,34 @@
 import React from 'react';
 import { render } from '@testing-library/react';
 import { wrapInTestApp } from '@backstage/test-utils';
+import { configApiRef } from '@backstage/core-plugin-api';
 import { DocsTable } from './DocsTable';
+import { rootDocsRouteRef } from '../../routes';
+
+// Hacky way to mock a specific boolean config value.
+const getOptionalBooleanMock = jest.fn().mockReturnValue(false);
+jest.mock('@backstage/core-plugin-api', () => ({
+  ...jest.requireActual('@backstage/core-plugin-api'),
+  useApi: (apiRef: any) => {
+    const actualUseApi = jest.requireActual(
+      '@backstage/core-plugin-api',
+    ).useApi;
+    const actualApi = actualUseApi(apiRef);
+    if (apiRef === configApiRef) {
+      const configReader = actualApi;
+      configReader.getOptionalBoolean = getOptionalBooleanMock;
+      return configReader;
+    }
+
+    return actualApi;
+  },
+}));
 
 describe('DocsTable test', () => {
+  beforeEach(() => {
+    jest.resetAllMocks();
+  });
+
   it('should render documents passed', async () => {
     const { findByText } = render(
       wrapInTestApp(
@@ -66,15 +91,81 @@ describe('DocsTable test', () => {
             },
           ]}
         />,
+        {
+          mountedRoutes: {
+            '/docs/:namespace/:kind/:name/*': rootDocsRouteRef,
+          },
+        },
       ),
     );
 
-    expect(await findByText('testName')).toBeInTheDocument();
-    expect(await findByText('testName2')).toBeInTheDocument();
+    const link1 = await findByText('testName');
+    const link2 = await findByText('testName2');
+    expect(link1).toBeInTheDocument();
+    expect(link1.getAttribute('href')).toContain(
+      '/docs/default/testkind/testname',
+    );
+    expect(link2).toBeInTheDocument();
+    expect(link2.getAttribute('href')).toContain(
+      '/docs/default/testkind2/testname2',
+    );
+  });
+
+  it('should fall back to case-sensitive links when configured', async () => {
+    getOptionalBooleanMock.mockReturnValue(true);
+
+    const { findByText } = render(
+      wrapInTestApp(
+        <DocsTable
+          entities={[
+            {
+              apiVersion: 'version',
+              kind: 'TestKind',
+              metadata: {
+                name: 'testName',
+                namespace: 'SomeNamespace',
+              },
+              spec: {
+                owner: 'user:owned',
+              },
+              relations: [
+                {
+                  target: {
+                    kind: 'user',
+                    namespace: 'default',
+                    name: 'owned',
+                  },
+                  type: 'ownedBy',
+                },
+              ],
+            },
+          ]}
+        />,
+        {
+          mountedRoutes: {
+            '/techdocs/:namespace/:kind/:name/*': rootDocsRouteRef,
+          },
+        },
+      ),
+    );
+
+    const button = await findByText('testName');
+    expect(getOptionalBooleanMock).toHaveBeenCalledWith(
+      'techdocs.legacyUseCaseSensitiveTripletPaths',
+    );
+    expect(button.getAttribute('href')).toContain(
+      '/techdocs/SomeNamespace/TestKind/testName',
+    );
   });
 
   it('should render empty state if no owned documents exist', async () => {
-    const { findByText } = render(wrapInTestApp(<DocsTable entities={[]} />));
+    const { findByText } = render(
+      wrapInTestApp(<DocsTable entities={[]} />, {
+        mountedRoutes: {
+          '/docs/:namespace/:kind/:name/*': rootDocsRouteRef,
+        },
+      }),
+    );
 
     expect(await findByText('No documents to show')).toBeInTheDocument();
   });
diff --git a/plugins/techdocs/src/home/components/DocsTable.tsx b/plugins/techdocs/src/home/components/DocsTable.tsx
index 031f09868f..f210e5f678 100644
--- a/plugins/techdocs/src/home/components/DocsTable.tsx
+++ b/plugins/techdocs/src/home/components/DocsTable.tsx
@@ -16,93 +16,93 @@
 
 import React from 'react';
 import { useCopyToClipboard } from 'react-use';
-import { generatePath } from 'react-router-dom';
 
-import { IconButton, Tooltip } from '@material-ui/core';
-import ShareIcon from '@material-ui/icons/Share';
-import { Entity } from '@backstage/catalog-model';
+import { configApiRef, useApi, useRouteRef } from '@backstage/core-plugin-api';
+import { Entity, RELATION_OWNED_BY } from '@backstage/catalog-model';
+import {
+  formatEntityRefTitle,
+  getEntityRelations,
+} from '@backstage/plugin-catalog-react';
 import { rootDocsRouteRef } from '../../routes';
 import {
-  Table,
-  EmptyState,
   Button,
-  SubvalueCell,
-  Link,
+  EmptyState,
+  Table,
+  TableColumn,
+  TableProps,
 } from '@backstage/core-components';
+import * as actionFactories from './actions';
+import * as columnFactories from './columns';
+import { DocsTableRow } from './types';
 
 export const DocsTable = ({
   entities,
   title,
+  loading,
+  columns,
+  actions,
 }: {
   entities: Entity[] | undefined;
   title?: string | undefined;
+  loading?: boolean | undefined;
+  columns?: TableColumn<DocsTableRow>[];
+  actions?: TableProps<DocsTableRow>['actions'];
 }) => {
   const [, copyToClipboard] = useCopyToClipboard();
+  const getRouteToReaderPageFor = useRouteRef(rootDocsRouteRef);
+
+  // Lower-case entity triplets by default, but allow override.
+  const toLowerMaybe = useApi(configApiRef).getOptionalBoolean(
+    'techdocs.legacyUseCaseSensitiveTripletPaths',
+  )
+    ? (str: string) => str
+    : (str: string) => str.toLocaleLowerCase();
 
   if (!entities) return null;
 
   const documents = entities.map(entity => {
+    const ownedByRelations = getEntityRelations(entity, RELATION_OWNED_BY);
+
     return {
-      name: entity.metadata.name,
-      description: entity.metadata.description,
-      owner: entity?.spec?.owner,
-      type: entity?.spec?.type,
-      docsUrl: generatePath(rootDocsRouteRef.path, {
-        namespace: entity.metadata.namespace ?? 'default',
-        kind: entity.kind,
-        name: entity.metadata.name,
-      }),
+      entity,
+      resolved: {
+        docsUrl: getRouteToReaderPageFor({
+          namespace: toLowerMaybe(entity.metadata.namespace ?? 'default'),
+          kind: toLowerMaybe(entity.kind),
+          name: toLowerMaybe(entity.metadata.name),
+        }),
+        ownedByRelations,
+        ownedByRelationsTitle: ownedByRelations
+          .map(r => formatEntityRefTitle(r, { defaultKind: 'group' }))
+          .join(', '),
+      },
     };
   });
 
-  const columns = [
-    {
-      title: 'Document',
-      field: 'name',
-      highlight: true,
-      render: (row: any): React.ReactNode => (
-        <SubvalueCell
-          value={<Link to={row.docsUrl}>{row.name}</Link>}
-          subvalue={row.description}
-        />
-      ),
-    },
-    {
-      title: 'Owner',
-      field: 'owner',
-    },
-    {
-      title: 'Type',
-      field: 'type',
-    },
-    {
-      title: 'Actions',
-      width: '10%',
-      render: (row: any) => (
-        <Tooltip title="Click to copy documentation link to clipboard">
-          <IconButton
-            onClick={() =>
-              copyToClipboard(`${window.location.href}/${row.docsUrl}`)
-            }
-          >
-            <ShareIcon />
-          </IconButton>
-        </Tooltip>
-      ),
-    },
+  const defaultColumns: TableColumn<DocsTableRow>[] = [
+    columnFactories.createNameColumn(),
+    columnFactories.createOwnerColumn(),
+    columnFactories.createTypeColumn(),
+  ];
+
+  const defaultActions: TableProps<DocsTableRow>['actions'] = [
+    actionFactories.createCopyDocsUrlAction(copyToClipboard),
   ];
 
   return (
     <>
-      {documents && documents.length > 0 ? (
-        <Table
+      {loading || (documents && documents.length > 0) ? (
+        <Table<DocsTableRow>
+          isLoading={loading}
           options={{
             paging: true,
             pageSize: 20,
             search: true,
+            actionsColumnIndex: -1,
           }}
           data={documents}
-          columns={columns}
+          columns={columns || defaultColumns}
+          actions={actions || defaultActions}
           title={
             title
               ? `${title} (${documents.length})`
diff --git a/plugins/techdocs/src/home/components/EntityListDocsTable.tsx b/plugins/techdocs/src/home/components/EntityListDocsTable.tsx
new file mode 100644
index 0000000000..b94e7adace
--- /dev/null
+++ b/plugins/techdocs/src/home/components/EntityListDocsTable.tsx
@@ -0,0 +1,79 @@
+/*
+ * Copyright 2021 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import React from 'react';
+import { useCopyToClipboard } from 'react-use';
+import { capitalize } from 'lodash';
+import {
+  CodeSnippet,
+  TableColumn,
+  TableProps,
+  WarningPanel,
+} from '@backstage/core-components';
+import {
+  useEntityListProvider,
+  useStarredEntities,
+} from '@backstage/plugin-catalog-react';
+import { DocsTable } from './DocsTable';
+import * as actionFactories from './actions';
+import * as columnFactories from './columns';
+import { DocsTableRow } from './types';
+
+export const EntityListDocsTable = ({
+  columns,
+  actions,
+}: {
+  columns?: TableColumn<DocsTableRow>[];
+  actions?: TableProps<DocsTableRow>['actions'];
+}) => {
+  const { loading, error, entities, filters } = useEntityListProvider();
+  const { isStarredEntity, toggleStarredEntity } = useStarredEntities();
+  const [, copyToClipboard] = useCopyToClipboard();
+
+  const title = capitalize(filters.user?.value ?? 'all');
+
+  const defaultActions = [
+    actionFactories.createCopyDocsUrlAction(copyToClipboard),
+    actionFactories.createStarEntityAction(
+      isStarredEntity,
+      toggleStarredEntity,
+    ),
+  ];
+
+  if (error) {
+    return (
+      <WarningPanel
+        severity="error"
+        title="Could not load available documentation."
+      >
+        <CodeSnippet language="text" text={error.toString()} />
+      </WarningPanel>
+    );
+  }
+
+  return (
+    <DocsTable
+      title={title}
+      entities={entities}
+      loading={loading}
+      actions={actions || defaultActions}
+      columns={columns}
+    />
+  );
+};
+
+EntityListDocsTable.columns = columnFactories;
+EntityListDocsTable.actions = actionFactories;
diff --git a/plugins/techdocs/src/home/components/TechDocsHome.test.tsx b/plugins/techdocs/src/home/components/LegacyTechDocsHome.test.tsx
similarity index 87%
rename from plugins/techdocs/src/home/components/TechDocsHome.test.tsx
rename to plugins/techdocs/src/home/components/LegacyTechDocsHome.test.tsx
index f90b35e181..d9d2c6a345 100644
--- a/plugins/techdocs/src/home/components/TechDocsHome.test.tsx
+++ b/plugins/techdocs/src/home/components/LegacyTechDocsHome.test.tsx
@@ -18,7 +18,7 @@ import { CatalogApi, catalogApiRef } from '@backstage/plugin-catalog-react';
 import { renderInTestApp } from '@backstage/test-utils';
 import { screen } from '@testing-library/react';
 import React from 'react';
-import { TechDocsHome } from './TechDocsHome';
+import { LegacyTechDocsHome } from './LegacyTechDocsHome';
 
 import {
   ApiProvider,
@@ -26,6 +26,7 @@ import {
   ConfigReader,
 } from '@backstage/core-app-api';
 import { ConfigApi, configApiRef } from '@backstage/core-plugin-api';
+import { rootDocsRouteRef } from '../../routes';
 
 jest.mock('@backstage/plugin-catalog-react', () => {
   const actual = jest.requireActual('@backstage/plugin-catalog-react');
@@ -51,7 +52,7 @@ const mockCatalogApi = {
   }),
 } as Partial<CatalogApi>;
 
-describe('TechDocs Home', () => {
+describe('Legacy TechDocs Home', () => {
   const configApi: ConfigApi = new ConfigReader({
     organization: {
       name: 'My Company',
@@ -66,8 +67,13 @@ describe('TechDocs Home', () => {
   it('should render a TechDocs home page', async () => {
     await renderInTestApp(
       <ApiProvider apis={apiRegistry}>
-        <TechDocsHome />
+        <LegacyTechDocsHome />
       </ApiProvider>,
+      {
+        mountedRoutes: {
+          '/docs/:namespace/:kind/:name/*': rootDocsRouteRef,
+        },
+      },
     );
 
     // Header
diff --git a/plugins/techdocs/src/home/components/TechDocsHome.tsx b/plugins/techdocs/src/home/components/LegacyTechDocsHome.tsx
similarity index 97%
rename from plugins/techdocs/src/home/components/TechDocsHome.tsx
rename to plugins/techdocs/src/home/components/LegacyTechDocsHome.tsx
index 6445713875..34ea416026 100644
--- a/plugins/techdocs/src/home/components/TechDocsHome.tsx
+++ b/plugins/techdocs/src/home/components/LegacyTechDocsHome.tsx
@@ -17,7 +17,7 @@
 import React from 'react';
 import { PanelType, TechDocsCustomHome } from './TechDocsCustomHome';
 
-export const TechDocsHome = () => {
+export const LegacyTechDocsHome = () => {
   const tabsConfig = [
     {
       label: 'Overview',
diff --git a/plugins/techdocs/src/home/components/TechDocsCustomHome.test.tsx b/plugins/techdocs/src/home/components/TechDocsCustomHome.test.tsx
index 304daeee87..bcbfdeed86 100644
--- a/plugins/techdocs/src/home/components/TechDocsCustomHome.test.tsx
+++ b/plugins/techdocs/src/home/components/TechDocsCustomHome.test.tsx
@@ -20,6 +20,7 @@ import { screen } from '@testing-library/react';
 import React from 'react';
 import { TechDocsCustomHome, PanelType } from './TechDocsCustomHome';
 import { ApiProvider, ApiRegistry } from '@backstage/core-app-api';
+import { rootDocsRouteRef } from '../../routes';
 
 jest.mock('@backstage/plugin-catalog-react', () => {
   const actual = jest.requireActual('@backstage/plugin-catalog-react');
@@ -78,6 +79,11 @@ describe('TechDocsCustomHome', () => {
       <ApiProvider apis={apiRegistry}>
         <TechDocsCustomHome tabsConfig={tabsConfig} />
       </ApiProvider>,
+      {
+        mountedRoutes: {
+          '/docs/:namespace/:kind/:name/*': rootDocsRouteRef,
+        },
+      },
     );
 
     // Header
diff --git a/plugins/techdocs/src/home/components/TechDocsCustomHome.tsx b/plugins/techdocs/src/home/components/TechDocsCustomHome.tsx
index 90b968de6c..9975db6435 100644
--- a/plugins/techdocs/src/home/components/TechDocsCustomHome.tsx
+++ b/plugins/techdocs/src/home/components/TechDocsCustomHome.tsx
@@ -19,6 +19,7 @@ import { useAsync } from 'react-use';
 import { makeStyles } from '@material-ui/core';
 import { CSSProperties } from '@material-ui/styles';
 import {
+  CATALOG_FILTER_EXISTS,
   catalogApiRef,
   CatalogApi,
   isOwnerOf,
@@ -27,20 +28,19 @@ import {
 import { Entity } from '@backstage/catalog-model';
 import { DocsTable } from './DocsTable';
 import { DocsCardGrid } from './DocsCardGrid';
+import { TechDocsPageWrapper } from './TechDocsPageWrapper';
 
 import {
   CodeSnippet,
   Content,
-  Header,
   HeaderTabs,
-  Page,
   Progress,
   WarningPanel,
   SupportButton,
   ContentHeader,
 } from '@backstage/core-components';
 
-import { ConfigApi, configApiRef, useApi } from '@backstage/core-plugin-api';
+import { useApi } from '@backstage/core-plugin-api';
 
 const panels = {
   DocsTable: DocsTable,
@@ -121,38 +121,45 @@ export const TechDocsCustomHome = ({
 }) => {
   const [selectedTab, setSelectedTab] = useState<number>(0);
   const catalogApi: CatalogApi = useApi(catalogApiRef);
-  const configApi: ConfigApi = useApi(configApiRef);
 
-  const { value: entities, loading, error } = useAsync(async () => {
+  const {
+    value: entities,
+    loading,
+    error,
+  } = useAsync(async () => {
     const response = await catalogApi.getEntities({
-      fields: ['apiVersion', 'kind', 'metadata', 'spec.owner', 'spec.type'],
+      filter: {
+        'metadata.annotations.backstage.io/techdocs-ref': CATALOG_FILTER_EXISTS,
+      },
+      fields: [
+        'apiVersion',
+        'kind',
+        'metadata',
+        'relations',
+        'spec.owner',
+        'spec.type',
+      ],
     });
     return response.items.filter((entity: Entity) => {
       return !!entity.metadata.annotations?.['backstage.io/techdocs-ref'];
     });
   });
 
-  const generatedSubtitle = `Documentation available in ${
-    configApi.getOptionalString('organization.name') ?? 'Backstage'
-  }`;
-
   const currentTabConfig = tabsConfig[selectedTab];
 
   if (loading) {
     return (
-      <Page themeId="documentation">
-        <Header title="Documentation" subtitle={generatedSubtitle} />
+      <TechDocsPageWrapper>
         <Content>
           <Progress />
         </Content>
-      </Page>
+      </TechDocsPageWrapper>
     );
   }
 
   if (error) {
     return (
-      <Page themeId="documentation">
-        <Header title="Documentation" subtitle={generatedSubtitle} />
+      <TechDocsPageWrapper>
         <Content>
           <WarningPanel
             severity="error"
@@ -161,13 +168,12 @@ export const TechDocsCustomHome = ({
             <CodeSnippet language="text" text={error.toString()} />
           </WarningPanel>
         </Content>
-      </Page>
+      </TechDocsPageWrapper>
     );
   }
 
   return (
-    <Page themeId="documentation">
-      <Header title="Documentation" subtitle={generatedSubtitle} />
+    <TechDocsPageWrapper>
       <HeaderTabs
         selectedIndex={selectedTab}
         onChange={index => setSelectedTab(index)}
@@ -186,6 +192,6 @@ export const TechDocsCustomHome = ({
           />
         ))}
       </Content>
-    </Page>
+    </TechDocsPageWrapper>
   );
 };
diff --git a/plugins/techdocs/src/home/components/TechDocsIndexPage.test.tsx b/plugins/techdocs/src/home/components/TechDocsIndexPage.test.tsx
new file mode 100644
index 0000000000..fbeca7cfd4
--- /dev/null
+++ b/plugins/techdocs/src/home/components/TechDocsIndexPage.test.tsx
@@ -0,0 +1,44 @@
+/*
+ * Copyright 2021 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import React from 'react';
+import { renderInTestApp } from '@backstage/test-utils';
+import { useOutlet } from 'react-router';
+import { TechDocsIndexPage } from './TechDocsIndexPage';
+
+jest.mock('react-router', () => ({
+  ...jest.requireActual('react-router'),
+  useOutlet: jest.fn().mockReturnValue('Route Children'),
+}));
+
+jest.mock('./LegacyTechDocsHome', () => ({
+  LegacyTechDocsHome: jest.fn().mockReturnValue('LegacyTechDocsHomeMock'),
+}));
+
+describe('TechDocsIndexPage', () => {
+  it('renders provided router element', async () => {
+    const { getByText } = await renderInTestApp(<TechDocsIndexPage />);
+
+    expect(getByText('Route Children')).toBeInTheDocument();
+  });
+
+  it('renders legacy TechDocs home when no router children are provided', async () => {
+    (useOutlet as jest.Mock).mockReturnValueOnce(null);
+    const { getByText } = await renderInTestApp(<TechDocsIndexPage />);
+
+    expect(getByText('LegacyTechDocsHomeMock')).toBeInTheDocument();
+  });
+});
diff --git a/plugins/techdocs/src/home/components/TechDocsIndexPage.tsx b/plugins/techdocs/src/home/components/TechDocsIndexPage.tsx
new file mode 100644
index 0000000000..ff694d3570
--- /dev/null
+++ b/plugins/techdocs/src/home/components/TechDocsIndexPage.tsx
@@ -0,0 +1,25 @@
+/*
+ * Copyright 2021 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import React from 'react';
+import { useOutlet } from 'react-router';
+import { LegacyTechDocsHome } from './LegacyTechDocsHome';
+
+export const TechDocsIndexPage = () => {
+  const outlet = useOutlet();
+
+  return outlet || <LegacyTechDocsHome />;
+};
diff --git a/plugins/api-docs/src/components/ApiExplorerPage/ApiExplorerLayout.tsx b/plugins/techdocs/src/home/components/TechDocsPageWrapper.tsx
similarity index 69%
rename from plugins/api-docs/src/components/ApiExplorerPage/ApiExplorerLayout.tsx
rename to plugins/techdocs/src/home/components/TechDocsPageWrapper.tsx
index 5638c23634..453cfc22cc 100644
--- a/plugins/api-docs/src/components/ApiExplorerPage/ApiExplorerLayout.tsx
+++ b/plugins/techdocs/src/home/components/TechDocsPageWrapper.tsx
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 The Backstage Authors
+ * Copyright 2021 The Backstage Authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,25 +16,26 @@
 
 import React from 'react';
 
-import { Header, Page } from '@backstage/core-components';
+import { PageWithHeader } from '@backstage/core-components';
 import { useApi, configApiRef } from '@backstage/core-plugin-api';
 
 type Props = {
   children?: React.ReactNode;
 };
-export const ApiExplorerLayout = ({ children }: Props) => {
+
+export const TechDocsPageWrapper = ({ children }: Props) => {
   const configApi = useApi(configApiRef);
-  const generatedSubtitle = `${
+  const generatedSubtitle = `Documentation available in ${
     configApi.getOptionalString('organization.name') ?? 'Backstage'
-  } API Explorer`;
+  }`;
+
   return (
-    <Page themeId="apis">
-      <Header
-        title="APIs"
-        subtitle={generatedSubtitle}
-        pageTitleOverride="APIs"
-      />
+    <PageWithHeader
+      title="Documentation"
+      subtitle={generatedSubtitle}
+      themeId="documentation"
+    >
       {children}
-    </Page>
+    </PageWithHeader>
   );
 };
diff --git a/plugins/techdocs/src/home/components/TechDocsPicker.tsx b/plugins/techdocs/src/home/components/TechDocsPicker.tsx
new file mode 100644
index 0000000000..9ed21da368
--- /dev/null
+++ b/plugins/techdocs/src/home/components/TechDocsPicker.tsx
@@ -0,0 +1,47 @@
+/*
+ * Copyright 2021 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { useEffect } from 'react';
+import {
+  CATALOG_FILTER_EXISTS,
+  DefaultEntityFilters,
+  EntityFilter,
+  useEntityListProvider,
+} from '@backstage/plugin-catalog-react';
+
+class TechDocsFilter implements EntityFilter {
+  getCatalogFilters(): Record<string, string | symbol | (string | symbol)[]> {
+    return {
+      'metadata.annotations.backstage.io/techdocs-ref': CATALOG_FILTER_EXISTS,
+    };
+  }
+}
+
+type CustomFilters = DefaultEntityFilters & {
+  techdocs?: TechDocsFilter;
+};
+
+export const TechDocsPicker = () => {
+  const { updateFilters } = useEntityListProvider<CustomFilters>();
+
+  useEffect(() => {
+    updateFilters({
+      techdocs: new TechDocsFilter(),
+    });
+  }, [updateFilters]);
+
+  return null;
+};
diff --git a/plugins/techdocs/src/home/components/actions.tsx b/plugins/techdocs/src/home/components/actions.tsx
new file mode 100644
index 0000000000..b737e99d14
--- /dev/null
+++ b/plugins/techdocs/src/home/components/actions.tsx
@@ -0,0 +1,54 @@
+/*
+ * Copyright 2021 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import React from 'react';
+import ShareIcon from '@material-ui/icons/Share';
+import {
+  favoriteEntityIcon,
+  favoriteEntityTooltip,
+} from '@backstage/plugin-catalog-react';
+import { DocsTableRow } from './types';
+
+export function createCopyDocsUrlAction(copyToClipboard: Function) {
+  return (row: DocsTableRow) => {
+    return {
+      icon: () => <ShareIcon fontSize="small" />,
+      tooltip: 'Click to copy documentation link to clipboard',
+      onClick: () =>
+        copyToClipboard(
+          `${window.location.origin}${window.location.pathname.replace(
+            /\/?$/,
+            '/',
+          )}${row.resolved.docsUrl}`,
+        ),
+    };
+  };
+}
+
+export function createStarEntityAction(
+  isStarredEntity: Function,
+  toggleStarredEntity: Function,
+) {
+  return ({ entity }: DocsTableRow) => {
+    const isStarred = isStarredEntity(entity);
+    return {
+      cellStyle: { paddingLeft: '1em' },
+      icon: () => favoriteEntityIcon(isStarred),
+      tooltip: favoriteEntityTooltip(isStarred),
+      onClick: () => toggleStarredEntity(entity),
+    };
+  };
+}
diff --git a/plugins/techdocs/src/home/components/columns.tsx b/plugins/techdocs/src/home/components/columns.tsx
new file mode 100644
index 0000000000..d29f44da75
--- /dev/null
+++ b/plugins/techdocs/src/home/components/columns.tsx
@@ -0,0 +1,59 @@
+/*
+ * Copyright 2021 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import React from 'react';
+import { Link, SubvalueCell, TableColumn } from '@backstage/core-components';
+import { EntityRefLinks } from '@backstage/plugin-catalog-react';
+import { Entity } from '@backstage/catalog-model';
+import { DocsTableRow } from './types';
+
+function customTitle(entity: Entity): string {
+  return entity.metadata.title || entity.metadata.name;
+}
+
+export function createNameColumn(): TableColumn<DocsTableRow> {
+  return {
+    title: 'Document',
+    field: 'entity.metadata.name',
+    highlight: true,
+    render: (row: DocsTableRow) => (
+      <SubvalueCell
+        value={<Link to={row.resolved.docsUrl}>{customTitle(row.entity)}</Link>}
+        subvalue={row.entity.metadata.description}
+      />
+    ),
+  };
+}
+
+export function createOwnerColumn(): TableColumn<DocsTableRow> {
+  return {
+    title: 'Owner',
+    field: 'resolved.ownedByRelationsTitle',
+    render: ({ resolved }) => (
+      <EntityRefLinks
+        entityRefs={resolved.ownedByRelations}
+        defaultKind="group"
+      />
+    ),
+  };
+}
+
+export function createTypeColumn(): TableColumn<DocsTableRow> {
+  return {
+    title: 'Type',
+    field: 'entity.spec.type',
+  };
+}
diff --git a/plugins/techdocs/src/home/components/index.ts b/plugins/techdocs/src/home/components/index.ts
new file mode 100644
index 0000000000..53dd0fd909
--- /dev/null
+++ b/plugins/techdocs/src/home/components/index.ts
@@ -0,0 +1,22 @@
+/*
+ * Copyright 2021 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+export { EntityListDocsTable } from './EntityListDocsTable';
+export { DefaultTechDocsHome } from './DefaultTechDocsHome';
+export { TechDocsPageWrapper } from './TechDocsPageWrapper';
+export { TechDocsPicker } from './TechDocsPicker';
+export type { PanelType } from './TechDocsCustomHome';
+export type { DocsTableRow } from './types';
diff --git a/plugins/techdocs/src/home/components/types.ts b/plugins/techdocs/src/home/components/types.ts
new file mode 100644
index 0000000000..6fd29f1716
--- /dev/null
+++ b/plugins/techdocs/src/home/components/types.ts
@@ -0,0 +1,26 @@
+/*
+ * Copyright 2021 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { Entity, EntityName } from '@backstage/catalog-model';
+
+export type DocsTableRow = {
+  entity: Entity;
+  resolved: {
+    docsUrl: string;
+    ownedByRelationsTitle: string;
+    ownedByRelations: EntityName[];
+  };
+};
diff --git a/plugins/techdocs/src/index.ts b/plugins/techdocs/src/index.ts
index d645d128f7..4ebf29180c 100644
--- a/plugins/techdocs/src/index.ts
+++ b/plugins/techdocs/src/index.ts
@@ -18,12 +18,20 @@ export * from './api';
 export { techdocsApiRef, techdocsStorageApiRef } from './api';
 export type { TechDocsApi, TechDocsStorageApi } from './api';
 export { TechDocsClient, TechDocsStorageClient } from './client';
-export type { PanelType } from './home/components/TechDocsCustomHome';
+export type { DocsTableRow, PanelType } from './home/components';
+export {
+  EntityListDocsTable,
+  DefaultTechDocsHome,
+  TechDocsPageWrapper,
+  TechDocsPicker,
+} from './home/components';
+export * from './components/DocsResultListItem';
 export {
   DocsCardGrid,
   DocsTable,
   EntityTechdocsContent,
   TechDocsCustomHome,
+  TechDocsIndexPage,
   TechdocsPage,
   techdocsPlugin as plugin,
   techdocsPlugin,
diff --git a/plugins/techdocs/src/plugin.ts b/plugins/techdocs/src/plugin.ts
index 39544500bd..b3f66e9c19 100644
--- a/plugins/techdocs/src/plugin.ts
+++ b/plugins/techdocs/src/plugin.ts
@@ -65,6 +65,7 @@ export const techdocsPlugin = createPlugin({
   ],
   routes: {
     root: rootRouteRef,
+    docRoot: rootDocsRouteRef,
     entityContent: rootCatalogDocsRouteRef,
   },
 });
@@ -113,6 +114,16 @@ export const TechDocsCustomHome = techdocsPlugin.provide(
   }),
 );
 
+export const TechDocsIndexPage = techdocsPlugin.provide(
+  createRoutableExtension({
+    component: () =>
+      import('./home/components/TechDocsIndexPage').then(
+        m => m.TechDocsIndexPage,
+      ),
+    mountPoint: rootRouteRef,
+  }),
+);
+
 export const TechDocsReaderPage = techdocsPlugin.provide(
   createRoutableExtension({
     component: () =>
diff --git a/plugins/techdocs/src/reader/components/Reader.test.tsx b/plugins/techdocs/src/reader/components/Reader.test.tsx
index 7824754231..91e5693c43 100644
--- a/plugins/techdocs/src/reader/components/Reader.test.tsx
+++ b/plugins/techdocs/src/reader/components/Reader.test.tsx
@@ -25,6 +25,7 @@ import React from 'react';
 import { TechDocsStorageApi, techdocsStorageApiRef } from '../../api';
 import { Reader } from './Reader';
 import { ApiProvider, ApiRegistry } from '@backstage/core-app-api';
+import { searchApiRef } from '@backstage/plugin-search';
 
 jest.mock('react-router-dom', () => {
   const actual = jest.requireActual('react-router-dom');
@@ -34,9 +35,8 @@ jest.mock('react-router-dom', () => {
   };
 });
 
-const { useParams }: { useParams: jest.Mock } = jest.requireMock(
-  'react-router-dom',
-);
+const { useParams }: { useParams: jest.Mock } =
+  jest.requireMock('react-router-dom');
 
 describe('<Reader />', () => {
   it('should render Reader content', async () => {
@@ -44,16 +44,23 @@ describe('<Reader />', () => {
       entityId: 'Component::backstage',
     });
 
-    const scmIntegrationsApi: ScmIntegrationsApi = ScmIntegrationsApi.fromConfig(
-      new ConfigReader({
-        integrations: {},
-      }),
-    );
+    const scmIntegrationsApi: ScmIntegrationsApi =
+      ScmIntegrationsApi.fromConfig(
+        new ConfigReader({
+          integrations: {},
+        }),
+      );
     const techdocsStorageApi: Partial<TechDocsStorageApi> = {};
-
+    const searchApi = {
+      query: () =>
+        Promise.resolve({
+          results: [],
+        }),
+    };
     const apiRegistry = ApiRegistry.from([
       [scmIntegrationsApiRef, scmIntegrationsApi],
       [techdocsStorageApiRef, techdocsStorageApi],
+      [searchApiRef, searchApi],
     ]);
 
     await act(async () => {
diff --git a/plugins/techdocs/src/reader/components/Reader.tsx b/plugins/techdocs/src/reader/components/Reader.tsx
index 294f81378f..5fe395e131 100644
--- a/plugins/techdocs/src/reader/components/Reader.tsx
+++ b/plugins/techdocs/src/reader/components/Reader.tsx
@@ -15,9 +15,17 @@
  */
 
 import { EntityName } from '@backstage/catalog-model';
+import { Progress } from '@backstage/core-components';
+import { useApi } from '@backstage/core-plugin-api';
 import { scmIntegrationsApiRef } from '@backstage/integration-react';
 import { BackstageTheme } from '@backstage/theme';
-import { useTheme } from '@material-ui/core';
+import {
+  Button,
+  CircularProgress,
+  Grid,
+  makeStyles,
+  useTheme,
+} from '@material-ui/core';
 import { Alert } from '@material-ui/lab';
 import React, { useCallback, useEffect, useRef, useState } from 'react';
 import { useNavigate, useParams } from 'react-router-dom';
@@ -34,27 +42,45 @@ import {
   simplifyMkdocsFooter,
   transform as transformer,
 } from '../transformers';
+import { TechDocsBuildLogs } from './TechDocsBuildLogs';
 import { TechDocsNotFound } from './TechDocsNotFound';
-import TechDocsProgressBar from './TechDocsProgressBar';
+import { TechDocsSearch } from './TechDocsSearch';
 import { useReaderState } from './useReaderState';
-import { useApi } from '@backstage/core-plugin-api';
 
 type Props = {
   entityId: EntityName;
   onReady?: () => void;
+  withSearch?: boolean;
 };
 
-export const Reader = ({ entityId, onReady }: Props) => {
-  const { kind, namespace, name } = entityId;
-  const { '*': path } = useParams();
-  const theme = useTheme<BackstageTheme>();
+const useStyles = makeStyles<BackstageTheme>(theme => ({
+  message: {
+    // `word-break: break-word` is deprecated, but gives legacy support to browsers not supporting `overflow-wrap` yet
+    // https://developer.mozilla.org/en-US/docs/Web/CSS/word-break
+    wordBreak: 'break-word',
+    overflowWrap: 'anywhere',
+  },
+  searchBar: {
+    marginLeft: '20rem',
+    maxWidth: 'calc(100% - 20rem * 2 - 3rem)',
+    marginTop: theme.spacing(1),
+  },
+}));
 
-  const { state, content: rawPage, errorMessage } = useReaderState(
-    kind,
-    namespace,
-    name,
+export const Reader = ({ entityId, onReady, withSearch = true }: Props) => {
+  const { kind, namespace, name } = entityId;
+  const theme = useTheme<BackstageTheme>();
+  const classes = useStyles();
+
+  const {
+    state,
     path,
-  );
+    contentReload,
+    content: rawPage,
+    contentErrorMessage,
+    syncErrorMessage,
+    buildLog,
+  } = useReaderState(kind, namespace, name, useParams()['*']);
 
   const techdocsStorageApi = useApi(techdocsStorageApiRef);
   const [sidebars, setSidebars] = useState<HTMLElement[]>();
@@ -82,40 +108,35 @@ export const Reader = ({ entityId, onReady }: Props) => {
 
   useEffect(() => {
     updateSidebarPosition();
-    window.addEventListener('scroll', updateSidebarPosition);
+    window.addEventListener('scroll', updateSidebarPosition, true);
     window.addEventListener('resize', updateSidebarPosition);
     return () => {
-      window.removeEventListener('scroll', updateSidebarPosition);
+      window.removeEventListener('scroll', updateSidebarPosition, true);
       window.removeEventListener('resize', updateSidebarPosition);
     };
     // an update to "state" might lead to an updated UI so we include it as a trigger
   }, [updateSidebarPosition, state]);
 
-  useEffect(() => {
-    if (!rawPage || !shadowDomRef.current) {
-      return;
-    }
-    if (onReady) {
-      onReady();
-    }
-    // Pre-render
-    const transformedElement = transformer(rawPage, [
-      sanitizeDOM(),
-      addBaseUrl({
-        techdocsStorageApi,
-        entityId: {
-          kind,
-          name,
-          namespace,
-        },
-        path,
-      }),
-      rewriteDocLinks(),
-      removeMkdocsHeader(),
-      simplifyMkdocsFooter(),
-      addGitFeedbackLink(scmIntegrationsApi),
-      injectCss({
-        css: `
+  // a function that performs transformations that are executed prior to adding it to the DOM
+  const preRender = useCallback(
+    (rawContent: string, contentPath: string) =>
+      transformer(rawContent, [
+        sanitizeDOM(),
+        addBaseUrl({
+          techdocsStorageApi,
+          entityId: {
+            kind,
+            name,
+            namespace,
+          },
+          path: contentPath,
+        }),
+        rewriteDocLinks(),
+        removeMkdocsHeader(),
+        simplifyMkdocsFooter(),
+        addGitFeedbackLink(scmIntegrationsApi),
+        injectCss({
+          css: `
         body {
           font-family: ${theme.typography.fontFamily};
           --md-text-color: ${theme.palette.text.primary};
@@ -172,21 +193,21 @@ export const Reader = ({ entityId, onReady }: Props) => {
           }
         }
       `,
-      }),
-      injectCss({
-        // Disable CSS animations on link colors as they lead to issues in dark
-        // mode. The dark mode color theme is applied later and theirfore there
-        // is always an animation from light to dark mode when navigation
-        // between pages.
-        css: `
+        }),
+        injectCss({
+          // Disable CSS animations on link colors as they lead to issues in dark
+          // mode. The dark mode color theme is applied later and theirfore there
+          // is always an animation from light to dark mode when navigation
+          // between pages.
+          css: `
         .md-nav__link, .md-typeset a, .md-typeset a::before, .md-typeset .headerlink {
           transition: none;
         }
         `,
-      }),
-      injectCss({
-        // Properly style code blocks.
-        css: `
+        }),
+        injectCss({
+          // Properly style code blocks.
+          css: `
         .md-typeset pre > code::-webkit-scrollbar-thumb {
           background-color: hsla(0, 0%, 0%, 0.32);
         }
@@ -194,17 +215,17 @@ export const Reader = ({ entityId, onReady }: Props) => {
           background-color: hsla(0, 0%, 0%, 0.87);
         }
         `,
-      }),
-      injectCss({
-        // Admonitions and others are using SVG masks to define icons. These
-        // masks are defined as CSS variables.
-        // As the MkDocs output is rendered in shadow DOM, the CSS variable
-        // definitions on the root selector are not applied. Instead, the have
-        // to be applied on :host.
-        // As there is no way to transform the served main*.css yet (for
-        // example in the backend), we have to copy from main*.css and modify
-        // them.
-        css: `
+        }),
+        injectCss({
+          // Admonitions and others are using SVG masks to define icons. These
+          // masks are defined as CSS variables.
+          // As the MkDocs output is rendered in shadow DOM, the CSS variable
+          // definitions on the root selector are not applied. Instead, the have
+          // to be applied on :host.
+          // As there is no way to transform the served main*.css yet (for
+          // example in the backend), we have to copy from main*.css and modify
+          // them.
+          css: `
         :host {
           --md-admonition-icon--note: url('data:image/svg+xml;charset=utf-8,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="M20.71 7.04c.39-.39.39-1.04 0-1.41l-2.34-2.34c-.37-.39-1.02-.39-1.41 0l-1.84 1.83 3.75 3.75M3 17.25V21h3.75L17.81 9.93l-3.75-3.75L3 17.25z"/></svg>');
           --md-admonition-icon--abstract: url('data:image/svg+xml;charset=utf-8,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="M4 5h16v2H4V5m0 4h16v2H4V9m0 4h16v2H4v-2m0 4h10v2H4v-2z"/></svg>');
@@ -230,128 +251,201 @@ export const Reader = ({ entityId, onReady }: Props) => {
           --md-tasklist-icon--checked: url('data:image/svg+xml;charset=utf-8,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="M12 2C6.5 2 2 6.5 2 12s4.5 10 10 10 10-4.5 10-10S17.5 2 12 2m-2 15l-5-5 1.41-1.41L10 14.17l7.59-7.59L19 8l-9 9z"/></svg>');
         }
         `,
-      }),
-    ]);
+        }),
+      ]),
+    [
+      kind,
+      name,
+      namespace,
+      scmIntegrationsApi,
+      techdocsStorageApi,
+      theme.palette.background.default,
+      theme.palette.background.paper,
+      theme.palette.primary.main,
+      theme.palette.text.primary,
+      theme.typography.fontFamily,
+    ],
+  );
 
-    if (!transformedElement) {
-      return; // An unexpected error occurred
+  // a function that performs transformations that are executed after adding it to the DOM
+  const postRender = useCallback(
+    async (shadowRoot: ShadowRoot) =>
+      transformer(shadowRoot.children[0], [
+        dom => {
+          setTimeout(() => {
+            // Scoll to the desired anchor on initial navigation
+            if (window.location.hash) {
+              const hash = window.location.hash.slice(1);
+              shadowRoot?.getElementById(hash)?.scrollIntoView();
+            }
+          }, 200);
+          return dom;
+        },
+        addLinkClickListener({
+          baseUrl: window.location.origin,
+          onClick: (_: MouseEvent, url: string) => {
+            const parsedUrl = new URL(url);
+
+            if (parsedUrl.hash) {
+              navigate(`${parsedUrl.pathname}${parsedUrl.hash}`);
+
+              // Scroll to hash if it's on the current page
+              shadowRoot
+                ?.getElementById(parsedUrl.hash.slice(1))
+                ?.scrollIntoView();
+            } else {
+              navigate(parsedUrl.pathname);
+            }
+          },
+        }),
+        onCssReady({
+          docStorageUrl: await techdocsStorageApi.getApiOrigin(),
+          onLoading: (dom: Element) => {
+            (dom as HTMLElement).style.setProperty('opacity', '0');
+          },
+          onLoaded: (dom: Element) => {
+            (dom as HTMLElement).style.removeProperty('opacity');
+            // disable MkDocs drawer toggling ('for' attribute => checkbox mechanism)
+            (dom as HTMLElement)
+              .querySelector('.md-nav__title')
+              ?.removeAttribute('for');
+            const sideDivs: HTMLElement[] = Array.from(
+              shadowRoot!.querySelectorAll('.md-sidebar'),
+            );
+            setSidebars(sideDivs);
+            // set sidebar height so they don't initially render in wrong position
+            const docTopPosition = (dom as HTMLElement).getBoundingClientRect()
+              .top;
+            const mdTabs = dom.querySelector('.md-container > .md-tabs');
+            sideDivs!.forEach(sidebar => {
+              sidebar.style.top = mdTabs
+                ? `${docTopPosition + mdTabs.getBoundingClientRect().height}px`
+                : `${docTopPosition}px`;
+            });
+          },
+        }),
+      ]),
+    [navigate, techdocsStorageApi],
+  );
+
+  useEffect(() => {
+    if (!rawPage || !shadowDomRef.current) {
+      // clear the shadow dom if no content is available
+      if (shadowDomRef.current?.shadowRoot) {
+        shadowDomRef.current.shadowRoot.innerHTML = '';
+      }
+      return () => {};
+    }
+    if (onReady) {
+      onReady();
     }
 
-    const shadowDiv: HTMLElement = shadowDomRef.current!;
-    const shadowRoot =
-      shadowDiv.shadowRoot || shadowDiv.attachShadow({ mode: 'open' });
-    Array.from(shadowRoot.children).forEach(child =>
-      shadowRoot.removeChild(child),
-    );
-    shadowRoot.appendChild(transformedElement);
+    // if false, there is already a newer execution of this effect
+    let shouldReplaceContent = true;
 
-    // Scroll to top after render
-    window.scroll({ top: 0 });
+    // Pre-render
+    preRender(rawPage, path).then(async transformedElement => {
+      if (!transformedElement?.innerHTML) {
+        return; // An unexpected error occurred
+      }
 
-    // Post-render
-    transformer(shadowRoot.children[0], [
-      dom => {
-        setTimeout(() => {
-          // Scoll to the desired anchor on initial navigation
-          if (window.location.hash) {
-            const hash = window.location.hash.slice(1);
-            shadowRoot?.getElementById(hash)?.scrollIntoView();
-          }
-        }, 200);
-        return dom;
-      },
-      addLinkClickListener({
-        baseUrl: window.location.origin,
-        onClick: (_: MouseEvent, url: string) => {
-          const parsedUrl = new URL(url);
+      // don't manipulate the shadow dom if this isn't the latest effect execution
+      if (!shouldReplaceContent) {
+        return;
+      }
 
-          if (parsedUrl.hash) {
-            navigate(`${parsedUrl.pathname}${parsedUrl.hash}`);
+      const shadowDiv: HTMLElement = shadowDomRef.current!;
+      const shadowRoot =
+        shadowDiv.shadowRoot || shadowDiv.attachShadow({ mode: 'open' });
+      Array.from(shadowRoot.children).forEach(child =>
+        shadowRoot.removeChild(child),
+      );
+      shadowRoot.appendChild(transformedElement);
 
-            // Scroll to hash if it's on the current page
-            shadowRoot
-              ?.getElementById(parsedUrl.hash.slice(1))
-              ?.scrollIntoView();
-          } else {
-            navigate(parsedUrl.pathname);
-          }
-        },
-      }),
-      onCssReady({
-        docStorageUrl: techdocsStorageApi.getApiOrigin(),
-        onLoading: (dom: Element) => {
-          (dom as HTMLElement).style.setProperty('opacity', '0');
-        },
-        onLoaded: (dom: Element) => {
-          (dom as HTMLElement).style.removeProperty('opacity');
-          // disable MkDocs drawer toggling ('for' attribute => checkbox mechanism)
-          (dom as HTMLElement)
-            .querySelector('.md-nav__title')
-            ?.removeAttribute('for');
-          const sideDivs: HTMLElement[] = Array.from(
-            shadowRoot!.querySelectorAll('.md-sidebar'),
-          );
-          setSidebars(sideDivs);
-          // set sidebar height so they don't initially render in wrong position
-          const docTopPosition = (dom as HTMLElement).getBoundingClientRect()
-            .top;
-          const mdTabs = dom.querySelector('.md-container > .md-tabs');
-          sideDivs!.forEach(sidebar => {
-            sidebar.style.top = mdTabs
-              ? `${docTopPosition + mdTabs.getBoundingClientRect().height}px`
-              : `${docTopPosition}px`;
-          });
-        },
-      }),
-    ]);
-  }, [
-    path,
-    kind,
-    namespace,
-    name,
-    rawPage,
-    navigate,
-    onReady,
-    shadowDomRef,
-    techdocsStorageApi,
-    theme.typography.fontFamily,
-    theme.palette.text.primary,
-    theme.palette.primary.main,
-    theme.palette.background.paper,
-    theme.palette.background.default,
-    scmIntegrationsApi,
-  ]);
+      // Scroll to top after render
+      window.scroll({ top: 0 });
+
+      // Post-render
+      await postRender(shadowRoot);
+    });
+
+    // cancel this execution
+    return () => {
+      shouldReplaceContent = false;
+    };
+  }, [onReady, path, postRender, preRender, rawPage]);
 
   return (
     <>
-      {(state === 'CHECKING' || state === 'INITIAL_BUILD') && (
-        <TechDocsProgressBar />
+      {state === 'CHECKING' && <Progress />}
+      {state === 'INITIAL_BUILD' && (
+        <Alert
+          variant="outlined"
+          severity="info"
+          icon={<CircularProgress size="24px" />}
+          action={<TechDocsBuildLogs buildLog={buildLog} />}
+        >
+          Documentation is accessed for the first time and is being prepared.
+          The subsequent loads are much faster.
+        </Alert>
       )}
       {state === 'CONTENT_STALE_REFRESHING' && (
-        <Alert variant="outlined" severity="info">
+        <Alert
+          variant="outlined"
+          severity="info"
+          icon={<CircularProgress size="24px" />}
+          action={<TechDocsBuildLogs buildLog={buildLog} />}
+        >
           A newer version of this documentation is being prepared and will be
           available shortly.
         </Alert>
       )}
       {state === 'CONTENT_STALE_READY' && (
-        <Alert variant="outlined" severity="success">
+        <Alert
+          variant="outlined"
+          severity="success"
+          action={
+            <Button color="inherit" onClick={() => contentReload()}>
+              Refresh
+            </Button>
+          }
+        >
           A newer version of this documentation is now available, please refresh
           to view.
         </Alert>
       )}
-      {state === 'CONTENT_STALE_TIMEOUT' && (
-        <Alert variant="outlined" severity="warning">
-          Building a newer version of this documentation took longer than
-          expected. Please refresh to try again.
-        </Alert>
-      )}
       {state === 'CONTENT_STALE_ERROR' && (
-        <Alert variant="outlined" severity="error">
-          Building a newer version of this documentation failed. {errorMessage}
+        <Alert
+          variant="outlined"
+          severity="error"
+          action={<TechDocsBuildLogs buildLog={buildLog} />}
+          classes={{ message: classes.message }}
+        >
+          Building a newer version of this documentation failed.{' '}
+          {syncErrorMessage}
         </Alert>
       )}
       {state === 'CONTENT_NOT_FOUND' && (
-        <TechDocsNotFound errorMessage={errorMessage} />
+        <>
+          {syncErrorMessage && (
+            <Alert
+              variant="outlined"
+              severity="error"
+              action={<TechDocsBuildLogs buildLog={buildLog} />}
+              classes={{ message: classes.message }}
+            >
+              Building a newer version of this documentation failed.{' '}
+              {syncErrorMessage}
+            </Alert>
+          )}
+          <TechDocsNotFound errorMessage={contentErrorMessage} />
+        </>
+      )}
+
+      {withSearch && shadowDomRef?.current?.shadowRoot?.innerHTML && (
+        <Grid container className={classes.searchBar}>
+          <TechDocsSearch entityId={entityId} />
+        </Grid>
       )}
       <div data-testid="techdocs-content-shadowroot" ref={shadowDomRef} />
     </>
diff --git a/plugins/techdocs/src/reader/components/TechDocsBuildLogs.test.tsx b/plugins/techdocs/src/reader/components/TechDocsBuildLogs.test.tsx
new file mode 100644
index 0000000000..d1bb99b76c
--- /dev/null
+++ b/plugins/techdocs/src/reader/components/TechDocsBuildLogs.test.tsx
@@ -0,0 +1,87 @@
+/*
+ * Copyright 2021 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { render } from '@testing-library/react';
+import React from 'react';
+import {
+  TechDocsBuildLogs,
+  TechDocsBuildLogsDrawerContent,
+} from './TechDocsBuildLogs';
+
+// react-lazylog is based on a react-virtualized component which doesn't
+// write the content to the dom, so we mock it.
+jest.mock('react-lazylog', () => {
+  return {
+    LazyLog: ({ text }: { text: string }) => {
+      return <p>{text}</p>;
+    },
+  };
+});
+
+describe('<TechDocsBuildLogs />', () => {
+  it('should render with button', () => {
+    const rendered = render(<TechDocsBuildLogs buildLog={[]} />);
+    expect(rendered.getByText(/Show Build Logs/i)).toBeInTheDocument();
+    expect(rendered.queryByText(/Build Details/i)).not.toBeInTheDocument();
+  });
+
+  it('should open drawer', () => {
+    const rendered = render(<TechDocsBuildLogs buildLog={[]} />);
+    rendered.getByText(/Show Build Logs/i).click();
+    expect(rendered.getByText(/Build Details/i)).toBeInTheDocument();
+  });
+});
+
+describe('<TechDocsBuildLogsDrawerContent />', () => {
+  it('should render with empty log', () => {
+    const onClose = jest.fn();
+    const rendered = render(
+      <TechDocsBuildLogsDrawerContent buildLog={[]} onClose={onClose} />,
+    );
+    expect(rendered.getByText(/Build Details/i)).toBeInTheDocument();
+    expect(rendered.getByText(/Waiting for logs.../i)).toBeInTheDocument();
+
+    expect(onClose).toBeCalledTimes(0);
+  });
+
+  it('should render with empty logs', () => {
+    const onClose = jest.fn();
+    const rendered = render(
+      <TechDocsBuildLogsDrawerContent
+        buildLog={['Line 1', 'Line 2']}
+        onClose={onClose}
+      />,
+    );
+    expect(rendered.getByText(/Build Details/i)).toBeInTheDocument();
+    expect(
+      rendered.queryByText(/Waiting for logs.../i),
+    ).not.toBeInTheDocument();
+    expect(rendered.getByText(/Line 1/i)).toBeInTheDocument();
+    expect(rendered.getByText(/Line 2/i)).toBeInTheDocument();
+
+    expect(onClose).toBeCalledTimes(0);
+  });
+
+  it('should call onClose', () => {
+    const onClose = jest.fn();
+    const rendered = render(
+      <TechDocsBuildLogsDrawerContent buildLog={[]} onClose={onClose} />,
+    );
+    rendered.getByRole('button').click();
+
+    expect(onClose).toBeCalledTimes(1);
+  });
+});
diff --git a/plugins/techdocs/src/reader/components/TechDocsBuildLogs.tsx b/plugins/techdocs/src/reader/components/TechDocsBuildLogs.tsx
new file mode 100644
index 0000000000..4283932fb3
--- /dev/null
+++ b/plugins/techdocs/src/reader/components/TechDocsBuildLogs.tsx
@@ -0,0 +1,121 @@
+/*
+ * Copyright 2021 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import {
+  Button,
+  createStyles,
+  Drawer,
+  Grid,
+  IconButton,
+  makeStyles,
+  Theme,
+  Typography,
+} from '@material-ui/core';
+import Close from '@material-ui/icons/Close';
+import * as React from 'react';
+import { useState } from 'react';
+import { LazyLog } from 'react-lazylog';
+
+const useDrawerStyles = makeStyles((theme: Theme) =>
+  createStyles({
+    paper: {
+      width: '100%',
+      [theme.breakpoints.up('sm')]: {
+        width: '75%',
+      },
+      [theme.breakpoints.up('md')]: {
+        width: '50%',
+      },
+      padding: theme.spacing(2.5),
+    },
+    root: {
+      height: '100%',
+      overflow: 'hidden',
+    },
+  }),
+);
+
+export const TechDocsBuildLogsDrawerContent = ({
+  buildLog,
+  onClose,
+}: {
+  buildLog: string[];
+  onClose: () => void;
+}) => {
+  const classes = useDrawerStyles();
+  return (
+    <Grid
+      container
+      direction="column"
+      className={classes.root}
+      spacing={0}
+      wrap="nowrap"
+    >
+      <Grid
+        item
+        container
+        justifyContent="space-between"
+        alignItems="center"
+        spacing={0}
+        wrap="nowrap"
+      >
+        <Typography variant="h5">Build Details</Typography>
+        <IconButton
+          key="dismiss"
+          title="Close the drawer"
+          onClick={onClose}
+          color="inherit"
+        >
+          <Close />
+        </IconButton>
+      </Grid>
+
+      <LazyLog
+        text={
+          buildLog.length === 0 ? 'Waiting for logs...' : buildLog.join('\n')
+        }
+        extraLines={1}
+        follow
+        selectableLines
+        enableSearch
+      />
+    </Grid>
+  );
+};
+
+export const TechDocsBuildLogs = ({ buildLog }: { buildLog: string[] }) => {
+  const classes = useDrawerStyles();
+  const [open, setOpen] = useState(false);
+
+  return (
+    <>
+      <Button color="inherit" onClick={() => setOpen(true)}>
+        Show Build Logs
+      </Button>
+      <Drawer
+        classes={{ paper: classes.paper }}
+        anchor="right"
+        open={open}
+        onClose={() => setOpen(false)}
+      >
+        <TechDocsBuildLogsDrawerContent
+          buildLog={buildLog}
+          onClose={() => setOpen(false)}
+        />
+      </Drawer>
+    </>
+  );
+};
diff --git a/plugins/techdocs/src/reader/components/TechDocsNotFound.tsx b/plugins/techdocs/src/reader/components/TechDocsNotFound.tsx
index 430b8e6c05..4bc7d4fa59 100644
--- a/plugins/techdocs/src/reader/components/TechDocsNotFound.tsx
+++ b/plugins/techdocs/src/reader/components/TechDocsNotFound.tsx
@@ -23,9 +23,8 @@ type Props = {
 };
 
 export const TechDocsNotFound = ({ errorMessage }: Props) => {
-  const techdocsBuilder = useApi(configApiRef).getOptionalString(
-    'techdocs.builder',
-  );
+  const techdocsBuilder =
+    useApi(configApiRef).getOptionalString('techdocs.builder');
 
   let additionalInfo = '';
   if (techdocsBuilder !== 'local') {
diff --git a/plugins/techdocs/src/reader/components/TechDocsPage.test.tsx b/plugins/techdocs/src/reader/components/TechDocsPage.test.tsx
index 1d80683d63..584ce534fa 100644
--- a/plugins/techdocs/src/reader/components/TechDocsPage.test.tsx
+++ b/plugins/techdocs/src/reader/components/TechDocsPage.test.tsx
@@ -29,6 +29,7 @@ import {
   TechDocsStorageApi,
 } from '../../api';
 import { ApiRegistry, ApiProvider } from '@backstage/core-app-api';
+import { searchApiRef } from '@backstage/plugin-search';
 
 jest.mock('react-router-dom', () => {
   const actual = jest.requireActual('react-router-dom');
@@ -45,9 +46,9 @@ jest.mock('./TechDocsPageHeader', () => {
   };
 });
 
-const { useParams }: { useParams: jest.Mock } = jest.requireMock(
-  'react-router-dom',
-);
+const { useParams }: { useParams: jest.Mock } =
+  jest.requireMock('react-router-dom');
+global.scroll = jest.fn();
 
 describe('<TechDocsPage />', () => {
   it('should render techdocs page', async () => {
@@ -55,11 +56,12 @@ describe('<TechDocsPage />', () => {
       entityId: 'Component::backstage',
     });
 
-    const scmIntegrationsApi: ScmIntegrationsApi = ScmIntegrationsApi.fromConfig(
-      new ConfigReader({
-        integrations: {},
-      }),
-    );
+    const scmIntegrationsApi: ScmIntegrationsApi =
+      ScmIntegrationsApi.fromConfig(
+        new ConfigReader({
+          integrations: {},
+        }),
+      );
     const techdocsApi: Partial<TechDocsApi> = {
       getEntityMetadata: () =>
         Promise.resolve({
@@ -75,16 +77,23 @@ describe('<TechDocsPage />', () => {
           site_description: 'string',
         }),
     };
+
     const techdocsStorageApi: Partial<TechDocsStorageApi> = {
       getEntityDocs: (): Promise<string> => Promise.resolve('String'),
       getBaseUrl: (): Promise<string> => Promise.resolve('String'),
       getApiOrigin: (): Promise<string> => Promise.resolve('String'),
     };
-
+    const searchApi = {
+      query: () =>
+        Promise.resolve({
+          results: [],
+        }),
+    };
     const apiRegistry = ApiRegistry.from([
       [scmIntegrationsApiRef, scmIntegrationsApi],
       [techdocsApiRef, techdocsApi],
       [techdocsStorageApiRef, techdocsStorageApi],
+      [searchApiRef, searchApi],
     ]);
 
     await act(async () => {
diff --git a/plugins/techdocs/src/reader/components/TechDocsPage.tsx b/plugins/techdocs/src/reader/components/TechDocsPage.tsx
index 88c53a38a7..19092f47c3 100644
--- a/plugins/techdocs/src/reader/components/TechDocsPage.tsx
+++ b/plugins/techdocs/src/reader/components/TechDocsPage.tsx
@@ -30,7 +30,7 @@ export const TechDocsPage = () => {
 
   const techdocsApi = useApi(techdocsApiRef);
 
-  const techdocsMetadataRequest = useAsync(() => {
+  const { value: techdocsMetadataValue } = useAsync(() => {
     if (documentReady) {
       return techdocsApi.getTechDocsMetadata({ kind, namespace, name });
     }
@@ -38,7 +38,7 @@ export const TechDocsPage = () => {
     return Promise.resolve(undefined);
   }, [kind, namespace, name, techdocsApi, documentReady]);
 
-  const entityMetadataRequest = useAsync(() => {
+  const { value: entityMetadataValue } = useAsync(() => {
     return techdocsApi.getEntityMetadata({ kind, namespace, name });
   }, [kind, namespace, name, techdocsApi]);
 
@@ -49,10 +49,8 @@ export const TechDocsPage = () => {
   return (
     <Page themeId="documentation">
       <TechDocsPageHeader
-        metadataRequest={{
-          techdocs: techdocsMetadataRequest,
-          entity: entityMetadataRequest,
-        }}
+        techDocsMetadata={techdocsMetadataValue}
+        entityMetadata={entityMetadataValue}
         entityId={{
           kind,
           namespace,
diff --git a/plugins/techdocs/src/reader/components/TechDocsPageHeader.test.tsx b/plugins/techdocs/src/reader/components/TechDocsPageHeader.test.tsx
index 9e80edb29a..dede1af115 100644
--- a/plugins/techdocs/src/reader/components/TechDocsPageHeader.test.tsx
+++ b/plugins/techdocs/src/reader/components/TechDocsPageHeader.test.tsx
@@ -30,26 +30,23 @@ describe('<TechDocsPageHeader />', () => {
             name: 'test-name',
             namespace: 'test-namespace',
           }}
-          metadataRequest={{
-            entity: {
-              loading: false,
-              value: {
-                locationMetadata: {
-                  type: 'github',
-                  target: 'https://example.com/',
-                },
-                spec: {
-                  owner: 'test',
-                },
-              },
+          entityMetadata={{
+            locationMetadata: {
+              type: 'github',
+              target: 'https://example.com/',
             },
-            techdocs: {
-              loading: false,
-              value: {
-                site_name: 'test-site-name',
-                site_description: 'test-site-desc',
-              },
+            apiVersion: 'v1',
+            kind: 'Component',
+            metadata: {
+              name: 'test',
             },
+            spec: {
+              owner: 'test',
+            },
+          }}
+          techDocsMetadata={{
+            site_name: 'test-site-name',
+            site_description: 'test-site-desc',
           }}
         />,
         {
@@ -75,14 +72,6 @@ describe('<TechDocsPageHeader />', () => {
             name: 'test-name',
             namespace: 'test-namespace',
           }}
-          metadataRequest={{
-            entity: {
-              loading: false,
-            },
-            techdocs: {
-              loading: false,
-            },
-          }}
         />,
         {
           mountedRoutes: {
@@ -105,17 +94,9 @@ describe('<TechDocsPageHeader />', () => {
             name: 'test-name',
             namespace: 'test-namespace',
           }}
-          metadataRequest={{
-            entity: {
-              loading: false,
-            },
-            techdocs: {
-              loading: false,
-              value: {
-                site_name: 'test-site-name',
-                site_description: 'test-site-desc',
-              },
-            },
+          techDocsMetadata={{
+            site_name: 'test-site-name',
+            site_description: 'test-site-desc',
           }}
         />,
         {
diff --git a/plugins/techdocs/src/reader/components/TechDocsPageHeader.tsx b/plugins/techdocs/src/reader/components/TechDocsPageHeader.tsx
index 38e122e9cb..34d564bdfe 100644
--- a/plugins/techdocs/src/reader/components/TechDocsPageHeader.tsx
+++ b/plugins/techdocs/src/reader/components/TechDocsPageHeader.tsx
@@ -15,6 +15,8 @@
  */
 
 import { EntityName, RELATION_OWNED_BY } from '@backstage/catalog-model';
+import { Header, HeaderLabel } from '@backstage/core-components';
+import { useRouteRef } from '@backstage/core-plugin-api';
 import {
   EntityRefLink,
   EntityRefLinks,
@@ -22,45 +24,30 @@ import {
 } from '@backstage/plugin-catalog-react';
 import CodeIcon from '@material-ui/icons/Code';
 import React from 'react';
-import { AsyncState } from 'react-use/lib/useAsync';
 import { rootRouteRef } from '../../routes';
-import { TechDocsMetadata } from '../../types';
-
-import { Header, HeaderLabel } from '@backstage/core-components';
-import { useRouteRef } from '@backstage/core-plugin-api';
+import { TechDocsEntityMetadata, TechDocsMetadata } from '../../types';
 
 type TechDocsPageHeaderProps = {
   entityId: EntityName;
-  metadataRequest: {
-    entity: AsyncState<any>;
-    techdocs: AsyncState<TechDocsMetadata>;
-  };
+  entityMetadata?: TechDocsEntityMetadata;
+  techDocsMetadata?: TechDocsMetadata;
 };
 
 export const TechDocsPageHeader = ({
   entityId,
-  metadataRequest,
+  entityMetadata,
+  techDocsMetadata,
 }: TechDocsPageHeaderProps) => {
-  const {
-    techdocs: techdocsMetadata,
-    entity: entityMetadata,
-  } = metadataRequest;
-
-  const { value: techdocsMetadataValues } = techdocsMetadata;
-  const { value: entityMetadataValues } = entityMetadata;
-
   const { name } = entityId;
 
   const { site_name: siteName, site_description: siteDescription } =
-    techdocsMetadataValues || {};
+    techDocsMetadata || {};
 
-  const {
-    locationMetadata,
-    spec: { lifecycle },
-  } = entityMetadataValues || { spec: {} };
+  const { locationMetadata, spec } = entityMetadata || {};
+  const lifecycle = spec?.lifecycle;
 
-  const ownedByRelations = entityMetadataValues
-    ? getEntityRelations(entityMetadataValues, RELATION_OWNED_BY)
+  const ownedByRelations = entityMetadata
+    ? getEntityRelations(entityMetadata, RELATION_OWNED_BY)
     : [];
 
   const docsRootLink = useRouteRef(rootRouteRef)();
diff --git a/plugins/techdocs/src/reader/components/TechDocsProgressBar.test.tsx b/plugins/techdocs/src/reader/components/TechDocsProgressBar.test.tsx
deleted file mode 100644
index f33ed62b97..0000000000
--- a/plugins/techdocs/src/reader/components/TechDocsProgressBar.test.tsx
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Copyright 2020 The Backstage Authors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import TechDocsProgressBar from './TechDocsProgressBar';
-import React from 'react';
-import { render } from '@testing-library/react';
-import { wrapInTestApp } from '@backstage/test-utils';
-import { act } from 'react-dom/test-utils';
-
-jest.useFakeTimers();
-
-describe('<TechDocsProgressBar />', () => {
-  it('should render a message if techdocs page takes more time to load', () => {
-    const rendered = render(wrapInTestApp(<TechDocsProgressBar />));
-    act(() => {
-      jest.advanceTimersByTime(250);
-    });
-    expect(rendered.getByTestId('progress')).toBeInTheDocument();
-    expect(rendered.queryByTestId('delay-reason')).toBeNull();
-    act(() => {
-      jest.advanceTimersByTime(5000);
-    });
-    expect(rendered.getByTestId('delay-reason')).toBeInTheDocument();
-  });
-});
diff --git a/plugins/techdocs/src/reader/components/TechDocsProgressBar.tsx b/plugins/techdocs/src/reader/components/TechDocsProgressBar.tsx
deleted file mode 100644
index 7089f5ae08..0000000000
--- a/plugins/techdocs/src/reader/components/TechDocsProgressBar.tsx
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Copyright 2020 The Backstage Authors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import React, { useState, useEffect } from 'react';
-import { useMountedState } from 'react-use';
-import { Typography } from '@material-ui/core';
-import { Progress } from '@backstage/core-components';
-
-const TechDocsProgressBar = () => {
-  const isMounted = useMountedState();
-  const [hasBeenDelayed, setHasBeenDelayed] = useState(false);
-
-  const delayReason = `Docs are still loading...Backstage takes some extra time to load docs
-  for the first time. The subsequent loads are much faster.`;
-
-  // Allowed time that docs can take to load (in milliseconds)
-  const allowedDelayTime = 5000;
-
-  useEffect(() => {
-    setTimeout(() => {
-      if (isMounted()) {
-        setHasBeenDelayed(true);
-      }
-    }, allowedDelayTime);
-  });
-
-  return (
-    <>
-      {hasBeenDelayed ? (
-        <Typography data-testid="delay-reason">{delayReason}</Typography>
-      ) : null}
-      <Progress />
-    </>
-  );
-};
-
-export default TechDocsProgressBar;
diff --git a/plugins/techdocs/src/reader/components/TechDocsSearch.test.tsx b/plugins/techdocs/src/reader/components/TechDocsSearch.test.tsx
new file mode 100644
index 0000000000..564a8098a5
--- /dev/null
+++ b/plugins/techdocs/src/reader/components/TechDocsSearch.test.tsx
@@ -0,0 +1,122 @@
+/*
+ * Copyright 2020 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import React from 'react';
+import { TechDocsSearch } from './TechDocsSearch';
+import {
+  act,
+  fireEvent,
+  render,
+  waitFor,
+  within,
+} from '@testing-library/react';
+import { wrapInTestApp } from '@backstage/test-utils';
+import { ApiProvider, ApiRegistry } from '@backstage/core-app-api';
+import { searchApiRef } from '@backstage/plugin-search';
+
+const entityId = {
+  name: 'test',
+  namespace: 'testspace',
+  kind: 'Testable',
+};
+
+const emptyResults = Promise.resolve({
+  results: [],
+});
+const singleResult = Promise.resolve({
+  results: [
+    {
+      type: 'testsearchresult',
+      document: {
+        text: 'text',
+        title: 'title',
+        location: '/something/something',
+      },
+    },
+  ],
+});
+
+describe('<TechDocsPage />', () => {
+  it('should render techdocs search bar', async () => {
+    const query = () => emptyResults;
+    const querySpy = jest.fn(query);
+    const searchApi = { query: querySpy };
+
+    const apiRegistry = ApiRegistry.from([[searchApiRef, searchApi]]);
+
+    await act(async () => {
+      const rendered = render(
+        wrapInTestApp(
+          <ApiProvider apis={apiRegistry}>
+            <TechDocsSearch entityId={entityId} />
+          </ApiProvider>,
+        ),
+      );
+
+      await emptyResults;
+      expect(querySpy).toBeCalled();
+      expect(rendered.getByTestId('techdocs-search-bar')).toBeInTheDocument();
+    });
+  });
+  it('should trigger query when autocomplete input changed', async () => {
+    const query = () => singleResult;
+    const querySpy = jest.fn(query);
+    const searchApi = { query: querySpy };
+
+    const apiRegistry = ApiRegistry.from([[searchApiRef, searchApi]]);
+
+    await act(async () => {
+      const rendered = render(
+        wrapInTestApp(
+          <ApiProvider apis={apiRegistry}>
+            <TechDocsSearch entityId={entityId} debounceTime={0} />
+          </ApiProvider>,
+        ),
+      );
+
+      await singleResult;
+      expect(querySpy).toBeCalledWith({
+        filters: {
+          kind: 'Testable',
+          name: 'test',
+          namespace: 'testspace',
+        },
+        pageCursor: '',
+        term: '',
+        types: ['techdocs'],
+      });
+
+      const autocomplete = rendered.getByTestId('techdocs-search-bar');
+      const input = within(autocomplete).getByRole('textbox');
+      autocomplete.click();
+      autocomplete.focus();
+      fireEvent.change(input, { target: { value: 'asdf' } });
+
+      await singleResult;
+      await waitFor(() =>
+        expect(querySpy).toBeCalledWith({
+          filters: {
+            kind: 'Testable',
+            name: 'test',
+            namespace: 'testspace',
+          },
+          pageCursor: '',
+          term: 'asdf',
+          types: ['techdocs'],
+        }),
+      );
+    });
+  });
+});
diff --git a/plugins/techdocs/src/reader/components/TechDocsSearch.tsx b/plugins/techdocs/src/reader/components/TechDocsSearch.tsx
new file mode 100644
index 0000000000..6f2df2cc55
--- /dev/null
+++ b/plugins/techdocs/src/reader/components/TechDocsSearch.tsx
@@ -0,0 +1,177 @@
+/*
+ * Copyright 2021 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import React, { ChangeEvent, useEffect, useState } from 'react';
+import {
+  Grid,
+  IconButton,
+  InputAdornment,
+  TextField,
+  CircularProgress,
+} from '@material-ui/core';
+import Autocomplete from '@material-ui/lab/Autocomplete';
+import { SearchContextProvider, useSearch } from '@backstage/plugin-search';
+import { DocsResultListItem } from '../../components/DocsResultListItem';
+import SearchIcon from '@material-ui/icons/Search';
+import { useDebounce } from 'react-use';
+import { useNavigate } from 'react-router';
+
+type TechDocsSearchProps = {
+  entityId: {
+    name: string;
+    namespace: string;
+    kind: string;
+  };
+  debounceTime?: number;
+};
+
+type TechDocsDoc = {
+  namespace: string;
+  kind: string;
+  name: string;
+  path: string;
+  location: string;
+  title: string;
+};
+
+type TechDocsSearchResult = {
+  type: string;
+  document: TechDocsDoc;
+};
+
+const TechDocsSearchBar = ({
+  entityId,
+  debounceTime = 150,
+}: TechDocsSearchProps) => {
+  const [open, setOpen] = useState(false);
+  const navigate = useNavigate();
+  const {
+    term,
+    setTerm,
+    result: { loading, value: searchVal },
+  } = useSearch();
+  const [options, setOptions] = useState<any[]>([]);
+  useEffect(() => {
+    let mounted = true;
+
+    if (mounted && searchVal) {
+      // TODO: Change this into getting only subset of search results from the BE in the first place
+      // once pagination is implemented for search engines
+      // See: https://github.com/backstage/backstage/issues/6062
+      const searchResults = searchVal.results.slice(0, 10);
+      setOptions(searchResults);
+    }
+    return () => {
+      mounted = false;
+    };
+  }, [loading, searchVal]);
+
+  const [value, setValue] = useState<string>(term);
+
+  useDebounce(() => setTerm(value), debounceTime, [value]);
+
+  const handleQuery = (e: ChangeEvent<HTMLInputElement>) => {
+    if (!open) {
+      setOpen(true);
+    }
+    setValue(e.target.value);
+  };
+
+  const handleSelection = (_: any, selection: TechDocsSearchResult | null) => {
+    if (selection?.document) {
+      const { location } = selection.document;
+      navigate(location);
+    }
+  };
+
+  return (
+    <Grid item xs={12}>
+      <Autocomplete
+        data-testid="techdocs-search-bar"
+        size="small"
+        open={open}
+        getOptionLabel={() => ''}
+        filterOptions={x => {
+          return x; // This is needed to get renderOption to be called after options change. Bug in material-ui?
+        }}
+        onClose={() => {
+          setOpen(false);
+        }}
+        onFocus={() => {
+          setOpen(true);
+        }}
+        onChange={handleSelection}
+        blurOnSelect
+        noOptionsText="No results found"
+        value={null}
+        options={options}
+        renderOption={({ document }) => (
+          <DocsResultListItem
+            result={document}
+            lineClamp={3}
+            asListItem={false}
+            asLink={false}
+            title={document.title}
+          />
+        )}
+        loading={loading}
+        renderInput={params => (
+          <TextField
+            {...params}
+            data-testid="techdocs-search-bar-input"
+            variant="outlined"
+            fullWidth
+            placeholder={`Search ${entityId.name} docs`}
+            value={value}
+            onChange={handleQuery}
+            InputProps={{
+              ...params.InputProps,
+              startAdornment: (
+                <InputAdornment position="start">
+                  <IconButton aria-label="Query" disabled>
+                    <SearchIcon />
+                  </IconButton>
+                </InputAdornment>
+              ),
+              endAdornment: (
+                <React.Fragment>
+                  {loading ? (
+                    <CircularProgress color="inherit" size={20} />
+                  ) : null}
+                  {params.InputProps.endAdornment}
+                </React.Fragment>
+              ),
+            }}
+          />
+        )}
+      />
+    </Grid>
+  );
+};
+const TechDocsSearch = (props: TechDocsSearchProps) => {
+  const initialState = {
+    term: '',
+    types: ['techdocs'],
+    pageCursor: '',
+    filters: props.entityId,
+  };
+  return (
+    <SearchContextProvider initialState={initialState}>
+      <TechDocsSearchBar {...props} />
+    </SearchContextProvider>
+  );
+};
+export { TechDocsSearch };
diff --git a/plugins/techdocs/src/reader/components/useReaderState.test.tsx b/plugins/techdocs/src/reader/components/useReaderState.test.tsx
index 1edf41af30..b0d4e0326a 100644
--- a/plugins/techdocs/src/reader/components/useReaderState.test.tsx
+++ b/plugins/techdocs/src/reader/components/useReaderState.test.tsx
@@ -14,6 +14,7 @@
  * limitations under the License.
  */
 
+import { ApiProvider, ApiRegistry } from '@backstage/core-app-api';
 import { NotFoundError } from '@backstage/errors';
 import { act, renderHook } from '@testing-library/react-hooks';
 import React from 'react';
@@ -23,7 +24,6 @@ import {
   reducer,
   useReaderState,
 } from './useReaderState';
-import { ApiProvider, ApiRegistry } from '@backstage/core-app-api';
 
 describe('useReaderState', () => {
   let Wrapper: React.ComponentType;
@@ -55,14 +55,12 @@ describe('useReaderState', () => {
       ${false}       | ${undefined} | ${'BUILDING'}           | ${'INITIAL_BUILD'}
       ${false}       | ${undefined} | ${'BUILD_READY'}        | ${'CONTENT_NOT_FOUND'}
       ${false}       | ${undefined} | ${'BUILD_READY_RELOAD'} | ${'CHECKING'}
-      ${false}       | ${undefined} | ${'BUILD_TIMED_OUT'}    | ${'CONTENT_NOT_FOUND'}
       ${false}       | ${undefined} | ${'UP_TO_DATE'}         | ${'CONTENT_NOT_FOUND'}
       ${false}       | ${undefined} | ${'ERROR'}              | ${'CONTENT_NOT_FOUND'}
       ${false}       | ${'asdf'}    | ${'CHECKING'}           | ${'CONTENT_FRESH'}
       ${false}       | ${'asdf'}    | ${'BUILDING'}           | ${'CONTENT_STALE_REFRESHING'}
       ${false}       | ${'asdf'}    | ${'BUILD_READY'}        | ${'CONTENT_STALE_READY'}
       ${false}       | ${'asdf'}    | ${'BUILD_READY_RELOAD'} | ${'CHECKING'}
-      ${false}       | ${'asdf'}    | ${'BUILD_TIMED_OUT'}    | ${'CONTENT_STALE_TIMEOUT'}
       ${false}       | ${'asdf'}    | ${'UP_TO_DATE'}         | ${'CONTENT_FRESH'}
       ${false}       | ${'asdf'}    | ${'ERROR'}              | ${'CONTENT_STALE_ERROR'}
     `(
@@ -84,30 +82,33 @@ describe('useReaderState', () => {
       activeSyncState: 'CHECKING',
       contentLoading: false,
       path: '',
+      buildLog: ['1', '2'],
     };
 
     it('should return a copy of the state', () => {
-      expect(reducer(oldState, { type: 'navigate', path: '/' })).toEqual({
+      expect(reducer(oldState, { type: 'content', path: '/' })).toEqual({
         activeSyncState: 'CHECKING',
         contentLoading: false,
         path: '/',
+        buildLog: ['1', '2'],
       });
 
       expect(oldState).toEqual({
         activeSyncState: 'CHECKING',
         contentLoading: false,
         path: '',
+        buildLog: ['1', '2'],
       });
     });
 
     it.each`
-      type          | oldActiveSyncState      | newActiveSyncState
-      ${'content'}  | ${'BUILD_READY'}        | ${'UP_TO_DATE'}
-      ${'content'}  | ${'BUILD_READY_RELOAD'} | ${'UP_TO_DATE'}
-      ${'navigate'} | ${'BUILD_READY'}        | ${'UP_TO_DATE'}
-      ${'navigate'} | ${'BUILD_READY_RELOAD'} | ${'UP_TO_DATE'}
-      ${'sync'}     | ${'BUILD_READY'}        | ${undefined}
-      ${'sync'}     | ${'BUILD_READY_RELOAD'} | ${undefined}
+      type                | oldActiveSyncState      | newActiveSyncState
+      ${'contentLoading'} | ${'BUILD_READY'}        | ${'UP_TO_DATE'}
+      ${'contentLoading'} | ${'BUILD_READY_RELOAD'} | ${'UP_TO_DATE'}
+      ${'content'}        | ${'BUILD_READY'}        | ${'UP_TO_DATE'}
+      ${'content'}        | ${'BUILD_READY_RELOAD'} | ${'UP_TO_DATE'}
+      ${'sync'}           | ${'BUILD_READY'}        | ${undefined /* undefined, because we don't set an input */}
+      ${'sync'}           | ${'BUILD_READY_RELOAD'} | ${undefined /* undefined, because we don't set an input */}
     `(
       'should, when type=$type and activeSyncState=$oldActiveSyncState, set activeSyncState=$newActiveSyncState',
       ({ type, oldActiveSyncState, newActiveSyncState }) => {
@@ -123,18 +124,45 @@ describe('useReaderState', () => {
       },
     );
 
-    describe('"content" action', () => {
+    describe('"contentLoading" action', () => {
       it('should set loading', () => {
+        expect(
+          reducer(oldState, {
+            type: 'contentLoading',
+          }),
+        ).toEqual({
+          ...oldState,
+          contentLoading: true,
+        });
+      });
+
+      it('should keep content', () => {
         expect(
           reducer(
             {
               ...oldState,
               content: 'some-old-content',
+            },
+            {
+              type: 'contentLoading',
+            },
+          ),
+        ).toEqual({
+          ...oldState,
+          contentLoading: true,
+          content: 'some-old-content',
+        });
+      });
+
+      it('should reset errors', () => {
+        expect(
+          reducer(
+            {
+              ...oldState,
               contentError: new Error(),
             },
             {
-              type: 'content',
-              contentLoading: true,
+              type: 'contentLoading',
             },
           ),
         ).toEqual({
@@ -142,7 +170,9 @@ describe('useReaderState', () => {
           contentLoading: true,
         });
       });
+    });
 
+    describe('"content" action', () => {
       it('should set content', () => {
         expect(
           reducer(
@@ -163,6 +193,27 @@ describe('useReaderState', () => {
         });
       });
 
+      it('should set content and update path', () => {
+        expect(
+          reducer(
+            {
+              ...oldState,
+              contentLoading: true,
+            },
+            {
+              type: 'content',
+              content: 'asdf',
+              path: '/new-path',
+            },
+          ),
+        ).toEqual({
+          ...oldState,
+          contentLoading: false,
+          content: 'asdf',
+          path: '/new-path',
+        });
+      });
+
       it('should set error', () => {
         expect(
           reducer(
@@ -184,20 +235,6 @@ describe('useReaderState', () => {
       });
     });
 
-    describe('"navigate" action', () => {
-      it('should work', () => {
-        expect(
-          reducer(oldState, {
-            type: 'navigate',
-            path: '/',
-          }),
-        ).toEqual({
-          ...oldState,
-          path: '/',
-        });
-      });
-    });
-
     describe('"sync" action', () => {
       it('should update state', () => {
         expect(
@@ -210,6 +247,33 @@ describe('useReaderState', () => {
           activeSyncState: 'BUILDING',
         });
       });
+
+      it('should clear buildLog on "CHECKING"', () => {
+        expect(
+          reducer(oldState, {
+            type: 'sync',
+            state: 'CHECKING',
+          }),
+        ).toEqual({
+          ...oldState,
+          activeSyncState: 'CHECKING',
+          buildLog: [],
+        });
+      });
+    });
+
+    describe('"buildLog" action', () => {
+      it('should work', () => {
+        expect(
+          reducer(oldState, {
+            type: 'buildLog',
+            log: 'Another Line',
+          }),
+        ).toEqual({
+          ...oldState,
+          buildLog: ['1', '2', 'Another Line'],
+        });
+      });
     });
   });
 
@@ -228,27 +292,38 @@ describe('useReaderState', () => {
 
         expect(result.current).toEqual({
           state: 'CHECKING',
+          path: '/example',
           content: undefined,
-          errorMessage: '',
+          contentErrorMessage: undefined,
+          syncErrorMessage: undefined,
+          buildLog: [],
+          contentReload: expect.any(Function),
         });
 
         await waitForValueToChange(() => result.current.state);
 
         expect(result.current).toEqual({
           state: 'CONTENT_FRESH',
+          path: '/example',
           content: 'my content',
-          errorMessage: '',
+          contentErrorMessage: undefined,
+          syncErrorMessage: undefined,
+          buildLog: [],
+          contentReload: expect.any(Function),
         });
 
         expect(techdocsStorageApi.getEntityDocs).toBeCalledWith(
           { kind: 'Component', namespace: 'default', name: 'backstage' },
           '/example',
         );
-        expect(techdocsStorageApi.syncEntityDocs).toBeCalledWith({
-          kind: 'Component',
-          namespace: 'default',
-          name: 'backstage',
-        });
+        expect(techdocsStorageApi.syncEntityDocs).toBeCalledWith(
+          {
+            kind: 'Component',
+            namespace: 'default',
+            name: 'backstage',
+          },
+          expect.any(Function),
+        );
       });
     });
 
@@ -259,10 +334,14 @@ describe('useReaderState', () => {
           await new Promise(resolve => setTimeout(resolve, 500));
           return 'my content';
         });
-      techdocsStorageApi.syncEntityDocs.mockImplementation(async () => {
-        await new Promise(resolve => setTimeout(resolve, 1100));
-        return 'updated';
-      });
+      techdocsStorageApi.syncEntityDocs.mockImplementation(
+        async (_, logHandler) => {
+          logHandler?.call(this, 'Line 1');
+          logHandler?.call(this, 'Line 2');
+          await new Promise(resolve => setTimeout(resolve, 1100));
+          return 'updated';
+        },
+      );
 
       await act(async () => {
         const { result, waitForValueToChange } = await renderHook(
@@ -272,32 +351,48 @@ describe('useReaderState', () => {
 
         expect(result.current).toEqual({
           state: 'CHECKING',
+          path: '/example',
           content: undefined,
-          errorMessage: '',
+          contentErrorMessage: undefined,
+          syncErrorMessage: undefined,
+          buildLog: [],
+          contentReload: expect.any(Function),
         });
 
         await waitForValueToChange(() => result.current.state);
 
         expect(result.current).toEqual({
           state: 'INITIAL_BUILD',
+          path: '/example',
           content: undefined,
-          errorMessage: ' Load error: NotFoundError: Page Not Found',
+          contentErrorMessage: 'NotFoundError: Page Not Found',
+          syncErrorMessage: undefined,
+          buildLog: ['Line 1', 'Line 2'],
+          contentReload: expect.any(Function),
         });
 
         await waitForValueToChange(() => result.current.state);
 
         expect(result.current).toEqual({
           state: 'CHECKING',
+          path: '/example',
           content: undefined,
-          errorMessage: '',
+          contentErrorMessage: undefined,
+          syncErrorMessage: undefined,
+          buildLog: [],
+          contentReload: expect.any(Function),
         });
 
         await waitForValueToChange(() => result.current.state);
 
         expect(result.current).toEqual({
           state: 'CONTENT_FRESH',
+          path: '/example',
           content: 'my content',
-          errorMessage: '',
+          contentErrorMessage: undefined,
+          syncErrorMessage: undefined,
+          buildLog: [],
+          contentReload: expect.any(Function),
         });
 
         expect(techdocsStorageApi.getEntityDocs).toBeCalledTimes(2);
@@ -306,20 +401,32 @@ describe('useReaderState', () => {
           '/example',
         );
         expect(techdocsStorageApi.syncEntityDocs).toBeCalledTimes(1);
-        expect(techdocsStorageApi.syncEntityDocs).toBeCalledWith({
-          kind: 'Component',
-          namespace: 'default',
-          name: 'backstage',
-        });
+        expect(techdocsStorageApi.syncEntityDocs).toBeCalledWith(
+          {
+            kind: 'Component',
+            namespace: 'default',
+            name: 'backstage',
+          },
+          expect.any(Function),
+        );
       });
     });
 
     it('should handle stale content', async () => {
-      techdocsStorageApi.getEntityDocs.mockResolvedValue('my content');
-      techdocsStorageApi.syncEntityDocs.mockImplementation(async () => {
-        await new Promise(resolve => setTimeout(resolve, 1100));
-        return 'updated';
-      });
+      techdocsStorageApi.getEntityDocs
+        .mockResolvedValueOnce('my content')
+        .mockImplementationOnce(async () => {
+          await new Promise(resolve => setTimeout(resolve, 1100));
+          return 'my new content';
+        });
+      techdocsStorageApi.syncEntityDocs.mockImplementation(
+        async (_, logHandler) => {
+          logHandler?.call(this, 'Line 1');
+          logHandler?.call(this, 'Line 2');
+          await new Promise(resolve => setTimeout(resolve, 1100));
+          return 'updated';
+        },
+      );
 
       await act(async () => {
         const { result, waitForValueToChange } = await renderHook(
@@ -329,79 +436,187 @@ describe('useReaderState', () => {
 
         expect(result.current).toEqual({
           state: 'CHECKING',
+          path: '/example',
           content: undefined,
-          errorMessage: '',
+          contentErrorMessage: undefined,
+          syncErrorMessage: undefined,
+          buildLog: [],
+          contentReload: expect.any(Function),
         });
 
         // the content is returned but the sync is in progress
         await waitForValueToChange(() => result.current.state);
         expect(result.current).toEqual({
           state: 'CONTENT_FRESH',
+          path: '/example',
           content: 'my content',
-          errorMessage: '',
+          contentErrorMessage: undefined,
+          syncErrorMessage: undefined,
+          buildLog: ['Line 1', 'Line 2'],
+          contentReload: expect.any(Function),
         });
 
         // the sync takes longer than 1 seconds so the refreshing state starts
         await waitForValueToChange(() => result.current.state);
         expect(result.current).toEqual({
           state: 'CONTENT_STALE_REFRESHING',
+          path: '/example',
           content: 'my content',
-          errorMessage: '',
+          contentErrorMessage: undefined,
+          syncErrorMessage: undefined,
+          buildLog: ['Line 1', 'Line 2'],
+          contentReload: expect.any(Function),
         });
 
-        // the content is up-to-date
+        // the content is updated but not yet displayed
         await waitForValueToChange(() => result.current.state);
         expect(result.current).toEqual({
           state: 'CONTENT_STALE_READY',
+          path: '/example',
           content: 'my content',
-          errorMessage: '',
+          contentErrorMessage: undefined,
+          syncErrorMessage: undefined,
+          buildLog: ['Line 1', 'Line 2'],
+          contentReload: expect.any(Function),
         });
 
+        // reload the content
+        result.current.contentReload();
+
+        // the new content refresh is triggered
+        await waitForValueToChange(() => result.current.state);
+        expect(result.current).toEqual({
+          state: 'CHECKING',
+          path: '/example',
+          content: 'my content',
+          contentErrorMessage: undefined,
+          syncErrorMessage: undefined,
+          buildLog: [],
+          contentReload: expect.any(Function),
+        });
+
+        // the new content is loaded
+        await waitForValueToChange(() => result.current.state);
+        expect(result.current).toEqual({
+          state: 'CONTENT_FRESH',
+          path: '/example',
+          content: 'my new content',
+          contentErrorMessage: undefined,
+          syncErrorMessage: undefined,
+          buildLog: [],
+          contentReload: expect.any(Function),
+        });
+
+        expect(techdocsStorageApi.getEntityDocs).toBeCalledTimes(2);
         expect(techdocsStorageApi.getEntityDocs).toBeCalledWith(
           { kind: 'Component', namespace: 'default', name: 'backstage' },
           '/example',
         );
-        expect(techdocsStorageApi.syncEntityDocs).toBeCalledWith({
-          kind: 'Component',
-          namespace: 'default',
-          name: 'backstage',
-        });
+        expect(techdocsStorageApi.syncEntityDocs).toBeCalledWith(
+          {
+            kind: 'Component',
+            namespace: 'default',
+            name: 'backstage',
+          },
+          expect.any(Function),
+        );
       });
     });
 
-    it('should handle timed-out refresh', async () => {
-      techdocsStorageApi.getEntityDocs.mockResolvedValue('my content');
-      techdocsStorageApi.syncEntityDocs.mockResolvedValue('timeout');
+    it('should handle navigation', async () => {
+      techdocsStorageApi.getEntityDocs
+        .mockResolvedValueOnce('my content')
+        .mockImplementationOnce(async () => {
+          await new Promise(resolve => setTimeout(resolve, 1100));
+          return 'my new content';
+        })
+        .mockRejectedValueOnce(new NotFoundError('Some error description'));
+      techdocsStorageApi.syncEntityDocs.mockResolvedValue('cached');
 
       await act(async () => {
-        const { result, waitForValueToChange } = await renderHook(
-          () => useReaderState('Component', 'default', 'backstage', '/example'),
-          { wrapper: Wrapper },
+        const { result, waitForValueToChange, rerender } = await renderHook(
+          ({ path }: { path: string }) =>
+            useReaderState('Component', 'default', 'backstage', path),
+          { initialProps: { path: '/example' }, wrapper: Wrapper as any },
         );
 
         expect(result.current).toEqual({
           state: 'CHECKING',
+          path: '/example',
           content: undefined,
-          errorMessage: '',
+          contentErrorMessage: undefined,
+          syncErrorMessage: undefined,
+          buildLog: [],
+          contentReload: expect.any(Function),
         });
 
-        // the content is returned but the sync is in progress
+        // show the content
         await waitForValueToChange(() => result.current.state);
         expect(result.current).toEqual({
-          state: 'CONTENT_STALE_TIMEOUT',
+          state: 'CONTENT_FRESH',
+          path: '/example',
           content: 'my content',
-          errorMessage: '',
+          contentErrorMessage: undefined,
+          syncErrorMessage: undefined,
+          buildLog: [],
+          contentReload: expect.any(Function),
+        });
+
+        // navigate
+        rerender({ path: '/new' });
+
+        await waitForValueToChange(() => result.current.state);
+        expect(result.current).toEqual({
+          state: 'CHECKING',
+          path: '/example',
+          content: 'my content',
+          contentErrorMessage: undefined,
+          syncErrorMessage: undefined,
+          buildLog: [],
+          contentReload: expect.any(Function),
+        });
+
+        await waitForValueToChange(() => result.current.state);
+        expect(result.current).toEqual({
+          state: 'CONTENT_FRESH',
+          path: '/new',
+          content: 'my new content',
+          contentErrorMessage: undefined,
+          syncErrorMessage: undefined,
+          buildLog: [],
+          contentReload: expect.any(Function),
+        });
+
+        // navigate
+        rerender({ path: '/missing' });
+
+        await waitForValueToChange(() => result.current.state);
+        expect(result.current).toEqual({
+          state: 'CONTENT_NOT_FOUND',
+          path: '/missing',
+          content: undefined,
+          contentErrorMessage: 'NotFoundError: Some error description',
+          syncErrorMessage: undefined,
+          buildLog: [],
+          contentReload: expect.any(Function),
         });
 
         expect(techdocsStorageApi.getEntityDocs).toBeCalledWith(
           { kind: 'Component', namespace: 'default', name: 'backstage' },
           '/example',
         );
-        expect(techdocsStorageApi.syncEntityDocs).toBeCalledWith({
-          kind: 'Component',
-          namespace: 'default',
-          name: 'backstage',
-        });
+        expect(techdocsStorageApi.getEntityDocs).toBeCalledWith(
+          { kind: 'Component', namespace: 'default', name: 'backstage' },
+          '/new',
+        );
+        expect(techdocsStorageApi.syncEntityDocs).toBeCalledWith(
+          {
+            kind: 'Component',
+            namespace: 'default',
+            name: 'backstage',
+          },
+          expect.any(Function),
+        );
       });
     });
 
@@ -419,27 +634,38 @@ describe('useReaderState', () => {
 
         expect(result.current).toEqual({
           state: 'CHECKING',
+          path: '/example',
           content: undefined,
-          errorMessage: '',
+          contentErrorMessage: undefined,
+          syncErrorMessage: undefined,
+          buildLog: [],
+          contentReload: expect.any(Function),
         });
 
         // the content loading threw an error
         await waitForValueToChange(() => result.current.state);
         expect(result.current).toEqual({
           state: 'CONTENT_NOT_FOUND',
+          path: '/example',
           content: undefined,
-          errorMessage: ' Load error: NotFoundError: Some error description',
+          contentErrorMessage: 'NotFoundError: Some error description',
+          syncErrorMessage: undefined,
+          buildLog: [],
+          contentReload: expect.any(Function),
         });
 
         expect(techdocsStorageApi.getEntityDocs).toBeCalledWith(
           { kind: 'Component', namespace: 'default', name: 'backstage' },
           '/example',
         );
-        expect(techdocsStorageApi.syncEntityDocs).toBeCalledWith({
-          kind: 'Component',
-          namespace: 'default',
-          name: 'backstage',
-        });
+        expect(techdocsStorageApi.syncEntityDocs).toBeCalledWith(
+          {
+            kind: 'Component',
+            namespace: 'default',
+            name: 'backstage',
+          },
+          expect.any(Function),
+        );
       });
     });
   });
diff --git a/plugins/techdocs/src/reader/components/useReaderState.ts b/plugins/techdocs/src/reader/components/useReaderState.ts
index ac5145ee49..07bd338de9 100644
--- a/plugins/techdocs/src/reader/components/useReaderState.ts
+++ b/plugins/techdocs/src/reader/components/useReaderState.ts
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-import { useEffect, useMemo, useReducer, useRef } from 'react';
+import { useApi } from '@backstage/core-plugin-api';
+import { useMemo, useReducer, useRef } from 'react';
 import { useAsync, useAsyncRetry } from 'react-use';
 import { techdocsStorageApiRef } from '../../api';
-import { useApi } from '@backstage/core-plugin-api';
 
 /**
  * A state representation that is used to configure the UI of <Reader />
@@ -35,9 +35,6 @@ type ContentStateTypes =
   /** There is content, but after a reload, the content will be different */
   | 'CONTENT_STALE_READY'
 
-  /** There is content, the backend tried to update it, but it took too long */
-  | 'CONTENT_STALE_TIMEOUT'
-
   /** There is content, the backend tried to update it, but failed */
   | 'CONTENT_STALE_ERROR'
 
@@ -93,11 +90,6 @@ export function calculateDisplayState({
     return 'CONTENT_STALE_READY';
   }
 
-  // the build timed out, but the content is still stale
-  if (activeSyncState === 'BUILD_TIMED_OUT') {
-    return 'CONTENT_STALE_TIMEOUT';
-  }
-
   // the build failed, but the content is still stale
   if (activeSyncState === 'ERROR') {
     return 'CONTENT_STALE_ERROR';
@@ -127,9 +119,6 @@ type SyncStates =
    */
   | 'BUILD_READY_RELOAD'
 
-  /** Building the documentation timed out */
-  | 'BUILD_TIMED_OUT'
-
   /** No need for a sync. The content was already up-to-date. */
   | 'UP_TO_DATE'
 
@@ -142,13 +131,14 @@ type ReducerActions =
       state: SyncStates;
       syncError?: Error;
     }
+  | { type: 'contentLoading' }
   | {
       type: 'content';
+      path?: string;
       content?: string;
-      contentLoading?: true;
       contentError?: Error;
     }
-  | { type: 'navigate'; path: string };
+  | { type: 'buildLog'; log: string };
 
 type ReducerState = {
   /**
@@ -172,6 +162,11 @@ type ReducerState = {
 
   contentError?: Error;
   syncError?: Error;
+
+  /**
+   * A list of log messages that were emitted by the build process.
+   */
+  buildLog: string[];
 };
 
 export function reducer(
@@ -182,30 +177,48 @@ export function reducer(
 
   switch (action.type) {
     case 'sync':
+      // reset the build log when a new check starts
+      if (action.state === 'CHECKING') {
+        newState.buildLog = [];
+      }
+
       newState.activeSyncState = action.state;
       newState.syncError = action.syncError;
       break;
 
+    case 'contentLoading':
+      newState.contentLoading = true;
+
+      // only reset errors but keep the old content until it is replaced by the 'content' action
+      newState.contentError = undefined;
+      break;
+
     case 'content':
+      // only override the path if it is part of the action
+      if (typeof action.path === 'string') {
+        newState.path = action.path;
+      }
+
+      newState.contentLoading = false;
       newState.content = action.content;
-      newState.contentLoading = action.contentLoading ?? false;
       newState.contentError = action.contentError;
       break;
 
-    case 'navigate':
-      newState.path = action.path;
+    case 'buildLog':
+      newState.buildLog = newState.buildLog.concat(action.log);
       break;
 
     default:
       throw new Error();
   }
 
-  // a navigation or a content update loads fresh content so the build is updated to being up-to-date
+  // a content update loads fresh content so the build is updated to being up-to-date
   if (
     ['BUILD_READY', 'BUILD_READY_RELOAD'].includes(newState.activeSyncState) &&
-    ['content', 'navigate'].includes(action.type)
+    ['contentLoading', 'content'].includes(action.type)
   ) {
     newState.activeSyncState = 'UP_TO_DATE';
+    newState.buildLog = [];
   }
 
   return newState;
@@ -216,23 +229,27 @@ export function useReaderState(
   namespace: string,
   name: string,
   path: string,
-): { state: ContentStateTypes; content?: string; errorMessage?: string } {
+): {
+  state: ContentStateTypes;
+  path: string;
+  contentReload: () => void;
+  content?: string;
+  contentErrorMessage?: string;
+  syncErrorMessage?: string;
+  buildLog: string[];
+} {
   const [state, dispatch] = useReducer(reducer, {
     activeSyncState: 'CHECKING',
     path,
     contentLoading: true,
+    buildLog: [],
   });
 
   const techdocsStorageApi = useApi(techdocsStorageApiRef);
 
-  // convert all path changes into actions
-  useEffect(() => {
-    dispatch({ type: 'navigate', path });
-  }, [path]);
-
   // try to load the content. the function will fire events and we don't care for the return values
   const { retry: contentReload } = useAsyncRetry(async () => {
-    dispatch({ type: 'content', contentLoading: true });
+    dispatch({ type: 'contentLoading' });
 
     try {
       const entityDocs = await techdocsStorageApi.getEntityDocs(
@@ -240,11 +257,12 @@ export function useReaderState(
         path,
       );
 
-      dispatch({ type: 'content', content: entityDocs });
+      // update content and path at the same time
+      dispatch({ type: 'content', content: entityDocs, path });
 
       return entityDocs;
     } catch (e) {
-      dispatch({ type: 'content', contentError: e });
+      dispatch({ type: 'content', contentError: e, path });
     }
 
     return undefined;
@@ -268,24 +286,38 @@ export function useReaderState(
     }, 1000);
 
     try {
-      const result = await techdocsStorageApi.syncEntityDocs({
-        kind,
-        namespace,
-        name,
-      });
+      const result = await techdocsStorageApi.syncEntityDocs(
+        {
+          kind,
+          namespace,
+          name,
+        },
+        log => {
+          dispatch({ type: 'buildLog', log });
+        },
+      );
 
-      if (result === 'updated') {
-        // if there was no content prior to building, retry the loading
-        if (!contentRef.current.content) {
-          contentRef.current.reload();
-          dispatch({ type: 'sync', state: 'BUILD_READY_RELOAD' });
-        } else {
-          dispatch({ type: 'sync', state: 'BUILD_READY' });
-        }
-      } else if (result === 'cached') {
-        dispatch({ type: 'sync', state: 'UP_TO_DATE' });
-      } else {
-        dispatch({ type: 'sync', state: 'BUILD_TIMED_OUT' });
+      switch (result) {
+        case 'updated':
+          // if there was no content prior to building, retry the loading
+          if (!contentRef.current.content) {
+            contentRef.current.reload();
+            dispatch({ type: 'sync', state: 'BUILD_READY_RELOAD' });
+          } else {
+            dispatch({ type: 'sync', state: 'BUILD_READY' });
+          }
+          break;
+        case 'cached':
+          dispatch({ type: 'sync', state: 'UP_TO_DATE' });
+          break;
+
+        default:
+          dispatch({
+            type: 'sync',
+            state: 'ERROR',
+            syncError: new Error('Unexpected return state'),
+          });
+          break;
       }
     } catch (e) {
       dispatch({ type: 'sync', state: 'ERROR', syncError: e });
@@ -305,19 +337,13 @@ export function useReaderState(
     [state.activeSyncState, state.content, state.contentLoading],
   );
 
-  const errorMessage = useMemo(() => {
-    let errMessage = '';
-    if (state.contentError) {
-      errMessage += ` Load error: ${state.contentError}`;
-    }
-    if (state.syncError) errMessage += ` Build error: ${state.syncError}`;
-
-    return errMessage;
-  }, [state.syncError, state.contentError]);
-
   return {
     state: displayState,
+    contentReload,
+    path: state.path,
     content: state.content,
-    errorMessage,
+    contentErrorMessage: state.contentError?.toString(),
+    syncErrorMessage: state.syncError?.toString(),
+    buildLog: state.buildLog,
   };
 }
diff --git a/plugins/techdocs/src/reader/transformers/addBaseUrl.test.ts b/plugins/techdocs/src/reader/transformers/addBaseUrl.test.ts
index f04c9963f0..11e8375420 100644
--- a/plugins/techdocs/src/reader/transformers/addBaseUrl.test.ts
+++ b/plugins/techdocs/src/reader/transformers/addBaseUrl.test.ts
@@ -15,9 +15,9 @@
  */
 
 import { waitFor } from '@testing-library/react';
-import { createTestShadowDom } from '../../test-utils';
-import { addBaseUrl } from '../transformers';
 import { TechDocsStorageApi } from '../../api';
+import { createTestShadowDom } from '../../test-utils';
+import { addBaseUrl } from './addBaseUrl';
 
 const DOC_STORAGE_URL = 'https://example-host.storage.googleapis.com';
 const API_ORIGIN_URL = 'https://backstage.example.com/api/techdocs';
@@ -62,8 +62,8 @@ describe('addBaseUrl', () => {
     global.fetch = originalFetch;
   });
 
-  it('contains relative paths', () => {
-    createTestShadowDom(fixture, {
+  it('contains relative paths', async () => {
+    await createTestShadowDom(fixture, {
       preTransformers: [
         addBaseUrl({
           techdocsStorageApi,
@@ -110,7 +110,7 @@ describe('addBaseUrl', () => {
       text: jest.fn().mockResolvedValue(svgContent),
     });
 
-    const root = createTestShadowDom('<img id="x" src="test.svg" />', {
+    const root = await createTestShadowDom('<img id="x" src="test.svg" />', {
       preTransformers: [
         addBaseUrl({
           techdocsStorageApi,
@@ -137,7 +137,7 @@ describe('addBaseUrl', () => {
       text: jest.fn().mockResolvedValue(svgContent),
     });
 
-    const root = createTestShadowDom(
+    const root = await createTestShadowDom(
       `<img id="x" src="${API_ORIGIN_URL}/test.svg" />`,
       {
         preTransformers: [
@@ -162,16 +162,19 @@ describe('addBaseUrl', () => {
 
   it('does not inline external svgs', async () => {
     const expectedSrc = 'https://example.com/test.svg';
-    const root = createTestShadowDom(`<img id="x" src="${expectedSrc}" />`, {
-      preTransformers: [
-        addBaseUrl({
-          techdocsStorageApi,
-          entityId: mockEntityId,
-          path: '',
-        }),
-      ],
-      postTransformers: [],
-    });
+    const root = await createTestShadowDom(
+      `<img id="x" src="${expectedSrc}" />`,
+      {
+        preTransformers: [
+          addBaseUrl({
+            techdocsStorageApi,
+            entityId: mockEntityId,
+            path: '',
+          }),
+        ],
+        postTransformers: [],
+      },
+    );
 
     await new Promise<void>(done => {
       process.nextTick(() => {
diff --git a/plugins/techdocs/src/reader/transformers/addBaseUrl.ts b/plugins/techdocs/src/reader/transformers/addBaseUrl.ts
index f21cb8c47a..8f08ec83a6 100644
--- a/plugins/techdocs/src/reader/transformers/addBaseUrl.ts
+++ b/plugins/techdocs/src/reader/transformers/addBaseUrl.ts
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 import { EntityName } from '@backstage/catalog-model';
-import type { Transformer } from './transformer';
 import { TechDocsStorageApi } from '../../api';
+import type { Transformer } from './transformer';
 
 type AddBaseUrlOptions = {
   techdocsStorageApi: TechDocsStorageApi;
@@ -44,14 +44,15 @@ export const addBaseUrl = ({
   entityId,
   path,
 }: AddBaseUrlOptions): Transformer => {
-  return dom => {
-    const updateDom = <T extends Element>(
+  return async dom => {
+    const apiOrigin = await techdocsStorageApi.getApiOrigin();
+
+    const updateDom = async <T extends Element>(
       list: HTMLCollectionOf<T> | NodeListOf<T>,
       attributeName: string,
-    ): void => {
-      Array.from(list)
-        .filter(elem => !!elem.getAttribute(attributeName))
-        .forEach(async (elem: T) => {
+    ) => {
+      for (const elem of list) {
+        if (elem.hasAttribute(attributeName)) {
           const elemAttribute = elem.getAttribute(attributeName);
           if (!elemAttribute) return;
 
@@ -61,7 +62,7 @@ export const addBaseUrl = ({
             entityId,
             path,
           );
-          const apiOrigin = await techdocsStorageApi.getApiOrigin();
+
           if (isSvgNeedingInlining(attributeName, elemAttribute, apiOrigin)) {
             try {
               const svg = await fetch(newValue, { credentials: 'include' });
@@ -76,13 +77,16 @@ export const addBaseUrl = ({
           } else {
             elem.setAttribute(attributeName, newValue);
           }
-        });
+        }
+      }
     };
 
-    updateDom<HTMLImageElement>(dom.querySelectorAll('img'), 'src');
-    updateDom<HTMLScriptElement>(dom.querySelectorAll('script'), 'src');
-    updateDom<HTMLLinkElement>(dom.querySelectorAll('link'), 'href');
-    updateDom<HTMLAnchorElement>(dom.querySelectorAll('a[download]'), 'href');
+    await Promise.all([
+      updateDom<HTMLImageElement>(dom.querySelectorAll('img'), 'src'),
+      updateDom<HTMLScriptElement>(dom.querySelectorAll('script'), 'src'),
+      updateDom<HTMLLinkElement>(dom.querySelectorAll('link'), 'href'),
+      updateDom<HTMLAnchorElement>(dom.querySelectorAll('a[download]'), 'href'),
+    ]);
 
     return dom;
   };
diff --git a/plugins/techdocs/src/reader/transformers/addGitFeedbackLink.test.ts b/plugins/techdocs/src/reader/transformers/addGitFeedbackLink.test.ts
index 2165afac98..dea13ca09d 100644
--- a/plugins/techdocs/src/reader/transformers/addGitFeedbackLink.test.ts
+++ b/plugins/techdocs/src/reader/transformers/addGitFeedbackLink.test.ts
@@ -28,14 +28,14 @@ const integrations = ScmIntegrations.fromConfig(
 );
 
 describe('addGitFeedbackLink', () => {
-  it('adds a feedback link when a Gitlab source edit link is available', () => {
-    const shadowDom = createTestShadowDom(
+  it('adds a feedback link when a Gitlab source edit link is available', async () => {
+    const shadowDom = await createTestShadowDom(
       `
       <!DOCTYPE html>
       <html>
         <article class="md-content__inner">
           <h1>HeaderText</h1>
-          <a title="Edit this page" href="https://gitlab.com/reponame/username/docs/TestDoc.md"></>
+          <a title="Edit this page" href="https://gitlab.com/groupname/reponame/-/blob/master/docs/docname.md"></>
         </article>
       </html>
     `,
@@ -49,18 +49,18 @@ describe('addGitFeedbackLink', () => {
     expect(
       (shadowDom.querySelector('#git-feedback-link') as HTMLLinkElement)!.href,
     ).toEqual(
-      'https://gitlab.com/reponame/username/issues/new?issue[title]=Documentation%20Feedback%3A%20HeaderText&issue[description]=Page%20source%3A%0Ahttps%3A%2F%2Fgitlab.com%2Freponame%2Fusername%2Fdocs%2FTestDoc.md%0A%0AFeedback%3A',
+      'https://gitlab.com/groupname/reponame/issues/new?issue[title]=Documentation%20Feedback%3A%20HeaderText&issue[description]=Page%20source%3A%0Ahttps%3A%2F%2Fgitlab.com%2Fgroupname%2Freponame%2F-%2Fblob%2Fmaster%2Fdocs%2Fdocname.md%0A%0AFeedback%3A',
     );
   });
 
-  it('adds a feedback link when a Github source edit link is available', () => {
-    const shadowDom = createTestShadowDom(
+  it('adds a feedback link correctly when a Gitlab source edit link is available and contains a subgroup', async () => {
+    const shadowDom = await createTestShadowDom(
       `
       <!DOCTYPE html>
       <html>
         <article class="md-content__inner">
           <h1>HeaderText</h1>
-          <a title="Edit this page" href="https://github.com/reponame/username/docs/TestDoc.md"></>
+          <a title="Edit this page" href="https://gitlab.com/groupname/subgroupname/reponame/-/blob/master/docs/docname.md"></>
         </article>
       </html>
     `,
@@ -74,12 +74,37 @@ describe('addGitFeedbackLink', () => {
     expect(
       (shadowDom.querySelector('#git-feedback-link') as HTMLLinkElement)!.href,
     ).toEqual(
-      'https://github.com/reponame/username/issues/new?title=Documentation%20Feedback%3A%20HeaderText&body=Page%20source%3A%0Ahttps%3A%2F%2Fgithub.com%2Freponame%2Fusername%2Fdocs%2FTestDoc.md%0A%0AFeedback%3A',
+      'https://gitlab.com/groupname/subgroupname/reponame/issues/new?issue[title]=Documentation%20Feedback%3A%20HeaderText&issue[description]=Page%20source%3A%0Ahttps%3A%2F%2Fgitlab.com%2Fgroupname%2Fsubgroupname%2Freponame%2F-%2Fblob%2Fmaster%2Fdocs%2Fdocname.md%0A%0AFeedback%3A',
     );
   });
 
-  it('does not add a feedback link when no source edit link is available', () => {
-    const shadowDom = createTestShadowDom(
+  it('adds a feedback link when a Github source edit link is available', async () => {
+    const shadowDom = await createTestShadowDom(
+      `
+      <!DOCTYPE html>
+      <html>
+        <article class="md-content__inner">
+          <h1>HeaderText</h1>
+          <a title="Edit this page" href="https://github.com/groupname/reponame/edit/master/docs/docname.md"></>
+        </article>
+      </html>
+    `,
+      {
+        preTransformers: [addGitFeedbackLink(integrations)],
+        postTransformers: [],
+      },
+    );
+
+    expect(shadowDom.querySelector('#git-feedback-link')).toBeTruthy();
+    expect(
+      (shadowDom.querySelector('#git-feedback-link') as HTMLLinkElement)!.href,
+    ).toEqual(
+      'https://github.com/groupname/reponame/issues/new?title=Documentation%20Feedback%3A%20HeaderText&body=Page%20source%3A%0Ahttps%3A%2F%2Fgithub.com%2Fgroupname%2Freponame%2Fedit%2Fmaster%2Fdocs%2Fdocname.md%0A%0AFeedback%3A',
+    );
+  });
+
+  it('does not add a feedback link when no source edit link is available', async () => {
+    const shadowDom = await createTestShadowDom(
       `
       <!DOCTYPE html>
       <html>
@@ -97,8 +122,8 @@ describe('addGitFeedbackLink', () => {
     expect(shadowDom.querySelector('#git-feedback-link')).toBeFalsy();
   });
 
-  it('does not add a feedback link when a Gitlab or Github source edit link is not available', () => {
-    const shadowDom = createTestShadowDom(
+  it('does not add a feedback link when a Gitlab or Github source edit link is not available', async () => {
+    const shadowDom = await createTestShadowDom(
       `
       <!DOCTYPE html>
       <html>
@@ -117,14 +142,14 @@ describe('addGitFeedbackLink', () => {
     expect(shadowDom.querySelector('#git-feedback-link')).toBeFalsy();
   });
 
-  it('adds a feedback link when a Gitlab or Github source edit link is not available but hostname matches an integrations host', () => {
-    const shadowDom = createTestShadowDom(
+  it('adds a feedback link when a Gitlab or Github source edit link is not available but hostname matches an integrations host', async () => {
+    const shadowDom = await createTestShadowDom(
       `
       <!DOCTYPE html>
       <html>
         <article class="md-content__inner">
           <h1>HeaderText<a class="headerlink" href="http://headerlink.com">¶</a></h1>
-          <a title="Edit this page" href="https://self-hosted-git-hub-provider.com/reponame/username/docs/TestDoc.md"/>
+          <a title="Edit this page" href="https://self-hosted-git-hub-provider.com/groupname/reponame/blob/master/docs/docname.md"/>
         </article>
       </html>
     `,
@@ -138,7 +163,7 @@ describe('addGitFeedbackLink', () => {
     expect(
       (shadowDom.querySelector('#git-feedback-link') as HTMLLinkElement)!.href,
     ).toEqual(
-      'https://self-hosted-git-hub-provider.com/reponame/username/issues/new?title=Documentation%20Feedback%3A%20HeaderText&body=Page%20source%3A%0Ahttps%3A%2F%2Fself-hosted-git-hub-provider.com%2Freponame%2Fusername%2Fdocs%2FTestDoc.md%0A%0AFeedback%3A',
+      'https://self-hosted-git-hub-provider.com/groupname/reponame/issues/new?title=Documentation%20Feedback%3A%20HeaderText&body=Page%20source%3A%0Ahttps%3A%2F%2Fself-hosted-git-hub-provider.com%2Fgroupname%2Freponame%2Fblob%2Fmaster%2Fdocs%2Fdocname.md%0A%0AFeedback%3A',
     );
   });
 });
diff --git a/plugins/techdocs/src/reader/transformers/addGitFeedbackLink.ts b/plugins/techdocs/src/reader/transformers/addGitFeedbackLink.ts
index f91ef5b78d..13befb3309 100644
--- a/plugins/techdocs/src/reader/transformers/addGitFeedbackLink.ts
+++ b/plugins/techdocs/src/reader/transformers/addGitFeedbackLink.ts
@@ -15,10 +15,14 @@
  */
 
 import type { Transformer } from './index';
-import { ScmIntegrationRegistry } from '@backstage/integration';
+import {
+  replaceGitHubUrlType,
+  ScmIntegrationRegistry,
+} from '@backstage/integration';
 import FeedbackOutlinedIcon from '@material-ui/icons/FeedbackOutlined';
 import React from 'react';
 import ReactDOM from 'react-dom';
+import parseGitUrl from 'git-url-parse';
 
 // requires repo
 export const addGitFeedbackLink = (
@@ -50,7 +54,14 @@ export const addGitFeedbackLink = (
     const issueDesc = encodeURIComponent(
       `Page source:\n${sourceAnchor.href}\n\nFeedback:`,
     );
-    const repoPath = sourceURL.pathname.split('/').slice(0, 3).join('/');
+
+    // Convert GitHub edit url to blob type so it can be parsed by git-url-parse correctly
+    const gitUrl =
+      integration?.type === 'github'
+        ? replaceGitHubUrlType(sourceURL.href, 'blob')
+        : sourceURL.href;
+    const gitInfo = parseGitUrl(gitUrl);
+    const repoPath = `/${gitInfo.organization}/${gitInfo.name}`;
 
     const feedbackLink = sourceAnchor.cloneNode() as HTMLAnchorElement;
     switch (integration?.type) {
diff --git a/plugins/techdocs/src/reader/transformers/addLinkClickListener.test.ts b/plugins/techdocs/src/reader/transformers/addLinkClickListener.test.ts
index 2d2d54a31c..fe3a6e557c 100644
--- a/plugins/techdocs/src/reader/transformers/addLinkClickListener.test.ts
+++ b/plugins/techdocs/src/reader/transformers/addLinkClickListener.test.ts
@@ -18,9 +18,9 @@ import { createTestShadowDom } from '../../test-utils';
 import { addLinkClickListener } from './addLinkClickListener';
 
 describe('addLinkClickListener', () => {
-  it('calls onClick when a link has been clicked', () => {
+  it('calls onClick when a link has been clicked', async () => {
     const fn = jest.fn();
-    const shadowDom = createTestShadowDom(
+    const shadowDom = await createTestShadowDom(
       `
       <!DOCTYPE html>
       <html>
@@ -45,9 +45,9 @@ describe('addLinkClickListener', () => {
     expect(fn).toHaveBeenCalledTimes(1);
   });
 
-  it('does not call onClick when a link links to another baseUrl', () => {
+  it('does not call onClick when a link links to another baseUrl', async () => {
     const fn = jest.fn();
-    const shadowDom = createTestShadowDom(
+    const shadowDom = await createTestShadowDom(
       `
       <!DOCTYPE html>
       <html>
diff --git a/plugins/techdocs/src/reader/transformers/index.test.ts b/plugins/techdocs/src/reader/transformers/index.test.ts
index 30607aedcd..16b42266df 100644
--- a/plugins/techdocs/src/reader/transformers/index.test.ts
+++ b/plugins/techdocs/src/reader/transformers/index.test.ts
@@ -17,14 +17,14 @@
 import { Transformer, transform } from './transformer';
 
 describe('transform', () => {
-  it('calls the transformers', () => {
+  it('calls the transformers', async () => {
     const fn = jest.fn();
     const mockTransformer = (): Transformer => (dom: Element) => {
       fn(dom);
       return dom;
     };
 
-    transform('<html></html>', [mockTransformer()]);
+    await transform('<html></html>', [mockTransformer()]);
 
     expect(fn).toHaveBeenCalledTimes(1);
     expect(fn).toHaveBeenCalledWith(expect.any(Element));
diff --git a/plugins/techdocs/src/reader/transformers/injectCss.test.ts b/plugins/techdocs/src/reader/transformers/injectCss.test.ts
index 368d077b43..6d0eb8daa9 100644
--- a/plugins/techdocs/src/reader/transformers/injectCss.test.ts
+++ b/plugins/techdocs/src/reader/transformers/injectCss.test.ts
@@ -15,10 +15,10 @@
  */
 
 import { createTestShadowDom } from '../../test-utils';
-import { injectCss } from '../transformers';
+import { injectCss } from './injectCss';
 
 describe('injectCss', () => {
-  it('should inject style with passed css in head', () => {
+  it('should inject style with passed css in head', async () => {
     const html = `
         <html>
             <head></head>
@@ -27,7 +27,7 @@ describe('injectCss', () => {
     `;
     const injectedCss = '* {background-color: #fff}';
 
-    const shadowDom = createTestShadowDom(html, {
+    const shadowDom = await createTestShadowDom(html, {
       preTransformers: [injectCss({ css: injectedCss })],
       postTransformers: [],
     });
diff --git a/plugins/techdocs/src/reader/transformers/onCssReady.test.ts b/plugins/techdocs/src/reader/transformers/onCssReady.test.ts
index 3174e23f5c..b2a5aa9760 100644
--- a/plugins/techdocs/src/reader/transformers/onCssReady.test.ts
+++ b/plugins/techdocs/src/reader/transformers/onCssReady.test.ts
@@ -15,16 +15,15 @@
  */
 
 import {
-  createTestShadowDom,
-  mockStylesheetEventListener,
-  executeStylesheetEventListeners,
   clearStylesheetEventListeners,
+  createTestShadowDom,
+  executeStylesheetEventListeners,
+  mockStylesheetEventListener,
 } from '../../test-utils';
-import { onCssReady } from '../transformers';
+import { onCssReady } from './onCssReady';
 
-const docStorageUrl: Promise<string> = Promise.resolve(
-  'https://techdocs-mock-sites.storage.googleapis.com',
-);
+const docStorageUrl: string =
+  'https://techdocs-mock-sites.storage.googleapis.com';
 
 const fixture = `
   <link rel="stylesheet" href="${docStorageUrl}/test.css" />
@@ -48,11 +47,11 @@ describe('onCssReady', () => {
     clearStylesheetEventListeners();
   });
 
-  it('does not call onLoading and onLoaded without the onCssReady transformer', () => {
+  it('does not call onLoading and onLoaded without the onCssReady transformer', async () => {
     const onLoading = jest.fn();
     const onLoaded = jest.fn();
 
-    createTestShadowDom(fixture, {
+    await createTestShadowDom(fixture, {
       preTransformers: [],
       postTransformers: [],
     });
@@ -62,11 +61,11 @@ describe('onCssReady', () => {
     expect(onLoaded).not.toHaveBeenCalled();
   });
 
-  it('calls the onLoading and onLoaded correctly', () => {
+  it('calls the onLoading and onLoaded correctly', async () => {
     const onLoading = jest.fn();
     const onLoaded = jest.fn();
 
-    createTestShadowDom(fixture, {
+    await createTestShadowDom(fixture, {
       preTransformers: [],
       postTransformers: [
         onCssReady({
diff --git a/plugins/techdocs/src/reader/transformers/onCssReady.ts b/plugins/techdocs/src/reader/transformers/onCssReady.ts
index 936c4306a7..e9406ba632 100644
--- a/plugins/techdocs/src/reader/transformers/onCssReady.ts
+++ b/plugins/techdocs/src/reader/transformers/onCssReady.ts
@@ -17,7 +17,7 @@
 import type { Transformer } from './transformer';
 
 type OnCssReadyOptions = {
-  docStorageUrl: Promise<string>;
+  docStorageUrl: string;
   onLoading: (dom: Element) => void;
   onLoaded: (dom: Element) => void;
 };
@@ -30,9 +30,7 @@ export const onCssReady = ({
   return dom => {
     const cssPages = Array.from(
       dom.querySelectorAll('head > link[rel="stylesheet"]'),
-    ).filter(async elem =>
-      elem.getAttribute('href')?.startsWith(await docStorageUrl),
-    );
+    ).filter(elem => elem.getAttribute('href')?.startsWith(docStorageUrl));
 
     let count = cssPages.length;
 
diff --git a/plugins/techdocs/src/reader/transformers/removeMkdocsHeader.test.ts b/plugins/techdocs/src/reader/transformers/removeMkdocsHeader.test.ts
index 70d6b2fa4a..60f0b9ca30 100644
--- a/plugins/techdocs/src/reader/transformers/removeMkdocsHeader.test.ts
+++ b/plugins/techdocs/src/reader/transformers/removeMkdocsHeader.test.ts
@@ -18,20 +18,26 @@ import { createTestShadowDom, FIXTURES } from '../../test-utils';
 import { removeMkdocsHeader } from '../transformers';
 
 describe('removeMkdocsHeader', () => {
-  it('does not remove mkdocs header', () => {
-    const shadowDom = createTestShadowDom(FIXTURES.FIXTURE_STANDARD_PAGE, {
-      preTransformers: [],
-      postTransformers: [],
-    });
+  it('does not remove mkdocs header', async () => {
+    const shadowDom = await createTestShadowDom(
+      FIXTURES.FIXTURE_STANDARD_PAGE,
+      {
+        preTransformers: [],
+        postTransformers: [],
+      },
+    );
 
     expect(shadowDom.querySelector('.md-header')).toBeTruthy();
   });
 
-  it('does remove mkdocs header', () => {
-    const shadowDom = createTestShadowDom(FIXTURES.FIXTURE_STANDARD_PAGE, {
-      preTransformers: [removeMkdocsHeader()],
-      postTransformers: [],
-    });
+  it('does remove mkdocs header', async () => {
+    const shadowDom = await createTestShadowDom(
+      FIXTURES.FIXTURE_STANDARD_PAGE,
+      {
+        preTransformers: [removeMkdocsHeader()],
+        postTransformers: [],
+      },
+    );
 
     expect(shadowDom.querySelector('.md-header')).toBeFalsy();
   });
diff --git a/plugins/techdocs/src/reader/transformers/rewriteDocLinks.test.ts b/plugins/techdocs/src/reader/transformers/rewriteDocLinks.test.ts
index 62b80cd514..66fc5f29c1 100644
--- a/plugins/techdocs/src/reader/transformers/rewriteDocLinks.test.ts
+++ b/plugins/techdocs/src/reader/transformers/rewriteDocLinks.test.ts
@@ -19,8 +19,8 @@ import { rewriteDocLinks } from '../transformers';
 import { normalizeUrl } from './rewriteDocLinks';
 
 describe('rewriteDocLinks', () => {
-  it('should not do anything', () => {
-    const shadowDom = createTestShadowDom(`
+  it('should not do anything', async () => {
+    const shadowDom = await createTestShadowDom(`
         <a href="http://example.org/">Test</a>
         <a href="../example">Test</a>
         <a href="example-docs">Test</a>
@@ -35,8 +35,8 @@ describe('rewriteDocLinks', () => {
     ]);
   });
 
-  it('should transform a href with localhost as baseUrl', () => {
-    const shadowDom = createTestShadowDom(
+  it('should transform a href with localhost as baseUrl', async () => {
+    const shadowDom = await createTestShadowDom(
       `
         <a href="http://example.org/">Test</a>
         <a href="../example">Test</a>
@@ -57,9 +57,9 @@ describe('rewriteDocLinks', () => {
     ]);
   });
 
-  it('should rewrite non-parseable URLs as text', () => {
+  it('should rewrite non-parseable URLs as text', async () => {
     const expectedText = `www.my-internet.[top-level-domain]/pathname/[URLkey]`;
-    const shadowDom = createTestShadowDom(
+    const shadowDom = await createTestShadowDom(
       `<a href="http://${expectedText}">${expectedText}</a>`,
       {
         preTransformers: [rewriteDocLinks()],
diff --git a/plugins/techdocs/src/reader/transformers/sanitizeDOM.test.ts b/plugins/techdocs/src/reader/transformers/sanitizeDOM.test.ts
new file mode 100644
index 0000000000..66019fb74f
--- /dev/null
+++ b/plugins/techdocs/src/reader/transformers/sanitizeDOM.test.ts
@@ -0,0 +1,148 @@
+/*
+ * Copyright 2020 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { createTestShadowDom, FIXTURES } from '../../test-utils';
+import { Transformer } from './index';
+import { sanitizeDOM } from './sanitizeDOM';
+
+const injectMaliciousLink = (): Transformer => dom => {
+  const link = document.createElement('a');
+  link.setAttribute('id', 'test-malicious-link');
+  link.setAttribute('onclick', 'alert("Hello world");');
+  dom.querySelector('body')?.appendChild(link);
+  return dom;
+};
+
+describe('sanitizeDOM', () => {
+  it('contains a script tag', async () => {
+    const shadowDom = await createTestShadowDom(FIXTURES.FIXTURE_STANDARD_PAGE);
+
+    expect(shadowDom.querySelectorAll('script').length).toBeGreaterThan(0);
+  });
+
+  it('does not contain a script tag', async () => {
+    const shadowDom = await createTestShadowDom(
+      FIXTURES.FIXTURE_STANDARD_PAGE,
+      {
+        preTransformers: [sanitizeDOM()],
+        postTransformers: [],
+      },
+    );
+
+    expect(shadowDom.querySelectorAll('script').length).toBe(0);
+  });
+
+  it('contains link with a onClick attribute', async () => {
+    const shadowDom = await createTestShadowDom(
+      FIXTURES.FIXTURE_STANDARD_PAGE,
+      {
+        preTransformers: [injectMaliciousLink()],
+        postTransformers: [],
+      },
+    );
+
+    expect(
+      shadowDom.querySelector('#test-malicious-link')?.hasAttribute('onclick'),
+    ).toBeTruthy();
+  });
+
+  it('does not contain link with a onClick attribute', async () => {
+    const shadowDom = await createTestShadowDom(
+      FIXTURES.FIXTURE_STANDARD_PAGE,
+      {
+        preTransformers: [sanitizeDOM()],
+        postTransformers: [],
+      },
+    );
+
+    expect(
+      shadowDom.querySelector('#test-malicious-link')?.hasAttribute('onclick'),
+    ).toBeFalsy();
+  });
+
+  it('removes style tags', async () => {
+    const html = `
+      <html>
+        <head>
+          <style>* {color: #f0f;}</style>
+        </head>
+        <body>
+        </body>
+      </html>
+    `;
+
+    const shadowDom = await createTestShadowDom(html, {
+      preTransformers: [sanitizeDOM()],
+      postTransformers: [],
+    });
+
+    expect(shadowDom.querySelectorAll('style').length).toEqual(0);
+  });
+
+  it('does not remove link tags', async () => {
+    const html = `
+      <html>
+        <head>
+          <link rel="stylesheet" href="style.css">
+        </head>
+        <body>
+        </body>
+      </html>
+    `;
+
+    const shadowDom = await createTestShadowDom(html, {
+      preTransformers: [sanitizeDOM()],
+      postTransformers: [],
+    });
+
+    expect(shadowDom.querySelectorAll('link').length).toEqual(1);
+  });
+
+  describe('safe head links', () => {
+    let shadowDom: ShadowRoot;
+
+    beforeEach(async () => {
+      shadowDom = await createTestShadowDom(FIXTURES.FIXTURE_STANDARD_PAGE, {
+        preTransformers: [sanitizeDOM()],
+        postTransformers: [],
+      });
+    });
+
+    it('should not sanitize the techdocs css', async () => {
+      const techdocsCss = shadowDom.querySelector(
+        'link[href$="main.fe0cca5b.min.css"]',
+      );
+      const rel = techdocsCss!.getAttribute('rel');
+      expect(rel).toBe('stylesheet');
+    });
+
+    it('should not sanitize google fonts', async () => {
+      const googleFonts = shadowDom.querySelector(
+        'link[href^="https://fonts.googleapis.com"]',
+      );
+      const rel = googleFonts!.getAttribute('rel');
+      expect(rel).toBe('stylesheet');
+    });
+
+    it('should not sanitize gstatic fonts', async () => {
+      const gstaticFonts = shadowDom.querySelector(
+        'link[href^="https://fonts.gstatic.com"]',
+      );
+      const rel = gstaticFonts!.getAttribute('rel');
+      expect(rel).toBe('preconnect');
+    });
+  });
+});
diff --git a/plugins/techdocs/src/reader/transformers/sanitizeDOM.ts b/plugins/techdocs/src/reader/transformers/sanitizeDOM.ts
new file mode 100644
index 0000000000..73c3bd2237
--- /dev/null
+++ b/plugins/techdocs/src/reader/transformers/sanitizeDOM.ts
@@ -0,0 +1,50 @@
+/*
+ * Copyright 2020 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+const TECHDOCS_CSS = /main\.[A-Fa-f0-9]{8}\.min\.css$/;
+const GOOGLE_FONTS = /^https:\/\/fonts\.googleapis\.com/;
+const GSTATIC_FONTS = /^https:\/\/fonts\.gstatic\.com/;
+
+export const safeLinksHook = (node: Element) => {
+  if (node.nodeName && node.nodeName === 'LINK') {
+    const href = node.getAttribute('href') || '';
+    if (href.match(TECHDOCS_CSS)) {
+      node.setAttribute('rel', 'stylesheet');
+    }
+    if (href.match(GOOGLE_FONTS)) {
+      node.setAttribute('rel', 'stylesheet');
+    }
+    if (href.match(GSTATIC_FONTS)) {
+      node.setAttribute('rel', 'preconnect');
+    }
+  }
+  return node;
+};
+
+import DOMPurify from 'dompurify';
+import type { Transformer } from './transformer';
+
+export const sanitizeDOM = (): Transformer => {
+  return dom => {
+    DOMPurify.addHook('afterSanitizeAttributes', safeLinksHook);
+    return DOMPurify.sanitize(dom.innerHTML, {
+      ADD_TAGS: ['link'],
+      FORBID_TAGS: ['style'],
+      WHOLE_DOCUMENT: true,
+      RETURN_DOM: true,
+    });
+  };
+};
diff --git a/plugins/techdocs/src/reader/transformers/sanitizeDOM/attributes.ts b/plugins/techdocs/src/reader/transformers/sanitizeDOM/attributes.ts
deleted file mode 100644
index 39fb528da9..0000000000
--- a/plugins/techdocs/src/reader/transformers/sanitizeDOM/attributes.ts
+++ /dev/null
@@ -1,386 +0,0 @@
-/*
- * Copyright 2020 The Backstage Authors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/**
- * This is the source of truth of what attributes we support in TechDocs.
- */
-
-export const html = [
-  'accept',
-  'action',
-  'align',
-  'alt',
-  'autocapitalize',
-  'autocomplete',
-  'autopictureinpicture',
-  'autoplay',
-  'background',
-  'bgcolor',
-  'border',
-  'capture',
-  'cellpadding',
-  'cellspacing',
-  'checked',
-  'cite',
-  'class',
-  'clear',
-  'color',
-  'cols',
-  'colspan',
-  'controls',
-  'controlslist',
-  'coords',
-  'crossorigin',
-  'datetime',
-  'decoding',
-  'default',
-  'dir',
-  'disabled',
-  'disablepictureinpicture',
-  'disableremoteplayback',
-  'download',
-  'draggable',
-  'enctype',
-  'enterkeyhint',
-  'face',
-  'for',
-  'headers',
-  'height',
-  'hidden',
-  'high',
-  'href',
-  'hreflang',
-  'id',
-  'inputmode',
-  'integrity',
-  'ismap',
-  'kind',
-  'label',
-  'lang',
-  'list',
-  'loading',
-  'loop',
-  'low',
-  'max',
-  'maxlength',
-  'media',
-  'method',
-  'min',
-  'minlength',
-  'multiple',
-  'muted',
-  'name',
-  'noshade',
-  'novalidate',
-  'nowrap',
-  'open',
-  'optimum',
-  'pattern',
-  'placeholder',
-  'playsinline',
-  'poster',
-  'preload',
-  'pubdate',
-  'radiogroup',
-  'readonly',
-  'rel',
-  'required',
-  'rev',
-  'reversed',
-  'role',
-  'rows',
-  'rowspan',
-  'spellcheck',
-  'scope',
-  'selected',
-  'shape',
-  'size',
-  'sizes',
-  'span',
-  'srclang',
-  'start',
-  'src',
-  'srcset',
-  'step',
-  'style',
-  'summary',
-  'tabindex',
-  'title',
-  'translate',
-  'type',
-  'usemap',
-  'valign',
-  'value',
-  'width',
-  'xmlns',
-];
-
-export const svg = [
-  'accent-height',
-  'accumulate',
-  'additive',
-  'alignment-baseline',
-  'ascent',
-  'attributename',
-  'attributetype',
-  'azimuth',
-  'basefrequency',
-  'baseline-shift',
-  'begin',
-  'bias',
-  'by',
-  'class',
-  'clip',
-  'clip-path',
-  'clip-rule',
-  'color',
-  'color-interpolation',
-  'color-interpolation-filters',
-  'color-profile',
-  'color-rendering',
-  'cx',
-  'cy',
-  'd',
-  'dx',
-  'dy',
-  'data',
-  'diffuseconstant',
-  'direction',
-  'display',
-  'divisor',
-  'dur',
-  'edgemode',
-  'elevation',
-  'end',
-  'fill',
-  'fill-opacity',
-  'fill-rule',
-  'filter',
-  'filterunits',
-  'flood-color',
-  'flood-opacity',
-  'font-family',
-  'font-size',
-  'font-size-adjust',
-  'font-stretch',
-  'font-style',
-  'font-variant',
-  'font-weight',
-  'fx',
-  'fy',
-  'g1',
-  'g2',
-  'glyph-name',
-  'glyphref',
-  'gradientunits',
-  'gradienttransform',
-  'height',
-  'href',
-  'id',
-  'image-rendering',
-  'in',
-  'in2',
-  'k',
-  'k1',
-  'k2',
-  'k3',
-  'k4',
-  'kerning',
-  'keypoints',
-  'keysplines',
-  'keytimes',
-  'lang',
-  'lengthadjust',
-  'letter-spacing',
-  'kernelmatrix',
-  'kernelunitlength',
-  'lighting-color',
-  'local',
-  'marker-end',
-  'marker-mid',
-  'marker-start',
-  'markerheight',
-  'markerunits',
-  'markerwidth',
-  'maskcontentunits',
-  'maskunits',
-  'max',
-  'mask',
-  'media',
-  'method',
-  'mode',
-  'min',
-  'name',
-  'numoctaves',
-  'offset',
-  'operator',
-  'opacity',
-  'order',
-  'orient',
-  'orientation',
-  'origin',
-  'overflow',
-  'paint-order',
-  'path',
-  'pathlength',
-  'patterncontentunits',
-  'patterntransform',
-  'patternunits',
-  'points',
-  'preservealpha',
-  'preserveaspectratio',
-  'primitiveunits',
-  'r',
-  'rx',
-  'ry',
-  'radius',
-  'refx',
-  'refy',
-  'repeatcount',
-  'repeatdur',
-  'restart',
-  'result',
-  'rotate',
-  'scale',
-  'seed',
-  'shape-rendering',
-  'specularconstant',
-  'specularexponent',
-  'spreadmethod',
-  'startoffset',
-  'stddeviation',
-  'stitchtiles',
-  'stop-color',
-  'stop-opacity',
-  'stroke-dasharray',
-  'stroke-dashoffset',
-  'stroke-linecap',
-  'stroke-linejoin',
-  'stroke-miterlimit',
-  'stroke-opacity',
-  'stroke',
-  'stroke-width',
-  'style',
-  'surfacescale',
-  'tabindex',
-  'targetx',
-  'targety',
-  'transform',
-  'text-anchor',
-  'text-decoration',
-  'text-rendering',
-  'textlength',
-  'type',
-  'u1',
-  'u2',
-  'unicode',
-  'values',
-  'viewbox',
-  'visibility',
-  'version',
-  'vert-adv-y',
-  'vert-origin-x',
-  'vert-origin-y',
-  'width',
-  'word-spacing',
-  'wrap',
-  'writing-mode',
-  'xchannelselector',
-  'ychannelselector',
-  'x',
-  'x1',
-  'x2',
-  'xmlns',
-  'y',
-  'y1',
-  'y2',
-  'z',
-  'zoomandpan',
-];
-
-export const mathMl = [
-  'accent',
-  'accentunder',
-  'align',
-  'bevelled',
-  'close',
-  'columnsalign',
-  'columnlines',
-  'columnspan',
-  'denomalign',
-  'depth',
-  'dir',
-  'display',
-  'displaystyle',
-  'encoding',
-  'fence',
-  'frame',
-  'height',
-  'href',
-  'id',
-  'largeop',
-  'length',
-  'linethickness',
-  'lspace',
-  'lquote',
-  'mathbackground',
-  'mathcolor',
-  'mathsize',
-  'mathvariant',
-  'maxsize',
-  'minsize',
-  'movablelimits',
-  'notation',
-  'numalign',
-  'open',
-  'rowalign',
-  'rowlines',
-  'rowspacing',
-  'rowspan',
-  'rspace',
-  'rquote',
-  'scriptlevel',
-  'scriptminsize',
-  'scriptsizemultiplier',
-  'selection',
-  'separator',
-  'separators',
-  'stretchy',
-  'subscriptshift',
-  'supscriptshift',
-  'symmetric',
-  'voffset',
-  'width',
-  'xmlns',
-];
-
-export const xml = [
-  'xlink:href',
-  'xml:id',
-  'xlink:title',
-  'xml:space',
-  'xmlns:xlink',
-];
-
-/**
- * Anything in here will be supported as HTML attributes from TechDocs.
- *
- * @note Be conscious about what you add here. It can affect the TechDocs experience. For
- * some review before making a PR, reach out in the #docs-like-code channel in Discord first.
- */
-export const TECHDOCS_ALLOWED_ATTRIBUTES = {
-  '*': [...html, ...svg, ...mathMl, ...xml, 'data-*'],
-};
diff --git a/plugins/techdocs/src/reader/transformers/sanitizeDOM/index.test.ts b/plugins/techdocs/src/reader/transformers/sanitizeDOM/index.test.ts
deleted file mode 100644
index 8456cf7c23..0000000000
--- a/plugins/techdocs/src/reader/transformers/sanitizeDOM/index.test.ts
+++ /dev/null
@@ -1,104 +0,0 @@
-/*
- * Copyright 2020 The Backstage Authors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import { createTestShadowDom, FIXTURES } from '../../../test-utils';
-import { Transformer } from '../index';
-import { sanitizeDOM } from '../sanitizeDOM';
-
-const injectMaliciousLink = (): Transformer => dom => {
-  const link = document.createElement('a');
-  link.setAttribute('id', 'test-malicious-link');
-  link.setAttribute('onclick', 'alert("Hello world");');
-  dom.querySelector('body')?.appendChild(link);
-  return dom;
-};
-
-describe('sanitizeDOM', () => {
-  it('contains a script tag', () => {
-    const shadowDom = createTestShadowDom(FIXTURES.FIXTURE_STANDARD_PAGE);
-
-    expect(shadowDom.querySelectorAll('script').length).toBeGreaterThan(0);
-  });
-
-  it('does not contain a script tag', () => {
-    const shadowDom = createTestShadowDom(FIXTURES.FIXTURE_STANDARD_PAGE, {
-      preTransformers: [sanitizeDOM()],
-      postTransformers: [],
-    });
-
-    expect(shadowDom.querySelectorAll('script').length).toBe(0);
-  });
-
-  it('contains link with a onClick attribute', () => {
-    const shadowDom = createTestShadowDom(FIXTURES.FIXTURE_STANDARD_PAGE, {
-      preTransformers: [injectMaliciousLink()],
-      postTransformers: [],
-    });
-
-    expect(
-      shadowDom.querySelector('#test-malicious-link')?.hasAttribute('onclick'),
-    ).toBeTruthy();
-  });
-
-  it('does not contain link with a onClick attribute', () => {
-    const shadowDom = createTestShadowDom(FIXTURES.FIXTURE_STANDARD_PAGE, {
-      preTransformers: [sanitizeDOM()],
-      postTransformers: [],
-    });
-
-    expect(
-      shadowDom.querySelector('#test-malicious-link')?.hasAttribute('onclick'),
-    ).toBeFalsy();
-  });
-
-  it('removes style tags', () => {
-    const html = `
-      <html>
-        <head>
-          <style>* {color: #f0f;}<style>
-        </head>
-        <body>
-        </body>
-      </html>
-    `;
-
-    const shadowDom = createTestShadowDom(html, {
-      preTransformers: [sanitizeDOM()],
-      postTransformers: [],
-    });
-
-    expect(shadowDom.querySelectorAll('style').length).toEqual(0);
-  });
-
-  it('does not remove link tags', () => {
-    const html = `
-      <html>
-        <head>
-          <link rel="stylesheet" href="style.css">
-        </head>
-        <body>
-        </body>
-      </html>
-    `;
-
-    const shadowDom = createTestShadowDom(html, {
-      preTransformers: [sanitizeDOM()],
-      postTransformers: [],
-    });
-
-    expect(shadowDom.querySelectorAll('link').length).toEqual(1);
-  });
-});
diff --git a/plugins/techdocs/src/reader/transformers/sanitizeDOM/index.ts b/plugins/techdocs/src/reader/transformers/sanitizeDOM/index.ts
deleted file mode 100644
index 65db98ae01..0000000000
--- a/plugins/techdocs/src/reader/transformers/sanitizeDOM/index.ts
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright 2020 The Backstage Authors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-// @ts-ignore
-import sanitizeHtml from 'sanitize-html';
-import type { Transformer } from '../transformer';
-import { TECHDOCS_ALLOWED_TAGS } from './tags';
-import { TECHDOCS_ALLOWED_ATTRIBUTES } from './attributes';
-
-// TODO(freben): move all of this out of index
-
-export const sanitizeDOM = (): Transformer => {
-  return dom => {
-    const sanitizedHtml = sanitizeHtml(dom.innerHTML, {
-      allowedTags: TECHDOCS_ALLOWED_TAGS,
-      allowedAttributes: TECHDOCS_ALLOWED_ATTRIBUTES,
-      allowedSchemes: ['http', 'https', 'ftp', 'mailto', 'data', 'blob'],
-    });
-
-    return new DOMParser().parseFromString(sanitizedHtml, 'text/html')
-      .documentElement;
-  };
-};
diff --git a/plugins/techdocs/src/reader/transformers/sanitizeDOM/tags.ts b/plugins/techdocs/src/reader/transformers/sanitizeDOM/tags.ts
deleted file mode 100644
index 780a4c01f7..0000000000
--- a/plugins/techdocs/src/reader/transformers/sanitizeDOM/tags.ts
+++ /dev/null
@@ -1,248 +0,0 @@
-/*
- * Copyright 2020 The Backstage Authors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/**
- * This is the source of truth for what HTML tags we support in TechDocs.
- */
-
-// prettier-ignore
-export const html = [
-  'a', 'abbr', 'acronym',
-  'address', 'area', 'article',
-  'aside', 'audio', 'b', 'bdi',
-  'bdo', 'big',
-  'blink', 'blockquote',
-  'body',
-  'br', 'button',
-  'canvas', 'caption', 'center', 'cite', 'code',
-  'col', 'colgroup',
-  'content',
-  'data',
-  'datalist',
-  'dd',
-  'decorator',
-  'del',
-  'details',
-  'dfn',
-  'dir',
-  'div',
-  'dl',
-  'dt',
-  'element',
-  'em',
-  'fieldset',
-  'figcaption',
-  'figure',
-  'font',
-  'footer',
-  'form',
-  'h1',
-  'h2',
-  'h3',
-  'h4',
-  'h5',
-  'h6',
-  'head',
-  'header',
-  'hgroup',
-  'hr',
-  'html',
-  'i',
-  'img',
-  'input',
-  'ins',
-  'kbd',
-  'label',
-  'legend',
-  'li',
-  'link',
-  'main',
-  'map',
-  'mark',
-  'marquee',
-  'menu',
-  'menuitem',
-  'meter',
-  'nav',
-  'nobr',
-  'ol',
-  'optgroup',
-  'option',
-  'output',
-  'p',
-  'picture',
-  'pre',
-  'progress',
-  'q',
-  'rp',
-  'rt',
-  'ruby',
-  's',
-  'samp',
-  'section',
-  'select',
-  'shadow',
-  'small',
-  'source',
-  'spacer',
-  'span',
-  'strike',
-  'strong',
-  'sub',
-  'summary',
-  'sup',
-  'table',
-  'tbody',
-  'td',
-  'template',
-  'textarea',
-  'tfoot',
-  'th',
-  'thead',
-  'time',
-  'tr',
-  'track',
-  'tt',
-  'u',
-  'ul',
-  'var',
-  'video',
-  'wbr',
-];
-
-// SVG
-export const svg = [
-  'svg',
-  'a',
-  'altglyph',
-  'altglyphdef',
-  'altglyphitem',
-  'animatecolor',
-  'animatemotion',
-  'animatetransform',
-  'audio',
-  'canvas',
-  'circle',
-  'clippath',
-  'defs',
-  'desc',
-  'ellipse',
-  'filter',
-  'font',
-  'g',
-  'glyph',
-  'glyphref',
-  'hkern',
-  'image',
-  'line',
-  'lineargradient',
-  'marker',
-  'mask',
-  'metadata',
-  'mpath',
-  'path',
-  'pattern',
-  'polygon',
-  'polyline',
-  'radialgradient',
-  'rect',
-  'stop',
-  'switch',
-  'symbol',
-  'text',
-  'textpath',
-  'title',
-  'tref',
-  'tspan',
-  'video',
-  'view',
-  'vkern',
-];
-
-export const svgFilters = [
-  'feBlend',
-  'feColorMatrix',
-  'feComponentTransfer',
-  'feComposite',
-  'feConvolveMatrix',
-  'feDiffuseLighting',
-  'feDisplacementMap',
-  'feDistantLight',
-  'feFlood',
-  'feFuncA',
-  'feFuncB',
-  'feFuncG',
-  'feFuncR',
-  'feGaussianBlur',
-  'feMerge',
-  'feMergeNode',
-  'feMorphology',
-  'feOffset',
-  'fePointLight',
-  'feSpecularLighting',
-  'feSpotLight',
-  'feTile',
-  'feTurbulence',
-];
-
-export const mathMl = [
-  'math',
-  'menclose',
-  'merror',
-  'mfenced',
-  'mfrac',
-  'mglyph',
-  'mi',
-  'mlabeledtr',
-  'mmultiscripts',
-  'mn',
-  'mo',
-  'mover',
-  'mpadded',
-  'mphantom',
-  'mroot',
-  'mrow',
-  'ms',
-  'mspace',
-  'msqrt',
-  'mstyle',
-  'msub',
-  'msup',
-  'msubsup',
-  'mtable',
-  'mtd',
-  'mtext',
-  'mtr',
-  'munder',
-  'munderover',
-];
-
-export const text = ['#text'];
-
-/**
- * Anything in here will be executed as HTML tags from TechDocs.
- *
- * @note Be conscious about what you add here. It can affect the TechDocs experience. For
- * some review before making a PR, reach out in the #docs-like-code channel in Discord first.
- */
-export const TECHDOCS_ALLOWED_TAGS = [
-  ...html,
-  ...svg,
-  ...svgFilters,
-  ...mathMl,
-  ...text,
-  'iframe',
-];
diff --git a/plugins/techdocs/src/reader/transformers/simplifyMkdocsFooter.test.ts b/plugins/techdocs/src/reader/transformers/simplifyMkdocsFooter.test.ts
index dbc3761e80..020befd522 100644
--- a/plugins/techdocs/src/reader/transformers/simplifyMkdocsFooter.test.ts
+++ b/plugins/techdocs/src/reader/transformers/simplifyMkdocsFooter.test.ts
@@ -18,20 +18,26 @@ import { createTestShadowDom, FIXTURES } from '../../test-utils';
 import { simplifyMkdocsFooter } from './simplifyMkdocsFooter';
 
 describe('simplifyMkdocsFooter', () => {
-  it('does not remove mkdocs copyright', () => {
-    const shadowDom = createTestShadowDom(FIXTURES.FIXTURE_STANDARD_PAGE, {
-      preTransformers: [],
-      postTransformers: [],
-    });
+  it('does not remove mkdocs copyright', async () => {
+    const shadowDom = await createTestShadowDom(
+      FIXTURES.FIXTURE_STANDARD_PAGE,
+      {
+        preTransformers: [],
+        postTransformers: [],
+      },
+    );
 
     expect(shadowDom.querySelector('.md-footer-copyright')).toBeTruthy();
   });
 
-  it('does remove mkdocs copyright', () => {
-    const shadowDom = createTestShadowDom(FIXTURES.FIXTURE_STANDARD_PAGE, {
-      preTransformers: [simplifyMkdocsFooter()],
-      postTransformers: [],
-    });
+  it('does remove mkdocs copyright', async () => {
+    const shadowDom = await createTestShadowDom(
+      FIXTURES.FIXTURE_STANDARD_PAGE,
+      {
+        preTransformers: [simplifyMkdocsFooter()],
+        postTransformers: [],
+      },
+    );
 
     expect(shadowDom.querySelector('.md-footer-copyright')).toBeFalsy();
   });
diff --git a/plugins/techdocs/src/reader/transformers/transformer.ts b/plugins/techdocs/src/reader/transformers/transformer.ts
index 7b440befbf..fc52f42b5c 100644
--- a/plugins/techdocs/src/reader/transformers/transformer.ts
+++ b/plugins/techdocs/src/reader/transformers/transformer.ts
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-export type Transformer = (dom: Element) => Element;
+export type Transformer = (dom: Element) => Element | Promise<Element>;
 
-export const transform = (
+export const transform = async (
   html: string | Element,
   transformers: Transformer[],
-): Element => {
+): Promise<Element> => {
   let dom: Element;
 
   if (typeof html === 'string') {
@@ -30,9 +30,9 @@ export const transform = (
     throw new Error('dom is not a recognized type');
   }
 
-  transformers.forEach(transformer => {
-    dom = transformer(dom);
-  });
+  for (const transformer of transformers) {
+    dom = await transformer(dom);
+  }
 
   return dom;
 };
diff --git a/plugins/techdocs/src/routes.ts b/plugins/techdocs/src/routes.ts
index d10a464d8a..e0b7661ffd 100644
--- a/plugins/techdocs/src/routes.ts
+++ b/plugins/techdocs/src/routes.ts
@@ -17,16 +17,17 @@
 import { createRouteRef } from '@backstage/core-plugin-api';
 
 export const rootRouteRef = createRouteRef({
-  path: '',
+  id: 'techdocs-index-page',
   title: 'TechDocs Landing Page',
 });
 
 export const rootDocsRouteRef = createRouteRef({
-  path: ':namespace/:kind/:name/*',
+  id: 'techdocs-reader-page',
   title: 'Docs',
+  params: ['namespace', 'kind', 'name'],
 });
 
 export const rootCatalogDocsRouteRef = createRouteRef({
-  path: '*',
+  id: 'catalog-techdocs-reader-view',
   title: 'Docs',
 });
diff --git a/plugins/techdocs/src/test-utils/shadowDom.ts b/plugins/techdocs/src/test-utils/shadowDom.ts
index 61055a87bd..f8289bf6d9 100644
--- a/plugins/techdocs/src/test-utils/shadowDom.ts
+++ b/plugins/techdocs/src/test-utils/shadowDom.ts
@@ -22,13 +22,13 @@ export type CreateTestShadowDomOptions = {
   postTransformers: Transformer[];
 };
 
-export const createTestShadowDom = (
+export const createTestShadowDom = async (
   fixture: string,
   opts: CreateTestShadowDomOptions = {
     preTransformers: [],
     postTransformers: [],
   },
-): ShadowRoot => {
+): Promise<ShadowRoot> => {
   const divElement = document.createElement('div');
   divElement.attachShadow({ mode: 'open' });
   document.body.appendChild(divElement);
@@ -39,7 +39,7 @@ export const createTestShadowDom = (
     'text/html',
   ).documentElement;
   if (opts.preTransformers) {
-    dom = transformer(dom, opts.preTransformers);
+    dom = await transformer(dom, opts.preTransformers);
   }
 
   // Mount the UI
@@ -47,7 +47,7 @@ export const createTestShadowDom = (
 
   // Transformers after the UI is rendered
   if (opts.postTransformers) {
-    transformer(dom, opts.postTransformers);
+    await transformer(dom, opts.postTransformers);
   }
 
   return divElement.shadowRoot!;
diff --git a/plugins/techdocs/src/types.ts b/plugins/techdocs/src/types.ts
index f6d849b426..dd35e255b6 100644
--- a/plugins/techdocs/src/types.ts
+++ b/plugins/techdocs/src/types.ts
@@ -14,11 +14,13 @@
  * limitations under the License.
  */
 
-import { Entity, Location } from '@backstage/catalog-model';
+import { Entity, LocationSpec } from '@backstage/catalog-model';
 
 export type TechDocsMetadata = {
   site_name: string;
   site_description: string;
 };
 
-export type TechDocsEntityMetadata = Entity & { locationMetadata?: Location };
+export type TechDocsEntityMetadata = Entity & {
+  locationMetadata?: LocationSpec;
+};
diff --git a/plugins/todo-backend/CHANGELOG.md b/plugins/todo-backend/CHANGELOG.md
index cc69ae6c3d..f74b639fa8 100644
--- a/plugins/todo-backend/CHANGELOG.md
+++ b/plugins/todo-backend/CHANGELOG.md
@@ -1,5 +1,32 @@
 # @backstage/plugin-todo-backend
 
+## 0.1.11
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.9.0
+  - @backstage/integration@0.6.2
+  - @backstage/config@0.1.8
+
+## 0.1.10
+
+### Patch Changes
+
+- 0b34dc7a3: Ignore images and files that are larger than 200KB.
+- Updated dependencies
+  - @backstage/backend-common@0.8.10
+  - @backstage/config@0.1.7
+  - @backstage/integration@0.6.1
+
+## 0.1.9
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/integration@0.6.0
+  - @backstage/backend-common@0.8.9
+
 ## 0.1.8
 
 ### Patch Changes
diff --git a/plugins/todo-backend/api-report.md b/plugins/todo-backend/api-report.md
index 92e133a481..592a912c11 100644
--- a/plugins/todo-backend/api-report.md
+++ b/plugins/todo-backend/api-report.md
@@ -11,12 +11,21 @@ import { Logger as Logger_2 } from 'winston';
 import { ScmIntegrations } from '@backstage/integration';
 import { UrlReader } from '@backstage/backend-common';
 
+// Warning: (ae-forgotten-export) The symbol "RouterOptions" needs to be exported by the entry point index.d.ts
+// Warning: (ae-missing-release-tag) "createRouter" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export function createRouter(options: RouterOptions): Promise<express.Router>;
 
+// Warning: (ae-forgotten-export) The symbol "TodoParserOptions" needs to be exported by the entry point index.d.ts
+// Warning: (ae-forgotten-export) The symbol "TodoParser" needs to be exported by the entry point index.d.ts
+// Warning: (ae-missing-release-tag) "createTodoParser" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export function createTodoParser(options?: TodoParserOptions): TodoParser;
 
+// Warning: (ae-missing-release-tag) "ListTodosRequest" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export type ListTodosRequest = {
   entity?: EntityName;
@@ -32,6 +41,8 @@ export type ListTodosRequest = {
   }[];
 };
 
+// Warning: (ae-missing-release-tag) "ListTodosResponse" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export type ListTodosResponse = {
   items: TodoItem[];
@@ -40,16 +51,22 @@ export type ListTodosResponse = {
   limit: number;
 };
 
+// Warning: (ae-missing-release-tag) "ReadTodosOptions" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export type ReadTodosOptions = {
   url: string;
 };
 
+// Warning: (ae-missing-release-tag) "ReadTodosResult" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export type ReadTodosResult = {
   items: TodoItem[];
 };
 
+// Warning: (ae-missing-release-tag) "TodoItem" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export type TodoItem = {
   text: string;
@@ -60,13 +77,18 @@ export type TodoItem = {
   repoFilePath?: string;
 };
 
+// Warning: (ae-missing-release-tag) "TodoReader" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export interface TodoReader {
   readTodos(options: ReadTodosOptions): Promise<ReadTodosResult>;
 }
 
+// Warning: (ae-missing-release-tag) "TodoReaderService" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export class TodoReaderService implements TodoService {
+  // Warning: (ae-forgotten-export) The symbol "Options" needs to be exported by the entry point index.d.ts
   constructor(options: Options_2);
   // (undocumented)
   listTodos(
@@ -77,9 +99,13 @@ export class TodoReaderService implements TodoService {
   ): Promise<ListTodosResponse>;
 }
 
+// Warning: (ae-missing-release-tag) "TodoScmReader" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export class TodoScmReader implements TodoReader {
   constructor(options: Options);
+  // Warning: (ae-forgotten-export) The symbol "Options" needs to be exported by the entry point index.d.ts
+  //
   // (undocumented)
   static fromConfig(
     config: Config,
@@ -89,6 +115,8 @@ export class TodoScmReader implements TodoReader {
   readTodos({ url }: ReadTodosOptions): Promise<ReadTodosResult>;
 }
 
+// Warning: (ae-missing-release-tag) "TodoService" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export interface TodoService {
   // (undocumented)
@@ -100,5 +128,9 @@ export interface TodoService {
   ): Promise<ListTodosResponse>;
 }
 
+// Warnings were encountered during analysis:
+//
+// src/service/types.d.ts:9:9 - (ae-forgotten-export) The symbol "Fields" needs to be exported by the entry point index.d.ts
+
 // (No @packageDocumentation comment for this package)
 ```
diff --git a/plugins/todo-backend/package.json b/plugins/todo-backend/package.json
index 61e84f8377..2b2b548620 100644
--- a/plugins/todo-backend/package.json
+++ b/plugins/todo-backend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-todo-backend",
-  "version": "0.1.8",
+  "version": "0.1.11",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -24,12 +24,12 @@
     "clean": "backstage-cli clean"
   },
   "dependencies": {
-    "@backstage/backend-common": "^0.8.5",
+    "@backstage/backend-common": "^0.9.0",
     "@backstage/catalog-client": "^0.3.16",
     "@backstage/catalog-model": "^0.9.0",
-    "@backstage/config": "^0.1.5",
+    "@backstage/config": "^0.1.8",
     "@backstage/errors": "^0.1.1",
-    "@backstage/integration": "^0.5.8",
+    "@backstage/integration": "^0.6.2",
     "@types/express": "^4.17.6",
     "cross-fetch": "^3.0.6",
     "express": "^4.17.1",
@@ -39,7 +39,7 @@
     "yn": "^4.0.0"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.7.1",
+    "@backstage/cli": "^0.7.9",
     "@types/supertest": "^2.0.8",
     "msw": "^0.29.0",
     "supertest": "^6.1.3"
diff --git a/plugins/todo-backend/src/lib/TodoReader/TodoScmReader.test.ts b/plugins/todo-backend/src/lib/TodoReader/TodoScmReader.test.ts
index a3fc607404..9675a285e0 100644
--- a/plugins/todo-backend/src/lib/TodoReader/TodoScmReader.test.ts
+++ b/plugins/todo-backend/src/lib/TodoReader/TodoScmReader.test.ts
@@ -74,7 +74,13 @@ describe('TodoScmReader', () => {
       ],
     };
 
-    await expect(todoReader.readTodos({ url })).resolves.toEqual(expected);
+    // These two reads should only result in a single call to readTree
+    await expect(
+      Promise.all([
+        todoReader.readTodos({ url }),
+        todoReader.readTodos({ url }),
+      ]),
+    ).resolves.toEqual([expected, expected]);
 
     expect(reader.readTree).toHaveBeenCalledTimes(1);
     expect(reader.readTree).toHaveBeenCalledWith(
diff --git a/plugins/todo-backend/src/lib/TodoReader/TodoScmReader.ts b/plugins/todo-backend/src/lib/TodoReader/TodoScmReader.ts
index 256279596f..8442983637 100644
--- a/plugins/todo-backend/src/lib/TodoReader/TodoScmReader.ts
+++ b/plugins/todo-backend/src/lib/TodoReader/TodoScmReader.ts
@@ -27,6 +27,19 @@ import {
 } from './types';
 import { Config } from '@backstage/config';
 import { createTodoParser } from './createTodoParser';
+import path from 'path';
+
+const excludedExtensions = [
+  '.png',
+  '.svg',
+  '.jpg',
+  '.jpeg',
+  '.gif',
+  '.raw',
+  '.lock',
+  '.ico',
+];
+const MAX_FILE_SIZE = 200000;
 
 type Options = {
   logger: Logger;
@@ -47,6 +60,7 @@ export class TodoScmReader implements TodoReader {
   private readonly integrations: ScmIntegrations;
 
   private readonly cache = new Map<string, CacheItem>();
+  private readonly inFlightReads = new Map<string, Promise<CacheItem>>();
 
   static fromConfig(config: Config, options: Omit<Options, 'integrations'>) {
     return new TodoScmReader({
@@ -63,16 +77,26 @@ export class TodoScmReader implements TodoReader {
   }
 
   async readTodos({ url }: ReadTodosOptions): Promise<ReadTodosResult> {
+    const inFlightRead = this.inFlightReads.get(url);
+    if (inFlightRead) {
+      return inFlightRead.then(read => read.result);
+    }
+
     const cacheItem = this.cache.get(url);
-    try {
-      const newCacheItem = await this.doReadTodos({ url }, cacheItem?.etag);
-      this.cache.set(url, newCacheItem);
-      return newCacheItem.result;
-    } catch (error) {
+    const newRead = this.doReadTodos({ url }, cacheItem?.etag).catch(error => {
       if (cacheItem && error.name === 'NotModifiedError') {
-        return cacheItem.result;
+        return cacheItem;
       }
       throw error;
+    });
+
+    this.inFlightReads.set(url, newRead);
+    try {
+      const newCacheItem = await newRead;
+      this.cache.set(url, newCacheItem);
+      return newCacheItem.result;
+    } finally {
+      this.inFlightReads.delete(url);
     }
   }
 
@@ -82,8 +106,16 @@ export class TodoScmReader implements TodoReader {
   ): Promise<CacheItem> {
     const tree = await this.reader.readTree(url, {
       etag,
-      filter(path) {
-        return !path.startsWith('.') && !path.includes('/.');
+      filter(filePath, info) {
+        const extname = path.extname(filePath);
+        if (info && info.size > MAX_FILE_SIZE) {
+          return false;
+        }
+        return (
+          !filePath.startsWith('.') &&
+          !filePath.includes('/.') &&
+          !excludedExtensions.includes(extname)
+        );
       },
     });
 
diff --git a/plugins/todo/CHANGELOG.md b/plugins/todo/CHANGELOG.md
index e8a079880d..bbab997e8f 100644
--- a/plugins/todo/CHANGELOG.md
+++ b/plugins/todo/CHANGELOG.md
@@ -1,5 +1,58 @@
 # @backstage/plugin-todo
 
+## 0.1.9
+
+### Patch Changes
+
+- a3734ba27: Fix TodoList table column widths
+- b07378742: All types are now properly documented and exported.
+- Updated dependencies
+  - @backstage/core-components@0.4.1
+  - @backstage/catalog-model@0.9.2
+  - @backstage/errors@0.1.2
+  - @backstage/core-plugin-api@0.1.7
+
+## 0.1.8
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@0.4.5
+  - @backstage/core-components@0.4.0
+  - @backstage/catalog-model@0.9.1
+
+## 0.1.7
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.3.0
+  - @backstage/core-plugin-api@0.1.5
+  - @backstage/plugin-catalog-react@0.4.1
+
+## 0.1.6
+
+### Patch Changes
+
+- 9d40fcb1e: - Bumping `material-ui/core` version to at least `4.12.2` as they made some breaking changes in later versions which broke `Pagination` of the `Table`.
+  - Switching out `material-table` to `@material-table/core` for support for the later versions of `material-ui/core`
+  - This causes a minor API change to `@backstage/core-components` as the interface for `Table` re-exports the `prop` from the underlying `Table` components.
+  - `onChangeRowsPerPage` has been renamed to `onRowsPerPageChange`
+  - `onChangePage` has been renamed to `onPageChange`
+  - Migration guide is here: https://material-table-core.com/docs/breaking-changes
+- Updated dependencies
+  - @backstage/core-components@0.2.0
+  - @backstage/plugin-catalog-react@0.4.0
+  - @backstage/core-plugin-api@0.1.4
+  - @backstage/theme@0.2.9
+
+## 0.1.5
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@0.3.0
+
 ## 0.1.4
 
 ### Patch Changes
diff --git a/plugins/todo/api-report.md b/plugins/todo/api-report.md
index 1fc8e8f99f..22fca3cb9e 100644
--- a/plugins/todo/api-report.md
+++ b/plugins/todo/api-report.md
@@ -7,15 +7,84 @@
 
 import { ApiRef } from '@backstage/core-plugin-api';
 import { BackstagePlugin } from '@backstage/core-plugin-api';
+import { DiscoveryApi } from '@backstage/core-plugin-api';
 import { Entity } from '@backstage/catalog-model';
+import { IdentityApi } from '@backstage/core-plugin-api';
 
-// @public (undocumented)
+// @public
 export const EntityTodoContent: () => JSX.Element;
 
-// @public (undocumented)
+// @public
+export interface TodoApi {
+  listTodos(options: TodoListOptions): Promise<TodoListResult>;
+}
+
+// @public
 export const todoApiRef: ApiRef<TodoApi>;
 
-// @public (undocumented)
+// @public
+export class TodoClient implements TodoApi {
+  constructor(options: TodoClientOptions);
+  // (undocumented)
+  listTodos({
+    entity,
+    offset,
+    limit,
+    orderBy,
+    filters,
+  }: TodoListOptions): Promise<TodoListResult>;
+}
+
+// @public
+export interface TodoClientOptions {
+  // (undocumented)
+  discoveryApi: DiscoveryApi;
+  // (undocumented)
+  identityApi: IdentityApi;
+}
+
+// @public
+export type TodoItem = {
+  text: string;
+  tag: string;
+  author?: string;
+  viewUrl?: string;
+  lineNumber?: number;
+  repoFilePath?: string;
+};
+
+// @public
+export type TodoListFields =
+  | 'text'
+  | 'tag'
+  | 'author'
+  | 'viewUrl'
+  | 'repoFilePath';
+
+// @public
+export type TodoListOptions = {
+  entity?: Entity;
+  offset?: number;
+  limit?: number;
+  orderBy?: {
+    field: TodoListFields;
+    direction: 'asc' | 'desc';
+  };
+  filters?: {
+    field: TodoListFields;
+    value: string;
+  }[];
+};
+
+// @public
+export type TodoListResult = {
+  items: TodoItem[];
+  totalCount: number;
+  offset: number;
+  limit: number;
+};
+
+// @public
 export const todoPlugin: BackstagePlugin<{}, {}>;
 
 // (No @packageDocumentation comment for this package)
diff --git a/plugins/todo/package.json b/plugins/todo/package.json
index df719ef10e..73b29f14e1 100644
--- a/plugins/todo/package.json
+++ b/plugins/todo/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-todo",
-  "version": "0.1.4",
+  "version": "0.1.9",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -26,13 +26,13 @@
     "clean": "backstage-cli clean"
   },
   "dependencies": {
-    "@backstage/catalog-model": "^0.9.0",
-    "@backstage/core-components": "^0.1.5",
-    "@backstage/core-plugin-api": "^0.1.3",
-    "@backstage/errors": "^0.1.1",
-    "@backstage/plugin-catalog-react": "^0.2.6",
-    "@backstage/theme": "^0.2.8",
-    "@material-ui/core": "^4.11.0",
+    "@backstage/catalog-model": "^0.9.2",
+    "@backstage/core-components": "^0.4.1",
+    "@backstage/core-plugin-api": "^0.1.7",
+    "@backstage/errors": "^0.1.2",
+    "@backstage/plugin-catalog-react": "^0.4.5",
+    "@backstage/theme": "^0.2.10",
+    "@material-ui/core": "^4.12.2",
     "@material-ui/icons": "^4.9.1",
     "@material-ui/lab": "4.0.0-alpha.45",
     "react": "^16.13.1",
@@ -40,10 +40,10 @@
     "react-use": "^17.2.4"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.7.3",
-    "@backstage/core-app-api": "^0.1.4",
-    "@backstage/dev-utils": "^0.2.1",
-    "@backstage/test-utils": "^0.1.14",
+    "@backstage/cli": "^0.7.11",
+    "@backstage/core-app-api": "^0.1.12",
+    "@backstage/dev-utils": "^0.2.9",
+    "@backstage/test-utils": "^0.1.17",
     "@testing-library/jest-dom": "^5.10.1",
     "@testing-library/react": "^11.2.5",
     "@testing-library/user-event": "^13.1.8",
diff --git a/plugins/todo/src/api/TodoClient.ts b/plugins/todo/src/api/TodoClient.ts
index f4fb4071e8..f75e4b6954 100644
--- a/plugins/todo/src/api/TodoClient.ts
+++ b/plugins/todo/src/api/TodoClient.ts
@@ -14,21 +14,31 @@
  * limitations under the License.
  */
 
-import { serializeEntityRef } from '@backstage/catalog-model';
+import { stringifyEntityRef } from '@backstage/catalog-model';
 import { ResponseError } from '@backstage/errors';
 import { TodoApi, TodoListOptions, TodoListResult } from './types';
 import { DiscoveryApi, IdentityApi } from '@backstage/core-plugin-api';
 
-interface Options {
+/**
+ * Options for creating a todo client.
+ *
+ * @public
+ */
+export interface TodoClientOptions {
   discoveryApi: DiscoveryApi;
   identityApi: IdentityApi;
 }
 
+/**
+ * An implementation of the TodoApi that talks to the todo plugin backend.
+ *
+ * @public
+ */
 export class TodoClient implements TodoApi {
   private readonly discoveryApi: DiscoveryApi;
   private readonly identityApi: IdentityApi;
 
-  constructor(options: Options) {
+  constructor(options: TodoClientOptions) {
     this.discoveryApi = options.discoveryApi;
     this.identityApi = options.identityApi;
   }
@@ -45,7 +55,7 @@ export class TodoClient implements TodoApi {
 
     const query = new URLSearchParams();
     if (entity) {
-      query.set('entity', serializeEntityRef(entity) as string);
+      query.set('entity', stringifyEntityRef(entity));
     }
     if (typeof offset === 'number') {
       query.set('offset', String(offset));
diff --git a/plugins/todo/src/api/index.ts b/plugins/todo/src/api/index.ts
index d6771aeaba..b1d9792c95 100644
--- a/plugins/todo/src/api/index.ts
+++ b/plugins/todo/src/api/index.ts
@@ -15,5 +15,12 @@
  */
 
 export { TodoClient } from './TodoClient';
+export type { TodoClientOptions } from './TodoClient';
 export { todoApiRef } from './types';
-export type { TodoApi } from './types';
+export type {
+  TodoApi,
+  TodoListOptions,
+  TodoListResult,
+  TodoItem,
+  TodoListFields,
+} from './types';
diff --git a/plugins/todo/src/api/types.ts b/plugins/todo/src/api/types.ts
index 018f1df536..f1f647f6e3 100644
--- a/plugins/todo/src/api/types.ts
+++ b/plugins/todo/src/api/types.ts
@@ -17,6 +17,11 @@
 import { Entity } from '@backstage/catalog-model';
 import { createApiRef } from '@backstage/core-plugin-api';
 
+/**
+ * TodoItem represents a single TODO comment in source code.
+ *
+ * @public
+ */
 export type TodoItem = {
   /** The contents of the TODO comment */
   text: string;
@@ -37,23 +42,43 @@ export type TodoItem = {
   repoFilePath?: string;
 };
 
-type Fields = 'text' | 'tag' | 'author' | 'viewUrl' | 'repoFilePath';
+/**
+ * Fields that can be used to filter or order todo items.
+ *
+ * @public
+ */
+export type TodoListFields =
+  | 'text'
+  | 'tag'
+  | 'author'
+  | 'viewUrl'
+  | 'repoFilePath';
 
+/**
+ * Options used to list todo items.
+ *
+ * @public
+ */
 export type TodoListOptions = {
   entity?: Entity;
   offset?: number;
   limit?: number;
   orderBy?: {
-    field: Fields;
+    field: TodoListFields;
     direction: 'asc' | 'desc';
   };
   filters?: {
-    field: Fields;
+    field: TodoListFields;
     /** Value to filter by, with '*' used as wildcard */
     value: string;
   }[];
 };
 
+/**
+ * The result of listing todos.
+ *
+ * @public
+ */
 export type TodoListResult = {
   items: TodoItem[];
   totalCount: number;
@@ -61,10 +86,25 @@ export type TodoListResult = {
   limit: number;
 };
 
+/**
+ * The API used by the todo-plugin to list todos.
+ *
+ * @public
+ */
 export interface TodoApi {
+  /**
+   * Lists todo items.
+   *
+   * @public
+   */
   listTodos(options: TodoListOptions): Promise<TodoListResult>;
 }
 
+/**
+ * ApiRef for the TodoApi.
+ *
+ * @public
+ */
 export const todoApiRef = createApiRef<TodoApi>({
   id: 'plugin.todo.api',
   description: 'Lists TODOs',
diff --git a/plugins/todo/src/components/TodoList/TodoList.tsx b/plugins/todo/src/components/TodoList/TodoList.tsx
index 35bca27e30..653f825f6a 100644
--- a/plugins/todo/src/components/TodoList/TodoList.tsx
+++ b/plugins/todo/src/components/TodoList/TodoList.tsx
@@ -34,19 +34,20 @@ const columns: TableColumn<TodoItem>[] = [
   {
     title: 'Tag',
     field: 'tag',
+    width: '10%',
     filtering: false,
   },
   {
     title: 'Text',
     field: 'text',
-    width: '100%',
+    width: '55%',
     highlight: true,
     render: ({ text }) => <OverflowTooltip text={text} />,
   },
   {
     title: 'File',
     field: 'repoFilePath',
-    width: '80%',
+    width: '25%',
     render: ({ viewUrl, repoFilePath }) =>
       viewUrl ? (
         <Link to={viewUrl} target="_blank">
@@ -59,7 +60,7 @@ const columns: TableColumn<TodoItem>[] = [
   {
     title: 'Author',
     field: 'author',
-    width: '20%',
+    width: '10%',
     render: ({ author }) => <OverflowTooltip text={author} />,
   },
 ];
diff --git a/plugins/todo/src/index.ts b/plugins/todo/src/index.ts
index d04df36f5e..92a85945ac 100644
--- a/plugins/todo/src/index.ts
+++ b/plugins/todo/src/index.ts
@@ -14,5 +14,13 @@
  * limitations under the License.
  */
 
-export { todoApiRef } from './api';
+export { todoApiRef, TodoClient } from './api';
+export type {
+  TodoApi,
+  TodoListOptions,
+  TodoListResult,
+  TodoItem,
+  TodoListFields,
+  TodoClientOptions,
+} from './api';
 export { todoPlugin, EntityTodoContent } from './plugin';
diff --git a/plugins/todo/src/plugin.ts b/plugins/todo/src/plugin.ts
index dd24304d0a..5415bbb902 100644
--- a/plugins/todo/src/plugin.ts
+++ b/plugins/todo/src/plugin.ts
@@ -22,8 +22,11 @@ import {
   identityApiRef,
 } from '@backstage/core-plugin-api';
 
-// import { rootRouteRef } from './routes';
-
+/**
+ * The Todo plugin instance.
+ *
+ * @public
+ */
 export const todoPlugin = createPlugin({
   id: 'todo',
   apis: [
@@ -43,6 +46,11 @@ export const todoPlugin = createPlugin({
   },
 });
 
+/**
+ * An extension for displaying the list of todos on an entity page.
+ *
+ * @public
+ */
 export const EntityTodoContent = todoPlugin.provide(
   createComponentExtension({
     component: {
diff --git a/plugins/user-settings/CHANGELOG.md b/plugins/user-settings/CHANGELOG.md
index 95344dd0a5..24a6c967a0 100644
--- a/plugins/user-settings/CHANGELOG.md
+++ b/plugins/user-settings/CHANGELOG.md
@@ -1,5 +1,49 @@
 # @backstage/plugin-user-settings
 
+## 0.3.4
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.4.0
+
+## 0.3.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.3.0
+  - @backstage/core-plugin-api@0.1.5
+
+## 0.3.2
+
+### Patch Changes
+
+- 9d40fcb1e: - Bumping `material-ui/core` version to at least `4.12.2` as they made some breaking changes in later versions which broke `Pagination` of the `Table`.
+  - Switching out `material-table` to `@material-table/core` for support for the later versions of `material-ui/core`
+  - This causes a minor API change to `@backstage/core-components` as the interface for `Table` re-exports the `prop` from the underlying `Table` components.
+  - `onChangeRowsPerPage` has been renamed to `onRowsPerPageChange`
+  - `onChangePage` has been renamed to `onPageChange`
+  - Migration guide is here: https://material-table-core.com/docs/breaking-changes
+- Updated dependencies
+  - @backstage/core-components@0.2.0
+  - @backstage/core-plugin-api@0.1.4
+  - @backstage/theme@0.2.9
+
+## 0.3.1
+
+### Patch Changes
+
+- b5953c1df: Aligns switch left and allows clicking on rows
+- Updated dependencies
+  - @backstage/core-components@0.1.6
+
+## 0.3.0
+
+### Minor Changes
+
+- 71afed7f3: Exported and renamed components from the `@backstage/plugin-user-settings` plugin , to be able to use it in the consumer side and customize the `SettingPage`
+
 ## 0.2.12
 
 ### Patch Changes
diff --git a/plugins/user-settings/api-report.md b/plugins/user-settings/api-report.md
index 2f3b9b2fed..af542e22d9 100644
--- a/plugins/user-settings/api-report.md
+++ b/plugins/user-settings/api-report.md
@@ -12,11 +12,17 @@ import { ProfileInfo } from '@backstage/core-plugin-api';
 import { RouteRef } from '@backstage/core-plugin-api';
 import { SessionApi } from '@backstage/core-plugin-api';
 
+// Warning: (ae-forgotten-export) The symbol "Props" needs to be exported by the entry point index.d.ts
+// Warning: (ae-missing-release-tag) "DefaultProviderSettings" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export const DefaultProviderSettings: ({
   configuredProviders,
 }: Props_3) => JSX.Element;
 
+// Warning: (ae-forgotten-export) The symbol "Props" needs to be exported by the entry point index.d.ts
+// Warning: (ae-missing-release-tag) "ProviderSettingsItem" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export const ProviderSettingsItem: ({
   title,
@@ -25,29 +31,47 @@ export const ProviderSettingsItem: ({
   apiRef,
 }: Props_4) => JSX.Element;
 
+// Warning: (ae-forgotten-export) The symbol "Props" needs to be exported by the entry point index.d.ts
+// Warning: (ae-missing-release-tag) "SettingsPage" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export const Router: ({ providerSettings }: Props) => JSX.Element;
 
+// Warning: (ae-missing-release-tag) "Settings" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export const Settings: () => JSX.Element;
 
+// Warning: (ae-missing-release-tag) "UserSettingsAppearanceCard" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export const UserSettingsAppearanceCard: () => JSX.Element;
 
+// Warning: (ae-forgotten-export) The symbol "Props" needs to be exported by the entry point index.d.ts
+// Warning: (ae-missing-release-tag) "UserSettingsAuthProviders" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export const UserSettingsAuthProviders: ({
   providerSettings,
 }: Props_2) => JSX.Element;
 
+// Warning: (ae-missing-release-tag) "UserSettingsFeatureFlags" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export const UserSettingsFeatureFlags: () => JSX.Element;
 
+// Warning: (ae-missing-release-tag) "UserSettingsGeneral" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export const UserSettingsGeneral: () => JSX.Element;
 
+// Warning: (ae-missing-release-tag) "UserSettingsMenu" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export const UserSettingsMenu: () => JSX.Element;
 
+// Warning: (ae-missing-release-tag) "UserSettingsPage" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export const UserSettingsPage: ({
   providerSettings,
@@ -55,9 +79,13 @@ export const UserSettingsPage: ({
   providerSettings?: JSX.Element | undefined;
 }) => JSX.Element;
 
+// Warning: (ae-missing-release-tag) "UserSettingsPinToggle" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export const UserSettingsPinToggle: () => JSX.Element;
 
+// Warning: (ae-missing-release-tag) "userSettingsPlugin" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 const userSettingsPlugin: BackstagePlugin<
   {
@@ -68,15 +96,24 @@ const userSettingsPlugin: BackstagePlugin<
 export { userSettingsPlugin as plugin };
 export { userSettingsPlugin };
 
+// Warning: (ae-missing-release-tag) "UserSettingsProfileCard" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export const UserSettingsProfileCard: () => JSX.Element;
 
+// Warning: (ae-forgotten-export) The symbol "Props" needs to be exported by the entry point index.d.ts
+// Warning: (ae-missing-release-tag) "UserSettingsSignInAvatar" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export const UserSettingsSignInAvatar: ({ size }: Props_5) => JSX.Element;
 
+// Warning: (ae-missing-release-tag) "UserSettingsThemeToggle" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export const UserSettingsThemeToggle: () => JSX.Element;
 
+// Warning: (ae-missing-release-tag) "useUserProfile" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export const useUserProfile: () => {
   profile: ProfileInfo;
diff --git a/plugins/user-settings/package.json b/plugins/user-settings/package.json
index 941116b0bb..73208f3ec6 100644
--- a/plugins/user-settings/package.json
+++ b/plugins/user-settings/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-user-settings",
-  "version": "0.2.12",
+  "version": "0.3.4",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -30,10 +30,10 @@
     "clean": "backstage-cli clean"
   },
   "dependencies": {
-    "@backstage/core-components": "^0.1.5",
-    "@backstage/core-plugin-api": "^0.1.3",
-    "@backstage/theme": "^0.2.8",
-    "@material-ui/core": "^4.11.0",
+    "@backstage/core-components": "^0.4.1",
+    "@backstage/core-plugin-api": "^0.1.7",
+    "@backstage/theme": "^0.2.10",
+    "@material-ui/core": "^4.12.2",
     "@material-ui/icons": "^4.9.1",
     "@material-ui/lab": "4.0.0-alpha.45",
     "react": "^16.13.1",
@@ -42,11 +42,11 @@
     "react-use": "^17.2.4"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.7.3",
-    "@backstage/core-app-api": "^0.1.4",
-    "@backstage/core-plugin-api": "^0.1.3",
-    "@backstage/dev-utils": "^0.2.1",
-    "@backstage/test-utils": "^0.1.14",
+    "@backstage/cli": "^0.7.11",
+    "@backstage/core-app-api": "^0.1.12",
+    "@backstage/core-plugin-api": "^0.1.5",
+    "@backstage/dev-utils": "^0.2.9",
+    "@backstage/test-utils": "^0.1.17",
     "@testing-library/jest-dom": "^5.10.1",
     "@testing-library/react": "^11.2.5",
     "@testing-library/user-event": "^13.1.8",
diff --git a/plugins/user-settings/src/components/FeatureFlags/EmptyFlags.tsx b/plugins/user-settings/src/components/FeatureFlags/EmptyFlags.tsx
index 878141f7dc..785f398d6f 100644
--- a/plugins/user-settings/src/components/FeatureFlags/EmptyFlags.tsx
+++ b/plugins/user-settings/src/components/FeatureFlags/EmptyFlags.tsx
@@ -18,7 +18,7 @@ import React from 'react';
 import { Button, Typography } from '@material-ui/core';
 import { CodeSnippet, EmptyState } from '@backstage/core-components';
 
-const EXAMPLE = `import { createPlugin } from '@backstage/core';
+const EXAMPLE = `import { createPlugin } from '@backstage/core-plugin-api';
 
 export default createPlugin({
   id: 'plugin-name',
diff --git a/plugins/user-settings/src/components/FeatureFlags/FeatureFlagsItem.tsx b/plugins/user-settings/src/components/FeatureFlags/FeatureFlagsItem.tsx
index 62861d99a9..e97b33cd92 100644
--- a/plugins/user-settings/src/components/FeatureFlags/FeatureFlagsItem.tsx
+++ b/plugins/user-settings/src/components/FeatureFlags/FeatureFlagsItem.tsx
@@ -17,8 +17,8 @@
 import React from 'react';
 import {
   ListItem,
-  ListItemSecondaryAction,
   ListItemText,
+  ListItemIcon,
   Switch,
   Tooltip,
 } from '@material-ui/core';
@@ -31,20 +31,15 @@ type Props = {
 };
 
 export const FlagItem = ({ flag, enabled, toggleHandler }: Props) => (
-  <ListItem>
+  <ListItem divider button onClick={() => toggleHandler(flag.name)}>
+    <ListItemIcon>
+      <Tooltip placement="top" arrow title={enabled ? 'Disable' : 'Enable'}>
+        <Switch color="primary" checked={enabled} name={flag.name} />
+      </Tooltip>
+    </ListItemIcon>
     <ListItemText
       primary={flag.name}
       secondary={`Registered in ${flag.pluginId} plugin`}
     />
-    <ListItemSecondaryAction>
-      <Tooltip placement="top" arrow title={enabled ? 'Disable' : 'Enable'}>
-        <Switch
-          color="primary"
-          checked={enabled}
-          onChange={() => toggleHandler(flag.name)}
-          name={flag.name}
-        />
-      </Tooltip>
-    </ListItemSecondaryAction>
   </ListItem>
 );
diff --git a/plugins/welcome/CHANGELOG.md b/plugins/welcome/CHANGELOG.md
index 25420009d9..cb518b83e5 100644
--- a/plugins/welcome/CHANGELOG.md
+++ b/plugins/welcome/CHANGELOG.md
@@ -1,5 +1,35 @@
 # @backstage/plugin-welcome
 
+## 0.3.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.4.0
+
+## 0.3.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.3.0
+  - @backstage/core-plugin-api@0.1.5
+
+## 0.3.1
+
+### Patch Changes
+
+- 9d40fcb1e: - Bumping `material-ui/core` version to at least `4.12.2` as they made some breaking changes in later versions which broke `Pagination` of the `Table`.
+  - Switching out `material-table` to `@material-table/core` for support for the later versions of `material-ui/core`
+  - This causes a minor API change to `@backstage/core-components` as the interface for `Table` re-exports the `prop` from the underlying `Table` components.
+  - `onChangeRowsPerPage` has been renamed to `onRowsPerPageChange`
+  - `onChangePage` has been renamed to `onPageChange`
+  - Migration guide is here: https://material-table-core.com/docs/breaking-changes
+- Updated dependencies
+  - @backstage/core-components@0.2.0
+  - @backstage/core-plugin-api@0.1.4
+  - @backstage/theme@0.2.9
+
 ## 0.3.0
 
 ### Minor Changes
diff --git a/plugins/welcome/api-report.md b/plugins/welcome/api-report.md
index 49ccd46994..f3096482de 100644
--- a/plugins/welcome/api-report.md
+++ b/plugins/welcome/api-report.md
@@ -7,9 +7,13 @@
 
 import { BackstagePlugin } from '@backstage/core-plugin-api';
 
+// Warning: (ae-missing-release-tag) "WelcomePage" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 export const WelcomePage: () => JSX.Element;
 
+// Warning: (ae-missing-release-tag) "welcomePlugin" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
 // @public (undocumented)
 const welcomePlugin: BackstagePlugin<{}, {}>;
 export { welcomePlugin as plugin };
diff --git a/plugins/welcome/package.json b/plugins/welcome/package.json
index a04d3cf9dd..07989801c8 100644
--- a/plugins/welcome/package.json
+++ b/plugins/welcome/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-welcome",
-  "version": "0.3.0",
+  "version": "0.3.3",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "private": false,
@@ -30,10 +30,10 @@
     "start": "backstage-cli plugin:serve"
   },
   "dependencies": {
-    "@backstage/core-components": "^0.1.5",
-    "@backstage/core-plugin-api": "^0.1.3",
-    "@backstage/theme": "^0.2.8",
-    "@material-ui/core": "^4.11.0",
+    "@backstage/core-components": "^0.4.1",
+    "@backstage/core-plugin-api": "^0.1.7",
+    "@backstage/theme": "^0.2.10",
+    "@material-ui/core": "^4.12.2",
     "@material-ui/icons": "^4.9.1",
     "@material-ui/lab": "4.0.0-alpha.45",
     "react": "^16.13.1",
@@ -42,10 +42,10 @@
     "react-use": "^17.2.4"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.7.3",
-    "@backstage/core-app-api": "^0.1.4",
-    "@backstage/dev-utils": "^0.2.1",
-    "@backstage/test-utils": "^0.1.14",
+    "@backstage/cli": "^0.7.11",
+    "@backstage/core-app-api": "^0.1.12",
+    "@backstage/dev-utils": "^0.2.9",
+    "@backstage/test-utils": "^0.1.17",
     "@testing-library/jest-dom": "^5.10.1",
     "@testing-library/react": "^11.2.5",
     "@testing-library/user-event": "^13.1.8",
diff --git a/plugins/xcmetrics/.eslintrc.js b/plugins/xcmetrics/.eslintrc.js
new file mode 100644
index 0000000000..13573efa9c
--- /dev/null
+++ b/plugins/xcmetrics/.eslintrc.js
@@ -0,0 +1,3 @@
+module.exports = {
+  extends: [require.resolve('@backstage/cli/config/eslint')],
+};
diff --git a/plugins/xcmetrics/CHANGELOG.md b/plugins/xcmetrics/CHANGELOG.md
new file mode 100644
index 0000000000..c512bae367
--- /dev/null
+++ b/plugins/xcmetrics/CHANGELOG.md
@@ -0,0 +1,55 @@
+# @backstage/plugin-xcmetrics
+
+## 0.2.4
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.4.0
+
+## 0.2.3
+
+### Patch Changes
+
+- eed15251e: Enable browsing detailed build information such as host configuration, errors, warnings, metadata and a timeline for all targets
+- 8ee9aa066: Internal refactoring
+- Updated dependencies
+  - @backstage/core-components@0.3.2
+  - @backstage/theme@0.2.10
+
+## 0.2.2
+
+### Patch Changes
+
+- 8bedb75ae: Update Luxon dependency to 2.x
+- Updated dependencies
+  - @backstage/core-components@0.3.1
+  - @backstage/core-plugin-api@0.1.6
+
+## 0.2.1
+
+### Patch Changes
+
+- f6f664357: New page for browsing all builds with filtering and pagination capabilities
+- Updated dependencies
+  - @backstage/core-components@0.3.0
+  - @backstage/core-plugin-api@0.1.5
+
+## 0.2.0
+
+### Minor Changes
+
+- 616e10e94: New data in form of trend lines, status timeline and other is added to the dashboard of XCMetrics to give a better understanding of how the build system is behaving.
+
+### Patch Changes
+
+- 9d40fcb1e: - Bumping `material-ui/core` version to at least `4.12.2` as they made some breaking changes in later versions which broke `Pagination` of the `Table`.
+  - Switching out `material-table` to `@material-table/core` for support for the later versions of `material-ui/core`
+  - This causes a minor API change to `@backstage/core-components` as the interface for `Table` re-exports the `prop` from the underlying `Table` components.
+  - `onChangeRowsPerPage` has been renamed to `onRowsPerPageChange`
+  - `onChangePage` has been renamed to `onPageChange`
+  - Migration guide is here: https://material-table-core.com/docs/breaking-changes
+- Updated dependencies
+  - @backstage/core-components@0.2.0
+  - @backstage/core-plugin-api@0.1.4
+  - @backstage/theme@0.2.9
diff --git a/plugins/xcmetrics/README.md b/plugins/xcmetrics/README.md
new file mode 100644
index 0000000000..a3bb93d2af
--- /dev/null
+++ b/plugins/xcmetrics/README.md
@@ -0,0 +1,38 @@
+# XCMetrics
+
+[XCMetrics](https://xcmetrics.io) is a tool for collecting build metrics from XCode.  
+With this plugin, you can view data from XCMetrics directly in Backstage.
+
+![XCMetrics-overview](./docs/XCMetrics-overview.png)
+
+## Getting started
+
+From `packages/app`:
+
+```bash
+yarn add @backstage/plugin-xcmetrics
+```
+
+In `packages/app/src/App.tsx`, add the following:
+
+```ts
+import { XcmetricsPage } from '@backstage/plugin-xcmetrics';
+```
+
+```tsx
+<FlatRoutes>
+  {/* Other routes... */}
+  <Route path="/xcmetrics" element={<XcmetricsPage />} />
+</FlatRoutes>
+```
+
+Add the URL to your XCMetrics backend instance in `app-config.yaml` like so:
+
+```yaml
+proxy:
+  ...
+  '/xcmetrics':
+    target: http://127.0.0.1:8080/v1
+```
+
+Start Backstage and navigate to `/xcmetrics` to view your build metrics!
diff --git a/plugins/xcmetrics/api-report.md b/plugins/xcmetrics/api-report.md
new file mode 100644
index 0000000000..9eb9a16f8b
--- /dev/null
+++ b/plugins/xcmetrics/api-report.md
@@ -0,0 +1,27 @@
+## API Report File for "@backstage/plugin-xcmetrics"
+
+> Do not edit this file. It is a report generated by [API Extractor](https://api-extractor.com/).
+
+```ts
+/// <reference types="react" />
+
+import { BackstagePlugin } from '@backstage/core-plugin-api';
+import { RouteRef } from '@backstage/core-plugin-api';
+
+// Warning: (ae-missing-release-tag) "XcmetricsPage" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
+// @public (undocumented)
+export const XcmetricsPage: () => JSX.Element;
+
+// Warning: (ae-missing-release-tag) "xcmetricsPlugin" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
+// @public (undocumented)
+export const xcmetricsPlugin: BackstagePlugin<
+  {
+    root: RouteRef<undefined>;
+  },
+  {}
+>;
+
+// (No @packageDocumentation comment for this package)
+```
diff --git a/plugins/xcmetrics/dev/index.tsx b/plugins/xcmetrics/dev/index.tsx
new file mode 100644
index 0000000000..f6663dd33d
--- /dev/null
+++ b/plugins/xcmetrics/dev/index.tsx
@@ -0,0 +1,27 @@
+/*
+ * Copyright 2021 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import React from 'react';
+import { createDevApp } from '@backstage/dev-utils';
+import { xcmetricsPlugin, XcmetricsPage } from '../src/plugin';
+
+createDevApp()
+  .registerPlugin(xcmetricsPlugin)
+  .addPage({
+    element: <XcmetricsPage />,
+    title: 'Root Page',
+    path: '/xcmetrics',
+  })
+  .render();
diff --git a/plugins/xcmetrics/docs/XCMetrics-overview.png b/plugins/xcmetrics/docs/XCMetrics-overview.png
new file mode 100644
index 0000000000..764bfa9836
Binary files /dev/null and b/plugins/xcmetrics/docs/XCMetrics-overview.png differ
diff --git a/plugins/xcmetrics/package.json b/plugins/xcmetrics/package.json
new file mode 100644
index 0000000000..a5cadb03ac
--- /dev/null
+++ b/plugins/xcmetrics/package.json
@@ -0,0 +1,53 @@
+{
+  "name": "@backstage/plugin-xcmetrics",
+  "version": "0.2.4",
+  "main": "src/index.ts",
+  "types": "src/index.ts",
+  "license": "Apache-2.0",
+  "publishConfig": {
+    "access": "public",
+    "main": "dist/index.esm.js",
+    "types": "dist/index.d.ts"
+  },
+  "scripts": {
+    "build": "backstage-cli plugin:build",
+    "start": "backstage-cli plugin:serve",
+    "lint": "backstage-cli lint",
+    "test": "backstage-cli test",
+    "diff": "backstage-cli plugin:diff",
+    "prepack": "backstage-cli prepack",
+    "postpack": "backstage-cli postpack",
+    "clean": "backstage-cli clean"
+  },
+  "dependencies": {
+    "@backstage/core-components": "^0.4.1",
+    "@backstage/core-plugin-api": "^0.1.7",
+    "@backstage/errors": "^0.1.1",
+    "@backstage/theme": "^0.2.10",
+    "@material-ui/core": "^4.12.2",
+    "@material-ui/icons": "^4.9.1",
+    "@material-ui/lab": "4.0.0-alpha.45",
+    "luxon": "^2.0.2",
+    "react": "^16.13.1",
+    "react-dom": "^16.13.1",
+    "react-use": "^17.2.4",
+    "recharts": "^1.8.5"
+  },
+  "devDependencies": {
+    "@backstage/cli": "^0.7.11",
+    "@backstage/core-app-api": "^0.1.12",
+    "@backstage/dev-utils": "^0.2.9",
+    "@backstage/test-utils": "^0.1.17",
+    "@testing-library/jest-dom": "^5.10.1",
+    "@testing-library/react": "^11.2.5",
+    "@testing-library/user-event": "^13.1.8",
+    "@types/jest": "^26.0.7",
+    "@types/luxon": "^1.27.0",
+    "@types/node": "^14.14.32",
+    "cross-fetch": "^3.0.6",
+    "msw": "^0.29.0"
+  },
+  "files": [
+    "dist"
+  ]
+}
diff --git a/plugins/xcmetrics/src/api/XcmetricsClient.ts b/plugins/xcmetrics/src/api/XcmetricsClient.ts
new file mode 100644
index 0000000000..37baa949d4
--- /dev/null
+++ b/plugins/xcmetrics/src/api/XcmetricsClient.ts
@@ -0,0 +1,145 @@
+/*
+ * Copyright 2021 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { DiscoveryApi } from '@backstage/core-plugin-api';
+import { ResponseError } from '@backstage/errors';
+import { DateTime } from 'luxon';
+import {
+  Build,
+  BuildCount,
+  BuildError,
+  BuildFilters,
+  BuildHost,
+  BuildMetadata,
+  BuildResponse,
+  BuildStatusResult,
+  BuildTime,
+  BuildWarning,
+  PaginationResult,
+  XcmetricsApi,
+} from './types';
+
+interface Options {
+  discoveryApi: DiscoveryApi;
+}
+
+export class XcmetricsClient implements XcmetricsApi {
+  private readonly discoveryApi: DiscoveryApi;
+
+  constructor(options: Options) {
+    this.discoveryApi = options.discoveryApi;
+  }
+
+  async getBuild(id: string): Promise<BuildResponse> {
+    const response = await this.get(`/build/${id}`);
+    return (await response.json()) as BuildResponse;
+  }
+
+  async getBuilds(limit: number = 10): Promise<Build[]> {
+    const response = await this.get(`/build?per=${limit}`);
+    return ((await response.json()) as PaginationResult<Build>).items;
+  }
+
+  async getFilteredBuilds(
+    filters: BuildFilters,
+    page?: number,
+    perPage?: number,
+  ): Promise<PaginationResult<Build>> {
+    const response = await this.post('/build/filter', {
+      from: DateTime.fromISO(filters.from)
+        .startOf('day')
+        .toISO({ suppressMilliseconds: true }),
+      to: DateTime.fromISO(filters.to)
+        .endOf('day')
+        .startOf('second')
+        .toISO({ suppressMilliseconds: true }),
+      status: filters.buildStatus,
+      projectName: filters.project,
+      page,
+      per: perPage,
+    });
+
+    return (await response.json()) as PaginationResult<Build>;
+  }
+
+  async getBuildCounts(days: number): Promise<BuildCount[]> {
+    const response = await this.get(`/statistics/build/count?days=${days}`);
+    return (await response.json()) as BuildCount[];
+  }
+
+  async getBuildErrors(buildId: string): Promise<BuildError[]> {
+    const response = await this.get(`/build/error/${buildId}`);
+    return (await response.json()) as BuildError[];
+  }
+
+  async getBuildHost(buildId: string): Promise<BuildHost> {
+    const response = await this.get(`/build/host/${buildId}`);
+    return (await response.json()) as BuildHost;
+  }
+
+  async getBuildMetadata(buildId: string): Promise<BuildMetadata> {
+    const response = await this.get(`/build/metadata/${buildId}`);
+    return ((await response.json()) as Record<'metadata', BuildMetadata>)
+      .metadata;
+  }
+
+  async getBuildTimes(days: number): Promise<BuildTime[]> {
+    const response = await this.get(`/statistics/build/time?days=${days}`);
+    return (await response.json()) as BuildTime[];
+  }
+
+  async getBuildStatuses(limit: number): Promise<BuildStatusResult[]> {
+    const response = await this.get(`/statistics/build/status?per=${limit}`);
+    return ((await response.json()) as PaginationResult<BuildStatusResult>)
+      .items;
+  }
+
+  async getBuildWarnings(buildId: string): Promise<BuildWarning[]> {
+    const response = await this.get(`/build/warning/${buildId}`);
+    return (await response.json()) as BuildWarning[];
+  }
+
+  async getProjects(): Promise<string[]> {
+    const response = await this.get('/build/project');
+    return (await response.json()) as string[];
+  }
+
+  private async get(path: string): Promise<Response> {
+    const baseUrl = `${await this.discoveryApi.getBaseUrl('proxy')}/xcmetrics`;
+    const response = await fetch(`${baseUrl}${path}`);
+
+    if (!response.ok) {
+      throw await ResponseError.fromResponse(response);
+    }
+
+    return response;
+  }
+
+  private async post(path: string, body: Object): Promise<Response> {
+    const baseUrl = `${await this.discoveryApi.getBaseUrl('proxy')}/xcmetrics`;
+    const response = await fetch(`${baseUrl}${path}`, {
+      method: 'POST',
+      headers: { 'Content-Type': 'application/json' },
+      body: JSON.stringify(body),
+    });
+
+    if (!response.ok) {
+      throw await ResponseError.fromResponse(response);
+    }
+
+    return response;
+  }
+}
diff --git a/plugins/xcmetrics/src/api/__mocks__/XcmetricsClient.ts b/plugins/xcmetrics/src/api/__mocks__/XcmetricsClient.ts
new file mode 100644
index 0000000000..765be721c6
--- /dev/null
+++ b/plugins/xcmetrics/src/api/__mocks__/XcmetricsClient.ts
@@ -0,0 +1,231 @@
+/*
+ * Copyright 2021 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import {
+  Build,
+  BuildCount,
+  BuildError,
+  BuildFilters,
+  BuildHost,
+  BuildMetadata,
+  BuildStatusResult,
+  BuildTime,
+  BuildWarning,
+  Target,
+  XcmetricsApi,
+  Xcode,
+} from '../types';
+
+const MOCK_BUILD_ID = 'buildId';
+
+export const mockBuild: Build = {
+  userid: 'userid1',
+  warningCount: 1,
+  duration: 1,
+  startTimestamp: '2021-01-01T00:00:00Z',
+  isCi: true,
+  startTimestampMicroseconds: 0,
+  category: '',
+  endTimestampMicroseconds: 10000,
+  day: '2021-01-01',
+  compilationEndTimestamp: '2021-01-01T00:00:01Z',
+  tag: '',
+  projectName: 'ProjectName',
+  compilationEndTimestampMicroseconds: 1,
+  errorCount: 1,
+  id: MOCK_BUILD_ID,
+  buildStatus: 'succeeded',
+  compilationDuration: 1,
+  schema: 'SchemaName',
+  compiledCount: 1,
+  endTimestamp: '2021-01-01T00:00:01Z',
+  userid256: 'userId256',
+  machineName: 'Example_Machine',
+  wasSuspended: true,
+};
+
+export const mockBuildCount: BuildCount = {
+  day: '2021-07-10',
+  builds: 10,
+  errors: 1,
+};
+
+export const mockBuildError: BuildError = {
+  detail: `\/Users\/<redacted>\/myproject\/Sources\/MyClass.m:241:97:// /  error: instance method 'fetch' not found ; did you mean 'fetchIt'?\r
+  myclass:[self.myService fetch]\r                                                                                                ^~~~~~~~~~~~~~\r                                                                                                fetch\r
+  1 error generated.\r"`,
+  characterRangeEnd: 13815,
+  id: '3E6EF185-6AC1-4E95-87E8-E305F41916E9',
+  endingColumn: 97,
+  parentIdentifier: 'MyMac_34580469-5792-40F3-BEFB-7C5925996F23_8860',
+  day: '2020-11-02T00:00:00Z',
+  type: 'clangError',
+  title: 'Instance method "fetch" not found ; did you mean "fetchIt"?',
+  endingLine: 241,
+  severity: 2,
+  startingLine: 241,
+  parentType: 'step',
+  buildIdentifier: MOCK_BUILD_ID,
+  startingColumn: 97,
+  characterRangeStart: 0,
+  documentURL: 'file:///Users/<redacted>/myproject/Sources/MyClass.m',
+};
+
+export const mockBuildHost: BuildHost = {
+  id: '9DD5508D-4AD9-4C1C-AB7C-45BC2183EC51',
+  swapFreeMb: 1615.25,
+  hostOsFamily: 'Darwin',
+  isVirtual: false,
+  uptimeSeconds: 1602055187,
+  hostModel: 'MacBookPro14,2',
+  hostOsVersion: '10.15.7',
+  day: '2020-10-26T00:00:00Z',
+  cpuCount: 4,
+  swapTotalMb: 7168,
+  hostOs: 'Mac OS X',
+  hostArchitecture: 'x86_64',
+  memoryTotalMb: 16384,
+  timezone: 'CET',
+  cpuModel: 'Intel(R) Core(TM) i7-7567U CPU @ 3.50GHz',
+  buildIdentifier: MOCK_BUILD_ID,
+  memoryFreeMb: 24.5234375,
+  cpuSpeedGhz: 3.5,
+};
+
+export const mockBuildMetadata: BuildMetadata = {
+  anotherKey: '42',
+  thirdKey: 'Third value',
+  aKey: 'value1',
+};
+
+export const mockBuildTime: BuildTime = {
+  day: '2021-07-10',
+  durationP50: 1.1,
+  durationP95: 2.1,
+  totalDuration: 3.1,
+};
+export const mockBuildStatus: BuildStatusResult = {
+  id: MOCK_BUILD_ID,
+  buildStatus: 'succeeded',
+};
+
+export const mockBuildWarning: BuildWarning = {
+  detail: null,
+  characterRangeEnd: 9817,
+  documentURL: 'file:///Users/<redacted>/myproject/Sources/MyViewController.m',
+  endingColumn: 22,
+  id: '5F2011AC-F87F-4EDC-BBC6-2BBA3D789EB3',
+  parentIdentifier: 'MyMac_34580469-5792-40F3-BEFB-7C5925996F23_1845',
+  day: '2020-11-02T00:00:00Z',
+  type: 'deprecatedWarning',
+  title:
+    "'dimsBackgroundDuringPresentation' is deprecated: first deprecated in iOS 12.0",
+  endingLine: 235,
+  severity: 1,
+  startingLine: 235,
+  parentType: 'step',
+  clangFlag: '[-Wdeprecated-declarations]',
+  startingColumn: 22,
+  buildIdentifier: MOCK_BUILD_ID,
+  characterRangeStart: 0,
+};
+
+export const mockTarget: Target = {
+  id: 'MyMac_34580469-5792-40F3-BEFB-7C5925996F23_1992',
+  category: 'noop',
+  startTimestamp: '2020-11-02T10:59:09Z',
+  compilationEndTimestampMicroseconds: 1604314749.2909288,
+  endTimestampMicroseconds: 1604314982.298002,
+  endTimestamp: '2020-11-02T11:03:02Z',
+  fetchedFromCache: false,
+  errorCount: 0,
+  day: '2020-11-02T00:00:00Z',
+  warningCount: 0,
+  compilationEndTimestamp: '2020-11-02T10:59:09Z',
+  compilationDuration: 0,
+  compiledCount: 0,
+  duration: 0.000233007,
+  buildIdentifier: MOCK_BUILD_ID,
+  name: 'Model',
+  startTimestampMicroseconds: 1604314749.2909288,
+};
+
+export const mockXcode: Xcode = {
+  buildNumber: '12A7209',
+  id: '6354C87F-0ADC-4354-929C-02EBE545E099',
+  buildIdentifier: MOCK_BUILD_ID,
+  day: '2020-11-02T00:00:00Z',
+  version: '1200',
+};
+
+export const mockBuildResponse = {
+  build: mockBuild,
+  targets: [mockTarget],
+  xcode: mockXcode,
+};
+
+export const XcmetricsClient: XcmetricsApi = {
+  getBuild: (_id: string) => {
+    return Promise.resolve(mockBuildResponse);
+  },
+  getBuilds: () => {
+    return Promise.resolve([
+      { ...mockBuild, id: '1' },
+      { ...mockBuild, id: '2', userid: 'userid2' },
+    ]);
+  },
+  getFilteredBuilds: (
+    _filters: BuildFilters,
+    _page?: number,
+    _perPage?: number,
+  ) => {
+    return Promise.resolve({
+      items: [
+        mockBuild,
+        { ...mockBuild, buildStatus: 'failed', projectName: 'ProjectName2' },
+      ],
+      metadata: {
+        per: 10,
+        total: 2,
+        page: 1,
+      },
+    });
+  },
+  getBuildErrors: (buildId: string) => {
+    return Promise.resolve([{ ...mockBuildError, buildIdentifier: buildId }]);
+  },
+  getBuildCounts: () => {
+    return Promise.resolve([mockBuildCount, mockBuildCount]);
+  },
+  getBuildHost: (buildId: string) => {
+    return Promise.resolve({ ...mockBuildHost, buildIdentifier: buildId });
+  },
+  getBuildMetadata: (_buildId: string) => {
+    return Promise.resolve(mockBuildMetadata);
+  },
+  getBuildStatuses: (limit: number) => {
+    return Promise.resolve([mockBuild].slice(0, limit));
+  },
+  getBuildTimes: (days: number) => {
+    return Promise.resolve([mockBuildTime, mockBuildTime].slice(0, days));
+  },
+  getBuildWarnings: (buildId: string) => {
+    return Promise.resolve([{ ...mockBuildWarning, buildIdentifier: buildId }]);
+  },
+  getProjects: () => {
+    return Promise.resolve([mockBuild.projectName]);
+  },
+};
diff --git a/plugins/xcmetrics/src/api/index.ts b/plugins/xcmetrics/src/api/index.ts
new file mode 100644
index 0000000000..c184dc950d
--- /dev/null
+++ b/plugins/xcmetrics/src/api/index.ts
@@ -0,0 +1,18 @@
+/*
+ * Copyright 2021 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+export * from './types';
+export * from './XcmetricsClient';
diff --git a/plugins/xcmetrics/src/api/types.ts b/plugins/xcmetrics/src/api/types.ts
new file mode 100644
index 0000000000..44f27872ca
--- /dev/null
+++ b/plugins/xcmetrics/src/api/types.ts
@@ -0,0 +1,197 @@
+/*
+ * Copyright 2021 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { createApiRef } from '@backstage/core-plugin-api';
+
+export type BuildStatus = 'succeeded' | 'failed' | 'stopped';
+
+export type Build = {
+  userid: string;
+  warningCount: number;
+  duration: number;
+  startTimestamp: string;
+  isCi: boolean;
+  startTimestampMicroseconds: number;
+  category: string;
+  endTimestampMicroseconds: number;
+  day: string;
+  compilationEndTimestamp: string;
+  tag: string;
+  projectName: string;
+  compilationEndTimestampMicroseconds: number;
+  errorCount: number;
+  id: string;
+  buildStatus: BuildStatus;
+  compilationDuration: number;
+  schema: string;
+  compiledCount: number;
+  endTimestamp: string;
+  userid256: string;
+  machineName: string;
+  wasSuspended: boolean;
+};
+
+export type BuildStatusResult = Pick<Build, 'id' | 'buildStatus'>;
+
+export type BuildCount = {
+  day: string;
+  errors: number;
+  builds: number;
+};
+
+export type BuildError = {
+  detail: string;
+  characterRangeEnd: number;
+  id: string;
+  endingColumn: number;
+  parentIdentifier: string;
+  day: string;
+  type: string;
+  title: string;
+  endingLine: number;
+  severity: number;
+  startingLine: number;
+  parentType: string;
+  buildIdentifier: string;
+  startingColumn: number;
+  characterRangeStart: number;
+  documentURL: string;
+};
+
+export type BuildHost = {
+  id: string;
+  swapFreeMb: number;
+  hostOsFamily: string;
+  isVirtual: boolean;
+  uptimeSeconds: number;
+  hostModel: string;
+  hostOsVersion: string;
+  day: string;
+  cpuCount: number;
+  swapTotalMb: number;
+  hostOs: string;
+  hostArchitecture: string;
+  memoryTotalMb: number;
+  timezone: string;
+  cpuModel: string;
+  buildIdentifier: string;
+  memoryFreeMb: number;
+  cpuSpeedGhz: number;
+};
+
+export type BuildMetadata = {
+  [key: string]: string;
+};
+
+export type BuildTime = {
+  day: string;
+  durationP50: number;
+  durationP95: number;
+  totalDuration: number;
+};
+
+export type BuildWarning = {
+  detail: string | null;
+  characterRangeEnd: number;
+  documentURL: string;
+  endingColumn: number;
+  id: string;
+  parentIdentifier: string;
+  day: string;
+  type: string;
+  title: string;
+  endingLine: number;
+  severity: number;
+  startingLine: number;
+  parentType: string;
+  clangFlag: string;
+  startingColumn: number;
+  buildIdentifier: string;
+  characterRangeStart: number;
+};
+
+export type PaginationResult<T> = {
+  items: T[];
+  metadata: {
+    per: number;
+    total: number;
+    page: number;
+  };
+};
+
+export type Target = {
+  id: string;
+  category: string;
+  startTimestamp: string;
+  compilationEndTimestampMicroseconds: number;
+  endTimestampMicroseconds: number;
+  endTimestamp: string;
+  fetchedFromCache: boolean;
+  errorCount: number;
+  day: string;
+  warningCount: number;
+  compilationEndTimestamp: string;
+  compilationDuration: number;
+  compiledCount: number;
+  duration: number;
+  buildIdentifier: string;
+  name: string;
+  startTimestampMicroseconds: number;
+};
+
+export type Xcode = {
+  buildNumber: string;
+  id: string;
+  buildIdentifier: string;
+  day: string;
+  version: string;
+};
+
+export type BuildResponse = {
+  build: Build;
+  targets: Target[];
+  xcode: Xcode;
+};
+
+export type BuildFilters = {
+  from: string; // ISO Date (e.g. "2021-01-01")
+  to: string; // ISO Date (e.g. "2021-01-02")
+  buildStatus?: BuildStatus;
+  project?: string;
+};
+
+export interface XcmetricsApi {
+  getBuild(id: string): Promise<BuildResponse>;
+  getBuilds(limit?: number): Promise<Build[]>;
+  getFilteredBuilds(
+    filters: BuildFilters,
+    page?: number,
+    perPage?: number,
+  ): Promise<PaginationResult<Build>>;
+  getBuildErrors(buildId: string): Promise<BuildError[]>;
+  getBuildCounts(days: number): Promise<BuildCount[]>;
+  getBuildHost(buildId: string): Promise<BuildHost>;
+  getBuildMetadata(buildId: string): Promise<BuildMetadata>;
+  getBuildTimes(days: number): Promise<BuildTime[]>;
+  getBuildStatuses(limit: number): Promise<BuildStatusResult[]>;
+  getBuildWarnings(buildId: string): Promise<BuildWarning[]>;
+  getProjects(): Promise<string[]>;
+}
+
+export const xcmetricsApiRef = createApiRef<XcmetricsApi>({
+  id: 'plugin.xcmetrics.api',
+  description: 'Used by the XCMetrics plugin to make requests',
+});
diff --git a/plugins/xcmetrics/src/components/Accordion/Accordion.test.tsx b/plugins/xcmetrics/src/components/Accordion/Accordion.test.tsx
new file mode 100644
index 0000000000..70be560abf
--- /dev/null
+++ b/plugins/xcmetrics/src/components/Accordion/Accordion.test.tsx
@@ -0,0 +1,51 @@
+/*
+ * Copyright 2021 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import React from 'react';
+import { renderInTestApp } from '@backstage/test-utils';
+import { Accordion } from './Accordion';
+import userEvent from '@testing-library/user-event';
+
+describe('Accordion', () => {
+  it('should render', async () => {
+    const rendered = await renderInTestApp(
+      <Accordion
+        id="accordionId"
+        heading="heading"
+        secondaryHeading="secondaryHeading"
+      />,
+    );
+
+    expect(rendered.getByText('heading')).toBeInTheDocument();
+    expect(rendered.getByText('secondaryHeading')).toBeInTheDocument();
+  });
+
+  it('should show content when clicked', async () => {
+    const rendered = await renderInTestApp(
+      <Accordion
+        id="accordionId"
+        heading="heading"
+        secondaryHeading="secondaryHeading"
+      >
+        Content
+      </Accordion>,
+    );
+
+    expect(rendered.getByText('Content')).not.toBeVisible();
+
+    userEvent.click(rendered.getByRole('button'));
+    expect(await rendered.findByText('Content')).toBeVisible();
+  });
+});
diff --git a/plugins/xcmetrics/src/components/Accordion/Accordion.tsx b/plugins/xcmetrics/src/components/Accordion/Accordion.tsx
new file mode 100644
index 0000000000..2e2100a816
--- /dev/null
+++ b/plugins/xcmetrics/src/components/Accordion/Accordion.tsx
@@ -0,0 +1,69 @@
+/*
+ * Copyright 2021 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import {
+  Accordion as MuiAccordion,
+  AccordionSummary as MuiAccordionSummary,
+  Typography,
+  AccordionDetails,
+  makeStyles,
+  createStyles,
+} from '@material-ui/core';
+import React, { PropsWithChildren } from 'react';
+import ExpandMoreIcon from '@material-ui/icons/ExpandMore';
+import { BackstageTheme } from '@backstage/theme';
+
+const useStyles = makeStyles((theme: BackstageTheme) =>
+  createStyles({
+    heading: {
+      flexBasis: '33.33%',
+      flexShrink: 0,
+    },
+    secondaryHeading: {
+      color: theme.palette.text.secondary,
+    },
+  }),
+);
+
+interface AccordionProps {
+  id: string;
+  heading: string;
+  secondaryHeading?: string | number;
+  disabled?: boolean;
+  unmountOnExit?: boolean;
+}
+
+export const Accordion = (props: PropsWithChildren<AccordionProps>) => {
+  const classes = useStyles();
+
+  return (
+    <MuiAccordion
+      disabled={props.disabled}
+      TransitionProps={{ unmountOnExit: props.unmountOnExit ?? false }}
+    >
+      <MuiAccordionSummary
+        expandIcon={<ExpandMoreIcon />}
+        aria-controls={`${props.id}-content`}
+        id={`${props.id}-header`}
+      >
+        <Typography className={classes.heading}>{props.heading}</Typography>
+        <Typography className={classes.secondaryHeading}>
+          {props.secondaryHeading}
+        </Typography>
+      </MuiAccordionSummary>
+      <AccordionDetails>{props.children}</AccordionDetails>
+    </MuiAccordion>
+  );
+};
diff --git a/plugins/xcmetrics/src/components/Accordion/index.ts b/plugins/xcmetrics/src/components/Accordion/index.ts
new file mode 100644
index 0000000000..4bb2e58df9
--- /dev/null
+++ b/plugins/xcmetrics/src/components/Accordion/index.ts
@@ -0,0 +1,16 @@
+/*
+ * Copyright 2021 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+export { Accordion } from './Accordion';
diff --git a/plugins/xcmetrics/src/components/BuildDetails/BuildDetails.test.tsx b/plugins/xcmetrics/src/components/BuildDetails/BuildDetails.test.tsx
new file mode 100644
index 0000000000..2d949d7abc
--- /dev/null
+++ b/plugins/xcmetrics/src/components/BuildDetails/BuildDetails.test.tsx
@@ -0,0 +1,106 @@
+/*
+ * Copyright 2021 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import React from 'react';
+import { renderInTestApp } from '@backstage/test-utils';
+import { ApiProvider, ApiRegistry } from '@backstage/core-app-api';
+import { BuildDetails, withRequest } from './BuildDetails';
+import { xcmetricsApiRef } from '../../api';
+
+jest.mock('../../api/XcmetricsClient');
+const client = require('../../api/XcmetricsClient');
+
+jest.mock('../Accordion', () => ({
+  Accordion: ({ heading }: { heading: string }) => (
+    <div>accordion-{heading}</div>
+  ),
+}));
+
+jest.mock('../BuildTimeline', () => ({
+  BuildTimeline: () => 'BuildTimeline',
+}));
+
+describe('BuildDetails', () => {
+  it('should render', async () => {
+    const rendered = await renderInTestApp(
+      <ApiProvider
+        apis={ApiRegistry.with(xcmetricsApiRef, client.XcmetricsClient)}
+      >
+        <BuildDetails buildData={client.mockBuildResponse} />
+      </ApiProvider>,
+    );
+
+    expect(rendered.getByText('accordion-Host')).toBeInTheDocument();
+    expect(rendered.getByText('accordion-Errors')).toBeInTheDocument();
+    expect(rendered.getByText('accordion-Warnings')).toBeInTheDocument();
+    expect(rendered.getByText('accordion-Metadata')).toBeInTheDocument();
+    expect(rendered.getByText('accordion-Timeline')).toBeInTheDocument();
+
+    expect(rendered.getByText(client.mockBuild.id)).toBeInTheDocument();
+    expect(
+      rendered.getByText(client.mockBuild.projectName),
+    ).toBeInTheDocument();
+    expect(rendered.getByText(client.mockBuild.schema)).toBeInTheDocument();
+  });
+});
+
+describe('BuildDetails with request', () => {
+  const BuildDetailsWithRequest = withRequest(BuildDetails);
+
+  it('should fetch the build and render', async () => {
+    const rendered = await renderInTestApp(
+      <ApiProvider
+        apis={ApiRegistry.with(xcmetricsApiRef, client.XcmetricsClient)}
+      >
+        <BuildDetailsWithRequest buildId={client.mockBuild.id} />
+      </ApiProvider>,
+    );
+
+    expect(rendered.getByText(client.mockBuild.id)).toBeInTheDocument();
+  });
+
+  it('should show an error when API not responding', async () => {
+    const errorMessage = 'MockErrorMessage';
+    client.XcmetricsClient.getBuild = jest
+      .fn()
+      .mockRejectedValue({ message: errorMessage });
+
+    const rendered = await renderInTestApp(
+      <ApiProvider
+        apis={ApiRegistry.with(xcmetricsApiRef, client.XcmetricsClient)}
+      >
+        <BuildDetailsWithRequest buildId={client.mockBuild.id} />
+      </ApiProvider>,
+    );
+
+    expect(rendered.getByText(errorMessage)).toBeInTheDocument();
+  });
+
+  it('should show a message when no build is returned from the API', async () => {
+    client.XcmetricsClient.getBuild = jest.fn().mockReturnValue(undefined);
+
+    const rendered = await renderInTestApp(
+      <ApiProvider
+        apis={ApiRegistry.with(xcmetricsApiRef, client.XcmetricsClient)}
+      >
+        <BuildDetailsWithRequest buildId={client.mockBuild.id} />
+      </ApiProvider>,
+    );
+
+    expect(
+      rendered.getByText(`Could not load build ${client.mockBuild.id}`),
+    ).toBeInTheDocument();
+  });
+});
diff --git a/plugins/xcmetrics/src/components/BuildDetails/BuildDetails.tsx b/plugins/xcmetrics/src/components/BuildDetails/BuildDetails.tsx
new file mode 100644
index 0000000000..1d77bf7a7a
--- /dev/null
+++ b/plugins/xcmetrics/src/components/BuildDetails/BuildDetails.tsx
@@ -0,0 +1,202 @@
+/*
+ * Copyright 2021 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import { createStyles, Divider, Grid, makeStyles } from '@material-ui/core';
+import React from 'react';
+import { BuildResponse, xcmetricsApiRef } from '../../api';
+import { Progress, StructuredMetadataTable } from '@backstage/core-components';
+import { Alert } from '@material-ui/lab';
+import { useAsync } from 'react-use';
+import { useApi } from '@backstage/core-plugin-api';
+import { formatDuration, formatStatus, formatTime } from '../../utils';
+import { StatusIcon } from '../StatusIcon';
+import { BackstageTheme } from '@backstage/theme';
+import { Accordion } from '../Accordion';
+import { BuildTimeline } from '../BuildTimeline';
+import { PreformattedText } from '../PreformattedText';
+
+const useStyles = makeStyles((theme: BackstageTheme) =>
+  createStyles({
+    divider: {
+      marginTop: theme.spacing(2),
+      marginBottom: theme.spacing(2),
+    },
+  }),
+);
+
+interface BuildDetailsProps {
+  buildData: BuildResponse;
+  showId?: boolean;
+}
+
+export const BuildDetails = ({
+  buildData: { build, targets, xcode },
+  showId,
+}: BuildDetailsProps) => {
+  const classes = useStyles();
+  const client = useApi(xcmetricsApiRef);
+  const hostResult = useAsync(
+    async () => client.getBuildHost(build.id),
+    [build.id],
+  );
+  const errorsResult = useAsync(
+    async () => client.getBuildErrors(build.id),
+    [build.id],
+  );
+  const warningsResult = useAsync(
+    async () => client.getBuildWarnings(build.id),
+    [build.id],
+  );
+  const metadataResult = useAsync(
+    async () => client.getBuildMetadata(build.id),
+    [build.id],
+  );
+
+  const buildDetails = {
+    project: build.projectName,
+    schema: build.schema,
+    category: build.category,
+    userId: build.userid,
+    'started at': formatTime(build.startTimestamp),
+    'ended at': formatTime(build.endTimestamp),
+    duration: formatDuration(build.duration),
+    status: (
+      <>
+        <StatusIcon buildStatus={build.buildStatus} />
+        {formatStatus(build.buildStatus)}
+      </>
+    ),
+    xcode: `${xcode.version} (${xcode.buildNumber})`,
+    CI: build.isCi,
+  };
+
+  return (
+    <Grid container item direction="row">
+      <Grid item xs={4}>
+        <StructuredMetadataTable
+          metadata={
+            showId === false ? buildDetails : { id: build.id, ...buildDetails }
+          }
+        />
+      </Grid>
+      <Grid item xs={8}>
+        <Accordion
+          id="buildHost"
+          heading="Host"
+          secondaryHeading={build.machineName}
+        >
+          {hostResult.loading && <Progress />}
+          {!hostResult.loading && hostResult.value && (
+            <StructuredMetadataTable metadata={hostResult.value} />
+          )}
+        </Accordion>
+
+        <Accordion
+          id="buildErrors"
+          heading="Errors"
+          secondaryHeading={build.errorCount}
+          disabled={build.errorCount === 0}
+        >
+          <div>
+            {errorsResult.loading && <Progress />}
+            {!errorsResult.loading &&
+              errorsResult.value?.map((error, idx) => (
+                <div key={error.id}>
+                  <PreformattedText
+                    title="Error Details"
+                    text={error.detail}
+                    maxChars={190}
+                    expandable
+                  />
+                  {idx !== errorsResult.value.length - 1 && (
+                    <Divider className={classes.divider} />
+                  )}
+                </div>
+              ))}
+          </div>
+        </Accordion>
+
+        <Accordion
+          id="buildWarnings"
+          heading="Warnings"
+          secondaryHeading={build.warningCount}
+          disabled={build.warningCount === 0}
+        >
+          <div>
+            {warningsResult.loading && <Progress />}
+            {!warningsResult.loading &&
+              warningsResult.value?.map((warning, idx) => (
+                <div key={warning.id}>
+                  <PreformattedText
+                    title="Warning Details"
+                    text={warning.detail ?? warning.title}
+                    maxChars={190}
+                    expandable
+                  />
+                  {idx !== warningsResult.value.length - 1 && (
+                    <Divider className={classes.divider} />
+                  )}
+                </div>
+              ))}
+          </div>
+        </Accordion>
+
+        <Accordion
+          id="buildMetadata"
+          heading="Metadata"
+          disabled={!metadataResult.loading && !metadataResult.value}
+        >
+          {metadataResult.loading && <Progress />}
+          {!metadataResult.loading && metadataResult.value && (
+            <StructuredMetadataTable metadata={metadataResult.value} />
+          )}
+        </Accordion>
+
+        <Accordion id="buildTimeline" heading="Timeline" unmountOnExit>
+          <BuildTimeline targets={targets} />
+        </Accordion>
+      </Grid>
+    </Grid>
+  );
+};
+
+type WithRequestProps = Omit<BuildDetailsProps, 'buildData'> & {
+  buildId: string;
+};
+
+export const withRequest =
+  (Component: typeof BuildDetails) =>
+  ({ buildId, ...props }: WithRequestProps) => {
+    const client = useApi(xcmetricsApiRef);
+    const {
+      value: buildResponse,
+      loading,
+      error,
+    } = useAsync(async () => client.getBuild(buildId), []);
+
+    if (loading) {
+      return <Progress />;
+    }
+
+    if (error) {
+      return <Alert severity="error">{error.message}</Alert>;
+    }
+
+    if (!buildResponse) {
+      return <Alert severity="error">Could not load build {buildId}</Alert>;
+    }
+
+    return <Component {...props} buildData={buildResponse} />;
+  };
diff --git a/plugins/xcmetrics/src/components/BuildDetails/index.ts b/plugins/xcmetrics/src/components/BuildDetails/index.ts
new file mode 100644
index 0000000000..c2511b248e
--- /dev/null
+++ b/plugins/xcmetrics/src/components/BuildDetails/index.ts
@@ -0,0 +1,16 @@
+/*
+ * Copyright 2021 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+export { BuildDetails, withRequest } from './BuildDetails';
diff --git a/plugins/xcmetrics/src/components/BuildList/BuildList.test.tsx b/plugins/xcmetrics/src/components/BuildList/BuildList.test.tsx
new file mode 100644
index 0000000000..eb141209e7
--- /dev/null
+++ b/plugins/xcmetrics/src/components/BuildList/BuildList.test.tsx
@@ -0,0 +1,82 @@
+/*
+ * Copyright 2021 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import React from 'react';
+import { renderInTestApp } from '@backstage/test-utils';
+import { ApiProvider, ApiRegistry } from '@backstage/core-app-api';
+import { BuildList } from './BuildList';
+import { xcmetricsApiRef } from '../../api';
+import userEvent from '@testing-library/user-event';
+
+jest.mock('../../api/XcmetricsClient');
+const client = require('../../api/XcmetricsClient');
+
+jest.mock('../BuildListFilter', () => ({
+  BuildListFilter: () => 'BuildListFilter',
+}));
+
+jest.mock('../BuildDetails', () => ({
+  withRequest: (component: any) => component,
+  BuildDetails: () => 'BuildDetails',
+}));
+
+describe('BuildList', () => {
+  it('should render', async () => {
+    const rendered = await renderInTestApp(
+      <ApiProvider
+        apis={ApiRegistry.with(xcmetricsApiRef, client.XcmetricsClient)}
+      >
+        <BuildList />
+      </ApiProvider>,
+    );
+
+    expect(rendered.getByText('Builds')).toBeInTheDocument();
+    expect(
+      rendered.getByText(client.mockBuild.projectName),
+    ).toBeInTheDocument();
+  });
+
+  it('should show build details', async () => {
+    const rendered = await renderInTestApp(
+      <ApiProvider
+        apis={ApiRegistry.with(xcmetricsApiRef, client.XcmetricsClient)}
+      >
+        <BuildList />
+      </ApiProvider>,
+    );
+
+    userEvent.click(
+      (await rendered.findAllByLabelText('Detail panel visiblity toggle'))[0],
+    );
+    expect(await rendered.findByText('BuildDetails')).toBeInTheDocument();
+  });
+
+  it('should show errors', async () => {
+    const message = 'error';
+    client.XcmetricsClient.getFilteredBuilds = jest
+      .fn()
+      .mockRejectedValue({ message });
+
+    const rendered = await renderInTestApp(
+      <ApiProvider
+        apis={ApiRegistry.with(xcmetricsApiRef, client.XcmetricsClient)}
+      >
+        <BuildList />
+      </ApiProvider>,
+    );
+
+    expect(rendered.getByText(message)).toBeInTheDocument();
+  });
+});
diff --git a/plugins/xcmetrics/src/components/BuildList/BuildList.tsx b/plugins/xcmetrics/src/components/BuildList/BuildList.tsx
new file mode 100644
index 0000000000..f9e8bfdd98
--- /dev/null
+++ b/plugins/xcmetrics/src/components/BuildList/BuildList.tsx
@@ -0,0 +1,94 @@
+/*
+ * Copyright 2021 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import React, { useRef, useState } from 'react';
+import { Table } from '@backstage/core-components';
+import { useApi } from '@backstage/core-plugin-api';
+import { BuildFilters, xcmetricsApiRef } from '../../api';
+import { createStyles, Grid, makeStyles } from '@material-ui/core';
+import { BuildListFilter as Filters } from '../BuildListFilter';
+import { DateTime } from 'luxon';
+import { buildPageColumns } from '../BuildTableColumns';
+import { BuildDetails, withRequest } from '../BuildDetails';
+import { BackstageTheme } from '@backstage/theme';
+
+const useStyles = makeStyles((theme: BackstageTheme) =>
+  createStyles({
+    detailPanel: {
+      padding: theme.spacing(2),
+      backgroundColor: theme.palette.background.paper,
+    },
+  }),
+);
+
+export const BuildList = () => {
+  const classes = useStyles();
+  const client = useApi(xcmetricsApiRef);
+  const tableRef = useRef<any>();
+
+  const initialFilters = {
+    from: DateTime.now().minus({ year: 1 }).toISODate(),
+    to: DateTime.now().toISODate(),
+  };
+
+  const [filters, setFilters] = useState<BuildFilters>(initialFilters);
+
+  const handleFilterChange = (values: BuildFilters) => {
+    setFilters(values);
+    tableRef.current?.onQueryChange();
+  };
+
+  return (
+    <Grid container spacing={3} direction="column">
+      <Filters
+        onFilterChange={handleFilterChange}
+        initialValues={initialFilters}
+      />
+      <Table
+        title="Builds"
+        columns={buildPageColumns}
+        options={{ paging: true, sorting: false, search: false, pageSize: 10 }}
+        tableRef={tableRef}
+        data={query => {
+          return new Promise((resolve, reject) => {
+            if (!query) return;
+            client
+              .getFilteredBuilds(
+                filters,
+                query.page + 1, // Page is 0-indexed in Table
+                query.pageSize,
+              )
+              .then(result => {
+                resolve({
+                  data: result.items,
+                  page: result.metadata.page - 1,
+                  totalCount: result.metadata.total,
+                });
+              })
+              .catch(reason => reject(reason));
+          });
+        }}
+        detailPanel={rowData => {
+          const BuildDetailsWithRequest = withRequest(BuildDetails);
+          return (
+            <div className={classes.detailPanel}>
+              <BuildDetailsWithRequest buildId={(rowData as any).rowData.id} />
+            </div>
+          );
+        }}
+      />
+    </Grid>
+  );
+};
diff --git a/plugins/xcmetrics/src/components/BuildList/index.ts b/plugins/xcmetrics/src/components/BuildList/index.ts
new file mode 100644
index 0000000000..12b44d01be
--- /dev/null
+++ b/plugins/xcmetrics/src/components/BuildList/index.ts
@@ -0,0 +1,16 @@
+/*
+ * Copyright 2021 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+export { BuildList } from './BuildList';
diff --git a/plugins/xcmetrics/src/components/BuildListFilter/BuildListFilter.test.tsx b/plugins/xcmetrics/src/components/BuildListFilter/BuildListFilter.test.tsx
new file mode 100644
index 0000000000..b997de68e0
--- /dev/null
+++ b/plugins/xcmetrics/src/components/BuildListFilter/BuildListFilter.test.tsx
@@ -0,0 +1,156 @@
+/*
+ * Copyright 2021 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import React from 'react';
+import { renderInTestApp } from '@backstage/test-utils';
+import { ApiProvider, ApiRegistry } from '@backstage/core-app-api';
+import userEvent from '@testing-library/user-event';
+import { BuildListFilter } from './BuildListFilter';
+import { BuildFilters, xcmetricsApiRef } from '../../api';
+import { RenderResult } from '@testing-library/react';
+
+jest.mock('../../api/XcmetricsClient');
+const client = require('../../api/XcmetricsClient');
+
+jest.mock('../DatePicker', () => ({
+  DatePicker: () => 'DatePicker',
+}));
+
+const initialValues = {
+  from: '2020-07-30',
+  to: '2021-07-30',
+};
+
+const renderWithFiltersVisible = async (
+  callback?: (filters: BuildFilters) => void,
+) => {
+  const rendered = await renderInTestApp(
+    <ApiProvider
+      apis={ApiRegistry.with(xcmetricsApiRef, client.XcmetricsClient)}
+    >
+      <BuildListFilter
+        initialValues={initialValues}
+        onFilterChange={callback ?? jest.fn()}
+      />
+    </ApiProvider>,
+  );
+
+  userEvent.click(rendered.getByLabelText('show filters'));
+  return rendered;
+};
+
+const setStatusFilter = async (rendered: RenderResult, option: string) => {
+  const statusSelect = rendered.getAllByTestId('select')[0];
+  userEvent.click(statusSelect);
+  userEvent.click((await rendered.findAllByText(option))[0]);
+};
+
+const setProjectFilter = async (rendered: RenderResult, option: string) => {
+  const statusSelect = rendered.getAllByTestId('select')[1];
+  userEvent.click(statusSelect);
+  const options = await rendered.findAllByText(option);
+  userEvent.click(options[options.length - 1]);
+};
+
+describe('BuildListFilter', () => {
+  it('should render', async () => {
+    const rendered = await renderInTestApp(
+      <ApiProvider
+        apis={ApiRegistry.with(xcmetricsApiRef, client.XcmetricsClient)}
+      >
+        <BuildListFilter
+          initialValues={initialValues}
+          onFilterChange={jest.fn()}
+        />
+      </ApiProvider>,
+    );
+
+    expect(rendered.getByText('Filters (0)')).toBeInTheDocument();
+  });
+
+  it('should toggle between showing and hiding filters', async () => {
+    const rendered = await renderWithFiltersVisible();
+
+    expect((await rendered.findAllByText('DatePicker')).length).toEqual(2);
+    expect(await rendered.findByText('Status')).toBeInTheDocument();
+    expect(await rendered.findByText('Project')).toBeInTheDocument();
+
+    userEvent.click(rendered.getByLabelText('hide filters'));
+    expect(rendered.queryByText('DatePicker')).toBeNull();
+    expect(rendered.queryByText('Status')).toBeNull();
+    expect(rendered.queryByText('Project')).toBeNull();
+  });
+
+  it('should load projects', async () => {
+    const callback = jest.fn();
+    const rendered = await renderWithFiltersVisible(callback);
+    userEvent.click((await rendered.findAllByText('All'))[1]);
+
+    expect(
+      await rendered.findByText(client.mockBuild.projectName),
+    ).toBeInTheDocument();
+  });
+
+  it('should call back with a status when status is selected', async () => {
+    const callback = jest.fn();
+    const rendered = await renderWithFiltersVisible(callback);
+
+    await setStatusFilter(rendered, 'Succeeded');
+    expect(callback).toBeCalledWith({
+      ...initialValues,
+      buildStatus: 'succeeded',
+    });
+
+    await setStatusFilter(rendered, 'All');
+    expect(callback).toBeCalledWith(initialValues);
+  });
+
+  it('should call back with a project when project is selected', async () => {
+    const callback = jest.fn();
+    const rendered = await renderWithFiltersVisible(callback);
+
+    await setProjectFilter(rendered, client.mockBuild.projectName);
+    expect(callback).toBeCalledWith({
+      ...initialValues,
+      project: client.mockBuild.projectName,
+    });
+
+    await setProjectFilter(rendered, 'All');
+    expect(callback).toBeCalledWith(initialValues);
+  });
+
+  it('should display a count of active (changed) filters', async () => {
+    const rendered = await renderWithFiltersVisible();
+
+    await setStatusFilter(rendered, 'Failed');
+    await setProjectFilter(rendered, client.mockBuild.projectName);
+
+    expect(await rendered.findByText('Filters (2)')).toBeInTheDocument();
+  });
+
+  it('should clear all filters', async () => {
+    const callback = jest.fn();
+    const rendered = await renderWithFiltersVisible(callback);
+
+    await setStatusFilter(rendered, 'Failed');
+    await setProjectFilter(rendered, client.mockBuild.projectName);
+
+    callback.mockClear();
+    userEvent.click(await rendered.findByText('Clear all'));
+
+    expect(callback).toHaveBeenCalledWith(initialValues);
+    expect(await rendered.findByText('Filters (0)')).toBeInTheDocument();
+  });
+});
diff --git a/plugins/xcmetrics/src/components/BuildListFilter/BuildListFilter.tsx b/plugins/xcmetrics/src/components/BuildListFilter/BuildListFilter.tsx
new file mode 100644
index 0000000000..8c1334f928
--- /dev/null
+++ b/plugins/xcmetrics/src/components/BuildListFilter/BuildListFilter.tsx
@@ -0,0 +1,158 @@
+/*
+ * Copyright 2021 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import React, { useEffect, useState } from 'react';
+import { makeStyles, IconButton, Grid, Button } from '@material-ui/core';
+import FilterList from '@material-ui/icons/FilterList';
+import { InfoCard, Select } from '@backstage/core-components';
+import { BackstageTheme } from '@backstage/theme';
+import { useApi } from '@backstage/core-plugin-api';
+import { useAsync } from 'react-use';
+import { BuildFilters, BuildStatus, xcmetricsApiRef } from '../../api';
+import { DatePicker } from '../DatePicker';
+
+const toSelectItems = (strings: string[]) => {
+  return strings.map(str => ({ label: str, value: str }));
+};
+
+const useStyles = makeStyles<BackstageTheme>(theme => ({
+  filtersContent: {
+    padding: theme.spacing(2, 2, 2, 2.5),
+  },
+}));
+
+type FilterOption<T> = T | 'all';
+
+interface FiltersProps {
+  initialValues: BuildFilters;
+  onFilterChange: (filters: BuildFilters) => void;
+}
+
+export const BuildListFilter = ({
+  onFilterChange,
+  initialValues,
+}: FiltersProps) => {
+  const client = useApi(xcmetricsApiRef);
+  const classes = useStyles();
+  const [open, setOpen] = useState(false);
+  const [values, setValues] = useState(initialValues);
+
+  useEffect(() => onFilterChange(values), [onFilterChange, values]);
+
+  const numFilters = Object.keys(values).reduce((sum, key) => {
+    const filtersKey = key as keyof BuildFilters;
+    return sum + Number(values[filtersKey] !== initialValues[filtersKey]);
+  }, 0);
+
+  const title = (
+    <>
+      <IconButton
+        onClick={() => setOpen(!open)}
+        aria-label={`${open ? 'hide' : 'show'} filters`}
+      >
+        <FilterList />
+      </IconButton>
+      Filters ({numFilters})
+      {!!numFilters && (
+        <Button color="primary" onClick={() => setValues(initialValues)}>
+          Clear all
+        </Button>
+      )}
+    </>
+  );
+
+  const statusItems: { label: string; value: FilterOption<BuildStatus> }[] = [
+    { label: 'All', value: 'all' },
+    { label: 'Succeeded', value: 'succeeded' },
+    { label: 'Failed', value: 'failed' },
+    { label: 'Stopped', value: 'stopped' },
+  ];
+
+  const { value: projects, loading } = useAsync(async () => {
+    return client.getProjects();
+  }, []);
+
+  const content = (
+    <Grid
+      container
+      spacing={3}
+      direction="row"
+      className={classes.filtersContent}
+    >
+      <Grid item sm={6} md={4} lg={2}>
+        <DatePicker
+          label="From"
+          value={values.from}
+          onDateChange={date => setValues({ ...values, from: date })}
+        />
+      </Grid>
+      <Grid item sm={6} md={4} lg={2}>
+        <DatePicker
+          label="To"
+          value={values.to}
+          onDateChange={date => setValues({ ...values, to: date })}
+        />
+      </Grid>
+      <Grid item sm={6} md={4} lg={2}>
+        <Select
+          label="Status"
+          items={statusItems}
+          selected={!values.buildStatus ? 'all' : values.buildStatus}
+          onChange={selection => {
+            const buildStatus =
+              selection === 'all' ? undefined : (selection as BuildStatus);
+            setValues({ ...values, buildStatus });
+          }}
+        />
+      </Grid>
+      <Grid item sm={6} md={4} lg={2}>
+        {loading ? (
+          <Select
+            label="Project"
+            placeholder="Loading.."
+            items={[]}
+            onChange={() => undefined}
+          />
+        ) : (
+          <Select
+            label="Project"
+            items={toSelectItems(['All'].concat(projects ?? []))}
+            selected={values.project ? values.project : 'All'}
+            onChange={selection =>
+              setValues({
+                ...values,
+                project:
+                  selection === 'All' ? undefined : (selection as string),
+              })
+            }
+          />
+        )}
+      </Grid>
+    </Grid>
+  );
+
+  return (
+    <InfoCard
+      title={title}
+      titleTypographyProps={{ variant: 'h6' }}
+      divider={open}
+      noPadding
+      variant="gridItem"
+    >
+      {open && content}
+    </InfoCard>
+  );
+};
diff --git a/plugins/xcmetrics/src/components/BuildListFilter/index.ts b/plugins/xcmetrics/src/components/BuildListFilter/index.ts
new file mode 100644
index 0000000000..9b599f20c5
--- /dev/null
+++ b/plugins/xcmetrics/src/components/BuildListFilter/index.ts
@@ -0,0 +1,16 @@
+/*
+ * Copyright 2021 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+export { BuildListFilter } from './BuildListFilter';
diff --git a/plugins/xcmetrics/src/components/BuildTableColumns.tsx b/plugins/xcmetrics/src/components/BuildTableColumns.tsx
new file mode 100644
index 0000000000..0d1141dfae
--- /dev/null
+++ b/plugins/xcmetrics/src/components/BuildTableColumns.tsx
@@ -0,0 +1,79 @@
+/*
+ * Copyright 2021 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { Chip } from '@material-ui/core';
+import React from 'react';
+import { TableColumn } from '@backstage/core-components';
+import { Build } from '../api';
+import { formatTime, formatDuration } from '../utils';
+import { StatusIcon } from './StatusIcon';
+
+const baseColumns: TableColumn<Build>[] = [
+  {
+    field: 'buildStatus',
+    render: data => <StatusIcon buildStatus={data.buildStatus} />,
+  },
+  {
+    title: 'Project',
+    field: 'projectName',
+  },
+  {
+    title: 'Schema',
+    field: 'schema',
+  },
+  {
+    title: 'Started',
+    field: 'startedAt',
+    render: data => formatTime(data.startTimestamp),
+    cellStyle: { whiteSpace: 'nowrap' },
+  },
+  {
+    title: 'Duration',
+    field: 'duration',
+    render: data => formatDuration(data.duration),
+  },
+  {
+    title: 'User',
+    field: 'userid',
+  },
+];
+
+const isCi: TableColumn<Build> = {
+  field: 'isCI',
+  render: data => data.isCi && <Chip label="CI" size="small" />,
+  width: '10',
+  sorting: false,
+};
+
+export const overviewColumns: TableColumn<Build>[] = [...baseColumns, isCi];
+
+export const buildPageColumns: TableColumn<Build>[] = [
+  ...baseColumns,
+  {
+    title: 'Host',
+    field: 'machineName',
+  },
+  {
+    title: 'Warnings',
+    field: 'warningCount',
+  },
+  {
+    title: 'Category',
+    field: 'category',
+    render: data => <Chip label={data.category} size="small" />,
+  },
+  isCi,
+];
diff --git a/plugins/xcmetrics/src/components/BuildTimeline/BuildTimeline.test.tsx b/plugins/xcmetrics/src/components/BuildTimeline/BuildTimeline.test.tsx
new file mode 100644
index 0000000000..bb7e43a43c
--- /dev/null
+++ b/plugins/xcmetrics/src/components/BuildTimeline/BuildTimeline.test.tsx
@@ -0,0 +1,37 @@
+/*
+ * Copyright 2021 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import React from 'react';
+import { renderInTestApp } from '@backstage/test-utils';
+import { BuildTimeline } from './BuildTimeline';
+
+jest.mock('../../api/XcmetricsClient');
+const client = require('../../api/XcmetricsClient');
+
+describe('BuildTimeline', () => {
+  it('should render', async () => {
+    const rendered = await renderInTestApp(
+      <BuildTimeline targets={[client.mockTarget]} height={100} width={100} />,
+    );
+    expect(
+      await rendered.findByText(client.mockTarget.name),
+    ).toBeInTheDocument();
+  });
+
+  it('should render a message if no targets are provided', async () => {
+    const rendered = await renderInTestApp(<BuildTimeline targets={[]} />);
+    expect(rendered.getByText('No Targets')).toBeInTheDocument();
+  });
+});
diff --git a/plugins/xcmetrics/src/components/BuildTimeline/BuildTimeline.tsx b/plugins/xcmetrics/src/components/BuildTimeline/BuildTimeline.tsx
new file mode 100644
index 0000000000..f00ee03d56
--- /dev/null
+++ b/plugins/xcmetrics/src/components/BuildTimeline/BuildTimeline.tsx
@@ -0,0 +1,119 @@
+/*
+ * Copyright 2021 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { createStyles, makeStyles, useTheme } from '@material-ui/core';
+import React from 'react';
+import {
+  Bar,
+  BarChart,
+  CartesianGrid,
+  Legend,
+  ResponsiveContainer,
+  Tooltip,
+  XAxis,
+  YAxis,
+} from 'recharts';
+import { BackstageTheme } from '@backstage/theme';
+import { Target } from '../../api';
+import { formatSecondsInterval, formatPercentage } from '../../utils';
+
+const EMPTY_HEIGHT = 100;
+
+const useStyles = makeStyles((theme: BackstageTheme) =>
+  createStyles({
+    toolTip: {
+      backgroundColor: theme.palette.background.paper,
+      opacity: 0.8,
+      padding: 8,
+    },
+  }),
+);
+
+const TargetToolTip = ({ active, payload, label }: any) => {
+  const classes = useStyles();
+
+  if (active && payload && payload.length === 2) {
+    const buildTime = payload[0].value[1] - payload[0].value[0];
+    const compileTime = payload[1].value[1] - payload[1].value[0];
+    return (
+      <div className={classes.toolTip}>
+        {`${label}: ${formatSecondsInterval(payload[0].value)}`}
+        <br />
+        {buildTime > 0 &&
+          `Compile time: ${formatPercentage(compileTime / buildTime)}`}
+      </div>
+    );
+  }
+
+  return null;
+};
+
+const getTimelineData = (targets: Target[]) => {
+  const min = targets[0].startTimestampMicroseconds;
+
+  return targets
+    .filter(target => target.fetchedFromCache === false)
+    .map(target => ({
+      name: target.name,
+      buildTime: [
+        target.startTimestampMicroseconds - min,
+        target.endTimestampMicroseconds - min,
+      ],
+      compileTime: [
+        target.startTimestampMicroseconds - min,
+        target.compilationEndTimestampMicroseconds - min,
+      ],
+    }));
+};
+
+export interface BuildTimelineProps {
+  targets: Target[];
+  height?: number;
+  width?: number;
+}
+
+export const BuildTimeline = ({
+  targets,
+  height,
+  width,
+}: BuildTimelineProps) => {
+  const theme = useTheme();
+  if (!targets.length) return <p>No Targets</p>;
+
+  const data = getTimelineData(targets);
+
+  return (
+    <ResponsiveContainer
+      height={height}
+      width={width}
+      minHeight={EMPTY_HEIGHT + targets.length * 5}
+    >
+      <BarChart layout="vertical" data={data} maxBarSize={10} barGap={0}>
+        <CartesianGrid strokeDasharray="2 2" />
+        <XAxis type="number" domain={[0, 'dataMax']} />
+        <YAxis type="category" dataKey="name" padding={{ top: 0, bottom: 0 }} />
+        <Tooltip content={<TargetToolTip />} />
+        <Legend />
+        <Bar
+          dataKey="buildTime"
+          fill={theme.palette.grey[400]}
+          minPointSize={1}
+        />
+        <Bar dataKey="compileTime" fill={theme.palette.primary.main} />
+      </BarChart>
+    </ResponsiveContainer>
+  );
+};
diff --git a/plugins/xcmetrics/src/components/BuildTimeline/index.ts b/plugins/xcmetrics/src/components/BuildTimeline/index.ts
new file mode 100644
index 0000000000..cb8e40a219
--- /dev/null
+++ b/plugins/xcmetrics/src/components/BuildTimeline/index.ts
@@ -0,0 +1,16 @@
+/*
+ * Copyright 2021 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+export { BuildTimeline } from './BuildTimeline';
diff --git a/plugins/xcmetrics/src/components/BuildsPage/BuildsPage.test.tsx b/plugins/xcmetrics/src/components/BuildsPage/BuildsPage.test.tsx
new file mode 100644
index 0000000000..75e31427ae
--- /dev/null
+++ b/plugins/xcmetrics/src/components/BuildsPage/BuildsPage.test.tsx
@@ -0,0 +1,43 @@
+/*
+ * Copyright 2021 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import React from 'react';
+import { renderInTestApp } from '@backstage/test-utils';
+import { BuildsPage } from './BuildsPage';
+
+jest.mock('../BuildDetails', () => ({
+  withRequest: (component: any) => component,
+  BuildDetails: () => 'BuildDetails',
+}));
+
+jest.mock('../BuildList', () => ({
+  BuildList: () => 'BuildList',
+}));
+
+describe('BuildPage', () => {
+  it('should render BuildDetails if build id is provided in path', async () => {
+    const rendered = await renderInTestApp(<BuildsPage />, {
+      routeEntries: [`/buildId`],
+    });
+
+    expect(rendered.getByText('BuildDetails')).toBeInTheDocument();
+  });
+
+  it('should render BuildList if no build id is provided in path', async () => {
+    const rendered = await renderInTestApp(<BuildsPage />);
+
+    expect(rendered.getByText('BuildList')).toBeInTheDocument();
+  });
+});
diff --git a/plugins/xcmetrics/src/components/BuildsPage/BuildsPage.tsx b/plugins/xcmetrics/src/components/BuildsPage/BuildsPage.tsx
new file mode 100644
index 0000000000..152337707d
--- /dev/null
+++ b/plugins/xcmetrics/src/components/BuildsPage/BuildsPage.tsx
@@ -0,0 +1,37 @@
+/*
+ * Copyright 2021 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import React from 'react';
+import { useRouteRefParams } from '@backstage/core-plugin-api';
+import { buildsRouteRef } from '../../routes';
+import { BuildList } from '../BuildList';
+import { BuildDetails, withRequest } from '../BuildDetails';
+import { InfoCard } from '@backstage/core-components';
+
+export const BuildsPage = () => {
+  const { '*': buildId } = useRouteRefParams(buildsRouteRef) ?? { '*': '' };
+
+  if (buildId) {
+    const BuildDetailsWithRequest = withRequest(BuildDetails);
+
+    return (
+      <InfoCard title="Build Details" subheader={buildId}>
+        <BuildDetailsWithRequest buildId={buildId} showId={false} />
+      </InfoCard>
+    );
+  }
+
+  return <BuildList />;
+};
diff --git a/plugins/xcmetrics/src/components/BuildsPage/index.ts b/plugins/xcmetrics/src/components/BuildsPage/index.ts
new file mode 100644
index 0000000000..47fe9166df
--- /dev/null
+++ b/plugins/xcmetrics/src/components/BuildsPage/index.ts
@@ -0,0 +1,16 @@
+/*
+ * Copyright 2021 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+export { BuildsPage } from './BuildsPage';
diff --git a/plugins/xcmetrics/src/components/DataValue/DataValue.test.tsx b/plugins/xcmetrics/src/components/DataValue/DataValue.test.tsx
new file mode 100644
index 0000000000..3422140029
--- /dev/null
+++ b/plugins/xcmetrics/src/components/DataValue/DataValue.test.tsx
@@ -0,0 +1,47 @@
+/*
+ * Copyright 2021 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import React from 'react';
+import { DataValue, DataValueGridItem } from './DataValue';
+import { renderInTestApp } from '@backstage/test-utils';
+
+describe('DataValue', () => {
+  it('should render', async () => {
+    const field = 'Field';
+    const value = 'Value';
+    const rendered = await renderInTestApp(
+      <DataValue field={field} value={value} />,
+    );
+    expect(rendered.getByText(field)).toBeInTheDocument();
+    expect(rendered.getByText(value)).toBeInTheDocument();
+  });
+
+  it('should render placeholder text when no value is present', async () => {
+    const field = 'Field';
+    const rendered = await renderInTestApp(<DataValue field={field} />);
+    expect(rendered.getByText(field)).toBeInTheDocument();
+    expect(rendered.getByText('--')).toBeInTheDocument();
+  });
+
+  it('grid item should render', async () => {
+    const field = 'Field';
+    const value = 'Value';
+    const rendered = await renderInTestApp(
+      <DataValueGridItem field={field} value={value} />,
+    );
+    expect(rendered.getByText(field)).toBeInTheDocument();
+    expect(rendered.getByText(value)).toBeInTheDocument();
+  });
+});
diff --git a/plugins/xcmetrics/src/components/DataValue/DataValue.tsx b/plugins/xcmetrics/src/components/DataValue/DataValue.tsx
new file mode 100644
index 0000000000..78f1cdcaea
--- /dev/null
+++ b/plugins/xcmetrics/src/components/DataValue/DataValue.tsx
@@ -0,0 +1,43 @@
+/*
+ * Copyright 2021 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import { Grid, GridSize, Typography } from '@material-ui/core';
+import React from 'react';
+
+interface DataValueProps {
+  field: string;
+  value?: string | number | null | undefined;
+}
+
+export const DataValue = ({ field, value }: DataValueProps) => {
+  return (
+    <div>
+      <Typography variant="caption">{field}</Typography>
+      <Typography variant="subtitle1">{value ?? '--'}</Typography>
+    </div>
+  );
+};
+
+interface GridProps {
+  xs?: GridSize;
+  md?: GridSize;
+  lg?: GridSize;
+}
+
+export const DataValueGridItem = (props: DataValueProps & GridProps) => (
+  <Grid item xs={props.xs ?? 6} md={props.md ?? 6} lg={props.lg ?? 4}>
+    <DataValue {...props} />
+  </Grid>
+);
diff --git a/plugins/xcmetrics/src/components/DataValue/index.ts b/plugins/xcmetrics/src/components/DataValue/index.ts
new file mode 100644
index 0000000000..99658f96b1
--- /dev/null
+++ b/plugins/xcmetrics/src/components/DataValue/index.ts
@@ -0,0 +1,16 @@
+/*
+ * Copyright 2021 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+export { DataValue, DataValueGridItem } from './DataValue';
diff --git a/plugins/xcmetrics/src/components/DatePicker/DatePicker.test.tsx b/plugins/xcmetrics/src/components/DatePicker/DatePicker.test.tsx
new file mode 100644
index 0000000000..924e83da7e
--- /dev/null
+++ b/plugins/xcmetrics/src/components/DatePicker/DatePicker.test.tsx
@@ -0,0 +1,51 @@
+/*
+ * Copyright 2021 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import React from 'react';
+import { renderInTestApp } from '@backstage/test-utils';
+import { DatePicker } from './DatePicker';
+import userEvent from '@testing-library/user-event';
+
+describe('DatePicker', () => {
+  it('should render', async () => {
+    const label = 'label';
+    const rendered = await renderInTestApp(<DatePicker label={label} />);
+    expect(rendered.getByText(label)).toBeInTheDocument();
+  });
+
+  it('should accept a date', async () => {
+    const label = 'label';
+    const callback = jest.fn();
+    const rendered = await renderInTestApp(
+      <DatePicker label={label} onDateChange={callback} />,
+    );
+    const input = rendered.getByLabelText(label);
+
+    userEvent.type(input, '2020-02-02');
+    expect(callback).toBeCalledWith('2020-02-02');
+  });
+
+  it('should not accept non date', async () => {
+    const label = 'label';
+    const callback = jest.fn();
+    const rendered = await renderInTestApp(
+      <DatePicker label={label} onDateChange={callback} />,
+    );
+    const input = rendered.getByLabelText(label);
+
+    userEvent.type(input, 'test');
+    expect(callback).not.toHaveBeenCalled();
+  });
+});
diff --git a/plugins/xcmetrics/src/components/DatePicker/DatePicker.tsx b/plugins/xcmetrics/src/components/DatePicker/DatePicker.tsx
new file mode 100644
index 0000000000..b524243ff7
--- /dev/null
+++ b/plugins/xcmetrics/src/components/DatePicker/DatePicker.tsx
@@ -0,0 +1,85 @@
+/*
+ * Copyright 2021 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import React from 'react';
+import {
+  createStyles,
+  InputBase,
+  InputProps,
+  makeStyles,
+  Theme,
+  Typography,
+  withStyles,
+} from '@material-ui/core';
+
+const BootstrapInput = withStyles((theme: Theme) =>
+  createStyles({
+    root: {
+      margin: `${theme.spacing(1)} 0px`,
+      maxWidth: 300,
+      'label + &': {
+        marginTop: theme.spacing(3),
+      },
+    },
+    input: {
+      borderRadius: 4,
+      position: 'relative',
+      backgroundColor: theme.palette.background.paper,
+      border: '1px solid #ced4da',
+      fontSize: 16,
+      padding: '10px 26px 10px 12px',
+      transition: theme.transitions.create(['border-color', 'box-shadow']),
+      fontFamily: 'Helvetica Neue',
+      height: 25,
+      '&:focus': {
+        background: theme.palette.background.paper,
+        borderRadius: 4,
+      },
+    },
+  }),
+)(InputBase);
+
+const useStyles = makeStyles({
+  root: {
+    display: 'flex',
+    flexDirection: 'column',
+  },
+});
+
+interface DatePickerProps {
+  label: string;
+  onDateChange?: (date: string) => void;
+}
+
+export const DatePicker = ({
+  label,
+  onDateChange,
+  ...inputProps
+}: InputProps & DatePickerProps) => {
+  const classes = useStyles();
+
+  return (
+    <div className={classes.root}>
+      <Typography variant="button">{label}</Typography>
+      <BootstrapInput
+        inputProps={{ 'aria-label': label }}
+        type="date"
+        fullWidth
+        onChange={event => onDateChange?.(event.target.value)}
+        {...inputProps}
+      />
+    </div>
+  );
+};
diff --git a/plugins/xcmetrics/src/components/DatePicker/index.ts b/plugins/xcmetrics/src/components/DatePicker/index.ts
new file mode 100644
index 0000000000..599f24510f
--- /dev/null
+++ b/plugins/xcmetrics/src/components/DatePicker/index.ts
@@ -0,0 +1,16 @@
+/*
+ * Copyright 2021 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+export { DatePicker } from './DatePicker';
diff --git a/plugins/xcmetrics/src/components/Overview/Overview.test.tsx b/plugins/xcmetrics/src/components/Overview/Overview.test.tsx
new file mode 100644
index 0000000000..3d24d2a422
--- /dev/null
+++ b/plugins/xcmetrics/src/components/Overview/Overview.test.tsx
@@ -0,0 +1,74 @@
+/*
+ * Copyright 2021 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import React from 'react';
+import { renderInTestApp } from '@backstage/test-utils';
+import { xcmetricsApiRef } from '../../api';
+import { ApiProvider, ApiRegistry } from '@backstage/core-app-api';
+import { Overview } from './Overview';
+
+jest.mock('../../api/XcmetricsClient');
+const client = require('../../api/XcmetricsClient');
+
+jest.mock('../OverviewTrends', () => ({
+  OverviewTrends: () => 'OverviewTrends',
+}));
+
+jest.mock('../StatusMatrix', () => ({
+  StatusMatrix: () => 'StatusMatrix',
+}));
+
+describe('Overview', () => {
+  it('should render', async () => {
+    const rendered = await renderInTestApp(
+      <ApiProvider
+        apis={ApiRegistry.with(xcmetricsApiRef, client.XcmetricsClient)}
+      >
+        <Overview />
+      </ApiProvider>,
+    );
+
+    expect(rendered.getByText('XCMetrics Dashboard')).toBeInTheDocument();
+    expect(rendered.getByText(client.mockBuild.userid)).toBeInTheDocument();
+  });
+
+  it('should render an empty state when no builds exist', async () => {
+    const api = client.XcmetricsClient;
+    api.getBuilds = jest.fn().mockResolvedValue([]);
+
+    const rendered = await renderInTestApp(
+      <ApiProvider apis={ApiRegistry.with(xcmetricsApiRef, api)}>
+        <Overview />
+      </ApiProvider>,
+    );
+
+    expect(rendered.getByText('No builds to show')).toBeInTheDocument();
+  });
+
+  it('should show an error when API not responding', async () => {
+    const api = client.XcmetricsClient;
+    const errorMessage = 'MockErrorMessage';
+
+    api.getBuilds = jest.fn().mockRejectedValue({ message: errorMessage });
+
+    const rendered = await renderInTestApp(
+      <ApiProvider apis={ApiRegistry.with(xcmetricsApiRef, api)}>
+        <Overview />
+      </ApiProvider>,
+    );
+
+    expect(rendered.getByText(errorMessage)).toBeInTheDocument();
+  });
+});
diff --git a/plugins/xcmetrics/src/components/Overview/Overview.tsx b/plugins/xcmetrics/src/components/Overview/Overview.tsx
new file mode 100644
index 0000000000..e7a9a1d705
--- /dev/null
+++ b/plugins/xcmetrics/src/components/Overview/Overview.tsx
@@ -0,0 +1,90 @@
+/*
+ * Copyright 2021 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import React from 'react';
+import {
+  ContentHeader,
+  SupportButton,
+  Progress,
+  Table,
+  EmptyState,
+  InfoCard,
+} from '@backstage/core-components';
+import { useApi } from '@backstage/core-plugin-api';
+import { xcmetricsApiRef } from '../../api';
+import { useAsync } from 'react-use';
+import { Alert } from '@material-ui/lab';
+import { StatusMatrix } from '../StatusMatrix';
+import { Grid } from '@material-ui/core';
+import { OverviewTrends } from '../OverviewTrends';
+import { overviewColumns } from '../BuildTableColumns';
+
+export const Overview = () => {
+  const client = useApi(xcmetricsApiRef);
+  const {
+    value: builds,
+    loading,
+    error,
+  } = useAsync(async () => client.getBuilds(), []);
+
+  if (loading) {
+    return <Progress />;
+  } else if (error) {
+    return <Alert severity="error">{error.message}</Alert>;
+  }
+
+  if (!builds || !builds.length) {
+    return (
+      <EmptyState
+        missing="data"
+        title="No builds to show"
+        description="There are no builds in XCMetrics yet"
+      />
+    );
+  }
+
+  return (
+    <>
+      <ContentHeader title="XCMetrics Dashboard">
+        <SupportButton>Dashboard for XCMetrics</SupportButton>
+      </ContentHeader>
+      <Grid container spacing={3} direction="row">
+        <Grid item xs={12} md={8} lg={8} xl={9}>
+          <Table
+            options={{
+              paging: false,
+              search: false,
+              sorting: false,
+              draggable: false,
+            }}
+            data={builds}
+            columns={overviewColumns}
+            title={
+              <>
+                Latest Builds
+                <StatusMatrix />
+              </>
+            }
+          />
+        </Grid>
+        <Grid item xs={12} md={4} lg={4} xl={3}>
+          <InfoCard>
+            <OverviewTrends />
+          </InfoCard>
+        </Grid>
+      </Grid>
+    </>
+  );
+};
diff --git a/plugins/xcmetrics/src/components/Overview/index.ts b/plugins/xcmetrics/src/components/Overview/index.ts
new file mode 100644
index 0000000000..77685905e9
--- /dev/null
+++ b/plugins/xcmetrics/src/components/Overview/index.ts
@@ -0,0 +1,16 @@
+/*
+ * Copyright 2021 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+export { Overview } from './Overview';
diff --git a/plugins/xcmetrics/src/components/OverviewTrends/OverviewTrends.test.tsx b/plugins/xcmetrics/src/components/OverviewTrends/OverviewTrends.test.tsx
new file mode 100644
index 0000000000..76b47f4943
--- /dev/null
+++ b/plugins/xcmetrics/src/components/OverviewTrends/OverviewTrends.test.tsx
@@ -0,0 +1,86 @@
+/*
+ * Copyright 2021 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import React from 'react';
+import { OverviewTrends } from './OverviewTrends';
+import { renderInTestApp } from '@backstage/test-utils';
+import { xcmetricsApiRef } from '../../api';
+import { ApiProvider, ApiRegistry } from '@backstage/core-app-api';
+import userEvent from '@testing-library/user-event';
+
+jest.mock('../../api/XcmetricsClient');
+const client = require('../../api/XcmetricsClient');
+
+describe('OverviewTrends', () => {
+  it('should render', async () => {
+    const rendered = await renderInTestApp(
+      <ApiProvider
+        apis={ApiRegistry.with(xcmetricsApiRef, client.XcmetricsClient)}
+      >
+        <OverviewTrends />
+      </ApiProvider>,
+    );
+    expect(rendered.getByText('Trends for')).toBeInTheDocument();
+    expect(rendered.getAllByText('Build Count').length).toEqual(3);
+    expect(rendered.getByText('Avg. Build Time (P50)')).toBeInTheDocument();
+  });
+
+  it('should render empty state', async () => {
+    const api = client.XcmetricsClient;
+    api.getBuildCounts = jest.fn().mockResolvedValue([]);
+
+    const rendered = await renderInTestApp(
+      <ApiProvider apis={ApiRegistry.with(xcmetricsApiRef, api)}>
+        <OverviewTrends />
+      </ApiProvider>,
+    );
+    expect(rendered.getByText('--')).toBeInTheDocument();
+  });
+
+  it('should change number of days when select is changed', async () => {
+    const rendered = await renderInTestApp(
+      <ApiProvider
+        apis={ApiRegistry.with(xcmetricsApiRef, client.XcmetricsClient)}
+      >
+        <OverviewTrends />
+      </ApiProvider>,
+    );
+
+    userEvent.click(rendered.getByText('14 days'));
+    userEvent.click(await rendered.findByText('30 days'));
+    expect(await rendered.findByText('30 days')).toBeInTheDocument();
+  });
+
+  it('should show errors when API not responding', async () => {
+    const api = client.XcmetricsClient;
+    const buildCountError = 'MockBuildCountErrorMessage';
+    const buildTimesError = 'MockBuildTimesErrorMessage';
+
+    api.getBuildCounts = jest
+      .fn()
+      .mockRejectedValue({ message: buildCountError });
+    api.getBuildTimes = jest
+      .fn()
+      .mockRejectedValue({ message: buildTimesError });
+
+    const rendered = await renderInTestApp(
+      <ApiProvider apis={ApiRegistry.with(xcmetricsApiRef, api)}>
+        <OverviewTrends />
+      </ApiProvider>,
+    );
+    expect(rendered.getByText(buildCountError)).toBeInTheDocument();
+    expect(rendered.getByText(buildTimesError)).toBeInTheDocument();
+  });
+});
diff --git a/plugins/xcmetrics/src/components/OverviewTrends/OverviewTrends.tsx b/plugins/xcmetrics/src/components/OverviewTrends/OverviewTrends.tsx
new file mode 100644
index 0000000000..8b16d689bb
--- /dev/null
+++ b/plugins/xcmetrics/src/components/OverviewTrends/OverviewTrends.tsx
@@ -0,0 +1,150 @@
+/*
+ * Copyright 2021 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import { Grid, makeStyles, useTheme } from '@material-ui/core';
+import React, { useState } from 'react';
+import { Progress, Select } from '@backstage/core-components';
+import { Trend } from '../Trend';
+import { Alert, AlertTitle } from '@material-ui/lab';
+import { xcmetricsApiRef } from '../../api';
+import { useAsync } from 'react-use';
+import { useApi } from '@backstage/core-plugin-api';
+import { DataValueGridItem } from '../DataValue';
+import {
+  formatDuration,
+  formatPercentage,
+  getAverageDuration,
+  getErrorRatios,
+  getValues,
+  sumField,
+} from '../../utils';
+import { BackstageTheme } from '@backstage/theme';
+
+const useStyles = makeStyles({
+  spacingTop: {
+    marginTop: 8,
+  },
+  spacingVertical: {
+    marginTop: 8,
+    marginBottom: 8,
+  },
+});
+
+const DAYS_SELECT_ITEMS = [
+  { label: '7 days', value: 7 },
+  { label: '14 days', value: 14 },
+  { label: '30 days', value: 30 },
+  { label: '60 days', value: 60 },
+];
+
+export const OverviewTrends = () => {
+  const [days, setDays] = useState(14);
+  const theme = useTheme<BackstageTheme>();
+  const classes = useStyles();
+  const client = useApi(xcmetricsApiRef);
+  const buildCountsResult = useAsync(
+    async () => client.getBuildCounts(days),
+    [days],
+  );
+  const buildTimesResult = useAsync(
+    async () => client.getBuildTimes(days),
+    [days],
+  );
+
+  if (buildCountsResult.loading && buildTimesResult.loading) {
+    return <Progress />;
+  }
+
+  const sumBuilds = sumField(b => b.builds, buildCountsResult.value);
+  const sumErrors = sumField(b => b.errors, buildCountsResult.value);
+  const errorRate = sumBuilds && sumErrors ? sumErrors / sumBuilds : undefined;
+
+  const averageBuildDurationP50 = getAverageDuration(
+    buildTimesResult.value,
+    b => b.durationP50,
+  );
+  const averageBuildDurationP95 = getAverageDuration(
+    buildTimesResult.value,
+    b => b.durationP95,
+  );
+  const totalBuildTime = sumField(t => t.totalDuration, buildTimesResult.value);
+
+  return (
+    <>
+      <Select
+        selected={days}
+        items={DAYS_SELECT_ITEMS}
+        label="Trends for"
+        onChange={selection => setDays(selection as number)}
+      />
+      {buildCountsResult.error && (
+        <Alert severity="error" className={classes.spacingVertical}>
+          <AlertTitle>Failed to fetch build counts</AlertTitle>
+          {buildCountsResult?.error?.message}
+        </Alert>
+      )}
+      {buildTimesResult.error && (
+        <Alert severity="error" className={classes.spacingVertical}>
+          <AlertTitle>Failed to fetch build times</AlertTitle>
+          {buildTimesResult?.error?.message}
+        </Alert>
+      )}
+      {(!buildCountsResult.error || !buildTimesResult.error) && (
+        <div className={classes.spacingVertical}>
+          <Trend
+            title="Build Time"
+            color={theme.palette.secondary.main}
+            data={getValues(e => e.durationP50, buildTimesResult.value)}
+          />
+          <Trend
+            title="Error Rate"
+            color={theme.palette.status.warning}
+            data={getErrorRatios(buildCountsResult.value)}
+          />
+          <Trend
+            title="Build Count"
+            color={theme.palette.primary.main}
+            data={getValues(e => e.builds, buildCountsResult.value)}
+          />
+          <Grid
+            container
+            spacing={3}
+            direction="row"
+            className={classes.spacingTop}
+          >
+            <DataValueGridItem field="Build Count" value={sumBuilds} />
+            <DataValueGridItem field="Error Count" value={sumErrors} />
+            <DataValueGridItem
+              field="Error Rate"
+              value={errorRate && formatPercentage(errorRate)}
+            />
+            <DataValueGridItem
+              field="Avg. Build Time (P50)"
+              value={averageBuildDurationP50}
+            />
+            <DataValueGridItem
+              field="Avg. Build Time (P95)"
+              value={averageBuildDurationP95}
+            />
+            <DataValueGridItem
+              field="Total Build Time"
+              value={totalBuildTime && formatDuration(totalBuildTime)}
+            />
+          </Grid>
+        </div>
+      )}
+    </>
+  );
+};
diff --git a/plugins/xcmetrics/src/components/OverviewTrends/index.ts b/plugins/xcmetrics/src/components/OverviewTrends/index.ts
new file mode 100644
index 0000000000..7a3e7e62b9
--- /dev/null
+++ b/plugins/xcmetrics/src/components/OverviewTrends/index.ts
@@ -0,0 +1,16 @@
+/*
+ * Copyright 2021 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+export { OverviewTrends } from './OverviewTrends';
diff --git a/plugins/xcmetrics/src/components/PreformattedText/PreformattedText.tsx b/plugins/xcmetrics/src/components/PreformattedText/PreformattedText.tsx
new file mode 100644
index 0000000000..c2c3f8ce25
--- /dev/null
+++ b/plugins/xcmetrics/src/components/PreformattedText/PreformattedText.tsx
@@ -0,0 +1,128 @@
+/*
+ * Copyright 2021 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import {
+  Button,
+  createStyles,
+  Dialog,
+  DialogActions,
+  DialogContent,
+  DialogTitle,
+  IconButton,
+  makeStyles,
+} from '@material-ui/core';
+import CloseIcon from '@material-ui/icons/Close';
+import React, { useState } from 'react';
+import { BackstageTheme } from '@backstage/theme';
+import { cn } from '../../utils';
+
+const useStyles = makeStyles((theme: BackstageTheme) =>
+  createStyles({
+    pre: {
+      whiteSpace: 'pre-line',
+      wordBreak: 'break-all',
+    },
+    expandable: {
+      cursor: 'pointer',
+    },
+    fullPre: {
+      whiteSpace: 'pre-wrap',
+    },
+    closeButton: {
+      position: 'absolute',
+      right: theme.spacing(1),
+      top: theme.spacing(1),
+      color: theme.palette.grey[500],
+    },
+  }),
+);
+
+interface PreformattedTextProps {
+  text: string;
+  maxChars: number;
+}
+
+interface ExpandableProps extends PreformattedTextProps {
+  expandable: boolean;
+  title: string;
+}
+
+interface NonExpandableProps extends PreformattedTextProps {
+  expandable?: never;
+  title?: string;
+}
+
+export const PreformattedText = ({
+  text,
+  maxChars,
+  expandable,
+  title,
+}: NonExpandableProps | ExpandableProps) => {
+  const [open, setOpen] = useState(false);
+  const classes = useStyles();
+
+  const handleKeyUp = (event: React.KeyboardEvent<HTMLDivElement>) => {
+    if (expandable && event.key === 'Enter') {
+      setOpen(true);
+    }
+  };
+
+  return (
+    <>
+      <div
+        role={expandable ? 'button' : undefined}
+        onClick={() => expandable && setOpen(true)}
+        onKeyUp={handleKeyUp}
+        tabIndex={expandable ? 0 : undefined}
+      >
+        <pre className={cn(classes.pre, expandable && classes.expandable)}>
+          {text.slice(0, maxChars - 1).trim()}
+          {text.length > maxChars - 1 && '…'}
+        </pre>
+      </div>
+
+      {expandable && (
+        <Dialog
+          open={open}
+          onClose={() => setOpen(false)}
+          aria-labelledby="dialog-title"
+          aria-describedby="dialog-description"
+          maxWidth="xl"
+          fullWidth
+        >
+          <DialogTitle id="dialog-title">
+            {title}
+            <IconButton
+              aria-label="close"
+              className={classes.closeButton}
+              onClick={() => setOpen(false)}
+            >
+              <CloseIcon />
+            </IconButton>
+          </DialogTitle>
+          <DialogContent>
+            <pre className={classes.fullPre}>{text}</pre>
+          </DialogContent>
+          <DialogActions>
+            <Button color="primary" onClick={() => setOpen(false)}>
+              Close
+            </Button>
+          </DialogActions>
+        </Dialog>
+      )}
+    </>
+  );
+};
diff --git a/plugins/xcmetrics/src/components/PreformattedText/index.ts b/plugins/xcmetrics/src/components/PreformattedText/index.ts
new file mode 100644
index 0000000000..9a03d821b2
--- /dev/null
+++ b/plugins/xcmetrics/src/components/PreformattedText/index.ts
@@ -0,0 +1,16 @@
+/*
+ * Copyright 2021 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+export { PreformattedText } from './PreformattedText';
diff --git a/plugins/xcmetrics/src/components/StatusCell/StatusCell.test.tsx b/plugins/xcmetrics/src/components/StatusCell/StatusCell.test.tsx
new file mode 100644
index 0000000000..cac111d13e
--- /dev/null
+++ b/plugins/xcmetrics/src/components/StatusCell/StatusCell.test.tsx
@@ -0,0 +1,54 @@
+/*
+ * Copyright 2021 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import React from 'react';
+import { renderInTestApp } from '@backstage/test-utils';
+import { ApiProvider, ApiRegistry } from '@backstage/core-app-api';
+import userEvent from '@testing-library/user-event';
+import { StatusCell } from './StatusCell';
+import { xcmetricsApiRef } from '../../api';
+import { formatDuration, formatStatus } from '../../utils';
+
+jest.mock('../../api/XcmetricsClient');
+const client = require('../../api/XcmetricsClient');
+
+describe('StatusCell', () => {
+  it('should render', async () => {
+    const rendered = await renderInTestApp(
+      <ApiProvider
+        apis={ApiRegistry.with(xcmetricsApiRef, client.XcmetricsClient)}
+      >
+        <StatusCell
+          buildStatus={{
+            id: client.mockBuild.id,
+            buildStatus: client.mockBuild.buildStatus,
+          }}
+          size={10}
+          spacing={10}
+        />
+      </ApiProvider>,
+    );
+
+    userEvent.hover(rendered.getByTestId(client.mockBuild.id));
+    expect(
+      await rendered.findByText(formatStatus(client.mockBuild.buildStatus)),
+    ).toBeInTheDocument();
+    expect(
+      await rendered.findByText(
+        formatDuration(client.mockBuild.duration).trim(),
+      ),
+    ).toBeInTheDocument();
+  });
+});
diff --git a/plugins/xcmetrics/src/components/StatusCell/StatusCell.tsx b/plugins/xcmetrics/src/components/StatusCell/StatusCell.tsx
new file mode 100644
index 0000000000..2cdb5c9d39
--- /dev/null
+++ b/plugins/xcmetrics/src/components/StatusCell/StatusCell.tsx
@@ -0,0 +1,125 @@
+/*
+ * Copyright 2021 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import { makeStyles, Tooltip } from '@material-ui/core';
+import React from 'react';
+import { BackstageTheme } from '@backstage/theme';
+import { BuildStatus, BuildStatusResult, xcmetricsApiRef } from '../../api';
+import { cn, formatDuration, formatStatus } from '../../utils';
+import { useAsync } from 'react-use';
+import { useApi } from '@backstage/core-plugin-api';
+import { Progress } from '@backstage/core-components';
+
+interface TooltipContentProps {
+  buildId: string;
+}
+
+const TooltipContent = ({ buildId }: TooltipContentProps) => {
+  const client = useApi(xcmetricsApiRef);
+  const { value, loading, error } = useAsync(
+    async () => client.getBuild(buildId),
+    [],
+  );
+
+  if (error) {
+    return <div>{error.message}</div>;
+  }
+
+  if (loading || !value?.build) {
+    return <Progress style={{ width: 100 }} />;
+  }
+
+  return (
+    <table>
+      <tbody>
+        <tr>
+          <td>Started</td>
+          <td>{new Date(value.build.startTimestamp).toLocaleString()}</td>
+        </tr>
+        <tr>
+          <td>Duration</td>
+          <td>{formatDuration(value.build.duration)}</td>
+        </tr>
+        <tr>
+          <td>Status</td>
+          <td>{formatStatus(value.build.buildStatus)}</td>
+        </tr>
+      </tbody>
+    </table>
+  );
+};
+
+interface StatusCellProps {
+  buildStatus?: BuildStatusResult;
+  size: number;
+  spacing: number;
+}
+
+type StatusStyle = {
+  [key in BuildStatus]: any;
+};
+
+const useStyles = makeStyles<BackstageTheme, StatusCellProps>(theme => ({
+  root: {
+    width: ({ size }) => size,
+    height: ({ size }) => size,
+    marginRight: ({ spacing }) => spacing,
+    marginBottom: ({ spacing }) => spacing,
+    backgroundColor: theme.palette.grey[600],
+    '&:hover': {
+      transform: 'scale(1.2)',
+    },
+  },
+  ...({
+    succeeded: {
+      backgroundColor:
+        theme.palette.type === 'light'
+          ? theme.palette.success.light
+          : theme.palette.success.main,
+    },
+  } as StatusStyle), // Make sure that key matches a status
+  ...({
+    failed: {
+      backgroundColor: theme.palette.error[theme.palette.type],
+    },
+  } as StatusStyle),
+  ...({
+    stopped: {
+      backgroundColor: theme.palette.warning[theme.palette.type],
+    },
+  } as StatusStyle),
+}));
+
+export const StatusCell = (props: StatusCellProps) => {
+  const classes = useStyles(props);
+  const { buildStatus } = props;
+
+  if (!buildStatus) {
+    return <div className={classes.root} />;
+  }
+
+  return (
+    <Tooltip
+      title={<TooltipContent buildId={buildStatus.id} />}
+      enterNextDelay={500}
+      arrow
+    >
+      <div
+        data-testid={buildStatus.id}
+        className={cn(classes.root, classes[buildStatus.buildStatus])}
+      />
+    </Tooltip>
+  );
+};
diff --git a/plugins/xcmetrics/src/components/StatusCell/index.ts b/plugins/xcmetrics/src/components/StatusCell/index.ts
new file mode 100644
index 0000000000..60008aeacf
--- /dev/null
+++ b/plugins/xcmetrics/src/components/StatusCell/index.ts
@@ -0,0 +1,16 @@
+/*
+ * Copyright 2021 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+export { StatusCell } from './StatusCell';
diff --git a/plugins/xcmetrics/src/components/StatusIcon/StatusIcon.test.tsx b/plugins/xcmetrics/src/components/StatusIcon/StatusIcon.test.tsx
new file mode 100644
index 0000000000..a208432f59
--- /dev/null
+++ b/plugins/xcmetrics/src/components/StatusIcon/StatusIcon.test.tsx
@@ -0,0 +1,34 @@
+/*
+ * Copyright 2021 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import React from 'react';
+import { renderInTestApp } from '@backstage/test-utils';
+import { StatusIcon } from './StatusIcon';
+
+describe('StatusIcon', () => {
+  it('should render', async () => {
+    let rendered = await renderInTestApp(
+      <StatusIcon buildStatus="succeeded" />,
+    );
+    expect(rendered.getByLabelText('Status ok')).toBeInTheDocument();
+
+    rendered = await renderInTestApp(<StatusIcon buildStatus="failed" />);
+    expect(rendered.getByLabelText('Status error')).toBeInTheDocument();
+
+    rendered = await renderInTestApp(<StatusIcon buildStatus="stopped" />);
+    expect(rendered.getByLabelText('Status warning')).toBeInTheDocument();
+  });
+});
diff --git a/plugins/xcmetrics/src/components/StatusIcon/StatusIcon.tsx b/plugins/xcmetrics/src/components/StatusIcon/StatusIcon.tsx
new file mode 100644
index 0000000000..610575b817
--- /dev/null
+++ b/plugins/xcmetrics/src/components/StatusIcon/StatusIcon.tsx
@@ -0,0 +1,35 @@
+/*
+ * Copyright 2021 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import React from 'react';
+import {
+  StatusError,
+  StatusOK,
+  StatusWarning,
+} from '@backstage/core-components';
+import { BuildStatus } from '../../api';
+
+const STATUS_ICONS: { [key in BuildStatus]: JSX.Element } = {
+  succeeded: <StatusOK />,
+  failed: <StatusError />,
+  stopped: <StatusWarning />,
+};
+
+interface StatusIconProps {
+  buildStatus: BuildStatus;
+}
+
+export const StatusIcon = ({ buildStatus }: StatusIconProps) =>
+  STATUS_ICONS[buildStatus];
diff --git a/plugins/xcmetrics/src/components/StatusIcon/index.ts b/plugins/xcmetrics/src/components/StatusIcon/index.ts
new file mode 100644
index 0000000000..597caaca89
--- /dev/null
+++ b/plugins/xcmetrics/src/components/StatusIcon/index.ts
@@ -0,0 +1,16 @@
+/*
+ * Copyright 2021 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+export { StatusIcon } from './StatusIcon';
diff --git a/plugins/xcmetrics/src/components/StatusMatrix/StatusMatrix.test.tsx b/plugins/xcmetrics/src/components/StatusMatrix/StatusMatrix.test.tsx
new file mode 100644
index 0000000000..7d3854bbda
--- /dev/null
+++ b/plugins/xcmetrics/src/components/StatusMatrix/StatusMatrix.test.tsx
@@ -0,0 +1,38 @@
+/*
+ * Copyright 2021 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import React from 'react';
+import { renderInTestApp } from '@backstage/test-utils';
+import { ApiProvider, ApiRegistry } from '@backstage/core-app-api';
+import { StatusMatrix } from './StatusMatrix';
+import { xcmetricsApiRef } from '../../api';
+
+jest.mock('../../api/XcmetricsClient');
+const client = require('../../api/XcmetricsClient');
+
+describe('StatusMatrix', () => {
+  it('should render', async () => {
+    const rendered = await renderInTestApp(
+      <ApiProvider
+        apis={ApiRegistry.with(xcmetricsApiRef, client.XcmetricsClient)}
+      >
+        <StatusMatrix />
+      </ApiProvider>,
+    );
+
+    const cell = rendered.getByTestId(client.mockBuild.id);
+    expect(cell).toBeInTheDocument();
+  });
+});
diff --git a/plugins/xcmetrics/src/components/StatusMatrix/StatusMatrix.tsx b/plugins/xcmetrics/src/components/StatusMatrix/StatusMatrix.tsx
new file mode 100644
index 0000000000..e7f3294e6d
--- /dev/null
+++ b/plugins/xcmetrics/src/components/StatusMatrix/StatusMatrix.tsx
@@ -0,0 +1,88 @@
+/*
+ * Copyright 2021 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import React from 'react';
+import { makeStyles } from '@material-ui/core';
+import { BackstageTheme } from '@backstage/theme';
+import { xcmetricsApiRef } from '../../api';
+import { useAsync, useMeasure } from 'react-use';
+import { cn } from '../../utils';
+import { useApi } from '@backstage/core-plugin-api';
+import { Alert } from '@material-ui/lab';
+import { StatusCell } from '../StatusCell';
+
+const CELL_SIZE = 12;
+const CELL_MARGIN = 4;
+const MAX_ROWS = 4;
+
+const useStyles = makeStyles<BackstageTheme>(theme => ({
+  root: {
+    marginTop: 8,
+    display: 'flex',
+    flexWrap: 'wrap',
+    width: '100%',
+  },
+  loading: {
+    animation: `$loadingOpacity 900ms ${theme.transitions.easing.easeInOut}`,
+    animationIterationCount: 'infinite',
+  },
+  '@keyframes loadingOpacity': {
+    '0%': { opacity: 0.3 },
+    '100%': { opacity: 0.8 },
+  },
+}));
+
+export const StatusMatrix = () => {
+  const classes = useStyles();
+  const [measureRef, { width: rootWidth }] = useMeasure<HTMLDivElement>();
+  const client = useApi(xcmetricsApiRef);
+  const {
+    value: builds,
+    loading,
+    error,
+  } = useAsync(async () => client.getBuildStatuses(300), []);
+
+  if (error) {
+    return <Alert severity="error">{error.message}</Alert>;
+  }
+
+  const cols = Math.trunc(rootWidth / (CELL_SIZE + CELL_MARGIN)) || 1;
+
+  return (
+    <div
+      className={cn(classes.root, loading && classes.loading)}
+      ref={measureRef}
+    >
+      {loading &&
+        [...new Array(cols * MAX_ROWS)].map((_, index) => {
+          return (
+            <StatusCell key={index} size={CELL_SIZE} spacing={CELL_MARGIN} />
+          );
+        })}
+
+      {builds &&
+        builds
+          .slice(0, cols * MAX_ROWS)
+          .map((buildStatus, index) => (
+            <StatusCell
+              key={index}
+              buildStatus={buildStatus}
+              size={CELL_SIZE}
+              spacing={CELL_MARGIN}
+            />
+          ))}
+    </div>
+  );
+};
diff --git a/plugins/xcmetrics/src/components/StatusMatrix/index.ts b/plugins/xcmetrics/src/components/StatusMatrix/index.ts
new file mode 100644
index 0000000000..f112dcc26c
--- /dev/null
+++ b/plugins/xcmetrics/src/components/StatusMatrix/index.ts
@@ -0,0 +1,16 @@
+/*
+ * Copyright 2021 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+export { StatusMatrix } from './StatusMatrix';
diff --git a/plugins/xcmetrics/src/components/Trend/Trend.test.tsx b/plugins/xcmetrics/src/components/Trend/Trend.test.tsx
new file mode 100644
index 0000000000..90981e5401
--- /dev/null
+++ b/plugins/xcmetrics/src/components/Trend/Trend.test.tsx
@@ -0,0 +1,37 @@
+/*
+ * Copyright 2021 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import React from 'react';
+import { Trend } from './Trend';
+import { renderInTestApp } from '@backstage/test-utils';
+
+describe('Trend', () => {
+  it('should render', async () => {
+    const data = [1, 2, 3, 4];
+    const title = 'testTitle';
+    const rendered = await renderInTestApp(
+      <Trend data={data} title={title} color="#000" />,
+    );
+    expect(rendered.findAllByText('testTitle')).toBeTruthy();
+  });
+
+  it('should render empty state', async () => {
+    const title = 'testTitle';
+    const rendered = await renderInTestApp(
+      <Trend title={title} color="#000" />,
+    );
+    expect(rendered.findAllByText('testTitle')).toBeTruthy();
+  });
+});
diff --git a/plugins/catalog/src/components/CatalogPage/CatalogLayout.tsx b/plugins/xcmetrics/src/components/Trend/Trend.tsx
similarity index 50%
rename from plugins/catalog/src/components/CatalogPage/CatalogLayout.tsx
rename to plugins/xcmetrics/src/components/Trend/Trend.tsx
index 2471ac9df2..575872e813 100644
--- a/plugins/catalog/src/components/CatalogPage/CatalogLayout.tsx
+++ b/plugins/xcmetrics/src/components/Trend/Trend.tsx
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 The Backstage Authors
+ * Copyright 2021 The Backstage Authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,30 +13,29 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 import React from 'react';
+import { TrendLine } from '@backstage/core-components';
+import { Typography } from '@material-ui/core';
 
-import { configApiRef, useApi } from '@backstage/core-plugin-api';
-import { Header, Page } from '@backstage/core-components';
+interface TrendProps {
+  data?: number[];
+  title: string;
+  color: string;
+}
 
-type Props = {
-  children?: React.ReactNode;
-};
-
-export const CatalogLayout = ({ children }: Props) => {
-  const orgName =
-    useApi(configApiRef).getOptionalString('organization.name') ?? 'Backstage';
+export const Trend = ({ data, title, color }: TrendProps) => {
+  const emptyData = [0, 0];
+  const max = Math.max(...(data ?? emptyData));
 
   return (
-    <Page themeId="home">
-      <Header
-        title={`${orgName} Catalog`}
-        subtitle={`Catalog of software components at ${orgName}`}
-        pageTitleOverride="Home"
+    <>
+      <Typography variant="overline">{title}</Typography>
+      <TrendLine
+        data={data ?? emptyData}
+        title={title}
+        max={max}
+        color={data && color}
       />
-      {children}
-    </Page>
+    </>
   );
 };
-
-export default CatalogLayout;
diff --git a/plugins/xcmetrics/src/components/Trend/index.ts b/plugins/xcmetrics/src/components/Trend/index.ts
new file mode 100644
index 0000000000..5e32e2fe3c
--- /dev/null
+++ b/plugins/xcmetrics/src/components/Trend/index.ts
@@ -0,0 +1,16 @@
+/*
+ * Copyright 2021 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+export { Trend } from './Trend';
diff --git a/plugins/xcmetrics/src/components/XcmetricsLayout/XcmetricsLayout.test.tsx b/plugins/xcmetrics/src/components/XcmetricsLayout/XcmetricsLayout.test.tsx
new file mode 100644
index 0000000000..84bd25624c
--- /dev/null
+++ b/plugins/xcmetrics/src/components/XcmetricsLayout/XcmetricsLayout.test.tsx
@@ -0,0 +1,62 @@
+/*
+ * Copyright 2021 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import React from 'react';
+import { renderInTestApp } from '@backstage/test-utils';
+import { ApiProvider, ApiRegistry } from '@backstage/core-app-api';
+import { XcmetricsLayout } from './XcmetricsLayout';
+import { xcmetricsApiRef } from '../../api';
+import userEvent from '@testing-library/user-event';
+
+jest.mock('../../api/XcmetricsClient');
+const client = require('../../api/XcmetricsClient');
+
+jest.mock('../Overview', () => ({
+  Overview: () => 'OverviewComponent',
+}));
+
+jest.mock('../BuildList', () => ({
+  BuildList: () => 'BuildList',
+}));
+
+describe('XcmetricsLayout', () => {
+  it('should render', async () => {
+    const rendered = await renderInTestApp(
+      <ApiProvider
+        apis={ApiRegistry.with(xcmetricsApiRef, client.XcmetricsClient)}
+      >
+        <XcmetricsLayout />
+      </ApiProvider>,
+    );
+
+    expect(rendered.getByText('Overview')).toBeInTheDocument();
+    expect(rendered.getByText('Builds')).toBeInTheDocument();
+
+    expect(rendered.getByText('OverviewComponent')).toBeInTheDocument();
+  });
+
+  it('should show a list of builds when the Builds tab is selected', async () => {
+    const rendered = await renderInTestApp(
+      <ApiProvider
+        apis={ApiRegistry.with(xcmetricsApiRef, client.XcmetricsClient)}
+      >
+        <XcmetricsLayout />
+      </ApiProvider>,
+    );
+
+    userEvent.click(rendered.getByText('Builds'));
+    expect(await rendered.findByText('BuildList')).toBeInTheDocument();
+  });
+});
diff --git a/plugins/xcmetrics/src/components/XcmetricsLayout/XcmetricsLayout.tsx b/plugins/xcmetrics/src/components/XcmetricsLayout/XcmetricsLayout.tsx
new file mode 100644
index 0000000000..53545890a4
--- /dev/null
+++ b/plugins/xcmetrics/src/components/XcmetricsLayout/XcmetricsLayout.tsx
@@ -0,0 +1,66 @@
+/*
+ * Copyright 2021 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import React, { ReactChild } from 'react';
+import {
+  Content,
+  Header,
+  HeaderLabel,
+  Page,
+  TabbedLayout,
+} from '@backstage/core-components';
+import { Overview } from '../Overview';
+import { buildsRouteRef, rootRouteRef } from '../../routes';
+import { RouteRef, SubRouteRef } from '@backstage/core-plugin-api';
+import { BuildsPage } from '../BuildsPage';
+
+export interface TabConfig {
+  routeRef: RouteRef | SubRouteRef;
+  title: string;
+  component: ReactChild;
+}
+
+const TABS: TabConfig[] = [
+  {
+    routeRef: rootRouteRef,
+    title: 'Overview',
+    component: <Overview />,
+  },
+  {
+    routeRef: buildsRouteRef,
+    title: 'Builds',
+    component: <BuildsPage />,
+  },
+];
+
+export const XcmetricsLayout = () => (
+  <Page themeId="tool">
+    <Header title="XCMetrics" subtitle="Dashboard">
+      <HeaderLabel label="Owner" value="Spotify" />
+      <HeaderLabel label="Lifecycle" value="Alpha" />
+    </Header>
+    <TabbedLayout>
+      {TABS.map(tab => (
+        <TabbedLayout.Route
+          key={tab.routeRef.path}
+          path={tab.routeRef.path}
+          title={tab.title}
+        >
+          <Content>{tab.component}</Content>
+        </TabbedLayout.Route>
+      ))}
+    </TabbedLayout>
+  </Page>
+);
diff --git a/plugins/xcmetrics/src/components/XcmetricsLayout/index.ts b/plugins/xcmetrics/src/components/XcmetricsLayout/index.ts
new file mode 100644
index 0000000000..aa7cd4b8dc
--- /dev/null
+++ b/plugins/xcmetrics/src/components/XcmetricsLayout/index.ts
@@ -0,0 +1,16 @@
+/*
+ * Copyright 2021 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+export { XcmetricsLayout } from './XcmetricsLayout';
diff --git a/plugins/xcmetrics/src/index.ts b/plugins/xcmetrics/src/index.ts
new file mode 100644
index 0000000000..aa02224738
--- /dev/null
+++ b/plugins/xcmetrics/src/index.ts
@@ -0,0 +1,16 @@
+/*
+ * Copyright 2021 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+export { xcmetricsPlugin, XcmetricsPage } from './plugin';
diff --git a/plugins/xcmetrics/src/plugin.test.ts b/plugins/xcmetrics/src/plugin.test.ts
new file mode 100644
index 0000000000..a390e8aeb7
--- /dev/null
+++ b/plugins/xcmetrics/src/plugin.test.ts
@@ -0,0 +1,23 @@
+/*
+ * Copyright 2021 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import { XcmetricsPage, xcmetricsPlugin } from './plugin';
+
+describe('xcmetrics', () => {
+  it('should export plugin', () => {
+    expect(xcmetricsPlugin).toBeDefined();
+    expect(XcmetricsPage).toBeDefined();
+  });
+});
diff --git a/plugins/register-component/src/plugin.ts b/plugins/xcmetrics/src/plugin.ts
similarity index 56%
rename from plugins/register-component/src/plugin.ts
rename to plugins/xcmetrics/src/plugin.ts
index 61e998c94f..22250ff627 100644
--- a/plugins/register-component/src/plugin.ts
+++ b/plugins/xcmetrics/src/plugin.ts
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 The Backstage Authors
+ * Copyright 2021 The Backstage Authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,30 +13,37 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 import {
+  createApiFactory,
   createPlugin,
   createRoutableExtension,
-  createRouteRef,
+  discoveryApiRef,
 } from '@backstage/core-plugin-api';
+import { xcmetricsApiRef, XcmetricsClient } from './api';
+import { rootRouteRef } from './routes';
 
-const rootRouteRef = createRouteRef({
-  title: 'Register Component',
-});
-
-export const registerComponentPlugin = createPlugin({
-  id: 'register-component',
+export const xcmetricsPlugin = createPlugin({
+  id: 'xcmetrics',
   routes: {
     root: rootRouteRef,
   },
+  apis: [
+    createApiFactory({
+      api: xcmetricsApiRef,
+      deps: {
+        discoveryApi: discoveryApiRef,
+      },
+      factory({ discoveryApi }) {
+        return new XcmetricsClient({ discoveryApi });
+      },
+    }),
+  ],
 });
 
-export const RegisterComponentPage = registerComponentPlugin.provide(
+export const XcmetricsPage = xcmetricsPlugin.provide(
   createRoutableExtension({
     component: () =>
-      import('./components/RegisterComponentPage').then(
-        m => m.RegisterComponentPage,
-      ),
+      import('./components/XcmetricsLayout').then(m => m.XcmetricsLayout),
     mountPoint: rootRouteRef,
   }),
 );
diff --git a/plugins/xcmetrics/src/routes.ts b/plugins/xcmetrics/src/routes.ts
new file mode 100644
index 0000000000..212ecbae48
--- /dev/null
+++ b/plugins/xcmetrics/src/routes.ts
@@ -0,0 +1,26 @@
+/*
+ * Copyright 2021 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import { createRouteRef, createSubRouteRef } from '@backstage/core-plugin-api';
+
+export const rootRouteRef = createRouteRef({
+  title: 'XCMetrics',
+});
+
+export const buildsRouteRef = createSubRouteRef({
+  id: 'xcmetrics-builds',
+  parent: rootRouteRef,
+  path: '/builds',
+});
diff --git a/plugins/xcmetrics/src/setupTests.ts b/plugins/xcmetrics/src/setupTests.ts
new file mode 100644
index 0000000000..fc6dbd98f8
--- /dev/null
+++ b/plugins/xcmetrics/src/setupTests.ts
@@ -0,0 +1,17 @@
+/*
+ * Copyright 2021 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import '@testing-library/jest-dom';
+import 'cross-fetch/polyfill';
diff --git a/plugins/xcmetrics/src/utils/array.ts b/plugins/xcmetrics/src/utils/array.ts
new file mode 100644
index 0000000000..9e3e2d1d4d
--- /dev/null
+++ b/plugins/xcmetrics/src/utils/array.ts
@@ -0,0 +1,33 @@
+/*
+ * Copyright 2021 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+export const sumField = <T extends {}>(
+  field: (element: T) => number,
+  arr?: T[],
+) => {
+  return arr?.reduce((sum, current) => sum + field(current), 0);
+};
+
+export const getValues = <T extends {}>(
+  field: (element: T) => number,
+  arr?: T[],
+) => {
+  if (!arr?.length) {
+    return undefined;
+  }
+
+  return arr.map(element => field(element));
+};
diff --git a/plugins/xcmetrics/src/utils/buildData.ts b/plugins/xcmetrics/src/utils/buildData.ts
new file mode 100644
index 0000000000..df6fad996e
--- /dev/null
+++ b/plugins/xcmetrics/src/utils/buildData.ts
@@ -0,0 +1,42 @@
+/*
+ * Copyright 2021 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { formatDuration } from '.';
+import { BuildCount, BuildTime } from '../api';
+
+export const getErrorRatios = (buildCounts?: BuildCount[]) => {
+  if (!buildCounts?.length) {
+    return undefined;
+  }
+
+  return buildCounts.map(counts =>
+    counts.builds === 0 ? 0 : counts.errors / counts.builds,
+  );
+};
+
+export const getAverageDuration = (
+  buildTimes: BuildTime[] | undefined,
+  field: (b: BuildTime) => number,
+) => {
+  if (!buildTimes?.length) {
+    return undefined;
+  }
+
+  return formatDuration(
+    buildTimes.reduce((sum, current) => sum + field(current), 0) /
+      buildTimes.length,
+  );
+};
diff --git a/plugins/xcmetrics/src/utils/classnames.ts b/plugins/xcmetrics/src/utils/classnames.ts
new file mode 100644
index 0000000000..48b7d3b438
--- /dev/null
+++ b/plugins/xcmetrics/src/utils/classnames.ts
@@ -0,0 +1,22 @@
+/*
+ * Copyright 2021 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+type ClassName = string | false | undefined | null;
+
+export const classNames = (...args: ClassName[]) =>
+  args.filter(c => !!c).join(' ');
+
+export const cn = classNames;
diff --git a/plugins/xcmetrics/src/utils/format.ts b/plugins/xcmetrics/src/utils/format.ts
new file mode 100644
index 0000000000..e21e95a7b2
--- /dev/null
+++ b/plugins/xcmetrics/src/utils/format.ts
@@ -0,0 +1,52 @@
+/*
+ * Copyright 2021 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import { DateTime, Duration } from 'luxon';
+import { BuildStatus } from '../api';
+
+export const formatDuration = (seconds: number) => {
+  const duration = Duration.fromObject({
+    seconds: seconds,
+  }).shiftTo('hours', 'minutes', 'seconds', 'milliseconds');
+
+  if (duration.hours + duration.minutes + duration.seconds === 0) {
+    return `${Math.round(duration.milliseconds)} ms`;
+  }
+
+  const h = duration.hours ? `${duration.hours} h` : '';
+  const m = duration.minutes ? `${duration.minutes} m` : '';
+  const s = duration.hours < 12 ? `${duration.seconds ?? 0} s` : '';
+
+  return `${h} ${m} ${s}`;
+};
+
+export const formatSecondsInterval = ([start, end]: [number, number]) => {
+  return `${Math.round(start * 100) / 100} s - ${
+    Math.round(end * 100) / 100
+  } s`;
+};
+
+export const formatTime = (timestamp: string) => {
+  return DateTime.fromISO(timestamp).toLocaleString(
+    DateTime.DATETIME_SHORT_WITH_SECONDS,
+  );
+};
+
+export const formatPercentage = (number: number) => {
+  return `${Math.round(number * 100)} %`;
+};
+
+export const formatStatus = (status: BuildStatus) =>
+  status[0].toUpperCase() + status.slice(1);
diff --git a/plugins/xcmetrics/src/utils/index.ts b/plugins/xcmetrics/src/utils/index.ts
new file mode 100644
index 0000000000..f487041e25
--- /dev/null
+++ b/plugins/xcmetrics/src/utils/index.ts
@@ -0,0 +1,19 @@
+/*
+ * Copyright 2021 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+export * from './array';
+export * from './buildData';
+export * from './format';
+export * from './classnames';
diff --git a/plugins/xcmetrics/src/utils/utils.test.ts b/plugins/xcmetrics/src/utils/utils.test.ts
new file mode 100644
index 0000000000..a6a324e533
--- /dev/null
+++ b/plugins/xcmetrics/src/utils/utils.test.ts
@@ -0,0 +1,88 @@
+/*
+ * Copyright 2021 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { classNames, getValues, sumField } from './';
+import { getAverageDuration, getErrorRatios } from './buildData';
+
+describe('utils', () => {
+  describe('classNames', () => {
+    it('should concatinate strings', () => {
+      expect(classNames('class1', 'class2', 'class3')).toEqual(
+        'class1 class2 class3',
+      );
+    });
+
+    it('should not include values null, undefined or empty strings', () => {
+      expect(classNames('class1', undefined, null, '')).toEqual('class1');
+    });
+
+    it('should handle strings with boolean expressions', () => {
+      expect(classNames(true && 'class1', false && 'class2', false)).toEqual(
+        'class1',
+      );
+    });
+  });
+
+  describe('sumFields', () => {
+    it('should sum the given field', () => {
+      expect(sumField(e => e.a, [{ a: 1 }, { a: 1 }, { a: 1, b: 10 }])).toEqual(
+        3,
+      );
+      expect(sumField(e => (e as any).field)).toBeUndefined();
+    });
+  });
+
+  describe('getValues', () => {
+    it('should return the values of the specified field', () => {
+      expect(getValues(e => e.a, [{ a: 1 }, { a: 2, b: 10 }])).toEqual([1, 2]);
+      expect(getValues(e => (e as any).field)).toBeUndefined();
+      expect(getValues(e => e.field, [] as { field: any }[])).toBeUndefined();
+    });
+  });
+
+  describe('getErrorRatios', () => {
+    it('should return the ratio between errors and builds', () => {
+      expect(
+        getErrorRatios([{ day: '2021-01-01', errors: 10, builds: 1 }]),
+      ).toEqual([10]);
+      expect(
+        getErrorRatios([{ day: '2021-01-01', errors: 0, builds: 0 }]),
+      ).toEqual([0]);
+      expect(getErrorRatios()).toBeUndefined();
+    });
+  });
+
+  describe('getAverageDuration', () => {
+    it('should return the average duration', () => {
+      const data = [
+        {
+          day: '2021-01-01',
+          durationP50: 3.0,
+          durationP95: 0,
+          totalDuration: 0,
+        },
+        {
+          day: '2021-01-01',
+          durationP50: 1.0,
+          durationP95: 0,
+          totalDuration: 0,
+        },
+      ];
+      expect(getAverageDuration(data, e => e.durationP50)).toMatch('2 s');
+      expect(getAverageDuration([], e => e.durationP50)).toBeUndefined();
+    });
+  });
+});
diff --git a/scripts/api-extractor.ts b/scripts/api-extractor.ts
index f88b30d1fd..6b34b4a82b 100644
--- a/scripts/api-extractor.ts
+++ b/scripts/api-extractor.ts
@@ -31,8 +31,14 @@ import {
   CompilerState,
   ExtractorLogLevel,
 } from '@microsoft/api-extractor';
+import { DocNode, IDocNodeContainerParameters } from '@microsoft/tsdoc';
 import { ApiPackage, ApiModel } from '@microsoft/api-extractor-model';
-import { MarkdownDocumenter } from '@microsoft/api-documenter/lib/documenters/MarkdownDocumenter';
+import {
+  IMarkdownDocumenterOptions,
+  MarkdownDocumenter,
+} from '@microsoft/api-documenter/lib/documenters/MarkdownDocumenter';
+import { CustomMarkdownEmitter } from '@microsoft/api-documenter/lib/markdown/CustomMarkdownEmitter';
+import { IMarkdownEmitterContext } from '@microsoft/api-documenter/lib/markdown/MarkdownEmitter';
 
 const tmpDir = resolvePath(__dirname, '../node_modules/.cache/api-extractor');
 
@@ -50,17 +56,16 @@ const {
 } = require('@rushstack/node-core-library/lib/PackageJsonLookup');
 
 const old = PackageJsonLookup.prototype.tryGetPackageJsonFilePathFor;
-PackageJsonLookup.prototype.tryGetPackageJsonFilePathFor = function tryGetPackageJsonFilePathForPatch(
-  path: string,
-) {
-  if (
-    path.includes('@material-ui') &&
-    !dirname(path).endsWith('@material-ui')
-  ) {
-    return undefined;
-  }
-  return old.call(this, path);
-};
+PackageJsonLookup.prototype.tryGetPackageJsonFilePathFor =
+  function tryGetPackageJsonFilePathForPatch(path: string) {
+    if (
+      path.includes('@material-ui') &&
+      !dirname(path).endsWith('@material-ui')
+    ) {
+      return undefined;
+    }
+    return old.call(this, path);
+  };
 
 /**
  * Another monkey patch where we apply prettier to the API reports. This has to be patched into
@@ -73,15 +78,14 @@ const {
 
 const originalGenerateReviewFileContent =
   ApiReportGenerator.generateReviewFileContent;
-ApiReportGenerator.generateReviewFileContent = function decoratedGenerateReviewFileContent(
-  ...args
-) {
-  const content = originalGenerateReviewFileContent.apply(this, args);
-  return prettier.format(content, {
-    ...require('@spotify/prettier-config'),
-    parser: 'markdown',
-  });
-};
+ApiReportGenerator.generateReviewFileContent =
+  function decoratedGenerateReviewFileContent(...args) {
+    const content = originalGenerateReviewFileContent.apply(this, args);
+    return prettier.format(content, {
+      ...require('@spotify/prettier-config'),
+      parser: 'markdown',
+    });
+  };
 
 const PACKAGE_ROOTS = ['packages', 'plugins'];
 
@@ -91,7 +95,6 @@ const SKIPPED_PACKAGES = [
   'packages/cli',
   'packages/codemods',
   'packages/create-app',
-  'packages/docgen',
   'packages/e2e-test',
   'packages/storybook',
   'packages/techdocs-cli',
@@ -150,16 +153,11 @@ async function runApiExtraction({
   for (const packageDir of packageDirs) {
     console.log(`## Processing ${packageDir}`);
     const projectFolder = resolvePath(__dirname, '..', packageDir);
-    const packagePath = resolvePath(__dirname, `../${packageDir}/package.json`);
+    const packageFolder = resolvePath(__dirname, '../dist-types', packageDir);
 
     const extractorConfig = ExtractorConfig.prepare({
       configObject: {
-        mainEntryPointFilePath: resolvePath(
-          __dirname,
-          '../dist-types',
-          packageDir,
-          'src/index.d.ts',
-        ),
+        mainEntryPointFilePath: resolvePath(packageFolder, 'src/index.d.ts'),
         bundledPackages: [],
 
         compiler: {
@@ -190,7 +188,7 @@ async function runApiExtraction({
         },
 
         messages: {
-          // Silence warnings, as these will prevent the CI build to work
+          // Silence compiler warnings, as these will prevent the CI build to work
           compilerMessageReporting: {
             default: {
               logLevel: 'none' as ExtractorLogLevel.None,
@@ -200,14 +198,14 @@ async function runApiExtraction({
           },
           extractorMessageReporting: {
             default: {
-              logLevel: 'none' as ExtractorLogLevel.Warning,
-              // addToApiReportFile: true,
+              logLevel: 'warning' as ExtractorLogLevel.Warning,
+              addToApiReportFile: true,
             },
           },
           tsdocMessageReporting: {
             default: {
-              logLevel: 'none' as ExtractorLogLevel.Warning,
-              // addToApiReportFile: true,
+              logLevel: 'warning' as ExtractorLogLevel.Warning,
+              addToApiReportFile: true,
             },
           },
         },
@@ -217,9 +215,18 @@ async function runApiExtraction({
         projectFolder,
       },
       configObjectFullPath: projectFolder,
-      packageJsonFullPath: packagePath,
+      packageJsonFullPath: resolvePath(projectFolder, 'package.json'),
     });
 
+    // The `packageFolder` needs to point to the location within `dist-types` in order for relative
+    // paths to be logged. Unfortunately the `prepare` method above derives it from the `packageJsonFullPath`,
+    // which needs to point to the actual file, so we override `packageFolder` afterwards.
+    (
+      extractorConfig as {
+        packageFolder: string;
+      }
+    ).packageFolder = packageFolder;
+
     if (!compilerState) {
       compilerState = CompilerState.create(extractorConfig, {
         additionalEntryPoints: entryPoints,
@@ -296,10 +303,13 @@ async function runApiExtraction({
   }
 }
 
-function isComponentMember(member: any) {
-  // React components are annotated with @component, and we want to skip those
-  return Boolean(member.docComment.match(/\n\s*\**\s*@component/m));
-}
+/*
+WARNING: Bring a blanket if you're gonna read the code below
+
+There's some weird shit going on here, and it's because we cba
+forking rushstash to modify the api-documenter markdown generation,
+which otherwise is the recommended way to do customizations.
+*/
 
 async function buildDocs({
   inputDir,
@@ -308,6 +318,8 @@ async function buildDocs({
   inputDir: string;
   outputDir: string;
 }) {
+  // We start by constructing our own model from the files so that
+  // we get a change to modify them, as the model is otherwise read-only.
   const parseFile = async (filename: string): Promise<any> => {
     console.log(`Reading ${filename}`);
     return fs.readJson(resolvePath(inputDir, filename));
@@ -322,9 +334,7 @@ async function buildDocs({
 
   const newModel = new ApiModel();
   for (const serialized of serializedPackages) {
-    serialized.members[0].members = serialized.members[0].members.filter(
-      member => !isComponentMember(member),
-    );
+    // Add any docs filtering logic here
 
     const pkg = ApiPackage.deserialize(
       serialized,
@@ -333,10 +343,132 @@ async function buildDocs({
     newModel.addMember(pkg);
   }
 
-  await fs.remove(outputDir);
-  await fs.ensureDir(outputDir);
+  // The doc AST need to be extended with custom nodes if we want to
+  // add any extra content.
+  // This one is for the YAML front matter that we need for the microsite.
+  class DocFrontMatter extends DocNode {
+    static kind = 'DocFrontMatter';
 
-  const documenter = new MarkdownDocumenter({
+    public readonly id: string;
+    public readonly title: string;
+    public readonly description: string;
+
+    public constructor(
+      parameters: IDocNodeContainerParameters & {
+        id: string;
+        title: string;
+        description: string;
+      },
+    ) {
+      super(parameters);
+      this.id = parameters.id;
+      this.title = parameters.title;
+      this.description = parameters.description;
+    }
+
+    /** @override */
+    public get kind(): string {
+      return DocFrontMatter.kind;
+    }
+  }
+
+  // This is where we actually write the markdown and where we can hook
+  // in the rendering of our own nodes.
+  class CustomCustomMarkdownEmitter extends CustomMarkdownEmitter {
+    /** @override */
+    protected writeNode(
+      docNode: DocNode,
+      context: IMarkdownEmitterContext,
+      docNodeSiblings: boolean,
+    ): void {
+      switch (docNode.kind) {
+        case DocFrontMatter.kind: {
+          const node = docNode as DocFrontMatter;
+          context.writer.writeLine('---');
+          context.writer.writeLine(`id: ${node.id}`);
+          context.writer.writeLine(`title: ${node.title}`);
+          context.writer.writeLine(`description: ${node.description}`);
+          context.writer.writeLine('---');
+          context.writer.writeLine();
+          break;
+        }
+        default:
+          super.writeNode(docNode, context, docNodeSiblings);
+      }
+    }
+
+    /** @override */
+    emit(stringBuilder, docNode, options) {
+      // Hack to get rid of the leading comment of each file, since
+      // we want the front matter to come first
+      stringBuilder._chunks.length = 0;
+      return super.emit(stringBuilder, docNode, options);
+    }
+  }
+
+  class CustomMarkdownDocumenter extends (MarkdownDocumenter as any) {
+    constructor(options: IMarkdownDocumenterOptions) {
+      super(options);
+
+      // It's a strict model, we gotta register the allowed usage of our new node
+      this._tsdocConfiguration.docNodeManager.registerDocNodes(
+        '@backstage/docs',
+        [{ docNodeKind: DocFrontMatter.kind, constructor: DocFrontMatter }],
+      );
+      this._tsdocConfiguration.docNodeManager.registerAllowableChildren(
+        'Paragraph',
+        [DocFrontMatter.kind],
+      );
+
+      this._markdownEmitter = new CustomCustomMarkdownEmitter(newModel);
+    }
+
+    // We don't really get many chances to modify the generated AST
+    // so we hook in wherever we can. In this case we add the front matter
+    // just before writing the breadcrumbs at the top.
+    /** @override */
+    _writeBreadcrumb(output, apiItem) {
+      let title;
+      let description;
+
+      const name = apiItem.getScopedNameWithinPackage();
+      if (name) {
+        title = name;
+        description = `API reference for ${apiItem.getScopedNameWithinPackage()}`;
+      } else if (apiItem.kind === 'Model') {
+        title = 'Package Index';
+        description = 'Index of all Backstage Packages';
+      } else {
+        title = apiItem.name;
+        description = `API Reference for ${apiItem.name}`;
+      }
+
+      // Add our front matter
+      output.appendNodeInParagraph(
+        new DocFrontMatter({
+          configuration: this._tsdocConfiguration,
+          id: this._getFilenameForApiItem(apiItem).slice(0, -3),
+          title,
+          description,
+        }),
+      );
+
+      // Now write the actual breadcrumbs
+      super._writeBreadcrumb(output, apiItem);
+
+      // We wanna ignore the header that always gets written after the breadcrumb
+      // This otherwise becomes more or less a duplicate of the title in the front matter
+      const oldAppendNode = output.appendNode;
+      output.appendNode = () => {
+        output.appendNode = oldAppendNode;
+      };
+    }
+  }
+
+  // This is root of the documentation generation, but it's not directly
+  // responsible for generating markdown, it just constructs an AST that
+  // is the consumed by an emitter to actually write the files.
+  const documenter = new CustomMarkdownDocumenter({
     apiModel: newModel,
     documenterConfig: {
       outputTarget: 'markdown',
@@ -348,6 +480,9 @@ async function buildDocs({
     outputFolder: outputDir,
   });
 
+  // Clean up existing stuff and write ALL the docs!
+  await fs.remove(outputDir);
+  await fs.ensureDir(outputDir);
   documenter.generateFiles();
 }
 
diff --git a/scripts/verify-links.js b/scripts/verify-links.js
index d62aa75526..25bdaa2ac3 100755
--- a/scripts/verify-links.js
+++ b/scripts/verify-links.js
@@ -139,9 +139,8 @@ async function findExternalDocsLinks(dir) {
     const match = content.match(/---(?:\r|\n|.)*^id: (.*)$/m);
 
     // Both docs with an id and without should remove trailing /index
-    const realPath = (match
-      ? joinPath(dirname(url), match[1])
-      : url.replace(/\.md$/, '')
+    const realPath = (
+      match ? joinPath(dirname(url), match[1]) : url.replace(/\.md$/, '')
     ).replace(/\/index$/, '');
 
     paths.set(url, realPath);
diff --git a/yarn.lock b/yarn.lock
index 0400d0bc59..274b41d73e 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2,6 +2,13 @@
 # yarn lockfile v1
 
 
+"@acuris/aws-es-connection@^2.2.0":
+  version "2.2.0"
+  resolved "https://registry.npmjs.org/@acuris/aws-es-connection/-/aws-es-connection-2.2.0.tgz#43f7d6f3d15de0231642647a45eb84a8108e7d3e"
+  integrity sha512-xstECUJiWhj3kUK3aBpidoeHojXV611dcUewBwMG0hDRrRkIS+aj3xOhlfXcqYql7ITG84jgTfAidFqr8F+dnQ==
+  dependencies:
+    aws4 "^1.8.0"
+
 "@apidevtools/json-schema-ref-parser@^9.0.6":
   version "9.0.6"
   resolved "https://registry.npmjs.org/@apidevtools/json-schema-ref-parser/-/json-schema-ref-parser-9.0.6.tgz#5d9000a3ac1fd25404da886da6b266adcd99cf1c"
@@ -129,6 +136,26 @@
     "@azure/abort-controller" "^1.0.0"
     tslib "^2.0.0"
 
+"@azure/core-auth@^1.3.0":
+  version "1.3.2"
+  resolved "https://registry.npmjs.org/@azure/core-auth/-/core-auth-1.3.2.tgz#6a2c248576c26df365f6c7881ca04b7f6d08e3d0"
+  integrity sha512-7CU6DmCHIZp5ZPiZ9r3J17lTKMmYsm/zGvNkjArQwPkrLlZ1TZ+EUYfGgh2X31OLMVAQCTJZW4cXHJi02EbJnA==
+  dependencies:
+    "@azure/abort-controller" "^1.0.0"
+    tslib "^2.2.0"
+
+"@azure/core-client@^1.0.0":
+  version "1.2.2"
+  resolved "https://registry.npmjs.org/@azure/core-client/-/core-client-1.2.2.tgz#29c781e5ccd4da968cea89d3b909ab573a3a7bec"
+  integrity sha512-VYFR2qiczjBrSfpQSbo5s8FJhXaJFz2tP01MOrpNJaOqnSNEKcY35I79b1Ty7s8qHGvc5/YMJ745l3B7abncFQ==
+  dependencies:
+    "@azure/abort-controller" "^1.0.0"
+    "@azure/core-asynciterator-polyfill" "^1.0.0"
+    "@azure/core-auth" "^1.3.0"
+    "@azure/core-rest-pipeline" "^1.1.0"
+    "@azure/core-tracing" "1.0.0-preview.12"
+    tslib "^2.2.0"
+
 "@azure/core-http@^1.2.0":
   version "1.2.2"
   resolved "https://registry.npmjs.org/@azure/core-http/-/core-http-1.2.2.tgz#a6f7717184fd2657d3acabd1d64dfdc0bd531ce3"
@@ -167,6 +194,38 @@
   dependencies:
     "@azure/core-asynciterator-polyfill" "^1.0.0"
 
+"@azure/core-rest-pipeline@^1.1.0":
+  version "1.1.1"
+  resolved "https://registry.npmjs.org/@azure/core-rest-pipeline/-/core-rest-pipeline-1.1.1.tgz#53b4278f5c417c3da9f133511064375362b68a12"
+  integrity sha512-ObF8iTEDXIG7/NlL28ni9bR3XLJwgm2S3GWO4aNW6CsTCFVoY9HMdbBtN7xOB+pUQwifehifXNnootbzzuwJnw==
+  dependencies:
+    "@azure/abort-controller" "^1.0.0"
+    "@azure/core-auth" "^1.3.0"
+    "@azure/core-tracing" "1.0.0-preview.12"
+    "@azure/logger" "^1.0.0"
+    form-data "^3.0.0"
+    http-proxy-agent "^4.0.1"
+    https-proxy-agent "^5.0.0"
+    tslib "^2.2.0"
+    uuid "^8.3.0"
+
+"@azure/core-tracing@1.0.0-preview.10":
+  version "1.0.0-preview.10"
+  resolved "https://registry.npmjs.org/@azure/core-tracing/-/core-tracing-1.0.0-preview.10.tgz#e7060272145dddad4486765030d1b037cd52a8ea"
+  integrity sha512-iIwjtMwQnsxB7cYkugMx+s4W1nfy3+pT/ceo+uW1fv4YDgYe84nh+QP0fEC9IH/3UATLSWbIBemdMHzk2APUrw==
+  dependencies:
+    "@opencensus/web-types" "0.0.7"
+    "@opentelemetry/api" "^0.10.2"
+    tslib "^2.0.0"
+
+"@azure/core-tracing@1.0.0-preview.12":
+  version "1.0.0-preview.12"
+  resolved "https://registry.npmjs.org/@azure/core-tracing/-/core-tracing-1.0.0-preview.12.tgz#f53ff452c0742ad981c244f97d93d37ca2b5e139"
+  integrity sha512-nvo2Wc4EKZGN6eFu9n3U7OXmASmL8VxoPIH7xaD6OlQqi44bouF0YIi9ID5rEsKLiAU59IYx6M297nqWVMWPDg==
+  dependencies:
+    "@opentelemetry/api" "^1.0.0"
+    tslib "^2.2.0"
+
 "@azure/core-tracing@1.0.0-preview.9":
   version "1.0.0-preview.9"
   resolved "https://registry.npmjs.org/@azure/core-tracing/-/core-tracing-1.0.0-preview.9.tgz#84f3b85572013f9d9b85e1e5d89787aa180787eb"
@@ -176,26 +235,29 @@
     "@opentelemetry/api" "^0.10.2"
     tslib "^2.0.0"
 
-"@azure/identity@^1.2.2":
-  version "1.2.2"
-  resolved "https://registry.npmjs.org/@azure/identity/-/identity-1.2.2.tgz#00d673c8881778c55777fcc76e822b42466d3fc7"
-  integrity sha512-aYkeNXl52aEHW1iOZQJb3SC7Vvbu87f01iNT+pSVHwj09LpN9+gP/Lb9uoWy36Fgv9WlukM55LbjLSbb1Renqw==
+"@azure/identity@^1.5.0":
+  version "1.5.0"
+  resolved "https://registry.npmjs.org/@azure/identity/-/identity-1.5.0.tgz#0ac832b95adaac00b4718d92b43b2c9c5ab42d2d"
+  integrity sha512-djgywuWtX6720seqNOPmGM1hY54oHnjRT0MLIOzacMARTZuEtAIaFFvMPBlUIMQdtSGhdjH+/MS1/9PE8j83eA==
   dependencies:
-    "@azure/core-http" "^1.2.0"
-    "@azure/core-tracing" "1.0.0-preview.9"
+    "@azure/core-auth" "^1.3.0"
+    "@azure/core-client" "^1.0.0"
+    "@azure/core-rest-pipeline" "^1.1.0"
+    "@azure/core-tracing" "1.0.0-preview.12"
     "@azure/logger" "^1.0.0"
-    "@azure/msal-node" "1.0.0-beta.3"
-    "@opentelemetry/api" "^0.10.2"
+    "@azure/msal-node" "1.0.0-beta.6"
+    "@types/stoppable" "^1.1.0"
     axios "^0.21.1"
     events "^3.0.0"
     jws "^4.0.0"
     msal "^1.0.2"
     open "^7.0.0"
     qs "^6.7.0"
+    stoppable "^1.1.0"
     tslib "^2.0.0"
     uuid "^8.3.0"
   optionalDependencies:
-    keytar "^5.4.0"
+    keytar "^7.3.0"
 
 "@azure/logger@^1.0.0":
   version "1.0.1"
@@ -204,50 +266,43 @@
   dependencies:
     tslib "^2.0.0"
 
-"@azure/msal-common@^2.1.0":
-  version "2.1.0"
-  resolved "https://registry.npmjs.org/@azure/msal-common/-/msal-common-2.1.0.tgz#a4bc17e254d6ec524016f13267947dd4ff4a624d"
-  integrity sha512-Y1Id+jG59S3eY2ZQQtUA/lxwbRcgjcWaiib9YX+SwV3zeRauKfEiZT7l3z+lwV+T+Sst20F6l1mJsfQcfE7CEQ==
+"@azure/msal-common@^4.0.0", "@azure/msal-common@^4.4.0":
+  version "4.4.0"
+  resolved "https://registry.npmjs.org/@azure/msal-common/-/msal-common-4.4.0.tgz#818526042f78838ebc332fb735e7de64d8bccb45"
+  integrity sha512-Qrs33Ctt2KM7NxArFPIUKc8UbIcm7zYxJFdJeQ9k7HKBhVk3e88CUz1Mw33cS/Jr+YA1H02OAzHg++bJ+4SFyQ==
   dependencies:
     debug "^4.1.1"
 
-"@azure/msal-common@^4.3.0":
-  version "4.3.0"
-  resolved "https://registry.npmjs.org/@azure/msal-common/-/msal-common-4.3.0.tgz#b540e92748656724088bf77192e59943a93135bc"
-  integrity sha512-jFqUWe83wVb6O8cNGGBFg2QlKvqM1ezUgJTEV7kIsAPX0RXhGFE4B1DLNt6hCnkTXDbw+KGW0zgxOEr4MJQwLw==
+"@azure/msal-node@1.0.0-beta.6":
+  version "1.0.0-beta.6"
+  resolved "https://registry.npmjs.org/@azure/msal-node/-/msal-node-1.0.0-beta.6.tgz#da6bc3a3a861057c85586055960e069f162548ee"
+  integrity sha512-ZQI11Uz1j0HJohb9JZLRD8z0moVcPks1AFW4Q/Gcl67+QvH4aKEJti7fjCcipEEZYb/qzLSO8U6IZgPYytsiJQ==
   dependencies:
-    debug "^4.1.1"
-
-"@azure/msal-node@1.0.0-beta.3":
-  version "1.0.0-beta.3"
-  resolved "https://registry.npmjs.org/@azure/msal-node/-/msal-node-1.0.0-beta.3.tgz#c84c7948028b39e48b901f5fac35bdedcbc8772e"
-  integrity sha512-/KfYRfrsOIrZONvo/0Vi5umuqbPBtCWNtmRvkse64uI0C4CP/W4WXwRD42VMws/8LtKvr1I5rYlYgFzt5zDz/A==
-  dependencies:
-    "@azure/msal-common" "^2.1.0"
+    "@azure/msal-common" "^4.0.0"
     axios "^0.21.1"
     jsonwebtoken "^8.5.1"
     uuid "^8.3.0"
 
 "@azure/msal-node@^1.1.0":
-  version "1.1.0"
-  resolved "https://registry.npmjs.org/@azure/msal-node/-/msal-node-1.1.0.tgz#e472cfadead169f8832066ae6c2d6b8eef4e89e4"
-  integrity sha512-gMO9aZdWOzufp1PcdD5ID25DdS9eInxgeCqx4Tk8PVU6Z7RxJQhoMzS64cJhGdpYgeIQwKljtF0CLCcPFxew/w==
+  version "1.2.0"
+  resolved "https://registry.npmjs.org/@azure/msal-node/-/msal-node-1.2.0.tgz#d08a5fb3391436715cb37c6eb44816013bdfa11e"
+  integrity sha512-79o5n483vslc7Qegh9+0BsxODRmlk6YYjVdl9jvwmAuF+i+oylq57e7RVhTVocKCbLCIMOKARI14JyKdDbW0WA==
   dependencies:
-    "@azure/msal-common" "^4.3.0"
+    "@azure/msal-common" "^4.4.0"
     axios "^0.21.1"
     jsonwebtoken "^8.5.1"
     uuid "^8.3.0"
 
-"@azure/storage-blob@^12.4.0":
-  version "12.4.0"
-  resolved "https://registry.npmjs.org/@azure/storage-blob/-/storage-blob-12.4.0.tgz#7127ddd9f413105e2c3688691bc4c6245d0806b3"
-  integrity sha512-OnhVSoKD1HzBB79/rFzPbC4w9TdzFXeoOwkX+aIu3rb8qvN0VaqvUqZXSrBCyG2LcLyVkY4MPCJQBrmEUm9kvw==
+"@azure/storage-blob@^12.5.0":
+  version "12.5.0"
+  resolved "https://registry.npmjs.org/@azure/storage-blob/-/storage-blob-12.5.0.tgz#1ddd8837d9a15ebe355e795375d13b406f2cb496"
+  integrity sha512-DgoefgODst2IPkkQsNdhtYdyJgSsAZC1pEujO6aD5y7uFy5GnzhYliobSrp204jYRyK5XeJ9iiePmy/SPtTbLA==
   dependencies:
     "@azure/abort-controller" "^1.0.0"
     "@azure/core-http" "^1.2.0"
     "@azure/core-lro" "^1.0.2"
     "@azure/core-paging" "^1.1.1"
-    "@azure/core-tracing" "1.0.0-preview.9"
+    "@azure/core-tracing" "1.0.0-preview.10"
     "@azure/logger" "^1.0.0"
     "@opentelemetry/api" "^0.10.2"
     events "^3.0.0"
@@ -274,25 +329,52 @@
   dependencies:
     "@babel/highlight" "^7.10.4"
 
-"@babel/code-frame@7.8.3":
-  version "7.8.3"
-  resolved "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.8.3.tgz#33e25903d7481181534e12ec0a25f16b6fcf419e"
-  integrity sha512-a9gxpmdXtZEInkCSHUJDLHZVBgb1QS0jhss4cPP93EW7s+uC5bikET2twEF3KV+7rDblJcmNvTR7VJejqd2C2g==
-  dependencies:
-    "@babel/highlight" "^7.8.3"
-
-"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.10.4", "@babel/code-frame@^7.12.13", "@babel/code-frame@^7.5.5", "@babel/code-frame@^7.8.3":
+"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.10.4", "@babel/code-frame@^7.12.13", "@babel/code-frame@^7.5.5":
   version "7.12.13"
   resolved "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.12.13.tgz#dcfc826beef65e75c50e21d3837d7d95798dd658"
   integrity sha512-HV1Cm0Q3ZrpCR93tkWOYiuYIgLxZXZFVG2VgK+MBWjUqZTundupbfx2aXarXuw5Ko5aMcjtJgbSs4vUGBS5v6g==
   dependencies:
     "@babel/highlight" "^7.12.13"
 
+"@babel/code-frame@^7.14.5", "@babel/code-frame@^7.8.3":
+  version "7.14.5"
+  resolved "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.14.5.tgz#23b08d740e83f49c5e59945fbf1b43e80bbf4edb"
+  integrity sha512-9pzDqyc6OLDaqe+zbACgFkb6fKMNG6CObKpnYXChRsvYGyEdc7CA2BaqeOM+vOtCS5ndmJicPJhKAwYRI6UfFw==
+  dependencies:
+    "@babel/highlight" "^7.14.5"
+
 "@babel/compat-data@^7.13.11", "@babel/compat-data@^7.14.4":
   version "7.14.4"
   resolved "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.14.4.tgz#45720fe0cecf3fd42019e1d12cc3d27fadc98d58"
   integrity sha512-i2wXrWQNkH6JplJQGn3Rd2I4Pij8GdHkXwHMxm+zV5YG/Jci+bCNrWZEWC4o+umiDkRrRs4dVzH3X4GP7vyjQQ==
 
+"@babel/compat-data@^7.14.5", "@babel/compat-data@^7.14.7", "@babel/compat-data@^7.14.9":
+  version "7.14.9"
+  resolved "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.14.9.tgz#ac7996ceaafcf8f410119c8af0d1db4cf914a210"
+  integrity sha512-p3QjZmMGHDGdpcwEYYWu7i7oJShJvtgMjJeb0W95PPhSm++3lm8YXYOh45Y6iCN9PkZLTZ7CIX5nFrp7pw7TXw==
+
+"@babel/core@7.12.9":
+  version "7.12.9"
+  resolved "https://registry.npmjs.org/@babel/core/-/core-7.12.9.tgz#fd450c4ec10cdbb980e2928b7aa7a28484593fc8"
+  integrity sha512-gTXYh3M5wb7FRXQy+FErKFAv90BnlOuNn1QkCK2lREoPAjrQCO49+HVSrFoe5uakFAF5eenS75KbO2vQiLrTMQ==
+  dependencies:
+    "@babel/code-frame" "^7.10.4"
+    "@babel/generator" "^7.12.5"
+    "@babel/helper-module-transforms" "^7.12.1"
+    "@babel/helpers" "^7.12.5"
+    "@babel/parser" "^7.12.7"
+    "@babel/template" "^7.12.7"
+    "@babel/traverse" "^7.12.9"
+    "@babel/types" "^7.12.7"
+    convert-source-map "^1.7.0"
+    debug "^4.1.0"
+    gensync "^1.0.0-beta.1"
+    json5 "^2.1.2"
+    lodash "^4.17.19"
+    resolve "^1.3.2"
+    semver "^5.4.1"
+    source-map "^0.5.0"
+
 "@babel/core@^7.0.0", "@babel/core@^7.1.0", "@babel/core@^7.12.3", "@babel/core@^7.13.16", "@babel/core@^7.4.4", "@babel/core@^7.7.5":
   version "7.14.3"
   resolved "https://registry.npmjs.org/@babel/core/-/core-7.14.3.tgz#5395e30405f0776067fbd9cf0884f15bfb770a38"
@@ -314,6 +396,36 @@
     semver "^6.3.0"
     source-map "^0.5.0"
 
+"@babel/core@^7.12.10":
+  version "7.14.8"
+  resolved "https://registry.npmjs.org/@babel/core/-/core-7.14.8.tgz#20cdf7c84b5d86d83fac8710a8bc605a7ba3f010"
+  integrity sha512-/AtaeEhT6ErpDhInbXmjHcUQXH0L0TEgscfcxk1qbOvLuKCa5aZT0SOOtDKFY96/CLROwbLSKyFor6idgNaU4Q==
+  dependencies:
+    "@babel/code-frame" "^7.14.5"
+    "@babel/generator" "^7.14.8"
+    "@babel/helper-compilation-targets" "^7.14.5"
+    "@babel/helper-module-transforms" "^7.14.8"
+    "@babel/helpers" "^7.14.8"
+    "@babel/parser" "^7.14.8"
+    "@babel/template" "^7.14.5"
+    "@babel/traverse" "^7.14.8"
+    "@babel/types" "^7.14.8"
+    convert-source-map "^1.7.0"
+    debug "^4.1.0"
+    gensync "^1.0.0-beta.2"
+    json5 "^2.1.2"
+    semver "^6.3.0"
+    source-map "^0.5.0"
+
+"@babel/generator@^7.12.11", "@babel/generator@^7.12.5", "@babel/generator@^7.14.8", "@babel/generator@^7.14.9":
+  version "7.14.9"
+  resolved "https://registry.npmjs.org/@babel/generator/-/generator-7.14.9.tgz#23b19c597d38b4f7dc2e3fe42a69c88d9ecfaa16"
+  integrity sha512-4yoHbhDYzFa0GLfCzLp5GxH7vPPMAHdZjyE7M/OajM9037zhx0rf+iNsJwp4PT0MSFpwjG7BsHEbPkBQpZ6cYA==
+  dependencies:
+    "@babel/types" "^7.14.9"
+    jsesc "^2.5.1"
+    source-map "^0.5.0"
+
 "@babel/generator@^7.12.13", "@babel/generator@^7.14.2", "@babel/generator@^7.14.3", "@babel/generator@^7.5.0":
   version "7.14.3"
   resolved "https://registry.npmjs.org/@babel/generator/-/generator-7.14.3.tgz#0c2652d91f7bddab7cccc6ba8157e4f40dcedb91"
@@ -330,6 +442,13 @@
   dependencies:
     "@babel/types" "^7.12.13"
 
+"@babel/helper-annotate-as-pure@^7.14.5":
+  version "7.14.5"
+  resolved "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.14.5.tgz#7bf478ec3b71726d56a8ca5775b046fc29879e61"
+  integrity sha512-EivH9EgBIb+G8ij1B2jAwSH36WnGvkQSEC6CkX/6v6ZFlw5fVOHvsgGF4uiEHO2GzMvunZb6tDLQEQSdrdocrA==
+  dependencies:
+    "@babel/types" "^7.14.5"
+
 "@babel/helper-builder-binary-assignment-operator-visitor@^7.12.13":
   version "7.12.13"
   resolved "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.12.13.tgz#6bc20361c88b0a74d05137a65cac8d3cbf6f61fc"
@@ -338,6 +457,14 @@
     "@babel/helper-explode-assignable-expression" "^7.12.13"
     "@babel/types" "^7.12.13"
 
+"@babel/helper-builder-binary-assignment-operator-visitor@^7.14.5":
+  version "7.14.5"
+  resolved "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.14.5.tgz#b939b43f8c37765443a19ae74ad8b15978e0a191"
+  integrity sha512-YTA/Twn0vBXDVGJuAX6PwW7x5zQei1luDDo2Pl6q1qZ7hVNl0RZrhHCQG/ArGpR29Vl7ETiB8eJyrvpuRp300w==
+  dependencies:
+    "@babel/helper-explode-assignable-expression" "^7.14.5"
+    "@babel/types" "^7.14.5"
+
 "@babel/helper-compilation-targets@^7.13.0", "@babel/helper-compilation-targets@^7.13.16", "@babel/helper-compilation-targets@^7.14.4":
   version "7.14.4"
   resolved "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.14.4.tgz#33ebd0ffc34248051ee2089350a929ab02f2a516"
@@ -348,7 +475,17 @@
     browserslist "^4.16.6"
     semver "^6.3.0"
 
-"@babel/helper-create-class-features-plugin@^7.13.0", "@babel/helper-create-class-features-plugin@^7.14.0", "@babel/helper-create-class-features-plugin@^7.14.2", "@babel/helper-create-class-features-plugin@^7.14.3", "@babel/helper-create-class-features-plugin@^7.14.4":
+"@babel/helper-compilation-targets@^7.14.5":
+  version "7.14.5"
+  resolved "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.14.5.tgz#7a99c5d0967911e972fe2c3411f7d5b498498ecf"
+  integrity sha512-v+QtZqXEiOnpO6EYvlImB6zCD2Lel06RzOPzmkz/D/XgQiUu3C/Jb1LOqSt/AIA34TYi/Q+KlT8vTQrgdxkbLw==
+  dependencies:
+    "@babel/compat-data" "^7.14.5"
+    "@babel/helper-validator-option" "^7.14.5"
+    browserslist "^4.16.6"
+    semver "^6.3.0"
+
+"@babel/helper-create-class-features-plugin@^7.13.0", "@babel/helper-create-class-features-plugin@^7.14.0", "@babel/helper-create-class-features-plugin@^7.14.3", "@babel/helper-create-class-features-plugin@^7.14.4":
   version "7.14.4"
   resolved "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.14.4.tgz#abf888d836a441abee783c75229279748705dc42"
   integrity sha512-idr3pthFlDCpV+p/rMgGLGYIVtazeatrSOQk8YzO2pAepIjQhCN3myeihVg58ax2bbbGK9PUE1reFi7axOYIOw==
@@ -360,6 +497,18 @@
     "@babel/helper-replace-supers" "^7.14.4"
     "@babel/helper-split-export-declaration" "^7.12.13"
 
+"@babel/helper-create-class-features-plugin@^7.14.5", "@babel/helper-create-class-features-plugin@^7.14.6":
+  version "7.14.8"
+  resolved "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.14.8.tgz#a6f8c3de208b1e5629424a9a63567f56501955fc"
+  integrity sha512-bpYvH8zJBWzeqi1o+co8qOrw+EXzQ/0c74gVmY205AWXy9nifHrOg77y+1zwxX5lXE7Icq4sPlSQ4O2kWBrteQ==
+  dependencies:
+    "@babel/helper-annotate-as-pure" "^7.14.5"
+    "@babel/helper-function-name" "^7.14.5"
+    "@babel/helper-member-expression-to-functions" "^7.14.7"
+    "@babel/helper-optimise-call-expression" "^7.14.5"
+    "@babel/helper-replace-supers" "^7.14.5"
+    "@babel/helper-split-export-declaration" "^7.14.5"
+
 "@babel/helper-create-regexp-features-plugin@^7.12.13":
   version "7.14.3"
   resolved "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.14.3.tgz#149aa6d78c016e318c43e2409a0ae9c136a86688"
@@ -368,6 +517,28 @@
     "@babel/helper-annotate-as-pure" "^7.12.13"
     regexpu-core "^4.7.1"
 
+"@babel/helper-create-regexp-features-plugin@^7.14.5":
+  version "7.14.5"
+  resolved "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.14.5.tgz#c7d5ac5e9cf621c26057722fb7a8a4c5889358c4"
+  integrity sha512-TLawwqpOErY2HhWbGJ2nZT5wSkR192QpN+nBg1THfBfftrlvOh+WbhrxXCH4q4xJ9Gl16BGPR/48JA+Ryiho/A==
+  dependencies:
+    "@babel/helper-annotate-as-pure" "^7.14.5"
+    regexpu-core "^4.7.1"
+
+"@babel/helper-define-polyfill-provider@^0.1.5":
+  version "0.1.5"
+  resolved "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.1.5.tgz#3c2f91b7971b9fc11fe779c945c014065dea340e"
+  integrity sha512-nXuzCSwlJ/WKr8qxzW816gwyT6VZgiJG17zR40fou70yfAcqjoNyTLl/DQ+FExw5Hx5KNqshmN8Ldl/r2N7cTg==
+  dependencies:
+    "@babel/helper-compilation-targets" "^7.13.0"
+    "@babel/helper-module-imports" "^7.12.13"
+    "@babel/helper-plugin-utils" "^7.13.0"
+    "@babel/traverse" "^7.13.0"
+    debug "^4.1.1"
+    lodash.debounce "^4.0.8"
+    resolve "^1.14.2"
+    semver "^6.1.2"
+
 "@babel/helper-define-polyfill-provider@^0.2.2":
   version "0.2.3"
   resolved "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.2.3.tgz#0525edec5094653a282688d34d846e4c75e9c0b6"
@@ -389,6 +560,13 @@
   dependencies:
     "@babel/types" "^7.13.0"
 
+"@babel/helper-explode-assignable-expression@^7.14.5":
+  version "7.14.5"
+  resolved "https://registry.npmjs.org/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.14.5.tgz#8aa72e708205c7bb643e45c73b4386cdf2a1f645"
+  integrity sha512-Htb24gnGJdIGT4vnRKMdoXiOIlqOLmdiUYpAQ0mYfgVT/GDm8GOYhgi4GL+hMKrkiPRohO4ts34ELFsGAPQLDQ==
+  dependencies:
+    "@babel/types" "^7.14.5"
+
 "@babel/helper-function-name@^7.12.13", "@babel/helper-function-name@^7.14.2":
   version "7.14.2"
   resolved "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.14.2.tgz#397688b590760b6ef7725b5f0860c82427ebaac2"
@@ -398,6 +576,15 @@
     "@babel/template" "^7.12.13"
     "@babel/types" "^7.14.2"
 
+"@babel/helper-function-name@^7.14.5":
+  version "7.14.5"
+  resolved "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.14.5.tgz#89e2c474972f15d8e233b52ee8c480e2cfcd50c4"
+  integrity sha512-Gjna0AsXWfFvrAuX+VKcN/aNNWonizBj39yGwUzVDVTlMYJMK2Wp6xdpy72mfArFq5uK+NOuexfzZlzI1z9+AQ==
+  dependencies:
+    "@babel/helper-get-function-arity" "^7.14.5"
+    "@babel/template" "^7.14.5"
+    "@babel/types" "^7.14.5"
+
 "@babel/helper-get-function-arity@^7.12.13":
   version "7.12.13"
   resolved "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.12.13.tgz#bc63451d403a3b3082b97e1d8b3fe5bd4091e583"
@@ -405,6 +592,13 @@
   dependencies:
     "@babel/types" "^7.12.13"
 
+"@babel/helper-get-function-arity@^7.14.5":
+  version "7.14.5"
+  resolved "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.14.5.tgz#25fbfa579b0937eee1f3b805ece4ce398c431815"
+  integrity sha512-I1Db4Shst5lewOM4V+ZKJzQ0JGGaZ6VY1jYvMghRjqs6DWgxLCIyFt30GlnKkfUeFLpJt2vzbMVEXVSXlIFYUg==
+  dependencies:
+    "@babel/types" "^7.14.5"
+
 "@babel/helper-hoist-variables@^7.13.0":
   version "7.13.16"
   resolved "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.13.16.tgz#1b1651249e94b51f8f0d33439843e33e39775b30"
@@ -413,6 +607,13 @@
     "@babel/traverse" "^7.13.15"
     "@babel/types" "^7.13.16"
 
+"@babel/helper-hoist-variables@^7.14.5":
+  version "7.14.5"
+  resolved "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.14.5.tgz#e0dd27c33a78e577d7c8884916a3e7ef1f7c7f8d"
+  integrity sha512-R1PXiz31Uc0Vxy4OEOm07x0oSjKAdPPCh3tPivn/Eo8cvz6gveAeuyUUPB21Hoiif0uoPQSSdhIPS3352nvdyQ==
+  dependencies:
+    "@babel/types" "^7.14.5"
+
 "@babel/helper-member-expression-to-functions@^7.13.12":
   version "7.13.12"
   resolved "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.13.12.tgz#dfe368f26d426a07299d8d6513821768216e6d72"
@@ -420,6 +621,13 @@
   dependencies:
     "@babel/types" "^7.13.12"
 
+"@babel/helper-member-expression-to-functions@^7.14.5", "@babel/helper-member-expression-to-functions@^7.14.7":
+  version "7.14.7"
+  resolved "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.14.7.tgz#97e56244beb94211fe277bd818e3a329c66f7970"
+  integrity sha512-TMUt4xKxJn6ccjcOW7c4hlwyJArizskAhoSTOCkA0uZ+KghIaci0Qg9R043kUMWI9mtQfgny+NQ5QATnZ+paaA==
+  dependencies:
+    "@babel/types" "^7.14.5"
+
 "@babel/helper-module-imports@^7.0.0", "@babel/helper-module-imports@^7.12.13", "@babel/helper-module-imports@^7.13.12":
   version "7.13.12"
   resolved "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.13.12.tgz#c6a369a6f3621cb25da014078684da9196b61977"
@@ -427,6 +635,27 @@
   dependencies:
     "@babel/types" "^7.13.12"
 
+"@babel/helper-module-imports@^7.14.5":
+  version "7.14.5"
+  resolved "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.14.5.tgz#6d1a44df6a38c957aa7c312da076429f11b422f3"
+  integrity sha512-SwrNHu5QWS84XlHwGYPDtCxcA0hrSlL2yhWYLgeOc0w7ccOl2qv4s/nARI0aYZW+bSwAL5CukeXA47B/1NKcnQ==
+  dependencies:
+    "@babel/types" "^7.14.5"
+
+"@babel/helper-module-transforms@^7.12.1", "@babel/helper-module-transforms@^7.14.5", "@babel/helper-module-transforms@^7.14.8":
+  version "7.14.8"
+  resolved "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.14.8.tgz#d4279f7e3fd5f4d5d342d833af36d4dd87d7dc49"
+  integrity sha512-RyE+NFOjXn5A9YU1dkpeBaduagTlZ0+fccnIcAGbv1KGUlReBj7utF7oEth8IdIBQPcux0DDgW5MFBH2xu9KcA==
+  dependencies:
+    "@babel/helper-module-imports" "^7.14.5"
+    "@babel/helper-replace-supers" "^7.14.5"
+    "@babel/helper-simple-access" "^7.14.8"
+    "@babel/helper-split-export-declaration" "^7.14.5"
+    "@babel/helper-validator-identifier" "^7.14.8"
+    "@babel/template" "^7.14.5"
+    "@babel/traverse" "^7.14.8"
+    "@babel/types" "^7.14.8"
+
 "@babel/helper-module-transforms@^7.13.0", "@babel/helper-module-transforms@^7.14.0", "@babel/helper-module-transforms@^7.14.2":
   version "7.14.2"
   resolved "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.14.2.tgz#ac1cc30ee47b945e3e0c4db12fa0c5389509dfe5"
@@ -448,11 +677,28 @@
   dependencies:
     "@babel/types" "^7.12.13"
 
+"@babel/helper-optimise-call-expression@^7.14.5":
+  version "7.14.5"
+  resolved "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.14.5.tgz#f27395a8619e0665b3f0364cddb41c25d71b499c"
+  integrity sha512-IqiLIrODUOdnPU9/F8ib1Fx2ohlgDhxnIDU7OEVi+kAbEZcyiF7BLU8W6PfvPi9LzztjS7kcbzbmL7oG8kD6VA==
+  dependencies:
+    "@babel/types" "^7.14.5"
+
+"@babel/helper-plugin-utils@7.10.4":
+  version "7.10.4"
+  resolved "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.4.tgz#2f75a831269d4f677de49986dff59927533cf375"
+  integrity sha512-O4KCvQA6lLiMU9l2eawBPMf1xPP8xPfB3iEQw150hOVTqj/rfXz0ThTb4HEzqQfs2Bmo5Ay8BzxfzVtBrr9dVg==
+
 "@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.12.13", "@babel/helper-plugin-utils@^7.13.0", "@babel/helper-plugin-utils@^7.8.0", "@babel/helper-plugin-utils@^7.8.3":
   version "7.13.0"
   resolved "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.13.0.tgz#806526ce125aed03373bc416a828321e3a6a33af"
   integrity sha512-ZPafIPSwzUlAoWT8DKs1W2VyF2gOWthGd5NGFMsBcMMol+ZhK+EQY/e6V96poa6PA/Bh+C9plWN0hXO1uB8AfQ==
 
+"@babel/helper-plugin-utils@^7.14.5":
+  version "7.14.5"
+  resolved "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.14.5.tgz#5ac822ce97eec46741ab70a517971e443a70c5a9"
+  integrity sha512-/37qQCE3K0vvZKwoK4XU/irIJQdIfCJuhU5eKnNxpFDsOkgFaUAwbv+RYw6eYgsC0E4hS7r5KqGULUogqui0fQ==
+
 "@babel/helper-remap-async-to-generator@^7.13.0":
   version "7.13.0"
   resolved "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.13.0.tgz#376a760d9f7b4b2077a9dd05aa9c3927cadb2209"
@@ -462,6 +708,15 @@
     "@babel/helper-wrap-function" "^7.13.0"
     "@babel/types" "^7.13.0"
 
+"@babel/helper-remap-async-to-generator@^7.14.5":
+  version "7.14.5"
+  resolved "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.14.5.tgz#51439c913612958f54a987a4ffc9ee587a2045d6"
+  integrity sha512-rLQKdQU+HYlxBwQIj8dk4/0ENOUEhA/Z0l4hN8BexpvmSMN9oA9EagjnhnDpNsRdWCfjwa4mn/HyBXO9yhQP6A==
+  dependencies:
+    "@babel/helper-annotate-as-pure" "^7.14.5"
+    "@babel/helper-wrap-function" "^7.14.5"
+    "@babel/types" "^7.14.5"
+
 "@babel/helper-replace-supers@^7.12.13", "@babel/helper-replace-supers@^7.13.12", "@babel/helper-replace-supers@^7.14.4":
   version "7.14.4"
   resolved "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.14.4.tgz#b2ab16875deecfff3ddfcd539bc315f72998d836"
@@ -472,6 +727,16 @@
     "@babel/traverse" "^7.14.2"
     "@babel/types" "^7.14.4"
 
+"@babel/helper-replace-supers@^7.14.5":
+  version "7.14.5"
+  resolved "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.14.5.tgz#0ecc0b03c41cd567b4024ea016134c28414abb94"
+  integrity sha512-3i1Qe9/8x/hCHINujn+iuHy+mMRLoc77b2nI9TB0zjH1hvn9qGlXjWlggdwUcju36PkPCy/lpM7LLUdcTyH4Ow==
+  dependencies:
+    "@babel/helper-member-expression-to-functions" "^7.14.5"
+    "@babel/helper-optimise-call-expression" "^7.14.5"
+    "@babel/traverse" "^7.14.5"
+    "@babel/types" "^7.14.5"
+
 "@babel/helper-simple-access@^7.13.12":
   version "7.13.12"
   resolved "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.13.12.tgz#dd6c538afb61819d205a012c31792a39c7a5eaf6"
@@ -479,6 +744,13 @@
   dependencies:
     "@babel/types" "^7.13.12"
 
+"@babel/helper-simple-access@^7.14.5", "@babel/helper-simple-access@^7.14.8":
+  version "7.14.8"
+  resolved "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.14.8.tgz#82e1fec0644a7e775c74d305f212c39f8fe73924"
+  integrity sha512-TrFN4RHh9gnWEU+s7JloIho2T76GPwRHhdzOWLqTrMnlas8T9O7ec+oEDNsRXndOmru9ymH9DFrEOxpzPoSbdg==
+  dependencies:
+    "@babel/types" "^7.14.8"
+
 "@babel/helper-skip-transparent-expression-wrappers@^7.12.1":
   version "7.12.1"
   resolved "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.12.1.tgz#462dc63a7e435ade8468385c63d2b84cce4b3cbf"
@@ -486,6 +758,13 @@
   dependencies:
     "@babel/types" "^7.12.1"
 
+"@babel/helper-skip-transparent-expression-wrappers@^7.14.5":
+  version "7.14.5"
+  resolved "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.14.5.tgz#96f486ac050ca9f44b009fbe5b7d394cab3a0ee4"
+  integrity sha512-dmqZB7mrb94PZSAOYtr+ZN5qt5owZIAgqtoTuqiFbHFtxgEcmQlRJVI+bO++fciBunXtB6MK7HrzrfcAzIz2NQ==
+  dependencies:
+    "@babel/types" "^7.14.5"
+
 "@babel/helper-split-export-declaration@^7.12.13":
   version "7.12.13"
   resolved "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.12.13.tgz#e9430be00baf3e88b0e13e6f9d4eaf2136372b05"
@@ -493,16 +772,33 @@
   dependencies:
     "@babel/types" "^7.12.13"
 
+"@babel/helper-split-export-declaration@^7.14.5":
+  version "7.14.5"
+  resolved "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.14.5.tgz#22b23a54ef51c2b7605d851930c1976dd0bc693a"
+  integrity sha512-hprxVPu6e5Kdp2puZUmvOGjaLv9TCe58E/Fl6hRq4YiVQxIcNvuq6uTM2r1mT/oPskuS9CgR+I94sqAYv0NGKA==
+  dependencies:
+    "@babel/types" "^7.14.5"
+
 "@babel/helper-validator-identifier@^7.12.11", "@babel/helper-validator-identifier@^7.14.0":
   version "7.14.0"
   resolved "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.14.0.tgz#d26cad8a47c65286b15df1547319a5d0bcf27288"
   integrity sha512-V3ts7zMSu5lfiwWDVWzRDGIN+lnCEUdaXgtVHJgLb1rGaA6jMrtB9EmE7L18foXJIE8Un/A/h6NJfGQp/e1J4A==
 
+"@babel/helper-validator-identifier@^7.14.5", "@babel/helper-validator-identifier@^7.14.8", "@babel/helper-validator-identifier@^7.14.9":
+  version "7.14.9"
+  resolved "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.14.9.tgz#6654d171b2024f6d8ee151bf2509699919131d48"
+  integrity sha512-pQYxPY0UP6IHISRitNe8bsijHex4TWZXi2HwKVsjPiltzlhse2znVcm9Ace510VT1kxIHjGJCZZQBX2gJDbo0g==
+
 "@babel/helper-validator-option@^7.12.17":
   version "7.12.17"
   resolved "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.12.17.tgz#d1fbf012e1a79b7eebbfdc6d270baaf8d9eb9831"
   integrity sha512-TopkMDmLzq8ngChwRlyjR6raKD6gMSae4JdYDB8bByKreQgG0RBTuKe9LRxW3wFtUnjxOPRKBDwEH6Mg5KeDfw==
 
+"@babel/helper-validator-option@^7.14.5":
+  version "7.14.5"
+  resolved "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.14.5.tgz#6e72a1fff18d5dfcb878e1e62f1a021c4b72d5a3"
+  integrity sha512-OX8D5eeX4XwcroVW45NMvoYaIuFI+GQpA2a8Gi+X/U/cDUIRsV37qQfF905F0htTRCREQIB4KqPeaveRJUl3Ow==
+
 "@babel/helper-wrap-function@^7.13.0":
   version "7.13.0"
   resolved "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.13.0.tgz#bdb5c66fda8526ec235ab894ad53a1235c79fcc4"
@@ -513,6 +809,25 @@
     "@babel/traverse" "^7.13.0"
     "@babel/types" "^7.13.0"
 
+"@babel/helper-wrap-function@^7.14.5":
+  version "7.14.5"
+  resolved "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.14.5.tgz#5919d115bf0fe328b8a5d63bcb610f51601f2bff"
+  integrity sha512-YEdjTCq+LNuNS1WfxsDCNpgXkJaIyqco6DAelTUjT4f2KIWC1nBcaCaSdHTBqQVLnTBexBcVcFhLSU1KnYuePQ==
+  dependencies:
+    "@babel/helper-function-name" "^7.14.5"
+    "@babel/template" "^7.14.5"
+    "@babel/traverse" "^7.14.5"
+    "@babel/types" "^7.14.5"
+
+"@babel/helpers@^7.12.5", "@babel/helpers@^7.14.8":
+  version "7.14.8"
+  resolved "https://registry.npmjs.org/@babel/helpers/-/helpers-7.14.8.tgz#839f88f463025886cff7f85a35297007e2da1b77"
+  integrity sha512-ZRDmI56pnV+p1dH6d+UN6GINGz7Krps3+270qqI9UJ4wxYThfAIcI5i7j5vXC4FJ3Wap+S9qcebxeYiqn87DZw==
+  dependencies:
+    "@babel/template" "^7.14.5"
+    "@babel/traverse" "^7.14.8"
+    "@babel/types" "^7.14.8"
+
 "@babel/helpers@^7.14.0":
   version "7.14.0"
   resolved "https://registry.npmjs.org/@babel/helpers/-/helpers-7.14.0.tgz#ea9b6be9478a13d6f961dbb5f36bf75e2f3b8f62"
@@ -522,7 +837,7 @@
     "@babel/traverse" "^7.14.0"
     "@babel/types" "^7.14.0"
 
-"@babel/highlight@^7.0.0", "@babel/highlight@^7.10.4", "@babel/highlight@^7.12.13", "@babel/highlight@^7.8.3":
+"@babel/highlight@^7.0.0", "@babel/highlight@^7.10.4", "@babel/highlight@^7.12.13":
   version "7.14.0"
   resolved "https://registry.npmjs.org/@babel/highlight/-/highlight-7.14.0.tgz#3197e375711ef6bf834e67d0daec88e4f46113cf"
   integrity sha512-YSCOwxvTYEIMSGaBQb5kDDsCopDdiUGsqpatp3fOlI4+2HQSkTmEVWnVuySdAC5EWCqSWWTv0ib63RjR7dTBdg==
@@ -531,6 +846,15 @@
     chalk "^2.0.0"
     js-tokens "^4.0.0"
 
+"@babel/highlight@^7.14.5":
+  version "7.14.5"
+  resolved "https://registry.npmjs.org/@babel/highlight/-/highlight-7.14.5.tgz#6861a52f03966405001f6aa534a01a24d99e8cd9"
+  integrity sha512-qf9u2WFWVV0MppaL877j2dBtQIDgmidgjGk5VIMw3OadXvYaXn66U1BFlH2t4+t3i+8PhedppRv+i40ABzd+gg==
+  dependencies:
+    "@babel/helper-validator-identifier" "^7.14.5"
+    chalk "^2.0.0"
+    js-tokens "^4.0.0"
+
 "@babel/parser@7.12.16":
   version "7.12.16"
   resolved "https://registry.npmjs.org/@babel/parser/-/parser-7.12.16.tgz#cc31257419d2c3189d394081635703f549fc1ed4"
@@ -541,6 +865,11 @@
   resolved "https://registry.npmjs.org/@babel/parser/-/parser-7.14.4.tgz#a5c560d6db6cd8e6ed342368dea8039232cbab18"
   integrity sha512-ArliyUsWDUqEGfWcmzpGUzNfLxTdTp6WU4IuP6QFSp9gGfWS6boxFCkJSJ/L4+RG8z/FnIU3WxCk6hPL9SSWeA==
 
+"@babel/parser@^7.12.11", "@babel/parser@^7.12.7", "@babel/parser@^7.14.5", "@babel/parser@^7.14.8", "@babel/parser@^7.14.9":
+  version "7.14.9"
+  resolved "https://registry.npmjs.org/@babel/parser/-/parser-7.14.9.tgz#596c1ad67608070058ebf8df50c1eaf65db895a4"
+  integrity sha512-RdUTOseXJ8POjjOeEBEvNMIZU/nm4yu2rufRkcibzkkg7DmQvXU8v3M4Xk9G7uuI86CDGkKcuDWgioqZm+mScQ==
+
 "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@^7.13.12":
   version "7.13.12"
   resolved "https://registry.npmjs.org/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.13.12.tgz#a3484d84d0b549f3fc916b99ee4783f26fabad2a"
@@ -550,6 +879,15 @@
     "@babel/helper-skip-transparent-expression-wrappers" "^7.12.1"
     "@babel/plugin-proposal-optional-chaining" "^7.13.12"
 
+"@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@^7.14.5":
+  version "7.14.5"
+  resolved "https://registry.npmjs.org/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.14.5.tgz#4b467302e1548ed3b1be43beae2cc9cf45e0bb7e"
+  integrity sha512-ZoJS2XCKPBfTmL122iP6NM9dOg+d4lc9fFk3zxc8iDjvt8Pk4+TlsHSKhIPf6X+L5ORCdBzqMZDjL/WHj7WknQ==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.14.5"
+    "@babel/helper-skip-transparent-expression-wrappers" "^7.14.5"
+    "@babel/plugin-proposal-optional-chaining" "^7.14.5"
+
 "@babel/plugin-proposal-async-generator-functions@^7.14.2":
   version "7.14.2"
   resolved "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.14.2.tgz#3a2085abbf5d5f962d480dbc81347385ed62eb1e"
@@ -559,6 +897,15 @@
     "@babel/helper-remap-async-to-generator" "^7.13.0"
     "@babel/plugin-syntax-async-generators" "^7.8.4"
 
+"@babel/plugin-proposal-async-generator-functions@^7.14.9":
+  version "7.14.9"
+  resolved "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.14.9.tgz#7028dc4fa21dc199bbacf98b39bab1267d0eaf9a"
+  integrity sha512-d1lnh+ZnKrFKwtTYdw320+sQWCTwgkB9fmUhNXRADA4akR6wLjaruSGnIEUjpt9HCOwTr4ynFTKu19b7rFRpmw==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.14.5"
+    "@babel/helper-remap-async-to-generator" "^7.14.5"
+    "@babel/plugin-syntax-async-generators" "^7.8.4"
+
 "@babel/plugin-proposal-class-properties@^7.0.0", "@babel/plugin-proposal-class-properties@^7.12.1", "@babel/plugin-proposal-class-properties@^7.13.0":
   version "7.13.0"
   resolved "https://registry.npmjs.org/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.13.0.tgz#146376000b94efd001e57a40a88a525afaab9f37"
@@ -567,6 +914,14 @@
     "@babel/helper-create-class-features-plugin" "^7.13.0"
     "@babel/helper-plugin-utils" "^7.13.0"
 
+"@babel/plugin-proposal-class-properties@^7.14.5":
+  version "7.14.5"
+  resolved "https://registry.npmjs.org/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.14.5.tgz#40d1ee140c5b1e31a350f4f5eed945096559b42e"
+  integrity sha512-q/PLpv5Ko4dVc1LYMpCY7RVAAO4uk55qPwrIuJ5QJ8c6cVuAmhu7I/49JOppXL6gXf7ZHzpRVEUZdYoPLM04Gg==
+  dependencies:
+    "@babel/helper-create-class-features-plugin" "^7.14.5"
+    "@babel/helper-plugin-utils" "^7.14.5"
+
 "@babel/plugin-proposal-class-static-block@^7.14.3":
   version "7.14.3"
   resolved "https://registry.npmjs.org/@babel/plugin-proposal-class-static-block/-/plugin-proposal-class-static-block-7.14.3.tgz#5a527e2cae4a4753119c3a3e7f64ecae8ccf1360"
@@ -576,14 +931,23 @@
     "@babel/helper-plugin-utils" "^7.13.0"
     "@babel/plugin-syntax-class-static-block" "^7.12.13"
 
-"@babel/plugin-proposal-decorators@^7.12.1":
-  version "7.14.2"
-  resolved "https://registry.npmjs.org/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.14.2.tgz#e68c3c5e4a6a08834456568256fc3e71b93590cf"
-  integrity sha512-LauAqDd/VjQDtae58QgBcEOE42NNP+jB2OE+XeC3KBI/E+BhhRjtr5viCIrj1hmu1YvrguLipIPRJZmS5yUcFw==
+"@babel/plugin-proposal-class-static-block@^7.14.5":
+  version "7.14.5"
+  resolved "https://registry.npmjs.org/@babel/plugin-proposal-class-static-block/-/plugin-proposal-class-static-block-7.14.5.tgz#158e9e10d449c3849ef3ecde94a03d9f1841b681"
+  integrity sha512-KBAH5ksEnYHCegqseI5N9skTdxgJdmDoAOc0uXa+4QMYKeZD0w5IARh4FMlTNtaHhbB8v+KzMdTgxMMzsIy6Yg==
   dependencies:
-    "@babel/helper-create-class-features-plugin" "^7.14.2"
-    "@babel/helper-plugin-utils" "^7.13.0"
-    "@babel/plugin-syntax-decorators" "^7.12.13"
+    "@babel/helper-create-class-features-plugin" "^7.14.5"
+    "@babel/helper-plugin-utils" "^7.14.5"
+    "@babel/plugin-syntax-class-static-block" "^7.14.5"
+
+"@babel/plugin-proposal-decorators@^7.12.12":
+  version "7.14.5"
+  resolved "https://registry.npmjs.org/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.14.5.tgz#59bc4dfc1d665b5a6749cf798ff42297ed1b2c1d"
+  integrity sha512-LYz5nvQcvYeRVjui1Ykn28i+3aUiXwQ/3MGoEy0InTaz1pJo/lAzmIDXX+BQny/oufgHzJ6vnEEiXQ8KZjEVFg==
+  dependencies:
+    "@babel/helper-create-class-features-plugin" "^7.14.5"
+    "@babel/helper-plugin-utils" "^7.14.5"
+    "@babel/plugin-syntax-decorators" "^7.14.5"
 
 "@babel/plugin-proposal-dynamic-import@^7.14.2":
   version "7.14.2"
@@ -593,6 +957,14 @@
     "@babel/helper-plugin-utils" "^7.13.0"
     "@babel/plugin-syntax-dynamic-import" "^7.8.3"
 
+"@babel/plugin-proposal-dynamic-import@^7.14.5":
+  version "7.14.5"
+  resolved "https://registry.npmjs.org/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.14.5.tgz#0c6617df461c0c1f8fff3b47cd59772360101d2c"
+  integrity sha512-ExjiNYc3HDN5PXJx+bwC50GIx/KKanX2HiggnIUAYedbARdImiCU4RhhHfdf0Kd7JNXGpsBBBCOm+bBVy3Gb0g==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.14.5"
+    "@babel/plugin-syntax-dynamic-import" "^7.8.3"
+
 "@babel/plugin-proposal-export-default-from@^7.12.1":
   version "7.12.13"
   resolved "https://registry.npmjs.org/@babel/plugin-proposal-export-default-from/-/plugin-proposal-export-default-from-7.12.13.tgz#f110284108a9b2b96f01b15b3be9e54c2610a989"
@@ -609,6 +981,14 @@
     "@babel/helper-plugin-utils" "^7.13.0"
     "@babel/plugin-syntax-export-namespace-from" "^7.8.3"
 
+"@babel/plugin-proposal-export-namespace-from@^7.14.5":
+  version "7.14.5"
+  resolved "https://registry.npmjs.org/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.14.5.tgz#dbad244310ce6ccd083072167d8cea83a52faf76"
+  integrity sha512-g5POA32bXPMmSBu5Dx/iZGLGnKmKPc5AiY7qfZgurzrCYgIztDlHFbznSNCoQuv57YQLnQfaDi7dxCtLDIdXdA==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.14.5"
+    "@babel/plugin-syntax-export-namespace-from" "^7.8.3"
+
 "@babel/plugin-proposal-json-strings@^7.14.2":
   version "7.14.2"
   resolved "https://registry.npmjs.org/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.14.2.tgz#830b4e2426a782e8b2878fbfe2cba85b70cbf98c"
@@ -617,6 +997,14 @@
     "@babel/helper-plugin-utils" "^7.13.0"
     "@babel/plugin-syntax-json-strings" "^7.8.3"
 
+"@babel/plugin-proposal-json-strings@^7.14.5":
+  version "7.14.5"
+  resolved "https://registry.npmjs.org/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.14.5.tgz#38de60db362e83a3d8c944ac858ddf9f0c2239eb"
+  integrity sha512-NSq2fczJYKVRIsUJyNxrVUMhB27zb7N7pOFGQOhBKJrChbGcgEAqyZrmZswkPk18VMurEeJAaICbfm57vUeTbQ==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.14.5"
+    "@babel/plugin-syntax-json-strings" "^7.8.3"
+
 "@babel/plugin-proposal-logical-assignment-operators@^7.14.2":
   version "7.14.2"
   resolved "https://registry.npmjs.org/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.14.2.tgz#222348c080a1678e0e74ea63fe76f275882d1fd7"
@@ -625,6 +1013,14 @@
     "@babel/helper-plugin-utils" "^7.13.0"
     "@babel/plugin-syntax-logical-assignment-operators" "^7.10.4"
 
+"@babel/plugin-proposal-logical-assignment-operators@^7.14.5":
+  version "7.14.5"
+  resolved "https://registry.npmjs.org/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.14.5.tgz#6e6229c2a99b02ab2915f82571e0cc646a40c738"
+  integrity sha512-YGn2AvZAo9TwyhlLvCCWxD90Xq8xJ4aSgaX3G5D/8DW94L8aaT+dS5cSP+Z06+rCJERGSr9GxMBZ601xoc2taw==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.14.5"
+    "@babel/plugin-syntax-logical-assignment-operators" "^7.10.4"
+
 "@babel/plugin-proposal-nullish-coalescing-operator@^7.12.1", "@babel/plugin-proposal-nullish-coalescing-operator@^7.13.8", "@babel/plugin-proposal-nullish-coalescing-operator@^7.14.2":
   version "7.14.2"
   resolved "https://registry.npmjs.org/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.14.2.tgz#425b11dc62fc26939a2ab42cbba680bdf5734546"
@@ -633,6 +1029,14 @@
     "@babel/helper-plugin-utils" "^7.13.0"
     "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.3"
 
+"@babel/plugin-proposal-nullish-coalescing-operator@^7.14.5":
+  version "7.14.5"
+  resolved "https://registry.npmjs.org/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.14.5.tgz#ee38589ce00e2cc59b299ec3ea406fcd3a0fdaf6"
+  integrity sha512-gun/SOnMqjSb98Nkaq2rTKMwervfdAoz6NphdY0vTfuzMfryj+tDGb2n6UkDKwez+Y8PZDhE3D143v6Gepp4Hg==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.14.5"
+    "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.3"
+
 "@babel/plugin-proposal-numeric-separator@^7.14.2":
   version "7.14.2"
   resolved "https://registry.npmjs.org/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.14.2.tgz#82b4cc06571143faf50626104b335dd71baa4f9e"
@@ -641,6 +1045,23 @@
     "@babel/helper-plugin-utils" "^7.13.0"
     "@babel/plugin-syntax-numeric-separator" "^7.10.4"
 
+"@babel/plugin-proposal-numeric-separator@^7.14.5":
+  version "7.14.5"
+  resolved "https://registry.npmjs.org/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.14.5.tgz#83631bf33d9a51df184c2102a069ac0c58c05f18"
+  integrity sha512-yiclALKe0vyZRZE0pS6RXgjUOt87GWv6FYa5zqj15PvhOGFO69R5DusPlgK/1K5dVnCtegTiWu9UaBSrLLJJBg==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.14.5"
+    "@babel/plugin-syntax-numeric-separator" "^7.10.4"
+
+"@babel/plugin-proposal-object-rest-spread@7.12.1":
+  version "7.12.1"
+  resolved "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.12.1.tgz#def9bd03cea0f9b72283dac0ec22d289c7691069"
+  integrity sha512-s6SowJIjzlhx8o7lsFx5zmY4At6CTtDvgNQDdPzkBQucle58A6b/TTeEBYtyDgmcXjUTM+vE8YOGHZzzbc/ioA==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.10.4"
+    "@babel/plugin-syntax-object-rest-spread" "^7.8.0"
+    "@babel/plugin-transform-parameters" "^7.12.1"
+
 "@babel/plugin-proposal-object-rest-spread@^7.0.0", "@babel/plugin-proposal-object-rest-spread@^7.12.1", "@babel/plugin-proposal-object-rest-spread@^7.14.4":
   version "7.14.4"
   resolved "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.14.4.tgz#0e2b4de419915dc0b409378e829412e2031777c4"
@@ -652,6 +1073,17 @@
     "@babel/plugin-syntax-object-rest-spread" "^7.8.3"
     "@babel/plugin-transform-parameters" "^7.14.2"
 
+"@babel/plugin-proposal-object-rest-spread@^7.14.7":
+  version "7.14.7"
+  resolved "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.14.7.tgz#5920a2b3df7f7901df0205974c0641b13fd9d363"
+  integrity sha512-082hsZz+sVabfmDWo1Oct1u1AgbKbUAyVgmX4otIc7bdsRgHBXwTwb3DpDmD4Eyyx6DNiuz5UAATT655k+kL5g==
+  dependencies:
+    "@babel/compat-data" "^7.14.7"
+    "@babel/helper-compilation-targets" "^7.14.5"
+    "@babel/helper-plugin-utils" "^7.14.5"
+    "@babel/plugin-syntax-object-rest-spread" "^7.8.3"
+    "@babel/plugin-transform-parameters" "^7.14.5"
+
 "@babel/plugin-proposal-optional-catch-binding@^7.14.2":
   version "7.14.2"
   resolved "https://registry.npmjs.org/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.14.2.tgz#150d4e58e525b16a9a1431bd5326c4eed870d717"
@@ -660,7 +1092,24 @@
     "@babel/helper-plugin-utils" "^7.13.0"
     "@babel/plugin-syntax-optional-catch-binding" "^7.8.3"
 
-"@babel/plugin-proposal-optional-chaining@^7.12.1", "@babel/plugin-proposal-optional-chaining@^7.13.12", "@babel/plugin-proposal-optional-chaining@^7.14.2":
+"@babel/plugin-proposal-optional-catch-binding@^7.14.5":
+  version "7.14.5"
+  resolved "https://registry.npmjs.org/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.14.5.tgz#939dd6eddeff3a67fdf7b3f044b5347262598c3c"
+  integrity sha512-3Oyiixm0ur7bzO5ybNcZFlmVsygSIQgdOa7cTfOYCMY+wEPAYhZAJxi3mixKFCTCKUhQXuCTtQ1MzrpL3WT8ZQ==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.14.5"
+    "@babel/plugin-syntax-optional-catch-binding" "^7.8.3"
+
+"@babel/plugin-proposal-optional-chaining@^7.12.7", "@babel/plugin-proposal-optional-chaining@^7.14.5":
+  version "7.14.5"
+  resolved "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.14.5.tgz#fa83651e60a360e3f13797eef00b8d519695b603"
+  integrity sha512-ycz+VOzo2UbWNI1rQXxIuMOzrDdHGrI23fRiz/Si2R4kv2XZQ1BK8ccdHwehMKBlcH/joGW/tzrUmo67gbJHlQ==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.14.5"
+    "@babel/helper-skip-transparent-expression-wrappers" "^7.14.5"
+    "@babel/plugin-syntax-optional-chaining" "^7.8.3"
+
+"@babel/plugin-proposal-optional-chaining@^7.13.12", "@babel/plugin-proposal-optional-chaining@^7.14.2":
   version "7.14.2"
   resolved "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.14.2.tgz#df8171a8b9c43ebf4c1dabe6311b432d83e1b34e"
   integrity sha512-qQByMRPwMZJainfig10BoaDldx/+VDtNcrA7qdNaEOAj6VXud+gfrkA8j4CRAU5HjnWREXqIpSpH30qZX1xivA==
@@ -677,6 +1126,14 @@
     "@babel/helper-create-class-features-plugin" "^7.13.0"
     "@babel/helper-plugin-utils" "^7.13.0"
 
+"@babel/plugin-proposal-private-methods@^7.14.5":
+  version "7.14.5"
+  resolved "https://registry.npmjs.org/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.14.5.tgz#37446495996b2945f30f5be5b60d5e2aa4f5792d"
+  integrity sha512-838DkdUA1u+QTCplatfq4B7+1lnDa/+QMI89x5WZHBcnNv+47N8QEj2k9I2MUU9xIv8XJ4XvPCviM/Dj7Uwt9g==
+  dependencies:
+    "@babel/helper-create-class-features-plugin" "^7.14.5"
+    "@babel/helper-plugin-utils" "^7.14.5"
+
 "@babel/plugin-proposal-private-property-in-object@^7.14.0":
   version "7.14.0"
   resolved "https://registry.npmjs.org/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.14.0.tgz#b1a1f2030586b9d3489cc26179d2eb5883277636"
@@ -687,6 +1144,16 @@
     "@babel/helper-plugin-utils" "^7.13.0"
     "@babel/plugin-syntax-private-property-in-object" "^7.14.0"
 
+"@babel/plugin-proposal-private-property-in-object@^7.14.5":
+  version "7.14.5"
+  resolved "https://registry.npmjs.org/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.14.5.tgz#9f65a4d0493a940b4c01f8aa9d3f1894a587f636"
+  integrity sha512-62EyfyA3WA0mZiF2e2IV9mc9Ghwxcg8YTu8BS4Wss4Y3PY725OmS9M0qLORbJwLqFtGh+jiE4wAmocK2CTUK2Q==
+  dependencies:
+    "@babel/helper-annotate-as-pure" "^7.14.5"
+    "@babel/helper-create-class-features-plugin" "^7.14.5"
+    "@babel/helper-plugin-utils" "^7.14.5"
+    "@babel/plugin-syntax-private-property-in-object" "^7.14.5"
+
 "@babel/plugin-proposal-unicode-property-regex@^7.12.13", "@babel/plugin-proposal-unicode-property-regex@^7.4.4":
   version "7.12.13"
   resolved "https://registry.npmjs.org/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.12.13.tgz#bebde51339be829c17aaaaced18641deb62b39ba"
@@ -695,6 +1162,14 @@
     "@babel/helper-create-regexp-features-plugin" "^7.12.13"
     "@babel/helper-plugin-utils" "^7.12.13"
 
+"@babel/plugin-proposal-unicode-property-regex@^7.14.5":
+  version "7.14.5"
+  resolved "https://registry.npmjs.org/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.14.5.tgz#0f95ee0e757a5d647f378daa0eca7e93faa8bbe8"
+  integrity sha512-6axIeOU5LnY471KenAB9vI8I5j7NQ2d652hIYwVyRfgaZT5UpiqFKCuVXCDMSrU+3VFafnu2c5m3lrWIlr6A5Q==
+  dependencies:
+    "@babel/helper-create-regexp-features-plugin" "^7.14.5"
+    "@babel/helper-plugin-utils" "^7.14.5"
+
 "@babel/plugin-syntax-async-generators@^7.8.4":
   version "7.8.4"
   resolved "https://registry.npmjs.org/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz#a983fb1aeb2ec3f6ed042a210f640e90e786fe0d"
@@ -723,12 +1198,19 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.12.13"
 
-"@babel/plugin-syntax-decorators@^7.12.13":
-  version "7.12.13"
-  resolved "https://registry.npmjs.org/@babel/plugin-syntax-decorators/-/plugin-syntax-decorators-7.12.13.tgz#fac829bf3c7ef4a1bc916257b403e58c6bdaf648"
-  integrity sha512-Rw6aIXGuqDLr6/LoBBYE57nKOzQpz/aDkKlMqEwH+Vp0MXbG6H/TfRjaY343LKxzAKAMXIHsQ8JzaZKuDZ9MwA==
+"@babel/plugin-syntax-class-static-block@^7.14.5":
+  version "7.14.5"
+  resolved "https://registry.npmjs.org/@babel/plugin-syntax-class-static-block/-/plugin-syntax-class-static-block-7.14.5.tgz#195df89b146b4b78b3bf897fd7a257c84659d406"
+  integrity sha512-b+YyPmr6ldyNnM6sqYeMWE+bgJcJpO6yS4QD7ymxgH34GBPNDM/THBh8iunyvKIZztiwLH4CJZ0RxTk9emgpjw==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.12.13"
+    "@babel/helper-plugin-utils" "^7.14.5"
+
+"@babel/plugin-syntax-decorators@^7.14.5":
+  version "7.14.5"
+  resolved "https://registry.npmjs.org/@babel/plugin-syntax-decorators/-/plugin-syntax-decorators-7.14.5.tgz#eafb9c0cbe09c8afeb964ba3a7bbd63945a72f20"
+  integrity sha512-c4sZMRWL4GSvP1EXy0woIP7m4jkVcEuG8R1TOZxPBPtp4FSM/kiPZub9UIs/Jrb5ZAOzvTUSGYrWsrSu1JvoPw==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.14.5"
 
 "@babel/plugin-syntax-dynamic-import@^7.8.3":
   version "7.8.3"
@@ -772,6 +1254,13 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.0"
 
+"@babel/plugin-syntax-jsx@7.12.1":
+  version "7.12.1"
+  resolved "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.12.1.tgz#9d9d357cc818aa7ae7935917c1257f67677a0926"
+  integrity sha512-1yRi7yAtB0ETgxdY9ti/p2TivUxJkTdhu/ZbF9MshVGqOx1TdB3b7xCXs49Fupgg50N45KcAsRP/ZqWjs9SRjg==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.10.4"
+
 "@babel/plugin-syntax-jsx@^7.0.0", "@babel/plugin-syntax-jsx@^7.12.13":
   version "7.12.13"
   resolved "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.12.13.tgz#044fb81ebad6698fe62c478875575bcbb9b70f15"
@@ -779,6 +1268,13 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.12.13"
 
+"@babel/plugin-syntax-jsx@^7.14.5":
+  version "7.14.5"
+  resolved "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.14.5.tgz#000e2e25d8673cce49300517a3eda44c263e4201"
+  integrity sha512-ohuFIsOMXJnbOMRfX7/w7LocdR6R7whhuRD4ax8IipLcLPlZGJKkBxgHp++U4N/vKyU16/YDQr2f5seajD3jIw==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.14.5"
+
 "@babel/plugin-syntax-logical-assignment-operators@^7.10.4", "@babel/plugin-syntax-logical-assignment-operators@^7.8.3":
   version "7.10.4"
   resolved "https://registry.npmjs.org/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz#ca91ef46303530448b906652bac2e9fe9941f699"
@@ -800,7 +1296,7 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-syntax-object-rest-spread@^7.0.0", "@babel/plugin-syntax-object-rest-spread@^7.8.3":
+"@babel/plugin-syntax-object-rest-spread@7.8.3", "@babel/plugin-syntax-object-rest-spread@^7.0.0", "@babel/plugin-syntax-object-rest-spread@^7.8.0", "@babel/plugin-syntax-object-rest-spread@^7.8.3":
   version "7.8.3"
   resolved "https://registry.npmjs.org/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz#60e225edcbd98a640332a2e72dd3e66f1af55871"
   integrity sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==
@@ -828,6 +1324,13 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.13.0"
 
+"@babel/plugin-syntax-private-property-in-object@^7.14.5":
+  version "7.14.5"
+  resolved "https://registry.npmjs.org/@babel/plugin-syntax-private-property-in-object/-/plugin-syntax-private-property-in-object-7.14.5.tgz#0dc6671ec0ea22b6e94a1114f857970cd39de1ad"
+  integrity sha512-0wVnp9dxJ72ZUJDV27ZfbSj6iHLoytYZmh3rFcxNnvsJF3ktkzLDZPy/mA17HGsaQT3/DQsWYX1f1QGWkCoVUg==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.14.5"
+
 "@babel/plugin-syntax-top-level-await@^7.12.13", "@babel/plugin-syntax-top-level-await@^7.8.3":
   version "7.12.13"
   resolved "https://registry.npmjs.org/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.12.13.tgz#c5f0fa6e249f5b739727f923540cf7a806130178"
@@ -835,6 +1338,13 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.12.13"
 
+"@babel/plugin-syntax-top-level-await@^7.14.5":
+  version "7.14.5"
+  resolved "https://registry.npmjs.org/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.14.5.tgz#c1cfdadc35a646240001f06138247b741c34d94c"
+  integrity sha512-hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.14.5"
+
 "@babel/plugin-syntax-typescript@^7.12.13":
   version "7.12.13"
   resolved "https://registry.npmjs.org/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.12.13.tgz#9dff111ca64154cef0f4dc52cf843d9f12ce4474"
@@ -842,6 +1352,13 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.12.13"
 
+"@babel/plugin-syntax-typescript@^7.14.5":
+  version "7.14.5"
+  resolved "https://registry.npmjs.org/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.14.5.tgz#b82c6ce471b165b5ce420cf92914d6fb46225716"
+  integrity sha512-u6OXzDaIXjEstBRRoBCQ/uKQKlbuaeE5in0RvWdA4pN6AhqxTIwUsnHPU1CFZA/amYObMsuWhYfRl3Ch90HD0Q==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.14.5"
+
 "@babel/plugin-transform-arrow-functions@^7.0.0", "@babel/plugin-transform-arrow-functions@^7.12.1", "@babel/plugin-transform-arrow-functions@^7.13.0":
   version "7.13.0"
   resolved "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.13.0.tgz#10a59bebad52d637a027afa692e8d5ceff5e3dae"
@@ -849,6 +1366,13 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.13.0"
 
+"@babel/plugin-transform-arrow-functions@^7.14.5":
+  version "7.14.5"
+  resolved "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.14.5.tgz#f7187d9588a768dd080bf4c9ffe117ea62f7862a"
+  integrity sha512-KOnO0l4+tD5IfOdi4x8C1XmEIRWUjNRV8wc6K2vz/3e8yAOoZZvsRXRRIF/yo/MAOFb4QjtAw9xSxMXbSMRy8A==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.14.5"
+
 "@babel/plugin-transform-async-to-generator@^7.13.0":
   version "7.13.0"
   resolved "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.13.0.tgz#8e112bf6771b82bf1e974e5e26806c5c99aa516f"
@@ -858,6 +1382,15 @@
     "@babel/helper-plugin-utils" "^7.13.0"
     "@babel/helper-remap-async-to-generator" "^7.13.0"
 
+"@babel/plugin-transform-async-to-generator@^7.14.5":
+  version "7.14.5"
+  resolved "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.14.5.tgz#72c789084d8f2094acb945633943ef8443d39e67"
+  integrity sha512-szkbzQ0mNk0rpu76fzDdqSyPu0MuvpXgC+6rz5rpMb5OIRxdmHfQxrktL8CYolL2d8luMCZTR0DpIMIdL27IjA==
+  dependencies:
+    "@babel/helper-module-imports" "^7.14.5"
+    "@babel/helper-plugin-utils" "^7.14.5"
+    "@babel/helper-remap-async-to-generator" "^7.14.5"
+
 "@babel/plugin-transform-block-scoped-functions@^7.0.0", "@babel/plugin-transform-block-scoped-functions@^7.12.13":
   version "7.12.13"
   resolved "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.12.13.tgz#a9bf1836f2a39b4eb6cf09967739de29ea4bf4c4"
@@ -865,13 +1398,27 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.12.13"
 
-"@babel/plugin-transform-block-scoping@^7.0.0", "@babel/plugin-transform-block-scoping@^7.12.1", "@babel/plugin-transform-block-scoping@^7.14.4":
+"@babel/plugin-transform-block-scoped-functions@^7.14.5":
+  version "7.14.5"
+  resolved "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.14.5.tgz#e48641d999d4bc157a67ef336aeb54bc44fd3ad4"
+  integrity sha512-dtqWqdWZ5NqBX3KzsVCWfQI3A53Ft5pWFCT2eCVUftWZgjc5DpDponbIF1+c+7cSGk2wN0YK7HGL/ezfRbpKBQ==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.14.5"
+
+"@babel/plugin-transform-block-scoping@^7.0.0", "@babel/plugin-transform-block-scoping@^7.14.4":
   version "7.14.4"
   resolved "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.14.4.tgz#caf140b0b2e2462c509553d140e6d0abefb61ed8"
   integrity sha512-5KdpkGxsZlTk+fPleDtGKsA+pon28+ptYmMO8GBSa5fHERCJWAzj50uAfCKBqq42HO+Zot6JF1x37CRprwmN4g==
   dependencies:
     "@babel/helper-plugin-utils" "^7.13.0"
 
+"@babel/plugin-transform-block-scoping@^7.12.12", "@babel/plugin-transform-block-scoping@^7.14.5":
+  version "7.14.5"
+  resolved "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.14.5.tgz#8cc63e61e50f42e078e6f09be775a75f23ef9939"
+  integrity sha512-LBYm4ZocNgoCqyxMLoOnwpsmQ18HWTQvql64t3GvMUzLQrNoV1BDG0lNftC8QKYERkZgCCT/7J5xWGObGAyHDw==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.14.5"
+
 "@babel/plugin-transform-classes@^7.0.0", "@babel/plugin-transform-classes@^7.12.1", "@babel/plugin-transform-classes@^7.14.4":
   version "7.14.4"
   resolved "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.14.4.tgz#a83c15503fc71a0f99e876fdce7dadbc6575ec3a"
@@ -885,6 +1432,19 @@
     "@babel/helper-split-export-declaration" "^7.12.13"
     globals "^11.1.0"
 
+"@babel/plugin-transform-classes@^7.14.9":
+  version "7.14.9"
+  resolved "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.14.9.tgz#2a391ffb1e5292710b00f2e2c210e1435e7d449f"
+  integrity sha512-NfZpTcxU3foGWbl4wxmZ35mTsYJy8oQocbeIMoDAGGFarAmSQlL+LWMkDx/tj6pNotpbX3rltIA4dprgAPOq5A==
+  dependencies:
+    "@babel/helper-annotate-as-pure" "^7.14.5"
+    "@babel/helper-function-name" "^7.14.5"
+    "@babel/helper-optimise-call-expression" "^7.14.5"
+    "@babel/helper-plugin-utils" "^7.14.5"
+    "@babel/helper-replace-supers" "^7.14.5"
+    "@babel/helper-split-export-declaration" "^7.14.5"
+    globals "^11.1.0"
+
 "@babel/plugin-transform-computed-properties@^7.0.0", "@babel/plugin-transform-computed-properties@^7.13.0":
   version "7.13.0"
   resolved "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.13.0.tgz#845c6e8b9bb55376b1fa0b92ef0bdc8ea06644ed"
@@ -892,6 +1452,13 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.13.0"
 
+"@babel/plugin-transform-computed-properties@^7.14.5":
+  version "7.14.5"
+  resolved "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.14.5.tgz#1b9d78987420d11223d41195461cc43b974b204f"
+  integrity sha512-pWM+E4283UxaVzLb8UBXv4EIxMovU4zxT1OPnpHJcmnvyY9QbPPTKZfEj31EUvG3/EQRbYAGaYEUZ4yWOBC2xg==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.14.5"
+
 "@babel/plugin-transform-destructuring@^7.0.0", "@babel/plugin-transform-destructuring@^7.12.1", "@babel/plugin-transform-destructuring@^7.14.4":
   version "7.14.4"
   resolved "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.14.4.tgz#acbec502e9951f30f4441eaca1d2f29efade59ed"
@@ -899,6 +1466,13 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.13.0"
 
+"@babel/plugin-transform-destructuring@^7.14.7":
+  version "7.14.7"
+  resolved "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.14.7.tgz#0ad58ed37e23e22084d109f185260835e5557576"
+  integrity sha512-0mDE99nK+kVh3xlc5vKwB6wnP9ecuSj+zQCa/n0voENtP/zymdT4HH6QEb65wjjcbqr1Jb/7z9Qp7TF5FtwYGw==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.14.5"
+
 "@babel/plugin-transform-dotall-regex@^7.12.13", "@babel/plugin-transform-dotall-regex@^7.4.4":
   version "7.12.13"
   resolved "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.12.13.tgz#3f1601cc29905bfcb67f53910f197aeafebb25ad"
@@ -907,6 +1481,14 @@
     "@babel/helper-create-regexp-features-plugin" "^7.12.13"
     "@babel/helper-plugin-utils" "^7.12.13"
 
+"@babel/plugin-transform-dotall-regex@^7.14.5":
+  version "7.14.5"
+  resolved "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.14.5.tgz#2f6bf76e46bdf8043b4e7e16cf24532629ba0c7a"
+  integrity sha512-loGlnBdj02MDsFaHhAIJzh7euK89lBrGIdM9EAtHFo6xKygCUGuuWe07o1oZVk287amtW1n0808sQM99aZt3gw==
+  dependencies:
+    "@babel/helper-create-regexp-features-plugin" "^7.14.5"
+    "@babel/helper-plugin-utils" "^7.14.5"
+
 "@babel/plugin-transform-duplicate-keys@^7.12.13":
   version "7.12.13"
   resolved "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.12.13.tgz#6f06b87a8b803fd928e54b81c258f0a0033904de"
@@ -914,6 +1496,13 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.12.13"
 
+"@babel/plugin-transform-duplicate-keys@^7.14.5":
+  version "7.14.5"
+  resolved "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.14.5.tgz#365a4844881bdf1501e3a9f0270e7f0f91177954"
+  integrity sha512-iJjbI53huKbPDAsJ8EmVmvCKeeq21bAze4fu9GBQtSLqfvzj2oRuHVx4ZkDwEhg1htQ+5OBZh/Ab0XDf5iBZ7A==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.14.5"
+
 "@babel/plugin-transform-exponentiation-operator@^7.12.13":
   version "7.12.13"
   resolved "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.12.13.tgz#4d52390b9a273e651e4aba6aee49ef40e80cd0a1"
@@ -922,6 +1511,14 @@
     "@babel/helper-builder-binary-assignment-operator-visitor" "^7.12.13"
     "@babel/helper-plugin-utils" "^7.12.13"
 
+"@babel/plugin-transform-exponentiation-operator@^7.14.5":
+  version "7.14.5"
+  resolved "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.14.5.tgz#5154b8dd6a3dfe6d90923d61724bd3deeb90b493"
+  integrity sha512-jFazJhMBc9D27o9jDnIE5ZErI0R0m7PbKXVq77FFvqFbzvTMuv8jaAwLZ5PviOLSFttqKIW0/wxNSDbjLk0tYA==
+  dependencies:
+    "@babel/helper-builder-binary-assignment-operator-visitor" "^7.14.5"
+    "@babel/helper-plugin-utils" "^7.14.5"
+
 "@babel/plugin-transform-flow-strip-types@^7.0.0", "@babel/plugin-transform-flow-strip-types@^7.13.0":
   version "7.13.0"
   resolved "https://registry.npmjs.org/@babel/plugin-transform-flow-strip-types/-/plugin-transform-flow-strip-types-7.13.0.tgz#58177a48c209971e8234e99906cb6bd1122addd3"
@@ -937,6 +1534,13 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.13.0"
 
+"@babel/plugin-transform-for-of@^7.14.5":
+  version "7.14.5"
+  resolved "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.14.5.tgz#dae384613de8f77c196a8869cbf602a44f7fc0eb"
+  integrity sha512-CfmqxSUZzBl0rSjpoQSFoR9UEj3HzbGuGNL21/iFTmjb5gFggJp3ph0xR1YBhexmLoKRHzgxuFvty2xdSt6gTA==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.14.5"
+
 "@babel/plugin-transform-function-name@^7.0.0", "@babel/plugin-transform-function-name@^7.12.13":
   version "7.12.13"
   resolved "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.12.13.tgz#bb024452f9aaed861d374c8e7a24252ce3a50051"
@@ -945,6 +1549,14 @@
     "@babel/helper-function-name" "^7.12.13"
     "@babel/helper-plugin-utils" "^7.12.13"
 
+"@babel/plugin-transform-function-name@^7.14.5":
+  version "7.14.5"
+  resolved "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.14.5.tgz#e81c65ecb900746d7f31802f6bed1f52d915d6f2"
+  integrity sha512-vbO6kv0fIzZ1GpmGQuvbwwm+O4Cbm2NrPzwlup9+/3fdkuzo1YqOZcXw26+YUJB84Ja7j9yURWposEHLYwxUfQ==
+  dependencies:
+    "@babel/helper-function-name" "^7.14.5"
+    "@babel/helper-plugin-utils" "^7.14.5"
+
 "@babel/plugin-transform-literals@^7.0.0", "@babel/plugin-transform-literals@^7.12.13":
   version "7.12.13"
   resolved "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.12.13.tgz#2ca45bafe4a820197cf315794a4d26560fe4bdb9"
@@ -952,6 +1564,13 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.12.13"
 
+"@babel/plugin-transform-literals@^7.14.5":
+  version "7.14.5"
+  resolved "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.14.5.tgz#41d06c7ff5d4d09e3cf4587bd3ecf3930c730f78"
+  integrity sha512-ql33+epql2F49bi8aHXxvLURHkxJbSmMKl9J5yHqg4PLtdE6Uc48CH1GS6TQvZ86eoB/ApZXwm7jlA+B3kra7A==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.14.5"
+
 "@babel/plugin-transform-member-expression-literals@^7.0.0", "@babel/plugin-transform-member-expression-literals@^7.12.13":
   version "7.12.13"
   resolved "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.12.13.tgz#5ffa66cd59b9e191314c9f1f803b938e8c081e40"
@@ -959,6 +1578,13 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.12.13"
 
+"@babel/plugin-transform-member-expression-literals@^7.14.5":
+  version "7.14.5"
+  resolved "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.14.5.tgz#b39cd5212a2bf235a617d320ec2b48bcc091b8a7"
+  integrity sha512-WkNXxH1VXVTKarWFqmso83xl+2V3Eo28YY5utIkbsmXoItO8Q3aZxN4BTS2k0hz9dGUloHK26mJMyQEYfkn/+Q==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.14.5"
+
 "@babel/plugin-transform-modules-amd@^7.14.2":
   version "7.14.2"
   resolved "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.14.2.tgz#6622806fe1a7c07a1388444222ef9535f2ca17b0"
@@ -968,6 +1594,15 @@
     "@babel/helper-plugin-utils" "^7.13.0"
     babel-plugin-dynamic-import-node "^2.3.3"
 
+"@babel/plugin-transform-modules-amd@^7.14.5":
+  version "7.14.5"
+  resolved "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.14.5.tgz#4fd9ce7e3411cb8b83848480b7041d83004858f7"
+  integrity sha512-3lpOU8Vxmp3roC4vzFpSdEpGUWSMsHFreTWOMMLzel2gNGfHE5UWIh/LN6ghHs2xurUp4jRFYMUIZhuFbody1g==
+  dependencies:
+    "@babel/helper-module-transforms" "^7.14.5"
+    "@babel/helper-plugin-utils" "^7.14.5"
+    babel-plugin-dynamic-import-node "^2.3.3"
+
 "@babel/plugin-transform-modules-commonjs@^7.0.0", "@babel/plugin-transform-modules-commonjs@^7.13.8", "@babel/plugin-transform-modules-commonjs@^7.14.0", "@babel/plugin-transform-modules-commonjs@^7.4.4":
   version "7.14.0"
   resolved "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.14.0.tgz#52bc199cb581e0992edba0f0f80356467587f161"
@@ -978,6 +1613,16 @@
     "@babel/helper-simple-access" "^7.13.12"
     babel-plugin-dynamic-import-node "^2.3.3"
 
+"@babel/plugin-transform-modules-commonjs@^7.14.5":
+  version "7.14.5"
+  resolved "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.14.5.tgz#7aaee0ea98283de94da98b28f8c35701429dad97"
+  integrity sha512-en8GfBtgnydoao2PS+87mKyw62k02k7kJ9ltbKe0fXTHrQmG6QZZflYuGI1VVG7sVpx4E1n7KBpNlPb8m78J+A==
+  dependencies:
+    "@babel/helper-module-transforms" "^7.14.5"
+    "@babel/helper-plugin-utils" "^7.14.5"
+    "@babel/helper-simple-access" "^7.14.5"
+    babel-plugin-dynamic-import-node "^2.3.3"
+
 "@babel/plugin-transform-modules-systemjs@^7.13.8":
   version "7.13.8"
   resolved "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.13.8.tgz#6d066ee2bff3c7b3d60bf28dec169ad993831ae3"
@@ -989,6 +1634,17 @@
     "@babel/helper-validator-identifier" "^7.12.11"
     babel-plugin-dynamic-import-node "^2.3.3"
 
+"@babel/plugin-transform-modules-systemjs@^7.14.5":
+  version "7.14.5"
+  resolved "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.14.5.tgz#c75342ef8b30dcde4295d3401aae24e65638ed29"
+  integrity sha512-mNMQdvBEE5DcMQaL5LbzXFMANrQjd2W7FPzg34Y4yEz7dBgdaC+9B84dSO+/1Wba98zoDbInctCDo4JGxz1VYA==
+  dependencies:
+    "@babel/helper-hoist-variables" "^7.14.5"
+    "@babel/helper-module-transforms" "^7.14.5"
+    "@babel/helper-plugin-utils" "^7.14.5"
+    "@babel/helper-validator-identifier" "^7.14.5"
+    babel-plugin-dynamic-import-node "^2.3.3"
+
 "@babel/plugin-transform-modules-umd@^7.14.0":
   version "7.14.0"
   resolved "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.14.0.tgz#2f8179d1bbc9263665ce4a65f305526b2ea8ac34"
@@ -997,6 +1653,14 @@
     "@babel/helper-module-transforms" "^7.14.0"
     "@babel/helper-plugin-utils" "^7.13.0"
 
+"@babel/plugin-transform-modules-umd@^7.14.5":
+  version "7.14.5"
+  resolved "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.14.5.tgz#fb662dfee697cce274a7cda525190a79096aa6e0"
+  integrity sha512-RfPGoagSngC06LsGUYyM9QWSXZ8MysEjDJTAea1lqRjNECE3y0qIJF/qbvJxc4oA4s99HumIMdXOrd+TdKaAAA==
+  dependencies:
+    "@babel/helper-module-transforms" "^7.14.5"
+    "@babel/helper-plugin-utils" "^7.14.5"
+
 "@babel/plugin-transform-named-capturing-groups-regex@^7.12.13":
   version "7.12.13"
   resolved "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.12.13.tgz#2213725a5f5bbbe364b50c3ba5998c9599c5c9d9"
@@ -1004,6 +1668,13 @@
   dependencies:
     "@babel/helper-create-regexp-features-plugin" "^7.12.13"
 
+"@babel/plugin-transform-named-capturing-groups-regex@^7.14.9":
+  version "7.14.9"
+  resolved "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.14.9.tgz#c68f5c5d12d2ebaba3762e57c2c4f6347a46e7b2"
+  integrity sha512-l666wCVYO75mlAtGFfyFwnWmIXQm3kSH0C3IRnJqWcZbWkoihyAdDhFm2ZWaxWTqvBvhVFfJjMRQ0ez4oN1yYA==
+  dependencies:
+    "@babel/helper-create-regexp-features-plugin" "^7.14.5"
+
 "@babel/plugin-transform-new-target@^7.12.13":
   version "7.12.13"
   resolved "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.12.13.tgz#e22d8c3af24b150dd528cbd6e685e799bf1c351c"
@@ -1011,6 +1682,13 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.12.13"
 
+"@babel/plugin-transform-new-target@^7.14.5":
+  version "7.14.5"
+  resolved "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.14.5.tgz#31bdae8b925dc84076ebfcd2a9940143aed7dbf8"
+  integrity sha512-Nx054zovz6IIRWEB49RDRuXGI4Gy0GMgqG0cII9L3MxqgXz/+rgII+RU58qpo4g7tNEx1jG7rRVH4ihZoP4esQ==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.14.5"
+
 "@babel/plugin-transform-object-super@^7.0.0", "@babel/plugin-transform-object-super@^7.12.13":
   version "7.12.13"
   resolved "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.12.13.tgz#b4416a2d63b8f7be314f3d349bd55a9c1b5171f7"
@@ -1019,6 +1697,14 @@
     "@babel/helper-plugin-utils" "^7.12.13"
     "@babel/helper-replace-supers" "^7.12.13"
 
+"@babel/plugin-transform-object-super@^7.14.5":
+  version "7.14.5"
+  resolved "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.14.5.tgz#d0b5faeac9e98597a161a9cf78c527ed934cdc45"
+  integrity sha512-MKfOBWzK0pZIrav9z/hkRqIk/2bTv9qvxHzPQc12RcVkMOzpIKnFCNYJip00ssKWYkd8Sf5g0Wr7pqJ+cmtuFg==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.14.5"
+    "@babel/helper-replace-supers" "^7.14.5"
+
 "@babel/plugin-transform-parameters@^7.0.0", "@babel/plugin-transform-parameters@^7.12.1", "@babel/plugin-transform-parameters@^7.14.2":
   version "7.14.2"
   resolved "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.14.2.tgz#e4290f72e0e9e831000d066427c4667098decc31"
@@ -1026,6 +1712,13 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.13.0"
 
+"@babel/plugin-transform-parameters@^7.14.5":
+  version "7.14.5"
+  resolved "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.14.5.tgz#49662e86a1f3ddccac6363a7dfb1ff0a158afeb3"
+  integrity sha512-Tl7LWdr6HUxTmzQtzuU14SqbgrSKmaR77M0OKyq4njZLQTPfOvzblNKyNkGwOfEFCEx7KeYHQHDI0P3F02IVkA==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.14.5"
+
 "@babel/plugin-transform-property-literals@^7.0.0", "@babel/plugin-transform-property-literals@^7.12.13":
   version "7.12.13"
   resolved "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.12.13.tgz#4e6a9e37864d8f1b3bc0e2dce7bf8857db8b1a81"
@@ -1033,6 +1726,13 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.12.13"
 
+"@babel/plugin-transform-property-literals@^7.14.5":
+  version "7.14.5"
+  resolved "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.14.5.tgz#0ddbaa1f83db3606f1cdf4846fa1dfb473458b34"
+  integrity sha512-r1uilDthkgXW8Z1vJz2dKYLV1tuw2xsbrp3MrZmD99Wh9vsfKoob+JTgri5VUb/JqyKRXotlOtwgu4stIYCmnw==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.14.5"
+
 "@babel/plugin-transform-react-constant-elements@^7.12.1":
   version "7.13.13"
   resolved "https://registry.npmjs.org/@babel/plugin-transform-react-constant-elements/-/plugin-transform-react-constant-elements-7.13.13.tgz#0208b1d942bf939cd4f7aa5b255d42602aa4a920"
@@ -1047,6 +1747,13 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.13.0"
 
+"@babel/plugin-transform-react-display-name@^7.14.5":
+  version "7.14.5"
+  resolved "https://registry.npmjs.org/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.14.5.tgz#baa92d15c4570411301a85a74c13534873885b65"
+  integrity sha512-07aqY1ChoPgIxsuDviptRpVkWCSbXWmzQqcgy65C6YSFOfPFvb/DX3bBRHh7pCd/PMEEYHYWUTSVkCbkVainYQ==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.14.5"
+
 "@babel/plugin-transform-react-jsx-development@^7.12.17":
   version "7.12.17"
   resolved "https://registry.npmjs.org/@babel/plugin-transform-react-jsx-development/-/plugin-transform-react-jsx-development-7.12.17.tgz#f510c0fa7cd7234153539f9a362ced41a5ca1447"
@@ -1054,6 +1761,13 @@
   dependencies:
     "@babel/plugin-transform-react-jsx" "^7.12.17"
 
+"@babel/plugin-transform-react-jsx-development@^7.14.5":
+  version "7.14.5"
+  resolved "https://registry.npmjs.org/@babel/plugin-transform-react-jsx-development/-/plugin-transform-react-jsx-development-7.14.5.tgz#1a6c73e2f7ed2c42eebc3d2ad60b0c7494fcb9af"
+  integrity sha512-rdwG/9jC6QybWxVe2UVOa7q6cnTpw8JRRHOxntG/h6g/guAOe6AhtQHJuJh5FwmnXIT1bdm5vC2/5huV8ZOorQ==
+  dependencies:
+    "@babel/plugin-transform-react-jsx" "^7.14.5"
+
 "@babel/plugin-transform-react-jsx@^7.0.0", "@babel/plugin-transform-react-jsx@^7.12.17", "@babel/plugin-transform-react-jsx@^7.13.12":
   version "7.14.3"
   resolved "https://registry.npmjs.org/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.14.3.tgz#0e26597805cf0862da735f264550933c38babb66"
@@ -1065,6 +1779,17 @@
     "@babel/plugin-syntax-jsx" "^7.12.13"
     "@babel/types" "^7.14.2"
 
+"@babel/plugin-transform-react-jsx@^7.12.12", "@babel/plugin-transform-react-jsx@^7.14.5":
+  version "7.14.9"
+  resolved "https://registry.npmjs.org/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.14.9.tgz#3314b2163033abac5200a869c4de242cd50a914c"
+  integrity sha512-30PeETvS+AeD1f58i1OVyoDlVYQhap/K20ZrMjLmmzmC2AYR/G43D4sdJAaDAqCD3MYpSWbmrz3kES158QSLjw==
+  dependencies:
+    "@babel/helper-annotate-as-pure" "^7.14.5"
+    "@babel/helper-module-imports" "^7.14.5"
+    "@babel/helper-plugin-utils" "^7.14.5"
+    "@babel/plugin-syntax-jsx" "^7.14.5"
+    "@babel/types" "^7.14.9"
+
 "@babel/plugin-transform-react-pure-annotations@^7.12.1":
   version "7.12.1"
   resolved "https://registry.npmjs.org/@babel/plugin-transform-react-pure-annotations/-/plugin-transform-react-pure-annotations-7.12.1.tgz#05d46f0ab4d1339ac59adf20a1462c91b37a1a42"
@@ -1073,6 +1798,14 @@
     "@babel/helper-annotate-as-pure" "^7.10.4"
     "@babel/helper-plugin-utils" "^7.10.4"
 
+"@babel/plugin-transform-react-pure-annotations@^7.14.5":
+  version "7.14.5"
+  resolved "https://registry.npmjs.org/@babel/plugin-transform-react-pure-annotations/-/plugin-transform-react-pure-annotations-7.14.5.tgz#18de612b84021e3a9802cbc212c9d9f46d0d11fc"
+  integrity sha512-3X4HpBJimNxW4rhUy/SONPyNQHp5YRr0HhJdT2OH1BRp0of7u3Dkirc7x9FRJMKMqTBI079VZ1hzv7Ouuz///g==
+  dependencies:
+    "@babel/helper-annotate-as-pure" "^7.14.5"
+    "@babel/helper-plugin-utils" "^7.14.5"
+
 "@babel/plugin-transform-regenerator@^7.13.15":
   version "7.13.15"
   resolved "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.13.15.tgz#e5eb28945bf8b6563e7f818945f966a8d2997f39"
@@ -1080,6 +1813,13 @@
   dependencies:
     regenerator-transform "^0.14.2"
 
+"@babel/plugin-transform-regenerator@^7.14.5":
+  version "7.14.5"
+  resolved "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.14.5.tgz#9676fd5707ed28f522727c5b3c0aa8544440b04f"
+  integrity sha512-NVIY1W3ITDP5xQl50NgTKlZ0GrotKtLna08/uGY6ErQt6VEQZXla86x/CTddm5gZdcr+5GSsvMeTmWA5Ii6pkg==
+  dependencies:
+    regenerator-transform "^0.14.2"
+
 "@babel/plugin-transform-reserved-words@^7.12.13":
   version "7.12.13"
   resolved "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.12.13.tgz#7d9988d4f06e0fe697ea1d9803188aa18b472695"
@@ -1087,6 +1827,13 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.12.13"
 
+"@babel/plugin-transform-reserved-words@^7.14.5":
+  version "7.14.5"
+  resolved "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.14.5.tgz#c44589b661cfdbef8d4300dcc7469dffa92f8304"
+  integrity sha512-cv4F2rv1nD4qdexOGsRQXJrOcyb5CrgjUH9PKrrtyhSDBNWGxd0UIitjyJiWagS+EbUGjG++22mGH1Pub8D6Vg==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.14.5"
+
 "@babel/plugin-transform-shorthand-properties@^7.0.0", "@babel/plugin-transform-shorthand-properties@^7.12.1", "@babel/plugin-transform-shorthand-properties@^7.12.13":
   version "7.12.13"
   resolved "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.12.13.tgz#db755732b70c539d504c6390d9ce90fe64aff7ad"
@@ -1094,6 +1841,13 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.12.13"
 
+"@babel/plugin-transform-shorthand-properties@^7.14.5":
+  version "7.14.5"
+  resolved "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.14.5.tgz#97f13855f1409338d8cadcbaca670ad79e091a58"
+  integrity sha512-xLucks6T1VmGsTB+GWK5Pl9Jl5+nRXD1uoFdA5TSO6xtiNjtXTjKkmPdFXVLGlK5A2/or/wQMKfmQ2Y0XJfn5g==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.14.5"
+
 "@babel/plugin-transform-spread@^7.0.0", "@babel/plugin-transform-spread@^7.12.1", "@babel/plugin-transform-spread@^7.13.0":
   version "7.13.0"
   resolved "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.13.0.tgz#84887710e273c1815ace7ae459f6f42a5d31d5fd"
@@ -1102,6 +1856,14 @@
     "@babel/helper-plugin-utils" "^7.13.0"
     "@babel/helper-skip-transparent-expression-wrappers" "^7.12.1"
 
+"@babel/plugin-transform-spread@^7.14.6":
+  version "7.14.6"
+  resolved "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.14.6.tgz#6bd40e57fe7de94aa904851963b5616652f73144"
+  integrity sha512-Zr0x0YroFJku7n7+/HH3A2eIrGMjbmAIbJSVv0IZ+t3U2WUQUA64S/oeied2e+MaGSjmt4alzBCsK9E8gh+fag==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.14.5"
+    "@babel/helper-skip-transparent-expression-wrappers" "^7.14.5"
+
 "@babel/plugin-transform-sticky-regex@^7.12.13":
   version "7.12.13"
   resolved "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.12.13.tgz#760ffd936face73f860ae646fb86ee82f3d06d1f"
@@ -1109,6 +1871,13 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.12.13"
 
+"@babel/plugin-transform-sticky-regex@^7.14.5":
+  version "7.14.5"
+  resolved "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.14.5.tgz#5b617542675e8b7761294381f3c28c633f40aeb9"
+  integrity sha512-Z7F7GyvEMzIIbwnziAZmnSNpdijdr4dWt+FJNBnBLz5mwDFkqIXU9wmBcWWad3QeJF5hMTkRe4dAq2sUZiG+8A==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.14.5"
+
 "@babel/plugin-transform-template-literals@^7.0.0", "@babel/plugin-transform-template-literals@^7.12.1", "@babel/plugin-transform-template-literals@^7.13.0":
   version "7.13.0"
   resolved "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.13.0.tgz#a36049127977ad94438dee7443598d1cefdf409d"
@@ -1116,6 +1885,13 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.13.0"
 
+"@babel/plugin-transform-template-literals@^7.14.5":
+  version "7.14.5"
+  resolved "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.14.5.tgz#a5f2bc233937d8453885dc736bdd8d9ffabf3d93"
+  integrity sha512-22btZeURqiepOfuy/VkFr+zStqlujWaarpMErvay7goJS6BWwdd6BY9zQyDLDa4x2S3VugxFb162IZ4m/S/+Gg==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.14.5"
+
 "@babel/plugin-transform-typeof-symbol@^7.12.13":
   version "7.12.13"
   resolved "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.12.13.tgz#785dd67a1f2ea579d9c2be722de8c84cb85f5a7f"
@@ -1123,6 +1899,13 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.12.13"
 
+"@babel/plugin-transform-typeof-symbol@^7.14.5":
+  version "7.14.5"
+  resolved "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.14.5.tgz#39af2739e989a2bd291bf6b53f16981423d457d4"
+  integrity sha512-lXzLD30ffCWseTbMQzrvDWqljvZlHkXU+CnseMhkMNqU1sASnCsz3tSzAaH3vCUXb9PHeUb90ZT1BdFTm1xxJw==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.14.5"
+
 "@babel/plugin-transform-typescript@^7.13.0":
   version "7.14.4"
   resolved "https://registry.npmjs.org/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.14.4.tgz#1c48829fa6d5f2de646060cd08abb6cda4b521a7"
@@ -1132,6 +1915,15 @@
     "@babel/helper-plugin-utils" "^7.13.0"
     "@babel/plugin-syntax-typescript" "^7.12.13"
 
+"@babel/plugin-transform-typescript@^7.14.5":
+  version "7.14.6"
+  resolved "https://registry.npmjs.org/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.14.6.tgz#6e9c2d98da2507ebe0a883b100cde3c7279df36c"
+  integrity sha512-XlTdBq7Awr4FYIzqhmYY80WN0V0azF74DMPyFqVHBvf81ZUgc4X7ZOpx6O8eLDK6iM5cCQzeyJw0ynTaefixRA==
+  dependencies:
+    "@babel/helper-create-class-features-plugin" "^7.14.6"
+    "@babel/helper-plugin-utils" "^7.14.5"
+    "@babel/plugin-syntax-typescript" "^7.14.5"
+
 "@babel/plugin-transform-unicode-escapes@^7.12.13":
   version "7.12.13"
   resolved "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.12.13.tgz#840ced3b816d3b5127dd1d12dcedc5dead1a5e74"
@@ -1139,6 +1931,13 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.12.13"
 
+"@babel/plugin-transform-unicode-escapes@^7.14.5":
+  version "7.14.5"
+  resolved "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.14.5.tgz#9d4bd2a681e3c5d7acf4f57fa9e51175d91d0c6b"
+  integrity sha512-crTo4jATEOjxj7bt9lbYXcBAM3LZaUrbP2uUdxb6WIorLmjNKSpHfIybgY4B8SRpbf8tEVIWH3Vtm7ayCrKocA==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.14.5"
+
 "@babel/plugin-transform-unicode-regex@^7.12.13":
   version "7.12.13"
   resolved "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.12.13.tgz#b52521685804e155b1202e83fc188d34bb70f5ac"
@@ -1147,6 +1946,14 @@
     "@babel/helper-create-regexp-features-plugin" "^7.12.13"
     "@babel/helper-plugin-utils" "^7.12.13"
 
+"@babel/plugin-transform-unicode-regex@^7.14.5":
+  version "7.14.5"
+  resolved "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.14.5.tgz#4cd09b6c8425dd81255c7ceb3fb1836e7414382e"
+  integrity sha512-UygduJpC5kHeCiRw/xDVzC+wj8VaYSoKl5JNVmbP7MadpNinAm3SvZCxZ42H37KZBKztz46YC73i9yV34d0Tzw==
+  dependencies:
+    "@babel/helper-create-regexp-features-plugin" "^7.14.5"
+    "@babel/helper-plugin-utils" "^7.14.5"
+
 "@babel/preset-env@^7.12.1":
   version "7.14.4"
   resolved "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.14.4.tgz#73fc3228c59727e5e974319156f304f0d6685a2d"
@@ -1226,6 +2033,85 @@
     core-js-compat "^3.9.0"
     semver "^6.3.0"
 
+"@babel/preset-env@^7.12.11":
+  version "7.14.9"
+  resolved "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.14.9.tgz#4a3bbbd745f20e9121d5925170bef040a21b7819"
+  integrity sha512-BV5JvCwBDebkyh67bPKBYVCC6gGw0MCzU6HfKe5Pm3upFpPVqiC/hB33zkOe0tVdAzaMywah0LSXQeD9v/BYdQ==
+  dependencies:
+    "@babel/compat-data" "^7.14.9"
+    "@babel/helper-compilation-targets" "^7.14.5"
+    "@babel/helper-plugin-utils" "^7.14.5"
+    "@babel/helper-validator-option" "^7.14.5"
+    "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining" "^7.14.5"
+    "@babel/plugin-proposal-async-generator-functions" "^7.14.9"
+    "@babel/plugin-proposal-class-properties" "^7.14.5"
+    "@babel/plugin-proposal-class-static-block" "^7.14.5"
+    "@babel/plugin-proposal-dynamic-import" "^7.14.5"
+    "@babel/plugin-proposal-export-namespace-from" "^7.14.5"
+    "@babel/plugin-proposal-json-strings" "^7.14.5"
+    "@babel/plugin-proposal-logical-assignment-operators" "^7.14.5"
+    "@babel/plugin-proposal-nullish-coalescing-operator" "^7.14.5"
+    "@babel/plugin-proposal-numeric-separator" "^7.14.5"
+    "@babel/plugin-proposal-object-rest-spread" "^7.14.7"
+    "@babel/plugin-proposal-optional-catch-binding" "^7.14.5"
+    "@babel/plugin-proposal-optional-chaining" "^7.14.5"
+    "@babel/plugin-proposal-private-methods" "^7.14.5"
+    "@babel/plugin-proposal-private-property-in-object" "^7.14.5"
+    "@babel/plugin-proposal-unicode-property-regex" "^7.14.5"
+    "@babel/plugin-syntax-async-generators" "^7.8.4"
+    "@babel/plugin-syntax-class-properties" "^7.12.13"
+    "@babel/plugin-syntax-class-static-block" "^7.14.5"
+    "@babel/plugin-syntax-dynamic-import" "^7.8.3"
+    "@babel/plugin-syntax-export-namespace-from" "^7.8.3"
+    "@babel/plugin-syntax-json-strings" "^7.8.3"
+    "@babel/plugin-syntax-logical-assignment-operators" "^7.10.4"
+    "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.3"
+    "@babel/plugin-syntax-numeric-separator" "^7.10.4"
+    "@babel/plugin-syntax-object-rest-spread" "^7.8.3"
+    "@babel/plugin-syntax-optional-catch-binding" "^7.8.3"
+    "@babel/plugin-syntax-optional-chaining" "^7.8.3"
+    "@babel/plugin-syntax-private-property-in-object" "^7.14.5"
+    "@babel/plugin-syntax-top-level-await" "^7.14.5"
+    "@babel/plugin-transform-arrow-functions" "^7.14.5"
+    "@babel/plugin-transform-async-to-generator" "^7.14.5"
+    "@babel/plugin-transform-block-scoped-functions" "^7.14.5"
+    "@babel/plugin-transform-block-scoping" "^7.14.5"
+    "@babel/plugin-transform-classes" "^7.14.9"
+    "@babel/plugin-transform-computed-properties" "^7.14.5"
+    "@babel/plugin-transform-destructuring" "^7.14.7"
+    "@babel/plugin-transform-dotall-regex" "^7.14.5"
+    "@babel/plugin-transform-duplicate-keys" "^7.14.5"
+    "@babel/plugin-transform-exponentiation-operator" "^7.14.5"
+    "@babel/plugin-transform-for-of" "^7.14.5"
+    "@babel/plugin-transform-function-name" "^7.14.5"
+    "@babel/plugin-transform-literals" "^7.14.5"
+    "@babel/plugin-transform-member-expression-literals" "^7.14.5"
+    "@babel/plugin-transform-modules-amd" "^7.14.5"
+    "@babel/plugin-transform-modules-commonjs" "^7.14.5"
+    "@babel/plugin-transform-modules-systemjs" "^7.14.5"
+    "@babel/plugin-transform-modules-umd" "^7.14.5"
+    "@babel/plugin-transform-named-capturing-groups-regex" "^7.14.9"
+    "@babel/plugin-transform-new-target" "^7.14.5"
+    "@babel/plugin-transform-object-super" "^7.14.5"
+    "@babel/plugin-transform-parameters" "^7.14.5"
+    "@babel/plugin-transform-property-literals" "^7.14.5"
+    "@babel/plugin-transform-regenerator" "^7.14.5"
+    "@babel/plugin-transform-reserved-words" "^7.14.5"
+    "@babel/plugin-transform-shorthand-properties" "^7.14.5"
+    "@babel/plugin-transform-spread" "^7.14.6"
+    "@babel/plugin-transform-sticky-regex" "^7.14.5"
+    "@babel/plugin-transform-template-literals" "^7.14.5"
+    "@babel/plugin-transform-typeof-symbol" "^7.14.5"
+    "@babel/plugin-transform-unicode-escapes" "^7.14.5"
+    "@babel/plugin-transform-unicode-regex" "^7.14.5"
+    "@babel/preset-modules" "^0.1.4"
+    "@babel/types" "^7.14.9"
+    babel-plugin-polyfill-corejs2 "^0.2.2"
+    babel-plugin-polyfill-corejs3 "^0.2.2"
+    babel-plugin-polyfill-regenerator "^0.2.2"
+    core-js-compat "^3.16.0"
+    semver "^6.3.0"
+
 "@babel/preset-flow@^7.12.1", "@babel/preset-flow@^7.13.13":
   version "7.13.13"
   resolved "https://registry.npmjs.org/@babel/preset-flow/-/preset-flow-7.13.13.tgz#a61a1c149b3f77589d795287744393444d5cdd9e"
@@ -1246,7 +2132,19 @@
     "@babel/types" "^7.4.4"
     esutils "^2.0.2"
 
-"@babel/preset-react@^7.12.1", "@babel/preset-react@^7.12.5":
+"@babel/preset-react@^7.12.10":
+  version "7.14.5"
+  resolved "https://registry.npmjs.org/@babel/preset-react/-/preset-react-7.14.5.tgz#0fbb769513f899c2c56f3a882fa79673c2d4ab3c"
+  integrity sha512-XFxBkjyObLvBaAvkx1Ie95Iaq4S/GUEIrejyrntQ/VCMKUYvKLoyKxOBzJ2kjA3b6rC9/KL6KXfDC2GqvLiNqQ==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.14.5"
+    "@babel/helper-validator-option" "^7.14.5"
+    "@babel/plugin-transform-react-display-name" "^7.14.5"
+    "@babel/plugin-transform-react-jsx" "^7.14.5"
+    "@babel/plugin-transform-react-jsx-development" "^7.14.5"
+    "@babel/plugin-transform-react-pure-annotations" "^7.14.5"
+
+"@babel/preset-react@^7.12.5":
   version "7.13.13"
   resolved "https://registry.npmjs.org/@babel/preset-react/-/preset-react-7.13.13.tgz#fa6895a96c50763fe693f9148568458d5a839761"
   integrity sha512-gx+tDLIE06sRjKJkVtpZ/t3mzCDOnPG+ggHZG9lffUbX8+wC739x20YQc9V35Do6ZAxaUc/HhVHIiOzz5MvDmA==
@@ -1258,7 +2156,16 @@
     "@babel/plugin-transform-react-jsx-development" "^7.12.17"
     "@babel/plugin-transform-react-pure-annotations" "^7.12.1"
 
-"@babel/preset-typescript@^7.12.1", "@babel/preset-typescript@^7.13.0":
+"@babel/preset-typescript@^7.12.7":
+  version "7.14.5"
+  resolved "https://registry.npmjs.org/@babel/preset-typescript/-/preset-typescript-7.14.5.tgz#aa98de119cf9852b79511f19e7f44a2d379bcce0"
+  integrity sha512-u4zO6CdbRKbS9TypMqrlGH7sd2TAJppZwn3c/ZRLeO/wGsbddxgbPDUZVNrie3JWYLQ9vpineKlsrWFvO6Pwkw==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.14.5"
+    "@babel/helper-validator-option" "^7.14.5"
+    "@babel/plugin-transform-typescript" "^7.14.5"
+
+"@babel/preset-typescript@^7.13.0":
   version "7.13.0"
   resolved "https://registry.npmjs.org/@babel/preset-typescript/-/preset-typescript-7.13.0.tgz#ab107e5f050609d806fbb039bec553b33462c60a"
   integrity sha512-LXJwxrHy0N3f6gIJlYbLta1D9BDtHpQeqwzM0LIfjDlr6UE/D5Mc7W4iDiQzaE+ks0sTjT26ArcHWnJVt0QiHw==
@@ -1278,18 +2185,33 @@
     pirates "^4.0.0"
     source-map-support "^0.5.16"
 
-"@babel/runtime-corejs3@^7.10.2", "@babel/runtime-corejs3@^7.11.2", "@babel/runtime-corejs3@^7.13.17":
-  version "7.14.0"
-  resolved "https://registry.npmjs.org/@babel/runtime-corejs3/-/runtime-corejs3-7.14.0.tgz#6bf5fbc0b961f8e3202888cb2cd0fb7a0a9a3f66"
-  integrity sha512-0R0HTZWHLk6G8jIk0FtoX+AatCtKnswS98VhXwGImFc759PJRp4Tru0PQYZofyijTFUr+gT8Mu7sgXVJLQ0ceg==
+"@babel/runtime-corejs3@^7.10.2", "@babel/runtime-corejs3@^7.11.2", "@babel/runtime-corejs3@^7.14.7":
+  version "7.15.3"
+  resolved "https://registry.npmjs.org/@babel/runtime-corejs3/-/runtime-corejs3-7.15.3.tgz#28754263988198f2a928c09733ade2fb4d28089d"
+  integrity sha512-30A3lP+sRL6ml8uhoJSs+8jwpKzbw8CqBvDc1laeptxPm5FahumJxirigcbD2qTs71Sonvj1cyZB0OKGAmxQ+A==
   dependencies:
-    core-js-pure "^3.0.0"
+    core-js-pure "^3.16.0"
     regenerator-runtime "^0.13.4"
 
-"@babel/runtime@^7.0.0", "@babel/runtime@^7.1.2", "@babel/runtime@^7.10.0", "@babel/runtime@^7.10.1", "@babel/runtime@^7.10.2", "@babel/runtime@^7.10.4", "@babel/runtime@^7.10.5", "@babel/runtime@^7.11.2", "@babel/runtime@^7.12.5", "@babel/runtime@^7.14.0", "@babel/runtime@^7.3.1", "@babel/runtime@^7.3.4", "@babel/runtime@^7.4.4", "@babel/runtime@^7.5.0", "@babel/runtime@^7.5.4", "@babel/runtime@^7.5.5", "@babel/runtime@^7.6.0", "@babel/runtime@^7.6.3", "@babel/runtime@^7.7.2", "@babel/runtime@^7.7.6", "@babel/runtime@^7.8.3", "@babel/runtime@^7.8.4", "@babel/runtime@^7.8.7", "@babel/runtime@^7.9.2":
-  version "7.14.6"
-  resolved "https://registry.npmjs.org/@babel/runtime/-/runtime-7.14.6.tgz#535203bc0892efc7dec60bdc27b2ecf6e409062d"
-  integrity sha512-/PCB2uJ7oM44tz8YhC4Z/6PeOKXp4K588f+5M3clr1M4zbqztlo0XEfJ2LEzj/FgwfgGcIdl8n7YYjTCI0BYwg==
+"@babel/runtime-corejs3@^7.9.6":
+  version "7.15.4"
+  resolved "https://registry.npmjs.org/@babel/runtime-corejs3/-/runtime-corejs3-7.15.4.tgz#403139af262b9a6e8f9ba04a6fdcebf8de692bf1"
+  integrity sha512-lWcAqKeB624/twtTc3w6w/2o9RqJPaNBhPGK6DKLSiwuVWC7WFkypWyNg+CpZoyJH0jVzv1uMtXZ/5/lQOLtCg==
+  dependencies:
+    core-js-pure "^3.16.0"
+    regenerator-runtime "^0.13.4"
+
+"@babel/runtime@^7.0.0", "@babel/runtime@^7.1.2", "@babel/runtime@^7.10.0", "@babel/runtime@^7.10.1", "@babel/runtime@^7.10.2", "@babel/runtime@^7.10.4", "@babel/runtime@^7.10.5", "@babel/runtime@^7.11.2", "@babel/runtime@^7.12.5", "@babel/runtime@^7.14.0", "@babel/runtime@^7.14.8", "@babel/runtime@^7.3.1", "@babel/runtime@^7.4.4", "@babel/runtime@^7.5.0", "@babel/runtime@^7.5.4", "@babel/runtime@^7.5.5", "@babel/runtime@^7.6.0", "@babel/runtime@^7.7.2", "@babel/runtime@^7.7.6", "@babel/runtime@^7.8.3", "@babel/runtime@^7.8.4", "@babel/runtime@^7.8.7", "@babel/runtime@^7.9.2":
+  version "7.14.8"
+  resolved "https://registry.npmjs.org/@babel/runtime/-/runtime-7.14.8.tgz#7119a56f421018852694290b9f9148097391b446"
+  integrity sha512-twj3L8Og5SaCRCErB4x4ajbvBIVV77CGeFglHpeg5WC5FF8TZzBWXtTJ4MqaD9QszLYTtr+IsaAL2rEUevb+eg==
+  dependencies:
+    regenerator-runtime "^0.13.4"
+
+"@babel/runtime@^7.2.0":
+  version "7.15.4"
+  resolved "https://registry.npmjs.org/@babel/runtime/-/runtime-7.15.4.tgz#fd17d16bfdf878e6dd02d19753a39fa8a8d9c84a"
+  integrity sha512-99catp6bHCaxr4sJ/DbTGgHS4+Rs2RVd2g7iOap6SLGPDknRK9ztKNsE/Fg6QhSeh1FGE5f6gHGQmvvn3I3xhw==
   dependencies:
     regenerator-runtime "^0.13.4"
 
@@ -1302,6 +2224,15 @@
     "@babel/parser" "^7.12.13"
     "@babel/types" "^7.12.13"
 
+"@babel/template@^7.12.7", "@babel/template@^7.14.5":
+  version "7.14.5"
+  resolved "https://registry.npmjs.org/@babel/template/-/template-7.14.5.tgz#a9bc9d8b33354ff6e55a9c60d1109200a68974f4"
+  integrity sha512-6Z3Po85sfxRGachLULUhOmvAaOo7xCvqGQtxINai2mEGPFm6pQ4z5QInFnUrRpfoSV60BnjyF5F3c+15fxFV1g==
+  dependencies:
+    "@babel/code-frame" "^7.14.5"
+    "@babel/parser" "^7.14.5"
+    "@babel/types" "^7.14.5"
+
 "@babel/traverse@7.12.13":
   version "7.12.13"
   resolved "https://registry.npmjs.org/@babel/traverse/-/traverse-7.12.13.tgz#689f0e4b4c08587ad26622832632735fb8c4e0c0"
@@ -1331,6 +2262,21 @@
     debug "^4.1.0"
     globals "^11.1.0"
 
+"@babel/traverse@^7.12.11", "@babel/traverse@^7.12.9", "@babel/traverse@^7.14.5", "@babel/traverse@^7.14.8":
+  version "7.14.9"
+  resolved "https://registry.npmjs.org/@babel/traverse/-/traverse-7.14.9.tgz#016126b331210bf06fff29d52971eef8383e556f"
+  integrity sha512-bldh6dtB49L8q9bUyB7bC20UKgU+EFDwKJylwl234Kv+ySZeMD31Xeht6URyueQ6LrRRpF2tmkfcZooZR9/e8g==
+  dependencies:
+    "@babel/code-frame" "^7.14.5"
+    "@babel/generator" "^7.14.9"
+    "@babel/helper-function-name" "^7.14.5"
+    "@babel/helper-hoist-variables" "^7.14.5"
+    "@babel/helper-split-export-declaration" "^7.14.5"
+    "@babel/parser" "^7.14.9"
+    "@babel/types" "^7.14.9"
+    debug "^4.1.0"
+    globals "^11.1.0"
+
 "@babel/types@7.12.13":
   version "7.12.13"
   resolved "https://registry.npmjs.org/@babel/types/-/types-7.12.13.tgz#8be1aa8f2c876da11a9cf650c0ecf656913ad611"
@@ -1348,18 +2294,13 @@
     "@babel/helper-validator-identifier" "^7.14.0"
     to-fast-properties "^2.0.0"
 
-"@backstage/catalog-model@^0.8.4":
-  version "0.9.0"
+"@babel/types@^7.12.11", "@babel/types@^7.12.7", "@babel/types@^7.14.5", "@babel/types@^7.14.8", "@babel/types@^7.14.9":
+  version "7.14.9"
+  resolved "https://registry.npmjs.org/@babel/types/-/types-7.14.9.tgz#f2b19c3f2f77c5708d67fe8f6046e9cea2b5036d"
+  integrity sha512-u0bLTnv3DFHeaQLYzb7oRJ1JHr1sv/SYDM7JSqHFFLwXG1wTZRughxFI5NCP8qBEo1rVVsn7Yg2Lvw49nne/Ow==
   dependencies:
-    "@backstage/config" "^0.1.5"
-    "@backstage/errors" "^0.1.1"
-    "@types/json-schema" "^7.0.5"
-    "@types/yup" "^0.29.8"
-    ajv "^7.0.3"
-    json-schema "^0.3.0"
-    lodash "^4.17.15"
-    uuid "^8.0.0"
-    yup "^0.29.3"
+    "@babel/helper-validator-identifier" "^7.14.9"
+    to-fast-properties "^2.0.0"
 
 "@backstage/core-api@^0.2.23":
   version "0.2.23"
@@ -1379,6 +2320,51 @@
     react-use "^17.2.4"
     zen-observable "^0.8.15"
 
+"@backstage/core-components@^0.3.0":
+  version "0.3.3"
+  resolved "https://registry.npmjs.org/@backstage/core-components/-/core-components-0.3.3.tgz#ec63eac6d789303f90219857849fa1cefe4e0dde"
+  integrity sha512-u75+YiXu33NHSFT5MqTgY+uqtxyye4Tmy3I7D21wLUgeW6aFhmS1IUBGckCqv8UG1nqZS7gBmJLccm88tDsJaA==
+  dependencies:
+    "@backstage/config" "^0.1.8"
+    "@backstage/core-plugin-api" "^0.1.6"
+    "@backstage/errors" "^0.1.1"
+    "@backstage/theme" "^0.2.10"
+    "@material-table/core" "^3.1.0"
+    "@material-ui/core" "^4.12.2"
+    "@material-ui/icons" "^4.9.1"
+    "@material-ui/lab" "4.0.0-alpha.45"
+    "@testing-library/react-hooks" "^3.4.2"
+    "@types/dagre" "^0.7.44"
+    "@types/prop-types" "^15.7.3"
+    "@types/react" "*"
+    "@types/react-sparklines" "^1.7.0"
+    "@types/react-text-truncate" "^0.14.0"
+    classnames "^2.2.6"
+    clsx "^1.1.0"
+    d3-selection "^2.0.0"
+    d3-shape "^2.0.0"
+    d3-zoom "^2.0.0"
+    dagre "^0.8.5"
+    immer "^9.0.1"
+    lodash "^4.17.15"
+    pluralize "^8.0.0"
+    prop-types "^15.7.2"
+    qs "^6.9.4"
+    rc-progress "^3.0.0"
+    react "^16.12.0"
+    react-dom "^16.12.0"
+    react-helmet "6.1.0"
+    react-hook-form "^6.15.4"
+    react-markdown "^5.0.2"
+    react-router "6.0.0-beta.0"
+    react-router-dom "6.0.0-beta.0"
+    react-sparklines "^1.7.0"
+    react-syntax-highlighter "^15.4.3"
+    react-text-truncate "^0.16.0"
+    react-use "^17.2.4"
+    remark-gfm "^1.0.0"
+    zen-observable "^0.8.15"
+
 "@backstage/core@*":
   version "0.7.14"
   resolved "https://registry.npmjs.org/@backstage/core/-/core-0.7.14.tgz#863844fe40bb6a29bcc2d297e42055633b0e886f"
@@ -1430,10 +2416,10 @@
   resolved "https://registry.npmjs.org/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
   integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
 
-"@braintree/sanitize-url@^5.0.0":
-  version "5.0.0"
-  resolved "https://registry.npmjs.org/@braintree/sanitize-url/-/sanitize-url-5.0.0.tgz#3ba791f37b90e7f6170d252b63aacfcae943c039"
-  integrity sha512-WmKrB/575EJCzbeSJR3YQ5sET5FaizeljLRw1382qVUeGqzuWBgIS+AF5a0FO51uQTrDpoRgvuHC2IWVsgwkkA==
+"@braintree/sanitize-url@^5.0.2":
+  version "5.0.2"
+  resolved "https://registry.npmjs.org/@braintree/sanitize-url/-/sanitize-url-5.0.2.tgz#b23080fa35520e993a8a37a0f5bca26aa4650a48"
+  integrity sha512-NBEJlHWrhQucLhZGHtSxM2loSaNUMajC7KOYJLyfcdW/6goVoff2HoYI3bz8YCDN0wKGbxtUL0gx2dvHpvnWlw==
 
 "@changesets/apply-release-plan@^5.0.0":
   version "5.0.0"
@@ -1680,7 +2666,7 @@
     enabled "2.0.x"
     kuler "^2.0.0"
 
-"@date-io/core@1.x", "@date-io/core@^1.3.13":
+"@date-io/core@1.x", "@date-io/core@^1.1.0", "@date-io/core@^1.3.13":
   version "1.3.13"
   resolved "https://registry.npmjs.org/@date-io/core/-/core-1.3.13.tgz#90c71da493f20204b7a972929cc5c482d078b3fa"
   integrity sha512-AlEKV7TxjeK+jxWVKcCFrfYAk8spX9aCyiToFIiLPtfQbsjmRGLIhb5VZgptQcJdHtLXo7+m0DuurwFgUToQuA==
@@ -1695,7 +2681,14 @@
   resolved "https://registry.npmjs.org/@date-io/core/-/core-2.10.11.tgz#b1a3d57730f3eaaab54d5658be4a71727297e357"
   integrity sha512-keXQnwH0LM8wyvu+j5Z2KGK56D+eItjy7DnwuWl/oV+DM2UEYl0z5WhdPMpfswSyt/kjuPOzcVF/7u/skMLaoA==
 
-"@date-io/date-fns@^1.1.0":
+"@date-io/date-fns@1.1.0":
+  version "1.1.0"
+  resolved "https://registry.npmjs.org/@date-io/date-fns/-/date-fns-1.1.0.tgz#91cd7703042513a6a0056a344b25cd74a4df643e"
+  integrity sha512-FMRhYWfoGiIXdN4xWAArpkdEbqsg2Fr+6Yda7Np2eVWCNx6gSMYsHIM51IIcI+3762ajYbhoEYjHYXVFNZIk1g==
+  dependencies:
+    "@date-io/core" "^1.1.0"
+
+"@date-io/date-fns@^1.3.13":
   version "1.3.13"
   resolved "https://registry.npmjs.org/@date-io/date-fns/-/date-fns-1.3.13.tgz#7798844041640ab393f7e21a7769a65d672f4735"
   integrity sha512-yXxGzcRUPcogiMj58wVgFjc9qUYrCnnU9eLcyNbsQCmae4jPuZCDoIBR21j8ZURsM7GRtU62VOw5yNd4dDHunA==
@@ -1709,6 +2702,25 @@
   dependencies:
     "@date-io/core" "^2.10.11"
 
+"@elastic/elasticsearch-mock@^0.3.0":
+  version "0.3.0"
+  resolved "https://registry.npmjs.org/@elastic/elasticsearch-mock/-/elasticsearch-mock-0.3.0.tgz#6b1d8448aad3ca20f760fa01c0206b733c9c1e54"
+  integrity sha512-hZYRjPgRE1M0wCqdsgaDtwxrgQEXDZya1gQ3gnpc8pB8mHUfPoO+9ye7GbDPUkWbuGGGZ4/p6OKmAbt/ME+CDQ==
+  dependencies:
+    fast-deep-equal "^3.1.1"
+    find-my-way "^2.2.2"
+    into-stream "^5.1.1"
+
+"@elastic/elasticsearch@^7.13.0":
+  version "7.13.0"
+  resolved "https://registry.npmjs.org/@elastic/elasticsearch/-/elasticsearch-7.13.0.tgz#6dcf511dfa91187e22c81e54f41f4bd0fd96b4d6"
+  integrity sha512-WgwLWo2p9P2tdqzBGX9fHeG8p5IOTXprXNTECQG2mJ7z9n93N5AFBJpEw4d35tWWeCWi9jI13A2wzQZH7XZ/xw==
+  dependencies:
+    debug "^4.3.1"
+    hpagent "^0.1.1"
+    ms "^2.1.3"
+    secure-json-parse "^2.4.0"
+
 "@emotion/cache@^10.0.27":
   version "10.0.29"
   resolved "https://registry.npmjs.org/@emotion/cache/-/cache-10.0.29.tgz#87e7e64f412c060102d589fe7c6dc042e6f9d1e0"
@@ -1783,7 +2795,7 @@
     "@emotion/serialize" "^0.11.15"
     "@emotion/utils" "0.11.3"
 
-"@emotion/styled@^10.0.23", "@emotion/styled@^10.0.27":
+"@emotion/styled@^10.0.27":
   version "10.0.27"
   resolved "https://registry.npmjs.org/@emotion/styled/-/styled-10.0.27.tgz#12cb67e91f7ad7431e1875b1d83a94b814133eaf"
   integrity sha512-iK/8Sh7+NLJzyp9a5+vIQIXTYxfT4yB/OJbjzQanB2RZpvmzBQOHZWhpAMZWYEKRNNbsD6WfBw5sVWkb6WzS/Q==
@@ -1874,27 +2886,10 @@
     query-string "^7.0.0"
     xcase "^2.0.1"
 
-"@google-cloud/common@^0.32.0":
-  version "0.32.1"
-  resolved "https://registry.npmjs.org/@google-cloud/common/-/common-0.32.1.tgz#6a32c340172cea3db6674d0e0e34e78740a0073f"
-  integrity sha512-bLdPzFvvBMtVkwsoBtygE9oUm3yrNmPa71gvOgucYI/GqvNP2tb6RYsDHPq98kvignhcgHGDI5wyNgxaCo8bKQ==
-  dependencies:
-    "@google-cloud/projectify" "^0.3.3"
-    "@google-cloud/promisify" "^0.4.0"
-    "@types/request" "^2.48.1"
-    arrify "^2.0.0"
-    duplexify "^3.6.0"
-    ent "^2.2.0"
-    extend "^3.0.2"
-    google-auth-library "^3.1.1"
-    pify "^4.0.1"
-    retry-request "^4.0.0"
-    teeny-request "^3.11.3"
-
-"@google-cloud/common@^3.6.0":
-  version "3.6.0"
-  resolved "https://registry.npmjs.org/@google-cloud/common/-/common-3.6.0.tgz#c2f6da5f79279a4a9ac7c71fc02d582beab98e8b"
-  integrity sha512-aHIFTqJZmeTNO9md8XxV+ywuvXF3xBm5WNmgWeeCK+XN5X+kGW0WEX94wGwj+/MdOnrVf4dL2RvSIt9J5yJG6Q==
+"@google-cloud/common@^3.7.0":
+  version "3.7.0"
+  resolved "https://registry.npmjs.org/@google-cloud/common/-/common-3.7.0.tgz#ee3fba75aeaa614978aebf8740380670026592aa"
+  integrity sha512-oFgpKLjH9JTOAyQd3kB36iSuH8wNSpDKb1TywlB6zcsG0xmJFxLutmfPhz03KUxRMNQOZ1K1Gc9BYvJifVnGVA==
   dependencies:
     "@google-cloud/projectify" "^2.0.0"
     "@google-cloud/promisify" "^2.0.0"
@@ -1903,7 +2898,7 @@
     ent "^2.2.0"
     extend "^3.0.2"
     google-auth-library "^7.0.2"
-    retry-request "^4.1.1"
+    retry-request "^4.2.2"
     teeny-request "^7.0.0"
 
 "@google-cloud/container@^2.2.0":
@@ -1913,16 +2908,6 @@
   dependencies:
     google-gax "^2.12.0"
 
-"@google-cloud/paginator@^0.2.0":
-  version "0.2.0"
-  resolved "https://registry.npmjs.org/@google-cloud/paginator/-/paginator-0.2.0.tgz#eab2e6aa4b81df7418f6c51e2071f64dab2c2fa5"
-  integrity sha512-2ZSARojHDhkLvQ+CS32K+iUhBsWg3AEw+uxtqblA7xoCABDyhpj99FPp35xy6A+XlzMhOSrHHaxFE+t6ZTQq0w==
-  dependencies:
-    arrify "^1.0.1"
-    extend "^3.0.1"
-    split-array-stream "^2.0.0"
-    stream-events "^1.0.4"
-
 "@google-cloud/paginator@^3.0.0":
   version "3.0.5"
   resolved "https://registry.npmjs.org/@google-cloud/paginator/-/paginator-3.0.5.tgz#9d6b96c421a89bd560c1bc2c197c7611ef21db6c"
@@ -1931,59 +2916,22 @@
     arrify "^2.0.0"
     extend "^3.0.2"
 
-"@google-cloud/projectify@^0.3.3":
-  version "0.3.3"
-  resolved "https://registry.npmjs.org/@google-cloud/projectify/-/projectify-0.3.3.tgz#bde9103d50b20a3ea3337df8c6783a766e70d41d"
-  integrity sha512-7522YHQ4IhaafgSunsFF15nG0TGVmxgXidy9cITMe+256RgqfcrfWphiMufW+Ou4kqagW/u3yxwbzVEW3dk2Uw==
-
 "@google-cloud/projectify@^2.0.0":
   version "2.0.1"
   resolved "https://registry.npmjs.org/@google-cloud/projectify/-/projectify-2.0.1.tgz#13350ee609346435c795bbfe133a08dfeab78d65"
   integrity sha512-ZDG38U/Yy6Zr21LaR3BTiiLtpJl6RkPS/JwoRT453G+6Q1DhlV0waNf8Lfu+YVYGIIxgKnLayJRfYlFJfiI8iQ==
 
-"@google-cloud/promisify@^0.4.0":
-  version "0.4.0"
-  resolved "https://registry.npmjs.org/@google-cloud/promisify/-/promisify-0.4.0.tgz#4fbfcf4d85bb6a2e4ccf05aa63d2b10d6c9aad9b"
-  integrity sha512-4yAHDC52TEMCNcMzVC8WlqnKKKq+Ssi2lXoUg9zWWkZ6U6tq9ZBRYLHHCRdfU+EU9YJsVmivwGcKYCjRGjnf4Q==
-
 "@google-cloud/promisify@^2.0.0":
   version "2.0.3"
   resolved "https://registry.npmjs.org/@google-cloud/promisify/-/promisify-2.0.3.tgz#f934b5cdc939e3c7039ff62b9caaf59a9d89e3a8"
   integrity sha512-d4VSA86eL/AFTe5xtyZX+ePUjE8dIFu2T8zmdeNBSa5/kNgXPCx/o/wbFNHAGLJdGnk1vddRuMESD9HbOC8irw==
 
-"@google-cloud/storage@^2.4.3":
-  version "2.5.0"
-  resolved "https://registry.npmjs.org/@google-cloud/storage/-/storage-2.5.0.tgz#9dd3566d8155cf5ba0c212208f69f9ecd47fbd7e"
-  integrity sha512-q1mwB6RUebIahbA3eriRs8DbG2Ij81Ynb9k8hMqTPkmbd8/S6Z0d6hVvfPmnyvX9Ej13IcmEYIbymuq/RBLghA==
-  dependencies:
-    "@google-cloud/common" "^0.32.0"
-    "@google-cloud/paginator" "^0.2.0"
-    "@google-cloud/promisify" "^0.4.0"
-    arrify "^1.0.0"
-    async "^2.0.1"
-    compressible "^2.0.12"
-    concat-stream "^2.0.0"
-    date-and-time "^0.6.3"
-    duplexify "^3.5.0"
-    extend "^3.0.0"
-    gcs-resumable-upload "^1.0.0"
-    hash-stream-validation "^0.2.1"
-    mime "^2.2.0"
-    mime-types "^2.0.8"
-    onetime "^5.1.0"
-    pumpify "^1.5.1"
-    snakeize "^0.1.0"
-    stream-events "^1.0.1"
-    teeny-request "^3.11.3"
-    through2 "^3.0.0"
-    xdg-basedir "^3.0.0"
-
 "@google-cloud/storage@^5.6.0", "@google-cloud/storage@^5.8.0":
-  version "5.8.5"
-  resolved "https://registry.npmjs.org/@google-cloud/storage/-/storage-5.8.5.tgz#2cf1e2e0ef8ca552abc4450301fef3fea4900ef6"
-  integrity sha512-i0gB9CRwQeOBYP7xuvn14M40LhHCwMjceBjxE4CTvsqL519sVY5yVKxLiAedHWGwUZHJNRa7Q2CmNfkdRwVNPg==
+  version "5.11.0"
+  resolved "https://registry.npmjs.org/@google-cloud/storage/-/storage-5.11.0.tgz#f2414358f093034410bb03410176a5dcabc7bdf8"
+  integrity sha512-UgdAwBelXpQhubYOHw0U/hDxCXIXFT2TqDc0JWUxtg+BeePZC0ohoFM/b/tJffE28AZW0urTQax5xbRNoDA1Sw==
   dependencies:
-    "@google-cloud/common" "^3.6.0"
+    "@google-cloud/common" "^3.7.0"
     "@google-cloud/paginator" "^3.0.0"
     "@google-cloud/promisify" "^2.0.0"
     arrify "^2.0.0"
@@ -1992,8 +2940,7 @@
     date-and-time "^1.0.0"
     duplexify "^4.0.0"
     extend "^3.0.2"
-    gaxios "^4.0.0"
-    gcs-resumable-upload "^3.1.4"
+    gcs-resumable-upload "^3.3.0"
     get-stream "^6.0.0"
     hash-stream-validation "^0.2.2"
     mime "^2.2.0"
@@ -2005,14 +2952,15 @@
     stream-events "^1.0.1"
     xdg-basedir "^4.0.0"
 
-"@graphiql/toolkit@^0.1.0":
-  version "0.1.1"
-  resolved "https://registry.npmjs.org/@graphiql/toolkit/-/toolkit-0.1.1.tgz#a7da3ba460ceae27bcdc8f03831ca4f88f90f3d7"
-  integrity sha512-cvsuaPkOA6/TZOdqEdvzqr7i+or2STTpSsteyDkrUXrwftRnH9ZfiUwnHPyf0AC2cKMwpP/Dny/UTS6CLC8ZNQ==
+"@graphiql/toolkit@^0.2.0":
+  version "0.2.2"
+  resolved "https://registry.npmjs.org/@graphiql/toolkit/-/toolkit-0.2.2.tgz#193d570afcf686c9ee61c92054c1782b9f3c1255"
+  integrity sha512-kDgYhqnS4p4LqSo1KvLd3tbX8Hhdj0ZrgQuGsosjjEnahiPYmmylxUL1p9lj6348OsypcTlCncGpEjeb9S3TiQ==
   dependencies:
-    "@n1ru4l/push-pull-async-iterable-iterator" "^2.0.1"
-    graphql-ws "^4.1.0"
-    meros "^1.1.2"
+    "@n1ru4l/push-pull-async-iterable-iterator" "^2.1.4"
+    graphql-ws "^4.3.2"
+    meros "^1.1.4"
+  optionalDependencies:
     subscriptions-transport-ws "^0.9.18"
 
 "@graphql-codegen/cli@^1.21.3":
@@ -2070,16 +3018,16 @@
     "@graphql-tools/utils" "^7.9.1"
     tslib "~2.2.0"
 
-"@graphql-codegen/plugin-helpers@^1.18.7":
-  version "1.18.7"
-  resolved "https://registry.npmjs.org/@graphql-codegen/plugin-helpers/-/plugin-helpers-1.18.7.tgz#465af3e5b02de89e49ddc76ad2546b880fe240f2"
-  integrity sha512-8ICOrXlsvyL1dpVz8C9b7H31d4DJpDd75WfjMn6Xjqz81Ah8xDn1Bi+7YXRCCILCBmvI94k6fi8qpsIVhFBBjQ==
+"@graphql-codegen/plugin-helpers@^1.18.7", "@graphql-codegen/plugin-helpers@^1.18.8":
+  version "1.18.8"
+  resolved "https://registry.npmjs.org/@graphql-codegen/plugin-helpers/-/plugin-helpers-1.18.8.tgz#39aac745b9e22e28c781cc07cf74836896a3a905"
+  integrity sha512-mb4I9j9lMGqvGggYuZ0CV+Hme08nar68xkpPbAVotg/ZBmlhZIok/HqW2BcMQi7Rj+Il5HQMeQ1wQ1M7sv/TlQ==
   dependencies:
     "@graphql-tools/utils" "^7.9.1"
     common-tags "1.8.0"
-    import-from "3.0.0"
+    import-from "4.0.0"
     lodash "~4.17.0"
-    tslib "~2.2.0"
+    tslib "~2.3.0"
 
 "@graphql-codegen/typescript-resolvers@^1.17.7":
   version "1.19.3"
@@ -2094,12 +3042,12 @@
     tslib "~2.3.0"
 
 "@graphql-codegen/typescript@^1.17.7", "@graphql-codegen/typescript@^1.22.2":
-  version "1.22.2"
-  resolved "https://registry.npmjs.org/@graphql-codegen/typescript/-/typescript-1.22.2.tgz#e0a1926ed8f81d10fcf64911d08d19d57dea94b1"
-  integrity sha512-M+gJVHnpWanCTrSqzh+jNyJ6HhDICFzWV3SVcns5LX1X4NC/7N+TvYLk9ZzRSpBYCkWWGmTPrZNd0zjwhroRTg==
+  version "1.23.0"
+  resolved "https://registry.npmjs.org/@graphql-codegen/typescript/-/typescript-1.23.0.tgz#48a5372bcbe81a442c71c1bb032c312c6586a59a"
+  integrity sha512-ZfFgk5mGfuOy4kEpy+dcuvJMphigMfJ4AkiP1qWmWFufDW3Sg2yayTSNmzeFdcXMrWGgfNW2dKtuuTmbmQhS5g==
   dependencies:
-    "@graphql-codegen/plugin-helpers" "^1.18.7"
-    "@graphql-codegen/visitor-plugin-common" "1.21.1"
+    "@graphql-codegen/plugin-helpers" "^1.18.8"
+    "@graphql-codegen/visitor-plugin-common" "1.22.0"
     auto-bind "~4.0.0"
     tslib "~2.3.0"
 
@@ -2119,6 +3067,22 @@
     parse-filepath "^1.0.2"
     tslib "~2.3.0"
 
+"@graphql-codegen/visitor-plugin-common@1.22.0":
+  version "1.22.0"
+  resolved "https://registry.npmjs.org/@graphql-codegen/visitor-plugin-common/-/visitor-plugin-common-1.22.0.tgz#75fc8b580143bccbec411eb92d5fef715ed22e42"
+  integrity sha512-2afJGb6d8iuZl9KizYsexPwraEKO1lAvt5eVHNM5Xew4vwz/AUHeqDR2uOeQgVV+27EzjjzSDd47IEdH0dLC2w==
+  dependencies:
+    "@graphql-codegen/plugin-helpers" "^1.18.8"
+    "@graphql-tools/optimize" "^1.0.1"
+    "@graphql-tools/relay-operation-optimizer" "^6.3.0"
+    array.prototype.flatmap "^1.2.4"
+    auto-bind "~4.0.0"
+    change-case-all "1.0.14"
+    dependency-graph "^0.11.0"
+    graphql-tag "^2.11.0"
+    parse-filepath "^1.0.2"
+    tslib "~2.3.0"
+
 "@graphql-modules/core@^0.7.17":
   version "0.7.17"
   resolved "https://registry.npmjs.org/@graphql-modules/core/-/core-0.7.17.tgz#ae9bbf44894509664bc0b6fcdd9b6cf3d99bcd00"
@@ -2417,16 +3381,25 @@
     prop-types "^15.6.2"
     scheduler "^0.19.0"
 
+"@humanwhocodes/config-array@^0.5.0":
+  version "0.5.0"
+  resolved "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.5.0.tgz#1407967d4c6eecd7388f83acf1eaf4d0c6e58ef9"
+  integrity sha512-FagtKFz74XrTl7y6HCzQpwDfXP0yhxe9lHLD1UZxjvZIcbyRz8zTFF/yYNfSfzU414eDwZ1SrO0Qvtyf+wFMQg==
+  dependencies:
+    "@humanwhocodes/object-schema" "^1.2.0"
+    debug "^4.1.1"
+    minimatch "^3.0.4"
+
+"@humanwhocodes/object-schema@^1.2.0":
+  version "1.2.0"
+  resolved "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-1.2.0.tgz#87de7af9c231826fdd68ac7258f77c429e0e5fcf"
+  integrity sha512-wdppn25U8z/2yiaT6YGquE6X8sSv7hNMWSXYSSU1jGv/yd6XqjXgTDJ8KP4NgjTXfJ3GbRjeeb8RTV7a/VpM+w==
+
 "@iarna/toml@^2.2.5":
   version "2.2.5"
   resolved "https://registry.npmjs.org/@iarna/toml/-/toml-2.2.5.tgz#b32366c89b43c6f8cefbdefac778b9c828e3ba8c"
   integrity sha512-trnsAYxU3xnS1gPHPyU961coFyLkh4gAD/0zQ5mymY4yOZ+CYvsPqUbOFSw0aDM4y0tV7tiFxL/1XfXPNC6IPg==
 
-"@icons/material@^0.2.4":
-  version "0.2.4"
-  resolved "https://registry.npmjs.org/@icons/material/-/material-0.2.4.tgz#e90c9f71768b3736e76d7dd6783fc6c2afa88bc8"
-  integrity sha512-QPcGmICAPbGLGb6F/yNf/KzKqvFx8z5qx3D1yFqVAjoFmXK35EgyW+cJ57Te3CNsmzblwtzakLGFqHPqrfb4Tw==
-
 "@istanbuljs/load-nyc-config@^1.0.0":
   version "1.0.0"
   resolved "https://registry.npmjs.org/@istanbuljs/load-nyc-config/-/load-nyc-config-1.0.0.tgz#10602de5570baea82f8afbfa2630b24e7a8cfe5b"
@@ -2659,10 +3632,10 @@
   resolved "https://registry.npmjs.org/@jsdevtools/ono/-/ono-7.1.3.tgz#9df03bbd7c696a5c58885c34aa06da41c8543796"
   integrity sha512-4JQNk+3mVzK3xh2rqd6RB4J46qUR19azEHBneZyTZM+c456qOrbbM/5xcR8huNCCcbVt7+UmizG6GuUvPvKUYg==
 
-"@kubernetes/client-node@^0.14.0":
-  version "0.14.3"
-  resolved "https://registry.npmjs.org/@kubernetes/client-node/-/client-node-0.14.3.tgz#5ed9b88873419080547f22cb74eb502bf6671fca"
-  integrity sha512-9hHGDNm2JEFQcRTpDxVoAVr0fowU+JH/l5atCXY9VXwvFM18pW5wr2LzLP+Q2Rh+uQv7Moz4gEjEKSCgVKykEQ==
+"@kubernetes/client-node@^0.15.0":
+  version "0.15.0"
+  resolved "https://registry.npmjs.org/@kubernetes/client-node/-/client-node-0.15.0.tgz#aa5cfcfa9ba3055fe0b510c430d19bbda715d8e7"
+  integrity sha512-AnEcsWWadl5IWOzzvO/gWpTnJb1d1CzA/rbV/qK1c0fD1SOxTDPj6jFllyQ9icGDfCgNw3TafZftmuepm6z9JA==
   dependencies:
     "@types/js-yaml" "^3.12.1"
     "@types/node" "^10.12.0"
@@ -2672,14 +3645,14 @@
     "@types/underscore" "^1.8.9"
     "@types/ws" "^6.0.1"
     byline "^5.0.0"
-    execa "1.0.0"
+    execa "5.0.0"
     isomorphic-ws "^4.0.1"
     js-yaml "^3.13.1"
     jsonpath-plus "^0.19.0"
     openid-client "^4.1.1"
     request "^2.88.0"
     rfc4648 "^1.3.0"
-    shelljs "^0.8.2"
+    shelljs "^0.8.4"
     stream-buffers "^3.0.2"
     tar "^6.0.2"
     tmp-promise "^3.0.2"
@@ -3396,14 +4369,31 @@
   resolved "https://registry.npmjs.org/@material-icons/font/-/font-1.0.3.tgz#f722e5a69a03f20ef47d015cb69420bebeeaabe5"
   integrity sha512-aIRd0Z9b/HJ/O24KOaP7dNsXypMnXhpWrpLVYvQB/JesVqXYSbioYND200sR+C14a0LSCp+qWnWCnSXmN1hWGw==
 
-"@material-ui/core@^4.11.0", "@material-ui/core@^4.11.3":
-  version "4.11.4"
-  resolved "https://registry.npmjs.org/@material-ui/core/-/core-4.11.4.tgz#4fb9fe5dec5dcf780b687e3a40cff78b2b9640a4"
-  integrity sha512-oqb+lJ2Dl9HXI9orc6/aN8ZIAMkeThufA5iZELf2LQeBn2NtjVilF5D2w7e9RpntAzDb4jK5DsVhkfOvFY/8fg==
+"@material-table/core@^3.1.0":
+  version "3.1.0"
+  resolved "https://registry.npmjs.org/@material-table/core/-/core-3.1.0.tgz#4fc3bd1553359e628413437a4102d8469852c253"
+  integrity sha512-46vpm1q9v2B5t/VgaEq2JmnftTBYle1yNAX3cfdQsTRZ1iWkpG34qBkNHx/hbOauQPsm5hmeUo1KJJZdwtGL1g==
+  dependencies:
+    "@babel/runtime" "^7.12.5"
+    "@date-io/date-fns" "^1.3.13"
+    "@material-ui/pickers" "^3.2.10"
+    "@material-ui/styles" "^4.11.4"
+    classnames "^2.2.6"
+    date-fns "^2.16.1"
+    debounce "^1.2.0"
+    fast-deep-equal "^3.1.3"
+    prop-types "^15.7.2"
+    react-beautiful-dnd "^13.0.0"
+    react-double-scrollbar "0.0.15"
+
+"@material-ui/core@^4.11.0", "@material-ui/core@^4.11.3", "@material-ui/core@^4.12.1", "@material-ui/core@^4.12.2":
+  version "4.12.3"
+  resolved "https://registry.npmjs.org/@material-ui/core/-/core-4.12.3.tgz#80d665caf0f1f034e52355c5450c0e38b099d3ca"
+  integrity sha512-sdpgI/PL56QVsEJldwEe4FFaFTLUqN+rd7sSZiRCdx2E/C7z5yK0y/khAWVBH24tXwto7I1hCzNWfJGZIYJKnw==
   dependencies:
     "@babel/runtime" "^7.4.4"
     "@material-ui/styles" "^4.11.4"
-    "@material-ui/system" "^4.11.3"
+    "@material-ui/system" "^4.12.1"
     "@material-ui/types" "5.1.0"
     "@material-ui/utils" "^4.11.2"
     "@types/react-transition-group" "^4.2.0"
@@ -3443,7 +4433,19 @@
     prop-types "^15.7.2"
     react-is "^16.8.0 || ^17.0.0"
 
-"@material-ui/pickers@^3.2.2", "@material-ui/pickers@^3.3.10":
+"@material-ui/pickers@3.2.2":
+  version "3.2.2"
+  resolved "https://registry.npmjs.org/@material-ui/pickers/-/pickers-3.2.2.tgz#9b7a67f5a8f21f8183853ebc1848e5d8dd680d4c"
+  integrity sha512-on/J1yyKeJ4CkLnItpf/jPDKMZVWvHDklkh5FS7wkZ0s1OPoqTsPubLWfA7eND6xREnVRyLFzVTlE3VlWYdQWw==
+  dependencies:
+    "@babel/runtime" "^7.2.0"
+    "@types/styled-jsx" "^2.2.8"
+    clsx "^1.0.2"
+    react-transition-group "^4.0.0"
+    rifm "^0.7.0"
+    tslib "^1.9.3"
+
+"@material-ui/pickers@^3.2.10", "@material-ui/pickers@^3.3.10":
   version "3.3.10"
   resolved "https://registry.npmjs.org/@material-ui/pickers/-/pickers-3.3.10.tgz#f1b0f963348cc191645ef0bdeff7a67c6aa25485"
   integrity sha512-hS4pxwn1ZGXVkmgD4tpFpaumUaAg2ZzbTrxltfC5yPw4BJV+mGkfnQOB4VpWEYZw2jv65Z0wLwDE/piQiPPZ3w==
@@ -3477,10 +4479,10 @@
     jss-plugin-vendor-prefixer "^10.5.1"
     prop-types "^15.7.2"
 
-"@material-ui/system@^4.11.3":
-  version "4.11.3"
-  resolved "https://registry.npmjs.org/@material-ui/system/-/system-4.11.3.tgz#466bc14c9986798fd325665927c963eb47cc4143"
-  integrity sha512-SY7otguNGol41Mu2Sg6KbBP1ZRFIbFLHGK81y4KYbsV2yIcaEPOmsCK6zwWlp+2yTV3J/VwT6oSBARtGIVdXPw==
+"@material-ui/system@^4.12.1":
+  version "4.12.1"
+  resolved "https://registry.npmjs.org/@material-ui/system/-/system-4.12.1.tgz#2dd96c243f8c0a331b2bb6d46efd7771a399707c"
+  integrity sha512-lUdzs4q9kEXZGhbN7BptyiS1rLNHe6kG9o8Y307HCvF4sQxbCgpL2qi+gUk+yI8a2DNk48gISEQxoxpgph0xIw==
   dependencies:
     "@babel/runtime" "^7.4.4"
     "@material-ui/utils" "^4.11.2"
@@ -3508,45 +4510,75 @@
   dependencies:
     "@types/whatwg-streams" "^0.0.7"
 
-"@microsoft/api-documenter@^7.13.30":
-  version "7.13.30"
-  resolved "https://registry.npmjs.org/@microsoft/api-documenter/-/api-documenter-7.13.30.tgz#f4832b8747ad9f61b3a0d87eb61b6b1aca2aeb60"
-  integrity sha512-n91XihJptwcHp1g5FUIcrjDXhg/g2q6+Rj+nuPBkvsCAKQP/OwCLNVO3tYNpz+qa+lWrHPWL3Urc8G3th5cn7w==
+"@mdx-js/mdx@^1.6.22":
+  version "1.6.22"
+  resolved "https://registry.npmjs.org/@mdx-js/mdx/-/mdx-1.6.22.tgz#8a723157bf90e78f17dc0f27995398e6c731f1ba"
+  integrity sha512-AMxuLxPz2j5/6TpF/XSdKpQP1NlG0z11dFOlq+2IP/lSgl11GY8ji6S/rgsViN/L0BDvHvUMruRb7ub+24LUYA==
   dependencies:
-    "@microsoft/api-extractor-model" "7.13.3"
+    "@babel/core" "7.12.9"
+    "@babel/plugin-syntax-jsx" "7.12.1"
+    "@babel/plugin-syntax-object-rest-spread" "7.8.3"
+    "@mdx-js/util" "1.6.22"
+    babel-plugin-apply-mdx-type-prop "1.6.22"
+    babel-plugin-extract-import-names "1.6.22"
+    camelcase-css "2.0.1"
+    detab "2.0.4"
+    hast-util-raw "6.0.1"
+    lodash.uniq "4.5.0"
+    mdast-util-to-hast "10.0.1"
+    remark-footnotes "2.0.0"
+    remark-mdx "1.6.22"
+    remark-parse "8.0.3"
+    remark-squeeze-paragraphs "4.0.0"
+    style-to-object "0.3.0"
+    unified "9.2.0"
+    unist-builder "2.0.3"
+    unist-util-visit "2.0.3"
+
+"@mdx-js/util@1.6.22":
+  version "1.6.22"
+  resolved "https://registry.npmjs.org/@mdx-js/util/-/util-1.6.22.tgz#219dfd89ae5b97a8801f015323ffa4b62f45718b"
+  integrity sha512-H1rQc1ZOHANWBvPcW+JpGwr+juXSxM8Q8YCkm3GhZd8REu1fHR3z99CErO1p9pkcfcxZnMdIZdIsXkOHY0NilA==
+
+"@microsoft/api-documenter@^7.13.47":
+  version "7.13.47"
+  resolved "https://registry.npmjs.org/@microsoft/api-documenter/-/api-documenter-7.13.47.tgz#0b7726634232b37f76c0e5e8353cdbb5b52d4ece"
+  integrity sha512-jk78Pf8cKL2WZf6CkKUUtwegdsTA1Jf0MfIzD50qpG7T257HLrqCi1t70ZA85VpRLR8oSeNHMayqNTWkdku9iA==
+  dependencies:
+    "@microsoft/api-extractor-model" "7.13.5"
     "@microsoft/tsdoc" "0.13.2"
-    "@rushstack/node-core-library" "3.39.0"
-    "@rushstack/ts-command-line" "4.8.0"
+    "@rushstack/node-core-library" "3.40.0"
+    "@rushstack/ts-command-line" "4.9.0"
     colors "~1.2.1"
     js-yaml "~3.13.1"
     resolve "~1.17.0"
 
-"@microsoft/api-extractor-model@7.13.3", "@microsoft/api-extractor-model@^7.13.3":
-  version "7.13.3"
-  resolved "https://registry.npmjs.org/@microsoft/api-extractor-model/-/api-extractor-model-7.13.3.tgz#ac01c064c5af520d3661c85d7e5ef95e1ca8ab92"
-  integrity sha512-uXilAhu2GcvyY/0NwVRk3AN7TFYjkPnjHLV2UywTTz9uglS+Af0YjNrCy+aaK8qXtfbFWdBzkH9N2XU8/YBeRQ==
+"@microsoft/api-extractor-model@7.13.5", "@microsoft/api-extractor-model@^7.13.5":
+  version "7.13.5"
+  resolved "https://registry.npmjs.org/@microsoft/api-extractor-model/-/api-extractor-model-7.13.5.tgz#7836a81ba47b9a654062ed0361e4eee69afae51e"
+  integrity sha512-il6AebNltYo5hEtqXZw4DMvrwBPn6+F58TxwqmsLY+U+sSJNxaYn2jYksArrjErXVPR3gUgRMqD6zsdIkg+WEQ==
   dependencies:
     "@microsoft/tsdoc" "0.13.2"
     "@microsoft/tsdoc-config" "~0.15.2"
-    "@rushstack/node-core-library" "3.39.0"
+    "@rushstack/node-core-library" "3.40.0"
 
-"@microsoft/api-extractor@^7.18.1":
-  version "7.18.1"
-  resolved "https://registry.npmjs.org/@microsoft/api-extractor/-/api-extractor-7.18.1.tgz#61b39f972b646261dd49f2de9f5d448aa6497e7a"
-  integrity sha512-qljUF2Q0zAx1vJrjKkJVGN7OVbsXki+Pji99jywyl6L/FK3YZ7PpstUJYE6uBcLPy6rhNPWPAsHNTMpG/kHIsg==
+"@microsoft/api-extractor@^7.18.7":
+  version "7.18.7"
+  resolved "https://registry.npmjs.org/@microsoft/api-extractor/-/api-extractor-7.18.7.tgz#851d2413a3c5d696f7cc914eb59de7a7882b2e8b"
+  integrity sha512-JhtV8LoyLuIecbgCPyZQg08G1kngIRWpai2UzwNil9mGVGYiDZVeeKx8c2phmlPcogmMDm4oQROxyuiYt5sJiw==
   dependencies:
-    "@microsoft/api-extractor-model" "7.13.3"
+    "@microsoft/api-extractor-model" "7.13.5"
     "@microsoft/tsdoc" "0.13.2"
     "@microsoft/tsdoc-config" "~0.15.2"
-    "@rushstack/node-core-library" "3.39.0"
-    "@rushstack/rig-package" "0.2.12"
-    "@rushstack/ts-command-line" "4.8.0"
+    "@rushstack/node-core-library" "3.40.0"
+    "@rushstack/rig-package" "0.3.0"
+    "@rushstack/ts-command-line" "4.9.0"
     colors "~1.2.1"
     lodash "~4.17.15"
     resolve "~1.17.0"
     semver "~7.3.0"
     source-map "~0.6.1"
-    typescript "~4.3.2"
+    typescript "~4.3.5"
 
 "@microsoft/fetch-event-source@2.0.1":
   version "2.0.1"
@@ -3568,7 +4600,7 @@
     jju "~1.4.0"
     resolve "~1.19.0"
 
-"@microsoft/tsdoc@0.13.2":
+"@microsoft/tsdoc@0.13.2", "@microsoft/tsdoc@^0.13.2":
   version "0.13.2"
   resolved "https://registry.npmjs.org/@microsoft/tsdoc/-/tsdoc-0.13.2.tgz#3b0efb6d3903bd49edb073696f60e90df08efb26"
   integrity sha512-WrHvO8PDL8wd8T2+zBGKrMwVL5IyzR3ryWUsl0PXgEV0QHup4mTLi0QcATefGI6Gx9Anu7vthPyyyLpY0EpiQg==
@@ -3600,10 +4632,10 @@
     strict-event-emitter "^0.2.0"
     xmldom "^0.6.0"
 
-"@n1ru4l/push-pull-async-iterable-iterator@^2.0.1":
-  version "2.1.2"
-  resolved "https://registry.npmjs.org/@n1ru4l/push-pull-async-iterable-iterator/-/push-pull-async-iterable-iterator-2.1.2.tgz#e486bf86c4c29e78601694a26f31c2dec0c08d9b"
-  integrity sha512-KwZGeX2XK7Xj9ksWwei5923QnqIGoEuLlh3O46OW9vc8hQxjzmMTKCgJMVZ5ne5xaWFQYDT2dMpbUhq6hEOhxA==
+"@n1ru4l/push-pull-async-iterable-iterator@^2.1.4":
+  version "2.1.4"
+  resolved "https://registry.npmjs.org/@n1ru4l/push-pull-async-iterable-iterator/-/push-pull-async-iterable-iterator-2.1.4.tgz#a90225474352f9f159bff979905f707b9c6bcf04"
+  integrity sha512-qLIvoOUJ+zritv+BlzcBMePKNjKQzH9Rb2i9W98YXxf/M62Lye8qH0peyiU8yJ1tL0kfulWi31BoK10E6BKJeA==
 
 "@nodelib/fs.scandir@2.1.3":
   version "2.1.3"
@@ -3770,9 +4802,9 @@
     universal-user-agent "^5.0.0"
 
 "@octokit/graphql@^4.5.8":
-  version "4.6.4"
-  resolved "https://registry.npmjs.org/@octokit/graphql/-/graphql-4.6.4.tgz#0c3f5bed440822182e972317122acb65d311a5ed"
-  integrity sha512-SWTdXsVheRmlotWNjKzPOb6Js6tjSqA2a8z9+glDJng0Aqjzti8MEWOtuT8ZSu6wHnci7LZNuarE87+WJBG4vg==
+  version "4.7.0"
+  resolved "https://registry.npmjs.org/@octokit/graphql/-/graphql-4.7.0.tgz#cbe12edc2bc61e9eaa5f9e5d092644c92b6fcb74"
+  integrity sha512-diY0qMPyQjfu4rDu3kDhJ9qIZadIm4IISO3RJSv9ajYUWJUCO0AykbgzLcg1xclxtXgzY583u3gAv66M6zz5SA==
   dependencies:
     "@octokit/request" "^5.6.0"
     "@octokit/types" "^6.0.3"
@@ -3829,7 +4861,7 @@
     "@octokit/types" "^6.16.2"
     deprecation "^2.3.1"
 
-"@octokit/request-error@^2.0.0", "@octokit/request-error@^2.0.5", "@octokit/request-error@^2.1.0":
+"@octokit/request-error@^2.0.0", "@octokit/request-error@^2.0.2", "@octokit/request-error@^2.0.5", "@octokit/request-error@^2.1.0":
   version "2.1.0"
   resolved "https://registry.npmjs.org/@octokit/request-error/-/request-error-2.1.0.tgz#9e150357831bfc788d13a4fd4b1913d60c74d677"
   integrity sha512-1VIvgXxs9WHSjicsRwq8PlR2LR2x6DwsJAaFgzdi0JfJoGSO8mYI/cHJQ+9FbN21aa+DrgNLnwObmyeSC8Rmpg==
@@ -3874,6 +4906,26 @@
   dependencies:
     "@octokit/openapi-types" "^7.3.2"
 
+"@octokit/webhooks-methods@^2.0.0":
+  version "2.0.0"
+  resolved "https://registry.npmjs.org/@octokit/webhooks-methods/-/webhooks-methods-2.0.0.tgz#1108b9ea661ca6c81e4a8bfa63a09eb27d5bc2db"
+  integrity sha512-35cfQ4YWlnZnmZKmIxlGPUPLtbkF8lr/A/1Sk1eC0ddLMwQN06dOuLc+dI3YLQS+T+MoNt3DIQ0NynwgKPilig==
+
+"@octokit/webhooks-types@4.4.0":
+  version "4.4.0"
+  resolved "https://registry.npmjs.org/@octokit/webhooks-types/-/webhooks-types-4.4.0.tgz#0985964b72d577221574cca614770e0743fe0830"
+  integrity sha512-gK9L2pWLZ1CWWlf9zwzFBQeA3dgyWdRe6gqAedR5T7adFZpoHg4De6GeXIFySV796ooQtKhW4eFfQLFQF5ydAA==
+
+"@octokit/webhooks@^9.14.1":
+  version "9.14.1"
+  resolved "https://registry.npmjs.org/@octokit/webhooks/-/webhooks-9.14.1.tgz#d1b8fcc4c1c18ee46ec30cef9e84043b57c8d2dd"
+  integrity sha512-INsqtHKQJys5NbuE71kq6uR8BMSSkZ2L9dLanAc1jylGroQ80SW1TYXLuJlcYNakNrHCCe4c5qvNKfR/KJXrJA==
+  dependencies:
+    "@octokit/request-error" "^2.0.2"
+    "@octokit/webhooks-methods" "^2.0.0"
+    "@octokit/webhooks-types" "4.4.0"
+    aggregate-error "^3.1.0"
+
 "@open-draft/until@^1.0.3":
   version "1.0.3"
   resolved "https://registry.npmjs.org/@open-draft/until/-/until-1.0.3.tgz#db9cc719191a62e7d9200f6e7bab21c5b848adca"
@@ -3899,6 +4951,11 @@
   dependencies:
     "@opentelemetry/context-base" "^0.10.2"
 
+"@opentelemetry/api@^1.0.0":
+  version "1.0.1"
+  resolved "https://registry.npmjs.org/@opentelemetry/api/-/api-1.0.1.tgz#03c72f548431da5820a0c8864d1401e348e7e79f"
+  integrity sha512-H5Djcc2txGAINgf3TNaq4yFofYSIK3722PM89S/3R8FuI/eqi1UscajlXk7EBkG9s2pxss/q6SHlpturaavXaw==
+
 "@opentelemetry/context-base@^0.10.2":
   version "0.10.2"
   resolved "https://registry.npmjs.org/@opentelemetry/context-base/-/context-base-0.10.2.tgz#55bea904b2b91aa8a8675df9eaba5961bddb1def"
@@ -3909,7 +4966,7 @@
   resolved "https://registry.npmjs.org/@panva/asn1.js/-/asn1.js-1.0.0.tgz#dd55ae7b8129e02049f009408b97c61ccf9032f6"
   integrity sha512-UdkG3mLEqXgnlKsWanWcgb6dOjUzJ+XC5f+aWw30qrtjxeNUSfKX1cd5FBzOaXQumoe9nIqeZUvrRJS03HCCtw==
 
-"@pmmmwh/react-refresh-webpack-plugin@^0.4.2":
+"@pmmmwh/react-refresh-webpack-plugin@^0.4.3":
   version "0.4.3"
   resolved "https://registry.npmjs.org/@pmmmwh/react-refresh-webpack-plugin/-/react-refresh-webpack-plugin-0.4.3.tgz#1eec460596d200c0236bf195b078a5d1df89b766"
   integrity sha512-br5Qwvh8D2OQqSXpd1g/xqXKnK0r+Jz6qVKBbWmpUcrbGOxUrf39V5oZ1876084CGn18uMdR5uvPqBv9UqtBjQ==
@@ -3979,7 +5036,7 @@
   resolved "https://registry.npmjs.org/@protobufjs/utf8/-/utf8-1.1.0.tgz#a777360b5b39a1a2e5106f8e858f2fd2d060c570"
   integrity sha1-p3c2C1s5oaLlEG+OhY8v0tBgxXA=
 
-"@reach/router@^1.3.3", "@reach/router@^1.3.4":
+"@reach/router@^1.3.4":
   version "1.3.4"
   resolved "https://registry.npmjs.org/@reach/router/-/router-1.3.4.tgz#d2574b19370a70c80480ed91f3da840136d10f8c"
   integrity sha512-+mtn9wjlB9NN2CNnnC/BRYtwdKBfSyyasPYraNAyvaV1occr/5NnB4CVzjEZipNHwYebQwcndGUmpFzxAUoqSA==
@@ -3990,9 +5047,9 @@
     react-lifecycles-compat "^3.0.4"
 
 "@rjsf/core@^3.0.0":
-  version "3.0.0"
-  resolved "https://registry.npmjs.org/@rjsf/core/-/core-3.0.0.tgz#7f79b0635c969e3fbfe0aaa4773d844fbee68a63"
-  integrity sha512-QSvyVMDiwd7neVnIMOte4tZUvtDWgLDYKOsq1tgCsIFh+RXskd3AEBf6IsK8w6Wg36Om7YalDqqrtXbk9z+rLw==
+  version "3.1.0"
+  resolved "https://registry.npmjs.org/@rjsf/core/-/core-3.1.0.tgz#7667364a4532e25c164abbc2adabe39157ffec4c"
+  integrity sha512-EwM2juiQxEdXzFy9rIIsDr6/e+FYeR1cKx0/no8ASEuXZ1p+/nf/CxKGobzD6UhpRip7JK9PhhuHFEFBIjHFJA==
   dependencies:
     "@types/json-schema" "^7.0.7"
     ajv "^6.7.0"
@@ -4005,22 +5062,22 @@
     react-is "^16.9.0"
 
 "@rjsf/material-ui@^3.0.0":
-  version "3.0.0"
-  resolved "https://registry.npmjs.org/@rjsf/material-ui/-/material-ui-3.0.0.tgz#69ece2cb549f0e860b5f89898db90edcc95b15ba"
-  integrity sha512-T2B8QnrDQphbFNxDz7baAa0zTd5TXJmO9soHBPTKKdniRbMEOQ19AJBbZkA3ED2XZa/xrUY/6XjERQLpNACddw==
+  version "3.1.0"
+  resolved "https://registry.npmjs.org/@rjsf/material-ui/-/material-ui-3.1.0.tgz#ed15fc75de1594f87cd8336b7f2ebc492a432d8b"
+  integrity sha512-kWz37spT5SOXkb8Axq4g4BzQjXRylQr6B7eFAg1NPhSK7KrJYwSMSsFJ9Ze2vEBxwEiR0Z0n/4puaamGuGFRBw==
 
-"@roadiehq/backstage-plugin-buildkite@^1.0.4":
-  version "1.0.4"
-  resolved "https://registry.npmjs.org/@roadiehq/backstage-plugin-buildkite/-/backstage-plugin-buildkite-1.0.4.tgz#8bd89d235c12b0093dd8c35d5397d8332bb62df0"
-  integrity sha512-SkPJzkLhVo1vMM76EShJRRQegXFKkY1bf1TMVIqR2Cm3E9QXHyN099+dSimFW8f5uyNioEHuRkSh7Iwm7AZekA==
+"@roadiehq/backstage-plugin-buildkite@^1.0.8":
+  version "1.0.8"
+  resolved "https://registry.npmjs.org/@roadiehq/backstage-plugin-buildkite/-/backstage-plugin-buildkite-1.0.8.tgz#c377ae194682426a957366e85263749ff75b8db1"
+  integrity sha512-v3OOQj5Ksvs/8SZcNBgq6bzmyJvMIzdGsQrwW8uaLgOX076T0nmK8c3Ojz3w1opymEl3s20sLxLUXjhd7V/nIA==
   dependencies:
-    "@backstage/catalog-model" "^0.8.4"
+    "@backstage/catalog-model" "^0.9.0"
     "@backstage/core-app-api" "^0.1.3"
-    "@backstage/core-components" "^0.1.3"
+    "@backstage/core-components" "^0.3.0"
     "@backstage/core-plugin-api" "^0.1.3"
-    "@backstage/plugin-catalog-react" "^0.2.4"
+    "@backstage/plugin-catalog-react" "^0.4.0"
     "@backstage/theme" "^0.2.6"
-    "@material-ui/core" "^4.11.3"
+    "@material-ui/core" "^4.12.1"
     "@material-ui/icons" "^4.11.2"
     "@material-ui/lab" "4.0.0-alpha.57"
     history "^5.0.0"
@@ -4032,16 +5089,16 @@
     react-router-dom "6.0.0-beta.0"
     react-use "^17.2.4"
 
-"@roadiehq/backstage-plugin-github-insights@^1.1.15":
-  version "1.1.15"
-  resolved "https://registry.npmjs.org/@roadiehq/backstage-plugin-github-insights/-/backstage-plugin-github-insights-1.1.15.tgz#ef033f85c54f5203a2bc161290f46e861dc6feca"
-  integrity sha512-UH8lvDZd1OVP6fX+mF0eTrxqo/QmGWiCWvxumxkyU61sF3XkXzEqhQDKlWWEtpGLPa++yf98p00wfSeXRfjRWA==
+"@roadiehq/backstage-plugin-github-insights@^1.1.23":
+  version "1.1.23"
+  resolved "https://registry.npmjs.org/@roadiehq/backstage-plugin-github-insights/-/backstage-plugin-github-insights-1.1.23.tgz#bcf7424df5a659df39d5aa75f5fffd8e02c9437e"
+  integrity sha512-3HL9nEtlaE+gFmV0xkrtZGbWHbS26z+NHzEk2KIyV8oqReQ+57PRLTVcXCjFA+djkKfP2hpu5s7zp72aVb0v+w==
   dependencies:
-    "@backstage/catalog-model" "^0.8.4"
+    "@backstage/catalog-model" "^0.9.0"
     "@backstage/core-app-api" "^0.1.3"
-    "@backstage/core-components" "^0.1.3"
+    "@backstage/core-components" "^0.3.0"
     "@backstage/core-plugin-api" "^0.1.3"
-    "@backstage/plugin-catalog-react" "^0.2.0"
+    "@backstage/plugin-catalog-react" "^0.4.0"
     "@backstage/theme" "^0.2.7"
     "@date-io/core" "2.10.7"
     "@material-ui/core" "^4.11.0"
@@ -4055,16 +5112,16 @@
     react-router "^6.0.0-beta.0"
     react-use "^17.2.4"
 
-"@roadiehq/backstage-plugin-github-pull-requests@^1.0.8":
-  version "1.0.8"
-  resolved "https://registry.npmjs.org/@roadiehq/backstage-plugin-github-pull-requests/-/backstage-plugin-github-pull-requests-1.0.8.tgz#7d6202ec60808156058bd2d335f7df332934ae56"
-  integrity sha512-g1CudaKX1NYW0wfbtjcZxFWmDMfw1IvpJD4ymmwZmsogBOHFknlowVmwwSL4W4LwK6IPypIZkOe95Vd2PrjO+Q==
+"@roadiehq/backstage-plugin-github-pull-requests@^1.0.13":
+  version "1.0.13"
+  resolved "https://registry.npmjs.org/@roadiehq/backstage-plugin-github-pull-requests/-/backstage-plugin-github-pull-requests-1.0.13.tgz#18673d5b906f03fe9b34e388f85e699f51ce89f0"
+  integrity sha512-k9z2uas1SiCLC93A6kUu8smeKnBA6GbSdY+VhhMgojHmGkhS669HxIbCyt9xyf1S6/G7o6/4MibxHBvHfszI4Q==
   dependencies:
-    "@backstage/catalog-model" "^0.8.4"
+    "@backstage/catalog-model" "^0.9.0"
     "@backstage/core-app-api" "^0.1.3"
-    "@backstage/core-components" "^0.1.3"
+    "@backstage/core-components" "^0.3.0"
     "@backstage/core-plugin-api" "^0.1.3"
-    "@backstage/plugin-catalog-react" "^0.2.0"
+    "@backstage/plugin-catalog-react" "^0.4.0"
     "@material-ui/core" "^4.11.0"
     "@material-ui/icons" "^4.9.1"
     "@octokit/rest" "^18.5.3"
@@ -4078,17 +5135,17 @@
     react-router "6.0.0-beta.0"
     react-use "^17.2.4"
 
-"@roadiehq/backstage-plugin-travis-ci@^1.0.4":
-  version "1.0.4"
-  resolved "https://registry.npmjs.org/@roadiehq/backstage-plugin-travis-ci/-/backstage-plugin-travis-ci-1.0.4.tgz#224d17749b6bb33fbc5bf50489d7e7a87b06aa3a"
-  integrity sha512-rSMB+ZuI9xXIwgqJv7NW/wt3ulZa9rSLsCzkMO30/6/TMbenmsIyfmIP9XI32D9mPew4dVX9spi6KsgEo41WHw==
+"@roadiehq/backstage-plugin-travis-ci@^1.0.11":
+  version "1.0.11"
+  resolved "https://registry.npmjs.org/@roadiehq/backstage-plugin-travis-ci/-/backstage-plugin-travis-ci-1.0.11.tgz#427c14a93a9f1f62ab42c5f149ab1beba1178fd2"
+  integrity sha512-EAWIyprpjm6tkHX3AFqZFFf6B74soAbwwO0RJhTfGIPTa/t8H7g5AR5tUF283rmuA2KupYutT5ywXY2Bqcjfyw==
   dependencies:
-    "@backstage/catalog-model" "^0.8.4"
-    "@backstage/core-app-api" "^0.1.3"
-    "@backstage/core-components" "^0.1.3"
-    "@backstage/core-plugin-api" "^0.1.3"
-    "@backstage/plugin-catalog-react" "^0.2.4"
-    "@backstage/theme" "^0.2.6"
+    "@backstage/catalog-model" "^0.9.0"
+    "@backstage/core-app-api" "^0.1.6"
+    "@backstage/core-components" "^0.3.0"
+    "@backstage/core-plugin-api" "^0.1.4"
+    "@backstage/plugin-catalog-react" "^0.4.0"
+    "@backstage/theme" "^0.2.9"
     "@material-ui/core" "^4.11.3"
     "@material-ui/icons" "^4.11.2"
     "@material-ui/lab" "4.0.0-alpha.57"
@@ -4160,10 +5217,10 @@
     estree-walker "^2.0.1"
     picomatch "^2.2.2"
 
-"@rushstack/node-core-library@3.39.0":
-  version "3.39.0"
-  resolved "https://registry.npmjs.org/@rushstack/node-core-library/-/node-core-library-3.39.0.tgz#38928946d15ae89b773386cf97433d0d1ec83b93"
-  integrity sha512-kgu3+7/zOBkZU0+NdJb1rcHcpk3/oTjn5c8cg5nUTn+JDjEw58yG83SoeJEcRNNdl11dGX0lKG2PxPsjCokZOQ==
+"@rushstack/node-core-library@3.40.0":
+  version "3.40.0"
+  resolved "https://registry.npmjs.org/@rushstack/node-core-library/-/node-core-library-3.40.0.tgz#2551915ea34e34ec2abb7172b9d7f4546144d9d4"
+  integrity sha512-P6uMPI7cqTdawLSPAG5BQrBu1MHlGRPqecp7ruIRgyukIEzkmh0QAnje4jAL/l1r3hw0qe4e+Dz5ZSnukT/Egg==
   dependencies:
     "@types/node" "10.17.13"
     colors "~1.2.1"
@@ -4175,18 +5232,18 @@
     timsort "~0.3.0"
     z-schema "~3.18.3"
 
-"@rushstack/rig-package@0.2.12":
-  version "0.2.12"
-  resolved "https://registry.npmjs.org/@rushstack/rig-package/-/rig-package-0.2.12.tgz#c434d62b28e0418a040938226f8913971d0424c7"
-  integrity sha512-nbePcvF8hQwv0ql9aeQxcaMPK/h1OLAC00W7fWCRWIvD2MchZOE8jumIIr66HGrfG2X1sw++m/ZYI4D+BM5ovQ==
+"@rushstack/rig-package@0.3.0":
+  version "0.3.0"
+  resolved "https://registry.npmjs.org/@rushstack/rig-package/-/rig-package-0.3.0.tgz#334ad2846797861361b3445d4cc9ae9164b1885c"
+  integrity sha512-Lj6noF7Q4BBm1hKiBDw94e6uZvq1xlBwM/d2cBFaPqXeGdV+G6r3qaCWfRiSXK0pcHpGGpV5Tb2MdfhVcO6G/g==
   dependencies:
     resolve "~1.17.0"
     strip-json-comments "~3.1.1"
 
-"@rushstack/ts-command-line@4.8.0":
-  version "4.8.0"
-  resolved "https://registry.npmjs.org/@rushstack/ts-command-line/-/ts-command-line-4.8.0.tgz#611accb931b9ac62ff4d078f68f95c47f6606724"
-  integrity sha512-nZ8cbzVF1VmFPfSJfy8vEohdiFAH/59Y/Y+B4nsJbn4SkifLJ8LqNZ5+LxCC2UR242EXFumxlsY1d6fPBxck5Q==
+"@rushstack/ts-command-line@4.9.0":
+  version "4.9.0"
+  resolved "https://registry.npmjs.org/@rushstack/ts-command-line/-/ts-command-line-4.9.0.tgz#781ba42cff73cae097b6d5241b6441e7cc2fe6e0"
+  integrity sha512-kmT8t+JfnvphISF1C5WwY56RefjwgajhSjs9J4ckvAFXZDXR6F5cvF5/RTh7fGCzIomg8esy2PHO/b52zFoZvA==
   dependencies:
     "@types/argparse" "1.0.38"
     argparse "~1.0.9"
@@ -4227,6 +5284,13 @@
   resolved "https://registry.npmjs.org/@sindresorhus/is/-/is-4.0.0.tgz#2ff674e9611b45b528896d820d3d7a812de2f0e4"
   integrity sha512-FyD2meJpDPjyNQejSjvnhpgI/azsQkA4lGbuu5BQZfjvJ9cbRZXzeWL2HceCekW4lixO9JPesIIQkSoLjeJHNQ==
 
+"@sinonjs/commons@^1.6.0", "@sinonjs/commons@^1.8.3":
+  version "1.8.3"
+  resolved "https://registry.npmjs.org/@sinonjs/commons/-/commons-1.8.3.tgz#3802ddd21a50a949b6721ddd72da36e67e7f1b2d"
+  integrity sha512-xkNcLAn/wZaX14RPlwizcKicDk9G3F8m2nU3L7Ukm5zBgTwiT0wsoFAHx9Jq56fJA1z/7uKGtCRu16sOUCLIHQ==
+  dependencies:
+    type-detect "4.0.8"
+
 "@sinonjs/commons@^1.7.0":
   version "1.7.1"
   resolved "https://registry.npmjs.org/@sinonjs/commons/-/commons-1.7.1.tgz#da5fd19a5f71177a53778073978873964f49acf1"
@@ -4241,6 +5305,27 @@
   dependencies:
     "@sinonjs/commons" "^1.7.0"
 
+"@sinonjs/fake-timers@^7.0.4", "@sinonjs/fake-timers@^7.1.0":
+  version "7.1.2"
+  resolved "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-7.1.2.tgz#2524eae70c4910edccf99b2f4e6efc5894aff7b5"
+  integrity sha512-iQADsW4LBMISqZ6Ci1dupJL9pprqwcVFTcOsEmQOEhW+KLCVn/Y4Jrvg2k19fIHCp+iFprriYPTdRcQR8NbUPg==
+  dependencies:
+    "@sinonjs/commons" "^1.7.0"
+
+"@sinonjs/samsam@^6.0.2":
+  version "6.0.2"
+  resolved "https://registry.npmjs.org/@sinonjs/samsam/-/samsam-6.0.2.tgz#a0117d823260f282c04bff5f8704bdc2ac6910bb"
+  integrity sha512-jxPRPp9n93ci7b8hMfJOFDPRLFYadN6FSpeROFTR4UNF4i5b+EK6m4QXPO46BDhFgRy1JuS87zAnFOzCUwMJcQ==
+  dependencies:
+    "@sinonjs/commons" "^1.6.0"
+    lodash.get "^4.4.2"
+    type-detect "^4.0.8"
+
+"@sinonjs/text-encoding@^0.7.1":
+  version "0.7.1"
+  resolved "https://registry.npmjs.org/@sinonjs/text-encoding/-/text-encoding-0.7.1.tgz#8da5c6530915653f3a1f38fd5f101d8c3f8079c5"
+  integrity sha512-+iTbntw2IZPb/anVDbypzfQa+ay64MW0Zo8aJ8gZPWMMK6/OubMVb6lUPMagqjOPnmtauXnFCACVl3O7ogjeqQ==
+
 "@spotify/eslint-config-base@^9.0.0":
   version "9.0.2"
   resolved "https://registry.npmjs.org/@spotify/eslint-config-base/-/eslint-config-base-9.0.2.tgz#a4830f610f40de935de795d3def486c3e5064ee4"
@@ -4261,17 +5346,39 @@
   resolved "https://registry.npmjs.org/@spotify/prettier-config/-/prettier-config-10.0.0.tgz#fa076d98d2e7e6c53dd3d86a696307a7010bd056"
   integrity sha512-VYOdo8P7lIScAkl02nB9KpUAuOYMManryBIBuKJkAw5D3aVtLobfmdIKvdV6MqEmGMEQPbn7w/UpnjJYhUH+IA==
 
-"@storybook/addon-actions@^6.1.11":
-  version "6.3.0"
-  resolved "https://registry.npmjs.org/@storybook/addon-actions/-/addon-actions-6.3.0.tgz#e5a24c69d70da9aa98560f19d10c06a50495ca2e"
-  integrity sha512-7Ls1OIAdtAa4a27/bTuAlejQee4j7bFBkRzAeaHzcaZT1VVXoF6yBfMGuEGJI8brQ+KuSaIhIU2b0Iuzq47dDQ==
+"@storybook/addon-a11y@^6.3.4":
+  version "6.3.7"
+  resolved "https://registry.npmjs.org/@storybook/addon-a11y/-/addon-a11y-6.3.7.tgz#a802455f2d932eda07314e3d44a96c94bbd22b3d"
+  integrity sha512-Z5Lhxm8r5CkPW9FYf6zmAk9c7IhUeUQZxKZeEWGZdOvcjQ32rtg4IYvO2SHgWNrEKBdxxFm3pMiyK3wylQLfsQ==
   dependencies:
-    "@storybook/addons" "6.3.0"
-    "@storybook/api" "6.3.0"
-    "@storybook/client-api" "6.3.0"
-    "@storybook/components" "6.3.0"
-    "@storybook/core-events" "6.3.0"
-    "@storybook/theming" "6.3.0"
+    "@storybook/addons" "6.3.7"
+    "@storybook/api" "6.3.7"
+    "@storybook/channels" "6.3.7"
+    "@storybook/client-api" "6.3.7"
+    "@storybook/client-logger" "6.3.7"
+    "@storybook/components" "6.3.7"
+    "@storybook/core-events" "6.3.7"
+    "@storybook/theming" "6.3.7"
+    axe-core "^4.2.0"
+    core-js "^3.8.2"
+    global "^4.4.0"
+    lodash "^4.17.20"
+    react-sizeme "^3.0.1"
+    regenerator-runtime "^0.13.7"
+    ts-dedent "^2.0.0"
+    util-deprecate "^1.0.2"
+
+"@storybook/addon-actions@^6.1.11":
+  version "6.3.7"
+  resolved "https://registry.npmjs.org/@storybook/addon-actions/-/addon-actions-6.3.7.tgz#b25434972bef351aceb3f7ec6fd66e210f256aac"
+  integrity sha512-CEAmztbVt47Gw1o6Iw0VP20tuvISCEKk9CS/rCjHtb4ubby6+j/bkp3pkEUQIbyLdHiLWFMz0ZJdyA/U6T6jCw==
+  dependencies:
+    "@storybook/addons" "6.3.7"
+    "@storybook/api" "6.3.7"
+    "@storybook/client-api" "6.3.7"
+    "@storybook/components" "6.3.7"
+    "@storybook/core-events" "6.3.7"
+    "@storybook/theming" "6.3.7"
     core-js "^3.8.2"
     fast-deep-equal "^3.1.3"
     global "^4.4.0"
@@ -4285,35 +5392,35 @@
     uuid-browser "^3.1.0"
 
 "@storybook/addon-links@^6.1.11":
-  version "6.1.11"
-  resolved "https://registry.npmjs.org/@storybook/addon-links/-/addon-links-6.1.11.tgz#84b20b0c13bbfc8270cdf52389ce52f98c415b6a"
-  integrity sha512-OIBeOdTHNr/egIuyOUEtEBtZJXVp9PEPQ4MDxvKsCgpnXruPhjenPNW+mQKxm4SefpePW7zkx6k1ubpYVJUeag==
+  version "6.3.7"
+  resolved "https://registry.npmjs.org/@storybook/addon-links/-/addon-links-6.3.7.tgz#f273abba6d056794a4aa920b2fa9639136e6747f"
+  integrity sha512-/8Gq18o1DejP3Om0ZOJRkMzW5FoHqoAmR0pFx4DipmNu5lYy7V3krLw4jW4qja1MuQkZ53MGh08FJOoAc2RZvQ==
   dependencies:
-    "@storybook/addons" "6.1.11"
-    "@storybook/client-logger" "6.1.11"
-    "@storybook/core-events" "6.1.11"
+    "@storybook/addons" "6.3.7"
+    "@storybook/client-logger" "6.3.7"
+    "@storybook/core-events" "6.3.7"
     "@storybook/csf" "0.0.1"
-    "@storybook/router" "6.1.11"
-    "@types/qs" "^6.9.0"
-    core-js "^3.0.1"
-    global "^4.3.2"
+    "@storybook/router" "6.3.7"
+    "@types/qs" "^6.9.5"
+    core-js "^3.8.2"
+    global "^4.4.0"
     prop-types "^15.7.2"
-    qs "^6.6.0"
+    qs "^6.10.0"
     regenerator-runtime "^0.13.7"
     ts-dedent "^2.0.0"
 
 "@storybook/addon-storysource@^6.1.11":
-  version "6.2.9"
-  resolved "https://registry.npmjs.org/@storybook/addon-storysource/-/addon-storysource-6.2.9.tgz#631a9b6c2e3db42c05055ed5341700687a0b42f9"
-  integrity sha512-lKQOKbk8akqPN7NNBRn+OsiwYg1BXYExmErCwAT/ejx4ggHJCPTDlrl2ZiEriKZ7WXIfgA4VuN5YriKu5uxdnw==
+  version "6.3.7"
+  resolved "https://registry.npmjs.org/@storybook/addon-storysource/-/addon-storysource-6.3.7.tgz#7818f2402e19453747274d2c1e8e0a99f24fc2ab"
+  integrity sha512-cb1F47aD/c5TQDMmYwuKz608YeLWYSYQXGtCdijzjznYVSMJ4eAFnd38AiF2Ax1EM79BEMqzqH1SrveibAaQlA==
   dependencies:
-    "@storybook/addons" "6.2.9"
-    "@storybook/api" "6.2.9"
-    "@storybook/client-logger" "6.2.9"
-    "@storybook/components" "6.2.9"
-    "@storybook/router" "6.2.9"
-    "@storybook/source-loader" "6.2.9"
-    "@storybook/theming" "6.2.9"
+    "@storybook/addons" "6.3.7"
+    "@storybook/api" "6.3.7"
+    "@storybook/client-logger" "6.3.7"
+    "@storybook/components" "6.3.7"
+    "@storybook/router" "6.3.7"
+    "@storybook/source-loader" "6.3.7"
+    "@storybook/theming" "6.3.7"
     core-js "^3.8.2"
     estraverse "^5.2.0"
     loader-utils "^2.0.0"
@@ -4322,155 +5429,34 @@
     react-syntax-highlighter "^13.5.3"
     regenerator-runtime "^0.13.7"
 
-"@storybook/addons@6.1.11":
-  version "6.1.11"
-  resolved "https://registry.npmjs.org/@storybook/addons/-/addons-6.1.11.tgz#cb4578411ca00ccb206b484df5a171ccaca34719"
-  integrity sha512-OZXsdmn60dVe482l9zWxzOqqJApD2jggk/8QJKn3/Ub9posmqdqg712bW6v71BBe0UXXG/QfkZA7gcyiyEENbw==
+"@storybook/addons@6.3.7", "@storybook/addons@^6.1.11":
+  version "6.3.7"
+  resolved "https://registry.npmjs.org/@storybook/addons/-/addons-6.3.7.tgz#7c6b8d11b65f67b1884f6140437fe996dc39537a"
+  integrity sha512-9stVjTcc52bqqh7YQex/LpSjJ4e2Czm4/ZYDjIiNy0p4OZEx+yLhL5mZzMWh2NQd6vv+pHASBSxf2IeaR5511A==
   dependencies:
-    "@storybook/api" "6.1.11"
-    "@storybook/channels" "6.1.11"
-    "@storybook/client-logger" "6.1.11"
-    "@storybook/core-events" "6.1.11"
-    "@storybook/router" "6.1.11"
-    "@storybook/theming" "6.1.11"
-    core-js "^3.0.1"
-    global "^4.3.2"
-    regenerator-runtime "^0.13.7"
-
-"@storybook/addons@6.1.15":
-  version "6.1.15"
-  resolved "https://registry.npmjs.org/@storybook/addons/-/addons-6.1.15.tgz#09eb8d962f58bd20b4ac2f83b515831c83226352"
-  integrity sha512-ENyHapLFOG93VaoQXPX8O3IWjLRyVBox9C9P20LMruKX/SfXAXx20qsoAWKKPGssopyOin17aoQX9pj+lFmCZQ==
-  dependencies:
-    "@storybook/api" "6.1.15"
-    "@storybook/channels" "6.1.15"
-    "@storybook/client-logger" "6.1.15"
-    "@storybook/core-events" "6.1.15"
-    "@storybook/router" "6.1.15"
-    "@storybook/theming" "6.1.15"
-    core-js "^3.0.1"
-    global "^4.3.2"
-    regenerator-runtime "^0.13.7"
-
-"@storybook/addons@6.2.9":
-  version "6.2.9"
-  resolved "https://registry.npmjs.org/@storybook/addons/-/addons-6.2.9.tgz#b7ba2b9f0e15b852c7d6b57d04fb0a493c57477c"
-  integrity sha512-GnmEKbJwiN1jncN9NSA8CuR1i2XAlasPcl/Zn0jkfV9WitQeczVcJCPw86SGH84AD+tTBCyF2i9UC0KaOV1YBQ==
-  dependencies:
-    "@storybook/api" "6.2.9"
-    "@storybook/channels" "6.2.9"
-    "@storybook/client-logger" "6.2.9"
-    "@storybook/core-events" "6.2.9"
-    "@storybook/router" "6.2.9"
-    "@storybook/theming" "6.2.9"
+    "@storybook/api" "6.3.7"
+    "@storybook/channels" "6.3.7"
+    "@storybook/client-logger" "6.3.7"
+    "@storybook/core-events" "6.3.7"
+    "@storybook/router" "6.3.7"
+    "@storybook/theming" "6.3.7"
     core-js "^3.8.2"
     global "^4.4.0"
     regenerator-runtime "^0.13.7"
 
-"@storybook/addons@6.3.0", "@storybook/addons@^6.1.11":
-  version "6.3.0"
-  resolved "https://registry.npmjs.org/@storybook/addons/-/addons-6.3.0.tgz#a86849f46a654d2d78b91fad0088264a32d4e58e"
-  integrity sha512-/dcq20HtdSw5+cG8znR59Y/uv2zCR2VjRK3N52IkGWk162b/UbSjjL0PhNnnQFGpH9Fruft6mqvjTAKT41kmJw==
-  dependencies:
-    "@storybook/api" "6.3.0"
-    "@storybook/channels" "6.3.0"
-    "@storybook/client-logger" "6.3.0"
-    "@storybook/core-events" "6.3.0"
-    "@storybook/router" "6.3.0"
-    "@storybook/theming" "6.3.0"
-    core-js "^3.8.2"
-    global "^4.4.0"
-    regenerator-runtime "^0.13.7"
-
-"@storybook/api@6.1.11":
-  version "6.1.11"
-  resolved "https://registry.npmjs.org/@storybook/api/-/api-6.1.11.tgz#1e0b798203df823ac21184386258cf8b5f17f440"
-  integrity sha512-/p4QW/p3uWO0AKVveNezX3I/CotyBKaJ5ui8PuvSPsl7yvqcsK41qI4evKOw7GMQn6oP+2enRbzHpGuCUgQSjA==
-  dependencies:
-    "@reach/router" "^1.3.3"
-    "@storybook/channels" "6.1.11"
-    "@storybook/client-logger" "6.1.11"
-    "@storybook/core-events" "6.1.11"
-    "@storybook/csf" "0.0.1"
-    "@storybook/router" "6.1.11"
-    "@storybook/semver" "^7.3.2"
-    "@storybook/theming" "6.1.11"
-    "@types/reach__router" "^1.3.5"
-    core-js "^3.0.1"
-    fast-deep-equal "^3.1.1"
-    global "^4.3.2"
-    lodash "^4.17.15"
-    memoizerific "^1.11.3"
-    regenerator-runtime "^0.13.7"
-    store2 "^2.7.1"
-    telejson "^5.0.2"
-    ts-dedent "^2.0.0"
-    util-deprecate "^1.0.2"
-
-"@storybook/api@6.1.15":
-  version "6.1.15"
-  resolved "https://registry.npmjs.org/@storybook/api/-/api-6.1.15.tgz#285ba42f7a8efcd3bd0e586a5e978487d826fbb4"
-  integrity sha512-C4D08e2ZbSe62nNKtmh9YBraoWb2j6Chw8VCkuj91kuKHh3YDNc1gjj5Fi+KYZwIcy0EllzW3RFQs+YR1/Vg1g==
-  dependencies:
-    "@reach/router" "^1.3.3"
-    "@storybook/channels" "6.1.15"
-    "@storybook/client-logger" "6.1.15"
-    "@storybook/core-events" "6.1.15"
-    "@storybook/csf" "0.0.1"
-    "@storybook/router" "6.1.15"
-    "@storybook/semver" "^7.3.2"
-    "@storybook/theming" "6.1.15"
-    "@types/reach__router" "^1.3.7"
-    core-js "^3.0.1"
-    fast-deep-equal "^3.1.1"
-    global "^4.3.2"
-    lodash "^4.17.15"
-    memoizerific "^1.11.3"
-    regenerator-runtime "^0.13.7"
-    store2 "^2.7.1"
-    telejson "^5.0.2"
-    ts-dedent "^2.0.0"
-    util-deprecate "^1.0.2"
-
-"@storybook/api@6.2.9":
-  version "6.2.9"
-  resolved "https://registry.npmjs.org/@storybook/api/-/api-6.2.9.tgz#a9b46569192ad5d8da6435c9d63dc4b0c8463b51"
-  integrity sha512-okkA3HAScE9tGnYBrjTOcgzT+L1lRHNoEh3ZfGgh1u/XNEyHGNkj4grvkd6nX7BzRcYQ/l2VkcKCqmOjUnSkVQ==
+"@storybook/api@6.3.7":
+  version "6.3.7"
+  resolved "https://registry.npmjs.org/@storybook/api/-/api-6.3.7.tgz#88b8a51422cd0739c91bde0b1d65fb6d8a8485d0"
+  integrity sha512-57al8mxmE9agXZGo8syRQ8UhvGnDC9zkuwkBPXchESYYVkm3Mc54RTvdAOYDiy85VS4JxiGOywHayCaRwgUddQ==
   dependencies:
     "@reach/router" "^1.3.4"
-    "@storybook/channels" "6.2.9"
-    "@storybook/client-logger" "6.2.9"
-    "@storybook/core-events" "6.2.9"
+    "@storybook/channels" "6.3.7"
+    "@storybook/client-logger" "6.3.7"
+    "@storybook/core-events" "6.3.7"
     "@storybook/csf" "0.0.1"
-    "@storybook/router" "6.2.9"
+    "@storybook/router" "6.3.7"
     "@storybook/semver" "^7.3.2"
-    "@storybook/theming" "6.2.9"
-    "@types/reach__router" "^1.3.7"
-    core-js "^3.8.2"
-    fast-deep-equal "^3.1.3"
-    global "^4.4.0"
-    lodash "^4.17.20"
-    memoizerific "^1.11.3"
-    qs "^6.10.0"
-    regenerator-runtime "^0.13.7"
-    store2 "^2.12.0"
-    telejson "^5.1.0"
-    ts-dedent "^2.0.0"
-    util-deprecate "^1.0.2"
-
-"@storybook/api@6.3.0":
-  version "6.3.0"
-  resolved "https://registry.npmjs.org/@storybook/api/-/api-6.3.0.tgz#5ecb646e7c3c4c7c494bb15f4c94554f7f4ee09e"
-  integrity sha512-swPMcQadLDRTnMjL9dwY6K1zXHn3KcAa3euvSHd1R4OKXTSBBj1zHvIaOrq6yHz7RIYOACmZlEV3CUru9FlvEA==
-  dependencies:
-    "@reach/router" "^1.3.4"
-    "@storybook/channels" "6.3.0"
-    "@storybook/client-logger" "6.3.0"
-    "@storybook/core-events" "6.3.0"
-    "@storybook/csf" "0.0.1"
-    "@storybook/router" "6.3.0"
-    "@storybook/semver" "^7.3.2"
-    "@storybook/theming" "6.3.0"
+    "@storybook/theming" "6.3.7"
     "@types/reach__router" "^1.3.7"
     core-js "^3.8.2"
     fast-deep-equal "^3.1.3"
@@ -4484,102 +5470,114 @@
     ts-dedent "^2.0.0"
     util-deprecate "^1.0.2"
 
-"@storybook/channel-postmessage@6.1.15":
-  version "6.1.15"
-  resolved "https://registry.npmjs.org/@storybook/channel-postmessage/-/channel-postmessage-6.1.15.tgz#80ea2346d18496f9710dd7f87fd2a9eca46ef36f"
-  integrity sha512-Es4B5zpLrW28KSbY8FhGVEDgUnKspJ7wPuJyKExUpZ5L9w52RkTD6lRnVPzLUfoQ4luPsExy5fiuo878/Wc9ag==
+"@storybook/builder-webpack4@6.3.7":
+  version "6.3.7"
+  resolved "https://registry.npmjs.org/@storybook/builder-webpack4/-/builder-webpack4-6.3.7.tgz#1cc1a1184043be3f6ef840d0b43ba91a803105e2"
+  integrity sha512-M5envblMzAUrNqP1+ouKiL8iSIW/90+kBRU2QeWlZoZl1ib+fiFoKk06cgbaC70Bx1lU8nOnI/VBvB5pLhXLaw==
   dependencies:
-    "@storybook/channels" "6.1.15"
-    "@storybook/client-logger" "6.1.15"
-    "@storybook/core-events" "6.1.15"
-    core-js "^3.0.1"
-    global "^4.3.2"
-    qs "^6.6.0"
-    telejson "^5.0.2"
-
-"@storybook/channel-postmessage@6.3.0":
-  version "6.3.0"
-  resolved "https://registry.npmjs.org/@storybook/channel-postmessage/-/channel-postmessage-6.3.0.tgz#96e7aea034ec1c4f397323ab7923eaa80d017324"
-  integrity sha512-q7FeNWIIrvZxycIMBscqahFLygxAa2L4eJ9oxZFF9zJpSV80bxDalMou3Uo7RvDJFrAeHCanF1Y7bnEDMus4yg==
-  dependencies:
-    "@storybook/channels" "6.3.0"
-    "@storybook/client-logger" "6.3.0"
-    "@storybook/core-events" "6.3.0"
+    "@babel/core" "^7.12.10"
+    "@babel/plugin-proposal-class-properties" "^7.12.1"
+    "@babel/plugin-proposal-decorators" "^7.12.12"
+    "@babel/plugin-proposal-export-default-from" "^7.12.1"
+    "@babel/plugin-proposal-nullish-coalescing-operator" "^7.12.1"
+    "@babel/plugin-proposal-object-rest-spread" "^7.12.1"
+    "@babel/plugin-proposal-optional-chaining" "^7.12.7"
+    "@babel/plugin-proposal-private-methods" "^7.12.1"
+    "@babel/plugin-syntax-dynamic-import" "^7.8.3"
+    "@babel/plugin-transform-arrow-functions" "^7.12.1"
+    "@babel/plugin-transform-block-scoping" "^7.12.12"
+    "@babel/plugin-transform-classes" "^7.12.1"
+    "@babel/plugin-transform-destructuring" "^7.12.1"
+    "@babel/plugin-transform-for-of" "^7.12.1"
+    "@babel/plugin-transform-parameters" "^7.12.1"
+    "@babel/plugin-transform-shorthand-properties" "^7.12.1"
+    "@babel/plugin-transform-spread" "^7.12.1"
+    "@babel/plugin-transform-template-literals" "^7.12.1"
+    "@babel/preset-env" "^7.12.11"
+    "@babel/preset-react" "^7.12.10"
+    "@babel/preset-typescript" "^7.12.7"
+    "@storybook/addons" "6.3.7"
+    "@storybook/api" "6.3.7"
+    "@storybook/channel-postmessage" "6.3.7"
+    "@storybook/channels" "6.3.7"
+    "@storybook/client-api" "6.3.7"
+    "@storybook/client-logger" "6.3.7"
+    "@storybook/components" "6.3.7"
+    "@storybook/core-common" "6.3.7"
+    "@storybook/core-events" "6.3.7"
+    "@storybook/node-logger" "6.3.7"
+    "@storybook/router" "6.3.7"
+    "@storybook/semver" "^7.3.2"
+    "@storybook/theming" "6.3.7"
+    "@storybook/ui" "6.3.7"
+    "@types/node" "^14.0.10"
+    "@types/webpack" "^4.41.26"
+    autoprefixer "^9.8.6"
+    babel-loader "^8.2.2"
+    babel-plugin-macros "^2.8.0"
+    babel-plugin-polyfill-corejs3 "^0.1.0"
+    case-sensitive-paths-webpack-plugin "^2.3.0"
     core-js "^3.8.2"
+    css-loader "^3.6.0"
+    dotenv-webpack "^1.8.0"
+    file-loader "^6.2.0"
+    find-up "^5.0.0"
+    fork-ts-checker-webpack-plugin "^4.1.6"
+    fs-extra "^9.0.1"
+    glob "^7.1.6"
+    glob-promise "^3.4.0"
     global "^4.4.0"
-    qs "^6.10.0"
-    telejson "^5.3.2"
-
-"@storybook/channels@6.1.11":
-  version "6.1.11"
-  resolved "https://registry.npmjs.org/@storybook/channels/-/channels-6.1.11.tgz#a93a83746ad78dd40e1c056029f6d93b17bb66bc"
-  integrity sha512-NvjWzQ95TSV1e18jaQBCOGoe+vptKH2NOKZ7QRQ7I0O5OoHKr47IXoh+MQ5C8CRD9FTdLE/xWdn1sVVEPRyHEw==
-  dependencies:
-    core-js "^3.0.1"
-    ts-dedent "^2.0.0"
-    util-deprecate "^1.0.2"
-
-"@storybook/channels@6.1.15":
-  version "6.1.15"
-  resolved "https://registry.npmjs.org/@storybook/channels/-/channels-6.1.15.tgz#22bb06a671a5ae09d2537bcf63aaf90d7f6b9f6b"
-  integrity sha512-HIKHDeL/0BDk9a7xc2PLiFFoHjUMKUd2djhUGdeKgdKqoWejp4JJ60fI68+2QuSRbkB8k+rAwmuWJzV7EfB5fg==
-  dependencies:
-    core-js "^3.0.1"
-    ts-dedent "^2.0.0"
-    util-deprecate "^1.0.2"
-
-"@storybook/channels@6.2.9":
-  version "6.2.9"
-  resolved "https://registry.npmjs.org/@storybook/channels/-/channels-6.2.9.tgz#a9fd7f25102cbec15fb56f76abf891b7b214e9de"
-  integrity sha512-6dC8Fb2ipNyOQXnUZMDeEUaJGH5DMLzyHlGLhVyDtrO5WR6bO8mQdkzf4+5dSKXgCBNX0BSkssXth4pDjn18rg==
-  dependencies:
-    core-js "^3.8.2"
-    ts-dedent "^2.0.0"
-    util-deprecate "^1.0.2"
-
-"@storybook/channels@6.3.0":
-  version "6.3.0"
-  resolved "https://registry.npmjs.org/@storybook/channels/-/channels-6.3.0.tgz#f378c6ee03e0c72a2ee9263c8dfdfa4a7a1bcf51"
-  integrity sha512-E+SCQLSIlCaOGKEkZ8rFKNyH24/N4IA6h+EDF+9mhw3yT4iv7NCoswCgqX7JhyhSjWkM01onhuMVUVKVvi7CSw==
-  dependencies:
-    core-js "^3.8.2"
-    ts-dedent "^2.0.0"
-    util-deprecate "^1.0.2"
-
-"@storybook/client-api@6.1.15":
-  version "6.1.15"
-  resolved "https://registry.npmjs.org/@storybook/client-api/-/client-api-6.1.15.tgz#8f8ead111459b94621571bdb2276f8a0aace17b1"
-  integrity sha512-iwuDlgNdB6Y4OidlhWPob3tEIax9taymdKEe9by4rLJ3nfXu7viHcvCAjN24oI4NFW3NZsmtqJotgftRYk0r1Q==
-  dependencies:
-    "@storybook/addons" "6.1.15"
-    "@storybook/channel-postmessage" "6.1.15"
-    "@storybook/channels" "6.1.15"
-    "@storybook/client-logger" "6.1.15"
-    "@storybook/core-events" "6.1.15"
-    "@storybook/csf" "0.0.1"
-    "@types/qs" "^6.9.0"
-    "@types/webpack-env" "^1.15.3"
-    core-js "^3.0.1"
-    global "^4.3.2"
-    lodash "^4.17.15"
-    memoizerific "^1.11.3"
-    qs "^6.6.0"
-    regenerator-runtime "^0.13.7"
+    html-webpack-plugin "^4.0.0"
+    pnp-webpack-plugin "1.6.4"
+    postcss "^7.0.36"
+    postcss-flexbugs-fixes "^4.2.1"
+    postcss-loader "^4.2.0"
+    raw-loader "^4.0.2"
+    react-dev-utils "^11.0.3"
     stable "^0.1.8"
-    store2 "^2.7.1"
+    style-loader "^1.3.0"
+    terser-webpack-plugin "^4.2.3"
+    ts-dedent "^2.0.0"
+    url-loader "^4.1.1"
+    util-deprecate "^1.0.2"
+    webpack "4"
+    webpack-dev-middleware "^3.7.3"
+    webpack-filter-warnings-plugin "^1.2.1"
+    webpack-hot-middleware "^2.25.0"
+    webpack-virtual-modules "^0.2.2"
+
+"@storybook/channel-postmessage@6.3.7":
+  version "6.3.7"
+  resolved "https://registry.npmjs.org/@storybook/channel-postmessage/-/channel-postmessage-6.3.7.tgz#bd4edf84a29aa2cd4a22d26115c60194d289a840"
+  integrity sha512-Cmw8HRkeSF1yUFLfEIUIkUICyCXX8x5Ol/5QPbiW9HPE2hbZtYROCcg4bmWqdq59N0Tp9FQNSn+9ZygPgqQtNw==
+  dependencies:
+    "@storybook/channels" "6.3.7"
+    "@storybook/client-logger" "6.3.7"
+    "@storybook/core-events" "6.3.7"
+    core-js "^3.8.2"
+    global "^4.4.0"
+    qs "^6.10.0"
+    telejson "^5.3.2"
+
+"@storybook/channels@6.3.7":
+  version "6.3.7"
+  resolved "https://registry.npmjs.org/@storybook/channels/-/channels-6.3.7.tgz#85ed5925522b802d959810f78d37aacde7fea66e"
+  integrity sha512-aErXO+SRO8MPp2wOkT2n9d0fby+8yM35tq1tI633B4eQsM74EykbXPv7EamrYPqp1AI4BdiloyEpr0hmr2zlvg==
+  dependencies:
+    core-js "^3.8.2"
     ts-dedent "^2.0.0"
     util-deprecate "^1.0.2"
 
-"@storybook/client-api@6.3.0":
-  version "6.3.0"
-  resolved "https://registry.npmjs.org/@storybook/client-api/-/client-api-6.3.0.tgz#a285c4b64ec318f360ade31d0c87c22e6e1db2a6"
-  integrity sha512-5HLtYPBOHif9AdzwLCrVbMQdOJ2dne9zv7oTo6Yl0wvLhbr6V/VypoXE0CgFF3hAI2iUquG5z00KlrE8UErC5Q==
+"@storybook/client-api@6.3.7":
+  version "6.3.7"
+  resolved "https://registry.npmjs.org/@storybook/client-api/-/client-api-6.3.7.tgz#cb1dca05467d777bd09aadbbdd1dd22ca537ce14"
+  integrity sha512-8wOH19cMIwIIYhZy5O5Wl8JT1QOL5kNuamp9GPmg5ff4DtnG+/uUslskRvsnKyjPvl+WbIlZtBVWBiawVdd/yQ==
   dependencies:
-    "@storybook/addons" "6.3.0"
-    "@storybook/channel-postmessage" "6.3.0"
-    "@storybook/channels" "6.3.0"
-    "@storybook/client-logger" "6.3.0"
-    "@storybook/core-events" "6.3.0"
+    "@storybook/addons" "6.3.7"
+    "@storybook/channel-postmessage" "6.3.7"
+    "@storybook/channels" "6.3.7"
+    "@storybook/client-logger" "6.3.7"
+    "@storybook/core-events" "6.3.7"
     "@storybook/csf" "0.0.1"
     "@types/qs" "^6.9.5"
     "@types/webpack-env" "^1.16.0"
@@ -4594,103 +5592,23 @@
     ts-dedent "^2.0.0"
     util-deprecate "^1.0.2"
 
-"@storybook/client-logger@6.1.11":
-  version "6.1.11"
-  resolved "https://registry.npmjs.org/@storybook/client-logger/-/client-logger-6.1.11.tgz#5dd092e4293e5f58f7e89ddbc6eb2511b7d60954"
-  integrity sha512-dSc+VKLW1UaiMPMhlZYRqhynrrHdHFiBEgU28+8LcmoZ1yhZBwLkcKdSD4YTT0CbMJAG1/+NUW5kRI8Geeg+rA==
-  dependencies:
-    core-js "^3.0.1"
-    global "^4.3.2"
-
-"@storybook/client-logger@6.1.15":
-  version "6.1.15"
-  resolved "https://registry.npmjs.org/@storybook/client-logger/-/client-logger-6.1.15.tgz#b558d6ecbee82c038d684717d8c598eaa4a9324d"
-  integrity sha512-lUpatG8SxzrUapWMsIPWiR+5qRVT5ebn8tGHQeBeRHXbdmEqyq5DOlrotLUemkA5nNTCs1pMFNvKSpCHznG+fg==
-  dependencies:
-    core-js "^3.0.1"
-    global "^4.3.2"
-
-"@storybook/client-logger@6.2.9":
-  version "6.2.9"
-  resolved "https://registry.npmjs.org/@storybook/client-logger/-/client-logger-6.2.9.tgz#77c1ea39684ad2a2cf6836051b381fc5b354e132"
-  integrity sha512-IfOQZuvpjh66qBInQCJOb9S0dTGpzZ/Cxlcvokp+PYt95KztaWN3mPm+HaDQCeRsrWNe0Bpm1zuickcJ6dBOXg==
+"@storybook/client-logger@6.3.7":
+  version "6.3.7"
+  resolved "https://registry.npmjs.org/@storybook/client-logger/-/client-logger-6.3.7.tgz#ff17b7494e7e9e23089b0d5c5364c371c726bdd1"
+  integrity sha512-BQRErHE3nIEuUJN/3S3dO1LzxAknOgrFeZLd4UVcH/fvjtS1F4EkhcbH+jNyUWvcWGv66PZYN0oFPEn/g3Savg==
   dependencies:
     core-js "^3.8.2"
     global "^4.4.0"
 
-"@storybook/client-logger@6.3.0":
-  version "6.3.0"
-  resolved "https://registry.npmjs.org/@storybook/client-logger/-/client-logger-6.3.0.tgz#3188f84dd10353d225efadee9f24928395d38aab"
-  integrity sha512-x/y820f/2Jm6RW5TxRv7IlbF6zWpTkHoajfwYuTpK/OXvK5gx6dwXGdgjNoaAGofGRz5SVjDjTDPOcd5X5AUPw==
-  dependencies:
-    core-js "^3.8.2"
-    global "^4.4.0"
-
-"@storybook/components@6.1.15":
-  version "6.1.15"
-  resolved "https://registry.npmjs.org/@storybook/components/-/components-6.1.15.tgz#b4a2af23ee6b9cba4c255191eae3d3463e29bfb7"
-  integrity sha512-lPbA/zyBfctdlpDhRTcRFLWlZPJ3PB4+wI0FUvYs69iG3/bNbQPYu8vRmNhCZOsaGt+b+dik4Tfcth8Bu+eQug==
-  dependencies:
-    "@popperjs/core" "^2.5.4"
-    "@storybook/client-logger" "6.1.15"
-    "@storybook/csf" "0.0.1"
-    "@storybook/theming" "6.1.15"
-    "@types/overlayscrollbars" "^1.9.0"
-    "@types/react-color" "^3.0.1"
-    "@types/react-syntax-highlighter" "11.0.4"
-    core-js "^3.0.1"
-    fast-deep-equal "^3.1.1"
-    global "^4.3.2"
-    lodash "^4.17.15"
-    markdown-to-jsx "^6.11.4"
-    memoizerific "^1.11.3"
-    overlayscrollbars "^1.10.2"
-    polished "^3.4.4"
-    react-color "^2.17.0"
-    react-popper-tooltip "^3.1.1"
-    react-syntax-highlighter "^13.5.0"
-    react-textarea-autosize "^8.1.1"
-    ts-dedent "^2.0.0"
-
-"@storybook/components@6.2.9":
-  version "6.2.9"
-  resolved "https://registry.npmjs.org/@storybook/components/-/components-6.2.9.tgz#7189f9715b05720fe083ae8ad014849f14e98e73"
-  integrity sha512-hnV1MI2aB2g1sJ7NJphpxi7TwrMZQ/tpCJeHnkjmzyC6ez1MXqcBXGrEEdSXzRfAxjQTOEpu6H1mnns0xMP0Ag==
+"@storybook/components@6.3.7":
+  version "6.3.7"
+  resolved "https://registry.npmjs.org/@storybook/components/-/components-6.3.7.tgz#42b1ca6d24e388e02eab82aa9ed3365db2266ecc"
+  integrity sha512-O7LIg9Z18G0AJqXX7Shcj0uHqwXlSA5UkHgaz9A7mqqqJNl6m6FwwTWcxR1acUfYVNkO+czgpqZHNrOF6rky1A==
   dependencies:
     "@popperjs/core" "^2.6.0"
-    "@storybook/client-logger" "6.2.9"
+    "@storybook/client-logger" "6.3.7"
     "@storybook/csf" "0.0.1"
-    "@storybook/theming" "6.2.9"
-    "@types/color-convert" "^2.0.0"
-    "@types/overlayscrollbars" "^1.12.0"
-    "@types/react-syntax-highlighter" "11.0.5"
-    color-convert "^2.0.1"
-    core-js "^3.8.2"
-    fast-deep-equal "^3.1.3"
-    global "^4.4.0"
-    lodash "^4.17.20"
-    markdown-to-jsx "^7.1.0"
-    memoizerific "^1.11.3"
-    overlayscrollbars "^1.13.1"
-    polished "^4.0.5"
-    prop-types "^15.7.2"
-    react-colorful "^5.0.1"
-    react-popper-tooltip "^3.1.1"
-    react-syntax-highlighter "^13.5.3"
-    react-textarea-autosize "^8.3.0"
-    regenerator-runtime "^0.13.7"
-    ts-dedent "^2.0.0"
-    util-deprecate "^1.0.2"
-
-"@storybook/components@6.3.0":
-  version "6.3.0"
-  resolved "https://registry.npmjs.org/@storybook/components/-/components-6.3.0.tgz#5ad372abd60ee0cb02516f960f514659e3fbf865"
-  integrity sha512-TDcazQAtNgE1E33jKKABx51XpvWyXMcJZFWA0d5wu8XrElrL1PuZqz7dPePoWKGMfTaPYWP6rRyDg4Svv36j+A==
-  dependencies:
-    "@popperjs/core" "^2.6.0"
-    "@storybook/client-logger" "6.3.0"
-    "@storybook/csf" "0.0.1"
-    "@storybook/theming" "6.3.0"
+    "@storybook/theming" "6.3.7"
     "@types/color-convert" "^2.0.0"
     "@types/overlayscrollbars" "^1.12.0"
     "@types/react-syntax-highlighter" "11.0.5"
@@ -4712,233 +5630,267 @@
     ts-dedent "^2.0.0"
     util-deprecate "^1.0.2"
 
-"@storybook/core-events@6.1.11":
-  version "6.1.11"
-  resolved "https://registry.npmjs.org/@storybook/core-events/-/core-events-6.1.11.tgz#d50e8ec90490f9a7180a8c8a83afb6dcfe47ed66"
-  integrity sha512-hTib81W8PxepM7iXVvl3pBXSaGpChl5LTzaLCoIRO9sSB8dy0/x2DLAHzbQvShk/l1wqUc3TtOLIxq+eC9l3wg==
-  dependencies:
-    core-js "^3.0.1"
-
-"@storybook/core-events@6.1.15":
-  version "6.1.15"
-  resolved "https://registry.npmjs.org/@storybook/core-events/-/core-events-6.1.15.tgz#f66e30cbed8afdb8df2254d2aa47fe139e641c60"
-  integrity sha512-2sz02hdGZshanoq83jaB+goAcapVEWrxe+RJZn/gu2OymlEioWNjPPtOVGgi5DNIiJFnYvc66adayNwX39+tDA==
-  dependencies:
-    core-js "^3.0.1"
-
-"@storybook/core-events@6.2.9":
-  version "6.2.9"
-  resolved "https://registry.npmjs.org/@storybook/core-events/-/core-events-6.2.9.tgz#4f12947cd15d1eb3c4109923657c012feef521cd"
-  integrity sha512-xQmbX/oYQK1QsAGN8hriXX5SUKOoTUe3L4dVaVHxJqy7MReRWJpprJmCpbAPJzWS6WCbDFfCM5kVEexHLOzJlQ==
+"@storybook/core-client@6.3.7":
+  version "6.3.7"
+  resolved "https://registry.npmjs.org/@storybook/core-client/-/core-client-6.3.7.tgz#cfb75952e0e1d32f2aca92bca2786334ab589c40"
+  integrity sha512-M/4A65yV+Y4lsCQXX4BtQO/i3BcMPrU5FkDG8qJd3dkcx2fUlFvGWqQPkcTZE+MPVvMEGl/AsEZSADzah9+dAg==
   dependencies:
+    "@storybook/addons" "6.3.7"
+    "@storybook/channel-postmessage" "6.3.7"
+    "@storybook/client-api" "6.3.7"
+    "@storybook/client-logger" "6.3.7"
+    "@storybook/core-events" "6.3.7"
+    "@storybook/csf" "0.0.1"
+    "@storybook/ui" "6.3.7"
+    airbnb-js-shims "^2.2.1"
+    ansi-to-html "^0.6.11"
     core-js "^3.8.2"
+    global "^4.4.0"
+    lodash "^4.17.20"
+    qs "^6.10.0"
+    regenerator-runtime "^0.13.7"
+    ts-dedent "^2.0.0"
+    unfetch "^4.2.0"
+    util-deprecate "^1.0.2"
 
-"@storybook/core-events@6.3.0":
-  version "6.3.0"
-  resolved "https://registry.npmjs.org/@storybook/core-events/-/core-events-6.3.0.tgz#5e220a866db5b93550b5c3464774a7b10ad036a6"
-  integrity sha512-ZGTm5nQvFLlc2LVgoDyxo99MbQcFqQzkxIQReFkO7hPwwkcjcwmdBtnlmkn9/p5QQ5/8aU0k+ceCkrBNu1M83w==
+"@storybook/core-common@6.3.7":
+  version "6.3.7"
+  resolved "https://registry.npmjs.org/@storybook/core-common/-/core-common-6.3.7.tgz#9eedf3ff16aff870950e3372ab71ef846fa3ac52"
+  integrity sha512-exLoqRPPsAefwyjbsQBLNFrlPCcv69Q/pclqmIm7FqAPR7f3CKP1rqsHY0PnemizTL/+cLX5S7mY90gI6wpNug==
   dependencies:
-    core-js "^3.8.2"
-
-"@storybook/core@6.1.15":
-  version "6.1.15"
-  resolved "https://registry.npmjs.org/@storybook/core/-/core-6.1.15.tgz#7ff8c314d3857497bf2e26c69a1fa93ef37301aa"
-  integrity sha512-mQeKAXcowUwF+pOdWZEFwb5M6sz4yv5cOv1vTci3/1pMmB8QpYlH+P61p4lsRO17Vlak70h18TworPka/4+mhA==
-  dependencies:
-    "@babel/core" "^7.12.3"
+    "@babel/core" "^7.12.10"
     "@babel/plugin-proposal-class-properties" "^7.12.1"
-    "@babel/plugin-proposal-decorators" "^7.12.1"
+    "@babel/plugin-proposal-decorators" "^7.12.12"
     "@babel/plugin-proposal-export-default-from" "^7.12.1"
     "@babel/plugin-proposal-nullish-coalescing-operator" "^7.12.1"
     "@babel/plugin-proposal-object-rest-spread" "^7.12.1"
-    "@babel/plugin-proposal-optional-chaining" "^7.12.1"
+    "@babel/plugin-proposal-optional-chaining" "^7.12.7"
     "@babel/plugin-proposal-private-methods" "^7.12.1"
     "@babel/plugin-syntax-dynamic-import" "^7.8.3"
     "@babel/plugin-transform-arrow-functions" "^7.12.1"
-    "@babel/plugin-transform-block-scoping" "^7.12.1"
+    "@babel/plugin-transform-block-scoping" "^7.12.12"
     "@babel/plugin-transform-classes" "^7.12.1"
     "@babel/plugin-transform-destructuring" "^7.12.1"
     "@babel/plugin-transform-for-of" "^7.12.1"
     "@babel/plugin-transform-parameters" "^7.12.1"
     "@babel/plugin-transform-shorthand-properties" "^7.12.1"
     "@babel/plugin-transform-spread" "^7.12.1"
-    "@babel/plugin-transform-template-literals" "^7.12.1"
-    "@babel/preset-env" "^7.12.1"
-    "@babel/preset-react" "^7.12.1"
-    "@babel/preset-typescript" "^7.12.1"
+    "@babel/preset-env" "^7.12.11"
+    "@babel/preset-react" "^7.12.10"
+    "@babel/preset-typescript" "^7.12.7"
     "@babel/register" "^7.12.1"
-    "@storybook/addons" "6.1.15"
-    "@storybook/api" "6.1.15"
-    "@storybook/channel-postmessage" "6.1.15"
-    "@storybook/channels" "6.1.15"
-    "@storybook/client-api" "6.1.15"
-    "@storybook/client-logger" "6.1.15"
-    "@storybook/components" "6.1.15"
-    "@storybook/core-events" "6.1.15"
-    "@storybook/csf" "0.0.1"
-    "@storybook/node-logger" "6.1.15"
-    "@storybook/router" "6.1.15"
+    "@storybook/node-logger" "6.3.7"
     "@storybook/semver" "^7.3.2"
-    "@storybook/theming" "6.1.15"
-    "@storybook/ui" "6.1.15"
     "@types/glob-base" "^0.3.0"
     "@types/micromatch" "^4.0.1"
-    "@types/node-fetch" "^2.5.4"
-    airbnb-js-shims "^2.2.1"
-    ansi-to-html "^0.6.11"
-    autoprefixer "^9.7.2"
-    babel-loader "^8.0.6"
-    babel-plugin-emotion "^10.0.20"
-    babel-plugin-macros "^2.8.0"
-    babel-preset-minify "^0.5.0 || 0.6.0-alpha.5"
-    better-opn "^2.0.0"
-    boxen "^4.1.0"
-    case-sensitive-paths-webpack-plugin "^2.2.0"
-    chalk "^4.0.0"
-    cli-table3 "0.6.0"
-    commander "^5.0.0"
-    core-js "^3.0.1"
-    cpy "^8.1.1"
-    css-loader "^3.5.3"
-    detect-port "^1.3.0"
-    dotenv-webpack "^1.7.0"
-    ejs "^3.1.2"
-    express "^4.17.0"
-    file-loader "^6.0.0"
+    "@types/node" "^14.0.10"
+    "@types/pretty-hrtime" "^1.0.0"
+    babel-loader "^8.2.2"
+    babel-plugin-macros "^3.0.1"
+    babel-plugin-polyfill-corejs3 "^0.1.0"
+    chalk "^4.1.0"
+    core-js "^3.8.2"
+    express "^4.17.1"
     file-system-cache "^1.0.5"
-    find-up "^4.1.0"
-    fork-ts-checker-webpack-plugin "^4.1.4"
-    fs-extra "^9.0.0"
+    find-up "^5.0.0"
+    fork-ts-checker-webpack-plugin "^6.0.4"
     glob "^7.1.6"
     glob-base "^0.3.0"
-    glob-promise "^3.4.0"
-    global "^4.3.2"
-    html-webpack-plugin "^4.2.1"
-    inquirer "^7.0.0"
-    interpret "^2.0.0"
-    ip "^1.1.5"
-    json5 "^2.1.1"
+    interpret "^2.2.0"
+    json5 "^2.1.3"
     lazy-universal-dotenv "^3.0.1"
     micromatch "^4.0.2"
-    node-fetch "^2.6.0"
-    pkg-dir "^4.2.0"
-    pnp-webpack-plugin "1.6.4"
-    postcss-flexbugs-fixes "^4.1.0"
-    postcss-loader "^3.0.0"
+    pkg-dir "^5.0.0"
     pretty-hrtime "^1.0.3"
-    qs "^6.6.0"
-    raw-loader "^4.0.1"
-    react-dev-utils "^10.0.0"
-    regenerator-runtime "^0.13.7"
     resolve-from "^5.0.0"
-    serve-favicon "^2.5.0"
-    shelljs "^0.8.4"
-    stable "^0.1.8"
-    style-loader "^1.2.1"
-    telejson "^5.0.2"
-    terser-webpack-plugin "^3.0.0"
     ts-dedent "^2.0.0"
-    unfetch "^4.1.0"
-    url-loader "^4.0.0"
     util-deprecate "^1.0.2"
-    webpack "^4.44.2"
-    webpack-dev-middleware "^3.7.0"
-    webpack-filter-warnings-plugin "^1.2.1"
-    webpack-hot-middleware "^2.25.0"
-    webpack-virtual-modules "^0.2.2"
+    webpack "4"
 
-"@storybook/csf@0.0.1":
+"@storybook/core-events@6.3.7":
+  version "6.3.7"
+  resolved "https://registry.npmjs.org/@storybook/core-events/-/core-events-6.3.7.tgz#c5bc7cae7dc295de73b6b9f671ecbe582582e9bd"
+  integrity sha512-l5Hlhe+C/dqxjobemZ6DWBhTOhQoFF3F1Y4kjFGE7pGZl/mas4M72I5I/FUcYCmbk2fbLfZX8hzKkUqS1hdyLA==
+  dependencies:
+    core-js "^3.8.2"
+
+"@storybook/core-server@6.3.7":
+  version "6.3.7"
+  resolved "https://registry.npmjs.org/@storybook/core-server/-/core-server-6.3.7.tgz#6f29ad720aafe4a97247b5e306eac4174d0931f2"
+  integrity sha512-m5OPD/rmZA7KFewkXzXD46/i1ngUoFO4LWOiAY/wR6RQGjYXGMhSa5UYFF6MNwSbiGS5YieHkR5crB1HP47AhQ==
+  dependencies:
+    "@storybook/builder-webpack4" "6.3.7"
+    "@storybook/core-client" "6.3.7"
+    "@storybook/core-common" "6.3.7"
+    "@storybook/csf-tools" "6.3.7"
+    "@storybook/manager-webpack4" "6.3.7"
+    "@storybook/node-logger" "6.3.7"
+    "@storybook/semver" "^7.3.2"
+    "@types/node" "^14.0.10"
+    "@types/node-fetch" "^2.5.7"
+    "@types/pretty-hrtime" "^1.0.0"
+    "@types/webpack" "^4.41.26"
+    better-opn "^2.1.1"
+    boxen "^4.2.0"
+    chalk "^4.1.0"
+    cli-table3 "0.6.0"
+    commander "^6.2.1"
+    compression "^1.7.4"
+    core-js "^3.8.2"
+    cpy "^8.1.1"
+    detect-port "^1.3.0"
+    express "^4.17.1"
+    file-system-cache "^1.0.5"
+    fs-extra "^9.0.1"
+    globby "^11.0.2"
+    ip "^1.1.5"
+    node-fetch "^2.6.1"
+    pretty-hrtime "^1.0.3"
+    prompts "^2.4.0"
+    regenerator-runtime "^0.13.7"
+    serve-favicon "^2.5.0"
+    ts-dedent "^2.0.0"
+    util-deprecate "^1.0.2"
+    webpack "4"
+
+"@storybook/core@6.3.7":
+  version "6.3.7"
+  resolved "https://registry.npmjs.org/@storybook/core/-/core-6.3.7.tgz#482228a270abc3e23fed10c7bc4df674da22ca19"
+  integrity sha512-YTVLPXqgyBg7TALNxQ+cd+GtCm/NFjxr/qQ1mss1T9GCMR0IjE0d0trgOVHHLAO8jCVlK8DeuqZCCgZFTXulRw==
+  dependencies:
+    "@storybook/core-client" "6.3.7"
+    "@storybook/core-server" "6.3.7"
+
+"@storybook/csf-tools@6.3.7":
+  version "6.3.7"
+  resolved "https://registry.npmjs.org/@storybook/csf-tools/-/csf-tools-6.3.7.tgz#505514d211f8698c47ddb15662442098b4b00156"
+  integrity sha512-A7yGsrYwh+vwVpmG8dHpEimX021RbZd9VzoREcILH56u8atssdh/rseljyWlRes3Sr4QgtLvDB7ggoJ+XDZH7w==
+  dependencies:
+    "@babel/generator" "^7.12.11"
+    "@babel/parser" "^7.12.11"
+    "@babel/plugin-transform-react-jsx" "^7.12.12"
+    "@babel/preset-env" "^7.12.11"
+    "@babel/traverse" "^7.12.11"
+    "@babel/types" "^7.12.11"
+    "@mdx-js/mdx" "^1.6.22"
+    "@storybook/csf" "^0.0.1"
+    core-js "^3.8.2"
+    fs-extra "^9.0.1"
+    js-string-escape "^1.0.1"
+    lodash "^4.17.20"
+    prettier "~2.2.1"
+    regenerator-runtime "^0.13.7"
+
+"@storybook/csf@0.0.1", "@storybook/csf@^0.0.1":
   version "0.0.1"
   resolved "https://registry.npmjs.org/@storybook/csf/-/csf-0.0.1.tgz#95901507dc02f0bc6f9ac8ee1983e2fc5bb98ce6"
   integrity sha512-USTLkZze5gkel8MYCujSRBVIrUQ3YPBrLOx7GNk/0wttvVtlzWXAq9eLbQ4p/NicGxP+3T7KPEMVV//g+yubpw==
   dependencies:
     lodash "^4.17.15"
 
-"@storybook/node-logger@6.1.15":
-  version "6.1.15"
-  resolved "https://registry.npmjs.org/@storybook/node-logger/-/node-logger-6.1.15.tgz#fcf786d3a323feb6821e40e26f98a513a60d1a79"
-  integrity sha512-lrO0ei3W7BRci2iUkWTr/rXgHkzxwZTrlkx0iBzbQQRy7K1AJ9bjzhurCH9B8C9XGLmn60LXT81RWD3iCLZjcw==
+"@storybook/manager-webpack4@6.3.7":
+  version "6.3.7"
+  resolved "https://registry.npmjs.org/@storybook/manager-webpack4/-/manager-webpack4-6.3.7.tgz#9ca604dea38d3c47eb38bf485ca6107861280aa8"
+  integrity sha512-cwUdO3oklEtx6y+ZOl2zHvflICK85emiXBQGgRcCsnwWQRBZOMh+tCgOSZj4jmISVpT52RtT9woG4jKe15KBig==
+  dependencies:
+    "@babel/core" "^7.12.10"
+    "@babel/plugin-transform-template-literals" "^7.12.1"
+    "@babel/preset-react" "^7.12.10"
+    "@storybook/addons" "6.3.7"
+    "@storybook/core-client" "6.3.7"
+    "@storybook/core-common" "6.3.7"
+    "@storybook/node-logger" "6.3.7"
+    "@storybook/theming" "6.3.7"
+    "@storybook/ui" "6.3.7"
+    "@types/node" "^14.0.10"
+    "@types/webpack" "^4.41.26"
+    babel-loader "^8.2.2"
+    case-sensitive-paths-webpack-plugin "^2.3.0"
+    chalk "^4.1.0"
+    core-js "^3.8.2"
+    css-loader "^3.6.0"
+    dotenv-webpack "^1.8.0"
+    express "^4.17.1"
+    file-loader "^6.2.0"
+    file-system-cache "^1.0.5"
+    find-up "^5.0.0"
+    fs-extra "^9.0.1"
+    html-webpack-plugin "^4.0.0"
+    node-fetch "^2.6.1"
+    pnp-webpack-plugin "1.6.4"
+    read-pkg-up "^7.0.1"
+    regenerator-runtime "^0.13.7"
+    resolve-from "^5.0.0"
+    style-loader "^1.3.0"
+    telejson "^5.3.2"
+    terser-webpack-plugin "^4.2.3"
+    ts-dedent "^2.0.0"
+    url-loader "^4.1.1"
+    util-deprecate "^1.0.2"
+    webpack "4"
+    webpack-dev-middleware "^3.7.3"
+    webpack-virtual-modules "^0.2.2"
+
+"@storybook/node-logger@6.3.7":
+  version "6.3.7"
+  resolved "https://registry.npmjs.org/@storybook/node-logger/-/node-logger-6.3.7.tgz#492469ea4749de8d984af144976961589a1ac382"
+  integrity sha512-YXHCblruRe6HcNefDOpuXJoaybHnnSryIVP9Z+gDv6OgLAMkyxccTIaQL9dbc/eI4ywgzAz4kD8t1RfVwXNVXw==
   dependencies:
     "@types/npmlog" "^4.1.2"
-    chalk "^4.0.0"
-    core-js "^3.0.1"
+    chalk "^4.1.0"
+    core-js "^3.8.2"
     npmlog "^4.1.2"
     pretty-hrtime "^1.0.3"
 
-"@storybook/react@^6.1.11":
-  version "6.1.15"
-  resolved "https://registry.npmjs.org/@storybook/react/-/react-6.1.15.tgz#e17d00b05b8980ad381ba701805309ed46d1fdcd"
-  integrity sha512-7WoYLOZuAlzgQsL9oy4JCr9NcB4NBCuxslPSncN5l/7ewGXgfVXTAOMOfw+EVNrtUeVJU2fC8gFiHVl0SJpTZw==
+"@storybook/react-docgen-typescript-plugin@1.0.2-canary.253f8c1.0":
+  version "1.0.2-canary.253f8c1.0"
+  resolved "https://registry.npmjs.org/@storybook/react-docgen-typescript-plugin/-/react-docgen-typescript-plugin-1.0.2-canary.253f8c1.0.tgz#f2da40e6aae4aa586c2fb284a4a1744602c3c7fa"
+  integrity sha512-mmoRG/rNzAiTbh+vGP8d57dfcR2aP+5/Ll03KKFyfy5FqWFm/Gh7u27ikx1I3LmVMI8n6jh5SdWMkMKon7/tDw==
+  dependencies:
+    debug "^4.1.1"
+    endent "^2.0.1"
+    find-cache-dir "^3.3.1"
+    flat-cache "^3.0.4"
+    micromatch "^4.0.2"
+    react-docgen-typescript "^2.0.0"
+    tslib "^2.0.0"
+
+"@storybook/react@^6.3.6":
+  version "6.3.7"
+  resolved "https://registry.npmjs.org/@storybook/react/-/react-6.3.7.tgz#b15259aeb4cdeef99cc7f09d21db42e3ecd7a01a"
+  integrity sha512-4S0iCQIzgi6PdAtV2sYw4uL57yIwbMInNFSux9CxPnVdlxOxCJ+U8IgTxD4tjkTvR4boYSEvEle46ns/bwg5iQ==
   dependencies:
     "@babel/preset-flow" "^7.12.1"
-    "@babel/preset-react" "^7.12.1"
-    "@pmmmwh/react-refresh-webpack-plugin" "^0.4.2"
-    "@storybook/addons" "6.1.15"
-    "@storybook/core" "6.1.15"
-    "@storybook/node-logger" "6.1.15"
+    "@babel/preset-react" "^7.12.10"
+    "@pmmmwh/react-refresh-webpack-plugin" "^0.4.3"
+    "@storybook/addons" "6.3.7"
+    "@storybook/core" "6.3.7"
+    "@storybook/core-common" "6.3.7"
+    "@storybook/node-logger" "6.3.7"
+    "@storybook/react-docgen-typescript-plugin" "1.0.2-canary.253f8c1.0"
     "@storybook/semver" "^7.3.2"
-    "@types/webpack-env" "^1.15.3"
+    "@types/webpack-env" "^1.16.0"
     babel-plugin-add-react-displayname "^0.0.5"
     babel-plugin-named-asset-import "^0.3.1"
     babel-plugin-react-docgen "^4.2.1"
-    core-js "^3.0.1"
-    global "^4.3.2"
-    lodash "^4.17.15"
-    prop-types "^15.7.2"
-    react-dev-utils "^10.0.0"
-    react-docgen-typescript-plugin "^0.6.2"
-    react-refresh "^0.8.3"
-    regenerator-runtime "^0.13.7"
-    ts-dedent "^2.0.0"
-    webpack "^4.44.2"
-
-"@storybook/router@6.1.11":
-  version "6.1.11"
-  resolved "https://registry.npmjs.org/@storybook/router/-/router-6.1.11.tgz#d58e0c8324d8b16d71e09c017a4e3c844b1a4139"
-  integrity sha512-YEYOoKMo/WI13MZCkdqI9X3H1G0Oj5OUxi7So4qd3khX3zcCjSr3LjiMDBcmIVZpFo5VAvzjhIY4KqpgvzTG0A==
-  dependencies:
-    "@reach/router" "^1.3.3"
-    "@types/reach__router" "^1.3.5"
-    core-js "^3.0.1"
-    global "^4.3.2"
-    memoizerific "^1.11.3"
-    qs "^6.6.0"
-
-"@storybook/router@6.1.15":
-  version "6.1.15"
-  resolved "https://registry.npmjs.org/@storybook/router/-/router-6.1.15.tgz#e0cd7440a2ddc9b265e506b1cb590d3eeab56476"
-  integrity sha512-HlxDkGpiTSxXCJuqRoZ9Viq6Y/h/7efI8LPhhopr50qWRBTh/PEQzDqWBXG3sj8ISmi9GyUaTSAuqRwdA3lJQQ==
-  dependencies:
-    "@reach/router" "^1.3.3"
-    "@types/reach__router" "^1.3.7"
-    core-js "^3.0.1"
-    global "^4.3.2"
-    memoizerific "^1.11.3"
-    qs "^6.6.0"
-
-"@storybook/router@6.2.9":
-  version "6.2.9"
-  resolved "https://registry.npmjs.org/@storybook/router/-/router-6.2.9.tgz#547543031dd8330870bb6b473dcf7e51982e841c"
-  integrity sha512-7Bn1OFoItCl8whXRT8N1qp1Lky7kzXJ3aslWp5E8HcM8rxh4OYXfbaeiyJEJxBTGC5zxgY+tAEXHFjsAviFROg==
-  dependencies:
-    "@reach/router" "^1.3.4"
-    "@storybook/client-logger" "6.2.9"
-    "@types/reach__router" "^1.3.7"
     core-js "^3.8.2"
-    fast-deep-equal "^3.1.3"
     global "^4.4.0"
     lodash "^4.17.20"
-    memoizerific "^1.11.3"
-    qs "^6.10.0"
+    prop-types "^15.7.2"
+    react-dev-utils "^11.0.3"
+    react-refresh "^0.8.3"
+    read-pkg-up "^7.0.1"
+    regenerator-runtime "^0.13.7"
     ts-dedent "^2.0.0"
+    webpack "4"
 
-"@storybook/router@6.3.0":
-  version "6.3.0"
-  resolved "https://registry.npmjs.org/@storybook/router/-/router-6.3.0.tgz#8b63773f11fe4c6749ccfda5d725c94275f0a459"
-  integrity sha512-RJcRVI6IqffLOU6k9GrlB3cXLLK5TRmFSIjwW3lEHVhj313e56uLRYTylT11aBf8bPEQ+MeQVe2sqQUBG3Ugng==
+"@storybook/router@6.3.7":
+  version "6.3.7"
+  resolved "https://registry.npmjs.org/@storybook/router/-/router-6.3.7.tgz#1714a99a58a7b9f08b6fcfe2b678dad6ca896736"
+  integrity sha512-6tthN8op7H0NoYoE1SkQFJKC42pC4tGaoPn7kEql8XGeUJnxPtVFjrnywlTrRnKuxZKIvbilQBAwDml97XH23Q==
   dependencies:
     "@reach/router" "^1.3.4"
-    "@storybook/client-logger" "6.3.0"
+    "@storybook/client-logger" "6.3.7"
     "@types/reach__router" "^1.3.7"
     core-js "^3.8.2"
     fast-deep-equal "^3.1.3"
@@ -4956,13 +5908,13 @@
     core-js "^3.6.5"
     find-up "^4.1.0"
 
-"@storybook/source-loader@6.2.9":
-  version "6.2.9"
-  resolved "https://registry.npmjs.org/@storybook/source-loader/-/source-loader-6.2.9.tgz#ac6b314e48044acad5318d237275b24e684edb9f"
-  integrity sha512-cx499g7BG2oeXvRFx45r0W0p2gKEy/e88WsUFnqqfMKZBJ8K0R/lx5DI0l1hq+TzSrE6uGe0/uPlaLkJNIro7g==
+"@storybook/source-loader@6.3.7":
+  version "6.3.7"
+  resolved "https://registry.npmjs.org/@storybook/source-loader/-/source-loader-6.3.7.tgz#cc348305df3c2d8d716c0bab7830c9f537b859ff"
+  integrity sha512-0xQTq90jwx7W7MJn/idEBCGPOyxi/3No5j+5YdfJsSGJRuMFH3jt6pGgdeZ4XA01cmmIX6bZ+fB9al6yAzs91w==
   dependencies:
-    "@storybook/addons" "6.2.9"
-    "@storybook/client-logger" "6.2.9"
+    "@storybook/addons" "6.3.7"
+    "@storybook/client-logger" "6.3.7"
     "@storybook/csf" "0.0.1"
     core-js "^3.8.2"
     estraverse "^5.2.0"
@@ -4972,51 +5924,15 @@
     prettier "~2.2.1"
     regenerator-runtime "^0.13.7"
 
-"@storybook/theming@6.1.11":
-  version "6.1.11"
-  resolved "https://registry.npmjs.org/@storybook/theming/-/theming-6.1.11.tgz#0e757e0562aedefc96bd1d12714d4c8e92823467"
-  integrity sha512-zRChacVgKoU2BmpvwK1ntiF3KIpc8QblJT7IGiKfP/BNpy9gNeXbLPLk3g/tkHszOvVYtkaZhEXni4Od8tqy1A==
-  dependencies:
-    "@emotion/core" "^10.1.1"
-    "@emotion/is-prop-valid" "^0.8.6"
-    "@emotion/styled" "^10.0.23"
-    "@storybook/client-logger" "6.1.11"
-    core-js "^3.0.1"
-    deep-object-diff "^1.1.0"
-    emotion-theming "^10.0.19"
-    global "^4.3.2"
-    memoizerific "^1.11.3"
-    polished "^3.4.4"
-    resolve-from "^5.0.0"
-    ts-dedent "^2.0.0"
-
-"@storybook/theming@6.1.15":
-  version "6.1.15"
-  resolved "https://registry.npmjs.org/@storybook/theming/-/theming-6.1.15.tgz#01083ab89904dd959429b0b3fd1c76bd0ecc59ef"
-  integrity sha512-88IdYaPzp4NMKf/GKBrPggxD6/d/lkdQ4SNowXxN9g9eONd9M7HtTbjuJGRCbGMJ52xGcbpj2exEnAqKQ2iodA==
-  dependencies:
-    "@emotion/core" "^10.1.1"
-    "@emotion/is-prop-valid" "^0.8.6"
-    "@emotion/styled" "^10.0.23"
-    "@storybook/client-logger" "6.1.15"
-    core-js "^3.0.1"
-    deep-object-diff "^1.1.0"
-    emotion-theming "^10.0.19"
-    global "^4.3.2"
-    memoizerific "^1.11.3"
-    polished "^3.4.4"
-    resolve-from "^5.0.0"
-    ts-dedent "^2.0.0"
-
-"@storybook/theming@6.2.9":
-  version "6.2.9"
-  resolved "https://registry.npmjs.org/@storybook/theming/-/theming-6.2.9.tgz#16bf40180861f222c7ed1d80abd5d1e3cb315660"
-  integrity sha512-183oJW7AD7Fhqg5NT4ct3GJntwteAb9jZnQ6yhf9JSdY+fk8OhxRbPf7ov0au2gYACcGrWDd9K5pYQsvWlP5gA==
+"@storybook/theming@6.3.7":
+  version "6.3.7"
+  resolved "https://registry.npmjs.org/@storybook/theming/-/theming-6.3.7.tgz#6daf9a21b26ed607f3c28a82acd90c0248e76d8b"
+  integrity sha512-GXBdw18JJd5jLLcRonAZWvGGdwEXByxF1IFNDSOYCcpHWsMgTk4XoLjceu9MpXET04pVX51LbVPLCvMdggoohg==
   dependencies:
     "@emotion/core" "^10.1.1"
     "@emotion/is-prop-valid" "^0.8.6"
     "@emotion/styled" "^10.0.27"
-    "@storybook/client-logger" "6.2.9"
+    "@storybook/client-logger" "6.3.7"
     core-js "^3.8.2"
     deep-object-diff "^1.1.0"
     emotion-theming "^10.0.27"
@@ -5026,59 +5942,40 @@
     resolve-from "^5.0.0"
     ts-dedent "^2.0.0"
 
-"@storybook/theming@6.3.0":
-  version "6.3.0"
-  resolved "https://registry.npmjs.org/@storybook/theming/-/theming-6.3.0.tgz#4b6ef023631663d8e50f1348469b9a9641244cd0"
-  integrity sha512-Mtnq8qFv/TTtnl1sB6DGBCg/kJq7sR2e2uh/Uy2sHyksnhVITVJxEIFHSBo2L+IE6y0S2Oh6F9WdddWAO4Ao2g==
+"@storybook/ui@6.3.7":
+  version "6.3.7"
+  resolved "https://registry.npmjs.org/@storybook/ui/-/ui-6.3.7.tgz#d0caea50640670da3189bbbb67c43da30c90455a"
+  integrity sha512-PBeRO8qtwAbtHvxUgNtz/ChUR6qnN+R37dMaIs3Y96jbks1fS2K9Mt7W5s1HnUbWbg2KsZMv9D4VYPBasY+Isw==
   dependencies:
     "@emotion/core" "^10.1.1"
-    "@emotion/is-prop-valid" "^0.8.6"
-    "@emotion/styled" "^10.0.27"
-    "@storybook/client-logger" "6.3.0"
-    core-js "^3.8.2"
-    deep-object-diff "^1.1.0"
-    emotion-theming "^10.0.27"
-    global "^4.4.0"
-    memoizerific "^1.11.3"
-    polished "^4.0.5"
-    resolve-from "^5.0.0"
-    ts-dedent "^2.0.0"
-
-"@storybook/ui@6.1.15":
-  version "6.1.15"
-  resolved "https://registry.npmjs.org/@storybook/ui/-/ui-6.1.15.tgz#a0f6c49fcf81cf172cd2de4c8dba2be1296891f6"
-  integrity sha512-quyhJWlOxhk95he7s5/TSYM3eEsaz3s4+98kUZE6r3ssME8u6zDvqa/qa6EWs5/nvZ2V3+12efIzCNbiiT3v3g==
-  dependencies:
-    "@emotion/core" "^10.1.1"
-    "@storybook/addons" "6.1.15"
-    "@storybook/api" "6.1.15"
-    "@storybook/channels" "6.1.15"
-    "@storybook/client-logger" "6.1.15"
-    "@storybook/components" "6.1.15"
-    "@storybook/core-events" "6.1.15"
-    "@storybook/router" "6.1.15"
+    "@storybook/addons" "6.3.7"
+    "@storybook/api" "6.3.7"
+    "@storybook/channels" "6.3.7"
+    "@storybook/client-logger" "6.3.7"
+    "@storybook/components" "6.3.7"
+    "@storybook/core-events" "6.3.7"
+    "@storybook/router" "6.3.7"
     "@storybook/semver" "^7.3.2"
-    "@storybook/theming" "6.1.15"
-    "@types/markdown-to-jsx" "^6.11.0"
-    copy-to-clipboard "^3.0.8"
-    core-js "^3.0.1"
-    core-js-pure "^3.0.1"
-    downshift "^6.0.6"
-    emotion-theming "^10.0.19"
+    "@storybook/theming" "6.3.7"
+    "@types/markdown-to-jsx" "^6.11.3"
+    copy-to-clipboard "^3.3.1"
+    core-js "^3.8.2"
+    core-js-pure "^3.8.2"
+    downshift "^6.0.15"
+    emotion-theming "^10.0.27"
     fuse.js "^3.6.1"
-    global "^4.3.2"
-    lodash "^4.17.15"
+    global "^4.4.0"
+    lodash "^4.17.20"
     markdown-to-jsx "^6.11.4"
     memoizerific "^1.11.3"
-    polished "^3.4.4"
-    qs "^6.6.0"
-    react-draggable "^4.0.3"
-    react-helmet-async "^1.0.2"
-    react-hotkeys "2.0.0"
-    react-sizeme "^2.6.7"
+    polished "^4.0.5"
+    qs "^6.10.0"
+    react-draggable "^4.4.3"
+    react-helmet-async "^1.0.7"
+    react-sizeme "^3.0.1"
     regenerator-runtime "^0.13.7"
     resolve-from "^5.0.0"
-    store2 "^2.7.1"
+    store2 "^2.12.0"
 
 "@sucrase/jest-plugin@^2.1.0":
   version "2.1.0"
@@ -5257,9 +6154,9 @@
     pretty-format "^26.6.2"
 
 "@testing-library/jest-dom@^5.10.1":
-  version "5.11.9"
-  resolved "https://registry.npmjs.org/@testing-library/jest-dom/-/jest-dom-5.11.9.tgz#e6b3cd687021f89f261bd53cbe367041fbd3e975"
-  integrity sha512-Mn2gnA9d1wStlAIT2NU8J15LNob0YFBVjs2aEQ3j8rsfRQo+lAs7/ui1i2TGaJjapLmuNPLTsrm+nPjmZDwpcQ==
+  version "5.14.1"
+  resolved "https://registry.npmjs.org/@testing-library/jest-dom/-/jest-dom-5.14.1.tgz#8501e16f1e55a55d675fe73eecee32cdaddb9766"
+  integrity sha512-dfB7HVIgTNCxH22M1+KU6viG5of2ldoA5ly8Ar8xkezKHKXjRvznCdbMbqjYGgO2xjRbwnR+rR8MLUIqF3kKbQ==
   dependencies:
     "@babel/runtime" "^7.9.2"
     "@types/testing-library__jest-dom" "^5.9.1"
@@ -5267,6 +6164,7 @@
     chalk "^3.0.0"
     css "^3.0.0"
     css.escape "^1.5.1"
+    dom-accessibility-api "^0.5.6"
     lodash "^4.17.15"
     redent "^3.0.0"
 
@@ -5293,11 +6191,26 @@
   dependencies:
     "@babel/runtime" "^7.12.5"
 
+"@tokenizer/token@^0.3.0":
+  version "0.3.0"
+  resolved "https://registry.npmjs.org/@tokenizer/token/-/token-0.3.0.tgz#fe98a93fe789247e998c75e74e9c7c63217aa276"
+  integrity sha512-OvjF+z51L3ov0OyAU0duzsYuvO01PH7x4t6DJx+guahgTnBHkhJdG7soQeTSFLWN3efnHyibZ4Z8l2EuWwJN3A==
+
 "@tootallnate/once@1":
   version "1.1.2"
   resolved "https://registry.npmjs.org/@tootallnate/once/-/once-1.1.2.tgz#ccb91445360179a04e7fe6aff78c00ffc1eeaf82"
   integrity sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw==
 
+"@trendyol-js/openstack-swift-sdk@^0.0.4":
+  version "0.0.4"
+  resolved "https://registry.npmjs.org/@trendyol-js/openstack-swift-sdk/-/openstack-swift-sdk-0.0.4.tgz#570c6ab950319156c175ace005b4fb4d9f895d47"
+  integrity sha512-9YKOjov+V+yzptei6+B9QPuC5pOMTBTg/NQpb1ZbxvlOaYpWU4HHpSH2BkIFYZ8vYyAfzFNG1T2rjpQ2ZQDUtQ==
+  dependencies:
+    agentkeepalive "^4.1.4"
+    axios "^0.21.1"
+    axios-cached-dns-resolve "0.5.2"
+    file-type "16.5.3"
+
 "@tsconfig/node10@^1.0.7":
   version "1.0.8"
   resolved "https://registry.npmjs.org/@tsconfig/node10/-/node10-1.0.8.tgz#c1e4e80d6f964fbecb3359c43bd48b40f7cadad9"
@@ -5325,11 +6238,6 @@
   dependencies:
     "@types/node" "*"
 
-"@types/anymatch@*":
-  version "1.3.1"
-  resolved "https://registry.npmjs.org/@types/anymatch/-/anymatch-1.3.1.tgz#336badc1beecb9dacc38bea2cf32adf627a8421a"
-  integrity sha512-/+CRPXpBDpo2RK9C68N3b2cOvO0Cf5B9aPijHsoDQTHivnGSObdOF2BRQOYjojWTDy6nQvMjmqRXIxH55VjxxA==
-
 "@types/archiver@^5.1.0":
   version "5.3.0"
   resolved "https://registry.npmjs.org/@types/archiver/-/archiver-5.3.0.tgz#2b34ba56d4d7102d256b922c7e91e09eab79db6f"
@@ -5425,13 +6333,6 @@
   dependencies:
     classnames "*"
 
-"@types/clean-css@*":
-  version "4.2.1"
-  resolved "https://registry.npmjs.org/@types/clean-css/-/clean-css-4.2.1.tgz#cb0134241ec5e6ede1b5344bc829668fd9871a8d"
-  integrity sha512-A1HQhQ0hkvqqByJMgg+Wiv9p9XdoYEzuwm11SVo1mX2/4PSdhjcrUlilJQoqLscIheC51t1D5g+EFWCXZ2VTQQ==
-  dependencies:
-    "@types/node" "*"
-
 "@types/codemirror@^0.0.108":
   version "0.0.108"
   resolved "https://registry.npmjs.org/@types/codemirror/-/codemirror-0.0.108.tgz#e640422b666bf49251b384c390cdeb2362585bde"
@@ -5452,9 +6353,9 @@
   integrity sha512-rr+OQyAjxze7GgWrSaJwydHStIhHq2lvY3BOC2Mj7KnzI7XK0Uw1TOOdI9lDoajEbSWLiYgoo4f1R51erQfhPQ==
 
 "@types/color@^3.0.1":
-  version "3.0.1"
-  resolved "https://registry.npmjs.org/@types/color/-/color-3.0.1.tgz#2900490ed04da8116c5058cd5dba3572d5a25071"
-  integrity sha512-oeUWVaAwI+xINDUx+3F2vJkl/vVB03VChFF/Gl3iQCdbcakjuoJyMOba+3BXRtnBhxZ7uBYqQBi9EpLnvSoztA==
+  version "3.0.2"
+  resolved "https://registry.npmjs.org/@types/color/-/color-3.0.2.tgz#3779043e782f562aa9157b5fc6bd07e14fd8e7f3"
+  integrity sha512-INiJl6sfNn8iyC5paxVzqiVUEj2boIlFki02uRTAkKwAj++7aAF+ZfEv/XrIeBa0XI/fTZuDHW8rEEcEVnON+Q==
   dependencies:
     "@types/color-convert" "*"
 
@@ -5471,16 +6372,16 @@
     "@types/express" "*"
 
 "@types/concat-stream@^1.6.0":
-  version "1.6.0"
-  resolved "https://registry.npmjs.org/@types/concat-stream/-/concat-stream-1.6.0.tgz#394dbe0bb5fee46b38d896735e8b68ef2390d00d"
-  integrity sha1-OU2+C7X+5Gs42JZzXoto7yOQ0A0=
+  version "1.6.1"
+  resolved "https://registry.npmjs.org/@types/concat-stream/-/concat-stream-1.6.1.tgz#24bcfc101ecf68e886aaedce60dfd74b632a1b74"
+  integrity sha512-eHE4cQPoj6ngxBZMvVf6Hw7Mh4jMW4U9lpGmS5GBPB9RYxlFg+CHaVN7ErNY4W9XfLIEn20b4VDYaIrbq0q4uA==
   dependencies:
     "@types/node" "*"
 
 "@types/connect-history-api-fallback@*":
-  version "1.3.3"
-  resolved "https://registry.npmjs.org/@types/connect-history-api-fallback/-/connect-history-api-fallback-1.3.3.tgz#4772b79b8b53185f0f4c9deab09236baf76ee3b4"
-  integrity sha512-7SxFCd+FLlxCfwVwbyPxbR4khL9aNikJhrorw8nUIOqeuooc9gifBuDQOJw5kzN7i6i3vLn9G8Wde/4QDihpYw==
+  version "1.3.5"
+  resolved "https://registry.npmjs.org/@types/connect-history-api-fallback/-/connect-history-api-fallback-1.3.5.tgz#d1f7a8a09d0ed5a57aee5ae9c18ab9b803205dae"
+  integrity sha512-h8QJa8xSb1WD4fpKBDcATDNGXghFj6/3GRWG6dhmRcu0RX1Ubasur2Uvx5aeEwlf0MwblEC2bMzzMQntxnw/Cw==
   dependencies:
     "@types/express-serve-static-core" "*"
     "@types/node" "*"
@@ -5558,6 +6459,11 @@
   dependencies:
     "@types/d3-color" "*"
 
+"@types/d3-path@*":
+  version "3.0.0"
+  resolved "https://registry.npmjs.org/@types/d3-path/-/d3-path-3.0.0.tgz#939e3a784ae4f80b1fde8098b91af1776ff1312b"
+  integrity sha512-0g/A+mZXgFkQxN3HniRDbXMN79K3CdTpLsevj+PXiTcb2hVyvkZUBg37StmgCQkaD84cUJ4uaDAWq7UJOQy2Tg==
+
 "@types/d3-path@^1":
   version "1.0.9"
   resolved "https://registry.npmjs.org/@types/d3-path/-/d3-path-1.0.9.tgz#73526b150d14cd96e701597cbf346cfd1fd4a58c"
@@ -5575,12 +6481,12 @@
   dependencies:
     "@types/d3-path" "^1"
 
-"@types/d3-shape@^2.0.0":
-  version "2.1.0"
-  resolved "https://registry.npmjs.org/@types/d3-shape/-/d3-shape-2.1.0.tgz#cc7bbc9fc2c25f092bd457887a3224a21a55ca55"
-  integrity sha512-xTMEs8eITRksXclcVxMHIONRdyjj2TjDIwO4XFOPTVBNK9/oC4ZOhUbvTz1IpcsEsS/mClwuulP+OoawSAbSGA==
+"@types/d3-shape@^3.0.1":
+  version "3.0.2"
+  resolved "https://registry.npmjs.org/@types/d3-shape/-/d3-shape-3.0.2.tgz#4b1ca4ddaac294e76b712429726d40365cd1e8ca"
+  integrity sha512-5+ButCmIfNX8id5seZ7jKj3igdcxx+S9IDBiT35fQGTLZUfkFgTv+oBH34xgeoWDKpWcMITSzBILWQtBoN5Piw==
   dependencies:
-    "@types/d3-path" "^1"
+    "@types/d3-path" "*"
 
 "@types/d3-zoom@^2.0.0":
   version "2.0.1"
@@ -5600,12 +6506,36 @@
   resolved "https://registry.npmjs.org/@types/diff/-/diff-5.0.0.tgz#eb71e94feae62548282c4889308a3dfb57e36020"
   integrity sha512-jrm2K65CokCCX4NmowtA+MfXyuprZC13jbRuwprs6/04z/EcFg/MCwYdsHn+zgV4CQBiATiI7AEq7y1sZCtWKA==
 
-"@types/dockerode@^3.2.1":
-  version "3.2.1"
-  resolved "https://registry.npmjs.org/@types/dockerode/-/dockerode-3.2.1.tgz#f713a8f6f1017c227845ab33239383da721207b9"
-  integrity sha512-AeZpdQMNqM8dtrEaaP81CbjdRVKNmFIMzgz5IlKIeS5uWEmjlEmENP444AGTEEF71r5TFuY9E4SkzZAO8lOF1A==
+"@types/docker-modem@*":
+  version "3.0.1"
+  resolved "https://registry.npmjs.org/@types/docker-modem/-/docker-modem-3.0.1.tgz#2a29c914dd64c4c9213510d2ce75fa85232934df"
+  integrity sha512-ZUXPF0WNnvs7AxoQRijt+DW2jsXnWCk8ac28tTYzTpBNnOEIAw83A+pYkCXjTFdJHMTc+wUmwNr71Zy2TRjlWg==
   dependencies:
     "@types/node" "*"
+    "@types/ssh2" "*"
+
+"@types/dockerode@^3.2.1":
+  version "3.2.7"
+  resolved "https://registry.npmjs.org/@types/dockerode/-/dockerode-3.2.7.tgz#0bc1f583b0e1edc4ca0c6179ef251382df35dcb3"
+  integrity sha512-Y8hMRQTwsOjz4qm6yilZKKjB/Y7+2EOiY3RPN1Xtu63wEUEDVv+3Ou+sgiisPE9+pVe3bmwhnF+E1Iwj/o4J6w==
+  dependencies:
+    "@types/docker-modem" "*"
+    "@types/node" "*"
+
+"@types/dompurify@^2.2.2":
+  version "2.2.3"
+  resolved "https://registry.npmjs.org/@types/dompurify/-/dompurify-2.2.3.tgz#6e89677a07902ac1b6821c345f34bd85da239b08"
+  integrity sha512-CLtc2mZK8+axmrz1JqtpklO/Kvn38arGc8o1l3UVopZaXXuer9ONdZwJ/9f226GrhRLtUmLr9WrvZsRSNpS8og==
+  dependencies:
+    "@types/trusted-types" "*"
+
+"@types/eslint-scope@^3.7.0":
+  version "3.7.0"
+  resolved "https://registry.npmjs.org/@types/eslint-scope/-/eslint-scope-3.7.0.tgz#4792816e31119ebd506902a482caec4951fabd86"
+  integrity sha512-O/ql2+rrCUe2W2rs7wMR+GqPRcgB6UiqN5RhrR5xruFlY7l9YLMn0ZkDzjoHLeiFkR8MCQZVudUuuvQ2BLC9Qw==
+  dependencies:
+    "@types/eslint" "*"
+    "@types/estree" "*"
 
 "@types/eslint@*":
   version "6.1.8"
@@ -5625,10 +6555,24 @@
   resolved "https://registry.npmjs.org/@types/estree/-/estree-0.0.39.tgz#e177e699ee1b8c22d23174caaa7422644389509f"
   integrity sha512-EYNwp3bU+98cpU4lAWYYL7Zz+2gryWH1qbdDTidVd6hkiR6weksdbMadyXKXNPEkQFhXM+hVO9ZygomHXp+AIw==
 
-"@types/express-serve-static-core@*", "@types/express-serve-static-core@^4.17.18", "@types/express-serve-static-core@^4.17.21", "@types/express-serve-static-core@^4.17.5":
-  version "4.17.21"
-  resolved "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.21.tgz#a427278e106bca77b83ad85221eae709a3414d42"
-  integrity sha512-gwCiEZqW6f7EoR8TTEfalyEhb1zA5jQJnRngr97+3pzMaO1RKoI1w2bw07TK72renMUVWcWS5mLI6rk1NqN0nA==
+"@types/estree@^0.0.50":
+  version "0.0.50"
+  resolved "https://registry.npmjs.org/@types/estree/-/estree-0.0.50.tgz#1e0caa9364d3fccd2931c3ed96fdbeaa5d4cca83"
+  integrity sha512-C6N5s2ZFtuZRj54k2/zyRhNDjJwwcViAM3Nbm8zjBpbqAdZ00mr0CFxvSKeO8Y/e03WVFLpQMdHYVfUd6SB+Hw==
+
+"@types/express-serve-static-core@*", "@types/express-serve-static-core@^4.17.18", "@types/express-serve-static-core@^4.17.21":
+  version "4.17.24"
+  resolved "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.24.tgz#ea41f93bf7e0d59cd5a76665068ed6aab6815c07"
+  integrity sha512-3UJuW+Qxhzwjq3xhwXm2onQcFHn76frIYVbTu+kn24LFxI+dEhdfISDFovPB8VpEgW8oQCTpRuCe+0zJxB7NEA==
+  dependencies:
+    "@types/node" "*"
+    "@types/qs" "*"
+    "@types/range-parser" "*"
+
+"@types/express-serve-static-core@^4.17.5":
+  version "4.17.18"
+  resolved "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.18.tgz#8371e260f40e0e1ca0c116a9afcd9426fa094c40"
+  integrity sha512-m4JTwx5RUBNZvky/JJ8swEJPKFd8si08pPF2PfizYjGZOKr/svUWPcoUmLow6MmPzhasphB7gSTINY67xn3JNA==
   dependencies:
     "@types/node" "*"
     "@types/qs" "*"
@@ -5727,24 +6671,6 @@
   resolved "https://registry.npmjs.org/@types/html-minifier-terser/-/html-minifier-terser-5.1.0.tgz#551a4589b6ee2cc9c1dff08056128aec29b94880"
   integrity sha512-iYCgjm1dGPRuo12+BStjd1HiVQqhlRhWDOQigNxn023HcjnhsiFz9pc6CzJj4HwDCSQca9bxTL4PxJDbkdm3PA==
 
-"@types/html-minifier@*":
-  version "3.5.3"
-  resolved "https://registry.npmjs.org/@types/html-minifier/-/html-minifier-3.5.3.tgz#5276845138db2cebc54c789e0aaf87621a21e84f"
-  integrity sha512-j1P/4PcWVVCPEy5lofcHnQ6BtXz9tHGiFPWzqm7TtGuWZEfCHEP446HlkSNc9fQgNJaJZ6ewPtp2aaFla/Uerg==
-  dependencies:
-    "@types/clean-css" "*"
-    "@types/relateurl" "*"
-    "@types/uglify-js" "*"
-
-"@types/html-webpack-plugin@*", "@types/html-webpack-plugin@^3.2.2":
-  version "3.2.5"
-  resolved "https://registry.npmjs.org/@types/html-webpack-plugin/-/html-webpack-plugin-3.2.5.tgz#58e94c0d57801903b2b77674d2b9ef6c4a65a6db"
-  integrity sha512-DhC7NTte+Ikw/zxp2w9qjcWtHqpShbUx7ASPUZ00trn1EOftoRtMmy8nS7F/mW8ASTA2JGMFX2bbuqqxiqs6mQ==
-  dependencies:
-    "@types/html-minifier" "*"
-    "@types/tapable" "^1"
-    "@types/webpack" "^4"
-
 "@types/http-assert@*":
   version "1.5.1"
   resolved "https://registry.npmjs.org/@types/http-assert/-/http-assert-1.5.1.tgz#d775e93630c2469c2f980fc27e3143240335db3b"
@@ -5777,9 +6703,9 @@
     "@types/node" "*"
 
 "@types/http-proxy@*", "@types/http-proxy@^1.17.4", "@types/http-proxy@^1.17.5":
-  version "1.17.6"
-  resolved "https://registry.npmjs.org/@types/http-proxy/-/http-proxy-1.17.6.tgz#62dc3fade227d6ac2862c8f19ee0da9da9fd8616"
-  integrity sha512-+qsjqR75S/ib0ig0R9WN+CDoZeOBU6F2XLewgC4KVgdXiNHiKKHFEMRHOrs5PbYE97D5vataw5wPj4KLYfUkuQ==
+  version "1.17.7"
+  resolved "https://registry.npmjs.org/@types/http-proxy/-/http-proxy-1.17.7.tgz#30ea85cc2c868368352a37f0d0d3581e24834c6f"
+  integrity sha512-9hdj6iXH64tHSLTY+Vt2eYOGzSogC+JQ2H7bdPWkuh7KXP5qLllWx++t+K9Wk556c3dkDdPws/SpMRi0sdCT1w==
   dependencies:
     "@types/node" "*"
 
@@ -5828,6 +6754,13 @@
   dependencies:
     "@types/istanbul-lib-report" "*"
 
+"@types/jenkins@^0.23.1":
+  version "0.23.2"
+  resolved "https://registry.npmjs.org/@types/jenkins/-/jenkins-0.23.2.tgz#96736a2be4904efdfe7fe2650569479fd77dc48e"
+  integrity sha512-BELmIZ6brxwGFqBHfLjLTjYRWAUqcT1d2BydH1CcRTZEjCYw3DRVfZkXU7BVlyIsKXm2ZMIKVkEjKKtVDvPiXA==
+  dependencies:
+    "@types/node" "*"
+
 "@types/jest-when@^2.7.2":
   version "2.7.2"
   resolved "https://registry.npmjs.org/@types/jest-when/-/jest-when-2.7.2.tgz#619fbc5f623bcd0b29efde0e4993c7f0d50d026d"
@@ -5879,16 +6812,16 @@
     recast "^0.20.3"
 
 "@types/json-schema-merge-allof@^0.6.0":
-  version "0.6.0"
-  resolved "https://registry.npmjs.org/@types/json-schema-merge-allof/-/json-schema-merge-allof-0.6.0.tgz#0f587d8a3bcb41a55ef2e91d3ba96430c9bc1813"
-  integrity sha512-v6iCEk4Sxy1twlCTtrRxMqSHX0vuLJ7Ql4hiIUZRMOswxtlUeybIfYaZIj7pX747RBczG2YtBm4Fn6sqKzeY2Q==
+  version "0.6.1"
+  resolved "https://registry.npmjs.org/@types/json-schema-merge-allof/-/json-schema-merge-allof-0.6.1.tgz#c476c2aeed04d8a14882ff872de9ddeca5608e0b"
+  integrity sha512-tBVtkCCbA1oF8vQ2cp2yuGLp0T2f0AZ2dAic64ZftoWQnKqrTYY/+PuiqPKX1XaxoR43ll/EkYcHnJbdbHUS2g==
   dependencies:
     "@types/json-schema" "*"
 
-"@types/json-schema@*", "@types/json-schema@^7.0.4", "@types/json-schema@^7.0.5", "@types/json-schema@^7.0.6", "@types/json-schema@^7.0.7":
-  version "7.0.7"
-  resolved "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.7.tgz#98a993516c859eb0d5c4c8f098317a9ea68db9ad"
-  integrity sha512-cxWFQVseBm6O9Gbw1IWb8r6OS4OhSt3hPZLkFApLjM8TEXROBuQGLAH2i2gZpcXdLBIrpXuTDhH7Vbm1iXmNGA==
+"@types/json-schema@*", "@types/json-schema@^7.0.4", "@types/json-schema@^7.0.5", "@types/json-schema@^7.0.6", "@types/json-schema@^7.0.7", "@types/json-schema@^7.0.8":
+  version "7.0.9"
+  resolved "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.9.tgz#97edc9037ea0c38585320b28964dde3b39e4660d"
+  integrity sha512-qcUXuemtEu+E5wZSJHNxUXeCZhAfXKQ41D+duX+VYPde7xyEVZci+/oXKJL13tnRs9lR2pr4fod59GT6/X1/yQ==
 
 "@types/json-stable-stringify@^1.0.32":
   version "1.0.32"
@@ -5946,10 +6879,10 @@
     "@types/koa-compose" "*"
     "@types/node" "*"
 
-"@types/ldapjs@^1.0.10":
-  version "1.0.10"
-  resolved "https://registry.npmjs.org/@types/ldapjs/-/ldapjs-1.0.10.tgz#bac705c9e154b97d69496b5213cc28dbe9715a37"
-  integrity sha512-AMkMxkK/wjYtWebNH2O+rARfo7scBpW3T23g6zmGCwDgbyDbR79XWpcSqhPWdU+fChaF+I3dVyl9X2dT1CyI9w==
+"@types/ldapjs@^2.2.0":
+  version "2.2.0"
+  resolved "https://registry.npmjs.org/@types/ldapjs/-/ldapjs-2.2.0.tgz#43ff78668c420b69a61b93e0acde71ddc0c7766d"
+  integrity sha512-L6ObSryRGOw0qYmN9B4w4s8UkoyRbxoWh7C1vc/Z6O/VXJQJqGBSyZPXRDmgKF+TZVGq/F7H37t0Cxrm+hLiRA==
   dependencies:
     "@types/node" "*"
 
@@ -5978,10 +6911,10 @@
   resolved "https://registry.npmjs.org/@types/luxon/-/luxon-1.27.0.tgz#1e3b5a7f8ca6944349c43498b4442b742c71ab0b"
   integrity sha512-rr2lNXsErnA/ARtgFn46NtQjUa66cuwZYeo/2K7oqqxhJErhXgHBPyNKCo+pfOC3L7HFwtao8ebViiU9h4iAxA==
 
-"@types/markdown-to-jsx@^6.11.0":
-  version "6.11.2"
-  resolved "https://registry.npmjs.org/@types/markdown-to-jsx/-/markdown-to-jsx-6.11.2.tgz#05d1aaffbf15be7be12c70535fa4fed65cc7c64f"
-  integrity sha512-ESuCu8Bk7jpTZ3YPdMW1+6wUj13F5N15vXfc7BuUAN0eCp0lrvVL9nzOTzoqvbRzXMciuqXr1KrHt3xQAhfwPA==
+"@types/markdown-to-jsx@^6.11.3":
+  version "6.11.3"
+  resolved "https://registry.npmjs.org/@types/markdown-to-jsx/-/markdown-to-jsx-6.11.3.tgz#cdd1619308fecbc8be7e6a26f3751260249b020e"
+  integrity sha512-30nFYpceM/ZEvhGiqWjm5quLUxNeld0HCzJEXMZZDpq53FPkS85mTwkWtCXzCqq8s5JYLgM5W392a02xn8Bdaw==
   dependencies:
     "@types/react" "*"
 
@@ -6009,13 +6942,6 @@
   resolved "https://registry.npmjs.org/@types/mime/-/mime-1.3.2.tgz#93e25bf9ee75fe0fd80b594bc4feb0e862111b5a"
   integrity sha512-YATxVxgRqNH6nHEIsvg6k2Boc1JHI9ZbH5iWFFv/MTkchz3b1ieGDa5T0a9RznNdI0KhVbdbWSN+KWWrQZRxTw==
 
-"@types/mini-css-extract-plugin@^1.2.2":
-  version "1.2.2"
-  resolved "https://registry.npmjs.org/@types/mini-css-extract-plugin/-/mini-css-extract-plugin-1.2.2.tgz#e6031da8d60777b3da3f5b4daf285437d7b6580b"
-  integrity sha512-EoHBJ4rcrd5j7weAFE4yU1gxedx53EFCWKso03G7DW0h2YvtwjKYz/NnuFHudcQDI1HpTLqoQFTwEgfJxygYCw==
-  dependencies:
-    "@types/webpack" "*"
-
 "@types/minimatch@*", "@types/minimatch@^3.0.3":
   version "3.0.3"
   resolved "https://registry.npmjs.org/@types/minimatch/-/minimatch-3.0.3.tgz#3dca0e3f33b200fc7d1139c0cd96c1268cadfd9d"
@@ -6047,7 +6973,7 @@
   dependencies:
     "@types/node" "*"
 
-"@types/node-fetch@^2.5.0", "@types/node-fetch@^2.5.4", "@types/node-fetch@^2.5.7":
+"@types/node-fetch@^2.5.0", "@types/node-fetch@^2.5.7":
   version "2.5.8"
   resolved "https://registry.npmjs.org/@types/node-fetch/-/node-fetch-2.5.8.tgz#e199c835d234c7eb0846f6618012e558544ee2fb"
   integrity sha512-fbjI6ja0N5ZA8TV53RUqzsKNkl9fv8Oj3T7zxW7FGv1GSH7gwJaNF8dzCjrqKaxKeUpTz4yT1DaJFq/omNpGfw==
@@ -6055,10 +6981,10 @@
     "@types/node" "*"
     form-data "^3.0.0"
 
-"@types/node@*", "@types/node@>= 8", "@types/node@>=12.12.47", "@types/node@>=13.7.0":
-  version "14.17.0"
-  resolved "https://registry.npmjs.org/@types/node/-/node-14.17.0.tgz#3ba770047723b3eeb8dc9fca02cce8a7fb6378da"
-  integrity sha512-w8VZUN/f7SSbvVReb9SWp6cJFevxb4/nkG65yLAya//98WgocKm5PLDAtSs5CtJJJM+kHmJjO/6mmYW4MHShZA==
+"@types/node@*", "@types/node@>= 8", "@types/node@>=12.12.47", "@types/node@>=13.7.0", "@types/node@^14.0.10", "@types/node@^14.14.31", "@types/node@^14.14.32", "@types/node@^14.14.33":
+  version "14.17.8"
+  resolved "https://registry.npmjs.org/@types/node/-/node-14.17.8.tgz#813b73ab7d82ac06ddfd2458b13c88459a3b319f"
+  integrity sha512-0CHLt50GbUmH/6MrlBIKNdWCglvlyQKkorRf08/0DIi0ryuTPP+ijWLSI19SbDTHSKaagGDELiImY4BSikt61w==
 
 "@types/node@10.17.13":
   version "10.17.13"
@@ -6075,11 +7001,6 @@
   resolved "https://registry.npmjs.org/@types/node/-/node-12.12.58.tgz#46dae9b2b9ee5992818c8f7cee01ff4ce03ab44c"
   integrity sha512-Be46CNIHWAagEfINOjmriSxuv7IVcqbGe+sDSg2SYCEz/0CRBy7LRASGfRbD8KZkqoePU73Wsx3UvOSFcq/9hA==
 
-"@types/node@^14.14.31", "@types/node@^14.14.32", "@types/node@^14.14.33":
-  version "14.17.3"
-  resolved "https://registry.npmjs.org/@types/node/-/node-14.17.3.tgz#6d327abaa4be34a74e421ed6409a0ae2f47f4c3d"
-  integrity sha512-e6ZowgGJmTuXa3GyaPbTGxX17tnThl2aSSizrFthQ7m9uLGZBXiGhgE55cjRZTF5kjZvYn9EOPOMljdjwbflxw==
-
 "@types/normalize-package-data@^2.4.0":
   version "2.4.0"
   resolved "https://registry.npmjs.org/@types/normalize-package-data/-/normalize-package-data-2.4.0.tgz#e486d0d97396d79beedd0a6e33f4534ff6b4973e"
@@ -6091,9 +7012,9 @@
   integrity sha512-4QQmOF5KlwfxJ5IGXFIudkeLCdMABz03RcUXu+LCb24zmln8QW6aDjuGl4d4XPVLf2j+FnjelHTP7dvceAFbhA==
 
 "@types/nunjucks@^3.1.4":
-  version "3.1.4"
-  resolved "https://registry.npmjs.org/@types/nunjucks/-/nunjucks-3.1.4.tgz#2f80e2fa5e7982b2131201d0b4474ab4d03d9de1"
-  integrity sha512-cR65PLlHKW/qxxj840dbNb3ICO+iAVQzaNKJ8TcKOVKFi+QcAkhw9SCY8VFAyU41SmJMs+2nrIN2JGhX+jYb7A==
+  version "3.1.5"
+  resolved "https://registry.npmjs.org/@types/nunjucks/-/nunjucks-3.1.5.tgz#e0782333b75b4ff9ac9213aa160ca8c5132eaf57"
+  integrity sha512-0zEdmQNNvQ+xyV9kqQvAV93UVroTwhE78toVUDT0GBnGcW2jQBZnB4al9qq2LqI5qHOqROy/DvvAY/UwrbvV1A==
 
 "@types/oauth@*":
   version "0.9.1"
@@ -6102,7 +7023,7 @@
   dependencies:
     "@types/node" "*"
 
-"@types/overlayscrollbars@^1.12.0", "@types/overlayscrollbars@^1.9.0":
+"@types/overlayscrollbars@^1.12.0":
   version "1.12.0"
   resolved "https://registry.npmjs.org/@types/overlayscrollbars/-/overlayscrollbars-1.12.0.tgz#98456caceca8ad73bd5bb572632a585074e70764"
   integrity sha512-h/pScHNKi4mb+TrJGDon8Yb06ujFG0mSg12wIO0sWMUF3dQIe2ExRRdNRviaNt9IjxIiOfnRr7FsQAdHwK4sMg==
@@ -6112,10 +7033,15 @@
   resolved "https://registry.npmjs.org/@types/parse-json/-/parse-json-4.0.0.tgz#2f8bb441434d163b35fb8ffdccd7138927ffb8c0"
   integrity sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA==
 
+"@types/parse5@^5.0.0":
+  version "5.0.3"
+  resolved "https://registry.npmjs.org/@types/parse5/-/parse5-5.0.3.tgz#e7b5aebbac150f8b5fdd4a46e7f0bd8e65e19109"
+  integrity sha512-kUNnecmtkunAoQ3CnjmMkzNU/gtxG8guhi+Fk2U/kOpIKjIMKnXGp4IJCgQJrXSgMsWYimYG4TGjz/UzbGEBTw==
+
 "@types/passport-github2@^1.2.4":
-  version "1.2.4"
-  resolved "https://registry.npmjs.org/@types/passport-github2/-/passport-github2-1.2.4.tgz#f56c386d1fe6435e359430e57adc1747a627bd86"
-  integrity sha512-dtGtA0Uyzk6ne3SrgQi/I1ClClLE3i7JmSiMaJgkGH8v1nbE9JdBpG7QWJ1XPlLdcf7EvoPdHmkWN2+Kln9y8g==
+  version "1.2.5"
+  resolved "https://registry.npmjs.org/@types/passport-github2/-/passport-github2-1.2.5.tgz#79064e213ff33ca0a9d21af3da09a3230fac8099"
+  integrity sha512-+WLyrd8JPsCxroK34EjegR0j3FMxp6wqB9cw/sRCFkWT9qic1dymAn021gr336EpyjzdhjUd2KKrqyxvdFSvOA==
   dependencies:
     "@types/express" "*"
     "@types/passport" "*"
@@ -6146,10 +7072,10 @@
     "@types/oauth" "*"
     "@types/passport" "*"
 
-"@types/passport-saml@^1.1.2":
-  version "1.1.2"
-  resolved "https://registry.npmjs.org/@types/passport-saml/-/passport-saml-1.1.2.tgz#f32ac2321eb25ec7bdbb1f3a5313b596bb0887e6"
-  integrity sha512-vpSdcb7V/bFxrvZJwSqnBr0qEqIhtOnwRBxw+Dvq4UkVbEgcCOkxF4tERCCFfA+FP3lp63VCCAifZLQrF5JkXA==
+"@types/passport-saml@^1.1.3":
+  version "1.1.3"
+  resolved "https://registry.npmjs.org/@types/passport-saml/-/passport-saml-1.1.3.tgz#efc57902a07ebe1ec114d00acd8d990e873813a1"
+  integrity sha512-4kqfyTN6Ud8xTPIdmsYDOBVs4vQFQRcLWhMcGLYiMBc0sFeC44k0Q8Z8v1TIYTmZUrqaO6rbf78GZXl4xAvCRA==
   dependencies:
     "@types/express" "*"
     "@types/passport" "*"
@@ -6163,19 +7089,12 @@
     "@types/passport" "*"
 
 "@types/passport@*", "@types/passport@^1.0.3":
-  version "1.0.6"
-  resolved "https://registry.npmjs.org/@types/passport/-/passport-1.0.6.tgz#72343e49d65efa98cb328163cff5f127981947d7"
-  integrity sha512-9oKfrJXuAxvyxdrtMCxKkHgmd6DMO8NDOLvMJ1LvIWd6/xP+i81PAkpTaEca7VhJX9S009RciwZL/j6dsLsHrA==
+  version "1.0.7"
+  resolved "https://registry.npmjs.org/@types/passport/-/passport-1.0.7.tgz#85892f14932168158c86aecafd06b12f5439467a"
+  integrity sha512-JtswU8N3kxBYgo+n9of7C97YQBT+AYPP2aBfNGTzABqPAZnK/WOAaKfh3XesUYMZRrXFuoPc2Hv0/G/nQFveHw==
   dependencies:
     "@types/express" "*"
 
-"@types/pkgcloud@^1.7.4":
-  version "1.7.4"
-  resolved "https://registry.npmjs.org/@types/pkgcloud/-/pkgcloud-1.7.4.tgz#ccce313cd584623787581d2d4384f6f911c06b64"
-  integrity sha512-syikaJpSx59aAxGd0i/FX5VgFLlO8OSxZLUVhwOhJqx+CRsdgaWB9TqIm5kSqJxLoyIird63QLt96Px63rHnOw==
-  dependencies:
-    "@types/node" "*"
-
 "@types/pluralize@^0.0.29":
   version "0.0.29"
   resolved "https://registry.npmjs.org/@types/pluralize/-/pluralize-0.0.29.tgz#6ffa33ed1fc8813c469b859681d09707eb40d03c"
@@ -6186,6 +7105,11 @@
   resolved "https://registry.npmjs.org/@types/prettier/-/prettier-2.0.0.tgz#dc85454b953178cc6043df5208b9e949b54a3bc4"
   integrity sha512-/rM+sWiuOZ5dvuVzV37sUuklsbg+JPOP8d+nNFlo2ZtfpzPiPvh1/gc8liWOLBqe+sR+ZM7guPaIcTt6UZTo7Q==
 
+"@types/pretty-hrtime@^1.0.0":
+  version "1.0.1"
+  resolved "https://registry.npmjs.org/@types/pretty-hrtime/-/pretty-hrtime-1.0.1.tgz#72a26101dc567b0d68fd956cf42314556e42d601"
+  integrity sha512-VjID5MJb1eGKthz2qUerWT8+R4b9N+CHvGCzg9fn4kWZgaF9AhdYikQio3R7wV8YY1NsQKPaCwKz1Yff+aHNUQ==
+
 "@types/prop-types@*", "@types/prop-types@^15.7.3":
   version "15.7.4"
   resolved "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.7.4.tgz#fcf7205c25dff795ee79af1e30da2c9790808f11"
@@ -6196,7 +7120,7 @@
   resolved "https://registry.npmjs.org/@types/q/-/q-1.5.2.tgz#690a1475b84f2a884fd07cd797c00f5f31356ea8"
   integrity sha512-ce5d3q03Ex0sy4R14722Rmt6MT07Ua+k4FwDfdcToYJcMKNtRVQvJ6JCAPdAmAnbRb6CsX6aYb9m96NGod9uTw==
 
-"@types/qs@*", "@types/qs@^6.9.0", "@types/qs@^6.9.5":
+"@types/qs@*", "@types/qs@^6.9.5":
   version "6.9.6"
   resolved "https://registry.npmjs.org/@types/qs/-/qs-6.9.6.tgz#df9c3c8b31a247ec315e6996566be3171df4b3b1"
   integrity sha512-0/HnwIfW4ki2D8L8c9GVcG5I72s9jP5GSLVF0VIXDW00kmIpA6O33G7a8n59Tmh7Nz0WUC3rSb7PTY/sdW2JzA==
@@ -6211,36 +7135,17 @@
   resolved "https://registry.npmjs.org/@types/range-parser/-/range-parser-1.2.3.tgz#7ee330ba7caafb98090bece86a5ee44115904c2c"
   integrity sha512-ewFXqrQHlFsgc09MK5jP5iR7vumV/BYayNC6PgJO2LPe8vrnNFyjQjSppfEngITi0qvfKtzFvgKymGheFM9UOA==
 
-"@types/reach__router@^1.3.5", "@types/reach__router@^1.3.7":
+"@types/reach__router@^1.3.7":
   version "1.3.7"
   resolved "https://registry.npmjs.org/@types/reach__router/-/reach__router-1.3.7.tgz#de8ab374259ae7f7499fc1373b9697a5f3cd6428"
   integrity sha512-cyBEb8Ef3SJNH5NYEIDGPoMMmYUxROatuxbICusVRQIqZUB85UCt6R2Ok60tKS/TABJsJYaHyNTW3kqbpxlMjg==
   dependencies:
     "@types/react" "*"
 
-"@types/react-color@^3.0.1":
-  version "3.0.4"
-  resolved "https://registry.npmjs.org/@types/react-color/-/react-color-3.0.4.tgz#c63daf012ad067ac0127bdd86725f079d02082bd"
-  integrity sha512-EswbYJDF1kkrx93/YU+BbBtb46CCtDMvTiGmcOa/c5PETnwTiSWoseJ1oSWeRl/4rUXkhME9bVURvvPg0W5YQw==
-  dependencies:
-    "@types/react" "*"
-    "@types/reactcss" "*"
-
-"@types/react-dev-utils@^9.0.4":
-  version "9.0.6"
-  resolved "https://registry.npmjs.org/@types/react-dev-utils/-/react-dev-utils-9.0.6.tgz#c5d74358786ecd06caea3bd7b3af3195f53c73e4"
-  integrity sha512-CtrGzH+tSw4MCAZ92QzchrCq8kES/NUUu1kAXeeDXJyb7hRzucry0sRk/bcSwBR8dJJY7N7oaEDranyyOcX3hQ==
-  dependencies:
-    "@types/eslint" "*"
-    "@types/express" "*"
-    "@types/html-webpack-plugin" "*"
-    "@types/webpack" "^4"
-    "@types/webpack-dev-server" "*"
-
-"@types/react-dom@^16.9.8":
-  version "16.9.8"
-  resolved "https://registry.npmjs.org/@types/react-dom/-/react-dom-16.9.8.tgz#fe4c1e11dfc67155733dfa6aa65108b4971cb423"
-  integrity sha512-ykkPQ+5nFknnlU6lDd947WbQ6TE3NNzbQAkInC2EKY1qeYdTKp7onFusmYZb+ityzx2YviqT6BXSu+LyWWJwcA==
+"@types/react-dom@*":
+  version "17.0.9"
+  resolved "https://registry.npmjs.org/@types/react-dom/-/react-dom-17.0.9.tgz#441a981da9d7be117042e1a6fd3dac4b30f55add"
+  integrity sha512-wIvGxLfgpVDSAMH5utdL9Ngm5Owu0VsGmldro3ORLXV8CShrL8awVj06NuEXFQ5xyaYfdca7Sgbk/50Ri1GdPg==
   dependencies:
     "@types/react" "*"
 
@@ -6252,9 +7157,9 @@
     "@types/react" "*"
 
 "@types/react-lazylog@^4.5.0":
-  version "4.5.0"
-  resolved "https://registry.npmjs.org/@types/react-lazylog/-/react-lazylog-4.5.0.tgz#1677ac520f29ada2e95b8cd5f8ec54b897227278"
-  integrity sha512-yg0IhKtDRGqUUtXJwi9Y/sSmgX/gmVP0vu0cr5uAECmJnRQbAgsGoVUntQGtwH0Z7Y2iiTh+QW5LkOFsmtIisg==
+  version "4.5.1"
+  resolved "https://registry.npmjs.org/@types/react-lazylog/-/react-lazylog-4.5.1.tgz#babb5d814f7035b5434518769975e12f299356a8"
+  integrity sha512-g4yeosa1zYhu2BUJmuu2H2o0dsdRj0o8Omw3pBiVHdLHJaeYIyArvyMRR3bI/MxZxG4EaiRl8AOQ6zeM8P46jA==
   dependencies:
     "@types/react" "*"
     immutable ">=3.8.2"
@@ -6266,13 +7171,6 @@
   dependencies:
     "@types/react" "*"
 
-"@types/react-syntax-highlighter@11.0.4":
-  version "11.0.4"
-  resolved "https://registry.npmjs.org/@types/react-syntax-highlighter/-/react-syntax-highlighter-11.0.4.tgz#d86d17697db62f98046874f62fdb3e53a0bbc4cd"
-  integrity sha512-9GfTo3a0PHwQeTVoqs0g5bS28KkSY48pp5659wA+Dp4MqceDEa8EHBqrllJvvtyusszyJhViUEap0FDvlk/9Zg==
-  dependencies:
-    "@types/react" "*"
-
 "@types/react-syntax-highlighter@11.0.5":
   version "11.0.5"
   resolved "https://registry.npmjs.org/@types/react-syntax-highlighter/-/react-syntax-highlighter-11.0.5.tgz#0d546261b4021e1f9d85b50401c0a42acb106087"
@@ -6280,6 +7178,13 @@
   dependencies:
     "@types/react" "*"
 
+"@types/react-syntax-highlighter@^13.5.2":
+  version "13.5.2"
+  resolved "https://registry.npmjs.org/@types/react-syntax-highlighter/-/react-syntax-highlighter-13.5.2.tgz#357cc03581dc434c57c3b31f70e0eecdbf7b3ab0"
+  integrity sha512-sRZoKZBGKaE7CzMvTTgz+0x/aVR58ZYUTfB7HN76vC+yQnvo1FWtzNARBt0fGqcLGEVakEzMu/CtPzssmanu8Q==
+  dependencies:
+    "@types/react" "*"
+
 "@types/react-test-renderer@*":
   version "16.9.2"
   resolved "https://registry.npmjs.org/@types/react-test-renderer/-/react-test-renderer-16.9.2.tgz#e1c408831e8183e5ad748fdece02214a7c2ab6c5"
@@ -6324,13 +7229,6 @@
   dependencies:
     csstype "^2.2.0"
 
-"@types/reactcss@*":
-  version "1.2.3"
-  resolved "https://registry.npmjs.org/@types/reactcss/-/reactcss-1.2.3.tgz#af28ae11bbb277978b99d04d1eedfd068ca71834"
-  integrity sha512-d2gQQ0IL6hXLnoRfVYZukQNWHuVsE75DzFTLPUuyyEhJS8G2VvlE+qfQQ91SJjaMqlURRCNIsX7Jcsw6cEuJlA==
-  dependencies:
-    "@types/react" "*"
-
 "@types/recharts@^1.8.14", "@types/recharts@^1.8.15":
   version "1.8.19"
   resolved "https://registry.npmjs.org/@types/recharts/-/recharts-1.8.19.tgz#047f72cf4c25df545aa1085fe3a085e58a2483c1"
@@ -6351,12 +7249,7 @@
   resolved "https://registry.npmjs.org/@types/regression/-/regression-2.0.0.tgz#0677ea78d7bdb37039c02ebbccf062042f756ae3"
   integrity sha512-Ch2FD53M1HpFLL6zSTc/sfuyqQcIPy+/PV3xFT6QYtk9EOiMI29XOYmLNxBb1Y0lfMOR/NNa86J1gRc/1jGLyw==
 
-"@types/relateurl@*":
-  version "0.2.28"
-  resolved "https://registry.npmjs.org/@types/relateurl/-/relateurl-0.2.28.tgz#6bda7db8653fa62643f5ee69e9f69c11a392e3a6"
-  integrity sha1-a9p9uGU/piZD9e5p6facEaOS46Y=
-
-"@types/request@^2.47.1", "@types/request@^2.48.1":
+"@types/request@^2.47.1":
   version "2.48.5"
   resolved "https://registry.npmjs.org/@types/request/-/request-2.48.5.tgz#019b8536b402069f6d11bee1b2c03e7f232937a0"
   integrity sha512-/LO7xRVnL3DxJ1WkPGDQrp4VTV1reX9RkC85mJ+Qzykj2Bdw+mG15aAfDahc76HtknjzE16SX/Yddn6MxVbmGQ==
@@ -6380,6 +7273,11 @@
   dependencies:
     "@types/node" "*"
 
+"@types/retry@^0.12.0":
+  version "0.12.0"
+  resolved "https://registry.npmjs.org/@types/retry/-/retry-0.12.0.tgz#2b35eccfcee7d38cd72ad99232fbd58bffb3c84d"
+  integrity sha512-wWKOClTTiizcZhXnPY4wikVAwmdYHp8q6DmC+EJUzAMsycb7HB32Kh9RN4+0gExjmPmZSAQjgURXIGATPegAvA==
+
 "@types/rollup-plugin-peer-deps-external@^2.2.0":
   version "2.2.0"
   resolved "https://registry.npmjs.org/@types/rollup-plugin-peer-deps-external/-/rollup-plugin-peer-deps-external-2.2.0.tgz#eae7d8b9d27fa037f5bcaded24e389f85b81973c"
@@ -6444,6 +7342,14 @@
   dependencies:
     "@types/node" "*"
 
+"@types/ssh2@*":
+  version "0.5.47"
+  resolved "https://registry.npmjs.org/@types/ssh2/-/ssh2-0.5.47.tgz#67a8b35a0527b2bb668f6dea4c84be6ff1abdc19"
+  integrity sha512-ZhqJg8BRV7OsCi0KVqPr27lUMMmLEeHYw1VXUNGGDlQEDq9HTsKx+wYvi8E6oNC6gRZ7PV99ZMZmMr5vztcYYA==
+  dependencies:
+    "@types/node" "*"
+    "@types/ssh2-streams" "*"
+
 "@types/ssh2@^0.5.45":
   version "0.5.46"
   resolved "https://registry.npmjs.org/@types/ssh2/-/ssh2-0.5.46.tgz#e12341a242aea0e98ac2dec89e039bf421fd3584"
@@ -6462,17 +7368,10 @@
   resolved "https://registry.npmjs.org/@types/stack-utils/-/stack-utils-2.0.0.tgz#7036640b4e21cc2f259ae826ce843d277dad8cff"
   integrity sha512-RJJrrySY7A8havqpGObOB4W92QXKJo63/jFLLgpvOtsGUqbQZ9Sbgl35KMm1DjC6j7AvmmU2bIno+3IyEaemaw==
 
-"@types/start-server-webpack-plugin@^2.2.0":
-  version "2.2.0"
-  resolved "https://registry.npmjs.org/@types/start-server-webpack-plugin/-/start-server-webpack-plugin-2.2.0.tgz#a7c4595c715eda083d92ca1ea184d97db3d8fc7b"
-  integrity sha512-TFiZWMPuiMR/utvjk6ENi0HPtQl38HnPMYfJqm04ztpzITHzTCXt7T7LyXnP9eTwg4lLQkmRUaFy04iEyjoJmw==
-  dependencies:
-    "@types/webpack" "*"
-
 "@types/stoppable@^1.1.0":
-  version "1.1.0"
-  resolved "https://registry.npmjs.org/@types/stoppable/-/stoppable-1.1.0.tgz#a5fa6a48120b109ca9233eed05c67c50bc4f3b91"
-  integrity sha512-BRR23Q9CJduH7AM6mk4JRttd8XyFkb4qIPZu4mdLF+VoP+wcjIxIWIKiBbN78NBbEuynrAyMPtzOHnIp2B/JPQ==
+  version "1.1.1"
+  resolved "https://registry.npmjs.org/@types/stoppable/-/stoppable-1.1.1.tgz#a6f1f280e29f8f3c743277534425e0a75041d2f9"
+  integrity sha512-b8N+fCADRIYYrGZOcmOR8ZNBOqhktWTB/bMUl5LvGtT201QKJZOOH5UsFyI3qtteM6ZAJbJqZoBcLqqxKIwjhw==
   dependencies:
     "@types/node" "*"
 
@@ -6518,9 +7417,9 @@
   integrity sha512-0VBprVqfgFD7Ehb2vd8Lh9TG3jP98gvr8rgehQqzztZNI7o8zS8Ad4jyZneKELphpuE212D8J70LnSNQSyO6bQ==
 
 "@types/tar@^4.0.3":
-  version "4.0.4"
-  resolved "https://registry.npmjs.org/@types/tar/-/tar-4.0.4.tgz#d680de60855e7778a51c672b755869a3b8d2889f"
-  integrity sha512-0Xv+xcmkTsOZdIF4yCnd7RkOOyfyqPaqJ7RZFKnwdxfDbkN3eAAE9sHl8zJFqBz4VhxolW9EErbjR1oyH7jK2A==
+  version "4.0.5"
+  resolved "https://registry.npmjs.org/@types/tar/-/tar-4.0.5.tgz#5f953f183e36a15c6ce3f336568f6051b7b183f3"
+  integrity sha512-cgwPhNEabHaZcYIy5xeMtux2EmYBitfqEceBUi2t5+ETy4dW6kswt6WX4+HqLeiiKOo42EXbGiDmVJ2x+vi37Q==
   dependencies:
     "@types/minipass" "*"
     "@types/node" "*"
@@ -6532,6 +7431,14 @@
   dependencies:
     "@types/estree" "*"
 
+"@types/terser-webpack-plugin@^5.0.4":
+  version "5.0.4"
+  resolved "https://registry.npmjs.org/@types/terser-webpack-plugin/-/terser-webpack-plugin-5.0.4.tgz#852949e1d124e6c895cfa8cb17eb6265e4fdfe59"
+  integrity sha512-1iyfZpMNNA/h/Q8uBpwuVhxKfKQHc98PD9NaCTrg22nj6d8aUvT79KBMtRLmR43v1PtCB0r1/gWGdNXrrMEK7A==
+  dependencies:
+    terser "^5.3.8"
+    webpack "^5.1.0"
+
 "@types/testing-library__jest-dom@^5.9.1":
   version "5.9.5"
   resolved "https://registry.npmjs.org/@types/testing-library__jest-dom/-/testing-library__jest-dom-5.9.5.tgz#5bf25c91ad2d7b38f264b12275e5c92a66d849b0"
@@ -6558,6 +7465,11 @@
   resolved "https://registry.npmjs.org/@types/tough-cookie/-/tough-cookie-4.0.0.tgz#fef1904e4668b6e5ecee60c52cc6a078ffa6697d"
   integrity sha512-I99sngh224D0M7XgW1s120zxCt3VYQ3IQsuw3P3jbq5GG4yc79+ZjyKznyOGIQrflfylLgcfekeZW/vk0yng6A==
 
+"@types/trusted-types@*":
+  version "2.0.2"
+  resolved "https://registry.npmjs.org/@types/trusted-types/-/trusted-types-2.0.2.tgz#fc25ad9943bcac11cceb8168db4f275e0e72e756"
+  integrity sha512-F5DIZ36YVLE+PN+Zwws4kJogq47hNgX3Nx6WyDJ3kcplxyke3XIzB8uK5n/Lpm1HBsbGzd6nmGehL8cPekP+Tg==
+
 "@types/tunnel@^0.0.1":
   version "0.0.1"
   resolved "https://registry.npmjs.org/@types/tunnel/-/tunnel-0.0.1.tgz#0d72774768b73df26f25df9184273a42da72b19c"
@@ -6594,10 +7506,10 @@
   resolved "https://registry.npmjs.org/@types/uuid/-/uuid-8.3.0.tgz#215c231dff736d5ba92410e6d602050cce7e273f"
   integrity sha512-eQ9qFW/fhfGJF8WKHGEHZEyVWfZxrT+6CLIJGBcZPfxUh/+BnEj+UCGYMlr9qZuX/2AltsvwrGqp0LhEW8D0zQ==
 
-"@types/webpack-dev-server@*", "@types/webpack-dev-server@^3.11.0":
-  version "3.11.4"
-  resolved "https://registry.npmjs.org/@types/webpack-dev-server/-/webpack-dev-server-3.11.4.tgz#90d47dd660b696d409431ab8c1e9fa3615103a07"
-  integrity sha512-DCKORHjqNNVuMIDWFrlljftvc9CL0+09p3l7lBpb8dRqgN5SmvkWCY4MPKxoI6wJgdRqohmoNbptkxqSKAzLRg==
+"@types/webpack-dev-server@^3.11.5":
+  version "3.11.5"
+  resolved "https://registry.npmjs.org/@types/webpack-dev-server/-/webpack-dev-server-3.11.5.tgz#f4a254a3dd0667c8ee4af90d42afdb4ad1d607f3"
+  integrity sha512-vjsbQBW3fE5FDICkF3w3ZWFRXNwQdKt7JRPLmRy5W0KXlcuew4wgpKWXhgHS71iLNv7Z2PlY9dSSIaYg+bk+9w==
   dependencies:
     "@types/connect-history-api-fallback" "*"
     "@types/express" "*"
@@ -6605,18 +7517,11 @@
     "@types/webpack" "^4"
     http-proxy-middleware "^1.0.0"
 
-"@types/webpack-env@^1.15.2", "@types/webpack-env@^1.15.3", "@types/webpack-env@^1.16.0":
+"@types/webpack-env@^1.15.2", "@types/webpack-env@^1.16.0":
   version "1.16.0"
   resolved "https://registry.npmjs.org/@types/webpack-env/-/webpack-env-1.16.0.tgz#8c0a9435dfa7b3b1be76562f3070efb3f92637b4"
   integrity sha512-Fx+NpfOO0CpeYX2g9bkvX8O5qh9wrU1sOF4g8sft4Mu7z+qfe387YlyY8w8daDyDsKY5vUxM0yxkAYnbkRbZEw==
 
-"@types/webpack-node-externals@^2.5.0":
-  version "2.5.1"
-  resolved "https://registry.npmjs.org/@types/webpack-node-externals/-/webpack-node-externals-2.5.1.tgz#0f00036bce0f405ceabc092e415b734059fe5505"
-  integrity sha512-Cwg6+FQogkImRMF5nu5bKsLoZlwNCzpEyvxIzJM0ZgkkuKP7TrmQ3suOvNKKG1O4luxXZroKGo0mMC5EN5gPBA==
-  dependencies:
-    "@types/webpack" "^4"
-
 "@types/webpack-sources@*":
   version "0.1.6"
   resolved "https://registry.npmjs.org/@types/webpack-sources/-/webpack-sources-0.1.6.tgz#3d21dfc2ec0ad0c77758e79362426a9ba7d7cbcb"
@@ -6626,18 +7531,27 @@
     "@types/source-list-map" "*"
     source-map "^0.6.1"
 
-"@types/webpack@*", "@types/webpack@^4", "@types/webpack@^4.41.7", "@types/webpack@^4.41.8":
-  version "4.41.27"
-  resolved "https://registry.npmjs.org/@types/webpack/-/webpack-4.41.27.tgz#f47da488c8037e7f1b2dbf2714fbbacb61ec0ffc"
-  integrity sha512-wK/oi5gcHi72VMTbOaQ70VcDxSQ1uX8S2tukBK9ARuGXrYM/+u4ou73roc7trXDNmCxCoerE8zruQqX/wuHszA==
+"@types/webpack@^4", "@types/webpack@^4.41.26", "@types/webpack@^4.41.8":
+  version "4.41.30"
+  resolved "https://registry.npmjs.org/@types/webpack/-/webpack-4.41.30.tgz#fd3db6d0d41e145a8eeeafcd3c4a7ccde9068ddc"
+  integrity sha512-GUHyY+pfuQ6haAfzu4S14F+R5iGRwN6b2FRNJY7U0NilmFAqbsOfK6j1HwuLBAqwRIT+pVdNDJGJ6e8rpp0KHA==
   dependencies:
-    "@types/anymatch" "*"
     "@types/node" "*"
     "@types/tapable" "^1"
     "@types/uglify-js" "*"
     "@types/webpack-sources" "*"
+    anymatch "^3.0.0"
     source-map "^0.6.0"
 
+"@types/webpack@^5.28.0":
+  version "5.28.0"
+  resolved "https://registry.npmjs.org/@types/webpack/-/webpack-5.28.0.tgz#78dde06212f038d77e54116cfe69e88ae9ed2c03"
+  integrity sha512-8cP0CzcxUiFuA9xGJkfeVpqmWTk9nx6CWwamRGCj95ph1SmlRRk9KlCZ6avhCbZd4L68LvYT6l1kpdEnQXrF8w==
+  dependencies:
+    "@types/node" "*"
+    tapable "^2.2.0"
+    webpack "^5"
+
 "@types/websocket@1.0.2":
   version "1.0.2"
   resolved "https://registry.npmjs.org/@types/websocket/-/websocket-1.0.2.tgz#d2855c6a312b7da73ed16ba6781815bf30c6187a"
@@ -6705,76 +7619,117 @@
   resolved "https://registry.npmjs.org/@types/zen-observable/-/zen-observable-0.8.2.tgz#808c9fa7e4517274ed555fa158f2de4b4f468e71"
   integrity sha512-HrCIVMLjE1MOozVoD86622S7aunluLb2PJdPfb3nYiEtohm8mIB/vyv0Fd37AdeMFrTUQXEunw78YloMA3Qilg==
 
-"@typescript-eslint/eslint-plugin@^v4.27.0":
-  version "4.27.0"
-  resolved "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.27.0.tgz#0b7fc974e8bc9b2b5eb98ed51427b0be529b4ad0"
-  integrity sha512-DsLqxeUfLVNp3AO7PC3JyaddmEHTtI9qTSAs+RB6ja27QvIM0TA8Cizn1qcS6vOu+WDLFJzkwkgweiyFhssDdQ==
+"@typescript-eslint/eslint-plugin@^v4.30.0":
+  version "4.30.0"
+  resolved "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.30.0.tgz#4a0c1ae96b953f4e67435e20248d812bfa55e4fb"
+  integrity sha512-NgAnqk55RQ/SD+tZFD9aPwNSeHmDHHe5rtUyhIq0ZeCWZEvo4DK9rYz7v9HDuQZFvn320Ot+AikaCKMFKLlD0g==
   dependencies:
-    "@typescript-eslint/experimental-utils" "4.27.0"
-    "@typescript-eslint/scope-manager" "4.27.0"
+    "@typescript-eslint/experimental-utils" "4.30.0"
+    "@typescript-eslint/scope-manager" "4.30.0"
     debug "^4.3.1"
     functional-red-black-tree "^1.0.1"
-    lodash "^4.17.21"
     regexpp "^3.1.0"
     semver "^7.3.5"
     tsutils "^3.21.0"
 
-"@typescript-eslint/experimental-utils@4.27.0", "@typescript-eslint/experimental-utils@^4.0.1":
-  version "4.27.0"
-  resolved "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-4.27.0.tgz#78192a616472d199f084eab8f10f962c0757cd1c"
-  integrity sha512-n5NlbnmzT2MXlyT+Y0Jf0gsmAQzCnQSWXKy4RGSXVStjDvS5we9IWbh7qRVKdGcxT0WYlgcCYUK/HRg7xFhvjQ==
+"@typescript-eslint/experimental-utils@4.30.0", "@typescript-eslint/experimental-utils@^4.0.1":
+  version "4.30.0"
+  resolved "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-4.30.0.tgz#9e49704fef568432ae16fc0d6685c13d67db0fd5"
+  integrity sha512-K8RNIX9GnBsv5v4TjtwkKtqMSzYpjqAQg/oSphtxf3xxdt6T0owqnpojztjjTcatSteH3hLj3t/kklKx87NPqw==
   dependencies:
     "@types/json-schema" "^7.0.7"
-    "@typescript-eslint/scope-manager" "4.27.0"
-    "@typescript-eslint/types" "4.27.0"
-    "@typescript-eslint/typescript-estree" "4.27.0"
+    "@typescript-eslint/scope-manager" "4.30.0"
+    "@typescript-eslint/types" "4.30.0"
+    "@typescript-eslint/typescript-estree" "4.30.0"
     eslint-scope "^5.1.1"
     eslint-utils "^3.0.0"
 
-"@typescript-eslint/parser@^v4.27.0":
-  version "4.27.0"
-  resolved "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-4.27.0.tgz#85447e573364bce4c46c7f64abaa4985aadf5a94"
-  integrity sha512-XpbxL+M+gClmJcJ5kHnUpBGmlGdgNvy6cehgR6ufyxkEJMGP25tZKCaKyC0W/JVpuhU3VU1RBn7SYUPKSMqQvQ==
+"@typescript-eslint/parser@^v4.28.3":
+  version "4.28.3"
+  resolved "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-4.28.3.tgz#95f1d475c08268edffdcb2779993c488b6434b44"
+  integrity sha512-ZyWEn34bJexn/JNYvLQab0Mo5e+qqQNhknxmc8azgNd4XqspVYR5oHq9O11fLwdZMRcj4by15ghSlIEq+H5ltQ==
   dependencies:
-    "@typescript-eslint/scope-manager" "4.27.0"
-    "@typescript-eslint/types" "4.27.0"
-    "@typescript-eslint/typescript-estree" "4.27.0"
+    "@typescript-eslint/scope-manager" "4.28.3"
+    "@typescript-eslint/types" "4.28.3"
+    "@typescript-eslint/typescript-estree" "4.28.3"
     debug "^4.3.1"
 
-"@typescript-eslint/scope-manager@4.27.0":
-  version "4.27.0"
-  resolved "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-4.27.0.tgz#b0b1de2b35aaf7f532e89c8e81d0fa298cae327d"
-  integrity sha512-DY73jK6SEH6UDdzc6maF19AHQJBFVRf6fgAXHPXCGEmpqD4vYgPEzqpFz1lf/daSbOcMpPPj9tyXXDPW2XReAw==
+"@typescript-eslint/scope-manager@4.28.3":
+  version "4.28.3"
+  resolved "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-4.28.3.tgz#c32ad4491b3726db1ba34030b59ea922c214e371"
+  integrity sha512-/8lMisZ5NGIzGtJB+QizQ5eX4Xd8uxedFfMBXOKuJGP0oaBBVEMbJVddQKDXyyB0bPlmt8i6bHV89KbwOelJiQ==
   dependencies:
-    "@typescript-eslint/types" "4.27.0"
-    "@typescript-eslint/visitor-keys" "4.27.0"
+    "@typescript-eslint/types" "4.28.3"
+    "@typescript-eslint/visitor-keys" "4.28.3"
 
-"@typescript-eslint/types@4.27.0":
-  version "4.27.0"
-  resolved "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.27.0.tgz#712b408519ed699baff69086bc59cd2fc13df8d8"
-  integrity sha512-I4ps3SCPFCKclRcvnsVA/7sWzh7naaM/b4pBO2hVxnM3wrU51Lveybdw5WoIktU/V4KfXrTt94V9b065b/0+wA==
-
-"@typescript-eslint/typescript-estree@4.27.0":
-  version "4.27.0"
-  resolved "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.27.0.tgz#189a7b9f1d0717d5cccdcc17247692dedf7a09da"
-  integrity sha512-KH03GUsUj41sRLLEy2JHstnezgpS5VNhrJouRdmh6yNdQ+yl8w5LrSwBkExM+jWwCJa7Ct2c8yl8NdtNRyQO6g==
+"@typescript-eslint/scope-manager@4.30.0":
+  version "4.30.0"
+  resolved "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-4.30.0.tgz#1a3ffbb385b1a06be85cd5165a22324f069a85ee"
+  integrity sha512-VJ/jAXovxNh7rIXCQbYhkyV2Y3Ac/0cVHP/FruTJSAUUm4Oacmn/nkN5zfWmWFEanN4ggP0vJSHOeajtHq3f8A==
   dependencies:
-    "@typescript-eslint/types" "4.27.0"
-    "@typescript-eslint/visitor-keys" "4.27.0"
+    "@typescript-eslint/types" "4.30.0"
+    "@typescript-eslint/visitor-keys" "4.30.0"
+
+"@typescript-eslint/types@4.28.3":
+  version "4.28.3"
+  resolved "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.28.3.tgz#8fffd436a3bada422c2c1da56060a0566a9506c7"
+  integrity sha512-kQFaEsQBQVtA9VGVyciyTbIg7S3WoKHNuOp/UF5RG40900KtGqfoiETWD/v0lzRXc+euVE9NXmfer9dLkUJrkA==
+
+"@typescript-eslint/types@4.30.0":
+  version "4.30.0"
+  resolved "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.30.0.tgz#fb9d9b0358426f18687fba82eb0b0f869780204f"
+  integrity sha512-YKldqbNU9K4WpTNwBqtAerQKLLW/X2A/j4yw92e3ZJYLx+BpKLeheyzoPfzIXHfM8BXfoleTdiYwpsvVPvHrDw==
+
+"@typescript-eslint/typescript-estree@4.28.3":
+  version "4.28.3"
+  resolved "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.28.3.tgz#253d7088100b2a38aefe3c8dd7bd1f8232ec46fb"
+  integrity sha512-YAb1JED41kJsqCQt1NcnX5ZdTA93vKFCMP4lQYG6CFxd0VzDJcKttRlMrlG+1qiWAw8+zowmHU1H0OzjWJzR2w==
+  dependencies:
+    "@typescript-eslint/types" "4.28.3"
+    "@typescript-eslint/visitor-keys" "4.28.3"
     debug "^4.3.1"
     globby "^11.0.3"
     is-glob "^4.0.1"
     semver "^7.3.5"
     tsutils "^3.21.0"
 
-"@typescript-eslint/visitor-keys@4.27.0":
-  version "4.27.0"
-  resolved "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.27.0.tgz#f56138b993ec822793e7ebcfac6ffdce0a60cb81"
-  integrity sha512-es0GRYNZp0ieckZ938cEANfEhsfHrzuLrePukLKtY3/KPXcq1Xd555Mno9/GOgXhKzn0QfkDLVgqWO3dGY80bg==
+"@typescript-eslint/typescript-estree@4.30.0":
+  version "4.30.0"
+  resolved "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.30.0.tgz#ae57833da72a753f4846cd3053758c771670c2ac"
+  integrity sha512-6WN7UFYvykr/U0Qgy4kz48iGPWILvYL34xXJxvDQeiRE018B7POspNRVtAZscWntEPZpFCx4hcz/XBT+erenfg==
   dependencies:
-    "@typescript-eslint/types" "4.27.0"
+    "@typescript-eslint/types" "4.30.0"
+    "@typescript-eslint/visitor-keys" "4.30.0"
+    debug "^4.3.1"
+    globby "^11.0.3"
+    is-glob "^4.0.1"
+    semver "^7.3.5"
+    tsutils "^3.21.0"
+
+"@typescript-eslint/visitor-keys@4.28.3":
+  version "4.28.3"
+  resolved "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.28.3.tgz#26ac91e84b23529968361045829da80a4e5251c4"
+  integrity sha512-ri1OzcLnk1HH4gORmr1dllxDzzrN6goUIz/P4MHFV0YZJDCADPR3RvYNp0PW2SetKTThar6wlbFTL00hV2Q+fg==
+  dependencies:
+    "@typescript-eslint/types" "4.28.3"
     eslint-visitor-keys "^2.0.0"
 
+"@typescript-eslint/visitor-keys@4.30.0":
+  version "4.30.0"
+  resolved "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.30.0.tgz#a47c6272fc71b0c627d1691f68eaecf4ad71445e"
+  integrity sha512-pNaaxDt/Ol/+JZwzP7MqWc8PJQTUhZwoee/PVlQ+iYoYhagccvoHnC9e4l+C/krQYYkENxznhVSDwClIbZVxRw==
+  dependencies:
+    "@typescript-eslint/types" "4.30.0"
+    eslint-visitor-keys "^2.0.0"
+
+"@webassemblyjs/ast@1.11.1":
+  version "1.11.1"
+  resolved "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.11.1.tgz#2bfd767eae1a6996f432ff7e8d7fc75679c0b6a7"
+  integrity sha512-ukBh14qFLjxTQNTXocdyksN5QdM28S1CxHt2rdskFyL+xFV7VremuBLVbmCePj+URalXBENx/9Lm7lnhihtCSw==
+  dependencies:
+    "@webassemblyjs/helper-numbers" "1.11.1"
+    "@webassemblyjs/helper-wasm-bytecode" "1.11.1"
+
 "@webassemblyjs/ast@1.9.0":
   version "1.9.0"
   resolved "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.9.0.tgz#bd850604b4042459a5a41cd7d338cbed695ed964"
@@ -6784,16 +7739,31 @@
     "@webassemblyjs/helper-wasm-bytecode" "1.9.0"
     "@webassemblyjs/wast-parser" "1.9.0"
 
+"@webassemblyjs/floating-point-hex-parser@1.11.1":
+  version "1.11.1"
+  resolved "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.11.1.tgz#f6c61a705f0fd7a6aecaa4e8198f23d9dc179e4f"
+  integrity sha512-iGRfyc5Bq+NnNuX8b5hwBrRjzf0ocrJPI6GWFodBFzmFnyvrQ83SHKhmilCU/8Jv67i4GJZBMhEzltxzcNagtQ==
+
 "@webassemblyjs/floating-point-hex-parser@1.9.0":
   version "1.9.0"
   resolved "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.9.0.tgz#3c3d3b271bddfc84deb00f71344438311d52ffb4"
   integrity sha512-TG5qcFsS8QB4g4MhrxK5TqfdNe7Ey/7YL/xN+36rRjl/BlGE/NcBvJcqsRgCP6Z92mRE+7N50pRIi8SmKUbcQA==
 
+"@webassemblyjs/helper-api-error@1.11.1":
+  version "1.11.1"
+  resolved "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.1.tgz#1a63192d8788e5c012800ba6a7a46c705288fd16"
+  integrity sha512-RlhS8CBCXfRUR/cwo2ho9bkheSXG0+NwooXcc3PAILALf2QLdFyj7KGsKRbVc95hZnhnERon4kW/D3SZpp6Tcg==
+
 "@webassemblyjs/helper-api-error@1.9.0":
   version "1.9.0"
   resolved "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.9.0.tgz#203f676e333b96c9da2eeab3ccef33c45928b6a2"
   integrity sha512-NcMLjoFMXpsASZFxJ5h2HZRcEhDkvnNFOAKneP5RbKRzaWJN36NC4jqQHKwStIhGXu5mUWlUUk7ygdtrO8lbmw==
 
+"@webassemblyjs/helper-buffer@1.11.1":
+  version "1.11.1"
+  resolved "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.11.1.tgz#832a900eb444884cde9a7cad467f81500f5e5ab5"
+  integrity sha512-gwikF65aDNeeXa8JxXa2BAk+REjSyhrNC9ZwdT0f8jc4dQQeDQ7G4m0f2QCLPJiMTTO6wfDmRmj/pW0PsUvIcA==
+
 "@webassemblyjs/helper-buffer@1.9.0":
   version "1.9.0"
   resolved "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.9.0.tgz#a1442d269c5feb23fcbc9ef759dac3547f29de00"
@@ -6818,11 +7788,35 @@
   dependencies:
     "@webassemblyjs/ast" "1.9.0"
 
+"@webassemblyjs/helper-numbers@1.11.1":
+  version "1.11.1"
+  resolved "https://registry.npmjs.org/@webassemblyjs/helper-numbers/-/helper-numbers-1.11.1.tgz#64d81da219fbbba1e3bd1bfc74f6e8c4e10a62ae"
+  integrity sha512-vDkbxiB8zfnPdNK9Rajcey5C0w+QJugEglN0of+kmO8l7lDb77AnlKYQF7aarZuCrv+l0UvqL+68gSDr3k9LPQ==
+  dependencies:
+    "@webassemblyjs/floating-point-hex-parser" "1.11.1"
+    "@webassemblyjs/helper-api-error" "1.11.1"
+    "@xtuc/long" "4.2.2"
+
+"@webassemblyjs/helper-wasm-bytecode@1.11.1":
+  version "1.11.1"
+  resolved "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.11.1.tgz#f328241e41e7b199d0b20c18e88429c4433295e1"
+  integrity sha512-PvpoOGiJwXeTrSf/qfudJhwlvDQxFgelbMqtq52WWiXC6Xgg1IREdngmPN3bs4RoO83PnL/nFrxucXj1+BX62Q==
+
 "@webassemblyjs/helper-wasm-bytecode@1.9.0":
   version "1.9.0"
   resolved "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.9.0.tgz#4fed8beac9b8c14f8c58b70d124d549dd1fe5790"
   integrity sha512-R7FStIzyNcd7xKxCZH5lE0Bqy+hGTwS3LJjuv1ZVxd9O7eHCedSdrId/hMOd20I+v8wDXEn+bjfKDLzTepoaUw==
 
+"@webassemblyjs/helper-wasm-section@1.11.1":
+  version "1.11.1"
+  resolved "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.11.1.tgz#21ee065a7b635f319e738f0dd73bfbda281c097a"
+  integrity sha512-10P9No29rYX1j7F3EVPX3JvGPQPae+AomuSTPiF9eBQeChHI6iqjMIwR9JmOJXwpnn/oVGDk7I5IlskuMwU/pg==
+  dependencies:
+    "@webassemblyjs/ast" "1.11.1"
+    "@webassemblyjs/helper-buffer" "1.11.1"
+    "@webassemblyjs/helper-wasm-bytecode" "1.11.1"
+    "@webassemblyjs/wasm-gen" "1.11.1"
+
 "@webassemblyjs/helper-wasm-section@1.9.0":
   version "1.9.0"
   resolved "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.9.0.tgz#5a4138d5a6292ba18b04c5ae49717e4167965346"
@@ -6833,6 +7827,13 @@
     "@webassemblyjs/helper-wasm-bytecode" "1.9.0"
     "@webassemblyjs/wasm-gen" "1.9.0"
 
+"@webassemblyjs/ieee754@1.11.1":
+  version "1.11.1"
+  resolved "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.11.1.tgz#963929e9bbd05709e7e12243a099180812992614"
+  integrity sha512-hJ87QIPtAMKbFq6CGTkZYJivEwZDbQUgYd3qKSadTNOhVY7p+gfP6Sr0lLRVTaG1JjFj+r3YchoqRYxNH3M0GQ==
+  dependencies:
+    "@xtuc/ieee754" "^1.2.0"
+
 "@webassemblyjs/ieee754@1.9.0":
   version "1.9.0"
   resolved "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.9.0.tgz#15c7a0fbaae83fb26143bbacf6d6df1702ad39e4"
@@ -6840,6 +7841,13 @@
   dependencies:
     "@xtuc/ieee754" "^1.2.0"
 
+"@webassemblyjs/leb128@1.11.1":
+  version "1.11.1"
+  resolved "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.11.1.tgz#ce814b45574e93d76bae1fb2644ab9cdd9527aa5"
+  integrity sha512-BJ2P0hNZ0u+Th1YZXJpzW6miwqQUGcIHT1G/sf72gLVD9DZ5AdYTqPNbHZh6K1M5VmKvFXwGSWZADz+qBWxeRw==
+  dependencies:
+    "@xtuc/long" "4.2.2"
+
 "@webassemblyjs/leb128@1.9.0":
   version "1.9.0"
   resolved "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.9.0.tgz#f19ca0b76a6dc55623a09cffa769e838fa1e1c95"
@@ -6847,11 +7855,30 @@
   dependencies:
     "@xtuc/long" "4.2.2"
 
+"@webassemblyjs/utf8@1.11.1":
+  version "1.11.1"
+  resolved "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.11.1.tgz#d1f8b764369e7c6e6bae350e854dec9a59f0a3ff"
+  integrity sha512-9kqcxAEdMhiwQkHpkNiorZzqpGrodQQ2IGrHHxCy+Ozng0ofyMA0lTqiLkVs1uzTRejX+/O0EOT7KxqVPuXosQ==
+
 "@webassemblyjs/utf8@1.9.0":
   version "1.9.0"
   resolved "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.9.0.tgz#04d33b636f78e6a6813227e82402f7637b6229ab"
   integrity sha512-GZbQlWtopBTP0u7cHrEx+73yZKrQoBMpwkGEIqlacljhXCkVM1kMQge/Mf+csMJAjEdSwhOyLAS0AoR3AG5P8w==
 
+"@webassemblyjs/wasm-edit@1.11.1":
+  version "1.11.1"
+  resolved "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.11.1.tgz#ad206ebf4bf95a058ce9880a8c092c5dec8193d6"
+  integrity sha512-g+RsupUC1aTHfR8CDgnsVRVZFJqdkFHpsHMfJuWQzWU3tvnLC07UqHICfP+4XyL2tnr1amvl1Sdp06TnYCmVkA==
+  dependencies:
+    "@webassemblyjs/ast" "1.11.1"
+    "@webassemblyjs/helper-buffer" "1.11.1"
+    "@webassemblyjs/helper-wasm-bytecode" "1.11.1"
+    "@webassemblyjs/helper-wasm-section" "1.11.1"
+    "@webassemblyjs/wasm-gen" "1.11.1"
+    "@webassemblyjs/wasm-opt" "1.11.1"
+    "@webassemblyjs/wasm-parser" "1.11.1"
+    "@webassemblyjs/wast-printer" "1.11.1"
+
 "@webassemblyjs/wasm-edit@1.9.0":
   version "1.9.0"
   resolved "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.9.0.tgz#3fe6d79d3f0f922183aa86002c42dd256cfee9cf"
@@ -6866,6 +7893,17 @@
     "@webassemblyjs/wasm-parser" "1.9.0"
     "@webassemblyjs/wast-printer" "1.9.0"
 
+"@webassemblyjs/wasm-gen@1.11.1":
+  version "1.11.1"
+  resolved "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.11.1.tgz#86c5ea304849759b7d88c47a32f4f039ae3c8f76"
+  integrity sha512-F7QqKXwwNlMmsulj6+O7r4mmtAlCWfO/0HdgOxSklZfQcDu0TpLiD1mRt/zF25Bk59FIjEuGAIyn5ei4yMfLhA==
+  dependencies:
+    "@webassemblyjs/ast" "1.11.1"
+    "@webassemblyjs/helper-wasm-bytecode" "1.11.1"
+    "@webassemblyjs/ieee754" "1.11.1"
+    "@webassemblyjs/leb128" "1.11.1"
+    "@webassemblyjs/utf8" "1.11.1"
+
 "@webassemblyjs/wasm-gen@1.9.0":
   version "1.9.0"
   resolved "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.9.0.tgz#50bc70ec68ded8e2763b01a1418bf43491a7a49c"
@@ -6877,6 +7915,16 @@
     "@webassemblyjs/leb128" "1.9.0"
     "@webassemblyjs/utf8" "1.9.0"
 
+"@webassemblyjs/wasm-opt@1.11.1":
+  version "1.11.1"
+  resolved "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.11.1.tgz#657b4c2202f4cf3b345f8a4c6461c8c2418985f2"
+  integrity sha512-VqnkNqnZlU5EB64pp1l7hdm3hmQw7Vgqa0KF/KCNO9sIpI6Fk6brDEiX+iCOYrvMuBWDws0NkTOxYEb85XQHHw==
+  dependencies:
+    "@webassemblyjs/ast" "1.11.1"
+    "@webassemblyjs/helper-buffer" "1.11.1"
+    "@webassemblyjs/wasm-gen" "1.11.1"
+    "@webassemblyjs/wasm-parser" "1.11.1"
+
 "@webassemblyjs/wasm-opt@1.9.0":
   version "1.9.0"
   resolved "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.9.0.tgz#2211181e5b31326443cc8112eb9f0b9028721a61"
@@ -6887,6 +7935,18 @@
     "@webassemblyjs/wasm-gen" "1.9.0"
     "@webassemblyjs/wasm-parser" "1.9.0"
 
+"@webassemblyjs/wasm-parser@1.11.1":
+  version "1.11.1"
+  resolved "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.11.1.tgz#86ca734534f417e9bd3c67c7a1c75d8be41fb199"
+  integrity sha512-rrBujw+dJu32gYB7/Lup6UhdkPx9S9SnobZzRVL7VcBH9Bt9bCBLEuX/YXOOtBsOZ4NQrRykKhffRWHvigQvOA==
+  dependencies:
+    "@webassemblyjs/ast" "1.11.1"
+    "@webassemblyjs/helper-api-error" "1.11.1"
+    "@webassemblyjs/helper-wasm-bytecode" "1.11.1"
+    "@webassemblyjs/ieee754" "1.11.1"
+    "@webassemblyjs/leb128" "1.11.1"
+    "@webassemblyjs/utf8" "1.11.1"
+
 "@webassemblyjs/wasm-parser@1.9.0":
   version "1.9.0"
   resolved "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.9.0.tgz#9d48e44826df4a6598294aa6c87469d642fff65e"
@@ -6911,6 +7971,14 @@
     "@webassemblyjs/helper-fsm" "1.9.0"
     "@xtuc/long" "4.2.2"
 
+"@webassemblyjs/wast-printer@1.11.1":
+  version "1.11.1"
+  resolved "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.11.1.tgz#d0c73beda8eec5426f10ae8ef55cee5e7084c2f0"
+  integrity sha512-IQboUWM4eKzWW+N/jij2sRatKMh99QEelo3Eb2q0qXkvPRISAj8Qxtmw5itwqK+TTkBuUIE45AxYPToqPtL5gg==
+  dependencies:
+    "@webassemblyjs/ast" "1.11.1"
+    "@xtuc/long" "4.2.2"
+
 "@webassemblyjs/wast-printer@1.9.0":
   version "1.9.0"
   resolved "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.9.0.tgz#4935d54c85fef637b00ce9f52377451d00d47899"
@@ -6927,6 +7995,11 @@
   dependencies:
     tslib "^1.9.3"
 
+"@xmldom/xmldom@^0.7.0", "@xmldom/xmldom@^0.7.2":
+  version "0.7.3"
+  resolved "https://registry.npmjs.org/@xmldom/xmldom/-/xmldom-0.7.3.tgz#55de695f77afd3cc0e5bee0aa900040bc63c0f63"
+  integrity sha512-8XmJdPut2XGtfFcsNsqEsvMUmAwk7xLq7m+E/GcsU9b5qyFFIsiX4Fvnb5UoQ4wo12Wlm07YFJERoyWUYdbIpw==
+
 "@xobotyi/scrollbar-width@^1.9.5":
   version "1.9.5"
   resolved "https://registry.npmjs.org/@xobotyi/scrollbar-width/-/scrollbar-width-1.9.5.tgz#80224a6919272f405b87913ca13b92929bdf3c4d"
@@ -6977,13 +8050,6 @@ abort-controller@3.0.0, abort-controller@^3.0.0:
   dependencies:
     event-target-shim "^5.0.0"
 
-abort-controller@^2.0.2:
-  version "2.0.3"
-  resolved "https://registry.npmjs.org/abort-controller/-/abort-controller-2.0.3.tgz#b174827a732efadff81227ed4b8d1cc569baf20a"
-  integrity sha512-EPSq5wr2aFyAZ1PejJB32IX9Qd4Nwus+adnp7STYFM5/23nLPBazqZ1oor6ZqbH+4otaaGXTlC8RN5hq3C8w9Q==
-  dependencies:
-    event-target-shim "^5.0.0"
-
 abstract-logging@^2.0.0:
   version "2.0.0"
   resolved "https://registry.npmjs.org/abstract-logging/-/abstract-logging-2.0.0.tgz#08a85814946c98ef06f4256ad470aba1886d4490"
@@ -7013,6 +8079,11 @@ acorn-globals@^6.0.0:
     acorn "^7.1.1"
     acorn-walk "^7.1.1"
 
+acorn-import-assertions@^1.7.6:
+  version "1.7.6"
+  resolved "https://registry.npmjs.org/acorn-import-assertions/-/acorn-import-assertions-1.7.6.tgz#580e3ffcae6770eebeec76c3b9723201e9d01f78"
+  integrity sha512-FlVvVFA1TX6l3lp8VjDnYYq7R1nyW6x3svAt4nDgrWQ9SBaSh9CnbwgSUTasgfNfOG5HlM1ehugCvM+hjo56LA==
+
 acorn-jsx@^5.3.1:
   version "5.3.1"
   resolved "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.1.tgz#fc8661e11b7ac1539c47dbfea2e72b3af34d267b"
@@ -7043,6 +8114,11 @@ acorn@^7.1.1, acorn@^7.4.0:
   resolved "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz#feaed255973d2e77555b83dbc08851a6c63520fa"
   integrity sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==
 
+acorn@^8.4.1:
+  version "8.4.1"
+  resolved "https://registry.npmjs.org/acorn/-/acorn-8.4.1.tgz#56c36251fc7cabc7096adc18f05afe814321a28c"
+  integrity sha512-asabaBSkEKosYKMITunzX177CXxQ4Q8BSSzMTKD+FefUhipQC70gfW5SiUDhYQ3vk8G+81HqQk7Fv9OXwwn9KA==
+
 add-stream@^1.0.0:
   version "1.0.0"
   resolved "https://registry.npmjs.org/add-stream/-/add-stream-1.0.0.tgz#6a7990437ca736d5e1288db92bd3266d5f5cb2aa"
@@ -7060,14 +8136,7 @@ agent-base@6:
   dependencies:
     debug "4"
 
-agent-base@^4.3.0:
-  version "4.3.0"
-  resolved "https://registry.npmjs.org/agent-base/-/agent-base-4.3.0.tgz#8165f01c436009bccad0b1d122f05ed770efc6ee"
-  integrity sha512-salcGninV0nPrwpGNn4VTXBb1SOuXQBiqbrNXoeizJsHrsL6ERFM2Ne3JUSBWRE6aeNJI2ROP/WEEIDUiDe3cg==
-  dependencies:
-    es6-promisify "^5.0.0"
-
-agentkeepalive@^4.1.3:
+agentkeepalive@^4.1.3, agentkeepalive@^4.1.4:
   version "4.1.4"
   resolved "https://registry.npmjs.org/agentkeepalive/-/agentkeepalive-4.1.4.tgz#d928028a4862cb11718e55227872e842a44c945b"
   integrity sha512-+V/rGa3EuU74H6wR04plBb7Ks10FbtUQgRj/FQOG7uUIEuaINI+AiqJR1k6t3SVNs7o7ZjIdus6706qqzVq8jQ==
@@ -7228,6 +8297,11 @@ ansi-regex@^5.0.0:
   resolved "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz#388539f55179bf39339c81af30a654d69f87cb75"
   integrity sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==
 
+ansi-regex@^6.0.1:
+  version "6.0.1"
+  resolved "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz#3183e38fae9a65d7cb5e53945cd5897d0260a06a"
+  integrity sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==
+
 ansi-styles@^2.2.1:
   version "2.2.1"
   resolved "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe"
@@ -7273,7 +8347,7 @@ anymatch@^2.0.0:
     micromatch "^3.1.4"
     normalize-path "^2.1.1"
 
-anymatch@^3.0.3, anymatch@~3.1.2:
+anymatch@^3.0.0, anymatch@^3.0.3, anymatch@~3.1.2:
   version "3.1.2"
   resolved "https://registry.npmjs.org/anymatch/-/anymatch-3.1.2.tgz#c0557c096af32f106198f4f4e2a383537e378716"
   integrity sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg==
@@ -7543,6 +8617,16 @@ argparse@^2.0.1:
   resolved "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz#246f50f3ca78a3240f6c997e8a9bd1eac49e4b38"
   integrity sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==
 
+args@^5.0.0:
+  version "5.0.1"
+  resolved "https://registry.npmjs.org/args/-/args-5.0.1.tgz#4bf298df90a4799a09521362c579278cc2fdd761"
+  integrity sha512-1kqmFCFsPffavQFGt8OxJdIcETti99kySRUPMpOhaGjL6mRJn8HFU1OxKY5bMqfZKUwTQc1mZkAjmGYaVOHFtQ==
+  dependencies:
+    camelcase "5.0.0"
+    chalk "2.4.2"
+    leven "2.1.0"
+    mri "1.1.4"
+
 aria-query@^4.2.2:
   version "4.2.2"
   resolved "https://registry.npmjs.org/aria-query/-/aria-query-4.2.2.tgz#0d2ca6c9aceb56b8977e9fed6aed7e15bbd2f83b"
@@ -7576,6 +8660,11 @@ array-equal@^1.0.0:
   resolved "https://registry.npmjs.org/array-equal/-/array-equal-1.0.0.tgz#8c2a5ef2472fd9ea742b04c77a75093ba2757c93"
   integrity sha1-jCpe8kcv2ep0KwTHenUJO6J1fJM=
 
+array-filter@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.npmjs.org/array-filter/-/array-filter-1.0.0.tgz#baf79e62e6ef4c2a4c0b831232daffec251f9d83"
+  integrity sha1-uveeYubvTCpMC4MSMtr/7CUfnYM=
+
 array-find-index@^1.0.1:
   version "1.0.2"
   resolved "https://registry.npmjs.org/array-find-index/-/array-find-index-1.0.2.tgz#df010aa1287e164bbda6f9723b0a96a1ec4187a1"
@@ -7657,7 +8746,7 @@ array.prototype.map@^1.0.1:
     es-array-method-boxes-properly "^1.0.0"
     is-string "^1.0.4"
 
-arrify@^1.0.0, arrify@^1.0.1:
+arrify@^1.0.1:
   version "1.0.1"
   resolved "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz#898508da2226f380df904728456849c1501a4b0d"
   integrity sha1-iYUI2iIm84DfkEcoRWhJwVAaSw0=
@@ -7750,12 +8839,7 @@ async-retry@^1.2.1, async-retry@^1.3.1:
   dependencies:
     retry "0.12.0"
 
-async@0.9.x:
-  version "0.9.2"
-  resolved "https://registry.npmjs.org/async/-/async-0.9.2.tgz#aea74d5e61c1f899613bf64bda66d4c78f2fd17d"
-  integrity sha1-rqdNXmHB+JlhO/ZL2mbUx48v0X0=
-
-async@^2.0.1, async@^2.6.1, async@^2.6.2:
+async@^2.6.2:
   version "2.6.3"
   resolved "https://registry.npmjs.org/async/-/async-2.6.3.tgz#d72625e2344a3656e3a3ad4fa749fa83299d82ff"
   integrity sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg==
@@ -7782,6 +8866,11 @@ atob@^2.1.2:
   resolved "https://registry.npmjs.org/atob/-/atob-2.1.2.tgz#6d9517eb9e030d2436666651e86bd9f6f13533c9"
   integrity sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==
 
+atomic-sleep@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.npmjs.org/atomic-sleep/-/atomic-sleep-1.0.0.tgz#eb85b77a601fc932cfe432c5acd364a9e2c9075b"
+  integrity sha512-kNOjDqAh7px0XWNI+4QbzoiR/nTkHAWNud2uvnJquD1/x5a7EQZMJT0AczqK0Qn67oY/TTQ1LbUKajZpp3I9tQ==
+
 auto-bind@~4.0.0:
   version "4.0.0"
   resolved "https://registry.npmjs.org/auto-bind/-/auto-bind-4.0.0.tgz#e3589fc6c2da8f7ca43ba9f84fa52a744fc997fb"
@@ -7794,7 +8883,7 @@ autolinker@^3.11.0:
   dependencies:
     tslib "^1.9.3"
 
-autoprefixer@^9.7.2:
+autoprefixer@^9.8.6:
   version "9.8.6"
   resolved "https://registry.npmjs.org/autoprefixer/-/autoprefixer-9.8.6.tgz#3b73594ca1bf9266320c5acf1588d74dea74210f"
   integrity sha512-XrvP4VVHdRBCdX1S3WXVD8+RyG9qeb1D5Sn1DeLiG2xfSpzellk5k54xbUERJ3M5DggQxes39UGOTP8CFrEGbg==
@@ -7807,7 +8896,23 @@ autoprefixer@^9.7.2:
     postcss "^7.0.32"
     postcss-value-parser "^4.1.0"
 
-aws-sdk@^2.382.0, aws-sdk@^2.840.0:
+available-typed-arrays@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.npmjs.org/available-typed-arrays/-/available-typed-arrays-1.0.2.tgz#6b098ca9d8039079ee3f77f7b783c4480ba513f5"
+  integrity sha512-XWX3OX8Onv97LMk/ftVyBibpGwY5a8SmuxZPzeOxqmuEqUCOM9ZE+uIaD1VNJ5QnvU2UQusvmKbuM1FR8QWGfQ==
+  dependencies:
+    array-filter "^1.0.0"
+
+aws-sdk-mock@^5.2.1:
+  version "5.2.1"
+  resolved "https://registry.npmjs.org/aws-sdk-mock/-/aws-sdk-mock-5.2.1.tgz#126d4d5362c96b7d1d0bd87708a99d626c19ffd4"
+  integrity sha512-dY7zA1p/lX335V4/aOJ2L8ggXC3a5zokTJFZlZVW3uU+Zej7u+V7WrEcN5TVaJAnk4auT263T6EK/OHW4WjKhw==
+  dependencies:
+    aws-sdk "^2.928.0"
+    sinon "^11.1.1"
+    traverse "^0.6.6"
+
+aws-sdk@^2.840.0:
   version "2.922.0"
   resolved "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.922.0.tgz#4568be067dceaaeda5d2d5a7e2f22666687f0b32"
   integrity sha512-SufbR5TTCK94Zk/xIv4v/m0MM9z+KW999XnjXOyNWGFGHP9/FArjtHtq69+a3KpohYBR1dBj8wUhVjbClmQIBA==
@@ -7822,6 +8927,36 @@ aws-sdk@^2.382.0, aws-sdk@^2.840.0:
     uuid "3.3.2"
     xml2js "0.4.19"
 
+aws-sdk@^2.928.0:
+  version "2.951.0"
+  resolved "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.951.0.tgz#3cd8c0a4610407623ae8f1724f431fd328441033"
+  integrity sha512-YPqhdESUzd4+pSuGJcfMnG1qNVbmZjnmsa85Z9jofR1ilIpuV31onIiFHv8iubM59ETok/+zy3QOmxRSLYzFmQ==
+  dependencies:
+    buffer "4.9.2"
+    events "1.1.1"
+    ieee754 "1.1.13"
+    jmespath "0.15.0"
+    querystring "0.2.0"
+    sax "1.2.1"
+    url "0.10.3"
+    uuid "3.3.2"
+    xml2js "0.4.19"
+
+aws-sdk@^2.948.0:
+  version "2.948.0"
+  resolved "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.948.0.tgz#0c974c351af97dbc66dbd96bd6c20928baf10415"
+  integrity sha512-UJaCwccNaNNFtbhlvg+BmcaVWNI7RPonZA16nca0s3O+UnHm5y5H/nN6XpuJp+NUrxrLgTFaztPvjmBp5q6p+g==
+  dependencies:
+    buffer "4.9.2"
+    events "1.1.1"
+    ieee754 "1.1.13"
+    jmespath "0.15.0"
+    querystring "0.2.0"
+    sax "1.2.1"
+    url "0.10.3"
+    uuid "3.3.2"
+    xml2js "0.4.19"
+
 aws-sign2@~0.7.0:
   version "0.7.0"
   resolved "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz#b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8"
@@ -7837,12 +8972,22 @@ axe-core@^4.0.2:
   resolved "https://registry.npmjs.org/axe-core/-/axe-core-4.1.3.tgz#64a4c85509e0991f5168340edc4bedd1ceea6966"
   integrity sha512-vwPpH4Aj4122EW38mxO/fxhGKtwWTMLDIJfZ1He0Edbtjcfna/R3YB67yVhezUMzqc3Jr3+Ii50KRntlENL4xQ==
 
-axios@^0.20.0:
-  version "0.20.0"
-  resolved "https://registry.npmjs.org/axios/-/axios-0.20.0.tgz#057ba30f04884694993a8cd07fa394cff11c50bd"
-  integrity sha512-ANA4rr2BDcmmAQLOKft2fufrtuvlqR+cXNNinUmvfeSNCOF98PZL+7M/v1zIdGo7OLjEA9J2gXJL+j4zGsl0bA==
+axe-core@^4.2.0:
+  version "4.3.1"
+  resolved "https://registry.npmjs.org/axe-core/-/axe-core-4.3.1.tgz#0c6a076e4a1c3e0544ba6a9479158f9be7a7928e"
+  integrity sha512-3WVgVPs/7OnKU3s+lqMtkv3wQlg3WxK1YifmpJSDO0E1aPBrZWlrrTO6cxRqCXLuX2aYgCljqXIQd0VnRidV0g==
+
+axios-cached-dns-resolve@0.5.2:
+  version "0.5.2"
+  resolved "https://registry.npmjs.org/axios-cached-dns-resolve/-/axios-cached-dns-resolve-0.5.2.tgz#38cd89fd491fa7a48d04fb421291085c640fe79e"
+  integrity sha512-yPTnMRel6YMux5lrMsqzSck7qD8pJMnZDa1eHLGH5CrHA7/ACr4IRJCGJgX3leEuSe7uuzBQymYoTIgtNPfV8Q==
   dependencies:
-    follow-redirects "^1.10.0"
+    babel-polyfill "^6.26.0"
+    json-stringify-safe "^5.0.1"
+    lodash "^4.17.15"
+    lru-cache "^5.1.1"
+    pino "^5.12.2"
+    pino-pretty "^2.6.0"
 
 axios@^0.21.1:
   version "0.21.1"
@@ -7856,63 +9001,19 @@ axobject-query@^2.2.0:
   resolved "https://registry.npmjs.org/axobject-query/-/axobject-query-2.2.0.tgz#943d47e10c0b704aa42275e20edf3722648989be"
   integrity sha512-Td525n+iPOOyUQIeBfcASuG6uJsDOITl7Mds5gFyerkWiX7qhUTdYUBlSgNMyVqtSJqwpt1kXGLdUt6SykLMRA==
 
-azure-devops-node-api@^10.2.2:
-  version "10.2.2"
-  resolved "https://registry.npmjs.org/azure-devops-node-api/-/azure-devops-node-api-10.2.2.tgz#9f557e622dd07bbaa9bd5e7e84e17c761e2151b2"
-  integrity sha512-4TVv2X7oNStT0vLaEfExmy3J4/CzfuXolEcQl/BRUmvGySqKStTG2O55/hUQ0kM7UJlZBLgniM0SBq4d/WkKow==
+azure-devops-node-api@^11.0.1:
+  version "11.0.1"
+  resolved "https://registry.npmjs.org/azure-devops-node-api/-/azure-devops-node-api-11.0.1.tgz#b7ec4783230e1de8fc972b23effe7ed2ebac17ff"
+  integrity sha512-YMdjAw9l5p/6leiyIloxj3k7VIvYThKjvqgiQn88r3nhT93ENwsoDS3A83CyJ4uTWzCZ5f5jCi6c27rTU5Pz+A==
   dependencies:
     tunnel "0.0.6"
     typed-rest-client "^1.8.4"
 
-babel-code-frame@^6.22.0:
-  version "6.26.0"
-  resolved "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.26.0.tgz#63fd43f7dc1e3bb7ce35947db8fe369a3f58c74b"
-  integrity sha1-Y/1D99weO7fONZR9uP42mj9Yx0s=
-  dependencies:
-    chalk "^1.1.3"
-    esutils "^2.0.2"
-    js-tokens "^3.0.2"
-
 babel-core@^7.0.0-bridge.0:
   version "7.0.0-bridge.0"
   resolved "https://registry.npmjs.org/babel-core/-/babel-core-7.0.0-bridge.0.tgz#95a492ddd90f9b4e9a4a1da14eb335b87b634ece"
   integrity sha512-poPX9mZH/5CSanm50Q+1toVci6pv5KSRv/5TWCwtzQS5XEwn40BcCrgIeMFWP9CKKIniKXNxoIOnOq4VVlGXhg==
 
-babel-helper-evaluate-path@^0.5.0:
-  version "0.5.0"
-  resolved "https://registry.npmjs.org/babel-helper-evaluate-path/-/babel-helper-evaluate-path-0.5.0.tgz#a62fa9c4e64ff7ea5cea9353174ef023a900a67c"
-  integrity sha512-mUh0UhS607bGh5wUMAQfOpt2JX2ThXMtppHRdRU1kL7ZLRWIXxoV2UIV1r2cAeeNeU1M5SB5/RSUgUxrK8yOkA==
-
-babel-helper-flip-expressions@^0.4.3:
-  version "0.4.3"
-  resolved "https://registry.npmjs.org/babel-helper-flip-expressions/-/babel-helper-flip-expressions-0.4.3.tgz#3696736a128ac18bc25254b5f40a22ceb3c1d3fd"
-  integrity sha1-NpZzahKKwYvCUlS19AoizrPB0/0=
-
-babel-helper-is-nodes-equiv@^0.0.1:
-  version "0.0.1"
-  resolved "https://registry.npmjs.org/babel-helper-is-nodes-equiv/-/babel-helper-is-nodes-equiv-0.0.1.tgz#34e9b300b1479ddd98ec77ea0bbe9342dfe39684"
-  integrity sha1-NOmzALFHnd2Y7HfqC76TQt/jloQ=
-
-babel-helper-is-void-0@^0.4.3:
-  version "0.4.3"
-  resolved "https://registry.npmjs.org/babel-helper-is-void-0/-/babel-helper-is-void-0-0.4.3.tgz#7d9c01b4561e7b95dbda0f6eee48f5b60e67313e"
-  integrity sha1-fZwBtFYee5Xb2g9u7kj1tg5nMT4=
-
-babel-helper-mark-eval-scopes@^0.4.3:
-  version "0.4.3"
-  resolved "https://registry.npmjs.org/babel-helper-mark-eval-scopes/-/babel-helper-mark-eval-scopes-0.4.3.tgz#d244a3bef9844872603ffb46e22ce8acdf551562"
-  integrity sha1-0kSjvvmESHJgP/tG4izorN9VFWI=
-
-babel-helper-remove-or-void@^0.4.3:
-  version "0.4.3"
-  resolved "https://registry.npmjs.org/babel-helper-remove-or-void/-/babel-helper-remove-or-void-0.4.3.tgz#a4f03b40077a0ffe88e45d07010dee241ff5ae60"
-  integrity sha1-pPA7QAd6D/6I5F0HAQ3uJB/1rmA=
-
-babel-helper-to-multiple-sequence-expressions@^0.5.0:
-  version "0.5.0"
-  resolved "https://registry.npmjs.org/babel-helper-to-multiple-sequence-expressions/-/babel-helper-to-multiple-sequence-expressions-0.5.0.tgz#a3f924e3561882d42fcf48907aa98f7979a4588d"
-  integrity sha512-m2CvfDW4+1qfDdsrtf4dwOslQC3yhbgyBFptncp4wvtdrDHqueW7slsYv4gArie056phvQFhT2nRcGS4bnm6mA==
-
 babel-jest@^26.6.3:
   version "26.6.3"
   resolved "https://registry.npmjs.org/babel-jest/-/babel-jest-26.6.3.tgz#d87d25cb0037577a0c89f82e5755c5d293c01056"
@@ -7927,15 +9028,14 @@ babel-jest@^26.6.3:
     graceful-fs "^4.2.4"
     slash "^3.0.0"
 
-babel-loader@^8.0.6:
-  version "8.1.0"
-  resolved "https://registry.npmjs.org/babel-loader/-/babel-loader-8.1.0.tgz#c611d5112bd5209abe8b9fa84c3e4da25275f1c3"
-  integrity sha512-7q7nC1tYOrqvUrN3LQK4GwSk/TQorZSOlO9C+RZDZpODgyN4ZlCqE5q9cDsyWOliN+aU9B4JX01xK9eJXowJLw==
+babel-loader@^8.2.2:
+  version "8.2.2"
+  resolved "https://registry.npmjs.org/babel-loader/-/babel-loader-8.2.2.tgz#9363ce84c10c9a40e6c753748e1441b60c8a0b81"
+  integrity sha512-JvTd0/D889PQBtUXJ2PXaKU/pjZDMtHA9V2ecm+eNRmmBCMR09a+fmpGTNwnJtFmFl5Ei7Vy47LjBb+L0wQ99g==
   dependencies:
-    find-cache-dir "^2.1.0"
+    find-cache-dir "^3.3.1"
     loader-utils "^1.4.0"
-    mkdirp "^0.5.3"
-    pify "^4.0.1"
+    make-dir "^3.1.0"
     schema-utils "^2.6.5"
 
 babel-plugin-add-react-displayname@^0.0.5:
@@ -7943,6 +9043,14 @@ babel-plugin-add-react-displayname@^0.0.5:
   resolved "https://registry.npmjs.org/babel-plugin-add-react-displayname/-/babel-plugin-add-react-displayname-0.0.5.tgz#339d4cddb7b65fd62d1df9db9fe04de134122bd5"
   integrity sha1-M51M3be2X9YtHfnbn+BN4TQSK9U=
 
+babel-plugin-apply-mdx-type-prop@1.6.22:
+  version "1.6.22"
+  resolved "https://registry.npmjs.org/babel-plugin-apply-mdx-type-prop/-/babel-plugin-apply-mdx-type-prop-1.6.22.tgz#d216e8fd0de91de3f1478ef3231e05446bc8705b"
+  integrity sha512-VefL+8o+F/DfK24lPZMtJctrCVOfgbqLAGZSkxwhazQv4VxPg3Za/i40fu22KR2m8eEda+IfSOlPLUSIiLcnCQ==
+  dependencies:
+    "@babel/helper-plugin-utils" "7.10.4"
+    "@mdx-js/util" "1.6.22"
+
 babel-plugin-dynamic-import-node@^2.3.3:
   version "2.3.3"
   resolved "https://registry.npmjs.org/babel-plugin-dynamic-import-node/-/babel-plugin-dynamic-import-node-2.3.3.tgz#84fda19c976ec5c6defef57f9427b3def66e17a3"
@@ -7950,7 +9058,7 @@ babel-plugin-dynamic-import-node@^2.3.3:
   dependencies:
     object.assign "^4.1.0"
 
-babel-plugin-emotion@^10.0.20, babel-plugin-emotion@^10.0.27:
+babel-plugin-emotion@^10.0.27:
   version "10.0.29"
   resolved "https://registry.npmjs.org/babel-plugin-emotion/-/babel-plugin-emotion-10.0.29.tgz#89d8e497091fcd3d10331f097f1471e4cc3f35b4"
   integrity sha512-7Jpi1OCxjyz0k163lKtqP+LHMg5z3S6A7vMBfHnF06l2unmtsOmFDzZBpGf0CWo1G4m8UACfVcDJiSiRuu/cSw==
@@ -7966,6 +9074,13 @@ babel-plugin-emotion@^10.0.20, babel-plugin-emotion@^10.0.27:
     find-root "^1.1.0"
     source-map "^0.5.7"
 
+babel-plugin-extract-import-names@1.6.22:
+  version "1.6.22"
+  resolved "https://registry.npmjs.org/babel-plugin-extract-import-names/-/babel-plugin-extract-import-names-1.6.22.tgz#de5f9a28eb12f3eb2578bf74472204e66d1a13dc"
+  integrity sha512-yJ9BsJaISua7d8zNT7oRG1ZLBJCIdZ4PZqmH8qa9N5AK01ifk3fnkc98AXhtzE7UkfCsEumvoQWgoYLhOnJ7jQ==
+  dependencies:
+    "@babel/helper-plugin-utils" "7.10.4"
+
 babel-plugin-istanbul@^6.0.0:
   version "6.0.0"
   resolved "https://registry.npmjs.org/babel-plugin-istanbul/-/babel-plugin-istanbul-6.0.0.tgz#e159ccdc9af95e0b570c75b4573b7c34d671d765"
@@ -7996,88 +9111,21 @@ babel-plugin-macros@^2.0.0, babel-plugin-macros@^2.8.0:
     cosmiconfig "^6.0.0"
     resolve "^1.12.0"
 
-babel-plugin-minify-builtins@^0.5.0:
-  version "0.5.0"
-  resolved "https://registry.npmjs.org/babel-plugin-minify-builtins/-/babel-plugin-minify-builtins-0.5.0.tgz#31eb82ed1a0d0efdc31312f93b6e4741ce82c36b"
-  integrity sha512-wpqbN7Ov5hsNwGdzuzvFcjgRlzbIeVv1gMIlICbPj0xkexnfoIDe7q+AZHMkQmAE/F9R5jkrB6TLfTegImlXag==
-
-babel-plugin-minify-constant-folding@^0.5.0:
-  version "0.5.0"
-  resolved "https://registry.npmjs.org/babel-plugin-minify-constant-folding/-/babel-plugin-minify-constant-folding-0.5.0.tgz#f84bc8dbf6a561e5e350ff95ae216b0ad5515b6e"
-  integrity sha512-Vj97CTn/lE9hR1D+jKUeHfNy+m1baNiJ1wJvoGyOBUx7F7kJqDZxr9nCHjO/Ad+irbR3HzR6jABpSSA29QsrXQ==
+babel-plugin-macros@^3.0.1:
+  version "3.1.0"
+  resolved "https://registry.npmjs.org/babel-plugin-macros/-/babel-plugin-macros-3.1.0.tgz#9ef6dc74deb934b4db344dc973ee851d148c50c1"
+  integrity sha512-Cg7TFGpIr01vOQNODXOOaGz2NpCU5gl8x1qJFbb6hbZxR7XrcE2vtbAsTAbJ7/xwJtUuJEw8K8Zr/AE0LHlesg==
   dependencies:
-    babel-helper-evaluate-path "^0.5.0"
-
-babel-plugin-minify-dead-code-elimination@^0.5.1:
-  version "0.5.1"
-  resolved "https://registry.npmjs.org/babel-plugin-minify-dead-code-elimination/-/babel-plugin-minify-dead-code-elimination-0.5.1.tgz#1a0c68e44be30de4976ca69ffc535e08be13683f"
-  integrity sha512-x8OJOZIrRmQBcSqxBcLbMIK8uPmTvNWPXH2bh5MDCW1latEqYiRMuUkPImKcfpo59pTUB2FT7HfcgtG8ZlR5Qg==
-  dependencies:
-    babel-helper-evaluate-path "^0.5.0"
-    babel-helper-mark-eval-scopes "^0.4.3"
-    babel-helper-remove-or-void "^0.4.3"
-    lodash "^4.17.11"
-
-babel-plugin-minify-flip-comparisons@^0.4.3:
-  version "0.4.3"
-  resolved "https://registry.npmjs.org/babel-plugin-minify-flip-comparisons/-/babel-plugin-minify-flip-comparisons-0.4.3.tgz#00ca870cb8f13b45c038b3c1ebc0f227293c965a"
-  integrity sha1-AMqHDLjxO0XAOLPB68DyJyk8llo=
-  dependencies:
-    babel-helper-is-void-0 "^0.4.3"
-
-babel-plugin-minify-guarded-expressions@^0.4.4:
-  version "0.4.4"
-  resolved "https://registry.npmjs.org/babel-plugin-minify-guarded-expressions/-/babel-plugin-minify-guarded-expressions-0.4.4.tgz#818960f64cc08aee9d6c75bec6da974c4d621135"
-  integrity sha512-RMv0tM72YuPPfLT9QLr3ix9nwUIq+sHT6z8Iu3sLbqldzC1Dls8DPCywzUIzkTx9Zh1hWX4q/m9BPoPed9GOfA==
-  dependencies:
-    babel-helper-evaluate-path "^0.5.0"
-    babel-helper-flip-expressions "^0.4.3"
-
-babel-plugin-minify-infinity@^0.4.3:
-  version "0.4.3"
-  resolved "https://registry.npmjs.org/babel-plugin-minify-infinity/-/babel-plugin-minify-infinity-0.4.3.tgz#dfb876a1b08a06576384ef3f92e653ba607b39ca"
-  integrity sha1-37h2obCKBldjhO8/kuZTumB7Oco=
-
-babel-plugin-minify-mangle-names@^0.5.0:
-  version "0.5.0"
-  resolved "https://registry.npmjs.org/babel-plugin-minify-mangle-names/-/babel-plugin-minify-mangle-names-0.5.0.tgz#bcddb507c91d2c99e138bd6b17a19c3c271e3fd3"
-  integrity sha512-3jdNv6hCAw6fsX1p2wBGPfWuK69sfOjfd3zjUXkbq8McbohWy23tpXfy5RnToYWggvqzuMOwlId1PhyHOfgnGw==
-  dependencies:
-    babel-helper-mark-eval-scopes "^0.4.3"
-
-babel-plugin-minify-numeric-literals@^0.4.3:
-  version "0.4.3"
-  resolved "https://registry.npmjs.org/babel-plugin-minify-numeric-literals/-/babel-plugin-minify-numeric-literals-0.4.3.tgz#8e4fd561c79f7801286ff60e8c5fd9deee93c0bc"
-  integrity sha1-jk/VYcefeAEob/YOjF/Z3u6TwLw=
-
-babel-plugin-minify-replace@^0.5.0:
-  version "0.5.0"
-  resolved "https://registry.npmjs.org/babel-plugin-minify-replace/-/babel-plugin-minify-replace-0.5.0.tgz#d3e2c9946c9096c070efc96761ce288ec5c3f71c"
-  integrity sha512-aXZiaqWDNUbyNNNpWs/8NyST+oU7QTpK7J9zFEFSA0eOmtUNMU3fczlTTTlnCxHmq/jYNFEmkkSG3DDBtW3Y4Q==
-
-babel-plugin-minify-simplify@^0.5.1:
-  version "0.5.1"
-  resolved "https://registry.npmjs.org/babel-plugin-minify-simplify/-/babel-plugin-minify-simplify-0.5.1.tgz#f21613c8b95af3450a2ca71502fdbd91793c8d6a"
-  integrity sha512-OSYDSnoCxP2cYDMk9gxNAed6uJDiDz65zgL6h8d3tm8qXIagWGMLWhqysT6DY3Vs7Fgq7YUDcjOomhVUb+xX6A==
-  dependencies:
-    babel-helper-evaluate-path "^0.5.0"
-    babel-helper-flip-expressions "^0.4.3"
-    babel-helper-is-nodes-equiv "^0.0.1"
-    babel-helper-to-multiple-sequence-expressions "^0.5.0"
-
-babel-plugin-minify-type-constructors@^0.4.3:
-  version "0.4.3"
-  resolved "https://registry.npmjs.org/babel-plugin-minify-type-constructors/-/babel-plugin-minify-type-constructors-0.4.3.tgz#1bc6f15b87f7ab1085d42b330b717657a2156500"
-  integrity sha1-G8bxW4f3qxCF1CszC3F2V6IVZQA=
-  dependencies:
-    babel-helper-is-void-0 "^0.4.3"
+    "@babel/runtime" "^7.12.5"
+    cosmiconfig "^7.0.0"
+    resolve "^1.19.0"
 
 babel-plugin-named-asset-import@^0.3.1:
   version "0.3.6"
   resolved "https://registry.npmjs.org/babel-plugin-named-asset-import/-/babel-plugin-named-asset-import-0.3.6.tgz#c9750a1b38d85112c9e166bf3ef7c5dbc605f4be"
   integrity sha512-1aGDUfL1qOOIoqk9QKGIo2lANk+C7ko/fqH0uIyC71x3PEGz0uVP8ISgfEsFuG+FKmjHTvFK/nNM8dowpmUxLA==
 
-babel-plugin-polyfill-corejs2@^0.2.0:
+babel-plugin-polyfill-corejs2@^0.2.0, babel-plugin-polyfill-corejs2@^0.2.2:
   version "0.2.2"
   resolved "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.2.2.tgz#e9124785e6fd94f94b618a7954e5693053bf5327"
   integrity sha512-kISrENsJ0z5dNPq5eRvcctITNHYXWOA4DUZRFYCz3jYCcvTb/A546LIddmoGNMVYg2U38OyFeNosQwI9ENTqIQ==
@@ -8086,6 +9134,14 @@ babel-plugin-polyfill-corejs2@^0.2.0:
     "@babel/helper-define-polyfill-provider" "^0.2.2"
     semver "^6.1.1"
 
+babel-plugin-polyfill-corejs3@^0.1.0:
+  version "0.1.7"
+  resolved "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.1.7.tgz#80449d9d6f2274912e05d9e182b54816904befd0"
+  integrity sha512-u+gbS9bbPhZWEeyy1oR/YaaSpod/KDT07arZHb80aTpl8H5ZBq+uN1nN9/xtX7jQyfLdPfoqI4Rue/MQSWJquw==
+  dependencies:
+    "@babel/helper-define-polyfill-provider" "^0.1.5"
+    core-js-compat "^3.8.1"
+
 babel-plugin-polyfill-corejs3@^0.2.0:
   version "0.2.2"
   resolved "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.2.2.tgz#7424a1682ee44baec817327710b1b094e5f8f7f5"
@@ -8094,7 +9150,15 @@ babel-plugin-polyfill-corejs3@^0.2.0:
     "@babel/helper-define-polyfill-provider" "^0.2.2"
     core-js-compat "^3.9.1"
 
-babel-plugin-polyfill-regenerator@^0.2.0:
+babel-plugin-polyfill-corejs3@^0.2.2:
+  version "0.2.4"
+  resolved "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.2.4.tgz#68cb81316b0e8d9d721a92e0009ec6ecd4cd2ca9"
+  integrity sha512-z3HnJE5TY/j4EFEa/qpQMSbcUJZ5JQi+3UFjXzn6pQCmIKc5Ug5j98SuYyH+m4xQnvKlMDIW4plLfgyVnd0IcQ==
+  dependencies:
+    "@babel/helper-define-polyfill-provider" "^0.2.2"
+    core-js-compat "^3.14.0"
+
+babel-plugin-polyfill-regenerator@^0.2.0, babel-plugin-polyfill-regenerator@^0.2.2:
   version "0.2.2"
   resolved "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.2.2.tgz#b310c8d642acada348c1fa3b3e6ce0e851bee077"
   integrity sha512-Goy5ghsc21HgPDFtzRkSirpZVW35meGoTmTOb2bxqdl60ghub4xOidgNTHaZfQ2FaxQsKmwvXtOAkcIS4SMBWg==
@@ -8120,64 +9184,14 @@ babel-plugin-syntax-trailing-function-commas@^7.0.0-beta.0:
   resolved "https://registry.npmjs.org/babel-plugin-syntax-trailing-function-commas/-/babel-plugin-syntax-trailing-function-commas-7.0.0-beta.0.tgz#aa213c1435e2bffeb6fca842287ef534ad05d5cf"
   integrity sha512-Xj9XuRuz3nTSbaTXWv3itLOcxyF4oPD8douBBmj7U9BBC6nEBYfyOJYQMf/8PJAFotC62UY5dFfIGEPr7WswzQ==
 
-babel-plugin-transform-inline-consecutive-adds@^0.4.3:
-  version "0.4.3"
-  resolved "https://registry.npmjs.org/babel-plugin-transform-inline-consecutive-adds/-/babel-plugin-transform-inline-consecutive-adds-0.4.3.tgz#323d47a3ea63a83a7ac3c811ae8e6941faf2b0d1"
-  integrity sha1-Mj1Ho+pjqDp6w8gRro5pQfrysNE=
-
-babel-plugin-transform-member-expression-literals@^6.9.4:
-  version "6.9.4"
-  resolved "https://registry.npmjs.org/babel-plugin-transform-member-expression-literals/-/babel-plugin-transform-member-expression-literals-6.9.4.tgz#37039c9a0c3313a39495faac2ff3a6b5b9d038bf"
-  integrity sha1-NwOcmgwzE6OUlfqsL/OmtbnQOL8=
-
-babel-plugin-transform-merge-sibling-variables@^6.9.4:
-  version "6.9.4"
-  resolved "https://registry.npmjs.org/babel-plugin-transform-merge-sibling-variables/-/babel-plugin-transform-merge-sibling-variables-6.9.4.tgz#85b422fc3377b449c9d1cde44087203532401dae"
-  integrity sha1-hbQi/DN3tEnJ0c3kQIcgNTJAHa4=
-
-babel-plugin-transform-minify-booleans@^6.9.4:
-  version "6.9.4"
-  resolved "https://registry.npmjs.org/babel-plugin-transform-minify-booleans/-/babel-plugin-transform-minify-booleans-6.9.4.tgz#acbb3e56a3555dd23928e4b582d285162dd2b198"
-  integrity sha1-rLs+VqNVXdI5KOS1gtKFFi3SsZg=
-
-babel-plugin-transform-property-literals@^6.9.4:
-  version "6.9.4"
-  resolved "https://registry.npmjs.org/babel-plugin-transform-property-literals/-/babel-plugin-transform-property-literals-6.9.4.tgz#98c1d21e255736573f93ece54459f6ce24985d39"
-  integrity sha1-mMHSHiVXNlc/k+zlRFn2ziSYXTk=
+babel-polyfill@^6.26.0:
+  version "6.26.0"
+  resolved "https://registry.npmjs.org/babel-polyfill/-/babel-polyfill-6.26.0.tgz#379937abc67d7895970adc621f284cd966cf2153"
+  integrity sha1-N5k3q8Z9eJWXCtxiHyhM2WbPIVM=
   dependencies:
-    esutils "^2.0.2"
-
-babel-plugin-transform-regexp-constructors@^0.4.3:
-  version "0.4.3"
-  resolved "https://registry.npmjs.org/babel-plugin-transform-regexp-constructors/-/babel-plugin-transform-regexp-constructors-0.4.3.tgz#58b7775b63afcf33328fae9a5f88fbd4fb0b4965"
-  integrity sha1-WLd3W2OvzzMyj66aX4j71PsLSWU=
-
-babel-plugin-transform-remove-console@^6.9.4:
-  version "6.9.4"
-  resolved "https://registry.npmjs.org/babel-plugin-transform-remove-console/-/babel-plugin-transform-remove-console-6.9.4.tgz#b980360c067384e24b357a588d807d3c83527780"
-  integrity sha1-uYA2DAZzhOJLNXpYjYB9PINSd4A=
-
-babel-plugin-transform-remove-debugger@^6.9.4:
-  version "6.9.4"
-  resolved "https://registry.npmjs.org/babel-plugin-transform-remove-debugger/-/babel-plugin-transform-remove-debugger-6.9.4.tgz#42b727631c97978e1eb2d199a7aec84a18339ef2"
-  integrity sha1-QrcnYxyXl44estGZp67IShgznvI=
-
-babel-plugin-transform-remove-undefined@^0.5.0:
-  version "0.5.0"
-  resolved "https://registry.npmjs.org/babel-plugin-transform-remove-undefined/-/babel-plugin-transform-remove-undefined-0.5.0.tgz#80208b31225766c630c97fa2d288952056ea22dd"
-  integrity sha512-+M7fJYFaEE/M9CXa0/IRkDbiV3wRELzA1kKQFCJ4ifhrzLKn/9VCCgj9OFmYWwBd8IB48YdgPkHYtbYq+4vtHQ==
-  dependencies:
-    babel-helper-evaluate-path "^0.5.0"
-
-babel-plugin-transform-simplify-comparison-operators@^6.9.4:
-  version "6.9.4"
-  resolved "https://registry.npmjs.org/babel-plugin-transform-simplify-comparison-operators/-/babel-plugin-transform-simplify-comparison-operators-6.9.4.tgz#f62afe096cab0e1f68a2d753fdf283888471ceb9"
-  integrity sha1-9ir+CWyrDh9ootdT/fKDiIRxzrk=
-
-babel-plugin-transform-undefined-to-void@^6.9.4:
-  version "6.9.4"
-  resolved "https://registry.npmjs.org/babel-plugin-transform-undefined-to-void/-/babel-plugin-transform-undefined-to-void-6.9.4.tgz#be241ca81404030678b748717322b89d0c8fe280"
-  integrity sha1-viQcqBQEAwZ4t0hxcyK4nQyP4oA=
+    babel-runtime "^6.26.0"
+    core-js "^2.5.0"
+    regenerator-runtime "^0.10.5"
 
 babel-preset-current-node-syntax@^1.0.0:
   version "1.0.0"
@@ -8238,35 +9252,6 @@ babel-preset-jest@^26.6.2:
     babel-plugin-jest-hoist "^26.6.2"
     babel-preset-current-node-syntax "^1.0.0"
 
-"babel-preset-minify@^0.5.0 || 0.6.0-alpha.5":
-  version "0.5.1"
-  resolved "https://registry.npmjs.org/babel-preset-minify/-/babel-preset-minify-0.5.1.tgz#25f5d0bce36ec818be80338d0e594106e21eaa9f"
-  integrity sha512-1IajDumYOAPYImkHbrKeiN5AKKP9iOmRoO2IPbIuVp0j2iuCcj0n7P260z38siKMZZ+85d3mJZdtW8IgOv+Tzg==
-  dependencies:
-    babel-plugin-minify-builtins "^0.5.0"
-    babel-plugin-minify-constant-folding "^0.5.0"
-    babel-plugin-minify-dead-code-elimination "^0.5.1"
-    babel-plugin-minify-flip-comparisons "^0.4.3"
-    babel-plugin-minify-guarded-expressions "^0.4.4"
-    babel-plugin-minify-infinity "^0.4.3"
-    babel-plugin-minify-mangle-names "^0.5.0"
-    babel-plugin-minify-numeric-literals "^0.4.3"
-    babel-plugin-minify-replace "^0.5.0"
-    babel-plugin-minify-simplify "^0.5.1"
-    babel-plugin-minify-type-constructors "^0.4.3"
-    babel-plugin-transform-inline-consecutive-adds "^0.4.3"
-    babel-plugin-transform-member-expression-literals "^6.9.4"
-    babel-plugin-transform-merge-sibling-variables "^6.9.4"
-    babel-plugin-transform-minify-booleans "^6.9.4"
-    babel-plugin-transform-property-literals "^6.9.4"
-    babel-plugin-transform-regexp-constructors "^0.4.3"
-    babel-plugin-transform-remove-console "^6.9.4"
-    babel-plugin-transform-remove-debugger "^6.9.4"
-    babel-plugin-transform-remove-undefined "^0.5.0"
-    babel-plugin-transform-simplify-comparison-operators "^6.9.4"
-    babel-plugin-transform-undefined-to-void "^6.9.4"
-    lodash "^4.17.11"
-
 babel-runtime@6.26.0, babel-runtime@^6.26.0:
   version "6.26.0"
   resolved "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.26.0.tgz#965c7058668e82b55d7bfe04ff2337bc8b5647fe"
@@ -8315,6 +9300,11 @@ base64-arraybuffer@^0.2.0:
   resolved "https://registry.npmjs.org/base64-arraybuffer/-/base64-arraybuffer-0.2.0.tgz#4b944fac0191aa5907afe2d8c999ccc57ce80f45"
   integrity sha512-7emyCsu1/xiBXgQZrscw/8KPRT44I4Yq9Pe6EGs3aPRTsWuggML1/1DTuZUuIaJPIm1FTDUVXl4x/yW8s0kQDQ==
 
+base64-arraybuffer@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.npmjs.org/base64-arraybuffer/-/base64-arraybuffer-1.0.1.tgz#87bd13525626db4a9838e00a508c2b73efcf348c"
+  integrity sha512-vFIUq7FdLtjZMhATwDul5RZWv2jpXQ09Pd6jcVEOvIsqCWTRFD/ONHNfyOS8dA/Ippi5dsIgpyKWKZaAKZltbA==
+
 base64-js@^1.0.2, base64-js@^1.3.0, base64-js@^1.3.1, base64-js@^1.5.1:
   version "1.5.1"
   resolved "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz#1b1b440160a5bf7ad40b650f095963481903930a"
@@ -8362,15 +9352,20 @@ bcrypt-pbkdf@^1.0.0, bcrypt-pbkdf@^1.0.2:
   dependencies:
     tweetnacl "^0.14.3"
 
+bdd-lazy-var@^2.6.0:
+  version "2.6.1"
+  resolved "https://registry.npmjs.org/bdd-lazy-var/-/bdd-lazy-var-2.6.1.tgz#ca03fb36d68c5a507c0ba9a4d53160b899e6b7cb"
+  integrity sha512-X3ADwcFji/IHIrYJhTTpaiWhoOx4pl4whdAx1dmvdeUPsMUb7fVYFvf/Q33VEAEAVkEwi5rgNSZ0Y9oOVeQV+A==
+
 before-after-hook@^2.1.0:
   version "2.1.0"
   resolved "https://registry.npmjs.org/before-after-hook/-/before-after-hook-2.1.0.tgz#b6c03487f44e24200dd30ca5e6a1979c5d2fb635"
   integrity sha512-IWIbu7pMqyw3EAJHzzHbWa85b6oud/yfKYg5rqB5hNE8CeMi3nX+2C2sj0HswfblST86hpVEOAb9x34NZd6P7A==
 
-better-opn@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.npmjs.org/better-opn/-/better-opn-2.0.0.tgz#c70d198e51164bdc220306a28a885d9ac7a14c44"
-  integrity sha512-PPbGRgO/K0LowMHbH/JNvaV3qY3Vt+A2nH28fzJxy16h/DfR5OsVti6ldGl6S9SMsyUqT13sltikiAVtI6tKLA==
+better-opn@^2.1.1:
+  version "2.1.1"
+  resolved "https://registry.npmjs.org/better-opn/-/better-opn-2.1.1.tgz#94a55b4695dc79288f31d7d0e5f658320759f7c6"
+  integrity sha512-kIPXZS5qwyKiX/HcRvDYfmBQUa8XP17I0mYZZ0y4UhpYOSvtsLHDYqmomS+Mj20aDvD3knEiQ0ecQy2nhio3yA==
   dependencies:
     open "^7.0.3"
 
@@ -8436,6 +9431,11 @@ bindings@^1.5.0:
   dependencies:
     file-uri-to-path "1.0.0"
 
+bintrees@1.0.1:
+  version "1.0.1"
+  resolved "https://registry.npmjs.org/bintrees/-/bintrees-1.0.1.tgz#0e655c9b9c2435eaab68bf4027226d2b55a34524"
+  integrity sha1-DmVcm5wkNeqraL9AJyJtK1WjRSQ=
+
 bl@^4.0.3, bl@^4.1.0:
   version "4.1.0"
   resolved "https://registry.npmjs.org/bl/-/bl-4.1.0.tgz#451535264182bec2fbbc83a62ab98cf11d9f7b3a"
@@ -8518,7 +9518,7 @@ boxen@^1.3.0:
     term-size "^1.2.0"
     widest-line "^2.0.0"
 
-boxen@^4.1.0, boxen@^4.2.0:
+boxen@^4.2.0:
   version "4.2.0"
   resolved "https://registry.npmjs.org/boxen/-/boxen-4.2.0.tgz#e411b62357d6d6d36587c8ac3d5d974daa070e64"
   integrity sha512-eB4uT9RGzg2odpER62bBwSLvUeGC+WbRjjyyFhGsKnc8wp/m0+hQsMUvUe3H2V0D5vw0nBdO1hCJoZo5mKeuIQ==
@@ -8639,16 +9639,6 @@ browserify-zlib@^0.2.0:
   dependencies:
     pako "~1.0.5"
 
-browserslist@4.10.0:
-  version "4.10.0"
-  resolved "https://registry.npmjs.org/browserslist/-/browserslist-4.10.0.tgz#f179737913eaf0d2b98e4926ac1ca6a15cbcc6a9"
-  integrity sha512-TpfK0TDgv71dzuTsEAlQiHeWQ/tiPqgNZVdv046fvNtBZrjbv2O3TsWCDU0AWGJJKCF/KsjNdLzR9hXOsh/CfA==
-  dependencies:
-    caniuse-lite "^1.0.30001035"
-    electron-to-chromium "^1.3.378"
-    node-releases "^1.1.52"
-    pkg-up "^3.1.0"
-
 browserslist@4.14.2:
   version "4.14.2"
   resolved "https://registry.npmjs.org/browserslist/-/browserslist-4.14.2.tgz#1b3cec458a1ba87588cc5e9be62f19b6d48813ce"
@@ -8659,7 +9649,7 @@ browserslist@4.14.2:
     escalade "^3.0.2"
     node-releases "^1.1.61"
 
-browserslist@^4.0.0, browserslist@^4.12.0, browserslist@^4.16.6:
+browserslist@^4.0.0, browserslist@^4.12.0, browserslist@^4.14.5, browserslist@^4.16.6:
   version "4.16.6"
   resolved "https://registry.npmjs.org/browserslist/-/browserslist-4.16.6.tgz#d7901277a5a88e554ed305b183ec9b0c08f66fa2"
   integrity sha512-Wspk/PqO+4W9qp5iUTJsa1B/QrYn1keNCcEP5OvP7WBwT4KaDly0uONYmC6Xa3Z5IqnUgS0KcgLYu1l74x0ZXQ==
@@ -8957,6 +9947,11 @@ camel-case@4.1.2, camel-case@^4.1.1, camel-case@^4.1.2:
     pascal-case "^3.1.2"
     tslib "^2.0.3"
 
+camelcase-css@2.0.1:
+  version "2.0.1"
+  resolved "https://registry.npmjs.org/camelcase-css/-/camelcase-css-2.0.1.tgz#ee978f6947914cc30c6b44741b6ed1df7f043fd5"
+  integrity sha512-QOSvevhslijgYwRx6Rv7zKdMF8lbRmx+uQGx2+vDc+KI/eBnsy9kit5aj23AgGu3pa4t9AgwbnXWqS+iOY+2aA==
+
 camelcase-keys@^2.0.0:
   version "2.1.0"
   resolved "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-2.1.0.tgz#308beeaffdf28119051efa1d932213c91b8f92e7"
@@ -8974,6 +9969,11 @@ camelcase-keys@^6.2.2:
     map-obj "^4.0.0"
     quick-lru "^4.0.1"
 
+camelcase@5.0.0:
+  version "5.0.0"
+  resolved "https://registry.npmjs.org/camelcase/-/camelcase-5.0.0.tgz#03295527d58bd3cd4aa75363f35b2e8d97be2f42"
+  integrity sha512-faqwZqnWxbxn+F1d399ygeamQNy3lPp/H9H6rNrqYh4FSVCtcY+3cub1MxA8o9mDd55mM8Aghuu/kuyYA6VTsA==
+
 camelcase@^2.0.0:
   version "2.1.1"
   resolved "https://registry.npmjs.org/camelcase/-/camelcase-2.1.1.tgz#7c1d16d679a1bbe59ca02cacecfb011e201f5a1f"
@@ -9009,7 +10009,7 @@ caniuse-api@^3.0.0:
     lodash.memoize "^4.1.2"
     lodash.uniq "^4.5.0"
 
-caniuse-lite@^1.0.0, caniuse-lite@^1.0.30001035, caniuse-lite@^1.0.30001109, caniuse-lite@^1.0.30001125, caniuse-lite@^1.0.30001219:
+caniuse-lite@^1.0.0, caniuse-lite@^1.0.30001109, caniuse-lite@^1.0.30001125, caniuse-lite@^1.0.30001219:
   version "1.0.30001230"
   resolved "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001230.tgz#8135c57459854b2240b57a4a6786044bdc5a9f71"
   integrity sha512-5yBd5nWCBS+jWKTcHOzXwo5xzcj4ePE/yjtkZyUV1BTUmrBaA9MRGC+e7mxnqXSA90CmCA8L3eKLaSUkt099IQ==
@@ -9024,16 +10024,16 @@ canvas@^2.6.1:
     simple-get "^3.0.3"
 
 canvg@^3.0.6:
-  version "3.0.6"
-  resolved "https://registry.npmjs.org/canvg/-/canvg-3.0.6.tgz#4f82a34acc433daa06c494fc255420cbbb05f903"
-  integrity sha512-eFUy8R/4DgocR93LF8lr+YUxW4PYblUe/Q1gz2osk/cI5n8AsYdassvln0D9QPhLXQ6Lx7l8hwtT8FLvOn2Ihg==
+  version "3.0.7"
+  resolved "https://registry.npmjs.org/canvg/-/canvg-3.0.7.tgz#e45b87a64116af906917f7cad57d370ea372d682"
+  integrity sha512-4sq6iL5Q4VOXS3PL1BapiXIZItpxYyANVzsAKpTPS5oq4u3SKbGfUcbZh2gdLCQ3jWpG/y5wRkMlBBAJhXeiZA==
   dependencies:
-    "@babel/runtime" "^7.6.3"
+    "@babel/runtime-corejs3" "^7.9.6"
     "@types/raf" "^3.4.0"
-    core-js "3"
     raf "^3.4.1"
     rgbcolor "^1.0.1"
     stackblur-canvas "^2.0.0"
+    svg-pathdata "^5.0.5"
 
 capital-case@^1.0.4:
   version "1.0.4"
@@ -9051,16 +10051,21 @@ capture-exit@^2.0.0:
   dependencies:
     rsvp "^4.8.4"
 
-case-sensitive-paths-webpack-plugin@^2.2.0:
-  version "2.3.0"
-  resolved "https://registry.npmjs.org/case-sensitive-paths-webpack-plugin/-/case-sensitive-paths-webpack-plugin-2.3.0.tgz#23ac613cc9a856e4f88ff8bb73bbb5e989825cf7"
-  integrity sha512-/4YgnZS8y1UXXmC02xD5rRrBEu6T5ub+mQHLNRj0fzTRbgdBYhsNo2V5EqwgqrExjxsjtF/OpAKAMkKsxbD5XQ==
+case-sensitive-paths-webpack-plugin@^2.3.0:
+  version "2.4.0"
+  resolved "https://registry.npmjs.org/case-sensitive-paths-webpack-plugin/-/case-sensitive-paths-webpack-plugin-2.4.0.tgz#db64066c6422eed2e08cc14b986ca43796dbc6d4"
+  integrity sha512-roIFONhcxog0JSSWbvVAh3OocukmSgpqOH6YpMkCvav/ySIV3JKg4Dc8vYtQjYi/UxpNE36r/9v+VqTQqgkYmw==
 
 caseless@~0.12.0:
   version "0.12.0"
   resolved "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc"
   integrity sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=
 
+ccount@^1.0.0:
+  version "1.1.0"
+  resolved "https://registry.npmjs.org/ccount/-/ccount-1.1.0.tgz#246687debb6014735131be8abab2d93898f8d043"
+  integrity sha512-vlNK021QdI7PNeiUh/lKkC/mNHHfV0m/Ad5JoI0TYtlBnJAslM/JIkm/tGC88bkLIwO6OQ5uV6ztS6kVAtCDlg==
+
 chainsaw@~0.1.0:
   version "0.1.0"
   resolved "https://registry.npmjs.org/chainsaw/-/chainsaw-0.1.0.tgz#5eab50b28afe58074d0d58291388828b5e5fbc98"
@@ -9068,7 +10073,7 @@ chainsaw@~0.1.0:
   dependencies:
     traverse ">=0.3.0 <0.4"
 
-chalk@2.4.2, chalk@^2.0.0, chalk@^2.0.1, chalk@^2.1.0, chalk@^2.4.1, chalk@^2.4.2:
+chalk@2.4.2, chalk@^2.0.0, chalk@^2.0.1, chalk@^2.1.0, chalk@^2.3.2, chalk@^2.4.1, chalk@^2.4.2:
   version "2.4.2"
   resolved "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424"
   integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==
@@ -9199,7 +10204,7 @@ chokidar@^2.1.8:
   optionalDependencies:
     fsevents "^1.2.7"
 
-chokidar@^3.2.2, chokidar@^3.3.0, chokidar@^3.3.1, chokidar@^3.4.1, chokidar@^3.4.2, chokidar@^3.5.2:
+chokidar@^3.2.2, chokidar@^3.3.1, chokidar@^3.4.1, chokidar@^3.4.2, chokidar@^3.5.1, chokidar@^3.5.2:
   version "3.5.2"
   resolved "https://registry.npmjs.org/chokidar/-/chokidar-3.5.2.tgz#dba3976fcadb016f66fd365021d91600d01c1e75"
   integrity sha512-ekGhOnNVPgT77r4K/U3GDhu+FQ2S8TnK/s2KbIGXi0SZWuwkZ2QNyfWdZW+TVfn84DpEP7rLeCt2UI6bJ8GwbQ==
@@ -9214,7 +10219,7 @@ chokidar@^3.2.2, chokidar@^3.3.0, chokidar@^3.3.1, chokidar@^3.4.1, chokidar@^3.
   optionalDependencies:
     fsevents "~2.3.2"
 
-chownr@^1.1.1:
+chownr@^1.1.1, chownr@^1.1.4:
   version "1.1.4"
   resolved "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz#6fc9d7b42d32a583596337666e7d08084da2cc6b"
   integrity sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==
@@ -9250,11 +10255,11 @@ cipher-base@^1.0.0, cipher-base@^1.0.1, cipher-base@^1.0.3:
     safe-buffer "^5.0.1"
 
 circleci-api@^4.0.0:
-  version "4.1.3"
-  resolved "https://registry.npmjs.org/circleci-api/-/circleci-api-4.1.3.tgz#cafd80bc1905c6064724636741b4b5b231ed34d0"
-  integrity sha512-Km6H8LB3nNbFUjErhI+sNQrcHcU7dCBnQEi4ckBtQMkCXh+2gDvaYchfkeuIaA1hkakQT5sLmdPbYzhKbvsOMg==
+  version "4.1.4"
+  resolved "https://registry.npmjs.org/circleci-api/-/circleci-api-4.1.4.tgz#6880a28eb021879d81789b50996640dc6373c5ad"
+  integrity sha512-49F0P2mhmfqYzJR/V4+oM+1SfI/VjKPcurvkzuuawNqgW5Eo00ZufgpHgdT+qRrvRymk6yt45bWOIP/f0FKhJA==
   dependencies:
-    axios "^0.20.0"
+    axios "^0.21.1"
 
 cjs-module-lexer@^0.6.0:
   version "0.6.0"
@@ -9276,6 +10281,11 @@ classnames@*, classnames@^2.2.5, classnames@^2.2.6, classnames@^2.3.1:
   resolved "https://registry.npmjs.org/classnames/-/classnames-2.3.1.tgz#dfcfa3891e306ec1dad105d0e88f4417b8535e8e"
   integrity sha512-OlQdbZ7gLfGarSqxesMesDa5uz7KFbID8Kpq/SxIoNGDqY8lSYs0D+hhtBXhcdB3rcbXArFr7vlHheLk1voeNA==
 
+classnames@2.2.6:
+  version "2.2.6"
+  resolved "https://registry.npmjs.org/classnames/-/classnames-2.2.6.tgz#43935bffdd291f326dad0a205309b38d00f650ce"
+  integrity sha512-JR/iSQOSt+LQIWwrwEzJ9uk0xfN3mTVYMwt1Ir5mUcSN6pU+V4zQFFaJsclJbPuAUQH+yfWef6tm7l1quW3C8Q==
+
 clean-css@^4.2.3:
   version "4.2.3"
   resolved "https://registry.npmjs.org/clean-css/-/clean-css-4.2.3.tgz#507b5de7d97b48ee53d84adb0160ff6216380f78"
@@ -9355,11 +10365,6 @@ cli-truncate@^0.2.1:
     slice-ansi "0.0.4"
     string-width "^1.0.1"
 
-cli-width@^2.0.0:
-  version "2.2.0"
-  resolved "https://registry.npmjs.org/cli-width/-/cli-width-2.2.0.tgz#ff19ede8a9a5e579324147b0c11f0fbcbabed639"
-  integrity sha1-/xnt6Kml5XkyQUewwR8PvLq+1jk=
-
 cli-width@^3.0.0:
   version "3.0.0"
   resolved "https://registry.npmjs.org/cli-width/-/cli-width-3.0.0.tgz#a2f48437a2caa9a22436e794bf071ec9e61cedf6"
@@ -9383,15 +10388,6 @@ cliui@^3.2.0:
     strip-ansi "^3.0.1"
     wrap-ansi "^2.0.0"
 
-cliui@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.npmjs.org/cliui/-/cliui-5.0.0.tgz#deefcfdb2e800784aa34f46fa08e06851c7bbbc5"
-  integrity sha512-PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA==
-  dependencies:
-    string-width "^3.1.0"
-    strip-ansi "^5.2.0"
-    wrap-ansi "^5.1.0"
-
 cliui@^6.0.0:
   version "6.0.0"
   resolved "https://registry.npmjs.org/cliui/-/cliui-6.0.0.tgz#511d702c0c4e41ca156d7d0e96021f23e13225b1"
@@ -9506,6 +10502,11 @@ codeowners-utils@^1.0.2:
     ignore "^5.1.4"
     locate-path "^5.0.0"
 
+collapse-white-space@^1.0.2:
+  version "1.0.6"
+  resolved "https://registry.npmjs.org/collapse-white-space/-/collapse-white-space-1.0.6.tgz#e63629c0016665792060dbbeb79c42239d2c5287"
+  integrity sha512-jEovNnrhMuqyCcjfEJA56v0Xq8SkIoPKDyaHahwo3POf4qcSXqMYuwNcOTzp74vTsR9Tn08z4MxWqAhcekogkQ==
+
 collect-v8-coverage@^1.0.0:
   version "1.0.0"
   resolved "https://registry.npmjs.org/collect-v8-coverage/-/collect-v8-coverage-1.0.0.tgz#150ee634ac3650b71d9c985eb7f608942334feb1"
@@ -9548,10 +10549,10 @@ color-name@^1.0.0, color-name@^1.1.4, color-name@~1.1.4:
   resolved "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2"
   integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==
 
-color-string@^1.5.2, color-string@^1.5.4:
-  version "1.5.4"
-  resolved "https://registry.npmjs.org/color-string/-/color-string-1.5.4.tgz#dd51cd25cfee953d138fe4002372cc3d0e504cb6"
-  integrity sha512-57yF5yt8Xa3czSEW1jfQDE79Idk0+AkN/4KWad6tbdxUmAs3MvjxlWSWD4deYytcRfoZ9nhKyFl1kj5tBvidbw==
+color-string@^1.5.2, color-string@^1.5.4, color-string@^1.6.0:
+  version "1.6.0"
+  resolved "https://registry.npmjs.org/color-string/-/color-string-1.6.0.tgz#c3915f61fe267672cb7e1e064c9d692219f6c312"
+  integrity sha512-c/hGS+kRWJutUBEngKKmk4iH3sD59MBkoxVapS/0wgpCz2u7XsNloxknyvBhzwEs1IbV36D9PwqLPJ2DTu3vMA==
   dependencies:
     color-name "^1.0.0"
     simple-swizzle "^0.2.2"
@@ -9564,7 +10565,7 @@ color@3.0.x:
     color-convert "^1.9.1"
     color-string "^1.5.2"
 
-color@^3.0.0, color@^3.1.2:
+color@^3.0.0:
   version "3.1.3"
   resolved "https://registry.npmjs.org/color/-/color-3.1.3.tgz#ca67fb4e7b97d611dcde39eceed422067d91596e"
   integrity sha512-xgXAcTHa2HeFCGLE9Xs/R82hujGtu9Jd9x4NW3T34+OMs7VoPsjwzRczKHvTAHeJwWFwX5j15+MgAppE8ztObQ==
@@ -9572,6 +10573,14 @@ color@^3.0.0, color@^3.1.2:
     color-convert "^1.9.1"
     color-string "^1.5.4"
 
+color@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.npmjs.org/color/-/color-4.0.1.tgz#21df44cd10245a91b1ccf5ba031609b0e10e7d67"
+  integrity sha512-rpZjOKN5O7naJxkH2Rx1sZzzBgaiWECc6BYXjeCE6kF0kcASJYbUq02u7JqIHwCb/j3NhV+QhRL2683aICeGZA==
+  dependencies:
+    color-convert "^2.0.1"
+    color-string "^1.6.0"
+
 colorette@1.2.1:
   version "1.2.1"
   resolved "https://registry.npmjs.org/colorette/-/colorette-1.2.1.tgz#4d0b921325c14faf92633086a536db6e89564b1b"
@@ -9625,16 +10634,6 @@ command-exists@^1.2.9:
   resolved "https://registry.npmjs.org/command-exists/-/command-exists-1.2.9.tgz#c50725af3808c8ab0260fd60b01fbfa25b954f69"
   integrity sha512-LTQ/SGc+s0Xc0Fu5WaKnR0YiygZkm9eKFvyS+fRsU7/ZWFF8ykFM6Pc9aCVf1+xasOOZpO3BAVgVrKvsqKHV7w==
 
-commander@0.6.1:
-  version "0.6.1"
-  resolved "https://registry.npmjs.org/commander/-/commander-0.6.1.tgz#fa68a14f6a945d54dbbe50d8cdb3320e9e3b1a06"
-  integrity sha1-+mihT2qUXVTbvlDYzbMyDp47GgY=
-
-commander@2.3.0:
-  version "2.3.0"
-  resolved "https://registry.npmjs.org/commander/-/commander-2.3.0.tgz#fd430e889832ec353b9acd1de217c11cb3eef873"
-  integrity sha1-/UMOiJgy7DU7ms0d4hfBHLPu+HM=
-
 commander@^2.19.0, commander@^2.20.0, commander@^2.20.3, commander@^2.7.1, commander@~2.20.3:
   version "2.20.3"
   resolved "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33"
@@ -9645,12 +10644,12 @@ commander@^4.0.0, commander@^4.1.1:
   resolved "https://registry.npmjs.org/commander/-/commander-4.1.1.tgz#9fd602bd936294e9e9ef46a3f4d6964044b18068"
   integrity sha512-NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA==
 
-commander@^5.0.0, commander@^5.1.0:
+commander@^5.1.0:
   version "5.1.0"
   resolved "https://registry.npmjs.org/commander/-/commander-5.1.0.tgz#46abbd1652f8e059bddaef99bbdcb2ad9cf179ae"
   integrity sha512-P0CysNDQ7rtVw4QIQtm+MRxV66vKFSvlsQvGYXZWR3qFU0jlMKHZZZgw8e+8DSah4UDKMqnknRDQz+xuQXQ/Zg==
 
-commander@^6.1.0:
+commander@^6.1.0, commander@^6.2.1:
   version "6.2.1"
   resolved "https://registry.npmjs.org/commander/-/commander-6.2.1.tgz#0792eb682dfbc325999bb2b84fddddba110ac73c"
   integrity sha512-U7VdrJFnJgo4xjrHpTzu0yrHPGImdsmD95ZlgYSEajAn2JKzDhDTPG9kBTefmObL2w/ngeZnilk+OV9CG3d7UA==
@@ -9732,10 +10731,10 @@ compute-lcm@^1.1.0, compute-lcm@^1.1.2:
     validate.io-function "^1.0.2"
     validate.io-integer-array "^1.0.0"
 
-compute-scroll-into-view@^1.0.16:
-  version "1.0.16"
-  resolved "https://registry.npmjs.org/compute-scroll-into-view/-/compute-scroll-into-view-1.0.16.tgz#5b7bf4f7127ea2c19b750353d7ce6776a90ee088"
-  integrity sha512-a85LHKY81oQnikatZYA90pufpZ6sQx++BoCxOEMsjpZx+ZnaKGQnCyCehTRr/1p9GBIAHTjcU9k71kSYWloLiQ==
+compute-scroll-into-view@^1.0.17:
+  version "1.0.17"
+  resolved "https://registry.npmjs.org/compute-scroll-into-view/-/compute-scroll-into-view-1.0.17.tgz#6a88f18acd9d42e9cf4baa6bec7e0522607ab7ab"
+  integrity sha512-j4dx+Fb0URmzbwwMUrhqWM2BEWHdFGx+qZ9qqASHRPqvTYdqvWnHg0H1hIbcyLnvgnoNAVMlwkepyqM3DaIFUg==
 
 concat-map@0.0.1:
   version "0.0.1"
@@ -9792,18 +10791,6 @@ config-chain@^1.1.12:
     ini "^1.3.4"
     proto-list "~1.2.1"
 
-configstore@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.npmjs.org/configstore/-/configstore-4.0.0.tgz#5933311e95d3687efb592c528b922d9262d227e7"
-  integrity sha512-CmquAXFBocrzaSM8mtGPMM/HiWmyIpr4CcJl/rgY2uCObZ/S7cKU0silxslqJejl+t/T9HS8E0PUNQD81JGUEQ==
-  dependencies:
-    dot-prop "^4.1.0"
-    graceful-fs "^4.1.2"
-    make-dir "^1.0.0"
-    unique-string "^1.0.0"
-    write-file-atomic "^2.0.0"
-    xdg-basedir "^3.0.0"
-
 configstore@^5.0.0, configstore@^5.0.1:
   version "5.0.1"
   resolved "https://registry.npmjs.org/configstore/-/configstore-5.0.1.tgz#d365021b5df4b98cdd187d6a3b0e3f6a7cc5ed96"
@@ -10004,13 +10991,21 @@ copy-descriptor@^0.1.0:
   resolved "https://registry.npmjs.org/copy-descriptor/-/copy-descriptor-0.1.1.tgz#676f6eb3c39997c2ee1ac3a924fd6124748f578d"
   integrity sha1-Z29us8OZl8LuGsOpJP1hJHSPV40=
 
-copy-to-clipboard@^3, copy-to-clipboard@^3.0.8, copy-to-clipboard@^3.1.0, copy-to-clipboard@^3.2.0, copy-to-clipboard@^3.3.1:
+copy-to-clipboard@^3, copy-to-clipboard@^3.1.0, copy-to-clipboard@^3.2.0, copy-to-clipboard@^3.3.1:
   version "3.3.1"
   resolved "https://registry.npmjs.org/copy-to-clipboard/-/copy-to-clipboard-3.3.1.tgz#115aa1a9998ffab6196f93076ad6da3b913662ae"
   integrity sha512-i13qo6kIHTTpCm8/Wup+0b1mVWETvu2kIMzKoK8FpkLkFxlt0znUAHcMzox+T8sPlqtZXq3CulEjQHsYiGFJUw==
   dependencies:
     toggle-selection "^1.0.6"
 
+core-js-compat@^3.14.0, core-js-compat@^3.16.0, core-js-compat@^3.8.1:
+  version "3.16.0"
+  resolved "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.16.0.tgz#fced4a0a534e7e02f7e084bff66c701f8281805f"
+  integrity sha512-5D9sPHCdewoUK7pSUPfTF7ZhLh8k9/CoJXWUEo+F1dZT5Z1DVgcuRqUKhjeKW+YLb8f21rTFgWwQJiNw1hoZ5Q==
+  dependencies:
+    browserslist "^4.16.6"
+    semver "7.0.0"
+
 core-js-compat@^3.9.0, core-js-compat@^3.9.1:
   version "3.13.1"
   resolved "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.13.1.tgz#05444caa8f153be0c67db03cf8adb8ec0964e58e"
@@ -10019,21 +11014,41 @@ core-js-compat@^3.9.0, core-js-compat@^3.9.1:
     browserslist "^4.16.6"
     semver "7.0.0"
 
-core-js-pure@^3.0.0, core-js-pure@^3.0.1, core-js-pure@^3.10.2, core-js-pure@^3.6.5:
+core-js-pure@^3.10.2, core-js-pure@^3.6.5:
   version "3.15.1"
   resolved "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.15.1.tgz#8356f6576fa2aa8e54ca6fe02620968ff010eed7"
   integrity sha512-OZuWHDlYcIda8sJLY4Ec6nWq2hRjlyCqCZ+jCflyleMkVt3tPedDVErvHslyS2nbO+SlBFMSBJYvtLMwxnrzjA==
 
-core-js@3, core-js@^3.0.1, core-js@^3.0.4, core-js@^3.6.0, core-js@^3.6.5, core-js@^3.8.2:
-  version "3.15.0"
-  resolved "https://registry.npmjs.org/core-js/-/core-js-3.15.0.tgz#db9554ebce0b6fd90dc9b1f2465c841d2d055044"
-  integrity sha512-GUbtPllXMYRzIgHNZ4dTYTcUemls2cni83Q4Q/TrFONHfhcg9oEGOtaGHfb0cpzec60P96UKPvMkjX1jET8rUw==
+core-js-pure@^3.16.0:
+  version "3.16.2"
+  resolved "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.16.2.tgz#0ef4b79cabafb251ea86eb7d139b42bd98c533e8"
+  integrity sha512-oxKe64UH049mJqrKkynWp6Vu0Rlm/BTXO/bJZuN2mmR3RtOFNepLlSWDd1eo16PzHpQAoNG97rLU1V/YxesJjw==
+
+core-js-pure@^3.8.2:
+  version "3.16.0"
+  resolved "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.16.0.tgz#218e07add3f1844e53fab195c47871fc5ba18de8"
+  integrity sha512-wzlhZNepF/QA9yvx3ePDgNGudU5KDB8lu/TRPKelYA/QtSnkS/cLl2W+TIdEX1FAFcBr0YpY7tPDlcmXJ7AyiQ==
 
 core-js@^2.4.0, core-js@^2.6.10:
   version "2.6.11"
   resolved "https://registry.npmjs.org/core-js/-/core-js-2.6.11.tgz#38831469f9922bded8ee21c9dc46985e0399308c"
   integrity sha512-5wjnpaT/3dV+XB4borEsnAYQchn00XSgTAWKDkEqv+K8KevjbzmofK6hfJ9TZIlpj2N0xQpazy7PiRQiWHqzWg==
 
+core-js@^2.5.0:
+  version "2.6.12"
+  resolved "https://registry.npmjs.org/core-js/-/core-js-2.6.12.tgz#d9333dfa7b065e347cc5682219d6f690859cc2ec"
+  integrity sha512-Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ==
+
+core-js@^3.0.4, core-js@^3.6.5, core-js@^3.8.2:
+  version "3.15.0"
+  resolved "https://registry.npmjs.org/core-js/-/core-js-3.15.0.tgz#db9554ebce0b6fd90dc9b1f2465c841d2d055044"
+  integrity sha512-GUbtPllXMYRzIgHNZ4dTYTcUemls2cni83Q4Q/TrFONHfhcg9oEGOtaGHfb0cpzec60P96UKPvMkjX1jET8rUw==
+
+core-js@^3.6.0:
+  version "3.17.3"
+  resolved "https://registry.npmjs.org/core-js/-/core-js-3.17.3.tgz#8e8bd20e91df9951e903cabe91f9af4a0895bc1e"
+  integrity sha512-lyvajs+wd8N1hXfzob1LdOCCHFU4bGMbqqmLn1Q4QlCpDqWPpGf+p0nj+LNrvDDG33j0hZXw2nsvvVpHysxyNw==
+
 core-util-is@1.0.2, core-util-is@~1.0.0:
   version "1.0.2"
   resolved "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7"
@@ -10193,22 +11208,13 @@ cross-fetch@3.0.6:
   dependencies:
     node-fetch "2.6.1"
 
-cross-fetch@3.1.4, cross-fetch@^3.0.4, cross-fetch@^3.0.6, cross-fetch@^3.1.3:
+cross-fetch@3.1.4, cross-fetch@^3.0.4, cross-fetch@^3.0.6, cross-fetch@^3.1.3, cross-fetch@^3.1.4:
   version "3.1.4"
   resolved "https://registry.npmjs.org/cross-fetch/-/cross-fetch-3.1.4.tgz#9723f3a3a247bf8b89039f3a380a9244e8fa2f39"
   integrity sha512-1eAtFWdIubi6T4XPy6ei9iUFoKpUkIF971QLN8lIvvvwueI65+Nw5haMNKUwfJxabqlIIDODJKGrQ66gxC0PbQ==
   dependencies:
     node-fetch "2.6.1"
 
-cross-spawn@7.0.1:
-  version "7.0.1"
-  resolved "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.1.tgz#0ab56286e0f7c24e153d04cc2aa027e43a9a5d14"
-  integrity sha512-u7v4o84SwFpD32Z8IIcPZ6z1/ie24O6RU3RbtL5Y316l3KuHVPx9ItBgWQ6VlfAFnRnTtMUrsQ9MUUTuEZjogg==
-  dependencies:
-    path-key "^3.1.0"
-    shebang-command "^2.0.0"
-    which "^2.0.1"
-
 cross-spawn@7.0.3, cross-spawn@^7.0.0, cross-spawn@^7.0.1, cross-spawn@^7.0.2, cross-spawn@^7.0.3:
   version "7.0.3"
   resolved "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz#f73a85b9d5d41d045551c177e2882d4ac85728a6"
@@ -10255,11 +11261,6 @@ crypto-browserify@^3.11.0:
     randombytes "^2.0.0"
     randomfill "^1.0.3"
 
-crypto-random-string@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.npmjs.org/crypto-random-string/-/crypto-random-string-1.0.0.tgz#a230f64f568310e1498009940790ec99545bca7e"
-  integrity sha1-ojD2T1aDEOFJgAmUB5DsmVRbyn4=
-
 crypto-random-string@^2.0.0:
   version "2.0.0"
   resolved "https://registry.npmjs.org/crypto-random-string/-/crypto-random-string-2.0.0.tgz#ef2a7a966ec11083388369baa02ebead229b30d5"
@@ -10302,14 +11303,14 @@ css-in-js-utils@^2.0.0:
     hyphenate-style-name "^1.0.2"
     isobject "^3.0.1"
 
-css-line-break@1.1.1:
-  version "1.1.1"
-  resolved "https://registry.npmjs.org/css-line-break/-/css-line-break-1.1.1.tgz#d5e9bdd297840099eb0503c7310fd34927a026ef"
-  integrity sha512-1feNVaM4Fyzdj4mKPIQNL2n70MmuYzAXZ1aytlROFX1JsOo070OsugwGjj7nl6jnDJWHDM8zRZswkmeYVWZJQA==
+css-line-break@2.0.1:
+  version "2.0.1"
+  resolved "https://registry.npmjs.org/css-line-break/-/css-line-break-2.0.1.tgz#3dc74c2ed5eb64211480281932475790243e7338"
+  integrity sha512-gwKYIMUn7xodIcb346wgUhE2Dt5O1Kmrc16PWi8sL4FTfyDj8P5095rzH7+O8CTZudJr+uw2GCI/hwEkDJFI2w==
   dependencies:
     base64-arraybuffer "^0.2.0"
 
-css-loader@^3.5.3:
+css-loader@^3.6.0:
   version "3.6.0"
   resolved "https://registry.npmjs.org/css-loader/-/css-loader-3.6.0.tgz#2e4b2c7e6e2d27f8c8f28f61bffcd2e6c91ef645"
   integrity sha512-M5lSukoWi1If8dhQAUCvj4H8vUt3vOnwbQBH9DdTm/s4Ym2B/3dPMtYZeJmq7Q3S3Pa+I94DcZ7pc9bP14cWIQ==
@@ -10835,27 +11836,27 @@ dataloader@2.0.0:
   resolved "https://registry.npmjs.org/dataloader/-/dataloader-2.0.0.tgz#41eaf123db115987e21ca93c005cd7753c55fe6f"
   integrity sha512-YzhyDAwA4TaQIhM5go+vCLmU0UikghC/t9DTQYZR2M/UvZ1MdOhPezSDZcjj9uqQJOMqjLcpWtyW2iNINdlatQ==
 
-date-and-time@^0.6.3:
-  version "0.6.3"
-  resolved "https://registry.npmjs.org/date-and-time/-/date-and-time-0.6.3.tgz#2daee52df67c28bd93bce862756ac86b68cf4237"
-  integrity sha512-lcWy3AXDRJOD7MplwZMmNSRM//kZtJaLz4n6D1P5z9wEmZGBKhJRBIr1Xs9KNQJmdXPblvgffynYji4iylUTcA==
-
 date-and-time@^1.0.0:
   version "1.0.0"
   resolved "https://registry.npmjs.org/date-and-time/-/date-and-time-1.0.0.tgz#0062394bdf6f44e961f0db00511cb19cdf3cc0a5"
   integrity sha512-477D7ypIiqlXBkxhU7YtG9wWZJEQ+RUpujt2quTfgf4+E8g5fNUkB0QIL0bVyP5/TKBg8y55Hfa1R/c4bt3dEw==
 
+date-fns@2.0.0-alpha.27:
+  version "2.0.0-alpha.27"
+  resolved "https://registry.npmjs.org/date-fns/-/date-fns-2.0.0-alpha.27.tgz#5ecd4204ef0e7064264039570f6e8afbc014481c"
+  integrity sha512-cqfVLS+346P/Mpj2RpDrBv0P4p2zZhWWvfY5fuWrXNR/K38HaAGEkeOwb47hIpQP9Jr/TIxjZ2/sNMQwdXuGMg==
+
 date-fns@^1.27.2:
   version "1.30.1"
   resolved "https://registry.npmjs.org/date-fns/-/date-fns-1.30.1.tgz#2e71bf0b119153dbb4cc4e88d9ea5acfb50dc05c"
   integrity sha512-hBSVCvSmWC+QypYObzwGOd9wqdDpOt+0wl0KbU+R+uuZBS1jN8VsD1ss3irQDknRj5NvxiTF6oj/nDRnN/UQNw==
 
-date-fns@^2.0.0-alpha.27, date-fns@^2.16.1, date-fns@^2.18.0:
+date-fns@^2.16.1, date-fns@^2.18.0:
   version "2.19.0"
   resolved "https://registry.npmjs.org/date-fns/-/date-fns-2.19.0.tgz#65193348635a28d5d916c43ec7ce6fbd145059e1"
   integrity sha512-X3bf2iTPgCAQp9wvjOQytnf5vO5rESYRXlPIVcgSbtT5OTScPcsf9eZU+B/YIkKAtYr5WeCii58BgATrNitlWg==
 
-dateformat@^3.0.0:
+dateformat@^3.0.0, dateformat@^3.0.3:
   version "3.0.3"
   resolved "https://registry.npmjs.org/dateformat/-/dateformat-3.0.3.tgz#a6e37499a4d9a9cf85ef5872044d62901c9889ae"
   integrity sha512-jyCETtSl3VMZMWeRo7iY1FL19ges1t55hMo5yaam4Jrsm5EPL89UQkoQRyiI+Yf4k8r2ZpdngkV8hr1lIdjb3Q==
@@ -10865,18 +11866,11 @@ dayjs@^1.10.4, dayjs@^1.9.4:
   resolved "https://registry.npmjs.org/dayjs/-/dayjs-1.10.4.tgz#8e544a9b8683f61783f570980a8a80eaf54ab1e2"
   integrity sha512-RI/Hh4kqRc1UKLOAf/T5zdMMX5DQIlDxwUe3wSyMMnEbGunnpENCdbUgM+dW7kXidZqCttBrmw7BhN4TMddkCw==
 
-debounce@^1.2.0:
+debounce@1.2.0, debounce@^1.2.0:
   version "1.2.0"
   resolved "https://registry.npmjs.org/debounce/-/debounce-1.2.0.tgz#44a540abc0ea9943018dc0eaa95cce87f65cd131"
   integrity sha512-mYtLl1xfZLi1m4RtQYlZgJUNQjl4ZxVnHzIR8nLLgi4q1YT8o/WM+MK/f8yfcc9s5Ir5zRaPZyZU6xs1Syoocg==
 
-debug@2.2.0:
-  version "2.2.0"
-  resolved "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz#f87057e995b1a1f6ae6a4960664137bc56f039da"
-  integrity sha1-+HBX6ZWxofauaklgZkE3vFbwOdo=
-  dependencies:
-    ms "0.7.1"
-
 debug@2.6.9, debug@^2.2.0, debug@^2.3.3, debug@^2.6.0, debug@^2.6.9:
   version "2.6.9"
   resolved "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f"
@@ -10898,7 +11892,7 @@ debug@4.3.1:
   dependencies:
     ms "2.1.2"
 
-debug@^3.0.0, debug@^3.1.0, debug@^3.1.1, debug@^3.2.5, debug@^3.2.6:
+debug@^3.0.0, debug@^3.1.0, debug@^3.1.1, debug@^3.2.6:
   version "3.2.6"
   resolved "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz#e83d17de16d8a7efb7717edbe5fb10135eee629b"
   integrity sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==
@@ -10996,13 +11990,12 @@ deepmerge@4.2.2, deepmerge@^4.2.2:
   resolved "https://registry.npmjs.org/deepmerge/-/deepmerge-4.2.2.tgz#44d2ea3679b8f4d4ffba33f03d865fc1e7bf4955"
   integrity sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg==
 
-default-gateway@^4.2.0:
-  version "4.2.0"
-  resolved "https://registry.npmjs.org/default-gateway/-/default-gateway-4.2.0.tgz#167104c7500c2115f6dd69b0a536bb8ed720552b"
-  integrity sha512-h6sMrVB1VMWVrW13mSc6ia/DwYYw5MN6+exNu1OaJeFac5aSAvwM7lZ0NVfTABuSkQelr4h5oebg3KB1XPdjgA==
+default-gateway@^6.0.0:
+  version "6.0.3"
+  resolved "https://registry.npmjs.org/default-gateway/-/default-gateway-6.0.3.tgz#819494c888053bdb743edbf343d6cdf7f2943a71"
+  integrity sha512-fwSOJsbbNzZ/CUFpqFBqYfYNLj1NbMPm8MMCIzHjC83iSJRBEGmDUxU+WP661BaBQImeC2yHwXtz+P/O9o+XEg==
   dependencies:
-    execa "^1.0.0"
-    ip-regex "^2.1.0"
+    execa "^5.0.0"
 
 defaults@^1.0.3:
   version "1.0.3"
@@ -11021,6 +12014,11 @@ defer-to-connect@^2.0.0:
   resolved "https://registry.npmjs.org/defer-to-connect/-/defer-to-connect-2.0.0.tgz#83d6b199db041593ac84d781b5222308ccf4c2c1"
   integrity sha512-bYL2d05vOSf1JEZNx5vSAtPuBMkX8K9EUutg7zlKvTqKXHt7RhWJFbmd7qakVuf13i+IkGmp6FwSsONOf6VYIg==
 
+define-lazy-prop@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.npmjs.org/define-lazy-prop/-/define-lazy-prop-2.0.0.tgz#3f7ae421129bcaaac9bc74905c98a0009ec9ee7f"
+  integrity sha512-Ds09qNh8yw3khSjiJjiUInaGX9xlqZDY7JVryGxdxV7NPeuqQfplOpQ66yJFZut3jLa5zOwkXw1g9EI2uKh4Og==
+
 define-properties@^1.1.2, define-properties@^1.1.3:
   version "1.1.3"
   resolved "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz#cf88da6cbee26fe6db7094f61d870cbd84cee9f1"
@@ -11050,19 +12048,6 @@ define-property@^2.0.2:
     is-descriptor "^1.0.2"
     isobject "^3.0.1"
 
-del@^4.1.1:
-  version "4.1.1"
-  resolved "https://registry.npmjs.org/del/-/del-4.1.1.tgz#9e8f117222ea44a31ff3a156c049b99052a9f0b4"
-  integrity sha512-QwGuEUouP2kVwQenAsOof5Fv8K9t3D8Ca8NxcXKrIpEHjTXK5J2nXLdP+ALI1cgv8wj7KuwBhTwBkOZSJKM5XQ==
-  dependencies:
-    "@types/glob" "^7.1.1"
-    globby "^6.1.0"
-    is-path-cwd "^2.0.0"
-    is-path-in-cwd "^2.0.0"
-    p-map "^2.0.0"
-    pify "^4.0.1"
-    rimraf "^2.6.3"
-
 del@^6.0.0:
   version "6.0.0"
   resolved "https://registry.npmjs.org/del/-/del-6.0.0.tgz#0b40d0332cea743f1614f818be4feb717714c952"
@@ -11140,6 +12125,13 @@ destroy@~1.0.4:
   resolved "https://registry.npmjs.org/destroy/-/destroy-1.0.4.tgz#978857442c44749e4206613e37946205826abd80"
   integrity sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA=
 
+detab@2.0.4:
+  version "2.0.4"
+  resolved "https://registry.npmjs.org/detab/-/detab-2.0.4.tgz#b927892069aff405fbb9a186fe97a44a92a94b43"
+  integrity sha512-8zdsQA5bIkoRECvCrNKPla84lyoR7DSAyf7p0YgXzBO9PDJx8KntPUay7NS6yp+KdxdVtiE5SpHKtbp2ZQyA9g==
+  dependencies:
+    repeat-string "^1.5.4"
+
 detect-indent@^5.0.0:
   version "5.0.0"
   resolved "https://registry.npmjs.org/detect-indent/-/detect-indent-5.0.0.tgz#3871cc0a6a002e8c3e5b3cf7f336264675f06b9d"
@@ -11211,11 +12203,6 @@ diff3@0.0.3:
   resolved "https://registry.npmjs.org/diff3/-/diff3-0.0.3.tgz#d4e5c3a4cdf4e5fe1211ab42e693fcb4321580fc"
   integrity sha1-1OXDpM305f4SEatC5pP8tDIVgPw=
 
-diff@1.4.0:
-  version "1.4.0"
-  resolved "https://registry.npmjs.org/diff/-/diff-1.4.0.tgz#7f28d2eb9ee7b15a97efd89ce63dcfdaa3ccbabf"
-  integrity sha1-fyjS657nsVqX79ic5j3P2qPMur8=
-
 diff@^4.0.1:
   version "4.0.2"
   resolved "https://registry.npmjs.org/diff/-/diff-4.0.2.tgz#60f3aecb89d5fae520c11aa19efc2bb982aade7d"
@@ -11235,14 +12222,6 @@ diffie-hellman@^5.0.0:
     miller-rabin "^4.0.0"
     randombytes "^2.0.0"
 
-dir-glob@2.0.0:
-  version "2.0.0"
-  resolved "https://registry.npmjs.org/dir-glob/-/dir-glob-2.0.0.tgz#0b205d2b6aef98238ca286598a8204d29d0a0034"
-  integrity sha512-37qirFDz8cA5fimp9feo43fSuRo2gHwaIn6dXL8Ber1dGwUosDrGZeCCXq57WnIqE4aQ+u3eQZzsk1yOzhdwag==
-  dependencies:
-    arrify "^1.0.1"
-    path-type "^3.0.0"
-
 dir-glob@^2.0.0, dir-glob@^2.2.2:
   version "2.2.2"
   resolved "https://registry.npmjs.org/dir-glob/-/dir-glob-2.2.2.tgz#fa09f0694153c8918b18ba0deafae94769fc50c4"
@@ -11324,10 +12303,10 @@ doctrine@^3.0.0:
   dependencies:
     esutils "^2.0.2"
 
-dom-accessibility-api@^0.5.4:
-  version "0.5.4"
-  resolved "https://registry.npmjs.org/dom-accessibility-api/-/dom-accessibility-api-0.5.4.tgz#b06d059cdd4a4ad9a79275f9d414a5c126241166"
-  integrity sha512-TvrjBckDy2c6v6RLxPv5QXOnU+SmF9nBII5621Ve5fu6Z/BDrENurBEvlC1f44lKEUVqOpK4w9E5Idc5/EgkLQ==
+dom-accessibility-api@^0.5.4, dom-accessibility-api@^0.5.6:
+  version "0.5.6"
+  resolved "https://registry.npmjs.org/dom-accessibility-api/-/dom-accessibility-api-0.5.6.tgz#3f5d43b52c7a3bd68b5fb63fa47b4e4c1fdf65a9"
+  integrity sha512-DplGLZd8L1lN64jlT27N9TVSESFR5STaEJvX+thCby7fuCHonfPpAlodYc3vuUYbDuDec5w8AMP7oCM5TWFsqw==
 
 dom-converter@^0.2:
   version "0.2.0"
@@ -11423,10 +12402,10 @@ domhandler@^4.0.0:
   dependencies:
     domelementtype "^2.1.0"
 
-dompurify@^2.0.12, dompurify@^2.1.1, dompurify@^2.2.8:
-  version "2.2.8"
-  resolved "https://registry.npmjs.org/dompurify/-/dompurify-2.2.8.tgz#ce88e395f6d00b6dc53f80d6b2a6fdf5446873c6"
-  integrity sha512-9H0UL59EkDLgY3dUFjLV6IEUaHm5qp3mxSqWw7Yyx4Zhk2Jn2cmLe+CNPP3xy13zl8Bqg+0NehQzkdMoVhGRww==
+dompurify@^2.0.12, dompurify@^2.1.1, dompurify@^2.2.9:
+  version "2.3.1"
+  resolved "https://registry.npmjs.org/dompurify/-/dompurify-2.3.1.tgz#a47059ca21fd1212d3c8f71fdea6943b8bfbdf6a"
+  integrity sha512-xGWt+NHAQS+4tpgbOAI08yxW0Pr256Gu/FNE2frZVTbgrBUn8M7tz7/ktS/LZ2MHeGqz6topj0/xY+y8R5FBFw==
 
 domutils@1.5.1:
   version "1.5.1"
@@ -11444,7 +12423,7 @@ domutils@^1.5.1, domutils@^1.7.0:
     dom-serializer "0"
     domelementtype "1"
 
-domutils@^2.0.0, domutils@^2.4.4:
+domutils@^2.0.0:
   version "2.4.4"
   resolved "https://registry.npmjs.org/domutils/-/domutils-2.4.4.tgz#282739c4b150d022d34699797369aad8d19bbbd3"
   integrity sha512-jBC0vOsECI4OMdD0GC9mGn7NXPLb+Qt6KW1YDQzeQYRUFKmNG8lh7mO5HiELfr+lLQE7loDVI4QcAxV80HS+RA==
@@ -11461,13 +12440,6 @@ dot-case@^3.0.4:
     no-case "^3.0.4"
     tslib "^2.0.3"
 
-dot-prop@^4.1.0:
-  version "4.2.1"
-  resolved "https://registry.npmjs.org/dot-prop/-/dot-prop-4.2.1.tgz#45884194a71fc2cda71cbb4bceb3a4dd2f433ba4"
-  integrity sha512-l0p4+mIuJIua0mhxGoh4a+iNL9bmeK5DvnSVQa6T0OhrVmaEa1XScX5Etc673FePCJOArq/4Pa2cLGODUWTPOQ==
-  dependencies:
-    is-obj "^1.0.0"
-
 dot-prop@^5.1.0, dot-prop@^5.2.0:
   version "5.3.0"
   resolved "https://registry.npmjs.org/dot-prop/-/dot-prop-5.3.0.tgz#90ccce708cd9cd82cc4dc8c3ddd9abdd55b20e88"
@@ -11494,10 +12466,10 @@ dotenv-expand@^5.1.0:
   resolved "https://registry.npmjs.org/dotenv-expand/-/dotenv-expand-5.1.0.tgz#3fbaf020bfd794884072ea26b1e9791d45a629f0"
   integrity sha512-YXQl1DSa4/PQyRfgrv6aoNjhasp/p4qs9FjJ4q4cQk+8m4r6k4ZSiEyytKG8f8W9gi8WsQtIObNmKd+tMzNTmA==
 
-dotenv-webpack@^1.7.0:
-  version "1.7.0"
-  resolved "https://registry.npmjs.org/dotenv-webpack/-/dotenv-webpack-1.7.0.tgz#4384d8c57ee6f405c296278c14a9f9167856d3a1"
-  integrity sha512-wwNtOBW/6gLQSkb8p43y0Wts970A3xtNiG/mpwj9MLUhtPCQG6i+/DSXXoNN7fbPCU/vQ7JjwGmgOeGZSSZnsw==
+dotenv-webpack@^1.8.0:
+  version "1.8.0"
+  resolved "https://registry.npmjs.org/dotenv-webpack/-/dotenv-webpack-1.8.0.tgz#7ca79cef2497dd4079d43e81e0796bc9d0f68a5e"
+  integrity sha512-o8pq6NLBehtrqA8Jv8jFQNtG9nhRtVqmoD4yWbgUyoU3+9WBlPe+c2EAiaJok9RB28QvrWvdWLZGeTT5aATDMg==
   dependencies:
     dotenv-defaults "^1.0.2"
 
@@ -11511,17 +12483,17 @@ dotenv@^8.0.0, dotenv@^8.2.0:
   resolved "https://registry.npmjs.org/dotenv/-/dotenv-8.2.0.tgz#97e619259ada750eea3e4ea3e26bceea5424b16a"
   integrity sha512-8sJ78ElpbDJBHNeBzUbUVLsqKdccaa/BXF1uPTw3GrvQTBgrQrtObr2mUrE38vzYd8cEv+m/JBfDLioYcfXoaw==
 
-downshift@^6.0.6:
-  version "6.0.7"
-  resolved "https://registry.npmjs.org/downshift/-/downshift-6.0.7.tgz#05ef58b991e4467cdb8cd36e7a87a011d0bada5c"
-  integrity sha512-+rqgx3JTSs8b4V9q++hsLvaP8mhMOdX7u+jy5S2etg7+Y7uFLVzZaI0S7Xo2yEnNDmTcNnYZZ/vFjdWuJ2kZdg==
+downshift@^6.0.15:
+  version "6.1.5"
+  resolved "https://registry.npmjs.org/downshift/-/downshift-6.1.5.tgz#f6ffbead35680df6263c15e6eeb55cec77dadc50"
+  integrity sha512-9hpSCQLQ0KzlnI9ebpdbLuw5ogm7MXXI1D5N1zGWYSjHph+Xe02enXKyfDDE14akGr0jppAg0S1t/cjXp677ew==
   dependencies:
-    "@babel/runtime" "^7.12.5"
-    compute-scroll-into-view "^1.0.16"
+    "@babel/runtime" "^7.14.8"
+    compute-scroll-into-view "^1.0.17"
     prop-types "^15.7.2"
-    react-is "^17.0.1"
+    react-is "^17.0.2"
 
-dset@^3.0.0:
+dset@^3.1.0:
   version "3.1.0"
   resolved "https://registry.npmjs.org/dset/-/dset-3.1.0.tgz#23feb6df93816ea452566308b1374d6e869b0d7b"
   integrity sha512-7xTQ5DzyE59Nn+7ZgXDXjKAGSGmXZHqttMVVz1r4QNfmGpyj+cm2YtI3II0c/+4zS4a9yq2mBhgdeq2QnpcYlw==
@@ -11550,7 +12522,7 @@ duplexer@^0.1.1, duplexer@~0.1.1:
   resolved "https://registry.npmjs.org/duplexer/-/duplexer-0.1.1.tgz#ace6ff808c1ce66b57d1ebf97977acb02334cfc1"
   integrity sha1-rOb/gIwc5mtX0ev5eXessCM0z8E=
 
-duplexify@^3.4.2, duplexify@^3.5.0, duplexify@^3.6.0:
+duplexify@^3.4.2, duplexify@^3.6.0:
   version "3.7.1"
   resolved "https://registry.npmjs.org/duplexify/-/duplexify-3.7.1.tgz#2a4df5317f6ccfd91f86d6fd25d8d8a103b88309"
   integrity sha512-07z8uv2wMyS51kKhD1KsdXJg5WQ6t93RneqRxUHnskXVtlYYkLqM0gqStQZ3pj073g687jPCHrqNfCzawLYh5g==
@@ -11590,14 +12562,22 @@ ee-first@1.1.1:
   resolved "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d"
   integrity sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=
 
-ejs@^3.1.2:
-  version "3.1.5"
-  resolved "https://registry.npmjs.org/ejs/-/ejs-3.1.5.tgz#aed723844dc20acb4b170cd9ab1017e476a0d93b"
-  integrity sha512-dldq3ZfFtgVTJMLjOe+/3sROTzALlL9E34V4/sDtUd/KlBSS0s6U1/+WPE1B4sj9CXHJpL1M6rhNJnc9Wbal9w==
+elastic-builder@^2.16.0:
+  version "2.16.0"
+  resolved "https://registry.npmjs.org/elastic-builder/-/elastic-builder-2.16.0.tgz#684757ab9e6a4214653d23d84cec5ab8d185892f"
+  integrity sha512-5EXFxTAOPQFW7uYe59lZ5pqHBoyILQ8U3x1GgZN921EfAsLNdA2kMV0bgK8/rwJOd9JM0F40WpGxCPzHRtCG1Q==
   dependencies:
-    jake "^10.6.1"
+    babel-runtime "^6.26.0"
+    lodash.has "^4.5.2"
+    lodash.hasin "^4.5.2"
+    lodash.head "^4.0.1"
+    lodash.isempty "^4.4.0"
+    lodash.isnil "^4.0.0"
+    lodash.isobject "^3.0.2"
+    lodash.isstring "^4.0.1"
+    lodash.omit "^4.5.0"
 
-electron-to-chromium@^1.3.378, electron-to-chromium@^1.3.564, electron-to-chromium@^1.3.723:
+electron-to-chromium@^1.3.564, electron-to-chromium@^1.3.723:
   version "1.3.739"
   resolved "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.739.tgz#f07756aa92cabd5a6eec6f491525a64fe62f98b9"
   integrity sha512-+LPJVRsN7hGZ9EIUUiWCpO7l4E3qBYHNadazlucBfsXBbccDFNKUBAgzE68FnkWGJPwD/AfKhSzL+G+Iqb8A4A==
@@ -11607,10 +12587,10 @@ elegant-spinner@^1.0.1:
   resolved "https://registry.npmjs.org/elegant-spinner/-/elegant-spinner-1.0.1.tgz#db043521c95d7e303fd8f345bedc3349cfb0729e"
   integrity sha1-2wQ1IcldfjA/2PNFvtwzSc+wcp4=
 
-element-resize-detector@^1.2.1:
-  version "1.2.1"
-  resolved "https://registry.npmjs.org/element-resize-detector/-/element-resize-detector-1.2.1.tgz#b0305194447a4863155e58f13323a0aef30851d1"
-  integrity sha512-BdFsPepnQr9fznNPF9nF4vQ457U/ZJXQDSNF1zBe7yaga8v9AdZf3/NElYxFdUh7SitSGt040QygiTo6dtatIw==
+element-resize-detector@^1.2.2:
+  version "1.2.3"
+  resolved "https://registry.npmjs.org/element-resize-detector/-/element-resize-detector-1.2.3.tgz#5078d9b99398fe4c589f8c8df94ff99e5d413ff3"
+  integrity sha512-+dhNzUgLpq9ol5tyhoG7YLoXL3ssjfFW+0gpszXPwRU6NjGr1fVHMEAF8fVzIiRJq57Nre0RFeIjJwI8Nh2NmQ==
   dependencies:
     batch-processor "1.0.0"
 
@@ -11657,17 +12637,12 @@ emoji-regex@^9.0.0:
   resolved "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz#840c8803b0d8047f4ff0cf963176b32d4ef3ed72"
   integrity sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==
 
-emojis-list@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.npmjs.org/emojis-list/-/emojis-list-2.1.0.tgz#4daa4d9db00f9819880c79fa457ae5b09a1fd389"
-  integrity sha1-TapNnbAPmBmIDHn6RXrlsJof04k=
-
 emojis-list@^3.0.0:
   version "3.0.0"
   resolved "https://registry.npmjs.org/emojis-list/-/emojis-list-3.0.0.tgz#5570662046ad29e2e916e71aae260abdff4f6a78"
   integrity sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==
 
-emotion-theming@^10.0.19, emotion-theming@^10.0.27:
+emotion-theming@^10.0.27:
   version "10.0.27"
   resolved "https://registry.npmjs.org/emotion-theming/-/emotion-theming-10.0.27.tgz#1887baaec15199862c89b1b984b79806f2b9ab10"
   integrity sha512-MlF1yu/gYh8u+sLUqA0YuA9JX0P4Hb69WlKc/9OLo+WCXuX6sy/KoIa+qJimgmr2dWqnypYKYPX37esjDBbhdw==
@@ -11709,15 +12684,23 @@ endent@^2.0.1:
     fast-json-parse "^1.0.3"
     objectorarray "^1.0.4"
 
-enhanced-resolve@^4.0.0, enhanced-resolve@^4.3.0:
-  version "4.3.0"
-  resolved "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-4.3.0.tgz#3b806f3bfafc1ec7de69551ef93cca46c1704126"
-  integrity sha512-3e87LvavsdxyoCfGusJnrZ5G8SLPOFeHSNpZI/ATL9a5leXo2k0w6MKnbqhdBad9qTobSfB20Ld7UmgoNbAZkQ==
+enhanced-resolve@^4.0.0, enhanced-resolve@^4.5.0:
+  version "4.5.0"
+  resolved "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-4.5.0.tgz#2f3cfd84dbe3b487f18f2db2ef1e064a571ca5ec"
+  integrity sha512-Nv9m36S/vxpsI+Hc4/ZGRs0n9mXqSWGGq49zxb/cJfPAQMbUtttJAlNPS4AQzaBdw/pKskw5bMbekT/Y7W/Wlg==
   dependencies:
     graceful-fs "^4.1.2"
     memory-fs "^0.5.0"
     tapable "^1.0.0"
 
+enhanced-resolve@^5.8.0:
+  version "5.8.2"
+  resolved "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.8.2.tgz#15ddc779345cbb73e97c611cd00c01c1e7bf4d8b"
+  integrity sha512-F27oB3WuHDzvR2DOGNTaYy0D5o0cnrv8TeI482VM4kYgQd/FT9lUQwuNsJ0oOHtBUq7eiW5ytqzp7nBFknL+GA==
+  dependencies:
+    graceful-fs "^4.2.4"
+    tapable "^2.2.0"
+
 enquirer@^2.3.0, enquirer@^2.3.5:
   version "2.3.6"
   resolved "https://registry.npmjs.org/enquirer/-/enquirer-2.3.6.tgz#2a7fe5dd634a1e4125a975ec994ff5456dc3734d"
@@ -11781,11 +12764,6 @@ error-stack-parser@^2.0.6:
   dependencies:
     stackframe "^1.1.1"
 
-errs@^0.3.2:
-  version "0.3.2"
-  resolved "https://registry.npmjs.org/errs/-/errs-0.3.2.tgz#798099b2dbd37ca2bc749e538a7c1307d0b50499"
-  integrity sha1-eYCZstvTfKK8dJ5TinwTB9C1BJk=
-
 es-abstract@^1.17.0, es-abstract@^1.17.0-next.0, es-abstract@^1.17.0-next.1, es-abstract@^1.17.2, es-abstract@^1.17.4, es-abstract@^1.17.5, es-abstract@^1.18.0-next.1, es-abstract@^1.18.0-next.2:
   version "1.18.0"
   resolved "https://registry.npmjs.org/es-abstract/-/es-abstract-1.18.0.tgz#ab80b359eecb7ede4c298000390bc5ac3ec7b5a4"
@@ -11826,6 +12804,11 @@ es-get-iterator@^1.0.2:
     is-string "^1.0.5"
     isarray "^2.0.5"
 
+es-module-lexer@^0.7.1:
+  version "0.7.1"
+  resolved "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-0.7.1.tgz#c2c8e0f46f2df06274cdaf0dd3f3b33e0a0b267d"
+  integrity sha512-MgtWFl5No+4S3TmhDmCz2ObFGm6lEpTnzbQi+Dd+pw4mlTIZTmM2iAs5gRlmx5zS9luzobCSBSI90JM/1/JgOw==
+
 es-to-primitive@^1.2.1:
   version "1.2.1"
   resolved "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz#e55cd4c9cdc188bcefb03b366c736323fc5c898a"
@@ -11858,18 +12841,6 @@ es6-iterator@^2.0.3, es6-iterator@~2.0.3:
     es5-ext "^0.10.35"
     es6-symbol "^3.1.1"
 
-es6-promise@^4.0.3:
-  version "4.2.8"
-  resolved "https://registry.npmjs.org/es6-promise/-/es6-promise-4.2.8.tgz#4eb21594c972bc40553d276e510539143db53e0a"
-  integrity sha512-HJDGx5daxeIvxdBxvG2cb9g4tEvwIk3i8+nhX0yGrYmZUzbkdg8QbDevheDB8gd0//uPj4c1EQua8Q+MViT0/w==
-
-es6-promisify@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.npmjs.org/es6-promisify/-/es6-promisify-5.0.0.tgz#5109d62f3e56ea967c4b63505aef08291c8a5203"
-  integrity sha1-UQnWLz5W6pZ8S2NQWu8IKRyKUgM=
-  dependencies:
-    es6-promise "^4.0.3"
-
 es6-shim@^0.35.5:
   version "0.35.5"
   resolved "https://registry.npmjs.org/es6-shim/-/es6-shim-0.35.5.tgz#46f59dc0a84a1c5029e8ff1166ca0a902077a9ab"
@@ -11913,11 +12884,6 @@ escape-html@^1.0.3, escape-html@~1.0.3:
   resolved "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz#0258eae4d3d0c0974de1c169188ef0051d1d1988"
   integrity sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg=
 
-escape-string-regexp@1.0.2:
-  version "1.0.2"
-  resolved "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.2.tgz#4dbc2fe674e71949caf3fb2695ce7f2dc1d9a8d1"
-  integrity sha1-Tbwv5nTnGUnK8/smlc5/LcHZqNE=
-
 escape-string-regexp@2.0.0, escape-string-regexp@^2.0.0:
   version "2.0.0"
   resolved "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz#a30304e99daa32e23b2fd20f51babd07cffca344"
@@ -12081,6 +13047,14 @@ eslint-plugin-react@^7.12.4:
     resolve "^1.18.1"
     string.prototype.matchall "^4.0.2"
 
+eslint-scope@5.1.1, eslint-scope@^5.1.1:
+  version "5.1.1"
+  resolved "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz#e786e59a66cb92b3f6c1fb0d508aab174848f48c"
+  integrity sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==
+  dependencies:
+    esrecurse "^4.3.0"
+    estraverse "^4.1.1"
+
 eslint-scope@^4.0.3:
   version "4.0.3"
   resolved "https://registry.npmjs.org/eslint-scope/-/eslint-scope-4.0.3.tgz#ca03833310f6889a3264781aa82e63eb9cfe7848"
@@ -12089,14 +13063,6 @@ eslint-scope@^4.0.3:
     esrecurse "^4.1.0"
     estraverse "^4.1.1"
 
-eslint-scope@^5.1.1:
-  version "5.1.1"
-  resolved "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz#e786e59a66cb92b3f6c1fb0d508aab174848f48c"
-  integrity sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==
-  dependencies:
-    esrecurse "^4.3.0"
-    estraverse "^4.1.1"
-
 eslint-utils@^2.1.0:
   version "2.1.0"
   resolved "https://registry.npmjs.org/eslint-utils/-/eslint-utils-2.1.0.tgz#d2de5e03424e707dc10c74068ddedae708741b27"
@@ -12121,13 +13087,14 @@ eslint-visitor-keys@^2.0.0:
   resolved "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.0.0.tgz#21fdc8fbcd9c795cc0321f0563702095751511a8"
   integrity sha512-QudtT6av5WXels9WjIM7qz1XD1cWGvX4gGXvp/zBn9nXG02D0utdU3Em2m/QjTnrsk6bBjmCygl3rmj118msQQ==
 
-eslint@^7.1.0:
-  version "7.28.0"
-  resolved "https://registry.npmjs.org/eslint/-/eslint-7.28.0.tgz#435aa17a0b82c13bb2be9d51408b617e49c1e820"
-  integrity sha512-UMfH0VSjP0G4p3EWirscJEQ/cHqnT/iuH6oNZOB94nBjWbMnhGEPxsZm1eyIW0C/9jLI0Fow4W5DXLjEI7mn1g==
+eslint@^7.30.0:
+  version "7.30.0"
+  resolved "https://registry.npmjs.org/eslint/-/eslint-7.30.0.tgz#6d34ab51aaa56112fd97166226c9a97f505474f8"
+  integrity sha512-VLqz80i3as3NdloY44BQSJpFw534L9Oh+6zJOUaViV4JPd+DaHwutqP7tcpkW3YiXbK6s05RZl7yl7cQn+lijg==
   dependencies:
     "@babel/code-frame" "7.12.11"
     "@eslint/eslintrc" "^0.4.2"
+    "@humanwhocodes/config-array" "^0.5.0"
     ajv "^6.10.0"
     chalk "^4.0.0"
     cross-spawn "^7.0.2"
@@ -12242,6 +13209,11 @@ event-emitter@^0.3.5:
     d "1"
     es5-ext "~0.10.14"
 
+event-source-polyfill@^1.0.25:
+  version "1.0.25"
+  resolved "https://registry.npmjs.org/event-source-polyfill/-/event-source-polyfill-1.0.25.tgz#d8bb7f99cb6f8119c2baf086d9f6ee0514b6d9c8"
+  integrity sha512-hQxu6sN1Eq4JjoI7ITdQeGGUN193A2ra83qC0Ltm9I2UJVAten3OFVN6k5RX4YWeCS0BoC8xg/5czOCIHVosQg==
+
 event-stream@=3.3.4:
   version "3.3.4"
   resolved "https://registry.npmjs.org/event-stream/-/event-stream-3.3.4.tgz#4ab4c9a0f5a54db9338b4c34d86bfce8f4b35571"
@@ -12260,11 +13232,6 @@ event-target-shim@^5.0.0:
   resolved "https://registry.npmjs.org/event-target-shim/-/event-target-shim-5.0.1.tgz#5d4d3ebdf9583d63a5333ce2deb7480ab2b05789"
   integrity sha512-i/2XbnSz/uxRCU6+NdVJgKWDTM427+MqYbkQzD321DuCQJUqOuJKIA0IM2+W2xtYHdKOmZ4dR6fExsd4SXL+WQ==
 
-eventemitter2@^5.0.1:
-  version "5.0.1"
-  resolved "https://registry.npmjs.org/eventemitter2/-/eventemitter2-5.0.1.tgz#6197a095d5fb6b57e8942f6fd7eaad63a09c9452"
-  integrity sha1-YZegldX7a1folC9v1+qtY6CclFI=
-
 eventemitter2@^6.4.3:
   version "6.4.4"
   resolved "https://registry.npmjs.org/eventemitter2/-/eventemitter2-6.4.4.tgz#aa96e8275c4dbeb017a5d0e03780c65612a1202b"
@@ -12290,12 +13257,12 @@ events@3.1.0:
   resolved "https://registry.npmjs.org/events/-/events-3.1.0.tgz#84279af1b34cb75aa88bf5ff291f6d0bd9b31a59"
   integrity sha512-Rv+u8MLHNOdMjTAFeT3nCjHn2aGlx435FP/sDHNaRhDEMwyI/aB22Kj2qIN8R0cw3z28psEQLYwxVKLsKrMgWg==
 
-events@^3.0.0, events@^3.3.0:
+events@^3.0.0, events@^3.2.0, events@^3.3.0:
   version "3.3.0"
   resolved "https://registry.npmjs.org/events/-/events-3.3.0.tgz#31a95ad0a924e2d2c419a813aeb2c4e878ea7400"
   integrity sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==
 
-eventsource@^1.0.5, eventsource@^1.0.7:
+eventsource@^1.0.5:
   version "1.0.7"
   resolved "https://registry.npmjs.org/eventsource/-/eventsource-1.0.7.tgz#8fbc72c93fcd34088090bc0a4e64f4b5cee6d8d0"
   integrity sha512-4Ln17+vVT0k8aWq+t/bF5arcS3EpT9gYtW66EPacdj/mAFevznsnyoHLPy2BA8gbIQeIHoPsvwmfBftfcG//BQ==
@@ -12315,35 +13282,6 @@ exec-sh@^0.3.2:
   resolved "https://registry.npmjs.org/exec-sh/-/exec-sh-0.3.4.tgz#3a018ceb526cc6f6df2bb504b2bfe8e3a4934ec5"
   integrity sha512-sEFIkc61v75sWeOe72qyrqg2Qg0OuLESziUDk/O/z2qgS15y2gWVFrI6f2Qn/qw/0/NCfCEsmNA4zOjkwEZT1A==
 
-execa@1.0.0, execa@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.npmjs.org/execa/-/execa-1.0.0.tgz#c6236a5bb4df6d6f15e88e7f017798216749ddd8"
-  integrity sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==
-  dependencies:
-    cross-spawn "^6.0.0"
-    get-stream "^4.0.0"
-    is-stream "^1.1.0"
-    npm-run-path "^2.0.0"
-    p-finally "^1.0.0"
-    signal-exit "^3.0.0"
-    strip-eof "^1.0.0"
-
-execa@3.4.0:
-  version "3.4.0"
-  resolved "https://registry.npmjs.org/execa/-/execa-3.4.0.tgz#c08ed4550ef65d858fac269ffc8572446f37eb89"
-  integrity sha512-r9vdGQk4bmCuK1yKQu1KTwcT2zwfWdbdaXfCtAh+5nU/4fSX+JAb7vZGvI5naJrQlvONrEB20jeruESI69530g==
-  dependencies:
-    cross-spawn "^7.0.0"
-    get-stream "^5.0.0"
-    human-signals "^1.1.1"
-    is-stream "^2.0.0"
-    merge-stream "^2.0.0"
-    npm-run-path "^4.0.0"
-    onetime "^5.1.0"
-    p-finally "^2.0.0"
-    signal-exit "^3.0.2"
-    strip-final-newline "^2.0.0"
-
 execa@4.1.0, execa@^4.0.0, execa@^4.0.1:
   version "4.1.0"
   resolved "https://registry.npmjs.org/execa/-/execa-4.1.0.tgz#4e5491ad1572f2f17a77d388c6c857135b22847a"
@@ -12359,20 +13297,7 @@ execa@4.1.0, execa@^4.0.0, execa@^4.0.1:
     signal-exit "^3.0.2"
     strip-final-newline "^2.0.0"
 
-execa@^0.7.0:
-  version "0.7.0"
-  resolved "https://registry.npmjs.org/execa/-/execa-0.7.0.tgz#944becd34cc41ee32a63a9faf27ad5a65fc59777"
-  integrity sha1-lEvs00zEHuMqY6n68nrVpl/Fl3c=
-  dependencies:
-    cross-spawn "^5.0.1"
-    get-stream "^3.0.0"
-    is-stream "^1.1.0"
-    npm-run-path "^2.0.0"
-    p-finally "^1.0.0"
-    signal-exit "^3.0.0"
-    strip-eof "^1.0.0"
-
-execa@^5.0.0:
+execa@5.0.0:
   version "5.0.0"
   resolved "https://registry.npmjs.org/execa/-/execa-5.0.0.tgz#4029b0007998a841fbd1032e5f4de86a3c1e3376"
   integrity sha512-ov6w/2LCiuyO4RLYGdpFGjkcs0wMTgGE8PrkTHikeUy5iJekXyPIKUjifk5CsE0pt7sMCrMZ3YNqoCj6idQOnQ==
@@ -12387,6 +13312,47 @@ execa@^5.0.0:
     signal-exit "^3.0.3"
     strip-final-newline "^2.0.0"
 
+execa@5.1.1, execa@^5.0.0:
+  version "5.1.1"
+  resolved "https://registry.npmjs.org/execa/-/execa-5.1.1.tgz#f80ad9cbf4298f7bd1d4c9555c21e93741c411dd"
+  integrity sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==
+  dependencies:
+    cross-spawn "^7.0.3"
+    get-stream "^6.0.0"
+    human-signals "^2.1.0"
+    is-stream "^2.0.0"
+    merge-stream "^2.0.0"
+    npm-run-path "^4.0.1"
+    onetime "^5.1.2"
+    signal-exit "^3.0.3"
+    strip-final-newline "^2.0.0"
+
+execa@^0.7.0:
+  version "0.7.0"
+  resolved "https://registry.npmjs.org/execa/-/execa-0.7.0.tgz#944becd34cc41ee32a63a9faf27ad5a65fc59777"
+  integrity sha1-lEvs00zEHuMqY6n68nrVpl/Fl3c=
+  dependencies:
+    cross-spawn "^5.0.1"
+    get-stream "^3.0.0"
+    is-stream "^1.1.0"
+    npm-run-path "^2.0.0"
+    p-finally "^1.0.0"
+    signal-exit "^3.0.0"
+    strip-eof "^1.0.0"
+
+execa@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.npmjs.org/execa/-/execa-1.0.0.tgz#c6236a5bb4df6d6f15e88e7f017798216749ddd8"
+  integrity sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==
+  dependencies:
+    cross-spawn "^6.0.0"
+    get-stream "^4.0.0"
+    is-stream "^1.1.0"
+    npm-run-path "^2.0.0"
+    p-finally "^1.0.0"
+    signal-exit "^3.0.0"
+    strip-eof "^1.0.0"
+
 executable@^4.1.1:
   version "4.1.1"
   resolved "https://registry.npmjs.org/executable/-/executable-4.1.1.tgz#41532bff361d3e57af4d763b70582db18f5d133c"
@@ -12451,6 +13417,14 @@ expect@^26.6.2:
     jest-message-util "^26.6.2"
     jest-regex-util "^26.0.0"
 
+express-prom-bundle@^6.3.6:
+  version "6.3.6"
+  resolved "https://registry.npmjs.org/express-prom-bundle/-/express-prom-bundle-6.3.6.tgz#c8da1c1024edfcc54953c365991aca57ffd0cfda"
+  integrity sha512-IRsTRCEKCVCHEriQlZ1FuutjEFc89KASsveXh+1HcGEnuZKiAC4LugxrsGEIdySqYvqOYSr2SWHJ6L8/BK2SHA==
+  dependencies:
+    on-finished "^2.3.0"
+    url-value-parser "^2.0.0"
+
 express-promise-router@^4.1.0:
   version "4.1.0"
   resolved "https://registry.npmjs.org/express-promise-router/-/express-promise-router-4.1.0.tgz#79160e145c27610ba411bceb0552a36f11dbab4f"
@@ -12481,7 +13455,7 @@ express-xml-bodyparser@^0.3.0:
   dependencies:
     xml2js "^0.4.11"
 
-express@^4.0.0, express@^4.17.0, express@^4.17.1:
+express@^4.0.0, express@^4.17.1:
   version "4.17.1"
   resolved "https://registry.npmjs.org/express/-/express-4.17.1.tgz#4491fc38605cf51f8629d39c2b5d026f98a4c134"
   integrity sha512-mHJ9O79RqluphRrcw2X/GTh3k9tVv8YcoyY4Kkh4WDMUYKRZUq0h1o0w2rrrxBqM7VoeUVqgb27xlEMXTnYt4g==
@@ -12539,7 +13513,7 @@ extend-shallow@^3.0.0, extend-shallow@^3.0.2:
     assign-symbols "^1.0.0"
     is-extendable "^1.0.1"
 
-extend@3.0.2, extend@^3.0.0, extend@^3.0.1, extend@^3.0.2, extend@~3.0.2:
+extend@3.0.2, extend@^3.0.0, extend@^3.0.2, extend@~3.0.2:
   version "3.0.2"
   resolved "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz#f8b1136b4071fbd8eb140aff858b1019ec2915fa"
   integrity sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==
@@ -12602,7 +13576,12 @@ extsprintf@^1.2.0:
   resolved "https://registry.npmjs.org/extsprintf/-/extsprintf-1.4.0.tgz#e2689f8f356fad62cca65a3a91c5df5f9551692f"
   integrity sha1-4mifjzVvrWLMplo6kcXfX5VRaS8=
 
-fast-deep-equal@2.0.1, fast-deep-equal@^2.0.1:
+fast-decode-uri-component@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.npmjs.org/fast-decode-uri-component/-/fast-decode-uri-component-1.0.1.tgz#46f8b6c22b30ff7a81357d4f59abfae938202543"
+  integrity sha512-WKgKWg5eUxvRZGwW8FvfbaH7AXSh2cL+3j5fMGzUMCxWBJ3dV3a7Wz8y2f/uQ0e3B6WmodD3oS54jTQ9HVTIIg==
+
+fast-deep-equal@2.0.1:
   version "2.0.1"
   resolved "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz#7b05218ddf9667bf7f370bf7fdb2cb15fdd0aa49"
   integrity sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk=
@@ -12612,7 +13591,7 @@ fast-deep-equal@^3.0.0, fast-deep-equal@^3.1.1, fast-deep-equal@^3.1.3:
   resolved "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz#3a7d56b559d6cbc3eb512325244e619a65c6c525"
   integrity sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==
 
-fast-glob@^2.0.2, fast-glob@^2.2.6:
+fast-glob@^2.2.6:
   version "2.2.7"
   resolved "https://registry.npmjs.org/fast-glob/-/fast-glob-2.2.7.tgz#6953857c3afa475fff92ee6015d52da70a4cd39d"
   integrity sha512-g1KuQwHOZAmOZMuBtHdxDtju+T2RT8jgCC9aANsbpdiDDTSnjgfuVsIBNKbUeJI3oKMRExcfNDtJl4OhbffMsw==
@@ -12641,13 +13620,6 @@ fast-json-parse@^1.0.3:
   resolved "https://registry.npmjs.org/fast-json-parse/-/fast-json-parse-1.0.3.tgz#43e5c61ee4efa9265633046b770fb682a7577c4d"
   integrity sha512-FRWsaZRWEJ1ESVNbDWmsAlqDk96gPQezzLghafp5J4GUKjbCz3OkAHuZs5TuPEtkbVQERysLp9xv6c24fBm8Aw==
 
-fast-json-patch@^2.1.0:
-  version "2.2.1"
-  resolved "https://registry.npmjs.org/fast-json-patch/-/fast-json-patch-2.2.1.tgz#18150d36c9ab65c7209e7d4eb113f4f8eaabe6d9"
-  integrity sha512-4j5uBaTnsYAV5ebkidvxiLUYOwjQ+JSFljeqfTxCrH9bDmlCQaOJFS84oDJ2rAXZq2yskmk3ORfoP9DCwqFNig==
-  dependencies:
-    fast-deep-equal "^2.0.1"
-
 fast-json-patch@^3.0.0-1:
   version "3.0.0-1"
   resolved "https://registry.npmjs.org/fast-json-patch/-/fast-json-patch-3.0.0-1.tgz#4c68f2e7acfbab6d29d1719c44be51899c93dabb"
@@ -12663,11 +13635,21 @@ fast-levenshtein@^2.0.6, fast-levenshtein@~2.0.6:
   resolved "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917"
   integrity sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=
 
+fast-redact@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.npmjs.org/fast-redact/-/fast-redact-2.1.0.tgz#dfe3c1ca69367fb226f110aa4ec10ec85462ffdf"
+  integrity sha512-0LkHpTLyadJavq9sRzzyqIoMZemWli77K2/MGOkafrR64B9ItrvZ9aT+jluvNDsv0YEHjSNhlMBtbokuoqii4A==
+
 fast-safe-stringify@^2.0.4, fast-safe-stringify@^2.0.7:
   version "2.0.7"
   resolved "https://registry.npmjs.org/fast-safe-stringify/-/fast-safe-stringify-2.0.7.tgz#124aa885899261f68aedb42a7c080de9da608743"
   integrity sha512-Utm6CdzT+6xsDk2m8S6uL8VHxNwI6Jub+e9NYTcAms28T84pTa25GJQV9j0CY0N1rM8hK4x6grpF2BQf+2qwVA==
 
+fast-safe-stringify@^2.0.6:
+  version "2.0.8"
+  resolved "https://registry.npmjs.org/fast-safe-stringify/-/fast-safe-stringify-2.0.8.tgz#dc2af48c46cf712b683e849b2bbd446b32de936f"
+  integrity sha512-lXatBjf3WPjmWD6DpIZxkeSsCOwqI0maYMpgDlx8g4U2qi4lbjA9oH/HD2a87G+KfsUmo5WbJFmqBZlPxtptag==
+
 fast-shallow-equal@^1.0.0:
   version "1.0.0"
   resolved "https://registry.npmjs.org/fast-shallow-equal/-/fast-shallow-equal-1.0.0.tgz#d4dcaf6472440dcefa6f88b98e3251e27f25628b"
@@ -12697,14 +13679,7 @@ fault@^1.0.0:
   dependencies:
     format "^0.2.0"
 
-faye-websocket@^0.10.0:
-  version "0.10.0"
-  resolved "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.10.0.tgz#4e492f8d04dfb6f89003507f6edbf2d501e7c6f4"
-  integrity sha1-TkkvjQTftviQA1B/btvy1QHnxvQ=
-  dependencies:
-    websocket-driver ">=0.5.1"
-
-faye-websocket@~0.11.1:
+faye-websocket@^0.11.3:
   version "0.11.3"
   resolved "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.11.3.tgz#5c0e9a8968e8912c286639fde977a8b209f2508e"
   integrity sha512-D2y4bovYpzziGgbHYtGCMjlJM36vAl/y+xUyn1C+FVx8szd1E+86KwVw6XvYSzOP8iMpm1X0I4xJD+QtUb36OA==
@@ -12748,6 +13723,11 @@ fecha@^4.2.0:
   resolved "https://registry.npmjs.org/fecha/-/fecha-4.2.0.tgz#3ffb6395453e3f3efff850404f0a59b6747f5f41"
   integrity sha512-aN3pcx/DSmtyoovUudctc8+6Hl4T+hI9GBBHLjA76jdZl7+b1sgh5g4k+u/GL3dTy1/pnYzKp69FpJ0OicE3Wg==
 
+fetch-blob@2.1.2:
+  version "2.1.2"
+  resolved "https://registry.npmjs.org/fetch-blob/-/fetch-blob-2.1.2.tgz#a7805db1361bd44c1ef62bb57fb5fe8ea173ef3c"
+  integrity sha512-YKqtUDwqLyfyMnmbw8XD6Q8j9i/HggKtPEI+pZ1+8bvheBu78biSmNaXWusx1TauGqtUUGx/cBb1mKdq2rLYow==
+
 fetch-readablestream@^0.2.0:
   version "0.2.0"
   resolved "https://registry.npmjs.org/fetch-readablestream/-/fetch-readablestream-0.2.0.tgz#eaa6d1a76b12de2d4731a343393c6ccdcfe2c795"
@@ -12787,7 +13767,7 @@ file-entry-cache@^6.0.1:
   dependencies:
     flat-cache "^3.0.4"
 
-file-loader@^6.0.0, file-loader@^6.2.0:
+file-loader@^6.2.0:
   version "6.2.0"
   resolved "https://registry.npmjs.org/file-loader/-/file-loader-6.2.0.tgz#baef7cf8e1840df325e4390b4484879480eebe4d"
   integrity sha512-qo3glqyTa61Ytg4u73GultjHGjdRyig3tG6lPtyX/jOEJvHif9uB0/OCI2Kif6ctF3caQTW2G5gym21oAsI4pw==
@@ -12804,35 +13784,25 @@ file-system-cache@^1.0.5:
     fs-extra "^0.30.0"
     ramda "^0.21.0"
 
+file-type@16.5.3:
+  version "16.5.3"
+  resolved "https://registry.npmjs.org/file-type/-/file-type-16.5.3.tgz#474b7e88c74724046abb505e9b8ed4db30c4fc06"
+  integrity sha512-uVsl7iFhHSOY4bEONLlTK47iAHtNsFHWP5YE4xJfZ4rnX7S1Q3wce09XgqSC7E/xh8Ncv/be1lNoyprlUH/x6A==
+  dependencies:
+    readable-web-to-node-stream "^3.0.0"
+    strtok3 "^6.2.4"
+    token-types "^4.1.1"
+
 file-uri-to-path@1.0.0:
   version "1.0.0"
   resolved "https://registry.npmjs.org/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz#553a7b8446ff6f684359c445f1e37a05dacc33dd"
   integrity sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==
 
-filed-mimefix@^0.1.3:
-  version "0.1.3"
-  resolved "https://registry.npmjs.org/filed-mimefix/-/filed-mimefix-0.1.3.tgz#0b0b67d075a63fc74f26fdf39c7f9d4314967bb5"
-  integrity sha1-Cwtn0HWmP8dPJv3znH+dQxSWe7U=
-  dependencies:
-    mime "^1.4.0"
-
 filefy@0.1.10:
   version "0.1.10"
   resolved "https://registry.npmjs.org/filefy/-/filefy-0.1.10.tgz#174677c8e2fa5bc39a3af0ed6fb492f16b8fbf42"
   integrity sha512-VgoRVOOY1WkTpWH+KBy8zcU1G7uQTVsXqhWEgzryB9A5hg2aqCyZ6aQ/5PSzlqM5+6cnVrX6oYV0XqD3HZSnmQ==
 
-filelist@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.npmjs.org/filelist/-/filelist-1.0.1.tgz#f10d1a3ae86c1694808e8f20906f43d4c9132dbb"
-  integrity sha512-8zSK6Nu0DQIC08mUC46sWGXi+q3GGpKydAG36k+JDba6VRpkevvOWUW5a/PhShij4+vHT9M+ghgG7eM+a9JDUQ==
-  dependencies:
-    minimatch "^3.0.4"
-
-filesize@6.0.1:
-  version "6.0.1"
-  resolved "https://registry.npmjs.org/filesize/-/filesize-6.0.1.tgz#f850b509909c7c86f7e450ea19006c31c2ed3d2f"
-  integrity sha512-u4AYWPgbI5GBhs6id1KdImZWn5yfyFrrQ8OWZdN7ZMfA8Bf4HcO0BGo9bmUIEV8yrp8I1xVfJ/dn90GtFNNJcg==
-
 filesize@6.1.0:
   version "6.1.0"
   resolved "https://registry.npmjs.org/filesize/-/filesize-6.1.0.tgz#e81bdaa780e2451d714d71c0d7a4f3238d37ad00"
@@ -12891,6 +13861,15 @@ find-cache-dir@^3.3.1:
     make-dir "^3.0.2"
     pkg-dir "^4.1.0"
 
+find-my-way@^2.2.2:
+  version "2.2.5"
+  resolved "https://registry.npmjs.org/find-my-way/-/find-my-way-2.2.5.tgz#86ce825266fa28cd962e538a45ec2aaa84c3d514"
+  integrity sha512-GjRZZlGcGmTh9t+6Xrj5K0YprpoAFCAiCPgmAH9Kb09O4oX6hYuckDfnDipYj+Q7B1GtYWSzDI5HEecNYscLQg==
+  dependencies:
+    fast-decode-uri-component "^1.0.0"
+    safe-regex2 "^2.0.0"
+    semver-store "^0.3.0"
+
 find-root@^1.1.0:
   version "1.1.0"
   resolved "https://registry.npmjs.org/find-root/-/find-root-1.1.0.tgz#abcfc8ba76f708c42a97b3d685b7e9450bfb9ce4"
@@ -12950,6 +13929,11 @@ flat-cache@^3.0.4:
     flatted "^3.1.0"
     rimraf "^3.0.2"
 
+flatstr@^1.0.12:
+  version "1.0.12"
+  resolved "https://registry.npmjs.org/flatstr/-/flatstr-1.0.12.tgz#c2ba6a08173edbb6c9640e3055b95e287ceb5931"
+  integrity sha512-4zPxDyhCyiN2wIAtSLI6gc82/EjqZc1onI4Mz/l0pWrAlsSfYH/2ZIcU+e3oA2wDwbzIWNKwa23F8rh6+DRWkw==
+
 flatted@^3.1.0:
   version "3.1.1"
   resolved "https://registry.npmjs.org/flatted/-/flatted-3.1.1.tgz#c4b489e80096d9df1dfc97c79871aea7c617c469"
@@ -13000,7 +13984,7 @@ for-own@^0.1.3:
   dependencies:
     for-in "^1.0.1"
 
-foreach@^2.0.4:
+foreach@^2.0.4, foreach@^2.0.5:
   version "2.0.5"
   resolved "https://registry.npmjs.org/foreach/-/foreach-2.0.5.tgz#0bee005018aeb260d0a3af3ae658dd0136ec1b99"
   integrity sha1-C+4AUBiusmDQo6865ljdATbsG5k=
@@ -13010,21 +13994,7 @@ forever-agent@~0.6.1:
   resolved "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91"
   integrity sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=
 
-fork-ts-checker-webpack-plugin@3.1.1:
-  version "3.1.1"
-  resolved "https://registry.npmjs.org/fork-ts-checker-webpack-plugin/-/fork-ts-checker-webpack-plugin-3.1.1.tgz#a1642c0d3e65f50c2cc1742e9c0a80f441f86b19"
-  integrity sha512-DuVkPNrM12jR41KM2e+N+styka0EgLkTnXmNcXdgOM37vtGeY+oCBK/Jx0hzSeEU6memFCtWb4htrHPMDfwwUQ==
-  dependencies:
-    babel-code-frame "^6.22.0"
-    chalk "^2.4.1"
-    chokidar "^3.3.0"
-    micromatch "^3.1.10"
-    minimatch "^3.0.4"
-    semver "^5.6.0"
-    tapable "^1.0.0"
-    worker-rpc "^0.1.0"
-
-fork-ts-checker-webpack-plugin@4.1.6, fork-ts-checker-webpack-plugin@^4.1.4:
+fork-ts-checker-webpack-plugin@4.1.6, fork-ts-checker-webpack-plugin@^4.0.5, fork-ts-checker-webpack-plugin@^4.1.6:
   version "4.1.6"
   resolved "https://registry.npmjs.org/fork-ts-checker-webpack-plugin/-/fork-ts-checker-webpack-plugin-4.1.6.tgz#5055c703febcf37fa06405d400c122b905167fc5"
   integrity sha512-DUxuQaKoqfNne8iikd14SAkh5uw4+8vNifp6gmA73yYNS6ywLIWSLD/n/mBzHQRpW3J7rbATEakmiA8JvkTyZw==
@@ -13037,10 +14007,10 @@ fork-ts-checker-webpack-plugin@4.1.6, fork-ts-checker-webpack-plugin@^4.1.4:
     tapable "^1.0.0"
     worker-rpc "^0.1.0"
 
-fork-ts-checker-webpack-plugin@^6.2.9:
-  version "6.2.9"
-  resolved "https://registry.npmjs.org/fork-ts-checker-webpack-plugin/-/fork-ts-checker-webpack-plugin-6.2.9.tgz#08f51b685a48b09ab3ec079a8501762422443120"
-  integrity sha512-D/KSb/2VeiOy3odDerrC16WiZ1t5TLwiFfZmuDeTXcf3Km79M+f8nTCIdKkokxybybrgMcStbx0QpGaseePxnA==
+fork-ts-checker-webpack-plugin@^6.0.4:
+  version "6.3.1"
+  resolved "https://registry.npmjs.org/fork-ts-checker-webpack-plugin/-/fork-ts-checker-webpack-plugin-6.3.1.tgz#938535f844cdddf6796211e5761da27341b9fcd3"
+  integrity sha512-uxqlKTEeSJ5/JRr0zaCiw2U+kOV8F4/MhCnnRf6vbxj4ZU3Or0DLl/0CNtXro7uLWDssnuR7wUN7fU9w1I0REA==
   dependencies:
     "@babel/code-frame" "^7.8.3"
     "@types/json-schema" "^7.0.5"
@@ -13056,6 +14026,11 @@ fork-ts-checker-webpack-plugin@^6.2.9:
     semver "^7.3.2"
     tapable "^1.0.0"
 
+form-data-encoder@1.4.3, form-data-encoder@^1.0.1:
+  version "1.4.3"
+  resolved "https://registry.npmjs.org/form-data-encoder/-/form-data-encoder-1.4.3.tgz#b0975dbe5795676f211c0ff98e473eaf52b0db4a"
+  integrity sha512-ARLR/jJaj3+tlKkO7h1uvvjQcD6xCiKyg42hcG5Q4jv8uDa1IMPs81bM3BwI8BrqVEQxF9pX6tx0iLIzAvr31Q==
+
 form-data@4.0.0, form-data@^4.0.0:
   version "4.0.0"
   resolved "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz#93919daeaf361ee529584b9b31664dc12c9fa452"
@@ -13097,6 +14072,15 @@ format@^0.2.0:
   resolved "https://registry.npmjs.org/format/-/format-0.2.2.tgz#d6170107e9efdc4ed30c9dc39016df942b5cb58b"
   integrity sha1-1hcBB+nv3E7TDJ3DkBbflCtctYs=
 
+formdata-node@^3.6.2:
+  version "3.7.0"
+  resolved "https://registry.npmjs.org/formdata-node/-/formdata-node-3.7.0.tgz#b58942e617639a0ebea57227cfff8332a4020760"
+  integrity sha512-O3y7XoWwE4zRvI5e1yVPDHyDGtEgGEI10KxTbQeMbEEt+imR7uxbL5Z4BCaHz5M09d1pkrFaqeYc8beAce4VSw==
+  dependencies:
+    fetch-blob "2.1.2"
+    form-data-encoder "1.4.3"
+    node-domexception "1.0.0"
+
 formidable@^1.2.0, formidable@^1.2.2:
   version "1.2.2"
   resolved "https://registry.npmjs.org/formidable/-/formidable-1.2.2.tgz#bf69aea2972982675f00865342b982986f6b8dd9"
@@ -13119,7 +14103,7 @@ fresh@0.5.2:
   resolved "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz#3d8cadd90d976569fa835ab1f8e4b23a105605a7"
   integrity sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac=
 
-from2@^2.1.0:
+from2@^2.1.0, from2@^2.3.0:
   version "2.3.0"
   resolved "https://registry.npmjs.org/from2/-/from2-2.3.0.tgz#8bfb5502bde4a4d36cfdeea007fcca21d7e382af"
   integrity sha1-i/tVAr3kpNNs/e6gB/zKIdfjgq8=
@@ -13151,7 +14135,7 @@ fs-extra@10.0.0:
     jsonfile "^6.0.1"
     universalify "^2.0.0"
 
-fs-extra@9.1.0, fs-extra@^9.0.0, fs-extra@^9.1.0:
+fs-extra@9.1.0, fs-extra@^9.0.0, fs-extra@^9.0.1, fs-extra@^9.1.0:
   version "9.1.0"
   resolved "https://registry.npmjs.org/fs-extra/-/fs-extra-9.1.0.tgz#5954460c764a8da2094ba3554bf839e6b9a7c86d"
   integrity sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ==
@@ -13190,7 +14174,7 @@ fs-extra@^8.1.0:
     jsonfile "^4.0.0"
     universalify "^0.1.0"
 
-fs-minipass@^1.2.5:
+fs-minipass@^1.2.7:
   version "1.2.7"
   resolved "https://registry.npmjs.org/fs-minipass/-/fs-minipass-1.2.7.tgz#ccff8570841e7fe4265693da88936c55aed7f7c7"
   integrity sha512-GWSSJGFy4e9GUeCcbIkED+bgAoFyj7XF1mV8rma3QW4NIqX9Kyx79N/PF61H5udOV3aY1IaMLs6pGbH71nlCTA==
@@ -13290,16 +14274,6 @@ gauge@~2.7.3:
     strip-ansi "^3.0.1"
     wide-align "^1.1.0"
 
-gaxios@^1.0.2, gaxios@^1.0.4, gaxios@^1.2.1, gaxios@^1.5.0:
-  version "1.8.4"
-  resolved "https://registry.npmjs.org/gaxios/-/gaxios-1.8.4.tgz#e08c34fe93c0a9b67a52b7b9e7a64e6435f9a339"
-  integrity sha512-BoENMnu1Gav18HcpV9IleMPZ9exM+AvUjrAOV4Mzs/vfz2Lu/ABv451iEXByKiMPn2M140uul1txXCg83sAENw==
-  dependencies:
-    abort-controller "^3.0.0"
-    extend "^3.0.2"
-    https-proxy-agent "^2.2.1"
-    node-fetch "^2.3.0"
-
 gaxios@^4.0.0:
   version "4.0.1"
   resolved "https://registry.npmjs.org/gaxios/-/gaxios-4.0.1.tgz#bc7b205a89d883452822cc75e138620c35e3291e"
@@ -13311,14 +14285,6 @@ gaxios@^4.0.0:
     is-stream "^2.0.0"
     node-fetch "^2.3.0"
 
-gcp-metadata@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.npmjs.org/gcp-metadata/-/gcp-metadata-1.0.0.tgz#5212440229fa099fc2f7c2a5cdcb95575e9b2ca6"
-  integrity sha512-Q6HrgfrCQeEircnNP3rCcEgiDv7eF9+1B+1MMgpE190+/+0mjQR8PxeOaRgxZWmdDAF9EIryHB9g1moPiw1SbQ==
-  dependencies:
-    gaxios "^1.0.2"
-    json-bigint "^0.3.0"
-
 gcp-metadata@^4.2.0:
   version "4.2.1"
   resolved "https://registry.npmjs.org/gcp-metadata/-/gcp-metadata-4.2.1.tgz#31849fbcf9025ef34c2297c32a89a1e7e9f2cd62"
@@ -13327,22 +14293,10 @@ gcp-metadata@^4.2.0:
     gaxios "^4.0.0"
     json-bigint "^1.0.0"
 
-gcs-resumable-upload@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.npmjs.org/gcs-resumable-upload/-/gcs-resumable-upload-1.1.0.tgz#2b06f5876dcf60f18a309343f79ed951aff01399"
-  integrity sha512-uBz7uHqp44xjSDzG3kLbOYZDjxxR/UAGbB47A0cC907W6yd2LkcyFDTHg+bjivkHMwiJlKv4guVWcjPCk2zScg==
-  dependencies:
-    abort-controller "^2.0.2"
-    configstore "^4.0.0"
-    gaxios "^1.5.0"
-    google-auth-library "^3.0.0"
-    pumpify "^1.5.1"
-    stream-events "^1.0.4"
-
-gcs-resumable-upload@^3.1.4:
-  version "3.1.4"
-  resolved "https://registry.npmjs.org/gcs-resumable-upload/-/gcs-resumable-upload-3.1.4.tgz#2e591889efb02247af26868de300b398346b17b5"
-  integrity sha512-5dyDfHrrVcIskiw/cPssVD4HRiwoHjhk1Nd6h5W3pQ/qffDvhfy4oNCr1f3ZXFPwTnxkCbibsB+73oOM+NvmJQ==
+gcs-resumable-upload@^3.3.0:
+  version "3.3.0"
+  resolved "https://registry.npmjs.org/gcs-resumable-upload/-/gcs-resumable-upload-3.3.0.tgz#d1a866173f9b47e045d4406cafaa658dbb01e624"
+  integrity sha512-MQKWi+9hOSTyg5/SI1NBW4gAjL1wlkoevHefvr1PCBBXH4uKYLsug5qRrcotWKolDPLfWS51cWaHRN0CTtQNZw==
   dependencies:
     abort-controller "^3.0.0"
     configstore "^5.0.0"
@@ -13371,7 +14325,7 @@ generic-pool@2.4.3:
   resolved "https://registry.npmjs.org/generic-pool/-/generic-pool-2.4.3.tgz#780c36f69dfad05a5a045dd37be7adca11a4f6ff"
   integrity sha1-eAw29p360FpaBF3Te+etyhGk9v8=
 
-gensync@^1.0.0-beta.2:
+gensync@^1.0.0-beta.1, gensync@^1.0.0-beta.2:
   version "1.0.0-beta.2"
   resolved "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz#32a6ee76c3d7f52d46b2b1ae5d93fea8580a25e0"
   integrity sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==
@@ -13517,13 +14471,20 @@ git-up@^4.0.0:
     is-ssh "^1.3.0"
     parse-url "^5.0.0"
 
-git-url-parse@^11.4.4, git-url-parse@~11.4.4:
+git-url-parse@^11.4.4:
   version "11.4.4"
   resolved "https://registry.npmjs.org/git-url-parse/-/git-url-parse-11.4.4.tgz#5d747debc2469c17bc385719f7d0427802d83d77"
   integrity sha512-Y4o9o7vQngQDIU9IjyCmRJBin5iYjI5u9ZITnddRZpD7dcCFQj2sL2XuMNbLRE4b4B/4ENPsp2Q8P44fjAZ0Pw==
   dependencies:
     git-up "^4.0.0"
 
+git-url-parse@^11.6.0:
+  version "11.6.0"
+  resolved "https://registry.npmjs.org/git-url-parse/-/git-url-parse-11.6.0.tgz#c634b8de7faa66498a2b88932df31702c67df605"
+  integrity sha512-WWUxvJs5HsyHL6L08wOusa/IXYtMuCAhrMmnTjQPpBU0TTHyDhnOATNH3xNQz7YOQUsqIIPTGr4xiVti1Hsk5g==
+  dependencies:
+    git-up "^4.0.0"
+
 gitconfiglocal@^1.0.0:
   version "1.0.0"
   resolved "https://registry.npmjs.org/gitconfiglocal/-/gitconfiglocal-1.0.0.tgz#41d045f3851a5ea88f03f24ca1c6178114464b9b"
@@ -13585,13 +14546,10 @@ glob-to-regexp@^0.3.0:
   resolved "https://registry.npmjs.org/glob-to-regexp/-/glob-to-regexp-0.3.0.tgz#8c5a1494d2066c570cc3bfe4496175acc4d502ab"
   integrity sha1-jFoUlNIGbFcMw7/kSWF1rMTVAqs=
 
-glob@3.2.11:
-  version "3.2.11"
-  resolved "https://registry.npmjs.org/glob/-/glob-3.2.11.tgz#4a973f635b9190f715d10987d5c00fd2815ebe3d"
-  integrity sha1-Spc/Y1uRkPcV0QmH1cAP0oFevj0=
-  dependencies:
-    inherits "2"
-    minimatch "0.3"
+glob-to-regexp@^0.4.1:
+  version "0.4.1"
+  resolved "https://registry.npmjs.org/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz#c75297087c851b9a578bd217dd59a92f59fe546e"
+  integrity sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==
 
 glob@7.1.6:
   version "7.1.6"
@@ -13658,7 +14616,7 @@ global-prefix@^3.0.0:
     kind-of "^6.0.2"
     which "^1.3.1"
 
-global@^4.3.0, global@^4.3.2, global@^4.4.0:
+global@^4.3.0, global@^4.4.0:
   version "4.4.0"
   resolved "https://registry.npmjs.org/global/-/global-4.4.0.tgz#3e7b105179006a323ed71aafca3e9c57a5cc6406"
   integrity sha512-wv/LAoHdRE3BeTGz53FAamhGlPLhlssK45usmGFThIi4XqnBmjKQ16u+RNbP7WvigRZDxUsM0J3gcQ5yicaL0w==
@@ -13709,20 +14667,19 @@ globby@11.0.3:
     merge2 "^1.3.0"
     slash "^3.0.0"
 
-globby@8.0.2:
-  version "8.0.2"
-  resolved "https://registry.npmjs.org/globby/-/globby-8.0.2.tgz#5697619ccd95c5275dbb2d6faa42087c1a941d8d"
-  integrity sha512-yTzMmKygLp8RUpG1Ymu2VXPSJQZjNAZPD4ywgYEaG7e4tBJeUQBO8OpXrf1RCNcEs5alsoJYPAMiIHP0cmeC7w==
+globby@^11.0.0, globby@^11.0.1, globby@^11.0.2:
+  version "11.0.2"
+  resolved "https://registry.npmjs.org/globby/-/globby-11.0.2.tgz#1af538b766a3b540ebfb58a32b2e2d5897321d83"
+  integrity sha512-2ZThXDvvV8fYFRVIxnrMQBipZQDr7MxKAmQK1vujaj9/7eF0efG7BPUKJ7jP7G5SLF37xKDXvO4S/KKLj/Z0og==
   dependencies:
-    array-union "^1.0.1"
-    dir-glob "2.0.0"
-    fast-glob "^2.0.2"
-    glob "^7.1.2"
-    ignore "^3.3.5"
-    pify "^3.0.0"
-    slash "^1.0.0"
+    array-union "^2.1.0"
+    dir-glob "^3.0.1"
+    fast-glob "^3.1.1"
+    ignore "^5.1.4"
+    merge2 "^1.3.0"
+    slash "^3.0.0"
 
-globby@^11.0.0, globby@^11.0.1, globby@^11.0.2, globby@^11.0.3:
+globby@^11.0.3:
   version "11.0.4"
   resolved "https://registry.npmjs.org/globby/-/globby-11.0.4.tgz#2cbaff77c2f2a62e71e9b2813a67b97a3a3001a5"
   integrity sha512-9O4MVG9ioZJ08ffbcyVYyLOJLk5JQ688pJ4eMGLpdWLHq/Wr1D9BlriLQyL0E+jbkuePVZXYFj47QM/v093wHg==
@@ -13734,17 +14691,6 @@ globby@^11.0.0, globby@^11.0.1, globby@^11.0.2, globby@^11.0.3:
     merge2 "^1.3.0"
     slash "^3.0.0"
 
-globby@^6.1.0:
-  version "6.1.0"
-  resolved "https://registry.npmjs.org/globby/-/globby-6.1.0.tgz#f5a6d70e8395e21c858fb0489d64df02424d506c"
-  integrity sha1-9abXDoOV4hyFj7BInWTfAkJNUGw=
-  dependencies:
-    array-union "^1.0.1"
-    glob "^7.0.3"
-    object-assign "^4.0.1"
-    pify "^2.0.0"
-    pinkie-promise "^2.0.0"
-
 globby@^7.1.1:
   version "7.1.1"
   resolved "https://registry.npmjs.org/globby/-/globby-7.1.1.tgz#fb2ccff9401f8600945dfada97440cca972b8680"
@@ -13778,21 +14724,6 @@ good-listener@^1.2.2:
   dependencies:
     delegate "^3.1.2"
 
-google-auth-library@^3.0.0, google-auth-library@^3.1.1:
-  version "3.1.2"
-  resolved "https://registry.npmjs.org/google-auth-library/-/google-auth-library-3.1.2.tgz#ff2f88cd5cd2118a57bd3d5ad3c093c8837fc350"
-  integrity sha512-cDQMzTotwyWMrg5jRO7q0A4TL/3GWBgO7I7q5xGKNiiFf9SmGY/OJ1YsLMgI2MVHHsEGyrqYnbnmV1AE+Z6DnQ==
-  dependencies:
-    base64-js "^1.3.0"
-    fast-text-encoding "^1.0.0"
-    gaxios "^1.2.1"
-    gcp-metadata "^1.0.0"
-    gtoken "^2.3.2"
-    https-proxy-agent "^2.2.1"
-    jws "^3.1.5"
-    lru-cache "^5.0.0"
-    semver "^5.5.0"
-
 google-auth-library@^7.0.0, google-auth-library@^7.0.2:
   version "7.0.2"
   resolved "https://registry.npmjs.org/google-auth-library/-/google-auth-library-7.0.2.tgz#cab6fc7f94ebecc97be6133d6519d9946ccf3e9d"
@@ -13826,14 +14757,6 @@ google-gax@^2.12.0:
     protobufjs "^6.10.2"
     retry-request "^4.0.0"
 
-google-p12-pem@^1.0.0:
-  version "1.0.4"
-  resolved "https://registry.npmjs.org/google-p12-pem/-/google-p12-pem-1.0.4.tgz#b77fb833a2eb9f7f3c689e2e54f095276f777605"
-  integrity sha512-SwLAUJqUfTB2iS+wFfSS/G9p7bt4eWcc2LyfvmUXe7cWp6p3mpxDo6LLI29MXdU6wvPcQ/up298X7GMC5ylAlA==
-  dependencies:
-    node-forge "^0.8.0"
-    pify "^4.0.0"
-
 google-p12-pem@^3.0.3:
   version "3.0.3"
   resolved "https://registry.npmjs.org/google-p12-pem/-/google-p12-pem-3.0.3.tgz#673ac3a75d3903a87f05878f3c75e06fc151669e"
@@ -13875,7 +14798,12 @@ got@^9.6.0:
     to-readable-stream "^1.0.0"
     url-parse-lax "^3.0.0"
 
-graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.5, graceful-fs@^4.1.6, graceful-fs@^4.1.9, graceful-fs@^4.2.0, graceful-fs@^4.2.2, graceful-fs@^4.2.3, graceful-fs@^4.2.4:
+graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.5, graceful-fs@^4.1.6, graceful-fs@^4.1.9, graceful-fs@^4.2.0, graceful-fs@^4.2.2, graceful-fs@^4.2.4:
+  version "4.2.4"
+  resolved "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.4.tgz#2256bde14d3632958c465ebc96dc467ca07a29fb"
+  integrity sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw==
+
+graceful-fs@^4.2.3, graceful-fs@^4.2.6:
   version "4.2.6"
   resolved "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.6.tgz#ff040b2b0853b23c3d31027523706f1885d76bee"
   integrity sha512-nTnJ528pbqxYanhpDYsi4Rd8MAeaBA67+RZ10CM1m3bTAVFEDcd5AuA4a6W5YkGZ1iNXHzZz8T6TBKLeBuNriQ==
@@ -13886,15 +14814,15 @@ grapheme-splitter@^1.0.4:
   integrity sha512-bzh50DW9kTPM00T8y4o8vQg89Di9oLJVLW/KaOGIXJWP/iqCN6WKYkbNOF04vFLJhwcpYUh9ydh/+5vpOqV4YQ==
 
 graphiql@^1.0.0-alpha.10:
-  version "1.4.0"
-  resolved "https://registry.npmjs.org/graphiql/-/graphiql-1.4.0.tgz#8b17c988720a9da5ea3ebf7ff9d86939b462655e"
-  integrity sha512-E/Xzfu3YnifdINrK6dKHD1G0qnWkYYK2gHQ//vApUadMb4I4lZQ399ZKt5nqM5kzrATf5FDUTuSpnkaeSoARkQ==
+  version "1.4.2"
+  resolved "https://registry.npmjs.org/graphiql/-/graphiql-1.4.2.tgz#a1dc1a4d8d35f60c90d6d8a9eb62a99756e9fd9b"
+  integrity sha512-TQDuuU/ZqTWV1yQDpVEiKskg0IYA+Wck37DYrrFzLlpgZWRbWiyab1PyHKiRep7J540CgScBg6C/gGCymKyO3g==
   dependencies:
-    "@graphiql/toolkit" "^0.1.0"
+    "@graphiql/toolkit" "^0.2.0"
     codemirror "^5.54.0"
     codemirror-graphql "^1.0.0"
     copy-to-clipboard "^3.2.0"
-    dset "^3.0.0"
+    dset "^3.1.0"
     entities "^2.0.0"
     graphql-language-service "^3.1.2"
     markdown-it "^10.0.0"
@@ -14023,7 +14951,12 @@ graphql-type-json@^0.3.2:
   resolved "https://registry.npmjs.org/graphql-type-json/-/graphql-type-json-0.3.2.tgz#f53a851dbfe07bd1c8157d24150064baab41e115"
   integrity sha512-J+vjof74oMlCWXSvt0DOf2APEdZOCdubEvGDUAlqH//VBYcOYsGgRW7Xzorr44LvkjiuvecWc8fChxuZZbChtg==
 
-graphql-ws@^4.1.0, graphql-ws@^4.4.1:
+graphql-ws@^4.3.2:
+  version "4.9.0"
+  resolved "https://registry.npmjs.org/graphql-ws/-/graphql-ws-4.9.0.tgz#5cfd8bb490b35e86583d8322f5d5d099c26e365c"
+  integrity sha512-sHkK9+lUm20/BGawNEWNtVAeJzhZeBg21VmvmLoT5NdGVeZWv5PdIhkcayQIAgjSyyQ17WMKmbDijIPG2On+Ag==
+
+graphql-ws@^4.4.1:
   version "4.7.0"
   resolved "https://registry.npmjs.org/graphql-ws/-/graphql-ws-4.7.0.tgz#b323fbf35a3736eed85dac24c0054d6d10c93e62"
   integrity sha512-Md8SsmC9ZlsogFPd3Ot8HbIAAqsHh8Xoq7j4AmcIat1Bh6k91tjVyQvA0Au1/BolXSYq+RDvib6rATU2Hcf1Xw==
@@ -14038,27 +14971,11 @@ graphql@^15.3.0, graphql@^15.4.0:
   resolved "https://registry.npmjs.org/graphql/-/graphql-15.5.1.tgz#f2f84415d8985e7b84731e7f3536f8bb9d383aad"
   integrity sha512-FeTRX67T3LoE3LWAxxOlW2K3Bz+rMYAC18rRguK4wgXaTZMiJwSUwDmPFo3UadAKbzirKIg5Qy+sNJXbpPRnQw==
 
-growl@1.9.2:
-  version "1.9.2"
-  resolved "https://registry.npmjs.org/growl/-/growl-1.9.2.tgz#0ea7743715db8d8de2c5ede1775e1b45ac85c02f"
-  integrity sha1-Dqd0NxXbjY3ixe3hd14bRayFwC8=
-
 growly@^1.3.0:
   version "1.3.0"
   resolved "https://registry.npmjs.org/growly/-/growly-1.3.0.tgz#f10748cbe76af964b7c96c93c6bcc28af120c081"
   integrity sha1-8QdIy+dq+WS3yWyTxrzCivEgwIE=
 
-gtoken@^2.3.2:
-  version "2.3.3"
-  resolved "https://registry.npmjs.org/gtoken/-/gtoken-2.3.3.tgz#8a7fe155c5ce0c4b71c886cfb282a9060d94a641"
-  integrity sha512-EaB49bu/TCoNeQjhCYKI/CurooBKkGxIqFHsWABW0b25fobBYVTMe84A8EBVVZhl8emiUdNypil9huMOTmyAnw==
-  dependencies:
-    gaxios "^1.0.4"
-    google-p12-pem "^1.0.0"
-    jws "^3.1.5"
-    mime "^2.2.0"
-    pify "^4.0.0"
-
 gtoken@^5.0.4:
   version "5.1.0"
   resolved "https://registry.npmjs.org/gtoken/-/gtoken-5.1.0.tgz#4ba8d2fc9a8459098f76e7e8fd7beaa39fda9fe4"
@@ -14212,7 +15129,7 @@ hash-base@^3.0.0:
     inherits "^2.0.1"
     safe-buffer "^5.0.1"
 
-hash-stream-validation@^0.2.1, hash-stream-validation@^0.2.2:
+hash-stream-validation@^0.2.2:
   version "0.2.4"
   resolved "https://registry.npmjs.org/hash-stream-validation/-/hash-stream-validation-0.2.4.tgz#ee68b41bf822f7f44db1142ec28ba9ee7ccb7512"
   integrity sha512-Gjzu0Xn7IagXVkSu9cSFuK1fqzwtLwFhNhVL8IFJijRNMgUttFbBSIAzKuSIrsFMO1+g1RlsoN49zPIbwPDMGQ==
@@ -14225,11 +15142,63 @@ hash.js@^1.0.0, hash.js@^1.0.3:
     inherits "^2.0.3"
     minimalistic-assert "^1.0.1"
 
+hast-to-hyperscript@^9.0.0:
+  version "9.0.1"
+  resolved "https://registry.npmjs.org/hast-to-hyperscript/-/hast-to-hyperscript-9.0.1.tgz#9b67fd188e4c81e8ad66f803855334173920218d"
+  integrity sha512-zQgLKqF+O2F72S1aa4y2ivxzSlko3MAvxkwG8ehGmNiqd98BIN3JM1rAJPmplEyLmGLO2QZYJtIneOSZ2YbJuA==
+  dependencies:
+    "@types/unist" "^2.0.3"
+    comma-separated-tokens "^1.0.0"
+    property-information "^5.3.0"
+    space-separated-tokens "^1.0.0"
+    style-to-object "^0.3.0"
+    unist-util-is "^4.0.0"
+    web-namespaces "^1.0.0"
+
+hast-util-from-parse5@^6.0.0:
+  version "6.0.1"
+  resolved "https://registry.npmjs.org/hast-util-from-parse5/-/hast-util-from-parse5-6.0.1.tgz#554e34abdeea25ac76f5bd950a1f0180e0b3bc2a"
+  integrity sha512-jeJUWiN5pSxW12Rh01smtVkZgZr33wBokLzKLwinYOUfSzm1Nl/c3GUGebDyOKjdsRgMvoVbV0VpAcpjF4NrJA==
+  dependencies:
+    "@types/parse5" "^5.0.0"
+    hastscript "^6.0.0"
+    property-information "^5.0.0"
+    vfile "^4.0.0"
+    vfile-location "^3.2.0"
+    web-namespaces "^1.0.0"
+
 hast-util-parse-selector@^2.0.0:
   version "2.2.4"
   resolved "https://registry.npmjs.org/hast-util-parse-selector/-/hast-util-parse-selector-2.2.4.tgz#60c99d0b519e12ab4ed32e58f150ec3f61ed1974"
   integrity sha512-gW3sxfynIvZApL4L07wryYF4+C9VvH3AUi7LAnVXV4MneGEgwOByXvFo18BgmTWnm7oHAe874jKbIB1YhHSIzA==
 
+hast-util-raw@6.0.1:
+  version "6.0.1"
+  resolved "https://registry.npmjs.org/hast-util-raw/-/hast-util-raw-6.0.1.tgz#973b15930b7529a7b66984c98148b46526885977"
+  integrity sha512-ZMuiYA+UF7BXBtsTBNcLBF5HzXzkyE6MLzJnL605LKE8GJylNjGc4jjxazAHUtcwT5/CEt6afRKViYB4X66dig==
+  dependencies:
+    "@types/hast" "^2.0.0"
+    hast-util-from-parse5 "^6.0.0"
+    hast-util-to-parse5 "^6.0.0"
+    html-void-elements "^1.0.0"
+    parse5 "^6.0.0"
+    unist-util-position "^3.0.0"
+    vfile "^4.0.0"
+    web-namespaces "^1.0.0"
+    xtend "^4.0.0"
+    zwitch "^1.0.0"
+
+hast-util-to-parse5@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.npmjs.org/hast-util-to-parse5/-/hast-util-to-parse5-6.0.0.tgz#1ec44650b631d72952066cea9b1445df699f8479"
+  integrity sha512-Lu5m6Lgm/fWuz8eWnrKezHtVY83JeRGaNQ2kn9aJgqaxvVkFCZQBEhgodZUDUvoodgyROHDb3r5IxAEdl6suJQ==
+  dependencies:
+    hast-to-hyperscript "^9.0.0"
+    property-information "^5.0.0"
+    web-namespaces "^1.0.0"
+    xtend "^4.0.0"
+    zwitch "^1.0.0"
+
 hastscript@^6.0.0:
   version "6.0.0"
   resolved "https://registry.npmjs.org/hastscript/-/hastscript-6.0.0.tgz#e8768d7eac56c3fdeac8a92830d58e811e5bf640"
@@ -14329,6 +15298,11 @@ hpack.js@^2.1.6:
     readable-stream "^2.0.1"
     wbuf "^1.1.0"
 
+hpagent@^0.1.1:
+  version "0.1.2"
+  resolved "https://registry.npmjs.org/hpagent/-/hpagent-0.1.2.tgz#cab39c66d4df2d4377dbd212295d878deb9bdaa9"
+  integrity sha512-ePqFXHtSQWAFXYmj+JtOTHr84iNrII4/QRlAAPPE+zqnKy4xJo7Ie1Y4kC7AdB+LxLxSTTzBMASsEcy0q8YyvQ==
+
 hsl-regex@^1.0.0:
   version "1.0.0"
   resolved "https://registry.npmjs.org/hsl-regex/-/hsl-regex-1.0.0.tgz#d49330c789ed819e276a4c0d272dffa30b18fe6e"
@@ -14358,10 +15332,20 @@ html-encoding-sniffer@^2.0.1:
   dependencies:
     whatwg-encoding "^1.0.5"
 
-html-entities@^1.2.0, html-entities@^1.2.1, html-entities@^1.3.1:
-  version "1.3.3"
-  resolved "https://registry.npmjs.org/html-entities/-/html-entities-1.3.3.tgz#3dca638a43ee7de316fc23067398491152ad4736"
-  integrity sha512-/VulV3SYni1taM7a4RMdceqzJWR39gpZHjBwUnsCFKWV/GJkD14CJ5F7eWcZozmHJK0/f/H5U3b3SiPkuvxMgg==
+html-entities@^1.2.0:
+  version "1.3.1"
+  resolved "https://registry.npmjs.org/html-entities/-/html-entities-1.3.1.tgz#fb9a1a4b5b14c5daba82d3e34c6ae4fe701a0e44"
+  integrity sha512-rhE/4Z3hIhzHAUKbW8jVcCyuT5oJCXXqhN/6mXXVCpzTmvJnoH2HL/bt3EZ6p55jbFJBeAe1ZNpL5BugLujxNA==
+
+html-entities@^1.2.1:
+  version "1.4.0"
+  resolved "https://registry.npmjs.org/html-entities/-/html-entities-1.4.0.tgz#cfbd1b01d2afaf9adca1b10ae7dffab98c71d2dc"
+  integrity sha512-8nxjcBcd8wovbeKx7h3wTji4e6+rhaVuPNpMqwWgnHh+N9ToqsCs6XztWRBPQ+UtzsoMAdKZtUENoVzU/EMtZA==
+
+html-entities@^2.3.2:
+  version "2.3.2"
+  resolved "https://registry.npmjs.org/html-entities/-/html-entities-2.3.2.tgz#760b404685cb1d794e4f4b744332e3b00dcfe488"
+  integrity sha512-c3Ab/url5ksaT0WyleslpBEthOzWhrjQbg75y7XUsfSzi3Dgzt0l8w5e7DylRn15MTlMMD58dTfzddNS2kcAjQ==
 
 html-escaper@^2.0.0:
   version "2.0.1"
@@ -14391,7 +15375,12 @@ html-to-react@^1.3.4:
     lodash.camelcase "^4.3.0"
     ramda "^0.26"
 
-html-webpack-plugin@^4.2.1, html-webpack-plugin@^4.3.0:
+html-void-elements@^1.0.0:
+  version "1.0.5"
+  resolved "https://registry.npmjs.org/html-void-elements/-/html-void-elements-1.0.5.tgz#ce9159494e86d95e45795b166c2021c2cfca4483"
+  integrity sha512-uE/TxKuyNIcx44cIWnjr/rfIATDH7ZaOMmstu0CwhFG1Dunhlp4OC6/NMbhiwoq5BpW0ubi303qnEk/PZj614w==
+
+html-webpack-plugin@^4.0.0:
   version "4.5.2"
   resolved "https://registry.npmjs.org/html-webpack-plugin/-/html-webpack-plugin-4.5.2.tgz#76fc83fa1a0f12dd5f7da0404a54e2699666bc12"
   integrity sha512-q5oYdzjKUIPQVjOosjgvCHQOv9Ett9CYYHlgvJeXG0qQvdSojnBq4vAdQBwn1+yGveAwHCoe/rMR86ozX3+c2A==
@@ -14406,12 +15395,24 @@ html-webpack-plugin@^4.2.1, html-webpack-plugin@^4.3.0:
     tapable "^1.1.3"
     util.promisify "1.0.0"
 
-html2canvas@^1.0.0-rc.5:
-  version "1.0.0-rc.7"
-  resolved "https://registry.npmjs.org/html2canvas/-/html2canvas-1.0.0-rc.7.tgz#70c159ce0e63954a91169531894d08ad5627ac98"
-  integrity sha512-yvPNZGejB2KOyKleZspjK/NruXVQuowu8NnV2HYG7gW7ytzl+umffbtUI62v2dCHQLDdsK6HIDtyJZ0W3neerA==
+html-webpack-plugin@^5.3.1:
+  version "5.3.1"
+  resolved "https://registry.npmjs.org/html-webpack-plugin/-/html-webpack-plugin-5.3.1.tgz#8797327548e3de438e3494e0c6d06f181a7f20d1"
+  integrity sha512-rZsVvPXUYFyME0cuGkyOHfx9hmkFa4pWfxY/mdY38PsBEaVNsRoA+Id+8z6DBDgyv3zaw6XQszdF8HLwfQvcdQ==
   dependencies:
-    css-line-break "1.1.1"
+    "@types/html-minifier-terser" "^5.0.0"
+    html-minifier-terser "^5.0.1"
+    lodash "^4.17.20"
+    pretty-error "^2.1.1"
+    tapable "^2.0.0"
+
+html2canvas@^1.0.0-rc.5:
+  version "1.3.2"
+  resolved "https://registry.npmjs.org/html2canvas/-/html2canvas-1.3.2.tgz#951cc8388a3ce939fdac02131007ee28124afc27"
+  integrity sha512-4+zqv87/a1LsaCrINV69wVLGG8GBZcYBboz1JPWEgiXcWoD9kroLzccsBRU/L9UlfV2MAZ+3J92U9IQPVMDeSQ==
+  dependencies:
+    css-line-break "2.0.1"
+    text-segmentation "^1.0.2"
 
 htmlparser2@^3.3.0:
   version "3.10.1"
@@ -14435,16 +15436,6 @@ htmlparser2@^4.0:
     domutils "^2.0.0"
     entities "^2.0.0"
 
-htmlparser2@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.npmjs.org/htmlparser2/-/htmlparser2-6.0.0.tgz#c2da005030390908ca4c91e5629e418e0665ac01"
-  integrity sha512-numTQtDZMoh78zJpaNdJ9MXb2cv5G3jwUoe3dMQODubZvLoGvTE/Ofp6sHvH8OGKcN/8A47pGLi/k58xHP/Tfw==
-  dependencies:
-    domelementtype "^2.0.1"
-    domhandler "^4.0.0"
-    domutils "^2.4.4"
-    entities "^2.0.0"
-
 http-cache-semantics@^4.0.0, http-cache-semantics@^4.1.0:
   version "4.1.0"
   resolved "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.1.0.tgz#49e91c5cbf36c9b94bcfcd71c23d5249ec74e390"
@@ -14503,6 +15494,11 @@ http-errors@~1.6.2:
   resolved "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.4.10.tgz#92c9c1374c35085f75db359ec56cc257cbb93fa4"
   integrity sha1-ksnBN0w1CF912zWexWzCV8u5P6Q=
 
+http-parser-js@>=0.5.1:
+  version "0.5.3"
+  resolved "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.5.3.tgz#01d2709c79d41698bb01d4decc5e9da4e4a033d9"
+  integrity sha512-t7hjvef/5HEK7RWTdUzVUhl8zkEu+LlaE0IYzdMuvbSDipxBRpOn4Uhw8ZyECEa808iVT8XCjzo6xmYt4CiLZg==
+
 http-proxy-agent@^4.0.0, http-proxy-agent@^4.0.1:
   version "4.0.1"
   resolved "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-4.0.1.tgz#8a8c8ef7f5932ccf953c296ca8291b95aa74aa3a"
@@ -14512,16 +15508,6 @@ http-proxy-agent@^4.0.0, http-proxy-agent@^4.0.1:
     agent-base "6"
     debug "4"
 
-http-proxy-middleware@0.19.1:
-  version "0.19.1"
-  resolved "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-0.19.1.tgz#183c7dc4aa1479150306498c210cdaf96080a43a"
-  integrity sha512-yHYTgWMQO8VvwNS22eLLloAkvungsKdKTLO8AJlftYIKNfJr3GK3zK0ZCfzDDGUBttdGc8xFy1mCitvNKQtC3Q==
-  dependencies:
-    http-proxy "^1.17.0"
-    is-glob "^4.0.0"
-    lodash "^4.17.11"
-    micromatch "^3.1.10"
-
 http-proxy-middleware@^1.0.0:
   version "1.3.1"
   resolved "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-1.3.1.tgz#43700d6d9eecb7419bf086a128d0f7205d9eb665"
@@ -14544,7 +15530,7 @@ http-proxy-middleware@^2.0.0:
     is-plain-obj "^3.0.0"
     micromatch "^4.0.2"
 
-http-proxy@^1.17.0, http-proxy@^1.18.1:
+http-proxy@^1.18.1:
   version "1.18.1"
   resolved "https://registry.npmjs.org/http-proxy/-/http-proxy-1.18.1.tgz#401541f0534884bbf95260334e72f88ee3976549"
   integrity sha512-7mz/721AbnJwIVbnaSv1Cz3Am0ZLT/UBwkC92VlxhXv/k/BBQfM2fXElQNC27BVGr0uwUpplYPQM9LnaBMR5NQ==
@@ -14575,14 +15561,6 @@ https-browserify@^1.0.0:
   resolved "https://registry.npmjs.org/https-browserify/-/https-browserify-1.0.0.tgz#ec06c10e0a34c0f2faf199f7fd7fc78fffd03c73"
   integrity sha1-7AbBDgo0wPL68Zn3/X/Hj//QPHM=
 
-https-proxy-agent@^2.2.1:
-  version "2.2.4"
-  resolved "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-2.2.4.tgz#4ee7a737abd92678a293d9b34a1af4d0d08c787b"
-  integrity sha512-OmvfoQ53WLjtA9HeYP9RNrWMJzzAz1JGaSFr1nijg0PVR1JaD/xbJq1mdEIIlxGpXp9eSe/O2LgU9DJmTPd0Eg==
-  dependencies:
-    agent-base "^4.3.0"
-    debug "^3.1.0"
-
 https-proxy-agent@^5.0.0:
   version "5.0.0"
   resolved "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.0.tgz#e2a90542abb68a762e0a0850f6c9edadfd8506b2"
@@ -14708,20 +15686,15 @@ ignore@^5.1.4:
   resolved "https://registry.npmjs.org/ignore/-/ignore-5.1.4.tgz#84b7b3dbe64552b6ef0eca99f6743dbec6d97adf"
   integrity sha512-MzbUSahkTW1u7JpKKjY7LCARd1fU5W2rLdxlM4kdkayuCwZImjkpluF9CM1aLewYJguPDqewLam18Y6AU69A8A==
 
-immer@1.10.0:
-  version "1.10.0"
-  resolved "https://registry.npmjs.org/immer/-/immer-1.10.0.tgz#bad67605ba9c810275d91e1c2a47d4582e98286d"
-  integrity sha512-O3sR1/opvCDGLEVcvrGTMtLac8GJ5IwZC4puPrLuRj3l7ICKvkmA0vGuU9OW8mV9WIBRnaxp5GJh9IEAaNOoYg==
-
 immer@8.0.1:
   version "8.0.1"
   resolved "https://registry.npmjs.org/immer/-/immer-8.0.1.tgz#9c73db683e2b3975c424fb0572af5889877ae656"
   integrity sha512-aqXhGP7//Gui2+UrEtvxZxSquQVXTpZ7KDxfCcKAF3Vysvw0CViVaW9RZ1j1xlIYqaaaipBoqdqeibkc18PNvA==
 
 immer@^9.0.1:
-  version "9.0.1"
-  resolved "https://registry.npmjs.org/immer/-/immer-9.0.1.tgz#1116368e051f9a0fd188c5136b6efb74ed69c57f"
-  integrity sha512-7CCw1DSgr8kKYXTYOI1qMM/f5qxT5vIVMeGLDCDX8CSxsggr1Sjdoha4OhsP0AZ1UvWbyZlILHvLjaynuu02Mg==
+  version "9.0.6"
+  resolved "https://registry.npmjs.org/immer/-/immer-9.0.6.tgz#7a96bf2674d06c8143e327cbf73539388ddf1a73"
+  integrity sha512-G95ivKpy+EvVAnAab4fVa4YGYn24J1SpEktnJX7JJ45Bd7xqME/SCplFzYFmTbrkwZbQ4xJK1xMTUYBkN6pWsQ==
 
 immutable@>=3.8.2, immutable@^3.8.1, immutable@^3.8.2, immutable@^3.x.x:
   version "3.8.2"
@@ -14733,13 +15706,6 @@ immutable@~3.7.6:
   resolved "https://registry.npmjs.org/immutable/-/immutable-3.7.6.tgz#13b4d3cb12befa15482a26fe1b2ebae640071e4b"
   integrity sha1-E7TTyxK++hVIKib+Gy665kAHHks=
 
-import-cwd@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.npmjs.org/import-cwd/-/import-cwd-2.1.0.tgz#aa6cf36e722761285cb371ec6519f53e2435b0a9"
-  integrity sha1-qmzzbnInYShcs3HsZRn1PiQ1sKk=
-  dependencies:
-    import-from "^2.1.0"
-
 import-cwd@^3.0.0:
   version "3.0.0"
   resolved "https://registry.npmjs.org/import-cwd/-/import-cwd-3.0.0.tgz#20845547718015126ea9b3676b7592fb8bd4cf92"
@@ -14770,12 +15736,10 @@ import-from@3.0.0, import-from@^3.0.0:
   dependencies:
     resolve-from "^5.0.0"
 
-import-from@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.npmjs.org/import-from/-/import-from-2.1.0.tgz#335db7f2a7affd53aaa471d4b8021dee36b7f3b1"
-  integrity sha1-M1238qev/VOqpHHUuAId7ja387E=
-  dependencies:
-    resolve-from "^3.0.0"
+import-from@4.0.0:
+  version "4.0.0"
+  resolved "https://registry.npmjs.org/import-from/-/import-from-4.0.0.tgz#2710b8d66817d232e16f4166e319248d3d5492e2"
+  integrity sha512-P9J71vT5nLlDeV8FHs5nNxaLbrpfAV5cF5srvbZfpwpcJoM/xZR3hiv+q+SAnuSmuGbXMWud063iIMx/V/EWZQ==
 
 import-lazy@^2.1.0:
   version "2.1.0"
@@ -14787,14 +15751,6 @@ import-lazy@~4.0.0:
   resolved "https://registry.npmjs.org/import-lazy/-/import-lazy-4.0.0.tgz#e8eb627483a0a43da3c03f3e35548be5cb0cc153"
   integrity sha512-rKtvo6a868b5Hu3heneU+L4yEQ4jYKLtjpnPeUdK7h0yzXGmyBTypknlkCvHFBqfX9YlorEiMM6Dnq/5atfHkw==
 
-import-local@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.npmjs.org/import-local/-/import-local-2.0.0.tgz#55070be38a5993cf18ef6db7e961f5bee5c5a09d"
-  integrity sha512-b6s04m3O+s3CGSbqDIyP4R6aAwAeYlVq9+WUWep6iHa8ETRf9yei1U48C5MmfJmV9AiLYYBKPMq/W+/WRpQmCQ==
-  dependencies:
-    pkg-dir "^3.0.0"
-    resolve-cwd "^2.0.0"
-
 import-local@^3.0.2:
   version "3.0.2"
   resolved "https://registry.npmjs.org/import-local/-/import-local-3.0.2.tgz#a8cfd0431d1de4a2199703d003e3e62364fa6db6"
@@ -14850,7 +15806,7 @@ inflight@^1.0.4:
     once "^1.3.0"
     wrappy "1"
 
-inherits@2, inherits@2.0.4, inherits@^2.0.1, inherits@^2.0.3, inherits@^2.0.4, inherits@~2.0.0, inherits@~2.0.1, inherits@~2.0.3:
+inherits@2, inherits@2.0.4, inherits@^2.0.0, inherits@^2.0.1, inherits@^2.0.3, inherits@^2.0.4, inherits@~2.0.0, inherits@~2.0.1, inherits@~2.0.3:
   version "2.0.4"
   resolved "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c"
   integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==
@@ -14889,6 +15845,11 @@ init-package-json@^2.0.2:
     validate-npm-package-license "^3.0.4"
     validate-npm-package-name "^3.0.0"
 
+inline-style-parser@0.1.1:
+  version "0.1.1"
+  resolved "https://registry.npmjs.org/inline-style-parser/-/inline-style-parser-0.1.1.tgz#ec8a3b429274e9c0a1f1c4ffa9453a7fef72cea1"
+  integrity sha512-7NXolsK4CAS5+xvdj5OMMbI962hU/wvwoxk+LWR9Ek9bVtyuuYScDN6eS0rUm6TxApFpw7CX1o4uJzcd4AyD3Q==
+
 inline-style-prefixer@^6.0.0:
   version "6.0.0"
   resolved "https://registry.npmjs.org/inline-style-prefixer/-/inline-style-prefixer-6.0.0.tgz#f73d5dbf2855733d6b153a4d24b7b47a73e9770b"
@@ -14896,26 +15857,7 @@ inline-style-prefixer@^6.0.0:
   dependencies:
     css-in-js-utils "^2.0.0"
 
-inquirer@7.0.4:
-  version "7.0.4"
-  resolved "https://registry.npmjs.org/inquirer/-/inquirer-7.0.4.tgz#99af5bde47153abca23f5c7fc30db247f39da703"
-  integrity sha512-Bu5Td5+j11sCkqfqmUTiwv+tWisMtP0L7Q8WrqA2C/BbBhy1YTdFrvjjlrKq8oagA/tLQBski2Gcx/Sqyi2qSQ==
-  dependencies:
-    ansi-escapes "^4.2.1"
-    chalk "^2.4.2"
-    cli-cursor "^3.1.0"
-    cli-width "^2.0.0"
-    external-editor "^3.0.3"
-    figures "^3.0.0"
-    lodash "^4.17.15"
-    mute-stream "0.0.8"
-    run-async "^2.2.0"
-    rxjs "^6.5.3"
-    string-width "^4.1.0"
-    strip-ansi "^5.1.0"
-    through "^2.3.6"
-
-inquirer@^7.0.0, inquirer@^7.0.4, inquirer@^7.3.3:
+inquirer@^7.0.4, inquirer@^7.3.3:
   version "7.3.3"
   resolved "https://registry.npmjs.org/inquirer/-/inquirer-7.3.3.tgz#04d176b2af04afc157a83fd7c100e98ee0aad003"
   integrity sha512-JG3eIAj5V9CwcGvuOmoo6LB9kbAYT8HXffUl6memuszlwDC/qvFAJw49XJ5NROSFNPxp3iQg1GqkFhaY/CR0IA==
@@ -14954,13 +15896,15 @@ inquirer@^8.1.0:
     strip-ansi "^6.0.0"
     through "^2.3.6"
 
-internal-ip@^4.3.0:
-  version "4.3.0"
-  resolved "https://registry.npmjs.org/internal-ip/-/internal-ip-4.3.0.tgz#845452baad9d2ca3b69c635a137acb9a0dad0907"
-  integrity sha512-S1zBo1D6zcsyuC6PMmY5+55YMILQ9av8lotMx447Bq6SAgo/sDK6y6uUKmuYhW7eacnIhFfsPmCNYdDzsnnDCg==
+internal-ip@^6.2.0:
+  version "6.2.0"
+  resolved "https://registry.npmjs.org/internal-ip/-/internal-ip-6.2.0.tgz#d5541e79716e406b74ac6b07b856ef18dc1621c1"
+  integrity sha512-D8WGsR6yDt8uq7vDMu7mjcR+yRMm3dW8yufyChmszWRjcSHuxLBkR3GdS2HZAjodsaGuCvXeEJpueisXJULghg==
   dependencies:
-    default-gateway "^4.2.0"
-    ipaddr.js "^1.9.0"
+    default-gateway "^6.0.0"
+    ipaddr.js "^1.9.1"
+    is-ip "^3.1.0"
+    p-event "^4.2.0"
 
 internal-slot@^1.0.2:
   version "1.0.2"
@@ -14976,11 +15920,19 @@ interpret@^1.0.0:
   resolved "https://registry.npmjs.org/interpret/-/interpret-1.2.0.tgz#d5061a6224be58e8083985f5014d844359576296"
   integrity sha512-mT34yGKMNceBQUoVn7iCDKDntA7SC6gycMAWzGx1z/CMCTV7b2AAtXlo3nRyHZ1FelRkQbQjprHSYGwzLtkVbw==
 
-interpret@^2.0.0, interpret@^2.2.0:
+interpret@^2.2.0:
   version "2.2.0"
   resolved "https://registry.npmjs.org/interpret/-/interpret-2.2.0.tgz#1a78a0b5965c40a5416d007ad6f50ad27c417df9"
   integrity sha512-Ju0Bz/cEia55xDwUWEa8+olFpCiQoypjnQySseKtmjNrnps3P+xfpUmGr90T7yjlVJmOtybRvPXhKMbHr+fWnw==
 
+into-stream@^5.1.1:
+  version "5.1.1"
+  resolved "https://registry.npmjs.org/into-stream/-/into-stream-5.1.1.tgz#f9a20a348a11f3c13face22763f2d02e127f4db8"
+  integrity sha512-krrAJ7McQxGGmvaYbB7Q1mcA+cRwg9Ij2RfWIeVesNBgVDZmzY/Fa4IpZUT3bmdRzMzdf/mzltCG2Dq99IZGBA==
+  dependencies:
+    from2 "^2.3.0"
+    p-is-promise "^3.0.0"
+
 invariant@^2.0.0, invariant@^2.2.2, invariant@^2.2.3, invariant@^2.2.4:
   version "2.2.4"
   resolved "https://registry.npmjs.org/invariant/-/invariant-2.2.4.tgz#610f3c92c9359ce1db616e538008d23ff35158e6"
@@ -14998,16 +15950,26 @@ ip-regex@^2.1.0:
   resolved "https://registry.npmjs.org/ip-regex/-/ip-regex-2.1.0.tgz#fa78bf5d2e6913c911ce9f819ee5146bb6d844e9"
   integrity sha1-+ni/XS5pE8kRzp+BnuUUa7bYROk=
 
+ip-regex@^4.0.0:
+  version "4.3.0"
+  resolved "https://registry.npmjs.org/ip-regex/-/ip-regex-4.3.0.tgz#687275ab0f57fa76978ff8f4dddc8a23d5990db5"
+  integrity sha512-B9ZWJxHHOHUhUjCPrMpLD4xEq35bUTClHM1S6CBU5ixQnkZmwipwgc96vAd7AAGM9TGHvJR+Uss+/Ak6UphK+Q==
+
 ip@^1.1.0, ip@^1.1.5:
   version "1.1.5"
   resolved "https://registry.npmjs.org/ip/-/ip-1.1.5.tgz#bdded70114290828c0a039e72ef25f5aaec4354a"
   integrity sha1-vd7XARQpCCjAoDnnLvJfWq7ENUo=
 
-ipaddr.js@1.9.1, ipaddr.js@^1.9.0:
+ipaddr.js@1.9.1, ipaddr.js@^1.9.1:
   version "1.9.1"
   resolved "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.1.tgz#bff38543eeb8984825079ff3a2a8e6cbd46781b3"
   integrity sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g==
 
+ipaddr.js@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-2.0.1.tgz#eca256a7a877e917aeb368b0a7497ddf42ef81c0"
+  integrity sha512-1qTgH9NG+IIJ4yfKs2e6Pp1bZg8wbDbKHT21HrLIeYBTRLgMYKnMTPAuI3Lcs61nfx5h1xlXnbJtH1kX5/d/ng==
+
 is-absolute-url@^2.0.0:
   version "2.1.0"
   resolved "https://registry.npmjs.org/is-absolute-url/-/is-absolute-url-2.1.0.tgz#50530dfb84fcc9aa7dbe7852e83a37b93b9f2aa6"
@@ -15040,7 +16002,7 @@ is-accessor-descriptor@^1.0.0:
   dependencies:
     kind-of "^6.0.0"
 
-is-alphabetical@^1.0.0:
+is-alphabetical@1.0.4, is-alphabetical@^1.0.0:
   version "1.0.4"
   resolved "https://registry.npmjs.org/is-alphabetical/-/is-alphabetical-1.0.4.tgz#9e7d6b94916be22153745d184c298cbf986a686d"
   integrity sha512-DwzsA04LQ10FHTZuL0/grVDk4rFoVH1pjAToYwBrHSxcrBIGQuXrQMtD5U1b0U2XVgKZCTLLP8u2Qxqhy3l2Vg==
@@ -15189,7 +16151,7 @@ is-directory@^0.3.1:
   resolved "https://registry.npmjs.org/is-directory/-/is-directory-0.3.1.tgz#61339b6f2475fc772fd9c9d83f5c8575dc154ae1"
   integrity sha1-YTObbyR1/Hcv2cnYP1yFddwVSuE=
 
-is-docker@^2.0.0:
+is-docker@^2.0.0, is-docker@^2.1.1:
   version "2.2.1"
   resolved "https://registry.npmjs.org/is-docker/-/is-docker-2.2.1.tgz#33eeabe23cfe86f14bde4408a02c0cfb853acdaa"
   integrity sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ==
@@ -15256,6 +16218,11 @@ is-generator-fn@^2.0.0:
   resolved "https://registry.npmjs.org/is-generator-fn/-/is-generator-fn-2.1.0.tgz#7d140adc389aaf3011a8f2a2a4cfa6faadffb118"
   integrity sha512-cTIB4yPYL/Grw0EaSzASzg6bBy9gqCofvWN8okThAYIxKJZC+udlRAmGbM0XLeniEJSs8uEgHPGuHSe1XsOLSQ==
 
+is-generator-function@^1.0.7:
+  version "1.0.8"
+  resolved "https://registry.npmjs.org/is-generator-function/-/is-generator-function-1.0.8.tgz#dfb5c2b120e02b0a8d9d2c6806cd5621aa922f7b"
+  integrity sha512-2Omr/twNtufVZFr1GhxjOMFPAj2sjc/dKaIqBhvo4qciXfJmITGH6ZGd8eZYNHza8t1y0e01AuqRhJwfWp26WQ==
+
 is-glob@4.0.1, is-glob@^4.0.0, is-glob@^4.0.1, is-glob@~4.0.1:
   version "4.0.1"
   resolved "https://registry.npmjs.org/is-glob/-/is-glob-4.0.1.tgz#7567dbe9f2f5e2467bc77ab83c4a29482407a5dc"
@@ -15308,6 +16275,13 @@ is-interactive@^1.0.0:
   resolved "https://registry.npmjs.org/is-interactive/-/is-interactive-1.0.0.tgz#cea6e6ae5c870a7b0a0004070b7b587e0252912e"
   integrity sha512-2HvIEKRoqS62guEC+qBjpvRubdX910WCMuJTZ+I9yvqKU2/12eSL549HMwtabb4oupdj2sMP50k+XJfB/8JE6w==
 
+is-ip@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.npmjs.org/is-ip/-/is-ip-3.1.0.tgz#2ae5ddfafaf05cb8008a62093cf29734f657c5d8"
+  integrity sha512-35vd5necO7IitFPjd/YBeqwWnyDWbuLH9ZXQdMfDA8TEo7pv5X8yfrvVO3xbJbLUlERCMvf6X0hTUamQxCYJ9Q==
+  dependencies:
+    ip-regex "^4.0.0"
+
 is-lambda@^1.0.1:
   version "1.0.1"
   resolved "https://registry.npmjs.org/is-lambda/-/is-lambda-1.0.1.tgz#3d9877899e6a53efc0160504cde15f82e6f061d5"
@@ -15357,7 +16331,7 @@ is-number@^7.0.0:
   resolved "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz#7535345b896734d5f80c4d06c50955527a14f12b"
   integrity sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==
 
-is-obj@^1.0.0, is-obj@^1.0.1:
+is-obj@^1.0.1:
   version "1.0.1"
   resolved "https://registry.npmjs.org/is-obj/-/is-obj-1.0.1.tgz#3e4729ac1f5fde025cd7d83a896dab9f4f67db0f"
   integrity sha1-PkcprB9f3gJc19g6iW2rn09n2w8=
@@ -15379,26 +16353,17 @@ is-observable@^1.1.0:
   dependencies:
     symbol-observable "^1.1.0"
 
-is-path-cwd@^2.0.0, is-path-cwd@^2.2.0:
+is-path-cwd@^2.2.0:
   version "2.2.0"
   resolved "https://registry.npmjs.org/is-path-cwd/-/is-path-cwd-2.2.0.tgz#67d43b82664a7b5191fd9119127eb300048a9fdb"
   integrity sha512-w942bTcih8fdJPJmQHFzkS76NEP8Kzzvmw92cXsazb8intwLqPibPPdXf4ANdKV3rYMuuQYGIWtvz9JilB3NFQ==
 
-is-path-in-cwd@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.npmjs.org/is-path-in-cwd/-/is-path-in-cwd-2.1.0.tgz#bfe2dca26c69f397265a4009963602935a053acb"
-  integrity sha512-rNocXHgipO+rvnP6dk3zI20RpOtrAM/kzbB258Uw5BWr3TpXi861yzjo16Dn4hUox07iw5AyeMLHWsujkjzvRQ==
-  dependencies:
-    is-path-inside "^2.1.0"
+is-path-inside@^3.0.1:
+  version "3.0.2"
+  resolved "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.2.tgz#f5220fc82a3e233757291dddc9c5877f2a1f3017"
+  integrity sha512-/2UGPSgmtqwo1ktx8NDHjuPwZWmHhO+gj0f93EkhLB5RgW9RZevWYYlIkS6zePc6U2WpOdQYIwHe9YC4DWEBVg==
 
-is-path-inside@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.npmjs.org/is-path-inside/-/is-path-inside-2.1.0.tgz#7c9810587d659a40d27bcdb4d5616eab059494b2"
-  integrity sha512-wiyhTzfDWsvwAW53OBWF5zuvaOGlZ6PwYxAbPVDhpm+gM09xKQGjBq/8uYN12aDvMxnAnq3dxTyoSoRNmg5YFg==
-  dependencies:
-    path-is-inside "^1.0.2"
-
-is-path-inside@^3.0.1, is-path-inside@^3.0.2:
+is-path-inside@^3.0.2:
   version "3.0.3"
   resolved "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.3.tgz#d231362e53a07ff2b0e0ea7fed049161ffd16283"
   integrity sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==
@@ -15554,6 +16519,17 @@ is-text-path@^1.0.1:
   dependencies:
     text-extensions "^1.0.0"
 
+is-typed-array@^1.1.3:
+  version "1.1.5"
+  resolved "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.5.tgz#f32e6e096455e329eb7b423862456aa213f0eb4e"
+  integrity sha512-S+GRDgJlR3PyEbsX/Fobd9cqpZBuvUS+8asRqYDMLCb2qMzt1oz5m5oxQCxOgUDxiWsOVNi4yaF+/uvdlHlYug==
+  dependencies:
+    available-typed-arrays "^1.0.2"
+    call-bind "^1.0.2"
+    es-abstract "^1.18.0-next.2"
+    foreach "^2.0.5"
+    has-symbols "^1.0.1"
+
 is-typedarray@^1.0.0, is-typedarray@~1.0.0:
   version "1.0.0"
   resolved "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a"
@@ -15583,6 +16559,11 @@ is-utf8@^0.2.0:
   resolved "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.1.tgz#4b0da1442104d1b336340e80797e865cf39f7d72"
   integrity sha1-Sw2hRCEE0bM2NA6AeX6GXPOffXI=
 
+is-whitespace-character@^1.0.0:
+  version "1.0.4"
+  resolved "https://registry.npmjs.org/is-whitespace-character/-/is-whitespace-character-1.0.4.tgz#0858edd94a95594c7c9dd0b5c174ec6e45ee4aa7"
+  integrity sha512-SDweEzfIZM0SJV0EUga669UTKlmL0Pq8Lno0QDQsPnvECB3IM2aP0gdx5TrU0A01MAPfViaZiI2V1QMZLaKK5w==
+
 is-window@^1.0.2:
   version "1.0.2"
   resolved "https://registry.npmjs.org/is-window/-/is-window-1.0.2.tgz#2c896ca53db97de45d3c33133a65d8c9f563480d"
@@ -15593,6 +16574,11 @@ is-windows@^1.0.0, is-windows@^1.0.1, is-windows@^1.0.2:
   resolved "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz#d1850eb9791ecd18e6182ce12a30f396634bb19d"
   integrity sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==
 
+is-word-character@^1.0.0:
+  version "1.0.4"
+  resolved "https://registry.npmjs.org/is-word-character/-/is-word-character-1.0.4.tgz#ce0e73216f98599060592f62ff31354ddbeb0230"
+  integrity sha512-5SMO8RVennx3nZrqtKwCGyyetPE9VDba5ugvKLaD4KopPG5kR4mQ7tNt/r7feL5yt5h3lpuBbIUmCOG2eSzXHA==
+
 is-wsl@^1.1.0:
   version "1.1.0"
   resolved "https://registry.npmjs.org/is-wsl/-/is-wsl-1.1.0.tgz#1f16e4aa22b04d1336b66188a66af3c600c3a66d"
@@ -15610,6 +16596,11 @@ is-yarn-global@^0.3.0:
   resolved "https://registry.npmjs.org/is-yarn-global/-/is-yarn-global-0.3.0.tgz#d502d3382590ea3004893746754c89139973e232"
   integrity sha512-VjSeb/lHmkoyd8ryPVIKvOCn4D1koMqY+vqyjjUfc3xyKtP4dYOxM44sZrnqQSzSds3xyOrUTLTC9LVCVgLngw==
 
+isarray@0.0.1:
+  version "0.0.1"
+  resolved "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz#8a18acfca9a8f4177e09abfc6038939b05d1eedf"
+  integrity sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=
+
 isarray@1.0.0, isarray@^1.0.0, isarray@~1.0.0:
   version "1.0.0"
   resolved "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11"
@@ -15655,7 +16646,7 @@ isomorphic-fetch@^3.0.0:
     node-fetch "^2.6.1"
     whatwg-fetch "^3.4.1"
 
-isomorphic-form-data@~2.0.0:
+isomorphic-form-data@^2.0.0:
   version "2.0.0"
   resolved "https://registry.npmjs.org/isomorphic-form-data/-/isomorphic-form-data-2.0.0.tgz#9f6adf1c4c61ae3aefd8f110ab60fb9b143d6cec"
   integrity sha512-TYgVnXWeESVmQSg4GLVbalmQ+B4NPi/H4eWxqALKj63KsUrcu301YDjBqaOw3h+cbak7Na4Xyps3BiptHtxTfg==
@@ -15663,9 +16654,9 @@ isomorphic-form-data@~2.0.0:
     form-data "^2.3.2"
 
 isomorphic-git@^1.8.0:
-  version "1.8.0"
-  resolved "https://registry.npmjs.org/isomorphic-git/-/isomorphic-git-1.8.0.tgz#50440650a64706a321cbea1af955c1cf1110b238"
-  integrity sha512-TWJvQh+++eFrEG0IFS/jLhMwsBoCOX1/Dsw9q8no59Mp1K0jEjSHXFWv2P04PwkxcIpePkXVBI5YFcFT2nkuQg==
+  version "1.9.2"
+  resolved "https://registry.npmjs.org/isomorphic-git/-/isomorphic-git-1.9.2.tgz#0e492dbcd9873070b2a57eef257a45b90020ed72"
+  integrity sha512-puCXcGgtkDXdMYLZlAEGbpkbmHn/Q4Lsl2uMFwMLOKmmr8Qe7Fe3+c6k2+aHW3rMdJYg9xTv95BJ+PRzR8Ydww==
   dependencies:
     async-lock "^1.1.0"
     clean-git-ref "^2.0.1"
@@ -15748,25 +16739,7 @@ iterate-value@^1.0.0:
     es-get-iterator "^1.0.2"
     iterate-iterator "^1.0.1"
 
-jade@0.26.3:
-  version "0.26.3"
-  resolved "https://registry.npmjs.org/jade/-/jade-0.26.3.tgz#8f10d7977d8d79f2f6ff862a81b0513ccb25686c"
-  integrity sha1-jxDXl32NefL2/4YqgbBRPMslaGw=
-  dependencies:
-    commander "0.6.1"
-    mkdirp "0.3.0"
-
-jake@^10.6.1:
-  version "10.8.2"
-  resolved "https://registry.npmjs.org/jake/-/jake-10.8.2.tgz#ebc9de8558160a66d82d0eadc6a2e58fbc500a7b"
-  integrity sha512-eLpKyrfG3mzvGE2Du8VoPbeSkRry093+tyNjdYaBbJS9v17knImYGNXQCUV0gLxQtF82m3E8iRb/wdSQZLoq7A==
-  dependencies:
-    async "0.9.x"
-    chalk "^2.4.2"
-    filelist "^1.0.1"
-    minimatch "^3.0.4"
-
-jenkins@^0.28.0:
+jenkins@^0.28.1:
   version "0.28.1"
   resolved "https://registry.npmjs.org/jenkins/-/jenkins-0.28.1.tgz#f7951798ee5d2bb501a831979b6b5ecc1a922a64"
   integrity sha512-gcC4QUrP4VzdqOMHoVzh36XlJprxJkI2HGLQSY7w84KoCTVNDcR/8O00tYyXp9vrZOx4wl5zCXLVKMgH2IoyJQ==
@@ -16180,14 +17153,14 @@ jest-watcher@^26.6.2:
     string-length "^4.0.1"
 
 jest-when@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.npmjs.org/jest-when/-/jest-when-3.1.0.tgz#d041191b8d4a8ad3fd9c4dc2eda3237eaeec4004"
-  integrity sha512-oLANZfF60yxheShbbke3+XXosZhge8Va2xiwIddF8DF5l996Ldy8bL6hT319ovSyjrhBWLOEESKfANyM0Eo/SQ==
+  version "3.3.1"
+  resolved "https://registry.npmjs.org/jest-when/-/jest-when-3.3.1.tgz#04f978b2e522a290b1d91db7ab6ca029a7925513"
+  integrity sha512-nbQxKeHqfmoSE38TfLVPCgxG+rnsgHSXsdH1wdE9bqHt9US6twHjSXV+fD4ncfsIWNXqhv7zRvN5jn/QYL2UwA==
   dependencies:
     bunyan "^1.8.12"
     expect "^24.8.0"
 
-jest-worker@^26.2.1, jest-worker@^26.6.2:
+jest-worker@^26.5.0, jest-worker@^26.6.2:
   version "26.6.2"
   resolved "https://registry.npmjs.org/jest-worker/-/jest-worker-26.6.2.tgz#7f72cbc4d643c365e27b9fd775f9d0eaa9c7a8ed"
   integrity sha512-KWYVV1c4i+jbMpaBC+U++4Va0cp8OisU185o73T1vo99hqi7w8tSJfUXYswwqqrjzwxa6KpRK54WhPvwf5w6PQ==
@@ -16196,6 +17169,15 @@ jest-worker@^26.2.1, jest-worker@^26.6.2:
     merge-stream "^2.0.0"
     supports-color "^7.0.0"
 
+jest-worker@^27.0.2:
+  version "27.0.6"
+  resolved "https://registry.npmjs.org/jest-worker/-/jest-worker-27.0.6.tgz#a5fdb1e14ad34eb228cfe162d9f729cdbfa28aed"
+  integrity sha512-qupxcj/dRuA3xHPMUd40gr2EaAurFbkwzOh7wfPaeE9id7hyjURRQoqNfHifHK3XjJU6YJJUQKILGUnwGPEOCA==
+  dependencies:
+    "@types/node" "*"
+    merge-stream "^2.0.0"
+    supports-color "^8.0.0"
+
 jest@^26.0.1:
   version "26.6.3"
   resolved "https://registry.npmjs.org/jest/-/jest-26.6.3.tgz#40e8fdbe48f00dfa1f0ce8121ca74b88ac9148ef"
@@ -16210,15 +17192,15 @@ jju@~1.4.0:
   resolved "https://registry.npmjs.org/jju/-/jju-1.4.0.tgz#a3abe2718af241a2b2904f84a625970f389ae32a"
   integrity sha1-o6vicYryQaKykE+EpiWXDzia4yo=
 
-jmespath@0.15.0:
+jmespath@0.15.0, jmespath@^0.15.0:
   version "0.15.0"
   resolved "https://registry.npmjs.org/jmespath/-/jmespath-0.15.0.tgz#a3f222a9aae9f966f5d27c796510e28091764217"
   integrity sha1-o/Iiqarp+Wb10nx5ZRDigJF2Qhc=
 
-joi@^17.3.0:
-  version "17.4.0"
-  resolved "https://registry.npmjs.org/joi/-/joi-17.4.0.tgz#b5c2277c8519e016316e49ababd41a1908d9ef20"
-  integrity sha512-F4WiW2xaV6wc1jxete70Rw4V/VuMd6IN+a5ilZsxG4uYtUXWu2kq9W5P2dz30e7Gmw8RCbY/u/uk+dMPma9tAg==
+joi@^17.4.0:
+  version "17.4.2"
+  resolved "https://registry.npmjs.org/joi/-/joi-17.4.2.tgz#02f4eb5cf88e515e614830239379dcbbe28ce7f7"
+  integrity sha512-Lm56PP+n0+Z2A2rfRvsfWVDXGEWjXxatPopkQ8qQ5mxCEhwHG+Ettgg5o98FFaxilOxozoa14cFhrE/hOzh/Nw==
   dependencies:
     "@hapi/hoek" "^9.0.0"
     "@hapi/topo" "^5.0.0"
@@ -16246,9 +17228,9 @@ joycon@^2.2.5:
   integrity sha512-YqvUxoOcVPnCp0VU1/56f+iKSdvIRJYPznH22BdXV3xMk75SFXhWeJkZ8C9XxUWt1b5x2X1SxuFygW1U0FmkEQ==
 
 js-base64@^3.6.0:
-  version "3.6.0"
-  resolved "https://registry.npmjs.org/js-base64/-/js-base64-3.6.0.tgz#773e1de628f4f298d65a7e9842c50244751f5756"
-  integrity sha512-wVdUBYQeY2gY73RIlPrysvpYx+2vheGo8Y1SNQv/BzHToWpAZzJU7Z6uheKMAe+GLSBig5/Ps2nxg/8tRB73xg==
+  version "3.6.1"
+  resolved "https://registry.npmjs.org/js-base64/-/js-base64-3.6.1.tgz#555aae398b74694b4037af1f8a5a6209d170efbe"
+  integrity sha512-Frdq2+tRRGLQUIQOgsIGSCd1VePCS2fsddTG5dTCqR0JHgltXWfsxnY0gIXPoMeRmdom6Oyq+UMOFg5suduOjQ==
 
 js-cookie@^2.2.1:
   version "2.2.1"
@@ -16265,7 +17247,7 @@ js-levenshtein@^1.1.6:
   resolved "https://registry.npmjs.org/js-levenshtein/-/js-levenshtein-1.1.6.tgz#c6cee58eb3550372df8deb85fad5ce66ce01d59d"
   integrity sha512-X2BB11YZtrRqY4EnQcLX5Rh373zbK4alC1FW7D7MBhL2gtcC17cTnr6DmfHZeS0s2rTHjUTMMHfG7gO8SSdw+g==
 
-js-string-escape@1.0.1:
+js-string-escape@1.0.1, js-string-escape@^1.0.1:
   version "1.0.1"
   resolved "https://registry.npmjs.org/js-string-escape/-/js-string-escape-1.0.1.tgz#e2625badbc0d67c7533e9edc1068c587ae4137ef"
   integrity sha1-4mJbrbwNZ8dTPp7cEGjFh65BN+8=
@@ -16275,10 +17257,12 @@ js-string-escape@1.0.1:
   resolved "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499"
   integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==
 
-js-tokens@^3.0.2:
-  version "3.0.2"
-  resolved "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.2.tgz#9866df395102130e38f7f996bceb65443209c25b"
-  integrity sha1-mGbfOVECEw449/mWvOtlRDIJwls=
+js-yaml@=4.1.0, js-yaml@^4.0.0, js-yaml@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz#c1fb65f8f5017901cdd2c951864ba18458a10602"
+  integrity sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==
+  dependencies:
+    argparse "^2.0.1"
 
 js-yaml@^3.13.0, js-yaml@^3.13.1, js-yaml@^3.14.0, js-yaml@^3.6.1, js-yaml@^3.7.0, js-yaml@^3.8.3:
   version "3.14.1"
@@ -16288,13 +17272,6 @@ js-yaml@^3.13.0, js-yaml@^3.13.1, js-yaml@^3.14.0, js-yaml@^3.6.1, js-yaml@^3.7.
     argparse "^1.0.7"
     esprima "^4.0.0"
 
-js-yaml@^4.0.0:
-  version "4.1.0"
-  resolved "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz#c1fb65f8f5017901cdd2c951864ba18458a10602"
-  integrity sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==
-  dependencies:
-    argparse "^2.0.1"
-
 js-yaml@~3.13.1:
   version "3.13.1"
   resolved "https://registry.npmjs.org/js-yaml/-/js-yaml-3.13.1.tgz#aff151b30bfdfa8e49e05da22e7415e9dfa37847"
@@ -16420,13 +17397,6 @@ jsesc@~0.5.0:
   resolved "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz#e7dee66e35d6fc16f710fe91d5cf69f70f08911d"
   integrity sha1-597mbjXW/Bb3EP6R1c9p9w8IkR0=
 
-json-bigint@^0.3.0:
-  version "0.3.1"
-  resolved "https://registry.npmjs.org/json-bigint/-/json-bigint-0.3.1.tgz#0c1729d679f580d550899d6a2226c228564afe60"
-  integrity sha512-DGWnSzmusIreWlEupsUelHrhwmPPE+FiQvg+drKfk2p+bdEYa5mp4PJ8JsCWqae0M2jQNb0HPvnwvf1qOTThzQ==
-  dependencies:
-    bignumber.js "^9.0.0"
-
 json-bigint@^1.0.0:
   version "1.0.0"
   resolved "https://registry.npmjs.org/json-bigint/-/json-bigint-1.0.0.tgz#ae547823ac0cad8398667f8cd9ef4730f5b01ff1"
@@ -16544,11 +17514,6 @@ json2xml@^0.1.3:
   resolved "https://registry.npmjs.org/json2xml/-/json2xml-0.1.3.tgz#9ae7c220bedd7c66a668e26f7ac182f6704eca21"
   integrity sha1-mufCIL7dfGamaOJvesGC9nBOyiE=
 
-json3@^3.3.2:
-  version "3.3.3"
-  resolved "https://registry.npmjs.org/json3/-/json3-3.3.3.tgz#7fc10e375fc5ae42c4705a5cc0aa6f62be305b81"
-  integrity sha512-c7/8mbUsKigAbLkD5B010BK4D9LZm7A1pNItkEwiUZRpIN66exu/e7YQWysGun+TRKaJp8MhemM+VkfWv42aCA==
-
 json5@^1.0.1:
   version "1.0.1"
   resolved "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz#779fb0018604fa854eacbf6252180d83543e3dbe"
@@ -16556,7 +17521,7 @@ json5@^1.0.1:
   dependencies:
     minimist "^1.2.0"
 
-json5@^2.1.1, json5@^2.1.2, json5@^2.1.3:
+json5@^2.1.2, json5@^2.1.3:
   version "2.2.0"
   resolved "https://registry.npmjs.org/json5/-/json5-2.2.0.tgz#2dfefe720c6ba525d9ebd909950f0515316c89a3"
   integrity sha512-f+8cldu7X/y7RAJurMEJmdoKXGB/X550w2Nr3tTbezL6RwEE/iMcm+tZnXeoZtKuOq6ft8+CqzEkrIgx1fPoQA==
@@ -16739,6 +17704,11 @@ junk@^3.1.0:
   resolved "https://registry.npmjs.org/junk/-/junk-3.1.0.tgz#31499098d902b7e98c5d9b9c80f43457a88abfa1"
   integrity sha512-pBxcB3LFc8QVgdggvZWyeys+hnrNWg4OcZIU/1X59k5jQdLBlCsYGRQaz234SqoRLTCgMH00fY0xRJH+F9METQ==
 
+just-extend@^4.0.2:
+  version "4.2.1"
+  resolved "https://registry.npmjs.org/just-extend/-/just-extend-4.2.1.tgz#ef5e589afb61e5d66b24eca749409a8939a8c744"
+  integrity sha512-g3UB796vUFIY90VIv/WX3L2c8CS2MdWUww3CNrYmqza1Fg0DURc2K/O4YrnklBdQarSJ/y8JnJYDGc+1iumQjg==
+
 jwa@^1.4.1:
   version "1.4.1"
   resolved "https://registry.npmjs.org/jwa/-/jwa-1.4.1.tgz#743c32985cb9e98655530d53641b66c8645b039a"
@@ -16757,7 +17727,7 @@ jwa@^2.0.0:
     ecdsa-sig-formatter "1.0.11"
     safe-buffer "^5.0.1"
 
-jws@^3.1.5, jws@^3.2.2:
+jws@^3.2.2:
   version "3.2.2"
   resolved "https://registry.npmjs.org/jws/-/jws-3.2.2.tgz#001099f3639468c9414000e99995fa52fb478304"
   integrity sha512-YHlZCB6lMTllWDtSPHz/ZXTsi8S00usEV6v1tjq8tOUZzw7DpSDWVXjXDre6ed1w/pd495ODpHZYSdkRTsa0HA==
@@ -16779,17 +17749,17 @@ jwt-decode@*, jwt-decode@^3.1.0:
   integrity sha512-UfpWE/VZn0iP50d8cz9NrZLM9lSWhcJ+0Gt/nm4by88UL+J1SiKN8/5dkjMmbEzwL2CAe+67GsegCbIKtbp75A==
 
 kafkajs@^1.16.0-beta.6:
-  version "1.16.0-beta.6"
-  resolved "https://registry.npmjs.org/kafkajs/-/kafkajs-1.16.0-beta.6.tgz#650f4d16abd60516aa0c375be613368391216df1"
-  integrity sha512-R4DT3s7oCAoxdq3tN8w2WkUxLXcZgLQSjQVSmEZpEmT6hVdZ5AUZWqyLYr1IRbQowsJK4Z7eWJAk68J0JiRlUw==
+  version "1.16.0-beta.21"
+  resolved "https://registry.npmjs.org/kafkajs/-/kafkajs-1.16.0-beta.21.tgz#5736bcef7b505714642a82d6dc0d1507fc0ae817"
+  integrity sha512-6iarOOnKTaei0EK+a+K2V/bBA7YgvpA69tZwnVF85PxGlvoG/wqKpfRNh2Mb04uiNTEwBYNEIO7hAFElEM6/AA==
 
-keytar@^5.4.0:
-  version "5.6.0"
-  resolved "https://registry.npmjs.org/keytar/-/keytar-5.6.0.tgz#7b5d4bd043d17211163640be6c4a27a49b12bb39"
-  integrity sha512-ueulhshHSGoryfRXaIvTj0BV1yB0KddBGhGoqCxSN9LR1Ks1GKuuCdVhF+2/YOs5fMl6MlTI9On1a4DHDXoTow==
+keytar@^7.3.0:
+  version "7.7.0"
+  resolved "https://registry.npmjs.org/keytar/-/keytar-7.7.0.tgz#3002b106c01631aa79b1aa9ee0493b94179bbbd2"
+  integrity sha512-YEY9HWqThQc5q5xbXbRwsZTh2PJ36OSYRjSv3NN2xf5s5dpLTjEZnC2YikR29OaVybf9nQ0dJ/80i40RS97t/A==
   dependencies:
-    nan "2.14.1"
-    prebuild-install "5.3.3"
+    node-addon-api "^3.0.0"
+    prebuild-install "^6.0.0"
 
 keyv-memcache@^1.2.5:
   version "1.2.5"
@@ -16861,7 +17831,7 @@ kleur@^3.0.3:
   resolved "https://registry.npmjs.org/kleur/-/kleur-3.0.3.tgz#a79c9ecc86ee1ce3fa6206d1216c501f147fc07e"
   integrity sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w==
 
-klona@^2.0.3:
+klona@^2.0.4:
   version "2.0.4"
   resolved "https://registry.npmjs.org/klona/-/klona-2.0.4.tgz#7bb1e3affb0cb8624547ef7e8f6708ea2e39dfc0"
   integrity sha512-ZRbnvdg/NxqzC7L9Uyqzf4psi1OM4Cuc+sJAkQPjO6XkQIJTNbfK2Rsmbw8fx1p2mkZdp2FZYo2+LwXYY/uwIA==
@@ -17016,6 +17986,11 @@ lerna@^4.0.0:
     import-local "^3.0.2"
     npmlog "^4.1.2"
 
+leven@2.1.0:
+  version "2.1.0"
+  resolved "https://registry.npmjs.org/leven/-/leven-2.1.0.tgz#c2e7a9f772094dee9d34202ae8acce4687875580"
+  integrity sha1-wuep93IJTe6dNCAq6KzORoeHVYA=
+
 leven@^3.1.0:
   version "3.1.0"
   resolved "https://registry.npmjs.org/leven/-/leven-3.1.0.tgz#77891de834064cccba82ae7842bb6b14a13ed7f2"
@@ -17063,14 +18038,6 @@ libnpmpublish@^4.0.0:
     semver "^7.1.3"
     ssri "^8.0.0"
 
-liboneandone@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.npmjs.org/liboneandone/-/liboneandone-1.2.0.tgz#8d2c91c72a6323a96aed8410de05e06d6584b602"
-  integrity sha512-EB6Ak9qw+U4HAOnKqPtatxQ9pLclvtsBsggrvOuD4zclJ5xOeEASojsLKEC3O8KJ1Q4obE2JHhOeDuqWXvkoUQ==
-  dependencies:
-    mocha "^2.5.3"
-    request "^2.74.0"
-
 lines-and-columns@^1.1.6:
   version "1.1.6"
   resolved "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.1.6.tgz#1c00c743b433cd0a4e80758f7b64a57440d9ff00"
@@ -17230,14 +18197,10 @@ loader-runner@^2.4.0:
   resolved "https://registry.npmjs.org/loader-runner/-/loader-runner-2.4.0.tgz#ed47066bfe534d7e84c4c7b9998c2a75607d9357"
   integrity sha512-Jsmr89RcXGIwivFY21FcRrisYZfvLMTWx5kOLc+JTxtpBOG6xML0vzbc6SEQG2FO9/4Fc3wW4LVcB5DmGflaRw==
 
-loader-utils@1.2.3:
-  version "1.2.3"
-  resolved "https://registry.npmjs.org/loader-utils/-/loader-utils-1.2.3.tgz#1ff5dc6911c9f0a062531a4c04b609406108c2c7"
-  integrity sha512-fkpz8ejdnEMG3s37wGL07iSBDg99O9D5yflE9RGNH3hRdx9SOwYfnGYdZOUIZitN8E+E2vkq3MUMYMvPYl5ZZA==
-  dependencies:
-    big.js "^5.2.2"
-    emojis-list "^2.0.0"
-    json5 "^1.0.1"
+loader-runner@^4.2.0:
+  version "4.2.0"
+  resolved "https://registry.npmjs.org/loader-runner/-/loader-runner-4.2.0.tgz#d7022380d66d14c5fb1d496b89864ebcfd478384"
+  integrity sha512-92+huvxMvYlMzMt0iIOukcwYBFpkYJdpl2xsZ7LrlayO7E8SOv+JJUEK17B/dJIHAOLMfh2dZZ/Y18WgmGtYNw==
 
 loader-utils@2.0.0, loader-utils@^2.0.0:
   version "2.0.0"
@@ -17337,11 +18300,26 @@ lodash.flattendeep@^4.0.0:
   resolved "https://registry.npmjs.org/lodash.flattendeep/-/lodash.flattendeep-4.4.0.tgz#fb030917f86a3134e5bc9bec0d69e0013ddfedb2"
   integrity sha1-+wMJF/hqMTTlvJvsDWngAT3f7bI=
 
-lodash.get@^4, lodash.get@^4.0.0:
+lodash.get@^4, lodash.get@^4.0.0, lodash.get@^4.4.2:
   version "4.4.2"
   resolved "https://registry.npmjs.org/lodash.get/-/lodash.get-4.4.2.tgz#2d177f652fa31e939b4438d5341499dfa3825e99"
   integrity sha1-LRd/ZS+jHpObRDjVNBSZ36OCXpk=
 
+lodash.has@^4.5.2:
+  version "4.5.2"
+  resolved "https://registry.npmjs.org/lodash.has/-/lodash.has-4.5.2.tgz#d19f4dc1095058cccbe2b0cdf4ee0fe4aa37c862"
+  integrity sha1-0Z9NwQlQWMzL4rDN9O4P5Ko3yGI=
+
+lodash.hasin@^4.5.2:
+  version "4.5.2"
+  resolved "https://registry.npmjs.org/lodash.hasin/-/lodash.hasin-4.5.2.tgz#f91e352378d21ef7090b9e7687c2ca35c5b4d52a"
+  integrity sha1-+R41I3jSHvcJC552h8LKNcW01So=
+
+lodash.head@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.npmjs.org/lodash.head/-/lodash.head-4.0.1.tgz#e2aa322d3ec40cd6aae186082977d993b354ed9c"
+  integrity sha1-4qoyLT7EDNaq4YYIKXfZk7NU7Zw=
+
 lodash.includes@^4.3.0:
   version "4.3.0"
   resolved "https://registry.npmjs.org/lodash.includes/-/lodash.includes-4.3.0.tgz#60bb98a87cb923c68ca1e51325483314849f553f"
@@ -17352,6 +18330,11 @@ lodash.isboolean@^3.0.3:
   resolved "https://registry.npmjs.org/lodash.isboolean/-/lodash.isboolean-3.0.3.tgz#6c2e171db2a257cd96802fd43b01b20d5f5870f6"
   integrity sha1-bC4XHbKiV82WgC/UOwGyDV9YcPY=
 
+lodash.isempty@^4.4.0:
+  version "4.4.0"
+  resolved "https://registry.npmjs.org/lodash.isempty/-/lodash.isempty-4.4.0.tgz#6f86cbedd8be4ec987be9aaf33c9684db1b31e7e"
+  integrity sha1-b4bL7di+TsmHvpqvM8loTbGzHn4=
+
 lodash.isequal@^4.0.0:
   version "4.5.0"
   resolved "https://registry.npmjs.org/lodash.isequal/-/lodash.isequal-4.5.0.tgz#415c4478f2bcc30120c22ce10ed3226f7d3e18e0"
@@ -17367,11 +18350,21 @@ lodash.ismatch@^4.4.0:
   resolved "https://registry.npmjs.org/lodash.ismatch/-/lodash.ismatch-4.4.0.tgz#756cb5150ca3ba6f11085a78849645f188f85f37"
   integrity sha1-dWy1FQyjum8RCFp4hJZF8Yj4Xzc=
 
+lodash.isnil@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.npmjs.org/lodash.isnil/-/lodash.isnil-4.0.0.tgz#49e28cd559013458c814c5479d3c663a21bfaa6c"
+  integrity sha1-SeKM1VkBNFjIFMVHnTxmOiG/qmw=
+
 lodash.isnumber@^3.0.3:
   version "3.0.3"
   resolved "https://registry.npmjs.org/lodash.isnumber/-/lodash.isnumber-3.0.3.tgz#3ce76810c5928d03352301ac287317f11c0b1ffc"
   integrity sha1-POdoEMWSjQM1IwGsKHMX8RwLH/w=
 
+lodash.isobject@^3.0.2:
+  version "3.0.2"
+  resolved "https://registry.npmjs.org/lodash.isobject/-/lodash.isobject-3.0.2.tgz#3c8fb8d5b5bf4bf90ae06e14f2a530a4ed935e1d"
+  integrity sha1-PI+41bW/S/kK4G4U8qUwpO2TXh0=
+
 lodash.isplainobject@^4.0.6:
   version "4.0.6"
   resolved "https://registry.npmjs.org/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz#7c526a52d89b45c45cc690b88163be0497f550cb"
@@ -17392,6 +18385,11 @@ lodash.merge@^4.6.2:
   resolved "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz#558aa53b43b661e1925a0afdfa36a9a1085fe57a"
   integrity sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==
 
+lodash.omit@^4.5.0:
+  version "4.5.0"
+  resolved "https://registry.npmjs.org/lodash.omit/-/lodash.omit-4.5.0.tgz#6eb19ae5a1ee1dd9df0b969e66ce0b7fa30b5e60"
+  integrity sha1-brGa5aHuHdnfC5aeZs4Lf6MLXmA=
+
 lodash.once@^4.0.0, lodash.once@^4.1.1:
   version "4.1.1"
   resolved "https://registry.npmjs.org/lodash.once/-/lodash.once-4.1.1.tgz#0dd3971213c7c56df880977d504c88fb471a97ac"
@@ -17437,7 +18435,7 @@ lodash.union@^4.6.0:
   resolved "https://registry.npmjs.org/lodash.union/-/lodash.union-4.6.0.tgz#48bb5088409f16f1821666641c44dd1aaae3cd88"
   integrity sha1-SLtQiECfFvGCFmZkHETdGqrjzYg=
 
-lodash.uniq@^4.5.0:
+lodash.uniq@4.5.0, lodash.uniq@^4.5.0:
   version "4.5.0"
   resolved "https://registry.npmjs.org/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773"
   integrity sha1-0CJTc662Uq3BvILklFM5qEJ1R3M=
@@ -17452,7 +18450,7 @@ lodash@4.17.15:
   resolved "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz#b447f6670a0455bbfeedd11392eff330ea097548"
   integrity sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==
 
-lodash@4.17.21, lodash@^4.0.1, lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.19, lodash@^4.17.20, lodash@^4.17.21, lodash@^4.17.4, lodash@^4.17.5, lodash@^4.2.1, lodash@~4.17.0, lodash@~4.17.15, lodash@~4.17.4:
+lodash@4.17.21, lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.19, lodash@^4.17.20, lodash@^4.17.21, lodash@^4.17.4, lodash@^4.17.5, lodash@^4.2.1, lodash@~4.17.0, lodash@~4.17.15, lodash@~4.17.4:
   version "4.17.21"
   resolved "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c"
   integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==
@@ -17502,7 +18500,7 @@ logform@^2.1.1, logform@^2.2.0:
     ms "^2.1.1"
     triple-beam "^1.3.0"
 
-loglevel@^1.6.7, loglevel@^1.6.8:
+loglevel@^1.6.7:
   version "1.6.8"
   resolved "https://registry.npmjs.org/loglevel/-/loglevel-1.6.8.tgz#8a25fb75d092230ecd4457270d80b54e28011171"
   integrity sha512-bsU7+gc9AJ2SqpzxwU3+1fedl8zAntbtC5XYlt3s2j1hJcn2PsXSmgN8TaLG/J1/2mod4+cE/3vNL70/c1RNCA==
@@ -17564,11 +18562,6 @@ lowlight@^1.14.0, lowlight@^1.17.0:
     fault "^1.0.0"
     highlight.js "~10.4.0"
 
-lru-cache@2:
-  version "2.7.3"
-  resolved "https://registry.npmjs.org/lru-cache/-/lru-cache-2.7.3.tgz#6d4524e8b955f95d4f5b58851ce21dd72fb4e952"
-  integrity sha1-bUUk6LlV+V1PW1iFHOId1y+06VI=
-
 lru-cache@^4.0.1, lru-cache@^4.1.3:
   version "4.1.5"
   resolved "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.5.tgz#8bbe50ea85bed59bc9e33dcab8235ee9bcf443cd"
@@ -17603,15 +18596,15 @@ lunr@^2.3.9:
   resolved "https://registry.npmjs.org/lunr/-/lunr-2.3.9.tgz#18b123142832337dd6e964df1a5a7707b25d35e1"
   integrity sha512-zTU3DaZaF3Rt9rhN3uBMGQD3dD2/vFQqnvZCDv4dl5iOzq2IZQqTxu90r4E5J+nP70J3ilqVCrbho2eWaeW8Ow==
 
-luxon@1.25.0:
-  version "1.25.0"
-  resolved "https://registry.npmjs.org/luxon/-/luxon-1.25.0.tgz#d86219e90bc0102c0eb299d65b2f5e95efe1fe72"
-  integrity sha512-hEgLurSH8kQRjY6i4YLey+mcKVAWXbDNlZRmM6AgWDJ1cY3atl8Ztf5wEY7VBReFbmGnwQPz7KYJblL8B2k0jQ==
+luxon@2.0.2, luxon@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.npmjs.org/luxon/-/luxon-2.0.2.tgz#11f2cd4a11655fdf92e076b5782d7ede5bcdd133"
+  integrity sha512-ZRioYLCgRHrtTORaZX1mx+jtxKtKuI5ZDvHNAmqpUzGqSrR+tL4FVLn/CUGMA3h0+AKD1MAxGI5GnCqR5txNqg==
 
-luxon@^1.25.0, luxon@^1.26.0, luxon@^1.27.0:
-  version "1.27.0"
-  resolved "https://registry.npmjs.org/luxon/-/luxon-1.27.0.tgz#ae10c69113d85dab8f15f5e8390d0cbeddf4f00f"
-  integrity sha512-VKsFsPggTA0DvnxtJdiExAucKdAnwbCCNlMM5ENvHlxubqWd0xhZcdb4XgZ7QFNhaRhilXCFxHuoObP5BNA4PA==
+luxon@^1.27.0:
+  version "1.28.0"
+  resolved "https://registry.npmjs.org/luxon/-/luxon-1.28.0.tgz#e7f96daad3938c06a62de0fb027115d251251fbf"
+  integrity sha512-TfTiyvZhwBYM/7QdAVDh+7dBTBA29v4ik0Ce9zda3Mnf8on1S5KJI8P2jKFZ8+5C0jhmr0KwJEO/Wdpm0VeWJQ==
 
 lz-string@^1.4.4:
   version "1.4.4"
@@ -17630,13 +18623,6 @@ magic-string@^0.25.7:
   dependencies:
     sourcemap-codec "^1.4.4"
 
-make-dir@^1.0.0:
-  version "1.3.0"
-  resolved "https://registry.npmjs.org/make-dir/-/make-dir-1.3.0.tgz#79c1033b80515bd6d24ec9933e860ca75ee27f0c"
-  integrity sha512-2w31R7SJtieJJnQtGc7RVL2StM2vGYVfqUOvUDxH6bC6aJTxPxTF0GnIgCyu7tjockiUWAYQRbxa7vKn34s5sQ==
-  dependencies:
-    pify "^3.0.0"
-
 make-dir@^2.0.0, make-dir@^2.1.0:
   version "2.1.0"
   resolved "https://registry.npmjs.org/make-dir/-/make-dir-2.1.0.tgz#5f0310e18b8be898cc07009295a30ae41e91e6f5"
@@ -17652,6 +18638,13 @@ make-dir@^3.0.0, make-dir@^3.0.2:
   dependencies:
     semver "^6.0.0"
 
+make-dir@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz#415e967046b3a7f1d185277d84aa58203726a13f"
+  integrity sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==
+  dependencies:
+    semver "^6.0.0"
+
 make-error@^1, make-error@^1.1.1, make-error@^1.3.6:
   version "1.3.6"
   resolved "https://registry.npmjs.org/make-error/-/make-error-1.3.6.tgz#2eb2e37ea9b67c4891f684a1394799af484cf7a2"
@@ -17685,6 +18678,13 @@ makeerror@1.0.x:
   dependencies:
     tmpl "1.0.x"
 
+map-age-cleaner@^0.1.3:
+  version "0.1.3"
+  resolved "https://registry.npmjs.org/map-age-cleaner/-/map-age-cleaner-0.1.3.tgz#7d583a7306434c055fe474b0f45078e6e1b4b92a"
+  integrity sha512-bJzx6nMoP6PDLPBFmg7+xRKeFZvFboMrGlxmNj9ClvX53KrmvM5bXFXEWjbz4cz1AFn+jWJ9z/DJSz7hrs0w3w==
+  dependencies:
+    p-defer "^1.0.0"
+
 map-cache@^0.2.0, map-cache@^0.2.2:
   version "0.2.2"
   resolved "https://registry.npmjs.org/map-cache/-/map-cache-0.2.2.tgz#c32abd0bd6525d9b051645bb4f26ac5dc98a0dbf"
@@ -17717,6 +18717,11 @@ map-visit@^1.0.0:
   dependencies:
     object-visit "^1.0.0"
 
+markdown-escapes@^1.0.0:
+  version "1.0.4"
+  resolved "https://registry.npmjs.org/markdown-escapes/-/markdown-escapes-1.0.4.tgz#c95415ef451499d7602b91095f3c8e8975f78535"
+  integrity sha512-8z4efJYk43E0upd0NbVXwgSTQs6cT3T06etieCMEg7dRbzCbxUCK/GHlX8mhHRDcp+OLlHkPKsvqQTCvsRl2cg==
+
 markdown-it@^10.0.0:
   version "10.0.0"
   resolved "https://registry.npmjs.org/markdown-it/-/markdown-it-10.0.0.tgz#abfc64f141b1722d663402044e43927f1f50a8dc"
@@ -17754,32 +18759,27 @@ markdown-to-jsx@^6.11.4:
     prop-types "^15.6.2"
     unquote "^1.1.0"
 
-markdown-to-jsx@^7.1.0, markdown-to-jsx@^7.1.3:
+markdown-to-jsx@^7.1.3:
   version "7.1.3"
   resolved "https://registry.npmjs.org/markdown-to-jsx/-/markdown-to-jsx-7.1.3.tgz#f00bae66c0abe7dd2d274123f84cb6bd2a2c7c6a"
   integrity sha512-jtQ6VyT7rMT5tPV0g2EJakEnXLiPksnvlYtwQsVVZ611JsWGN8bQ1tVSDX4s6JllfEH6wmsYxNjTUAMrPmNA8w==
 
-material-colors@^1.2.1:
-  version "1.2.6"
-  resolved "https://registry.npmjs.org/material-colors/-/material-colors-1.2.6.tgz#6d1958871126992ceecc72f4bcc4d8f010865f46"
-  integrity sha512-6qE4B9deFBIa9YSpOc9O0Sgc43zTeVYbgDT5veRKSlB2+ZuHNoVVxA1L/ckMUayV9Ay9y7Z/SZCLcGteW9i7bg==
-
 material-table@^1.69.1:
-  version "1.69.1"
-  resolved "https://registry.npmjs.org/material-table/-/material-table-1.69.1.tgz#8d1c8b23207f18bd3328cae1b5775ede284682e6"
-  integrity sha512-7MA8kMtr8ToPE6gNUbOGIb4g+RGOLWK8s9gXZYNwFtg6fGAjWEJ+iqBrMmdq7fkMmTRcyOd7/sC/5OPPY8CNGg==
+  version "1.69.3"
+  resolved "https://registry.npmjs.org/material-table/-/material-table-1.69.3.tgz#3f282cffecf5461985965cd4a516bebb8069bf2d"
+  integrity sha512-UT/eQbUqfAg6XstcnM8dOQNgWmWbH5tbRmwqfGfPKQUQQXq/jb1z2spFHXPJBhEZFmk+Q95HlopiE6nAHymLMw==
   dependencies:
-    "@date-io/date-fns" "^1.1.0"
-    "@material-ui/pickers" "^3.2.2"
-    classnames "^2.2.6"
-    date-fns "^2.0.0-alpha.27"
-    debounce "^1.2.0"
+    "@date-io/date-fns" "1.1.0"
+    "@material-ui/pickers" "3.2.2"
+    classnames "2.2.6"
+    date-fns "2.0.0-alpha.27"
+    debounce "1.2.0"
     fast-deep-equal "2.0.1"
     filefy "0.1.10"
     jspdf "2.1.0"
     jspdf-autotable "3.5.9"
-    prop-types "^15.6.2"
-    react-beautiful-dnd "^13.0.0"
+    prop-types "15.6.2"
+    react-beautiful-dnd "13.0.0"
     react-double-scrollbar "0.0.15"
 
 math-expression-evaluator@^1.2.14:
@@ -17803,6 +18803,20 @@ mdast-add-list-metadata@1.0.1:
   dependencies:
     unist-util-visit-parents "1.1.2"
 
+mdast-squeeze-paragraphs@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.npmjs.org/mdast-squeeze-paragraphs/-/mdast-squeeze-paragraphs-4.0.0.tgz#7c4c114679c3bee27ef10b58e2e015be79f1ef97"
+  integrity sha512-zxdPn69hkQ1rm4J+2Cs2j6wDEv7O17TfXTJ33tl/+JPIoEmtV9t2ZzBM5LPHE8QlHsmVD8t3vPKCyY3oH+H8MQ==
+  dependencies:
+    unist-util-remove "^2.0.0"
+
+mdast-util-definitions@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.npmjs.org/mdast-util-definitions/-/mdast-util-definitions-4.0.0.tgz#c5c1a84db799173b4dcf7643cda999e440c24db2"
+  integrity sha512-k8AJ6aNnUkB7IE+5azR9h81O5EQ/cTDXtWdMq9Kk5KcEW/8ritU5CeLg/9HhOC++nALHBlaogJ5jz0Ybk3kPMQ==
+  dependencies:
+    unist-util-visit "^2.0.0"
+
 mdast-util-from-markdown@^0.8.0:
   version "0.8.1"
   resolved "https://registry.npmjs.org/mdast-util-from-markdown/-/mdast-util-from-markdown-0.8.1.tgz#781371d493cac11212947226190270c15dc97116"
@@ -17850,6 +18864,20 @@ mdast-util-gfm@^0.1.0:
     mdast-util-gfm-table "^0.1.0"
     mdast-util-gfm-task-list-item "^0.1.0"
 
+mdast-util-to-hast@10.0.1:
+  version "10.0.1"
+  resolved "https://registry.npmjs.org/mdast-util-to-hast/-/mdast-util-to-hast-10.0.1.tgz#0cfc82089494c52d46eb0e3edb7a4eb2aea021eb"
+  integrity sha512-BW3LM9SEMnjf4HXXVApZMt8gLQWVNXc3jryK0nJu/rOXPOnlkUjmdkDlmxMirpbU9ILncGFIwLH/ubnWBbcdgA==
+  dependencies:
+    "@types/mdast" "^3.0.0"
+    "@types/unist" "^2.0.0"
+    mdast-util-definitions "^4.0.0"
+    mdurl "^1.0.0"
+    unist-builder "^2.0.0"
+    unist-util-generated "^1.0.0"
+    unist-util-position "^3.0.0"
+    unist-util-visit "^2.0.0"
+
 mdast-util-to-markdown@^0.5.0:
   version "0.5.3"
   resolved "https://registry.npmjs.org/mdast-util-to-markdown/-/mdast-util-to-markdown-0.5.3.tgz#e05c54a3ccd239bab63c48a1e5b5747f0dcd5aca"
@@ -17877,7 +18905,7 @@ mdn-data@2.0.4:
   resolved "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.4.tgz#699b3c38ac6f1d728091a64650b65d388502fd5b"
   integrity sha512-iV3XNKw06j5Q7mi6h+9vbx23Tv7JkjEVgKHW4pimwyDGWm0OIQntJJ+u1C6mg6mK1EaTv42XQ7w76yuzH7M2cA==
 
-mdurl@^1.0.1:
+mdurl@^1.0.0, mdurl@^1.0.1:
   version "1.0.1"
   resolved "https://registry.npmjs.org/mdurl/-/mdurl-1.0.1.tgz#fe85b2ec75a59037f2adfec100fd6c601761152e"
   integrity sha1-/oWy7HWlkDfyrf7BAP1sYBdhFS4=
@@ -17887,7 +18915,15 @@ media-typer@0.3.0:
   resolved "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz#8710d7af0aa626f8fffa1ce00168545263255748"
   integrity sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g=
 
-memfs@^3.1.2:
+mem@^8.1.1:
+  version "8.1.1"
+  resolved "https://registry.npmjs.org/mem/-/mem-8.1.1.tgz#cf118b357c65ab7b7e0817bdf00c8062297c0122"
+  integrity sha512-qFCFUDs7U3b8mBDPyz5EToEKoAkgCzqquIgi9nkkR9bixxOVOre+09lbuH7+9Kn2NFpm56M3GUWVbU2hQgdACA==
+  dependencies:
+    map-age-cleaner "^0.1.3"
+    mimic-fn "^3.1.0"
+
+memfs@^3.1.2, memfs@^3.2.2:
   version "3.2.2"
   resolved "https://registry.npmjs.org/memfs/-/memfs-3.2.2.tgz#5de461389d596e3f23d48bb7c2afb6161f4df40e"
   integrity sha512-RE0CwmIM3CEvpcdK3rZ19BC4E6hv9kADkMN5rPduRak58cNArWLi/9jFLsa4rhsjfVxMP3v0jO7FHXq7SvFY5Q==
@@ -18020,7 +19056,7 @@ merge@^2.1.0:
   resolved "https://registry.npmjs.org/merge/-/merge-2.1.1.tgz#59ef4bf7e0b3e879186436e8481c06a6c162ca98"
   integrity sha512-jz+Cfrg9GWOZbQAnDQ4hlVnQky+341Yk5ru8bZSe6sIDTCIg8n9i/u7hSQGSVOF3C7lH6mGtqjkiT9G4wFLL0w==
 
-meros@1.1.4, meros@^1.1.2:
+meros@1.1.4, meros@^1.1.4:
   version "1.1.4"
   resolved "https://registry.npmjs.org/meros/-/meros-1.1.4.tgz#c17994d3133db8b23807f62bec7f0cb276cfd948"
   integrity sha512-E9ZXfK9iQfG9s73ars9qvvvbSIkJZF5yOo9j4tcwM5tN8mUKfj/EKN5PzOr3ZH0y5wL7dLAHw3RVEfpQV9Q7VQ==
@@ -18131,6 +19167,11 @@ mime-db@1.48.0, "mime-db@>= 1.43.0 < 2":
   resolved "https://registry.npmjs.org/mime-db/-/mime-db-1.48.0.tgz#e35b31045dd7eada3aaad537ed88a33afbef2d1d"
   integrity sha512-FM3QwxV+TnZYQ2aRqhlKBMHxk10lTbMt3bBkMAp54ddrNeVSfcQYOOKuGuy3Ddrm38I04If834fOUSq1yzslJQ==
 
+mime-db@1.49.0:
+  version "1.49.0"
+  resolved "https://registry.npmjs.org/mime-db/-/mime-db-1.49.0.tgz#f3dfde60c99e9cf3bc9701d687778f537001cbed"
+  integrity sha512-CIc8j9URtOVApSFCQIF+VBkX1RwXp/oMMOrqdyXSBXq5RWNEsRfyj1kiRnQgmNXmHxPoFIxOroKA3zcU9P+nAA==
+
 mime-types@^2.0.8, mime-types@^2.1.12, mime-types@^2.1.27, mime-types@~2.1.17, mime-types@~2.1.19, mime-types@~2.1.24:
   version "2.1.31"
   resolved "https://registry.npmjs.org/mime-types/-/mime-types-2.1.31.tgz#a00d76b74317c61f9c2db2218b8e9f8e9c5c9e6b"
@@ -18138,12 +19179,19 @@ mime-types@^2.0.8, mime-types@^2.1.12, mime-types@^2.1.27, mime-types@~2.1.17, m
   dependencies:
     mime-db "1.48.0"
 
-mime@1.6.0, mime@^1.4.0, mime@^1.4.1:
+mime-types@^2.1.31:
+  version "2.1.32"
+  resolved "https://registry.npmjs.org/mime-types/-/mime-types-2.1.32.tgz#1d00e89e7de7fe02008db61001d9e02852670fd5"
+  integrity sha512-hJGaVS4G4c9TSMYh2n6SQAGrC4RnfU+daP8G7cSCmaqNjiOoUY0VHCMS42pxnQmVF1GWwFhbHWn3RIxCqTmZ9A==
+  dependencies:
+    mime-db "1.49.0"
+
+mime@1.6.0, mime@^1.4.1:
   version "1.6.0"
   resolved "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz#32cd9e5c64553bd58d19a568af452acff04981b1"
   integrity sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==
 
-mime@^2.2.0, mime@^2.3.1, mime@^2.4.1, mime@^2.4.4, mime@^2.4.6:
+mime@^2.2.0, mime@^2.3.1, mime@^2.4.4, mime@^2.4.6:
   version "2.5.2"
   resolved "https://registry.npmjs.org/mime/-/mime-2.5.2.tgz#6e3dc6cc2b9510643830e5f19d5cb753da5eeabe"
   integrity sha512-tqkh47FzKeCPD2PUiPB6pkbMzsCasjxAfC62/Wap5qrUWcb+sFasXUC5I3gYM5iBM8v/Qpn4UK0x+j0iHyFPDg==
@@ -18158,6 +19206,11 @@ mimic-fn@^2.1.0:
   resolved "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz#7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b"
   integrity sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==
 
+mimic-fn@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.npmjs.org/mimic-fn/-/mimic-fn-3.1.0.tgz#65755145bbf3e36954b949c16450427451d5ca74"
+  integrity sha512-Ysbi9uYW9hFyfrThdDEQuykN4Ey6BuwPD2kpI5ES/nFTDn/98yxYNLZJcgUAKPT/mcrLLKaGzJR9YVxJrIdASQ==
+
 mimic-response@^1.0.0, mimic-response@^1.0.1:
   version "1.0.1"
   resolved "https://registry.npmjs.org/mimic-response/-/mimic-response-1.0.1.tgz#4923538878eef42063cb8a3e3b0798781487ab1b"
@@ -18185,14 +19238,13 @@ min-indent@^1.0.0:
   resolved "https://registry.npmjs.org/min-indent/-/min-indent-1.0.0.tgz#cfc45c37e9ec0d8f0a0ec3dd4ef7f7c3abe39256"
   integrity sha1-z8RcN+nsDY8KDsPdTvf3w6vjklY=
 
-mini-css-extract-plugin@^0.9.0:
-  version "0.9.0"
-  resolved "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-0.9.0.tgz#47f2cf07aa165ab35733b1fc97d4c46c0564339e"
-  integrity sha512-lp3GeY7ygcgAmVIcRPBVhIkf8Us7FZjA+ILpal44qLdSu11wmjKQ3d9k15lfD7pO4esu9eUIAW7qiYIBppv40A==
+mini-css-extract-plugin@^1.4.1:
+  version "1.4.1"
+  resolved "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-1.4.1.tgz#975e27c1d0bd8e052972415f47c79cea5ed37548"
+  integrity sha512-COAGbpAsU0ioFzj+/RRfO5Qv177L1Z/XAx2EmCF33b8GDDqKygMffBTws2lit8iaPdrbKEY5P+zsseBUCREZWQ==
   dependencies:
-    loader-utils "^1.1.0"
-    normalize-url "1.9.1"
-    schema-utils "^1.0.0"
+    loader-utils "^2.0.0"
+    schema-utils "^3.0.0"
     webpack-sources "^1.1.0"
 
 minimalistic-assert@^1.0.0, minimalistic-assert@^1.0.1:
@@ -18205,15 +19257,7 @@ minimalistic-crypto-utils@^1.0.1:
   resolved "https://registry.npmjs.org/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz#f6c00c1c0b082246e5c4d99dfb8c7c083b2b582a"
   integrity sha1-9sAMHAsIIkblxNmd+4x8CDsrWCo=
 
-minimatch@0.3:
-  version "0.3.0"
-  resolved "https://registry.npmjs.org/minimatch/-/minimatch-0.3.0.tgz#275d8edaac4f1bb3326472089e7949c8394699dd"
-  integrity sha1-J12O2qxPG7MyZHIInnlJyDlGmd0=
-  dependencies:
-    lru-cache "2"
-    sigmund "~1.0.0"
-
-"minimatch@2 || 3", minimatch@3.0.4, minimatch@^3.0.2, minimatch@^3.0.4:
+"minimatch@2 || 3", minimatch@3.0.4, minimatch@^3.0.2, minimatch@^3.0.3, minimatch@^3.0.4:
   version "3.0.4"
   resolved "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083"
   integrity sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==
@@ -18229,11 +19273,6 @@ minimist-options@4.1.0, minimist-options@^4.0.2:
     is-plain-obj "^1.1.0"
     kind-of "^6.0.3"
 
-minimist@0.0.8:
-  version "0.0.8"
-  resolved "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d"
-  integrity sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=
-
 minimist@^1.1.1, minimist@^1.1.3, minimist@^1.2.0, minimist@^1.2.3, minimist@^1.2.5:
   version "1.2.5"
   resolved "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602"
@@ -18293,7 +19332,7 @@ minipass-sized@^1.0.3:
   dependencies:
     minipass "^3.0.0"
 
-minipass@^2.6.0, minipass@^2.8.6, minipass@^2.9.0:
+minipass@^2.6.0, minipass@^2.9.0:
   version "2.9.0"
   resolved "https://registry.npmjs.org/minipass/-/minipass-2.9.0.tgz#e713762e7d3e32fed803115cf93e04bca9fcc9a6"
   integrity sha512-wxfUjg9WebH+CUDX/CdbRlh5SmfZiy/hpkxaRI16Y9W56Pa75sWgd/rvFilSgrauD9NyFymP/+JFV3KwzIsJeg==
@@ -18308,7 +19347,7 @@ minipass@^3.0.0, minipass@^3.1.0, minipass@^3.1.1, minipass@^3.1.3:
   dependencies:
     yallist "^4.0.0"
 
-minizlib@^1.2.1:
+minizlib@^1.3.3:
   version "1.3.3"
   resolved "https://registry.npmjs.org/minizlib/-/minizlib-1.3.3.tgz#2290de96818a34c29551c8a8d301216bd65a861d"
   integrity sha512-6ZYMOEnmVsdCeTJVE0W9ZD+pVnE8h9Hma/iOwwRDsdQoePpoX56/8B6z3P9VNwppJuBKNRuFDRNRqRWexT9G9Q==
@@ -18370,6 +19409,11 @@ mkdirp-classic@^0.5.2:
   resolved "https://registry.npmjs.org/mkdirp-classic/-/mkdirp-classic-0.5.2.tgz#54c441ce4c96cd7790e10b41a87aa51068ecab2b"
   integrity sha512-ejdnDQcR75gwknmMw/tx02AuRs8jCtqFoFqDZMjiNxsu85sRIJVXDKHuLYvUUPRBUtV2FpSZa9bL1BUa3BdR2g==
 
+mkdirp-classic@^0.5.3:
+  version "0.5.3"
+  resolved "https://registry.npmjs.org/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz#fa10c9115cc6d8865be221ba47ee9bed78601113"
+  integrity sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A==
+
 mkdirp-infer-owner@^2.0.0:
   version "2.0.0"
   resolved "https://registry.npmjs.org/mkdirp-infer-owner/-/mkdirp-infer-owner-2.0.0.tgz#55d3b368e7d89065c38f32fd38e638f0ab61d316"
@@ -18379,18 +19423,6 @@ mkdirp-infer-owner@^2.0.0:
     infer-owner "^1.0.4"
     mkdirp "^1.0.3"
 
-mkdirp@0.3.0:
-  version "0.3.0"
-  resolved "https://registry.npmjs.org/mkdirp/-/mkdirp-0.3.0.tgz#1bbf5ab1ba827af23575143490426455f481fe1e"
-  integrity sha1-G79asbqCevI1dRQ0kEJkVfSB/h4=
-
-mkdirp@0.5.1:
-  version "0.5.1"
-  resolved "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903"
-  integrity sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=
-  dependencies:
-    minimist "0.0.8"
-
 "mkdirp@>=0.5 0", mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@^0.5.3, mkdirp@^0.5.4, mkdirp@^0.5.5, mkdirp@~0.5.1:
   version "0.5.5"
   resolved "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz#d91cefd62d1436ca0f41620e251288d420099def"
@@ -18403,22 +19435,6 @@ mkdirp@^1.0.3, mkdirp@^1.0.4:
   resolved "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz#3eb5ed62622756d79a5f0e2a221dfebad75c2f7e"
   integrity sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==
 
-mocha@^2.5.3:
-  version "2.5.3"
-  resolved "https://registry.npmjs.org/mocha/-/mocha-2.5.3.tgz#161be5bdeb496771eb9b35745050b622b5aefc58"
-  integrity sha1-FhvlvetJZ3HrmzV0UFC2IrWu/Fg=
-  dependencies:
-    commander "2.3.0"
-    debug "2.2.0"
-    diff "1.4.0"
-    escape-string-regexp "1.0.2"
-    glob "3.2.11"
-    growl "1.9.2"
-    jade "0.26.3"
-    mkdirp "0.5.1"
-    supports-color "1.2.0"
-    to-iso-string "0.0.2"
-
 mock-fs@^4.13.0:
   version "4.13.0"
   resolved "https://registry.npmjs.org/mock-fs/-/mock-fs-4.13.0.tgz#31c02263673ec3789f90eb7b6963676aa407a598"
@@ -18457,10 +19473,10 @@ move-concurrently@^1.0.1:
     rimraf "^2.5.4"
     run-queue "^1.0.3"
 
-ms@0.7.1:
-  version "0.7.1"
-  resolved "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz#9cd13c03adbff25b65effde7ce864ee952017098"
-  integrity sha1-nNE8A62/8ltl7/3nzoZO6VIBcJg=
+mri@1.1.4:
+  version "1.1.4"
+  resolved "https://registry.npmjs.org/mri/-/mri-1.1.4.tgz#7cb1dd1b9b40905f1fac053abe25b6720f44744a"
+  integrity sha512-6y7IjGPm8AzlvoUrwAaw1tLnUBudaS3752vcd8JtrpGGQn+rXIe63LFVHm/YMwtqAuh+LJPCFdlLYPWM1nYn6w==
 
 ms@2.0.0:
   version "2.0.0"
@@ -18477,6 +19493,11 @@ ms@2.1.2, ms@^2.0.0, ms@^2.1.1:
   resolved "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009"
   integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==
 
+ms@^2.1.3:
+  version "2.1.3"
+  resolved "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2"
+  integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==
+
 msal@^1.0.2:
   version "1.4.4"
   resolved "https://registry.npmjs.org/msal/-/msal-1.4.4.tgz#3f9b5a4442aa711c12ab8e88b8ed89b293f99711"
@@ -18577,7 +19598,7 @@ named-placeholders@^1.1.2:
   dependencies:
     lru-cache "^4.1.3"
 
-nan@2.14.1, nan@^2.12.1, nan@^2.14.0:
+nan@^2.12.1, nan@^2.14.0:
   version "2.14.1"
   resolved "https://registry.npmjs.org/nan/-/nan-2.14.1.tgz#d7be34dfa3105b91494c3147089315eff8874b01"
   integrity sha512-isWHgVjnFjh2x2yuJ/tj3JbwoHu3UC2dX5G/88Cm24yB6YopVgxvBObDY7n5xW6ExmFhJpSEQqFPvq9zaXc8Jw==
@@ -18659,6 +19680,11 @@ neo-async@^2.5.0, neo-async@^2.6.0, neo-async@^2.6.1:
   resolved "https://registry.npmjs.org/neo-async/-/neo-async-2.6.1.tgz#ac27ada66167fa8849a6addd837f6b189ad2081c"
   integrity sha512-iyam8fBuCUpWeKPGpaNMetEocMt364qkCsfL9JuhjXX6dRnguRVOfk2GZaDpPjcOKiiXCPINZC1GczQ7iTq3Zw==
 
+neo-async@^2.6.2:
+  version "2.6.2"
+  resolved "https://registry.npmjs.org/neo-async/-/neo-async-2.6.2.tgz#b4aafb93e3aeb2d8174ca53cf163ab7d7308305f"
+  integrity sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==
+
 nested-error-stacks@^2.0.0, nested-error-stacks@^2.1.0:
   version "2.1.0"
   resolved "https://registry.npmjs.org/nested-error-stacks/-/nested-error-stacks-2.1.0.tgz#0fbdcf3e13fe4994781280524f8b96b0cdff9c61"
@@ -18679,6 +19705,17 @@ nice-try@^1.0.4:
   resolved "https://registry.npmjs.org/nice-try/-/nice-try-1.0.5.tgz#a3378a7696ce7d223e88fc9b764bd7ef1089e366"
   integrity sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==
 
+nise@^5.1.0:
+  version "5.1.0"
+  resolved "https://registry.npmjs.org/nise/-/nise-5.1.0.tgz#713ef3ed138252daef20ec035ab62b7a28be645c"
+  integrity sha512-W5WlHu+wvo3PaKLsJJkgPup2LrsXCcm7AWwyNZkUnn5rwPkuPBi3Iwk5SQtN0mv+K65k7nKKjwNQ30wg3wLAQQ==
+  dependencies:
+    "@sinonjs/commons" "^1.7.0"
+    "@sinonjs/fake-timers" "^7.0.4"
+    "@sinonjs/text-encoding" "^0.7.1"
+    just-extend "^4.0.2"
+    path-to-regexp "^1.7.0"
+
 no-case@^3.0.4:
   version "3.0.4"
   resolved "https://registry.npmjs.org/no-case/-/no-case-3.0.4.tgz#d361fd5c9800f558551a8369fc0dcd4662b6124d"
@@ -18687,10 +19724,10 @@ no-case@^3.0.4:
     lower-case "^2.0.2"
     tslib "^2.0.3"
 
-node-abi@^2.7.0:
-  version "2.19.3"
-  resolved "https://registry.npmjs.org/node-abi/-/node-abi-2.19.3.tgz#252f5dcab12dad1b5503b2d27eddd4733930282d"
-  integrity sha512-9xZrlyfvKhWme2EXFKQhZRp1yNWT/uI1luYPr3sFl+H4keYY4xR+1jO7mvTTijIsHf1M+QDe9uWuKeEpLInIlg==
+node-abi@^2.21.0:
+  version "2.30.0"
+  resolved "https://registry.npmjs.org/node-abi/-/node-abi-2.30.0.tgz#8be53bf3e7945a34eea10e0fc9a5982776cf550b"
+  integrity sha512-g6bZh3YCKQRdwuO/tSZZYJAw622SjsRfJ2X0Iy4sSOHZ34/sPPdVBn8fev2tj7njzLwuqPw9uMtGsGkO5kIQvg==
   dependencies:
     semver "^5.4.1"
 
@@ -18713,7 +19750,12 @@ node-dir@^0.1.10, node-dir@^0.1.17:
   dependencies:
     minimatch "^3.0.2"
 
-node-fetch@2.6.1, node-fetch@^2.2.0, node-fetch@^2.3.0, node-fetch@^2.6.0, node-fetch@^2.6.1:
+node-domexception@1.0.0:
+  version "1.0.0"
+  resolved "https://registry.npmjs.org/node-domexception/-/node-domexception-1.0.0.tgz#6888db46a1f71c0b76b3f7555016b63fe64766e5"
+  integrity sha512-/jKZoMpw0F8GRwl4/eLROPA3cfcXtLApP0QzLmUT/HuPCZWyB7IY9ZrMeKw2O/nFIqPQB3PVM9aYm0F312AXDQ==
+
+node-fetch@2.6.1, node-fetch@^2.3.0, node-fetch@^2.6.0, node-fetch@^2.6.1:
   version "2.6.1"
   resolved "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.1.tgz#045bd323631f76ed2e2b55573394416b639a0052"
   integrity sha512-V4aYg89jEoVRxRb2fJdAg8FHvI7cEyYdVAh94HH0UIK8oJxUfkjlDQN9RbMx+bEjP7+ggMiFRprSti032Oipxw==
@@ -18723,11 +19765,6 @@ node-forge@^0.10.0:
   resolved "https://registry.npmjs.org/node-forge/-/node-forge-0.10.0.tgz#32dea2afb3e9926f02ee5ce8794902691a676bf3"
   integrity sha512-PPmu8eEeG9saEUvI97fm4OYxXVB6bFvyNTyiUOBichBpFG8A1Ljw3bY62+5oOjDEMHRnd0Y7HQ+x7uzxOzC6JA==
 
-node-forge@^0.8.0:
-  version "0.8.5"
-  resolved "https://registry.npmjs.org/node-forge/-/node-forge-0.8.5.tgz#57906f07614dc72762c84cef442f427c0e1b86ee"
-  integrity sha512-vFMQIWt+J/7FLNyKouZ9TazT74PRV3wgv9UT4cRjC8BffxFbKXkgIWR42URCPSnHm/QDz6BOlb2Q0U4+VQT67Q==
-
 node-gyp@3.x:
   version "3.8.0"
   resolved "https://registry.npmjs.org/node-gyp/-/node-gyp-3.8.0.tgz#540304261c330e80d0d5edce253a68cb3964218c"
@@ -18867,15 +19904,15 @@ node-pre-gyp@^0.15.0:
     semver "^5.3.0"
     tar "^4.4.2"
 
-node-releases@^1.1.52, node-releases@^1.1.61, node-releases@^1.1.71:
+node-releases@^1.1.61, node-releases@^1.1.71:
   version "1.1.72"
   resolved "https://registry.npmjs.org/node-releases/-/node-releases-1.1.72.tgz#14802ab6b1039a79a0c7d662b610a5bbd76eacbe"
   integrity sha512-LLUo+PpH3dU6XizX3iVoubUNheF/owjXCZZ5yACDxNnPtgFuludV1ZL3ayK1kVep42Rmm0+R9/Y60NQbZ2bifw==
 
 nodemon@^2.0.2:
-  version "2.0.7"
-  resolved "https://registry.npmjs.org/nodemon/-/nodemon-2.0.7.tgz#6f030a0a0ebe3ea1ba2a38f71bf9bab4841ced32"
-  integrity sha512-XHzK69Awgnec9UzHr1kc8EomQh4sjTQ8oRf8TsGrSmHDx9/UmiGG9E/mM3BuTfNeFwdNBvrqQq/RHL0xIeyFOA==
+  version "2.0.12"
+  resolved "https://registry.npmjs.org/nodemon/-/nodemon-2.0.12.tgz#5dae4e162b617b91f1873b3bfea215dd71e144d5"
+  integrity sha512-egCTmNZdObdBxUBw6ZNwvZ/xzk24CKRs5K6d+5zbmrMr7rOpPmfPeF6OxM3DDpaRx331CQRFEktn+wrFFfBSOA==
   dependencies:
     chokidar "^3.2.2"
     debug "^3.2.6"
@@ -18888,11 +19925,6 @@ nodemon@^2.0.2:
     undefsafe "^2.0.3"
     update-notifier "^4.1.0"
 
-noop-logger@^0.1.1:
-  version "0.1.1"
-  resolved "https://registry.npmjs.org/noop-logger/-/noop-logger-0.1.1.tgz#94a2b1633c4f1317553007d8966fd0e841b6a4c2"
-  integrity sha1-lKKxYzxPExdVMAfYlm/Q6EG2pMI=
-
 "nopt@2 || 3":
   version "3.0.6"
   resolved "https://registry.npmjs.org/nopt/-/nopt-3.0.6.tgz#c6465dbf08abcd4db359317f79ac68a646b28ff9"
@@ -18959,16 +19991,6 @@ normalize-range@^0.1.2:
   resolved "https://registry.npmjs.org/normalize-range/-/normalize-range-0.1.2.tgz#2d10c06bdfd312ea9777695a4d28439456b75942"
   integrity sha1-LRDAa9/TEuqXd2laTShDlFa3WUI=
 
-normalize-url@1.9.1:
-  version "1.9.1"
-  resolved "https://registry.npmjs.org/normalize-url/-/normalize-url-1.9.1.tgz#2cc0d66b31ea23036458436e3620d85954c66c3c"
-  integrity sha1-LMDWazHqIwNkWENuNiDYWVTGbDw=
-  dependencies:
-    object-assign "^4.0.1"
-    prepend-http "^1.0.0"
-    query-string "^4.1.0"
-    sort-keys "^1.0.0"
-
 normalize-url@^3.0.0, normalize-url@^3.3.0:
   version "3.3.0"
   resolved "https://registry.npmjs.org/normalize-url/-/normalize-url-3.3.0.tgz#b2e1c4dc4f7c6d57743df733a4f5978d18650559"
@@ -19173,9 +20195,9 @@ object-keys@^1.0.12, object-keys@^1.1.1:
   integrity sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==
 
 object-path@^0.11.4:
-  version "0.11.5"
-  resolved "https://registry.npmjs.org/object-path/-/object-path-0.11.5.tgz#d4e3cf19601a5140a55a16ad712019a9c50b577a"
-  integrity sha512-jgSbThcoR/s+XumvGMTMf81QVBmah+/Q7K7YduKeKVWL7N111unR2d6pZZarSk6kY/caeNxUDyxOvMWyzoU2eg==
+  version "0.11.7"
+  resolved "https://registry.npmjs.org/object-path/-/object-path-0.11.7.tgz#5f211161f34bb395e4b13a5f565b79d933b6f65d"
+  integrity sha512-T4evaK9VfGGQskXBDILcn6F90ZD+WO3OwRFFQ2rmZdUH4vQeDBpiolTpVlPY2yj5xSepyILTjDyM6UvbbdHMZw==
 
 object-visit@^1.0.0:
   version "1.0.1"
@@ -19260,7 +20282,7 @@ oidc-token-hash@^5.0.1:
   resolved "https://registry.npmjs.org/oidc-token-hash/-/oidc-token-hash-5.0.1.tgz#ae6beec3ec20f0fd885e5400d175191d6e2f10c6"
   integrity sha512-EvoOtz6FIEBzE+9q253HsLCVRiK/0doEJ2HCvvqMQb3dHZrP3WlJKYtJ55CRTw4jmYomzH4wkPuCj/I3ZvpKxQ==
 
-on-finished@~2.3.0:
+on-finished@^2.3.0, on-finished@~2.3.0:
   version "2.3.0"
   resolved "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz#20f1336481b083cd75337992a16971aa2d906947"
   integrity sha1-IPEzZIGwg811M3mSoWlxqi2QaUc=
@@ -19313,6 +20335,15 @@ open@^7.0.0, open@^7.0.2, open@^7.0.3:
     is-docker "^2.0.0"
     is-wsl "^2.1.1"
 
+open@^8.0.9:
+  version "8.2.1"
+  resolved "https://registry.npmjs.org/open/-/open-8.2.1.tgz#82de42da0ccbf429bc12d099dad2e0975e14e8af"
+  integrity sha512-rXILpcQlkF/QuFez2BJDf3GsqpjGKbkUUToAIGo9A0Q6ZkoSGogZJulrUdwRkrAsoQvoZsrjCYt8+zblOk7JQQ==
+  dependencies:
+    define-lazy-prop "^2.0.0"
+    is-docker "^2.1.1"
+    is-wsl "^2.2.0"
+
 openapi-sampler@^1.0.0-beta.15:
   version "1.0.0-beta.16"
   resolved "https://registry.npmjs.org/openapi-sampler/-/openapi-sampler-1.0.0-beta.16.tgz#7813524d5b88d222efb772ceb5a809075d6d9174"
@@ -19333,13 +20364,6 @@ openid-client@^4.1.1, openid-client@^4.2.1:
     object-hash "^2.0.1"
     oidc-token-hash "^5.0.1"
 
-opn@^5.5.0:
-  version "5.5.0"
-  resolved "https://registry.npmjs.org/opn/-/opn-5.5.0.tgz#fc7164fab56d235904c51c3b27da6758ca3b9bfc"
-  integrity sha512-PqHpggC9bLV0VeWcdKhkpxY+3JTzetLSqTCWL/z/tFIbI6G8JCjondXklT1JinczLz2Xib62sSp0T/gKT4KksA==
-  dependencies:
-    is-wsl "^1.1.0"
-
 optionator@^0.8.1:
   version "0.8.3"
   resolved "https://registry.npmjs.org/optionator/-/optionator-0.8.3.tgz#84fa1d036fe9d3c7e21d99884b601167ec8fb495"
@@ -19434,7 +20458,7 @@ outdent@^0.5.0:
   resolved "https://registry.npmjs.org/outdent/-/outdent-0.5.0.tgz#9e10982fdc41492bb473ad13840d22f9655be2ff"
   integrity sha512-/jHxFIzoMXdqPzTaCpFzAAWhpkSjZPF4Vsn6jAfNpmbH/ymsmd7Qc6VE9BGn0L6YMj6uwpQLxCECpus4ukKS9Q==
 
-overlayscrollbars@^1.10.2, overlayscrollbars@^1.13.1:
+overlayscrollbars@^1.13.1:
   version "1.13.1"
   resolved "https://registry.npmjs.org/overlayscrollbars/-/overlayscrollbars-1.13.1.tgz#0b840a88737f43a946b9d87875a2f9e421d0338a"
   integrity sha512-gIQfzgGgu1wy80EB4/6DaJGHMEGmizq27xHIESrzXq0Y/J0Ay1P3DWk6tuVmEPIZH15zaBlxeEJOqdJKmowHCQ==
@@ -19456,12 +20480,17 @@ p-cancelable@^2.0.0:
   resolved "https://registry.npmjs.org/p-cancelable/-/p-cancelable-2.0.0.tgz#4a3740f5bdaf5ed5d7c3e34882c6fb5d6b266a6e"
   integrity sha512-wvPXDmbMmu2ksjkB4Z3nZWTSkJEb9lqVdMaCKpZUGJG9TMiNp9XcbG3fn9fPKjem04fJMJnXoyFPk2FmgiaiNg==
 
+p-defer@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.npmjs.org/p-defer/-/p-defer-1.0.0.tgz#9f6eb182f6c9aa8cd743004a7d4f96b196b0fb0c"
+  integrity sha1-n26xgvbJqozXQwBKfU+WsZaw+ww=
+
 p-each-series@^2.1.0:
   version "2.1.0"
   resolved "https://registry.npmjs.org/p-each-series/-/p-each-series-2.1.0.tgz#961c8dd3f195ea96c747e636b262b800a6b1af48"
   integrity sha512-ZuRs1miPT4HrjFa+9fRfOFXxGJfORgelKV9f9nNOWw2gl6gVsRaVDOQP0+MI0G0wGKns1Yacsu0GjOFbTK0JFQ==
 
-p-event@^4.1.0:
+p-event@^4.1.0, p-event@^4.2.0:
   version "4.2.0"
   resolved "https://registry.npmjs.org/p-event/-/p-event-4.2.0.tgz#af4b049c8acd91ae81083ebd1e6f5cae2044c1b5"
   integrity sha512-KXatOjCRXXkSePPb1Nbi0p0m+gQAwdlbhi4wQKJPI1HsMQS9g+Sqp2o+QHziPr7eYJyOZet836KoHEVM1mwOrQ==
@@ -19480,10 +20509,10 @@ p-finally@^1.0.0:
   resolved "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz#3fbcfb15b899a44123b34b6dcc18b724336a2cae"
   integrity sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4=
 
-p-finally@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.npmjs.org/p-finally/-/p-finally-2.0.1.tgz#bd6fcaa9c559a096b680806f4d657b3f0f240561"
-  integrity sha512-vpm09aKwq6H9phqRQzecoDpD8TmVyGw70qmWlyq5onxY7tqyTTFVvxMykxQSQKILBSFlbXpypIw2T1Ml7+DDtw==
+p-is-promise@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.npmjs.org/p-is-promise/-/p-is-promise-3.0.0.tgz#58e78c7dfe2e163cf2a04ff869e7c1dba64a5971"
+  integrity sha512-Wo8VsW4IRQSKVXsJCn7TomUaVtyfjVDn3nUP7kE967BQk0CwFpdbZs0X0uk5sW9mkBa9eNM7hCMaG93WUAwxYQ==
 
 p-limit@3.1.0, p-limit@^3.0.1, p-limit@^3.0.2, p-limit@^3.1.0:
   version "3.1.0"
@@ -19576,11 +20605,12 @@ p-reduce@^2.0.0, p-reduce@^2.1.0:
   resolved "https://registry.npmjs.org/p-reduce/-/p-reduce-2.1.0.tgz#09408da49507c6c274faa31f28df334bc712b64a"
   integrity sha512-2USApvnsutq8uoxZBGbbWM0JIYLiEMJ9RlaN7fAzVNb9OZN0SHjjTTfIcb667XynS5Y1VhwDJVDa72TnPzAYWw==
 
-p-retry@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.npmjs.org/p-retry/-/p-retry-3.0.1.tgz#316b4c8893e2c8dc1cfa891f406c4b422bebf328"
-  integrity sha512-XE6G4+YTTkT2a0UWb2kjZe8xNwf8bIbnqpc/IS/idOBVhyves0mK5OJgeocjx7q5pvX/6m23xuzVPYT1uGM73w==
+p-retry@^4.5.0:
+  version "4.5.0"
+  resolved "https://registry.npmjs.org/p-retry/-/p-retry-4.5.0.tgz#6685336b3672f9ee8174d3769a660cb5e488521d"
+  integrity sha512-5Hwh4aVQSu6BEP+w2zKlVXtFAaYQe1qWuVADSgoeVlLjwe/Q/AMSoRR4MDeaAfu8llT+YNbEijWu/YF3m6avkg==
   dependencies:
+    "@types/retry" "^0.12.0"
     retry "^0.12.0"
 
 p-timeout@^3.1.0, p-timeout@^3.2.0:
@@ -19762,11 +20792,6 @@ parse-path@^4.0.0:
     is-ssh "^1.3.0"
     protocols "^1.4.0"
 
-parse-srcset@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.npmjs.org/parse-srcset/-/parse-srcset-1.0.2.tgz#f2bd221f6cc970a938d88556abc589caaaa2bde1"
-  integrity sha1-8r0iH2zJcKk42IVWq8WJyqqiveE=
-
 parse-url@^5.0.0:
   version "5.0.1"
   resolved "https://registry.npmjs.org/parse-url/-/parse-url-5.0.1.tgz#99c4084fc11be14141efa41b3d117a96fcb9527f"
@@ -19787,6 +20812,11 @@ parse5@5.1.1:
   resolved "https://registry.npmjs.org/parse5/-/parse5-5.1.1.tgz#f68e4e5ba1852ac2cadc00f4555fff6c2abb6178"
   integrity sha512-ugq4DFI0Ptb+WWjAdOK16+u/nHfiIrcE+sh8kZMaM0WllQKLI9rOUq6c2b7cwPkXdzfQESqvoqK6ug7U/Yyzug==
 
+parse5@^6.0.0:
+  version "6.0.1"
+  resolved "https://registry.npmjs.org/parse5/-/parse5-6.0.1.tgz#e1a1c085c569b3dc08321184f19a39cc27f7c30b"
+  integrity sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw==
+
 parseurl@^1.3.2, parseurl@~1.3.2, parseurl@~1.3.3:
   version "1.3.3"
   resolved "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz#9da19e7bee8d12dff0513ed5b76957793bc2e8d4"
@@ -19889,20 +20919,20 @@ passport-onelogin-oauth@^0.0.1:
     pkginfo "0.2.x"
     uid2 "0.0.3"
 
-passport-saml@^2.0.0:
-  version "2.0.5"
-  resolved "https://registry.npmjs.org/passport-saml/-/passport-saml-2.0.5.tgz#d822225875d0ec640236bf27ad8d5d9436396dea"
-  integrity sha512-D9OkTZ2hgRHZZFU3BUPKz7PC/khu9jmJtGCoJOQcn8JKR+AW9H/aj1E32VPu/iQbYMXXxEEt4qMhkCZzK9trzw==
+passport-saml@^3.1.2:
+  version "3.1.2"
+  resolved "https://registry.npmjs.org/passport-saml/-/passport-saml-3.1.2.tgz#34a0c2c423d729ce102e69fea9c22040910e6d43"
+  integrity sha512-EhD3/ofiz1vu7R72i4RskXk/dQG9GyDmXPdHJf5LYB+93B5kvKv5p+5lpZgO3z+Wf3eN0h/tGdGd6noyYdjY6g==
   dependencies:
+    "@xmldom/xmldom" "^0.7.2"
     debug "^4.3.1"
-    passport-strategy "*"
-    xml-crypto "^2.0.0"
-    xml-encryption "1.2.1"
+    passport-strategy "^1.0.0"
+    xml-crypto "^2.1.3"
+    xml-encryption "^1.3.0"
     xml2js "^0.4.23"
     xmlbuilder "^15.1.1"
-    xmldom "0.4.x"
 
-passport-strategy@*, passport-strategy@1.x.x:
+passport-strategy@1.x.x, passport-strategy@^1.0.0:
   version "1.0.0"
   resolved "https://registry.npmjs.org/passport-strategy/-/passport-strategy-1.0.0.tgz#b5539aa8fc225a3d1ad179476ddf236b440f52e4"
   integrity sha1-tVOaqPwiWj0a0XlHbd8ja0QPUuQ=
@@ -19971,9 +21001,9 @@ path-key@^3.0.0, path-key@^3.1.0:
   integrity sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==
 
 path-parse@^1.0.6:
-  version "1.0.6"
-  resolved "https://registry.npmjs.org/path-parse/-/path-parse-1.0.6.tgz#d62dbb5679405d72c4737ec58600e9ddcf06d24c"
-  integrity sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==
+  version "1.0.7"
+  resolved "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz#fbc114b60ca42b30d9daf5858e4bd68bbedb6735"
+  integrity sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==
 
 path-root-regex@^0.1.0:
   version "0.1.2"
@@ -19992,6 +21022,13 @@ path-to-regexp@0.1.7:
   resolved "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz#df604178005f522f15eb4490e7247a1bfaa67f8c"
   integrity sha1-32BBeABfUi8V60SQ5yR6G/qmf4w=
 
+path-to-regexp@^1.7.0:
+  version "1.8.0"
+  resolved "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-1.8.0.tgz#887b3ba9d84393e87a0a0b9f4cb756198b53548a"
+  integrity sha512-n43JRhlUKUAlibEJhPeir1ncUID16QnEjNpwzNdO3Lm4ywrBpBZ5oLD0I6br9evr1Y9JTqwRtAh7JLoOzAQdVA==
+  dependencies:
+    isarray "0.0.1"
+
 path-type@^1.0.0:
   version "1.1.0"
   resolved "https://registry.npmjs.org/path-type/-/path-type-1.1.0.tgz#59c44f7ee491da704da415da5a4070ba4f8fe441"
@@ -20043,6 +21080,11 @@ pbkdf2@^3.0.3:
     safe-buffer "^5.0.1"
     sha.js "^2.4.8"
 
+peek-readable@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.npmjs.org/peek-readable/-/peek-readable-4.0.1.tgz#9a045f291db254111c3412c1ce4fec27ddd4d202"
+  integrity sha512-7qmhptnR0WMSpxT5rMHG9bW/mYSR1uqaPFj2MHvT+y/aOUu6msJijpKt5SkTDKySwg65OWG2JwTMBlgcbwMHrQ==
+
 pend@~1.2.0:
   version "1.2.0"
   resolved "https://registry.npmjs.org/pend/-/pend-1.2.0.tgz#7a57eb550a6783f9115331fcf4663d5c8e007a50"
@@ -20177,7 +21219,7 @@ pify@^3.0.0:
   resolved "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz#e5a4acd2c101fdf3d9a4d07f0dbc4db49dd28176"
   integrity sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=
 
-pify@^4.0.0, pify@^4.0.1:
+pify@^4.0.1:
   version "4.0.1"
   resolved "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz#4b2cd25c50d598735c50292224fd8c6df41e3231"
   integrity sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==
@@ -20199,6 +21241,38 @@ pinkie@^2.0.0:
   resolved "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz#72556b80cfa0d48a974e80e77248e80ed4f7f870"
   integrity sha1-clVrgM+g1IqXToDnckjoDtT3+HA=
 
+pino-pretty@^2.6.0:
+  version "2.6.1"
+  resolved "https://registry.npmjs.org/pino-pretty/-/pino-pretty-2.6.1.tgz#b5a8e28137deb1629428931d98c708b51f0e9555"
+  integrity sha512-e/CWtKLidqkr7sinfIVVcsfcHgnFVlGvuEfKuuPFnxBo+9dZZsmgF8a9Rj7SYJ5LMZ8YBxNY9Ca46eam4ajKtQ==
+  dependencies:
+    args "^5.0.0"
+    chalk "^2.3.2"
+    dateformat "^3.0.3"
+    fast-json-parse "^1.0.3"
+    fast-safe-stringify "^2.0.6"
+    jmespath "^0.15.0"
+    pump "^3.0.0"
+    readable-stream "^3.0.6"
+    split2 "^3.0.0"
+
+pino-std-serializers@^2.4.2:
+  version "2.5.0"
+  resolved "https://registry.npmjs.org/pino-std-serializers/-/pino-std-serializers-2.5.0.tgz#40ead781c65a0ce7ecd9c1c33f409d31fe712315"
+  integrity sha512-wXqbqSrIhE58TdrxxlfLwU9eDhrzppQDvGhBEr1gYbzzM4KKo3Y63gSjiDXRKLVS2UOXdPNR2v+KnQgNrs+xUg==
+
+pino@^5.12.2:
+  version "5.17.0"
+  resolved "https://registry.npmjs.org/pino/-/pino-5.17.0.tgz#b9def314e82402154f89a25d76a31f20ca84b4c8"
+  integrity sha512-LqrqmRcJz8etUjyV0ddqB6OTUutCgQULPFg2b4dtijRHUsucaAdBgSUW58vY6RFSX+NT8963F+q0tM6lNwGShA==
+  dependencies:
+    fast-redact "^2.0.0"
+    fast-safe-stringify "^2.0.7"
+    flatstr "^1.0.12"
+    pino-std-serializers "^2.4.2"
+    quick-format-unescaped "^3.0.3"
+    sonic-boom "^0.7.5"
+
 pirates@^4.0.0, pirates@^4.0.1:
   version "4.0.1"
   resolved "https://registry.npmjs.org/pirates/-/pirates-4.0.1.tgz#643a92caf894566f91b2b986d2c66950a8e2fb87"
@@ -20227,35 +21301,20 @@ pkg-dir@^4.1.0, pkg-dir@^4.2.0:
   dependencies:
     find-up "^4.0.0"
 
-pkg-up@3.1.0, pkg-up@^3.1.0:
+pkg-dir@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.npmjs.org/pkg-dir/-/pkg-dir-5.0.0.tgz#a02d6aebe6ba133a928f74aec20bafdfe6b8e760"
+  integrity sha512-NPE8TDbzl/3YQYY7CSS228s3g2ollTFnc+Qi3tqmqJp9Vg2ovUpixcJEo2HJScN2Ez+kEaal6y70c0ehqJBJeA==
+  dependencies:
+    find-up "^5.0.0"
+
+pkg-up@3.1.0:
   version "3.1.0"
   resolved "https://registry.npmjs.org/pkg-up/-/pkg-up-3.1.0.tgz#100ec235cc150e4fd42519412596a28512a0def5"
   integrity sha512-nDywThFk1i4BQK4twPQ6TA4RT8bDY96yeuCVBWL3ePARCiEKDRSrNGbFIgUJpLp+XeIR65v8ra7WuJOFUBtkMA==
   dependencies:
     find-up "^3.0.0"
 
-pkgcloud@^2.2.0:
-  version "2.2.0"
-  resolved "https://registry.npmjs.org/pkgcloud/-/pkgcloud-2.2.0.tgz#2b4e644b6da53c76c0a30bcc0c3861971011a714"
-  integrity sha512-ZbbGqJA8gMwR0peq57aNbjzgLbDj52oi59QJEShZmGUl3ckFBZ92j0h/C2L0tJeCb2VE12tnTwmftBgQ0f3gNw==
-  dependencies:
-    "@google-cloud/storage" "^2.4.3"
-    async "^2.6.1"
-    aws-sdk "^2.382.0"
-    errs "^0.3.2"
-    eventemitter2 "^5.0.1"
-    fast-json-patch "^2.1.0"
-    filed-mimefix "^0.1.3"
-    ip "^1.1.5"
-    liboneandone "^1.2.0"
-    lodash "^4.17.10"
-    mime "^2.4.1"
-    qs "^6.5.2"
-    request "^2.88.0"
-    through2 "^3.0.1"
-    url-join "^4.0.0"
-    xml2js "^0.4.19"
-
 pkginfo@0.2.x:
   version "0.2.3"
   resolved "https://registry.npmjs.org/pkginfo/-/pkginfo-0.2.3.tgz#7239c42a5ef6c30b8f328439d9b9ff71042490f8"
@@ -20285,13 +21344,6 @@ pnp-webpack-plugin@1.6.4:
   dependencies:
     ts-pnp "^1.1.6"
 
-polished@^3.4.4:
-  version "3.6.5"
-  resolved "https://registry.npmjs.org/polished/-/polished-3.6.5.tgz#dbefdde64c675935ec55119fe2a2ab627ca82e9c"
-  integrity sha512-VwhC9MlhW7O5dg/z7k32dabcAFW1VI2+7fSe8cE/kXcfL7mVdoa5UxciYGW2sJU78ldDLT6+ROEKIZKFNTnUXQ==
-  dependencies:
-    "@babel/runtime" "^7.9.2"
-
 polished@^4.0.5:
   version "4.1.3"
   resolved "https://registry.npmjs.org/polished/-/polished-4.1.3.tgz#7a3abf2972364e7d97770b827eec9a9e64002cfc"
@@ -20304,7 +21356,7 @@ popper.js@1.16.1-lts:
   resolved "https://registry.npmjs.org/popper.js/-/popper.js-1.16.1-lts.tgz#cf6847b807da3799d80ee3d6d2f90df8a3f50b05"
   integrity sha512-Kjw8nKRl1m+VrSFCoVGPph93W/qrSO7ZkqPpTf7F4bk/sqcfWK019dWBUpE/fBOsOQY1dks/Bmcbfn1heM/IsA==
 
-portfinder@^1.0.26:
+portfinder@^1.0.28:
   version "1.0.28"
   resolved "https://registry.npmjs.org/portfinder/-/portfinder-1.0.28.tgz#67c4622852bd5374dd1dd900f779f53462fac778"
   integrity sha512-Se+2isanIcEqf2XMHjyUKskczxbPH7dQnlMjXX6+dybayyHvAf/TCgyMRlzf/B6QDhAEFOGes0pzRo3by4AbMA==
@@ -20374,21 +21426,13 @@ postcss-discard-overridden@^4.0.1:
   dependencies:
     postcss "^7.0.0"
 
-postcss-flexbugs-fixes@^4.1.0:
-  version "4.2.0"
-  resolved "https://registry.npmjs.org/postcss-flexbugs-fixes/-/postcss-flexbugs-fixes-4.2.0.tgz#662b3dcb6354638b9213a55eed8913bcdc8d004a"
-  integrity sha512-QRE0n3hpkxxS/OGvzOa+PDuy4mh/Jg4o9ui22/ko5iGYOG3M5dfJabjnAZjTdh2G9F85c7Hv8hWcEDEKW/xceQ==
+postcss-flexbugs-fixes@^4.2.1:
+  version "4.2.1"
+  resolved "https://registry.npmjs.org/postcss-flexbugs-fixes/-/postcss-flexbugs-fixes-4.2.1.tgz#9218a65249f30897deab1033aced8578562a6690"
+  integrity sha512-9SiofaZ9CWpQWxOwRh1b/r85KD5y7GgvsNt1056k6OYLvWUun0czCvogfJgylC22uJTwW1KzY3Gz65NZRlvoiQ==
   dependencies:
     postcss "^7.0.26"
 
-postcss-load-config@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.npmjs.org/postcss-load-config/-/postcss-load-config-2.1.0.tgz#c84d692b7bb7b41ddced94ee62e8ab31b417b003"
-  integrity sha512-4pV3JJVPLd5+RueiVVB+gFOAa7GWc25XQcMp86Zexzke69mKf6Nx9LRcQywdz7yZI9n1udOxmLuAwTBypypF8Q==
-  dependencies:
-    cosmiconfig "^5.0.0"
-    import-cwd "^2.0.0"
-
 postcss-load-config@^3.0.0:
   version "3.0.1"
   resolved "https://registry.npmjs.org/postcss-load-config/-/postcss-load-config-3.0.1.tgz#d214bf9cfec1608ffaf0f4161b3ba20664ab64b9"
@@ -20397,15 +21441,16 @@ postcss-load-config@^3.0.0:
     cosmiconfig "^7.0.0"
     import-cwd "^3.0.0"
 
-postcss-loader@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.npmjs.org/postcss-loader/-/postcss-loader-3.0.0.tgz#6b97943e47c72d845fa9e03f273773d4e8dd6c2d"
-  integrity sha512-cLWoDEY5OwHcAjDnkyRQzAXfs2jrKjXpO/HQFcc5b5u/r7aa471wdmChmwfnv7x2u840iat/wi0lQ5nbRgSkUA==
+postcss-loader@^4.2.0:
+  version "4.3.0"
+  resolved "https://registry.npmjs.org/postcss-loader/-/postcss-loader-4.3.0.tgz#2c4de9657cd4f07af5ab42bd60a673004da1b8cc"
+  integrity sha512-M/dSoIiNDOo8Rk0mUqoj4kpGq91gcxCfb9PoyZVdZ76/AuhxylHDYZblNE8o+EQ9AMSASeMFEKxZf5aU6wlx1Q==
   dependencies:
-    loader-utils "^1.1.0"
-    postcss "^7.0.0"
-    postcss-load-config "^2.0.0"
-    schema-utils "^1.0.0"
+    cosmiconfig "^7.0.0"
+    klona "^2.0.4"
+    loader-utils "^2.0.0"
+    schema-utils "^3.0.0"
+    semver "^7.3.4"
 
 postcss-merge-longhand@^4.0.11:
   version "4.0.11"
@@ -20711,7 +21756,16 @@ postcss-value-parser@^4.0.0, postcss-value-parser@^4.0.2, postcss-value-parser@^
     source-map "^0.6.1"
     supports-color "^6.1.0"
 
-postcss@^8.0.2, postcss@^8.1.0, postcss@^8.2.15:
+postcss@^7.0.36:
+  version "7.0.36"
+  resolved "https://registry.npmjs.org/postcss/-/postcss-7.0.36.tgz#056f8cffa939662a8f5905950c07d5285644dfcb"
+  integrity sha512-BebJSIUMwJHRH0HAQoxN4u1CN86glsrwsW0q7T+/m44eXOUAxSNdHRkNZPYz5vVUbg17hFgOQDE7fZk7li3pZw==
+  dependencies:
+    chalk "^2.4.2"
+    source-map "^0.6.1"
+    supports-color "^6.1.0"
+
+postcss@^8.1.0, postcss@^8.2.15:
   version "8.3.5"
   resolved "https://registry.npmjs.org/postcss/-/postcss-8.3.5.tgz#982216b113412bc20a86289e91eb994952a5b709"
   integrity sha512-NxTuJocUhYGsMiMFHDUkmjSKT3EdH4/WbGF6GCi1NDGk+vbcUTun4fpbOqaPtD8IIsztA2ilZm2DhYCuyN58gA==
@@ -20747,26 +21801,24 @@ postgres-interval@^1.1.0:
   dependencies:
     xtend "^4.0.0"
 
-prebuild-install@5.3.3:
-  version "5.3.3"
-  resolved "https://registry.npmjs.org/prebuild-install/-/prebuild-install-5.3.3.tgz#ef4052baac60d465f5ba6bf003c9c1de79b9da8e"
-  integrity sha512-GV+nsUXuPW2p8Zy7SarF/2W/oiK8bFQgJcncoJ0d7kRpekEA0ftChjfEaF9/Y+QJEc/wFR7RAEa8lYByuUIe2g==
+prebuild-install@^6.0.0:
+  version "6.1.3"
+  resolved "https://registry.npmjs.org/prebuild-install/-/prebuild-install-6.1.3.tgz#8ea1f9d7386a0b30f7ef20247e36f8b2b82825a2"
+  integrity sha512-iqqSR84tNYQUQHRXalSKdIaM8Ov1QxOVuBNWI7+BzZWv6Ih9k75wOnH1rGQ9WWTaaLkTpxWKIciOF0KyfM74+Q==
   dependencies:
     detect-libc "^1.0.3"
     expand-template "^2.0.3"
     github-from-package "0.0.0"
-    minimist "^1.2.0"
-    mkdirp "^0.5.1"
+    minimist "^1.2.3"
+    mkdirp-classic "^0.5.3"
     napi-build-utils "^1.0.1"
-    node-abi "^2.7.0"
-    noop-logger "^0.1.1"
+    node-abi "^2.21.0"
     npmlog "^4.0.1"
     pump "^3.0.0"
     rc "^1.2.7"
     simple-get "^3.0.3"
     tar-fs "^2.0.0"
     tunnel-agent "^0.6.0"
-    which-pm-runs "^1.0.0"
 
 precond@0.2:
   version "0.2.3"
@@ -20793,11 +21845,6 @@ prelude-ls@~1.1.2:
   resolved "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54"
   integrity sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=
 
-prepend-http@^1.0.0:
-  version "1.0.4"
-  resolved "https://registry.npmjs.org/prepend-http/-/prepend-http-1.0.4.tgz#d4f4562b0ce3696e41ac52d0e002e57a635dc6dc"
-  integrity sha1-1PRWKwzjaW5BrFLQ4ALlemNdxtw=
-
 prepend-http@^2.0.0:
   version "2.0.0"
   resolved "https://registry.npmjs.org/prepend-http/-/prepend-http-2.0.0.tgz#e92434bfa5ea8c19f41cdfd401d741a3c819d897"
@@ -20808,7 +21855,12 @@ prettier@^1.19.1:
   resolved "https://registry.npmjs.org/prettier/-/prettier-1.19.1.tgz#f7d7f5ff8a9cd872a7be4ca142095956a60797cb"
   integrity sha512-s7PoyDv/II1ObgQunCbB9PdLmUcBZcnWOcxDh7O0N/UwDEsHyqkW+Qh28jW+mVuCdx7gLB0BotYI1Y6uI9iyew==
 
-prettier@^2.2.1, prettier@~2.2.1:
+prettier@^2.2.1:
+  version "2.4.0"
+  resolved "https://registry.npmjs.org/prettier/-/prettier-2.4.0.tgz#85bdfe0f70c3e777cf13a4ffff39713ca6f64cba"
+  integrity sha512-DsEPLY1dE5HF3BxCRBmD4uYZ+5DCbvatnolqTqcxEgKVZnL2kUfyu7b8pPQ5+hTBkdhU9SLUmK0/pHb07RE4WQ==
+
+prettier@~2.2.1:
   version "2.2.1"
   resolved "https://registry.npmjs.org/prettier/-/prettier-2.2.1.tgz#795a1a78dd52f073da0cd42b21f9c91381923ff5"
   integrity sha512-PqyhM2yCjg/oKkFPtTGUojv7gnZAoG80ttl45O6x2Ug/rMJw4wcc9k6aaf2hibP7BGVCCM33gZoGjyvt9mm16Q==
@@ -20883,6 +21935,13 @@ progress@^2.0.0:
   resolved "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz#7e8cf8d8f5b8f239c1bc68beb4eb78567d572ef8"
   integrity sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==
 
+prom-client@^13.2.0:
+  version "13.2.0"
+  resolved "https://registry.npmjs.org/prom-client/-/prom-client-13.2.0.tgz#99d13357912dd400f8911b77df19f7b328a93e92"
+  integrity sha512-wGr5mlNNdRNzEhRYXgboUU2LxHWIojxscJKmtG3R8f4/KiWqyYgXTLHs0+Ted7tG3zFT7pgHJbtomzZ1L0ARaQ==
+  dependencies:
+    tdigest "^0.1.1"
+
 promise-inflight@^1.0.1:
   version "1.0.1"
   resolved "https://registry.npmjs.org/promise-inflight/-/promise-inflight-1.0.1.tgz#98472870bf228132fcbdd868129bad12c3c029e3"
@@ -20936,6 +21995,14 @@ prompts@2.4.0, prompts@^2.0.1:
     kleur "^3.0.3"
     sisteransi "^1.0.5"
 
+prompts@^2.4.0:
+  version "2.4.1"
+  resolved "https://registry.npmjs.org/prompts/-/prompts-2.4.1.tgz#befd3b1195ba052f9fd2fde8a486c4e82ee77f61"
+  integrity sha512-EQyfIuO2hPDsX1L/blblV+H7I0knhgAd82cVneCwcdND9B8AuCDuRcBH6yIcG4dFzlOUqbazQqwGjx5xmsNLuQ==
+  dependencies:
+    kleur "^3.0.3"
+    sisteransi "^1.0.5"
+
 promzard@^0.3.0:
   version "0.3.0"
   resolved "https://registry.npmjs.org/promzard/-/promzard-0.3.0.tgz#26a5d6ee8c7dee4cb12208305acfb93ba382a9ee"
@@ -20943,6 +22010,14 @@ promzard@^0.3.0:
   dependencies:
     read "1"
 
+prop-types@15.6.2:
+  version "15.6.2"
+  resolved "https://registry.npmjs.org/prop-types/-/prop-types-15.6.2.tgz#05d5ca77b4453e985d60fc7ff8c859094a497102"
+  integrity sha512-3pboPvLiWD7dkI3qf3KbUe6hKFKa52w+AE0VCqECtf+QHAKgOL37tTaNCnuX1nAAQ4ZhyP+kYVKf8rLmJ/feDQ==
+  dependencies:
+    loose-envify "^1.3.1"
+    object-assign "^4.1.1"
+
 prop-types@^15.0.0, prop-types@^15.5.10, prop-types@^15.5.7, prop-types@^15.5.8, prop-types@^15.6.0, prop-types@^15.6.1, prop-types@^15.6.2, prop-types@^15.7.2:
   version "15.7.2"
   resolved "https://registry.npmjs.org/prop-types/-/prop-types-15.7.2.tgz#52c41e75b8c87e72b9d9360e0206b99dcbffa6c5"
@@ -20964,6 +22039,13 @@ property-information@^5.0.0:
   dependencies:
     xtend "^4.0.0"
 
+property-information@^5.3.0:
+  version "5.6.0"
+  resolved "https://registry.npmjs.org/property-information/-/property-information-5.6.0.tgz#61675545fb23002f245c6540ec46077d4da3ed69"
+  integrity sha512-YUHSPk+A30YPv+0Qf8i9Mbfe/C0hdPXk1s1jPVToV8pk8BQtpw10ct89Eo7OWkutrwqvT0eicAxlOg3dOAu8JA==
+  dependencies:
+    xtend "^4.0.0"
+
 proto-list@~1.2.1:
   version "1.2.4"
   resolved "https://registry.npmjs.org/proto-list/-/proto-list-1.2.4.tgz#212d5bfe1318306a420f6402b8e26ff39647a849"
@@ -21061,7 +22143,7 @@ pump@^3.0.0:
     end-of-stream "^1.1.0"
     once "^1.3.1"
 
-pumpify@^1.3.3, pumpify@^1.5.1:
+pumpify@^1.3.3:
   version "1.5.1"
   resolved "https://registry.npmjs.org/pumpify/-/pumpify-1.5.1.tgz#36513be246ab27570b1a374a5ce278bfd74370ce"
   integrity sha512-oClZI37HvuUJJxSKKrC17bZ9Cu0ZYhEAGPsPUy9KlMUmv9dKX2o77RUmq7f3XjIxbwyGwYzbzQ1L2Ks8sIradQ==
@@ -21111,7 +22193,7 @@ qs@6.7.0:
   resolved "https://registry.npmjs.org/qs/-/qs-6.7.0.tgz#41dc1a015e3d581f1621776be31afb2876a9b1bc"
   integrity sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ==
 
-qs@^6.10.0, qs@^6.10.1, qs@^6.5.1, qs@^6.5.2, qs@^6.6.0, qs@^6.7.0, qs@^6.9.1, qs@^6.9.4, qs@^6.9.6:
+qs@^6.10.0, qs@^6.10.1, qs@^6.5.1, qs@^6.7.0, qs@^6.9.1, qs@^6.9.4, qs@^6.9.6:
   version "6.10.1"
   resolved "https://registry.npmjs.org/qs/-/qs-6.10.1.tgz#4931482fa8d647a5aab799c5271d2133b981fb6a"
   integrity sha512-M528Hph6wsSVOBiYUnGf+K/7w0hNshs/duGsNXPUCLH5XAqjEtiPGwNONLV0tBH8NoGb0mvD5JubnUTrujKDTg==
@@ -21123,14 +22205,6 @@ qs@~6.5.2:
   resolved "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz#cb3ae806e8740444584ef154ce8ee98d403f3e36"
   integrity sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==
 
-query-string@^4.1.0:
-  version "4.3.4"
-  resolved "https://registry.npmjs.org/query-string/-/query-string-4.3.4.tgz#bbb693b9ca915c232515b228b1a02b609043dbeb"
-  integrity sha1-u7aTucqRXCMlFbIosaArYJBD2+s=
-  dependencies:
-    object-assign "^4.1.0"
-    strict-uri-encode "^1.0.0"
-
 query-string@^7.0.0:
   version "7.0.0"
   resolved "https://registry.npmjs.org/query-string/-/query-string-7.0.0.tgz#aaad2c8d5c6a6d0c6afada877fecbd56af79e609"
@@ -21161,6 +22235,11 @@ querystringify@^2.1.1:
   resolved "https://registry.npmjs.org/querystringify/-/querystringify-2.1.1.tgz#60e5a5fd64a7f8bfa4d2ab2ed6fdf4c85bad154e"
   integrity sha512-w7fLxIRCRT7U8Qu53jQnJyPkYZIaR4n5151KMfcJlO/A9397Wxb1amJvROTK6TOnp7PfoAmg/qXiNHI+08jRfA==
 
+quick-format-unescaped@^3.0.3:
+  version "3.0.3"
+  resolved "https://registry.npmjs.org/quick-format-unescaped/-/quick-format-unescaped-3.0.3.tgz#fb3e468ac64c01d22305806c39f121ddac0d1fb9"
+  integrity sha512-dy1yjycmn9blucmJLXOfZDx1ikZJUi6E8bBZLnhPG5gBrVhHXx2xVyqqgKBubVNEXmx51dBACMHpoMQK/N/AXQ==
+
 quick-lru@^4.0.1:
   version "4.0.1"
   resolved "https://registry.npmjs.org/quick-lru/-/quick-lru-4.0.1.tgz#5b8878f113a58217848c6482026c73e1ba57727f"
@@ -21243,7 +22322,7 @@ raw-body@^2.4.1:
     iconv-lite "0.4.24"
     unpipe "1.0.0"
 
-raw-loader@^4.0.1:
+raw-loader@^4.0.2:
   version "4.0.2"
   resolved "https://registry.npmjs.org/raw-loader/-/raw-loader-4.0.2.tgz#1aac6b7d1ad1501e66efdac1522c73e59a584eb6"
   integrity sha512-ZnScIV3ag9A4wPX/ZayxL/jZH+euYb6FcUinPcgiQW0+UBtEv0O6Q3lGd3cqJ+GHH+rksEv3Pj99oxJ3u3VIKA==
@@ -21269,7 +22348,7 @@ rc@^1.2.7, rc@^1.2.8:
     minimist "^1.2.0"
     strip-json-comments "~2.0.1"
 
-react-beautiful-dnd@^13.0.0:
+react-beautiful-dnd@13.0.0, react-beautiful-dnd@^13.0.0:
   version "13.0.0"
   resolved "https://registry.npmjs.org/react-beautiful-dnd/-/react-beautiful-dnd-13.0.0.tgz#f70cc8ff82b84bc718f8af157c9f95757a6c3b40"
   integrity sha512-87It8sN0ineoC3nBW0SbQuTFXM6bUqM62uJGY4BtTf0yzPl8/3+bHMWkgIe0Z6m8e+gJgjWxefGRVfpE3VcdEg==
@@ -21282,19 +22361,7 @@ react-beautiful-dnd@^13.0.0:
     redux "^4.0.4"
     use-memo-one "^1.1.1"
 
-react-color@^2.17.0:
-  version "2.18.1"
-  resolved "https://registry.npmjs.org/react-color/-/react-color-2.18.1.tgz#2cda8cc8e06a9e2c52ad391a30ddad31972472f4"
-  integrity sha512-X5XpyJS6ncplZs74ak0JJoqPi+33Nzpv5RYWWxn17bslih+X7OlgmfpmGC1fNvdkK7/SGWYf1JJdn7D2n5gSuQ==
-  dependencies:
-    "@icons/material" "^0.2.4"
-    lodash "^4.17.11"
-    material-colors "^1.2.1"
-    prop-types "^15.5.10"
-    reactcss "^1.2.0"
-    tinycolor2 "^1.4.1"
-
-react-colorful@^5.0.1, react-colorful@^5.1.2:
+react-colorful@^5.1.2:
   version "5.2.2"
   resolved "https://registry.npmjs.org/react-colorful/-/react-colorful-5.2.2.tgz#0a69d0648db47e51359d343854d83d250a742243"
   integrity sha512-Xdb1Rl6lZ5SMdNBH59eE0lGqR1g2LVD8IgPlw0WeMDrOC65lYI8fgMEwj/0dDpVRVMh5qp73ciISDst/t2O2iQ==
@@ -21315,37 +22382,7 @@ react-debounce-input@^3.2.3:
     lodash.debounce "^4"
     prop-types "^15.7.2"
 
-react-dev-utils@^10.0.0:
-  version "10.2.1"
-  resolved "https://registry.npmjs.org/react-dev-utils/-/react-dev-utils-10.2.1.tgz#f6de325ae25fa4d546d09df4bb1befdc6dd19c19"
-  integrity sha512-XxTbgJnYZmxuPtY3y/UV0D8/65NKkmaia4rXzViknVnZeVlklSh8u6TnaEYPfAi/Gh1TP4mEOXHI6jQOPbeakQ==
-  dependencies:
-    "@babel/code-frame" "7.8.3"
-    address "1.1.2"
-    browserslist "4.10.0"
-    chalk "2.4.2"
-    cross-spawn "7.0.1"
-    detect-port-alt "1.1.6"
-    escape-string-regexp "2.0.0"
-    filesize "6.0.1"
-    find-up "4.1.0"
-    fork-ts-checker-webpack-plugin "3.1.1"
-    global-modules "2.0.0"
-    globby "8.0.2"
-    gzip-size "5.1.1"
-    immer "1.10.0"
-    inquirer "7.0.4"
-    is-root "2.1.0"
-    loader-utils "1.2.3"
-    open "^7.0.2"
-    pkg-up "3.1.0"
-    react-error-overlay "^6.0.7"
-    recursive-readdir "2.2.2"
-    shell-quote "1.7.2"
-    strip-ansi "6.0.0"
-    text-table "0.2.0"
-
-react-dev-utils@^11.0.4:
+react-dev-utils@^11.0.3, react-dev-utils@^11.0.4:
   version "11.0.4"
   resolved "https://registry.npmjs.org/react-dev-utils/-/react-dev-utils-11.0.4.tgz#a7ccb60257a1ca2e0efe7a83e38e6700d17aa37a"
   integrity sha512-dx0LvIGHcOPtKbeiSUM4jqpBl3TcY7CDjZdfOIcKeznE7BWr9dg0iPG90G5yfVQ+p/rGNMXdbfStvzQZEVEi4A==
@@ -21375,21 +22412,10 @@ react-dev-utils@^11.0.4:
     strip-ansi "6.0.0"
     text-table "0.2.0"
 
-react-docgen-typescript-plugin@^0.6.2:
-  version "0.6.3"
-  resolved "https://registry.npmjs.org/react-docgen-typescript-plugin/-/react-docgen-typescript-plugin-0.6.3.tgz#664b22601df083597ecb1e60bd21beca60125fdf"
-  integrity sha512-av1S/fmWBNFGgNa4qtkidFjjOz23eEi6EdCtwSWo9WNhGzUMyMygbD/DosMWoeFlZpk9R3MXPkRE7PDH6j5GMQ==
-  dependencies:
-    debug "^4.1.1"
-    endent "^2.0.1"
-    micromatch "^4.0.2"
-    react-docgen-typescript "^1.20.5"
-    tslib "^2.0.0"
-
-react-docgen-typescript@^1.20.5:
-  version "1.20.5"
-  resolved "https://registry.npmjs.org/react-docgen-typescript/-/react-docgen-typescript-1.20.5.tgz#fb8d78a707243498436c2952bd3f6f488a68d4f3"
-  integrity sha512-AbLGMtn76bn7SYBJSSaKJrZ0lgNRRR3qL60PucM5M4v/AXyC8221cKBXW5Pyt9TfDRfe+LDnPNlg7TibxX0ovA==
+react-docgen-typescript@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.npmjs.org/react-docgen-typescript/-/react-docgen-typescript-2.1.0.tgz#20db64a7fd62e63a8a9469fb4abd90600878cbb2"
+  integrity sha512-7kpzLsYzVxff//HUVz1sPWLCdoSNvHD3M8b/iQLdF8fgf7zp26eVysRrAUSxiAT4yQv2zl09zHjJEYSYNxQ8Jw==
 
 react-docgen@^5.0.0:
   version "5.3.0"
@@ -21420,15 +22446,15 @@ react-double-scrollbar@0.0.15:
   resolved "https://registry.npmjs.org/react-double-scrollbar/-/react-double-scrollbar-0.0.15.tgz#e915ab8cb3b959877075f49436debfdb04288fe4"
   integrity sha1-6RWrjLO5WYdwdfSUNt6/2wQoj+Q=
 
-react-draggable@^4.0.3:
-  version "4.2.0"
-  resolved "https://registry.npmjs.org/react-draggable/-/react-draggable-4.2.0.tgz#40cc5209082ca7d613104bf6daf31372cc0e1114"
-  integrity sha512-5wFq//gEoeTYprnd4ze8GrFc+Rbnx+9RkOMR3vk4EbWxj02U6L6T3yrlKeiw4X5CtjD2ma2+b3WujghcXNRzkw==
+react-draggable@^4.4.3:
+  version "4.4.3"
+  resolved "https://registry.npmjs.org/react-draggable/-/react-draggable-4.4.3.tgz#0727f2cae5813e36b0e4962bf11b2f9ef2b406f3"
+  integrity sha512-jV4TE59MBuWm7gb6Ns3Q1mxX8Azffb7oTtDtBgFkxRvhDp38YAARmRplrj0+XGkhOJB5XziArX+4HUUABtyZ0w==
   dependencies:
     classnames "^2.2.5"
     prop-types "^15.6.0"
 
-react-error-overlay@^6.0.7, react-error-overlay@^6.0.9:
+react-error-overlay@^6.0.9:
   version "6.0.9"
   resolved "https://registry.npmjs.org/react-error-overlay/-/react-error-overlay-6.0.9.tgz#3c743010c9359608c375ecd6bc76f35d93995b0a"
   integrity sha512-nQTTcUu+ATDbrSD1BZHr5kgSD4oF8OFjxun8uAaL8RwPBacGBNPf/yAuVVdx17N8XNzRDMrZ9XcKZHCjPW+9ew==
@@ -21438,20 +22464,20 @@ react-fast-compare@^2.0.4:
   resolved "https://registry.npmjs.org/react-fast-compare/-/react-fast-compare-2.0.4.tgz#e84b4d455b0fec113e0402c329352715196f81f9"
   integrity sha512-suNP+J1VU1MWFKcyt7RtjiSWUjvidmQSlqu+eHslq+342xCbGTYmC0mEhPCOHxlW0CywylOC1u2DFAT+bv4dBw==
 
-react-fast-compare@^3.0.1, react-fast-compare@^3.1.1:
+react-fast-compare@^3.0.1, react-fast-compare@^3.1.1, react-fast-compare@^3.2.0:
   version "3.2.0"
   resolved "https://registry.npmjs.org/react-fast-compare/-/react-fast-compare-3.2.0.tgz#641a9da81b6a6320f270e89724fb45a0b39e43bb"
   integrity sha512-rtGImPZ0YyLrscKI9xTpV8psd6I8VAtjKCzQDlzyDvqJA8XOW78TXYQwNRNd8g8JZnDu8q9Fu/1v4HPAVwVdHA==
 
-react-helmet-async@^1.0.2:
-  version "1.0.4"
-  resolved "https://registry.npmjs.org/react-helmet-async/-/react-helmet-async-1.0.4.tgz#079ef10b7fefcaee6240fefd150711e62463cc97"
-  integrity sha512-KTGHE9sz8N7+fCkZ2a3vzXH9eIkiTNhL2NhKR7XzzQl3WsGlCHh76arauJUIiGdfhjeMp7DY7PkASAmYFXeJYg==
+react-helmet-async@^1.0.7:
+  version "1.0.9"
+  resolved "https://registry.npmjs.org/react-helmet-async/-/react-helmet-async-1.0.9.tgz#5b9ed2059de6b4aab47f769532f9fbcbce16c5ca"
+  integrity sha512-N+iUlo9WR3/u9qGMmP4jiYfaD6pe9IvDTapZLFJz2D3xlTlCM1Bzy4Ab3g72Nbajo/0ZyW+W9hdz8Hbe4l97pQ==
   dependencies:
-    "@babel/runtime" "^7.3.4"
+    "@babel/runtime" "^7.12.5"
     invariant "^2.2.4"
     prop-types "^15.7.2"
-    react-fast-compare "^2.0.4"
+    react-fast-compare "^3.2.0"
     shallowequal "^1.1.0"
 
 react-helmet@6.1.0:
@@ -21465,14 +22491,14 @@ react-helmet@6.1.0:
     react-side-effect "^2.1.0"
 
 react-hook-form@^6.15.4:
-  version "6.15.4"
-  resolved "https://registry.npmjs.org/react-hook-form/-/react-hook-form-6.15.4.tgz#328003e1ccc096cd158899ffe7e3b33735a9b024"
-  integrity sha512-K+Sw33DtTMengs8OdqFJI3glzNl1wBzSefD/ksQw/hJf9CnOHQAU6qy82eOrh0IRNt2G53sjr7qnnw1JDjvx1w==
+  version "6.15.8"
+  resolved "https://registry.npmjs.org/react-hook-form/-/react-hook-form-6.15.8.tgz#725c139d308c431c4611e4b9d85a49f01cfc0e7a"
+  integrity sha512-prq82ofMbnRyj5wqDe8hsTRcdR25jQ+B8KtCS7BLCzjFHAwNuCjRwzPuP4eYLsEBjEIeYd6try+pdLdw0kPkpg==
 
-react-hook-form@^7.1.1:
-  version "7.2.1"
-  resolved "https://registry.npmjs.org/react-hook-form/-/react-hook-form-7.2.1.tgz#99b3540dd2314499df12e9a53c70587ad63a806c"
-  integrity sha512-QopAubhVofqQrwlWLr9aK0DF8tNU8fnU8sJIlw1Tb3tGkEvP9yeaA+cx1hlxYni8xBswtHruL1WcDEa6CYQDow==
+react-hook-form@^7.12.2:
+  version "7.15.3"
+  resolved "https://registry.npmjs.org/react-hook-form/-/react-hook-form-7.15.3.tgz#7d222dcfd43137be127dca2843149f09bd25d4b1"
+  integrity sha512-z30aZoEHkWE8oZvad4OcYSBI0kQua/T5sFGH9tB2HfeykFnP/pGXNap8lDio4/U1yPj2ffpbvRIvqKd/6jjBVA==
 
 react-hot-loader@^4.12.21:
   version "4.13.0"
@@ -21488,13 +22514,6 @@ react-hot-loader@^4.12.21:
     shallowequal "^1.1.0"
     source-map "^0.7.3"
 
-react-hotkeys@2.0.0:
-  version "2.0.0"
-  resolved "https://registry.npmjs.org/react-hotkeys/-/react-hotkeys-2.0.0.tgz#a7719c7340cbba888b0e9184f806a9ec0ac2c53f"
-  integrity sha512-3n3OU8vLX/pfcJrR3xJ1zlww6KS1kEJt0Whxc4FiGV+MJrQ1mYSYI3qS/11d2MJDFm8IhOXMTFQirfu6AVOF6Q==
-  dependencies:
-    prop-types "^15.6.1"
-
 react-immutable-proptypes@2.2.0:
   version "2.2.0"
   resolved "https://registry.npmjs.org/react-immutable-proptypes/-/react-immutable-proptypes-2.2.0.tgz#cce96d68cc3c18e89617cbf3092d08e35126af4a"
@@ -21532,10 +22551,10 @@ react-is@^16.7.0, react-is@^16.8.0, react-is@^16.8.1, react-is@^16.8.4, react-is
   resolved "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz#789729a4dc36de2999dc156dd6c1d9c18cea56a4"
   integrity sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==
 
-"react-is@^16.8.0 || ^17.0.0", react-is@^17.0.1:
-  version "17.0.1"
-  resolved "https://registry.npmjs.org/react-is/-/react-is-17.0.1.tgz#5b3531bd76a645a4c9fb6e693ed36419e3301339"
-  integrity sha512-NAnt2iGDXohE5LI7uBnLnqvLQMtzhkiAOLXTmv+qnF9Ky7xAPcX8Up/xWIhxvLVGJvuLiNc4xQLtuqDRzb4fSA==
+"react-is@^16.8.0 || ^17.0.0", react-is@^17.0.1, react-is@^17.0.2:
+  version "17.0.2"
+  resolved "https://registry.npmjs.org/react-is/-/react-is-17.0.2.tgz#e691d4a8e9c789365655539ab372762b0efb54f0"
+  integrity sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w==
 
 react-lazylog@^4.5.2, react-lazylog@^4.5.3:
   version "4.5.3"
@@ -21657,15 +22676,15 @@ react-side-effect@^2.1.0:
   resolved "https://registry.npmjs.org/react-side-effect/-/react-side-effect-2.1.0.tgz#1ce4a8b4445168c487ed24dab886421f74d380d3"
   integrity sha512-IgmcegOSi5SNX+2Snh1vqmF0Vg/CbkycU9XZbOHJlZ6kMzTmi3yc254oB1WCkgA7OQtIAoLmcSFuHTc/tlcqXg==
 
-react-sizeme@^2.6.7:
-  version "2.6.12"
-  resolved "https://registry.npmjs.org/react-sizeme/-/react-sizeme-2.6.12.tgz#ed207be5476f4a85bf364e92042520499455453e"
-  integrity sha512-tL4sCgfmvapYRZ1FO2VmBmjPVzzqgHA7kI8lSJ6JS6L78jXFNRdOZFpXyK6P1NBZvKPPCZxReNgzZNUajAerZw==
+react-sizeme@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.npmjs.org/react-sizeme/-/react-sizeme-3.0.1.tgz#4d12f4244e0e6a0fb97253e7af0314dc7c83a5a0"
+  integrity sha512-9Hf1NLgSbny1bha77l9HwvwwxQUJxFUqi44Ih+y3evA+PezBpGdCGlnvye6avss2cIgs9PgdYgMnfuzJWn/RUw==
   dependencies:
-    element-resize-detector "^1.2.1"
+    element-resize-detector "^1.2.2"
     invariant "^2.2.4"
     shallowequal "^1.1.0"
-    throttle-debounce "^2.1.0"
+    throttle-debounce "^3.0.1"
 
 react-smooth@^1.0.5:
   version "1.0.5"
@@ -21691,7 +22710,7 @@ react-string-replace@^0.4.1:
   dependencies:
     lodash "^4.17.4"
 
-react-syntax-highlighter@^13.5.0, react-syntax-highlighter@^13.5.3:
+react-syntax-highlighter@^13.5.3:
   version "13.5.3"
   resolved "https://registry.npmjs.org/react-syntax-highlighter/-/react-syntax-highlighter-13.5.3.tgz#9712850f883a3e19eb858cf93fad7bb357eea9c6"
   integrity sha512-crPaF+QGPeHNIblxxCdf2Lg936NAHKhNhuMzRL3F9ct6aYXL3NcZtCL0Rms9+qVo6Y1EQLdXGypBNSbPL/r+qg==
@@ -21730,7 +22749,7 @@ react-text-truncate@^0.16.0:
   dependencies:
     prop-types "^15.5.7"
 
-react-textarea-autosize@^8.1.1, react-textarea-autosize@^8.3.0:
+react-textarea-autosize@^8.3.0:
   version "8.3.3"
   resolved "https://registry.npmjs.org/react-textarea-autosize/-/react-textarea-autosize-8.3.3.tgz#f70913945369da453fd554c168f6baacd1fa04d8"
   integrity sha512-2XlHXK2TDxS6vbQaoPbMOfQ8GK7+irc2fVK6QFIcC8GOnH3zI/v481n+j1L0WaPVvKxwesnY93fEfH++sus2rQ==
@@ -21827,13 +22846,6 @@ react@^16.0.0, react@^16.12.0, react@^16.13.1:
     object-assign "^4.1.1"
     prop-types "^15.6.2"
 
-reactcss@^1.2.0:
-  version "1.2.3"
-  resolved "https://registry.npmjs.org/reactcss/-/reactcss-1.2.3.tgz#c00013875e557b1cf0dfd9a368a1c3dab3b548dd"
-  integrity sha512-KiwVUcFu1RErkI97ywr8nvx8dNOpT03rbnma0SSalTYjkrPYaEajR4a/MRt6DZ46K6arDRbWMNHF+xH7G7n/8A==
-  dependencies:
-    lodash "^4.0.1"
-
 read-cmd-shim@^2.0.0:
   version "2.0.0"
   resolved "https://registry.npmjs.org/read-cmd-shim/-/read-cmd-shim-2.0.0.tgz#4a50a71d6f0965364938e9038476f7eede3928d9"
@@ -21978,7 +22990,7 @@ read@1, read@~1.0.1:
     string_decoder "~1.1.1"
     util-deprecate "~1.0.1"
 
-"readable-stream@2 || 3", readable-stream@3, readable-stream@^3.0.0, readable-stream@^3.0.2, readable-stream@^3.0.6, readable-stream@^3.1.1, readable-stream@^3.4.0, readable-stream@^3.5.0, readable-stream@^3.6.0:
+readable-stream@3, readable-stream@^3.0.0, readable-stream@^3.0.2, readable-stream@^3.0.6, readable-stream@^3.1.1, readable-stream@^3.4.0, readable-stream@^3.5.0, readable-stream@^3.6.0:
   version "3.6.0"
   resolved "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz#337bbda3adc0706bd3e024426a286d4b4b2c9198"
   integrity sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==
@@ -21987,6 +22999,13 @@ read@1, read@~1.0.1:
     string_decoder "^1.1.1"
     util-deprecate "^1.0.1"
 
+readable-web-to-node-stream@^3.0.0:
+  version "3.0.2"
+  resolved "https://registry.npmjs.org/readable-web-to-node-stream/-/readable-web-to-node-stream-3.0.2.tgz#5d52bb5df7b54861fd48d015e93a2cb87b3ee0bb"
+  integrity sha512-ePeK6cc1EcKLEhJFt/AebMCLL+GgSKhuygrZ/GLaKZYEecIgIECf4UaUuaByiGtzckwR4ain9VzUh95T1exYGw==
+  dependencies:
+    readable-stream "^3.6.0"
+
 readdir-glob@^1.0.0:
   version "1.1.1"
   resolved "https://registry.npmjs.org/readdir-glob/-/readdir-glob-1.1.1.tgz#f0e10bb7bf7bfa7e0add8baffdc54c3f7dbee6c4"
@@ -22158,6 +23177,11 @@ regenerate@^1.4.0:
   resolved "https://registry.npmjs.org/regenerate/-/regenerate-1.4.0.tgz#4a856ec4b56e4077c557589cae85e7a4c8869a11"
   integrity sha512-1G6jJVDWrt0rK99kBjvEtziZNCICAuvIPkSiUFIQxVP06RCVpq3dmDo2oi6ABpYaDYaTRr67BEhL8r1wgEZZKg==
 
+regenerator-runtime@^0.10.5:
+  version "0.10.5"
+  resolved "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.10.5.tgz#336c3efc1220adcedda2c9fab67b5a7955a33658"
+  integrity sha1-M2w+/BIgrc7dosn6tntaeVWjNlg=
+
 regenerator-runtime@^0.11.0:
   version "0.11.1"
   resolved "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz#be05ad7f9bf7d22e056f9726cee5017fbf19e2e9"
@@ -22275,6 +23299,11 @@ relay-runtime@10.1.0:
     "@babel/runtime" "^7.0.0"
     fbjs "^3.0.0"
 
+remark-footnotes@2.0.0:
+  version "2.0.0"
+  resolved "https://registry.npmjs.org/remark-footnotes/-/remark-footnotes-2.0.0.tgz#9001c4c2ffebba55695d2dd80ffb8b82f7e6303f"
+  integrity sha512-3Clt8ZMH75Ayjp9q4CorNeyjwIxHFcTkaektplKGl2A1jNGEUey8cKL0ZC5vJwfcD5GFGsNLImLG/NGzWIzoMQ==
+
 remark-gfm@^1.0.0:
   version "1.0.0"
   resolved "https://registry.npmjs.org/remark-gfm/-/remark-gfm-1.0.0.tgz#9213643001be3f277da6256464d56fd28c3b3c0d"
@@ -22283,6 +23312,42 @@ remark-gfm@^1.0.0:
     mdast-util-gfm "^0.1.0"
     micromark-extension-gfm "^0.3.0"
 
+remark-mdx@1.6.22:
+  version "1.6.22"
+  resolved "https://registry.npmjs.org/remark-mdx/-/remark-mdx-1.6.22.tgz#06a8dab07dcfdd57f3373af7f86bd0e992108bbd"
+  integrity sha512-phMHBJgeV76uyFkH4rvzCftLfKCr2RZuF+/gmVcaKrpsihyzmhXjA0BEMDaPTXG5y8qZOKPVo83NAOX01LPnOQ==
+  dependencies:
+    "@babel/core" "7.12.9"
+    "@babel/helper-plugin-utils" "7.10.4"
+    "@babel/plugin-proposal-object-rest-spread" "7.12.1"
+    "@babel/plugin-syntax-jsx" "7.12.1"
+    "@mdx-js/util" "1.6.22"
+    is-alphabetical "1.0.4"
+    remark-parse "8.0.3"
+    unified "9.2.0"
+
+remark-parse@8.0.3:
+  version "8.0.3"
+  resolved "https://registry.npmjs.org/remark-parse/-/remark-parse-8.0.3.tgz#9c62aa3b35b79a486454c690472906075f40c7e1"
+  integrity sha512-E1K9+QLGgggHxCQtLt++uXltxEprmWzNfg+MxpfHsZlrddKzZ/hZyWHDbK3/Ap8HJQqYJRXP+jHczdL6q6i85Q==
+  dependencies:
+    ccount "^1.0.0"
+    collapse-white-space "^1.0.2"
+    is-alphabetical "^1.0.0"
+    is-decimal "^1.0.0"
+    is-whitespace-character "^1.0.0"
+    is-word-character "^1.0.0"
+    markdown-escapes "^1.0.0"
+    parse-entities "^2.0.0"
+    repeat-string "^1.5.4"
+    state-toggle "^1.0.0"
+    trim "0.0.1"
+    trim-trailing-lines "^1.0.0"
+    unherit "^1.0.4"
+    unist-util-remove-position "^2.0.0"
+    vfile-location "^3.0.0"
+    xtend "^4.0.1"
+
 remark-parse@^9.0.0:
   version "9.0.0"
   resolved "https://registry.npmjs.org/remark-parse/-/remark-parse-9.0.0.tgz#4d20a299665880e4f4af5d90b7c7b8a935853640"
@@ -22290,6 +23355,13 @@ remark-parse@^9.0.0:
   dependencies:
     mdast-util-from-markdown "^0.8.0"
 
+remark-squeeze-paragraphs@4.0.0:
+  version "4.0.0"
+  resolved "https://registry.npmjs.org/remark-squeeze-paragraphs/-/remark-squeeze-paragraphs-4.0.0.tgz#76eb0e085295131c84748c8e43810159c5653ead"
+  integrity sha512-8qRqmL9F4nuLPIgl92XUuxI3pFxize+F1H0e/W3llTk0UsjJaj01+RrirkMw7P21RKe4X6goQhYRSvNWX+70Rw==
+  dependencies:
+    mdast-squeeze-paragraphs "^4.0.0"
+
 remarkable@^2.0.1:
   version "2.0.1"
   resolved "https://registry.npmjs.org/remarkable/-/remarkable-2.0.1.tgz#280ae6627384dfb13d98ee3995627ca550a12f31"
@@ -22329,7 +23401,7 @@ repeat-element@^1.1.2:
   resolved "https://registry.npmjs.org/repeat-element/-/repeat-element-1.1.3.tgz#782e0d825c0c5a3bb39731f84efee6b742e6b1ce"
   integrity sha512-ahGq0ZnV5m5XtZLMb+vP76kcAM5nkLqk0lpqAuojSKGgQtn4eRi4ZZGm2olo2zKFH+sMsWaqOCW1dqAnOru72g==
 
-repeat-string@^1.0.0, repeat-string@^1.5.2, repeat-string@^1.6.1:
+repeat-string@^1.0.0, repeat-string@^1.5.2, repeat-string@^1.5.4, repeat-string@^1.6.1:
   version "1.6.1"
   resolved "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz#8dcae470e1c88abc2d600fff4a776286da75e637"
   integrity sha1-jcrkcOHIirwtYA//Sndihtp15jc=
@@ -22383,7 +23455,7 @@ request-promise-native@^1.0.5, request-promise-native@^1.0.8:
     stealthy-require "^1.1.1"
     tough-cookie "^2.3.3"
 
-request@^2.74.0, request@^2.85.0, request@^2.87.0, request@^2.88.0, request@^2.88.2:
+request@^2.85.0, request@^2.87.0, request@^2.88.0, request@^2.88.2:
   version "2.88.2"
   resolved "https://registry.npmjs.org/request/-/request-2.88.2.tgz#d73c918731cb5a87da047e207234146f664d12b3"
   integrity sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw==
@@ -22449,13 +23521,6 @@ resolve-alpn@^1.0.0:
   resolved "https://registry.npmjs.org/resolve-alpn/-/resolve-alpn-1.0.0.tgz#745ad60b3d6aff4b4a48e01b8c0bdc70959e0e8c"
   integrity sha512-rTuiIEqFmGxne4IovivKSDzld2lWW9QCjqv80SYjPgf+gS35eaCAjaP54CCwGAwBtnCsvNLYtqxe1Nw+i6JEmA==
 
-resolve-cwd@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.npmjs.org/resolve-cwd/-/resolve-cwd-2.0.0.tgz#00a9f7387556e27038eae232caa372a6a59b665a"
-  integrity sha1-AKn3OHVW4nA46uIyyqNypqWbZlo=
-  dependencies:
-    resolve-from "^3.0.0"
-
 resolve-cwd@^3.0.0:
   version "3.0.0"
   resolved "https://registry.npmjs.org/resolve-cwd/-/resolve-cwd-3.0.0.tgz#0f0075f1bb2544766cf73ba6a6e2adfebcb13f2d"
@@ -22483,7 +23548,7 @@ resolve-url@^0.2.1:
   resolved "https://registry.npmjs.org/resolve-url/-/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a"
   integrity sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo=
 
-resolve@^1.1.6, resolve@^1.10.0, resolve@^1.12.0, resolve@^1.13.1, resolve@^1.14.2, resolve@^1.17.0, resolve@^1.18.1, resolve@^1.19.0, resolve@^1.9.0:
+resolve@^1.1.6, resolve@^1.10.0, resolve@^1.12.0, resolve@^1.13.1, resolve@^1.14.2, resolve@^1.17.0, resolve@^1.18.1, resolve@^1.19.0, resolve@^1.3.2, resolve@^1.9.0:
   version "1.20.0"
   resolved "https://registry.npmjs.org/resolve/-/resolve-1.20.0.tgz#629a013fb3f70755d6f0b7935cc1c2c5378b1975"
   integrity sha512-wENBPt4ySzg4ybFQW2TT1zMQucPK95HSh/nq2CFTZVOGut2+pQvSsgtda4d26YrYcr067wjbmzOG8byDPBX63A==
@@ -22549,13 +23614,26 @@ ret@~0.1.10:
   resolved "https://registry.npmjs.org/ret/-/ret-0.1.15.tgz#b8a4825d5bdb1fc3f6f53c2bc33f81388681c7bc"
   integrity sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg==
 
-retry-request@^4.0.0, retry-request@^4.1.1:
+ret@~0.2.0:
+  version "0.2.2"
+  resolved "https://registry.npmjs.org/ret/-/ret-0.2.2.tgz#b6861782a1f4762dce43402a71eb7a283f44573c"
+  integrity sha512-M0b3YWQs7R3Z917WRQy1HHA7Ba7D8hvZg6UE5mLykJxQVE2ju0IXbGlaHPPlkY+WN7wFP+wUMXmBFA0aV6vYGQ==
+
+retry-request@^4.0.0:
   version "4.1.3"
   resolved "https://registry.npmjs.org/retry-request/-/retry-request-4.1.3.tgz#d5f74daf261372cff58d08b0a1979b4d7cab0fde"
   integrity sha512-QnRZUpuPNgX0+D1xVxul6DbJ9slvo4Rm6iV/dn63e048MvGbUZiKySVt6Tenp04JqmchxjiLltGerOJys7kJYQ==
   dependencies:
     debug "^4.1.1"
 
+retry-request@^4.2.2:
+  version "4.2.2"
+  resolved "https://registry.npmjs.org/retry-request/-/retry-request-4.2.2.tgz#b7d82210b6d2651ed249ba3497f07ea602f1a903"
+  integrity sha512-xA93uxUD/rogV7BV59agW/JHPGXeREMWiZc9jhcwY4YdZ7QOtC7qbomYg0n4wyk2lJhggjvKvhNX8wln/Aldhg==
+  dependencies:
+    debug "^4.1.1"
+    extend "^3.0.2"
+
 retry@0.12.0, retry@^0.12.0:
   version "0.12.0"
   resolved "https://registry.npmjs.org/retry/-/retry-0.12.0.tgz#1b42a6266a21f07421d1b0b54b7dc167b01c013b"
@@ -22705,7 +23783,7 @@ rtl-css-js@^1.14.0:
   dependencies:
     "@babel/runtime" "^7.1.2"
 
-run-async@^2.2.0, run-async@^2.4.0:
+run-async@^2.4.0:
   version "2.4.0"
   resolved "https://registry.npmjs.org/run-async/-/run-async-2.4.0.tgz#e59054a5b86876cfae07f431d18cbaddc594f1e8"
   integrity sha512-xJTbh/d7Lm7SBhc1tNvTpeCHaEzoyxPrqNlvSdMfBTYwaY++UJFyXUOxAtsRUXjlqOfj8luNaR9vjCh4KeV+pg==
@@ -22724,13 +23802,39 @@ run-queue@^1.0.0, run-queue@^1.0.3:
   dependencies:
     aproba "^1.1.1"
 
-rxjs@^6.3.3, rxjs@^6.4.0, rxjs@^6.5.3, rxjs@^6.5.5, rxjs@^6.6.0, rxjs@^6.6.3, rxjs@^6.6.6:
+run-script-webpack-plugin@^0.0.11:
+  version "0.0.11"
+  resolved "https://registry.npmjs.org/run-script-webpack-plugin/-/run-script-webpack-plugin-0.0.11.tgz#04c510bed06b907fa2285e75feece71a25691171"
+  integrity sha512-QmuBhiqBPmhQLpO5vMBHVTAGyoPBnrCM5gQ3IzgieiImBXiBbXcIv4kysCT1gilFNFxQk22oKQfiIhWbT/zXCw==
+
+rxjs@^6.3.3, rxjs@^6.4.0, rxjs@^6.5.5, rxjs@^6.6.0:
+  version "6.6.2"
+  resolved "https://registry.npmjs.org/rxjs/-/rxjs-6.6.2.tgz#8096a7ac03f2cc4fe5860ef6e572810d9e01c0d2"
+  integrity sha512-BHdBMVoWC2sL26w//BCu3YzKT4s2jip/WhwsGEDmeKYBhKDZeYezVUnHatYB7L85v5xs0BAQmg6BEYJEKxBabg==
+  dependencies:
+    tslib "^1.9.0"
+
+rxjs@^6.6.3:
+  version "6.6.6"
+  resolved "https://registry.npmjs.org/rxjs/-/rxjs-6.6.6.tgz#14d8417aa5a07c5e633995b525e1e3c0dec03b70"
+  integrity sha512-/oTwee4N4iWzAMAL9xdGKjkEHmIwupR3oXbQjCKywF1BeFohswF3vZdogbmEF6pZkOsXTzWkrZszrWpQTByYVg==
+  dependencies:
+    tslib "^1.9.0"
+
+rxjs@^6.6.6:
   version "6.6.7"
   resolved "https://registry.npmjs.org/rxjs/-/rxjs-6.6.7.tgz#90ac018acabf491bf65044235d5863c4dab804c9"
   integrity sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==
   dependencies:
     tslib "^1.9.0"
 
+rxjs@^7.1.0:
+  version "7.3.0"
+  resolved "https://registry.npmjs.org/rxjs/-/rxjs-7.3.0.tgz#39fe4f3461dc1e50be1475b2b85a0a88c1e938c6"
+  integrity sha512-p2yuGIg9S1epc3vrjKf6iVb3RCaAYjYskkO+jHIaV0IjOPlJop4UnodOoFb2xeNwlguqLYvGw1b1McillYb5Gw==
+  dependencies:
+    tslib "~2.1.0"
+
 safe-buffer@5.1.1:
   version "5.1.1"
   resolved "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz#893312af69b2123def71f57889001671eeb2c853"
@@ -22741,7 +23845,7 @@ safe-buffer@5.1.2, safe-buffer@~5.1.0, safe-buffer@~5.1.1:
   resolved "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d"
   integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==
 
-safe-buffer@5.2.1, safe-buffer@>=5.1.0, safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.1, safe-buffer@^5.1.2, safe-buffer@~5.2.0:
+safe-buffer@5.2.1, safe-buffer@>=5.1.0, safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.1, safe-buffer@^5.1.2, safe-buffer@^5.2.1, safe-buffer@~5.2.0:
   version "5.2.1"
   resolved "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6"
   integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==
@@ -22756,6 +23860,13 @@ safe-json-stringify@~1:
   resolved "https://registry.npmjs.org/safe-json-stringify/-/safe-json-stringify-1.2.0.tgz#356e44bc98f1f93ce45df14bcd7c01cda86e0afd"
   integrity sha512-gH8eh2nZudPQO6TytOvbxnuhYBOvDBBLW52tz5q6X58lJcd/tkmqFR+5Z9adS8aJtURSXWThWy/xJtJwixErvg==
 
+safe-regex2@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.npmjs.org/safe-regex2/-/safe-regex2-2.0.0.tgz#b287524c397c7a2994470367e0185e1916b1f5b9"
+  integrity sha512-PaUSFsUaNNuKwkBijoAPHAK6/eM6VirvyPWlZ7BAQy4D+hCvh4B6lIG+nPdhbFfIbP+gTGBcrdsOaUs0F+ZBOQ==
+  dependencies:
+    ret "~0.2.0"
+
 safe-regex@^1.1.0:
   version "1.1.0"
   resolved "https://registry.npmjs.org/safe-regex/-/safe-regex-1.1.0.tgz#40a3669f3b077d1e943d44629e157dd48023bf2e"
@@ -22783,19 +23894,6 @@ sane@^4.0.3:
     minimist "^1.1.1"
     walker "~1.0.5"
 
-sanitize-html@^2.3.2:
-  version "2.4.0"
-  resolved "https://registry.npmjs.org/sanitize-html/-/sanitize-html-2.4.0.tgz#8da7524332eb210d968971621b068b53f17ab5a3"
-  integrity sha512-Y1OgkUiTPMqwZNRLPERSEi39iOebn2XJLbeiGOBhaJD/yLqtLGu6GE5w7evx177LeGgSE+4p4e107LMiydOf6A==
-  dependencies:
-    deepmerge "^4.2.2"
-    escape-string-regexp "^4.0.0"
-    htmlparser2 "^6.0.0"
-    is-plain-object "^5.0.0"
-    klona "^2.0.3"
-    parse-srcset "^1.0.2"
-    postcss "^8.0.2"
-
 sax@1.2.1:
   version "1.2.1"
   resolved "https://registry.npmjs.org/sax/-/sax-1.2.1.tgz#7b8e656190b228e81a66aea748480d828cd2d37a"
@@ -22857,6 +23955,15 @@ schema-utils@^3.0.0:
     ajv "^6.12.5"
     ajv-keywords "^3.5.2"
 
+schema-utils@^3.1.0:
+  version "3.1.1"
+  resolved "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.1.tgz#bc74c4b6b6995c1d88f76a8b77bea7219e0c8281"
+  integrity sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==
+  dependencies:
+    "@types/json-schema" "^7.0.8"
+    ajv "^6.12.5"
+    ajv-keywords "^3.5.2"
+
 screenfull@^5.0.0, screenfull@^5.1.0:
   version "5.1.0"
   resolved "https://registry.npmjs.org/screenfull/-/screenfull-5.1.0.tgz#85c13c70f4ead4c1b8a935c70010dfdcd2c0e5c8"
@@ -22867,6 +23974,11 @@ scuid@^1.1.0:
   resolved "https://registry.npmjs.org/scuid/-/scuid-1.1.0.tgz#d3f9f920956e737a60f72d0e4ad280bf324d5dab"
   integrity sha512-MuCAyrGZcTLfQoH2XoBlQ8C6bzwN88XT/0slOGz0pn8+gIP85BOAfYa44ZXQUTOwRwPU0QvgU+V+OSajl/59Xg==
 
+secure-json-parse@^2.4.0:
+  version "2.4.0"
+  resolved "https://registry.npmjs.org/secure-json-parse/-/secure-json-parse-2.4.0.tgz#5aaeaaef85c7a417f76271a4f5b0cc3315ddca85"
+  integrity sha512-Q5Z/97nbON5t/L/sH6mY2EacfjVGwrCcSi5D3btRO2GZ8pf1K1UN7Z9H5J57hjVU2Qzxr1xO+FmBhOvEkzCMmg==
+
 select-hose@^2.0.0:
   version "2.0.0"
   resolved "https://registry.npmjs.org/select-hose/-/select-hose-2.0.0.tgz#625d8658f865af43ec962bfc376a37359a4994ca"
@@ -22877,6 +23989,13 @@ select@^1.1.2:
   resolved "https://registry.npmjs.org/select/-/select-1.1.2.tgz#0e7350acdec80b1108528786ec1d4418d11b396d"
   integrity sha1-DnNQrN7ICxEIUoeG7B1EGNEbOW0=
 
+selfsigned@^1.10.11:
+  version "1.10.11"
+  resolved "https://registry.npmjs.org/selfsigned/-/selfsigned-1.10.11.tgz#24929cd906fe0f44b6d01fb23999a739537acbe9"
+  integrity sha512-aVmbPOfViZqOZPgRBT0+3u4yZFHpmnIghLMlAcb5/xhp5ZtB/RVnKhz5vl2M32CLXAqR4kha9zfhNg0Lf/sxKA==
+  dependencies:
+    node-forge "^0.10.0"
+
 selfsigned@^1.10.7:
   version "1.10.8"
   resolved "https://registry.npmjs.org/selfsigned/-/selfsigned-1.10.8.tgz#0d17208b7d12c33f8eac85c41835f27fc3d81a30"
@@ -22896,6 +24015,11 @@ semver-diff@^3.1.1:
   dependencies:
     semver "^6.3.0"
 
+semver-store@^0.3.0:
+  version "0.3.0"
+  resolved "https://registry.npmjs.org/semver-store/-/semver-store-0.3.0.tgz#ce602ff07df37080ec9f4fb40b29576547befbe9"
+  integrity sha512-TcZvGMMy9vodEFSse30lWinkj+JgOBvPn8wRItpQRSayhc+4ssDs335uklkfvQQJgL/WvmHLVj4Ycv2s7QCQMg==
+
 "semver@2 || 3 || 4 || 5", semver@^5.3.0, semver@^5.4.1, semver@^5.5.0, semver@^5.6.0, semver@^5.7.1:
   version "5.7.1"
   resolved "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7"
@@ -22973,10 +24097,17 @@ serialize-javascript@^2.1.2:
   resolved "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-2.1.2.tgz#ecec53b0e0317bdc95ef76ab7074b7384785fa61"
   integrity sha512-rs9OggEUF0V4jUSecXazOYsLfu7OGK2qIn3c7IPBiffz32XniEp/TX9Xmc9LQfK2nQ2QKHvZ2oygKUGU0lG4jQ==
 
-serialize-javascript@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-4.0.0.tgz#b525e1238489a5ecfc42afacc3fe99e666f4b1aa"
-  integrity sha512-GaNA54380uFefWghODBWEGisLZFj00nS5ACs6yHa9nLqlLpVLO8ChDGeKRjZnV4Nh4n0Qi7nhYZD/9fCPzEqkw==
+serialize-javascript@^5.0.1:
+  version "5.0.1"
+  resolved "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-5.0.1.tgz#7886ec848049a462467a97d3d918ebb2aaf934f4"
+  integrity sha512-SaaNal9imEO737H2c05Og0/8LUXG7EnsZyMa8MzkmuHoELfT6txuj0cMqRj6zfPKnmQ1yasR4PCJc8x+M4JSPA==
+  dependencies:
+    randombytes "^2.1.0"
+
+serialize-javascript@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.0.tgz#efae5d88f45d7924141da8b5c3a7a7e663fefeb8"
+  integrity sha512-Qr3TosvguFt8ePWqsvRfrKyQXIiW+nGbYpy8XK24NQHE83caxWt+mIymTT19DGFbNWNLfEwsrkSmN64lVWB9ag==
   dependencies:
     randombytes "^2.1.0"
 
@@ -23118,7 +24249,7 @@ shell-quote@1.7.2:
   resolved "https://registry.npmjs.org/shell-quote/-/shell-quote-1.7.2.tgz#67a7d02c76c9da24f99d20808fcaded0e0e04be2"
   integrity sha512-mRz/m/JVscCrkMyPqHc/bczi3OQHkLTqXHEFu0zDhK/qfv3UcOA4SVmRCLmos4bhjr9ekVQubj/R7waKapmiQg==
 
-shelljs@^0.8.2, shelljs@^0.8.3, shelljs@^0.8.4:
+shelljs@^0.8.3, shelljs@^0.8.4:
   version "0.8.4"
   resolved "https://registry.npmjs.org/shelljs/-/shelljs-0.8.4.tgz#de7684feeb767f8716b326078a8a00875890e3c2"
   integrity sha512-7gk3UZ9kOfPLIAbslLzyWeGiEqx9e3rxwZM0KE6EL8GlGwjym9Mrlx5/p33bWTu9YG6vcS4MBxYZDHYr5lr8BQ==
@@ -23149,11 +24280,6 @@ side-channel@^1.0.2, side-channel@^1.0.4:
     get-intrinsic "^1.0.2"
     object-inspect "^1.9.0"
 
-sigmund@~1.0.0:
-  version "1.0.1"
-  resolved "https://registry.npmjs.org/sigmund/-/sigmund-1.0.1.tgz#3ff21f198cad2175f9f3b781853fd94d0d19b590"
-  integrity sha1-P/IfGYytIXX587eBhT/ZTQ0ZtZA=
-
 signal-exit@^3.0.0, signal-exit@^3.0.2, signal-exit@^3.0.3:
   version "3.0.3"
   resolved "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.3.tgz#a1410c2edd8f077b08b4e253c8eacfcaf057461c"
@@ -23185,6 +24311,18 @@ simple-swizzle@^0.2.2:
   dependencies:
     is-arrayish "^0.3.1"
 
+sinon@^11.1.1:
+  version "11.1.1"
+  resolved "https://registry.npmjs.org/sinon/-/sinon-11.1.1.tgz#99a295a8b6f0fadbbb7e004076f3ae54fc6eab91"
+  integrity sha512-ZSSmlkSyhUWbkF01Z9tEbxZLF/5tRC9eojCdFh33gtQaP7ITQVaMWQHGuFM7Cuf/KEfihuh1tTl3/ABju3AQMg==
+  dependencies:
+    "@sinonjs/commons" "^1.8.3"
+    "@sinonjs/fake-timers" "^7.1.0"
+    "@sinonjs/samsam" "^6.0.2"
+    diff "^5.0.0"
+    nise "^5.1.0"
+    supports-color "^7.2.0"
+
 sisteransi@^1.0.5:
   version "1.0.5"
   resolved "https://registry.npmjs.org/sisteransi/-/sisteransi-1.0.5.tgz#134d681297756437cc05ca01370d3a7a571075ed"
@@ -23292,26 +24430,14 @@ snapdragon@^0.8.1:
     source-map-resolve "^0.5.0"
     use "^3.1.0"
 
-sockjs-client@1.4.0:
-  version "1.4.0"
-  resolved "https://registry.npmjs.org/sockjs-client/-/sockjs-client-1.4.0.tgz#c9f2568e19c8fd8173b4997ea3420e0bb306c7d5"
-  integrity sha512-5zaLyO8/nri5cua0VtOrFXBPK1jbL4+1cebT/mmKA1E1ZXOvJrII75bPu0l0k843G/+iAbhEqzyKr0w/eCCj7g==
+sockjs@^0.3.21:
+  version "0.3.21"
+  resolved "https://registry.npmjs.org/sockjs/-/sockjs-0.3.21.tgz#b34ffb98e796930b60a0cfa11904d6a339a7d417"
+  integrity sha512-DhbPFGpxjc6Z3I+uX07Id5ZO2XwYsWOrYjaSeieES78cq+JaJvVe5q/m1uvjIQhXinhIeCFRH6JgXe+mvVMyXw==
   dependencies:
-    debug "^3.2.5"
-    eventsource "^1.0.7"
-    faye-websocket "~0.11.1"
-    inherits "^2.0.3"
-    json3 "^3.3.2"
-    url-parse "^1.4.3"
-
-sockjs@0.3.20:
-  version "0.3.20"
-  resolved "https://registry.npmjs.org/sockjs/-/sockjs-0.3.20.tgz#b26a283ec562ef8b2687b44033a4eeceac75d855"
-  integrity sha512-SpmVOVpdq0DJc0qArhF3E5xsxvaiqGNb73XfgBpK1y3UD5gs8DSo8aCTsuT5pX8rssdc2NDIzANwP9eCAiSdTA==
-  dependencies:
-    faye-websocket "^0.10.0"
+    faye-websocket "^0.11.3"
     uuid "^3.4.0"
-    websocket-driver "0.6.5"
+    websocket-driver "^0.7.4"
 
 socks-proxy-agent@^5.0.0:
   version "5.0.0"
@@ -23330,12 +24456,13 @@ socks@^2.3.3:
     ip "^1.1.5"
     smart-buffer "^4.1.0"
 
-sort-keys@^1.0.0:
-  version "1.1.2"
-  resolved "https://registry.npmjs.org/sort-keys/-/sort-keys-1.1.2.tgz#441b6d4d346798f1b4e49e8920adfba0e543f9ad"
-  integrity sha1-RBttTTRnmPG05J6JIK37oOVD+a0=
+sonic-boom@^0.7.5:
+  version "0.7.7"
+  resolved "https://registry.npmjs.org/sonic-boom/-/sonic-boom-0.7.7.tgz#d921de887428208bfa07b0ae32c278de043f350a"
+  integrity sha512-Ei5YOo5J64GKClHIL/5evJPgASXFVpfVYbJV9PILZQytTK6/LCwHvsZJW2Ig4p9FMC2OrBrMnXKgRN/OEoAWfg==
   dependencies:
-    is-plain-obj "^1.0.0"
+    atomic-sleep "^1.0.0"
+    flatstr "^1.0.12"
 
 sort-keys@^2.0.0:
   version "2.0.0"
@@ -23380,7 +24507,7 @@ source-map-resolve@^0.6.0:
     atob "^2.1.2"
     decode-uri-component "^0.2.0"
 
-source-map-support@^0.5.16, source-map-support@^0.5.17, source-map-support@^0.5.6, source-map-support@~0.5.12:
+source-map-support@^0.5.16, source-map-support@^0.5.17, source-map-support@^0.5.6, source-map-support@~0.5.12, source-map-support@~0.5.19:
   version "0.5.19"
   resolved "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.19.tgz#a98b62f86dcaf4f67399648c085291ab9e8fed61"
   integrity sha512-Wonm7zOCIJzBGQdB+thsPar0kYuCIzYvxZwlBa87yi/Mdjv7Tip2cyVbLj5o0cFPN4EVkuTwb3GDDyUx2DGnGw==
@@ -23408,7 +24535,7 @@ source-map@^0.6.0, source-map@^0.6.1, source-map@~0.6.0, source-map@~0.6.1:
   resolved "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263"
   integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==
 
-source-map@^0.7.3:
+source-map@^0.7.3, source-map@~0.7.2:
   version "0.7.3"
   resolved "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz#5302f8169031735226544092e64981f751750383"
   integrity sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==
@@ -23485,13 +24612,6 @@ spdy@^4.0.2:
     select-hose "^2.0.0"
     spdy-transport "^3.0.0"
 
-split-array-stream@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.npmjs.org/split-array-stream/-/split-array-stream-2.0.0.tgz#85a4f8bfe14421d7bca7f33a6d176d0c076a53b1"
-  integrity sha512-hmMswlVY91WvGMxs0k8MRgq8zb2mSen4FmDNc5AFiTWtrBpdZN6nwD6kROVe4vNL+ywrvbCKsWVCnEd4riELIg==
-  dependencies:
-    is-stream-ended "^0.1.4"
-
 split-ca@^1.0.1:
   version "1.0.1"
   resolved "https://registry.npmjs.org/split-ca/-/split-ca-1.0.1.tgz#6c83aff3692fa61256e0cd197e05e9de157691a6"
@@ -23642,9 +24762,9 @@ stack-utils@^2.0.2:
     escape-string-regexp "^2.0.0"
 
 stackblur-canvas@^2.0.0:
-  version "2.4.0"
-  resolved "https://registry.npmjs.org/stackblur-canvas/-/stackblur-canvas-2.4.0.tgz#2b2eba910cb46f6feae918e1c402f863d602c01b"
-  integrity sha512-Z+HixfgYV0ss3C342DxPwc+UvN1SYWqoz7Wsi3xEDWEnaBkSCL3Ey21gF4io+WlLm8/RIrSnCrDBIEcH4O+q5Q==
+  version "2.5.0"
+  resolved "https://registry.npmjs.org/stackblur-canvas/-/stackblur-canvas-2.5.0.tgz#aa87bbed1560fdcd3138fff344fc6a1c413ebac4"
+  integrity sha512-EeNzTVfj+1In7aSLPKDD03F/ly4RxEuF/EX0YcOG0cKoPXs+SLZxDawQbexQDBzwROs4VKLWTOaZQlZkGBFEIQ==
 
 stackframe@^1.1.1:
   version "1.1.1"
@@ -23669,22 +24789,22 @@ stacktrace-js@^2.0.2:
     stacktrace-gps "^3.0.4"
 
 start-server-and-test@^1.10.11:
-  version "1.12.1"
-  resolved "https://registry.npmjs.org/start-server-and-test/-/start-server-and-test-1.12.1.tgz#bf84eb5c5a4c8a98b93ed36519035b3f76179f0e"
-  integrity sha512-qGQ2HQiF2yDIfyaHsXkHfoE5UOl4zJUbJ/gx2xOkfX7iPMXW9qHmoFyaMfIDJVLNkxCK7RxSrvWEI9hNVKQluw==
+  version "1.13.1"
+  resolved "https://registry.npmjs.org/start-server-and-test/-/start-server-and-test-1.13.1.tgz#c06eb18c3f31d610724722b7eecbdf2550b03582"
+  integrity sha512-wZjksmjG5scEHXmV/3HWzImxNzUgaNQ6W8kkqL2GbiOldM+nqiqh7niimlC9ZGNopTGj16kheWZnZtSWgdBZNQ==
   dependencies:
     bluebird "3.7.2"
     check-more-types "2.24.0"
-    debug "4.3.1"
-    execa "3.4.0"
+    debug "4.3.2"
+    execa "5.1.1"
     lazy-ass "1.6.0"
     ps-tree "1.2.0"
-    wait-on "5.3.0"
+    wait-on "6.0.0"
 
-start-server-webpack-plugin@^2.2.5:
-  version "2.2.5"
-  resolved "https://registry.npmjs.org/start-server-webpack-plugin/-/start-server-webpack-plugin-2.2.5.tgz#4a2838759b0f36acd11b0b2f5f196f289ae29d31"
-  integrity sha512-DRCkciwCJoCFZ+wt3wWMkR1M2mpVhJbUKFXqhK3FWyIUKYb42NnocH5sMwqgo+nPNHupqNwK/v8lgfBbr2NKdg==
+state-toggle@^1.0.0:
+  version "1.0.3"
+  resolved "https://registry.npmjs.org/state-toggle/-/state-toggle-1.0.3.tgz#e123b16a88e143139b09c6852221bc9815917dfe"
+  integrity sha512-d/5Z4/2iiCnHw6Xzghyhb+GcmF89bxwgXG60wjIiZaxnymbyOmI8Hk4VqHXiVVp6u2ysaskFfXg3ekCj4WNftQ==
 
 static-extend@^0.1.1:
   version "0.1.2"
@@ -23714,7 +24834,7 @@ stoppable@^1.1.0:
   resolved "https://registry.npmjs.org/stoppable/-/stoppable-1.1.0.tgz#32da568e83ea488b08e4d7ea2c3bcc9d75015d5b"
   integrity sha512-KXDYZ9dszj6bzvnEMRYvxgeTHU74QBFL54XKtP3nyMuJ81CFYtABZ3bAzL2EdFUaEwJOBOgENyFj3R7oTzDyyw==
 
-store2@^2.12.0, store2@^2.7.1:
+store2@^2.12.0:
   version "2.12.0"
   resolved "https://registry.npmjs.org/store2/-/store2-2.12.0.tgz#e1f1b7e1a59b6083b2596a8d067f6ee88fd4d3cf"
   integrity sha512-7t+/wpKLanLzSnQPX8WAcuLCCeuSHoWdQuh9SB3xD0kNOM38DNf+0Oa+wmvxmYueRzkmh6IcdKFtvTa+ecgPDw==
@@ -23811,11 +24931,6 @@ strict-event-emitter@^0.2.0:
   dependencies:
     events "^3.3.0"
 
-strict-uri-encode@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.npmjs.org/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz#279b225df1d582b1f54e65addd4352e18faa0713"
-  integrity sha1-J5siXfHVgrH1TmWt3UNS4Y+qBxM=
-
 strict-uri-encode@^2.0.0:
   version "2.0.0"
   resolved "https://registry.npmjs.org/strict-uri-encode/-/strict-uri-encode-2.0.0.tgz#b9c7330c7042862f6b142dc274bbcc5866ce3546"
@@ -23861,7 +24976,7 @@ string-width@^1.0.1, string-width@^1.0.2:
     is-fullwidth-code-point "^2.0.0"
     strip-ansi "^4.0.0"
 
-string-width@^3.0.0, string-width@^3.1.0:
+string-width@^3.0.0:
   version "3.1.0"
   resolved "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz#22767be21b62af1081574306f69ac51b62203961"
   integrity sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==
@@ -23946,7 +25061,7 @@ stringify-object@^3.3.0:
     is-obj "^1.0.1"
     is-regexp "^1.0.0"
 
-strip-ansi@5.2.0, strip-ansi@^5.0.0, strip-ansi@^5.1.0, strip-ansi@^5.2.0:
+strip-ansi@5.2.0, strip-ansi@^5.1.0:
   version "5.2.0"
   resolved "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz#8c9a536feb6afc962bdfa5b104a5091c1ad9c0ae"
   integrity sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==
@@ -23974,6 +25089,13 @@ strip-ansi@^4.0.0:
   dependencies:
     ansi-regex "^3.0.0"
 
+strip-ansi@^7.0.0:
+  version "7.0.1"
+  resolved "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.0.1.tgz#61740a08ce36b61e50e65653f07060d000975fb2"
+  integrity sha512-cXNxvT8dFNRVfhVME3JAe98mkXDYN2O1l7jmcwMnOslDeESg1rF/OZMtK0nRAhiari1unG5cD4jG3rapUAkLbw==
+  dependencies:
+    ansi-regex "^6.0.1"
+
 strip-bom@^2.0.0:
   version "2.0.0"
   resolved "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz#6219a85616520491f35788bdbf1447a99c7e6b0e"
@@ -24034,6 +25156,14 @@ strong-log-transformer@^2.1.0:
     minimist "^1.2.0"
     through "^2.3.4"
 
+strtok3@^6.2.4:
+  version "6.2.4"
+  resolved "https://registry.npmjs.org/strtok3/-/strtok3-6.2.4.tgz#302aea64c0fa25d12a0385069ba66253fdc38a81"
+  integrity sha512-GO8IcFF9GmFDvqduIspUBwCzCbqzegyVKIsSymcMgiZKeCfrN9SowtUoi8+b59WZMAjIzVZic/Ft97+pynR3Iw==
+  dependencies:
+    "@tokenizer/token" "^0.3.0"
+    peek-readable "^4.0.1"
+
 stubs@^3.0.0:
   version "3.0.0"
   resolved "https://registry.npmjs.org/stubs/-/stubs-3.0.0.tgz#e8d2ba1fa9c90570303c030b6900f7d5f89abe5b"
@@ -24052,6 +25182,21 @@ style-loader@^1.2.1:
     loader-utils "^2.0.0"
     schema-utils "^2.6.6"
 
+style-loader@^1.3.0:
+  version "1.3.0"
+  resolved "https://registry.npmjs.org/style-loader/-/style-loader-1.3.0.tgz#828b4a3b3b7e7aa5847ce7bae9e874512114249e"
+  integrity sha512-V7TCORko8rs9rIqkSrlMfkqA63DfoGBBJmK1kKGCcSi+BWb4cqz0SRsnp4l6rU5iwOEd0/2ePv68SV22VXon4Q==
+  dependencies:
+    loader-utils "^2.0.0"
+    schema-utils "^2.7.0"
+
+style-to-object@0.3.0, style-to-object@^0.3.0:
+  version "0.3.0"
+  resolved "https://registry.npmjs.org/style-to-object/-/style-to-object-0.3.0.tgz#b1b790d205991cc783801967214979ee19a76e46"
+  integrity sha512-CzFnRRXhzWIdItT3OmF8SQfWyahHhjq3HwcMNCNLn+N7klOOqPjMeG/4JSu77D7ypZdGvSzvkrbyeTMizz2VrA==
+  dependencies:
+    inline-style-parser "0.1.1"
+
 stylehacks@^4.0.0:
   version "4.0.3"
   resolved "https://registry.npmjs.org/stylehacks/-/stylehacks-4.0.3.tgz#6718fcaf4d1e07d8a1318690881e8d96726a71d5"
@@ -24138,11 +25283,6 @@ supertest@^6.1.3:
     methods "^1.1.2"
     superagent "^6.1.0"
 
-supports-color@1.2.0:
-  version "1.2.0"
-  resolved "https://registry.npmjs.org/supports-color/-/supports-color-1.2.0.tgz#ff1ed1e61169d06b3cf2d588e188b18d8847e17e"
-  integrity sha1-/x7R5hFp0Gs88tWI4YixjYhH4X4=
-
 supports-color@^2.0.0:
   version "2.0.0"
   resolved "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7"
@@ -24169,7 +25309,14 @@ supports-color@^7.0.0, supports-color@^7.1.0:
   dependencies:
     has-flag "^4.0.0"
 
-supports-color@^8.1.0, supports-color@^8.1.1:
+supports-color@^7.2.0:
+  version "7.2.0"
+  resolved "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz#1b7dcdcb32b8138801b3e478ba6a51caa89648da"
+  integrity sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==
+  dependencies:
+    has-flag "^4.0.0"
+
+supports-color@^8.0.0, supports-color@^8.1.0, supports-color@^8.1.1:
   version "8.1.1"
   resolved "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz#cd6fc17e28500cff56c1b86c0a7fd4a54a73005c"
   integrity sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==
@@ -24189,6 +25336,11 @@ svg-parser@^2.0.2:
   resolved "https://registry.npmjs.org/svg-parser/-/svg-parser-2.0.4.tgz#fdc2e29e13951736140b76cb122c8ee6630eb6b5"
   integrity sha512-e4hG1hRwoOdRb37cIMSgzNsxyzKfayW6VOflrwvR+/bzrkyxY/31WkbgnQpgtrNp1SdpJvpUAGTa/ZoiPNDuRQ==
 
+svg-pathdata@^5.0.5:
+  version "5.0.5"
+  resolved "https://registry.npmjs.org/svg-pathdata/-/svg-pathdata-5.0.5.tgz#65e8d765642ba15fe15434444087d082bc526b29"
+  integrity sha512-TAAvLNSE3fEhyl/Da19JWfMAdhSXTYeviXsLSoDT1UM76ADj5ndwAPX1FKQEgB/gFMPavOy6tOqfalXKUiXrow==
+
 svgo@^1.0.0, svgo@^1.2.2:
   version "1.3.2"
   resolved "https://registry.npmjs.org/svgo/-/svgo-1.3.2.tgz#b6dc511c063346c9e415b81e43401145b96d4167"
@@ -24208,20 +25360,21 @@ svgo@^1.0.0, svgo@^1.2.2:
     unquote "~1.1.1"
     util.promisify "~1.0.0"
 
-swagger-client@^3.13.2:
-  version "3.13.2"
-  resolved "https://registry.npmjs.org/swagger-client/-/swagger-client-3.13.2.tgz#df1a1fe92e6db87ab5f76cee6381dcb7da1ad117"
-  integrity sha512-kamtyXtmbZiA2C5YTVqJYgoPJgzqtM5RbeP23Rt/YPYjMArTKZ2fjx1UTsI0aSbws0GluU5pVHiGp8YMciSUfw==
+swagger-client@^3.15.0:
+  version "3.15.0"
+  resolved "https://registry.npmjs.org/swagger-client/-/swagger-client-3.15.0.tgz#ba9de5830a8baf40ec5a867e815fa4588d974fa3"
+  integrity sha512-8Ki4bVbT+bl8hGmy3vR89wktZhVLXKNUk8CoUvfwn7Rq45bZ15c9UQXVr4VU6hP3f9diWJGJs0bKZR9pPOq4ZA==
   dependencies:
     "@babel/runtime-corejs3" "^7.11.2"
     btoa "^1.2.1"
     buffer "^6.0.3"
     cookie "~0.4.1"
-    cross-fetch "^3.0.6"
+    cross-fetch "^3.1.4"
     deep-extend "~0.6.0"
     fast-json-patch "^3.0.0-1"
-    isomorphic-form-data "~2.0.0"
-    js-yaml "^3.14.0"
+    form-data-encoder "^1.0.1"
+    formdata-node "^3.6.2"
+    js-yaml "^4.1.0"
     lodash "^4.17.19"
     qs "^6.9.4"
     querystring-browser "^1.0.4"
@@ -24229,23 +25382,23 @@ swagger-client@^3.13.2:
     url "~0.11.0"
 
 swagger-ui-react@^3.37.2:
-  version "3.48.0"
-  resolved "https://registry.npmjs.org/swagger-ui-react/-/swagger-ui-react-3.48.0.tgz#f53e1b7de5bc2628635a2d832e254043badb3a91"
-  integrity sha512-39cibLdJYeujP5CAzBg+LiNFyIuHomi4Blru/1hyFyiTkFx9yYGvcFpZrKFKq1Me4GSUCQJ1DzUyUMblo+VFcA==
+  version "3.52.0"
+  resolved "https://registry.npmjs.org/swagger-ui-react/-/swagger-ui-react-3.52.0.tgz#edf85fed58d55677fc49807ff7d67e43e2d5bf44"
+  integrity sha512-JBw2Omif7i8pFIW8PHsoHZDXhn1LhiPmzxl6NRYGaoCxKDi+HQAQthvZ3piJbDQ8vS3EjtlVh7lkBn/RtrkPww==
   dependencies:
-    "@babel/runtime-corejs3" "^7.13.17"
-    "@braintree/sanitize-url" "^5.0.0"
+    "@babel/runtime-corejs3" "^7.14.7"
+    "@braintree/sanitize-url" "^5.0.2"
     "@kyleshockey/object-assign-deep" "^0.4.2"
     "@kyleshockey/xml" "^1.0.2"
     base64-js "^1.5.1"
     classnames "^2.3.1"
     css.escape "1.5.1"
     deep-extend "0.6.0"
-    dompurify "^2.2.8"
+    dompurify "^2.2.9"
     ieee754 "^1.2.1"
     immutable "^3.x.x"
     js-file-download "^0.4.12"
-    js-yaml "^3.13.1"
+    js-yaml "=4.1.0"
     lodash "^4.17.21"
     memoizee "^0.4.15"
     prop-types "^15.7.2"
@@ -24264,7 +25417,7 @@ swagger-ui-react@^3.37.2:
     reselect "^4.0.0"
     serialize-error "^8.1.0"
     sha.js "^2.4.11"
-    swagger-client "^3.13.2"
+    swagger-client "^3.15.0"
     url-parse "^1.5.1"
     xml-but-prettier "^1.0.1"
     zenscroll "^4.0.2"
@@ -24324,6 +25477,11 @@ tapable@^1.0.0, tapable@^1.1.3:
   resolved "https://registry.npmjs.org/tapable/-/tapable-1.1.3.tgz#a1fccc06b58db61fd7a45da2da44f5f3a3e67ba2"
   integrity sha512-4WK/bYZmj8xLr+HUCODHGF1ZFzsYffasLUgEiMBY4fgtltdO6B4WJtlSbPaDTLpYTcGVwM2qLnFTICEcNxs3kA==
 
+tapable@^2.0.0, tapable@^2.1.1, tapable@^2.2.0:
+  version "2.2.0"
+  resolved "https://registry.npmjs.org/tapable/-/tapable-2.2.0.tgz#5c373d281d9c672848213d0e037d1c4165ab426b"
+  integrity sha512-FBk4IesMV1rBxX2tfiK8RAmogtWn53puLOQlvO8XuwlgxcYbP4mVPS9Ph4aeamSyyVjOl24aYWAuc8U5kCVwMw==
+
 tar-fs@^2.0.0, tar-fs@^2.1.1:
   version "2.1.1"
   resolved "https://registry.npmjs.org/tar-fs/-/tar-fs-2.1.1.tgz#489a15ab85f1f0befabb370b7de4f9eb5cbe8784"
@@ -24365,22 +25523,22 @@ tar@^2.0.0:
     inherits "2"
 
 tar@^4, tar@^4.4.12, tar@^4.4.2:
-  version "4.4.13"
-  resolved "https://registry.npmjs.org/tar/-/tar-4.4.13.tgz#43b364bc52888d555298637b10d60790254ab525"
-  integrity sha512-w2VwSrBoHa5BsSyH+KxEqeQBAllHhccyMFVHtGtdMpF4W7IRWfZjFiQceJPChOeTsSDVUpER2T8FA93pr0L+QA==
+  version "4.4.19"
+  resolved "https://registry.npmjs.org/tar/-/tar-4.4.19.tgz#2e4d7263df26f2b914dee10c825ab132123742f3"
+  integrity sha512-a20gEsvHnWe0ygBY8JbxoM4w3SJdhc7ZAuxkLqh+nvNQN2IOt0B5lLgM490X5Hl8FF0dl0tOf2ewFYAlIFgzVA==
   dependencies:
-    chownr "^1.1.1"
-    fs-minipass "^1.2.5"
-    minipass "^2.8.6"
-    minizlib "^1.2.1"
-    mkdirp "^0.5.0"
-    safe-buffer "^5.1.2"
-    yallist "^3.0.3"
+    chownr "^1.1.4"
+    fs-minipass "^1.2.7"
+    minipass "^2.9.0"
+    minizlib "^1.3.3"
+    mkdirp "^0.5.5"
+    safe-buffer "^5.2.1"
+    yallist "^3.1.1"
 
-tar@^6.0.1, tar@^6.0.2, tar@^6.0.5, tar@^6.1.0:
-  version "6.1.0"
-  resolved "https://registry.npmjs.org/tar/-/tar-6.1.0.tgz#d1724e9bcc04b977b18d5c573b333a2207229a83"
-  integrity sha512-DUCttfhsnLCjwoDoFcI+B2iJgYa93vBnDUATYEeRx6sntCTdN01VnqsIuTlALXla/LWooNg0yEGeB+Y8WdFxGA==
+tar@^6.0.2, tar@^6.1.0, tar@^6.1.2:
+  version "6.1.11"
+  resolved "https://registry.npmjs.org/tar/-/tar-6.1.11.tgz#6760a38f003afa1b2ffd0ffe9e9abbd0eab3d621"
+  integrity sha512-an/KZQzQUkZCkuoAA64hM92X0Urb6VpRhAFllDzz44U2mcD5scmT3zBc4VgVpkugF580+DQn8eAFSyoQt0tznA==
   dependencies:
     chownr "^2.0.0"
     fs-minipass "^2.0.0"
@@ -24394,14 +25552,12 @@ tarn@^3.0.1:
   resolved "https://registry.npmjs.org/tarn/-/tarn-3.0.1.tgz#ebac2c6dbc6977d34d4526e0a7814200386a8aec"
   integrity sha512-6usSlV9KyHsspvwu2duKH+FMUhqJnAh6J5J/4MITl8s94iSUQTLkJggdiewKv4RyARQccnigV48Z+khiuVZDJw==
 
-teeny-request@^3.11.3:
-  version "3.11.3"
-  resolved "https://registry.npmjs.org/teeny-request/-/teeny-request-3.11.3.tgz#335c629f7645e5d6599362df2f3230c4cbc23a55"
-  integrity sha512-CKncqSF7sH6p4rzCgkb/z/Pcos5efl0DmolzvlqRQUNcpRIruOhY9+T1FsIlyEbfWd7MsFpodROOwHYh2BaXzw==
+tdigest@^0.1.1:
+  version "0.1.1"
+  resolved "https://registry.npmjs.org/tdigest/-/tdigest-0.1.1.tgz#2e3cb2c39ea449e55d1e6cd91117accca4588021"
+  integrity sha1-Ljyyw56kSeVdHmzZEReszKRYgCE=
   dependencies:
-    https-proxy-agent "^2.2.1"
-    node-fetch "^2.2.0"
-    uuid "^3.3.2"
+    bintrees "1.0.1"
 
 teeny-request@^7.0.0:
   version "7.0.1"
@@ -24414,7 +25570,7 @@ teeny-request@^7.0.0:
     stream-events "^1.0.5"
     uuid "^8.0.0"
 
-telejson@^5.0.2, telejson@^5.1.0, telejson@^5.3.2:
+telejson@^5.3.2:
   version "5.3.3"
   resolved "https://registry.npmjs.org/telejson/-/telejson-5.3.3.tgz#fa8ca84543e336576d8734123876a9f02bf41d2e"
   integrity sha512-PjqkJZpzEggA9TBpVtJi1LVptP7tYtXB6rEubwlHap76AMjzvOdKX41CxyaW7ahhzDU1aftXnMCx5kAPDZTQBA==
@@ -24486,22 +25642,34 @@ terser-webpack-plugin@^1.4.3:
     webpack-sources "^1.4.0"
     worker-farm "^1.7.0"
 
-terser-webpack-plugin@^3.0.0:
-  version "3.1.0"
-  resolved "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-3.1.0.tgz#91e6d39571460ed240c0cf69d295bcf30ebf98cb"
-  integrity sha512-cjdZte66fYkZ65rQ2oJfrdCAkkhJA7YLYk5eGOcGCSGlq0ieZupRdjedSQXYknMPo2IveQL+tPdrxUkERENCFA==
+terser-webpack-plugin@^4.2.3:
+  version "4.2.3"
+  resolved "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-4.2.3.tgz#28daef4a83bd17c1db0297070adc07fc8cfc6a9a"
+  integrity sha512-jTgXh40RnvOrLQNgIkwEKnQ8rmHjHK4u+6UBEi+W+FPmvb+uo+chJXntKe7/3lW5mNysgSWD60KyesnhW8D6MQ==
   dependencies:
     cacache "^15.0.5"
     find-cache-dir "^3.3.1"
-    jest-worker "^26.2.1"
+    jest-worker "^26.5.0"
     p-limit "^3.0.2"
-    schema-utils "^2.6.6"
-    serialize-javascript "^4.0.0"
+    schema-utils "^3.0.0"
+    serialize-javascript "^5.0.1"
     source-map "^0.6.1"
-    terser "^4.8.0"
+    terser "^5.3.4"
     webpack-sources "^1.4.3"
 
-terser@^4.1.2, terser@^4.6.3, terser@^4.8.0:
+terser-webpack-plugin@^5.1.3:
+  version "5.1.4"
+  resolved "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.1.4.tgz#c369cf8a47aa9922bd0d8a94fe3d3da11a7678a1"
+  integrity sha512-C2WkFwstHDhVEmsmlCxrXUtVklS+Ir1A7twrYzrDrQQOIMOaVAYykaoo/Aq1K0QRkMoY2hhvDQY1cm4jnIMFwA==
+  dependencies:
+    jest-worker "^27.0.2"
+    p-limit "^3.1.0"
+    schema-utils "^3.0.0"
+    serialize-javascript "^6.0.0"
+    source-map "^0.6.1"
+    terser "^5.7.0"
+
+terser@^4.1.2, terser@^4.6.3:
   version "4.8.0"
   resolved "https://registry.npmjs.org/terser/-/terser-4.8.0.tgz#63056343d7c70bb29f3af665865a46fe03a0df17"
   integrity sha512-EAPipTNeWsb/3wLPeup1tVPaXfIaU68xMnVdPafIL1TV05OhASArYyIfFvnvJCNrR2NIOvDVNNTFRa+Re2MWyw==
@@ -24510,6 +25678,15 @@ terser@^4.1.2, terser@^4.6.3, terser@^4.8.0:
     source-map "~0.6.1"
     source-map-support "~0.5.12"
 
+terser@^5.3.4, terser@^5.3.8, terser@^5.7.0:
+  version "5.7.1"
+  resolved "https://registry.npmjs.org/terser/-/terser-5.7.1.tgz#2dc7a61009b66bb638305cb2a824763b116bf784"
+  integrity sha512-b3e+d5JbHAe/JSjwsC3Zn55wsBIM7AsHLjKxT31kGCldgbpFePaFo+PiddtO6uwRZWRw7sPXmAN8dTW61xmnSg==
+  dependencies:
+    commander "^2.20.0"
+    source-map "~0.7.2"
+    source-map-support "~0.5.19"
+
 test-exclude@^6.0.0:
   version "6.0.0"
   resolved "https://registry.npmjs.org/test-exclude/-/test-exclude-6.0.0.tgz#04a8698661d805ea6fa293b6cb9e63ac044ef15e"
@@ -24553,6 +25730,13 @@ text-hex@1.0.x:
   resolved "https://registry.npmjs.org/text-hex/-/text-hex-1.0.0.tgz#69dc9c1b17446ee79a92bf5b884bb4b9127506f5"
   integrity sha512-uuVGNWzgJ4yhRaNSiubPY7OjISw4sw4E5Uv0wbjp+OzcbmVU/rsT8ujgcXJhn9ypzsgr5vlzpPqP+MBBKcGvbg==
 
+text-segmentation@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.npmjs.org/text-segmentation/-/text-segmentation-1.0.2.tgz#1f828fa14aa101c114ded1bda35ba7dcc17c9858"
+  integrity sha512-uTqvLxdBrVnx/CFQOtnf8tfzSXFm+1Qxau7Xi54j4OPTZokuDOX8qncQzrg2G8ZicAMOM8TgzFAYTb+AqNO4Cw==
+  dependencies:
+    utrie "^1.0.1"
+
 text-table@0.2.0, text-table@^0.2.0:
   version "0.2.0"
   resolved "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4"
@@ -24566,9 +25750,9 @@ thenify-all@^1.0.0:
     thenify ">= 3.1.0 < 4"
 
 "thenify@>= 3.1.0 < 4":
-  version "3.3.0"
-  resolved "https://registry.npmjs.org/thenify/-/thenify-3.3.0.tgz#e69e38a1babe969b0108207978b9f62b88604839"
-  integrity sha1-5p44obq+lpsBCCB5eLn2K4hgSDk=
+  version "3.3.1"
+  resolved "https://registry.npmjs.org/thenify/-/thenify-3.3.1.tgz#8932e686a4066038a016dd9e2ca46add9838a95f"
+  integrity sha512-RVZSIV5IG10Hk3enotrhvz0T9em6cyHBLkH/YAZuKqd8hRkKhSfCGIcP2KUY0EPxndzANBmNllzWPwak+bheSw==
   dependencies:
     any-promise "^1.0.0"
 
@@ -24577,7 +25761,7 @@ throat@^5.0.0:
   resolved "https://registry.npmjs.org/throat/-/throat-5.0.0.tgz#c5199235803aad18754a667d659b5e72ce16764b"
   integrity sha512-fcwX4mndzpLQKBS1DVYhGAcYaYt7vsHNIvQV+WXMvnow5cgjPphq5CaayLaGsjRdSCKZFNGt7/GYAuXaNOiYCA==
 
-throttle-debounce@^2.0.1, throttle-debounce@^2.1.0:
+throttle-debounce@^2.0.1:
   version "2.2.1"
   resolved "https://registry.npmjs.org/throttle-debounce/-/throttle-debounce-2.2.1.tgz#fbd933ae6793448816f7d5b3cae259d464c98137"
   integrity sha512-i9hAVld1f+woAiyNGqWelpDD5W1tpMroL3NofTz9xzwq6acWBlO2dC8k5EFSZepU6oOINtV5Q3aSPoRg7o4+fA==
@@ -24600,14 +25784,6 @@ through2@^2.0.0:
     readable-stream "~2.3.6"
     xtend "~4.0.1"
 
-through2@^3.0.0, through2@^3.0.1:
-  version "3.0.2"
-  resolved "https://registry.npmjs.org/through2/-/through2-3.0.2.tgz#99f88931cfc761ec7678b41d5d7336b5b6a07bf4"
-  integrity sha512-enaDQ4MUyP2W6ZyT6EsMzqBPZaM/avg8iuo+l2d3QCs0J+6RaqkHV/2/lOwDTueBHeJ/2LG9lrLW3d5rWPucuQ==
-  dependencies:
-    inherits "^2.0.4"
-    readable-stream "2 || 3"
-
 through2@^4.0.0:
   version "4.0.2"
   resolved "https://registry.npmjs.org/through2/-/through2-4.0.2.tgz#a7ce3ac2a7a8b0b966c80e7c49f0484c3b239764"
@@ -24670,11 +25846,6 @@ tiny-warning@^1.0.2:
   resolved "https://registry.npmjs.org/tiny-warning/-/tiny-warning-1.0.3.tgz#94a30db453df4c643d0fd566060d60a875d84754"
   integrity sha512-lBN9zLN/oAf68o3zNXYrdCt1kP8WsiGW8Oo2ka41b2IM5JL/S1CTyX1rW0mb/zSuJun0ZUrDxx4sqvYS2FWzPA==
 
-tinycolor2@^1.4.1:
-  version "1.4.1"
-  resolved "https://registry.npmjs.org/tinycolor2/-/tinycolor2-1.4.1.tgz#f4fad333447bc0b07d4dc8e9209d8f39a8ac77e8"
-  integrity sha1-9PrTM0R7wLB9TcjpIJ2POaisd+g=
-
 title-case@^3.0.3:
   version "3.0.3"
   resolved "https://registry.npmjs.org/title-case/-/title-case-3.0.3.tgz#bc689b46f02e411f1d1e1d081f7c3deca0489982"
@@ -24718,11 +25889,6 @@ to-fast-properties@^2.0.0:
   resolved "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz#dc5e698cbd079265bc73e0377681a4e4e83f616e"
   integrity sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4=
 
-to-iso-string@0.0.2:
-  version "0.0.2"
-  resolved "https://registry.npmjs.org/to-iso-string/-/to-iso-string-0.0.2.tgz#4dc19e664dfccbe25bd8db508b00c6da158255d1"
-  integrity sha1-TcGeZk38y+Jb2NtQiwDG2hWCVdE=
-
 to-object-path@^0.3.0:
   version "0.3.0"
   resolved "https://registry.npmjs.org/to-object-path/-/to-object-path-0.3.0.tgz#297588b7b0e7e0ac08e04e672f85c1f4999e17af"
@@ -24770,6 +25936,14 @@ toidentifier@1.0.0:
   resolved "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.0.tgz#7e1be3470f1e77948bc43d94a3c8f4d7752ba553"
   integrity sha512-yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw==
 
+token-types@^4.1.1:
+  version "4.1.1"
+  resolved "https://registry.npmjs.org/token-types/-/token-types-4.1.1.tgz#ef9e8c8e2e0ded9f1b3f8dbaa46a3228b113ba1a"
+  integrity sha512-hD+QyuUAyI2spzsI0B7gf/jJ2ggR4RjkAo37j3StuePhApJUwcWDjnHDOFdIWYSwNR28H14hpwm4EI+V1Ted1w==
+  dependencies:
+    "@tokenizer/token" "^0.3.0"
+    ieee754 "^1.2.1"
+
 toposort@^2.0.2:
   version "2.0.2"
   resolved "https://registry.npmjs.org/toposort/-/toposort-2.0.2.tgz#ae21768175d1559d48bef35420b2f4962f09c330"
@@ -24832,7 +26006,7 @@ tr46@^2.0.2:
   resolved "https://registry.npmjs.org/traverse/-/traverse-0.3.9.tgz#717b8f220cc0bb7b44e40514c22b2e8bbc70d8b9"
   integrity sha1-cXuPIgzAu3tE5AUUwisui7xw2Lk=
 
-traverse@~0.6.6:
+traverse@^0.6.6, traverse@~0.6.6:
   version "0.6.6"
   resolved "https://registry.npmjs.org/traverse/-/traverse-0.6.6.tgz#cbdf560fd7b9af632502fed40f918c157ea97137"
   integrity sha1-y99WD9e5r2MlAv7UD5GMFX6pcTc=
@@ -24857,6 +26031,16 @@ trim-off-newlines@^1.0.0:
   resolved "https://registry.npmjs.org/trim-off-newlines/-/trim-off-newlines-1.0.1.tgz#9f9ba9d9efa8764c387698bcbfeb2c848f11adb3"
   integrity sha1-n5up2e+odkw4dpi8v+sshI8RrbM=
 
+trim-trailing-lines@^1.0.0:
+  version "1.1.4"
+  resolved "https://registry.npmjs.org/trim-trailing-lines/-/trim-trailing-lines-1.1.4.tgz#bd4abbec7cc880462f10b2c8b5ce1d8d1ec7c2c0"
+  integrity sha512-rjUWSqnfTNrjbB9NQWfPMH/xRK1deHeGsHoVfpxJ++XeYXE0d6B1En37AHfw3jtfTU7dzMzZL2jjpe8Qb5gLIQ==
+
+trim@0.0.1:
+  version "0.0.1"
+  resolved "https://registry.npmjs.org/trim/-/trim-0.0.1.tgz#5858547f6b290757ee95cccc666fb50084c460dd"
+  integrity sha1-WFhUf2spB1fulczMZm+1AITEYN0=
+
 triple-beam@^1.2.0, triple-beam@^1.3.0:
   version "1.3.0"
   resolved "https://registry.npmjs.org/triple-beam/-/triple-beam-1.3.0.tgz#a595214c7298db8339eeeee083e4d10bd8cb8dd9"
@@ -24973,7 +26157,7 @@ tslib@^1.10.0, tslib@^1.11.1, tslib@^1.8.1, tslib@^1.9.0, tslib@^1.9.3:
   resolved "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00"
   integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==
 
-tslib@^2, tslib@^2.0.0, tslib@^2.0.1, tslib@^2.0.3, tslib@^2.1.0, tslib@~2.3.0:
+tslib@^2, tslib@^2.0.0, tslib@^2.0.1, tslib@^2.0.3, tslib@^2.1.0, tslib@^2.2.0, tslib@~2.3.0:
   version "2.3.0"
   resolved "https://registry.npmjs.org/tslib/-/tslib-2.3.0.tgz#803b8cdab3e12ba581a4ca41c8839bbb0dacb09e"
   integrity sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg==
@@ -25048,7 +26232,7 @@ type-check@~0.3.2:
   dependencies:
     prelude-ls "~1.1.2"
 
-type-detect@4.0.8:
+type-detect@4.0.8, type-detect@^4.0.8:
   version "4.0.8"
   resolved "https://registry.npmjs.org/type-detect/-/type-detect-4.0.8.tgz#7646fb5f18871cfbb7749e69bd39a6388eb7450c"
   integrity sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==
@@ -25150,7 +26334,7 @@ typescript@^4.0.3, typescript@~4.2.3:
   resolved "https://registry.npmjs.org/typescript/-/typescript-4.2.4.tgz#8610b59747de028fda898a8aef0e103f156d0961"
   integrity sha512-V+evlYHZnQkaz8TRBuxTA92yZBPotr5H+WhQ7bD3hZUndx5tGOa1fuCgeSjxAzM1RiN5IzvadIXTVefuuwZCRg==
 
-typescript@~4.3.2:
+typescript@~4.3.5:
   version "4.3.5"
   resolved "https://registry.npmjs.org/typescript/-/typescript-4.3.5.tgz#4d1c37cc16e893973c45a06886b7113234f119f4"
   integrity sha512-DqQgihaQ9cUrskJo9kIyW/+g0Vxsk8cDtZ52a3NGh0YNTfpUSArXSohyUGnvbPazEPLu398C0UxmKSOrPumUzA==
@@ -25222,10 +26406,18 @@ underscore@^1.12.1, underscore@^1.9.1:
   resolved "https://registry.npmjs.org/underscore/-/underscore-1.13.1.tgz#0c1c6bd2df54b6b69f2314066d65b6cde6fcf9d1"
   integrity sha512-hzSoAVtJF+3ZtiFX0VgfFPHEDRm7Y/QPjGyNo4TVdnDTdft3tr8hEkD25a1jC+TjTuE7tkHGKkhwCgs9dgBB2g==
 
-unfetch@^4.1.0:
-  version "4.1.0"
-  resolved "https://registry.npmjs.org/unfetch/-/unfetch-4.1.0.tgz#6ec2dd0de887e58a4dee83a050ded80ffc4137db"
-  integrity sha512-crP/n3eAPUJxZXM9T80/yv0YhkTEx2K1D3h7D1AJM6fzsWZrxdyRuLN0JH/dkZh1LNH8LxCnBzoPFCPbb2iGpg==
+unfetch@^4.2.0:
+  version "4.2.0"
+  resolved "https://registry.npmjs.org/unfetch/-/unfetch-4.2.0.tgz#7e21b0ef7d363d8d9af0fb929a5555f6ef97a3be"
+  integrity sha512-F9p7yYCn6cIW9El1zi0HI6vqpeIvBsr3dSuRO6Xuppb1u5rXpCPmMvLSyECLhybr9isec8Ohl0hPekMVrEinDA==
+
+unherit@^1.0.4:
+  version "1.1.3"
+  resolved "https://registry.npmjs.org/unherit/-/unherit-1.1.3.tgz#6c9b503f2b41b262330c80e91c8614abdaa69c22"
+  integrity sha512-Ft16BJcnapDKp0+J/rqFC3Rrk6Y/Ng4nzsC028k2jdDII/rdZ7Wd3pPT/6+vIIxRagwRc9K0IUX0Ra4fKvw+WQ==
+  dependencies:
+    inherits "^2.0.0"
+    xtend "^4.0.0"
 
 unicode-canonical-property-names-ecmascript@^1.0.4:
   version "1.0.4"
@@ -25250,7 +26442,7 @@ unicode-property-aliases-ecmascript@^1.0.4:
   resolved "https://registry.npmjs.org/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-1.1.0.tgz#dd57a99f6207bedff4628abefb94c50db941c8f4"
   integrity sha512-PqSoPh/pWetQ2phoj5RLiaqIk4kCNwoV3CI+LfGmWLKI3rE3kl1h59XpX2BjgDrmbxD9ARtQobPGU1SguCYuQg==
 
-unified@^9.0.0:
+unified@9.2.0, unified@^9.0.0:
   version "9.2.0"
   resolved "https://registry.npmjs.org/unified/-/unified-9.2.0.tgz#67a62c627c40589edebbf60f53edfd4d822027f8"
   integrity sha512-vx2Z0vY+a3YoTj8+pttM3tiJHCwY5UFbYdiWrwBEbHmK8pvsPj2rtAX2BFfgXen8T39CJWblWRDT4L5WGXtDdg==
@@ -25296,13 +26488,6 @@ unique-slug@^2.0.0:
   dependencies:
     imurmurhash "^0.1.4"
 
-unique-string@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.npmjs.org/unique-string/-/unique-string-1.0.0.tgz#9e1057cca851abb93398f8b33ae187b99caec11a"
-  integrity sha1-nhBXzKhRq7kzmPizOuGHuZyuwRo=
-  dependencies:
-    crypto-random-string "^1.0.0"
-
 unique-string@^2.0.0:
   version "2.0.0"
   resolved "https://registry.npmjs.org/unique-string/-/unique-string-2.0.0.tgz#39c6451f81afb2749de2b233e3f7c5e8843bd89d"
@@ -25310,11 +26495,40 @@ unique-string@^2.0.0:
   dependencies:
     crypto-random-string "^2.0.0"
 
+unist-builder@2.0.3, unist-builder@^2.0.0:
+  version "2.0.3"
+  resolved "https://registry.npmjs.org/unist-builder/-/unist-builder-2.0.3.tgz#77648711b5d86af0942f334397a33c5e91516436"
+  integrity sha512-f98yt5pnlMWlzP539tPc4grGMsFaQQlP/vM396b00jngsiINumNmsY8rkXjfoi1c6QaM8nQ3vaGDuoKWbe/1Uw==
+
+unist-util-generated@^1.0.0:
+  version "1.1.6"
+  resolved "https://registry.npmjs.org/unist-util-generated/-/unist-util-generated-1.1.6.tgz#5ab51f689e2992a472beb1b35f2ce7ff2f324d4b"
+  integrity sha512-cln2Mm1/CZzN5ttGK7vkoGw+RZ8VcUH6BtGbq98DDtRGquAAOXig1mrBQYelOwMXYS8rK+vZDyyojSjp7JX+Lg==
+
 unist-util-is@^4.0.0:
   version "4.0.3"
   resolved "https://registry.npmjs.org/unist-util-is/-/unist-util-is-4.0.3.tgz#e8b44db55fc20c43752b3346c116344d45d7c91d"
   integrity sha512-bTofCFVx0iQM8Jqb1TBDVRIQW03YkD3p66JOd/aCWuqzlLyUtx1ZAGw/u+Zw+SttKvSVcvTiKYbfrtLoLefykw==
 
+unist-util-position@^3.0.0:
+  version "3.1.0"
+  resolved "https://registry.npmjs.org/unist-util-position/-/unist-util-position-3.1.0.tgz#1c42ee6301f8d52f47d14f62bbdb796571fa2d47"
+  integrity sha512-w+PkwCbYSFw8vpgWD0v7zRCl1FpY3fjDSQ3/N/wNd9Ffa4gPi8+4keqt99N3XW6F99t/mUzp2xAhNmfKWp95QA==
+
+unist-util-remove-position@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.npmjs.org/unist-util-remove-position/-/unist-util-remove-position-2.0.1.tgz#5d19ca79fdba712301999b2b73553ca8f3b352cc"
+  integrity sha512-fDZsLYIe2uT+oGFnuZmy73K6ZxOPG/Qcm+w7jbEjaFcJgbQ6cqjs/eSPzXhsmGpAsWPkqZM9pYjww5QTn3LHMA==
+  dependencies:
+    unist-util-visit "^2.0.0"
+
+unist-util-remove@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.npmjs.org/unist-util-remove/-/unist-util-remove-2.1.0.tgz#b0b4738aa7ee445c402fda9328d604a02d010588"
+  integrity sha512-J8NYPyBm4baYLdCbjmf1bhPu45Cr1MWTm77qd9istEkzWpnN6O9tMsEbB2JhNnBCqGENRqEWomQ+He6au0B27Q==
+  dependencies:
+    unist-util-is "^4.0.0"
+
 unist-util-stringify-position@^2.0.0:
   version "2.0.3"
   resolved "https://registry.npmjs.org/unist-util-stringify-position/-/unist-util-stringify-position-2.0.3.tgz#cce3bfa1cdf85ba7375d1d5b17bdc4cada9bd9da"
@@ -25335,7 +26549,7 @@ unist-util-visit-parents@^3.0.0:
     "@types/unist" "^2.0.0"
     unist-util-is "^4.0.0"
 
-unist-util-visit@^2.0.0:
+unist-util-visit@2.0.3, unist-util-visit@^2.0.0:
   version "2.0.3"
   resolved "https://registry.npmjs.org/unist-util-visit/-/unist-util-visit-2.0.3.tgz#c3703893146df47203bb8a9795af47d7b971208c"
   integrity sha512-iJ4/RczbJMkD0712mGktuGpm/U4By4FfDonL7N/9tATGIF4imikjOuagyMY53tnZq3NP6BcmlrHhEKAfGWjh7Q==
@@ -25480,12 +26694,7 @@ urix@^0.1.0:
   resolved "https://registry.npmjs.org/urix/-/urix-0.1.0.tgz#da937f7a62e21fec1fd18d49b35c2935067a6c72"
   integrity sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI=
 
-url-join@^4.0.0:
-  version "4.0.1"
-  resolved "https://registry.npmjs.org/url-join/-/url-join-4.0.1.tgz#b642e21a2646808ffa178c4c5fda39844e12cde7"
-  integrity sha512-jk1+QP6ZJqyOiuEI9AEWQfju/nB2Pw466kbA0LEZljHwKeMgd9WrAEgEGxjPDD2+TNbbb37rTyhEfrCXfuKXnA==
-
-url-loader@^4.0.0, url-loader@^4.1.0:
+url-loader@^4.1.1:
   version "4.1.1"
   resolved "https://registry.npmjs.org/url-loader/-/url-loader-4.1.1.tgz#28505e905cae158cf07c92ca622d7f237e70a4e2"
   integrity sha512-3BTV812+AVHHOJQO8O5MkWgZ5aosP7GnROJwvzLS9hWDj00lZ6Z0wNak423Lp9PBZN05N+Jk/N5Si8jRAlGyWA==
@@ -25509,6 +26718,11 @@ url-parse@^1.4.3, url-parse@^1.5.1:
     querystringify "^2.1.1"
     requires-port "^1.0.0"
 
+url-value-parser@^2.0.0:
+  version "2.0.3"
+  resolved "https://registry.npmjs.org/url-value-parser/-/url-value-parser-2.0.3.tgz#cd4b8d6754e458d65e8125260c09718d926e6e21"
+  integrity sha512-FjIX+Q9lYmDM9uYIGdMYfQW0uLbWVwN2NrL2ayAI7BTOvEwzH+VoDdNquwB9h4dFAx+u6mb0ONLa3sHD5DvyvA==
+
 url@0.10.3:
   version "0.10.3"
   resolved "https://registry.npmjs.org/url/-/url-0.10.3.tgz#021e4d9c7705f21bbf37d03ceb58767402774c64"
@@ -25603,6 +26817,18 @@ util@^0.11.0:
   dependencies:
     inherits "2.0.3"
 
+util@^0.12.3:
+  version "0.12.3"
+  resolved "https://registry.npmjs.org/util/-/util-0.12.3.tgz#971bb0292d2cc0c892dab7c6a5d37c2bec707888"
+  integrity sha512-I8XkoQwE+fPQEhy9v012V+TSdH2kp9ts29i20TaaDUXsg7x/onePbhFJUExBfv/2ay1ZOp/Vsm3nDlmnFGSAog==
+  dependencies:
+    inherits "^2.0.3"
+    is-arguments "^1.0.4"
+    is-generator-function "^1.0.7"
+    is-typed-array "^1.1.3"
+    safe-buffer "^5.1.2"
+    which-typed-array "^1.1.2"
+
 utila@^0.4.0, utila@~0.4:
   version "0.4.0"
   resolved "https://registry.npmjs.org/utila/-/utila-0.4.0.tgz#8a16a05d445657a3aea5eecc5b12a4fa5379772c"
@@ -25613,6 +26839,13 @@ utils-merge@1.0.1, utils-merge@1.x.x:
   resolved "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz#9f95710f50a267947b2ccc124741c1028427e713"
   integrity sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM=
 
+utrie@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.npmjs.org/utrie/-/utrie-1.0.1.tgz#e155235ebcbddc89ae09261ab6e773ce61401b2f"
+  integrity sha512-JPaDXF3vzgZxfeEwutdGzlrNoVFL5UvZcbO6Qo9D4GoahrieUPoMU8GCpVpR7MQqcKhmShIh8VlbEN3PLM3EBg==
+  dependencies:
+    base64-arraybuffer "^1.0.1"
+
 uuid-browser@^3.1.0:
   version "3.1.0"
   resolved "https://registry.npmjs.org/uuid-browser/-/uuid-browser-3.1.0.tgz#0f05a40aef74f9e5951e20efbf44b11871e56410"
@@ -25738,6 +26971,11 @@ verror@1.10.0, verror@^1.8.1:
     core-util-is "1.0.2"
     extsprintf "^1.2.0"
 
+vfile-location@^3.0.0, vfile-location@^3.2.0:
+  version "3.2.0"
+  resolved "https://registry.npmjs.org/vfile-location/-/vfile-location-3.2.0.tgz#d8e41fbcbd406063669ebf6c33d56ae8721d0f3c"
+  integrity sha512-aLEIZKv/oxuCDZ8lkJGhuhztf/BW4M+iHdCwglA/eWc+vtuRFJj8EtgceYFX4LRjOhCAAiNHsKGssC6onJ+jbA==
+
 vfile-message@^2.0.0:
   version "2.0.4"
   resolved "https://registry.npmjs.org/vfile-message/-/vfile-message-2.0.4.tgz#5b43b88171d409eae58477d13f23dd41d52c371a"
@@ -25786,16 +27024,16 @@ wait-for-expect@^3.0.2:
   resolved "https://registry.npmjs.org/wait-for-expect/-/wait-for-expect-3.0.2.tgz#d2f14b2f7b778c9b82144109c8fa89ceaadaa463"
   integrity sha512-cfS1+DZxuav1aBYbaO/kE06EOS8yRw7qOFoD3XtjTkYvCvh3zUvNST8DXK/nPaeqIzIv3P3kL3lRJn8iwOiSag==
 
-wait-on@5.3.0:
-  version "5.3.0"
-  resolved "https://registry.npmjs.org/wait-on/-/wait-on-5.3.0.tgz#584e17d4b3fe7b46ac2b9f8e5e102c005c2776c7"
-  integrity sha512-DwrHrnTK+/0QFaB9a8Ol5Lna3k7WvUR4jzSKmz0YaPBpuN2sACyiPVKVfj6ejnjcajAcvn3wlbTyMIn9AZouOg==
+wait-on@6.0.0:
+  version "6.0.0"
+  resolved "https://registry.npmjs.org/wait-on/-/wait-on-6.0.0.tgz#7e9bf8e3d7fe2daecbb7a570ac8ca41e9311c7e7"
+  integrity sha512-tnUJr9p5r+bEYXPUdRseolmz5XqJTTj98JgOsfBn7Oz2dxfE2g3zw1jE+Mo8lopM3j3et/Mq1yW7kKX6qw7RVw==
   dependencies:
     axios "^0.21.1"
-    joi "^17.3.0"
+    joi "^17.4.0"
     lodash "^4.17.21"
     minimist "^1.2.5"
-    rxjs "^6.6.3"
+    rxjs "^7.1.0"
 
 walker@^1.0.7, walker@~1.0.5:
   version "1.0.7"
@@ -25829,6 +27067,14 @@ watchpack@^1.7.4:
     chokidar "^3.4.1"
     watchpack-chokidar2 "^2.0.0"
 
+watchpack@^2.2.0:
+  version "2.2.0"
+  resolved "https://registry.npmjs.org/watchpack/-/watchpack-2.2.0.tgz#47d78f5415fe550ecd740f99fe2882323a58b1ce"
+  integrity sha512-up4YAn/XHgZHIxFBVCdlMiWDj6WaLKpwVeGQk2I5thdYxF/KmF0aaz6TfJZ/hfl1h/XlcDr7k1KH7ThDagpFaA==
+  dependencies:
+    glob-to-regexp "^0.4.1"
+    graceful-fs "^4.1.2"
+
 wbuf@^1.1.0, wbuf@^1.7.3:
   version "1.7.3"
   resolved "https://registry.npmjs.org/wbuf/-/wbuf-1.7.3.tgz#c1d8d149316d3ea852848895cb6a0bfe887b87df"
@@ -25843,6 +27089,11 @@ wcwidth@^1.0.0, wcwidth@^1.0.1:
   dependencies:
     defaults "^1.0.3"
 
+web-namespaces@^1.0.0:
+  version "1.1.4"
+  resolved "https://registry.npmjs.org/web-namespaces/-/web-namespaces-1.1.4.tgz#bc98a3de60dadd7faefc403d1076d529f5e030ec"
+  integrity sha512-wYxSGajtmoP4WxfejAPIr4l0fVh+jeMXZb08wNc0tMg6xsfZXj3cECqIK0G7ZAqUq0PP8WlMDtaOGVBTAWztNw==
+
 webidl-conversions@^4.0.2:
   version "4.0.2"
   resolved "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-4.0.2.tgz#a855980b1f0b6b359ba1d5d9fb39ae941faa63ad"
@@ -25858,10 +27109,10 @@ webidl-conversions@^6.1.0:
   resolved "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-6.1.0.tgz#9111b4d7ea80acd40f5270d666621afa78b69514"
   integrity sha512-qBIvFLGiBpLjfwmYAaHPXsn+ho5xZnGvyGvsarywGNc8VyQJUMHJ8OBKGGrPER0okBeMDaan4mNBlgBROxuI8w==
 
-webpack-dev-middleware@^3.7.0, webpack-dev-middleware@^3.7.2:
-  version "3.7.2"
-  resolved "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-3.7.2.tgz#0019c3db716e3fa5cecbf64f2ab88a74bab331f3"
-  integrity sha512-1xC42LxbYoqLNAhV6YzTYacicgMZQTqRd27Sim9wn5hJrX3I5nxYy1SxSd4+gjUFsz1dQFj+yEe6zEVmSkeJjw==
+webpack-dev-middleware@^3.7.3:
+  version "3.7.3"
+  resolved "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-3.7.3.tgz#0639372b143262e2b84ab95d3b91a7597061c2c5"
+  integrity sha512-djelc/zGiz9nZj/U7PTBi2ViorGJXEWo/3ltkPbDyxCXhhEXkW0ce99falaok4TPj+AsxLiXJR0EBOb0zh9fKQ==
   dependencies:
     memory-fs "^0.4.1"
     mime "^2.4.4"
@@ -25869,44 +27120,49 @@ webpack-dev-middleware@^3.7.0, webpack-dev-middleware@^3.7.2:
     range-parser "^1.2.1"
     webpack-log "^2.0.0"
 
-webpack-dev-server@3.11.0:
-  version "3.11.0"
-  resolved "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-3.11.0.tgz#8f154a3bce1bcfd1cc618ef4e703278855e7ff8c"
-  integrity sha512-PUxZ+oSTxogFQgkTtFndEtJIPNmml7ExwufBZ9L2/Xyyd5PnOL5UreWe5ZT7IU25DSdykL9p1MLQzmLh2ljSeg==
+webpack-dev-middleware@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-5.0.0.tgz#0abe825275720e0a339978aea5f0b03b140c1584"
+  integrity sha512-9zng2Z60pm6A98YoRcA0wSxw1EYn7B7y5owX/Tckyt9KGyULTkLtiavjaXlWqOMkM0YtqGgL3PvMOFgyFLq8vw==
   dependencies:
-    ansi-html "0.0.7"
+    colorette "^1.2.2"
+    mem "^8.1.1"
+    memfs "^3.2.2"
+    mime-types "^2.1.31"
+    range-parser "^1.2.1"
+    schema-utils "^3.0.0"
+
+webpack-dev-server@4.0.0-rc.0:
+  version "4.0.0-rc.0"
+  resolved "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-4.0.0-rc.0.tgz#56099f1e1e877d15a1fc28a928f38bbc600e33da"
+  integrity sha512-9S+MywBN/ecr8AbXNVUnmbFji8UTtzLR6M5Dgy6sB5Ti/73UgHn8TMhLaSBZBkY/cmSmWHDSwUXFs8lOeARpOw==
+  dependencies:
+    ansi-html "^0.0.7"
     bonjour "^3.5.0"
-    chokidar "^2.1.8"
+    chokidar "^3.5.1"
     compression "^1.7.4"
     connect-history-api-fallback "^1.6.0"
-    debug "^4.1.1"
-    del "^4.1.1"
+    del "^6.0.0"
     express "^4.17.1"
-    html-entities "^1.3.1"
-    http-proxy-middleware "0.19.1"
-    import-local "^2.0.0"
-    internal-ip "^4.3.0"
-    ip "^1.1.5"
+    graceful-fs "^4.2.6"
+    html-entities "^2.3.2"
+    http-proxy-middleware "^2.0.0"
+    internal-ip "^6.2.0"
+    ipaddr.js "^2.0.1"
     is-absolute-url "^3.0.3"
     killable "^1.0.1"
-    loglevel "^1.6.8"
-    opn "^5.5.0"
-    p-retry "^3.0.1"
-    portfinder "^1.0.26"
-    schema-utils "^1.0.0"
-    selfsigned "^1.10.7"
-    semver "^6.3.0"
+    open "^8.0.9"
+    p-retry "^4.5.0"
+    portfinder "^1.0.28"
+    schema-utils "^3.1.0"
+    selfsigned "^1.10.11"
     serve-index "^1.9.1"
-    sockjs "0.3.20"
-    sockjs-client "1.4.0"
+    sockjs "^0.3.21"
     spdy "^4.0.2"
-    strip-ansi "^3.0.1"
-    supports-color "^6.1.0"
+    strip-ansi "^7.0.0"
     url "^0.11.0"
-    webpack-dev-middleware "^3.7.2"
-    webpack-log "^2.0.0"
-    ws "^6.2.1"
-    yargs "^13.3.2"
+    webpack-dev-middleware "^5.0.0"
+    ws "^7.5.3"
 
 webpack-filter-warnings-plugin@^1.2.1:
   version "1.2.1"
@@ -25944,6 +27200,11 @@ webpack-sources@^1.1.0, webpack-sources@^1.4.0, webpack-sources@^1.4.1, webpack-
     source-list-map "^2.0.0"
     source-map "~0.6.1"
 
+webpack-sources@^3.2.0:
+  version "3.2.0"
+  resolved "https://registry.npmjs.org/webpack-sources/-/webpack-sources-3.2.0.tgz#b16973bcf844ebcdb3afde32eda1c04d0b90f89d"
+  integrity sha512-fahN08Et7P9trej8xz/Z7eRu8ltyiygEo/hnRi9KqBUs80KeDcnf96ZJo++ewWd84fEf3xSX9bp4ZS9hbw0OBw==
+
 webpack-virtual-modules@^0.2.2:
   version "0.2.2"
   resolved "https://registry.npmjs.org/webpack-virtual-modules/-/webpack-virtual-modules-0.2.2.tgz#20863dc3cb6bb2104729fff951fbe14b18bd0299"
@@ -25951,10 +27212,10 @@ webpack-virtual-modules@^0.2.2:
   dependencies:
     debug "^3.0.0"
 
-webpack@^4.41.6, webpack@^4.44.2:
-  version "4.44.2"
-  resolved "https://registry.npmjs.org/webpack/-/webpack-4.44.2.tgz#6bfe2b0af055c8b2d1e90ed2cd9363f841266b72"
-  integrity sha512-6KJVGlCxYdISyurpQ0IPTklv+DULv05rs2hseIXer6D7KrUicRDLFb4IUM1S6LUAKypPM/nSiVSuv8jHu1m3/Q==
+webpack@4:
+  version "4.46.0"
+  resolved "https://registry.npmjs.org/webpack/-/webpack-4.46.0.tgz#bf9b4404ea20a073605e0a011d188d77cb6ad542"
+  integrity sha512-6jJuJjg8znb/xRItk7bkT0+Q7AHCYjjFnvKIWQPkNIOyRqoCGvkOs0ipeQzrqz4l5FtN5ZI/ukEHroeX/o1/5Q==
   dependencies:
     "@webassemblyjs/ast" "1.9.0"
     "@webassemblyjs/helper-module-context" "1.9.0"
@@ -25964,7 +27225,7 @@ webpack@^4.41.6, webpack@^4.44.2:
     ajv "^6.10.2"
     ajv-keywords "^3.4.1"
     chrome-trace-event "^1.0.2"
-    enhanced-resolve "^4.3.0"
+    enhanced-resolve "^4.5.0"
     eslint-scope "^4.0.3"
     json-parse-better-errors "^1.0.2"
     loader-runner "^2.4.0"
@@ -25980,12 +27241,65 @@ webpack@^4.41.6, webpack@^4.44.2:
     watchpack "^1.7.4"
     webpack-sources "^1.4.1"
 
-websocket-driver@0.6.5:
-  version "0.6.5"
-  resolved "https://registry.npmjs.org/websocket-driver/-/websocket-driver-0.6.5.tgz#5cb2556ceb85f4373c6d8238aa691c8454e13a36"
-  integrity sha1-XLJVbOuF9Dc8bYI4qmkchFThOjY=
+webpack@^5, webpack@^5.48.0:
+  version "5.48.0"
+  resolved "https://registry.npmjs.org/webpack/-/webpack-5.48.0.tgz#06180fef9767a6fd066889559a4c4d49bee19b83"
+  integrity sha512-CGe+nfbHrYzbk7SKoYITCgN3LRAG0yVddjNUecz9uugo1QtYdiyrVD8nP1PhkNqPfdxC2hknmmKpP355Epyn6A==
   dependencies:
-    websocket-extensions ">=0.1.1"
+    "@types/eslint-scope" "^3.7.0"
+    "@types/estree" "^0.0.50"
+    "@webassemblyjs/ast" "1.11.1"
+    "@webassemblyjs/wasm-edit" "1.11.1"
+    "@webassemblyjs/wasm-parser" "1.11.1"
+    acorn "^8.4.1"
+    acorn-import-assertions "^1.7.6"
+    browserslist "^4.14.5"
+    chrome-trace-event "^1.0.2"
+    enhanced-resolve "^5.8.0"
+    es-module-lexer "^0.7.1"
+    eslint-scope "5.1.1"
+    events "^3.2.0"
+    glob-to-regexp "^0.4.1"
+    graceful-fs "^4.2.4"
+    json-parse-better-errors "^1.0.2"
+    loader-runner "^4.2.0"
+    mime-types "^2.1.27"
+    neo-async "^2.6.2"
+    schema-utils "^3.1.0"
+    tapable "^2.1.1"
+    terser-webpack-plugin "^5.1.3"
+    watchpack "^2.2.0"
+    webpack-sources "^3.2.0"
+
+webpack@^5.1.0:
+  version "5.49.0"
+  resolved "https://registry.npmjs.org/webpack/-/webpack-5.49.0.tgz#e250362b781a9fb614ba0a97ed67c66b9c5310cd"
+  integrity sha512-XarsANVf28A7Q3KPxSnX80EkCcuOer5hTOEJWJNvbskOZ+EK3pobHarGHceyUZMxpsTHBHhlV7hiQyLZzGosYw==
+  dependencies:
+    "@types/eslint-scope" "^3.7.0"
+    "@types/estree" "^0.0.50"
+    "@webassemblyjs/ast" "1.11.1"
+    "@webassemblyjs/wasm-edit" "1.11.1"
+    "@webassemblyjs/wasm-parser" "1.11.1"
+    acorn "^8.4.1"
+    acorn-import-assertions "^1.7.6"
+    browserslist "^4.14.5"
+    chrome-trace-event "^1.0.2"
+    enhanced-resolve "^5.8.0"
+    es-module-lexer "^0.7.1"
+    eslint-scope "5.1.1"
+    events "^3.2.0"
+    glob-to-regexp "^0.4.1"
+    graceful-fs "^4.2.4"
+    json-parse-better-errors "^1.0.2"
+    loader-runner "^4.2.0"
+    mime-types "^2.1.27"
+    neo-async "^2.6.2"
+    schema-utils "^3.1.0"
+    tapable "^2.1.1"
+    terser-webpack-plugin "^5.1.3"
+    watchpack "^2.2.0"
+    webpack-sources "^3.2.0"
 
 websocket-driver@>=0.5.1:
   version "0.7.3"
@@ -25996,6 +27310,15 @@ websocket-driver@>=0.5.1:
     safe-buffer ">=5.1.0"
     websocket-extensions ">=0.1.1"
 
+websocket-driver@^0.7.4:
+  version "0.7.4"
+  resolved "https://registry.npmjs.org/websocket-driver/-/websocket-driver-0.7.4.tgz#89ad5295bbf64b480abcba31e4953aca706f5760"
+  integrity sha512-b17KeDIQVjvb0ssuSDF2cYXSg2iztliJ4B9WdsuB6J952qCPKmnVq4DyW5motImXHDC1cBT/1UezrJVsKw5zjg==
+  dependencies:
+    http-parser-js ">=0.5.1"
+    safe-buffer ">=5.1.0"
+    websocket-extensions ">=0.1.1"
+
 websocket-extensions@>=0.1.1:
   version "0.1.4"
   resolved "https://registry.npmjs.org/websocket-extensions/-/websocket-extensions-0.1.4.tgz#7f8473bc839dfd87608adb95d7eb075211578a42"
@@ -26071,11 +27394,6 @@ which-module@^2.0.0:
   resolved "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz#d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a"
   integrity sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=
 
-which-pm-runs@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.npmjs.org/which-pm-runs/-/which-pm-runs-1.0.0.tgz#670b3afbc552e0b55df6b7780ca74615f23ad1cb"
-  integrity sha1-Zws6+8VS4LVd9rd4DKdGFfI60cs=
-
 which-pm@2.0.0:
   version "2.0.0"
   resolved "https://registry.npmjs.org/which-pm/-/which-pm-2.0.0.tgz#8245609ecfe64bf751d0eef2f376d83bf1ddb7ae"
@@ -26084,6 +27402,19 @@ which-pm@2.0.0:
     load-yaml-file "^0.2.0"
     path-exists "^4.0.0"
 
+which-typed-array@^1.1.2:
+  version "1.1.4"
+  resolved "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.4.tgz#8fcb7d3ee5adf2d771066fba7cf37e32fe8711ff"
+  integrity sha512-49E0SpUe90cjpoc7BOJwyPHRqSAd12c10Qm2amdEZrJPCY2NDxaW01zHITrem+rnETY3dwrbH3UUrUwagfCYDA==
+  dependencies:
+    available-typed-arrays "^1.0.2"
+    call-bind "^1.0.0"
+    es-abstract "^1.18.0-next.1"
+    foreach "^2.0.5"
+    function-bind "^1.1.1"
+    has-symbols "^1.0.1"
+    is-typed-array "^1.1.3"
+
 which@1, which@^1.2.9, which@^1.3.1:
   version "1.3.1"
   resolved "https://registry.npmjs.org/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a"
@@ -26194,15 +27525,6 @@ wrap-ansi@^3.0.1:
     string-width "^2.1.1"
     strip-ansi "^4.0.0"
 
-wrap-ansi@^5.1.0:
-  version "5.1.0"
-  resolved "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-5.1.0.tgz#1fd1f67235d5b6d0fee781056001bfb694c03b09"
-  integrity sha512-QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q==
-  dependencies:
-    ansi-styles "^3.2.0"
-    string-width "^3.0.0"
-    strip-ansi "^5.0.0"
-
 wrap-ansi@^6.2.0:
   version "6.2.0"
   resolved "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz#e9393ba07102e6c91a3b221478f0257cd2856e53"
@@ -26226,7 +27548,7 @@ wrappy@1:
   resolved "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
   integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=
 
-write-file-atomic@^2.0.0, write-file-atomic@^2.3.0, write-file-atomic@^2.4.2:
+write-file-atomic@^2.3.0, write-file-atomic@^2.4.2:
   version "2.4.3"
   resolved "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-2.4.3.tgz#1fd2e9ae1df3e75b8d8c367443c692d4ca81f481"
   integrity sha512-GaETH5wwsX+GcnzhPgKcKjJ6M2Cq3/iZp1WyY/X1CSqrW+jVNM9Y7D8EC2sM4ZG/V8wZlSniJnCKWPmBYAucRQ==
@@ -26278,40 +27600,45 @@ write-pkg@^4.0.0:
     type-fest "^0.4.1"
     write-json-file "^3.2.0"
 
-ws@7.4.5:
-  version "7.4.5"
-  resolved "https://registry.npmjs.org/ws/-/ws-7.4.5.tgz#a484dd851e9beb6fdb420027e3885e8ce48986c1"
-  integrity sha512-xzyu3hFvomRfXKH8vOFMU3OguG6oOvhXMo3xsGy3xWExqaM2dxBbVxuD99O7m3ZUFMvvscsZDqxfgMaRr/Nr1g==
+ws@7.4.5, ws@^7.4.6:
+  version "7.5.5"
+  resolved "https://registry.npmjs.org/ws/-/ws-7.5.5.tgz#8b4bc4af518cfabd0473ae4f99144287b33eb881"
+  integrity sha512-BAkMFcAzl8as1G/hArkxOxq3G7pjUqQ3gzYbLL0/5zNkph70e+lCoxBGnm6AW1+/aiNeV4fnKqZ8m4GZewmH2w==
 
 ws@^5.2.0:
-  version "5.2.2"
-  resolved "https://registry.npmjs.org/ws/-/ws-5.2.2.tgz#dffef14866b8e8dc9133582514d1befaf96e980f"
-  integrity sha512-jaHFD6PFv6UgoIVda6qZllptQsMlDEJkTQcybzzXDYM1XO9Y8em691FGMPmM46WGyLU4z9KMgQN+qrux/nhlHA==
+  version "5.2.3"
+  resolved "https://registry.npmjs.org/ws/-/ws-5.2.3.tgz#05541053414921bc29c63bee14b8b0dd50b07b3d"
+  integrity sha512-jZArVERrMsKUatIdnLzqvcfydI85dvd/Fp1u/VOpfdDWQ4c9qWXe+VIeAbQ5FrDwciAkr+lzofXLz3Kuf26AOA==
   dependencies:
     async-limiter "~1.0.0"
 
-"ws@^5.2.0 || ^6.0.0 || ^7.0.0", ws@^7.2.3, ws@^7.3.1:
+"ws@^5.2.0 || ^6.0.0 || ^7.0.0":
   version "7.5.0"
   resolved "https://registry.npmjs.org/ws/-/ws-7.5.0.tgz#0033bafea031fb9df041b2026fc72a571ca44691"
   integrity sha512-6ezXvzOZupqKj4jUqbQ9tXuJNo+BR2gU8fFRk3XCP3e0G6WT414u5ELe6Y0vtp7kmSJ3F7YWObSNr1ESsgi4vw==
 
-ws@^6.1.2, ws@^6.2.1:
+ws@^6.1.2:
   version "6.2.1"
   resolved "https://registry.npmjs.org/ws/-/ws-6.2.1.tgz#442fdf0a47ed64f59b6a5d8ff130f4748ed524fb"
   integrity sha512-GIyAXC2cB7LjvpgMt9EKS2ldqr0MTrORaleiOno6TweZ6r3TKtoFQWay/2PceJ3RuBasOHzXNn5Lrw1X0bEjqA==
   dependencies:
     async-limiter "~1.0.0"
 
+ws@^7.2.3, ws@^7.3.1:
+  version "7.3.1"
+  resolved "https://registry.npmjs.org/ws/-/ws-7.3.1.tgz#d0547bf67f7ce4f12a72dfe31262c68d7dc551c8"
+  integrity sha512-D3RuNkynyHmEJIpD2qrgVkc9DQ23OrN/moAwZX4L8DfvszsJxpjQuUq3LMx6HoYji9fbIOBY18XWBsAux1ZZUA==
+
+ws@^7.5.3:
+  version "7.5.3"
+  resolved "https://registry.npmjs.org/ws/-/ws-7.5.3.tgz#160835b63c7d97bfab418fc1b8a9fced2ac01a74"
+  integrity sha512-kQ/dHIzuLrS6Je9+uv81ueZomEwH0qVYstcAQ4/Z93K8zeko9gtAbttJWzoC5ukqXY1PpoouV3+VSOqEAFt5wg==
+
 xcase@^2.0.1:
   version "2.0.1"
   resolved "https://registry.npmjs.org/xcase/-/xcase-2.0.1.tgz#c7fa72caa0f440db78fd5673432038ac984450b9"
   integrity sha1-x/pyyqD0QNt4/VZzQyA4rJhEULk=
 
-xdg-basedir@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.npmjs.org/xdg-basedir/-/xdg-basedir-3.0.0.tgz#496b2cc109eca8dbacfe2dc72b603c17c5870ad4"
-  integrity sha1-SWsswQnsqNus/i3HK2A8F8WHCtQ=
-
 xdg-basedir@^4.0.0:
   version "4.0.0"
   resolved "https://registry.npmjs.org/xdg-basedir/-/xdg-basedir-4.0.0.tgz#4bc8d9984403696225ef83a1573cbbcb4e79db13"
@@ -26324,23 +27651,23 @@ xml-but-prettier@^1.0.1:
   dependencies:
     repeat-string "^1.5.2"
 
-xml-crypto@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.npmjs.org/xml-crypto/-/xml-crypto-2.0.0.tgz#54cd268ad9d31930afcf7092cbb664258ca9e826"
-  integrity sha512-/a04qr7RpONRZHOxROZ6iIHItdsQQjN3sj8lJkYDDss8tAkEaAs0VrFjb3tlhmS5snQru5lTs9/5ISSMdPDHlg==
+xml-crypto@^2.1.3:
+  version "2.1.3"
+  resolved "https://registry.npmjs.org/xml-crypto/-/xml-crypto-2.1.3.tgz#6a7272b610ea3e4ea7f13e9e4876f1b20cbc32c8"
+  integrity sha512-MpXZwnn9JK0mNPZ5mnFIbNnQa+8lMGK4NtnX2FlJMfMWR60sJdFO9X72yO6ji068pxixzk53O7x0/iSKh6IhyQ==
   dependencies:
-    xmldom "0.1.27"
-    xpath "0.0.27"
+    "@xmldom/xmldom" "^0.7.0"
+    xpath "0.0.32"
 
-xml-encryption@1.2.1:
-  version "1.2.1"
-  resolved "https://registry.npmjs.org/xml-encryption/-/xml-encryption-1.2.1.tgz#e6d18817c4309fd07ca7793cca93c3fd06745baa"
-  integrity sha512-hn5w3l5p2+nGjlmM0CAhMChDzVGhW+M37jH35Z+GJIipXbn9PUlAIRZ6I5Wm7ynlqZjFrMAr83d/CIp9VZJMTA==
+xml-encryption@^1.3.0:
+  version "1.3.0"
+  resolved "https://registry.npmjs.org/xml-encryption/-/xml-encryption-1.3.0.tgz#4cad44a59bf8bdec76d7865ce0b89e13c09962f4"
+  integrity sha512-3P8C4egMMxSR1BmsRM+fG16a3WzOuUEQKS2U4c3AZ5v7OseIfdUeVkD8dwxIhuLryFZSRWUL5OP6oqkgU7hguA==
   dependencies:
+    "@xmldom/xmldom" "^0.7.0"
     escape-html "^1.0.3"
     node-forge "^0.10.0"
-    xmldom "~0.1.15"
-    xpath "0.0.27"
+    xpath "0.0.32"
 
 xml-name-validator@^3.0.0:
   version "3.0.0"
@@ -26383,30 +27710,15 @@ xmlchars@^2.2.0:
   resolved "https://registry.npmjs.org/xmlchars/-/xmlchars-2.2.0.tgz#060fe1bcb7f9c76fe2a17db86a9bc3ab894210cb"
   integrity sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw==
 
-xmldom@0.1.27:
-  version "0.1.27"
-  resolved "https://registry.npmjs.org/xmldom/-/xmldom-0.1.27.tgz#d501f97b3bdb403af8ef9ecc20573187aadac0e9"
-  integrity sha1-1QH5ezvbQDr4757MIFcxh6rawOk=
-
-xmldom@0.4.x:
-  version "0.4.0"
-  resolved "https://registry.npmjs.org/xmldom/-/xmldom-0.4.0.tgz#8771e482a333af44587e30ce026f0998c23f3830"
-  integrity sha512-2E93k08T30Ugs+34HBSTQLVtpi6mCddaY8uO+pMNk1pqSjV5vElzn4mmh6KLxN3hki8rNcHSYzILoh3TEWORvA==
-
 xmldom@^0.6.0:
   version "0.6.0"
   resolved "https://registry.npmjs.org/xmldom/-/xmldom-0.6.0.tgz#43a96ecb8beece991cef382c08397d82d4d0c46f"
   integrity sha512-iAcin401y58LckRZ0TkI4k0VSM1Qg0KGSc3i8rU+xrxe19A/BN1zHyVSJY7uoutVlaTSzYyk/v5AmkewAP7jtg==
 
-xmldom@~0.1.15:
-  version "0.1.31"
-  resolved "https://registry.npmjs.org/xmldom/-/xmldom-0.1.31.tgz#b76c9a1bd9f0a9737e5a72dc37231cf38375e2ff"
-  integrity sha512-yS2uJflVQs6n+CyjHoaBmVSqIDevTAWrzMmjG1Gc7h1qQ7uVozNhEPJAwZXWyGQ/Gafo3fCwrcaokezLPupVyQ==
-
-xpath@0.0.27:
-  version "0.0.27"
-  resolved "https://registry.npmjs.org/xpath/-/xpath-0.0.27.tgz#dd3421fbdcc5646ac32c48531b4d7e9d0c2cfa92"
-  integrity sha512-fg03WRxtkCV6ohClePNAECYsmpKKTv5L8y/X3Dn1hQrec3POx2jHZ/0P2qQ6HvsrU1BmeqXcof3NGGueG6LxwQ==
+xpath@0.0.32:
+  version "0.0.32"
+  resolved "https://registry.npmjs.org/xpath/-/xpath-0.0.32.tgz#1b73d3351af736e17ec078d6da4b8175405c48af"
+  integrity sha512-rxMJhSIoiO8vXcWvSifKqhvV96GjiD5wYb8/QHdoRyQvraTpp4IEv944nhGausZZ3u7dhQXteZuZbaqfpB7uYw==
 
 xss@^1.0.8:
   version "1.0.9"
@@ -26427,21 +27739,21 @@ y18n@^3.2.1:
   integrity sha512-uGZHXkHnhF0XeeAPgnKfPv1bgKAYyVvmNL1xlKsPYZPaIHxGti2hHqvOCQv71XMsLxu1QjergkqogUnms5D3YQ==
 
 y18n@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.npmjs.org/y18n/-/y18n-4.0.0.tgz#95ef94f85ecc81d007c264e190a120f0a3c8566b"
-  integrity sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==
+  version "4.0.3"
+  resolved "https://registry.npmjs.org/y18n/-/y18n-4.0.3.tgz#b5f259c82cd6e336921efd7bfd8bf560de9eeedf"
+  integrity sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ==
 
 y18n@^5.0.5:
-  version "5.0.5"
-  resolved "https://registry.npmjs.org/y18n/-/y18n-5.0.5.tgz#8769ec08d03b1ea2df2500acef561743bbb9ab18"
-  integrity sha512-hsRUr4FFrvhhRH12wOdfs38Gy7k2FFzB9qgN9v3aLykRq0dRcdcpz5C9FxdS2NuhOrI/628b/KSTJ3rwHysYSg==
+  version "5.0.8"
+  resolved "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz#7f4934d0f7ca8c56f95314939ddcd2dd91ce1d55"
+  integrity sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==
 
 yallist@^2.1.2:
   version "2.1.2"
   resolved "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz#1c11f9218f076089a47dd512f93c6699a6a81d52"
   integrity sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=
 
-yallist@^3.0.0, yallist@^3.0.2, yallist@^3.0.3:
+yallist@^3.0.0, yallist@^3.0.2, yallist@^3.1.1:
   version "3.1.1"
   resolved "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz#dbb7daf9bfd8bac9ab45ebf602b8cbad0d5d08fd"
   integrity sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==
@@ -26473,14 +27785,6 @@ yargs-parser@20.2.4, yargs-parser@^20.2.2, yargs-parser@^20.2.3:
   resolved "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.4.tgz#b42890f14566796f85ae8e3a25290d205f154a54"
   integrity sha512-WOkpgNhPTlE73h4VFAFsOnomJVaovO8VqLDzy5saChRBFQFBoMYirowyW+Q9HB4HFF4Z7VZTiG3iSzJJA29yRA==
 
-yargs-parser@^13.1.2:
-  version "13.1.2"
-  resolved "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.1.2.tgz#130f09702ebaeef2650d54ce6e3e5706f7a4fb38"
-  integrity sha512-3lbsNRf/j+A4QuSZfDRA7HRSfWrzO0YjqTJd5kjAq37Zep1CEgaYmrH9Q3GwPiB9cHyd1Y1UwggGhJGoxipbzg==
-  dependencies:
-    camelcase "^5.0.0"
-    decamelize "^1.2.0"
-
 yargs-parser@^18.1.2, yargs-parser@^18.1.3:
   version "18.1.3"
   resolved "https://registry.npmjs.org/yargs-parser/-/yargs-parser-18.1.3.tgz#be68c4975c6b2abf469236b0c870362fab09a7b0"
@@ -26497,22 +27801,6 @@ yargs-parser@^3.2.0:
     camelcase "^3.0.0"
     lodash.assign "^4.1.0"
 
-yargs@^13.3.2:
-  version "13.3.2"
-  resolved "https://registry.npmjs.org/yargs/-/yargs-13.3.2.tgz#ad7ffefec1aa59565ac915f82dccb38a9c31a2dd"
-  integrity sha512-AX3Zw5iPruN5ie6xGRIDgqkT+ZhnRlZMLMHAs8tg7nRruy2Nb+i5o9bwghAogtM08q1dpr2LVoS8KSTMYpWXUw==
-  dependencies:
-    cliui "^5.0.0"
-    find-up "^3.0.0"
-    get-caller-file "^2.0.1"
-    require-directory "^2.1.1"
-    require-main-filename "^2.0.0"
-    set-blocking "^2.0.0"
-    string-width "^3.0.0"
-    which-module "^2.0.0"
-    y18n "^4.0.0"
-    yargs-parser "^13.1.2"
-
 yargs@^15.1.0, yargs@^15.3.1, yargs@^15.4.1:
   version "15.4.1"
   resolved "https://registry.npmjs.org/yargs/-/yargs-15.4.1.tgz#0d87a16de01aee9d8bec2bfbf74f67851730f4f8"