diff --git a/docs/PULL_REQUEST_TEMPLATE.md b/docs/PULL_REQUEST_TEMPLATE.md
index 0e605925df5..e7cb34aec3f 100644
--- a/docs/PULL_REQUEST_TEMPLATE.md
+++ b/docs/PULL_REQUEST_TEMPLATE.md
@@ -6,6 +6,9 @@ List any change relevant to the reviewer.
 - ...
 - ...
 
+## Target release date 🗓️
+Please specify a release date to guarantee timely review of this PR. If exact date is not known, please approximate and update it as needed.
+
 ## Preview 📷
 **Include a screenshot or screen recording of the change**
 
@@ -27,7 +30,7 @@ List any change relevant to the reviewer.
 - ...
 - ...
 
-### Verification steps 
+### Verification steps
 (How to verify changes)
 - ...
 - ...
diff --git a/docs/development-guide/05-fetching-data.md b/docs/development-guide/05-fetching-data.md
index 5d44295ad67..ec26c115cbd 100644
--- a/docs/development-guide/05-fetching-data.md
+++ b/docs/development-guide/05-fetching-data.md
@@ -132,11 +132,11 @@ const UsernameDisplay = () => {
 ## When to use React Query or an api-v4 method directly
 
 Because **api-v4** methods don't commit data to a cache, it is acceptable to use **api-v4** methods directly
-when performing ***one-time actions*** that do not require any immediate state change in Cloud Manager's UI. 
+when performing ***one-time actions*** that do not require any immediate state change in Cloud Manager's UI.
 
 While use of **api-v4** methods directly are acceptable, use of **React Query** Queries or Mutations are **still prefered** for the benefits described above.
 
-A minimal example of accepable direct **api-v4** use: 
+A minimal example of acceptable direct **api-v4** use:
 
 ```ts
 resetKubeConfig({ id }).then(() => {
@@ -229,3 +229,8 @@ console.log(errorMap);
   none: 'a linode_id error or similar'
 }
 ```
+
+### Toast / Event Message Punctuation
+**Best practice:**
+- If a message is a sentence or a sentence fragment with a subject and a verb, add punctuation. Otherwise, leave punctuation off.
+- If a developer notices inconsistencies within files they are already working in, they can progressively fix them. In this case, be prepared to fix any Cypress test failures.
\ No newline at end of file
diff --git a/docs/development-guide/08-testing.md b/docs/development-guide/08-testing.md
index 91df0ddcad1..caf87e86060 100644
--- a/docs/development-guide/08-testing.md
+++ b/docs/development-guide/08-testing.md
@@ -45,7 +45,7 @@ Test execution will stop at the debugger statement, and you will be able to use
 
 ### React Testing Library
 
-We have some older tests that still use the Enzyme framework, but for new tests we generally use [React Testing Library](https://testing-library.com/docs/react-testing-library/intro). This library provides a set of tools to render React components from within the Vitest environment. The library's philosophy is that components should be tested as closely as possible to how they are used.
+This library provides a set of tools to render React components from within the Vitest environment. The library's philosophy is that components should be tested as closely as possible to how they are used.
 
 A simple test using this library will look something like this:
 
diff --git a/package.json b/package.json
index 67848f39cb2..9ed95835e54 100644
--- a/package.json
+++ b/package.json
@@ -23,7 +23,7 @@
     "build:sdk": "yarn workspace @linode/api-v4 build",
     "build:validation": "yarn workspace @linode/validation build",
     "build": "yarn build:validation && yarn build:sdk && yarn workspace linode-manager build",
-    "build:analyze": "yarn build --bundle-analyze",
+    "build:analyze": "yarn workspace linode-manager build:analyze",
     "up": "yarn install:all && yarn build:validation && yarn build:sdk && yarn start:all",
     "up:expose": "yarn install:all && yarn build:validation && yarn build:sdk && yarn start:all:expose",
     "dev": "yarn install:all && yarn start:all",
diff --git a/packages/api-v4/CHANGELOG.md b/packages/api-v4/CHANGELOG.md
index e2c188b5c88..7e09e127e93 100644
--- a/packages/api-v4/CHANGELOG.md
+++ b/packages/api-v4/CHANGELOG.md
@@ -1,5 +1,10 @@
-## [2024-02-05] - v0.109.0
+## [2024-02-20] - v0.110.0
+
+### Upcoming Features:
 
+- Update /account and /profile UserType from `null` to `"default"` ([#10176](https://github.com/linode/manager/pull/10176))
+
+## [2024-02-05] - v0.109.0
 
 ### Fixed:
 
@@ -13,7 +18,6 @@
 
 ## [2024-01-22] - v0.108.0
 
-
 ### Added:
 
 - AGLB endpoint health endpoints ([#10008](https://github.com/linode/manager/pull/10008))
@@ -25,10 +29,9 @@
 
 ## [2024-01-08] - v0.107.0
 
-
 ### Added:
 
--  Optional `headers` to `getProfile` function ([#9987](https://github.com/linode/manager/pull/9987))
+- Optional `headers` to `getProfile` function ([#9987](https://github.com/linode/manager/pull/9987))
 
 ### Tech Stories:
 
@@ -36,7 +39,6 @@
 
 ## [2023-12-11] - v0.106.0
 
-
 ### Added:
 
 - Beta flag DC Get Well endpoints ([#9904](https://github.com/linode/manager/pull/9904))
@@ -55,7 +57,6 @@
 
 ## [2023-11-13] - v0.105.0
 
-
 ### Upcoming Features:
 
 - Add `UpdateConfigurationPayload` ([#9853](https://github.com/linode/manager/pull/9853))
diff --git a/packages/api-v4/package.json b/packages/api-v4/package.json
index a96528a1c27..4d5475a0cfe 100644
--- a/packages/api-v4/package.json
+++ b/packages/api-v4/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@linode/api-v4",
-  "version": "0.109.0",
+  "version": "0.110.0",
   "homepage": "https://github.com/linode/manager/tree/develop/packages/api-v4",
   "bugs": {
     "url": "https://github.com/linode/manager/issues"
diff --git a/packages/api-v4/src/account/types.ts b/packages/api-v4/src/account/types.ts
index 6ad2d55d9a7..3800001d242 100644
--- a/packages/api-v4/src/account/types.ts
+++ b/packages/api-v4/src/account/types.ts
@@ -1,7 +1,7 @@
 import type { APIWarning, RequestOptions } from '../types';
 import type { Capabilities, Region } from '../regions';
 
-export type UserType = 'child' | 'parent' | 'proxy';
+export type UserType = 'child' | 'parent' | 'proxy' | 'default';
 
 export interface User {
   email: string;
@@ -30,7 +30,7 @@ export interface User {
   ssh_keys: string[];
   tfa_enabled: boolean;
   username: string;
-  user_type: UserType | null;
+  user_type: UserType;
   verified_phone_number: string | null;
 }
 
@@ -71,6 +71,7 @@ export type AccountCapability =
   | 'NodeBalancers'
   | 'Object Storage Access Key Regions'
   | 'Object Storage'
+  | 'Placement Group'
   | 'Vlans'
   | 'VPCs';
 
diff --git a/packages/api-v4/src/aglb/certificates.ts b/packages/api-v4/src/aclb/certificates.ts
similarity index 88%
rename from packages/api-v4/src/aglb/certificates.ts
rename to packages/api-v4/src/aclb/certificates.ts
index 10a9538687b..38af6d3f0a9 100644
--- a/packages/api-v4/src/aglb/certificates.ts
+++ b/packages/api-v4/src/aclb/certificates.ts
@@ -29,7 +29,7 @@ export const getLoadbalancerCertificates = (
 ) =>
   Request<ResourcePage<Certificate>>(
     setURL(
-      `${BETA_API_ROOT}/aglb/${encodeURIComponent(loadbalancerId)}/certificates`
+      `${BETA_API_ROOT}/aclb/${encodeURIComponent(loadbalancerId)}/certificates`
     ),
     setMethod('GET'),
     setParams(params),
@@ -47,7 +47,7 @@ export const getLoadbalancerCertificate = (
 ) =>
   Request<Certificate>(
     setURL(
-      `${BETA_API_ROOT}/aglb/${encodeURIComponent(
+      `${BETA_API_ROOT}/aclb/${encodeURIComponent(
         loadbalancerId
       )}/certificates/${encodeURIComponent(certificateId)}`
     ),
@@ -65,7 +65,7 @@ export const createLoadbalancerCertificate = (
 ) =>
   Request<Certificate>(
     setURL(
-      `${BETA_API_ROOT}/aglb/${encodeURIComponent(loadbalancerId)}/certificates`
+      `${BETA_API_ROOT}/aclb/${encodeURIComponent(loadbalancerId)}/certificates`
     ),
     setMethod('POST'),
     setData(data, CreateCertificateSchema)
@@ -83,7 +83,7 @@ export const updateLoadbalancerCertificate = (
 ) =>
   Request<Certificate>(
     setURL(
-      `${BETA_API_ROOT}/aglb/${encodeURIComponent(
+      `${BETA_API_ROOT}/aclb/${encodeURIComponent(
         loadbalancerId
       )}/certificates/${encodeURIComponent(certificateId)}`
     ),
@@ -102,7 +102,7 @@ export const deleteLoadbalancerCertificate = (
 ) =>
   Request<{}>(
     setURL(
-      `${BETA_API_ROOT}/aglb/${encodeURIComponent(
+      `${BETA_API_ROOT}/aclb/${encodeURIComponent(
         loadbalancerId
       )}/certificates/${encodeURIComponent(certificateId)}`
     ),
diff --git a/packages/api-v4/src/aglb/configurations.ts b/packages/api-v4/src/aclb/configurations.ts
similarity index 90%
rename from packages/api-v4/src/aglb/configurations.ts
rename to packages/api-v4/src/aclb/configurations.ts
index 82feaa83afc..8fe0d9ca30b 100644
--- a/packages/api-v4/src/aglb/configurations.ts
+++ b/packages/api-v4/src/aclb/configurations.ts
@@ -30,7 +30,7 @@ export const getLoadbalancerConfigurations = (
 ) =>
   Request<ResourcePage<Configuration>>(
     setURL(
-      `${BETA_API_ROOT}/aglb/${encodeURIComponent(
+      `${BETA_API_ROOT}/aclb/${encodeURIComponent(
         loadbalancerId
       )}/configurations`
     ),
@@ -50,7 +50,7 @@ export const getLoadbalancerConfiguration = (
 ) =>
   Request<Configuration>(
     setURL(
-      `${BETA_API_ROOT}/aglb/${encodeURIComponent(
+      `${BETA_API_ROOT}/aclb/${encodeURIComponent(
         loadbalancerId
       )}/configurations/${encodeURIComponent(configurationId)}`
     ),
@@ -67,7 +67,7 @@ export const getLoadbalancerConfigurationsEndpointHealth = (
 ) =>
   Request<ConfigurationsEndpointHealth>(
     setURL(
-      `${BETA_API_ROOT}/aglb/${encodeURIComponent(
+      `${BETA_API_ROOT}/aclb/${encodeURIComponent(
         loadbalancerId
       )}/configurations/endpoints-health`
     ),
@@ -85,7 +85,7 @@ export const createLoadbalancerConfiguration = (
 ) =>
   Request<Configuration>(
     setURL(
-      `${BETA_API_ROOT}/aglb/${encodeURIComponent(
+      `${BETA_API_ROOT}/aclb/${encodeURIComponent(
         loadbalancerId
       )}/configurations`
     ),
@@ -105,7 +105,7 @@ export const updateLoadbalancerConfiguration = (
 ) =>
   Request<Configuration>(
     setURL(
-      `${BETA_API_ROOT}/aglb/${encodeURIComponent(
+      `${BETA_API_ROOT}/aclb/${encodeURIComponent(
         loadbalancerId
       )}/configurations/${encodeURIComponent(configurationId)}`
     ),
@@ -124,7 +124,7 @@ export const deleteLoadbalancerConfiguration = (
 ) =>
   Request<{}>(
     setURL(
-      `${BETA_API_ROOT}/aglb/${encodeURIComponent(
+      `${BETA_API_ROOT}/aclb/${encodeURIComponent(
         loadbalancerId
       )}/configurations/${encodeURIComponent(configurationId)}`
     ),
diff --git a/packages/api-v4/src/aglb/index.ts b/packages/api-v4/src/aclb/index.ts
similarity index 100%
rename from packages/api-v4/src/aglb/index.ts
rename to packages/api-v4/src/aclb/index.ts
diff --git a/packages/api-v4/src/aglb/loadbalancers.ts b/packages/api-v4/src/aclb/loadbalancers.ts
similarity index 84%
rename from packages/api-v4/src/aglb/loadbalancers.ts
rename to packages/api-v4/src/aclb/loadbalancers.ts
index 56a50288acd..2176bb3e7e5 100644
--- a/packages/api-v4/src/aglb/loadbalancers.ts
+++ b/packages/api-v4/src/aclb/loadbalancers.ts
@@ -23,7 +23,7 @@ import { CreateBasicLoadbalancerSchema } from '@linode/validation';
  */
 export const getLoadbalancers = (params?: Params, filter?: Filter) =>
   Request<ResourcePage<Loadbalancer>>(
-    setURL(`${BETA_API_ROOT}/aglb`),
+    setURL(`${BETA_API_ROOT}/aclb`),
     setMethod('GET'),
     setParams(params),
     setXFilter(filter)
@@ -36,7 +36,7 @@ export const getLoadbalancers = (params?: Params, filter?: Filter) =>
  */
 export const getLoadbalancer = (id: number) =>
   Request<Loadbalancer>(
-    setURL(`${BETA_API_ROOT}/aglb/${encodeURIComponent(id)}`),
+    setURL(`${BETA_API_ROOT}/aclb/${encodeURIComponent(id)}`),
     setMethod('GET')
   );
 
@@ -47,7 +47,7 @@ export const getLoadbalancer = (id: number) =>
  */
 export const getLoadbalancerEndpointHealth = (id: number) =>
   Request<LoadBalancerEndpointHealth>(
-    setURL(`${BETA_API_ROOT}/aglb/${encodeURIComponent(id)}/endpoints-health`),
+    setURL(`${BETA_API_ROOT}/aclb/${encodeURIComponent(id)}/endpoints-health`),
     setMethod('GET')
   );
 
@@ -58,7 +58,7 @@ export const getLoadbalancerEndpointHealth = (id: number) =>
  */
 export const createLoadbalancer = (data: CreateLoadbalancerPayload) =>
   Request<Loadbalancer>(
-    setURL(`${BETA_API_ROOT}/aglb`),
+    setURL(`${BETA_API_ROOT}/aclb`),
     setData(data),
     setMethod('POST')
   );
@@ -70,7 +70,7 @@ export const createLoadbalancer = (data: CreateLoadbalancerPayload) =>
  */
 export const createBasicLoadbalancer = (data: CreateBasicLoadbalancerPayload) =>
   Request<Loadbalancer>(
-    setURL(`${BETA_API_ROOT}/aglb`),
+    setURL(`${BETA_API_ROOT}/aclb`),
     setData(data, CreateBasicLoadbalancerSchema),
     setMethod('POST')
   );
@@ -85,7 +85,7 @@ export const updateLoadbalancer = (
   data: UpdateLoadbalancerPayload
 ) =>
   Request<Loadbalancer>(
-    setURL(`${BETA_API_ROOT}/aglb/${encodeURIComponent(id)}`),
+    setURL(`${BETA_API_ROOT}/aclb/${encodeURIComponent(id)}`),
     setData(data),
     setMethod('PUT')
   );
@@ -97,6 +97,6 @@ export const updateLoadbalancer = (
  */
 export const deleteLoadbalancer = (id: number) =>
   Request<{}>(
-    setURL(`${BETA_API_ROOT}/aglb/${encodeURIComponent(id)}`),
+    setURL(`${BETA_API_ROOT}/aclb/${encodeURIComponent(id)}`),
     setMethod('DELETE')
   );
diff --git a/packages/api-v4/src/aglb/routes.ts b/packages/api-v4/src/aclb/routes.ts
similarity index 87%
rename from packages/api-v4/src/aglb/routes.ts
rename to packages/api-v4/src/aclb/routes.ts
index 0fcb196b0a5..91a7aa42686 100644
--- a/packages/api-v4/src/aglb/routes.ts
+++ b/packages/api-v4/src/aclb/routes.ts
@@ -22,7 +22,7 @@ export const getLoadbalancerRoutes = (
 ) =>
   Request<ResourcePage<Route>>(
     setURL(
-      `${BETA_API_ROOT}/aglb/${encodeURIComponent(loadbalancerId)}/routes`
+      `${BETA_API_ROOT}/aclb/${encodeURIComponent(loadbalancerId)}/routes`
     ),
     setMethod('GET'),
     setParams(params),
@@ -37,7 +37,7 @@ export const getLoadbalancerRoutes = (
 export const getLoadbalancerRoute = (loadbalancerId: number, routeId: number) =>
   Request<Route>(
     setURL(
-      `${BETA_API_ROOT}/aglb/${encodeURIComponent(
+      `${BETA_API_ROOT}/aclb/${encodeURIComponent(
         loadbalancerId
       )}/routes/${encodeURIComponent(routeId)}`
     ),
@@ -55,7 +55,7 @@ export const createLoadbalancerRoute = (
 ) =>
   Request<Route>(
     setURL(
-      `${BETA_API_ROOT}/aglb/${encodeURIComponent(loadbalancerId)}/routes`
+      `${BETA_API_ROOT}/aclb/${encodeURIComponent(loadbalancerId)}/routes`
     ),
     setData(data, CreateRouteSchema),
     setMethod('POST')
@@ -73,7 +73,7 @@ export const updateLoadbalancerRoute = (
 ) =>
   Request<Route>(
     setURL(
-      `${BETA_API_ROOT}/aglb/${encodeURIComponent(
+      `${BETA_API_ROOT}/aclb/${encodeURIComponent(
         loadbalancerId
       )}/routes/${encodeURIComponent(routeId)}`
     ),
@@ -92,7 +92,7 @@ export const deleteLoadbalancerRoute = (
 ) =>
   Request<{}>(
     setURL(
-      `${BETA_API_ROOT}/aglb/${encodeURIComponent(
+      `${BETA_API_ROOT}/aclb/${encodeURIComponent(
         loadbalancerId
       )}/routes/${encodeURIComponent(routeId)}`
     ),
diff --git a/packages/api-v4/src/aglb/service-targets.ts b/packages/api-v4/src/aclb/service-targets.ts
similarity index 89%
rename from packages/api-v4/src/aglb/service-targets.ts
rename to packages/api-v4/src/aclb/service-targets.ts
index c8caddf0cfe..40ef68a8939 100644
--- a/packages/api-v4/src/aglb/service-targets.ts
+++ b/packages/api-v4/src/aclb/service-targets.ts
@@ -29,7 +29,7 @@ export const getLoadbalancerServiceTargets = (
 ) =>
   Request<ResourcePage<ServiceTarget>>(
     setURL(
-      `${BETA_API_ROOT}/aglb/${encodeURIComponent(
+      `${BETA_API_ROOT}/aclb/${encodeURIComponent(
         loadbalancerId
       )}/service-targets`
     ),
@@ -49,7 +49,7 @@ export const getServiceTarget = (
 ) =>
   Request<ServiceTarget>(
     setURL(
-      `${BETA_API_ROOT}/aglb/${encodeURIComponent(
+      `${BETA_API_ROOT}/aclb/${encodeURIComponent(
         loadbalancerId
       )}/service-targets/${encodeURIComponent(serviceTargetId)}`
     ),
@@ -64,7 +64,7 @@ export const getServiceTarget = (
 export const getServiceTargetsEndpointHealth = (loadbalancerId: number) =>
   Request<ServiceTargetsEndpointHealth>(
     setURL(
-      `${BETA_API_ROOT}/aglb/${encodeURIComponent(
+      `${BETA_API_ROOT}/aclb/${encodeURIComponent(
         loadbalancerId
       )}/service-targets/endpoints-health`
     ),
@@ -82,7 +82,7 @@ export const createLoadbalancerServiceTarget = (
 ) =>
   Request<ServiceTarget>(
     setURL(
-      `${BETA_API_ROOT}/aglb/${encodeURIComponent(
+      `${BETA_API_ROOT}/aclb/${encodeURIComponent(
         loadbalancerId
       )}/service-targets`
     ),
@@ -102,7 +102,7 @@ export const updateLoadbalancerServiceTarget = (
 ) =>
   Request<ServiceTarget>(
     setURL(
-      `${BETA_API_ROOT}/aglb/${encodeURIComponent(
+      `${BETA_API_ROOT}/aclb/${encodeURIComponent(
         loadbalancerId
       )}/service-targets/${encodeURIComponent(serviceTargetId)}`
     ),
@@ -121,7 +121,7 @@ export const deleteLoadbalancerServiceTarget = (
 ) =>
   Request<{}>(
     setURL(
-      `${BETA_API_ROOT}/aglb/${encodeURIComponent(
+      `${BETA_API_ROOT}/aclb/${encodeURIComponent(
         loadbalancerId
       )}/service-targets/${encodeURIComponent(serviceTargetId)}`
     ),
diff --git a/packages/api-v4/src/aglb/types.ts b/packages/api-v4/src/aclb/types.ts
similarity index 100%
rename from packages/api-v4/src/aglb/types.ts
rename to packages/api-v4/src/aclb/types.ts
diff --git a/packages/api-v4/src/index.ts b/packages/api-v4/src/index.ts
index 7d407750435..b62ab50d817 100644
--- a/packages/api-v4/src/index.ts
+++ b/packages/api-v4/src/index.ts
@@ -1,6 +1,6 @@
 export * from './account';
 
-export * from './aglb';
+export * from './aclb';
 
 export * from './databases';
 
diff --git a/packages/api-v4/src/object-storage/objectStorageKeys.ts b/packages/api-v4/src/object-storage/objectStorageKeys.ts
index 6dd4d417adb..df8f3b0ce48 100644
--- a/packages/api-v4/src/object-storage/objectStorageKeys.ts
+++ b/packages/api-v4/src/object-storage/objectStorageKeys.ts
@@ -1,4 +1,7 @@
-import { createObjectStorageKeysSchema } from '@linode/validation/lib/objectStorageKeys.schema';
+import {
+  createObjectStorageKeysSchema,
+  updateObjectStorageKeysSchema,
+} from '@linode/validation/lib/objectStorageKeys.schema';
 import { API_ROOT } from '../constants';
 import Request, {
   setData,
@@ -51,7 +54,7 @@ export const updateObjectStorageKey = (
   Request<ObjectStorageKey>(
     setMethod('PUT'),
     setURL(`${API_ROOT}/object-storage/keys/${encodeURIComponent(id)}`),
-    setData(data, createObjectStorageKeysSchema)
+    setData(data, updateObjectStorageKeysSchema)
   );
 
 /**
diff --git a/packages/api-v4/src/placement-groups/placement-groups.ts b/packages/api-v4/src/placement-groups/placement-groups.ts
index 834cf10ead2..16cd63182fb 100644
--- a/packages/api-v4/src/placement-groups/placement-groups.ts
+++ b/packages/api-v4/src/placement-groups/placement-groups.ts
@@ -1,7 +1,5 @@
 import {
-  assignVMsToPlacementGroupSchema,
   createPlacementGroupSchema,
-  unassignVMsFromPlacementGroupSchema,
   renamePlacementGroupSchema,
 } from '@linode/validation';
 import { API_ROOT } from '../constants';
@@ -15,10 +13,10 @@ import Request, {
 } from '../request';
 import type { Filter, Params, ResourcePage as Page } from '../types';
 import type {
-  AssignVMsToPlacementGroupPayload,
+  AssignLinodesToPlacementGroupPayload,
   CreatePlacementGroupPayload,
   PlacementGroup,
-  UnassignVMsFromPlacementGroupPayload,
+  UnassignLinodesFromPlacementGroupPayload,
   RenamePlacementGroupPayload,
 } from './types';
 
@@ -109,9 +107,9 @@ export const deletePlacementGroup = (placementGroupId: number) =>
  *
  * @note While this accepts an array of Linode ids (future proofing), only one Linode id is supported at this time.
  */
-export const assignVMsToPlacementGroup = (
+export const assignLinodesToPlacementGroup = (
   placementGroupId: number,
-  linodeIds: AssignVMsToPlacementGroupPayload
+  payload: AssignLinodesToPlacementGroupPayload
 ) =>
   Request<PlacementGroup>(
     setURL(
@@ -120,7 +118,7 @@ export const assignVMsToPlacementGroup = (
       )}/assign`
     ),
     setMethod('POST'),
-    setData(linodeIds, assignVMsToPlacementGroupSchema)
+    setData(payload)
   );
 
 /**
@@ -133,9 +131,9 @@ export const assignVMsToPlacementGroup = (
  *
  * @note While this accepts an array of Linode ids (future proofing), only one Linode id is supported at this time.
  */
-export const unassignVMsFromPlacementGroup = (
+export const unassignLinodesFromPlacementGroup = (
   placementGroupId: number,
-  linodeIds: UnassignVMsFromPlacementGroupPayload
+  payload: UnassignLinodesFromPlacementGroupPayload
 ) =>
   Request<PlacementGroup>(
     setURL(
@@ -144,5 +142,5 @@ export const unassignVMsFromPlacementGroup = (
       )}/unassign`
     ),
     setMethod('POST'),
-    setData(linodeIds, unassignVMsFromPlacementGroupSchema)
+    setData(payload)
   );
diff --git a/packages/api-v4/src/placement-groups/types.ts b/packages/api-v4/src/placement-groups/types.ts
index 1952653081b..63f64584004 100644
--- a/packages/api-v4/src/placement-groups/types.ts
+++ b/packages/api-v4/src/placement-groups/types.ts
@@ -12,20 +12,26 @@ export interface PlacementGroup {
   label: string;
   region: Region['id'];
   affinity_type: AffinityType;
-  compliant: boolean;
+  is_compliant: boolean;
   linode_ids: number[];
-  capacity: number;
 }
 
+// The `strict` parameter specifies whether placement groups should be ignored when looking for a host.
+// TODO VM_Placement: figure out the values for each create flow (create, clone, migrate etc)
 export type CreatePlacementGroupPayload = Pick<
   PlacementGroup,
   'label' | 'affinity_type' | 'region'
->;
+> & { strict: boolean };
 
 export type RenamePlacementGroupPayload = Pick<PlacementGroup, 'label'>;
 
 /**
  * Since the API expects an array of ONE linode id, we'll use a tuple here.
  */
-export type AssignVMsToPlacementGroupPayload = [number];
-export type UnassignVMsFromPlacementGroupPayload = [number];
+export type AssignLinodesToPlacementGroupPayload = {
+  linodes: [number];
+  strict: boolean;
+};
+export type UnassignLinodesFromPlacementGroupPayload = {
+  linodes: [number];
+};
diff --git a/packages/api-v4/src/profile/types.ts b/packages/api-v4/src/profile/types.ts
index 0d7ea3347f3..aed94d75fda 100644
--- a/packages/api-v4/src/profile/types.ts
+++ b/packages/api-v4/src/profile/types.ts
@@ -24,7 +24,7 @@ export interface Profile {
   two_factor_auth: boolean;
   restricted: boolean;
   verified_phone_number: string | null;
-  user_type: UserType | null;
+  user_type: UserType;
 }
 
 export interface TokenRequest {
diff --git a/packages/api-v4/src/regions/types.ts b/packages/api-v4/src/regions/types.ts
index f03c852531c..23204247879 100644
--- a/packages/api-v4/src/regions/types.ts
+++ b/packages/api-v4/src/regions/types.ts
@@ -3,6 +3,7 @@ import { COUNTRY_CODE_TO_CONTINENT_CODE } from './constants';
 export type Capabilities =
   | 'Bare Metal'
   | 'Block Storage'
+  | 'Block Storage Migrations'
   | 'Cloud Firewall'
   | 'GPU Linodes'
   | 'Kubernetes'
@@ -11,6 +12,7 @@ export type Capabilities =
   | 'Metadata'
   | 'NodeBalancers'
   | 'Object Storage'
+  | 'Placement Group'
   | 'Premium Plans'
   | 'Vlans'
   | 'VPCs';
@@ -27,6 +29,8 @@ export interface Region {
   label: string;
   country: Country;
   capabilities: Capabilities[];
+  maximum_pgs_per_customer: number;
+  maximum_vms_per_pg: number;
   status: RegionStatus;
   resolvers: DNSResolvers;
 }
diff --git a/packages/manager/CHANGELOG.md b/packages/manager/CHANGELOG.md
index 35ff819b993..88934156e35 100644
--- a/packages/manager/CHANGELOG.md
+++ b/packages/manager/CHANGELOG.md
@@ -4,6 +4,58 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](http://keepachangelog.com/) and this project adheres to [Semantic Versioning](http://semver.org/).
 
+## [2024-02-20] - v1.113.0
+
+### Added:
+
+- Feb 2024 Marketplace apps ([#10149](https://github.com/linode/manager/pull/10149))
+
+### Changed:
+
+- Improve Linode Graph X Axis Labels when viewing historic data ([#10186](https://github.com/linode/manager/pull/10186))
+
+### Fixed:
+
+- EditableText interaction styling ([#10132](https://github.com/linode/manager/pull/10132))
+- Inability to transfer IPv6 ranges ([#10156](https://github.com/linode/manager/pull/10156))
+- Incorrect `X-Filter` on the Account Maintenance "Pending" Table (#10196)
+- Bundle analyzer script ([#10175](https://github.com/linode/manager/pull/10175))
+
+### Tech Stories:
+
+- Clean up DC Get Well feature flag logic ([#10146](https://github.com/linode/manager/pull/10146))
+- Clean up `regionDropdown` feature flag ([#10148](https://github.com/linode/manager/pull/10148))
+- Update `react-router-dom` in preparation for React 18 ([#10154](https://github.com/linode/manager/pull/10154))
+- Remove Enzyme ([#10160](https://github.com/linode/manager/pull/10160))
+- Update Luxon ([#10163](https://github.com/linode/manager/pull/10163))
+- Update `launchdarkly-react-client-sdk` ([#10165](https://github.com/linode/manager/pull/10165))
+- Add analytics event for breadcrumb label edit icon on Linode details page ([#10183](https://github.com/linode/manager/pull/10183))
+
+### Tests:
+
+- Add integration test coverage for Account Login History ([#10125](https://github.com/linode/manager/pull/10125))
+- Add integration test to check proxy user disabled username/email field ([#10139](https://github.com/linode/manager/pull/10139))
+- Add Cypress tests for OBJ Multicluster access key operations ([#10144](https://github.com/linode/manager/pull/10144))
+- Fix billing contact Cypress test by narrowing element selection scope ([#10150](https://github.com/linode/manager/pull/10150))
+- Update Cypress tests to use `"default"` `user_type` for non-parent/child/proxy users ([#10176](https://github.com/linode/manager/pull/10176))
+- Fix Button enabled assertions ([#10142](https://github.com/linode/manager/pull/10142))
+
+### Upcoming Features:
+
+- Disable "Save" button in Edit Access Key drawer unless field values are changed ([#10118](https://github.com/linode/manager/pull/10118))
+- Add Placement Groups Select component (#10100)
+- Update Placement Groups limits ([#10191](https://github.com/linode/manager/pull/10191))
+- Add Placement Group Linodes List ([#10123](https://github.com/linode/manager/pull/10123))
+- Add AssignLinodesToPlacementGroup drawer ([#10140](https://github.com/linode/manager/pull/10140))
+- Add PlacementGroups Summary component ([#10164](https://github.com/linode/manager/pull/10164))
+- Add unassign linode from Placement Group modal (#10172)
+- Improve restricted access Login History experience for child and restricted users ([#10125](https://github.com/linode/manager/pull/10125))
+- Add session expiry confirmation dialog for proxy to parent user account switching ([#10152](https://github.com/linode/manager/pull/10152))
+- Clean up files to use profile to get `user_type` ([#10102](https://github.com/linode/manager/pull/10102))
+- Update components and unit tests to use `"default"` `user_type` for non-parent/child/proxy users ([#10176](https://github.com/linode/manager/pull/10176))
+- Use infinite query for fetching child accounts ([#10179](https://github.com/linode/manager/pull/10179))
+- Use API filtering on user_type to populate the two Users & Grants tables ([#10192](https://github.com/linode/manager/pull/10192))
+
 ## [2024-02-13] - v1.112.0
 
 ### Added:
@@ -26,6 +78,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p
 - Display $0.00 prices in Linode Migration dialog ([#10166](https://github.com/linode/manager/pull/10166))
 
 ## [2024-02-05] - v1.111.0
+
 ### Changed:
 
 - Table CollapsibleRow icon orientation ([#10119](https://github.com/linode/manager/pull/10119))
@@ -82,25 +135,26 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p
 - Add Placement Groups Landing Page ([#10068](https://github.com/linode/manager/pull/10068))
 - Add Placement Groups Landing Page empty state ([#10075](https://github.com/linode/manager/pull/10075))
 
-
 ## [2024-01-31] - v1.110.3
 
 ### Fix:
+
 - Enable `Can add VPCs to this account` for user permissions
 
 ## [2024-01-31] - v1.110.2
 
 ### Changed:
+
 - Remove VPC beta feedback link
 
 ## [2024-01-31] - v1.110.1
 
 ### Changed:
+
 - Updated VPC flag for primary navigation
 
 ## [2024-01-22] - v1.110.0
 
-
 ### Added:
 
 - Subnet IPv4 range recommendation in VPC Create flow and Subnet Create Drawer ([#10010](https://github.com/linode/manager/pull/10010))
@@ -152,7 +206,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p
 
 - Add AGLB Endpoint Health ([#10008](https://github.com/linode/manager/pull/10008))
 - Add child account access column and disable delete account button when account has child accounts ([#10025](https://github.com/linode/manager/pull/10025))
-- Add parent/proxy 'Switch Account' button and drawer to user profile dropdown menu  ([#10031](https://github.com/linode/manager/pull/10031))
+- Add parent/proxy 'Switch Account' button and drawer to user profile dropdown menu ([#10031](https://github.com/linode/manager/pull/10031))
 - Disable Contact / Billing Info for Restricted Users ([#10036](https://github.com/linode/manager/pull/10036))
 - Disable Billing Access user permission for child accounts ([#10045](https://github.com/linode/manager/pull/10045))
 - Fix AGLB Configuration "Save" button remaining disabled when trying to remove a route ([#10048](https://github.com/linode/manager/pull/10048))
@@ -175,10 +229,8 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p
 
 - Remove obsolete VPC disabled state tests ([#10047](https://github.com/linode/manager/pull/10047))
 
-
 ## [2024-01-08] - v1.109.0
 
-
 ### Changed:
 
 - Improve layout of User Permissions page ([#10005](https://github.com/linode/manager/pull/10005))
@@ -231,7 +283,6 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p
 - Add `child_account` oauth scope to Personal Access Token drawers ([#9992](https://github.com/linode/manager/pull/9992))
 - Add AGLB Routes section of full create page ([#9997](https://github.com/linode/manager/pull/9997))
 
-
 ## [2023-12-11] - v1.108.0
 
 ### Added:
@@ -244,10 +295,9 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p
 
 - Improve MainConcept Transcoders Marketplace app name, description, and website ([#9858](https://github.com/linode/manager/pull/9858))
 - Move Linode Details Add/Edit Config button alignment to the right ([#9925](https://github.com/linode/manager/pull/9925))
-- Add pricing Docs Link to create/clone flows and remove DC-specific pricing warning notice  ([#9946](https://github.com/linode/manager/pull/9946))
+- Add pricing Docs Link to create/clone flows and remove DC-specific pricing warning notice ([#9946](https://github.com/linode/manager/pull/9946))
 - Update MainConcept app names to include “Demo” ([#9950](https://github.com/linode/manager/pull/9950))
 
-
 ### Fixed:
 
 - Overflow for VPC and StackScript detail descriptions and cut off placeholder text in VPC search bar ([#9887](https://github.com/linode/manager/pull/9887))
@@ -324,7 +374,6 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p
 
 ## [2023-11-13] - v1.107.0
 
-
 ### Changed:
 
 - Logic governing inclusion of public interfaces in Linode Create payload ([#9834](https://github.com/linode/manager/pull/9834))
@@ -332,7 +381,6 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p
 - Logic governing display of Network Interfaces/Networking section in Linode Config dialog ([#9868](https://github.com/linode/manager/pull/9868))
 - Temporarily remove region sorting on DBaaS landing page ([#9861](https://github.com/linode/manager/pull/9861))
 
-
 ### Fixed:
 
 - Linodes Landing flickering ([#9836](https://github.com/linode/manager/pull/9836))
@@ -356,7 +404,6 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p
 - Add integration tests for AGLB certificate edit flow ([#9880](https://github.com/linode/manager/pull/9880))
 - Add integration tests for AGLB certificate delete flow ([#9846](https://github.com/linode/manager/pull/9846))
 
-
 ### Upcoming Features:
 
 - Fix Unassign multiple Linodes from Subnet ([#9820](https://github.com/linode/manager/pull/9820))
@@ -380,7 +427,6 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p
 - AGLB Configurations Add Route Drawer and other refinements ([#9853](https://github.com/linode/manager/pull/9853))
 - Add missing label field validation in AGLB Edit Certificate drawer ([#9880](https://github.com/linode/manager/pull/9880))
 
-
 ## [2023-10-30] - v1.106.0
 
 ### Added:
diff --git a/packages/manager/cypress/e2e/core/account/account-login-history.spec.ts b/packages/manager/cypress/e2e/core/account/account-login-history.spec.ts
new file mode 100644
index 00000000000..6b213f48bf4
--- /dev/null
+++ b/packages/manager/cypress/e2e/core/account/account-login-history.spec.ts
@@ -0,0 +1,171 @@
+/**
+ * @file Integration tests for Cloud Manager account login history flows.
+ */
+
+import { profileFactory } from 'src/factories';
+import { accountLoginFactory } from 'src/factories/accountLogin';
+import { formatDate } from 'src/utilities/formatDate';
+import { mockGetAccountLogins } from 'support/intercepts/account';
+import {
+  mockAppendFeatureFlags,
+  mockGetFeatureFlagClientstream,
+} from 'support/intercepts/feature-flags';
+import { mockGetProfile } from 'support/intercepts/profile';
+import { makeFeatureFlagData } from 'support/util/feature-flags';
+
+describe('Account login history', () => {
+  /*
+   * - Confirms that a user can navigate to and view the login history page.
+   * - Confirms that login table displays the expected column headers.
+   * - Confirms that the login table displays a mocked failed restricted user login.
+   * - Confirm that the login table displays a mocked successful unrestricted user login.
+   */
+  it('users can view the login history table', () => {
+    const mockProfile = profileFactory.build({
+      username: 'mock-user',
+      restricted: false,
+      user_type: 'default',
+    });
+    const mockFailedLogin = accountLoginFactory.build({
+      status: 'failed',
+      username: 'mock-restricted-user',
+      restricted: true,
+    });
+    const mockSuccessfulLogin = accountLoginFactory.build({
+      status: 'successful',
+      restricted: false,
+    });
+
+    mockGetProfile(mockProfile).as('getProfile');
+    mockGetAccountLogins([mockFailedLogin, mockSuccessfulLogin]).as(
+      'getAccountLogins'
+    );
+
+    // TODO: Parent/Child - M3-7559 clean up when feature is live in prod and feature flag is removed.
+    mockAppendFeatureFlags({
+      parentChildAccountAccess: makeFeatureFlagData(false),
+    }).as('getFeatureFlags');
+    mockGetFeatureFlagClientstream().as('getClientStream');
+
+    // Navigate to Account Login History page.
+    cy.visitWithLogin('/account/login-history');
+    cy.wait(['@getClientStream', '@getFeatureFlags', '@getProfile']);
+
+    // Confirm helper text above table is visible.
+    cy.findByText(
+      'Logins across all users on your account over the last 90 days.'
+    ).should('be.visible');
+
+    // Confirm the login table includes the expected column headers and mocked logins are visible in table.
+    cy.findByLabelText('Account Logins').within(() => {
+      cy.get('thead').findByText('Date').should('be.visible');
+      cy.get('thead').findByText('Username').should('be.visible');
+      cy.get('thead').findByText('IP').should('be.visible');
+      cy.get('thead').findByText('Permission Level').should('be.visible');
+      cy.get('thead').findByText('Access').should('be.visible');
+
+      // Confirm that restricted user's failed login and status icon display in table.
+      cy.findByText(mockFailedLogin.username)
+        .should('be.visible')
+        .closest('tr')
+        .within(() => {
+          cy.findByText(mockFailedLogin.status, { exact: false }).should(
+            'be.visible'
+          );
+          cy.findAllByLabelText(`Status is ${mockFailedLogin.status}`);
+          cy.findByText('Restricted').should('be.visible');
+        });
+
+      // Confirm that unrestricted user login displays in table.
+      cy.findByText(mockSuccessfulLogin.username)
+        .should('be.visible')
+        .closest('tr')
+        .within(() => {
+          // Confirm that successful login and status icon display in table.
+          cy.findByText(mockSuccessfulLogin.status, { exact: false }).should(
+            'be.visible'
+          );
+          cy.findAllByLabelText(`Status is ${mockSuccessfulLogin.status}`);
+
+          // Confirm all other fields display in table.
+          cy.findByText(
+            formatDate(mockSuccessfulLogin.datetime, {
+              timezone: mockProfile.timezone,
+            })
+          ).should('be.visible');
+          cy.findByText(mockSuccessfulLogin.ip).should('be.visible');
+          cy.findByText('Unrestricted').should('be.visible');
+        });
+    });
+  });
+
+  /**
+   * - Confirms that a child user can navigate to the Login History page.
+   * - Confirms that a child user cannot see login history data.
+   * - Confirms that a child user sees a notice instead.
+   */
+  it('child users cannot view login history', () => {
+    const mockProfile = profileFactory.build({
+      username: 'mock-child-user',
+      restricted: false,
+      user_type: 'child',
+    });
+
+    mockGetProfile(mockProfile).as('getProfile');
+
+    // TODO: Parent/Child - M3-7559 clean up when feature is live in prod and feature flag is removed.
+    mockAppendFeatureFlags({
+      parentChildAccountAccess: makeFeatureFlagData(true),
+    }).as('getFeatureFlags');
+    mockGetFeatureFlagClientstream().as('getClientStream');
+
+    // Navigate to Account Login History page.
+    cy.visitWithLogin('/account/login-history');
+    cy.wait(['@getClientStream', '@getFeatureFlags', '@getProfile']);
+
+    // Confirm helper text above table and table are not visible.
+    cy.findByText(
+      'Logins across all users on your account over the last 90 days.'
+    ).should('not.exist');
+    cy.findByLabelText('Account Logins').should('not.exist');
+
+    cy.findByText(
+      'Access restricted. Please contact your business partner to request the necessary permission.'
+    );
+  });
+
+  /**
+   * - Confirms that a restricted user can navigate to the Login History page.
+   * - Confirms that a restricted user cannot see login history data.
+   * - Confirms that a restricted user sees a notice instead.
+   */
+  it('restricted users cannot view login history', () => {
+    const mockProfile = profileFactory.build({
+      username: 'mock-restricted-user',
+      restricted: true,
+      user_type: 'default',
+    });
+
+    mockGetProfile(mockProfile).as('getProfile');
+
+    // TODO: Parent/Child - M3-7559 clean up when feature is live in prod and feature flag is removed.
+    mockAppendFeatureFlags({
+      parentChildAccountAccess: makeFeatureFlagData(true),
+    }).as('getFeatureFlags');
+    mockGetFeatureFlagClientstream().as('getClientStream');
+
+    // Navigate to Account Login History page.
+    cy.visitWithLogin('/account/login-history');
+    cy.wait(['@getClientStream', '@getFeatureFlags', '@getProfile']);
+
+    // Confirm helper text above table and table are not visible.
+    cy.findByText(
+      'Logins across all users on your account over the last 90 days.'
+    ).should('not.exist');
+    cy.findByLabelText('Account Logins').should('not.exist');
+
+    cy.findByText(
+      'Access restricted. Please contact your account administrator to request the necessary permission.'
+    );
+  });
+});
diff --git a/packages/manager/cypress/e2e/core/account/change-username.spec.ts b/packages/manager/cypress/e2e/core/account/change-username.spec.ts
index a2323877ade..a0374fc698f 100644
--- a/packages/manager/cypress/e2e/core/account/change-username.spec.ts
+++ b/packages/manager/cypress/e2e/core/account/change-username.spec.ts
@@ -1,3 +1,11 @@
+import { Profile } from '@linode/api-v4';
+import { profileFactory } from '@src/factories';
+import {
+  mockAppendFeatureFlags,
+  mockGetFeatureFlagClientstream,
+} from 'support/intercepts/feature-flags';
+import { makeFeatureFlagData } from 'support/util/feature-flags';
+import { mockGetProfile } from 'support/intercepts/profile';
 import { getProfile } from 'support/api/account';
 import { interceptGetProfile } from 'support/intercepts/profile';
 import {
@@ -7,6 +15,50 @@ import {
 import { ui } from 'support/ui';
 import { randomString } from 'support/util/random';
 
+const verifyUsernameAndEmail = (
+  mockRestrictedProxyProfile: Profile,
+  tooltip: string,
+  checkEmail: boolean
+) => {
+  // TODO: Parent/Child - M3-7559 clean up when feature is live in prod and feature flag is removed.
+  mockAppendFeatureFlags({
+    parentChildAccountAccess: makeFeatureFlagData(true),
+  }).as('getFeatureFlags');
+  mockGetFeatureFlagClientstream().as('getClientStream');
+
+  mockGetProfile(mockRestrictedProxyProfile);
+
+  // Navigate to User Profile page
+  cy.visitWithLogin('/profile/display');
+
+  // Confirm the username and email address fields are disabled, as well their respective save buttons
+  cy.get('[id="username"]').should('be.disabled');
+  ui.button
+    .findByTitle('Update Username')
+    .should('be.visible')
+    .should('be.disabled')
+    .trigger('mouseover');
+  // Click the button first, then confirm the tooltip is shown
+  ui.tooltip.findByText(tooltip).should('be.visible');
+
+  // Refresh the page
+  mockGetProfile(mockRestrictedProxyProfile);
+  cy.reload();
+
+  if (checkEmail) {
+    cy.get('[id="email"]').should('be.disabled');
+    ui.button
+      .findByTitle('Update Email')
+      .should('be.visible')
+      .should('be.disabled')
+      .trigger('mouseover');
+    // Click the button first, then confirm the tooltip is shown
+    ui.tooltip
+      .findByText('This account type cannot update this field.')
+      .should('be.visible');
+  }
+};
+
 describe('username', () => {
   /*
    * - Validates username update flow via the user profile page using mocked data.
@@ -96,4 +148,45 @@ describe('username', () => {
       cy.findByText('Username updated successfully.').should('be.visible');
     });
   });
+
+  it('disables username/email fields for restricted proxy user', () => {
+    const mockRestrictedProxyProfile = profileFactory.build({
+      username: 'restricted-proxy-user',
+      user_type: 'proxy',
+      restricted: true,
+    });
+
+    verifyUsernameAndEmail(
+      mockRestrictedProxyProfile,
+      'This account type cannot update this field.',
+      true
+    );
+  });
+
+  it('disables username/email fields for unrestricted proxy user', () => {
+    const mockUnrestrictedProxyProfile = profileFactory.build({
+      username: 'unrestricted-proxy-user',
+      user_type: 'proxy',
+    });
+
+    verifyUsernameAndEmail(
+      mockUnrestrictedProxyProfile,
+      'This account type cannot update this field.',
+      true
+    );
+  });
+
+  it('disables username/email fields for regular restricted user', () => {
+    const mockRegularRestrictedProfile = profileFactory.build({
+      username: 'regular-restricted-user',
+      user_type: 'default',
+      restricted: true,
+    });
+
+    verifyUsernameAndEmail(
+      mockRegularRestrictedProfile,
+      'Restricted users cannot update their username. Please contact an account administrator.',
+      false
+    );
+  });
 });
diff --git a/packages/manager/cypress/e2e/core/billing/billing-contact.spec.ts b/packages/manager/cypress/e2e/core/billing/billing-contact.spec.ts
index be8fd90997c..0db765463af 100644
--- a/packages/manager/cypress/e2e/core/billing/billing-contact.spec.ts
+++ b/packages/manager/cypress/e2e/core/billing/billing-contact.spec.ts
@@ -1,6 +1,7 @@
 import { mockGetAccount, mockUpdateAccount } from 'support/intercepts/account';
 import { accountFactory } from 'src/factories/account';
 import type { Account } from '@linode/api-v4';
+import { ui } from 'support/ui';
 
 /* eslint-disable sonarjs/no-duplicate-string */
 const accountData = accountFactory.build({
@@ -66,75 +67,82 @@ describe('Billing Contact', () => {
     // mock the user's account data and confirm that it is displayed correctly upon page load
     mockGetAccount(accountData).as('getAccount');
     cy.visitWithLogin('/account/billing');
-    checkAccountContactDisplay(accountData);
 
     // edit the billing contact information
     mockUpdateAccount(newAccountData).as('updateAccount');
     cy.get('[data-qa-contact-summary]').within((_contact) => {
+      checkAccountContactDisplay(accountData);
       cy.findByText('Edit').should('be.visible').click();
     });
-    // check drawer is visible
-    cy.findByLabelText('First Name')
-      .should('be.visible')
-      .click()
-      .clear()
-      .type(newAccountData['first_name']);
-    cy.findByLabelText('Last Name')
-      .should('be.visible')
-      .click()
-      .clear()
-      .type(newAccountData['last_name']);
-    cy.findByLabelText('Company Name')
-      .should('be.visible')
-      .click()
-      .clear()
-      .type(newAccountData['company']);
-    cy.findByLabelText('Address')
-      .should('be.visible')
-      .click()
-      .clear()
-      .type(newAccountData['address_1']);
-    cy.findByLabelText('Address 2')
-      .should('be.visible')
-      .click()
-      .clear()
-      .type(newAccountData['address_2']);
-    cy.findByLabelText('Email (required)')
-      .should('be.visible')
-      .click()
-      .clear()
-      .type(newAccountData['email']);
-    cy.findByLabelText('City')
-      .should('be.visible')
-      .click()
-      .clear()
-      .type(newAccountData['city']);
-    cy.findByLabelText('Postal Code')
-      .should('be.visible')
-      .click()
-      .clear()
-      .type(newAccountData['zip']);
-    cy.findByLabelText('Phone')
-      .should('be.visible')
-      .click()
-      .clear()
-      .type(newAccountData['phone']);
-    cy.get('[data-qa-contact-country]').click().type('United States{enter}');
-    cy.get('[data-qa-contact-state-province]')
-      .should('be.visible')
-      .click()
-      .type(`${newAccountData['state']}{enter}`);
-    cy.findByLabelText('Tax ID')
+
+    ui.drawer
+      .findByTitle('Edit Billing Contact Info')
       .should('be.visible')
-      .click()
-      .clear()
-      .type(newAccountData['tax_id']);
-    cy.get('[data-qa-save-contact-info="true"]')
-      .click()
-      .then(() => {
-        cy.wait('@updateAccount').then((xhr) => {
-          expect(xhr.response?.body).to.eql(newAccountData);
-        });
+      .within(() => {
+        cy.findByLabelText('First Name')
+          .should('be.visible')
+          .click()
+          .clear()
+          .type(newAccountData['first_name']);
+        cy.findByLabelText('Last Name')
+          .should('be.visible')
+          .click()
+          .clear()
+          .type(newAccountData['last_name']);
+        cy.findByLabelText('Company Name')
+          .should('be.visible')
+          .click()
+          .clear()
+          .type(newAccountData['company']);
+        cy.findByLabelText('Address')
+          .should('be.visible')
+          .click()
+          .clear()
+          .type(newAccountData['address_1']);
+        cy.findByLabelText('Address 2')
+          .should('be.visible')
+          .click()
+          .clear()
+          .type(newAccountData['address_2']);
+        cy.findByLabelText('Email (required)')
+          .should('be.visible')
+          .click()
+          .clear()
+          .type(newAccountData['email']);
+        cy.findByLabelText('City')
+          .should('be.visible')
+          .click()
+          .clear()
+          .type(newAccountData['city']);
+        cy.findByLabelText('Postal Code')
+          .should('be.visible')
+          .click()
+          .clear()
+          .type(newAccountData['zip']);
+        cy.findByLabelText('Phone')
+          .should('be.visible')
+          .click()
+          .clear()
+          .type(newAccountData['phone']);
+        cy.get('[data-qa-contact-country]')
+          .click()
+          .type('United States{enter}');
+        cy.get('[data-qa-contact-state-province]')
+          .should('be.visible')
+          .click()
+          .type(`${newAccountData['state']}{enter}`);
+        cy.findByLabelText('Tax ID')
+          .should('be.visible')
+          .click()
+          .clear()
+          .type(newAccountData['tax_id']);
+        cy.get('[data-qa-save-contact-info="true"]')
+          .click()
+          .then(() => {
+            cy.wait('@updateAccount').then((xhr) => {
+              expect(xhr.response?.body).to.eql(newAccountData);
+            });
+          });
       });
 
     // check the page updates to reflect the edits
diff --git a/packages/manager/cypress/e2e/core/billing/restricted-user-billing.spec.ts b/packages/manager/cypress/e2e/core/billing/restricted-user-billing.spec.ts
index 5a17dd052d0..8c6594b7f46 100644
--- a/packages/manager/cypress/e2e/core/billing/restricted-user-billing.spec.ts
+++ b/packages/manager/cypress/e2e/core/billing/restricted-user-billing.spec.ts
@@ -208,7 +208,7 @@ describe('restricted user billing flows', () => {
 
       const mockUser = accountUserFactory.build({
         username: mockProfile.username,
-        user_type: null,
+        user_type: 'default',
         restricted: false,
       });
 
@@ -248,7 +248,7 @@ describe('restricted user billing flows', () => {
       const mockUser = accountUserFactory.build({
         username: mockProfile.username,
         restricted: true,
-        user_type: null,
+        user_type: 'default',
       });
 
       const mockGrants = grantsFactory.build({
@@ -304,7 +304,7 @@ describe('restricted user billing flows', () => {
 
       const mockUserRegular = accountUserFactory.build({
         username: mockProfileRegular.username,
-        user_type: null,
+        user_type: 'default',
         restricted: false,
       });
 
diff --git a/packages/manager/cypress/e2e/core/loadBalancers/load-balancer-summary.spec.ts b/packages/manager/cypress/e2e/core/loadBalancers/load-balancer-summary.spec.ts
index 1cb60363985..4eb6a35be71 100644
--- a/packages/manager/cypress/e2e/core/loadBalancers/load-balancer-summary.spec.ts
+++ b/packages/manager/cypress/e2e/core/loadBalancers/load-balancer-summary.spec.ts
@@ -2,7 +2,7 @@
  * @file Integration tests for Akamai Cloud Load Balancer summary page.
  */
 
-import { loadbalancerFactory, configurationFactory } from '@src/factories/aglb';
+import { loadbalancerFactory, configurationFactory } from '@src/factories/aclb';
 import {
   mockAppendFeatureFlags,
   mockGetFeatureFlagClientstream,
diff --git a/packages/manager/cypress/e2e/core/objectStorage/access-keys.smoke.spec.ts b/packages/manager/cypress/e2e/core/objectStorage/access-keys.smoke.spec.ts
index ac17fe65c95..cc1f74b33b7 100644
--- a/packages/manager/cypress/e2e/core/objectStorage/access-keys.smoke.spec.ts
+++ b/packages/manager/cypress/e2e/core/objectStorage/access-keys.smoke.spec.ts
@@ -2,7 +2,10 @@
  * @file Smoke tests for crucial Object Storage Access Keys operations.
  */
 
-import { objectStorageKeyFactory } from 'src/factories/objectStorage';
+import {
+  objectStorageKeyFactory,
+  objectStorageBucketFactory,
+} from 'src/factories/objectStorage';
 import {
   mockAppendFeatureFlags,
   mockGetFeatureFlagClientstream,
@@ -11,10 +14,21 @@ import {
   mockCreateAccessKey,
   mockDeleteAccessKey,
   mockGetAccessKeys,
+  mockGetBucketsForRegion,
+  mockUpdateAccessKey,
 } from 'support/intercepts/object-storage';
 import { makeFeatureFlagData } from 'support/util/feature-flags';
-import { randomLabel, randomNumber, randomString } from 'support/util/random';
+import {
+  randomDomainName,
+  randomLabel,
+  randomNumber,
+  randomString,
+} from 'support/util/random';
 import { ui } from 'support/ui';
+import { regionFactory } from 'src/factories';
+import { mockGetRegions } from 'support/intercepts/regions';
+import { buildArray } from 'support/util/arrays';
+import { Scope } from '@linode/api-v4';
 
 describe('object storage access keys smoke tests', () => {
   /*
@@ -132,4 +146,386 @@ describe('object storage access keys smoke tests', () => {
     cy.wait(['@deleteKey', '@getKeys']);
     cy.findByText('No items to display.').should('be.visible');
   });
+
+  describe('Object Storage Multicluster feature enabled', () => {
+    const mockRegionsObj = buildArray(3, () => {
+      return regionFactory.build({
+        id: `us-${randomString(5)}`,
+        label: `mock-obj-region-${randomString(5)}`,
+        capabilities: ['Object Storage'],
+      });
+    });
+
+    const mockRegionsNoObj = regionFactory.buildList(3, {
+      capabilities: [],
+    });
+
+    const mockRegions = [...mockRegionsObj, ...mockRegionsNoObj];
+
+    beforeEach(() => {
+      mockAppendFeatureFlags({
+        objMultiCluster: makeFeatureFlagData(true),
+      });
+      mockGetFeatureFlagClientstream();
+    });
+
+    /*
+     * - Confirms user can create access keys with unlimited access when OBJ Multicluster is enabled.
+     * - Confirms multiple regions can be selected when creating an access key.
+     * - Confirms that UI updates to reflect created access key.
+     */
+    it('can create unlimited access keys with OBJ Multicluster', () => {
+      const mockAccessKey = objectStorageKeyFactory.build({
+        id: randomNumber(10000, 99999),
+        label: randomLabel(),
+        access_key: randomString(20),
+        secret_key: randomString(39),
+        regions: mockRegionsObj.map((mockObjRegion) => ({
+          id: mockObjRegion.id,
+          s3_endpoint: randomDomainName(),
+        })),
+      });
+
+      mockGetAccessKeys([]);
+      mockCreateAccessKey(mockAccessKey).as('createAccessKey');
+      mockGetRegions(mockRegions);
+      mockRegions.forEach((region) => {
+        mockGetBucketsForRegion(region.id, []);
+      });
+
+      cy.visitWithLogin('/object-storage/access-keys');
+
+      ui.button
+        .findByTitle('Create Access Key')
+        .should('be.visible')
+        .should('be.enabled')
+        .click();
+
+      mockGetAccessKeys([mockAccessKey]);
+      ui.drawer
+        .findByTitle('Create Access Key')
+        .should('be.visible')
+        .within(() => {
+          cy.contains('Label (required)')
+            .should('be.visible')
+            .click()
+            .type(mockAccessKey.label);
+
+          cy.contains('Regions (required)').should('be.visible').click();
+
+          // Select each region with the OBJ capability.
+          mockRegionsObj.forEach((mockRegion) => {
+            cy.contains('Regions (required)').type(mockRegion.label);
+            ui.autocompletePopper
+              .findByTitle(`${mockRegion.label} (${mockRegion.id})`)
+              .should('be.visible')
+              .click();
+          });
+
+          // Close the regions drop-down.
+          cy.contains('Regions (required)')
+            .should('be.visible')
+            .click()
+            .type('{esc}');
+
+          // TODO Confirm expected regions are shown.
+          ui.buttonGroup
+            .findButtonByTitle('Create Access Key')
+            .should('be.visible')
+            .should('be.enabled')
+            .click();
+        });
+
+      cy.wait('@createAccessKey');
+      ui.dialog
+        .findByTitle('Access Keys')
+        .should('be.visible')
+        .within(() => {
+          // TODO Add assertions for S3 hostnames
+          cy.get('input[id="access-key"]')
+            .should('be.visible')
+            .should('have.value', mockAccessKey.access_key);
+          cy.get('input[id="secret-key"]')
+            .should('be.visible')
+            .should('have.value', mockAccessKey.secret_key);
+
+          ui.button
+            .findByTitle('I Have Saved My Secret Key')
+            .should('be.visible')
+            .should('be.enabled')
+            .click();
+        });
+
+      cy.findByText(mockAccessKey.label)
+        .should('be.visible')
+        .closest('tr')
+        .within(() => {
+          // TODO Add assertions for regions/S3 hostnames
+          cy.findByText(mockAccessKey.access_key).should('be.visible');
+        });
+    });
+
+    /*
+     * - COnfirms user can create access keys with limited access when OBJ Multicluster is enabled.
+     * - Confirms that UI updates to reflect created access key.
+     * - Confirms that "Permissions" drawer contains expected scope and permission data.
+     */
+    it('can create limited access keys with OBJ Multicluster', () => {
+      const mockRegion = regionFactory.build({
+        id: `us-${randomString(5)}`,
+        label: `mock-obj-region-${randomString(5)}`,
+        capabilities: ['Object Storage'],
+      });
+
+      const mockBuckets = objectStorageBucketFactory.buildList(2, {
+        region: mockRegion.id,
+        cluster: undefined,
+      });
+
+      const mockAccessKey = objectStorageKeyFactory.build({
+        id: randomNumber(10000, 99999),
+        label: randomLabel(),
+        access_key: randomString(20),
+        secret_key: randomString(39),
+        regions: [
+          {
+            id: mockRegion.id,
+            s3_endpoint: randomDomainName(),
+          },
+        ],
+        limited: true,
+        bucket_access: mockBuckets.map(
+          (bucket): Scope => ({
+            bucket_name: bucket.label,
+            cluster: '',
+            permissions: 'read_only',
+            region: mockRegion.id,
+          })
+        ),
+      });
+
+      mockGetAccessKeys([]);
+      mockCreateAccessKey(mockAccessKey).as('createAccessKey');
+      mockGetRegions([mockRegion]);
+      mockGetBucketsForRegion(mockRegion.id, mockBuckets);
+
+      // Navigate to access keys page, click "Create Access Key" button.
+      cy.visitWithLogin('/object-storage/access-keys');
+      ui.button
+        .findByTitle('Create Access Key')
+        .should('be.visible')
+        .should('be.enabled')
+        .click();
+
+      // Fill out form in "Create Access Key" drawer.
+      ui.drawer
+        .findByTitle('Create Access Key')
+        .should('be.visible')
+        .within(() => {
+          cy.contains('Label (required)')
+            .should('be.visible')
+            .click()
+            .type(mockAccessKey.label);
+
+          cy.contains('Regions (required)')
+            .should('be.visible')
+            .click()
+            .type(`${mockRegion.label}{enter}`);
+
+          ui.autocompletePopper
+            .findByTitle(`${mockRegion.label} (${mockRegion.id})`)
+            .should('be.visible');
+
+          // Dismiss region drop-down.
+          cy.contains('Regions (required)')
+            .should('be.visible')
+            .click()
+            .type('{esc}');
+
+          // Enable "Limited Access" toggle for access key, and select access rules.
+          cy.findByText('Limited Access').should('be.visible').click();
+
+          mockBuckets.forEach((mockBucket) => {
+            cy.findByText(mockBucket.label)
+              .should('be.visible')
+              .closest('tr')
+              .within(() => {
+                cy.findByLabelText(
+                  `read-only for ${mockRegion.id}-${mockBucket.label}`
+                )
+                  .should('be.enabled')
+                  .click();
+              });
+          });
+
+          mockGetAccessKeys([mockAccessKey]);
+          ui.buttonGroup
+            .findButtonByTitle('Create Access Key')
+            .should('be.enabled')
+            .click();
+        });
+
+      // Dismiss secrets dialog.
+      cy.wait('@createAccessKey');
+      ui.buttonGroup
+        .findButtonByTitle('I Have Saved My Secret Key')
+        .should('be.visible')
+        .should('be.enabled')
+        .click();
+
+      // Open "Permissions" drawer for new access key.
+      cy.findByText(mockAccessKey.label)
+        .should('be.visible')
+        .closest('tr')
+        .within(() => {
+          ui.actionMenu
+            .findByTitle(
+              `Action menu for Object Storage Key ${mockAccessKey.label}`
+            )
+            .should('be.visible')
+            .click();
+        });
+
+      ui.actionMenuItem.findByTitle('Permissions').click();
+      ui.drawer
+        .findByTitle(`Permissions for ${mockAccessKey.label}`)
+        .should('be.visible')
+        .within(() => {
+          mockBuckets.forEach((mockBucket) => {
+            // TODO M3-7733 Update this selector when ARIA label is fixed.
+            cy.findByLabelText(
+              `This token has read-only access for -${mockBucket.label}`
+            );
+          });
+        });
+    });
+
+    /*
+     * - Confirms user can edit access key labels and regions when OBJ Multicluster is enabled.
+     * - Confirms that user can deselect regions via the region selection list.
+     * - Confirms that access keys landing page automatically updates to reflect edited access key.
+     */
+    it('can update access keys with OBJ Multicluster', () => {
+      const mockInitialRegion = regionFactory.build({
+        id: `us-${randomString(5)}`,
+        label: `mock-obj-region-${randomString(5)}`,
+        capabilities: ['Object Storage'],
+      });
+
+      const mockUpdatedRegion = regionFactory.build({
+        id: `us-${randomString(5)}`,
+        label: `mock-obj-region-${randomString(5)}`,
+        capabilities: ['Object Storage'],
+      });
+
+      const mockRegions = [mockInitialRegion, mockUpdatedRegion];
+
+      const mockAccessKey = objectStorageKeyFactory.build({
+        id: randomNumber(10000, 99999),
+        label: randomLabel(),
+        access_key: randomString(20),
+        secret_key: randomString(39),
+        regions: [
+          {
+            id: mockInitialRegion.id,
+            s3_endpoint: randomDomainName(),
+          },
+        ],
+      });
+
+      const mockUpdatedAccessKeyEndpoint = randomDomainName();
+
+      const mockUpdatedAccessKey = {
+        ...mockAccessKey,
+        label: randomLabel(),
+        regions: [
+          {
+            id: mockUpdatedRegion.id,
+            s3_endpoint: mockUpdatedAccessKeyEndpoint,
+          },
+        ],
+      };
+
+      mockGetAccessKeys([mockAccessKey]);
+      mockGetRegions(mockRegions);
+      cy.visitWithLogin('/object-storage/access-keys');
+
+      cy.findByText(mockAccessKey.label)
+        .should('be.visible')
+        .closest('tr')
+        .within(() => {
+          ui.actionMenu
+            .findByTitle(
+              `Action menu for Object Storage Key ${mockAccessKey.label}`
+            )
+            .should('be.visible')
+            .click();
+        });
+
+      ui.actionMenuItem
+        .findByTitle('Edit')
+        .should('be.visible')
+        .should('be.enabled')
+        .click();
+
+      ui.drawer
+        .findByTitle('Edit Access Key')
+        .should('be.visible')
+        .within(() => {
+          cy.contains('Label (required)')
+            .should('be.visible')
+            .click()
+            .type('{selectall}{backspace}')
+            .type(mockUpdatedAccessKey.label);
+
+          cy.contains('Regions (required)')
+            .should('be.visible')
+            .click()
+            .type(`${mockUpdatedRegion.label}{enter}{esc}`);
+
+          cy.get('[data-qa-selection-list]')
+            .should('be.visible')
+            .within(() => {
+              // Confirm both regions are selected and present in selection list.
+              mockRegions.forEach((mockRegion) => {
+                cy.findByText(`${mockRegion.label} (${mockRegion.id})`).should(
+                  'be.visible'
+                );
+              });
+
+              // Deselect initial region and confirm it's removed from list.
+              cy.findByLabelText(
+                `remove ${mockInitialRegion.label} (${mockInitialRegion.id})`
+              )
+                .should('be.visible')
+                .should('be.enabled')
+                .click();
+
+              cy.findByText(
+                `${mockInitialRegion.label} (${mockInitialRegion.id})`
+              ).should('not.exist');
+            });
+
+          mockUpdateAccessKey(mockUpdatedAccessKey).as('updateAccessKey');
+          mockGetAccessKeys([mockUpdatedAccessKey]);
+          ui.button
+            .findByTitle('Save Changes')
+            .should('be.visible')
+            .should('be.enabled')
+            .click();
+        });
+
+      cy.wait('@updateAccessKey');
+
+      // Confirm that access key landing page reflects updated key.
+      cy.findByText(mockAccessKey.label).should('not.exist');
+      cy.findByText(mockUpdatedAccessKey.label)
+        .should('be.visible')
+        .closest('tr')
+        .within(() => {
+          cy.contains(mockUpdatedRegion.label).should('be.visible');
+          cy.contains(mockUpdatedAccessKeyEndpoint).should('be.visible');
+        });
+    });
+  });
 });
diff --git a/packages/manager/cypress/support/intercepts/account.ts b/packages/manager/cypress/support/intercepts/account.ts
index f8721963252..5eb29242169 100644
--- a/packages/manager/cypress/support/intercepts/account.ts
+++ b/packages/manager/cypress/support/intercepts/account.ts
@@ -10,6 +10,7 @@ import { makeResponse } from 'support/util/response';
 
 import type {
   Account,
+  AccountLogin,
   AccountSettings,
   Agreements,
   CancelAccount,
@@ -514,3 +515,19 @@ export const mockGetAccountAgreements = (
     makeResponse(agreements)
   );
 };
+
+/**
+ * Intercepts GET request to fetch the account logins and mocks the response.
+ *
+ *
+ * @returns Cypress chainable.
+ */
+export const mockGetAccountLogins = (
+  accountLogins: AccountLogin[]
+): Cypress.Chainable<null> => {
+  return cy.intercept(
+    'GET',
+    apiMatcher(`account/logins*`),
+    paginateResponse(accountLogins)
+  );
+};
diff --git a/packages/manager/cypress/support/intercepts/load-balancers.ts b/packages/manager/cypress/support/intercepts/load-balancers.ts
index 2ce86a625c8..3a33cd1849b 100644
--- a/packages/manager/cypress/support/intercepts/load-balancers.ts
+++ b/packages/manager/cypress/support/intercepts/load-balancers.ts
@@ -22,7 +22,7 @@ import type {
 export const mockGetLoadBalancer = (loadBalancer: Loadbalancer) => {
   return cy.intercept(
     'GET',
-    apiMatcher(`/aglb/${loadBalancer.id}`),
+    apiMatcher(`/aclb/${loadBalancer.id}`),
     makeResponse(loadBalancer)
   );
 };
@@ -37,7 +37,7 @@ export const mockGetLoadBalancer = (loadBalancer: Loadbalancer) => {
 export const mockGetLoadBalancers = (loadBalancers: Loadbalancer[]) => {
   return cy.intercept(
     'GET',
-    apiMatcher('/aglb*'),
+    apiMatcher('/aclb*'),
     paginateResponse(loadBalancers)
   );
 };
@@ -50,7 +50,7 @@ export const mockGetLoadBalancers = (loadBalancers: Loadbalancer[]) => {
  * @returns Cypress chainable.
  */
 export const mockDeleteLoadBalancer = (loadBalancerId: number) => {
-  return cy.intercept('DELETE', apiMatcher(`/aglb/${loadBalancerId}`), {});
+  return cy.intercept('DELETE', apiMatcher(`/aclb/${loadBalancerId}`), {});
 };
 
 /**
@@ -68,7 +68,7 @@ export const mockDeleteLoadBalancerError = (
   const defaultMessage = 'An error occurred while deleting Load Balancer.';
   return cy.intercept(
     'DELETE',
-    apiMatcher(`/aglb/${loadBalancerId}`),
+    apiMatcher(`/aclb/${loadBalancerId}`),
     makeErrorResponse(message ?? defaultMessage, 500)
   );
 };
@@ -87,7 +87,7 @@ export const mockGetLoadBalancerConfigurations = (
 ) => {
   return cy.intercept(
     'GET',
-    apiMatcher(`/aglb/${loadBalancerId}/configurations*`),
+    apiMatcher(`/aclb/${loadBalancerId}/configurations*`),
     paginateResponse(configurations)
   );
 };
@@ -106,7 +106,7 @@ export const mockDeleteLoadBalancerConfiguration = (
 ) => {
   return cy.intercept(
     'DELETE',
-    apiMatcher(`/aglb/${loadBalancerId}/configurations/${configId}`),
+    apiMatcher(`/aclb/${loadBalancerId}/configurations/${configId}`),
     {}
   );
 };
@@ -126,7 +126,7 @@ export const mockDeleteLoadBalancerConfigurationError = (
 ) => {
   return cy.intercept(
     'DELETE',
-    apiMatcher(`/aglb/${loadBalancerId}/configurations/${configId}`),
+    apiMatcher(`/aclb/${loadBalancerId}/configurations/${configId}`),
     makeResponse({ errors: [{ reason: error }] }, 500)
   );
 };
@@ -145,7 +145,7 @@ export const mockCreateLoadBalancerConfiguration = (
 ) => {
   return cy.intercept(
     'POST',
-    apiMatcher(`/aglb/${loadBalancerId}/configurations`),
+    apiMatcher(`/aclb/${loadBalancerId}/configurations`),
     makeResponse(configuration)
   );
 };
@@ -164,7 +164,7 @@ export const mockUpdateLoadBalancerConfiguration = (
 ) => {
   return cy.intercept(
     'PUT',
-    apiMatcher(`/aglb/${loadBalancerId}/configurations/${configuration.id}`),
+    apiMatcher(`/aclb/${loadBalancerId}/configurations/${configuration.id}`),
     makeResponse(configuration)
   );
 };
@@ -184,7 +184,7 @@ export const mockUpdateLoadBalancerConfigurationError = (
 ) => {
   return cy.intercept(
     'PUT',
-    apiMatcher(`/aglb/${loadBalancerId}/configurations/${configurationId}`),
+    apiMatcher(`/aclb/${loadBalancerId}/configurations/${configurationId}`),
     makeResponse({ errors }, 400)
   );
 };
@@ -203,7 +203,7 @@ export const mockCreateLoadBalancerConfigurationError = (
 ) => {
   return cy.intercept(
     'POST',
-    apiMatcher(`/aglb/${loadBalancerId}/configurations`),
+    apiMatcher(`/aclb/${loadBalancerId}/configurations`),
     makeResponse({ errors }, 500)
   );
 };
@@ -222,7 +222,7 @@ export const mockGetLoadBalancerCertificates = (
 ) => {
   return cy.intercept(
     'GET',
-    apiMatcher(`/aglb/${loadBalancerId}/certificates*`),
+    apiMatcher(`/aclb/${loadBalancerId}/certificates*`),
     paginateResponse(certificates)
   );
 };
@@ -240,7 +240,7 @@ export const mockUploadLoadBalancerCertificate = (
 ) => {
   return cy.intercept(
     'POST',
-    apiMatcher(`/aglb/${loadBalancerId}/certificates`),
+    apiMatcher(`/aclb/${loadBalancerId}/certificates`),
     makeResponse(certificate)
   );
 };
@@ -259,7 +259,7 @@ export const mockDeleteLoadBalancerCertificate = (
 ) => {
   return cy.intercept(
     'DELETE',
-    apiMatcher(`/aglb/${loadBalancerId}/certificates/${certificateId}`),
+    apiMatcher(`/aclb/${loadBalancerId}/certificates/${certificateId}`),
     makeResponse()
   );
 };
@@ -282,7 +282,7 @@ export const mockDeleteLoadBalancerCertificateError = (
     'An error occurred while deleting Load Balancer certificate.';
   return cy.intercept(
     'DELETE',
-    apiMatcher(`/aglb/${loadBalancerId}/certificates/${certificateId}`),
+    apiMatcher(`/aclb/${loadBalancerId}/certificates/${certificateId}`),
     makeErrorResponse(message ?? defaultMessage, 500)
   );
 };
@@ -300,7 +300,7 @@ export const mockUpdateLoadBalancerCertificate = (
 ) => {
   return cy.intercept(
     'PUT',
-    apiMatcher(`/aglb/${loadBalancerId}/certificates/${certificate.id}`),
+    apiMatcher(`/aclb/${loadBalancerId}/certificates/${certificate.id}`),
     makeResponse(certificate)
   );
 };
@@ -319,7 +319,7 @@ export const mockGetServiceTargets = (
 ) => {
   return cy.intercept(
     'GET',
-    apiMatcher(`/aglb/${loadBalancer.id}/service-targets*`),
+    apiMatcher(`/aclb/${loadBalancer.id}/service-targets*`),
     paginateResponse(serviceTargets)
   );
 };
@@ -335,7 +335,7 @@ export const mockGetServiceTargetsError = (message?: string) => {
   const defaultMessage = 'An error occurred while retrieving service targets';
   return cy.intercept(
     'GET',
-    apiMatcher('/aglb/service-targets*'),
+    apiMatcher('/aclb/service-targets*'),
     makeErrorResponse(message ?? defaultMessage, 500)
   );
 };
@@ -354,7 +354,7 @@ export const mockCreateServiceTarget = (
 ) => {
   return cy.intercept(
     'POST',
-    apiMatcher(`/aglb/${loadBalancer.id}/service-targets`),
+    apiMatcher(`/aclb/${loadBalancer.id}/service-targets`),
     makeResponse(serviceTarget)
   );
 };
@@ -373,7 +373,7 @@ export const mockUpdateServiceTarget = (
 ) => {
   return cy.intercept(
     'PUT',
-    apiMatcher(`/aglb/${loadBalancer.id}/service-targets/${serviceTarget.id}`),
+    apiMatcher(`/aclb/${loadBalancer.id}/service-targets/${serviceTarget.id}`),
     makeResponse(serviceTarget)
   );
 };
@@ -389,7 +389,7 @@ export const mockUpdateServiceTarget = (
 export const mockCreateRoute = (loadBalancer: Loadbalancer, route: Route) => {
   return cy.intercept(
     'POST',
-    apiMatcher(`/aglb/${loadBalancer.id}/routes`),
+    apiMatcher(`/aclb/${loadBalancer.id}/routes`),
     makeResponse(route)
   );
 };
@@ -408,7 +408,7 @@ export const mockGetLoadBalancerRoutes = (
 ) => {
   return cy.intercept(
     'GET',
-    apiMatcher(`/aglb/${loadBalancerId}/routes*`),
+    apiMatcher(`/aclb/${loadBalancerId}/routes*`),
     paginateResponse(routes)
   );
 };
@@ -427,7 +427,7 @@ export const mockGetLoadBalancerServiceTargets = (
 ) => {
   return cy.intercept(
     'GET',
-    apiMatcher(`/aglb/${loadBalancerId}/service-targets*`),
+    apiMatcher(`/aclb/${loadBalancerId}/service-targets*`),
     paginateResponse(serviceTargets)
   );
 };
@@ -443,7 +443,7 @@ export const mockGetLoadBalancerServiceTargets = (
 export const mockUpdateRoute = (loadBalancer: Loadbalancer, route: Route) => {
   return cy.intercept(
     'PUT',
-    apiMatcher(`/aglb/${loadBalancer.id}/routes/${route.id}`),
+    apiMatcher(`/aclb/${loadBalancer.id}/routes/${route.id}`),
     makeResponse(route)
   );
 };
@@ -462,7 +462,7 @@ export const mockUpdateRouteError = (
 ) => {
   return cy.intercept(
     'PUT',
-    apiMatcher(`/aglb/${loadBalancer.id}/routes/${route.id}`),
+    apiMatcher(`/aclb/${loadBalancer.id}/routes/${route.id}`),
     makeResponse(
       {
         errors: [
diff --git a/packages/manager/cypress/support/intercepts/object-storage.ts b/packages/manager/cypress/support/intercepts/object-storage.ts
index 3996a18a3e3..f993da79d73 100644
--- a/packages/manager/cypress/support/intercepts/object-storage.ts
+++ b/packages/manager/cypress/support/intercepts/object-storage.ts
@@ -51,6 +51,25 @@ export const mockGetBuckets = (
   );
 };
 
+/**
+ * Intercepts GET request to fetch buckets for a region and mocks response.
+ *
+ * @param regionId - ID of region for which to mock buckets.
+ * @param buckets - Array of Bucket objects with which to mock response.
+ *
+ * @returns Cypress chainable.
+ */
+export const mockGetBucketsForRegion = (
+  regionId: string,
+  buckets: ObjectStorageBucket[]
+): Cypress.Chainable<null> => {
+  return cy.intercept(
+    'GET',
+    apiMatcher(`object-storage/buckets/${regionId}*`),
+    paginateResponse(buckets)
+  );
+};
+
 /**
  * Intercepts POST request to create bucket.
  *
@@ -352,6 +371,23 @@ export const mockCreateAccessKey = (
   );
 };
 
+/**
+ * Intercepts request to update an Object Storage Access Key and mocks response.
+ *
+ * @param updatedAccessKey - Access key with which to mock response.
+ *
+ * @returns Cypress chainable.
+ */
+export const mockUpdateAccessKey = (
+  updatedAccessKey: ObjectStorageKey
+): Cypress.Chainable<null> => {
+  return cy.intercept(
+    'PUT',
+    apiMatcher(`object-storage/keys/${updatedAccessKey.id}`),
+    makeResponse(updatedAccessKey)
+  );
+};
+
 /**
  * Intercepts object storage access key DELETE request and mocks success response.
  *
diff --git a/packages/manager/package.json b/packages/manager/package.json
index 619861d2364..1f86cacdb8d 100644
--- a/packages/manager/package.json
+++ b/packages/manager/package.json
@@ -2,7 +2,7 @@
   "name": "linode-manager",
   "author": "Linode",
   "description": "The Linode Manager website",
-  "version": "1.112.0",
+  "version": "1.113.0",
   "private": true,
   "type": "module",
   "bugs": {
@@ -27,7 +27,6 @@
     "axios": "~1.6.5",
     "braintree-web": "^3.92.2",
     "chart.js": "~2.9.4",
-    "chartjs-adapter-luxon": "^0.2.1",
     "copy-to-clipboard": "^3.0.8",
     "country-region-data": "^1.4.5",
     "flag-icons": "^6.6.5",
@@ -39,11 +38,11 @@
     "ipaddr.js": "^1.9.1",
     "jspdf": "^2.3.1",
     "jspdf-autotable": "^3.5.14",
-    "launchdarkly-react-client-sdk": "^3.0.6",
+    "launchdarkly-react-client-sdk": "3.0.10",
     "libphonenumber-js": "^1.10.6",
     "lodash": "^4.17.21",
     "logic-query-parser": "^0.0.5",
-    "luxon": "^3.2.1",
+    "luxon": "3.4.4",
     "markdown-it": "^12.3.2",
     "md5": "^2.2.1",
     "notistack": "^2.0.5",
@@ -58,7 +57,7 @@
     "react-number-format": "^3.5.0",
     "react-query": "^3.3.2",
     "react-redux": "~7.1.3",
-    "react-router-dom": "~5.1.2",
+    "react-router-dom": "~5.3.4",
     "react-router-hash-link": "^2.3.1",
     "react-select": "~3.1.0",
     "react-vnc": "^0.5.3",
@@ -85,6 +84,7 @@
     "start:ci": "yarn serve ./build -p 3000 -s --cors",
     "lint": "yarn run eslint . --ext .js,.ts,.tsx --quiet",
     "build": "node scripts/prebuild.mjs && vite build",
+    "build:analyze": "bunx vite-bundle-visualizer",
     "precommit": "lint-staged && yarn typecheck",
     "test": "vitest run",
     "test:debug": "node --inspect-brk scripts/test.js --runInBand",
@@ -129,13 +129,12 @@
     "@types/chai-string": "^1.4.5",
     "@types/chart.js": "^2.9.21",
     "@types/css-mediaquery": "^0.1.1",
-    "@types/enzyme": "^3.9.3",
     "@types/he": "^1.1.0",
     "@types/highlight.js": "~10.1.0",
     "@types/jest-axe": "^3.5.7",
     "@types/jsdom": "^21.1.4",
     "@types/jspdf": "^1.3.3",
-    "@types/luxon": "^3.2.0",
+    "@types/luxon": "3.4.2",
     "@types/markdown-it": "^10.0.2",
     "@types/md5": "^2.1.32",
     "@types/mocha": "^10.0.2",
@@ -147,7 +146,7 @@
     "@types/react-csv": "^1.1.3",
     "@types/react-dom": "^17.0.9",
     "@types/react-redux": "~7.1.7",
-    "@types/react-router-dom": "~5.1.2",
+    "@types/react-router-dom": "~5.3.3",
     "@types/react-router-hash-link": "^1.2.1",
     "@types/react-select": "^3.0.11",
     "@types/recompose": "^0.30.0",
@@ -172,8 +171,6 @@
     "cypress-real-events": "^1.11.0",
     "cypress-vite": "^1.5.0",
     "dotenv": "^16.0.3",
-    "enzyme": "^3.10.0",
-    "enzyme-adapter-react-16": "^1.14.0",
     "eslint": "^6.8.0",
     "eslint-config-prettier": "~8.1.0",
     "eslint-plugin-cypress": "^2.11.3",
@@ -189,7 +186,6 @@
     "eslint-plugin-storybook": "^0.6.15",
     "eslint-plugin-testing-library": "^3.1.2",
     "eslint-plugin-xss": "^0.1.10",
-    "simple-git": "^3.19.0",
     "factory.ts": "^0.5.1",
     "glob": "^10.3.1",
     "jest-axe": "^8.0.0",
@@ -199,9 +195,11 @@
     "mocha-junit-reporter": "^2.2.1",
     "msw": "~1.3.2",
     "prettier": "~2.2.1",
+    "react-test-renderer": "16.14.0",
     "redux-mock-store": "^1.5.3",
     "reselect-tools": "^0.0.7",
     "serve": "^14.0.1",
+    "simple-git": "^3.19.0",
     "storybook": "^7.6.10",
     "storybook-dark-mode": "^3.0.3",
     "ts-node": "^10.9.2",
diff --git a/packages/manager/public/assets/jupyter.svg b/packages/manager/public/assets/jupyter.svg
new file mode 100644
index 00000000000..959b69e5299
--- /dev/null
+++ b/packages/manager/public/assets/jupyter.svg
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 28.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 243.7 243.7" style="enable-background:new 0 0 243.7 243.7;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#4E4E4E;}
+	.st1{fill:#767677;}
+	.st2{fill:#F37726;}
+	.st3{fill:#9E9E9E;}
+	.st4{fill:#616262;}
+</style>
+<g>
+	<g id="g">
+		<path id="path0_fill" class="st0" d="M27.9,127.5c0,7.7-0.5,10.1-1.9,11.5c-1.9,1.4-3.8,2.4-6.2,2.4l0.5,4.3
+			c3.4,0,7.2-1.4,9.6-3.4c1.4-1.9,2.4-3.8,3.4-6.2c0.5-2.4,1-4.3,0.5-6.7v-28.3h-5.8V127.5L27.9,127.5z"/>
+		<path id="path1_fill" class="st0" d="M70.5,124.2c0,3.4,0,6.2,0.5,8.6h-5.3l-0.5-5.3c-1,1.9-2.4,3.4-4.3,4.3s-3.8,1.4-5.8,1.4
+			c-4.8,0-11-2.9-11-13.4v-18.2h5.8v17.3c0,5.8,1.9,10.1,7.2,10.1c1,0,1.9,0,2.9-0.5c1-0.5,1.9-1,2.4-1.9c1-1,1.4-1.4,1.9-2.4
+			s0.5-1.9,0.5-2.9v-19.2h5.8V124.2L70.5,124.2z"/>
+		<path id="path2_fill" class="st0" d="M81.1,111.7c0-3.8,0-7.2-0.5-10.1h5.3l0.5,5.3c1-1.9,2.9-3.4,4.8-4.8c1.9-1,4.3-1.4,6.2-1.4
+			c7.7,0,13.4,6.2,13.4,15.8c0,11-6.7,16.8-14.4,16.8c-1.9,0-3.8-0.5-5.3-1c-1.9-1-3.4-1.9-4.3-3.8l0,0v17.3h-5.8V111.7L81.1,111.7z
+			 M86.8,120.3c0,1,0,1.4,0.5,2.4c0.5,1.9,1.4,3.4,3.4,4.8c1.4,1,3.4,1.9,5.3,1.9c6.2,0,9.6-4.8,9.6-12c0-6.2-3.4-11.5-9.1-11.5
+			c-2.4,0-4.8,1.4-6.2,2.9s-2.4,3.8-2.9,6.2v5.3H86.8z"/>
+		<path id="path3_fill" class="st0" d="M120.9,101.6l6.7,18.2c1,1.9,1.4,4.3,1.9,6.2c0.5-1.9,1.4-4.3,1.9-6.7l6.2-18.2h6.2
+			l-8.2,22.5c-4.3,10.6-6.7,16.3-11,19.7c-1.9,1.9-4.3,2.9-7.2,3.8l-1.4-4.8c1.9-0.5,3.4-1.4,4.8-2.9c1.9-1.9,3.8-3.8,4.8-6.2
+			c0-0.5,0.5-1,0.5-1.4c0-0.5,0-1-0.5-1.4l-11.5-28.8L120.9,101.6L120.9,101.6z"/>
+		<path id="path4_fill" class="st0" d="M159.3,92.5v9.1h8.2v4.3h-8.2v16.8c0,3.8,1,6.2,4.3,6.2c1,0,2.4,0,3.4-0.5l0.5,4.3
+			c-1.9,0.5-3.4,1-5.3,0.5c-1,0-2.4,0-3.4-0.5s-1.9-1-2.9-1.9c-1.9-2.4-2.4-5.3-2.4-8.2v-17.3h-4.8v-4.3h4.8v-7.7L159.3,92.5z"/>
+		<path id="path5_fill" class="st0" d="M178,118.4c0,1.4,0,2.9,0.5,4.3s1.4,2.4,2.4,3.8c1,1,2.4,1.9,3.8,2.4
+			c1.4,0.5,2.9,0.5,4.3,0.5c2.9,0,5.8-0.5,8.6-1.4l1,4.3c-3.4,1.4-6.7,1.9-10.6,1.9c-1.9,0-4.3,0-6.2-1c-1.9-1-3.8-1.9-5.3-3.4
+			c-1.4-1.4-2.4-3.4-3.4-5.3c-0.5-1.9-1-3.8-1-6.2c0-9.6,5.8-16.8,14.9-16.8c10.1,0,12.9,9.1,12.9,14.9c0,1,0,1.9,0,2.9L178,118.4
+			L178,118.4z M194.7,114.1c0-1,0-2.4-0.5-3.4s-1-1.9-1.4-2.9c-1-1-1.9-1.4-2.9-1.9c-1-0.5-2.4-1-3.4-1c-2.4,0-4.3,1.4-6.2,2.9
+			c-1.4,1.9-2.4,3.8-2.4,6.2C178,114.1,194.7,114.1,194.7,114.1z"/>
+		<path id="path6_fill" class="st0" d="M208.7,111.2c0-3.8,0-6.7-0.5-9.6h5.3v6.2h0.5c0.5-1.9,1.4-3.4,3.4-4.8
+			c1.4-1.4,3.4-1.9,5.3-1.9c0.5,0,1,0,1.4,0v5.3c-0.5,0-1.4,0-1.9,0c-1.9,0-3.8,1-5.3,2.4c-1.4,1.4-2.4,3.4-2.4,5.3
+			c0,1-0.5,1.9-0.5,2.9v16.8h-5.3V111.2L208.7,111.2z"/>
+	</g>
+	<g>
+		<path id="path7_fill" class="st1" d="M206.3,15.8c0,2.9-0.5,5.8-1.9,8.2c-1.4,2.4-3.8,4.3-6.2,5.8s-5.3,1.9-8.2,1.4
+			c-2.9-0.5-5.3-1.4-7.7-3.4c-2.4-1.9-3.8-4.8-4.3-7.7c-0.5-2.9-0.5-5.8,0.5-8.6s2.9-5.3,5.3-6.7c2.4-1.9,5.3-2.9,8.2-2.9
+			c1.9,0,3.8,0,5.8,1c1.9,0.5,3.4,1.4,4.8,2.9c1.4,1.4,2.4,2.9,3.4,4.3C206.7,11.5,206.3,13.9,206.3,15.8L206.3,15.8z"/>
+		<path id="path8_fill" class="st2" d="M121.9,183.1c-38.4,0-72.4-13.9-89.7-34.1c6.7,18.2,19.2,34.1,35,45.1s35,17.3,54.7,17.3
+			s38.4-5.8,54.7-17.3c15.8-11,28.3-26.9,35-45.1C194.3,169.2,160.7,183.1,121.9,183.1z"/>
+		<path id="path9_fill" class="st2" d="M121.9,50.8c38.4,0,72.4,13.9,89.7,34.1c-6.7-18.2-19.2-34.1-35-45.1
+			c-15.8-11.5-35-17.3-54.7-17.3s-38.4,5.8-54.7,17.3c-15.8,11-28.3,26.9-35,45.1C49.9,64.2,83.5,50.8,121.9,50.8z"/>
+		<path id="path10_fill" class="st3" d="M69.1,223c0,3.8-0.5,7.2-2.4,10.6c-1.9,2.9-4.8,5.3-8.2,6.7c-3.4,1.4-6.7,1.9-10.6,1.4
+			c-3.4-0.5-6.7-1.9-9.6-4.3s-4.8-5.8-5.3-9.1c-1-3.4-0.5-7.2,0.5-10.6c1.4-3.4,3.4-6.2,6.2-8.6c2.9-1.9,6.2-3.4,10.1-3.4
+			c2.4,0,4.8,0,7.2,1c2.4,1,4.3,1.9,6.2,3.8c1.9,1.9,3.4,3.4,4.3,5.8C68.1,218.2,68.6,220.6,69.1,223L69.1,223z"/>
+		<path id="path11_fill" class="st4" d="M36.5,46c-1.9,0-4.3-0.5-5.8-1.4c-1.9-1-3.4-2.9-3.8-4.8c-1-1.9-1.4-3.8-1-5.8
+			c0.5-1.9,1.4-3.8,2.9-5.3c1.4-1.4,3.4-2.4,5.3-2.9c1.9-1,3.8-1,5.8,0c1.9,1,3.8,1.9,4.8,3.8c1.4,1.4,1.9,3.8,1.9,5.8
+			c0,2.9-1,5.8-2.9,7.7C42.2,44.5,39.4,46,36.5,46z"/>
+	</g>
+</g>
+</svg>
diff --git a/packages/manager/public/assets/nats.svg b/packages/manager/public/assets/nats.svg
new file mode 100644
index 00000000000..d9f01a213ac
--- /dev/null
+++ b/packages/manager/public/assets/nats.svg
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 28.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 243.7 243.7" style="enable-background:new 0 0 243.7 243.7;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#34A574;}
+	.st1{fill:#27AAE1;}
+	.st2{fill:#8DC63F;}
+	.st3{fill:#375C93;}
+	.st4{fill:#FFFFFF;}
+</style>
+<g>
+	<rect x="122.6" class="st0" width="117.1" height="94.9"/>
+	<rect x="5.5" class="st1" width="117.1" height="94.9"/>
+	<rect x="122.6" y="95" class="st2" width="117.1" height="94.9"/>
+	<rect x="5.5" y="95" class="st3" width="117.1" height="94.9"/>
+	<polygon class="st2" points="105.4,189.4 162.7,242.4 162.7,189.4 	"/>
+	<polygon class="st3" points="122.6,189.4 123.2,206.1 104.9,188.9 	"/>
+</g>
+<g>
+	<path class="st4" d="M171.1,122.7V44.2h28v101.6h-42.4l-85.6-80v80H43V44.2h43.9L171.1,122.7z"/>
+</g>
+</svg>
diff --git a/packages/manager/public/assets/white/jupyter.svg b/packages/manager/public/assets/white/jupyter.svg
new file mode 100644
index 00000000000..bf2c5ca816d
--- /dev/null
+++ b/packages/manager/public/assets/white/jupyter.svg
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 28.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 243.7 243.7" style="enable-background:new 0 0 243.7 243.7;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#FFFFFF;}
+</style>
+<g>
+	<g id="g">
+		<path id="path0_fill" class="st0" d="M27.9,127.5c0,7.7-0.5,10.1-1.9,11.5c-1.9,1.4-3.8,2.4-6.2,2.4l0.5,4.3
+			c3.4,0,7.2-1.4,9.6-3.4c1.4-1.9,2.4-3.8,3.4-6.2c0.5-2.4,1-4.3,0.5-6.7v-28.3h-5.8V127.5L27.9,127.5z"/>
+		<path id="path1_fill" class="st0" d="M70.5,124.2c0,3.4,0,6.2,0.5,8.6h-5.3l-0.5-5.3c-1,1.9-2.4,3.4-4.3,4.3s-3.8,1.4-5.8,1.4
+			c-4.8,0-11-2.9-11-13.4v-18.2h5.8v17.3c0,5.8,1.9,10.1,7.2,10.1c1,0,1.9,0,2.9-0.5c1-0.5,1.9-1,2.4-1.9c1-1,1.4-1.4,1.9-2.4
+			s0.5-1.9,0.5-2.9v-19.2h5.8V124.2L70.5,124.2z"/>
+		<path id="path2_fill" class="st0" d="M81.1,111.7c0-3.8,0-7.2-0.5-10.1h5.3l0.5,5.3c1-1.9,2.9-3.4,4.8-4.8c1.9-1,4.3-1.4,6.2-1.4
+			c7.7,0,13.4,6.2,13.4,15.8c0,11-6.7,16.8-14.4,16.8c-1.9,0-3.8-0.5-5.3-1c-1.9-1-3.4-1.9-4.3-3.8l0,0v17.3h-5.8V111.7L81.1,111.7z
+			 M86.8,120.3c0,1,0,1.4,0.5,2.4c0.5,1.9,1.4,3.4,3.4,4.8c1.4,1,3.4,1.9,5.3,1.9c6.2,0,9.6-4.8,9.6-12c0-6.2-3.4-11.5-9.1-11.5
+			c-2.4,0-4.8,1.4-6.2,2.9s-2.4,3.8-2.9,6.2v5.3H86.8z"/>
+		<path id="path3_fill" class="st0" d="M120.9,101.6l6.7,18.2c1,1.9,1.4,4.3,1.9,6.2c0.5-1.9,1.4-4.3,1.9-6.7l6.2-18.2h6.2
+			l-8.2,22.5c-4.3,10.6-6.7,16.3-11,19.7c-1.9,1.9-4.3,2.9-7.2,3.8l-1.4-4.8c1.9-0.5,3.4-1.4,4.8-2.9c1.9-1.9,3.8-3.8,4.8-6.2
+			c0-0.5,0.5-1,0.5-1.4c0-0.5,0-1-0.5-1.4l-11.5-28.8L120.9,101.6L120.9,101.6z"/>
+		<path id="path4_fill" class="st0" d="M159.3,92.5v9.1h8.2v4.3h-8.2v16.8c0,3.8,1,6.2,4.3,6.2c1,0,2.4,0,3.4-0.5l0.5,4.3
+			c-1.9,0.5-3.4,1-5.3,0.5c-1,0-2.4,0-3.4-0.5s-1.9-1-2.9-1.9c-1.9-2.4-2.4-5.3-2.4-8.2v-17.3h-4.8v-4.3h4.8v-7.7L159.3,92.5z"/>
+		<path id="path5_fill" class="st0" d="M178,118.4c0,1.4,0,2.9,0.5,4.3s1.4,2.4,2.4,3.8c1,1,2.4,1.9,3.8,2.4
+			c1.4,0.5,2.9,0.5,4.3,0.5c2.9,0,5.8-0.5,8.6-1.4l1,4.3c-3.4,1.4-6.7,1.9-10.6,1.9c-1.9,0-4.3,0-6.2-1c-1.9-1-3.8-1.9-5.3-3.4
+			c-1.4-1.4-2.4-3.4-3.4-5.3c-0.5-1.9-1-3.8-1-6.2c0-9.6,5.8-16.8,14.9-16.8c10.1,0,12.9,9.1,12.9,14.9c0,1,0,1.9,0,2.9L178,118.4
+			L178,118.4z M194.7,114.1c0-1,0-2.4-0.5-3.4s-1-1.9-1.4-2.9c-1-1-1.9-1.4-2.9-1.9c-1-0.5-2.4-1-3.4-1c-2.4,0-4.3,1.4-6.2,2.9
+			c-1.4,1.9-2.4,3.8-2.4,6.2C178,114.1,194.7,114.1,194.7,114.1z"/>
+		<path id="path6_fill" class="st0" d="M208.7,111.2c0-3.8,0-6.7-0.5-9.6h5.3v6.2h0.5c0.5-1.9,1.4-3.4,3.4-4.8
+			c1.4-1.4,3.4-1.9,5.3-1.9c0.5,0,1,0,1.4,0v5.3c-0.5,0-1.4,0-1.9,0c-1.9,0-3.8,1-5.3,2.4c-1.4,1.4-2.4,3.4-2.4,5.3
+			c0,1-0.5,1.9-0.5,2.9v16.8h-5.3V111.2L208.7,111.2z"/>
+	</g>
+	<g>
+		<path id="path7_fill" class="st0" d="M206.3,15.8c0,2.9-0.5,5.8-1.9,8.2c-1.4,2.4-3.8,4.3-6.2,5.8s-5.3,1.9-8.2,1.4
+			c-2.9-0.5-5.3-1.4-7.7-3.4c-2.4-1.9-3.8-4.8-4.3-7.7c-0.5-2.9-0.5-5.8,0.5-8.6s2.9-5.3,5.3-6.7c2.4-1.9,5.3-2.9,8.2-2.9
+			c1.9,0,3.8,0,5.8,1c1.9,0.5,3.4,1.4,4.8,2.9c1.4,1.4,2.4,2.9,3.4,4.3C206.7,11.5,206.3,13.9,206.3,15.8L206.3,15.8z"/>
+		<path id="path8_fill" class="st0" d="M121.9,183.1c-38.4,0-72.4-13.9-89.7-34.1c6.7,18.2,19.2,34.1,35,45.1s35,17.3,54.7,17.3
+			s38.4-5.8,54.7-17.3c15.8-11,28.3-26.9,35-45.1C194.3,169.2,160.7,183.1,121.9,183.1z"/>
+		<path id="path9_fill" class="st0" d="M121.9,50.8c38.4,0,72.4,13.9,89.7,34.1c-6.7-18.2-19.2-34.1-35-45.1
+			c-15.8-11.5-35-17.3-54.7-17.3s-38.4,5.8-54.7,17.3c-15.8,11-28.3,26.9-35,45.1C49.9,64.2,83.5,50.8,121.9,50.8z"/>
+		<path id="path10_fill" class="st0" d="M69.1,223c0,3.8-0.5,7.2-2.4,10.6c-1.9,2.9-4.8,5.3-8.2,6.7c-3.4,1.4-6.7,1.9-10.6,1.4
+			c-3.4-0.5-6.7-1.9-9.6-4.3s-4.8-5.8-5.3-9.1c-1-3.4-0.5-7.2,0.5-10.6c1.4-3.4,3.4-6.2,6.2-8.6c2.9-1.9,6.2-3.4,10.1-3.4
+			c2.4,0,4.8,0,7.2,1c2.4,1,4.3,1.9,6.2,3.8c1.9,1.9,3.4,3.4,4.3,5.8C68.1,218.2,68.6,220.6,69.1,223L69.1,223z"/>
+		<path id="path11_fill" class="st0" d="M36.5,46c-1.9,0-4.3-0.5-5.8-1.4c-1.9-1-3.4-2.9-3.8-4.8c-1-1.9-1.4-3.8-1-5.8
+			c0.5-1.9,1.4-3.8,2.9-5.3c1.4-1.4,3.4-2.4,5.3-2.9c1.9-1,3.8-1,5.8,0c1.9,1,3.8,1.9,4.8,3.8c1.4,1.4,1.9,3.8,1.9,5.8
+			c0,2.9-1,5.8-2.9,7.7C42.2,44.5,39.4,46,36.5,46z"/>
+	</g>
+</g>
+</svg>
diff --git a/packages/manager/public/assets/white/nats.svg b/packages/manager/public/assets/white/nats.svg
new file mode 100644
index 00000000000..246e6d1e4cf
--- /dev/null
+++ b/packages/manager/public/assets/white/nats.svg
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 28.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 243.7 243.7" style="enable-background:new 0 0 243.7 243.7;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:none;}
+	.st1{fill:#FFFFFF;}
+</style>
+<g>
+	<polygon class="st0" points="71.1,94.9 71.1,95 102.3,95 102.2,94.9 	"/>
+	<polygon class="st0" points="141.4,95 171.1,95 171.1,94.9 141.3,94.9 	"/>
+	<path class="st1" d="M122.6,0H5.5v90.5v4.4v95H106l56.7,52.5v-52.5h77V98.5V95V0H122.6z M199.1,95v3.5v47.3h-42.4l-34.1-31.9
+		l-20.4-19h0L71.1,65.8v25.9v3.2v50.9H43V94.9v-4.4V44.2h43.9l35.7,33.3l16.1,15l0,0l32.4,30.2V94.9v-3.6V44.2h28V95z"/>
+</g>
+</svg>
diff --git a/packages/manager/src/App.tsx b/packages/manager/src/App.tsx
index 1247e6972c0..04c31a7aff0 100644
--- a/packages/manager/src/App.tsx
+++ b/packages/manager/src/App.tsx
@@ -6,7 +6,6 @@ import {
   DocumentTitleSegment,
   withDocumentTitleProvider,
 } from 'src/components/DocumentTitle';
-import withFeatureFlagConsumer from 'src/containers/withFeatureFlagConsumer.container';
 import withFeatureFlagProvider from 'src/containers/withFeatureFlagProvider.container';
 import TheApplicationIsOnFire from 'src/features/TheApplicationIsOnFire';
 
@@ -23,37 +22,35 @@ import { useSetupFeatureFlags } from './useSetupFeatureFlags';
 export const App = () => <BaseApp />;
 
 const BaseApp = withDocumentTitleProvider(
-  withFeatureFlagProvider(
-    withFeatureFlagConsumer(() => {
-      const { isLoading } = useInitialRequests();
-
-      const { areFeatureFlagsLoading } = useSetupFeatureFlags();
-
-      if (isLoading || areFeatureFlagsLoading) {
-        return <SplashScreen />;
-      }
-
-      return (
-        <ErrorBoundary fallback={<TheApplicationIsOnFire />}>
-          {/** Accessibility helper */}
-          <a className="skip-link" href="#main-content">
-            Skip to main content
-          </a>
-          <div hidden>
-            <span id="new-window">Opens in a new window</span>
-            <span id="external-site">Opens an external site</span>
-            <span id="external-site-new-window">
-              Opens an external site in a new window
-            </span>
-          </div>
-          <GoTo />
-          <DocumentTitleSegment segment="Akamai Cloud Manager" />
-          <MainContent />
-          <GlobalListeners />
-        </ErrorBoundary>
-      );
-    })
-  )
+  withFeatureFlagProvider(() => {
+    const { isLoading } = useInitialRequests();
+
+    const { areFeatureFlagsLoading } = useSetupFeatureFlags();
+
+    if (isLoading || areFeatureFlagsLoading) {
+      return <SplashScreen />;
+    }
+
+    return (
+      <ErrorBoundary fallback={<TheApplicationIsOnFire />}>
+        {/** Accessibility helper */}
+        <a className="skip-link" href="#main-content">
+          Skip to main content
+        </a>
+        <div hidden>
+          <span id="new-window">Opens in a new window</span>
+          <span id="external-site">Opens an external site</span>
+          <span id="external-site-new-window">
+            Opens an external site in a new window
+          </span>
+        </div>
+        <GoTo />
+        <DocumentTitleSegment segment="Akamai Cloud Manager" />
+        <MainContent />
+        <GlobalListeners />
+      </ErrorBoundary>
+    );
+  })
 );
 
 const GlobalListeners = () => {
diff --git a/packages/manager/src/MainContent.tsx b/packages/manager/src/MainContent.tsx
index 5d11ba2b26d..0d762133050 100644
--- a/packages/manager/src/MainContent.tsx
+++ b/packages/manager/src/MainContent.tsx
@@ -29,6 +29,7 @@ import { isFeatureEnabled } from 'src/utilities/accountCapabilities';
 
 import { ENABLE_MAINTENANCE_MODE } from './constants';
 import { complianceUpdateContext } from './context/complianceUpdateContext';
+import { switchAccountSessionContext } from './context/switchAccountSessionContext';
 import { FlagSet } from './featureFlags';
 import { useIsACLBEnabled } from './features/LoadBalancers/utils';
 import { useGlobalErrors } from './hooks/useGlobalErrors';
@@ -192,6 +193,11 @@ export const MainContent = () => {
   const ComplianceUpdateProvider = complianceUpdateContext.Provider;
   const complianceUpdateContextValue = useDialogContext();
 
+  const SwitchAccountSessionProvider = switchAccountSessionContext.Provider;
+  const switchAccountSessionContextValue = useDialogContext({
+    isOpen: false,
+  });
+
   const [menuIsOpen, toggleMenu] = React.useState<boolean>(false);
   const {
     _isManagedAccount,
@@ -294,100 +300,105 @@ export const MainContent = () => {
    */
   return (
     <div className={classes.appFrame}>
-      <ComplianceUpdateProvider value={complianceUpdateContextValue}>
-        <NotificationProvider value={contextValue}>
-          <>
-            {shouldDisplayMainContentBanner ? (
-              <MainContentBanner
-                bannerKey={flags.mainContentBanner?.key ?? ''}
-                bannerText={flags.mainContentBanner?.text ?? ''}
-                linkText={flags.mainContentBanner?.link?.text ?? ''}
-                onClose={() => setBannerDismissed(true)}
-                url={flags.mainContentBanner?.link?.url ?? ''}
-              />
-            ) : null}
-            <SideMenu
-              closeMenu={() => toggleMenu(false)}
-              collapse={desktopMenuIsOpen || false}
-              open={menuIsOpen}
-            />
-            <div
-              className={cx(classes.content, {
-                [classes.fullWidthContent]:
-                  desktopMenuIsOpen ||
-                  (desktopMenuIsOpen && desktopMenuIsOpen === true),
-              })}
-            >
-              <TopMenu
-                desktopMenuToggle={desktopMenuToggle}
-                isSideMenuOpen={!desktopMenuIsOpen}
-                openSideMenu={() => toggleMenu(true)}
-                username={username}
+      <SwitchAccountSessionProvider value={switchAccountSessionContextValue}>
+        <ComplianceUpdateProvider value={complianceUpdateContextValue}>
+          <NotificationProvider value={contextValue}>
+            <>
+              {shouldDisplayMainContentBanner ? (
+                <MainContentBanner
+                  bannerKey={flags.mainContentBanner?.key ?? ''}
+                  bannerText={flags.mainContentBanner?.text ?? ''}
+                  linkText={flags.mainContentBanner?.link?.text ?? ''}
+                  onClose={() => setBannerDismissed(true)}
+                  url={flags.mainContentBanner?.link?.url ?? ''}
+                />
+              ) : null}
+              <SideMenu
+                closeMenu={() => toggleMenu(false)}
+                collapse={desktopMenuIsOpen || false}
+                open={menuIsOpen}
               />
-              <main
-                className={classes.cmrWrapper}
-                id="main-content"
-                role="main"
+              <div
+                className={cx(classes.content, {
+                  [classes.fullWidthContent]:
+                    desktopMenuIsOpen ||
+                    (desktopMenuIsOpen && desktopMenuIsOpen === true),
+                })}
               >
-                <Grid className={classes.grid} container spacing={0}>
-                  <Grid className={cx(classes.switchWrapper, 'p0')}>
-                    <GlobalNotifications />
-                    <React.Suspense fallback={<SuspenseLoader />}>
-                      <Switch>
-                        <Route component={LinodesRoutes} path="/linodes" />
-                        <Route
-                          component={PlacementGroups}
-                          path="/placement-groups"
-                        />
-                        <Route component={Volumes} path="/volumes" />
-                        <Redirect path="/volumes*" to="/volumes" />
-                        {isACLBEnabled && (
+                <TopMenu
+                  desktopMenuToggle={desktopMenuToggle}
+                  isSideMenuOpen={!desktopMenuIsOpen}
+                  openSideMenu={() => toggleMenu(true)}
+                  username={username}
+                />
+                <main
+                  className={classes.cmrWrapper}
+                  id="main-content"
+                  role="main"
+                >
+                  <Grid className={classes.grid} container spacing={0}>
+                    <Grid className={cx(classes.switchWrapper, 'p0')}>
+                      <GlobalNotifications />
+                      <React.Suspense fallback={<SuspenseLoader />}>
+                        <Switch>
+                          <Route component={LinodesRoutes} path="/linodes" />
+                          <Route
+                            component={PlacementGroups}
+                            path="/placement-groups"
+                          />
+                          <Route component={Volumes} path="/volumes" />
+                          <Redirect path="/volumes*" to="/volumes" />
+                          {isACLBEnabled && (
+                            <Route
+                              component={LoadBalancers}
+                              path="/loadbalancer*"
+                            />
+                          )}
+                          <Route
+                            component={NodeBalancers}
+                            path="/nodebalancers"
+                          />
+                          <Route component={Domains} path="/domains" />
+                          <Route component={Managed} path="/managed" />
+                          <Route component={Longview} path="/longview" />
+                          <Route component={Images} path="/images" />
+                          <Route
+                            component={StackScripts}
+                            path="/stackscripts"
+                          />
                           <Route
-                            component={LoadBalancers}
-                            path="/loadbalancer*"
+                            component={ObjectStorage}
+                            path="/object-storage"
                           />
-                        )}
-                        <Route
-                          component={NodeBalancers}
-                          path="/nodebalancers"
-                        />
-                        <Route component={Domains} path="/domains" />
-                        <Route component={Managed} path="/managed" />
-                        <Route component={Longview} path="/longview" />
-                        <Route component={Images} path="/images" />
-                        <Route component={StackScripts} path="/stackscripts" />
-                        <Route
-                          component={ObjectStorage}
-                          path="/object-storage"
-                        />
-                        <Route component={Kubernetes} path="/kubernetes" />
-                        <Route component={Account} path="/account" />
-                        <Route component={Profile} path="/profile" />
-                        <Route component={Help} path="/support" />
-                        <Route component={SearchLanding} path="/search" />
-                        <Route component={EventsLanding} path="/events" />
-                        <Route component={Firewalls} path="/firewalls" />
-                        {showDatabases && (
-                          <Route component={Databases} path="/databases" />
-                        )}
-                        {flags.selfServeBetas && (
-                          <Route component={BetaRoutes} path="/betas" />
-                        )}
-                        {showVPCs && <Route component={VPC} path="/vpcs" />}
-                        <Redirect exact from="/" to={defaultRoot} />
-                        {/** We don't want to break any bookmarks. This can probably be removed eventually. */}
-                        <Redirect from="/dashboard" to={defaultRoot} />
-                        <Route component={NotFound} />
-                      </Switch>
-                    </React.Suspense>
+                          <Route component={Kubernetes} path="/kubernetes" />
+                          <Route component={Account} path="/account" />
+                          <Route component={Profile} path="/profile" />
+                          <Route component={Help} path="/support" />
+                          <Route component={SearchLanding} path="/search" />
+                          <Route component={EventsLanding} path="/events" />
+                          <Route component={Firewalls} path="/firewalls" />
+                          {showDatabases && (
+                            <Route component={Databases} path="/databases" />
+                          )}
+                          {flags.selfServeBetas && (
+                            <Route component={BetaRoutes} path="/betas" />
+                          )}
+                          {showVPCs && <Route component={VPC} path="/vpcs" />}
+                          <Redirect exact from="/" to={defaultRoot} />
+                          {/** We don't want to break any bookmarks. This can probably be removed eventually. */}
+                          <Redirect from="/dashboard" to={defaultRoot} />
+                          <Route component={NotFound} />
+                        </Switch>
+                      </React.Suspense>
+                    </Grid>
                   </Grid>
-                </Grid>
-              </main>
-            </div>
-          </>
-        </NotificationProvider>
-        <Footer desktopMenuIsOpen={desktopMenuIsOpen} />
-      </ComplianceUpdateProvider>
+                </main>
+              </div>
+            </>
+          </NotificationProvider>
+          <Footer desktopMenuIsOpen={desktopMenuIsOpen} />
+        </ComplianceUpdateProvider>
+      </SwitchAccountSessionProvider>
     </div>
   );
 };
diff --git a/packages/manager/src/__data__/pageyProps.ts b/packages/manager/src/__data__/pageyProps.ts
deleted file mode 100644
index 71f9359d803..00000000000
--- a/packages/manager/src/__data__/pageyProps.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-import { PaginationProps } from 'src/components/Pagey';
-
-export const pageyProps: PaginationProps<any> = {
-  count: 3,
-  error: undefined,
-  filter: {},
-  handleOrderChange: vi.fn(),
-  handlePageChange: vi.fn(),
-  handlePageSizeChange: vi.fn(),
-  handleSearch: vi.fn(),
-  loading: false,
-  onDelete: vi.fn(),
-  order: 'asc' as 'asc' | 'desc',
-  orderBy: undefined,
-  page: 1,
-  pageSize: 25,
-  request: vi.fn(),
-  searching: false,
-};
diff --git a/packages/manager/src/__data__/regionsData.ts b/packages/manager/src/__data__/regionsData.ts
index 7f7220ad9cf..c8afbb336d6 100644
--- a/packages/manager/src/__data__/regionsData.ts
+++ b/packages/manager/src/__data__/regionsData.ts
@@ -1,57 +1,478 @@
 import { Region } from '@linode/api-v4/lib/regions';
 
-const resolvers = {
-  ipv4: '8.8.8.8',
-  ipv6: '2600:3c03::5',
-};
-
 export const regions: Region[] = [
   {
-    capabilities: ['Linodes', 'NodeBalancers', 'Block Storage'],
+    capabilities: [
+      'Linodes',
+      'NodeBalancers',
+      'Block Storage',
+      'GPU Linodes',
+      'Kubernetes',
+      'Cloud Firewall',
+      'Vlans',
+      'Block Storage Migrations',
+      'Managed Databases',
+    ],
     country: 'in',
     id: 'ap-west',
     label: 'Mumbai, IN',
-    resolvers,
+    maximum_pgs_per_customer: 5,
+    maximum_vms_per_pg: 10,
+    resolvers: {
+      ipv4:
+        '172.105.34.5, 172.105.35.5, 172.105.36.5, 172.105.37.5, 172.105.38.5, 172.105.39.5, 172.105.40.5, 172.105.41.5, 172.105.42.5, 172.105.43.5',
+      ipv6:
+        '2400:8904::f03c:91ff:fea5:659, 2400:8904::f03c:91ff:fea5:9282, 2400:8904::f03c:91ff:fea5:b9b3, 2400:8904::f03c:91ff:fea5:925a, 2400:8904::f03c:91ff:fea5:22cb, 2400:8904::f03c:91ff:fea5:227a, 2400:8904::f03c:91ff:fea5:924c, 2400:8904::f03c:91ff:fea5:f7e2, 2400:8904::f03c:91ff:fea5:2205, 2400:8904::f03c:91ff:fea5:9207',
+    },
     status: 'ok',
   },
   {
-    capabilities: ['Linodes', 'NodeBalancers', 'Block Storage'],
+    capabilities: [
+      'Linodes',
+      'NodeBalancers',
+      'Block Storage',
+      'Kubernetes',
+      'Cloud Firewall',
+      'Vlans',
+      'Block Storage Migrations',
+      'Managed Databases',
+    ],
+    country: 'ca',
+    id: 'ca-central',
+    label: 'Toronto, CA',
+    maximum_pgs_per_customer: 5,
+    maximum_vms_per_pg: 10,
+    resolvers: {
+      ipv4:
+        '172.105.0.5, 172.105.3.5, 172.105.4.5, 172.105.5.5, 172.105.6.5, 172.105.7.5, 172.105.8.5, 172.105.9.5, 172.105.10.5, 172.105.11.5',
+      ipv6:
+        '2600:3c04::f03c:91ff:fea9:f63, 2600:3c04::f03c:91ff:fea9:f6d, 2600:3c04::f03c:91ff:fea9:f80, 2600:3c04::f03c:91ff:fea9:f0f, 2600:3c04::f03c:91ff:fea9:f99, 2600:3c04::f03c:91ff:fea9:fbd, 2600:3c04::f03c:91ff:fea9:fdd, 2600:3c04::f03c:91ff:fea9:fe2, 2600:3c04::f03c:91ff:fea9:f68, 2600:3c04::f03c:91ff:fea9:f4a',
+    },
+    status: 'ok',
+  },
+  {
+    capabilities: [
+      'Linodes',
+      'NodeBalancers',
+      'Block Storage',
+      'Kubernetes',
+      'Cloud Firewall',
+      'Vlans',
+      'Block Storage Migrations',
+      'Managed Databases',
+    ],
     country: 'au',
     id: 'ap-southeast',
     label: 'Sydney, AU',
-    resolvers,
+    maximum_pgs_per_customer: 5,
+    maximum_vms_per_pg: 10,
+    resolvers: {
+      ipv4:
+        '172.105.166.5, 172.105.169.5, 172.105.168.5, 172.105.172.5, 172.105.162.5, 172.105.170.5, 172.105.167.5, 172.105.171.5, 172.105.181.5, 172.105.161.5',
+      ipv6:
+        '2400:8907::f03c:92ff:fe6e:ec8, 2400:8907::f03c:92ff:fe6e:98e4, 2400:8907::f03c:92ff:fe6e:1c58, 2400:8907::f03c:92ff:fe6e:c299, 2400:8907::f03c:92ff:fe6e:c210, 2400:8907::f03c:92ff:fe6e:c219, 2400:8907::f03c:92ff:fe6e:1c5c, 2400:8907::f03c:92ff:fe6e:c24e, 2400:8907::f03c:92ff:fe6e:e6b, 2400:8907::f03c:92ff:fe6e:e3d',
+    },
     status: 'ok',
   },
   {
-    capabilities: ['Linodes', 'NodeBalancers', 'Block Storage'],
-    country: 'ca',
-    id: 'ca-central',
-    label: 'Toronto, CA',
-    resolvers,
+    capabilities: [
+      'Linodes',
+      'NodeBalancers',
+      'Block Storage',
+      'Object Storage',
+      'Kubernetes',
+      'Cloud Firewall',
+      'Vlans',
+      'Managed Databases',
+      'Metadata',
+      'Premium Plans',
+    ],
+    country: 'us',
+    id: 'us-iad',
+    label: 'Washington, DC',
+    maximum_pgs_per_customer: 5,
+    maximum_vms_per_pg: 10,
+    resolvers: {
+      ipv4:
+        '139.144.192.62,   139.144.192.60,   139.144.192.61,   139.144.192.53,   139.144.192.54,   139.144.192.67,   139.144.192.69,    139.144.192.66,   139.144.192.52,   139.144.192.68',
+      ipv6:
+        '2600:3c05::f03c:93ff:feb6:43b6,   2600:3c05::f03c:93ff:feb6:4365,   2600:3c05::f03c:93ff:feb6:43c2,   2600:3c05::f03c:93ff:feb6:e441,   2600:3c05::f03c:93ff:feb6:94ef,   2600:3c05::f03c:93ff:feb6:94ba,   2600:3c05::f03c:93ff:feb6:94a8,   2600:3c05::f03c:93ff:feb6:9413,   2600:3c05::f03c:93ff:feb6:9443,   2600:3c05::f03c:93ff:feb6:94e0',
+    },
+    status: 'ok',
+  },
+  {
+    capabilities: [
+      'Linodes',
+      'NodeBalancers',
+      'Block Storage',
+      'Object Storage',
+      'Kubernetes',
+      'Cloud Firewall',
+      'Vlans',
+      'Managed Databases',
+      'Metadata',
+      'Premium Plans',
+    ],
+    country: 'us',
+    id: 'us-ord',
+    label: 'Chicago, IL',
+    maximum_pgs_per_customer: 5,
+    maximum_vms_per_pg: 10,
+    resolvers: {
+      ipv4:
+        '172.232.0.17,   172.232.0.16,   172.232.0.21,   172.232.0.13,   172.232.0.22,   172.232.0.9,   172.232.0.19,   172.232.0.20,   172.232.0.15,   172.232.0.18',
+      ipv6:
+        '2600:3c06::f03c:93ff:fed0:e5fc,   2600:3c06::f03c:93ff:fed0:e54b,   2600:3c06::f03c:93ff:fed0:e572,   2600:3c06::f03c:93ff:fed0:e530,   2600:3c06::f03c:93ff:fed0:e597,   2600:3c06::f03c:93ff:fed0:e511,   2600:3c06::f03c:93ff:fed0:e5f2,   2600:3c06::f03c:93ff:fed0:e5bf,   2600:3c06::f03c:93ff:fed0:e529,   2600:3c06::f03c:93ff:fed0:e5a3',
+    },
+    status: 'ok',
+  },
+  {
+    capabilities: [
+      'Linodes',
+      'NodeBalancers',
+      'Block Storage',
+      'Object Storage',
+      'Kubernetes',
+      'Cloud Firewall',
+      'Vlans',
+      'Managed Databases',
+      'Metadata',
+      'Premium Plans',
+    ],
+    country: 'fr',
+    id: 'fr-par',
+    label: 'Paris, FR',
+    maximum_pgs_per_customer: 5,
+    maximum_vms_per_pg: 10,
+    resolvers: {
+      ipv4:
+        '172.232.32.21,  172.232.32.23,  172.232.32.17,  172.232.32.18,  172.232.32.16,  172.232.32.22,  172.232.32.20,  172.232.32.14,  172.232.32.11,  172.232.32.12',
+      ipv6:
+        '2600:3c07::f03c:93ff:fef2:2e63,  2600:3c07::f03c:93ff:fef2:2ec7,  2600:3c07::f03c:93ff:fef2:0dee,  2600:3c07::f03c:93ff:fef2:0d25,  2600:3c07::f03c:93ff:fef2:0de0,  2600:3c07::f03c:93ff:fef2:2e29,  2600:3c07::f03c:93ff:fef2:0dda,  2600:3c07::f03c:93ff:fef2:0d82,  2600:3c07::f03c:93ff:fef2:b3ac,  2600:3c07::f03c:93ff:fef2:b3a8',
+    },
     status: 'ok',
   },
   {
-    capabilities: ['Linodes', 'NodeBalancers', 'Block Storage'],
+    capabilities: [
+      'Linodes',
+      'NodeBalancers',
+      'Block Storage',
+      'Object Storage',
+      'Kubernetes',
+      'Cloud Firewall',
+      'Vlans',
+      'Metadata',
+      'Premium Plans',
+    ],
+    country: 'us',
+    id: 'us-sea',
+    label: 'Seattle, WA',
+    maximum_pgs_per_customer: 5,
+    maximum_vms_per_pg: 10,
+    resolvers: {
+      ipv4:
+        '172.232.160.19, 172.232.160.21, 172.232.160.17, 172.232.160.15, 172.232.160.18, 172.232.160.8, 172.232.160.12, 172.232.160.11, 172.232.160.14, 172.232.160.16',
+      ipv6:
+        '2600:3c0a::f03c:93ff:fe54:c6da, 2600:3c0a::f03c:93ff:fe54:c691, 2600:3c0a::f03c:93ff:fe54:c68d, 2600:3c0a::f03c:93ff:fe54:c61e, 2600:3c0a::f03c:93ff:fe54:c653, 2600:3c0a::f03c:93ff:fe54:c64c, 2600:3c0a::f03c:93ff:fe54:c68a, 2600:3c0a::f03c:93ff:fe54:c697, 2600:3c0a::f03c:93ff:fe54:c60f, 2600:3c0a::f03c:93ff:fe54:c6a0',
+    },
+    status: 'ok',
+  },
+  {
+    capabilities: [
+      'Linodes',
+      'NodeBalancers',
+      'Block Storage',
+      'Object Storage',
+      'Kubernetes',
+      'Cloud Firewall',
+      'Vlans',
+      'Metadata',
+      'Premium Plans',
+    ],
+    country: 'br',
+    id: 'br-gru',
+    label: 'Sao Paulo, BR',
+    maximum_pgs_per_customer: 5,
+    maximum_vms_per_pg: 10,
+    resolvers: {
+      ipv4:
+        '172.233.0.4, 172.233.0.9, 172.233.0.7, 172.233.0.12, 172.233.0.5, 172.233.0.13, 172.233.0.10, 172.233.0.6, 172.233.0.8, 172.233.0.11',
+      ipv6:
+        '2600:3c0d::f03c:93ff:fe3d:51cb, 2600:3c0d::f03c:93ff:fe3d:51a7, 2600:3c0d::f03c:93ff:fe3d:51a9, 2600:3c0d::f03c:93ff:fe3d:5119, 2600:3c0d::f03c:93ff:fe3d:51fe, 2600:3c0d::f03c:93ff:fe3d:517c, 2600:3c0d::f03c:93ff:fe3d:5144, 2600:3c0d::f03c:93ff:fe3d:5170, 2600:3c0d::f03c:93ff:fe3d:51cc, 2600:3c0d::f03c:93ff:fe3d:516c',
+    },
+    status: 'ok',
+  },
+  {
+    capabilities: [
+      'Linodes',
+      'NodeBalancers',
+      'Block Storage',
+      'Object Storage',
+      'Kubernetes',
+      'Cloud Firewall',
+      'Vlans',
+      'Metadata',
+      'Premium Plans',
+    ],
+    country: 'nl',
+    id: 'nl-ams',
+    label: 'Amsterdam, NL',
+    maximum_pgs_per_customer: 5,
+    maximum_vms_per_pg: 10,
+    resolvers: {
+      ipv4:
+        '172.233.33.36, 172.233.33.38, 172.233.33.35, 172.233.33.39, 172.233.33.34, 172.233.33.33, 172.233.33.31, 172.233.33.30, 172.233.33.37, 172.233.33.32',
+      ipv6:
+        '2600:3c0e::f03c:93ff:fe9d:2d10, 2600:3c0e::f03c:93ff:fe9d:2d89, 2600:3c0e::f03c:93ff:fe9d:2d79, 2600:3c0e::f03c:93ff:fe9d:2d96, 2600:3c0e::f03c:93ff:fe9d:2da5, 2600:3c0e::f03c:93ff:fe9d:2d34, 2600:3c0e::f03c:93ff:fe9d:2d68, 2600:3c0e::f03c:93ff:fe9d:2d17, 2600:3c0e::f03c:93ff:fe9d:2d45, 2600:3c0e::f03c:93ff:fe9d:2d5c',
+    },
+    status: 'ok',
+  },
+  {
+    capabilities: [
+      'Linodes',
+      'NodeBalancers',
+      'Block Storage',
+      'Object Storage',
+      'Kubernetes',
+      'Cloud Firewall',
+      'Vlans',
+      'Metadata',
+      'Premium Plans',
+    ],
+    country: 'se',
+    id: 'se-sto',
+    label: 'Stockholm, SE',
+    maximum_pgs_per_customer: 5,
+    maximum_vms_per_pg: 10,
+    resolvers: {
+      ipv4:
+        '172.232.128.24, 172.232.128.26, 172.232.128.20, 172.232.128.22, 172.232.128.25, 172.232.128.19, 172.232.128.23, 172.232.128.18, 172.232.128.21, 172.232.128.27',
+      ipv6:
+        '2600:3c09::f03c:93ff:fea9:4dbe, 2600:3c09::f03c:93ff:fea9:4d63, 2600:3c09::f03c:93ff:fea9:4dce, 2600:3c09::f03c:93ff:fea9:4dbb, 2600:3c09::f03c:93ff:fea9:4d99, 2600:3c09::f03c:93ff:fea9:4d26, 2600:3c09::f03c:93ff:fea9:4de0, 2600:3c09::f03c:93ff:fea9:4d69, 2600:3c09::f03c:93ff:fea9:4dbf, 2600:3c09::f03c:93ff:fea9:4da6',
+    },
+    status: 'ok',
+  },
+  {
+    capabilities: [
+      'Linodes',
+      'NodeBalancers',
+      'Block Storage',
+      'Object Storage',
+      'Kubernetes',
+      'Cloud Firewall',
+      'Vlans',
+      'Metadata',
+      'Premium Plans',
+    ],
+    country: 'in',
+    id: 'in-maa',
+    label: 'Chennai, IN',
+    maximum_pgs_per_customer: 5,
+    maximum_vms_per_pg: 10,
+    resolvers: {
+      ipv4:
+        '172.232.96.17, 172.232.96.26, 172.232.96.19, 172.232.96.20, 172.232.96.25, 172.232.96.21, 172.232.96.18, 172.232.96.22, 172.232.96.23, 172.232.96.24',
+      ipv6:
+        '2600:3c08::f03c:93ff:fe7c:1135, 2600:3c08::f03c:93ff:fe7c:11f8, 2600:3c08::f03c:93ff:fe7c:11d2, 2600:3c08::f03c:93ff:fe7c:11a7, 2600:3c08::f03c:93ff:fe7c:11ad, 2600:3c08::f03c:93ff:fe7c:110a, 2600:3c08::f03c:93ff:fe7c:11f9, 2600:3c08::f03c:93ff:fe7c:1137, 2600:3c08::f03c:93ff:fe7c:11db, 2600:3c08::f03c:93ff:fe7c:1164',
+    },
+    status: 'ok',
+  },
+  {
+    capabilities: [
+      'Linodes',
+      'NodeBalancers',
+      'Block Storage',
+      'Object Storage',
+      'Kubernetes',
+      'Cloud Firewall',
+      'Vlans',
+      'Metadata',
+      'Premium Plans',
+    ],
+    country: 'jp',
+    id: 'jp-osa',
+    label: 'Osaka, JP',
+    maximum_pgs_per_customer: 5,
+    maximum_vms_per_pg: 10,
+    resolvers: {
+      ipv4:
+        '172.233.64.44, 172.233.64.43, 172.233.64.37, 172.233.64.40, 172.233.64.46, 172.233.64.41, 172.233.64.39, 172.233.64.42, 172.233.64.45, 172.233.64.38',
+      ipv6:
+        '2400:8905::f03c:93ff:fe9d:b085, 2400:8905::f03c:93ff:fe9d:b012, 2400:8905::f03c:93ff:fe9d:b09b, 2400:8905::f03c:93ff:fe9d:b0d8, 2400:8905::f03c:93ff:fe9d:259f, 2400:8905::f03c:93ff:fe9d:b006, 2400:8905::f03c:93ff:fe9d:b084, 2400:8905::f03c:93ff:fe9d:b0ce, 2400:8905::f03c:93ff:fe9d:25ea, 2400:8905::f03c:93ff:fe9d:b086',
+    },
+    status: 'ok',
+  },
+  {
+    capabilities: [
+      'Linodes',
+      'NodeBalancers',
+      'Block Storage',
+      'Object Storage',
+      'Kubernetes',
+      'Cloud Firewall',
+      'Vlans',
+      'Metadata',
+      'Premium Plans',
+    ],
+    country: 'it',
+    id: 'it-mil',
+    label: 'Milan, IT',
+    maximum_pgs_per_customer: 5,
+    maximum_vms_per_pg: 10,
+    resolvers: {
+      ipv4:
+        '172.232.192.19, 172.232.192.18, 172.232.192.16, 172.232.192.20, 172.232.192.24, 172.232.192.21, 172.232.192.22, 172.232.192.17, 172.232.192.15, 172.232.192.23',
+      ipv6:
+        '2600:3c0b::f03c:93ff:feba:d513, 2600:3c0b::f03c:93ff:feba:d5c3, 2600:3c0b::f03c:93ff:feba:d597, 2600:3c0b::f03c:93ff:feba:d5fb, 2600:3c0b::f03c:93ff:feba:d51f, 2600:3c0b::f03c:93ff:feba:d58e, 2600:3c0b::f03c:93ff:feba:d5d5, 2600:3c0b::f03c:93ff:feba:d534, 2600:3c0b::f03c:93ff:feba:d57c, 2600:3c0b::f03c:93ff:feba:d529',
+    },
+    status: 'ok',
+  },
+  {
+    capabilities: [
+      'Linodes',
+      'NodeBalancers',
+      'Block Storage',
+      'Object Storage',
+      'Kubernetes',
+      'Cloud Firewall',
+      'Vlans',
+      'Metadata',
+      'Premium Plans',
+    ],
+    country: 'us',
+    id: 'us-mia',
+    label: 'Miami, FL',
+    maximum_pgs_per_customer: 5,
+    maximum_vms_per_pg: 10,
+    resolvers: {
+      ipv4:
+        '172.233.160.34, 172.233.160.27, 172.233.160.30, 172.233.160.29, 172.233.160.32, 172.233.160.28, 172.233.160.33, 172.233.160.26, 172.233.160.25, 172.233.160.31',
+      ipv6:
+        '2a01:7e04::f03c:93ff:fead:d31f, 2a01:7e04::f03c:93ff:fead:d37f, 2a01:7e04::f03c:93ff:fead:d30c, 2a01:7e04::f03c:93ff:fead:d318, 2a01:7e04::f03c:93ff:fead:d316, 2a01:7e04::f03c:93ff:fead:d339, 2a01:7e04::f03c:93ff:fead:d367, 2a01:7e04::f03c:93ff:fead:d395, 2a01:7e04::f03c:93ff:fead:d3d0, 2a01:7e04::f03c:93ff:fead:d38e',
+    },
+    status: 'ok',
+  },
+  {
+    capabilities: [
+      'Linodes',
+      'NodeBalancers',
+      'Block Storage',
+      'Object Storage',
+      'Kubernetes',
+      'Cloud Firewall',
+      'Vlans',
+      'Metadata',
+      'Premium Plans',
+    ],
+    country: 'id',
+    id: 'id-cgk',
+    label: 'Jakarta, ID',
+    maximum_pgs_per_customer: 5,
+    maximum_vms_per_pg: 10,
+    resolvers: {
+      ipv4:
+        '172.232.224.23, 172.232.224.32, 172.232.224.26, 172.232.224.27, 172.232.224.21, 172.232.224.24, 172.232.224.22, 172.232.224.20, 172.232.224.31, 172.232.224.28',
+      ipv6:
+        '2600:3c0c::f03c:93ff:feed:a90b, 2600:3c0c::f03c:93ff:feed:a9a5, 2600:3c0c::f03c:93ff:feed:a935, 2600:3c0c::f03c:93ff:feed:a930, 2600:3c0c::f03c:93ff:feed:a95c, 2600:3c0c::f03c:93ff:feed:a9ad, 2600:3c0c::f03c:93ff:feed:a9f2, 2600:3c0c::f03c:93ff:feed:a9ff, 2600:3c0c::f03c:93ff:feed:a9c8, 2600:3c0c::f03c:93ff:feed:a96b',
+    },
+    status: 'ok',
+  },
+  {
+    capabilities: [
+      'Linodes',
+      'NodeBalancers',
+      'Block Storage',
+      'Object Storage',
+      'Kubernetes',
+      'Cloud Firewall',
+      'Vlans',
+      'Metadata',
+      'Premium Plans',
+    ],
+    country: 'us',
+    id: 'us-lax',
+    label: 'Los Angeles, CA',
+    maximum_pgs_per_customer: 5,
+    maximum_vms_per_pg: 10,
+    resolvers: {
+      ipv4:
+        '172.233.128.45, 172.233.128.38, 172.233.128.53, 172.233.128.37, 172.233.128.34, 172.233.128.36, 172.233.128.33, 172.233.128.39, 172.233.128.43, 172.233.128.44',
+      ipv6:
+        '2a01:7e03::f03c:93ff:feb1:b789, 2a01:7e03::f03c:93ff:feb1:b717, 2a01:7e03::f03c:93ff:feb1:b707, 2a01:7e03::f03c:93ff:feb1:b7ab, 2a01:7e03::f03c:93ff:feb1:b7e2, 2a01:7e03::f03c:93ff:feb1:b709, 2a01:7e03::f03c:93ff:feb1:b7a6, 2a01:7e03::f03c:93ff:feb1:b750, 2a01:7e03::f03c:93ff:feb1:b76e, 2a01:7e03::f03c:93ff:feb1:b7a2',
+    },
+    status: 'ok',
+  },
+  {
+    capabilities: [
+      'Linodes',
+      'NodeBalancers',
+      'Block Storage',
+      'Kubernetes',
+      'Cloud Firewall',
+      'Vlans',
+      'Block Storage Migrations',
+      'Managed Databases',
+    ],
     country: 'us',
     id: 'us-central',
     label: 'Dallas, TX',
-    resolvers,
+    maximum_pgs_per_customer: 5,
+    maximum_vms_per_pg: 10,
+    resolvers: {
+      ipv4:
+        '72.14.179.5, 72.14.188.5, 173.255.199.5, 66.228.53.5, 96.126.122.5, 96.126.124.5, 96.126.127.5, 198.58.107.5, 198.58.111.5, 23.239.24.5',
+      ipv6:
+        '2600:3c00::2, 2600:3c00::9, 2600:3c00::7, 2600:3c00::5, 2600:3c00::3, 2600:3c00::8, 2600:3c00::6, 2600:3c00::4, 2600:3c00::c, 2600:3c00::b',
+    },
     status: 'ok',
   },
   {
-    capabilities: ['Linodes', 'NodeBalancers', 'Block Storage'],
+    capabilities: [
+      'Linodes',
+      'NodeBalancers',
+      'Block Storage',
+      'Kubernetes',
+      'Cloud Firewall',
+      'Block Storage Migrations',
+      'Managed Databases',
+    ],
     country: 'us',
     id: 'us-west',
     label: 'Fremont, CA',
-    resolvers,
+    maximum_pgs_per_customer: 5,
+    maximum_vms_per_pg: 10,
+    resolvers: {
+      ipv4:
+        '173.230.145.5, 173.230.147.5, 173.230.155.5, 173.255.212.5, 173.255.219.5, 173.255.241.5, 173.255.243.5, 173.255.244.5, 74.207.241.5, 74.207.242.5',
+      ipv6:
+        '2600:3c01::2, 2600:3c01::9, 2600:3c01::5, 2600:3c01::7, 2600:3c01::3, 2600:3c01::8, 2600:3c01::4, 2600:3c01::b, 2600:3c01::c, 2600:3c01::6',
+    },
     status: 'ok',
   },
   {
-    capabilities: ['Linodes', 'NodeBalancers'],
+    capabilities: [
+      'Linodes',
+      'NodeBalancers',
+      'Block Storage',
+      'Object Storage',
+      'GPU Linodes',
+      'Kubernetes',
+      'Cloud Firewall',
+      'Vlans',
+      'Block Storage Migrations',
+      'Managed Databases',
+    ],
     country: 'us',
     id: 'us-southeast',
     label: 'Atlanta, GA',
-    resolvers,
+    maximum_pgs_per_customer: 5,
+    maximum_vms_per_pg: 10,
+    resolvers: {
+      ipv4:
+        '74.207.231.5, 173.230.128.5, 173.230.129.5, 173.230.136.5, 173.230.140.5, 66.228.59.5, 66.228.62.5, 50.116.35.5, 50.116.41.5, 23.239.18.5',
+      ipv6:
+        '2600:3c02::3, 2600:3c02::5, 2600:3c02::4, 2600:3c02::6, 2600:3c02::c, 2600:3c02::7, 2600:3c02::2, 2600:3c02::9, 2600:3c02::8, 2600:3c02::b',
+    },
     status: 'ok',
   },
   {
@@ -60,43 +481,101 @@ export const regions: Region[] = [
       'NodeBalancers',
       'Block Storage',
       'Object Storage',
+      'GPU Linodes',
+      'Kubernetes',
+      'Cloud Firewall',
+      'Bare Metal',
+      'Vlans',
+      'Block Storage Migrations',
+      'Managed Databases',
     ],
     country: 'us',
     id: 'us-east',
     label: 'Newark, NJ',
-    resolvers,
+    maximum_pgs_per_customer: 5,
+    maximum_vms_per_pg: 10,
+    resolvers: {
+      ipv4:
+        '66.228.42.5, 96.126.106.5, 50.116.53.5, 50.116.58.5, 50.116.61.5, 50.116.62.5, 66.175.211.5, 97.107.133.4, 207.192.69.4, 207.192.69.5',
+      ipv6:
+        '2600:3c03::7, 2600:3c03::4, 2600:3c03::9, 2600:3c03::6, 2600:3c03::3, 2600:3c03::c, 2600:3c03::5, 2600:3c03::b, 2600:3c03::2, 2600:3c03::8',
+    },
     status: 'ok',
   },
   {
-    capabilities: ['Linodes', 'NodeBalancers', 'Block Storage'],
-    country: 'uk',
+    capabilities: [
+      'Linodes',
+      'NodeBalancers',
+      'Block Storage',
+      'Kubernetes',
+      'Cloud Firewall',
+      'Vlans',
+      'Block Storage Migrations',
+      'Managed Databases',
+    ],
+    country: 'gb',
     id: 'eu-west',
     label: 'London, UK',
-    resolvers,
+    maximum_pgs_per_customer: 5,
+    maximum_vms_per_pg: 10,
+    resolvers: {
+      ipv4:
+        '178.79.182.5,  176.58.107.5,  176.58.116.5,  176.58.121.5,  151.236.220.5,  212.71.252.5,  212.71.253.5,  109.74.192.20,  109.74.193.20,  109.74.194.20',
+      ipv6:
+        '2a01:7e00::9,  2a01:7e00::3,  2a01:7e00::c,  2a01:7e00::5,  2a01:7e00::6,  2a01:7e00::8,  2a01:7e00::b,  2a01:7e00::4,  2a01:7e00::7,  2a01:7e00::2',
+    },
     status: 'ok',
   },
   {
-    capabilities: ['Linodes', 'NodeBalancers', 'Block Storage'],
+    capabilities: [
+      'Linodes',
+      'NodeBalancers',
+      'Block Storage',
+      'Object Storage',
+      'GPU Linodes',
+      'Kubernetes',
+      'Cloud Firewall',
+      'Vlans',
+      'Block Storage Migrations',
+      'Managed Databases',
+    ],
     country: 'sg',
     id: 'ap-south',
     label: 'Singapore, SG',
-    resolvers,
+    maximum_pgs_per_customer: 5,
+    maximum_vms_per_pg: 10,
+    resolvers: {
+      ipv4:
+        '139.162.11.5, 139.162.13.5, 139.162.14.5, 139.162.15.5, 139.162.16.5, 139.162.21.5, 139.162.27.5, 103.3.60.18, 103.3.60.19, 103.3.60.20',
+      ipv6:
+        '2400:8901::5, 2400:8901::4, 2400:8901::b, 2400:8901::3, 2400:8901::9, 2400:8901::2, 2400:8901::8, 2400:8901::7, 2400:8901::c, 2400:8901::6',
+    },
     status: 'ok',
   },
   {
-    capabilities: ['Linodes', 'NodeBalancers', 'Block Storage'],
+    capabilities: [
+      'Linodes',
+      'NodeBalancers',
+      'Block Storage',
+      'Object Storage',
+      'GPU Linodes',
+      'Kubernetes',
+      'Cloud Firewall',
+      'Vlans',
+      'Block Storage Migrations',
+      'Managed Databases',
+    ],
     country: 'de',
     id: 'eu-central',
     label: 'Frankfurt, DE',
-    resolvers,
-    status: 'ok',
-  },
-  {
-    capabilities: ['Linodes', 'NodeBalancers', 'Block Storage'],
-    country: 'jp',
-    id: 'ap-northeast',
-    label: 'Tokyo, JP',
-    resolvers,
+    maximum_pgs_per_customer: 5,
+    maximum_vms_per_pg: 10,
+    resolvers: {
+      ipv4:
+        '139.162.130.5, 139.162.131.5, 139.162.132.5, 139.162.133.5, 139.162.134.5, 139.162.135.5, 139.162.136.5, 139.162.137.5, 139.162.138.5, 139.162.139.5',
+      ipv6:
+        '2a01:7e01::5, 2a01:7e01::9, 2a01:7e01::7, 2a01:7e01::c, 2a01:7e01::2, 2a01:7e01::4, 2a01:7e01::3, 2a01:7e01::6, 2a01:7e01::b, 2a01:7e01::8',
+    },
     status: 'ok',
   },
 ];
diff --git a/packages/manager/src/components/AccessPanel/UserSSHKeyPanel.tsx b/packages/manager/src/components/AccessPanel/UserSSHKeyPanel.tsx
index a1233722c7b..198806f9dc7 100644
--- a/packages/manager/src/components/AccessPanel/UserSSHKeyPanel.tsx
+++ b/packages/manager/src/components/AccessPanel/UserSSHKeyPanel.tsx
@@ -76,8 +76,10 @@ const UserSSHKeyPanel = (props: Props) => {
     isLoading: isAccountUsersLoading,
   } = useAccountUsers(
     {
-      page: pagination.page,
-      page_size: pagination.pageSize,
+      params: {
+        page: pagination.page,
+        page_size: pagination.pageSize,
+      },
     }
     // { ssh_keys: { '+neq': null } }
   );
diff --git a/packages/manager/src/components/Breadcrumb/FinalCrumb.tsx b/packages/manager/src/components/Breadcrumb/FinalCrumb.tsx
index cb119c1b920..d5b10394df4 100644
--- a/packages/manager/src/components/Breadcrumb/FinalCrumb.tsx
+++ b/packages/manager/src/components/Breadcrumb/FinalCrumb.tsx
@@ -21,6 +21,7 @@ export const FinalCrumb = React.memo((props: Props) => {
       <StyledEditableText
         data-qa-editable-text
         errorText={onEditHandlers.errorText}
+        handleAnalyticsEvent={onEditHandlers.handleAnalyticsEvent}
         labelLink={labelOptions && labelOptions.linkTo}
         onCancel={onEditHandlers.onCancel}
         onEdit={onEditHandlers.onEdit}
diff --git a/packages/manager/src/components/Breadcrumb/types.ts b/packages/manager/src/components/Breadcrumb/types.ts
index 3c169241f64..77e97930bb7 100644
--- a/packages/manager/src/components/Breadcrumb/types.ts
+++ b/packages/manager/src/components/Breadcrumb/types.ts
@@ -12,6 +12,7 @@ export interface EditableProps {
   editableTextTitle: string;
   editableTextTitleSuffix?: string;
   errorText?: string;
+  handleAnalyticsEvent?: () => void;
   onCancel: () => void;
   onEdit: (value: string) => Promise<any>;
 }
diff --git a/packages/manager/src/components/EditableText/EditableText.tsx b/packages/manager/src/components/EditableText/EditableText.tsx
index ac7af3a117c..66ab9109158 100644
--- a/packages/manager/src/components/EditableText/EditableText.tsx
+++ b/packages/manager/src/components/EditableText/EditableText.tsx
@@ -9,7 +9,6 @@ import { makeStyles } from 'tss-react/mui';
 import { Button } from 'src/components/Button/Button';
 import { ClickAwayListener } from 'src/components/ClickAwayListener';
 import { H1Header } from 'src/components/H1Header/H1Header';
-import { fadeIn } from 'src/styles/keyframes';
 
 import { TextField, TextFieldProps } from '../TextField';
 
@@ -63,7 +62,7 @@ const useStyles = makeStyles<void, 'editIcon' | 'icon'>()(
           color: theme.color.grey1,
         },
       },
-      border: '1px solid transparent',
+      borderLeft: '1px solid transparent',
     },
     input: {
       fontFamily: theme.font.bold,
@@ -92,7 +91,6 @@ const useStyles = makeStyles<void, 'editIcon' | 'icon'>()(
       wordBreak: 'break-all',
     },
     textField: {
-      animation: `${fadeIn} .3s ease-in-out forwards`,
       margin: 0,
     },
     underlineOnHover: {
@@ -106,6 +104,10 @@ const useStyles = makeStyles<void, 'editIcon' | 'icon'>()(
 interface Props {
   className?: string;
   errorText?: string;
+  /**
+   * Send event analytics
+   */
+  handleAnalyticsEvent?: () => void;
   /**
    * Optional link for the text when it is not in editing mode
    */
@@ -138,6 +140,7 @@ export const EditableText = (props: PassThroughProps) => {
   const {
     className,
     errorText,
+    handleAnalyticsEvent,
     labelLink,
     onCancel,
     onEdit,
@@ -160,6 +163,10 @@ export const EditableText = (props: PassThroughProps) => {
   };
 
   const openEdit = () => {
+    // Send analytics when pencil icon is clicked.
+    if (handleAnalyticsEvent) {
+      handleAnalyticsEvent();
+    }
     setIsEditing(true);
   };
 
diff --git a/packages/manager/src/components/EmptyLandingPageResources/ResourcesMoreLink.tsx b/packages/manager/src/components/EmptyLandingPageResources/ResourcesMoreLink.tsx
index 39e1edabaf6..bf7e0dc090e 100644
--- a/packages/manager/src/components/EmptyLandingPageResources/ResourcesMoreLink.tsx
+++ b/packages/manager/src/components/EmptyLandingPageResources/ResourcesMoreLink.tsx
@@ -1,12 +1,13 @@
 import { styled } from '@mui/material/styles';
 import * as React from 'react';
-import { LinkProps } from 'react-router-dom';
 
 import { Link } from 'src/components/Link';
 
-type ResourcesMoreLinkProps = LinkProps & {
+import type { LinkProps } from 'src/components/Link';
+
+interface ResourcesMoreLinkProps extends LinkProps {
   external?: boolean;
-};
+}
 
 const StyledMoreLink = styled(Link)<ResourcesMoreLinkProps>(({ ...props }) => ({
   alignItems: props.external ? 'baseline' : 'center',
diff --git a/packages/manager/src/components/ErrorState/ErrorState.tsx b/packages/manager/src/components/ErrorState/ErrorState.tsx
index f8566b4c5a4..11f007ddc55 100644
--- a/packages/manager/src/components/ErrorState/ErrorState.tsx
+++ b/packages/manager/src/components/ErrorState/ErrorState.tsx
@@ -76,10 +76,11 @@ const StyledIconContainer = styled('div')({
   textAlign: 'center',
 });
 
-const ErrorStateRoot = styled(Grid)<Partial<ErrorStateProps>>(
-  ({ theme, ...props }) => ({
-    marginLeft: 0,
-    padding: props.compact ? theme.spacing(5) : theme.spacing(10),
-    width: '100%',
-  })
-);
+const ErrorStateRoot = styled(Grid, {
+  label: 'ErrorStateRoot',
+  shouldForwardProp: (prop) => prop !== 'compact',
+})<Partial<ErrorStateProps>>(({ theme, ...props }) => ({
+  marginLeft: 0,
+  padding: props.compact ? theme.spacing(5) : theme.spacing(10),
+  width: '100%',
+}));
diff --git a/packages/manager/src/components/LabelAndTagsPanel/LabelAndTagsPanel.tsx b/packages/manager/src/components/LabelAndTagsPanel/LabelAndTagsPanel.tsx
index abe3a9e89cb..a733093124d 100644
--- a/packages/manager/src/components/LabelAndTagsPanel/LabelAndTagsPanel.tsx
+++ b/packages/manager/src/components/LabelAndTagsPanel/LabelAndTagsPanel.tsx
@@ -1,20 +1,46 @@
+import { Region } from '@linode/api-v4/lib/regions';
 import { useTheme } from '@mui/material/styles';
 import * as React from 'react';
 
+import { Box } from 'src/components/Box';
 import { Notice } from 'src/components/Notice/Notice';
+import { Paper } from 'src/components/Paper';
+import {
+  PlacementGroupsSelect,
+  PlacementGroupsSelectProps,
+} from 'src/components/PlacementGroupsSelect/PlacementGroupsSelect';
 import { TagsInput, TagsInputProps } from 'src/components/TagsInput/TagsInput';
 import { TextField, TextFieldProps } from 'src/components/TextField';
-import { Paper } from 'src/components/Paper';
+import { TooltipIcon } from 'src/components/TooltipIcon';
+import { Typography } from 'src/components/Typography';
+import { useFlags } from 'src/hooks/useFlags';
+
+{
+  /* TODO VM_Placement: 'Learn more' Link */
+}
+const tooltipText = `
+Add your virtual machine (VM) to a group to best meet your needs.
+You may want to group VMs closer together to help improve performance, or further apart to enable high-availability configurations.
+Learn more.`;
 
 interface LabelAndTagsProps {
   error?: string;
   labelFieldProps?: TextFieldProps;
+  placementGroupsSelectProps?: PlacementGroupsSelectProps;
+  regions?: Region[];
   tagsInputProps?: TagsInputProps;
 }
 
 export const LabelAndTagsPanel = (props: LabelAndTagsProps) => {
   const theme = useTheme();
-  const { error, labelFieldProps, tagsInputProps } = props;
+  const flags = useFlags();
+  const showPlacementGroups = Boolean(flags.vmPlacement);
+  const {
+    error,
+    labelFieldProps,
+    placementGroupsSelectProps,
+    tagsInputProps,
+  } = props;
 
   return (
     <Paper
@@ -35,6 +61,45 @@ export const LabelAndTagsPanel = (props: LabelAndTagsProps) => {
         noMarginTop
       />
       {tagsInputProps && <TagsInput {...tagsInputProps} />}
+      {showPlacementGroups && (
+        <>
+          {!placementGroupsSelectProps?.selectedRegionId && (
+            <Notice
+              dataTestId="placement-groups-no-region-notice"
+              spacingBottom={0}
+              spacingTop={16}
+              variant="warning"
+            >
+              <Typography>
+                <b>Select a region above to see available Placement Groups.</b>
+              </Typography>
+            </Notice>
+          )}
+          {placementGroupsSelectProps && (
+            <Box alignItems="flex-end" display="flex">
+              <PlacementGroupsSelect
+                {...placementGroupsSelectProps}
+                sx={{
+                  [theme.breakpoints.down('sm')]: {
+                    width: 320,
+                  },
+                  width: '400px',
+                }}
+              />
+              <TooltipIcon
+                sxTooltipIcon={{
+                  marginBottom: '6px',
+                  marginLeft: theme.spacing(),
+                  padding: 0,
+                }}
+                status="help"
+                text={tooltipText}
+                tooltipPosition="right"
+              />
+            </Box>
+          )}
+        </>
+      )}
     </Paper>
   );
 };
diff --git a/packages/manager/src/components/LandingHeader/LandingHeader.tsx b/packages/manager/src/components/LandingHeader/LandingHeader.tsx
index 05881941fb4..ce83c1c7754 100644
--- a/packages/manager/src/components/LandingHeader/LandingHeader.tsx
+++ b/packages/manager/src/components/LandingHeader/LandingHeader.tsx
@@ -156,5 +156,6 @@ export const LandingHeader = ({
 
 const Actions = styled('div')(() => ({
   display: 'flex',
+  gap: '24px',
   justifyContent: 'flex-end',
 }));
diff --git a/packages/manager/src/components/LineGraph/LineGraph.tsx b/packages/manager/src/components/LineGraph/LineGraph.tsx
index b47640b5f97..e28951180a3 100644
--- a/packages/manager/src/components/LineGraph/LineGraph.tsx
+++ b/packages/manager/src/components/LineGraph/LineGraph.tsx
@@ -8,7 +8,6 @@ import {
   ChartTooltipItem,
   ChartXAxe,
 } from 'chart.js';
-import 'chartjs-adapter-luxon';
 import { curry } from 'ramda';
 import * as React from 'react';
 
diff --git a/packages/manager/src/components/Link.tsx b/packages/manager/src/components/Link.tsx
index f4845fd0773..bbdb7fc9957 100644
--- a/packages/manager/src/components/Link.tsx
+++ b/packages/manager/src/components/Link.tsx
@@ -37,6 +37,15 @@ export interface LinkProps extends _LinkProps {
    * @default false
    */
   hideIcon?: boolean;
+  /**
+   * The Link's destination.
+   * We are overwriting react-router-dom's `to` type because they allow objects, functions, and strings.
+   * We want to keep our `to` prop simple so that we can easily read and sanitize it.
+   *
+   * @example "/profile/display"
+   * @example "https://linode.com"
+   */
+  to: string;
 }
 
 /**
diff --git a/packages/manager/src/components/OrderBy.tsx b/packages/manager/src/components/OrderBy.tsx
index 4b3c0b901b8..a4afc094d55 100644
--- a/packages/manager/src/components/OrderBy.tsx
+++ b/packages/manager/src/components/OrderBy.tsx
@@ -4,7 +4,6 @@ import * as React from 'react';
 import { useHistory, useLocation } from 'react-router-dom';
 import { debounce } from 'throttle-debounce';
 
-import { Order } from 'src/components/Pagey';
 import { usePrevious } from 'src/hooks/usePrevious';
 import { useMutatePreferences, usePreferences } from 'src/queries/preferences';
 import { ManagerPreferences } from 'src/types/ManagerPreferences';
@@ -16,6 +15,8 @@ import {
   sortByUTFDate,
 } from 'src/utilities/sort-by';
 
+import type { Order } from 'src/hooks/useOrder';
+
 export interface OrderByProps<T> extends State {
   data: T[];
   handleOrderChange: (orderBy: string, order: Order) => void;
diff --git a/packages/manager/src/components/Pagey/Pagey.test.tsx b/packages/manager/src/components/Pagey/Pagey.test.tsx
deleted file mode 100644
index 384b66750af..00000000000
--- a/packages/manager/src/components/Pagey/Pagey.test.tsx
+++ /dev/null
@@ -1,274 +0,0 @@
-import { ResourcePage } from '@linode/api-v4/lib/types';
-import { shallow } from 'enzyme';
-import * as React from 'react';
-
-import paginate from './Pagey';
-
-const mockData: ResourcePage<any> = {
-  data: [],
-  page: 1,
-  pages: 1,
-  results: 0,
-};
-
-const mockFn = vi.fn(() => Promise.resolve(mockData));
-
-const setup = (mockRequest: any = mockFn) => {
-  const MyComponent = paginate(mockRequest)(() => <div />);
-
-  return {
-    mockRequest,
-    wrapper: shallow(<MyComponent />),
-  };
-};
-
-describe('Paginator 2: Pagement Day', () => {
-  describe('props', () => {
-    const { wrapper } = setup();
-
-    const {
-      count,
-      handlePageChange,
-      handlePageSizeChange,
-      loading,
-      onDelete,
-      page,
-      pageSize,
-      request,
-    } = wrapper.props();
-
-    it('should provide a count prop', () => {
-      expect(count).toBeDefined();
-    });
-
-    it('should default count to 0', () => {
-      expect(count).toBe(0);
-    });
-
-    it('should provide a page prop', () => {
-      expect(page).toBeDefined();
-    });
-
-    it('should deafult page prop to 1', () => {
-      expect(page).toEqual(1);
-    });
-
-    it('should provide pageSize prop', () => {
-      expect(pageSize).toBeDefined();
-    });
-
-    it('should deafult pageSize to 25', () => {
-      expect(pageSize).toEqual(25);
-    });
-
-    it('should provide a handlePageChange handler prop', () => {
-      expect(handlePageChange).toBeDefined();
-      expect(handlePageChange).toBeInstanceOf(Function);
-    });
-
-    it('should provide a handlePageSizeChange handler prop', () => {
-      expect(handlePageSizeChange).toBeDefined();
-      expect(handlePageSizeChange).toBeInstanceOf(Function);
-    });
-
-    it('should provide a loading prop', () => {
-      expect(loading).toBeDefined();
-    });
-
-    it('should default loading to true', () => {
-      expect(loading).toBeTruthy();
-    });
-
-    it('should provide a request handler prop', () => {
-      expect(request).toBeDefined();
-      expect(request).toBeInstanceOf(Function);
-    });
-
-    it('should provide a onDelete handler prop', () => {
-      expect(onDelete).toBeDefined();
-      expect(onDelete).toBeInstanceOf(Function);
-    });
-  });
-
-  describe('when onDelete is called', () => {
-    it('should request the previous page if we deleted the last item', async () => {
-      /**
-       * We need to test if Pagey is currently viewing a page of one, and we call onDelete, it requests
-       * the following page, not the current page.
-       */
-      const mockRequest = vi
-        .fn(() => Promise.resolve({}))
-        .mockImplementationOnce(() =>
-          Promise.resolve({
-            data: [101],
-            page: 6,
-            pages: 5,
-            results: 101,
-          })
-        );
-
-      const { wrapper } = setup(mockRequest);
-      const request = wrapper.prop('request');
-      const onDelete = wrapper.prop('onDelete');
-
-      /**
-       * This triggers the first call to mockRequest and sets our state to
-       * { data: [6], page: 2, pages: 2, results: 6 }
-       */
-      await request();
-      wrapper.update();
-
-      /**
-       * This triggers the second call to mockRequest.
-       */
-      await onDelete();
-      wrapper.update();
-
-      /** We need to check that the second call to our request function is for the preceeding page. */
-      expect((mockRequest.mock.calls as any)[1][1]).toEqual({
-        page: 5,
-        page_size: 25,
-      });
-    });
-  });
-
-  describe('when handlePageChange is called', () => {
-    it('should update page with provided argument', () => {
-      const { wrapper } = setup(vi.fn(() => Promise.resolve(mockData)));
-
-      const handlePageChange = wrapper.prop('handlePageChange');
-
-      handlePageChange(9);
-
-      wrapper.update();
-
-      expect(wrapper.prop('page')).toEqual(9);
-    });
-
-    it('should result in the request being called with updated params', () => {
-      const { mockRequest, wrapper } = setup(
-        vi.fn(() => Promise.resolve(mockData))
-      );
-
-      const handlePageChange = wrapper.prop('handlePageChange');
-
-      handlePageChange(9);
-
-      wrapper.update();
-
-      expect(mockRequest).toBeCalledWith({}, { page: 9, page_size: 25 }, {});
-    });
-  });
-
-  describe('when handlePageSizeChange is called', () => {
-    it('should update pageSize with provided argument', () => {
-      const { wrapper } = setup(vi.fn(() => Promise.resolve(mockData)));
-
-      const handlePageSizeChange = wrapper.prop('handlePageSizeChange');
-
-      handlePageSizeChange(100);
-
-      wrapper.update();
-
-      expect(wrapper.prop('pageSize')).toEqual(100);
-      expect(wrapper.prop('page')).toEqual(1);
-    });
-
-    it('should result in the request being called with updated params', () => {
-      const { mockRequest, wrapper } = setup(
-        vi.fn(() => Promise.resolve(mockData))
-      );
-
-      const handlePageSizeChange = wrapper.prop('handlePageSizeChange');
-
-      handlePageSizeChange(100);
-
-      wrapper.update();
-
-      expect(mockRequest).toBeCalledWith({}, { page: 1, page_size: 100 }, {});
-    });
-  });
-
-  describe('when requesting data', () => {
-    describe('and the promise resolves', () => {
-      const mockDataWithData = {
-        data: [1, 2, 3, 4],
-        page: 2,
-        pages: 2,
-        results: 4,
-      };
-
-      const { wrapper } = setup(() => Promise.resolve(mockDataWithData));
-
-      beforeAll(async () => {
-        await wrapper.prop('request')();
-        wrapper.update();
-      });
-
-      it('should set data to response.data', () => {
-        expect(wrapper.prop('data')).toEqual([1, 2, 3, 4]);
-      });
-
-      it('should set page to response.page', () => {
-        expect(wrapper.prop('page')).toBe(2);
-      });
-
-      it('should set count to response.result', () => {
-        expect(wrapper.prop('count')).toBe(4);
-      });
-
-      it('should apply the map function to the response.result', async () => {
-        const fn = (numbers: number[]) => numbers.map((n) => n + 1);
-        await wrapper.prop('request')(fn);
-        wrapper.update();
-        expect(wrapper.prop('data')).toEqual([2, 3, 4, 5]);
-      });
-    });
-
-    describe('and the promise rejects', () => {
-      const { wrapper } = setup(() => Promise.reject(new Error()));
-
-      beforeAll(async () => {
-        await wrapper.prop('request')();
-        wrapper.update();
-      });
-
-      it('should set error to rejected value', () => {
-        expect(wrapper.prop('error')).toBeInstanceOf(Error);
-      });
-    });
-  });
-
-  describe('sorting', () => {
-    const { mockRequest, wrapper } = setup();
-    const handleOrderChange = wrapper.prop('handleOrderChange');
-
-    beforeEach(() => {
-      mockRequest.mockClear();
-    });
-
-    it('should provide a handleOrderChange handler prop', () => {
-      expect(handleOrderChange).toBeDefined();
-      expect(handleOrderChange).toBeInstanceOf(Function);
-    });
-
-    it('should send request with sort by ascending', () => {
-      handleOrderChange('label');
-
-      expect(mockRequest).toHaveBeenCalledWith(
-        {},
-        { page: 1, page_size: 25 },
-        { '+order': 'asc', '+order_by': 'label' }
-      );
-    });
-    it('should send request with sort by descending', () => {
-      handleOrderChange('label', 'desc');
-
-      expect(mockRequest).toHaveBeenCalledWith(
-        {},
-        { page: 1, page_size: 25 },
-        { '+order': 'desc', '+order_by': 'label' }
-      );
-    });
-  });
-});
diff --git a/packages/manager/src/components/Pagey/Pagey.ts b/packages/manager/src/components/Pagey/Pagey.ts
deleted file mode 100644
index 6e7118df245..00000000000
--- a/packages/manager/src/components/Pagey/Pagey.ts
+++ /dev/null
@@ -1,200 +0,0 @@
-import { APIError, Filter, ResourcePage } from '@linode/api-v4/lib/types';
-import { clone } from 'ramda';
-import * as React from 'react';
-
-import { storage } from 'src/utilities/storage';
-
-/**
- * @todo Document loading prop update as a result of promise resolution/rejection.
- * @todo How can we test the transition of loading from false -> true -> result?
- *
- * @todo Add basic sorting of one type and direction.
- * @todo Allow the request to be modified to allow additional filters (beyond sorting).
- * @todo Type FilterParams?
- */
-
-export interface PaginationParams {
-  page?: number;
-  page_size?: number;
-}
-
-export type FilterParams = any;
-
-export type PaginatedRequest<T = {}> = (
-  ownProps?: any,
-  p?: PaginationParams,
-  f?: FilterParams
-) => Promise<ResourcePage<T>>;
-
-export type HandleOrderChange = (key: string, order?: Order) => void;
-
-export type Order = 'asc' | 'desc';
-
-export type OrderBy = string | undefined;
-
-interface State<T = {}> {
-  count: number;
-  data?: T[];
-  error?: APIError[];
-  filter: Filter;
-  isSorting?: boolean;
-  loading: boolean;
-  order: Order;
-  orderBy?: OrderBy;
-  page: number;
-  pageSize: number;
-  pages?: number;
-  searching: boolean;
-}
-
-interface Options {
-  // props and the result of the request.
-  cb?: (ownProps: any, response: ResourcePage<any>) => any;
-  order?: Order;
-  // Callback to be executed after successful request, with the component's own
-  orderBy?: OrderBy;
-}
-
-export interface PaginationProps<T> extends State<T> {
-  handleOrderChange: HandleOrderChange;
-  handlePageChange: (v: number, showSpinner?: boolean) => void;
-  handlePageSizeChange: (v: number) => void;
-  handleSearch: (newFilter: Filter) => void;
-  onDelete: () => void;
-  request: <U = {}>(update?: (v: T[]) => U) => Promise<void>;
-}
-
-export default (requestFn: PaginatedRequest, options: Options = {}) => (
-  Component: React.ComponentType<any>
-) => {
-  return class WrappedComponent extends React.PureComponent<any, State> {
-    componentDidMount() {
-      this.mounted = true;
-    }
-
-    componentWillUnmount() {
-      this.mounted = false;
-    }
-
-    public render() {
-      return React.createElement(Component, {
-        ...this.props,
-        ...this.state,
-        handleOrderChange: this.handleOrderChange,
-        handlePageChange: this.handlePageChange,
-        handlePageSizeChange: this.handlePageSizeChange,
-        handleSearch: this.handleSearch,
-        onDelete: this.onDelete,
-        request: this.request,
-      });
-    }
-
-    public handleOrderChange = (
-      orderBy: string,
-      order: Order = 'asc',
-      page: number = 1
-    ) => {
-      this.setState({ isSorting: true, order, orderBy, page }, () =>
-        this.request()
-      );
-    };
-
-    public handlePageChange = (page: number) => {
-      /**
-       * change the page, make the request
-       */
-      this.setState({ page }, () => {
-        this.request();
-      });
-    };
-
-    public handlePageSizeChange = (pageSize: number) => {
-      this.setState({ page: 1, pageSize }, () => {
-        this.request();
-      });
-      storage.pageSize.set(pageSize);
-    };
-
-    public handleSearch = (filter: Filter) => {
-      this.setState({ filter, page: 1, searching: true }, () => this.request());
-    };
-
-    mounted: boolean = false;
-
-    private onDelete = () => {
-      const { data, page } = this.state;
-
-      /*
-       * Basically, if we're on page 2 and the user deletes the last entity
-       * on the page, send the user back to the previous page, AKA the max number
-       * of pages.
-       *
-       * This solves the issue where the user deletes the last entity
-       * on a page and then sees an empty state instead of going to the
-       * last page available
-       *
-       * Please note that if the deletion of an entity is instant and not
-       * initiated by the completetion of an event, we need to check that
-       * the data.length === 1 because we're not calling this.request() to update
-       * page and pages states
-       */
-      if (data && data.length === 1) {
-        return this.handlePageChange(page - 1);
-      }
-
-      return this.request();
-    };
-
-    // eslint-disable-next-line @typescript-eslint/ban-types
-    private request = (map?: Function) => {
-      /**
-       * we might potentially have a search term to filter by
-       */
-      const filters = clone(this.state.filter);
-
-      if (this.state.orderBy) {
-        filters['+order_by'] = this.state.orderBy;
-        filters['+order'] = this.state.order;
-      }
-      return requestFn(
-        this.props,
-        { page: this.state.page, page_size: this.state.pageSize },
-        filters
-      )
-        .then((response) => {
-          if (options.cb) {
-            options.cb(this.props, response);
-          }
-
-          if (this.mounted) {
-            this.setState({
-              count: response.results,
-              data: map ? map(response.data) : response.data,
-              error: undefined,
-              isSorting: false,
-              loading: false,
-              page: response.page,
-              pages: response.pages,
-              searching: false,
-            });
-          }
-        })
-        .catch((response) => {
-          this.setState({ error: response, loading: false });
-        });
-    };
-
-    state: State = {
-      count: 0,
-      error: undefined,
-      filter: {},
-      isSorting: false,
-      loading: true,
-      order: options.order ?? ('asc' as Order),
-      orderBy: options.orderBy,
-      page: 1,
-      pageSize: storage.pageSize.get() || 25,
-      searching: false,
-    };
-  };
-};
diff --git a/packages/manager/src/components/Pagey/index.ts b/packages/manager/src/components/Pagey/index.ts
deleted file mode 100644
index b2e44589418..00000000000
--- a/packages/manager/src/components/Pagey/index.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-import Pagey, {
-  HandleOrderChange as _HandleOrderChange,
-  Order as _Order,
-  OrderBy as _OrderBy,
-  PaginationProps as _PaginationProps,
-} from './Pagey';
-
-/* tslint:disable */
-export type HandleOrderChange = _HandleOrderChange;
-export type Order = _Order;
-export type OrderBy = _OrderBy;
-export type PaginationProps<T> = _PaginationProps<T>;
-export default Pagey;
diff --git a/packages/manager/src/components/PlacementGroupsSelect/PlacementGroupsSelect.test.tsx b/packages/manager/src/components/PlacementGroupsSelect/PlacementGroupsSelect.test.tsx
new file mode 100644
index 00000000000..54a2180817c
--- /dev/null
+++ b/packages/manager/src/components/PlacementGroupsSelect/PlacementGroupsSelect.test.tsx
@@ -0,0 +1,31 @@
+import * as React from 'react';
+
+import { renderWithTheme } from 'src/utilities/testHelpers';
+
+import {
+  PlacementGroupsSelect,
+  PlacementGroupsSelectProps,
+} from './PlacementGroupsSelect';
+
+const props: PlacementGroupsSelectProps = {
+  errorText: '',
+  handlePlacementGroupSelection: vi.fn(),
+  id: '',
+  label: 'Placement Groups in Atlanta, GA (us-southeast)',
+  noOptionsMessage: '',
+  selectedRegionId: 'us-southeast',
+};
+
+describe('PlacementGroupSelect', () => {
+  it('should render a Select component', () => {
+    const { getByTestId } = renderWithTheme(
+      <PlacementGroupsSelect {...props} />
+    );
+    expect(getByTestId('placement-groups-select')).toBeInTheDocument();
+  });
+
+  it('should render a Select component with the correct label', () => {
+    const { getByText } = renderWithTheme(<PlacementGroupsSelect {...props} />);
+    expect(getByText(/Placement Groups in /)).toBeInTheDocument();
+  });
+});
diff --git a/packages/manager/src/components/PlacementGroupsSelect/PlacementGroupsSelect.tsx b/packages/manager/src/components/PlacementGroupsSelect/PlacementGroupsSelect.tsx
new file mode 100644
index 00000000000..a3cca9d5582
--- /dev/null
+++ b/packages/manager/src/components/PlacementGroupsSelect/PlacementGroupsSelect.tsx
@@ -0,0 +1,110 @@
+import { PlacementGroup } from '@linode/api-v4';
+import { APIError } from '@linode/api-v4/lib/types';
+import { SxProps } from '@mui/system';
+import * as React from 'react';
+
+import { Autocomplete } from 'src/components/Autocomplete/Autocomplete';
+import { useUnpaginatedPlacementGroupsQuery } from 'src/queries/placementGroups';
+
+export interface PlacementGroupsSelectProps {
+  clearable?: boolean;
+  disabled?: boolean;
+  errorText?: string;
+  handlePlacementGroupSelection: (selected: PlacementGroup) => void;
+  id?: string;
+  label: string;
+  loading?: boolean;
+  noOptionsMessage?: string;
+  onBlur?: (e: React.FocusEvent) => void;
+  renderOption?: (
+    placementGroup: PlacementGroup,
+    selected: boolean
+  ) => JSX.Element;
+  renderOptionLabel?: (placementGroups: PlacementGroup) => string;
+  selectedRegionId?: string;
+  sx?: SxProps;
+}
+
+export const PlacementGroupsSelect = (props: PlacementGroupsSelectProps) => {
+  const {
+    clearable = true,
+    disabled,
+    errorText,
+    handlePlacementGroupSelection,
+    id,
+    label,
+    loading,
+    noOptionsMessage,
+    onBlur,
+    renderOption,
+    renderOptionLabel,
+    selectedRegionId,
+    sx,
+  } = props;
+
+  const {
+    data: placementGroups,
+    error,
+    isLoading,
+  } = useUnpaginatedPlacementGroupsQuery(Boolean(selectedRegionId));
+
+  const placementGroupsOptions = placementGroups?.filter(
+    (placementGroup) => placementGroup.region === selectedRegionId
+  );
+
+  const handlePlacementGroupChange = (selection: PlacementGroup) => {
+    handlePlacementGroupSelection(selection);
+  };
+
+  return (
+    <Autocomplete
+      getOptionLabel={(placementGroupsOptions: PlacementGroup) =>
+        renderOptionLabel
+          ? renderOptionLabel(placementGroupsOptions)
+          : `${placementGroupsOptions.label} (${placementGroupsOptions.affinity_type})`
+      }
+      noOptionsText={
+        noOptionsMessage ?? getDefaultNoOptionsMessage(error, isLoading)
+      }
+      onChange={(_, selectedOption: PlacementGroup) => {
+        handlePlacementGroupChange(selectedOption);
+      }}
+      renderOption={
+        renderOption
+          ? (props, option, { selected }) => {
+              return (
+                <li {...props} data-qa-placement-group-option>
+                  {renderOption(option, selected)}
+                </li>
+              );
+            }
+          : undefined
+      }
+      clearOnBlur={false}
+      data-testid="placement-groups-select"
+      disableClearable={!clearable}
+      disabled={disabled}
+      errorText={errorText}
+      id={id}
+      key={selectedRegionId}
+      label={label}
+      loading={isLoading || loading}
+      onBlur={onBlur}
+      options={placementGroupsOptions ?? []}
+      placeholder="Select a Placement Group"
+      sx={sx}
+    />
+  );
+};
+
+const getDefaultNoOptionsMessage = (
+  error: APIError[] | null,
+  loading: boolean
+) => {
+  if (error) {
+    return 'An error occurred while fetching your Placement Groups';
+  }
+  return loading
+    ? 'Loading your Placement Groups...'
+    : 'No available Placement Groups';
+};
diff --git a/packages/manager/src/components/PromiseLoader/PromiseLoader.test.tsx b/packages/manager/src/components/PromiseLoader/PromiseLoader.test.tsx
index 8c02a394eca..5cb7ab24ea5 100644
--- a/packages/manager/src/components/PromiseLoader/PromiseLoader.test.tsx
+++ b/packages/manager/src/components/PromiseLoader/PromiseLoader.test.tsx
@@ -1,46 +1,25 @@
-import { ShallowWrapper, shallow } from 'enzyme';
 import * as React from 'react';
 
-import PromiseLoader from './PromiseLoader';
+import { Box } from 'src/components/Box';
+import { renderWithTheme } from 'src/utilities/testHelpers';
 
-const mockAxiosResponse = (ms: number, result?: any) =>
-  new Promise((resolve) => setTimeout(() => resolve(result), ms));
+import PromiseLoader from './PromiseLoader';
 
 describe('PromiseLoaderSpec', () => {
-  const Component = () => <div id="component" />;
-  const data = { name: 'whatever' };
-  const preloaded = PromiseLoader({
-    resource: async () => {
-      await mockAxiosResponse(100);
-      return Promise.resolve(data);
-    },
-  });
-  const LoadedComponent = preloaded(Component);
-  let wrapper: ShallowWrapper;
+  it('shows a loading state initially and the component afterwards', async () => {
+    const ExampleComponent = () => <Box>Hey</Box>;
 
-  describe('before resolution', () => {
-    beforeEach(async () => {
-      wrapper = shallow(<LoadedComponent />);
-    });
+    const examplePromise = async () => {
+      await new Promise((r) => setTimeout(r, 100));
+      return 'OMG!';
+    };
 
-    it('should display loading component.', async () => {
-      expect(wrapper.find('[data-qa-circle-progress]').exists()).toBeTruthy();
-    });
-  });
+    const Component = PromiseLoader({ data: examplePromise })(ExampleComponent);
 
-  describe('after resolution', () => {
-    beforeEach(async () => {
-      wrapper = shallow(<LoadedComponent />);
-      await mockAxiosResponse(120);
-      wrapper.update();
-    });
+    const { findByText, getByTestId } = renderWithTheme(<Component />);
 
-    it('should render the Component.', () => {
-      expect(wrapper.find('Component').exists()).toBeTruthy();
-    });
+    expect(getByTestId('circle-progress')).toBeVisible();
 
-    it('should inject props onto Component.', async () => {
-      expect(wrapper.props()).toHaveProperty('resource', { response: data });
-    });
+    await findByText('Hey');
   });
 });
diff --git a/packages/manager/src/components/PromiseLoader/PromiseLoader.tsx b/packages/manager/src/components/PromiseLoader/PromiseLoader.tsx
index 70052ff86d8..955dd85fc43 100644
--- a/packages/manager/src/components/PromiseLoader/PromiseLoader.tsx
+++ b/packages/manager/src/components/PromiseLoader/PromiseLoader.tsx
@@ -16,10 +16,11 @@ export interface PromiseLoaderResponse<T> {
   response: T;
 }
 
-/* tslint:disable */
+/**
+ * @deprecated Please don't use this. Use something like React Query instead.
+ */
 export default function preload<P>(requests: RequestMap<P>) {
   return function (Component: React.ComponentType<P>) {
-    /* tslint:enable */
     return class LoadedComponent extends React.Component<P, State> {
       componentDidMount() {
         this.mounted = true;
diff --git a/packages/manager/src/components/RegionSelect/RegionMultiSelect.tsx b/packages/manager/src/components/RegionSelect/RegionMultiSelect.tsx
index b9acc2d0a1e..4b37ee42435 100644
--- a/packages/manager/src/components/RegionSelect/RegionMultiSelect.tsx
+++ b/packages/manager/src/components/RegionSelect/RegionMultiSelect.tsx
@@ -2,7 +2,6 @@ import React, { useEffect, useMemo, useState } from 'react';
 
 import { Autocomplete } from 'src/components/Autocomplete/Autocomplete';
 import { StyledListItem } from 'src/components/Autocomplete/Autocomplete.styles';
-import { useFlags } from 'src/hooks/useFlags';
 import { useAccountAvailabilitiesQueryUnpaginated } from 'src/queries/accountAvailability';
 
 import { RegionOption } from './RegionOption';
@@ -36,11 +35,10 @@ export const RegionMultiSelect = React.memo((props: RegionMultiSelectProps) => {
     width,
   } = props;
 
-  const flags = useFlags();
   const {
     data: accountAvailability,
     isLoading: accountAvailabilityLoading,
-  } = useAccountAvailabilitiesQueryUnpaginated(flags.dcGetWell);
+  } = useAccountAvailabilitiesQueryUnpaginated();
 
   const [selectedRegions, setSelectedRegions] = useState<RegionSelectOption[]>(
     getSelectedRegionsByIds({
@@ -93,9 +91,6 @@ export const RegionMultiSelect = React.memo((props: RegionMultiSelectProps) => {
     <>
       <StyledAutocompleteContainer sx={{ width }}>
         <Autocomplete
-          getOptionDisabled={(option: RegionSelectOption) =>
-            Boolean(flags.dcGetWell) && Boolean(option.unavailable)
-          }
           groupBy={(option: RegionSelectOption) => {
             return option?.data?.region;
           }}
@@ -134,6 +129,7 @@ export const RegionMultiSelect = React.memo((props: RegionMultiSelectProps) => {
           disableClearable={!isClearable}
           disabled={disabled}
           errorText={errorText}
+          getOptionDisabled={(option: RegionSelectOption) => option.unavailable}
           label={label ?? 'Regions'}
           loading={accountAvailabilityLoading}
           multiple
diff --git a/packages/manager/src/components/RegionSelect/RegionOption.tsx b/packages/manager/src/components/RegionSelect/RegionOption.tsx
index 5b4279666b5..38fe2feaccd 100644
--- a/packages/manager/src/components/RegionSelect/RegionOption.tsx
+++ b/packages/manager/src/components/RegionSelect/RegionOption.tsx
@@ -5,7 +5,6 @@ import { Box } from 'src/components/Box';
 import { Flag } from 'src/components/Flag';
 import { Link } from 'src/components/Link';
 import { Tooltip } from 'src/components/Tooltip';
-import { useFlags } from 'src/hooks/useFlags';
 
 import {
   SelectedIcon,
@@ -23,9 +22,7 @@ type Props = {
 };
 
 export const RegionOption = ({ option, props, selected }: Props) => {
-  const flags = useFlags();
-  const isDisabledMenuItem =
-    Boolean(flags.dcGetWell) && Boolean(option.unavailable);
+  const isDisabledMenuItem = option.unavailable;
 
   return (
     <Tooltip
diff --git a/packages/manager/src/components/RegionSelect/RegionSelect.tsx b/packages/manager/src/components/RegionSelect/RegionSelect.tsx
index d0948de5781..683728688ef 100644
--- a/packages/manager/src/components/RegionSelect/RegionSelect.tsx
+++ b/packages/manager/src/components/RegionSelect/RegionSelect.tsx
@@ -2,7 +2,6 @@ import * as React from 'react';
 
 import { Autocomplete } from 'src/components/Autocomplete/Autocomplete';
 import { Flag } from 'src/components/Flag';
-import { useFlags } from 'src/hooks/useFlags';
 import { useAccountAvailabilitiesQueryUnpaginated } from 'src/queries/accountAvailability';
 
 import { RegionOption } from './RegionOption';
@@ -39,11 +38,10 @@ export const RegionSelect = React.memo((props: RegionSelectProps) => {
     width,
   } = props;
 
-  const flags = useFlags();
   const {
     data: accountAvailability,
     isLoading: accountAvailabilityLoading,
-  } = useAccountAvailabilitiesQueryUnpaginated(flags.dcGetWell);
+  } = useAccountAvailabilitiesQueryUnpaginated();
 
   const regionFromSelectedId: RegionSelectOption | null =
     getSelectedRegionById({
@@ -84,9 +82,6 @@ export const RegionSelect = React.memo((props: RegionSelectProps) => {
   return (
     <StyledAutocompleteContainer sx={{ width }}>
       <Autocomplete
-        getOptionDisabled={(option: RegionSelectOption) =>
-          Boolean(flags.dcGetWell) && Boolean(option.unavailable)
-        }
         isOptionEqualToValue={(
           option: RegionSelectOption,
           { value }: RegionSelectOption
@@ -127,6 +122,7 @@ export const RegionSelect = React.memo((props: RegionSelectProps) => {
         disableClearable={!isClearable}
         disabled={disabled}
         errorText={errorText}
+        getOptionDisabled={(option: RegionSelectOption) => option.unavailable}
         groupBy={(option: RegionSelectOption) => option.data.region}
         label={label ?? 'Region'}
         loading={accountAvailabilityLoading}
diff --git a/packages/manager/src/components/RemovableSelectionsList/RemovableSelectionsList.tsx b/packages/manager/src/components/RemovableSelectionsList/RemovableSelectionsList.tsx
index 3b16017e78f..ec09036a215 100644
--- a/packages/manager/src/components/RemovableSelectionsList/RemovableSelectionsList.tsx
+++ b/packages/manager/src/components/RemovableSelectionsList/RemovableSelectionsList.tsx
@@ -1,6 +1,7 @@
 import Close from '@mui/icons-material/Close';
 import * as React from 'react';
 
+import { Box } from 'src/components/Box';
 import { IconButton } from 'src/components/IconButton';
 
 import {
@@ -13,6 +14,8 @@ import {
   StyledScrollBox,
 } from './RemovableSelectionsList.style';
 
+import type { SxProps, Theme } from '@mui/material';
+
 export type RemovableItem = {
   id: number;
   label: string;
@@ -29,7 +32,11 @@ export interface RemovableSelectionsListProps {
   /**
    * The descriptive text to display above the list
    */
-  headerText: string;
+  headerText: JSX.Element | string;
+  /**
+   * The id of the list component
+   */
+  id?: string;
   /**
    * If false, hide the remove button
    */
@@ -60,6 +67,10 @@ export interface RemovableSelectionsListProps {
    * The data to display in the list
    */
   selectionData: RemovableItem[];
+  /**
+   * Additional styles to apply to the component
+   */
+  sx?: SxProps<Theme>;
 }
 
 export const RemovableSelectionsList = (
@@ -68,6 +79,7 @@ export const RemovableSelectionsList = (
   const {
     LabelComponent,
     headerText,
+    id,
     isRemovable = true,
     maxHeight = 427,
     maxWidth = 416,
@@ -75,6 +87,7 @@ export const RemovableSelectionsList = (
     onRemove,
     preferredDataLabel,
     selectionData,
+    sx,
   } = props;
 
   // used to determine when to display a box-shadow to indicate scrollability
@@ -92,15 +105,20 @@ export const RemovableSelectionsList = (
   };
 
   return (
-    <>
+    <Box data-testid={id} sx={sx}>
       <SelectedOptionsHeader>{headerText}</SelectedOptionsHeader>
       {selectionData.length > 0 ? (
         <StyledBoxShadowWrapper
           displayShadow={listHeight > maxHeight}
+          id={id}
           maxWidth={maxWidth}
         >
           <StyledScrollBox maxHeight={maxHeight} maxWidth={maxWidth}>
-            <SelectedOptionsList isRemovable={isRemovable} ref={listRef}>
+            <SelectedOptionsList
+              isRemovable={isRemovable}
+              ref={listRef}
+              data-qa-selection-list
+            >
               {selectionData.map((selection) => (
                 <SelectedOptionsListItem alignItems="center" key={selection.id}>
                   <StyledLabel>
@@ -132,10 +150,10 @@ export const RemovableSelectionsList = (
           </StyledScrollBox>
         </StyledBoxShadowWrapper>
       ) : (
-        <StyledNoAssignedLinodesBox maxWidth={maxWidth}>
+        <StyledNoAssignedLinodesBox id={id} maxWidth={maxWidth}>
           <StyledLabel>{noDataText}</StyledLabel>
         </StyledNoAssignedLinodesBox>
       )}
-    </>
+    </Box>
   );
 };
diff --git a/packages/manager/src/components/Tags/Tags.test.tsx b/packages/manager/src/components/Tags/Tags.test.tsx
index 9856acf3c69..75a74e42f57 100644
--- a/packages/manager/src/components/Tags/Tags.test.tsx
+++ b/packages/manager/src/components/Tags/Tags.test.tsx
@@ -1,20 +1,28 @@
-import { shallow } from 'enzyme';
 import * as React from 'react';
 
+import { renderWithTheme } from 'src/utilities/testHelpers';
+
 import { Tags } from './Tags';
 
 describe('Tags list', () => {
   it('should display "Show More" button if the tags list is more than 3', () => {
-    const component = shallow(
+    const { container, getByText } = renderWithTheme(
       <Tags tags={['tag1', 'tag2', 'tag3', 'tag4', 'tag5']} />
     );
 
-    expect(component.find('ShowMore')).toHaveLength(1);
+    expect(getByText('+2')).toBeVisible();
+    expect(
+      container.querySelector('[data-qa-show-more-chip]')
+    ).toBeInTheDocument();
   });
 
   it('shouldn\'t display the "Show More" button if the tags list contains 3 or fewer tags', () => {
-    const component = shallow(<Tags tags={['tag1', 'tag2', 'tag3']} />);
+    const { container } = renderWithTheme(
+      <Tags tags={['tag1', 'tag2', 'tag3']} />
+    );
 
-    expect(component.find('ShowMore')).toHaveLength(0);
+    expect(
+      container.querySelector('[data-qa-show-more-chip]')
+    ).not.toBeInTheDocument();
   });
 });
diff --git a/packages/manager/src/containers/flags.container.ts b/packages/manager/src/containers/flags.container.ts
new file mode 100644
index 00000000000..f276099513f
--- /dev/null
+++ b/packages/manager/src/containers/flags.container.ts
@@ -0,0 +1,22 @@
+import * as React from 'react';
+
+import { useFlags } from 'src/hooks/useFlags';
+
+import type { FlagSet } from 'src/featureFlags';
+
+export interface WithFeatureFlagProps {
+  flags: FlagSet;
+}
+
+export const withFeatureFlags = <Props>(
+  Component: React.ComponentType<Props & WithFeatureFlagProps>
+) => {
+  return (props: Props) => {
+    const flags = useFlags();
+
+    return React.createElement(Component, {
+      ...props,
+      flags,
+    });
+  };
+};
diff --git a/packages/manager/src/containers/withFeatureFlagConsumer.container.ts b/packages/manager/src/containers/withFeatureFlagConsumer.container.ts
deleted file mode 100644
index 6ee9b19c54d..00000000000
--- a/packages/manager/src/containers/withFeatureFlagConsumer.container.ts
+++ /dev/null
@@ -1,55 +0,0 @@
-import { LDClient as _LDClient } from 'launchdarkly-js-client-sdk';
-import { withLDConsumer } from 'launchdarkly-react-client-sdk';
-import { LDProps } from 'launchdarkly-react-client-sdk/lib/withLDConsumer';
-import * as React from 'react';
-import { connect } from 'react-redux';
-import { compose } from 'recompose';
-
-import { FlagSet } from 'src/featureFlags';
-import { MockFeatureFlagState } from 'src/store/mockFeatureFlags';
-import { MapState } from 'src/store/types';
-
-/* eslint-disable-next-line */
-export interface LDClient extends _LDClient {}
-
-export interface FeatureFlagConsumerProps {
-  flags: FlagSet;
-  ldClient: LDClient;
-}
-
-// We have to provide an HOC around the `withLDConsumer` HOC in order to retrieve mock flags
-// for the custom dev tools.
-export const withFeatureFlagConsumer = (
-  Component: React.ComponentType<any>
-) => {
-  class WrappedComponent extends React.Component<StateProps & LDProps> {
-    render() {
-      return React.createElement(Component, {
-        ...this.props,
-        flags: {
-          // Real LD flags from `withLDConsumer()`.
-          ...this.props.flags,
-          // Mock flags from Redux.
-          ...this.props.mockFlags,
-        },
-      });
-    }
-  }
-
-  const enhanced = compose(connected, withLDConsumer());
-
-  return enhanced(WrappedComponent);
-};
-
-export default withFeatureFlagConsumer;
-
-// Redux connection for the wrapped component.
-interface StateProps {
-  mockFlags: MockFeatureFlagState;
-}
-
-const mapStateToProps: MapState<StateProps, {}> = (state) => ({
-  mockFlags: state.mockFeatureFlags,
-});
-
-const connected = connect(mapStateToProps);
diff --git a/packages/manager/src/context/switchAccountSessionContext.ts b/packages/manager/src/context/switchAccountSessionContext.ts
new file mode 100644
index 00000000000..986067ae6bc
--- /dev/null
+++ b/packages/manager/src/context/switchAccountSessionContext.ts
@@ -0,0 +1,7 @@
+import * as React from 'react';
+
+import { DialogContextProps, defaultContext } from './useDialogContext';
+
+export const switchAccountSessionContext = React.createContext<DialogContextProps>(
+  defaultContext
+);
diff --git a/packages/manager/src/context/useDialogContext.ts b/packages/manager/src/context/useDialogContext.ts
index 9dc2bb3e41f..a831f6f2ba8 100644
--- a/packages/manager/src/context/useDialogContext.ts
+++ b/packages/manager/src/context/useDialogContext.ts
@@ -1,26 +1,51 @@
-import { createContext, useCallback, useState } from 'react';
+import { useCallback, useState } from 'react';
 
 export interface DialogContextProps {
+  [key: string]:
+    | (() => void)
+    | ((newState: UseDialogContextOptions) => void)
+    | boolean;
   close: () => void;
   isOpen: boolean;
   open: () => void;
+  updateState: (newState: UseDialogContextOptions) => void;
 }
 
-export const defaultContext = {
+export type UseDialogContextOptions = {
+  [key: string]: boolean;
+};
+
+export const defaultContext: DialogContextProps = {
   close: () => void 0,
   isOpen: false,
   open: () => void 0,
+  updateState: () => void 0,
 };
 
-export const dialogContext = createContext<DialogContextProps>(defaultContext);
+export const useDialogContext = (
+  initialState: UseDialogContextOptions = {}
+): DialogContextProps => {
+  const [state, setState] = useState({ ...defaultContext, ...initialState });
+
+  // TODO: We no longer need the open and close functions after we update other references
+  const open = useCallback(
+    () => setState((prevState) => ({ ...prevState, isOpen: true })),
+    []
+  );
+  const close = useCallback(
+    () => setState((prevState) => ({ ...prevState, isOpen: false })),
+    []
+  );
+  const updateState = useCallback(
+    (newState: UseDialogContextOptions) =>
+      setState((prevState) => ({ ...prevState, ...newState })),
+    []
+  );
 
-export const useDialogContext = (): DialogContextProps => {
-  const [isOpen, setIsOpen] = useState(false);
-  const open = useCallback(() => setIsOpen(true), [setIsOpen]);
-  const close = useCallback(() => setIsOpen(false), [setIsOpen]);
   return {
+    ...state,
     close,
-    isOpen,
     open,
+    updateState,
   };
 };
diff --git a/packages/manager/src/dev-tools/FeatureFlagTool.tsx b/packages/manager/src/dev-tools/FeatureFlagTool.tsx
index af174364a63..7a5b7586832 100644
--- a/packages/manager/src/dev-tools/FeatureFlagTool.tsx
+++ b/packages/manager/src/dev-tools/FeatureFlagTool.tsx
@@ -14,7 +14,6 @@ const MOCK_FEATURE_FLAGS_STORAGE_KEY = 'devTools/mock-feature-flags';
 const options: { flag: keyof Flags; label: string }[] = [
   { flag: 'aclb', label: 'ACLB' },
   { flag: 'aclbFullCreateFlow', label: 'ACLB Full Create Flow' },
-  { flag: 'dcGetWell', label: 'DC Get Well' },
   { flag: 'linodeCloneUIChanges', label: 'Linode Clone UI Changes' },
   { flag: 'metadata', label: 'Metadata' },
   { flag: 'parentChildAccountAccess', label: 'Parent/Child Account' },
diff --git a/packages/manager/src/factories/account.ts b/packages/manager/src/factories/account.ts
index 878446039db..17662c422de 100644
--- a/packages/manager/src/factories/account.ts
+++ b/packages/manager/src/factories/account.ts
@@ -48,14 +48,14 @@ export const accountFactory = Factory.Sync.makeFactory<Account>({
     'Managed Databases',
   ],
   city: 'Colorado',
-  company: 'xrTHcxhFdaDW1XyYWSNWsccDa07iUy',
+  company: Factory.each((i) => `company-${i}`),
   country: 'CA',
   credit_card: {
     expiry: '01/2018',
     last_four: '1111',
   },
   email: 'my-email@example.com',
-  euuid: '278EC57D-7424-4B3A-B35C3CE395787567',
+  euuid: Factory.each((i) => `278EC57D-7424-4B3A-B35C3CE395787567-${i}`),
   first_name: 'XRbganOEO',
   last_name: 'demo2',
   phone: '19005553221',
diff --git a/packages/manager/src/factories/accountLogin.ts b/packages/manager/src/factories/accountLogin.ts
new file mode 100644
index 00000000000..878519a2c43
--- /dev/null
+++ b/packages/manager/src/factories/accountLogin.ts
@@ -0,0 +1,11 @@
+import { AccountLogin } from '@linode/api-v4';
+import * as Factory from 'factory.ts';
+
+export const accountLoginFactory = Factory.Sync.makeFactory<AccountLogin>({
+  datetime: '2021-05-21T14:27:51',
+  id: Factory.each((id) => id),
+  ip: '127.0.0.1',
+  restricted: false,
+  status: 'successful',
+  username: 'mock-user',
+});
diff --git a/packages/manager/src/factories/accountUsers.ts b/packages/manager/src/factories/accountUsers.ts
index 838bb124609..664cf75bd8b 100644
--- a/packages/manager/src/factories/accountUsers.ts
+++ b/packages/manager/src/factories/accountUsers.ts
@@ -8,7 +8,7 @@ export const accountUserFactory = Factory.Sync.makeFactory<User>({
   restricted: true,
   ssh_keys: [],
   tfa_enabled: false,
-  user_type: null,
+  user_type: 'default',
   username: Factory.each((i) => `user-${i}`),
   verified_phone_number: null,
 });
diff --git a/packages/manager/src/factories/aglb.ts b/packages/manager/src/factories/aclb.ts
similarity index 98%
rename from packages/manager/src/factories/aglb.ts
rename to packages/manager/src/factories/aclb.ts
index cd5f2b9bc55..7a3779e4ebc 100644
--- a/packages/manager/src/factories/aglb.ts
+++ b/packages/manager/src/factories/aclb.ts
@@ -1,4 +1,8 @@
-import {
+import * as Factory from 'factory.ts';
+
+import { pickRandom } from 'src/utilities/random';
+
+import type {
   Certificate,
   Configuration,
   ConfigurationsEndpointHealth,
@@ -14,10 +18,7 @@ import {
   ServiceTargetPayload,
   ServiceTargetsEndpointHealth,
   UpdateLoadbalancerPayload,
-} from '@linode/api-v4/lib/aglb/types';
-import * as Factory from 'factory.ts';
-
-import { pickRandom } from 'src/utilities/random';
+} from '@linode/api-v4';
 
 export const mockCertificate = `
 -----BEGIN CERTIFICATE-----
@@ -101,9 +102,9 @@ export const configurationFactory = Factory.Sync.makeFactory<Configuration>({
 // ***********************
 export const loadbalancerFactory = Factory.Sync.makeFactory<Loadbalancer>({
   configurations: [{ id: 1, label: 'my-config-1' }],
-  hostname: 'loadbalancer1.aglb.akamai.com',
+  hostname: 'loadbalancer1.aclb.akamai.com',
   id: Factory.each((i) => i),
-  label: Factory.each((i) => `aglb-${i}`),
+  label: Factory.each((i) => `aclb-${i}`),
   regions: ['us-west'],
   tags: ['tag1', 'tag2'],
 });
diff --git a/packages/manager/src/factories/index.ts b/packages/manager/src/factories/index.ts
index 95233470184..f0d21d4a282 100644
--- a/packages/manager/src/factories/index.ts
+++ b/packages/manager/src/factories/index.ts
@@ -4,7 +4,7 @@ export * from './accountSettings';
 export * from './accountMaintenance';
 export * from './accountOAuth';
 export * from './accountPayment';
-export * from './aglb';
+export * from './aclb';
 export * from './betas';
 export * from './billing';
 export * from './config';
diff --git a/packages/manager/src/factories/linodes.ts b/packages/manager/src/factories/linodes.ts
index 17e19789d99..64807d6cd23 100644
--- a/packages/manager/src/factories/linodes.ts
+++ b/packages/manager/src/factories/linodes.ts
@@ -1,4 +1,3 @@
-import { placementGroupFactory } from './placementGroups';
 import { RegionalNetworkUtilization } from '@linode/api-v4/lib/account';
 import {
   CreateLinodeRequest,
@@ -15,6 +14,8 @@ import {
 } from '@linode/api-v4/lib/linodes/types';
 import * as Factory from 'factory.ts';
 
+import { placementGroupFactory } from './placementGroups';
+
 export const linodeAlertsFactory = Factory.Sync.makeFactory<LinodeAlerts>({
   cpu: 10,
   io: 10000,
@@ -261,7 +262,16 @@ export const linodeFactory = Factory.Sync.makeFactory<Linode>({
   ipv4: ['50.116.6.212', '192.168.203.1'],
   ipv6: '2600:3c00::f03c:92ff:fee2:6c40/64',
   label: Factory.each((i) => `linode-${i}`),
-  placement_groups: [placementGroupFactory.build()],
+  placement_groups: [
+    placementGroupFactory.build({
+      affinity_type: 'anti_affinity',
+      id: 1,
+      is_compliant: true,
+      label: 'test',
+      linode_ids: [1],
+      region: 'us-east',
+    }),
+  ],
   region: 'us-east',
   specs: linodeSpecsFactory.build(),
   status: 'running',
diff --git a/packages/manager/src/factories/placementGroups.ts b/packages/manager/src/factories/placementGroups.ts
index d1fda5e4fee..fb0d0a2a73c 100644
--- a/packages/manager/src/factories/placementGroups.ts
+++ b/packages/manager/src/factories/placementGroups.ts
@@ -8,19 +8,12 @@ import type {
 } from '@linode/api-v4';
 
 export const placementGroupFactory = Factory.Sync.makeFactory<PlacementGroup>({
-  affinity_type: Factory.each(() => pickRandom(['affinity', 'anti_affinity'])),
-  capacity: 10,
-  compliant: Factory.each(() => pickRandom([true, false])),
+  affinity_type: 'anti_affinity',
   id: Factory.each((id) => id),
+  is_compliant: Factory.each(() => pickRandom([true, false])),
   label: Factory.each((id) => `pg-${id}`),
-  linode_ids: Factory.each(() => [
-    pickRandom([1, 2, 3]),
-    pickRandom([4, 5, 6]),
-    pickRandom([7, 8, 9]),
-  ]),
-  region: Factory.each(() =>
-    pickRandom(['us-east', 'us-southeast', 'ca-central'])
-  ),
+  linode_ids: [0, 1, 2, 3, 5, 6, 7, 8, 43],
+  region: 'us-east',
 });
 
 export const createPlacementGroupPayloadFactory = Factory.Sync.makeFactory<CreatePlacementGroupPayload>(
@@ -28,5 +21,6 @@ export const createPlacementGroupPayloadFactory = Factory.Sync.makeFactory<Creat
     affinity_type: 'anti_affinity',
     label: Factory.each((id) => `mock-pg-${id}`),
     region: pickRandom(['us-east', 'us-southeast', 'ca-central']),
+    strict: true,
   }
 );
diff --git a/packages/manager/src/factories/profile.ts b/packages/manager/src/factories/profile.ts
index 86fd7603653..8bbb442f188 100644
--- a/packages/manager/src/factories/profile.ts
+++ b/packages/manager/src/factories/profile.ts
@@ -25,7 +25,7 @@ export const profileFactory = Factory.Sync.makeFactory<Profile>({
   timezone: 'Asia/Shanghai',
   two_factor_auth: false,
   uid: 9999,
-  user_type: null,
+  user_type: 'default',
   username: 'mock-user',
   verified_phone_number: '+15555555555',
 });
diff --git a/packages/manager/src/factories/regions.ts b/packages/manager/src/factories/regions.ts
index 436ab8e840f..ad620a5d003 100644
--- a/packages/manager/src/factories/regions.ts
+++ b/packages/manager/src/factories/regions.ts
@@ -1,10 +1,11 @@
-import {
+import * as Factory from 'factory.ts';
+
+import type {
   Country,
   DNSResolvers,
   Region,
   RegionAvailability,
 } from '@linode/api-v4/lib/regions/types';
-import * as Factory from 'factory.ts';
 
 export const resolverFactory = Factory.Sync.makeFactory<DNSResolvers>({
   ipv4: '1.1.1.1',
@@ -16,6 +17,8 @@ export const regionFactory = Factory.Sync.makeFactory<Region>({
   country: 'us',
   id: Factory.each((id) => `us-${id}`),
   label: Factory.each((id) => `${id}, NJ`),
+  maximum_pgs_per_customer: 5,
+  maximum_vms_per_pg: 10,
   resolvers: resolverFactory.build(),
   status: 'ok',
 });
@@ -29,12 +32,15 @@ export const regionWithDynamicPricingFactory = Factory.Sync.makeFactory<Region>(
       'Object Storage',
       'Kubernetes',
       'Cloud Firewall',
+      'Placement Group',
       'Vlans',
       'Premium Plans',
     ],
     country: 'id' as Country,
     id: 'id-cgk',
     label: 'Jakarta, ID',
+    maximum_pgs_per_customer: 5,
+    maximum_vms_per_pg: 10,
     resolvers: resolverFactory.build(),
     status: 'ok',
   }
diff --git a/packages/manager/src/featureFlags.ts b/packages/manager/src/featureFlags.ts
index 0c2127f8336..c972cf17c3f 100644
--- a/packages/manager/src/featureFlags.ts
+++ b/packages/manager/src/featureFlags.ts
@@ -46,7 +46,6 @@ export interface Flags {
   databaseBeta: boolean;
   databaseScaleUp: boolean;
   databases: boolean;
-  dcGetWell: boolean;
   firewallNodebalancer: boolean;
   ipv6Sharing: boolean;
   linodeCloneUIChanges: boolean;
@@ -62,7 +61,6 @@ export interface Flags {
   promotionalOffers: PromotionalOffer[];
   recharts: boolean;
   referralBannerText: ReferralBannerText;
-  regionDropdown: boolean;
   selfServeBetas: boolean;
   soldOutChips: boolean;
   taxBanner: TaxBanner;
diff --git a/packages/manager/src/features/Account/AccountLanding.tsx b/packages/manager/src/features/Account/AccountLanding.tsx
index cc5b5007f3b..56f49f06fcf 100644
--- a/packages/manager/src/features/Account/AccountLanding.tsx
+++ b/packages/manager/src/features/Account/AccountLanding.tsx
@@ -11,9 +11,10 @@ import { SafeTabPanel } from 'src/components/Tabs/SafeTabPanel';
 import { TabLinkList } from 'src/components/Tabs/TabLinkList';
 import { TabPanels } from 'src/components/Tabs/TabPanels';
 import { Tabs } from 'src/components/Tabs/Tabs';
+import { switchAccountSessionContext } from 'src/context/switchAccountSessionContext';
+import { useParentTokenManagement } from 'src/features/Account/SwitchAccounts/useParentTokenManagement';
 import { useFlags } from 'src/hooks/useFlags';
 import { useAccount } from 'src/queries/account';
-import { useAccountUser } from 'src/queries/accountUsers';
 import { useGrants, useProfile } from 'src/queries/profile';
 
 import AccountLogins from './AccountLogins';
@@ -48,14 +49,18 @@ const AccountLanding = () => {
   const { data: account } = useAccount();
   const { data: grants } = useGrants();
   const { data: profile } = useProfile();
-  const { data: user } = useAccountUser(profile?.username ?? '');
 
   const flags = useFlags();
   const [isDrawerOpen, setIsDrawerOpen] = React.useState<boolean>(false);
+  const sessionContext = React.useContext(switchAccountSessionContext);
 
   const accountAccessGrant = grants?.global?.account_access;
   const readOnlyAccountAccess = accountAccessGrant === 'read_only';
   const isAkamaiAccount = account?.billing_source === 'akamai';
+  const isProxyUser = profile?.user_type === 'proxy';
+  const isParentUser = profile?.user_type === 'parent';
+
+  const { isParentTokenExpired } = useParentTokenManagement({ isProxyUser });
 
   const tabs = [
     {
@@ -90,6 +95,16 @@ const AccountLanding = () => {
     '/account/billing/edit',
   ];
 
+  const handleAccountSwitch = () => {
+    if (isParentTokenExpired) {
+      return sessionContext.updateState({
+        isOpen: true,
+      });
+    }
+
+    setIsDrawerOpen(true);
+  };
+
   const getDefaultTabIndex = () => {
     const tabChoice = tabs.findIndex((tab) =>
       Boolean(matchPath(tab.routeName, { path: location.pathname }))
@@ -117,8 +132,7 @@ const AccountLanding = () => {
 
   const isBillingTabSelected = location.pathname.match(/billing/);
   const canSwitchBetweenParentOrProxyAccount =
-    flags.parentChildAccountAccess &&
-    (user?.user_type === 'parent' || user?.user_type === 'proxy');
+    flags.parentChildAccountAccess && (isParentUser || isProxyUser);
 
   const landingHeaderProps: LandingHeaderProps = {
     breadcrumbProps: {
@@ -138,7 +152,7 @@ const AccountLanding = () => {
     }
     landingHeaderProps.disabledCreateButton = readOnlyAccountAccess;
     landingHeaderProps.extraActions = canSwitchBetweenParentOrProxyAccount ? (
-      <SwitchAccountButton onClick={() => setIsDrawerOpen(true)} />
+      <SwitchAccountButton onClick={handleAccountSwitch} />
     ) : undefined;
   }
 
@@ -174,7 +188,7 @@ const AccountLanding = () => {
         </React.Suspense>
       </Tabs>
       <SwitchAccountDrawer
-        isProxyUser={user?.user_type === 'proxy'}
+        isProxyUser={isProxyUser}
         onClose={() => setIsDrawerOpen(false)}
         open={isDrawerOpen}
       />
diff --git a/packages/manager/src/features/Account/AccountLogins.tsx b/packages/manager/src/features/Account/AccountLogins.tsx
index d948efa64d3..422ee1974d7 100644
--- a/packages/manager/src/features/Account/AccountLogins.tsx
+++ b/packages/manager/src/features/Account/AccountLogins.tsx
@@ -4,6 +4,7 @@ import * as React from 'react';
 import { makeStyles } from 'tss-react/mui';
 
 import { Hidden } from 'src/components/Hidden';
+import { Notice } from 'src/components/Notice/Notice';
 import { PaginationFooter } from 'src/components/PaginationFooter/PaginationFooter';
 import { Table } from 'src/components/Table';
 import { TableBody } from 'src/components/TableBody';
@@ -15,11 +16,14 @@ import { TableRowError } from 'src/components/TableRowError/TableRowError';
 import { TableRowLoading } from 'src/components/TableRowLoading/TableRowLoading';
 import { TableSortCell } from 'src/components/TableSortCell';
 import { Typography } from 'src/components/Typography';
+import { useFlags } from 'src/hooks/useFlags';
 import { useOrder } from 'src/hooks/useOrder';
 import { usePagination } from 'src/hooks/usePagination';
 import { useAccountLoginsQuery } from 'src/queries/accountLogins';
+import { useProfile } from 'src/queries/profile';
 
 import AccountLoginsTableRow from './AccountLoginsTableRow';
+import { getAccessRestrictedText } from './utils';
 
 const preferenceKey = 'account-logins';
 
@@ -40,6 +44,7 @@ const useStyles = makeStyles()((theme: Theme) => ({
 const AccountLogins = () => {
   const { classes } = useStyles();
   const pagination = usePagination(1, preferenceKey);
+  const flags = useFlags();
 
   const { handleOrderChange, order, orderBy } = useOrder(
     {
@@ -61,6 +66,13 @@ const AccountLogins = () => {
     },
     filter
   );
+  const { data: profile } = useProfile();
+
+  const isRestrictedChildUser = Boolean(
+    flags.parentChildAccountAccess && profile?.user_type === 'child'
+  );
+  const isAccountAccessRestricted =
+    isRestrictedChildUser || profile?.restricted;
 
   const renderTableContent = () => {
     if (isLoading) {
@@ -90,12 +102,12 @@ const AccountLogins = () => {
     return null;
   };
 
-  return (
+  return !isAccountAccessRestricted ? (
     <>
       <Typography className={classes.copy} variant="body1">
         Logins across all users on your account over the last 90 days.
       </Typography>
-      <Table>
+      <Table aria-label="Account Logins">
         <TableHead>
           <TableRow>
             <TableSortCell
@@ -152,6 +164,13 @@ const AccountLogins = () => {
         pageSize={pagination.pageSize}
       />
     </>
+  ) : (
+    <Notice important variant="warning">
+      {getAccessRestrictedText(
+        profile?.user_type,
+        flags.parentChildAccountAccess
+      )}
+    </Notice>
   );
 };
 
diff --git a/packages/manager/src/features/Account/AccountLoginsTableRow.tsx b/packages/manager/src/features/Account/AccountLoginsTableRow.tsx
index 9407bcd89c5..5763a6c8227 100644
--- a/packages/manager/src/features/Account/AccountLoginsTableRow.tsx
+++ b/packages/manager/src/features/Account/AccountLoginsTableRow.tsx
@@ -41,7 +41,11 @@ const AccountLoginsTableRow = (props: AccountLogin) => {
         </TableCell>
       </Hidden>
       <TableCell statusCell>
-        <StatusIcon pulse={false} status={accessIconMap[status] ?? 'other'} />
+        <StatusIcon
+          ariaLabel={`Status is ${status}`}
+          pulse={false}
+          status={accessIconMap[status] ?? 'other'}
+        />
         {capitalize(status)}
       </TableCell>
     </TableRow>
diff --git a/packages/manager/src/features/Account/CloseAccountSetting.tsx b/packages/manager/src/features/Account/CloseAccountSetting.tsx
index 5c11d329ab1..6158a5b0970 100644
--- a/packages/manager/src/features/Account/CloseAccountSetting.tsx
+++ b/packages/manager/src/features/Account/CloseAccountSetting.tsx
@@ -20,7 +20,7 @@ const CloseAccountSetting = () => {
 
   // Disable the Close Account button for users with a Parent/Proxy/Child user type.
   const isCloseAccountDisabled = Boolean(
-    flags.parentChildAccountAccess && profile?.user_type !== null
+    flags.parentChildAccountAccess && profile?.user_type !== 'default'
   );
   const closeAccountButtonTooltipText =
     isCloseAccountDisabled && profile?.user_type === 'child'
diff --git a/packages/manager/src/features/Account/Maintenance/MaintenanceTable.tsx b/packages/manager/src/features/Account/Maintenance/MaintenanceTable.tsx
index 5949baeb74f..019f1151836 100644
--- a/packages/manager/src/features/Account/Maintenance/MaintenanceTable.tsx
+++ b/packages/manager/src/features/Account/Maintenance/MaintenanceTable.tsx
@@ -1,5 +1,4 @@
 /* eslint-disable jsx-a11y/anchor-is-valid */
-import { AccountMaintenance } from '@linode/api-v4/lib/account/types';
 import { Theme } from '@mui/material/styles';
 import * as React from 'react';
 import { makeStyles } from 'tss-react/mui';
@@ -28,6 +27,8 @@ import {
 
 import { MaintenanceTableRow } from './MaintenanceTableRow';
 
+import type { AccountMaintenance, Filter } from '@linode/api-v4';
+
 const preferenceKey = 'account-maintenance';
 
 const headersForCSVDownload = [
@@ -73,15 +74,18 @@ const MaintenanceTable = ({ type }: Props) => {
     type
   );
 
-  const filters: Record<'completed' | 'pending', any> = {
-    completed: 'completed',
-    pending: { '+or': ['pending, started'] },
+  /**
+   * We use a different API filter depending on the table's `type`
+   */
+  const filters: Record<Props['type'], Filter> = {
+    completed: { status: 'completed' },
+    pending: { status: { '+or': ['pending', 'started'] } },
   };
 
-  const filter = {
+  const filter: Filter = {
     '+order': order,
     '+order_by': orderBy,
-    status: filters[type],
+    ...filters[type],
   };
 
   const { data: csv, refetch: getCSVData } = useAllAccountMaintenanceQuery(
diff --git a/packages/manager/src/features/Account/SwitchAccountDrawer.test.tsx b/packages/manager/src/features/Account/SwitchAccountDrawer.test.tsx
index 399872c11da..dcf11e472ce 100644
--- a/packages/manager/src/features/Account/SwitchAccountDrawer.test.tsx
+++ b/packages/manager/src/features/Account/SwitchAccountDrawer.test.tsx
@@ -1,7 +1,7 @@
 import { fireEvent } from '@testing-library/react';
 import * as React from 'react';
 
-import { accountUserFactory } from 'src/factories/accountUsers';
+import { profileFactory } from 'src/factories/profile';
 import { rest, server } from 'src/mocks/testServer';
 import { renderWithTheme } from 'src/utilities/testHelpers';
 
@@ -32,8 +32,8 @@ describe('SwitchAccountDrawer', () => {
 
   it('should include a link to switch back to the parent account if the active user is a proxy user', async () => {
     server.use(
-      rest.get('*/account/users/*', (req, res, ctx) => {
-        return res(ctx.json(accountUserFactory.build({ user_type: 'proxy' })));
+      rest.get('*/profile', (req, res, ctx) => {
+        return res(ctx.json(profileFactory.build({ user_type: 'proxy' })));
       })
     );
 
diff --git a/packages/manager/src/features/Account/SwitchAccountDrawer.tsx b/packages/manager/src/features/Account/SwitchAccountDrawer.tsx
index 987bff1687b..33ad7f6eeea 100644
--- a/packages/manager/src/features/Account/SwitchAccountDrawer.tsx
+++ b/packages/manager/src/features/Account/SwitchAccountDrawer.tsx
@@ -6,6 +6,7 @@ import { StyledLinkButton } from 'src/components/Button/StyledLinkButton';
 import { Drawer } from 'src/components/Drawer';
 import { Notice } from 'src/components/Notice/Notice';
 import { Typography } from 'src/components/Typography';
+import { PARENT_SESSION_EXPIRED } from 'src/features/Account/constants';
 import {
   isParentTokenValid,
   setTokenInLocalStorage,
@@ -62,7 +63,7 @@ export const SwitchAccountDrawer = (props: Props) => {
           headers:
             userType === 'proxy'
               ? {
-                  Authorization: `Bearer ${token}`,
+                  Authorization: token,
                 }
               : undefined,
         });
@@ -105,8 +106,8 @@ export const SwitchAccountDrawer = (props: Props) => {
         // We don't need to worry about this if we're a proxy user.
         if (!isProxyUser) {
           const parentToken = {
-            expiry: getStorage('authenication/expire'),
-            scopes: getStorage('authenication/scopes'),
+            expiry: getStorage('authentication/expire'),
+            scopes: getStorage('authentication/scopes'),
             token: currentTokenWithBearer ?? '',
           };
 
@@ -153,11 +154,10 @@ export const SwitchAccountDrawer = (props: Props) => {
   );
 
   const handleSwitchToParentAccount = React.useCallback(() => {
-    if (!isParentTokenValid({ isProxyUser })) {
+    if (!isParentTokenValid()) {
       const expiredTokenError: APIError = {
         field: 'token',
-        reason:
-          'The reseller account token has expired. You must log back into the account manually.',
+        reason: PARENT_SESSION_EXPIRED,
       };
 
       setIsParentTokenError([expiredTokenError]);
diff --git a/packages/manager/src/features/Account/SwitchAccounts/ChildAccountList.test.tsx b/packages/manager/src/features/Account/SwitchAccounts/ChildAccountList.test.tsx
index 63dd01d786f..555a6ee0801 100644
--- a/packages/manager/src/features/Account/SwitchAccounts/ChildAccountList.test.tsx
+++ b/packages/manager/src/features/Account/SwitchAccounts/ChildAccountList.test.tsx
@@ -1,8 +1,7 @@
 import { waitFor, within } from '@testing-library/react';
 import * as React from 'react';
 
-import { accountFactory } from 'src/factories/account';
-import { accountUserFactory } from 'src/factories/accountUsers';
+import { accountFactory, profileFactory } from 'src/factories';
 import { ChildAccountList } from 'src/features/Account/SwitchAccounts/ChildAccountList';
 import { makeResourcePage } from 'src/mocks/serverHandlers';
 import { rest, server } from 'src/mocks/testServer';
@@ -17,8 +16,8 @@ const props = {
 
 it('should display a list of child accounts', async () => {
   server.use(
-    rest.get('*/account/users/*', (req, res, ctx) => {
-      return res(ctx.json(accountUserFactory.build({ user_type: 'parent' })));
+    rest.get('*/profile', (req, res, ctx) => {
+      return res(ctx.json(profileFactory.build({ user_type: 'parent' })));
     }),
     rest.get('*/account/child-accounts', (req, res, ctx) => {
       return res(
diff --git a/packages/manager/src/features/Account/SwitchAccounts/ChildAccountList.tsx b/packages/manager/src/features/Account/SwitchAccounts/ChildAccountList.tsx
index fb97a41862a..3f9075bb849 100644
--- a/packages/manager/src/features/Account/SwitchAccounts/ChildAccountList.tsx
+++ b/packages/manager/src/features/Account/SwitchAccounts/ChildAccountList.tsx
@@ -1,5 +1,7 @@
+import _ from 'lodash';
 import React from 'react';
 import { useQueryClient } from 'react-query';
+import { Waypoint } from 'react-waypoint';
 
 import ErrorStateCloud from 'src/assets/icons/error-state-cloud.svg';
 import { Box } from 'src/components/Box';
@@ -11,7 +13,7 @@ import { Stack } from 'src/components/Stack';
 import { Typography } from 'src/components/Typography';
 import {
   queryKey as accountQueryKey,
-  useChildAccounts,
+  useChildAccountsInfiniteQuery,
 } from 'src/queries/account';
 
 interface ChildAccountListProps {
@@ -35,11 +37,14 @@ export const ChildAccountList = React.memo(
     onSwitchAccount,
   }: ChildAccountListProps) => {
     const {
-      data: childAccounts,
+      data,
+      fetchNextPage,
+      hasNextPage,
       isError,
+      isFetchingNextPage,
       isLoading,
       refetch: refetchChildAccounts,
-    } = useChildAccounts({
+    } = useChildAccountsInfiniteQuery({
       headers: isProxyUser
         ? {
             Authorization: currentTokenWithBearer,
@@ -47,6 +52,7 @@ export const ChildAccountList = React.memo(
         : undefined,
     });
     const queryClient = useQueryClient();
+    const childAccounts = data?.pages.flatMap((page) => page.data);
 
     if (isLoading) {
       return (
@@ -56,7 +62,7 @@ export const ChildAccountList = React.memo(
       );
     }
 
-    if (childAccounts?.results === 0) {
+    if (childAccounts?.length === 0) {
       return (
         <Notice variant="info">There are no indirect customer accounts.</Notice>
       );
@@ -75,7 +81,7 @@ export const ChildAccountList = React.memo(
               queryClient.invalidateQueries([
                 accountQueryKey,
                 'childAccounts',
-                'paginated',
+                'infinite',
               ]);
               refetchChildAccounts();
             }}
@@ -90,7 +96,7 @@ export const ChildAccountList = React.memo(
       );
     }
 
-    const renderChildAccounts = childAccounts?.data.map((childAccount, idx) => {
+    const renderChildAccounts = childAccounts?.map((childAccount, idx) => {
       const euuid = childAccount.euuid;
       return (
         <StyledLinkButton
@@ -116,6 +122,8 @@ export const ChildAccountList = React.memo(
     return (
       <Stack alignItems={'flex-start'} data-testid="child-account-list">
         {renderChildAccounts}
+        {hasNextPage && <Waypoint onEnter={() => fetchNextPage()} />}
+        {isFetchingNextPage && <CircleProgress mini />}
       </Stack>
     );
   }
diff --git a/packages/manager/src/features/Account/SwitchAccounts/SwitchAccountSessionDialog.test.tsx b/packages/manager/src/features/Account/SwitchAccounts/SwitchAccountSessionDialog.test.tsx
new file mode 100644
index 00000000000..0da8f9e727b
--- /dev/null
+++ b/packages/manager/src/features/Account/SwitchAccounts/SwitchAccountSessionDialog.test.tsx
@@ -0,0 +1,63 @@
+import { fireEvent } from '@testing-library/react';
+import React from 'react';
+import { MemoryRouter } from 'react-router-dom';
+
+import { SwitchAccountSessionDialog } from 'src/features/Account/SwitchAccounts/SwitchAccountSessionDialog';
+import { renderWithTheme } from 'src/utilities/testHelpers';
+
+const mockHistory = {
+  push: vi.fn(),
+  replace: vi.fn(),
+};
+
+// Mock useHistory
+vi.mock('react-router-dom', async () => {
+  const actual = await vi.importActual<any>('react-router-dom');
+  return {
+    ...actual,
+    useHistory: vi.fn(() => mockHistory),
+  };
+});
+
+describe('SwitchAccountSessionDialog', () => {
+  it('renders correctly when isOpen is true', () => {
+    const onCloseMock = vi.fn();
+    const { getByText } = renderWithTheme(
+      <MemoryRouter>
+        <SwitchAccountSessionDialog isOpen={true} onClose={onCloseMock} />
+      </MemoryRouter>
+    );
+
+    expect(getByText('Session expired')).toBeInTheDocument();
+    expect(
+      getByText(
+        'Log in again to switch accounts or close this window to continue working on the current account.'
+      )
+    ).toBeInTheDocument();
+    expect(getByText('Log in')).toBeInTheDocument();
+    expect(getByText('Close')).toBeInTheDocument();
+  });
+
+  it('calls onClose when close button is clicked', () => {
+    const onCloseMock = vi.fn();
+    const { getByText } = renderWithTheme(
+      <MemoryRouter>
+        <SwitchAccountSessionDialog isOpen={true} onClose={onCloseMock} />
+      </MemoryRouter>
+    );
+
+    fireEvent.click(getByText('Close'));
+    expect(onCloseMock).toHaveBeenCalled();
+  });
+
+  it('calls history.push("/logout") when Log in button is clicked', () => {
+    const { getByText } = renderWithTheme(
+      <MemoryRouter>
+        <SwitchAccountSessionDialog isOpen={true} onClose={vi.fn()} />
+      </MemoryRouter>
+    );
+
+    fireEvent.click(getByText('Log in'));
+    expect(mockHistory.push).toHaveBeenCalledWith('/logout');
+  });
+});
diff --git a/packages/manager/src/features/Account/SwitchAccounts/SwitchAccountSessionDialog.tsx b/packages/manager/src/features/Account/SwitchAccounts/SwitchAccountSessionDialog.tsx
new file mode 100644
index 00000000000..c4c4dfdaaa4
--- /dev/null
+++ b/packages/manager/src/features/Account/SwitchAccounts/SwitchAccountSessionDialog.tsx
@@ -0,0 +1,38 @@
+import React from 'react';
+import { useHistory } from 'react-router-dom';
+
+import { ActionsPanel } from 'src/components/ActionsPanel/ActionsPanel';
+import { ConfirmationDialog } from 'src/components/ConfirmationDialog/ConfirmationDialog';
+import { Typography } from 'src/components/Typography';
+
+export const SwitchAccountSessionDialog = React.memo(
+  ({ isOpen, onClose }: { isOpen: boolean; onClose: () => void }) => {
+    const history = useHistory();
+
+    const actions = (
+      <ActionsPanel
+        primaryButtonProps={{
+          label: 'Log in',
+          onClick: () => history.push('/logout'),
+        }}
+        secondaryButtonProps={{ label: 'Close', onClick: onClose }}
+      />
+    );
+
+    return (
+      <ConfirmationDialog
+        actions={actions}
+        data-testid="switch-account-session-dialog"
+        maxWidth="xs"
+        onClose={onClose}
+        open={isOpen}
+        title="Session expired"
+      >
+        <Typography>
+          Log in again to switch accounts or close this window to continue
+          working on the current account.
+        </Typography>
+      </ConfirmationDialog>
+    );
+  }
+);
diff --git a/packages/manager/src/features/Account/SwitchAccounts/useParentTokenManagement.test.tsx b/packages/manager/src/features/Account/SwitchAccounts/useParentTokenManagement.test.tsx
new file mode 100644
index 00000000000..0715e3d02d5
--- /dev/null
+++ b/packages/manager/src/features/Account/SwitchAccounts/useParentTokenManagement.test.tsx
@@ -0,0 +1,67 @@
+import { renderHook } from '@testing-library/react-hooks';
+import * as React from 'react';
+
+import { switchAccountSessionContext } from 'src/context/switchAccountSessionContext';
+import { useParentTokenManagement } from 'src/features/Account/SwitchAccounts/useParentTokenManagement';
+
+const queryMocks = vi.hoisted(() => ({
+  isParentTokenValid: vi.fn().mockReturnValue({}),
+}));
+
+vi.mock('src/features/Account/utils', async () => {
+  const actual = await vi.importActual('src/features/Account/utils');
+  return {
+    ...actual,
+    isParentTokenValid: queryMocks.isParentTokenValid,
+  };
+});
+
+const mockUpdateState = vi.fn();
+
+const wrapper = ({ children }: any) => (
+  <switchAccountSessionContext.Provider
+    value={{
+      close: vi.fn(),
+      isOpen: false,
+      open: vi.fn(),
+      updateState: mockUpdateState,
+    }}
+  >
+    {children}
+  </switchAccountSessionContext.Provider>
+);
+
+describe('useParentTokenManagement', () => {
+  beforeEach(() => {
+    vi.clearAllMocks();
+  });
+
+  it('should not mark parent token as expired if it is valid', async () => {
+    queryMocks.isParentTokenValid.mockReturnValue(true);
+    const { result } = renderHook(
+      () => useParentTokenManagement({ isProxyUser: true }),
+      { wrapper }
+    );
+
+    expect(result.current.isParentTokenExpired).toBe(false);
+  });
+
+  it('should mark parent token as expired if it is invalid', async () => {
+    queryMocks.isParentTokenValid.mockReturnValue(false);
+    const { result } = renderHook(
+      () => useParentTokenManagement({ isProxyUser: true }),
+      { wrapper }
+    );
+
+    expect(result.current.isParentTokenExpired).toBe(true);
+  });
+
+  it('should not update the session context when isParentTokenExpired is false', async () => {
+    queryMocks.isParentTokenValid.mockReturnValue(true);
+    renderHook(() => useParentTokenManagement({ isProxyUser: true }), {
+      wrapper,
+    });
+
+    expect(mockUpdateState).not.toHaveBeenCalled();
+  });
+});
diff --git a/packages/manager/src/features/Account/SwitchAccounts/useParentTokenManagement.tsx b/packages/manager/src/features/Account/SwitchAccounts/useParentTokenManagement.tsx
new file mode 100644
index 00000000000..292e3bf0f58
--- /dev/null
+++ b/packages/manager/src/features/Account/SwitchAccounts/useParentTokenManagement.tsx
@@ -0,0 +1,21 @@
+import React from 'react';
+
+import { isParentTokenValid } from 'src/features/Account/utils';
+
+// Checks and reacts to the expiration status of parent tokens.
+export const useParentTokenManagement = ({
+  isProxyUser,
+}: {
+  isProxyUser: boolean;
+}) => {
+  const [isParentTokenExpired, setIsParentTokenExpired] = React.useState(false);
+
+  React.useEffect(() => {
+    if (isProxyUser) {
+      const isExpired = !isParentTokenValid();
+      setIsParentTokenExpired(isExpired);
+    }
+  }, [isProxyUser]);
+
+  return { isParentTokenExpired };
+};
diff --git a/packages/manager/src/features/Account/constants.ts b/packages/manager/src/features/Account/constants.ts
index 1ee5f799f61..0bb075f38d4 100644
--- a/packages/manager/src/features/Account/constants.ts
+++ b/packages/manager/src/features/Account/constants.ts
@@ -18,3 +18,7 @@ export const PARENT_PROXY_USER_CLOSE_ACCOUNT_TOOLTIP_TEXT =
   'Remove indirect customers before closing the account.';
 export const CHILD_USER_CLOSE_ACCOUNT_TOOLTIP_TEXT =
   'Contact your business partner to close your account.';
+
+// TODO: Parent/Child: Requires updated copy...
+export const PARENT_SESSION_EXPIRED =
+  'Session expired. Please log in again to your business partner account.';
diff --git a/packages/manager/src/features/Account/utils.ts b/packages/manager/src/features/Account/utils.ts
index 8d9e95cb13f..de9b38a4699 100644
--- a/packages/manager/src/features/Account/utils.ts
+++ b/packages/manager/src/features/Account/utils.ts
@@ -1,6 +1,13 @@
 import { getStorage, setStorage } from 'src/utilities/storage';
 
-import type { GlobalGrantTypes, Grants, Profile, Token } from '@linode/api-v4';
+import type {
+  GlobalGrantTypes,
+  GrantLevel,
+  Grants,
+  Profile,
+  Token,
+  UserType,
+} from '@linode/api-v4';
 import type { GrantTypeMap } from 'src/features/Account/types';
 
 type ActionType = 'create' | 'delete' | 'edit' | 'view';
@@ -10,6 +17,30 @@ interface GetRestrictedResourceText {
   isSingular?: boolean;
   resourceType: GrantTypeMap;
 }
+
+interface GrantsProfileSchema {
+  grants: Grants | undefined;
+  profile: Profile | undefined;
+}
+
+interface AccountAccessGrant extends GrantsProfileSchema {
+  globalGrantType: 'account_access';
+  permittedGrantLevel: GrantLevel;
+}
+
+interface NonAccountAccessGrant extends GrantsProfileSchema {
+  globalGrantType: Exclude<GlobalGrantTypes, 'account_access'>;
+  permittedGrantLevel?: GrantLevel;
+}
+
+// Discriminating union to determine the type of global grant
+export type RestrictedGlobalGrantType =
+  | AccountAccessGrant
+  | NonAccountAccessGrant;
+
+/**
+ * Get a resource restricted message based on action and resource type.
+ */
 export const getRestrictedResourceText = ({
   action = 'edit',
   isSingular = true,
@@ -22,16 +53,47 @@ export const getRestrictedResourceText = ({
   return `You don't have permissions to ${action} ${resource}. Please contact your account administrator to request the necessary permissions.`;
 };
 
+/**
+ * Get an 'access restricted' message based on user type.
+ */
+export const getAccessRestrictedText = (
+  userType: UserType | undefined,
+  isParentChildFeatureEnabled?: boolean
+) => {
+  return `Access restricted. Please contact your ${
+    isParentChildFeatureEnabled && userType === 'child'
+      ? 'business partner'
+      : 'account administrator'
+  } to request the necessary permission.`;
+};
+
+/**
+ * Determine whether the user has restricted access to a specific resource.
+ *
+ * @example
+ * // If account access does not equal 'read_write', the user has restricted access.
+ * isRestrictedGlobalGrantType({
+ *   globalGrantType: 'account_access',
+ *   permittedGrantLevel: 'read_write',
+ *   grants,
+ *   profile
+ * });
+ * // Returns: true
+ */
 export const isRestrictedGlobalGrantType = ({
   globalGrantType,
   grants,
+  permittedGrantLevel,
   profile,
-}: {
-  globalGrantType: GlobalGrantTypes;
-  grants: Grants | undefined;
-  profile: Profile | undefined;
-}): boolean => {
-  return Boolean(profile?.restricted) && !grants?.global[globalGrantType];
+}: RestrictedGlobalGrantType): boolean => {
+  if (globalGrantType !== 'account_access') {
+    return Boolean(profile?.restricted) && !grants?.global[globalGrantType];
+  }
+
+  return (
+    Boolean(profile?.restricted) &&
+    grants?.global[globalGrantType] !== permittedGrantLevel
+  );
 };
 
 // TODO: Parent/Child: FOR MSW ONLY, REMOVE WHEN API IS READY
@@ -43,18 +105,13 @@ export const isRestrictedGlobalGrantType = ({
 /**
  * Determine whether the tokens used for switchable accounts are still valid.
  */
-export const isParentTokenValid = ({
-  isProxyUser,
-}: {
-  isProxyUser: boolean;
-}) => {
+export const isParentTokenValid = (): boolean => {
   const now = new Date().toISOString();
 
   // From a proxy user, check whether parent token is still valid before switching.
   if (
-    isProxyUser &&
     now >
-      new Date(getStorage('authentication/parent_token/expire')).toISOString()
+    new Date(getStorage('authentication/parent_token/expire')).toISOString()
 
     // TODO: Parent/Child: FOR MSW ONLY, REMOVE WHEN API IS READY
     // ================================================================
diff --git a/packages/manager/src/features/Billing/BillingPanels/BillingActivityPanel/BillingActivityPanel.test.tsx b/packages/manager/src/features/Billing/BillingPanels/BillingActivityPanel/BillingActivityPanel.test.tsx
index 2e64b102bf2..8f17374c8b2 100644
--- a/packages/manager/src/features/Billing/BillingPanels/BillingActivityPanel/BillingActivityPanel.test.tsx
+++ b/packages/manager/src/features/Billing/BillingPanels/BillingActivityPanel/BillingActivityPanel.test.tsx
@@ -168,6 +168,11 @@ describe('paymentToActivityFeedItem', () => {
         { zone: 'utc' }
       );
       const testDateISO = testDate.toISO();
+
+      if (!testDateISO) {
+        throw new Error('Invalid test date');
+      }
+
       expect(getCutoffFromDateRange('30 Days', testDateISO)).toBe(
         testDate.minus({ days: 30 }).toISO()
       );
@@ -183,21 +188,21 @@ describe('paymentToActivityFeedItem', () => {
       expect(getCutoffFromDateRange('12 Months', testDateISO)).toBe(
         testDate.minus({ months: 12 }).toISO()
       );
-      expect(getCutoffFromDateRange('All Time', testDateISO)).toBeUndefined();
+      expect(getCutoffFromDateRange('All Time', testDateISO)).toBeNull();
     });
   });
 
   describe('makeFilter', () => {
     const endDate = '2020-01-01T00:00:00';
     it('always includes conditions to order by date desc', () => {
-      expect(makeFilter()).toHaveProperty('+order_by', 'date');
-      expect(makeFilter()).toHaveProperty('+order', 'desc');
+      expect(makeFilter(null)).toHaveProperty('+order_by', 'date');
+      expect(makeFilter(null)).toHaveProperty('+order', 'desc');
       expect(makeFilter(endDate)).toHaveProperty('+order_by', 'date');
       expect(makeFilter(endDate)).toHaveProperty('+order', 'desc');
     });
 
     it('includes a date filter only if given an endDate', () => {
-      expect(makeFilter()).not.toHaveProperty('date');
+      expect(makeFilter(null)).not.toHaveProperty('date');
       expect(makeFilter(endDate)).toHaveProperty('date', {
         '+gte': '2020-01-01T00:00:00',
       });
diff --git a/packages/manager/src/features/Billing/BillingPanels/BillingActivityPanel/BillingActivityPanel.tsx b/packages/manager/src/features/Billing/BillingPanels/BillingActivityPanel/BillingActivityPanel.tsx
index bed0151fc80..b25268aed13 100644
--- a/packages/manager/src/features/Billing/BillingPanels/BillingActivityPanel/BillingActivityPanel.tsx
+++ b/packages/manager/src/features/Billing/BillingPanels/BillingActivityPanel/BillingActivityPanel.tsx
@@ -40,12 +40,12 @@ import {
   useAllAccountPayments,
 } from 'src/queries/accountBilling';
 import { useProfile } from 'src/queries/profile';
+import { useRegionsQuery } from 'src/queries/regions';
 import { parseAPIDate } from 'src/utilities/date';
 import { formatDate } from 'src/utilities/formatDate';
 import { getAll } from 'src/utilities/getAll';
 
 import { getTaxID } from '../../billingUtils';
-import { useRegionsQuery } from 'src/queries/regions';
 
 const useStyles = makeStyles()((theme: Theme) => ({
   activeSince: {
@@ -595,9 +595,9 @@ export const paymentToActivityFeedItem = (
 export const getCutoffFromDateRange = (
   range: DateRange,
   currentDatetime?: string
-): string | undefined => {
+): null | string => {
   if (range === 'All Time') {
-    return undefined;
+    return null;
   }
 
   const date = currentDatetime ? parseAPIDate(currentDatetime) : DateTime.utc();
@@ -629,7 +629,7 @@ export const getCutoffFromDateRange = (
 /**
  * @param endDate in ISO format
  */
-export const makeFilter = (endDate?: string): any => {
+export const makeFilter = (endDate: null | string) => {
   const filter: any = {
     '+order': 'desc',
     '+order_by': 'date',
diff --git a/packages/manager/src/features/Billing/BillingPanels/ContactInfoPanel/UpdateContactInformationForm/UpdateContactInformationForm.tsx b/packages/manager/src/features/Billing/BillingPanels/ContactInfoPanel/UpdateContactInformationForm/UpdateContactInformationForm.tsx
index 88f7ea1501b..18421b988e0 100644
--- a/packages/manager/src/features/Billing/BillingPanels/ContactInfoPanel/UpdateContactInformationForm/UpdateContactInformationForm.tsx
+++ b/packages/manager/src/features/Billing/BillingPanels/ContactInfoPanel/UpdateContactInformationForm/UpdateContactInformationForm.tsx
@@ -9,7 +9,6 @@ import { ActionsPanel } from 'src/components/ActionsPanel/ActionsPanel';
 import EnhancedSelect, { Item } from 'src/components/EnhancedSelect/Select';
 import { Notice } from 'src/components/Notice/Notice';
 import { TextField } from 'src/components/TextField';
-import { useFlags } from 'src/hooks/useFlags';
 import { useAccount, useMutateAccount } from 'src/queries/account';
 import { useNotificationsQuery } from 'src/queries/accountNotifications';
 import { getErrorMap } from 'src/utilities/errorUtils';
@@ -28,7 +27,6 @@ const UpdateContactInformationForm = ({ focusEmail, onClose }: Props) => {
   const { error, isLoading, mutateAsync } = useMutateAccount();
   const { data: notifications, refetch } = useNotificationsQuery();
   const { classes } = useStyles();
-  const flags = useFlags();
   const emailRef = React.useRef<HTMLInputElement>();
 
   const formik = useFormik({
@@ -241,15 +239,16 @@ const UpdateContactInformationForm = ({ focusEmail, onClose }: Props) => {
             onChange={(item) => formik.setFieldValue('country', item.value)}
             options={countryResults}
             placeholder="Select a Country"
-            required={flags.regionDropdown}
+            required
           />
         </Grid>
         <Grid sm={6} xs={12}>
-          {flags.regionDropdown &&
-          (formik.values.country === 'US' || formik.values.country == 'CA') ? (
+          {formik.values.country === 'US' || formik.values.country == 'CA' ? (
             <EnhancedSelect
               placeholder={
-                formik.values.country === 'US' ? 'state' : 'province'
+                formik.values.country === 'US'
+                  ? 'Enter state'
+                  : 'Enter province'
               }
               textFieldProps={{
                 dataAttrs: {
@@ -266,7 +265,7 @@ const UpdateContactInformationForm = ({ focusEmail, onClose }: Props) => {
               label={`${formik.values.country === 'US' ? 'State' : 'Province'}`}
               onChange={(item) => formik.setFieldValue('state', item.value)}
               options={filteredRegionResults}
-              required={flags.regionDropdown}
+              required
             />
           ) : (
             <TextField
@@ -276,7 +275,7 @@ const UpdateContactInformationForm = ({ focusEmail, onClose }: Props) => {
               name="state"
               onChange={formik.handleChange}
               placeholder="Enter region"
-              required={flags.regionDropdown}
+              required
               value={formik.values.state}
             />
           )}
diff --git a/packages/manager/src/features/Domains/DomainRecords.tsx b/packages/manager/src/features/Domains/DomainRecords.tsx
index ff5ed92a118..1b85fa2debf 100644
--- a/packages/manager/src/features/Domains/DomainRecords.tsx
+++ b/packages/manager/src/features/Domains/DomainRecords.tsx
@@ -21,7 +21,6 @@ import {
   propEq,
 } from 'ramda';
 import * as React from 'react';
-import { compose as recompose } from 'recompose';
 
 import { ActionsPanel } from 'src/components/ActionsPanel/ActionsPanel';
 import { Button } from 'src/components/Button/Button';
@@ -37,9 +36,6 @@ import { TableHead } from 'src/components/TableHead';
 import { TableRow } from 'src/components/TableRow';
 import { TableRowEmpty } from 'src/components/TableRowEmpty/TableRowEmpty';
 import { Typography } from 'src/components/Typography';
-import withFeatureFlags, {
-  FeatureFlagConsumerProps,
-} from 'src/containers/withFeatureFlagConsumer.container';
 import {
   getAPIErrorOrDefault,
   getErrorStringOrDefault,
@@ -52,7 +48,7 @@ import { DomainRecordActionMenu } from './DomainRecordActionMenu';
 import { DomainRecordDrawer } from './DomainRecordDrawer';
 import { StyledDiv, StyledGrid, StyledTableCell } from './DomainRecords.styles';
 
-interface DomainRecordsProps {
+interface Props {
   domain: Domain;
   domainRecords: DomainRecord[];
   updateDomain: (data: { id: number } & UpdateDomainPayload) => Promise<Domain>;
@@ -79,8 +75,6 @@ interface State {
   types: IType[];
 }
 
-type CombinedProps = DomainRecordsProps & FeatureFlagConsumerProps;
-
 interface IType {
   columns: {
     render: (r: Domain | DomainRecord) => JSX.Element | null | string;
@@ -99,8 +93,8 @@ const createLink = (title: string, handler: () => void) => (
   </Button>
 );
 
-class DomainRecords extends React.Component<CombinedProps, State> {
-  constructor(props: CombinedProps) {
+class DomainRecords extends React.Component<Props, State> {
+  constructor(props: Props) {
     super(props);
     this.state = {
       confirmDialog: {
@@ -112,7 +106,7 @@ class DomainRecords extends React.Component<CombinedProps, State> {
     };
   }
 
-  componentDidUpdate(prevProps: CombinedProps) {
+  componentDidUpdate(prevProps: Props) {
     if (
       !equals(prevProps.domainRecords, this.props.domainRecords) ||
       !equals(prevProps.domain, this.props.domain)
@@ -879,12 +873,10 @@ const prependLinodeNS = compose<any, any, DomainRecord[]>(
 );
 
 const getNSRecords = compose<
-  DomainRecordsProps,
+  Props,
   DomainRecord[],
   DomainRecord[],
   DomainRecord[]
 >(prependLinodeNS, filter(typeEq('NS')), pathOr([], ['domainRecords']));
 
-export default recompose<CombinedProps, DomainRecordsProps>(withFeatureFlags)(
-  DomainRecords
-);
+export default DomainRecords;
diff --git a/packages/manager/src/features/GlobalNotifications/GlobalNotifications.tsx b/packages/manager/src/features/GlobalNotifications/GlobalNotifications.tsx
index 0359ace3f8d..80440e8e92b 100644
--- a/packages/manager/src/features/GlobalNotifications/GlobalNotifications.tsx
+++ b/packages/manager/src/features/GlobalNotifications/GlobalNotifications.tsx
@@ -2,6 +2,8 @@ import { isEmpty } from 'ramda';
 import * as React from 'react';
 
 import AbuseTicketBanner from 'src/components/AbuseTicketBanner';
+import { switchAccountSessionContext } from 'src/context/switchAccountSessionContext';
+import { SwitchAccountSessionDialog } from 'src/features/Account/SwitchAccounts/SwitchAccountSessionDialog';
 import { useDismissibleNotifications } from 'src/hooks/useDismissibleNotifications';
 import { useFlags } from 'src/hooks/useFlags';
 import { useProfile } from 'src/queries/profile';
@@ -18,10 +20,13 @@ import { VerificationDetailsBanner } from './VerificationDetailsBanner';
 export const GlobalNotifications = () => {
   const flags = useFlags();
   const { data: profile } = useProfile();
-  const isChildAccount =
+  const sessionContext = React.useContext(switchAccountSessionContext);
+  const isChildUser =
     Boolean(flags.parentChildAccountAccess) && profile?.user_type === 'child';
+  const isProxyUser =
+    Boolean(flags.parentChildAccountAccess) && profile?.user_type === 'proxy';
   const { data: securityQuestions } = useSecurityQuestions({
-    enabled: isChildAccount,
+    enabled: isChildUser,
   });
   const suppliedMaintenances = flags.apiMaintenance?.maintenances; // The data (ID, and sometimes the title and body) we supply regarding maintenance events in LD.
 
@@ -50,8 +55,14 @@ export const GlobalNotifications = () => {
       <RegionStatusBanner />
       <AbuseTicketBanner />
       <ComplianceBanner />
+      {isProxyUser && (
+        <SwitchAccountSessionDialog
+          isOpen={Boolean(sessionContext.isOpen)}
+          onClose={() => sessionContext.updateState({ isOpen: false })}
+        />
+      )}
       <ComplianceUpdateModal />
-      {isChildAccount && !isVerified && (
+      {isChildUser && !isVerified && (
         <VerificationDetailsBanner
           hasSecurityQuestions={hasSecurityQuestions}
           hasVerifiedPhoneNumber={hasVerifiedPhoneNumber}
diff --git a/packages/manager/src/features/Help/HelpLanding.test.tsx b/packages/manager/src/features/Help/HelpLanding.test.tsx
index f7554f88ff4..d74a1d32e35 100644
--- a/packages/manager/src/features/Help/HelpLanding.test.tsx
+++ b/packages/manager/src/features/Help/HelpLanding.test.tsx
@@ -1,19 +1,26 @@
-import { shallow } from 'enzyme';
 import * as React from 'react';
 
+import { renderWithTheme } from 'src/utilities/testHelpers';
+
 import { HelpLanding } from './HelpLanding';
 
 describe('Help Landing', () => {
-  const component = shallow(<HelpLanding />);
-  it.skip('should render search panel', () => {
-    expect(component.find('SearchPanel')).toHaveLength(1);
+  it('should render search panel', () => {
+    const { getByText } = renderWithTheme(<HelpLanding />);
+
+    expect(getByText('What can we help you with?')).toBeVisible();
   });
 
   it('should render popular posts panel', () => {
-    expect(component.find('PopularPosts')).toHaveLength(1);
+    const { getByText } = renderWithTheme(<HelpLanding />);
+
+    expect(getByText('Most Popular Documentation:')).toBeVisible();
+    expect(getByText('Most Popular Community Posts:')).toBeVisible();
   });
 
   it('should render other ways panel', () => {
-    expect(component.find('OtherWays')).toHaveLength(1);
+    const { getByText } = renderWithTheme(<HelpLanding />);
+
+    expect(getByText('Other Ways to Get Help')).toBeVisible();
   });
 });
diff --git a/packages/manager/src/features/Help/SearchHOC.test.tsx b/packages/manager/src/features/Help/SearchHOC.test.tsx
index 980590b8ccc..1793cad9b7f 100644
--- a/packages/manager/src/features/Help/SearchHOC.test.tsx
+++ b/packages/manager/src/features/Help/SearchHOC.test.tsx
@@ -1,8 +1,3 @@
-import { waitFor } from '@testing-library/react';
-import algoliasearch from 'algoliasearch';
-import { shallow } from 'enzyme';
-import * as React from 'react';
-
 import {
   community_answer,
   community_question,
@@ -10,7 +5,7 @@ import {
 } from 'src/__data__/searchResults';
 import { COMMUNITY_BASE_URL, DOCS_BASE_URL } from 'src/constants';
 
-import withSearch, {
+import {
   cleanDescription,
   convertCommunityToItems,
   convertDocsToItems,
@@ -19,205 +14,120 @@ import withSearch, {
   getDocsResultLabel,
 } from './SearchHOC';
 
-const HITS_PER_PAGE = 10;
-
-const mockFn = vi.fn();
-
-vi.mock('algoliasearch', () => ({
-  default: vi.fn().mockImplementation(() => ({
-    search: mockFn,
-  })),
-}));
-
-const mockResults = {
-  results: [{ hits: [docs_result] }, { hits: [community_question] }],
-};
-
-const emptyResults = {
-  results: [{ hits: [] }, { hits: [] }],
-};
-
-const getSearchFromQuery = (query: string) => [
-  {
-    indexName: 'linode-docs',
-    params: {
-      attributesToRetrieve: ['title', '_highlightResult', 'href'],
-      hitsPerPage: HITS_PER_PAGE,
-    },
-    query,
-  },
-  {
-    indexName: 'linode-community',
-    params: {
-      attributesToRetrieve: ['title', 'description', '_highlightResult'],
-      distinct: true,
-      hitsPerPage: HITS_PER_PAGE,
-    },
-    query,
-  },
-];
-
-const searchable = withSearch({ highlight: false, hitsPerPage: HITS_PER_PAGE });
-const RawComponent = searchable(React.Component);
-
-const component = shallow(<RawComponent />);
-
-describe('Algolia Search HOC', () => {
-  describe('external API', () => {
-    afterEach(() => vi.resetAllMocks());
-    it('should initialize the index', () => {
-      expect(algoliasearch).toHaveBeenCalled();
-      expect(component.props().searchEnabled).toBe(true);
-    });
-    it('should search the Algolia indices', () => {
-      const query = getSearchFromQuery('hat');
-      component.props().searchAlgolia('hat');
-      expect(mockFn).toHaveBeenCalledWith(query);
-    });
-    it('should save an error to state if the request to Algolia fails', () => {
-      mockFn.mockImplementationOnce((queries: any, callback: any) =>
-        callback({ code: 500, message: 'I reject this request.' }, undefined)
-      );
-      component.props().searchAlgolia('existentialism');
-      expect(component.props().searchError).toEqual(
-        'There was an error retrieving your search results.'
+describe('internal methods', () => {
+  describe('getDocsResultLabel', () => {
+    // eslint-disable-next-line xss/no-mixed-html
+    it('should return a label with highlighted content marked as <em>', () => {
+      const label = getDocsResultLabel(docs_result, true);
+      expect(label).toBe(docs_result._highlightResult.title.value);
+    });
+    it('should use the unformatted title when highlighting is set to false', () => {
+      const label2 = getDocsResultLabel(docs_result, false);
+      expect(label2).toBe(docs_result.title);
+    });
+    it('should return an unformatted label if there is no highlighted result', () => {
+      const result = { ...docs_result } as any;
+      result._highlightResult = {};
+      const label3 = getDocsResultLabel(result, true);
+      expect(label3).toBe(result.title);
+    });
+  });
+  describe('getCommunityUrl', () => {
+    it('should parse a community question', () => {
+      expect(getCommunityUrl('q_123')).toMatch('/questions/123');
+    });
+    it('should parse a community answer', () => {
+      expect(getCommunityUrl('a_123')).toMatch('/questions/answer/123');
+    });
+    it('should handle strange input', () => {
+      expect(getCommunityUrl("I'm not a URL")).toEqual(COMMUNITY_BASE_URL);
+    });
+  });
+  describe('cleanDescription', () => {
+    it('should return a normal string unchanged', () => {
+      expect(cleanDescription('just a description')).toBe('just a description');
+    });
+    /* eslint-disable xss/no-mixed-html */
+    it('should trim a <t> tag', () => {
+      expect(cleanDescription('<t>I have a tag')).toBe('I have a tag');
+    });
+    it('should trim a <r> tag', () => {
+      expect(cleanDescription('<r>I also have a tag')).toBe(
+        'I also have a tag'
       );
     });
-    it('should set search results based on the Algolia response', async () => {
-      mockFn.mockImplementationOnce(() => mockResults);
-      component.props().searchAlgolia('existentialism');
-
-      await waitFor(() => {
-        expect(component.props().searchResults[0]).toHaveLength(1);
-        expect(component.props().searchResults[1]).toHaveLength(1);
-      });
-    });
-    it('should set results list to empty on a blank query', async () => {
-      mockFn.mockImplementationOnce(() => emptyResults);
-      component.props().searchAlgolia('existentialism');
-      await waitFor(() => {
-        expect(component.props().searchResults[0]).toHaveLength(0);
-        expect(component.props().searchResults[1]).toHaveLength(0);
-      });
+  });
+  /* eslint-enable xss/no-mixed-html */
+  describe('getCommunityResultLabel', () => {
+    it('should use the highlighted title if available', () => {
+      const label4 = getCommunityResultLabel(community_question, true);
+      expect(label4).toBe(community_question._highlightResult.title.value);
+    });
+    it('should use the unformatted title if highlight is false', () => {
+      const label5 = getCommunityResultLabel(community_question, false);
+      expect(label5).toBe(community_question.title);
+    });
+    it('should use the description if no title is available', () => {
+      const label6 = getCommunityResultLabel(community_answer, true);
+      expect(label6).toBe(community_answer.description);
+    });
+    it('should truncate the title', () => {
+      const result = { ...community_answer } as any;
+      result.description =
+        "A much longer description that can't possibly fit on one line of a results list.";
+      const label7 = getCommunityResultLabel(result, true);
+      expect(label7).toBe('A much longer description that can ...');
     });
   });
-  describe('internal methods', () => {
-    describe('getDocsResultLabel', () => {
-      // eslint-disable-next-line xss/no-mixed-html
-      it('should return a label with highlighted content marked as <em>', () => {
-        const label = getDocsResultLabel(docs_result, true);
-        expect(label).toBe(docs_result._highlightResult.title.value);
-      });
-      it('should use the unformatted title when highlighting is set to false', () => {
-        const label2 = getDocsResultLabel(docs_result, false);
-        expect(label2).toBe(docs_result.title);
-      });
-      it('should return an unformatted label if there is no highlighted result', () => {
-        const result = { ...docs_result } as any;
-        result._highlightResult = {};
-        const label3 = getDocsResultLabel(result, true);
-        expect(label3).toBe(result.title);
-      });
-    });
-    describe('getCommunityUrl', () => {
-      it('should parse a community question', () => {
-        expect(getCommunityUrl('q_123')).toMatch('/questions/123');
-      });
-      it('should parse a community answer', () => {
-        expect(getCommunityUrl('a_123')).toMatch('/questions/answer/123');
-      });
-      it('should handle strange input', () => {
-        expect(getCommunityUrl("I'm not a URL")).toEqual(COMMUNITY_BASE_URL);
-      });
-    });
-    describe('cleanDescription', () => {
-      it('should return a normal string unchanged', () => {
-        expect(cleanDescription('just a description')).toBe(
-          'just a description'
-        );
-      });
-      /* eslint-disable xss/no-mixed-html */
-      it('should trim a <t> tag', () => {
-        expect(cleanDescription('<t>I have a tag')).toBe('I have a tag');
-      });
-      it('should trim a <r> tag', () => {
-        expect(cleanDescription('<r>I also have a tag')).toBe(
-          'I also have a tag'
-        );
-      });
-    });
-    /* eslint-enable xss/no-mixed-html */
-    describe('getCommunityResultLabel', () => {
-      it('should use the highlighted title if available', () => {
-        const label4 = getCommunityResultLabel(community_question, true);
-        expect(label4).toBe(community_question._highlightResult.title.value);
-      });
-      it('should use the unformatted title if highlight is false', () => {
-        const label5 = getCommunityResultLabel(community_question, false);
-        expect(label5).toBe(community_question.title);
-      });
-      it('should use the description if no title is available', () => {
-        const label6 = getCommunityResultLabel(community_answer, true);
-        expect(label6).toBe(community_answer.description);
-      });
-      it('should truncate the title', () => {
-        const result = { ...community_answer } as any;
-        result.description =
-          "A much longer description that can't possibly fit on one line of a results list.";
-        const label7 = getCommunityResultLabel(result, true);
-        expect(label7).toBe('A much longer description that can ...');
-      });
-    });
-    describe('convertDocsToItems', () => {
-      it('should convert docs to a correctly formatted Item[]', () => {
-        const formattedResults = convertDocsToItems(false, [docs_result]);
-        expect(formattedResults).toEqual([
-          {
-            data: {
-              href: DOCS_BASE_URL + docs_result.href,
-              source: 'Linode documentation',
-            },
-            label: docs_result.title,
-            value: 0,
+  describe('convertDocsToItems', () => {
+    it('should convert docs to a correctly formatted Item[]', () => {
+      const formattedResults = convertDocsToItems(false, [docs_result]);
+      expect(formattedResults).toEqual([
+        {
+          data: {
+            href: DOCS_BASE_URL + docs_result.href,
+            source: 'Linode documentation',
           },
-        ]);
-      });
-      it('should handle empty results lists correctly', () => {
-        const results = convertDocsToItems(false, []);
-        expect(results).toEqual([]);
-      });
-    });
-    describe('convertCommunityToItems', () => {
-      it('should convert a community question to a correctly formatted Item', () => {
-        const formattedResults = convertCommunityToItems(false, [
-          community_question,
-        ] as any);
-        expect(formattedResults).toEqual([
-          {
-            data: {
-              href: expect.any(String),
-              source: 'Linode Community Site',
-            },
-            label: community_question.title,
-            value: 0,
+          label: docs_result.title,
+          value: 0,
+        },
+      ]);
+    });
+    it('should handle empty results lists correctly', () => {
+      const results = convertDocsToItems(false, []);
+      expect(results).toEqual([]);
+    });
+  });
+  describe('convertCommunityToItems', () => {
+    it('should convert a community question to a correctly formatted Item', () => {
+      const formattedResults = convertCommunityToItems(false, [
+        community_question,
+      ] as any);
+      expect(formattedResults).toEqual([
+        {
+          data: {
+            href: expect.any(String),
+            source: 'Linode Community Site',
           },
-        ]);
-      });
-      it('should convert a community answer to a correctly formatted Item', () => {
-        const formattedResults = convertCommunityToItems(false, [
-          community_answer,
-        ] as any);
-        expect(formattedResults).toEqual([
-          {
-            data: {
-              href: expect.any(String),
-              source: 'Linode Community Site',
-            },
-            label: community_question.description,
-            value: 0,
+          label: community_question.title,
+          value: 0,
+        },
+      ]);
+    });
+    it('should convert a community answer to a correctly formatted Item', () => {
+      const formattedResults = convertCommunityToItems(false, [
+        community_answer,
+      ] as any);
+      expect(formattedResults).toEqual([
+        {
+          data: {
+            href: expect.any(String),
+            source: 'Linode Community Site',
           },
-        ]);
-      });
+          label: community_question.description,
+          value: 0,
+        },
+      ]);
     });
   });
 });
diff --git a/packages/manager/src/features/Linodes/CloneLanding/utilities.ts b/packages/manager/src/features/Linodes/CloneLanding/utilities.ts
index af015bfedc3..8d1c5c700d1 100644
--- a/packages/manager/src/features/Linodes/CloneLanding/utilities.ts
+++ b/packages/manager/src/features/Linodes/CloneLanding/utilities.ts
@@ -304,7 +304,7 @@ export const getEstimatedCloneTime = (
     minutes: estimatedTimeInMinutes,
     seconds: estimatedTimeInMinutes > 0 ? 1 : 0, // in case less than 1 min
   });
-  let humanizedEstimate = then.toRelative(now.toObject());
+  let humanizedEstimate = then.toRelative({ base: now });
   const prefixHumanized = 'in ';
   if (humanizedEstimate?.startsWith(prefixHumanized)) {
     humanizedEstimate = humanizedEstimate?.substring(prefixHumanized.length);
diff --git a/packages/manager/src/features/Linodes/LinodesCreate/LinodeCreate.tsx b/packages/manager/src/features/Linodes/LinodesCreate/LinodeCreate.tsx
index b5ac6c725c0..e828af82c44 100644
--- a/packages/manager/src/features/Linodes/LinodesCreate/LinodeCreate.tsx
+++ b/packages/manager/src/features/Linodes/LinodesCreate/LinodeCreate.tsx
@@ -1,3 +1,4 @@
+import { PlacementGroup } from '@linode/api-v4';
 import {
   InterfacePayload,
   PriceObject,
@@ -32,18 +33,19 @@ import {
   WithAccountProps,
   withAccount,
 } from 'src/containers/account.container';
+import { WithFeatureFlagProps } from 'src/containers/flags.container';
 import { DefaultProps as ImagesProps } from 'src/containers/images.container';
 import { RegionsProps } from 'src/containers/regions.container';
 import { WithTypesProps } from 'src/containers/types.container';
-import { FeatureFlagConsumerProps } from 'src/containers/withFeatureFlagConsumer.container';
 import { WithLinodesProps } from 'src/containers/withLinodes.container';
 import { EUAgreementCheckbox } from 'src/features/Account/Agreements/EUAgreementCheckbox';
+import { regionSupportsMetadata } from 'src/features/Linodes/LinodesCreate/utilities';
 import {
   getMonthlyAndHourlyNodePricing,
   utoa,
 } from 'src/features/Linodes/LinodesCreate/utilities';
-import { regionSupportsMetadata } from 'src/features/Linodes/LinodesCreate/utilities';
 import { SMTPRestrictionText } from 'src/features/Linodes/SMTPRestrictionText';
+import { hasPlacementGroupReachedCapacity } from 'src/features/PlacementGroups/utils';
 import {
   getCommunityStackscripts,
   getMineAndAccountStackScripts,
@@ -120,6 +122,7 @@ export interface LinodeCreateProps {
   imageDisplayInfo: Info;
   ipamAddress: null | string;
   label: string;
+  placementGroupSelection?: PlacementGroup;
   regionDisplayInfo: Info;
   resetCreationState: () => void;
   selectedSubnetId?: number;
@@ -140,6 +143,7 @@ export interface LinodeCreateProps {
   updateLabel: (label: string) => void;
   updateLinodeID: (id: number, diskSize?: number | undefined) => void;
   updatePassword: (password: string) => void;
+  updatePlacementGroupSelection: (placementGroup: PlacementGroup) => void;
   updateTags: (tags: Tag[]) => void;
   updateUserData: (userData: string) => void;
   userData: string | undefined;
@@ -169,7 +173,7 @@ type InnerProps = WithTypesRegionsAndImages &
 
 type CombinedProps = AllFormStateAndHandlers &
   AppsData &
-  FeatureFlagConsumerProps &
+  WithFeatureFlagProps &
   ImagesProps &
   InnerProps &
   ReduxStateProps &
@@ -277,6 +281,7 @@ export class LinodeCreate extends React.PureComponent<
       linodesData,
       linodesError,
       linodesLoading,
+      placementGroupSelection,
       regionDisplayInfo,
       regionsData,
       regionsError,
@@ -292,6 +297,7 @@ export class LinodeCreate extends React.PureComponent<
       typesError,
       typesLoading,
       updateLabel,
+      updatePlacementGroupSelection,
       updateTags,
       updateUserData,
       userCannotCreateLinode,
@@ -315,6 +321,18 @@ export class LinodeCreate extends React.PureComponent<
       return null;
     }
 
+    {
+      /* TODO VM_Placement: Refactor this into a util method */
+    }
+    const regionLabel = regionsData?.find((r) => r.id === selectedRegionID)
+      ?.label;
+    let placementGroupsLabel;
+    if (selectedRegionID && regionLabel) {
+      placementGroupsLabel = `Placement Groups in ${regionLabel} (${selectedRegionID})`;
+    } else {
+      placementGroupsLabel = 'Placement Group';
+    }
+
     const tagsInputProps = {
       disabled: userCannotCreateLinode,
       onChange: updateTags,
@@ -322,6 +340,16 @@ export class LinodeCreate extends React.PureComponent<
       value: tags || [],
     };
 
+    let errorText;
+    if (
+      hasPlacementGroupReachedCapacity({
+        placementGroup: placementGroupSelection!,
+        region: regionsData.find((r) => r.id === selectedRegionID)!,
+      })
+    ) {
+      errorText = `This Placement Group doesn't have any capacity`;
+    }
+
     const hasBackups = Boolean(
       this.props.backupsEnabled || accountBackupsEnabled
     );
@@ -613,12 +641,21 @@ export class LinodeCreate extends React.PureComponent<
               onChange: (e) => updateLabel(e.target.value),
               value: label || '',
             }}
+            placementGroupsSelectProps={{
+              disabled: !selectedRegionID,
+              errorText,
+              handlePlacementGroupSelection: updatePlacementGroupSelection,
+              label: placementGroupsLabel,
+              noOptionsMessage: 'There are no Placement Groups in this region',
+              selectedRegionId: selectedRegionID,
+            }}
             tagsInputProps={
               this.props.createType !== 'fromLinode'
                 ? tagsInputProps
                 : undefined
             }
             data-qa-label-and-tags-panel
+            regions={regionsData!}
           />
           {/* Hide for backups and clone */}
           {!['fromBackup', 'fromLinode'].includes(this.props.createType) && (
diff --git a/packages/manager/src/features/Linodes/LinodesCreate/LinodeCreateContainer.tsx b/packages/manager/src/features/Linodes/LinodesCreate/LinodeCreateContainer.tsx
index a4fcfb54c08..fa39eab131d 100644
--- a/packages/manager/src/features/Linodes/LinodesCreate/LinodeCreateContainer.tsx
+++ b/packages/manager/src/features/Linodes/LinodesCreate/LinodeCreateContainer.tsx
@@ -1,3 +1,4 @@
+import { PlacementGroup } from '@linode/api-v4';
 import { Agreements, signAgreement } from '@linode/api-v4/lib/account';
 import { Image } from '@linode/api-v4/lib/images';
 import { Region } from '@linode/api-v4/lib/regions';
@@ -25,6 +26,10 @@ import {
   WithEventsPollingActionProps,
   withEventsPollingActions,
 } from 'src/containers/events.container';
+import {
+  WithFeatureFlagProps,
+  withFeatureFlags,
+} from 'src/containers/flags.container';
 import withImages, {
   DefaultProps as ImagesProps,
 } from 'src/containers/images.container';
@@ -34,9 +39,6 @@ import {
 } from 'src/containers/profile.container';
 import { RegionsProps, withRegions } from 'src/containers/regions.container';
 import { WithTypesProps, withTypes } from 'src/containers/types.container';
-import withFlags, {
-  FeatureFlagConsumerProps,
-} from 'src/containers/withFeatureFlagConsumer.container';
 import {
   WithLinodesProps,
   withLinodes,
@@ -107,6 +109,7 @@ interface State {
   errors?: APIError[];
   formIsSubmitting: boolean;
   password: string;
+  placementGroupSelection?: PlacementGroup;
   privateIPEnabled: boolean;
   selectedBackupID?: number;
   selectedDiskSize?: number;
@@ -136,7 +139,7 @@ type CombinedProps = WithSnackbarProps &
   WithTypesProps &
   WithLinodesProps &
   RegionsProps &
-  FeatureFlagConsumerProps &
+  WithFeatureFlagProps &
   RouteComponentProps<{}, any, any> &
   WithProfileProps &
   AgreementsProps &
@@ -157,6 +160,7 @@ const defaultState: State = {
   errors: undefined,
   formIsSubmitting: false,
   password: '',
+  placementGroupSelection: undefined,
   privateIPEnabled: false,
   selectedBackupID: undefined,
   selectedDiskSize: undefined,
@@ -313,6 +317,7 @@ class LinodeCreateContainer extends React.PureComponent<CombinedProps, State> {
             updateLabel={this.updateCustomLabel}
             updateLinodeID={this.setLinodeID}
             updatePassword={this.setPassword}
+            updatePlacementGroupSelection={this.setPlacementGroupSelection}
             updateRegionID={this.setRegionID}
             updateStackScript={this.setStackScript}
             updateTags={this.setTags}
@@ -604,6 +609,10 @@ class LinodeCreateContainer extends React.PureComponent<CombinedProps, State> {
 
   setPassword = (password: string) => this.setState({ password });
 
+  setPlacementGroupSelection = (placementGroupSelection: PlacementGroup) => {
+    this.setState({ placementGroupSelection });
+  };
+
   setRegionID = (selectedRegionId: string) => {
     const { showGDPRCheckbox } = getGDPRDetails({
       agreements: this.props.agreements?.data,
@@ -952,7 +961,7 @@ export default recompose<CombinedProps, {}>(
   withTypes,
   connected,
   withSnackbar,
-  withFlags,
+  withFeatureFlags,
   withProfile,
   withAgreements,
   withQueryClient,
diff --git a/packages/manager/src/features/Linodes/LinodesCreate/TabbedContent/FromBackupsContent.test.tsx b/packages/manager/src/features/Linodes/LinodesCreate/TabbedContent/FromBackupsContent.test.tsx
index 30c9ccc7c70..4e824c8772f 100644
--- a/packages/manager/src/features/Linodes/LinodesCreate/TabbedContent/FromBackupsContent.test.tsx
+++ b/packages/manager/src/features/Linodes/LinodesCreate/TabbedContent/FromBackupsContent.test.tsx
@@ -1,7 +1,7 @@
-import { shallow } from 'enzyme';
 import * as React from 'react';
+import { linodeFactory } from 'src/factories';
 
-import { LinodesWithBackups } from 'src/__data__/LinodesWithBackups';
+import { renderWithTheme } from 'src/utilities/testHelpers';
 
 import { CombinedProps, FromBackupsContent } from './FromBackupsContent';
 
@@ -21,35 +21,27 @@ const mockProps: CombinedProps = {
 };
 
 describe('FromBackupsContent', () => {
-  const component = shallow(<FromBackupsContent {...mockProps} />);
-
-  component.setState({ isGettingBackups: false }); // get rid of loading state
-
   it('should render Placeholder if no valid backups exist', () => {
-    expect(component.find('Placeholder')).toHaveLength(1);
+    const { getByText } = renderWithTheme(
+      <FromBackupsContent {...mockProps} />
+    );
+    expect(
+      getByText(
+        'You do not have backups enabled for your Linodes. Please visit the Backups panel in the Linode Details view.'
+      )
+    ).toBeVisible();
   });
 
-  // @todo: Rewrite these tests with react-testing-library.
-  describe.skip('FromBackupsContent When Valid Backups Exist', () => {
-    beforeAll(async () => {
-      component.setState({ linodesWithBackups: LinodesWithBackups });
-      await component.update();
+  it('should render a linode select if a user has linodes with backups', () => {
+    const linodes = linodeFactory.buildList(1, {
+      backups: { enabled: true },
+      label: 'this-linode-should-show-up',
     });
 
-    it('should render SelectLinode panel', () => {
-      expect(
-        component.find(
-          'WithTheme(WithRenderGuard(WithStyles(SelectLinodePanel)))'
-        )
-      ).toHaveLength(1);
-    });
+    const { getByText } = renderWithTheme(
+      <FromBackupsContent {...mockProps} linodesData={linodes} />
+    );
 
-    it('should render SelectBackup panel', () => {
-      expect(
-        component.find(
-          'WithTheme(WithRenderGuard(WithStyles(SelectBackupPanel)))'
-        )
-      ).toHaveLength(1);
-    });
+    expect(getByText('this-linode-should-show-up')).toBeVisible();
   });
 });
diff --git a/packages/manager/src/features/Linodes/LinodesCreate/TabbedContent/FromImageContent.test.tsx b/packages/manager/src/features/Linodes/LinodesCreate/TabbedContent/FromImageContent.test.tsx
index af2bc8d954a..6780627de63 100644
--- a/packages/manager/src/features/Linodes/LinodesCreate/TabbedContent/FromImageContent.test.tsx
+++ b/packages/manager/src/features/Linodes/LinodesCreate/TabbedContent/FromImageContent.test.tsx
@@ -1,14 +1,9 @@
-import { shallow } from 'enzyme';
 import * as React from 'react';
-import { Provider } from 'react-redux';
 
-import { LinodeThemeWrapper } from 'src/LinodeThemeWrapper';
-import { storeFactory } from 'src/store';
+import { renderWithTheme } from 'src/utilities/testHelpers';
 
 import { CombinedProps, FromImageContent } from './FromImageContent';
 
-const store = storeFactory();
-
 const mockProps: CombinedProps = {
   accountBackupsEnabled: false,
   imagesData: {},
@@ -21,19 +16,21 @@ const mockProps: CombinedProps = {
 };
 
 describe('FromImageContent', () => {
-  const component = shallow(
-    <Provider store={store}>
-      <LinodeThemeWrapper>
-        <FromImageContent {...mockProps} />
-      </LinodeThemeWrapper>
-    </Provider>
-  );
+  it('should render an image select', () => {
+    const { getByLabelText } = renderWithTheme(
+      <FromImageContent {...mockProps} />
+    );
 
-  it('should render without crashing', () => {
-    expect(component).toHaveLength(1);
+    expect(getByLabelText('Images')).toBeVisible();
   });
 
-  it.skip('should render SelectImage panel', () => {
-    expect(component.find('[data-qa-select-image-panel]')).toHaveLength(1);
+  it('should render empty state if user has no images and variant is private', () => {
+    const { getByText } = renderWithTheme(
+      <FromImageContent {...mockProps} variant="private" />
+    );
+
+    expect(
+      getByText('You don’t have any private Images.', { exact: false })
+    ).toBeVisible();
   });
 });
diff --git a/packages/manager/src/features/Linodes/LinodesCreate/TabbedContent/FromLinodeContent.test.tsx b/packages/manager/src/features/Linodes/LinodesCreate/TabbedContent/FromLinodeContent.test.tsx
index 4299dff10ee..35a3257f7f6 100644
--- a/packages/manager/src/features/Linodes/LinodesCreate/TabbedContent/FromLinodeContent.test.tsx
+++ b/packages/manager/src/features/Linodes/LinodesCreate/TabbedContent/FromLinodeContent.test.tsx
@@ -1,19 +1,14 @@
-import { shallow } from 'enzyme';
 import * as React from 'react';
-import { Provider } from 'react-redux';
 
-import { linodes } from 'src/__data__/linodes';
-import { LinodeThemeWrapper } from 'src/LinodeThemeWrapper';
-import { storeFactory } from 'src/store';
+import { linodeFactory } from 'src/factories';
+import { renderWithTheme } from 'src/utilities/testHelpers';
 
 import { CombinedProps, FromLinodeContent } from './FromLinodeContent';
 
-const store = storeFactory();
-
 const mockProps: CombinedProps = {
   accountBackupsEnabled: false,
   imagesData: {},
-  linodesData: linodes,
+  linodesData: [],
   regionsData: [],
   typesData: [],
   updateDiskSize: vi.fn(),
@@ -24,34 +19,25 @@ const mockProps: CombinedProps = {
   userCannotCreateLinode: false,
 };
 
-describe('FromImageContent', () => {
-  const component = shallow(
-    <Provider store={store}>
-      <LinodeThemeWrapper>
-        <FromLinodeContent {...mockProps} />
-      </LinodeThemeWrapper>
-    </Provider>
-  );
-
-  const componentWithoutLinodes = shallow(
-    <Provider store={store}>
-      <LinodeThemeWrapper>
-        <FromLinodeContent {...mockProps} linodesData={[]} />
-      </LinodeThemeWrapper>
-    </Provider>
-  );
+describe('FromLinodeContent', () => {
+  it('should render an empty state if the user has no Linodes', () => {
+    const { getByText } = renderWithTheme(<FromLinodeContent {...mockProps} />);
 
-  it('should render without crashing', () => {
-    expect(component).toHaveLength(1);
+    expect(
+      getByText(
+        'You do not have any existing Linodes to clone from. Please first create a Linode from either an Image or StackScript.'
+      )
+    ).toBeVisible();
   });
 
-  it.skip('should render a Placeholder when linodes prop has no length', () => {
-    expect(componentWithoutLinodes.find('[data-qa-placeholder]')).toHaveLength(
-      1
+  it("should render a user's linodes", () => {
+    const linodes = linodeFactory.buildList(1, {
+      label: 'this-linode-should-render',
+    });
+    const { getByText } = renderWithTheme(
+      <FromLinodeContent {...mockProps} linodesData={linodes} />
     );
-  });
 
-  it.skip('should render SelectLinode panel', () => {
-    expect(component.find('[data-qa-linode-panel]')).toHaveLength(1);
+    expect(getByText('this-linode-should-render')).toBeVisible();
   });
 });
diff --git a/packages/manager/src/features/Linodes/LinodesCreate/TabbedContent/FromStackScriptContent.test.tsx b/packages/manager/src/features/Linodes/LinodesCreate/TabbedContent/FromStackScriptContent.test.tsx
index aedc6d8d18d..c2e5df96c6e 100644
--- a/packages/manager/src/features/Linodes/LinodesCreate/TabbedContent/FromStackScriptContent.test.tsx
+++ b/packages/manager/src/features/Linodes/LinodesCreate/TabbedContent/FromStackScriptContent.test.tsx
@@ -1,29 +1,24 @@
-import { shallow } from 'enzyme';
+import { getStackScripts } from '@linode/api-v4';
 import * as React from 'react';
-import { Provider } from 'react-redux';
 
-import { UserDefinedFields as mockUserDefinedFields } from 'src/__data__/UserDefinedFields';
-import { LinodeThemeWrapper } from 'src/LinodeThemeWrapper';
-import { imageFactory } from 'src/factories/images';
-import { storeFactory } from 'src/store';
+import { stackScriptFactory } from 'src/factories';
+import { makeResourcePage } from 'src/mocks/serverHandlers';
+import { rest, server } from 'src/mocks/testServer';
+import { renderWithTheme } from 'src/utilities/testHelpers';
 
 import {
   CombinedProps,
   FromStackScriptContent,
 } from './FromStackScriptContent';
 
-const store = storeFactory();
-
-const mockImages = imageFactory.buildList(10);
-
 const mockProps: CombinedProps = {
   accountBackupsEnabled: false,
-  category: 'community',
+  category: 'account',
   handleSelectUDFs: vi.fn(),
   header: '',
   imagesData: {},
   regionsData: [],
-  request: vi.fn(),
+  request: getStackScripts,
   updateImageID: vi.fn(),
   updateRegionID: vi.fn(),
   updateStackScript: vi.fn(),
@@ -31,50 +26,23 @@ const mockProps: CombinedProps = {
   userCannotCreateLinode: false,
 };
 
-describe('FromImageContent', () => {
-  const component = shallow(
-    <Provider store={store}>
-      <LinodeThemeWrapper>
-        <FromStackScriptContent {...mockProps} />
-      </LinodeThemeWrapper>
-    </Provider>
-  );
-
-  const componentWithUDFs = shallow(
-    <Provider store={store}>
-      <LinodeThemeWrapper>
-        <FromStackScriptContent
-          {...mockProps}
-          availableStackScriptImages={mockImages}
-          availableUserDefinedFields={mockUserDefinedFields}
-        />
-      </LinodeThemeWrapper>
-    </Provider>
-  );
-
-  it('should render without crashing', () => {
-    expect(component).toHaveLength(1);
-  });
-
-  it.skip('should render SelectStackScript panel', () => {
-    expect(component.find('[data-qa-select-stackscript]')).toHaveLength(1);
-  });
-
-  it.skip('should render UserDefinedFields panel', () => {
-    expect(componentWithUDFs.find('[data-qa-udf-panel]')).toHaveLength(1);
-  });
-
-  it.skip('should not render UserDefinedFields panel if no UDFs', () => {
-    expect(component.find('[data-qa-udf-panel]')).toHaveLength(0);
-  });
+describe('FromStackScriptContent', () => {
+  it('should render stackscripts', async () => {
+    const stackscripts = stackScriptFactory.buildList(3);
 
-  it.skip('should not render SelectImage panel if no compatibleImages', () => {
-    expect(component.find('[data-qa-select-image-panel]')).toHaveLength(0);
-  });
+    server.use(
+      rest.get('*/v4/linode/stackscripts', (req, res, ctx) => {
+        return res(ctx.json(makeResourcePage(stackscripts)));
+      })
+    );
 
-  it.skip('should render SelectImage panel there are compatibleImages', () => {
-    expect(componentWithUDFs.find('[data-qa-select-image-panel]')).toHaveLength(
-      1
+    const { findByText } = renderWithTheme(
+      <FromStackScriptContent {...mockProps} />
     );
+
+    for (const stackscript of stackscripts) {
+      // eslint-disable-next-line no-await-in-loop
+      await findByText(stackscript.label);
+    }
   });
 });
diff --git a/packages/manager/src/features/Linodes/LinodesDetail/LinodeBackup/EnableBackupsDialog.test.tsx b/packages/manager/src/features/Linodes/LinodesDetail/LinodeBackup/EnableBackupsDialog.test.tsx
index 29ce79397e6..c08be4e4079 100644
--- a/packages/manager/src/features/Linodes/LinodesDetail/LinodeBackup/EnableBackupsDialog.test.tsx
+++ b/packages/manager/src/features/Linodes/LinodesDetail/LinodeBackup/EnableBackupsDialog.test.tsx
@@ -131,8 +131,6 @@ describe('EnableBackupsDialog component', () => {
     expect(await findByText(PRICES_RELOAD_ERROR_NOTICE_TEXT)).toBeVisible();
 
     // Confirm that "Enable Backups" button is disabled.
-    expect(getByTestId('confirm-enable-backups')).toHaveAttribute(
-      'aria-disabled'
-    );
+    expect(getByTestId('confirm-enable-backups')).toBeDisabled();
   });
 });
diff --git a/packages/manager/src/features/Linodes/LinodesDetail/LinodeNetworking/AddIPDrawer.tsx b/packages/manager/src/features/Linodes/LinodesDetail/LinodeNetworking/AddIPDrawer.tsx
index 2b93f89d5a8..241ffc44a80 100644
--- a/packages/manager/src/features/Linodes/LinodesDetail/LinodeNetworking/AddIPDrawer.tsx
+++ b/packages/manager/src/features/Linodes/LinodesDetail/LinodeNetworking/AddIPDrawer.tsx
@@ -1,8 +1,10 @@
 import { IPv6Prefix } from '@linode/api-v4/lib/networking';
-import { useTheme } from '@mui/material/styles';
+import { styled } from '@mui/material/styles';
 import * as React from 'react';
 
 import { ActionsPanel } from 'src/components/ActionsPanel/ActionsPanel';
+import { Box } from 'src/components/Box';
+import { Divider } from 'src/components/Divider';
 import { Drawer } from 'src/components/Drawer';
 import { Item } from 'src/components/EnhancedSelect/Select';
 import { FormControlLabel } from 'src/components/FormControlLabel';
@@ -10,6 +12,7 @@ import { Link } from 'src/components/Link';
 import { Notice } from 'src/components/Notice/Notice';
 import { Radio } from 'src/components/Radio/Radio';
 import { RadioGroup } from 'src/components/RadioGroup';
+import { Stack } from 'src/components/Stack';
 import { Tooltip } from 'src/components/Tooltip';
 import { Typography } from 'src/components/Typography';
 import {
@@ -80,7 +83,6 @@ interface Props {
 
 export const AddIPDrawer = (props: Props) => {
   const { linodeId, onClose, open, readOnly } = props;
-  const theme = useTheme();
 
   const {
     error: ipv4Error,
@@ -163,94 +165,87 @@ export const AddIPDrawer = (props: Props) => {
 
   return (
     <Drawer onClose={onClose} open={open} title="Add an IP Address">
-      <React.Fragment>
-        <Typography variant="h2">IPv4</Typography>
+      <Stack spacing={2}>
+        <Typography variant="h3">IPv4</Typography>
         {Boolean(ipv4Error) && (
-          <Notice spacingTop={8} text={ipv4Error?.[0].reason} variant="error" />
+          <Notice spacingTop={4} text={ipv4Error?.[0].reason} variant="error" />
         )}
-        <Typography sx={{ marginTop: '1rem' }} variant="h3">
-          Select type
-        </Typography>
-        <RadioGroup
-          aria-label="ip-option"
+
+        <StyledRadioGroup
+          aria-labelledby="ipv4-select-type"
           data-qa-ip-options-radio-group
           name="Select IPv4 type"
           onChange={handleIPv4Change}
-          sx={{ marginTop: '0 !important' }}
           value={selectedIPv4}
         >
-          {ipOptions.map((option, idx) => (
-            <FormControlLabel
-              control={<Radio />}
-              data-qa-radio={option.label}
-              key={idx}
-              label={option.label}
-              value={option.value}
-            />
-          ))}
-        </RadioGroup>
-        {selectedIPv4 && (
-          <Typography sx={{ marginTop: theme.spacing(2) }} variant="body1">
-            {explainerCopy[selectedIPv4]}
-          </Typography>
-        )}
+          <Typography id="ipv4-select-type">Select type</Typography>
+          <Box>
+            {ipOptions.map((option, idx) => (
+              <FormControlLabel
+                control={<Radio />}
+                data-qa-radio={option.label}
+                key={idx}
+                label={option.label}
+                value={option.value}
+              />
+            ))}
+          </Box>
+        </StyledRadioGroup>
+        {selectedIPv4 && <Typography>{explainerCopy[selectedIPv4]}</Typography>}
 
         {_tooltipCopy ? (
           <Tooltip placement="bottom-end" title={_tooltipCopy}>
             <div style={{ display: 'inline' }}>
-              <ActionsPanel
+              <StyledActionsPanel
                 primaryButtonProps={{
                   disabled: disabledIPv4,
                   label: 'Allocate',
                   loading: ipv4Loading,
                   onClick: handleAllocateIPv4,
-                  sx: { marginBottom: 8 },
                 }}
               />
             </div>
           </Tooltip>
         ) : (
-          <ActionsPanel
+          <StyledActionsPanel
             primaryButtonProps={{
               disabled: disabledIPv4,
               label: 'Allocate',
               loading: ipv4Loading,
               onClick: handleAllocateIPv4,
-              sx: { marginBottom: 8 },
             }}
           />
         )}
-        <Typography sx={{ marginTop: theme.spacing(4) }} variant="h2">
+        <Divider sx={{ pt: 1 }} />
+        <Typography sx={{ pt: 1 }} variant="h3">
           IPv6
         </Typography>
         {Boolean(ipv6Error) && (
-          <Notice spacingTop={8} text={ipv6Error?.[0].reason} variant="error" />
+          <Notice spacingTop={4} text={ipv6Error?.[0].reason} variant="error" />
         )}
-        <Typography sx={{ marginTop: '1rem' }} variant="h3">
-          Select prefix
-        </Typography>
-        <RadioGroup
-          aria-label="prefix-option"
+
+        <StyledRadioGroup
+          aria-labelledby="ipv6-select-type"
           data-qa-ip-options-radio-group
-          name="Select prefix"
+          name="Select IPv6 type"
           onChange={handleIPv6Change}
-          sx={{ marginTop: '0 !important' }}
           value={selectedIPv6Prefix}
         >
-          {prefixOptions.map((option, idx) => (
-            <FormControlLabel
-              control={<Radio />}
-              data-qa-radio={option.label}
-              key={idx}
-              label={option.label}
-              value={option.value}
-            />
-          ))}
-        </RadioGroup>
+          <Typography id="ipv6-select-type">Select prefix</Typography>
+          <Box>
+            {prefixOptions.map((option, idx) => (
+              <FormControlLabel
+                control={<Radio />}
+                data-qa-radio={option.label}
+                key={idx}
+                label={option.label}
+                value={option.value}
+              />
+            ))}
+          </Box>
+        </StyledRadioGroup>
         {selectedIPv6Prefix && (
-          <Typography style={{ marginBottom: '1rem' }} variant="body1">
-            {IPv6ExplanatoryCopy[selectedIPv6Prefix]}
-          </Typography>
+          <Typography>{IPv6ExplanatoryCopy[selectedIPv6Prefix]}</Typography>
         )}
         <Typography>
           IPv6 addresses are allocated as ranges, which you can choose to
@@ -260,16 +255,34 @@ export const AddIPDrawer = (props: Props) => {
           </Link>
           .
         </Typography>
-        <ActionsPanel
+        <StyledActionsPanel
           primaryButtonProps={{
             disabled: disabledIPv6,
             label: 'Allocate',
             loading: ipv6Loading,
             onClick: handleCreateIPv6Range,
-            sx: { marginBottom: 8 },
           }}
         />
-      </React.Fragment>
+      </Stack>
     </Drawer>
   );
 };
+
+const StyledRadioGroup = styled(RadioGroup, {
+  label: 'StyledApiDrawerRadioGroup',
+})(({ theme }) => ({
+  '& label': {
+    minWidth: 100,
+  },
+  '& p': {
+    fontFamily: theme.font.bold,
+    marginTop: theme.spacing(),
+  },
+  marginBottom: '0 !important',
+}));
+
+const StyledActionsPanel = styled(ActionsPanel, {
+  label: 'StyledActionsPanel',
+})(({ theme }) => ({
+  paddingTop: theme.spacing(2),
+}));
diff --git a/packages/manager/src/features/Linodes/LinodesDetail/LinodeNetworking/IPTransfer.tsx b/packages/manager/src/features/Linodes/LinodesDetail/LinodeNetworking/IPTransfer.tsx
index 5c3a51b7312..cea0386e54e 100644
--- a/packages/manager/src/features/Linodes/LinodesDetail/LinodeNetworking/IPTransfer.tsx
+++ b/packages/manager/src/features/Linodes/LinodesDetail/LinodeNetworking/IPTransfer.tsx
@@ -91,19 +91,27 @@ export const getLinodeIPv6Ranges = (
   );
 };
 
-const LinodeNetworkingIPTransferPanel = (props: Props) => {
+export const IPTransfer = (props: Props) => {
   const { linodeId, onClose, open, readOnly } = props;
   const theme = useTheme();
-  const { mutateAsync: assignAddresses } = useAssignAdressesMutation();
+  const { mutateAsync: assignAddresses } = useAssignAdressesMutation({
+    currentLinodeId: linodeId,
+  });
 
   const { data: linode } = useLinodeQuery(linodeId, open);
 
   const { data: _ips } = useLinodeIPsQuery(linodeId);
 
-  const publicIPs = _ips?.ipv4.public.map((i) => i.address) ?? [];
-  const privateIPs = _ips?.ipv4.private.map((i) => i.address) ?? [];
+  const publicIPv4Addresses = _ips?.ipv4.public.map((i) => i.address) ?? [];
+  const privateIPv4Addresses = _ips?.ipv4.private.map((i) => i.address) ?? [];
+  const ipv6Addresses =
+    _ips?.ipv6?.global.map((i) => `${i.range}/${i.prefix}`) ?? [];
 
-  const ipAddresses = [...publicIPs, ...privateIPs];
+  const ipAddresses = [
+    ...publicIPv4Addresses,
+    ...privateIPv4Addresses,
+    ...ipv6Addresses,
+  ];
 
   const [ips, setIPs] = React.useState<IPRowState>(
     ipAddresses.reduce(
@@ -252,30 +260,42 @@ const LinodeNetworkingIPTransferPanel = (props: Props) => {
     ];
 
     return (
-      <Grid container key={state.sourceIP} spacing={2} sx={{ width: '100%' }}>
+      <Grid
+        sx={{
+          [theme.breakpoints.down('md')]: {
+            backgroundColor: theme.color.grey5,
+            mb: 3,
+          },
+        }}
+        container
+        key={state.sourceIP}
+        spacing={2}
+        xs={12}
+      >
         <Grid
           sx={{
             alignItems: 'center',
             display: 'flex',
-            [theme.breakpoints.down('sm')]: {
-              width: '100%',
-            },
           }}
+          md={3}
+          xs={12}
         >
-          <Typography
-            sx={{
-              marginTop: 0,
-              [theme.breakpoints.up('sm')]: {
-                width: 175,
-              },
-              width: '100%',
-            }}
-            variant="body1"
-          >
+          <Typography>
+            <Typography
+              sx={{
+                [theme.breakpoints.up('md')]: {
+                  display: 'none',
+                },
+              }}
+              component="span"
+              fontFamily={theme.font.bold}
+            >
+              IP address:{' '}
+            </Typography>
             {state.sourceIP}
           </Typography>
         </Grid>
-        <StyledAudoGrid>
+        <StyledAutoGrid md={3} xs={12}>
           <Select
             textFieldProps={{
               dataAttrs: {
@@ -299,7 +319,7 @@ const LinodeNetworkingIPTransferPanel = (props: Props) => {
             overflowPortal
             placeholder="Select Action"
           />
-        </StyledAudoGrid>
+        </StyledAutoGrid>
         {renderLinodeSelect && renderLinodeSelect(state as Move)}
         {renderIPSelect && renderIPSelect(state as Swap)}
       </Grid>
@@ -316,7 +336,7 @@ const LinodeNetworkingIPTransferPanel = (props: Props) => {
     });
 
     return (
-      <StyledAudoGrid xs={12}>
+      <StyledAutoGrid md={3} xs={12}>
         <Select
           textFieldProps={{
             dataAttrs: {
@@ -336,7 +356,7 @@ const LinodeNetworkingIPTransferPanel = (props: Props) => {
           overflowPortal
           value={defaultLinode}
         />
-      </StyledAudoGrid>
+      </StyledAutoGrid>
     );
   };
 
@@ -350,7 +370,7 @@ const LinodeNetworkingIPTransferPanel = (props: Props) => {
     });
 
     return (
-      <StyledAudoGrid xs={12}>
+      <StyledAutoGrid md={3} xs={12}>
         <Select
           textFieldProps={{
             dataAttrs: {
@@ -367,7 +387,7 @@ const LinodeNetworkingIPTransferPanel = (props: Props) => {
           overflowPortal
           value={defaultIP}
         />
-      </StyledAudoGrid>
+      </StyledAutoGrid>
     );
   };
 
@@ -474,7 +494,7 @@ const LinodeNetworkingIPTransferPanel = (props: Props) => {
           the DNS records.
         </Typography>
       </Grid>
-      <Grid container spacing={2} xs={12}>
+      <Grid container xs={12}>
         {!isLoading && !ipv6RangesLoading && ipv6RangesError ? (
           <Notice
             text={'There was an error loading IPv6 Ranges'}
@@ -487,21 +507,23 @@ const LinodeNetworkingIPTransferPanel = (props: Props) => {
           </div>
         ) : (
           <>
-            <Grid container spacing={2} sx={{ width: '100%' }}>
+            <Grid container xs={12}>
               <Grid
                 sx={{
-                  [theme.breakpoints.up('sm')]: {
-                    width: `calc(175px + ${theme.spacing(2)})`,
+                  [theme.breakpoints.down('md')]: {
+                    display: 'none',
                   },
-                  width: '100%',
                 }}
                 data-qa-transfer-ip-label
+                sm={3}
+                xs={12}
               >
                 <Typography>IP Address</Typography>
               </Grid>
               <Grid
                 sx={{
-                  [theme.breakpoints.down('sm')]: {
+                  pl: 0.5,
+                  [theme.breakpoints.down('md')]: {
                     display: 'none',
                   },
                 }}
@@ -509,8 +531,15 @@ const LinodeNetworkingIPTransferPanel = (props: Props) => {
                 <Typography>Actions</Typography>
               </Grid>
             </Grid>
-            <Grid sx={{ paddingTop: 0 }} xs={12}>
-              <Divider spacingBottom={0} />
+            <Grid
+              sx={{
+                [theme.breakpoints.down('md')]: {
+                  visibility: 'hidden',
+                },
+              }}
+              xs={12}
+            >
+              <Divider />
             </Grid>
             {linodes.length === 0 && searchText === '' ? (
               <Typography
@@ -523,33 +552,35 @@ const LinodeNetworkingIPTransferPanel = (props: Props) => {
                 with which to transfer IPs.
               </Typography>
             ) : (
-              <Grid container spacing={2} sx={{ width: '100%' }}>
+              <Grid spacing={2} xs={12}>
                 {Object.values(ips).map(ipRow)}
               </Grid>
             )}
           </>
         )}
       </Grid>
-      <ActionsPanel
-        primaryButtonProps={{
-          'data-testid': 'ip-transfer-save',
-          disabled: readOnly || linodes.length === 0,
-          label: 'Save',
-          loading: submitting,
-          onClick: onSubmit,
-        }}
-        secondaryButtonProps={{
-          'data-testid': 'ip-transfer-reset',
-          disabled: submitting || linodes.length === 0,
-          label: 'Reset Form',
-          onClick: onReset,
-        }}
-      />
+      <Grid container justifyContent="flex-end" xs={12}>
+        <ActionsPanel
+          primaryButtonProps={{
+            'data-testid': 'ip-transfer-save',
+            disabled: readOnly || linodes.length === 0,
+            label: 'Save',
+            loading: submitting,
+            onClick: onSubmit,
+          }}
+          secondaryButtonProps={{
+            'data-testid': 'ip-transfer-reset',
+            disabled: submitting || linodes.length === 0,
+            label: 'Reset Form',
+            onClick: onReset,
+          }}
+        />
+      </Grid>
     </Dialog>
   );
 };
 
-const StyledAudoGrid = styled(Grid, { label: 'StyledAutoGrid' })(
+const StyledAutoGrid = styled(Grid, { label: 'StyledAutoGrid' })(
   ({ theme }) => ({
     minWidth: 175,
     [theme.breakpoints.up('sm')]: {
@@ -636,5 +667,3 @@ const createRequestData = (state: IPRowState, region: string) => ({
   assignments: Object.values(state).reduce(stateToAssignmentsReducer, []),
   region,
 });
-
-export default LinodeNetworkingIPTransferPanel;
diff --git a/packages/manager/src/features/Linodes/LinodesDetail/LinodeNetworking/LinodeIPAddresses.tsx b/packages/manager/src/features/Linodes/LinodesDetail/LinodeNetworking/LinodeIPAddresses.tsx
index 39002b778c5..12fb232a546 100644
--- a/packages/manager/src/features/Linodes/LinodesDetail/LinodeNetworking/LinodeIPAddresses.tsx
+++ b/packages/manager/src/features/Linodes/LinodesDetail/LinodeNetworking/LinodeIPAddresses.tsx
@@ -27,7 +27,7 @@ import { DeleteRangeDialog } from './DeleteRangeDialog';
 import { EditIPRDNSDrawer } from './EditIPRDNSDrawer';
 import { EditRangeRDNSDrawer } from './EditRangeRDNSDrawer';
 import IPSharing from './IPSharing';
-import IPTransfer from './IPTransfer';
+import { IPTransfer } from './IPTransfer';
 import { IPAddressRowHandlers, LinodeIPAddressRow } from './LinodeIPAddressRow';
 import {
   StyledRootGrid,
diff --git a/packages/manager/src/features/Linodes/LinodesDetail/LinodeSettings/LinodeSettingsLabelPanel.tsx b/packages/manager/src/features/Linodes/LinodesDetail/LinodeSettings/LinodeSettingsLabelPanel.tsx
index 8cb165353ad..a75fd776252 100644
--- a/packages/manager/src/features/Linodes/LinodesDetail/LinodeSettings/LinodeSettingsLabelPanel.tsx
+++ b/packages/manager/src/features/Linodes/LinodesDetail/LinodeSettings/LinodeSettingsLabelPanel.tsx
@@ -11,6 +11,7 @@ import {
   useLinodeQuery,
   useLinodeUpdateMutation,
 } from 'src/queries/linodes/linodes';
+import { sendUpdateLinodeLabelEvent } from 'src/utilities/analytics';
 import { getErrorMap } from 'src/utilities/errorUtils';
 
 interface Props {
@@ -40,6 +41,7 @@ export const LinodeSettingsLabelPanel = (props: Props) => {
       enqueueSnackbar(`Successfully updated Linode label to ${label}`, {
         variant: 'success',
       });
+      sendUpdateLinodeLabelEvent('Settings');
     },
   });
 
diff --git a/packages/manager/src/features/Linodes/LinodesDetail/LinodeSummary/LinodeSummary.tsx b/packages/manager/src/features/Linodes/LinodesDetail/LinodeSummary/LinodeSummary.tsx
index 00e00353e50..3a6e2844069 100644
--- a/packages/manager/src/features/Linodes/LinodesDetail/LinodeSummary/LinodeSummary.tsx
+++ b/packages/manager/src/features/Linodes/LinodesDetail/LinodeSummary/LinodeSummary.tsx
@@ -115,6 +115,17 @@ const LinodeSummary: React.FC<Props> = (props) => {
     debouncedRefetchLinodeStats();
   }, [windowWidth, windowHeight, debouncedRefetchLinodeStats]);
 
+  /**
+   * This changes the X-Axis tick labels depending on the selected timeframe.
+   *
+   * This is important because the X-Axis should show dates instead of times
+   * when viewing many days' worth of stats.
+   *
+   * @example 'hh a' renders '11am'
+   * @example 'LLL dd' renders 'Feb 14'
+   */
+  const xAxisTickFormat = isLast24Hours ? 'hh a' : 'LLL dd';
+
   const renderCPUChart = () => {
     const data = stats?.data.cpu ?? [];
     const metrics = getMetrics(data);
@@ -147,7 +158,7 @@ const LinodeSummary: React.FC<Props> = (props) => {
               },
             ]}
             xAxis={{
-              tickFormat: 'hh a',
+              tickFormat: xAxisTickFormat,
               tickGap: 60,
             }}
             ariaLabel="CPU Usage Graph"
@@ -233,7 +244,7 @@ const LinodeSummary: React.FC<Props> = (props) => {
               },
             ]}
             xAxis={{
-              tickFormat: 'hh a',
+              tickFormat: xAxisTickFormat,
               tickGap: 60,
             }}
             ariaLabel="Disk I/O Graph"
@@ -382,7 +393,11 @@ const LinodeSummary: React.FC<Props> = (props) => {
           </StyledGrid>
         </Grid>
       ) : null}
-      <NetworkGraphs stats={stats} {...chartProps} />
+      <NetworkGraphs
+        stats={stats}
+        xAxisTickFormat={xAxisTickFormat}
+        {...chartProps}
+      />
     </Grid>
   );
 };
diff --git a/packages/manager/src/features/Linodes/LinodesDetail/LinodeSummary/NetworkGraphs.tsx b/packages/manager/src/features/Linodes/LinodesDetail/LinodeSummary/NetworkGraphs.tsx
index 620f97a9f79..0fa810b5864 100644
--- a/packages/manager/src/features/Linodes/LinodesDetail/LinodeSummary/NetworkGraphs.tsx
+++ b/packages/manager/src/features/Linodes/LinodesDetail/LinodeSummary/NetworkGraphs.tsx
@@ -44,6 +44,7 @@ interface Props extends ChartProps {
   rangeSelection: string;
   stats?: Stats;
   timezone: string;
+  xAxisTickFormat: string;
 }
 
 interface NetworkMetrics {
@@ -70,7 +71,7 @@ const _getMetrics = (data: NetworkStats) => {
 };
 
 export const NetworkGraphs = (props: Props) => {
-  const { rangeSelection, stats, ...rest } = props;
+  const { rangeSelection, stats, xAxisTickFormat, ...rest } = props;
 
   const theme = useTheme();
   const flags = useFlags();
@@ -137,6 +138,7 @@ export const NetworkGraphs = (props: Props) => {
     rangeSelection,
     theme,
     timezone: props.timezone,
+    xAxisTickFormat,
   };
 
   return (
@@ -187,6 +189,7 @@ interface GraphProps {
   timezone: string;
   totalTraffic: TotalTrafficProps;
   unit: string;
+  xAxisTickFormat: string;
 }
 
 const Graph = (props: GraphProps) => {
@@ -199,6 +202,7 @@ const Graph = (props: GraphProps) => {
     theme,
     timezone,
     unit,
+    xAxisTickFormat,
   } = props;
 
   const flags = useFlags();
@@ -286,7 +290,7 @@ const Graph = (props: GraphProps) => {
             },
           ]}
           xAxis={{
-            tickFormat: 'hh a',
+            tickFormat: xAxisTickFormat,
             tickGap: 60,
           }}
           ariaLabel={ariaLabel}
diff --git a/packages/manager/src/features/Linodes/LinodesDetail/LinodesDetailHeader/LinodeDetailHeader.tsx b/packages/manager/src/features/Linodes/LinodesDetail/LinodesDetailHeader/LinodeDetailHeader.tsx
index 49da27178bd..75397e492bf 100644
--- a/packages/manager/src/features/Linodes/LinodesDetail/LinodesDetailHeader/LinodeDetailHeader.tsx
+++ b/packages/manager/src/features/Linodes/LinodesDetail/LinodesDetailHeader/LinodeDetailHeader.tsx
@@ -21,7 +21,11 @@ import {
   useLinodeUpdateMutation,
 } from 'src/queries/linodes/linodes';
 import { isFeatureEnabled } from 'src/utilities/accountCapabilities';
-import { sendLinodeCreateFlowDocsClickEvent } from 'src/utilities/analytics';
+import {
+  sendEditBreadcrumbEvent,
+  sendLinodeCreateFlowDocsClickEvent,
+  sendUpdateLinodeLabelEvent,
+} from 'src/utilities/analytics';
 import { getAPIErrorOrDefault } from 'src/utilities/errorUtils';
 import { getQueryParamsFromQueryString } from 'src/utilities/queryParams';
 import { scrollErrorIntoView } from 'src/utilities/scrollErrorIntoView';
@@ -160,6 +164,7 @@ const LinodeDetailHeader = () => {
     return updateLinodeLabel(label)
       .then(() => {
         resetEditableLabel();
+        sendUpdateLinodeLabelEvent('Breadcrumb');
       })
       .catch((updateError) => {
         const errorReasons: string[] = [updateError.message];
@@ -226,6 +231,7 @@ const LinodeDetailHeader = () => {
           onEditHandlers: {
             editableTextTitle: linode?.label ?? '',
             errorText: editableLabelError,
+            handleAnalyticsEvent: () => sendEditBreadcrumbEvent(),
             onCancel: resetEditableLabel,
             onEdit: handleLinodeLabelUpdate,
           },
diff --git a/packages/manager/src/features/Linodes/LinodesLanding/IPAddress.test.tsx b/packages/manager/src/features/Linodes/LinodesLanding/IPAddress.test.tsx
index 2cd5002fd6f..419f7583082 100644
--- a/packages/manager/src/features/Linodes/LinodesLanding/IPAddress.test.tsx
+++ b/packages/manager/src/features/Linodes/LinodesLanding/IPAddress.test.tsx
@@ -1,6 +1,7 @@
-import { shallow } from 'enzyme';
 import * as React from 'react';
 
+import { renderWithTheme } from 'src/utilities/testHelpers';
+
 import { IPAddress, sortIPAddress } from './IPAddress';
 
 const publicIP = '8.8.8.8';
@@ -8,77 +9,90 @@ const publicIP2 = '45.45.45.45';
 const privateIP = '192.168.220.103';
 const privateIP2 = '192.168.220.102';
 
-const component = shallow(<IPAddress ips={['8.8.8.8', '8.8.4.4']} />);
-
 describe('IPAddress', () => {
-  it('should render without error and display one IP address if showAll is false', () => {
-    component.setProps({ showAll: false, showMore: true });
-    const rendered = component.find('[data-qa-copy-ip-text]');
+  it('should display one IP address if showAll is false', () => {
+    const { container, getByText } = renderWithTheme(
+      <IPAddress ips={['8.8.8.8', '8.8.4.4']} showAll={false} showMore={true} />
+    );
+
+    // first IP address should be visible
+    expect(getByText('8.8.8.8')).toBeVisible();
 
-    expect(rendered).toHaveLength(1);
-    expect(rendered.prop('text')).toEqual('8.8.8.8');
+    // Show more button should be visible
+    expect(container.querySelector('[data-qa-show-more-chip]')).toBeVisible();
   });
 
   it('should not display ShowMore button unless the showMore prop is true', () => {
-    component.setProps({ showAll: false, showMore: false });
-    expect(component.find('[data-qa-ip-more]')).toHaveLength(0);
-  });
+    const { container, getByText } = renderWithTheme(
+      <IPAddress
+        ips={['8.8.8.8', '8.8.4.4']}
+        showAll={false}
+        showMore={false}
+      />
+    );
+
+    // first IP address should be visible
+    expect(getByText('8.8.8.8')).toBeVisible();
 
-  it('should render ShowMore with props.items = IPs', () => {
-    component.setProps({ showMore: true });
-    const showmore = component.find('[data-qa-ip-more]');
-    expect(showmore.exists()).toBe(true);
-    expect(showmore.prop('items')).toEqual(['8.8.4.4']);
+    // Show more button should not be visible
+    expect(container.querySelector('[data-qa-show-more-chip]')).toBeNull();
   });
 
-  // TODO figure out this test !!!!!!!
-  it('should render the copy icon, but not show it if showTooltipOnIpHover is false', () => {
-    const icon = component.find('[data-testid]');
-    expect(icon).toHaveLength(1);
-    expect(icon.get(0).props.isIpHovered).toBe(false);
-    expect(icon.get(0).props.showTooltipOnIpHover).toBe(false);
+  it('should render the copy icon if showTooltipOnIpHover is false', () => {
+    const { container } = renderWithTheme(
+      <IPAddress
+        ips={['8.8.8.8', '8.8.4.4']}
+        showAll={false}
+        showMore={false}
+        showTooltipOnIpHover={false}
+      />
+    );
 
-    component.setProps({ showTooltipOnIpHover: true });
-    const copy = component.find('[data-qa-copy-ip]');
-    expect(copy).toHaveLength(1);
-    const icon2 = component.find('[data-testid]');
-    expect(icon2.get(0).props.showTooltipOnIpHover).toBe(true);
+    expect(container.querySelector('[data-qa-copy-ip-text]')).toBeVisible();
   });
 
-  describe('IP address sorting', () => {
-    it('should place private IPs after public IPs', () => {
-      expect([publicIP, privateIP].sort(sortIPAddress)).toEqual([
-        publicIP,
-        privateIP,
-      ]);
-      expect([privateIP, publicIP].sort(sortIPAddress)).toEqual([
-        publicIP,
-        privateIP,
-      ]);
-    });
-    it('should not change order of two addresses of the same type', () => {
-      expect([publicIP, publicIP2].sort(sortIPAddress)).toEqual([
-        publicIP,
-        publicIP2,
-      ]);
-      expect([privateIP, privateIP2].sort(sortIPAddress)).toEqual([
-        privateIP,
-        privateIP2,
-      ]);
-    });
-    it('should sort longer lists correctly', () => {
-      expect(
-        [publicIP, privateIP, publicIP2, privateIP2].sort(sortIPAddress)
-      ).toEqual([publicIP, publicIP2, privateIP, privateIP2]);
-      expect(
-        [privateIP, publicIP, publicIP2, privateIP2].sort(sortIPAddress)
-      ).toEqual([publicIP, publicIP2, privateIP, privateIP2]);
-    });
+  it('should disable copy functionality if disabled is true', () => {
+    const { container } = renderWithTheme(
+      <IPAddress
+        disabled={true}
+        ips={['8.8.8.8', '8.8.4.4']}
+        showAll={false}
+        showMore={false}
+        showTooltipOnIpHover={false}
+      />
+    );
+
+    expect(container.querySelector('[data-qa-copy-ip-text]')).toBeDisabled();
   });
+});
 
-  it('should disable copy functionality if disabled is true', () => {
-    component.setProps({ disabled: true });
-    const copyTooltip = component.find('[data-qa-copy-ip-text]');
-    expect(copyTooltip.prop('disabled')).toBe(true);
+describe('IP address sorting', () => {
+  it('should place private IPs after public IPs', () => {
+    expect([publicIP, privateIP].sort(sortIPAddress)).toEqual([
+      publicIP,
+      privateIP,
+    ]);
+    expect([privateIP, publicIP].sort(sortIPAddress)).toEqual([
+      publicIP,
+      privateIP,
+    ]);
+  });
+  it('should not change order of two addresses of the same type', () => {
+    expect([publicIP, publicIP2].sort(sortIPAddress)).toEqual([
+      publicIP,
+      publicIP2,
+    ]);
+    expect([privateIP, privateIP2].sort(sortIPAddress)).toEqual([
+      privateIP,
+      privateIP2,
+    ]);
+  });
+  it('should sort longer lists correctly', () => {
+    expect(
+      [publicIP, privateIP, publicIP2, privateIP2].sort(sortIPAddress)
+    ).toEqual([publicIP, publicIP2, privateIP, privateIP2]);
+    expect(
+      [privateIP, publicIP, publicIP2, privateIP2].sort(sortIPAddress)
+    ).toEqual([publicIP, publicIP2, privateIP, privateIP2]);
   });
 });
diff --git a/packages/manager/src/features/Linodes/LinodesLanding/LinodeRow/LinodeRow.test.tsx b/packages/manager/src/features/Linodes/LinodesLanding/LinodeRow/LinodeRow.test.tsx
index 9d42d672c8b..d882e9c0b82 100644
--- a/packages/manager/src/features/Linodes/LinodesLanding/LinodeRow/LinodeRow.test.tsx
+++ b/packages/manager/src/features/Linodes/LinodesLanding/LinodeRow/LinodeRow.test.tsx
@@ -1,5 +1,4 @@
 import userEvent from '@testing-library/user-event';
-import { shallow } from 'enzyme';
 import * as React from 'react';
 
 import { linodeFactory } from 'src/factories';
@@ -10,15 +9,13 @@ import { LinodeRow, RenderFlag } from './LinodeRow';
 describe('LinodeRow', () => {
   describe('when Linode has mutation', () => {
     it('should render a Flag', () => {
-      const wrapper = shallow(<RenderFlag mutationAvailable={true} />);
-
-      const Tooltip = wrapper.find('Tooltip');
-
-      expect(Tooltip).toHaveLength(1);
-      expect(Tooltip.props()).toHaveProperty(
-        'title',
-        'There is a free upgrade available for this Linode'
+      const { getByLabelText } = renderWithTheme(
+        <RenderFlag mutationAvailable={true} />
       );
+
+      expect(
+        getByLabelText('There is a free upgrade available for this Linode')
+      ).toBeVisible();
     });
   });
 
diff --git a/packages/manager/src/features/Linodes/LinodesLanding/LinodesLanding.tsx b/packages/manager/src/features/Linodes/LinodesLanding/LinodesLanding.tsx
index 5d37d449092..b39a91d10b3 100644
--- a/packages/manager/src/features/Linodes/LinodesLanding/LinodesLanding.tsx
+++ b/packages/manager/src/features/Linodes/LinodesLanding/LinodesLanding.tsx
@@ -15,7 +15,6 @@ import {
   WithProfileProps,
   withProfile,
 } from 'src/containers/profile.container';
-import withFeatureFlagConsumer from 'src/containers/withFeatureFlagConsumer.container';
 import { BackupsCTA } from 'src/features/Backups/BackupsCTA';
 import { MigrateLinode } from 'src/features/Linodes/MigrateLinode/MigrateLinode';
 import { DialogType } from 'src/features/Linodes/types';
@@ -432,7 +431,6 @@ const sendGroupByAnalytic = (value: boolean) => {
 
 export const enhanced = compose<CombinedProps, LinodesLandingProps>(
   withRouter,
-  withFeatureFlagConsumer,
   withProfile
 );
 
diff --git a/packages/manager/src/features/LoadBalancers/LoadBalancerCreate/LoadBalancerBasicCreate.tsx b/packages/manager/src/features/LoadBalancers/LoadBalancerCreate/LoadBalancerBasicCreate.tsx
index 1d136f1f6da..1ce58a42f02 100644
--- a/packages/manager/src/features/LoadBalancers/LoadBalancerCreate/LoadBalancerBasicCreate.tsx
+++ b/packages/manager/src/features/LoadBalancers/LoadBalancerCreate/LoadBalancerBasicCreate.tsx
@@ -13,7 +13,7 @@ import { Paper } from 'src/components/Paper';
 import { Stack } from 'src/components/Stack';
 import { TextField } from 'src/components/TextField';
 import { ACLB_FEEDBACK_FORM_URL } from 'src/features/LoadBalancers/constants';
-import { useLoadBalancerBasicCreateMutation } from 'src/queries/aglb/loadbalancers';
+import { useLoadBalancerBasicCreateMutation } from 'src/queries/aclb/loadbalancers';
 import { getFormikErrorsFromAPIErrors } from 'src/utilities/formikErrorUtils';
 
 import { LoadBalancerRegions } from './LoadBalancerRegions';
diff --git a/packages/manager/src/features/LoadBalancers/LoadBalancerCreate/LoadBalancerSummary/EditLoadBalancerConfigurations/EditRoutes/RouteAccordion.tsx b/packages/manager/src/features/LoadBalancers/LoadBalancerCreate/LoadBalancerSummary/EditLoadBalancerConfigurations/EditRoutes/RouteAccordion.tsx
index be8e6a351a4..41dfcb5c9a7 100644
--- a/packages/manager/src/features/LoadBalancers/LoadBalancerCreate/LoadBalancerSummary/EditLoadBalancerConfigurations/EditRoutes/RouteAccordion.tsx
+++ b/packages/manager/src/features/LoadBalancers/LoadBalancerCreate/LoadBalancerSummary/EditLoadBalancerConfigurations/EditRoutes/RouteAccordion.tsx
@@ -31,7 +31,7 @@ export const RouteAccordion = ({ configIndex, route, routeIndex }: Props) => {
         headingProps={{ sx: { width: '100%' } }}
         sx={{ backgroundColor: '#f4f5f6', paddingLeft: 1, paddingRight: 1.4 }}
       >
-        {/* // TODO AGLB: Implement RulesTable */}
+        {/* TODO ACLB: Implement RulesTable */}
       </Accordion>
       <EditRouteDrawer
         configIndex={configIndex}
diff --git a/packages/manager/src/features/LoadBalancers/LoadBalancerCreate/LoadBalancerSummary/LoadBalancerSummary.tsx b/packages/manager/src/features/LoadBalancers/LoadBalancerCreate/LoadBalancerSummary/LoadBalancerSummary.tsx
index 1fcd5461215..55e3f695472 100644
--- a/packages/manager/src/features/LoadBalancers/LoadBalancerCreate/LoadBalancerSummary/LoadBalancerSummary.tsx
+++ b/packages/manager/src/features/LoadBalancers/LoadBalancerCreate/LoadBalancerSummary/LoadBalancerSummary.tsx
@@ -32,7 +32,7 @@ export const LoadBalancerSummary = () => {
         breadcrumbProps={{
           crumbOverrides: [
             {
-              label: 'Global Load Balancers',
+              label: 'Cloud Load Balancers',
               position: 1,
             },
             {
@@ -59,21 +59,21 @@ export const LoadBalancerSummary = () => {
             <Stack spacing={1}>
               <Typography variant="body1">Regions (5)</Typography>
               <div>
-                {/* // TODO AGLB: Implement Pricing */}
+                {/* TODO ACLB: Implement Pricing */}
                 <DisplayPrice interval="mo" price={60} />
               </div>
             </Stack>
 
             <Divider dark />
             <div>
-              {/* // TODO AGLB: Implement Pricing */}
+              {/* TODO ACLB: Implement Pricing */}
               <DisplayPrice interval="hour" price={2} />
             </div>
             <Divider dark />
             <Notice important variant="warning">
               <Typography>
                 Upload and apply certificates after Load Balancer creation.{' '}
-                {/* // TODO AGLB: update learn more link */}
+                {/* TODO ACLB: update learn more link */}
                 <Link to="#">Learn more</Link>.
               </Typography>
             </Notice>
diff --git a/packages/manager/src/features/LoadBalancers/LoadBalancerDetail/Certificates/CertificateSelect.tsx b/packages/manager/src/features/LoadBalancers/LoadBalancerDetail/Certificates/CertificateSelect.tsx
index 60c6f108b80..39f9721a172 100644
--- a/packages/manager/src/features/LoadBalancers/LoadBalancerDetail/Certificates/CertificateSelect.tsx
+++ b/packages/manager/src/features/LoadBalancers/LoadBalancerDetail/Certificates/CertificateSelect.tsx
@@ -1,7 +1,7 @@
 import React from 'react';
 
 import { Autocomplete } from 'src/components/Autocomplete/Autocomplete';
-import { useLoadBalancerCertificatesInfiniteQuery } from 'src/queries/aglb/certificates';
+import { useLoadBalancerCertificatesInfiniteQuery } from 'src/queries/aclb/certificates';
 
 import type { Certificate, Filter } from '@linode/api-v4';
 import type { TextFieldProps } from 'src/components/TextField';
diff --git a/packages/manager/src/features/LoadBalancers/LoadBalancerDetail/Certificates/Certificates.tsx b/packages/manager/src/features/LoadBalancers/LoadBalancerDetail/Certificates/Certificates.tsx
index 41020cba6b4..ac8f3fdc3b7 100644
--- a/packages/manager/src/features/LoadBalancers/LoadBalancerDetail/Certificates/Certificates.tsx
+++ b/packages/manager/src/features/LoadBalancers/LoadBalancerDetail/Certificates/Certificates.tsx
@@ -17,7 +17,7 @@ import { TableSortCell } from 'src/components/TableSortCell';
 import { Typography } from 'src/components/Typography';
 import { useOrder } from 'src/hooks/useOrder';
 import { usePagination } from 'src/hooks/usePagination';
-import { useLoadBalancerCertificatesQuery } from 'src/queries/aglb/certificates';
+import { useLoadBalancerCertificatesQuery } from 'src/queries/aclb/certificates';
 
 import { CreateCertificateDrawer } from './CreateCertificateDrawer';
 import { DeleteCertificateDialog } from './DeleteCertificateDialog';
diff --git a/packages/manager/src/features/LoadBalancers/LoadBalancerDetail/Certificates/CreateCertificateDrawer.tsx b/packages/manager/src/features/LoadBalancers/LoadBalancerDetail/Certificates/CreateCertificateDrawer.tsx
index 4d620de9320..28845682240 100644
--- a/packages/manager/src/features/LoadBalancers/LoadBalancerDetail/Certificates/CreateCertificateDrawer.tsx
+++ b/packages/manager/src/features/LoadBalancers/LoadBalancerDetail/Certificates/CreateCertificateDrawer.tsx
@@ -6,7 +6,7 @@ import { Drawer } from 'src/components/Drawer';
 import { Notice } from 'src/components/Notice/Notice';
 import { TextField } from 'src/components/TextField';
 import { Typography } from 'src/components/Typography';
-import { useLoadBalancerCertificateCreateMutation } from 'src/queries/aglb/certificates';
+import { useLoadBalancerCertificateCreateMutation } from 'src/queries/aclb/certificates';
 import { getFormikErrorsFromAPIErrors } from 'src/utilities/formikErrorUtils';
 import { scrollErrorIntoView } from 'src/utilities/scrollErrorIntoView';
 
diff --git a/packages/manager/src/features/LoadBalancers/LoadBalancerDetail/Certificates/DeleteCertificateDialog.tsx b/packages/manager/src/features/LoadBalancers/LoadBalancerDetail/Certificates/DeleteCertificateDialog.tsx
index c65ef6daeb8..fafd254a663 100644
--- a/packages/manager/src/features/LoadBalancers/LoadBalancerDetail/Certificates/DeleteCertificateDialog.tsx
+++ b/packages/manager/src/features/LoadBalancers/LoadBalancerDetail/Certificates/DeleteCertificateDialog.tsx
@@ -2,7 +2,7 @@ import React from 'react';
 
 import { ActionsPanel } from 'src/components/ActionsPanel/ActionsPanel';
 import { ConfirmationDialog } from 'src/components/ConfirmationDialog/ConfirmationDialog';
-import { useLoadBalancerCertificateDeleteMutation } from 'src/queries/aglb/certificates';
+import { useLoadBalancerCertificateDeleteMutation } from 'src/queries/aclb/certificates';
 
 import type { Certificate } from '@linode/api-v4';
 
diff --git a/packages/manager/src/features/LoadBalancers/LoadBalancerDetail/Certificates/EditCertificateDrawer.tsx b/packages/manager/src/features/LoadBalancers/LoadBalancerDetail/Certificates/EditCertificateDrawer.tsx
index 9b9ca01ebe6..0a1d7a9e798 100644
--- a/packages/manager/src/features/LoadBalancers/LoadBalancerDetail/Certificates/EditCertificateDrawer.tsx
+++ b/packages/manager/src/features/LoadBalancers/LoadBalancerDetail/Certificates/EditCertificateDrawer.tsx
@@ -8,7 +8,7 @@ import { Drawer } from 'src/components/Drawer';
 import { Notice } from 'src/components/Notice/Notice';
 import { TextField } from 'src/components/TextField';
 import { Typography } from 'src/components/Typography';
-import { useLoadBalancerCertificateMutation } from 'src/queries/aglb/certificates';
+import { useLoadBalancerCertificateMutation } from 'src/queries/aclb/certificates';
 import { getFormikErrorsFromAPIErrors } from 'src/utilities/formikErrorUtils';
 import { scrollErrorIntoView } from 'src/utilities/scrollErrorIntoView';
 
diff --git a/packages/manager/src/features/LoadBalancers/LoadBalancerDetail/Configurations/AddNewCertificateForm.tsx b/packages/manager/src/features/LoadBalancers/LoadBalancerDetail/Configurations/AddNewCertificateForm.tsx
index cac6bce246b..58aeac8e201 100644
--- a/packages/manager/src/features/LoadBalancers/LoadBalancerDetail/Configurations/AddNewCertificateForm.tsx
+++ b/packages/manager/src/features/LoadBalancers/LoadBalancerDetail/Configurations/AddNewCertificateForm.tsx
@@ -8,7 +8,7 @@ import React, { useEffect } from 'react';
 import { ActionsPanel } from 'src/components/ActionsPanel/ActionsPanel';
 import { Notice } from 'src/components/Notice/Notice';
 import { TextField } from 'src/components/TextField';
-import { useLoadBalancerCertificateCreateMutation } from 'src/queries/aglb/certificates';
+import { useLoadBalancerCertificateCreateMutation } from 'src/queries/aclb/certificates';
 import { getFormikErrorsFromAPIErrors } from 'src/utilities/formikErrorUtils';
 
 import {
diff --git a/packages/manager/src/features/LoadBalancers/LoadBalancerDetail/Configurations/CertificateTable.tsx b/packages/manager/src/features/LoadBalancers/LoadBalancerDetail/Configurations/CertificateTable.tsx
index 26822ecd702..b0b4c396a8d 100644
--- a/packages/manager/src/features/LoadBalancers/LoadBalancerDetail/Configurations/CertificateTable.tsx
+++ b/packages/manager/src/features/LoadBalancers/LoadBalancerDetail/Configurations/CertificateTable.tsx
@@ -9,7 +9,7 @@ import { TableHead } from 'src/components/TableHead';
 import { TableRow } from 'src/components/TableRow';
 import { TableRowEmpty } from 'src/components/TableRowEmpty/TableRowEmpty';
 import { Typography } from 'src/components/Typography';
-import { useLoadBalancerCertificatesQuery } from 'src/queries/aglb/certificates';
+import { useLoadBalancerCertificatesQuery } from 'src/queries/aclb/certificates';
 
 import type { CertificateConfig, Configuration } from '@linode/api-v4';
 import type { FormikErrors } from 'formik';
diff --git a/packages/manager/src/features/LoadBalancers/LoadBalancerDetail/Configurations/ConfigurationAccordionHeader.test.tsx b/packages/manager/src/features/LoadBalancers/LoadBalancerDetail/Configurations/ConfigurationAccordionHeader.test.tsx
index e62799f2ff7..c2ada09d05c 100644
--- a/packages/manager/src/features/LoadBalancers/LoadBalancerDetail/Configurations/ConfigurationAccordionHeader.test.tsx
+++ b/packages/manager/src/features/LoadBalancers/LoadBalancerDetail/Configurations/ConfigurationAccordionHeader.test.tsx
@@ -54,7 +54,7 @@ describe('ConfigurationAccordionHeader', () => {
 
     server.use(
       rest.get(
-        '*/v4beta/aglb/5/configurations/endpoints-health',
+        '*/v4beta/aclb/5/configurations/endpoints-health',
         (req, res, ctx) => res(ctx.json(allConfigurationsEndpointHealth))
       )
     );
diff --git a/packages/manager/src/features/LoadBalancers/LoadBalancerDetail/Configurations/ConfigurationEndpointHealth.test.tsx b/packages/manager/src/features/LoadBalancers/LoadBalancerDetail/Configurations/ConfigurationEndpointHealth.test.tsx
index 51c545fe67a..540cd2d5d01 100644
--- a/packages/manager/src/features/LoadBalancers/LoadBalancerDetail/Configurations/ConfigurationEndpointHealth.test.tsx
+++ b/packages/manager/src/features/LoadBalancers/LoadBalancerDetail/Configurations/ConfigurationEndpointHealth.test.tsx
@@ -13,7 +13,7 @@ describe('ConfigurationEndpointHealth', () => {
   it('renders endpoint health from API data', async () => {
     server.use(
       rest.get(
-        '*/v4beta/aglb/:id/configurations/endpoints-health',
+        '*/v4beta/aclb/:id/configurations/endpoints-health',
         (req, res, ctx) => {
           const health = configurationsEndpointHealthFactory.build({
             configurations: [
diff --git a/packages/manager/src/features/LoadBalancers/LoadBalancerDetail/Configurations/ConfigurationEndpointHealth.tsx b/packages/manager/src/features/LoadBalancers/LoadBalancerDetail/Configurations/ConfigurationEndpointHealth.tsx
index 3ca9d45c322..a7bd848ae2e 100644
--- a/packages/manager/src/features/LoadBalancers/LoadBalancerDetail/Configurations/ConfigurationEndpointHealth.tsx
+++ b/packages/manager/src/features/LoadBalancers/LoadBalancerDetail/Configurations/ConfigurationEndpointHealth.tsx
@@ -3,7 +3,7 @@ import React from 'react';
 import { Skeleton } from 'src/components/Skeleton';
 import { Stack } from 'src/components/Stack';
 import { Typography } from 'src/components/Typography';
-import { useLoadBalancerConfigurationsEndpointsHealth } from 'src/queries/aglb/configurations';
+import { useLoadBalancerConfigurationsEndpointsHealth } from 'src/queries/aclb/configurations';
 
 import { EndpointHealth } from '../EndpointHealth';
 
diff --git a/packages/manager/src/features/LoadBalancers/LoadBalancerDetail/Configurations/ConfigurationForm.tsx b/packages/manager/src/features/LoadBalancers/LoadBalancerDetail/Configurations/ConfigurationForm.tsx
index be21628f59f..8240c4d0ea7 100644
--- a/packages/manager/src/features/LoadBalancers/LoadBalancerDetail/Configurations/ConfigurationForm.tsx
+++ b/packages/manager/src/features/LoadBalancers/LoadBalancerDetail/Configurations/ConfigurationForm.tsx
@@ -19,7 +19,7 @@ import { Typography } from 'src/components/Typography';
 import {
   useLoadBalancerConfigurationCreateMutation,
   useLoadBalancerConfigurationMutation,
-} from 'src/queries/aglb/configurations';
+} from 'src/queries/aclb/configurations';
 import { getFormikErrorsFromAPIErrors } from 'src/utilities/formikErrorUtils';
 
 import { AddRouteDrawer } from '../Routes/AddRouteDrawer';
diff --git a/packages/manager/src/features/LoadBalancers/LoadBalancerDetail/Configurations/DeleteConfigurationDialog.tsx b/packages/manager/src/features/LoadBalancers/LoadBalancerDetail/Configurations/DeleteConfigurationDialog.tsx
index 8189cbeb867..62a4f09d57f 100644
--- a/packages/manager/src/features/LoadBalancers/LoadBalancerDetail/Configurations/DeleteConfigurationDialog.tsx
+++ b/packages/manager/src/features/LoadBalancers/LoadBalancerDetail/Configurations/DeleteConfigurationDialog.tsx
@@ -2,7 +2,7 @@ import React from 'react';
 
 import { ActionsPanel } from 'src/components/ActionsPanel/ActionsPanel';
 import { ConfirmationDialog } from 'src/components/ConfirmationDialog/ConfirmationDialog';
-import { useLoadBalancerConfigurationDeleteMutation } from 'src/queries/aglb/configurations';
+import { useLoadBalancerConfigurationDeleteMutation } from 'src/queries/aclb/configurations';
 
 import type { Configuration } from '@linode/api-v4';
 
diff --git a/packages/manager/src/features/LoadBalancers/LoadBalancerDetail/LoadBalancerConfigurations.tsx b/packages/manager/src/features/LoadBalancers/LoadBalancerDetail/LoadBalancerConfigurations.tsx
index 089bf7c3ec5..06db352e302 100644
--- a/packages/manager/src/features/LoadBalancers/LoadBalancerDetail/LoadBalancerConfigurations.tsx
+++ b/packages/manager/src/features/LoadBalancers/LoadBalancerDetail/LoadBalancerConfigurations.tsx
@@ -9,7 +9,7 @@ import { ErrorState } from 'src/components/ErrorState/ErrorState';
 import { Paper } from 'src/components/Paper';
 import { Stack } from 'src/components/Stack';
 import { Typography } from 'src/components/Typography';
-import { useLoabalancerConfigurationsInfiniteQuery } from 'src/queries/aglb/configurations';
+import { useLoabalancerConfigurationsInfiniteQuery } from 'src/queries/aclb/configurations';
 
 import { ConfigurationAccordion } from './Configurations/ConfigurationAccordion';
 import { ConfigurationForm } from './Configurations/ConfigurationForm';
diff --git a/packages/manager/src/features/LoadBalancers/LoadBalancerDetail/LoadBalancerDetail.tsx b/packages/manager/src/features/LoadBalancers/LoadBalancerDetail/LoadBalancerDetail.tsx
index 1e90afe5a1b..f9b22da587b 100644
--- a/packages/manager/src/features/LoadBalancers/LoadBalancerDetail/LoadBalancerDetail.tsx
+++ b/packages/manager/src/features/LoadBalancers/LoadBalancerDetail/LoadBalancerDetail.tsx
@@ -18,7 +18,7 @@ import {
   ACLB_DOCS,
   ACLB_FEEDBACK_FORM_URL,
 } from 'src/features/LoadBalancers/constants';
-import { useLoadBalancerQuery } from 'src/queries/aglb/loadbalancers';
+import { useLoadBalancerQuery } from 'src/queries/aclb/loadbalancers';
 
 const LoadBalancerSummary = React.lazy(() =>
   import('./LoadBalancerSummary').then((module) => ({
diff --git a/packages/manager/src/features/LoadBalancers/LoadBalancerDetail/LoadBalancerEndpointHealth.test.tsx b/packages/manager/src/features/LoadBalancers/LoadBalancerDetail/LoadBalancerEndpointHealth.test.tsx
index cf8fc0791e6..b327ce2a420 100644
--- a/packages/manager/src/features/LoadBalancers/LoadBalancerDetail/LoadBalancerEndpointHealth.test.tsx
+++ b/packages/manager/src/features/LoadBalancers/LoadBalancerDetail/LoadBalancerEndpointHealth.test.tsx
@@ -9,7 +9,7 @@ import { LoadBalancerEndpointHealth } from './LoadBalancerEndpointHealth';
 describe('LoadBalancerEndpointHealth', () => {
   it('renders endpoint health from API data', async () => {
     server.use(
-      rest.get('*/v4beta/aglb/:id/endpoints-health', (req, res, ctx) => {
+      rest.get('*/v4beta/aclb/:id/endpoints-health', (req, res, ctx) => {
         const health = loadbalancerEndpointHealthFactory.build({
           healthy_endpoints: 150,
           total_endpoints: 200,
diff --git a/packages/manager/src/features/LoadBalancers/LoadBalancerDetail/LoadBalancerEndpointHealth.tsx b/packages/manager/src/features/LoadBalancers/LoadBalancerDetail/LoadBalancerEndpointHealth.tsx
index 16aebca9e1e..3217e9ca139 100644
--- a/packages/manager/src/features/LoadBalancers/LoadBalancerDetail/LoadBalancerEndpointHealth.tsx
+++ b/packages/manager/src/features/LoadBalancers/LoadBalancerDetail/LoadBalancerEndpointHealth.tsx
@@ -2,7 +2,7 @@ import React from 'react';
 
 import { Skeleton } from 'src/components/Skeleton';
 import { Typography } from 'src/components/Typography';
-import { useLoadBalancerEndpointHealthQuery } from 'src/queries/aglb/loadbalancers';
+import { useLoadBalancerEndpointHealthQuery } from 'src/queries/aclb/loadbalancers';
 
 import { EndpointHealth } from './EndpointHealth';
 
diff --git a/packages/manager/src/features/LoadBalancers/LoadBalancerDetail/LoadBalancerServiceTargets.tsx b/packages/manager/src/features/LoadBalancers/LoadBalancerDetail/LoadBalancerServiceTargets.tsx
index dbb7719ee8d..af1ed1700f7 100644
--- a/packages/manager/src/features/LoadBalancers/LoadBalancerDetail/LoadBalancerServiceTargets.tsx
+++ b/packages/manager/src/features/LoadBalancers/LoadBalancerDetail/LoadBalancerServiceTargets.tsx
@@ -20,7 +20,7 @@ import { TableSortCell } from 'src/components/TableSortCell';
 import { TextField } from 'src/components/TextField';
 import { useOrder } from 'src/hooks/useOrder';
 import { usePagination } from 'src/hooks/usePagination';
-import { useLoadBalancerServiceTargetsQuery } from 'src/queries/aglb/serviceTargets';
+import { useLoadBalancerServiceTargetsQuery } from 'src/queries/aclb/serviceTargets';
 
 import { DeleteServiceTargetDialog } from './ServiceTargets/DeleteServiceTargetDialog';
 import { ServiceTargetDrawer } from './ServiceTargets/ServiceTargetDrawer';
diff --git a/packages/manager/src/features/LoadBalancers/LoadBalancerDetail/LoadBalancerSummary.tsx b/packages/manager/src/features/LoadBalancers/LoadBalancerDetail/LoadBalancerSummary.tsx
index 0be055e2d7c..15229e82e43 100644
--- a/packages/manager/src/features/LoadBalancers/LoadBalancerDetail/LoadBalancerSummary.tsx
+++ b/packages/manager/src/features/LoadBalancers/LoadBalancerDetail/LoadBalancerSummary.tsx
@@ -6,7 +6,7 @@ import { Paper } from 'src/components/Paper';
 import { Stack } from 'src/components/Stack';
 import { Typography } from 'src/components/Typography';
 import { IPAddress } from 'src/features/Linodes/LinodesLanding/IPAddress';
-import { useLoadBalancerQuery } from 'src/queries/aglb/loadbalancers';
+import { useLoadBalancerQuery } from 'src/queries/aclb/loadbalancers';
 // import { useRegionsQuery } from 'src/queries/regions';
 
 import { Ports } from '../LoadBalancerLanding/Ports';
diff --git a/packages/manager/src/features/LoadBalancers/LoadBalancerDetail/Routes/AddRouteDrawer.tsx b/packages/manager/src/features/LoadBalancers/LoadBalancerDetail/Routes/AddRouteDrawer.tsx
index 9e819c1b45f..e4dceac7e16 100644
--- a/packages/manager/src/features/LoadBalancers/LoadBalancerDetail/Routes/AddRouteDrawer.tsx
+++ b/packages/manager/src/features/LoadBalancers/LoadBalancerDetail/Routes/AddRouteDrawer.tsx
@@ -12,7 +12,7 @@ import { RadioGroup } from 'src/components/RadioGroup';
 import { Stack } from 'src/components/Stack';
 import { TextField } from 'src/components/TextField';
 import { Typography } from 'src/components/Typography';
-import { useLoadBalancerRouteCreateMutation } from 'src/queries/aglb/routes';
+import { useLoadBalancerRouteCreateMutation } from 'src/queries/aclb/routes';
 import { getFormikErrorsFromAPIErrors } from 'src/utilities/formikErrorUtils';
 
 import { RouteSelect } from './RouteSelect';
diff --git a/packages/manager/src/features/LoadBalancers/LoadBalancerDetail/Routes/CreateRouteDrawer.tsx b/packages/manager/src/features/LoadBalancers/LoadBalancerDetail/Routes/CreateRouteDrawer.tsx
index 6471e71731e..5cca938f5de 100644
--- a/packages/manager/src/features/LoadBalancers/LoadBalancerDetail/Routes/CreateRouteDrawer.tsx
+++ b/packages/manager/src/features/LoadBalancers/LoadBalancerDetail/Routes/CreateRouteDrawer.tsx
@@ -11,7 +11,7 @@ import { Notice } from 'src/components/Notice/Notice';
 import { Radio } from 'src/components/Radio/Radio';
 import { RadioGroup } from 'src/components/RadioGroup';
 import { TextField } from 'src/components/TextField';
-import { useLoadBalancerRouteCreateMutation } from 'src/queries/aglb/routes';
+import { useLoadBalancerRouteCreateMutation } from 'src/queries/aclb/routes';
 import { capitalize } from 'src/utilities/capitalize';
 import { getFormikErrorsFromAPIErrors } from 'src/utilities/formikErrorUtils';
 import { scrollErrorIntoView } from 'src/utilities/scrollErrorIntoView';
diff --git a/packages/manager/src/features/LoadBalancers/LoadBalancerDetail/Routes/DeleteRouteDialog.tsx b/packages/manager/src/features/LoadBalancers/LoadBalancerDetail/Routes/DeleteRouteDialog.tsx
index 179cd523002..1ef9efd719a 100644
--- a/packages/manager/src/features/LoadBalancers/LoadBalancerDetail/Routes/DeleteRouteDialog.tsx
+++ b/packages/manager/src/features/LoadBalancers/LoadBalancerDetail/Routes/DeleteRouteDialog.tsx
@@ -2,7 +2,7 @@ import React from 'react';
 
 import { ActionsPanel } from 'src/components/ActionsPanel/ActionsPanel';
 import { ConfirmationDialog } from 'src/components/ConfirmationDialog/ConfirmationDialog';
-import { useLoadBalancerRouteDeleteMutation } from 'src/queries/aglb/routes';
+import { useLoadBalancerRouteDeleteMutation } from 'src/queries/aclb/routes';
 
 import type { Route } from '@linode/api-v4';
 
diff --git a/packages/manager/src/features/LoadBalancers/LoadBalancerDetail/Routes/DeleteRuleDialog.tsx b/packages/manager/src/features/LoadBalancers/LoadBalancerDetail/Routes/DeleteRuleDialog.tsx
index c3d1804c251..f9fdb4f9a82 100644
--- a/packages/manager/src/features/LoadBalancers/LoadBalancerDetail/Routes/DeleteRuleDialog.tsx
+++ b/packages/manager/src/features/LoadBalancers/LoadBalancerDetail/Routes/DeleteRuleDialog.tsx
@@ -2,7 +2,7 @@ import React from 'react';
 
 import { ActionsPanel } from 'src/components/ActionsPanel/ActionsPanel';
 import { ConfirmationDialog } from 'src/components/ConfirmationDialog/ConfirmationDialog';
-import { useLoadBalancerRouteUpdateMutation } from 'src/queries/aglb/routes';
+import { useLoadBalancerRouteUpdateMutation } from 'src/queries/aclb/routes';
 
 import { getNormalizedRulePayload } from './utils';
 
diff --git a/packages/manager/src/features/LoadBalancers/LoadBalancerDetail/Routes/EditRouteDrawer.tsx b/packages/manager/src/features/LoadBalancers/LoadBalancerDetail/Routes/EditRouteDrawer.tsx
index 8ad993156c2..f697fa32f29 100644
--- a/packages/manager/src/features/LoadBalancers/LoadBalancerDetail/Routes/EditRouteDrawer.tsx
+++ b/packages/manager/src/features/LoadBalancers/LoadBalancerDetail/Routes/EditRouteDrawer.tsx
@@ -12,7 +12,7 @@ import { Notice } from 'src/components/Notice/Notice';
 import { Radio } from 'src/components/Radio/Radio';
 import { RadioGroup } from 'src/components/RadioGroup';
 import { TextField } from 'src/components/TextField';
-import { useLoadBalancerRouteUpdateMutation } from 'src/queries/aglb/routes';
+import { useLoadBalancerRouteUpdateMutation } from 'src/queries/aclb/routes';
 import { capitalize } from 'src/utilities/capitalize';
 import { getFormikErrorsFromAPIErrors } from 'src/utilities/formikErrorUtils';
 
diff --git a/packages/manager/src/features/LoadBalancers/LoadBalancerDetail/Routes/RouteSelect.tsx b/packages/manager/src/features/LoadBalancers/LoadBalancerDetail/Routes/RouteSelect.tsx
index c12db1e1d08..ea276a69f7b 100644
--- a/packages/manager/src/features/LoadBalancers/LoadBalancerDetail/Routes/RouteSelect.tsx
+++ b/packages/manager/src/features/LoadBalancers/LoadBalancerDetail/Routes/RouteSelect.tsx
@@ -1,7 +1,7 @@
 import React from 'react';
 
 import { Autocomplete } from 'src/components/Autocomplete/Autocomplete';
-import { useLoadBalancerRoutesInfiniteQuery } from 'src/queries/aglb/routes';
+import { useLoadBalancerRoutesInfiniteQuery } from 'src/queries/aclb/routes';
 import { pluralize } from 'src/utilities/pluralize';
 
 import type { Filter, Route } from '@linode/api-v4';
diff --git a/packages/manager/src/features/LoadBalancers/LoadBalancerDetail/Routes/RoutesTable.tsx b/packages/manager/src/features/LoadBalancers/LoadBalancerDetail/Routes/RoutesTable.tsx
index f7a362977ed..64401a5cd7e 100644
--- a/packages/manager/src/features/LoadBalancers/LoadBalancerDetail/Routes/RoutesTable.tsx
+++ b/packages/manager/src/features/LoadBalancers/LoadBalancerDetail/Routes/RoutesTable.tsx
@@ -16,7 +16,7 @@ import { TableRowEmpty } from 'src/components/TableRowEmpty/TableRowEmpty';
 import { TableSortCell } from 'src/components/TableSortCell';
 import { useOrder } from 'src/hooks/useOrder';
 import { usePagination } from 'src/hooks/usePagination';
-import { useLoadBalancerRoutesQuery } from 'src/queries/aglb/routes';
+import { useLoadBalancerRoutesQuery } from 'src/queries/aclb/routes';
 
 import { RulesTable } from '../RulesTable';
 import { DeleteRouteDialog } from './DeleteRouteDialog';
diff --git a/packages/manager/src/features/LoadBalancers/LoadBalancerDetail/Routes/RuleDrawer.tsx b/packages/manager/src/features/LoadBalancers/LoadBalancerDetail/Routes/RuleDrawer.tsx
index c6743a741fd..a9c544a9d93 100644
--- a/packages/manager/src/features/LoadBalancers/LoadBalancerDetail/Routes/RuleDrawer.tsx
+++ b/packages/manager/src/features/LoadBalancers/LoadBalancerDetail/Routes/RuleDrawer.tsx
@@ -17,7 +17,7 @@ import { Stack } from 'src/components/Stack';
 import { TextField } from 'src/components/TextField';
 import { Toggle } from 'src/components/Toggle/Toggle';
 import { Typography } from 'src/components/Typography';
-import { useLoadBalancerRouteUpdateMutation } from 'src/queries/aglb/routes';
+import { useLoadBalancerRouteUpdateMutation } from 'src/queries/aclb/routes';
 import { getFormikErrorsFromAPIErrors } from 'src/utilities/formikErrorUtils';
 
 import { ServiceTargetSelect } from '../ServiceTargets/ServiceTargetSelect';
diff --git a/packages/manager/src/features/LoadBalancers/LoadBalancerDetail/RulesTable.tsx b/packages/manager/src/features/LoadBalancers/LoadBalancerDetail/RulesTable.tsx
index b98cd5d2b62..37878bab95f 100644
--- a/packages/manager/src/features/LoadBalancers/LoadBalancerDetail/RulesTable.tsx
+++ b/packages/manager/src/features/LoadBalancers/LoadBalancerDetail/RulesTable.tsx
@@ -6,7 +6,7 @@ import React from 'react';
 import { DragDropContext, DropResult, Droppable } from 'react-beautiful-dnd';
 
 import { Box } from 'src/components/Box';
-import { useLoadBalancerRouteUpdateMutation } from 'src/queries/aglb/routes';
+import { useLoadBalancerRouteUpdateMutation } from 'src/queries/aclb/routes';
 
 import { RuleRow } from './RuleRow';
 import {
diff --git a/packages/manager/src/features/LoadBalancers/LoadBalancerDetail/ServiceTargets/DeleteServiceTargetDialog.tsx b/packages/manager/src/features/LoadBalancers/LoadBalancerDetail/ServiceTargets/DeleteServiceTargetDialog.tsx
index 8d9166e9cfa..9b6f0f2ddfc 100644
--- a/packages/manager/src/features/LoadBalancers/LoadBalancerDetail/ServiceTargets/DeleteServiceTargetDialog.tsx
+++ b/packages/manager/src/features/LoadBalancers/LoadBalancerDetail/ServiceTargets/DeleteServiceTargetDialog.tsx
@@ -3,7 +3,7 @@ import React from 'react';
 
 import { ActionsPanel } from 'src/components/ActionsPanel/ActionsPanel';
 import { ConfirmationDialog } from 'src/components/ConfirmationDialog/ConfirmationDialog';
-import { useLoadBalancerServiceTargetDeleteMutation } from 'src/queries/aglb/serviceTargets';
+import { useLoadBalancerServiceTargetDeleteMutation } from 'src/queries/aclb/serviceTargets';
 
 interface Props {
   loadbalancerId: number;
diff --git a/packages/manager/src/features/LoadBalancers/LoadBalancerDetail/ServiceTargets/ServiceTargetDrawer.tsx b/packages/manager/src/features/LoadBalancers/LoadBalancerDetail/ServiceTargets/ServiceTargetDrawer.tsx
index 303b8bad9c3..804ec776b17 100644
--- a/packages/manager/src/features/LoadBalancers/LoadBalancerDetail/ServiceTargets/ServiceTargetDrawer.tsx
+++ b/packages/manager/src/features/LoadBalancers/LoadBalancerDetail/ServiceTargets/ServiceTargetDrawer.tsx
@@ -22,7 +22,7 @@ import { Typography } from 'src/components/Typography';
 import {
   useServiceTargetCreateMutation,
   useServiceTargetUpdateMutation,
-} from 'src/queries/aglb/serviceTargets';
+} from 'src/queries/aclb/serviceTargets';
 import { getFormikErrorsFromAPIErrors } from 'src/utilities/formikErrorUtils';
 import { scrollErrorIntoView } from 'src/utilities/scrollErrorIntoView';
 
diff --git a/packages/manager/src/features/LoadBalancers/LoadBalancerDetail/ServiceTargets/ServiceTargetEndpointHealth.test.tsx b/packages/manager/src/features/LoadBalancers/LoadBalancerDetail/ServiceTargets/ServiceTargetEndpointHealth.test.tsx
index b03820c63c9..1e662aec7dd 100644
--- a/packages/manager/src/features/LoadBalancers/LoadBalancerDetail/ServiceTargets/ServiceTargetEndpointHealth.test.tsx
+++ b/packages/manager/src/features/LoadBalancers/LoadBalancerDetail/ServiceTargets/ServiceTargetEndpointHealth.test.tsx
@@ -15,7 +15,7 @@ describe('ServiceTargetEndpontHeath', () => {
 
     server.use(
       rest.get(
-        '*/v4beta/aglb/:id/service-targets/endpoints-health',
+        '*/v4beta/aclb/:id/service-targets/endpoints-health',
         (req, res, ctx) => {
           const health = serviceTargetsEndpointHealthFactory.build({
             service_targets: [
diff --git a/packages/manager/src/features/LoadBalancers/LoadBalancerDetail/ServiceTargets/ServiceTargetEndpointHealth.tsx b/packages/manager/src/features/LoadBalancers/LoadBalancerDetail/ServiceTargets/ServiceTargetEndpointHealth.tsx
index 4a41c1470fe..abbea8a338b 100644
--- a/packages/manager/src/features/LoadBalancers/LoadBalancerDetail/ServiceTargets/ServiceTargetEndpointHealth.tsx
+++ b/packages/manager/src/features/LoadBalancers/LoadBalancerDetail/ServiceTargets/ServiceTargetEndpointHealth.tsx
@@ -2,7 +2,7 @@ import React from 'react';
 
 import { Skeleton } from 'src/components/Skeleton';
 import { Typography } from 'src/components/Typography';
-import { useLoadBalancerServiceTargetsEndpointHealthQuery } from 'src/queries/aglb/serviceTargets';
+import { useLoadBalancerServiceTargetsEndpointHealthQuery } from 'src/queries/aclb/serviceTargets';
 
 import { EndpointHealth } from '../EndpointHealth';
 
diff --git a/packages/manager/src/features/LoadBalancers/LoadBalancerDetail/ServiceTargets/ServiceTargetRow.tsx b/packages/manager/src/features/LoadBalancers/LoadBalancerDetail/ServiceTargets/ServiceTargetRow.tsx
index 9903362c90a..e129f321ebd 100644
--- a/packages/manager/src/features/LoadBalancers/LoadBalancerDetail/ServiceTargets/ServiceTargetRow.tsx
+++ b/packages/manager/src/features/LoadBalancers/LoadBalancerDetail/ServiceTargets/ServiceTargetRow.tsx
@@ -4,7 +4,7 @@ import { ActionMenu } from 'src/components/ActionMenu/ActionMenu';
 import { Hidden } from 'src/components/Hidden';
 import { TableCell } from 'src/components/TableCell';
 import { TableRow } from 'src/components/TableRow';
-import { useLoadbalancerCertificateQuery } from 'src/queries/aglb/certificates';
+import { useLoadbalancerCertificateQuery } from 'src/queries/aclb/certificates';
 
 import { ServiceTargetEndpontHeath } from './ServiceTargetEndpointHealth';
 
diff --git a/packages/manager/src/features/LoadBalancers/LoadBalancerDetail/ServiceTargets/ServiceTargetSelect.tsx b/packages/manager/src/features/LoadBalancers/LoadBalancerDetail/ServiceTargets/ServiceTargetSelect.tsx
index b9055069296..46f361cdf2b 100644
--- a/packages/manager/src/features/LoadBalancers/LoadBalancerDetail/ServiceTargets/ServiceTargetSelect.tsx
+++ b/packages/manager/src/features/LoadBalancers/LoadBalancerDetail/ServiceTargets/ServiceTargetSelect.tsx
@@ -2,7 +2,7 @@ import React from 'react';
 
 import { Autocomplete } from 'src/components/Autocomplete/Autocomplete';
 import { TextFieldProps } from 'src/components/TextField';
-import { useLoadBalancerServiceTargetsInfiniteQuery } from 'src/queries/aglb/serviceTargets';
+import { useLoadBalancerServiceTargetsInfiniteQuery } from 'src/queries/aclb/serviceTargets';
 import { pluralize } from 'src/utilities/pluralize';
 
 import type { Filter, ServiceTarget } from '@linode/api-v4';
diff --git a/packages/manager/src/features/LoadBalancers/LoadBalancerDetail/Settings/Delete.tsx b/packages/manager/src/features/LoadBalancers/LoadBalancerDetail/Settings/Delete.tsx
index c3e1eefccd7..d85eb856dd9 100644
--- a/packages/manager/src/features/LoadBalancers/LoadBalancerDetail/Settings/Delete.tsx
+++ b/packages/manager/src/features/LoadBalancers/LoadBalancerDetail/Settings/Delete.tsx
@@ -6,7 +6,7 @@ import { Box } from 'src/components/Box';
 import { Button } from 'src/components/Button/Button';
 import { Paper } from 'src/components/Paper';
 import { Typography } from 'src/components/Typography';
-import { useLoadBalancerQuery } from 'src/queries/aglb/loadbalancers';
+import { useLoadBalancerQuery } from 'src/queries/aclb/loadbalancers';
 
 import { DeleteLoadBalancerDialog } from './LoadBalancerDeleteDialog';
 
diff --git a/packages/manager/src/features/LoadBalancers/LoadBalancerDetail/Settings/Label.tsx b/packages/manager/src/features/LoadBalancers/LoadBalancerDetail/Settings/Label.tsx
index 77276e4062b..383f041c006 100644
--- a/packages/manager/src/features/LoadBalancers/LoadBalancerDetail/Settings/Label.tsx
+++ b/packages/manager/src/features/LoadBalancers/LoadBalancerDetail/Settings/Label.tsx
@@ -9,7 +9,7 @@ import { TextField } from 'src/components/TextField';
 import {
   useLoadBalancerMutation,
   useLoadBalancerQuery,
-} from 'src/queries/aglb/loadbalancers';
+} from 'src/queries/aclb/loadbalancers';
 
 interface Props {
   loadbalancerId: number;
diff --git a/packages/manager/src/features/LoadBalancers/LoadBalancerDetail/Settings/LoadBalancerDeleteDialog.tsx b/packages/manager/src/features/LoadBalancers/LoadBalancerDetail/Settings/LoadBalancerDeleteDialog.tsx
index ebd649ab6cb..9555f85c2db 100644
--- a/packages/manager/src/features/LoadBalancers/LoadBalancerDetail/Settings/LoadBalancerDeleteDialog.tsx
+++ b/packages/manager/src/features/LoadBalancers/LoadBalancerDetail/Settings/LoadBalancerDeleteDialog.tsx
@@ -1,7 +1,7 @@
 import * as React from 'react';
 
 import { TypeToConfirmDialog } from 'src/components/TypeToConfirmDialog/TypeToConfirmDialog';
-import { useLoadBalancerDeleteMutation } from 'src/queries/aglb/loadbalancers';
+import { useLoadBalancerDeleteMutation } from 'src/queries/aclb/loadbalancers';
 
 import type { Loadbalancer } from '@linode/api-v4';
 
diff --git a/packages/manager/src/features/LoadBalancers/LoadBalancerDetail/Settings/Region.tsx b/packages/manager/src/features/LoadBalancers/LoadBalancerDetail/Settings/Region.tsx
index 521f7302e35..dfb79fa01dd 100644
--- a/packages/manager/src/features/LoadBalancers/LoadBalancerDetail/Settings/Region.tsx
+++ b/packages/manager/src/features/LoadBalancers/LoadBalancerDetail/Settings/Region.tsx
@@ -8,7 +8,7 @@ import { Typography } from 'src/components/Typography';
 import {
   useLoadBalancerMutation,
   useLoadBalancerQuery,
-} from 'src/queries/aglb/loadbalancers';
+} from 'src/queries/aclb/loadbalancers';
 
 import { LoadBalancerRegions } from '../LoadBalancerRegions';
 
diff --git a/packages/manager/src/features/LoadBalancers/LoadBalancerLanding/LoadBalancerLanding.tsx b/packages/manager/src/features/LoadBalancers/LoadBalancerLanding/LoadBalancerLanding.tsx
index 4116bee6414..acb5729a842 100644
--- a/packages/manager/src/features/LoadBalancers/LoadBalancerLanding/LoadBalancerLanding.tsx
+++ b/packages/manager/src/features/LoadBalancers/LoadBalancerLanding/LoadBalancerLanding.tsx
@@ -20,7 +20,7 @@ import {
 } from 'src/features/LoadBalancers/constants';
 import { useOrder } from 'src/hooks/useOrder';
 import { usePagination } from 'src/hooks/usePagination';
-import { useLoadBalancersQuery } from 'src/queries/aglb/loadbalancers';
+import { useLoadBalancersQuery } from 'src/queries/aclb/loadbalancers';
 import { getAPIErrorOrDefault } from 'src/utilities/errorUtils';
 
 import { DeleteLoadBalancerDialog } from '../LoadBalancerDetail/Settings/LoadBalancerDeleteDialog';
diff --git a/packages/manager/src/features/LoadBalancers/LoadBalancerLanding/Ports.test.tsx b/packages/manager/src/features/LoadBalancers/LoadBalancerLanding/Ports.test.tsx
index 7c8652be106..4af576fb1ef 100644
--- a/packages/manager/src/features/LoadBalancers/LoadBalancerLanding/Ports.test.tsx
+++ b/packages/manager/src/features/LoadBalancers/LoadBalancerLanding/Ports.test.tsx
@@ -17,7 +17,7 @@ describe('Ports', () => {
     ];
 
     server.use(
-      rest.get('*/aglb/1/configurations*', (req, res, ctx) => {
+      rest.get('*/aclb/1/configurations*', (req, res, ctx) => {
         return res(ctx.json(makeResourcePage(configs)));
       })
     );
diff --git a/packages/manager/src/features/LoadBalancers/LoadBalancerLanding/Ports.tsx b/packages/manager/src/features/LoadBalancers/LoadBalancerLanding/Ports.tsx
index 23a8467352f..21626d2e9a9 100644
--- a/packages/manager/src/features/LoadBalancers/LoadBalancerLanding/Ports.tsx
+++ b/packages/manager/src/features/LoadBalancers/LoadBalancerLanding/Ports.tsx
@@ -2,7 +2,7 @@ import React from 'react';
 
 import { Skeleton } from 'src/components/Skeleton';
 import { Typography } from 'src/components/Typography';
-import { useLoadBalancerConfigurationsQuery } from 'src/queries/aglb/configurations';
+import { useLoadBalancerConfigurationsQuery } from 'src/queries/aclb/configurations';
 
 interface PortProps {
   loadbalancerId: number;
diff --git a/packages/manager/src/features/Managed/Monitors/IssueCalendar.tsx b/packages/manager/src/features/Managed/Monitors/IssueCalendar.tsx
index 03fb145d657..0ea39a8aed1 100644
--- a/packages/manager/src/features/Managed/Monitors/IssueCalendar.tsx
+++ b/packages/manager/src/features/Managed/Monitors/IssueCalendar.tsx
@@ -51,10 +51,14 @@ export const generateCalendar = (timezone: string, issues: ManagedIssue[]) => {
       createdOnTargetDay(timezone, thisIssue, day)
     );
 
-    days.push({
-      day: day.toISO(),
-      issues: relevantIssues,
-    });
+    const isoDate = day.toISO();
+
+    if (isoDate) {
+      days.push({
+        day: isoDate,
+        issues: relevantIssues,
+      });
+    }
   }
 
   return days;
diff --git a/packages/manager/src/features/Managed/Monitors/IssueDay.test.tsx b/packages/manager/src/features/Managed/Monitors/IssueDay.test.tsx
index 0050214b3e4..4d2232326d8 100644
--- a/packages/manager/src/features/Managed/Monitors/IssueDay.test.tsx
+++ b/packages/manager/src/features/Managed/Monitors/IssueDay.test.tsx
@@ -9,7 +9,7 @@ describe('IssueDay', () => {
   it('should include basic Monitor actions', () => {
     const date = DateTime.fromISO('2020-10-01');
     const props: IssueDayProps = {
-      day: date.toISO(),
+      day: date.toISO()!,
       issues: [],
     };
     const { getByText } = renderWithTheme(<IssueDay {...props} />);
diff --git a/packages/manager/src/features/ObjectStorage/AccessKeyLanding/AccessKeyDrawer.tsx b/packages/manager/src/features/ObjectStorage/AccessKeyLanding/AccessKeyDrawer.tsx
index 9a078e7a585..f461ee44804 100644
--- a/packages/manager/src/features/ObjectStorage/AccessKeyLanding/AccessKeyDrawer.tsx
+++ b/packages/manager/src/features/ObjectStorage/AccessKeyLanding/AccessKeyDrawer.tsx
@@ -6,7 +6,7 @@ import {
   Scope,
 } from '@linode/api-v4/lib/object-storage';
 import { createObjectStorageKeysSchema } from '@linode/validation/lib/objectStorageKeys.schema';
-import { Formik } from 'formik';
+import { Formik, FormikProps } from 'formik';
 import * as React from 'react';
 
 import { ActionsPanel } from 'src/components/ActionsPanel/ActionsPanel';
@@ -33,7 +33,10 @@ export interface AccessKeyDrawerProps {
   // If the mode is 'editing', we should have an ObjectStorageKey to edit
   objectStorageKey?: ObjectStorageKey;
   onClose: () => void;
-  onSubmit: (values: ObjectStorageKeyRequest, formikProps: any) => void;
+  onSubmit: (
+    values: ObjectStorageKeyRequest,
+    formikProps: FormikProps<ObjectStorageKeyRequest>
+  ) => void;
   open: boolean;
 }
 
@@ -120,7 +123,10 @@ export const AccessKeyDrawer = (props: AccessKeyDrawerProps) => {
     label: initialLabelValue,
   };
 
-  const handleSubmit = (values: ObjectStorageKeyRequest, formikProps: any) => {
+  const handleSubmit = (
+    values: ObjectStorageKeyRequest,
+    formikProps: FormikProps<ObjectStorageKeyRequest>
+  ) => {
     // If the user hasn't toggled the Limited Access button,
     // don't include any bucket_access information in the payload.
 
diff --git a/packages/manager/src/features/ObjectStorage/AccessKeyLanding/AccessKeyLanding.test.tsx b/packages/manager/src/features/ObjectStorage/AccessKeyLanding/AccessKeyLanding.test.tsx
index 55993a6d7dc..121a8549c38 100644
--- a/packages/manager/src/features/ObjectStorage/AccessKeyLanding/AccessKeyLanding.test.tsx
+++ b/packages/manager/src/features/ObjectStorage/AccessKeyLanding/AccessKeyLanding.test.tsx
@@ -1,26 +1,16 @@
 import { screen } from '@testing-library/react';
 import * as React from 'react';
 
-import { pageyProps } from 'src/__data__/pageyProps';
 import { renderWithTheme } from 'src/utilities/testHelpers';
 
 import { AccessKeyLanding } from './AccessKeyLanding';
 
 const props = {
   accessDrawerOpen: false,
-  classes: {
-    confirmationDialog: '',
-    createdCell: '',
-    headline: '',
-    helperText: '',
-    labelCell: '',
-    paper: '',
-  },
   closeAccessDrawer: vi.fn(),
   isRestrictedUser: false,
   mode: 'creating' as any,
   openAccessDrawer: vi.fn(),
-  ...pageyProps,
 };
 
 describe('AccessKeyLanding', () => {
diff --git a/packages/manager/src/features/ObjectStorage/AccessKeyLanding/AccessKeyLanding.tsx b/packages/manager/src/features/ObjectStorage/AccessKeyLanding/AccessKeyLanding.tsx
index dce6f9c8221..38d48b1d327 100644
--- a/packages/manager/src/features/ObjectStorage/AccessKeyLanding/AccessKeyLanding.tsx
+++ b/packages/manager/src/features/ObjectStorage/AccessKeyLanding/AccessKeyLanding.tsx
@@ -5,7 +5,7 @@ import {
   revokeObjectStorageKey,
   updateObjectStorageKey,
 } from '@linode/api-v4/lib/object-storage';
-import { FormikBag } from 'formik';
+import { FormikBag, FormikHelpers } from 'formik';
 import * as React from 'react';
 
 import { DocumentTitleSegment } from 'src/components/DocumentTitle';
@@ -96,7 +96,11 @@ export const AccessKeyLanding = (props: Props) => {
 
   const handleCreateKey = (
     values: ObjectStorageKeyRequest,
-    { setErrors, setStatus, setSubmitting }: FormikProps
+    {
+      setErrors,
+      setStatus,
+      setSubmitting,
+    }: FormikHelpers<ObjectStorageKeyRequest>
   ) => {
     // Clear out status (used for general errors)
     setStatus(null);
@@ -152,7 +156,11 @@ export const AccessKeyLanding = (props: Props) => {
 
   const handleEditKey = (
     values: ObjectStorageKeyRequest,
-    { setErrors, setStatus, setSubmitting }: FormikProps
+    {
+      setErrors,
+      setStatus,
+      setSubmitting,
+    }: FormikHelpers<ObjectStorageKeyRequest>
   ) => {
     // This shouldn't happen, but just in case.
     if (!keyToEdit) {
@@ -170,7 +178,7 @@ export const AccessKeyLanding = (props: Props) => {
 
     setSubmitting(true);
 
-    updateObjectStorageKey(keyToEdit.id, { label: values.label })
+    updateObjectStorageKey(keyToEdit.id, values)
       .then((_) => {
         setSubmitting(false);
 
diff --git a/packages/manager/src/features/ObjectStorage/AccessKeyLanding/AccessKeyTable/AccessKeyActionMenu.tsx b/packages/manager/src/features/ObjectStorage/AccessKeyLanding/AccessKeyTable/AccessKeyActionMenu.tsx
index b8f85026d29..ac87472e441 100644
--- a/packages/manager/src/features/ObjectStorage/AccessKeyLanding/AccessKeyTable/AccessKeyActionMenu.tsx
+++ b/packages/manager/src/features/ObjectStorage/AccessKeyLanding/AccessKeyTable/AccessKeyActionMenu.tsx
@@ -38,7 +38,7 @@ export const AccessKeyActionMenu = ({
       onClick: () => {
         openDrawer('editing', objectStorageKey);
       },
-      title: 'Edit Label',
+      title: isObjMultiClusterEnabled ? 'Edit' : 'Edit Label',
     },
     {
       onClick: () => {
diff --git a/packages/manager/src/features/ObjectStorage/AccessKeyLanding/OMC_AccessKeyDrawer.tsx b/packages/manager/src/features/ObjectStorage/AccessKeyLanding/OMC_AccessKeyDrawer.tsx
index 6d4979acab9..a99f0d036ab 100644
--- a/packages/manager/src/features/ObjectStorage/AccessKeyLanding/OMC_AccessKeyDrawer.tsx
+++ b/packages/manager/src/features/ObjectStorage/AccessKeyLanding/OMC_AccessKeyDrawer.tsx
@@ -5,9 +5,10 @@ import {
   ObjectStorageKey,
   ObjectStorageKeyRequest,
   Scope,
+  UpdateObjectStorageKeyRequest,
 } from '@linode/api-v4/lib/object-storage';
 import { createObjectStorageKeysSchema } from '@linode/validation/lib/objectStorageKeys.schema';
-import { useFormik } from 'formik';
+import { useFormik, FormikProps } from 'formik';
 import React, { useEffect, useState } from 'react';
 
 import { ActionsPanel } from 'src/components/ActionsPanel/ActionsPanel';
@@ -28,6 +29,7 @@ import { confirmObjectStorage } from '../utilities';
 import { AccessKeyRegions } from './AccessKeyRegions/AccessKeyRegions';
 import { LimitedAccessControls } from './LimitedAccessControls';
 import { MODE } from './types';
+import { generateUpdatePayload, hasLabelOrRegionsChanged } from './utils';
 
 export interface AccessKeyDrawerProps {
   isRestrictedUser: boolean;
@@ -35,7 +37,12 @@ export interface AccessKeyDrawerProps {
   // If the mode is 'editing', we should have an ObjectStorageKey to edit
   objectStorageKey?: ObjectStorageKey;
   onClose: () => void;
-  onSubmit: (values: ObjectStorageKeyRequest, formikProps: any) => void;
+  onSubmit: (
+    values: ObjectStorageKeyRequest | UpdateObjectStorageKeyRequest,
+    formikProps: FormikProps<
+      ObjectStorageKeyRequest | UpdateObjectStorageKeyRequest
+    >
+  ) => void;
   open: boolean;
 }
 
@@ -116,10 +123,11 @@ export const OMC_AccessKeyDrawer = (props: AccessKeyDrawerProps) => {
   // and so not included in Formik's types
   const [limitedAccessChecked, setLimitedAccessChecked] = useState(false);
 
-  const title = createMode ? 'Create Access Key' : 'Edit Access Key Label';
+  const title = createMode ? 'Create Access Key' : 'Edit Access Key';
 
   const initialLabelValue =
     !createMode && objectStorageKey ? objectStorageKey.label : '';
+
   const initialRegions =
     !createMode && objectStorageKey
       ? objectStorageKey.regions?.map((region) => region.id)
@@ -148,13 +156,25 @@ export const OMC_AccessKeyDrawer = (props: AccessKeyDrawerProps) => {
           }
         : { ...values, bucket_access: null };
 
-      onSubmit(payload, formik);
+      const updatePayload = generateUpdatePayload(values, initialValues);
+
+      if (mode !== 'creating') {
+        onSubmit(updatePayload, formik);
+      } else {
+        onSubmit(payload, formik);
+      }
     },
     validateOnBlur: true,
     validateOnChange: false,
     validationSchema: createObjectStorageKeysSchema,
   });
 
+  const isSaveDisabled =
+    isRestrictedUser ||
+    (mode !== 'creating' &&
+      objectStorageKey &&
+      !hasLabelOrRegionsChanged(formik.values, objectStorageKey));
+
   const beforeSubmit = () => {
     confirmObjectStorage<FormState>(
       accountSettings?.object_storage || 'active',
@@ -257,6 +277,7 @@ export const OMC_AccessKeyDrawer = (props: AccessKeyDrawerProps) => {
                 'bucket_access',
                 getDefaultScopes(bucketsInRegions, regionsLookup)
               );
+              formik.validateField('regions');
             }}
             onChange={(values) => {
               const bucketsInRegions = buckets?.filter(
@@ -287,10 +308,7 @@ export const OMC_AccessKeyDrawer = (props: AccessKeyDrawerProps) => {
           <ActionsPanel
             primaryButtonProps={{
               'data-testid': 'submit',
-              disabled:
-                isRestrictedUser ||
-                (mode !== 'creating' &&
-                  formik.values.label === initialLabelValue),
+              disabled: isSaveDisabled,
               label: createMode ? 'Create Access Key' : 'Save Changes',
               loading: formik.isSubmitting,
               onClick: beforeSubmit,
diff --git a/packages/manager/src/features/ObjectStorage/AccessKeyLanding/utils.test.ts b/packages/manager/src/features/ObjectStorage/AccessKeyLanding/utils.test.ts
new file mode 100644
index 00000000000..2acbd6e940c
--- /dev/null
+++ b/packages/manager/src/features/ObjectStorage/AccessKeyLanding/utils.test.ts
@@ -0,0 +1,98 @@
+import { ObjectStorageKey } from '@linode/api-v4/lib/object-storage';
+
+import { FormState } from './OMC_AccessKeyDrawer';
+import { generateUpdatePayload, hasLabelOrRegionsChanged } from './utils';
+
+describe('generateUpdatePayload', () => {
+  const initialValues: FormState = {
+    bucket_access: [],
+    label: 'initialLabel',
+    regions: ['region1', 'region2'],
+  };
+
+  it('should return empty object if no changes', () => {
+    const updatedValues = { ...initialValues };
+    expect(generateUpdatePayload(updatedValues, initialValues)).toEqual({});
+  });
+
+  it('should return updated label if only label changed', () => {
+    const updatedValues = { ...initialValues, label: 'newLabel' };
+    expect(generateUpdatePayload(updatedValues, initialValues)).toEqual({
+      label: 'newLabel',
+    });
+  });
+
+  it('should return updated regions if only regions changed', () => {
+    const updatedValues = { ...initialValues, regions: ['region3', 'region4'] };
+    expect(generateUpdatePayload(updatedValues, initialValues)).toEqual({
+      regions: ['region3', 'region4'],
+    });
+  });
+
+  it('should return updated label and regions if both changed', () => {
+    const updatedValues = {
+      bucket_access: [],
+      label: 'newLabel',
+      regions: ['region3', 'region4'],
+    };
+    expect(generateUpdatePayload(updatedValues, initialValues)).toEqual({
+      label: 'newLabel',
+      regions: ['region3', 'region4'],
+    });
+  });
+});
+
+describe('hasLabelOrRegionsChanged', () => {
+  const updatedValues: FormState = {
+    bucket_access: [],
+    label: 'initialLabel',
+    regions: ['region3', 'region4'],
+  };
+  const initialValues: ObjectStorageKey = {
+    access_key: '',
+    bucket_access: null,
+    id: 0,
+    label: updatedValues.label,
+    limited: false,
+    regions: [
+      { id: 'region3', s3_endpoint: '' },
+      { id: 'region4', s3_endpoint: '' },
+    ],
+
+    secret_key: '',
+  };
+
+  it('returns false when both label and regions are unchanged', () => {
+    expect(hasLabelOrRegionsChanged(updatedValues, initialValues)).toBe(false);
+  });
+
+  it('returns true when only the label has changed', () => {
+    expect(
+      hasLabelOrRegionsChanged(
+        { ...updatedValues, label: 'newLabel' },
+        initialValues
+      )
+    ).toBe(true);
+  });
+
+  it('returns true when only the regions have changed', () => {
+    expect(
+      hasLabelOrRegionsChanged(
+        {
+          ...updatedValues,
+          regions: ['region5'],
+        },
+        initialValues
+      )
+    ).toBe(true);
+  });
+
+  it('returns true when both label and regions have changed', () => {
+    expect(
+      hasLabelOrRegionsChanged(
+        { ...updatedValues, label: 'newLabel', regions: ['region5'] },
+        initialValues
+      )
+    ).toBe(true);
+  });
+});
diff --git a/packages/manager/src/features/ObjectStorage/AccessKeyLanding/utils.ts b/packages/manager/src/features/ObjectStorage/AccessKeyLanding/utils.ts
new file mode 100644
index 00000000000..8008022a36a
--- /dev/null
+++ b/packages/manager/src/features/ObjectStorage/AccessKeyLanding/utils.ts
@@ -0,0 +1,73 @@
+import { ObjectStorageKey } from '@linode/api-v4/lib/object-storage';
+
+import { areArraysEqual } from 'src/utilities/areArraysEqual';
+import { sortByString } from 'src/utilities/sort-by';
+
+import { FormState } from './OMC_AccessKeyDrawer';
+
+type UpdatePayload =
+  | { label: FormState['label']; regions: FormState['regions'] }
+  | { label: FormState['label'] }
+  | { regions: FormState['regions'] }
+  | {};
+
+const sortRegionOptions = (a: string, b: string) => {
+  return sortByString(a, b, 'asc');
+};
+
+/**
+ * Generates an update payload for edit access key based on changes in form values.
+ *
+ * @param {FormState} updatedValues - The current state of the form.
+ * @param {FormState} initialValues - The initial state of the form for comparison.
+ * @returns An object containing the fields that have changed.
+ */
+export const generateUpdatePayload = (
+  updatedValues: FormState,
+  initialValues: FormState
+): UpdatePayload => {
+  let updatePayload = {};
+
+  const labelChanged = updatedValues.label !== initialValues.label;
+  const regionsChanged = !areArraysEqual(
+    [...updatedValues.regions].sort(sortRegionOptions),
+    [...initialValues.regions].sort(sortRegionOptions)
+  );
+
+  if (labelChanged && regionsChanged) {
+    updatePayload = {
+      label: updatedValues.label,
+      regions: updatedValues.regions,
+    };
+  } else if (labelChanged) {
+    updatePayload = { label: updatedValues.label };
+  } else if (regionsChanged) {
+    updatePayload = { regions: updatedValues.regions };
+  }
+
+  return updatePayload;
+};
+
+/**
+ * Determines if there have been any changes in the label or regions
+ * between the updated form values and the initial values.
+ *
+ * @param {FormState} updatedValues - The current state of the form.
+ * @param {ObjectStorageKey} initialValues - The initial values for comparison.
+ * @returns {boolean} True if there are changes in label or regions, false otherwise.
+ */
+export const hasLabelOrRegionsChanged = (
+  updatedValues: FormState,
+  initialValues: ObjectStorageKey
+): boolean => {
+  const regionsChanged = !areArraysEqual(
+    [...updatedValues.regions].sort(sortRegionOptions),
+    [...initialValues.regions?.map((region) => region.id)].sort(
+      sortRegionOptions
+    )
+  );
+
+  const labelChanged = updatedValues.label !== initialValues.label;
+
+  return labelChanged || regionsChanged;
+};
diff --git a/packages/manager/src/features/ObjectStorage/BucketLanding/BucketTable.test.tsx b/packages/manager/src/features/ObjectStorage/BucketLanding/BucketTable.test.tsx
index e6c376799db..bbce7fa8900 100644
--- a/packages/manager/src/features/ObjectStorage/BucketLanding/BucketTable.test.tsx
+++ b/packages/manager/src/features/ObjectStorage/BucketLanding/BucketTable.test.tsx
@@ -1,41 +1,46 @@
-import { shallow } from 'enzyme';
 import * as React from 'react';
 
-import { buckets } from 'src/__data__/buckets';
+import { objectStorageBucketFactory } from 'src/factories';
+import { renderWithTheme, mockMatchMedia } from 'src/utilities/testHelpers';
 
 import { BucketTable } from './BucketTable';
 
-describe('BucketTable', () => {
-  const wrapper = shallow(
-    <BucketTable
-      data={buckets}
-      handleClickDetails={vi.fn()}
-      handleClickRemove={vi.fn()}
-      handleOrderChange={vi.fn()}
-      order="asc"
-      orderBy="label"
-    />
-  );
+beforeAll(() => mockMatchMedia());
 
-  const innerComponent = wrapper.dive();
+describe('BucketTable', () => {
+  it('renders table column headers', () => {
+    const { getByText } = renderWithTheme(
+      <BucketTable
+        data={[]}
+        handleClickDetails={vi.fn()}
+        handleClickRemove={vi.fn()}
+        handleOrderChange={vi.fn()}
+        order="asc"
+        orderBy="label"
+      />
+    );
 
-  it('renders without crashing', () => {
-    expect(wrapper).toHaveLength(1);
+    expect(getByText('Name')).toBeVisible();
+    expect(getByText('Region')).toBeVisible();
+    expect(getByText('Created')).toBeVisible();
+    expect(getByText('Size')).toBeVisible();
   });
 
-  it('renders a "Name" column', () => {
-    expect(innerComponent.find('[data-qa-name]')).toHaveLength(1);
-  });
-  it('renders a "Region" column', () => {
-    expect(innerComponent.find('[data-qa-region]')).toHaveLength(1);
-  });
-  it('renders a "Created" column', () => {
-    expect(innerComponent.find('[data-qa-created]')).toHaveLength(1);
-  });
-  it('renders a "Size" column', () => {
-    expect(innerComponent.find('[data-qa-size]')).toHaveLength(1);
-  });
-  it('renders a RenderData component with the provided data', () => {
-    expect(innerComponent.find('RenderData').prop('data')).toEqual(buckets);
+  it('renders buckets', () => {
+    const buckets = objectStorageBucketFactory.buildList(3);
+    const { getByText } = renderWithTheme(
+      <BucketTable
+        data={buckets}
+        handleClickDetails={vi.fn()}
+        handleClickRemove={vi.fn()}
+        handleOrderChange={vi.fn()}
+        order="asc"
+        orderBy="label"
+      />
+    );
+
+    for (const bucket of buckets) {
+      expect(getByText(bucket.label)).toBeVisible();
+    }
   });
 });
diff --git a/packages/manager/src/features/OneClickApps/oneClickApps.ts b/packages/manager/src/features/OneClickApps/oneClickApps.ts
index c165941c8fe..442669176dc 100644
--- a/packages/manager/src/features/OneClickApps/oneClickApps.ts
+++ b/packages/manager/src/features/OneClickApps/oneClickApps.ts
@@ -905,6 +905,28 @@ export const oneClickApps: OCA[] = [
     summary: 'Open source multimedia note-taking app.',
     website: 'https://joplinapp.org/',
   },
+  {
+    alt_description: 'Data science notebook.',
+    alt_name: 'Data science and machine learning development environment.',
+    categories: ['Productivity'],
+    colors: {
+      end: '9e9e9e',
+      start: 'f37626',
+    },
+    description:
+      'JupyterLab is a cutting-edge web-based, interactive development environment, geared towards data science, machine learning and other scientific computing workflows.',
+    logo_url: 'jupyter.svg',
+    name: 'JupyterLab',
+    related_guides: [
+      {
+        href:
+          'https://www.linode.com/docs/products/tools/marketplace/guides/jupyterlab/',
+        title: 'Deploy JupyterLab through the Linode Marketplace',
+      },
+    ],
+    summary: 'Data science development environment.',
+    website: 'https://jupyter.org',
+  },
   {
     alt_description:
       'Security research and testing platform with hundreds of tools for reverse engineering, penetration testing, and more.',
@@ -1298,6 +1320,28 @@ export const oneClickApps: OCA[] = [
     summary: `World's most popular open source database.`,
     website: 'https://www.mysql.com/',
   },
+  {
+    alt_description: `Microservice centeric stream processing.`,
+    alt_name: 'Microservice messaging bus',
+    categories: ['Development'],
+    colors: {
+      end: '000000',
+      start: '0086FF',
+    },
+    description:
+      'NATS is a distributed PubSub technology that enables applications to securely communicate across any combination of cloud vendors, on-premise, edge, web and mobile, and devices.',
+    logo_url: 'nats.svg',
+    name: 'NATS Single Node',
+    related_guides: [
+      {
+        href:
+          'https://www.linode.com/docs/products/tools/marketplace/guides/nats-single-node/',
+        title: 'Deploy NATS single node through the Linode Marketplace',
+      },
+    ],
+    summary: 'Cloud native application messaging service.',
+    website: 'https://nats.io',
+  },
   {
     alt_description:
       'File storage alternative to Dropbox and office suite alternative to Microsoft Office.',
diff --git a/packages/manager/src/features/PlacementGroups/PlacementGroupsAssignLinodesDrawer.test.tsx b/packages/manager/src/features/PlacementGroups/PlacementGroupsAssignLinodesDrawer.test.tsx
new file mode 100644
index 00000000000..657f3468b8e
--- /dev/null
+++ b/packages/manager/src/features/PlacementGroups/PlacementGroupsAssignLinodesDrawer.test.tsx
@@ -0,0 +1,140 @@
+import { fireEvent } from '@testing-library/react';
+import * as React from 'react';
+
+import {
+  linodeFactory,
+  placementGroupFactory,
+  regionFactory,
+} from 'src/factories';
+import { renderWithTheme } from 'src/utilities/testHelpers';
+
+import { PlacementGroupsAssignLinodesDrawer } from './PlacementGroupsAssignLinodesDrawer';
+
+const queryMocks = vi.hoisted(() => ({
+  useAllLinodesQuery: vi.fn().mockReturnValue({}),
+  useAssignLinodesToPlacementGroup: vi.fn().mockReturnValue({}),
+  useRegionsQuery: vi.fn().mockReturnValue({}),
+  useUnpaginatedPlacementGroupsQuery: vi.fn().mockReturnValue({}),
+}));
+
+vi.mock('src/queries/linodes/linodes', async () => {
+  const actual = await vi.importActual('src/queries/linodes/linodes');
+  return {
+    ...actual,
+    useAllLinodesQuery: queryMocks.useAllLinodesQuery,
+  };
+});
+
+vi.mock('src/queries/placementGroups', async () => {
+  const actual = await vi.importActual('src/queries/placementGroups');
+  return {
+    ...actual,
+    useUnpaginatedPlacementGroupsQuery:
+      queryMocks.useUnpaginatedPlacementGroupsQuery,
+  };
+});
+
+vi.mock('src/queries/regions', async () => {
+  const actual = await vi.importActual('src/queries/regions');
+  return {
+    ...actual,
+    useRegionsQuery: queryMocks.useRegionsQuery,
+  };
+});
+
+vi.mock('src/queries/placementGroups', async () => {
+  const actual = await vi.importActual('src/queries/placementGroups');
+  return {
+    ...actual,
+    useAssignLinodesToPlacementGroup:
+      queryMocks.useAssignLinodesToPlacementGroup,
+  };
+});
+
+describe('PlacementGroupsAssignLinodesDrawer', () => {
+  it('should render the error state', () => {
+    queryMocks.useAllLinodesQuery.mockReturnValue({
+      error: [{ reason: 'Not found' }],
+    });
+
+    const { getByText } = renderWithTheme(
+      <PlacementGroupsAssignLinodesDrawer
+        numberOfPlacementGroupsCreated={9}
+        onClose={vi.fn()}
+        open={true}
+        selectedPlacementGroup={placementGroupFactory.build()}
+      />
+    );
+
+    expect(
+      getByText(
+        'There was a problem retrieving your placement group. Please try again'
+      )
+    ).toBeInTheDocument();
+  });
+
+  it('should render the drawer components', () => {
+    queryMocks.useAllLinodesQuery.mockReturnValue({
+      data: [
+        linodeFactory.build({ id: 1, label: 'Linode-1', region: 'us-east' }),
+        linodeFactory.build({ id: 2, label: 'Linode-2', region: 'us-east' }),
+        linodeFactory.build({ id: 11, label: 'Linode-11', region: 'us-east' }),
+      ],
+    });
+    queryMocks.useRegionsQuery.mockReturnValue(regionFactory.buildList(5));
+    queryMocks.useUnpaginatedPlacementGroupsQuery.mockReturnValue({
+      data: placementGroupFactory.build(),
+    });
+    queryMocks.useAssignLinodesToPlacementGroup.mockReturnValue(
+      placementGroupFactory.build({
+        linode_ids: [1, 2, 0, 1, 2, 3, 5, 6, 7, 8, 43, 11],
+      })
+    );
+
+    const {
+      getByPlaceholderText,
+      getByRole,
+      getByTestId,
+      getByText,
+    } = renderWithTheme(
+      <PlacementGroupsAssignLinodesDrawer
+        selectedPlacementGroup={placementGroupFactory.build({
+          affinity_type: 'anti_affinity',
+          label: 'PG-1',
+          region: 'us-east',
+        })}
+        onClose={vi.fn()}
+        open={true}
+      />
+    );
+
+    const linodesSelect = getByPlaceholderText('Select a Linode');
+    const addLinodeButton = getByRole('button', { name: 'Add Linode' });
+    const removableLinodesList = getByTestId('pg-linode-removable-list');
+
+    expect(linodesSelect).toBeInTheDocument();
+    expect(addLinodeButton).toHaveAttribute('aria-disabled', 'true');
+    expect(removableLinodesList).toHaveTextContent(
+      'No Linodes have been assigned.'
+    );
+
+    fireEvent.focus(linodesSelect);
+    fireEvent.change(linodesSelect, { target: { value: 'Linode-11' } });
+    const optionElement = getByText('Linode-11');
+    fireEvent.click(optionElement);
+
+    expect(addLinodeButton).not.toHaveAttribute('aria-disabled', 'true');
+
+    fireEvent.click(getByRole('button', { name: 'Add Linode' }));
+
+    expect(addLinodeButton).toHaveAttribute('aria-disabled', 'true');
+    expect(removableLinodesList).toHaveTextContent('Linode-11');
+
+    const removeButton = getByRole('button', { name: 'remove Linode-11' });
+    fireEvent.click(removeButton);
+
+    expect(removableLinodesList).toHaveTextContent(
+      'No Linodes have been assigned.'
+    );
+  });
+});
diff --git a/packages/manager/src/features/PlacementGroups/PlacementGroupsAssignLinodesDrawer.tsx b/packages/manager/src/features/PlacementGroups/PlacementGroupsAssignLinodesDrawer.tsx
new file mode 100644
index 00000000000..9022f02a4ba
--- /dev/null
+++ b/packages/manager/src/features/PlacementGroups/PlacementGroupsAssignLinodesDrawer.tsx
@@ -0,0 +1,248 @@
+import { AFFINITY_TYPES } from '@linode/api-v4';
+import Grid from '@mui/material/Unstable_Grid2';
+import * as React from 'react';
+
+import { ActionsPanel } from 'src/components/ActionsPanel/ActionsPanel';
+import { Drawer } from 'src/components/Drawer';
+import { ErrorState } from 'src/components/ErrorState/ErrorState';
+import { FormLabel } from 'src/components/FormLabel';
+import { Link } from 'src/components/Link';
+import { Notice } from 'src/components/Notice/Notice';
+import { RemovableSelectionsList } from 'src/components/RemovableSelectionsList/RemovableSelectionsList';
+import { Stack } from 'src/components/Stack';
+import { Typography } from 'src/components/Typography';
+import { usePlacementGroupData } from 'src/hooks/usePlacementGroupsData';
+import { useAllLinodesQuery } from 'src/queries/linodes/linodes';
+import {
+  useAssignLinodesToPlacementGroup,
+  useUnassignLinodesFromPlacementGroup,
+  useUnpaginatedPlacementGroupsQuery,
+} from 'src/queries/placementGroups';
+
+import { LinodeSelect } from '../Linodes/LinodeSelect/LinodeSelect';
+import { getLinodesFromAllPlacementGroups } from './utils';
+
+import type { PlacementGroupsAssignLinodesDrawerProps } from './types';
+import type {
+  AssignLinodesToPlacementGroupPayload,
+  Linode,
+  UnassignLinodesFromPlacementGroupPayload,
+} from '@linode/api-v4';
+
+export const PlacementGroupsAssignLinodesDrawer = (
+  props: PlacementGroupsAssignLinodesDrawerProps
+) => {
+  const { onClose, open, selectedPlacementGroup } = props;
+  const { data: allLinodesInRegion, error: linodesError } = useAllLinodesQuery(
+    {},
+    {
+      '+or': [
+        {
+          region: selectedPlacementGroup?.region,
+        },
+      ],
+    }
+  );
+  const {
+    data: allPlacementGroups,
+    error: allPlacementGroupsError,
+  } = useUnpaginatedPlacementGroupsQuery();
+
+  const { hasReachedCapacity, region } = usePlacementGroupData({
+    placementGroup: selectedPlacementGroup,
+  });
+
+  const { mutateAsync: assignLinodes } = useAssignLinodesToPlacementGroup(
+    selectedPlacementGroup?.id ?? -1
+  );
+  const { mutateAsync: unassignLinodes } = useUnassignLinodesFromPlacementGroup(
+    selectedPlacementGroup?.id ?? -1
+  );
+  const [selectedLinode, setSelectedLinode] = React.useState<Linode | null>(
+    null
+  );
+  const [localLinodesSelection, setLocalLinodesSelection] = React.useState<
+    Linode[]
+  >([]);
+  const [generalError, setGeneralError] = React.useState<string | undefined>(
+    undefined
+  );
+
+  React.useEffect(() => {
+    if (open) {
+      setSelectedLinode(null);
+      setLocalLinodesSelection([]);
+      setGeneralError(undefined);
+    }
+  }, [open]);
+
+  const linodesFromAllPlacementGroups = getLinodesFromAllPlacementGroups(
+    allPlacementGroups
+  );
+
+  if (
+    !allLinodesInRegion ||
+    !selectedPlacementGroup ||
+    linodesError ||
+    allPlacementGroupsError
+  ) {
+    return (
+      <ErrorState errorText="There was a problem retrieving your placement group. Please try again" />
+    );
+  }
+
+  const getLinodeSelectOptions = (): Linode[] => {
+    return (
+      allLinodesInRegion.filter((linode) => {
+        const isNotAlreadyAssigned = !linodesFromAllPlacementGroups.includes(
+          linode.id
+        );
+        const isNotAssignedInDrawer = !localLinodesSelection.find(
+          (l) => l.id === linode.id
+        );
+
+        return isNotAlreadyAssigned && isNotAssignedInDrawer;
+      }) ?? []
+    );
+  };
+
+  const { affinity_type, label } = selectedPlacementGroup;
+  const linodeSelectLabel = region
+    ? `Linodes in ${region.label} (${region.id})`
+    : 'Linodes';
+
+  const drawerTitle =
+    label && affinity_type
+      ? `Add Linodes to Placement Group ${label} (${AFFINITY_TYPES[affinity_type]})`
+      : 'Add Linodes to Placement Group';
+
+  const removableSelectionsListLabel = (
+    <>
+      <FormLabel htmlFor="pg-linode-removable-list">
+        {label && affinity_type
+          ? `Linodes Assigned to Placement Group ${label}
+        (${AFFINITY_TYPES[affinity_type]})`
+          : 'Linodes Assigned to Placement Group'}
+      </FormLabel>
+      <Typography component="span" display="block" fontSize="0.8rem">
+        Maximum Number of Linodes for this group: {region?.maximum_vms_per_pg}
+      </Typography>
+    </>
+  );
+
+  const handleAssignLinode = async (e: React.SyntheticEvent<HTMLElement>) => {
+    e.preventDefault();
+    setSelectedLinode(null);
+
+    if (!selectedLinode) {
+      return;
+    }
+
+    setLocalLinodesSelection([...localLinodesSelection, selectedLinode]);
+
+    const payload: AssignLinodesToPlacementGroupPayload = {
+      linodes: [selectedLinode.id],
+      strict: true,
+    };
+
+    try {
+      await assignLinodes(payload);
+    } catch (error) {
+      setGeneralError(
+        error?.[0]?.reason
+          ? error[0].reason
+          : 'An error occurred while adding the Linode to the group'
+      );
+    }
+  };
+
+  const handleUnassignLinode = async (linode: Linode) => {
+    setLocalLinodesSelection(
+      localLinodesSelection.filter((l) => l.id !== linode.id)
+    );
+
+    const payload: UnassignLinodesFromPlacementGroupPayload = {
+      linodes: [linode.id],
+    };
+
+    try {
+      await unassignLinodes(payload);
+    } catch (error) {
+      setGeneralError(
+        error
+          ? error?.[0]?.reason
+          : 'An error occurred while removing the Linode from the group'
+      );
+    }
+  };
+
+  return (
+    <Drawer onClose={onClose} open={open} title={drawerTitle}>
+      <Grid>
+        {generalError ? <Notice text={generalError} variant="error" /> : null}
+        <form onSubmit={handleAssignLinode}>
+          <Stack spacing={1}>
+            <Typography>
+              A Linode can only be assigned to a single Placement Group.
+            </Typography>
+
+            <Typography>
+              If you need to add a new Linode, go to{' '}
+              <Link to="/linodes/create">Create Linode</Link> and return to this
+              page to assign it to this Placement Group.
+            </Typography>
+            <LinodeSelect
+              onSelectionChange={(value) => {
+                setSelectedLinode(value);
+              }}
+              disabled={hasReachedCapacity}
+              helperText="Only displaying Linodes that aren’t assigned to a Placement Group"
+              label={linodeSelectLabel}
+              options={getLinodeSelectOptions()}
+              value={selectedLinode?.id ?? null}
+            />
+
+            <ActionsPanel
+              primaryButtonProps={{
+                'data-testid': 'submit',
+                disabled: !selectedLinode || hasReachedCapacity,
+                label: 'Add Linode',
+                type: 'submit',
+              }}
+              sx={{ pt: 2 }}
+            />
+            {hasReachedCapacity && (
+              <Notice
+                text="This Placement Group has the maximum number of Linodes allowed"
+                variant="warning"
+              />
+            )}
+            <RemovableSelectionsList
+              LabelComponent={({ selection }) => {
+                return (
+                  <Typography component="span">{selection.label}</Typography>
+                );
+              }}
+              onRemove={(data: Linode) => {
+                handleUnassignLinode(data);
+              }}
+              headerText={removableSelectionsListLabel}
+              id="pg-linode-removable-list"
+              noDataText={'No Linodes have been assigned.'}
+              selectionData={localLinodesSelection}
+              sx={{ pt: 2 }}
+            />
+            <ActionsPanel
+              primaryButtonProps={{
+                buttonType: 'outlined',
+                label: 'Done',
+                onClick: onClose,
+              }}
+              sx={{ pt: 2 }}
+            />
+          </Stack>
+        </form>
+      </Grid>
+    </Drawer>
+  );
+};
diff --git a/packages/manager/src/features/PlacementGroups/PlacementGroupsCreateDrawer.tsx b/packages/manager/src/features/PlacementGroups/PlacementGroupsCreateDrawer.tsx
index b22b56b4252..b64f3a9cc69 100644
--- a/packages/manager/src/features/PlacementGroups/PlacementGroupsCreateDrawer.tsx
+++ b/packages/manager/src/features/PlacementGroups/PlacementGroupsCreateDrawer.tsx
@@ -59,6 +59,7 @@ export const PlacementGroupsCreateDrawer = (
       affinity_type: '' as PlacementGroupDrawerFormikProps['affinity_type'],
       label: '',
       region: selectedRegionId ?? '',
+      strict: true,
     },
     onSubmit(
       values: PlacementGroupDrawerFormikProps,
diff --git a/packages/manager/src/features/PlacementGroups/PlacementGroupsDetail/PlacementGroupsDetail.test.tsx b/packages/manager/src/features/PlacementGroups/PlacementGroupsDetail/PlacementGroupsDetail.test.tsx
index b308ec34c2a..a8f2fd38630 100644
--- a/packages/manager/src/features/PlacementGroups/PlacementGroupsDetail/PlacementGroupsDetail.test.tsx
+++ b/packages/manager/src/features/PlacementGroups/PlacementGroupsDetail/PlacementGroupsDetail.test.tsx
@@ -48,6 +48,7 @@ describe('PlacementGroupsLanding', () => {
       data: placementGroupFactory.build({
         affinity_type: 'anti_affinity',
         id: 1,
+        is_compliant: true,
         label: 'My first PG',
       }),
     });
@@ -64,6 +65,6 @@ describe('PlacementGroupsLanding', () => {
     expect(getByText(/my first pg \(Anti-affinity\)/i)).toBeInTheDocument();
     expect(getByText(/docs/i)).toBeInTheDocument();
     expect(getByRole('tab', { name: 'Summary' })).toBeInTheDocument();
-    expect(getByRole('tab', { name: 'Linodes (3)' })).toBeInTheDocument();
+    expect(getByRole('tab', { name: 'Linodes (9)' })).toBeInTheDocument();
   });
 });
diff --git a/packages/manager/src/features/PlacementGroups/PlacementGroupsDetail/PlacementGroupsDetail.tsx b/packages/manager/src/features/PlacementGroups/PlacementGroupsDetail/PlacementGroupsDetail.tsx
index 487d85218c3..8cddb981a5d 100644
--- a/packages/manager/src/features/PlacementGroups/PlacementGroupsDetail/PlacementGroupsDetail.tsx
+++ b/packages/manager/src/features/PlacementGroups/PlacementGroupsDetail/PlacementGroupsDetail.tsx
@@ -19,22 +19,27 @@ import {
 import { getErrorStringOrDefault } from 'src/utilities/errorUtils';
 
 import { getPlacementGroupLinodeCount } from '../utils';
+import { PlacementGroupsLinodes } from './PlacementGroupsLinodes/PlacementGroupsLinodes';
+import { PlacementGroupsSummary } from './PlacementGroupsSummary/PlacementGroupsSummary';
 
 export const PlacementGroupsDetail = () => {
   const flags = useFlags();
   const { id, tab } = useParams<{ id: string; tab?: string }>();
   const history = useHistory();
   const placementGroupId = Number(id);
+
   const {
     data: placementGroup,
     error: placementGroupError,
     isLoading,
   } = usePlacementGroupQuery(placementGroupId, Boolean(flags.vmPlacement));
+
   const {
     error: updatePlacementGroupError,
     mutateAsync: updatePlacementGroup,
     reset,
   } = useMutatePlacementGroup(placementGroupId);
+
   const errorText = getErrorStringOrDefault(updatePlacementGroupError ?? '');
 
   if (isLoading) {
@@ -103,13 +108,16 @@ export const PlacementGroupsDetail = () => {
       />
       <Tabs
         index={tabIndex === -1 ? 0 : tabIndex}
-        onChange={(i) => history.push(tabs[i].routeName)}
+        onChange={(i: number) => history.push(tabs[i].routeName)}
       >
         <TabLinkList tabs={tabs} />
-
         <TabPanels>
-          <SafeTabPanel index={0}>TODO VM_Placement: summary</SafeTabPanel>
-          <SafeTabPanel index={1}>TODO VM_Placement: linode list</SafeTabPanel>
+          <SafeTabPanel index={0}>
+            <PlacementGroupsSummary placementGroup={placementGroup} />
+          </SafeTabPanel>
+          <SafeTabPanel index={1}>
+            <PlacementGroupsLinodes placementGroup={placementGroup} />
+          </SafeTabPanel>
         </TabPanels>
       </Tabs>
     </>
diff --git a/packages/manager/src/features/PlacementGroups/PlacementGroupsDetail/PlacementGroupsLinodes/PlacementGroupsLinodes.test.tsx b/packages/manager/src/features/PlacementGroups/PlacementGroupsDetail/PlacementGroupsLinodes/PlacementGroupsLinodes.test.tsx
new file mode 100644
index 00000000000..dd6d063c000
--- /dev/null
+++ b/packages/manager/src/features/PlacementGroups/PlacementGroupsDetail/PlacementGroupsLinodes/PlacementGroupsLinodes.test.tsx
@@ -0,0 +1,32 @@
+import * as React from 'react';
+
+import { placementGroupFactory } from 'src/factories';
+import { renderWithTheme } from 'src/utilities/testHelpers';
+
+import { PLACEMENT_GROUP_LINODES_ERROR_MESSAGE } from '../../constants';
+import { PlacementGroupsLinodes } from './PlacementGroupsLinodes';
+
+describe('PlacementGroupsLinodes', () => {
+  it('renders an error state if placement groups are undefined', () => {
+    const { getByText } = renderWithTheme(
+      <PlacementGroupsLinodes placementGroup={undefined} />
+    );
+
+    expect(
+      getByText(PLACEMENT_GROUP_LINODES_ERROR_MESSAGE)
+    ).toBeInTheDocument();
+  });
+
+  it('features the linodes table, a filter field, a create button and a docs link', () => {
+    const placementGroup = placementGroupFactory.build({
+      linode_ids: [1],
+    });
+
+    const { getByPlaceholderText, getByRole } = renderWithTheme(
+      <PlacementGroupsLinodes placementGroup={placementGroup} />
+    );
+
+    expect(getByPlaceholderText('Search Linodes')).toBeInTheDocument();
+    expect(getByRole('table')).toBeInTheDocument();
+  });
+});
diff --git a/packages/manager/src/features/PlacementGroups/PlacementGroupsDetail/PlacementGroupsLinodes/PlacementGroupsLinodes.tsx b/packages/manager/src/features/PlacementGroups/PlacementGroupsDetail/PlacementGroupsLinodes/PlacementGroupsLinodes.tsx
new file mode 100644
index 00000000000..b5845d1942e
--- /dev/null
+++ b/packages/manager/src/features/PlacementGroups/PlacementGroupsDetail/PlacementGroupsLinodes/PlacementGroupsLinodes.tsx
@@ -0,0 +1,130 @@
+import { useMediaQuery } from '@mui/material';
+import { useTheme } from '@mui/material';
+import Grid from '@mui/material/Unstable_Grid2/Grid2';
+import * as React from 'react';
+import { useHistory } from 'react-router-dom';
+
+import { Box } from 'src/components/Box';
+import { Button } from 'src/components/Button/Button';
+import { DebouncedSearchTextField } from 'src/components/DebouncedSearchTextField';
+import { ErrorState } from 'src/components/ErrorState/ErrorState';
+import { Stack } from 'src/components/Stack';
+import { Typography } from 'src/components/Typography';
+import { usePlacementGroupData } from 'src/hooks/usePlacementGroupsData';
+
+import { PlacementGroupsAssignLinodesDrawer } from '../../PlacementGroupsAssignLinodesDrawer';
+import { PlacementGroupsUnassignModal } from '../../PlacementGroupsUnassignModal';
+import {
+  MAX_NUMBER_OF_LINODES_IN_PLACEMENT_GROUP_MESSAGE,
+  PLACEMENT_GROUP_LINODES_ERROR_MESSAGE,
+} from '../../constants';
+import { PlacementGroupsLinodesTable } from './PlacementGroupsLinodesTable';
+
+import type { Linode, PlacementGroup } from '@linode/api-v4';
+
+interface Props {
+  placementGroup: PlacementGroup | undefined;
+}
+
+export const PlacementGroupsLinodes = (props: Props) => {
+  const { placementGroup } = props;
+  const history = useHistory();
+  const {
+    assignedLinodes,
+    hasReachedCapacity,
+    isLoading,
+    linodesError,
+    region,
+  } = usePlacementGroupData({
+    placementGroup,
+  });
+  const theme = useTheme();
+  const matchesSmDown = useMediaQuery(theme.breakpoints.down('md'));
+  const [searchText, setSearchText] = React.useState('');
+
+  if (!placementGroup) {
+    return <ErrorState errorText={PLACEMENT_GROUP_LINODES_ERROR_MESSAGE} />;
+  }
+
+  const getLinodesList = () => {
+    if (!assignedLinodes) {
+      return [];
+    }
+
+    if (searchText) {
+      return assignedLinodes.filter((linode: Linode) => {
+        return linode.label.toLowerCase().includes(searchText.toLowerCase());
+      });
+    }
+
+    return assignedLinodes;
+  };
+
+  const handleOpenAssignLinodesDrawer = () => {
+    history.replace(`/placement-groups/${placementGroup.id}/linodes/assign`);
+  };
+  const handleCloseDrawer = () => {
+    history.replace(`/placement-groups/${placementGroup.id}/linodes`);
+  };
+  const isAssignLinodesDrawerOpen = history.location.pathname.includes(
+    '/assign'
+  );
+  const isUnassignLinodesDrawerOpen = history.location.pathname.includes(
+    '/unassign'
+  );
+
+  return (
+    <Stack spacing={2}>
+      <Box sx={{ px: matchesSmDown ? 2 : 0, py: 2 }}>
+        <Typography>
+          The following Linodes have been assigned to this Placement Group. A
+          Linode can only be assigned to a single Placement Group.
+        </Typography>
+        <Typography sx={{ mt: 1 }}>
+          Limit of Linodes for this Placement Group:{' '}
+          {region?.maximum_vms_per_pg}
+        </Typography>
+      </Box>
+
+      <Grid container justifyContent="space-between">
+        <Grid flexGrow={1} sm={6} sx={{ mb: 1 }} xs={12}>
+          <DebouncedSearchTextField
+            onSearch={(value) => {
+              setSearchText(value);
+            }}
+            debounceTime={250}
+            hideLabel
+            label="Search Linodes"
+            placeholder="Search Linodes"
+            value={searchText}
+          />
+        </Grid>
+        <Grid>
+          <Button
+            buttonType="primary"
+            data-testid="add-linode-to-placement-group-button"
+            disabled={hasReachedCapacity}
+            onClick={handleOpenAssignLinodesDrawer}
+            tooltipText={MAX_NUMBER_OF_LINODES_IN_PLACEMENT_GROUP_MESSAGE}
+          >
+            Add Linode to Placement Group
+          </Button>
+        </Grid>
+      </Grid>
+      <PlacementGroupsLinodesTable
+        error={linodesError ?? []}
+        linodes={getLinodesList() ?? []}
+        loading={isLoading}
+      />
+      <PlacementGroupsAssignLinodesDrawer
+        onClose={handleCloseDrawer}
+        open={isAssignLinodesDrawerOpen}
+        selectedPlacementGroup={placementGroup}
+      />
+      <PlacementGroupsUnassignModal
+        onClose={handleCloseDrawer}
+        open={isUnassignLinodesDrawerOpen}
+      />
+    </Stack>
+  );
+};
diff --git a/packages/manager/src/features/PlacementGroups/PlacementGroupsDetail/PlacementGroupsLinodes/PlacementGroupsLinodesTable.test.tsx b/packages/manager/src/features/PlacementGroups/PlacementGroupsDetail/PlacementGroupsLinodes/PlacementGroupsLinodesTable.test.tsx
new file mode 100644
index 00000000000..2283a7fa634
--- /dev/null
+++ b/packages/manager/src/features/PlacementGroups/PlacementGroupsDetail/PlacementGroupsLinodes/PlacementGroupsLinodesTable.test.tsx
@@ -0,0 +1,49 @@
+import * as React from 'react';
+
+import { linodeFactory } from 'src/factories';
+import { renderWithTheme } from 'src/utilities/testHelpers';
+
+import { PlacementGroupsLinodesTable } from './PlacementGroupsLinodesTable';
+
+const defaultProps = {
+  error: [],
+  linodes: linodeFactory.buildList(5),
+  loading: false,
+};
+
+describe('PlacementGroupsLinodesTable', () => {
+  it('renders an error state when encountering an API error', () => {
+    const { getByText } = renderWithTheme(
+      <PlacementGroupsLinodesTable
+        {...defaultProps}
+        error={[{ reason: 'Not found' }]}
+      />
+    );
+
+    expect(getByText(/not found/i)).toBeInTheDocument();
+  });
+
+  it('renders a loading skeleton based on the loading prop', () => {
+    const { getByTestId } = renderWithTheme(
+      <PlacementGroupsLinodesTable {...defaultProps} loading />
+    );
+
+    expect(getByTestId('table-row-loading')).toBeInTheDocument();
+  });
+
+  it('should have the correct number of columns', () => {
+    const { getAllByRole } = renderWithTheme(
+      <PlacementGroupsLinodesTable {...defaultProps} />
+    );
+
+    expect(getAllByRole('columnheader')).toHaveLength(3);
+  });
+
+  it('should have the correct number of rows', () => {
+    const { getAllByTestId } = renderWithTheme(
+      <PlacementGroupsLinodesTable {...defaultProps} />
+    );
+
+    expect(getAllByTestId(/placement-group-linode-/i)).toHaveLength(5);
+  });
+});
diff --git a/packages/manager/src/features/PlacementGroups/PlacementGroupsDetail/PlacementGroupsLinodes/PlacementGroupsLinodesTable.tsx b/packages/manager/src/features/PlacementGroups/PlacementGroupsDetail/PlacementGroupsLinodes/PlacementGroupsLinodesTable.tsx
new file mode 100644
index 00000000000..19328b46608
--- /dev/null
+++ b/packages/manager/src/features/PlacementGroups/PlacementGroupsDetail/PlacementGroupsLinodes/PlacementGroupsLinodesTable.tsx
@@ -0,0 +1,106 @@
+import * as React from 'react';
+
+import OrderBy from 'src/components/OrderBy';
+import Paginate from 'src/components/Paginate';
+import { PaginationFooter } from 'src/components/PaginationFooter/PaginationFooter';
+import { Table } from 'src/components/Table';
+import { TableBody } from 'src/components/TableBody';
+import { TableCell } from 'src/components/TableCell';
+import { TableContentWrapper } from 'src/components/TableContentWrapper/TableContentWrapper';
+import { TableHead } from 'src/components/TableHead';
+import { TableRow } from 'src/components/TableRow';
+import { TableSortCell } from 'src/components/TableSortCell';
+import { getAPIErrorOrDefault } from 'src/utilities/errorUtils';
+
+import { PLACEMENT_GROUP_LINODES_ERROR_MESSAGE } from '../../constants';
+import { PlacementGroupsLinodesTableRow } from './PlacementGroupsLinodesTableRow';
+
+import type { APIError, Linode } from '@linode/api-v4';
+
+export interface Props {
+  error?: APIError[];
+  linodes: Linode[];
+  loading: boolean;
+}
+
+export const PlacementGroupsLinodesTable = React.memo((props: Props) => {
+  const { error, linodes, loading } = props;
+
+  const orderLinodeKey = 'label';
+  const orderStatusKey = 'status';
+
+  const _error = error
+    ? getAPIErrorOrDefault(error, PLACEMENT_GROUP_LINODES_ERROR_MESSAGE)
+    : undefined;
+
+  return (
+    <OrderBy data={linodes} order="asc" orderBy={orderLinodeKey}>
+      {({ data: orderedData, handleOrderChange, order, orderBy }) => (
+        <Paginate data={orderedData}>
+          {({
+            count,
+            data: paginatedAndOrderedLinodes,
+            handlePageChange,
+            handlePageSizeChange,
+            page,
+            pageSize,
+          }) => (
+            <>
+              <Table aria-label="List of Linodes in this Placement Group">
+                <TableHead>
+                  <TableRow>
+                    <TableSortCell
+                      active={orderBy === orderLinodeKey}
+                      data-qa-placement-group-linode-header
+                      direction={order}
+                      handleClick={handleOrderChange}
+                      label={orderLinodeKey}
+                      sx={{ width: '30%' }}
+                    >
+                      Linode
+                    </TableSortCell>
+                    <TableSortCell
+                      active={orderBy === orderStatusKey}
+                      data-qa-placement-group-linode-status-header
+                      direction={order}
+                      handleClick={handleOrderChange}
+                      label={orderStatusKey}
+                    >
+                      Linode Status
+                    </TableSortCell>
+                    <TableCell />
+                  </TableRow>
+                </TableHead>
+                <TableBody>
+                  <TableContentWrapper
+                    loadingProps={{
+                      columns: 3,
+                    }}
+                    error={_error}
+                    length={paginatedAndOrderedLinodes.length}
+                    loading={loading}
+                  >
+                    {paginatedAndOrderedLinodes.map((linode) => (
+                      <PlacementGroupsLinodesTableRow
+                        key={`placement-group-linode-${linode.id}`}
+                        linode={linode}
+                      />
+                    ))}
+                  </TableContentWrapper>
+                </TableBody>
+              </Table>
+              <PaginationFooter
+                count={count}
+                eventCategory="Placement Group Linodes Table"
+                handlePageChange={handlePageChange}
+                handleSizeChange={handlePageSizeChange}
+                page={page}
+                pageSize={pageSize}
+              />
+            </>
+          )}
+        </Paginate>
+      )}
+    </OrderBy>
+  );
+});
diff --git a/packages/manager/src/features/PlacementGroups/PlacementGroupsDetail/PlacementGroupsLinodes/PlacementGroupsLinodesTableRow.test.tsx b/packages/manager/src/features/PlacementGroups/PlacementGroupsDetail/PlacementGroupsLinodes/PlacementGroupsLinodesTableRow.test.tsx
new file mode 100644
index 00000000000..c99d19c876d
--- /dev/null
+++ b/packages/manager/src/features/PlacementGroups/PlacementGroupsDetail/PlacementGroupsLinodes/PlacementGroupsLinodesTableRow.test.tsx
@@ -0,0 +1,26 @@
+import * as React from 'react';
+
+import { linodeFactory } from 'src/factories';
+import { wrapWithTableBody } from 'src/utilities/testHelpers';
+import { renderWithTheme } from 'src/utilities/testHelpers';
+
+import { PlacementGroupsLinodesTableRow } from './PlacementGroupsLinodesTableRow';
+
+const defaultProps = {
+  linode: linodeFactory.build({
+    label: 'my-linode',
+    status: 'running',
+  }),
+};
+
+describe('PlacementGroupsLinodesTableRow', () => {
+  it('should feature the right table row data', () => {
+    const { getAllByRole } = renderWithTheme(
+      wrapWithTableBody(<PlacementGroupsLinodesTableRow {...defaultProps} />)
+    );
+
+    expect(getAllByRole('cell')[0]).toHaveTextContent('my-linode');
+    expect(getAllByRole('cell')[1]).toHaveTextContent('Running');
+    expect(getAllByRole('cell')[2]).toHaveTextContent('Unassign');
+  });
+});
diff --git a/packages/manager/src/features/PlacementGroups/PlacementGroupsDetail/PlacementGroupsLinodes/PlacementGroupsLinodesTableRow.tsx b/packages/manager/src/features/PlacementGroups/PlacementGroupsDetail/PlacementGroupsLinodes/PlacementGroupsLinodesTableRow.tsx
new file mode 100644
index 00000000000..1ec4768458f
--- /dev/null
+++ b/packages/manager/src/features/PlacementGroups/PlacementGroupsDetail/PlacementGroupsLinodes/PlacementGroupsLinodesTableRow.tsx
@@ -0,0 +1,54 @@
+import * as React from 'react';
+import { useHistory, useParams } from 'react-router-dom';
+
+import { InlineMenuAction } from 'src/components/InlineMenuAction/InlineMenuAction';
+import { Link } from 'src/components/Link';
+import { StatusIcon } from 'src/components/StatusIcon/StatusIcon';
+import { TableCell } from 'src/components/TableCell';
+import { TableRow } from 'src/components/TableRow';
+import { getLinodeIconStatus } from 'src/features/Linodes/LinodesLanding/utils';
+import { capitalizeAllWords } from 'src/utilities/capitalize';
+
+import type { Linode } from '@linode/api-v4';
+
+interface Props {
+  linode: Linode;
+}
+
+export const PlacementGroupsLinodesTableRow = React.memo((props: Props) => {
+  const { linode } = props;
+  const { label, status } = linode;
+  const history = useHistory();
+  const { id: placementGroupId } = useParams<{ id: string }>();
+  const iconStatus = getLinodeIconStatus(status);
+
+  const handleOpenUnassignLinodeModal = () => {
+    history.push(
+      `/placement-groups/${placementGroupId}/linodes/unassign/${linode.id}`
+    );
+  };
+
+  return (
+    <TableRow
+      ariaLabel={`Linode ${label}`}
+      data-testid={`placement-group-linode-${linode.id}`}
+    >
+      <TableCell>
+        <Link to={`/linodes/${linode.id}`}>{label}</Link>
+      </TableCell>
+      <TableCell statusCell>
+        <StatusIcon
+          aria-label={`Linode status ${status ?? iconStatus}`}
+          status={iconStatus}
+        />
+        {capitalizeAllWords(linode.status.replace('_', ' '))}
+      </TableCell>
+      <TableCell actionCell>
+        <InlineMenuAction
+          actionText="Unassign"
+          onClick={handleOpenUnassignLinodeModal}
+        />
+      </TableCell>
+    </TableRow>
+  );
+});
diff --git a/packages/manager/src/features/PlacementGroups/PlacementGroupsDetail/PlacementGroupsSummary/PlacementGroupsSummary.test.tsx b/packages/manager/src/features/PlacementGroups/PlacementGroupsDetail/PlacementGroupsSummary/PlacementGroupsSummary.test.tsx
new file mode 100644
index 00000000000..03d6a4e6f8e
--- /dev/null
+++ b/packages/manager/src/features/PlacementGroups/PlacementGroupsDetail/PlacementGroupsSummary/PlacementGroupsSummary.test.tsx
@@ -0,0 +1,29 @@
+import * as React from 'react';
+
+import { placementGroupFactory } from 'src/factories';
+import { renderWithTheme } from 'src/utilities/testHelpers';
+
+import { PlacementGroupsSummary } from './PlacementGroupsSummary';
+
+describe('PlacementGroups Summary', () => {
+  it('renders the placement group detail summary panel', () => {
+    const { getByTestId, getByText } = renderWithTheme(
+      <PlacementGroupsSummary
+        placementGroup={placementGroupFactory.build({
+          affinity_type: 'affinity',
+          id: 3,
+          is_compliant: true,
+          label: 'pg-3',
+          linode_ids: [2, 4, 6, 8, 10],
+          region: 'us-east',
+        })}
+      />
+    );
+
+    expect(getByText('Placement Group Configuration')).toBeInTheDocument();
+    expect(getByText('Linodes')).toBeInTheDocument();
+    expect(getByTestId('HelpOutlineIcon')).toBeInTheDocument();
+    expect(getByText('Affinity Type')).toBeInTheDocument();
+    expect(getByText('Region')).toBeInTheDocument();
+  });
+});
diff --git a/packages/manager/src/features/PlacementGroups/PlacementGroupsDetail/PlacementGroupsSummary/PlacementGroupsSummary.tsx b/packages/manager/src/features/PlacementGroups/PlacementGroupsDetail/PlacementGroupsSummary/PlacementGroupsSummary.tsx
new file mode 100644
index 00000000000..8e8bcef2557
--- /dev/null
+++ b/packages/manager/src/features/PlacementGroups/PlacementGroupsDetail/PlacementGroupsSummary/PlacementGroupsSummary.tsx
@@ -0,0 +1,102 @@
+import { AFFINITY_TYPES } from '@linode/api-v4';
+import { useTheme } from '@mui/material';
+import Grid from '@mui/material/Unstable_Grid2';
+import { styled } from '@mui/material/styles';
+import * as React from 'react';
+
+import { Box } from 'src/components/Box';
+import { Link } from 'src/components/Link';
+import { Notice } from 'src/components/Notice/Notice';
+import { Paper } from 'src/components/Paper';
+import { TooltipIcon } from 'src/components/TooltipIcon';
+import { Typography } from 'src/components/Typography';
+import { usePlacementGroupData } from 'src/hooks/usePlacementGroupsData';
+
+import { PLACEMENT_GROUP_TOOLTIP_TEXT } from '../../constants';
+
+import type { PlacementGroup } from '@linode/api-v4';
+
+interface Props {
+  placementGroup: PlacementGroup;
+}
+
+export const PlacementGroupsSummary = (props: Props) => {
+  const { placementGroup } = props;
+  const theme = useTheme();
+  const { linodesCount, region } = usePlacementGroupData({
+    placementGroup,
+  });
+
+  return (
+    <>
+      {!placementGroup.is_compliant && (
+        <Notice spacingBottom={20} spacingTop={24} variant="warning">
+          <Typography fontFamily={theme.font.bold}>
+            {`Placement Group ${placementGroup.label} (${
+              AFFINITY_TYPES[placementGroup.affinity_type]
+            }) is non-compliant.
+          We are working to resolve compliance issues so that you can continue assigning Linodes to this Placement Group. `}
+            {/* TODO VM_Placement: Get link location */}
+            <Link
+              className="secondaryLink"
+              data-testid="pg-non-compliant-notice-link"
+              to={'#'}
+            >
+              Learn more
+            </Link>
+            .
+          </Typography>
+        </Notice>
+      )}
+      <Paper>
+        <Typography
+          sx={(theme) => ({ marginBottom: theme.spacing(3) })}
+          variant="h3"
+        >
+          Placement Group Configuration
+        </Typography>
+        <Grid container spacing={1}>
+          <Grid md={8} sm={12}>
+            <Box display="flex">
+              <StyledLabel>Linodes</StyledLabel>
+              <Typography sx={{ mx: 8 }}>
+                {`${linodesCount} of ${region?.maximum_vms_per_pg}`}
+                <TooltipIcon
+                  sxTooltipIcon={{
+                    marginLeft: '10px',
+                    padding: 0,
+                  }}
+                  status="help"
+                  text={PLACEMENT_GROUP_TOOLTIP_TEXT}
+                  tooltipPosition="right"
+                />
+              </Typography>
+            </Box>
+          </Grid>
+          <Grid md={8} sm={12}>
+            <Box display="flex">
+              <StyledLabel>Affinity Type</StyledLabel>
+              <Typography sx={{ mx: 8 }}>
+                {AFFINITY_TYPES[placementGroup?.affinity_type]}
+              </Typography>
+            </Box>
+          </Grid>
+          <Grid md={8} sm={12}>
+            <Box display="flex">
+              <StyledLabel>Region</StyledLabel>
+              <Typography sx={{ mx: 8 }}>{region?.label}</Typography>
+            </Box>
+          </Grid>
+        </Grid>
+      </Paper>
+    </>
+  );
+};
+
+export const StyledLabel = styled(Typography, {
+  label: 'StyledLabel',
+})(({ theme }) => ({
+  fontFamily: theme.font.bold,
+  marginRight: theme.spacing(8),
+  width: theme.spacing(10),
+}));
diff --git a/packages/manager/src/features/PlacementGroups/PlacementGroupsDrawerContent.tsx b/packages/manager/src/features/PlacementGroups/PlacementGroupsDrawerContent.tsx
index 2e5109282f8..f7e11486eca 100644
--- a/packages/manager/src/features/PlacementGroups/PlacementGroupsDrawerContent.tsx
+++ b/packages/manager/src/features/PlacementGroups/PlacementGroupsDrawerContent.tsx
@@ -8,6 +8,7 @@ import { RegionSelect } from 'src/components/RegionSelect/RegionSelect';
 import { Stack } from 'src/components/Stack';
 import { TextField } from 'src/components/TextField';
 
+import { MAX_NUMBER_OF_LINODES_IN_PLACEMENT_GROUP_MESSAGE } from './constants';
 import { affinityTypeOptions } from './utils';
 
 import type { PlacementGroupDrawerFormikProps } from './types';
@@ -122,8 +123,7 @@ export const PlacementGroupsDrawerContent = (props: Props) => {
                   : false,
               label: `${isRenameDrawer ? 'Rename' : 'Create'} Placement Group`,
               loading: isSubmitting,
-              tooltipText:
-                'You have reached the maximum amount of Placement Groups.',
+              tooltipText: MAX_NUMBER_OF_LINODES_IN_PLACEMENT_GROUP_MESSAGE,
               type: 'submit',
             }}
             secondaryButtonProps={{
diff --git a/packages/manager/src/features/PlacementGroups/PlacementGroupsLanding/PlacementGroupsLanding.tsx b/packages/manager/src/features/PlacementGroups/PlacementGroupsLanding/PlacementGroupsLanding.tsx
index 3cdfea37067..df3e582ed2e 100644
--- a/packages/manager/src/features/PlacementGroups/PlacementGroupsLanding/PlacementGroupsLanding.tsx
+++ b/packages/manager/src/features/PlacementGroups/PlacementGroupsLanding/PlacementGroupsLanding.tsx
@@ -16,7 +16,6 @@ import { TableHead } from 'src/components/TableHead';
 import { TableRow } from 'src/components/TableRow';
 import { TableSortCell } from 'src/components/TableSortCell/TableSortCell';
 import { TextField } from 'src/components/TextField';
-import { Typography } from 'src/components/Typography';
 import { useOrder } from 'src/hooks/useOrder';
 import { usePagination } from 'src/hooks/usePagination';
 import { usePlacementGroupsQuery } from 'src/queries/placementGroups';
@@ -24,7 +23,6 @@ import { getAPIErrorOrDefault } from 'src/utilities/errorUtils';
 
 import { PlacementGroupsCreateDrawer } from '../PlacementGroupsCreateDrawer';
 import { PlacementGroupsRenameDrawer } from '../PlacementGroupsRenameDrawer';
-import { MAX_NUMBER_OF_PLACEMENT_GROUPS } from '../constants';
 import { PlacementGroupsLandingEmptyState } from './PlacementGroupsLandingEmptyState';
 import { PlacementGroupsRow } from './PlacementGroupsRow';
 
@@ -120,22 +118,12 @@ export const PlacementGroupsLanding = React.memo(() => {
   return (
     <>
       <LandingHeader
-        buttonDataAttrs={{
-          disabled:
-            (placementGroups?.results &&
-              placementGroups?.results >= MAX_NUMBER_OF_PLACEMENT_GROUPS) ||
-            false,
-        }}
         breadcrumbProps={{ pathname: '/placement-groups' }}
         docsLink={'TODO VM_Placement: add doc link'}
         entity="Placement Group"
         onButtonClick={handleCreatePlacementGroup}
         title="Placement Groups"
       />
-      <Typography sx={{ mb: 4, mt: 2 }}>
-        The maximum amount of Placement Groups is{' '}
-        {MAX_NUMBER_OF_PLACEMENT_GROUPS} per account.
-      </Typography>
       <TextField
         InputProps={{
           endAdornment: query && (
@@ -166,6 +154,7 @@ export const PlacementGroupsLanding = React.memo(() => {
               direction={order}
               handleClick={handleOrderChange}
               label="label"
+              sx={{ width: '40%' }}
             >
               Label
             </TableSortCell>
@@ -180,7 +169,7 @@ export const PlacementGroupsLanding = React.memo(() => {
                 Region
               </TableSortCell>
             </Hidden>
-            <TableCell></TableCell>
+            <TableCell />
           </TableRow>
         </TableHead>
         <TableBody>
diff --git a/packages/manager/src/features/PlacementGroups/PlacementGroupsLanding/PlacementGroupsRow.test.tsx b/packages/manager/src/features/PlacementGroups/PlacementGroupsLanding/PlacementGroupsRow.test.tsx
index 42fdf90f7c4..ba83d5c302d 100644
--- a/packages/manager/src/features/PlacementGroups/PlacementGroupsLanding/PlacementGroupsRow.test.tsx
+++ b/packages/manager/src/features/PlacementGroups/PlacementGroupsLanding/PlacementGroupsRow.test.tsx
@@ -70,7 +70,7 @@ describe('PlacementGroupsLanding', () => {
         <PlacementGroupsRow
           placementGroup={placementGroupFactory.build({
             affinity_type: 'anti_affinity',
-            compliant: false,
+            is_compliant: false,
             label: 'group 1',
             linode_ids: [1],
             region: 'us-east',
diff --git a/packages/manager/src/features/PlacementGroups/PlacementGroupsLanding/PlacementGroupsRow.tsx b/packages/manager/src/features/PlacementGroups/PlacementGroupsLanding/PlacementGroupsRow.tsx
index 162dde54bcf..d8bc510db5a 100644
--- a/packages/manager/src/features/PlacementGroups/PlacementGroupsLanding/PlacementGroupsRow.tsx
+++ b/packages/manager/src/features/PlacementGroups/PlacementGroupsLanding/PlacementGroupsRow.tsx
@@ -10,10 +10,8 @@ import { TableCell } from 'src/components/TableCell';
 import { TableRow } from 'src/components/TableRow';
 import { TextTooltip } from 'src/components/TextTooltip';
 import { Typography } from 'src/components/Typography';
-import { useLinodesQuery } from 'src/queries/linodes/linodes';
-import { useRegionsQuery } from 'src/queries/regions';
+import { usePlacementGroupData } from 'src/hooks/usePlacementGroupsData';
 
-import { getPlacementGroupLinodeCount } from '../utils';
 import { StyledWarningIcon } from './PlacementGroupsRow.styles';
 
 import type { PlacementGroup } from '@linode/api-v4';
@@ -31,23 +29,10 @@ export const PlacementGroupsRow = React.memo(
     handleRenamePlacementGroup,
     placementGroup,
   }: PlacementGroupsRowProps) => {
-    const {
-      affinity_type,
-      capacity,
-      compliant,
-      id,
-      label,
-      linode_ids,
-    } = placementGroup;
-    const { data: regions } = useRegionsQuery();
-    const { data: linodes } = useLinodesQuery();
-    const regionLabel =
-      regions?.find((region) => region.id === placementGroup.region)?.label ??
-      placementGroup.region;
-    const linodeCount = getPlacementGroupLinodeCount(placementGroup);
-    const listOfAssignedLinodes = linodes?.data.filter((linode) =>
-      linode_ids.includes(linode.id)
-    );
+    const { affinity_type, id, is_compliant, label } = placementGroup;
+    const { assignedLinodes, linodesCount, region } = usePlacementGroupData({
+      placementGroup,
+    });
     const actions: Action[] = [
       {
         onClick: handleRenamePlacementGroup,
@@ -72,7 +57,7 @@ export const PlacementGroupsRow = React.memo(
           >
             {label} ({AFFINITY_TYPES[affinity_type]})
           </Link>
-          {!compliant && (
+          {!is_compliant && (
             <Typography component="span" sx={{ whiteSpace: 'nowrap' }}>
               <StyledWarningIcon />
               Non-compliant
@@ -83,18 +68,18 @@ export const PlacementGroupsRow = React.memo(
           <TextTooltip
             tooltipText={
               <List>
-                {listOfAssignedLinodes?.map((linode, idx) => (
+                {assignedLinodes?.map((linode, idx) => (
                   <ListItem key={`pg-linode-${idx}`}>{linode.label}</ListItem>
                 ))}
               </List>
             }
-            displayText={`${linodeCount}`}
+            displayText={`${linodesCount}`}
             minWidth={200}
           />
-          &nbsp; of {capacity}
+          &nbsp; of {region?.maximum_vms_per_pg}
         </TableCell>
         <Hidden smDown>
-          <TableCell>{regionLabel}</TableCell>
+          <TableCell>{region?.label}</TableCell>
         </Hidden>
         <TableCell actionCell>
           {actions.map((action) => (
diff --git a/packages/manager/src/features/PlacementGroups/PlacementGroupsRenameDrawer.tsx b/packages/manager/src/features/PlacementGroups/PlacementGroupsRenameDrawer.tsx
index 3e3bd7a606f..72dd8d96668 100644
--- a/packages/manager/src/features/PlacementGroups/PlacementGroupsRenameDrawer.tsx
+++ b/packages/manager/src/features/PlacementGroups/PlacementGroupsRenameDrawer.tsx
@@ -59,6 +59,7 @@ export const PlacementGroupsRenameDrawer = (
       affinity_type: selectedPlacementGroup?.affinity_type as PlacementGroupDrawerFormikProps['affinity_type'],
       label: selectedPlacementGroup?.label ?? '',
       region: selectedPlacementGroup?.region ?? '',
+      strict: true,
     },
     onSubmit(values, { setErrors, setStatus, setSubmitting }) {
       setHasFormBeenSubmitted(false);
diff --git a/packages/manager/src/features/PlacementGroups/PlacementGroupsUnassignModal.test.tsx b/packages/manager/src/features/PlacementGroups/PlacementGroupsUnassignModal.test.tsx
new file mode 100644
index 00000000000..0e55362db0e
--- /dev/null
+++ b/packages/manager/src/features/PlacementGroups/PlacementGroupsUnassignModal.test.tsx
@@ -0,0 +1,50 @@
+import * as React from 'react';
+
+import { linodeFactory } from 'src/factories';
+import { renderWithTheme } from 'src/utilities/testHelpers';
+
+import { PlacementGroupsUnassignModal } from './PlacementGroupsUnassignModal';
+
+const queryMocks = vi.hoisted(() => ({
+  useLinodeQuery: vi.fn().mockReturnValue({}),
+  useParams: vi.fn().mockReturnValue({}),
+}));
+
+vi.mock('react-router-dom', async () => {
+  const actual = await vi.importActual('react-router-dom');
+  return {
+    ...actual,
+    useParams: queryMocks.useParams,
+  };
+});
+
+vi.mock('src/queries/linodes/linodes', async () => {
+  const actual = await vi.importActual('src/queries/linodes/linodes');
+  return {
+    ...actual,
+    useLinodeQuery: queryMocks.useLinodeQuery,
+  };
+});
+
+describe('PlacementGroupsUnassignModal', () => {
+  it('should render and have the proper content and CTAs', () => {
+    queryMocks.useLinodeQuery.mockReturnValue({
+      data: linodeFactory.build({
+        id: 1,
+        label: 'test-linode',
+      }),
+    });
+    queryMocks.useParams.mockReturnValue({
+      id: '1',
+      linodeId: '1',
+    });
+
+    const { getByLabelText, getByRole } = renderWithTheme(
+      <PlacementGroupsUnassignModal onClose={() => null} open />
+    );
+
+    getByLabelText('Unassign test-linode');
+    getByRole('button', { name: 'Unassign' });
+    getByRole('button', { name: 'Cancel' });
+  });
+});
diff --git a/packages/manager/src/features/PlacementGroups/PlacementGroupsUnassignModal.tsx b/packages/manager/src/features/PlacementGroups/PlacementGroupsUnassignModal.tsx
new file mode 100644
index 00000000000..9f6093f7cc5
--- /dev/null
+++ b/packages/manager/src/features/PlacementGroups/PlacementGroupsUnassignModal.tsx
@@ -0,0 +1,75 @@
+import * as React from 'react';
+import { useParams } from 'react-router-dom';
+
+import { ActionsPanel } from 'src/components/ActionsPanel/ActionsPanel';
+import { ConfirmationDialog } from 'src/components/ConfirmationDialog/ConfirmationDialog';
+import { Notice } from 'src/components/Notice/Notice';
+import { Typography } from 'src/components/Typography';
+import { useLinodeQuery } from 'src/queries/linodes/linodes';
+import { useUnassignLinodesFromPlacementGroup } from 'src/queries/placementGroups';
+
+import type { UnassignLinodesFromPlacementGroupPayload } from '@linode/api-v4';
+
+interface Props {
+  onClose: () => void;
+  open: boolean;
+}
+
+export const PlacementGroupsUnassignModal = (props: Props) => {
+  const { onClose, open } = props;
+  const { id: placementGroupId, linodeId } = useParams<{
+    id: string;
+    linodeId: string;
+  }>();
+  const {
+    error,
+    isLoading,
+    mutateAsync: unassignLinodes,
+  } = useUnassignLinodesFromPlacementGroup(Number(placementGroupId) ?? -1);
+  const { data: selectedLinode } = useLinodeQuery(Number(linodeId) ?? -1);
+
+  const payload: UnassignLinodesFromPlacementGroupPayload = {
+    linodes: [Number(linodeId) ?? -1],
+  };
+
+  const onUnassign = async () => {
+    await unassignLinodes(payload);
+    onClose();
+  };
+
+  const actions = (
+    <ActionsPanel
+      primaryButtonProps={{
+        disabled: isLoading,
+        label: 'Unassign',
+        loading: isLoading,
+        onClick: onUnassign,
+      }}
+      secondaryButtonProps={{
+        'data-testid': 'cancel',
+        label: 'Cancel',
+        onClick: onClose,
+      }}
+    />
+  );
+
+  return (
+    <ConfirmationDialog
+      title={
+        selectedLinode?.label ? `Unassign ${selectedLinode.label}` : 'Unassign'
+      }
+      actions={actions}
+      error={error?.[0]?.reason}
+      onClose={onClose}
+      open={open}
+    >
+      {!selectedLinode && (
+        <Notice
+          text="There was a problem retrieving this linode"
+          variant="error"
+        />
+      )}
+      <Typography>Are you sure you want to remove this Linode?</Typography>
+    </ConfirmationDialog>
+  );
+};
diff --git a/packages/manager/src/features/PlacementGroups/constants.ts b/packages/manager/src/features/PlacementGroups/constants.ts
index ce8bc275987..f82c19f0b92 100644
--- a/packages/manager/src/features/PlacementGroups/constants.ts
+++ b/packages/manager/src/features/PlacementGroups/constants.ts
@@ -2,3 +2,11 @@
 export const PLACEMENT_GROUP_LABEL = 'Placement Groups';
 
 export const MAX_NUMBER_OF_PLACEMENT_GROUPS = 5;
+
+export const MAX_NUMBER_OF_LINODES_IN_PLACEMENT_GROUP_MESSAGE =
+  "You've reached the maximum number of Linodes in a Placement Group. Please remove a Linode from this Placement Group before adding another.";
+
+export const PLACEMENT_GROUP_LINODES_ERROR_MESSAGE =
+  'There was an error loading Linodes for this Placement Group.';
+
+export const PLACEMENT_GROUP_TOOLTIP_TEXT = `The Affinity Type and Region determine the maximum number of VMs per group.`;
diff --git a/packages/manager/src/features/PlacementGroups/index.tsx b/packages/manager/src/features/PlacementGroups/index.tsx
index 25c99886c2c..5a94d394c1c 100644
--- a/packages/manager/src/features/PlacementGroups/index.tsx
+++ b/packages/manager/src/features/PlacementGroups/index.tsx
@@ -36,6 +36,10 @@ export const PlacementGroups = () => {
             exact
             path={`${path}/rename/:id`}
           />
+          <Route
+            component={PlacementGroupsDetail}
+            path={`${path}/:id/:tab?/unassign/:linodeId?`}
+          />
           <Route component={PlacementGroupsDetail} path={`${path}/:id/:tab?`} />
           <Route component={PlacementGroupsLanding} />
         </Switch>
diff --git a/packages/manager/src/features/PlacementGroups/types.ts b/packages/manager/src/features/PlacementGroups/types.ts
index eeeccfa9611..c23c6be27ab 100644
--- a/packages/manager/src/features/PlacementGroups/types.ts
+++ b/packages/manager/src/features/PlacementGroups/types.ts
@@ -5,7 +5,7 @@ import {
 } from '@linode/api-v4';
 
 export type PlacementGroupsDrawerPropsBase = {
-  numberOfPlacementGroupsCreated: number;
+  numberOfPlacementGroupsCreated?: number;
   onClose: () => void;
   open: boolean;
 };
@@ -22,3 +22,8 @@ export type PlacementGroupsRenameDrawerProps = PlacementGroupsDrawerPropsBase &
 
 export type PlacementGroupDrawerFormikProps = RenamePlacementGroupPayload &
   CreatePlacementGroupPayload;
+
+export type PlacementGroupsAssignLinodesDrawerProps = PlacementGroupsDrawerPropsBase & {
+  onLinodeAddedToPlacementGroup?: (placementGroup: PlacementGroup) => void;
+  selectedPlacementGroup: PlacementGroup | undefined;
+};
diff --git a/packages/manager/src/features/PlacementGroups/utils.test.ts b/packages/manager/src/features/PlacementGroups/utils.test.ts
index 0042fc2bc61..0600821731b 100644
--- a/packages/manager/src/features/PlacementGroups/utils.test.ts
+++ b/packages/manager/src/features/PlacementGroups/utils.test.ts
@@ -1,11 +1,20 @@
-import { affinityTypeOptions, getPlacementGroupLinodeCount } from './utils';
+import { placementGroupFactory, regionFactory } from 'src/factories';
+
+import {
+  affinityTypeOptions,
+  getLinodesFromAllPlacementGroups,
+  getPlacementGroupLinodeCount,
+  hasPlacementGroupReachedCapacity,
+} from './utils';
+
+import type { PlacementGroup } from '@linode/api-v4';
 
 describe('getPlacementGroupLinodeCount', () => {
   it('returns the length of the linode_ids array', () => {
     expect(
       getPlacementGroupLinodeCount({
         linode_ids: [1, 2, 3],
-      } as any)
+      } as PlacementGroup)
     ).toBe(3);
   });
 });
@@ -22,3 +31,46 @@ describe('affinityTypeOptions', () => {
     );
   });
 });
+
+describe('hasPlacementGroupReachedCapacity', () => {
+  it('returns true if the linode_ids array is equal to or greater than the capacity', () => {
+    expect(
+      hasPlacementGroupReachedCapacity({
+        placementGroup: placementGroupFactory.build({
+          linode_ids: [1, 2, 3],
+        }),
+        region: regionFactory.build({
+          maximum_vms_per_pg: 3,
+        }),
+      })
+    ).toBe(true);
+  });
+
+  it('returns false if the linode_ids array is less than the capacity', () => {
+    expect(
+      hasPlacementGroupReachedCapacity({
+        placementGroup: placementGroupFactory.build({
+          linode_ids: [1, 2, 3],
+        }),
+        region: regionFactory.build({
+          maximum_vms_per_pg: 4,
+        }),
+      })
+    ).toBe(false);
+  });
+});
+
+describe('getLinodesFromAllPlacementGroups', () => {
+  it('returns an array of unique linode ids from all placement groups', () => {
+    expect(
+      getLinodesFromAllPlacementGroups([
+        { linode_ids: [1, 2, 3] },
+        { linode_ids: [3, 4, 5] },
+      ] as PlacementGroup[])
+    ).toEqual([1, 2, 3, 4, 5]);
+  });
+
+  it('returns an empty array if no placement groups are provided', () => {
+    expect(getLinodesFromAllPlacementGroups(undefined)).toEqual([]);
+  });
+});
diff --git a/packages/manager/src/features/PlacementGroups/utils.ts b/packages/manager/src/features/PlacementGroups/utils.ts
index d238a195c4d..b28d7a87938 100644
--- a/packages/manager/src/features/PlacementGroups/utils.ts
+++ b/packages/manager/src/features/PlacementGroups/utils.ts
@@ -1,7 +1,10 @@
-import { PlacementGroup } from '@linode/api-v4';
 import { AFFINITY_TYPES } from '@linode/api-v4/lib/placement-groups';
 
-import type { CreatePlacementGroupPayload } from '@linode/api-v4';
+import type {
+  CreatePlacementGroupPayload,
+  PlacementGroup,
+  Region,
+} from '@linode/api-v4';
 
 /**
  * Helper to get the number of Linodes in a Placement Group.
@@ -12,6 +15,26 @@ export const getPlacementGroupLinodeCount = (
   return placementGroup.linode_ids.length;
 };
 
+interface HasPlacementGroupReachedCapacityOptions {
+  placementGroup: PlacementGroup | undefined;
+  region: Region | undefined;
+}
+/**
+ * Helper to determine if a Placement Group has reached capacity.
+ */
+export const hasPlacementGroupReachedCapacity = ({
+  placementGroup,
+  region,
+}: HasPlacementGroupReachedCapacityOptions): boolean => {
+  if (!placementGroup || !region) {
+    return false;
+  }
+
+  return (
+    getPlacementGroupLinodeCount(placementGroup) >= region.maximum_vms_per_pg
+  );
+};
+
 /**
  * Helper to populate the affinity_type select options.
  */
@@ -21,3 +44,21 @@ export const affinityTypeOptions = Object.entries(AFFINITY_TYPES).map(
     value: key as CreatePlacementGroupPayload['affinity_type'],
   })
 );
+
+/**
+ * Helper to get all linodes assigned to any placement group. (and reduce to unique linodes)
+ * This is useful for determining which linodes are available to be assigned.
+ */
+export const getLinodesFromAllPlacementGroups = (
+  allPlacementGroups: PlacementGroup[] | undefined
+) => {
+  if (!allPlacementGroups) {
+    return [];
+  }
+
+  const linodeIds = allPlacementGroups.reduce((acc, placementGroup) => {
+    return [...acc, ...placementGroup.linode_ids];
+  }, []);
+
+  return Array.from(new Set(linodeIds));
+};
diff --git a/packages/manager/src/features/Profile/APITokens/CreateAPITokenDrawer.test.tsx b/packages/manager/src/features/Profile/APITokens/CreateAPITokenDrawer.test.tsx
index 9dc003fde62..a3d46dc5748 100644
--- a/packages/manager/src/features/Profile/APITokens/CreateAPITokenDrawer.test.tsx
+++ b/packages/manager/src/features/Profile/APITokens/CreateAPITokenDrawer.test.tsx
@@ -3,22 +3,22 @@ import userEvent from '@testing-library/user-event';
 import * as React from 'react';
 
 import { appTokenFactory } from 'src/factories';
-import { accountUserFactory } from 'src/factories/accountUsers';
+import { profileFactory } from 'src/factories/profile';
 import { rest, server } from 'src/mocks/testServer';
 import { renderWithTheme } from 'src/utilities/testHelpers';
 
 import { CreateAPITokenDrawer } from './CreateAPITokenDrawer';
 
-// Mock the useAccountUser hooks to immediately return the expected data, circumventing the HTTP request and loading state.
+// Mock the useProfile hooks to immediately return the expected data, circumventing the HTTP request and loading state.
 const queryMocks = vi.hoisted(() => ({
-  useAccountUser: vi.fn().mockReturnValue({}),
+  useProfile: vi.fn().mockReturnValue({}),
 }));
 
-vi.mock('src/queries/accountUsers', async () => {
-  const actual = await vi.importActual<any>('src/queries/accountUsers');
+vi.mock('src/queries/profile', async () => {
+  const actual = await vi.importActual<any>('src/queries/profile');
   return {
     ...actual,
-    useAccountUser: queryMocks.useAccountUser,
+    useProfile: queryMocks.useProfile,
   };
 });
 
@@ -88,8 +88,8 @@ describe('Create API Token Drawer', () => {
   });
 
   it('Should show the Child Account Access scope for a parent user account with the parent/child feature flag on', () => {
-    queryMocks.useAccountUser.mockReturnValue({
-      data: accountUserFactory.build({ user_type: 'parent' }),
+    queryMocks.useProfile.mockReturnValue({
+      data: profileFactory.build({ user_type: 'parent' }),
     });
 
     const { getByText } = renderWithTheme(<CreateAPITokenDrawer {...props} />, {
@@ -100,8 +100,8 @@ describe('Create API Token Drawer', () => {
   });
 
   it('Should not show the Child Account Access scope for a non-parent user account with the parent/child feature flag on', () => {
-    queryMocks.useAccountUser.mockReturnValue({
-      data: accountUserFactory.build({ user_type: null }),
+    queryMocks.useProfile.mockReturnValue({
+      data: profileFactory.build({ user_type: 'default' }),
     });
 
     const { queryByText } = renderWithTheme(
diff --git a/packages/manager/src/features/Profile/APITokens/CreateAPITokenDrawer.tsx b/packages/manager/src/features/Profile/APITokens/CreateAPITokenDrawer.tsx
index b9bba270482..685b3eaaf1b 100644
--- a/packages/manager/src/features/Profile/APITokens/CreateAPITokenDrawer.tsx
+++ b/packages/manager/src/features/Profile/APITokens/CreateAPITokenDrawer.tsx
@@ -19,7 +19,6 @@ import { AccessCell } from 'src/features/ObjectStorage/AccessKeyLanding/AccessCe
 import { VPC_READ_ONLY_TOOLTIP } from 'src/features/VPCs/constants';
 import { useFlags } from 'src/hooks/useFlags';
 import { useAccount } from 'src/queries/account';
-import { useAccountUser } from 'src/queries/accountUsers';
 import { useProfile } from 'src/queries/profile';
 import { useCreatePersonalAccessTokenMutation } from 'src/queries/tokens';
 import { isFeatureEnabled } from 'src/utilities/accountCapabilities';
@@ -99,7 +98,6 @@ export const CreateAPITokenDrawer = (props: Props) => {
 
   const { data: profile } = useProfile();
   const { data: account } = useAccount();
-  const { data: user } = useAccountUser(profile?.username ?? '');
 
   const {
     error,
@@ -190,7 +188,7 @@ export const CreateAPITokenDrawer = (props: Props) => {
   const allPermissions = form.values.scopes;
 
   const showFilteredPermissions =
-    (flags.parentChildAccountAccess && user?.user_type !== 'parent') ||
+    (flags.parentChildAccountAccess && profile?.user_type !== 'parent') ||
     Boolean(!flags.parentChildAccountAccess);
 
   const filteredPermissions = allPermissions.filter(
diff --git a/packages/manager/src/features/Profile/APITokens/ViewAPITokenDrawer.test.tsx b/packages/manager/src/features/Profile/APITokens/ViewAPITokenDrawer.test.tsx
index 474f0fe9c56..924501a5853 100644
--- a/packages/manager/src/features/Profile/APITokens/ViewAPITokenDrawer.test.tsx
+++ b/packages/manager/src/features/Profile/APITokens/ViewAPITokenDrawer.test.tsx
@@ -167,10 +167,7 @@ describe('View API Token Drawer', () => {
   });
 
   describe('Parent/Child: User Roles', () => {
-    const setupAndRender = (
-      userType: UserType | null,
-      enableFeatureFlag = true
-    ) => {
+    const setupAndRender = (userType: UserType, enableFeatureFlag = true) => {
       queryMocks.useProfile.mockReturnValue({
         data: profileFactory.build({ user_type: userType }),
       });
@@ -181,7 +178,7 @@ describe('View API Token Drawer', () => {
     };
 
     const testChildScopeNotDisplayed = (
-      userType: UserType | null,
+      userType: UserType,
       enableFeatureFlag = true
     ) => {
       const { queryByText } = setupAndRender(userType, enableFeatureFlag);
@@ -193,8 +190,8 @@ describe('View API Token Drawer', () => {
       testChildScopeNotDisplayed('parent', false);
     });
 
-    it('should not display the Child Account Access scope for a user account without a parent uer type', () => {
-      testChildScopeNotDisplayed(null);
+    it('should not display the Child Account Access scope for a user account without a parent user type', () => {
+      testChildScopeNotDisplayed('default');
     });
 
     it('should not display the Child Account Access scope for "proxy" user type', () => {
diff --git a/packages/manager/src/features/StackScripts/StackScriptCreate/StackScriptCreate.test.tsx b/packages/manager/src/features/StackScripts/StackScriptCreate/StackScriptCreate.test.tsx
index a09e9d7cbed..6d9de4f6fe6 100644
--- a/packages/manager/src/features/StackScripts/StackScriptCreate/StackScriptCreate.test.tsx
+++ b/packages/manager/src/features/StackScripts/StackScriptCreate/StackScriptCreate.test.tsx
@@ -1,12 +1,12 @@
 import { Grants, Profile } from '@linode/api-v4/lib';
 import { APIError } from '@linode/api-v4/lib/types';
-import { shallow } from 'enzyme';
 import * as React from 'react';
 import { UseQueryResult } from 'react-query';
 
 import { reactRouterProps } from 'src/__data__/reactRouterProps';
 import { imageFactory, normalizeEntities, profileFactory } from 'src/factories';
 import { queryClientFactory } from 'src/queries/base';
+import { renderWithTheme } from 'src/utilities/testHelpers';
 
 import { StackScriptCreate } from './StackScriptCreate';
 
@@ -14,56 +14,40 @@ const images = normalizeEntities(imageFactory.buildList(10));
 const queryClient = queryClientFactory();
 
 describe('StackScriptCreate', () => {
-  const component = shallow(
-    <StackScriptCreate
-      {...reactRouterProps}
-      profile={
-        { data: profileFactory.build() } as UseQueryResult<Profile, APIError[]>
-      }
-      grants={{ data: {} } as UseQueryResult<Grants, APIError[]>}
-      imagesData={images}
-      imagesLastUpdated={0}
-      imagesLoading={false}
-      mode="create"
-      queryClient={queryClient}
-    />
-  );
-
-  it.skip('should container <LandingHeader />', () => {
-    expect(component.find('LandingHeader')).toHaveLength(1);
-  });
-
-  it.skip('should render a title that reads "Create StackScript', () => {
-    const titleText = component
-      .find('WithStyles(Typography)')
-      .first()
-      .children()
-      .text();
-    expect(titleText).toBe('Create StackScript');
-  });
-
-  it.skip(`should render a confirmation dialog with the
-  title "Clear StackScript Configuration?"`, () => {
-    const modalTitle = component
-      .find('WithStyles(ConfirmationDialog)')
-      .prop('title');
-    expect(modalTitle).toBe('Clear StackScript Configuration?');
-  });
-
-  it.skip('should render StackScript Form', () => {
-    expect(component.find('StackScriptForm')).toHaveLength(1);
-  });
-
-  describe('Back Arrow Icon Button', () => {
-    it.skip('should render back array icon button', () => {
-      const backIcon = component.find('WithStyles(IconButton)').first();
-      expect(backIcon.find('pure(KeyboardArrowLeft)')).toHaveLength(1);
-    });
-
-    it.skip('back arrow icon should link back to stackscripts landing', () => {
-      const backIcon = component.find('WithStyles(IconButton)').first();
-      const parentLink = backIcon.closest('Link');
-      expect(parentLink.prop('to')).toBe('/stackscripts');
-    });
+  it('should render header, inputs, and buttons', () => {
+    const { getByLabelText, getByText } = renderWithTheme(
+      <StackScriptCreate
+        {...reactRouterProps}
+        profile={
+          { data: profileFactory.build() } as UseQueryResult<
+            Profile,
+            APIError[]
+          >
+        }
+        grants={{ data: {} } as UseQueryResult<Grants, APIError[]>}
+        imagesData={images}
+        imagesLastUpdated={0}
+        imagesLoading={false}
+        mode="create"
+        queryClient={queryClient}
+      />,
+      { queryClient }
+    );
+
+    expect(getByText('Create')).toBeVisible();
+
+    expect(getByLabelText('StackScript Label (required)')).toBeVisible();
+    expect(getByLabelText('Description')).toBeVisible();
+    expect(getByLabelText('Target Images')).toBeVisible();
+    expect(getByLabelText('Script (required)')).toBeVisible();
+    expect(getByLabelText('Revision Note')).toBeVisible();
+
+    const createButton = getByText('Create StackScript').closest('button');
+    expect(createButton).toBeVisible();
+    expect(createButton).toBeDisabled();
+
+    const resetButton = getByText('Reset').closest('button');
+    expect(resetButton).toBeVisible();
+    expect(resetButton).toBeEnabled();
   });
 });
diff --git a/packages/manager/src/features/StackScripts/stackScriptUtils.ts b/packages/manager/src/features/StackScripts/stackScriptUtils.ts
index 6c8f8df9694..c2119a3a9e1 100644
--- a/packages/manager/src/features/StackScripts/stackScriptUtils.ts
+++ b/packages/manager/src/features/StackScripts/stackScriptUtils.ts
@@ -131,6 +131,9 @@ export const baseApps = {
   '1243763': 'MainConcept XAVC Transcoder Demo',
   '1243764': 'MainConcept XDCAM Transcoder Demo',
   '1243780': 'SimpleX Chat',
+  // uncomment after 2/20/24 release
+  // '1308539': 'NATS Single Node',
+  // '1298017': 'JupyterLab',
 };
 
 const oneClickFilter = [
diff --git a/packages/manager/src/features/Support/TicketAttachmentRow.test.tsx b/packages/manager/src/features/Support/TicketAttachmentRow.test.tsx
index a355ed51fe5..59c1c3a6f7b 100644
--- a/packages/manager/src/features/Support/TicketAttachmentRow.test.tsx
+++ b/packages/manager/src/features/Support/TicketAttachmentRow.test.tsx
@@ -1,18 +1,13 @@
 import InsertDriveFile from '@mui/icons-material/InsertDriveFile';
 import InsertPhoto from '@mui/icons-material/InsertPhoto';
-import { shallow } from 'enzyme';
 import * as React from 'react';
 
+import { renderWithTheme } from 'src/utilities/testHelpers';
+
 import { TicketAttachmentRow } from './TicketAttachmentRow';
 
 const props = {
   attachments: ['file1', 'file2', 'file3'],
-  classes: {
-    attachmentIcon: '',
-    attachmentPaper: '',
-    attachmentRow: '',
-    root: '',
-  },
   icons: [
     <InsertDriveFile key={0} />,
     <InsertPhoto key={1} />,
@@ -20,27 +15,12 @@ const props = {
   ],
 };
 
-const component = shallow(<TicketAttachmentRow {...props} />);
-
 describe('TicketAttachmentRow component', () => {
-  it('should render', () => {
-    expect(component).toBeDefined();
-  });
-  it('should render its props', () => {
-    expect(component.find('[data-qa-attachment-row]')).toHaveLength(3);
-  });
-  it('should render an icon for each attachment', () => {
-    expect(
-      component
-        .find('[data-qa-attachment-row]')
-        .first()
-        .containsMatchingElement(<InsertDriveFile key={0} />)
-    ).toBeTruthy();
-    expect(
-      component
-        .find('[data-qa-attachment-row]')
-        .last()
-        .containsMatchingElement(<InsertPhoto key={2} />)
-    ).toBeTruthy();
+  it('should render each attachment', () => {
+    const { getByText } = renderWithTheme(<TicketAttachmentRow {...props} />);
+
+    for (const attachment of props.attachments) {
+      expect(getByText(attachment)).toBeVisible();
+    }
   });
 });
diff --git a/packages/manager/src/features/TopMenu/UserMenu/UserMenu.test.tsx b/packages/manager/src/features/TopMenu/UserMenu/UserMenu.test.tsx
index 36e89b9fe75..e7a59b3f114 100644
--- a/packages/manager/src/features/TopMenu/UserMenu/UserMenu.test.tsx
+++ b/packages/manager/src/features/TopMenu/UserMenu/UserMenu.test.tsx
@@ -2,7 +2,6 @@ import { fireEvent, within } from '@testing-library/react';
 import * as React from 'react';
 
 import { accountFactory, profileFactory } from 'src/factories';
-import { accountUserFactory } from 'src/factories/accountUsers';
 import { rest, server } from 'src/mocks/testServer';
 import { mockMatchMedia, renderWithTheme } from 'src/utilities/testHelpers';
 
@@ -25,10 +24,14 @@ describe('UserMenu', () => {
         );
       }),
       rest.get('*/profile', (req, res, ctx) => {
-        return res(ctx.json(profileFactory.build({ username: 'parent-user' })));
-      }),
-      rest.get('*/account/users/*', (req, res, ctx) => {
-        return res(ctx.json(accountUserFactory.build({ user_type: 'parent' })));
+        return res(
+          ctx.json(
+            profileFactory.build({
+              user_type: 'parent',
+              username: 'parent-user',
+            })
+          )
+        );
       })
     );
 
@@ -48,10 +51,14 @@ describe('UserMenu', () => {
         );
       }),
       rest.get('*/profile', (req, res, ctx) => {
-        return res(ctx.json(profileFactory.build({ username: 'parent-user' })));
-      }),
-      rest.get('*/account/users/*', (req, res, ctx) => {
-        return res(ctx.json(accountUserFactory.build({ user_type: 'proxy' })));
+        return res(
+          ctx.json(
+            profileFactory.build({
+              user_type: 'proxy',
+              username: 'parent-user',
+            })
+          )
+        );
       })
     );
 
@@ -71,10 +78,11 @@ describe('UserMenu', () => {
         );
       }),
       rest.get('*/profile', (req, res, ctx) => {
-        return res(ctx.json(profileFactory.build({ username: 'child-user' })));
-      }),
-      rest.get('*/account/users/*', (req, res, ctx) => {
-        return res(ctx.json(accountUserFactory.build({ user_type: 'child' })));
+        return res(
+          ctx.json(
+            profileFactory.build({ user_type: 'child', username: 'child-user' })
+          )
+        );
       })
     );
 
@@ -93,11 +101,13 @@ describe('UserMenu', () => {
       }),
       rest.get('*/profile', (req, res, ctx) => {
         return res(
-          ctx.json(profileFactory.build({ username: 'regular-user' }))
+          ctx.json(
+            profileFactory.build({
+              user_type: 'default',
+              username: 'regular-user',
+            })
+          )
         );
-      }),
-      rest.get('*/account/users/*', (req, res, ctx) => {
-        return res(ctx.json(accountUserFactory.build({ user_type: null })));
       })
     );
 
@@ -116,8 +126,8 @@ describe('UserMenu', () => {
           ctx.json(accountFactory.build({ company: 'Parent Company' }))
         );
       }),
-      rest.get('*/account/users/*', (req, res, ctx) => {
-        return res(ctx.json(accountUserFactory.build({ user_type: 'parent' })));
+      rest.get('*/profile', (req, res, ctx) => {
+        return res(ctx.json(profileFactory.build({ user_type: 'parent' })));
       })
     );
 
@@ -141,8 +151,8 @@ describe('UserMenu', () => {
           ctx.json(accountFactory.build({ company: 'Child Company' }))
         );
       }),
-      rest.get('*/account/users/*', (req, res, ctx) => {
-        return res(ctx.json(accountUserFactory.build({ user_type: 'proxy' })));
+      rest.get('*/profile', (req, res, ctx) => {
+        return res(ctx.json(profileFactory.build({ user_type: 'proxy' })));
       })
     );
 
diff --git a/packages/manager/src/features/TopMenu/UserMenu/UserMenu.tsx b/packages/manager/src/features/TopMenu/UserMenu/UserMenu.tsx
index 8077365171a..30908821028 100644
--- a/packages/manager/src/features/TopMenu/UserMenu/UserMenu.tsx
+++ b/packages/manager/src/features/TopMenu/UserMenu/UserMenu.tsx
@@ -16,11 +16,12 @@ import { Link } from 'src/components/Link';
 import { Stack } from 'src/components/Stack';
 import { Tooltip } from 'src/components/Tooltip';
 import { Typography } from 'src/components/Typography';
+import { switchAccountSessionContext } from 'src/context/switchAccountSessionContext';
 import { SwitchAccountButton } from 'src/features/Account/SwitchAccountButton';
 import { SwitchAccountDrawer } from 'src/features/Account/SwitchAccountDrawer';
+import { useParentTokenManagement } from 'src/features/Account/SwitchAccounts/useParentTokenManagement';
 import { useFlags } from 'src/hooks/useFlags';
 import { useAccount } from 'src/queries/account';
-import { useAccountUser } from 'src/queries/accountUsers';
 import { useGrants, useProfile } from 'src/queries/profile';
 import { getStorage } from 'src/utilities/storage';
 
@@ -56,10 +57,10 @@ export const UserMenu = React.memo(() => {
 
   const { data: account } = useAccount();
   const { data: profile } = useProfile();
-  const { data: user } = useAccountUser(profile?.username ?? '');
   const { data: grants } = useGrants();
   const { enqueueSnackbar } = useSnackbar();
   const flags = useFlags();
+  const sessionContext = React.useContext(switchAccountSessionContext);
 
   const hasGrant = (grant: GlobalGrantTypes) =>
     grants?.global?.[grant] ?? false;
@@ -67,14 +68,19 @@ export const UserMenu = React.memo(() => {
   const hasAccountAccess = !isRestrictedUser || hasGrant('account_access');
   const hasReadWriteAccountAccess = hasGrant('account_access') === 'read_write';
   const hasParentChildAccountAccess = Boolean(flags.parentChildAccountAccess);
-  const isParentUser = user?.user_type === 'parent';
-  const isProxyUser = user?.user_type === 'proxy';
+  const isParentUser = profile?.user_type === 'parent';
+  const isProxyUser = profile?.user_type === 'proxy';
   const canSwitchBetweenParentOrProxyAccount =
     hasParentChildAccountAccess && (isParentUser || isProxyUser);
   const open = Boolean(anchorEl);
   const id = open ? 'user-menu-popover' : undefined;
-  const companyName = (user?.user_type && account?.company) ?? '';
+  const companyName =
+    (hasParentChildAccountAccess &&
+      profile?.user_type !== 'default' &&
+      account?.company) ??
+    '';
   const showCompanyName = hasParentChildAccountAccess && companyName;
+  const { isParentTokenExpired } = useParentTokenManagement({ isProxyUser });
 
   // Used for fetching parent profile and account data by making a request with the parent's token.
   const proxyHeaders =
@@ -175,6 +181,16 @@ export const UserMenu = React.memo(() => {
     );
   };
 
+  const handleAccountSwitch = () => {
+    if (isParentTokenExpired) {
+      return sessionContext.updateState({
+        isOpen: true,
+      });
+    }
+
+    setIsDrawerOpen(true);
+  };
+
   return (
     <>
       <Tooltip
@@ -257,7 +273,7 @@ export const UserMenu = React.memo(() => {
           {canSwitchBetweenParentOrProxyAccount && (
             <SwitchAccountButton
               buttonType="outlined"
-              onClick={() => setIsDrawerOpen(true)}
+              onClick={handleAccountSwitch}
             />
           )}
           <Box>
diff --git a/packages/manager/src/features/Users/UserPermissions.tsx b/packages/manager/src/features/Users/UserPermissions.tsx
index 89141431e01..70b815f7084 100644
--- a/packages/manager/src/features/Users/UserPermissions.tsx
+++ b/packages/manager/src/features/Users/UserPermissions.tsx
@@ -33,9 +33,10 @@ import { TabPanels } from 'src/components/Tabs/TabPanels';
 import { Tabs } from 'src/components/Tabs/Tabs';
 import { Toggle } from 'src/components/Toggle/Toggle';
 import { Typography } from 'src/components/Typography';
-import withFlags, {
-  FeatureFlagConsumerProps,
-} from 'src/containers/withFeatureFlagConsumer.container';
+import {
+  WithFeatureFlagProps,
+  withFeatureFlags,
+} from 'src/containers/flags.container';
 import {
   WithQueryClientProps,
   withQueryClient,
@@ -89,7 +90,7 @@ interface State {
 type CombinedProps = Props &
   WithSnackbarProps &
   WithQueryClientProps &
-  FeatureFlagConsumerProps;
+  WithFeatureFlagProps;
 
 class UserPermissions extends React.Component<CombinedProps, State> {
   componentDidMount() {
@@ -815,5 +816,5 @@ class UserPermissions extends React.Component<CombinedProps, State> {
 export default recompose<CombinedProps, Props>(
   withSnackbar,
   withQueryClient,
-  withFlags
+  withFeatureFlags
 )(UserPermissions);
diff --git a/packages/manager/src/features/Users/UserRow.test.tsx b/packages/manager/src/features/Users/UserRow.test.tsx
index 56dca8d729d..b921d65b4dd 100644
--- a/packages/manager/src/features/Users/UserRow.test.tsx
+++ b/packages/manager/src/features/Users/UserRow.test.tsx
@@ -117,7 +117,7 @@ describe('UserRow', () => {
       }),
       // Mock the active profile, which must NOT be of `parent` user type to hide the Child Account Access column.
       rest.get('*/profile', (req, res, ctx) => {
-        return res(ctx.json(profileFactory.build({ user_type: null })));
+        return res(ctx.json(profileFactory.build({ user_type: 'default' })));
       })
     );
 
diff --git a/packages/manager/src/features/Users/UsersLanding.tsx b/packages/manager/src/features/Users/UsersLanding.tsx
index c9ab394e75c..e7d86191574 100644
--- a/packages/manager/src/features/Users/UsersLanding.tsx
+++ b/packages/manager/src/features/Users/UsersLanding.tsx
@@ -1,4 +1,3 @@
-import { User } from '@linode/api-v4';
 import * as React from 'react';
 
 import AddNewLink from 'src/components/AddNewLink';
@@ -7,9 +6,6 @@ import { DocumentTitleSegment } from 'src/components/DocumentTitle';
 import { PaginationFooter } from 'src/components/PaginationFooter/PaginationFooter';
 import { Table } from 'src/components/Table';
 import { TableBody } from 'src/components/TableBody';
-import { TableRowEmpty } from 'src/components/TableRowEmpty/TableRowEmpty';
-import { TableRowError } from 'src/components/TableRowError/TableRowError';
-import { TableRowLoading } from 'src/components/TableRowLoading/TableRowLoading';
 import { Typography } from 'src/components/Typography';
 import { useFlags } from 'src/hooks/useFlags';
 import { useOrder } from 'src/hooks/useOrder';
@@ -19,88 +15,67 @@ import { useProfile } from 'src/queries/profile';
 
 import CreateUserDrawer from './CreateUserDrawer';
 import { UserDeleteConfirmationDialog } from './UserDeleteConfirmationDialog';
-import { UserRow } from './UserRow';
 import { UsersLandingProxyTableHead } from './UsersLandingProxyTableHead';
 import { UsersLandingTableBody } from './UsersLandingTableBody';
 import { UsersLandingTableHead } from './UsersLandingTableHead';
 
+import type { Filter } from '@linode/api-v4';
+
 export const UsersLanding = () => {
+  const [isCreateDrawerOpen, setIsCreateDrawerOpen] = React.useState<boolean>(
+    false
+  );
+  const [isDeleteDialogOpen, setIsDeleteDialogOpen] = React.useState(false);
+  const [selectedUsername, setSelectedUsername] = React.useState('');
   const flags = useFlags();
   const { data: profile } = useProfile();
 
   const pagination = usePagination(1, 'account-users');
   const order = useOrder();
 
-  const { data: users, error, isLoading, refetch } = useAccountUsers(
-    {
+  const usersFilter: Filter = {
+    ['+order']: order.order,
+    ['+order_by']: order.orderBy,
+  };
+
+  if (flags.parentChildAccountAccess) {
+    usersFilter['user_type'] = { '+neq': 'proxy' };
+  }
+
+  const { data: users, error, isLoading, refetch } = useAccountUsers({
+    filters: usersFilter,
+    params: {
       page: pagination.page,
       page_size: pagination.pageSize,
     },
-    {
-      '+order': order.order,
-      '+order_by': order.orderBy,
-    }
-  );
+  });
+
+  const {
+    data: proxyUser,
+    error: proxyUserError,
+    isLoading: isLoadingProxyUser,
+  } = useAccountUsers({
+    enabled: flags.parentChildAccountAccess,
+    filters: { user_type: 'proxy' },
+  });
 
   const isRestrictedUser = profile?.restricted;
 
   const showProxyUserTable =
     flags.parentChildAccountAccess &&
     (profile?.user_type === 'child' || profile?.user_type === 'proxy');
+
   const showChildAccountAccessCol = Boolean(
     flags.parentChildAccountAccess && profile?.user_type === 'parent'
   );
-  const numCols = showChildAccountAccessCol ? 6 : 5;
-
-  const { nonProxyUsers, proxyUsers } = users?.data.reduce(
-    (acc: { nonProxyUsers: User[]; proxyUsers: User[] }, user: User) => {
-      if (user.user_type === 'proxy') {
-        acc.proxyUsers.push(user);
-      } else {
-        acc.nonProxyUsers.push(user);
-      }
-      return acc;
-    },
-    { nonProxyUsers: [], proxyUsers: [] }
-  ) ?? { nonProxyUsers: [], proxyUsers: [] };
 
-  const [isCreateDrawerOpen, setIsCreateDrawerOpen] = React.useState<boolean>(
-    false
-  );
-
-  const [isDeleteDialogOpen, setIsDeleteDialogOpen] = React.useState(false);
-  const [selectedUsername, setSelectedUsername] = React.useState('');
+  const numCols = showChildAccountAccessCol ? 6 : 5;
 
-  const onDelete = (username: string) => {
+  const handleDelete = (username: string) => {
     setIsDeleteDialogOpen(true);
     setSelectedUsername(username);
   };
 
-  // TODO: Parent/Child - M3-7559 remove this function once feature is live in production.
-  const renderTableContent = () => {
-    if (isLoading) {
-      return (
-        <TableRowLoading
-          columns={numCols}
-          responsive={{ 1: { smDown: true }, 3: { lgDown: true } }}
-          rows={1}
-        />
-      );
-    }
-
-    if (error) {
-      return <TableRowError colSpan={numCols} message={error[0].reason} />;
-    }
-
-    if (!users || users.results === 0) {
-      return <TableRowEmpty colSpan={numCols} />;
-    }
-
-    return users.data.map((user) => (
-      <UserRow key={user.username} onDelete={onDelete} user={user} />
-    ));
-  };
-
   return (
     <React.Fragment>
       <DocumentTitleSegment segment="Users & Grants" />
@@ -123,11 +98,11 @@ export const UsersLanding = () => {
           <UsersLandingProxyTableHead order={order} />
           <TableBody>
             <UsersLandingTableBody
-              error={error}
-              isLoading={isLoading}
+              error={proxyUserError}
+              isLoading={isLoadingProxyUser}
               numCols={numCols}
-              onDelete={onDelete}
-              users={proxyUsers}
+              onDelete={handleDelete}
+              users={proxyUser?.data}
             />
           </TableBody>
         </Table>
@@ -170,17 +145,13 @@ export const UsersLanding = () => {
           showChildAccountAccessCol={showChildAccountAccessCol}
         />
         <TableBody>
-          {flags.parentChildAccountAccess ? (
-            <UsersLandingTableBody
-              error={error}
-              isLoading={isLoading}
-              numCols={numCols}
-              onDelete={onDelete}
-              users={nonProxyUsers}
-            />
-          ) : (
-            renderTableContent()
-          )}
+          <UsersLandingTableBody
+            error={error}
+            isLoading={isLoading}
+            numCols={numCols}
+            onDelete={handleDelete}
+            users={users?.data}
+          />
         </TableBody>
       </Table>
       <PaginationFooter
diff --git a/packages/manager/src/features/Users/UsersLandingTableBody.tsx b/packages/manager/src/features/Users/UsersLandingTableBody.tsx
index abc2e7a7156..2bf641032a8 100644
--- a/packages/manager/src/features/Users/UsersLandingTableBody.tsx
+++ b/packages/manager/src/features/Users/UsersLandingTableBody.tsx
@@ -12,7 +12,7 @@ interface Props {
   isLoading: boolean;
   numCols: number;
   onDelete: (username: string) => void;
-  users: User[];
+  users: User[] | undefined;
 }
 
 export const UsersLandingTableBody = (props: Props) => {
diff --git a/packages/manager/src/hooks/useIsResourceRestricted.ts b/packages/manager/src/hooks/useIsResourceRestricted.ts
index 0720636d1b4..e9126cf36af 100644
--- a/packages/manager/src/hooks/useIsResourceRestricted.ts
+++ b/packages/manager/src/hooks/useIsResourceRestricted.ts
@@ -1,6 +1,6 @@
 import { useGrants } from 'src/queries/profile';
 
-import type { GrantLevel, GrantType, Grants } from '@linode/api-v4';
+import type { GrantLevel, GrantType } from '@linode/api-v4';
 
 /**
  * This hook verifies if a user with restricted access can edit specific cloud resources (Linodes, NodeBalancers, Volumes, etc.).
@@ -13,7 +13,6 @@ export const useIsResourceRestricted = ({
 }: {
   grantLevel?: GrantLevel;
   grantType: GrantType;
-  grants?: Grants;
   id: number | undefined;
 }) => {
   const { data: grants } = useGrants();
diff --git a/packages/manager/src/hooks/useOrder.ts b/packages/manager/src/hooks/useOrder.ts
index ede57ad0fad..ce31f94a334 100644
--- a/packages/manager/src/hooks/useOrder.ts
+++ b/packages/manager/src/hooks/useOrder.ts
@@ -3,11 +3,12 @@ import { useHistory, useLocation } from 'react-router-dom';
 import { debounce } from 'throttle-debounce';
 
 import { getInitialValuesFromUserPreferences } from 'src/components/OrderBy';
-import { Order } from 'src/components/Pagey/Pagey';
 import { useMutatePreferences, usePreferences } from 'src/queries/preferences';
 import { OrderSet } from 'src/types/ManagerPreferences';
 import { getQueryParamsFromQueryString } from 'src/utilities/queryParams';
 
+export type Order = 'asc' | 'desc';
+
 /**
  * useOrder is a hook that allows you to handle ordering tables. It takes into account
  * the following items when determining inital order
diff --git a/packages/manager/src/hooks/usePlacementGroupsData.ts b/packages/manager/src/hooks/usePlacementGroupsData.ts
new file mode 100644
index 00000000000..a7b43ea370f
--- /dev/null
+++ b/packages/manager/src/hooks/usePlacementGroupsData.ts
@@ -0,0 +1,73 @@
+import {
+  getPlacementGroupLinodeCount,
+  hasPlacementGroupReachedCapacity,
+} from 'src/features/PlacementGroups/utils';
+import { useAllLinodesQuery } from 'src/queries/linodes/linodes';
+import { useRegionsQuery } from 'src/queries/regions';
+
+import type { APIError, Linode, PlacementGroup, Region } from '@linode/api-v4';
+
+interface PlacementGroupLimits {
+  assignedLinodes: Linode[];
+  hasReachedCapacity: boolean;
+  isLoading: boolean;
+  linodesCount: number;
+  linodesError: APIError[] | null;
+  region: Region | undefined;
+}
+
+interface PlacementGroupLimitsOptions {
+  placementGroup: PlacementGroup | undefined;
+}
+
+/**
+ * Helper hook to fetch data we always need when working with Placement Groups.
+ *
+ * NOTE: the linodes are filtered by the linode_ids in the placement group by default.
+ */
+export const usePlacementGroupData = ({
+  placementGroup,
+}: PlacementGroupLimitsOptions): PlacementGroupLimits => {
+  const { data: linodes, error, isLoading } = useAllLinodesQuery(
+    {},
+    {
+      '+or': placementGroup?.linode_ids.map((id) => ({
+        id,
+      })),
+    }
+  );
+  const { data: regions } = useRegionsQuery();
+
+  const region = regions?.find(
+    (region) => region.id === placementGroup?.region
+  );
+
+  if (!linodes || !regions || !placementGroup) {
+    return {
+      assignedLinodes: [],
+      hasReachedCapacity: false,
+      isLoading: false,
+      linodesCount: 0,
+      linodesError: [],
+      region,
+    };
+  }
+
+  const linodesCount = getPlacementGroupLinodeCount(placementGroup);
+  const assignedLinodes = linodes?.filter((linode) =>
+    placementGroup.linode_ids.includes(linode.id)
+  );
+  const hasReachedCapacity = hasPlacementGroupReachedCapacity({
+    placementGroup,
+    region,
+  });
+
+  return {
+    assignedLinodes,
+    hasReachedCapacity,
+    isLoading,
+    linodesCount,
+    linodesError: error,
+    region,
+  };
+};
diff --git a/packages/manager/src/layouts/Logout.test.tsx b/packages/manager/src/layouts/Logout.test.tsx
index c43a98f5b50..d782e2f0f02 100644
--- a/packages/manager/src/layouts/Logout.test.tsx
+++ b/packages/manager/src/layouts/Logout.test.tsx
@@ -1,18 +1,18 @@
-import { shallow } from 'enzyme';
 import * as React from 'react';
 
-import { Logout } from './Logout';
+import { renderWithTheme } from 'src/utilities/testHelpers';
 
-describe('layouts/Logout', () => {
-  const component = shallow<Logout>(
-    <Logout dispatchLogout={vi.fn()} token="" />
-  );
+import { Logout } from './Logout';
 
+describe('Logout', () => {
   it('dispatches logout action on componentDidMount', () => {
-    const instance = component.instance();
-    if (!instance) {
-      throw Error('Logout component did not mount!');
-    }
-    expect(instance.props.dispatchLogout).toBeCalled();
+    const props = {
+      dispatchLogout: vi.fn(),
+      token: '',
+    };
+
+    renderWithTheme(<Logout {...props} />);
+
+    expect(props.dispatchLogout).toHaveBeenCalled();
   });
 });
diff --git a/packages/manager/src/mocks/serverHandlers.ts b/packages/manager/src/mocks/serverHandlers.ts
index 8bc3ef43c29..c5fb288b5cb 100644
--- a/packages/manager/src/mocks/serverHandlers.ts
+++ b/packages/manager/src/mocks/serverHandlers.ts
@@ -10,7 +10,7 @@ import {
 import { DateTime } from 'luxon';
 import { rest } from 'msw';
 
-import cachedRegions from 'src/cachedData/regions.json';
+import { regions } from 'src/__data__/regionsData';
 import {
   VLANFactory,
   abuseTicketNotificationFactory,
@@ -99,6 +99,7 @@ import {
   vpcFactory,
 } from 'src/factories';
 import { accountAgreementsFactory } from 'src/factories/accountAgreements';
+import { accountLoginFactory } from 'src/factories/accountLogin';
 import { accountUserFactory } from 'src/factories/accountUsers';
 import { grantFactory, grantsFactory } from 'src/factories/grants';
 import { pickRandom } from 'src/utilities/random';
@@ -313,20 +314,20 @@ const databases = [
   }),
 ];
 
-const aglb = [
+const aclb = [
   // Configurations
-  rest.get('*/v4beta/aglb/:id/configurations', (req, res, ctx) => {
+  rest.get('*/v4beta/aclb/:id/configurations', (req, res, ctx) => {
     const configurations = configurationFactory.buildList(3);
     return res(ctx.json(makeResourcePage(configurations)));
   }),
-  rest.get('*/v4beta/aglb/:id/endpoints-health', (req, res, ctx) => {
+  rest.get('*/v4beta/aclb/:id/endpoints-health', (req, res, ctx) => {
     const health = loadbalancerEndpointHealthFactory.build({
       id: Number(req.params.id),
     });
     return res(ctx.json(health));
   }),
   rest.get(
-    '*/v4beta/aglb/:id/configurations/endpoints-health',
+    '*/v4beta/aclb/:id/configurations/endpoints-health',
     (req, res, ctx) => {
       const health = configurationsEndpointHealthFactory.build({
         id: Number(req.params.id),
@@ -335,7 +336,7 @@ const aglb = [
     }
   ),
   rest.get(
-    '*/v4beta/aglb/:id/service-targets/endpoints-health',
+    '*/v4beta/aclb/:id/service-targets/endpoints-health',
     (req, res, ctx) => {
       const health = serviceTargetsEndpointHealthFactory.build({
         id: Number(req.params.id),
@@ -343,38 +344,38 @@ const aglb = [
       return res(ctx.json(health));
     }
   ),
-  rest.get('*/v4beta/aglb/:id/configurations/:configId', (req, res, ctx) => {
+  rest.get('*/v4beta/aclb/:id/configurations/:configId', (req, res, ctx) => {
     return res(ctx.json(configurationFactory.build()));
   }),
-  rest.post('*/v4beta/aglb/:id/configurations', (req, res, ctx) => {
+  rest.post('*/v4beta/aclb/:id/configurations', (req, res, ctx) => {
     return res(ctx.json(configurationFactory.build()));
   }),
-  rest.put('*/v4beta/aglb/:id/configurations/:configId', (req, res, ctx) => {
+  rest.put('*/v4beta/aclb/:id/configurations/:configId', (req, res, ctx) => {
     const id = Number(req.params.configId);
     const body = req.body as any;
     return res(ctx.json(configurationFactory.build({ id, ...body })));
   }),
-  rest.delete('*/v4beta/aglb/:id/configurations/:configId', (req, res, ctx) => {
+  rest.delete('*/v4beta/aclb/:id/configurations/:configId', (req, res, ctx) => {
     return res(ctx.json({}));
   }),
   // Load Balancers
-  rest.get('*/v4beta/aglb', (req, res, ctx) => {
+  rest.get('*/v4beta/aclb', (req, res, ctx) => {
     return res(ctx.json(makeResourcePage(loadbalancerFactory.buildList(3))));
   }),
-  rest.get('*/v4beta/aglb/:loadbalancerId', (req, res, ctx) => {
+  rest.get('*/v4beta/aclb/:loadbalancerId', (req, res, ctx) => {
     return res(
       ctx.json(
         loadbalancerFactory.build({
           id: Number(req.params.loadbalancerId),
-          label: `aglb-${req.params.loadbalancerId}`,
+          label: `aclb-${req.params.loadbalancerId}`,
         })
       )
     );
   }),
-  rest.post('*/v4beta/aglb', (req, res, ctx) => {
+  rest.post('*/v4beta/aclb', (req, res, ctx) => {
     return res(ctx.json(loadbalancerFactory.build()));
   }),
-  rest.put('*/v4beta/aglb/:id', (req, res, ctx) => {
+  rest.put('*/v4beta/aclb/:id', (req, res, ctx) => {
     const id = Number(req.params.id);
     const body = req.body as any;
     // The payload to update a loadbalancer is not the same as the payload to create a loadbalancer
@@ -382,11 +383,11 @@ const aglb = [
     // TODO: ACLB - figure out if this is still accurate
     return res(ctx.json(loadbalancerFactory.build({ id, ...body })));
   }),
-  rest.delete('*/v4beta/aglb/:id', (req, res, ctx) => {
+  rest.delete('*/v4beta/aclb/:id', (req, res, ctx) => {
     return res(ctx.json({}));
   }),
   // Routes
-  rest.get('*/v4beta/aglb/:id/routes', (req, res, ctx) => {
+  rest.get('*/v4beta/aclb/:id/routes', (req, res, ctx) => {
     const headers = JSON.parse(req.headers.get('x-filter') || '{}');
     if (headers['+or']) {
       return res(
@@ -397,10 +398,10 @@ const aglb = [
     }
     return res(ctx.json(makeResourcePage(routeFactory.buildList(5))));
   }),
-  rest.post('*/v4beta/aglb/:id/routes', (req, res, ctx) => {
+  rest.post('*/v4beta/aclb/:id/routes', (req, res, ctx) => {
     return res(ctx.json(createRouteFactory.buildList(4)));
   }),
-  rest.put('*/v4beta/aglb/:id/routes/:routeId', (req, res, ctx) => {
+  rest.put('*/v4beta/aclb/:id/routes/:routeId', (req, res, ctx) => {
     const id = Number(req.params.routeId);
     const body = req.body as any;
     return res(
@@ -408,18 +409,18 @@ const aglb = [
       ctx.json(createRouteFactory.build({ id, ...body }))
     );
   }),
-  rest.delete('*/v4beta/aglb/:id/routes/:routeId', (req, res, ctx) => {
+  rest.delete('*/v4beta/aclb/:id/routes/:routeId', (req, res, ctx) => {
     return res(ctx.json({}));
   }),
   // Service Targets
-  rest.get('*/v4beta/aglb/:id/service-targets', (req, res, ctx) => {
+  rest.get('*/v4beta/aclb/:id/service-targets', (req, res, ctx) => {
     return res(ctx.json(makeResourcePage(serviceTargetFactory.buildList(5))));
   }),
-  rest.post('*/v4beta/aglb/:id/service-targets', (req, res, ctx) => {
+  rest.post('*/v4beta/aclb/:id/service-targets', (req, res, ctx) => {
     return res(ctx.json(createServiceTargetFactory.build()));
   }),
   rest.put(
-    '*/v4beta/aglb/:id/service-targets/:serviceTargetId',
+    '*/v4beta/aclb/:id/service-targets/:serviceTargetId',
     (req, res, ctx) => {
       const id = Number(req.params.serviceTargetId);
       const body = req.body as any;
@@ -427,13 +428,13 @@ const aglb = [
     }
   ),
   rest.delete(
-    '*/v4beta/aglb/:id/service-targets/:serviceTargetId',
+    '*/v4beta/aclb/:id/service-targets/:serviceTargetId',
     (req, res, ctx) => {
       return res(ctx.json({}));
     }
   ),
   // Certificates
-  rest.get('*/v4beta/aglb/:id/certificates', (req, res, ctx) => {
+  rest.get('*/v4beta/aclb/:id/certificates', (req, res, ctx) => {
     const tlsCertificate = certificateFactory.build({
       label: 'tls-certificate',
       type: 'downstream',
@@ -441,20 +442,20 @@ const aglb = [
     const certificates = certificateFactory.buildList(3);
     return res(ctx.json(makeResourcePage([tlsCertificate, ...certificates])));
   }),
-  rest.get('*/v4beta/aglb/:id/certificates/:certId', (req, res, ctx) => {
+  rest.get('*/v4beta/aclb/:id/certificates/:certId', (req, res, ctx) => {
     const id = Number(req.params.certId);
     const body = req.body as any;
     return res(ctx.json(certificateFactory.build({ id, ...body })));
   }),
-  rest.post('*/v4beta/aglb/:id/certificates', (req, res, ctx) => {
+  rest.post('*/v4beta/aclb/:id/certificates', (req, res, ctx) => {
     return res(ctx.json(certificateFactory.build()));
   }),
-  rest.put('*/v4beta/aglb/:id/certificates/:certId', (req, res, ctx) => {
+  rest.put('*/v4beta/aclb/:id/certificates/:certId', (req, res, ctx) => {
     const id = Number(req.params.certId);
     const body = req.body as any;
     return res(ctx.json(certificateFactory.build({ id, ...body })));
   }),
-  rest.delete('*/v4beta/aglb/:id/certificates/:certId', (req, res, ctx) => {
+  rest.delete('*/v4beta/aclb/:id/certificates/:certId', (req, res, ctx) => {
     return res(ctx.json({}));
   }),
 ];
@@ -552,7 +553,7 @@ export const handlers = [
     const profile = profileFactory.build({
       restricted: false,
       // Parent/Child: switch the `user_type` depending on what account view you need to mock.
-      user_type: 'proxy',
+      user_type: 'parent',
     });
     return res(ctx.json(profile));
   }),
@@ -588,7 +589,7 @@ export const handlers = [
     return res(ctx.json(req.body as SecurityQuestionsPayload));
   }),
   rest.get('*/regions', async (req, res, ctx) => {
-    return res(ctx.json(cachedRegions));
+    return res(ctx.json(makeResourcePage(regions)));
   }),
   rest.get('*/images', async (req, res, ctx) => {
     const privateImages = imageFactory.buildList(5, {
@@ -728,6 +729,26 @@ export const handlers = [
       eventLinode,
       multipleIPLinode,
     ];
+
+    if (req.headers.get('x-filter')) {
+      const headers = JSON.parse(req.headers.get('x-filter') || '{}');
+      const orFilters = headers['+or'];
+
+      if (orFilters) {
+        const filteredLinodes = linodes.filter((linode) => {
+          const filteredById = orFilters.some(
+            (filter: { id: number }) => filter.id === linode.id
+          );
+          const filteredByRegion = orFilters.some(
+            (filter: { region: string }) => filter.region === linode.region
+          );
+
+          return (filteredById || filteredByRegion) ?? linodes;
+        });
+
+        return res(ctx.json(makeResourcePage(filteredLinodes)));
+      }
+    }
     return res(ctx.json(makeResourcePage(linodes)));
   }),
   rest.get('*/linode/instances/:id', async (req, res, ctx) => {
@@ -1006,33 +1027,34 @@ export const handlers = [
           ...objectStorageKeyFactory.buildList(1, {
             regions: [
               { id: 'us-east', s3_endpoint: 'us-east.com' },
-              { id: 'us-east', s3_endpoint: 'us-east.com' },
-              { id: 'us-east', s3_endpoint: 'us-east.com' },
-              { id: 'us-east', s3_endpoint: 'us-east.com' },
-              { id: 'us-east', s3_endpoint: 'us-east.com' },
-              { id: 'us-east', s3_endpoint: 'us-east.com' },
-              { id: 'us-east', s3_endpoint: 'us-east.com' },
+              { id: 'nl-ams', s3_endpoint: 'nl-ams.com' },
+              { id: 'us-southeast', s3_endpoint: 'us-southeast.com' },
+              { id: 'in-maa', s3_endpoint: 'in-maa.com' },
+              { id: 'us-lax', s3_endpoint: 'us-lax.com' },
+              { id: 'us-mia', s3_endpoint: 'us-mia.com' },
+              { id: 'it-mil', s3_endpoint: 'it-mil.com' },
             ],
           }),
           ...objectStorageKeyFactory.buildList(1, {
             regions: [
               { id: 'us-east', s3_endpoint: 'us-east.com' },
-              { id: 'us-east', s3_endpoint: 'us-east.com' },
-              { id: 'us-east', s3_endpoint: 'us-east.com' },
-              { id: 'us-east', s3_endpoint: 'us-east.com' },
-              { id: 'us-east', s3_endpoint: 'us-east.com' },
+              { id: 'nl-ams', s3_endpoint: 'nl-ams.com' },
+              { id: 'us-southeast', s3_endpoint: 'us-southeast.com' },
+              { id: 'in-maa', s3_endpoint: 'in-maa.com' },
+              { id: 'us-lax', s3_endpoint: 'us-lax.com' },
             ],
           }),
           ...objectStorageKeyFactory.buildList(1, {
             regions: [
               { id: 'us-east', s3_endpoint: 'us-east.com' },
-              { id: 'us-east', s3_endpoint: 'us-east.com' },
+              { id: 'nl-ams', s3_endpoint: 'nl-ams.com' },
             ],
           }),
         ])
       )
     );
   }),
+
   rest.post('*object-storage/keys', (req, res, ctx) => {
     const { label, regions } = req.body as ObjectStorageKeyRequest;
 
@@ -1050,6 +1072,26 @@ export const handlers = [
       )
     );
   }),
+  rest.put('*object-storage/keys/:id', (req, res, ctx) => {
+    const { label, regions } = req.body as ObjectStorageKeyRequest;
+
+    const regionsData = regions?.map((region: string) => ({
+      id: region,
+      s3_endpoint: `${region}.com`,
+    }));
+
+    return res(
+      ctx.json(
+        objectStorageKeyFactory.build({
+          label,
+          regions: regionsData,
+        })
+      )
+    );
+  }),
+  rest.delete('*object-storage/keys/:id', (req, res, ctx) => {
+    return res(ctx.json({}));
+  }),
   rest.get('*/domains', (req, res, ctx) => {
     const domains = domainFactory.buildList(10);
     return res(ctx.json(makeResourcePage(domains)));
@@ -1246,28 +1288,23 @@ export const handlers = [
     return res(ctx.json(makeResourcePage(accountMaintenance)));
   }),
   rest.get('*/account/child-accounts', (req, res, ctx) => {
-    const childAccounts = [
-      accountFactory.build({
-        company: 'Child Company 0',
-        euuid: '0',
-      }),
-      accountFactory.build({
-        company: 'Child Company 1',
-        euuid: '1',
-      }),
-      accountFactory.build({
-        company: 'Child Company 2',
-        euuid: '2',
-      }),
-    ];
-    return res(ctx.json(makeResourcePage(childAccounts)));
-    // return res(ctx.json(makeResourcePage(accountFactory.buildList(101))));
+    const page = Number(req.url.searchParams.get('page') || 1);
+    const pageSize = Number(req.url.searchParams.get('page_size') || 25);
+    const childAccounts = accountFactory.buildList(100);
+    return res(
+      ctx.json({
+        data: childAccounts.slice(
+          (page - 1) * pageSize,
+          (page - 1) * pageSize + pageSize
+        ),
+        page,
+        pages: Math.ceil(childAccounts.length / pageSize),
+        results: childAccounts.length,
+      })
+    );
   }),
   rest.get('*/account/child-accounts/:euuid', (req, res, ctx) => {
-    const childAccount = accountFactory.build({
-      company: 'Child Company 1',
-      euuid: '1',
-    });
+    const childAccount = accountFactory.buildList(1);
     return res(ctx.json(childAccount));
   }),
   rest.post('*/account/child-accounts/:euuid/token', (req, res, ctx) => {
@@ -1282,6 +1319,10 @@ export const handlers = [
     return res(ctx.json(proxyToken));
   }),
   rest.get('*/account/users', (req, res, ctx) => {
+    const page = Number(req.url.searchParams.get('page') || 1);
+    const pageSize = Number(req.url.searchParams.get('page_size') || 25);
+    const headers = JSON.parse(req.headers.get('x-filter') || '{}');
+
     const accountUsers = [
       accountUserFactory.build({
         last_login: { login_datetime: '2023-10-16T17:04', status: 'failed' },
@@ -1299,6 +1340,52 @@ export const handlers = [
       proxyAccountUser,
       parentAccountNonAdminUser,
     ];
+
+    if (req.headers.get('x-filter')) {
+      let filteredAccountUsers = accountUsers;
+
+      if (headers['user_type']) {
+        if (headers['user_type']['+neq']) {
+          filteredAccountUsers = accountUsers.filter(
+            (user) => user.user_type !== headers['user_type']['+neq']
+          );
+        } else {
+          filteredAccountUsers = accountUsers.filter(
+            (user) => user.user_type === headers['user_type']
+          );
+        }
+      }
+
+      filteredAccountUsers.sort((a, b) => {
+        const statusA = a[headers['+order_by']];
+        const statusB = b[headers['+order_by']];
+
+        if (statusA < statusB) {
+          return -1;
+        }
+        if (statusA > statusB) {
+          return 1;
+        }
+        return 0;
+      });
+
+      if (headers['+order'] == 'desc') {
+        filteredAccountUsers.reverse();
+      }
+      return res(
+        ctx.json({
+          data: filteredAccountUsers.slice(
+            (page - 1) * pageSize,
+            (page - 1) * pageSize + pageSize
+          ),
+          page,
+          pages: Math.ceil(filteredAccountUsers.length / pageSize),
+          results: filteredAccountUsers.length,
+        })
+      );
+    }
+
+    // Return default response if 'x-filter' header is not present
     return res(ctx.json(makeResourcePage(accountUsers)));
   }),
   rest.get(`*/account/users/${childAccountUser.username}`, (req, res, ctx) => {
@@ -1420,6 +1507,22 @@ export const handlers = [
       )
     );
   }),
+  rest.get('*/account/logins', (req, res, ctx) => {
+    const failedRestrictedAccountLogin = accountLoginFactory.build({
+      restricted: true,
+      status: 'failed',
+    });
+    const successfulAccountLogins = accountLoginFactory.buildList(25);
+
+    return res(
+      ctx.json(
+        makeResourcePage([
+          failedRestrictedAccountLogin,
+          ...successfulAccountLogins,
+        ])
+      )
+    );
+  }),
   rest.get('*/account/payment-methods', (req, res, ctx) => {
     const defaultPaymentMethod = paymentMethodFactory.build({
       data: { card_type: 'MasterCard' },
@@ -1973,25 +2076,42 @@ export const handlers = [
     return res(ctx.json({}));
   }),
   rest.post('*/placement/groups/:placementGroupId/assign', (req, res, ctx) => {
-    if (req.params.placementGroupId === 'undefined') {
+    if (req.params.placementGroupId === '-1') {
       return res(ctx.status(404));
     }
 
-    return res(ctx.json({}));
+    const response = placementGroupFactory.build({
+      affinity_type: 'anti_affinity',
+      id: Number(req.params.placementGroupId) ?? -1,
+      label: 'pg-1',
+      linode_ids: [
+        ...[0, 1, 2, 3, 5, 6, 7, 8, 43],
+        (req.body as any).linodes[0],
+      ],
+    });
+
+    return res(ctx.json(response));
   }),
   rest.post(
     '*/placement/groups/:placementGroupId/unassign',
     (req, res, ctx) => {
-      if (req.params.placementGroupId === 'undefined') {
+      if (req.params.placementGroupId === '-1') {
         return res(ctx.status(404));
       }
 
-      return res(ctx.json({}));
+      const response = placementGroupFactory.build({
+        affinity_type: 'anti_affinity',
+        id: Number(req.params.placementGroupId) ?? -1,
+        label: 'pg-1',
+        linode_ids: [0, 1, 2, 3, 5, 6, 7, 8, 43],
+      });
+
+      return res(ctx.json(response));
     }
   ),
   ...entityTransfers,
   ...statusPage,
   ...databases,
-  ...aglb,
+  ...aclb,
   ...vpc,
 ];
diff --git a/packages/manager/src/queries/account.ts b/packages/manager/src/queries/account.ts
index 9adb30e6f26..e18ff88aff4 100644
--- a/packages/manager/src/queries/account.ts
+++ b/packages/manager/src/queries/account.ts
@@ -5,11 +5,15 @@ import {
   getChildAccounts,
   updateAccountInfo,
 } from '@linode/api-v4';
-import { useMutation, useQuery, useQueryClient } from 'react-query';
+import {
+  useInfiniteQuery,
+  useMutation,
+  useQuery,
+  useQueryClient,
+} from 'react-query';
 
 import { useGrants, useProfile } from 'src/queries/profile';
 
-import { useAccountUser } from './accountUsers';
 import { queryPresets } from './base';
 
 import type {
@@ -54,18 +58,55 @@ export const useChildAccounts = ({
   params,
 }: RequestOptions) => {
   const { data: profile } = useProfile();
-  const { data: user } = useAccountUser(profile?.username ?? '');
   const { data: grants } = useGrants();
   const hasExplicitAuthToken = Boolean(headers?.Authorization);
+  const enabled =
+    (Boolean(profile?.user_type === 'parent') && !profile?.restricted) ||
+    Boolean(grants?.global?.child_account_access) ||
+    hasExplicitAuthToken;
 
   return useQuery<ResourcePage<Account>, APIError[]>(
     [queryKey, 'childAccounts', 'paginated', params, filter],
     () => getChildAccounts({ filter, headers, params }),
     {
-      enabled:
-        (Boolean(user?.user_type === 'parent') && !profile?.restricted) ||
-        Boolean(grants?.global?.child_account_access) ||
-        hasExplicitAuthToken,
+      enabled,
+      keepPreviousData: true,
+    }
+  );
+};
+
+export const useChildAccountsInfiniteQuery = ({
+  filter,
+  headers,
+  params,
+}: RequestOptions) => {
+  const { data: profile } = useProfile();
+  const { data: grants } = useGrants();
+  const hasExplicitAuthToken = Boolean(headers?.Authorization);
+  const enabled =
+    (Boolean(profile?.user_type === 'parent') && !profile?.restricted) ||
+    Boolean(grants?.global?.child_account_access) ||
+    hasExplicitAuthToken;
+
+  return useInfiniteQuery<ResourcePage<Account>, APIError[]>(
+    [queryKey, 'childAccounts', 'infinite', params, filter],
+    ({ pageParam }) =>
+      getChildAccounts({
+        filter,
+        headers,
+        params: {
+          page: pageParam,
+          page_size: 25,
+        },
+      }),
+    {
+      enabled,
+      getNextPageParam: ({ page, pages }) => {
+        if (page === pages) {
+          return undefined;
+        }
+        return page + 1;
+      },
       keepPreviousData: true,
     }
   );
@@ -73,18 +114,18 @@ export const useChildAccounts = ({
 
 export const useChildAccount = ({ euuid, headers }: ChildAccountPayload) => {
   const { data: profile } = useProfile();
-  const { data: user } = useAccountUser(profile?.username ?? '');
   const { data: grants } = useGrants();
   const hasExplicitAuthToken = Boolean(headers?.Authorization);
+  const enabled =
+    (Boolean(profile?.user_type === 'parent') && !profile?.restricted) ||
+    Boolean(grants?.global?.child_account_access) ||
+    hasExplicitAuthToken;
 
   return useQuery<Account, APIError[]>(
     [queryKey, 'childAccounts', 'childAccount', euuid],
     () => getChildAccount({ euuid }),
     {
-      enabled:
-        (Boolean(user?.user_type === 'parent') && !profile?.restricted) ||
-        Boolean(grants?.global?.child_account_access) ||
-        hasExplicitAuthToken,
+      enabled,
     }
   );
 };
diff --git a/packages/manager/src/queries/accountUsers.ts b/packages/manager/src/queries/accountUsers.ts
index 989c456ad93..c22de8fcc84 100644
--- a/packages/manager/src/queries/accountUsers.ts
+++ b/packages/manager/src/queries/accountUsers.ts
@@ -19,14 +19,22 @@ import type {
   User,
 } from '@linode/api-v4';
 
-export const useAccountUsers = (params?: Params, filters?: Filter) => {
+export const useAccountUsers = ({
+  enabled = true,
+  filters,
+  params,
+}: {
+  enabled?: boolean;
+  filters?: Filter;
+  params?: Params;
+}) => {
   const { data: profile } = useProfile();
 
   return useQuery<ResourcePage<User>, APIError[]>(
     [queryKey, 'users', 'paginated', params, filters],
     () => getUsers(params, filters),
     {
-      enabled: !profile?.restricted,
+      enabled: enabled && !profile?.restricted,
       keepPreviousData: true,
     }
   );
diff --git a/packages/manager/src/queries/aglb/certificates.ts b/packages/manager/src/queries/aclb/certificates.ts
similarity index 100%
rename from packages/manager/src/queries/aglb/certificates.ts
rename to packages/manager/src/queries/aclb/certificates.ts
diff --git a/packages/manager/src/queries/aglb/configurations.ts b/packages/manager/src/queries/aclb/configurations.ts
similarity index 100%
rename from packages/manager/src/queries/aglb/configurations.ts
rename to packages/manager/src/queries/aclb/configurations.ts
diff --git a/packages/manager/src/queries/aglb/loadbalancers.ts b/packages/manager/src/queries/aclb/loadbalancers.ts
similarity index 97%
rename from packages/manager/src/queries/aglb/loadbalancers.ts
rename to packages/manager/src/queries/aclb/loadbalancers.ts
index 9b419fdea78..69d065c2c54 100644
--- a/packages/manager/src/queries/aglb/loadbalancers.ts
+++ b/packages/manager/src/queries/aclb/loadbalancers.ts
@@ -78,7 +78,7 @@ export const useLoadBalancerCreateMutation = () => {
   return useMutation<Loadbalancer, APIError[], CreateLoadbalancerPayload>({
     mutationFn: createLoadbalancer,
     onSuccess(data) {
-      queryClient.setQueryData([QUERY_KEY, 'aglb', data.id], data);
+      queryClient.setQueryData([QUERY_KEY, 'aclb', data.id], data);
       queryClient.invalidateQueries([QUERY_KEY, 'paginated']);
     },
   });
diff --git a/packages/manager/src/queries/aglb/routes.ts b/packages/manager/src/queries/aclb/routes.ts
similarity index 100%
rename from packages/manager/src/queries/aglb/routes.ts
rename to packages/manager/src/queries/aclb/routes.ts
diff --git a/packages/manager/src/queries/aglb/serviceTargets.ts b/packages/manager/src/queries/aclb/serviceTargets.ts
similarity index 100%
rename from packages/manager/src/queries/aglb/serviceTargets.ts
rename to packages/manager/src/queries/aclb/serviceTargets.ts
diff --git a/packages/manager/src/queries/events/events.ts b/packages/manager/src/queries/events/events.ts
index ba2279ef3da..2ef13ec33fe 100644
--- a/packages/manager/src/queries/events/events.ts
+++ b/packages/manager/src/queries/events/events.ts
@@ -24,7 +24,7 @@ import {
 import type { APIError, Event, Filter, ResourcePage } from '@linode/api-v4';
 
 /**
- * Gets an infinitly scrollable list of all Events
+ * Gets an infinitely scrollable list of all Events
  *
  * This query is kept up to date by `useEventsPoller`.
  *
@@ -33,7 +33,7 @@ import type { APIError, Event, Filter, ResourcePage } from '@linode/api-v4';
  *
  * The magic here is that we're doing cursor based pagination using the event `id`.
  * We are doing this as opposed to page based pagination because we need an accurate way to get
- * the next set of events when the items retrned by the server may have shifted.
+ * the next set of events when the items returned by the server may have shifted.
  */
 export const useEventsInfiniteQuery = (filter?: Filter) => {
   const query = useInfiniteQuery<ResourcePage<Event>, APIError[]>(
diff --git a/packages/manager/src/queries/linodes/networking.ts b/packages/manager/src/queries/linodes/networking.ts
index ec42b9c4915..f78b100f3db 100644
--- a/packages/manager/src/queries/linodes/networking.ts
+++ b/packages/manager/src/queries/linodes/networking.ts
@@ -8,6 +8,7 @@ import {
   IPRange,
   IPRangeInformation,
   IPSharingPayload,
+  Linode,
   LinodeIPsResponse,
   Params,
   allocateIPAddress,
@@ -105,7 +106,11 @@ export const useLinodeShareIPMutation = () => {
   });
 };
 
-export const useAssignAdressesMutation = () => {
+export const useAssignAdressesMutation = ({
+  currentLinodeId,
+}: {
+  currentLinodeId: Linode['id'];
+}) => {
   const queryClient = useQueryClient();
   return useMutation<{}, APIError[], IPAssignmentPayload>(assignAddresses, {
     onSuccess(_, variables) {
@@ -118,6 +123,13 @@ export const useAssignAdressesMutation = () => {
         ]);
         queryClient.invalidateQueries([queryKey, 'linode', linode_id, 'ips']);
       }
+      queryClient.invalidateQueries([
+        queryKey,
+        'linode',
+        currentLinodeId,
+        'ips',
+      ]);
+      queryClient.invalidateQueries([queryKey, 'ipv6']);
       queryClient.invalidateQueries([queryKey, 'paginated']);
       queryClient.invalidateQueries([queryKey, 'all']);
       queryClient.invalidateQueries([queryKey, 'infinite']);
diff --git a/packages/manager/src/queries/placementGroups.ts b/packages/manager/src/queries/placementGroups.ts
index 680e1adfe79..3f2e1f26108 100644
--- a/packages/manager/src/queries/placementGroups.ts
+++ b/packages/manager/src/queries/placementGroups.ts
@@ -1,11 +1,11 @@
 import {
-  assignVMsToPlacementGroup,
+  assignLinodesToPlacementGroup,
   createPlacementGroup,
   deletePlacementGroup,
   getPlacementGroup,
   getPlacementGroups,
   renamePlacementGroup,
-  unassignVMsFromPlacementGroup,
+  unassignLinodesFromPlacementGroup,
 } from '@linode/api-v4';
 import {
   APIError,
@@ -15,16 +15,33 @@ import {
 } from '@linode/api-v4/lib/types';
 import { useMutation, useQuery, useQueryClient } from 'react-query';
 
+import { getAll } from 'src/utilities/getAll';
+
+import { queryKey as LINODES_QUERY_KEY } from './linodes/linodes';
 import { queryKey as PROFILE_QUERY_KEY } from './profile';
 
 import type {
+  AssignLinodesToPlacementGroupPayload,
   CreatePlacementGroupPayload,
   PlacementGroup,
   RenamePlacementGroupPayload,
+  UnassignLinodesFromPlacementGroupPayload,
 } from '@linode/api-v4';
 
 export const queryKey = 'placement-groups';
 
+export const useUnpaginatedPlacementGroupsQuery = (enabled = true) =>
+  useQuery<PlacementGroup[], APIError[]>({
+    enabled,
+    queryFn: () => getAllPlacementGroupsRequest(),
+    queryKey: [queryKey, 'all'],
+  });
+
+const getAllPlacementGroupsRequest = () =>
+  getAll<PlacementGroup>((params, filters) =>
+    getPlacementGroups(params, filters)
+  )().then((data) => data.data);
+
 export const usePlacementGroupsQuery = (
   params: Params,
   filter: Filter,
@@ -92,35 +109,56 @@ export const useDeletePlacementGroup = (id: number) => {
   });
 };
 
-export const useAssignVMsToPlacementGroup = (
-  id: number,
-  linodeIds: [number]
-) => {
+export const useAssignLinodesToPlacementGroup = (placementGroupId: number) => {
   const queryClient = useQueryClient();
 
-  return useMutation<{}, APIError[]>({
-    mutationFn: () => assignVMsToPlacementGroup(id, linodeIds),
+  return useMutation<
+    PlacementGroup,
+    APIError[],
+    AssignLinodesToPlacementGroupPayload
+  >({
+    mutationFn: (data) => assignLinodesToPlacementGroup(placementGroupId, data),
     onSuccess: (updatedPlacementGroup) => {
-      queryClient.invalidateQueries([queryKey, 'paginated']);
+      // Invalidate placement group linodes
+      queryClient.invalidateQueries([
+        queryKey,
+        'placement-group',
+        placementGroupId,
+        'linodes',
+      ]);
+
+      // Invalidate linode placement group data
+      queryClient.invalidateQueries([
+        LINODES_QUERY_KEY,
+        'linode',
+        updatedPlacementGroup.linode_ids[0],
+        'placement_groups',
+      ]);
+
+      // Set the updated placement group
       queryClient.setQueryData(
-        [queryKey, 'placement-group', id],
+        [queryKey, 'placement-group', placementGroupId],
         updatedPlacementGroup
       );
     },
   });
 };
 
-export const useUnassignVMsToPlacementGroup = (
-  id: number,
-  linodeIds: [number]
+export const useUnassignLinodesFromPlacementGroup = (
+  placementGroupId: number
 ) => {
   const queryClient = useQueryClient();
-  return useMutation<{}, APIError[]>({
-    mutationFn: () => unassignVMsFromPlacementGroup(id, linodeIds),
+  return useMutation<
+    PlacementGroup,
+    APIError[],
+    UnassignLinodesFromPlacementGroupPayload
+  >({
+    mutationFn: (data) =>
+      unassignLinodesFromPlacementGroup(placementGroupId, data),
     onSuccess: (updatedPlacementGroup) => {
       queryClient.invalidateQueries([queryKey, 'paginated']);
       queryClient.setQueryData(
-        [queryKey, 'placement-group', id],
+        [queryKey, 'placement-group', placementGroupId],
         updatedPlacementGroup
       );
     },
diff --git a/packages/manager/src/testSetup.ts b/packages/manager/src/testSetup.ts
index e7d6f33aa01..6f87e964ec6 100644
--- a/packages/manager/src/testSetup.ts
+++ b/packages/manager/src/testSetup.ts
@@ -1,12 +1,5 @@
-import Enzyme from 'enzyme';
-// @ts-expect-error not a big deal, we can suffer
-import Adapter from 'enzyme-adapter-react-16';
-
-import { expect } from 'vitest';
 import matchers from '@testing-library/jest-dom/matchers';
-
-// // Enzyme React 17 adapter.
-// Enzyme.configure({ adapter: new Adapter() });
+import { expect } from 'vitest';
 
 // JSDom matchers.
 expect.extend(matchers);
@@ -19,8 +12,6 @@ afterEach(() => server.resetHandlers());
 
 require('@testing-library/jest-dom/extend-expect');
 
-Enzyme.configure({ adapter: new Adapter() });
-
 // @ts-expect-error this prevents some console errors
 HTMLCanvasElement.prototype.getContext = () => {
   return 0;
@@ -60,3 +51,75 @@ vi.mock('highlight.js/lib/highlight', () => ({
     registerLanguage: vi.fn(),
   },
 }));
+
+/**
+ ***************************************
+ *  Custom matchers & matchers overrides
+ ***************************************
+ */
+
+/**
+ * Matcher override for toBeDisabled and toBeEnabled
+ *
+ * The reason for overriding those matchers is that we need to check for the aria-disabled attribute as well.
+ * When a button is disabled, it will not necessarily have the `disabled` attribute. but it will have an aria-disabled attribute set to true.
+ */
+const ariaDisabledAttribute = 'aria-disabled';
+
+const isElementDisabled = (element: HTMLElement) => {
+  // We really only want to check for `aria-disabled` on buttons since this is a Cloud Manager customization
+  return element.tagName.toLowerCase() === 'button'
+    ? element.getAttribute(ariaDisabledAttribute) === 'true' ||
+        element.hasAttribute('disabled')
+    : element.hasAttribute('disabled');
+};
+
+interface HandleResult {
+  condition: boolean;
+  element: HTMLElement;
+  expectedState: 'disabled' | 'enabled';
+  thisInstance: any;
+}
+
+const handleResult = ({
+  condition,
+  element,
+  expectedState,
+  thisInstance,
+}: HandleResult) => {
+  const message = `${thisInstance?.utils?.printReceived(
+    element ?? ''
+  )}\n\n expected ${element?.tagName} to be ${expectedState}`;
+  return condition
+    ? {
+        message: () => '',
+        pass: true,
+      }
+    : {
+        message: () => message,
+        pass: false,
+      };
+};
+
+expect.extend({
+  toBeDisabled(this: any, element: HTMLElement) {
+    const isDisabled = isElementDisabled(element);
+
+    return handleResult({
+      condition: isDisabled,
+      element,
+      expectedState: 'disabled',
+      thisInstance: this,
+    });
+  },
+  toBeEnabled(this: any, element: HTMLElement) {
+    const isEnabled = !isElementDisabled(element);
+
+    return handleResult({
+      condition: isEnabled,
+      element,
+      expectedState: 'enabled',
+      thisInstance: this,
+    });
+  },
+});
diff --git a/packages/manager/src/types/ManagerPreferences.ts b/packages/manager/src/types/ManagerPreferences.ts
index dbe683c0899..f388a292248 100644
--- a/packages/manager/src/types/ManagerPreferences.ts
+++ b/packages/manager/src/types/ManagerPreferences.ts
@@ -1,8 +1,9 @@
 import { UserPreferences } from '@linode/api-v4';
 
-import { Order } from 'src/components/Pagey';
 import { ThemeChoice } from 'src/utilities/theme';
 
+import type { Order } from 'src/hooks/useOrder';
+
 export interface OrderSet {
   order: Order;
   orderBy: string;
diff --git a/packages/manager/src/utilities/analytics.ts b/packages/manager/src/utilities/analytics.ts
index c9c65bdab54..cb1b0bebd4b 100644
--- a/packages/manager/src/utilities/analytics.ts
+++ b/packages/manager/src/utilities/analytics.ts
@@ -434,3 +434,24 @@ export const sendLinodeConfigurationDocsEvent = (label: string) => {
     label,
   });
 };
+
+// LinodeDetailHeader.tsx
+export const sendEditBreadcrumbEvent = () => {
+  sendEvent({
+    action: 'Click:pencil icon',
+    category: 'Breadcrumb',
+    label: 'Edit Breadcrumb',
+  });
+};
+
+// LinodeDetailHeader.tsx
+// LinodeSettingsLabelPanel.tsx
+export const sendUpdateLinodeLabelEvent = (
+  label: 'Breadcrumb' | 'Settings'
+) => {
+  sendEvent({
+    action: 'Click:button',
+    category: 'Linode Label',
+    label: `Update linode label from ${label}`,
+  });
+};
diff --git a/packages/manager/src/utilities/isRecent.test.ts b/packages/manager/src/utilities/isRecent.test.ts
index 4b20504c2af..d891ca1cc66 100644
--- a/packages/manager/src/utilities/isRecent.test.ts
+++ b/packages/manager/src/utilities/isRecent.test.ts
@@ -6,14 +6,18 @@ describe('isRecent', () => {
   const baseDate = DateTime.fromObject({ day: 1, month: 1, year: 2019 });
   const m = baseDate.toISO();
 
+  if (!m) {
+    throw new Error('Invalid test date');
+  }
+
   it('should return false if time is in the future', () => {
     const t = baseDate.plus({ minutes: 1 }).toISO();
-    expect(isRecent(t, m)).toBe(false);
+    expect(isRecent(t!, m)).toBe(false);
   });
 
   it('should return true if 1 min in the past', () => {
     const t1 = DateTime.fromISO(m).minus({ minutes: 1 }).toISO();
-    expect(isRecent(t1, m)).toBe(true);
+    expect(isRecent(t1!, m)).toBe(true);
   });
 
   it('should return true if time 23:59:58 in the past', () => {
@@ -21,16 +25,16 @@ describe('isRecent', () => {
       .minus({ hours: 23, minutes: 59, seconds: 58 })
       .toISO();
 
-    expect(isRecent(t2, m)).toBe(true);
+    expect(isRecent(t2!, m)).toBe(true);
   });
 
   it('should return false if time is 1 day in the past', () => {
     const t1 = baseDate.minus({ days: 1 }).toISO();
-    expect(isRecent(t1, m)).toBe(false);
+    expect(isRecent(t1!, m)).toBe(false);
   });
 
   it('should return false if 24:01 in the past', () => {
     const t2 = baseDate.minus({ hours: 24, seconds: 1 }).toISO();
-    expect(isRecent(t2, m)).toBe(false);
+    expect(isRecent(t2!, m)).toBe(false);
   });
 });
diff --git a/packages/manager/src/utilities/regions.test.ts b/packages/manager/src/utilities/regions.test.ts
index 1a8b89931a6..99eee287b3d 100644
--- a/packages/manager/src/utilities/regions.test.ts
+++ b/packages/manager/src/utilities/regions.test.ts
@@ -10,6 +10,8 @@ describe('getRegionsByRegionId', () => {
         country: 'us',
         id: 'us-east',
         label: 'Newark, NJ',
+        maximum_pgs_per_customer: 5,
+        maximum_vms_per_pg: 10,
         resolvers: { ipv4: '', ipv6: '' },
         status: 'ok',
       },
@@ -18,6 +20,8 @@ describe('getRegionsByRegionId', () => {
         country: 'us',
         id: 'us-southeast',
         label: 'Atlanta, GA',
+        maximum_pgs_per_customer: 5,
+        maximum_vms_per_pg: 10,
         resolvers: { ipv4: '', ipv6: '' },
         status: 'ok',
       },
@@ -29,6 +33,8 @@ describe('getRegionsByRegionId', () => {
         country: 'us',
         id: 'us-east',
         label: 'Newark, NJ',
+        maximum_pgs_per_customer: 5,
+        maximum_vms_per_pg: 10,
         resolvers: { ipv4: '', ipv6: '' },
         status: 'ok',
       },
@@ -37,6 +43,8 @@ describe('getRegionsByRegionId', () => {
         country: 'us',
         id: 'us-southeast',
         label: 'Atlanta, GA',
+        maximum_pgs_per_customer: 5,
+        maximum_vms_per_pg: 10,
         resolvers: { ipv4: '', ipv6: '' },
         status: 'ok',
       },
diff --git a/packages/manager/src/utilities/testHelpers.tsx b/packages/manager/src/utilities/testHelpers.tsx
index 0f872368071..228a8ea9de3 100644
--- a/packages/manager/src/utilities/testHelpers.tsx
+++ b/packages/manager/src/utilities/testHelpers.tsx
@@ -7,7 +7,7 @@ import {
 import userEvent from '@testing-library/user-event';
 import mediaQuery from 'css-mediaquery';
 import { Formik, FormikConfig, FormikValues } from 'formik';
-import { Provider as LDProvider } from 'launchdarkly-react-client-sdk/lib/context';
+import { LDProvider } from 'launchdarkly-react-client-sdk';
 import { SnackbarProvider } from 'notistack';
 import { mergeDeepRight } from 'ramda';
 import * as React from 'react';
@@ -95,10 +95,10 @@ export const wrapWithTheme = (ui: any, options: Options = {}) => {
       <QueryClientProvider client={passedQueryClient || queryClient}>
         <LinodeThemeWrapper theme={options.theme}>
           <LDProvider
-            value={{
-              flagKeyMap: {},
-              flags: options.flags ?? {},
-            }}
+            clientSideID={''}
+            deferInitialization
+            flags={options.flags ?? {}}
+            options={{ bootstrap: options.flags }}
           >
             <SnackbarProvider>
               <MemoryRouter {...options.MemoryRouter}>
diff --git a/packages/validation/src/objectStorageKeys.schema.ts b/packages/validation/src/objectStorageKeys.schema.ts
index 9f9406dc3c8..b15dfe2ace8 100644
--- a/packages/validation/src/objectStorageKeys.schema.ts
+++ b/packages/validation/src/objectStorageKeys.schema.ts
@@ -1,10 +1,24 @@
 import { object, string, array } from 'yup';
 
+const labelErrorMessage = 'Label must be between 3 and 50 characters.';
+
 export const createObjectStorageKeysSchema = object({
   label: string()
     .required('Label is required.')
-    .min(3, 'Label must be between 3 and 50 characters.')
-    .max(50, 'Label must be between 3 and 50 characters.')
+    .min(3, labelErrorMessage)
+    .max(50, labelErrorMessage)
+    .trim(),
+  regions: array()
+    .of(string())
+    .min(1, 'Regions must include at least one region')
+    .notRequired(),
+});
+
+export const updateObjectStorageKeysSchema = object({
+  label: string()
+    .notRequired()
+    .min(3, labelErrorMessage)
+    .max(50, labelErrorMessage)
     .trim(),
   regions: array()
     .of(string())
diff --git a/packages/validation/src/placement-groups.schema.ts b/packages/validation/src/placement-groups.schema.ts
index 5b7ff60f556..f8df8600df7 100644
--- a/packages/validation/src/placement-groups.schema.ts
+++ b/packages/validation/src/placement-groups.schema.ts
@@ -1,4 +1,4 @@
-import { array, number, object, string } from 'yup';
+import { object, string } from 'yup';
 
 const labelValidation = string()
   .required('Label is required.')
@@ -14,14 +14,3 @@ export const createPlacementGroupSchema = object({
 export const renamePlacementGroupSchema = object({
   label: labelValidation,
 });
-
-/**
- * @note While this accepts an array of Linode ids (future proofing), only one Linode id is supported at this time.
- */
-export const assignVMsToPlacementGroupSchema = object({
-  linodeIds: array().of(number().max(1, 'Only one Linode id is supported.')),
-});
-
-export const unassignVMsFromPlacementGroupSchema = object({
-  linodeIds: array().of(number().max(1, 'Only one Linode id is supported.')),
-});
diff --git a/yarn.lock b/yarn.lock
index 9db8480f628..35cee6d6553 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1537,13 +1537,20 @@
     core-js-pure "^3.25.1"
     regenerator-runtime "^0.13.11"
 
-"@babel/runtime@^7.0.0", "@babel/runtime@^7.1.2", "@babel/runtime@^7.10.2", "@babel/runtime@^7.10.3", "@babel/runtime@^7.12.1", "@babel/runtime@^7.12.5", "@babel/runtime@^7.14.0", "@babel/runtime@^7.14.6", "@babel/runtime@^7.15.4", "@babel/runtime@^7.17.8", "@babel/runtime@^7.18.3", "@babel/runtime@^7.20.7", "@babel/runtime@^7.4.4", "@babel/runtime@^7.5.4", "@babel/runtime@^7.5.5", "@babel/runtime@^7.6.2", "@babel/runtime@^7.7.2", "@babel/runtime@^7.7.6", "@babel/runtime@^7.8.4", "@babel/runtime@^7.8.7", "@babel/runtime@^7.9.2":
+"@babel/runtime@^7.0.0", "@babel/runtime@^7.1.2", "@babel/runtime@^7.10.2", "@babel/runtime@^7.10.3", "@babel/runtime@^7.12.5", "@babel/runtime@^7.14.0", "@babel/runtime@^7.14.6", "@babel/runtime@^7.15.4", "@babel/runtime@^7.17.8", "@babel/runtime@^7.18.3", "@babel/runtime@^7.20.7", "@babel/runtime@^7.4.4", "@babel/runtime@^7.5.4", "@babel/runtime@^7.5.5", "@babel/runtime@^7.6.2", "@babel/runtime@^7.7.2", "@babel/runtime@^7.8.4", "@babel/runtime@^7.8.7", "@babel/runtime@^7.9.2":
   version "7.21.0"
   resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.21.0.tgz#5b55c9d394e5fcf304909a8b00c07dc217b56673"
   integrity sha512-xwII0//EObnq89Ji5AKYQaRYiW/nZ3llSv29d49IuxPhKbtJoLP+9QUUZ4nVragQVtaVGeZrpB+ZtG/Pdy/POw==
   dependencies:
     regenerator-runtime "^0.13.11"
 
+"@babel/runtime@^7.12.13":
+  version "7.23.9"
+  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.23.9.tgz#47791a15e4603bb5f905bc0753801cf21d6345f7"
+  integrity sha512-0CX6F+BI2s9dkUqr08KFrAIZgNFj75rdBU/DjCyYLIaV/quFjkk6T+EJ2LkZHyZTbEV4L5p97mNkUsHl2wLFAw==
+  dependencies:
+    regenerator-runtime "^0.14.0"
+
 "@babel/runtime@^7.13.10":
   version "7.23.2"
   resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.23.2.tgz#062b0ac103261d68a966c4c7baf2ae3e62ec3885"
@@ -4370,13 +4377,6 @@
   dependencies:
     moment "^2.10.2"
 
-"@types/cheerio@*":
-  version "0.22.31"
-  resolved "https://registry.yarnpkg.com/@types/cheerio/-/cheerio-0.22.31.tgz#b8538100653d6bb1b08a1e46dec75b4f2a5d5eb6"
-  integrity sha512-Kt7Cdjjdi2XWSfrZ53v4Of0wG3ZcmaegFXjMmz9tfNrZSkzzo36G0AL1YqSdcIA78Etjt6E609pt5h1xnQkPUw==
-  dependencies:
-    "@types/node" "*"
-
 "@types/connect@*":
   version "3.4.35"
   resolved "https://registry.yarnpkg.com/@types/connect/-/connect-3.4.35.tgz#5fcf6ae445e4021d1fc2219a4873cc73a3bb2ad1"
@@ -4491,14 +4491,6 @@
   resolved "https://registry.yarnpkg.com/@types/emscripten/-/emscripten-1.39.9.tgz#cbe73a8d153fc714a2e3177fbda2d7332d45efa7"
   integrity sha512-ILdWj4XYtNOqxJaW22NEQx2gJsLfV5ncxYhhGX1a1H1lXl2Ta0gUz7QOnOoF1xQbJwWDjImi8gXN9mKdIf6n9g==
 
-"@types/enzyme@^3.9.3":
-  version "3.10.12"
-  resolved "https://registry.yarnpkg.com/@types/enzyme/-/enzyme-3.10.12.tgz#ac4494801b38188935580642f772ad18f72c132f"
-  integrity sha512-xryQlOEIe1TduDWAOphR0ihfebKFSWOXpIsk+70JskCfRfW+xALdnJ0r1ZOTo85F9Qsjk6vtlU7edTYHbls9tA==
-  dependencies:
-    "@types/cheerio" "*"
-    "@types/react" "*"
-
 "@types/escodegen@^0.0.6":
   version "0.0.6"
   resolved "https://registry.yarnpkg.com/@types/escodegen/-/escodegen-0.0.6.tgz#5230a9ce796e042cda6f086dbf19f22ea330659c"
@@ -4575,13 +4567,6 @@
   dependencies:
     highlight.js "*"
 
-"@types/history@*":
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/@types/history/-/history-5.0.0.tgz#29f919f0c8e302763798118f45b19cab4a886f14"
-  integrity sha512-hy8b7Y1J8OGe6LbAjj3xniQrj3v6lsivCcrmf4TzSgPzLkhIeKgc5IZnT7ReIqmEuodjfO8EYAuoFvIrHi/+jQ==
-  dependencies:
-    history "*"
-
 "@types/history@^4.7.11":
   version "4.7.11"
   resolved "https://registry.yarnpkg.com/@types/history/-/history-4.7.11.tgz#56588b17ae8f50c53983a524fc3cc47437969d64"
@@ -4674,10 +4659,10 @@
   resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.191.tgz#09511e7f7cba275acd8b419ddac8da9a6a79e2fa"
   integrity sha512-BdZ5BCCvho3EIXw6wUCXHe7rS53AIDPLE+JzwgT+OsJk53oBfbSmZZ7CX4VaRoN78N+TJpFi9QPlfIVNmJYWxQ==
 
-"@types/luxon@^3.2.0":
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/@types/luxon/-/luxon-3.2.0.tgz#99901b4ab29a5fdffc88fff59b3b47fbfbe0557b"
-  integrity sha512-lGmaGFoaXHuOLXFvuju2bfvZRqxAqkHPx9Y9IQdQABrinJJshJwfNCKV+u7rR3kJbiqfTF/NhOkcxxAFrObyaA==
+"@types/luxon@3.4.2":
+  version "3.4.2"
+  resolved "https://registry.yarnpkg.com/@types/luxon/-/luxon-3.4.2.tgz#e4fc7214a420173cea47739c33cdf10874694db7"
+  integrity sha512-TifLZlFudklWlMBfhubvgqTXRzLDI5pCbGa4P8a3wPyUQSW+1xQ5eDsreP9DWHX3tjq1ke96uYG/nwundroWcA==
 
 "@types/markdown-it@^10.0.2":
   version "10.0.3"
@@ -4858,7 +4843,7 @@
     hoist-non-react-statics "^3.3.0"
     redux "^4.0.0"
 
-"@types/react-router-dom@*":
+"@types/react-router-dom@*", "@types/react-router-dom@~5.3.3":
   version "5.3.3"
   resolved "https://registry.yarnpkg.com/@types/react-router-dom/-/react-router-dom-5.3.3.tgz#e9d6b4a66fcdbd651a5f106c2656a30088cc1e83"
   integrity sha512-kpqnYK4wcdm5UaWI3fLcELopqLrHgLqNsdpHauzlQktfkHL3npOSwtj1Uz9oKBAzs7lFtVkV8j83voAz2D8fhw==
@@ -4867,15 +4852,6 @@
     "@types/react" "*"
     "@types/react-router" "*"
 
-"@types/react-router-dom@~5.1.2":
-  version "5.1.9"
-  resolved "https://registry.yarnpkg.com/@types/react-router-dom/-/react-router-dom-5.1.9.tgz#e8a8f687351ecc8c68bb4161d7e4b9df4994416e"
-  integrity sha512-Go0vxZSigXTyXx8xPkGiBrrc3YbBs82KE14WENMLS6TSUKcRFSmYVbL19zFOnNFqJhqrPqEs2h5eUpJhSRrwZw==
-  dependencies:
-    "@types/history" "*"
-    "@types/react" "*"
-    "@types/react-router" "*"
-
 "@types/react-router-hash-link@^1.2.1":
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/@types/react-router-hash-link/-/react-router-hash-link-1.2.1.tgz#fba7dc351cef2985791023018b7a5dbd0653c843"
@@ -5516,21 +5492,6 @@ aggregate-error@^3.0.0:
     clean-stack "^2.0.0"
     indent-string "^4.0.0"
 
-airbnb-prop-types@^2.16.0:
-  version "2.16.0"
-  resolved "https://registry.yarnpkg.com/airbnb-prop-types/-/airbnb-prop-types-2.16.0.tgz#b96274cefa1abb14f623f804173ee97c13971dc2"
-  integrity sha512-7WHOFolP/6cS96PhKNrslCLMYAI8yB1Pp6u6XmxozQOiZbsI5ycglZr5cHhBFfuRcQQjzCMith5ZPZdYiJCxUg==
-  dependencies:
-    array.prototype.find "^2.1.1"
-    function.prototype.name "^1.1.2"
-    is-regex "^1.1.0"
-    object-is "^1.1.2"
-    object.assign "^4.1.0"
-    object.entries "^1.1.2"
-    prop-types "^15.7.2"
-    prop-types-exact "^1.2.0"
-    react-is "^16.13.1"
-
 ajv@8.11.0:
   version "8.11.0"
   resolved "https://registry.yarnpkg.com/ajv/-/ajv-8.11.0.tgz#977e91dd96ca669f54a11e23e378e33b884a565f"
@@ -5727,37 +5688,6 @@ array-union@^2.1.0:
   resolved "https://registry.yarnpkg.com/array-union/-/array-union-2.1.0.tgz#b798420adbeb1de828d84acd8a2e23d3efe85e8d"
   integrity sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==
 
-array.prototype.filter@^1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/array.prototype.filter/-/array.prototype.filter-1.0.2.tgz#5f90ca6e3d01c31ea8db24c147665541db28bb4c"
-  integrity sha512-us+UrmGOilqttSOgoWZTpOvHu68vZT2YCjc/H4vhu56vzZpaDFBhB+Se2UwqWzMKbDv7Myq5M5pcZLAtUvTQdQ==
-  dependencies:
-    call-bind "^1.0.2"
-    define-properties "^1.1.4"
-    es-abstract "^1.20.4"
-    es-array-method-boxes-properly "^1.0.0"
-    is-string "^1.0.7"
-
-array.prototype.find@^2.1.1:
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/array.prototype.find/-/array.prototype.find-2.2.1.tgz#769b8182a0b535c3d76ac025abab98ba1e12467b"
-  integrity sha512-I2ri5Z9uMpMvnsNrHre9l3PaX+z9D0/z6F7Yt2u15q7wt0I62g5kX6xUKR1SJiefgG+u2/gJUmM8B47XRvQR6w==
-  dependencies:
-    call-bind "^1.0.2"
-    define-properties "^1.1.4"
-    es-abstract "^1.20.4"
-    es-shim-unscopables "^1.0.0"
-
-array.prototype.flat@^1.2.3:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/array.prototype.flat/-/array.prototype.flat-1.3.1.tgz#ffc6576a7ca3efc2f46a143b9d1dda9b4b3cf5e2"
-  integrity sha512-roTU0KWIOmJ4DRLmwKd19Otg0/mT3qPNt0Qb3GWW8iObuZXxrjB/pzn0R3hqpRSWg4HCwqx+0vwOnWnvlOyeIA==
-  dependencies:
-    call-bind "^1.0.2"
-    define-properties "^1.1.4"
-    es-abstract "^1.20.4"
-    es-shim-unscopables "^1.0.0"
-
 array.prototype.flatmap@^1.3.1:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/array.prototype.flatmap/-/array.prototype.flatmap-1.3.1.tgz#1aae7903c2100433cb8261cd4ed310aab5c4a183"
@@ -6100,11 +6030,6 @@ body-parser@1.20.1:
     type-is "~1.6.18"
     unpipe "1.0.0"
 
-boolbase@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/boolbase/-/boolbase-1.0.0.tgz#68dff5fbe60c51eb37725ea9e3ed310dcc1e776e"
-  integrity sha512-JZOSA7Mo9sNGB8+UjSgzdLtokWAky1zbztM3WRLCbZ70/3cTANmQmOdR7y2g+J0e2WXywy1yS468tY+IruqEww==
-
 boxen@7.0.0:
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/boxen/-/boxen-7.0.0.tgz#9e5f8c26e716793fc96edcf7cf754cdf5e3fbf32"
@@ -6462,11 +6387,6 @@ chart.js@~2.9.4:
     chartjs-color "^2.1.0"
     moment "^2.10.2"
 
-chartjs-adapter-luxon@^0.2.1:
-  version "0.2.2"
-  resolved "https://registry.yarnpkg.com/chartjs-adapter-luxon/-/chartjs-adapter-luxon-0.2.2.tgz#09c9a99a819802d51c28fd4cfc545c26fab61bec"
-  integrity sha512-LIZnrTj4FewFWnuyqbkdU8JjsZc0KrstFOIcNwDDpnMlVofCOkV9w4WMaa8A9fgpTsFMmqKAroFYa8NN5uCKWQ==
-
 chartjs-color-string@^0.6.0:
   version "0.6.0"
   resolved "https://registry.yarnpkg.com/chartjs-color-string/-/chartjs-color-string-0.6.0.tgz#1df096621c0e70720a64f4135ea171d051402f71"
@@ -6494,31 +6414,6 @@ check-more-types@^2.24.0:
   resolved "https://registry.yarnpkg.com/check-more-types/-/check-more-types-2.24.0.tgz#1420ffb10fd444dcfc79b43891bbfffd32a84600"
   integrity sha512-Pj779qHxV2tuapviy1bSZNEL1maXr13bPYpsvSDB68HlYcYuhlDrmGd63i0JHMCLKzc7rUSNIrpdJlhVlNwrxA==
 
-cheerio-select@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/cheerio-select/-/cheerio-select-2.1.0.tgz#4d8673286b8126ca2a8e42740d5e3c4884ae21b4"
-  integrity sha512-9v9kG0LvzrlcungtnJtpGNxY+fzECQKhK4EGJX2vByejiMX84MFNQw4UxPJl3bFbTMw+Dfs37XaIkCwTZfLh4g==
-  dependencies:
-    boolbase "^1.0.0"
-    css-select "^5.1.0"
-    css-what "^6.1.0"
-    domelementtype "^2.3.0"
-    domhandler "^5.0.3"
-    domutils "^3.0.1"
-
-cheerio@^1.0.0-rc.3:
-  version "1.0.0-rc.12"
-  resolved "https://registry.yarnpkg.com/cheerio/-/cheerio-1.0.0-rc.12.tgz#788bf7466506b1c6bf5fae51d24a2c4d62e47683"
-  integrity sha512-VqR8m68vM46BNnuZ5NtnGBKIE/DfN0cRIzg9n40EIq9NOv90ayxLBXA8fXC5gquFRGJSTRqBq25Jt2ECLR431Q==
-  dependencies:
-    cheerio-select "^2.1.0"
-    dom-serializer "^2.0.0"
-    domhandler "^5.0.3"
-    domutils "^3.0.1"
-    htmlparser2 "^8.0.1"
-    parse5 "^7.0.0"
-    parse5-htmlparser2-tree-adapter "^7.0.0"
-
 chokidar@^3.4.2, chokidar@^3.5.1, chokidar@^3.5.3:
   version "3.5.3"
   resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.5.3.tgz#1cf37c8707b932bd1af1ae22c0432e2acd1903bd"
@@ -6703,11 +6598,6 @@ commander@^10.0.0:
   resolved "https://registry.yarnpkg.com/commander/-/commander-10.0.0.tgz#71797971162cd3cf65f0b9d24eb28f8d303acdf1"
   integrity sha512-zS5PnTI22FIRM6ylNW8G4Ap0IEOyk62fhLSD0+uHRT9McRCLGpkVNvao4bjimpK/GShynyQkFFxHhwMcETmduA==
 
-commander@^2.19.0:
-  version "2.20.3"
-  resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33"
-  integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==
-
 commander@^4.0.0:
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/commander/-/commander-4.1.1.tgz#9fd602bd936294e9e9ef46a3f4d6964044b18068"
@@ -6977,22 +6867,6 @@ css-mediaquery@^0.1.2:
   resolved "https://registry.yarnpkg.com/css-mediaquery/-/css-mediaquery-0.1.2.tgz#6a2c37344928618631c54bd33cedd301da18bea0"
   integrity sha512-COtn4EROW5dBGlE/4PiKnh6rZpAPxDeFLaEEwt4i10jpDMFt2EhQGS79QmmrO+iKCHv0PU/HrOWEhijFd1x99Q==
 
-css-select@^5.1.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/css-select/-/css-select-5.1.0.tgz#b8ebd6554c3637ccc76688804ad3f6a6fdaea8a6"
-  integrity sha512-nwoRF1rvRRnnCqqY7updORDsuqKzqYJ28+oSMaJMMgOauh3fvwHqMS7EZpIPqK8GL+g9mKxF1vP/ZjSeNjEVHg==
-  dependencies:
-    boolbase "^1.0.0"
-    css-what "^6.1.0"
-    domhandler "^5.0.2"
-    domutils "^3.0.1"
-    nth-check "^2.0.1"
-
-css-what@^6.1.0:
-  version "6.1.0"
-  resolved "https://registry.yarnpkg.com/css-what/-/css-what-6.1.0.tgz#fb5effcf76f1ddea2c81bdfaa4de44e79bac70f4"
-  integrity sha512-HTUrgRJ7r4dsZKU6GjmpfRK1O76h97Z8MfS1G0FozR+oF2kG6Vfe8JE6zwrkbxigziPHinCJ+gCPjA9EaBDtRw==
-
 css.escape@^1.5.1:
   version "1.5.1"
   resolved "https://registry.yarnpkg.com/css.escape/-/css.escape-1.5.1.tgz#42e27d4fa04ae32f931a4b4d4191fa9cddee97cb"
@@ -7425,11 +7299,6 @@ dir-glob@^3.0.1:
   dependencies:
     path-type "^4.0.0"
 
-discontinuous-range@1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/discontinuous-range/-/discontinuous-range-1.0.0.tgz#e38331f0844bba49b9a9cb71c771585aab1bc65a"
-  integrity sha512-c68LpLbO+7kP/b1Hr1qs8/BJ09F5khZGTxqxZuhzxpmwJKOgRFHJWIb9/KmqnqHhLdO55aOxFH/EGBvUQbL/RQ==
-
 doctrine@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-2.1.0.tgz#5cd01fc101621b42c4cd7f5d1a66243716d3f39d"
@@ -7600,7 +7469,7 @@ enquirer@^2.3.6:
   dependencies:
     ansi-colors "^4.1.1"
 
-entities@^4.2.0, entities@^4.3.0, entities@^4.4.0:
+entities@^4.2.0, entities@^4.4.0:
   version "4.4.0"
   resolved "https://registry.yarnpkg.com/entities/-/entities-4.4.0.tgz#97bdaba170339446495e653cfd2db78962900174"
   integrity sha512-oYp7156SP8LkeGD0GF85ad1X9Ai79WtRsZ2gxJqtBuzH+98YUV6jkHEKlZkMbcrjJjIVJNIDP/3WL9wQkoPbWA==
@@ -7615,70 +7484,6 @@ envinfo@^7.7.3:
   resolved "https://registry.yarnpkg.com/envinfo/-/envinfo-7.8.1.tgz#06377e3e5f4d379fea7ac592d5ad8927e0c4d475"
   integrity sha512-/o+BXHmB7ocbHEAs6F2EnG0ogybVVUdkRunTT2glZU9XAaGmhqskrvKwqXuDfNjEO0LZKWdejEEpnq8aM0tOaw==
 
-enzyme-adapter-react-16@^1.14.0:
-  version "1.15.7"
-  resolved "https://registry.yarnpkg.com/enzyme-adapter-react-16/-/enzyme-adapter-react-16-1.15.7.tgz#a737e6d8e2c147e9da5acf957755be7634f76201"
-  integrity sha512-LtjKgvlTc/H7adyQcj+aq0P0H07LDL480WQl1gU512IUyaDo/sbOaNDdZsJXYW2XaoPqrLLE9KbZS+X2z6BASw==
-  dependencies:
-    enzyme-adapter-utils "^1.14.1"
-    enzyme-shallow-equal "^1.0.5"
-    has "^1.0.3"
-    object.assign "^4.1.4"
-    object.values "^1.1.5"
-    prop-types "^15.8.1"
-    react-is "^16.13.1"
-    react-test-renderer "^16.0.0-0"
-    semver "^5.7.0"
-
-enzyme-adapter-utils@^1.14.1:
-  version "1.14.1"
-  resolved "https://registry.yarnpkg.com/enzyme-adapter-utils/-/enzyme-adapter-utils-1.14.1.tgz#f30db15dafc22e0ccd44f5acc8d93be29218cdcf"
-  integrity sha512-JZgMPF1QOI7IzBj24EZoDpaeG/p8Os7WeBZWTJydpsH7JRStc7jYbHE4CmNQaLqazaGFyLM8ALWA3IIZvxW3PQ==
-  dependencies:
-    airbnb-prop-types "^2.16.0"
-    function.prototype.name "^1.1.5"
-    has "^1.0.3"
-    object.assign "^4.1.4"
-    object.fromentries "^2.0.5"
-    prop-types "^15.8.1"
-    semver "^5.7.1"
-
-enzyme-shallow-equal@^1.0.1, enzyme-shallow-equal@^1.0.5:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/enzyme-shallow-equal/-/enzyme-shallow-equal-1.0.5.tgz#5528a897a6ad2bdc417c7221a7db682cd01711ba"
-  integrity sha512-i6cwm7hN630JXenxxJFBKzgLC3hMTafFQXflvzHgPmDhOBhxUWDe8AeRv1qp2/uWJ2Y8z5yLWMzmAfkTOiOCZg==
-  dependencies:
-    has "^1.0.3"
-    object-is "^1.1.5"
-
-enzyme@^3.10.0:
-  version "3.11.0"
-  resolved "https://registry.yarnpkg.com/enzyme/-/enzyme-3.11.0.tgz#71d680c580fe9349f6f5ac6c775bc3e6b7a79c28"
-  integrity sha512-Dw8/Gs4vRjxY6/6i9wU0V+utmQO9kvh9XLnz3LIudviOnVYDEe2ec+0k+NQoMamn1VrjKgCUOWj5jG/5M5M0Qw==
-  dependencies:
-    array.prototype.flat "^1.2.3"
-    cheerio "^1.0.0-rc.3"
-    enzyme-shallow-equal "^1.0.1"
-    function.prototype.name "^1.1.2"
-    has "^1.0.3"
-    html-element-map "^1.2.0"
-    is-boolean-object "^1.0.1"
-    is-callable "^1.1.5"
-    is-number-object "^1.0.4"
-    is-regex "^1.0.5"
-    is-string "^1.0.5"
-    is-subset "^0.1.1"
-    lodash.escape "^4.0.1"
-    lodash.isequal "^4.5.0"
-    object-inspect "^1.7.0"
-    object-is "^1.0.2"
-    object.assign "^4.1.0"
-    object.entries "^1.1.1"
-    object.values "^1.1.1"
-    raf "^3.4.1"
-    rst-selector-parser "^2.2.3"
-    string.prototype.trim "^1.2.1"
-
 error-ex@^1.3.1:
   version "1.3.2"
   resolved "https://registry.yarnpkg.com/error-ex/-/error-ex-1.3.2.tgz#b4ac40648107fdcdcfae242f428bea8a14d4f1bf"
@@ -7725,11 +7530,6 @@ es-abstract@^1.19.0, es-abstract@^1.20.4:
     unbox-primitive "^1.0.2"
     which-typed-array "^1.1.9"
 
-es-array-method-boxes-properly@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/es-array-method-boxes-properly/-/es-array-method-boxes-properly-1.0.0.tgz#873f3e84418de4ee19c5be752990b2e44718d09e"
-  integrity sha512-wd6JXUmyHmt8T5a2xreUwKcGPq6f1f+WwIJkijUqiGcJz1qqnZgP6XIK+QyIWU5lT7imeNxUll48bziG+TSYcA==
-
 es-get-iterator@^1.1.2:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/es-get-iterator/-/es-get-iterator-1.1.3.tgz#3ef87523c5d464d41084b2c3c9c214f1199763d6"
@@ -8866,7 +8666,7 @@ function-bind@^1.1.2:
   resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.2.tgz#2c02d864d97f3ea6c8830c464cbd11ab6eab7a1c"
   integrity sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==
 
-function.prototype.name@^1.1.2, function.prototype.name@^1.1.5:
+function.prototype.name@^1.1.5:
   version "1.1.5"
   resolved "https://registry.yarnpkg.com/function.prototype.name/-/function.prototype.name-1.1.5.tgz#cce0505fe1ffb80503e6f9e46cc64e46a12a9621"
   integrity sha512-uN7m/BzVKQnCUF/iW8jYea67v++2u7m5UgENbHRtdDVclOUP+FMPlCNdmk0h/ysGyo2tavMJEDqJAkJdRa1vMA==
@@ -9259,13 +9059,6 @@ highlight.js@~10.4.1:
   resolved "https://registry.yarnpkg.com/highlight.js/-/highlight.js-10.4.1.tgz#d48fbcf4a9971c4361b3f95f302747afe19dbad0"
   integrity sha512-yR5lWvNz7c85OhVAEAeFhVCc/GV4C30Fjzc/rCP0aCWzc1UUOPUk55dK/qdwTZHBvMZo+eZ2jpk62ndX/xMFlg==
 
-history@*:
-  version "5.3.0"
-  resolved "https://registry.yarnpkg.com/history/-/history-5.3.0.tgz#1548abaa245ba47992f063a0783db91ef201c73b"
-  integrity sha512-ZqaKwjjrAYUYfLG+htGaIIZ4nioX2L70ZUMIFysS3xvBsSG4x/n1V6TXV3N8ZYNuFGlDirFg32T7B6WOUPDYcQ==
-  dependencies:
-    "@babel/runtime" "^7.7.6"
-
 history@^4.9.0:
   version "4.10.1"
   resolved "https://registry.yarnpkg.com/history/-/history-4.10.1.tgz#33371a65e3a83b267434e2b3f3b1b4c58aad4cf3"
@@ -9297,14 +9090,6 @@ hosted-git-info@^2.1.4, hosted-git-info@^5.0.0:
   dependencies:
     lru-cache "^7.5.1"
 
-html-element-map@^1.2.0:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/html-element-map/-/html-element-map-1.3.1.tgz#44b2cbcfa7be7aa4ff59779e47e51012e1c73c08"
-  integrity sha512-6XMlxrAFX4UEEGxctfFnmrFaaZFNf9i5fNuV5wZ3WWQ4FVaNP1aX1LkX9j2mfEx1NpjeE/rL3nmgEn23GdFmrg==
-  dependencies:
-    array.prototype.filter "^1.0.0"
-    call-bind "^1.0.2"
-
 html-encoding-sniffer@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/html-encoding-sniffer/-/html-encoding-sniffer-3.0.0.tgz#2cb1a8cf0db52414776e5b2a7a04d5dd98158de9"
@@ -9340,16 +9125,6 @@ htmlparser2@^8.0.0:
     domutils "^3.0.1"
     entities "^4.4.0"
 
-htmlparser2@^8.0.1:
-  version "8.0.1"
-  resolved "https://registry.yarnpkg.com/htmlparser2/-/htmlparser2-8.0.1.tgz#abaa985474fcefe269bc761a779b544d7196d010"
-  integrity sha512-4lVbmc1diZC7GUJQtRQ5yBAeUCL1exyMwmForWkRLnwyzWBFxN633SALPMGYaWZvKe9j1pRZJpauvmxENSp/EA==
-  dependencies:
-    domelementtype "^2.3.0"
-    domhandler "^5.0.2"
-    domutils "^3.0.1"
-    entities "^4.3.0"
-
 http-errors@2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-2.0.0.tgz#b7774a1486ef73cf7667ac9ae0858c012c57b9d3"
@@ -9642,7 +9417,7 @@ is-binary-path@~2.1.0:
   dependencies:
     binary-extensions "^2.0.0"
 
-is-boolean-object@^1.0.1, is-boolean-object@^1.1.0:
+is-boolean-object@^1.1.0:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/is-boolean-object/-/is-boolean-object-1.1.2.tgz#5c6dc200246dd9321ae4b885a114bb1f75f63719"
   integrity sha512-gDYaKHJmnj4aWxyj6YHyXVpdQawtVLHU5cb+eztPGczf6cjuTdwve5ZIEfgXqH4e57An1D1AKf8CZ3kYrQRqYA==
@@ -9660,7 +9435,7 @@ is-buffer@~1.1.6:
   resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be"
   integrity sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==
 
-is-callable@^1.1.3, is-callable@^1.1.4, is-callable@^1.1.5, is-callable@^1.2.7:
+is-callable@^1.1.3, is-callable@^1.1.4, is-callable@^1.2.7:
   version "1.2.7"
   resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.7.tgz#3bc2a85ea742d9e36205dcacdd72ca1fdc51b055"
   integrity sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA==
@@ -9846,7 +9621,7 @@ is-potential-custom-element-name@^1.0.1:
   resolved "https://registry.yarnpkg.com/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.1.tgz#171ed6f19e3ac554394edf78caa05784a45bebb5"
   integrity sha512-bCYeRA2rVibKZd+s2625gGnGF/t7DSqDs4dP7CrLA1m7jKWz6pps0LpYLJN8Q64HtmPKJ1hrN3nzPNKFEKOUiQ==
 
-is-regex@^1.0.5, is-regex@^1.1.0, is-regex@^1.1.4:
+is-regex@^1.1.4:
   version "1.1.4"
   resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.1.4.tgz#eef5663cd59fa4c0ae339505323df6854bb15958"
   integrity sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==
@@ -9888,11 +9663,6 @@ is-string@^1.0.5, is-string@^1.0.7:
   dependencies:
     has-tostringtag "^1.0.0"
 
-is-subset@^0.1.1:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/is-subset/-/is-subset-0.1.1.tgz#8a59117d932de1de00f245fcdd39ce43f1e939a6"
-  integrity sha512-6Ybun0IkarhmEqxXCNw/C0bna6Zb/TkfUX9UbwJtK6ObwAVCxmAP308WWTHviM/zAqXk05cdhYsUsZeGQh99iw==
-
 is-symbol@^1.0.2, is-symbol@^1.0.3:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/is-symbol/-/is-symbol-1.0.4.tgz#a6dac93b635b063ca6872236de88910a57af139c"
@@ -10427,10 +10197,10 @@ language-tags@=1.0.5:
   dependencies:
     language-subtag-registry "~0.3.2"
 
-launchdarkly-js-client-sdk@^3.1.3:
-  version "3.1.3"
-  resolved "https://registry.yarnpkg.com/launchdarkly-js-client-sdk/-/launchdarkly-js-client-sdk-3.1.3.tgz#e046439f0e4f0bfd6d38b9eaa4420a6e40ffc0c7"
-  integrity sha512-/JR/ri8z3bEj9RFTTKDjd+con4F1MsWUea1MmBDtFj4gDA0l9NDm1KzhMKiIeoBdmB2rSaeFYe4CaYOEp8IryA==
+launchdarkly-js-client-sdk@^3.1.4:
+  version "3.1.4"
+  resolved "https://registry.yarnpkg.com/launchdarkly-js-client-sdk/-/launchdarkly-js-client-sdk-3.1.4.tgz#e613cb53412533c07ccf140ae570fc994c59758d"
+  integrity sha512-yq0FeklpVuHMSRz7jfUAfyM7I/659RvGztqJ0Y9G5eN/ZrG1o2W61ZU0Nrv/gqZCtLXjarh/u1otxSFFBjTpHw==
   dependencies:
     escape-string-regexp "^4.0.0"
     launchdarkly-js-sdk-common "5.0.3"
@@ -10444,13 +10214,13 @@ launchdarkly-js-sdk-common@5.0.3:
     fast-deep-equal "^2.0.1"
     uuid "^8.0.0"
 
-launchdarkly-react-client-sdk@^3.0.6:
-  version "3.0.6"
-  resolved "https://registry.yarnpkg.com/launchdarkly-react-client-sdk/-/launchdarkly-react-client-sdk-3.0.6.tgz#5c694a4a013757d2afb5213efd28d9c16af1595e"
-  integrity sha512-r7gSshScugjnJB4lJ6mAOMKpV4Pj/wUks3tsRHdfeXgER9jPdxmZOAkm0besMjK0S7lfQdjxJ2KIXrh+Mn1sQA==
+launchdarkly-react-client-sdk@3.0.10:
+  version "3.0.10"
+  resolved "https://registry.yarnpkg.com/launchdarkly-react-client-sdk/-/launchdarkly-react-client-sdk-3.0.10.tgz#33816d939d9bd18b0723c0fd30b4772f2429f3de"
+  integrity sha512-ssb3KWe9z42+q8X2u32OrlDntGLsv0NP/p4E2Hx4O9RU0OeFm9v6omOlIk9SMsYEQD4QzLSXAp5L3cSN2ssLlA==
   dependencies:
     hoist-non-react-statics "^3.3.2"
-    launchdarkly-js-client-sdk "^3.1.3"
+    launchdarkly-js-client-sdk "^3.1.4"
     lodash.camelcase "^4.3.0"
 
 lazy-ass@^1.6.0:
@@ -10629,26 +10399,11 @@ lodash.debounce@^4.0.8:
   resolved "https://registry.yarnpkg.com/lodash.debounce/-/lodash.debounce-4.0.8.tgz#82d79bff30a67c4005ffd5e2515300ad9ca4d7af"
   integrity sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow==
 
-lodash.escape@^4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/lodash.escape/-/lodash.escape-4.0.1.tgz#c9044690c21e04294beaa517712fded1fa88de98"
-  integrity sha512-nXEOnb/jK9g0DYMr1/Xvq6l5xMD7GDG55+GSYIYmS0G4tBk/hURD4JR9WCavs04t33WmJx9kCyp9vJ+mr4BOUw==
-
-lodash.flattendeep@^4.4.0:
-  version "4.4.0"
-  resolved "https://registry.yarnpkg.com/lodash.flattendeep/-/lodash.flattendeep-4.4.0.tgz#fb030917f86a3134e5bc9bec0d69e0013ddfedb2"
-  integrity sha512-uHaJFihxmJcEX3kT4I23ABqKKalJ/zDrDg0lsFtc1h+3uw49SIJ5beyhx5ExVRti3AvKoOJngIj7xz3oylPdWQ==
-
 lodash.get@^4.3.0:
   version "4.4.2"
   resolved "https://registry.yarnpkg.com/lodash.get/-/lodash.get-4.4.2.tgz#2d177f652fa31e939b4438d5341499dfa3825e99"
   integrity sha512-z+Uw/vLuy6gQe8cfaFWD7p0wVv8fJl3mbzXh33RS+0oW2wvUqiRXiQ69gLWSLpgB5/6sU+r6BlQR0MBILadqTQ==
 
-lodash.isequal@^4.5.0:
-  version "4.5.0"
-  resolved "https://registry.yarnpkg.com/lodash.isequal/-/lodash.isequal-4.5.0.tgz#415c4478f2bcc30120c22ce10ed3226f7d3e18e0"
-  integrity sha512-pDo3lu8Jhfjqls6GkMgpahsF9kCyayhgykjyLMNFTKWrpVdAQtYyB4muAMWozBB4ig/dtWAmsMxLEI8wuz+DYQ==
-
 lodash.isplainobject@^4.0.6:
   version "4.0.6"
   resolved "https://registry.yarnpkg.com/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz#7c526a52d89b45c45cc690b88163be0497f550cb"
@@ -10740,10 +10495,10 @@ lru-cache@^7.5.1:
   resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-10.0.0.tgz#b9e2a6a72a129d81ab317202d93c7691df727e61"
   integrity sha512-svTf/fzsKHffP42sujkO/Rjs37BCIsQVRCeNYIm9WN8rgT7ffoUnRtZCqU+6BqcSBdv8gwJeTz8knJpgACeQMw==
 
-luxon@^3.2.1:
-  version "3.2.1"
-  resolved "https://registry.yarnpkg.com/luxon/-/luxon-3.2.1.tgz#14f1af209188ad61212578ea7e3d518d18cee45f"
-  integrity sha512-QrwPArQCNLAKGO/C+ZIilgIuDnEnKx5QYODdDtbFaxzsbZcc/a7WFq7MhsVYgRlwawLtvOUESTlfJ+hc/USqPg==
+luxon@3.4.4:
+  version "3.4.4"
+  resolved "https://registry.yarnpkg.com/luxon/-/luxon-3.4.4.tgz#cf20dc27dc532ba41a169c43fdcc0063601577af"
+  integrity sha512-zobTr7akeGHnv7eBOXcRgMeCP6+uyYsczwmeRCauvpvaAltgNyTbLH/+VaEAPUeWBT+1GuNmz4wC/6jtQzbbVA==
 
 lz-string@^1.4.4:
   version "1.4.4"
@@ -11380,14 +11135,6 @@ min-indent@^1.0.0, min-indent@^1.0.1:
   resolved "https://registry.yarnpkg.com/min-indent/-/min-indent-1.0.1.tgz#a63f681673b30571fbe8bc25686ae746eefa9869"
   integrity sha512-I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg==
 
-mini-create-react-context@^0.3.0:
-  version "0.3.3"
-  resolved "https://registry.yarnpkg.com/mini-create-react-context/-/mini-create-react-context-0.3.3.tgz#b1b2bc6604d3a6c5d9752bad7692615410ebb38e"
-  integrity sha512-TtF6hZE59SGmS4U8529qB+jJFeW6asTLDIpPgvPLSCsooAwJS7QprHIFTqv9/Qh3NdLwQxFYgiHX5lqb6jqzPA==
-  dependencies:
-    "@babel/runtime" "^7.12.1"
-    tiny-warning "^1.0.3"
-
 minimatch@3.1.2, minimatch@^3.0.2, minimatch@^3.0.4, minimatch@^3.0.5, minimatch@^3.1.1, minimatch@^3.1.2:
   version "3.1.2"
   resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.1.2.tgz#19cd194bfd3e428f049a70817c038d89ab4be35b"
@@ -11492,11 +11239,6 @@ moment@^2.10.2:
   resolved "https://registry.yarnpkg.com/moment/-/moment-2.29.4.tgz#3dbe052889fe7c1b2ed966fcb3a77328964ef108"
   integrity sha512-5LC9SOxjSc2HF6vO2CyuTDNivEdoz2IvyJJGj6X8DJ0eFyfszE0QiEd+iXmBvUP3WHxSjFH/vIsA0EN00cgr8w==
 
-moo@^0.5.0:
-  version "0.5.2"
-  resolved "https://registry.yarnpkg.com/moo/-/moo-0.5.2.tgz#f9fe82473bc7c184b0d32e2215d3f6e67278733c"
-  integrity sha512-iSAJLHYKnX41mKcJKjqvnAN9sf0LMDTXDEvFv+ffuRR9a1MIuXLjMNL6EsnDHSkKLTWNqQQ5uo61P4EbU4NU+Q==
-
 mri@^1.1.0, mri@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/mri/-/mri-1.2.0.tgz#6721480fec2a11a4889861115a48b6cbe7cc8f0b"
@@ -11588,16 +11330,6 @@ natural-compare@^1.4.0:
   resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7"
   integrity sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==
 
-nearley@^2.7.10:
-  version "2.20.1"
-  resolved "https://registry.yarnpkg.com/nearley/-/nearley-2.20.1.tgz#246cd33eff0d012faf197ff6774d7ac78acdd474"
-  integrity sha512-+Mc8UaAebFzgV+KpI5n7DasuuQCHA89dmwm7JXw3TV43ukfNQ9DnBH3Mdb2g/I4Fdxc26pwimBWvjIw0UAILSQ==
-  dependencies:
-    commander "^2.19.0"
-    moo "^0.5.0"
-    railroad-diagrams "^1.0.0"
-    randexp "0.4.6"
-
 negotiator@0.6.3:
   version "0.6.3"
   resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.3.tgz#58e323a72fedc0d6f9cd4d31fe49f51479590ccd"
@@ -11711,13 +11443,6 @@ npm-run-path@^5.1.0:
   dependencies:
     path-key "^4.0.0"
 
-nth-check@^2.0.1:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/nth-check/-/nth-check-2.1.1.tgz#c9eab428effce36cd6b92c924bdb000ef1f1ed1d"
-  integrity sha512-lqjrjmaOoAnWfMmBPL+XNnynZh2+swxiX3WUE0s4yEHI6m+AwrK2UZOimIRl3X/4QctVqS8AiZjFqyOGrMXb/w==
-  dependencies:
-    boolbase "^1.0.0"
-
 number-is-nan@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz#097b602b53422a522c1afb8790318336941a011d"
@@ -11733,12 +11458,12 @@ object-assign@^4.0.1, object-assign@^4.1.0, object-assign@^4.1.1:
   resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"
   integrity sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==
 
-object-inspect@^1.12.2, object-inspect@^1.12.3, object-inspect@^1.7.0, object-inspect@^1.9.0:
+object-inspect@^1.12.2, object-inspect@^1.12.3, object-inspect@^1.9.0:
   version "1.12.3"
   resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.12.3.tgz#ba62dffd67ee256c8c086dfae69e016cd1f198b9"
   integrity sha512-geUvdk7c+eizMNUDkRpW1wJwgfOiOeHbxBR/hLXK1aT6zmVSO0jsQcs7fj6MGw89jC/cjGfLcNOrtMYtGqm81g==
 
-object-is@^1.0.1, object-is@^1.0.2, object-is@^1.1.2, object-is@^1.1.5:
+object-is@^1.0.1, object-is@^1.1.5:
   version "1.1.5"
   resolved "https://registry.yarnpkg.com/object-is/-/object-is-1.1.5.tgz#b9deeaa5fc7f1846a0faecdceec138e5778f53ac"
   integrity sha512-3cyDsyHgtmi7I7DfSSI2LDp6SK2lwvtbg0p0R1e0RvTqF5ceGx+K2dfSjm1bKDMVCFEDAQvy+o8c6a7VujOddw==
@@ -11751,7 +11476,7 @@ object-keys@^1.1.1:
   resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.1.tgz#1c47f272df277f3b1daf061677d9c82e2322c60e"
   integrity sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==
 
-object.assign@^4.1.0, object.assign@^4.1.3, object.assign@^4.1.4:
+object.assign@^4.1.3, object.assign@^4.1.4:
   version "4.1.4"
   resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.4.tgz#9673c7c7c351ab8c4d0b516f4343ebf4dfb7799f"
   integrity sha512-1mxKf0e58bvyjSCtKYY4sRe9itRk3PJpquJOjeIkz885CczcI4IvJJDLPS72oowuSh+pBxUFROpX+TU++hxhZQ==
@@ -11761,7 +11486,7 @@ object.assign@^4.1.0, object.assign@^4.1.3, object.assign@^4.1.4:
     has-symbols "^1.0.3"
     object-keys "^1.1.1"
 
-object.entries@^1.1.1, object.entries@^1.1.2, object.entries@^1.1.6:
+object.entries@^1.1.6:
   version "1.1.6"
   resolved "https://registry.yarnpkg.com/object.entries/-/object.entries-1.1.6.tgz#9737d0e5b8291edd340a3e3264bb8a3b00d5fa23"
   integrity sha512-leTPzo4Zvg3pmbQ3rDK69Rl8GQvIqMWubrkxONG9/ojtFE2rD9fjMKfSI5BxW3osRH1m6VdzmqK8oAY9aT4x5w==
@@ -11770,7 +11495,7 @@ object.entries@^1.1.1, object.entries@^1.1.2, object.entries@^1.1.6:
     define-properties "^1.1.4"
     es-abstract "^1.20.4"
 
-object.fromentries@^2.0.5, object.fromentries@^2.0.6:
+object.fromentries@^2.0.6:
   version "2.0.6"
   resolved "https://registry.yarnpkg.com/object.fromentries/-/object.fromentries-2.0.6.tgz#cdb04da08c539cffa912dcd368b886e0904bfa73"
   integrity sha512-VciD13dswC4j1Xt5394WR4MzmAQmlgN72phd/riNp9vtD7tp4QQWJ0R4wvclXcafgcYK8veHRed2W6XeGBvcfg==
@@ -11787,7 +11512,7 @@ object.hasown@^1.1.2:
     define-properties "^1.1.4"
     es-abstract "^1.20.4"
 
-object.values@^1.1.1, object.values@^1.1.5, object.values@^1.1.6:
+object.values@^1.1.6:
   version "1.1.6"
   resolved "https://registry.yarnpkg.com/object.values/-/object.values-1.1.6.tgz#4abbaa71eba47d63589d402856f908243eea9b1d"
   integrity sha512-FVVTkD1vENCsAcwNs9k6jea2uHC/X0+JcjG8YA60FN5CMaJmG95wT9jek/xX9nornqGRrBkKtzuAu2wuHpKqvw==
@@ -12023,14 +11748,6 @@ parse-srcset@^1.0.2:
   resolved "https://registry.yarnpkg.com/parse-srcset/-/parse-srcset-1.0.2.tgz#f2bd221f6cc970a938d88556abc589caaaa2bde1"
   integrity sha512-/2qh0lav6CmI15FzA3i/2Bzk2zCgQhGMkvhOhKNcBVQ1ldgpbfiNTVslmooUmWJcADi1f1kIeynbDRVzNlfR6Q==
 
-parse5-htmlparser2-tree-adapter@^7.0.0:
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/parse5-htmlparser2-tree-adapter/-/parse5-htmlparser2-tree-adapter-7.0.0.tgz#23c2cc233bcf09bb7beba8b8a69d46b08c62c2f1"
-  integrity sha512-B77tOZrqqfUfnVcOrUvfdLbz4pu4RopLD/4vmu3HUPswwTA8OH0EMW9BlWR2B0RCoiZRAHEUu7IxeP1Pd1UU+g==
-  dependencies:
-    domhandler "^5.0.2"
-    parse5 "^7.0.0"
-
 parse5@^7.0.0, parse5@^7.1.2:
   version "7.1.2"
   resolved "https://registry.yarnpkg.com/parse5/-/parse5-7.1.2.tgz#0736bebbfd77793823240a23b7fc5e010b7f8e32"
@@ -12413,15 +12130,6 @@ prompts@^2.4.0:
     kleur "^3.0.3"
     sisteransi "^1.0.5"
 
-prop-types-exact@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/prop-types-exact/-/prop-types-exact-1.2.0.tgz#825d6be46094663848237e3925a98c6e944e9869"
-  integrity sha512-K+Tk3Kd9V0odiXFP9fwDHUYRyvK3Nun3GVyPapSIs5OBkITAm15W0CPFD/YKTkMUAbc0b9CUwRQp2ybiBIq+eA==
-  dependencies:
-    has "^1.0.3"
-    object.assign "^4.1.0"
-    reflect.ownkeys "^0.2.0"
-
 prop-types@^15.0.0, prop-types@^15.5.8, prop-types@^15.6.0, prop-types@^15.6.2, prop-types@^15.7.2, prop-types@^15.8.1:
   version "15.8.1"
   resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.8.1.tgz#67d87bf1a694f48435cf332c24af10214a3140b5"
@@ -12559,11 +12267,6 @@ raf@^3.4.1:
   dependencies:
     performance-now "^2.1.0"
 
-railroad-diagrams@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/railroad-diagrams/-/railroad-diagrams-1.0.0.tgz#eb7e6267548ddedfb899c1b90e57374559cddb7e"
-  integrity sha512-cz93DjNeLY0idrCNOH6PviZGRN9GJhsdm9hpn1YCS879fj4W+x5IFJhhkRZcwVgMmFF7R82UA/7Oh+R8lLZg6A==
-
 ramda@0.25.0, ramda@~0.25.0:
   version "0.25.0"
   resolved "https://registry.yarnpkg.com/ramda/-/ramda-0.25.0.tgz#8fdf68231cffa90bc2f9460390a0cb74a29b29a9"
@@ -12579,14 +12282,6 @@ ramda@^0.28.0:
   resolved "https://registry.yarnpkg.com/ramda/-/ramda-0.28.0.tgz#acd785690100337e8b063cab3470019be427cc97"
   integrity sha512-9QnLuG/kPVgWvMQ4aODhsBUFKOUmnbUnsSXACv+NCQZcHbeb+v8Lodp8OVxtRULN1/xOyYLLaL6npE6dMq5QTA==
 
-randexp@0.4.6:
-  version "0.4.6"
-  resolved "https://registry.yarnpkg.com/randexp/-/randexp-0.4.6.tgz#e986ad5e5e31dae13ddd6f7b3019aa7c87f60ca3"
-  integrity sha512-80WNmd9DA0tmZrw9qQa62GPPWfuXJknrmVmLcxvq4uZBdYqb1wYoKTmnlGUchvVWe0XiLupYkBoXVOxz3C8DYQ==
-  dependencies:
-    discontinuous-range "1.0.0"
-    ret "~0.1.10"
-
 range-parser@1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/range-parser/-/range-parser-1.2.0.tgz#f49be6b487894ddc40dcc94a322f611092e00d5e"
@@ -12789,16 +12484,16 @@ react-remove-scroll@2.5.5:
     use-callback-ref "^1.3.0"
     use-sidecar "^1.1.2"
 
-react-router-dom@~5.1.2:
-  version "5.1.2"
-  resolved "https://registry.yarnpkg.com/react-router-dom/-/react-router-dom-5.1.2.tgz#06701b834352f44d37fbb6311f870f84c76b9c18"
-  integrity sha512-7BPHAaIwWpZS074UKaw1FjVdZBSVWEk8IuDXdB+OkLb8vd/WRQIpA4ag9WQk61aEfQs47wHyjWUoUGGZxpQXew==
+react-router-dom@~5.3.4:
+  version "5.3.4"
+  resolved "https://registry.yarnpkg.com/react-router-dom/-/react-router-dom-5.3.4.tgz#2ed62ffd88cae6db134445f4a0c0ae8b91d2e5e6"
+  integrity sha512-m4EqFMHv/Ih4kpcBCONHbkT68KoAeHN4p3lAGoNryfHi0dMy0kCzEZakiKRsvg5wHZ/JLrLW8o8KomWiz/qbYQ==
   dependencies:
-    "@babel/runtime" "^7.1.2"
+    "@babel/runtime" "^7.12.13"
     history "^4.9.0"
     loose-envify "^1.3.1"
     prop-types "^15.6.2"
-    react-router "5.1.2"
+    react-router "5.3.4"
     tiny-invariant "^1.0.2"
     tiny-warning "^1.0.0"
 
@@ -12809,16 +12504,15 @@ react-router-hash-link@^2.3.1:
   dependencies:
     prop-types "^15.7.2"
 
-react-router@5.1.2:
-  version "5.1.2"
-  resolved "https://registry.yarnpkg.com/react-router/-/react-router-5.1.2.tgz#6ea51d789cb36a6be1ba5f7c0d48dd9e817d3418"
-  integrity sha512-yjEuMFy1ONK246B+rsa0cUam5OeAQ8pyclRDgpxuSCrAlJ1qN9uZ5IgyKC7gQg0w8OM50NXHEegPh/ks9YuR2A==
+react-router@5.3.4:
+  version "5.3.4"
+  resolved "https://registry.yarnpkg.com/react-router/-/react-router-5.3.4.tgz#8ca252d70fcc37841e31473c7a151cf777887bb5"
+  integrity sha512-Ys9K+ppnJah3QuaRiLxk+jDWOR1MekYQrlytiXxC1RyfbdsZkS5pvKAzCCr031xHixZwpnsYNT5xysdFHQaYsA==
   dependencies:
-    "@babel/runtime" "^7.1.2"
+    "@babel/runtime" "^7.12.13"
     history "^4.9.0"
     hoist-non-react-statics "^3.1.0"
     loose-envify "^1.3.1"
-    mini-create-react-context "^0.3.0"
     path-to-regexp "^1.7.0"
     prop-types "^15.6.2"
     react-is "^16.6.0"
@@ -12856,7 +12550,7 @@ react-style-singleton@^2.2.1:
     invariant "^2.2.4"
     tslib "^2.0.0"
 
-react-test-renderer@^16.0.0-0:
+react-test-renderer@16.14.0:
   version "16.14.0"
   resolved "https://registry.yarnpkg.com/react-test-renderer/-/react-test-renderer-16.14.0.tgz#e98360087348e260c56d4fe2315e970480c228ae"
   integrity sha512-L8yPjqPE5CZO6rKsKXRO/rVPiaCOy0tQQJbC+UjPNlobl5mad59lvPjwFsQHTvL03caVDIVr9x9/OSgDe6I5Eg==
@@ -13057,11 +12751,6 @@ redux@^4.0.0, redux@^4.0.4, redux@^4.0.5:
   dependencies:
     "@babel/runtime" "^7.9.2"
 
-reflect.ownkeys@^0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/reflect.ownkeys/-/reflect.ownkeys-0.2.0.tgz#749aceec7f3fdf8b63f927a04809e90c5c0b3460"
-  integrity sha512-qOLsBKHCpSOFKK1NUOCGC5VyeufB6lEsFe92AL2bhIJsacZS1qdoOZSbPk3MYKuT2cFlRDnulKXuuElIrMjGUg==
-
 regenerate-unicode-properties@^10.1.0:
   version "10.1.0"
   resolved "https://registry.yarnpkg.com/regenerate-unicode-properties/-/regenerate-unicode-properties-10.1.0.tgz#7c3192cab6dd24e21cb4461e5ddd7dd24fa8374c"
@@ -13307,11 +12996,6 @@ restricted-input@3.0.5:
   dependencies:
     "@braintree/browser-detection" "^1.12.1"
 
-ret@~0.1.10:
-  version "0.1.15"
-  resolved "https://registry.yarnpkg.com/ret/-/ret-0.1.15.tgz#b8a4825d5bdb1fc3f6f53c2bc33f81388681c7bc"
-  integrity sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg==
-
 reusify@^1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/reusify/-/reusify-1.0.4.tgz#90da382b1e126efc02146e90845a88db12925d76"
@@ -13379,14 +13063,6 @@ rrweb-cssom@^0.6.0:
   resolved "https://registry.yarnpkg.com/rrweb-cssom/-/rrweb-cssom-0.6.0.tgz#ed298055b97cbddcdeb278f904857629dec5e0e1"
   integrity sha512-APM0Gt1KoXBz0iIkkdB/kfvGOwC4UuJFeG/c+yV7wSc7q96cG/kJ0HiYCnzivD9SB53cLV1MlHFNfOuPaadYSw==
 
-rst-selector-parser@^2.2.3:
-  version "2.2.3"
-  resolved "https://registry.yarnpkg.com/rst-selector-parser/-/rst-selector-parser-2.2.3.tgz#81b230ea2fcc6066c89e3472de794285d9b03d91"
-  integrity sha512-nDG1rZeP6oFTLN6yNDV/uiAvs1+FS/KlrEwh7+y7dpuApDBy6bI2HTBcc0/V8lv9OTqfyD34eF7au2pm8aBbhA==
-  dependencies:
-    lodash.flattendeep "^4.4.0"
-    nearley "^2.7.10"
-
 run-async@^2.4.0:
   version "2.4.1"
   resolved "https://registry.yarnpkg.com/run-async/-/run-async-2.4.1.tgz#8440eccf99ea3e70bd409d49aab88e10c189a455"
@@ -13514,10 +13190,10 @@ semver-compare@^1.0.0:
   resolved "https://registry.yarnpkg.com/semver-compare/-/semver-compare-1.0.0.tgz#0dee216a1c941ab37e9efb1788f6afc5ff5537fc"
   integrity sha512-YM3/ITh2MJ5MtzaM429anh+x2jiLVjqILF4m4oyQB18W7Ggea7BfqdH/wGMK7dDiMghv/6WG7znWMwUDzJiXow==
 
-"semver@2 || 3 || 4 || 5", semver@^5.5.0, semver@^5.6.0, semver@^5.7.0, semver@^5.7.1, semver@^6.0.0, semver@^6.1.0, semver@^6.1.2, semver@^6.3.0, semver@^6.3.1, semver@^7.3.2, semver@^7.3.5, semver@^7.3.7, semver@^7.5.2, semver@^7.5.3:
-  version "7.5.4"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-7.5.4.tgz#483986ec4ed38e1c6c48c34894a9182dbff68a6e"
-  integrity sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==
+"semver@2 || 3 || 4 || 5", semver@^5.5.0, semver@^5.6.0, semver@^6.0.0, semver@^6.1.0, semver@^6.1.2, semver@^6.3.0, semver@^6.3.1, semver@^7.3.2, semver@^7.3.5, semver@^7.3.7, semver@^7.5.2, semver@^7.5.3:
+  version "7.6.0"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-7.6.0.tgz#1a46a4db4bffcccd97b743b5005c8325f23d4e2d"
+  integrity sha512-EnwXhrlwXMk9gKu5/flx5sv/an57AkRplG3hTK68W7FRDN+k+OWBj65M7719OkA82XLBxrcX0KSHj+X5COhOVg==
   dependencies:
     lru-cache "^6.0.0"
 
@@ -13977,15 +13653,6 @@ string.prototype.padend@^3.0.0:
     define-properties "^1.1.4"
     es-abstract "^1.20.4"
 
-string.prototype.trim@^1.2.1:
-  version "1.2.7"
-  resolved "https://registry.yarnpkg.com/string.prototype.trim/-/string.prototype.trim-1.2.7.tgz#a68352740859f6893f14ce3ef1bb3037f7a90533"
-  integrity sha512-p6TmeT1T3411M8Cgg9wBTMRtY2q9+PNy9EV1i2lIXUN/btt763oIfxwN3RR8VU6wHX8j/1CFy0L+YuThm6bgOg==
-  dependencies:
-    call-bind "^1.0.2"
-    define-properties "^1.1.4"
-    es-abstract "^1.20.4"
-
 string.prototype.trimend@^1.0.6:
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.6.tgz#c4a27fa026d979d79c04f17397f250a462944533"
@@ -14327,7 +13994,7 @@ tiny-invariant@^1.0.2, tiny-invariant@^1.0.6, tiny-invariant@^1.3.1:
   resolved "https://registry.yarnpkg.com/tiny-invariant/-/tiny-invariant-1.3.1.tgz#8560808c916ef02ecfd55e66090df23a4b7aa642"
   integrity sha512-AD5ih2NlSssTCwsMznbvwMZpJ1cbhkGd2uueNxzv2jDlEeZdU04JQfRnggJQ8DrcVBGjAsCKwFBbDlVNtEMlzw==
 
-tiny-warning@^1.0.0, tiny-warning@^1.0.2, tiny-warning@^1.0.3:
+tiny-warning@^1.0.0, tiny-warning@^1.0.2:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/tiny-warning/-/tiny-warning-1.0.3.tgz#94a30db453df4c643d0fd566060d60a875d84754"
   integrity sha512-lBN9zLN/oAf68o3zNXYrdCt1kP8WsiGW8Oo2ka41b2IM5JL/S1CTyX1rW0mb/zSuJun0ZUrDxx4sqvYS2FWzPA==