diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
new file mode 100644
index 0000000000..e72141f2b3
--- /dev/null
+++ b/.github/pull_request_template.md
@@ -0,0 +1,22 @@
+# Description
+
+Please include a summary of the changes and the related issue.
+
+# Breaking changes
+
+Does this PR include any breaking changes we should be aware of?
+
+# Screenshots
+
+You can add screenshots here if applicable.
+
+# Checklist
+
+:pushpin: Always:
+- [ ] I have set a clear title
+- [ ] My PR is small and contains a single feature
+- [ ] I have [checked my own PR](## "Fix typo's and remove unused or commented out code")
+
+:zap: Most of the time:
+- [ ] I have added or updated test cases
+- [ ] I have updated the README if needed
\ No newline at end of file
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 91acedbcf5..b869b886cc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,31 @@
+## <small>2.1.1 (2023-10-18)</small>
+
+
+#### Fixes
+
+* **admin-ui** Add missing RTL compatibility to some admin-ui components (#2451) ([ec61b58](https://github.com/vendure-ecommerce/vendure/commit/ec61b58)), closes [#2451](https://github.com/vendure-ecommerce/vendure/issues/2451)
+* **admin-ui** Add unique location id for prod detail variants table ([ce2b251](https://github.com/vendure-ecommerce/vendure/commit/ce2b251))
+* **admin-ui** Do not load pending search index updates if permissions are insufficient (#2460) ([08ad982](https://github.com/vendure-ecommerce/vendure/commit/08ad982)), closes [#2460](https://github.com/vendure-ecommerce/vendure/issues/2460) [#2456](https://github.com/vendure-ecommerce/vendure/issues/2456)
+* **admin-ui** Fix customer group select input ([02fe6ae](https://github.com/vendure-ecommerce/vendure/commit/02fe6ae)), closes [#2441](https://github.com/vendure-ecommerce/vendure/issues/2441)
+* **admin-ui** Fix initial render of code editor input marking dirty ([9dda349](https://github.com/vendure-ecommerce/vendure/commit/9dda349))
+* **admin-ui** Fix setting facet values on new product ([9d88db2](https://github.com/vendure-ecommerce/vendure/commit/9d88db2)), closes [#2355](https://github.com/vendure-ecommerce/vendure/issues/2355)
+* **admin-ui** Improve Italian translations (#2445) ([3fd93c7](https://github.com/vendure-ecommerce/vendure/commit/3fd93c7)), closes [#2445](https://github.com/vendure-ecommerce/vendure/issues/2445)
+* **admin-ui** Improvements to Nepali translation (#2463) ([4035fda](https://github.com/vendure-ecommerce/vendure/commit/4035fda)), closes [#2463](https://github.com/vendure-ecommerce/vendure/issues/2463)
+* **admin-ui** Make ExtensionHostComponent work with new extension APIs ([b917e62](https://github.com/vendure-ecommerce/vendure/commit/b917e62))
+* **admin-ui** Make utility margin/padding classes RTL-compatible ([74c6634](https://github.com/vendure-ecommerce/vendure/commit/74c6634))
+* **common** Remove trademark symbols from normalized strings (#2447) ([9aac191](https://github.com/vendure-ecommerce/vendure/commit/9aac191)), closes [#2447](https://github.com/vendure-ecommerce/vendure/issues/2447)
+* **core** Fix custom field resolver for eager translatable relation (#2457) ([09dd7df](https://github.com/vendure-ecommerce/vendure/commit/09dd7df)), closes [#2453](https://github.com/vendure-ecommerce/vendure/issues/2453)
+* **core** Fix regression in ProductService.findOne not using relations ([92cad43](https://github.com/vendure-ecommerce/vendure/commit/92cad43)), closes [#2443](https://github.com/vendure-ecommerce/vendure/issues/2443)
+* **core** Normalize email address on updating Customer ([957d0ad](https://github.com/vendure-ecommerce/vendure/commit/957d0ad)), closes [#2449](https://github.com/vendure-ecommerce/vendure/issues/2449)
+* **payments-plugin** Fix Mollie klarna AutoCapture (#2446) ([8db459a](https://github.com/vendure-ecommerce/vendure/commit/8db459a)), closes [#2446](https://github.com/vendure-ecommerce/vendure/issues/2446)
+* **payments-plugin** Fix Stripe controller crashing server instance (#2454) ([b0ece21](https://github.com/vendure-ecommerce/vendure/commit/b0ece21)), closes [#2454](https://github.com/vendure-ecommerce/vendure/issues/2454) [#2450](https://github.com/vendure-ecommerce/vendure/issues/2450)
+* **payments-plugin** Idempotent 'paid' Mollie webhooks (#2462) ([2f7a8d5](https://github.com/vendure-ecommerce/vendure/commit/2f7a8d5)), closes [#2462](https://github.com/vendure-ecommerce/vendure/issues/2462)
+
+#### Features
+
+* **admin-ui** Add Croatian translation (#2442) ([b594c55](https://github.com/vendure-ecommerce/vendure/commit/b594c55)), closes [#2442](https://github.com/vendure-ecommerce/vendure/issues/2442)
+* **admin-ui** Add product slug in product multi selector dialog component (#2461) ([b7f3452](https://github.com/vendure-ecommerce/vendure/commit/b7f3452)), closes [#2461](https://github.com/vendure-ecommerce/vendure/issues/2461)
+
 ## 2.1.0 (2023-10-11)
 
 
@@ -82,6 +110,8 @@ https://www.apollographql.com/docs/apollo-server/migration/
 
 * The ForbiddenError now defaults to a "warning" rather than "error" log level. Previously this was causing too much noise in logging services and the new level better reflects the severity of the error.
 
+* If after update you are running into the error `[GraphQL error]: Message: POST body missing, invalid Content-Type, or JSON object has no keys.`, this may be due to having the [body-parser](https://www.npmjs.com/package/body-parser) `json` middleware configured in your app. You should be able to safely remove this middleware in order to resolve the issue.
+
 ## <small>2.0.10 (2023-10-11)</small>
 
 
diff --git a/docs/docs/guides/core-concepts/orders/index.md b/docs/docs/guides/core-concepts/orders/index.md
index b999b47b5a..68d9222a18 100644
--- a/docs/docs/guides/core-concepts/orders/index.md
+++ b/docs/docs/guides/core-concepts/orders/index.md
@@ -117,6 +117,20 @@ const myCustomOrderProcess = configureDefaultOrderProcess({
   // Orders to have a shipping method assigned
   // before payment.
   arrangingPaymentRequiresShipping: false,
+    
+  // Other constraints which can be disabled. See the
+  // DefaultOrderProcessOptions interface docs for full
+  // explanations.
+  //  
+  // checkModificationPayments: false,
+  // checkAdditionalPaymentsAmount: false,
+  // checkAllVariantsExist: false,
+  // arrangingPaymentRequiresContents: false,
+  // arrangingPaymentRequiresCustomer: false,
+  // arrangingPaymentRequiresStock: false,
+  // checkPaymentsCoverTotal: false,
+  // checkAllItemsBeforeCancel: false,
+  // checkFulfillmentStates: false,
 });
 
 export const config: VendureConfig = {
@@ -241,6 +255,81 @@ const customerValidationProcess: OrderProcess<'ValidatingCustomer'> = {
 For an explanation of the `init()` method and `injector` argument, see the guide on [injecting dependencies in configurable operations](/guides/developer-guide/strategies-configurable-operations/#injecting-dependencies).
 :::
 
+### Responding to a state transition
+
+Once an order has successfully transitioned to a new state, the [`onTransitionEnd` state transition hook](/reference/typescript-api/state-machine/state-machine-config#ontransitionend) is called. This can be used to perform some action
+upon successful state transition.
+
+In this example, we have a referral service which creates a new referral for a customer when they complete an order. We want to create the referral only if the customer has a referral code associated with their account.
+
+```ts
+import { OrderProcess, OrderState } from '@vendure/core';
+
+import { ReferralService } from '../service/referral.service';
+
+let referralService: ReferralService;
+
+export const referralOrderProcess: OrderProcess<OrderState> = {
+    init: (injector) => {
+        referralService = injector.get(ReferralService);
+    },
+    onTransitionEnd: async (fromState, toState, data) => {
+        const { order, ctx } = data;
+        if (toState === 'PaymentSettled') {
+            if (order.customFields.referralCode) {
+                await referralService.createReferralForOrder(ctx, order);
+            }
+        }
+    },
+};
+```
+
+:::caution
+Use caution when modifying an order inside the `onTransitionEnd` function. The `order` object that gets passed in to this function
+will later be persisted to the database. Therefore any changes must be made to that `order` object, otherwise the changes might be lost.
+
+As an example, let's say we want to add a Surcharge to the order. The following code **will not work as expected**:
+
+```ts
+export const myOrderProcess: OrderProcess<OrderState> = {
+    async onTransitionEnd(fromState, toState, data) {
+        if (fromState === 'AddingItems' && toState === 'ArrangingPayment') {
+            // highlight-start
+            // WARNING: This will not work!  
+            await orderService.addSurchargeToOrder(ctx, order.id, {
+                description: 'Test',
+                listPrice: 42,
+                listPriceIncludesTax: false,
+            });
+            // highlight-end
+        }
+    }
+};
+```
+
+Instead, you need to ensure you **mutate the `order` object**:
+
+```ts
+export const myOrderProcess: OrderProcess<OrderState> = {
+    async onTransitionEnd(fromState, toState, data) {
+        if (fromState === 'AddingItems' && toState === 'ArrangingPayment') {
+            // highlight-start
+            const {surcharges} = await orderService.addSurchargeToOrder(ctx, order.id, {
+                description: 'Test',
+                listPrice: 42,
+                listPriceIncludesTax: false,
+            });
+            // Important: mutate the order object
+            order.surcharges = surcharges;
+            // highlight-end
+        }
+    },
+}
+```
+
+
+:::
+
 ## TypeScript Typings
 
 To make your custom states compatible with standard services you should declare your new states in the following way:
diff --git a/docs/docs/guides/developer-guide/custom-fields/index.md b/docs/docs/guides/developer-guide/custom-fields/index.md
index 9241b16f69..8d69678353 100644
--- a/docs/docs/guides/developer-guide/custom-fields/index.md
+++ b/docs/docs/guides/developer-guide/custom-fields/index.md
@@ -5,6 +5,7 @@ sidebar_position: 3
 
 import Tabs from '@theme/Tabs';
 import TabItem from '@theme/TabItem';
+import CustomFieldProperty from '@site/src/components/CustomFieldProperty';
 
 Custom fields allow you to add your own custom data properties almost every Vendure entity. The entities which may have custom fields defined are listed in the [CustomFields interface documentation](/reference/typescript-api/custom-fields/).
 
@@ -192,6 +193,68 @@ mutation {
 }
 ```
 
+## Accessing custom fields in TypeScript
+
+As well as exposing custom fields via the GraphQL APIs, you can also access them directly in your TypeScript code. This is useful for plugins which need to access custom field data.
+
+Given the following custom field configuration:
+
+```ts title="src/vendure-config.ts"
+import { VendureConfig } from '@vendure/core';
+
+const config: VendureConfig = {
+    // ...
+    customFields: {
+        Customer: [
+            { name: 'externalId', type: 'string' },
+            { name: 'avatar', type: 'relation', entity: Asset },
+        ],
+    },
+};
+```
+
+the `externalId` will be available whenever you access a `Customer` entity:
+
+```ts
+const customer = await this.connection.getRepository(ctx, Customer).findOne({
+    where: { id: 1 },
+});
+console.log(customer.externalId);
+```
+
+The `avatar` relation will require an explicit join to be performed in order to access the data, since it is not
+eagerly loaded by default:
+
+```ts
+const customer = await this.connection.getRepository(ctx, Customer).findOne({
+    where: { id: 1 },
+    relations: {
+        customFields: {
+            avatar: true,
+        }
+    }
+});
+console.log(customer.avatar);
+```
+
+or if using the QueryBuilder API:
+
+```ts
+const customer = await this.connection.getRepository(ctx, Customer).createQueryBuilder('customer')
+    .leftJoinAndSelect('customer.customFields.avatar', 'avatar')
+    .where('customer.id = :id', { id: 1 })
+    .getOne();
+console.log(customer.avatar);
+```
+
+or using the EntityHydrator:
+
+```ts
+const customer = await this.customerService.findOne(ctx, 1);
+await this.entityHydrator.hydrate(ctx, customer, { relations: ['customFields.avatar'] });
+console.log(customer.avatar);
+```
+
 ## Custom field config properties
 
 ### Common properties
@@ -200,9 +263,7 @@ All custom fields share some common properties:
 
 #### name
 
-<span class="badge badge--primary">Required</span>
-
-`string`
+<CustomFieldProperty required={true} type="string"/>
 
 The name of the field. This is used as the column name in the database, and as the GraphQL field name. The name should not contain spaces and by convention should be camelCased.
 
@@ -223,17 +284,13 @@ const config = {
 
 #### type
 
-<span class="badge badge--primary">Required</span>
-
-[`CustomFieldType`](/reference/typescript-api/custom-fields/custom-field-type)
+<CustomFieldProperty required={true} type="CustomFieldType" typeLink="/reference/typescript-api/custom-fields/custom-field-type"/>
 
 The type of data that will be stored in the field.
 
 #### list
 
-<span class="badge badge--secondary">Optional</span>
-
-`boolean`
+<CustomFieldProperty required={false} type="boolean" />
 
 If set to `true`, then the field will be an array of the specified type. Defaults to `false`.
 
@@ -261,9 +318,7 @@ Setting a custom field to be a list has the following effects:
 
 #### label
 
-<span class="badge badge--secondary">Optional</span>
-
-[`LocalizedStringArray`](/reference/typescript-api/configurable-operation-def/localized-string-array)
+<CustomFieldProperty required={false} type="LocalizedStringArray" typeLink="/reference/typescript-api/configurable-operation-def/localized-string-array"/>
 
 An array of localized labels for the field. These are used in the Admin UI to label the field.
 
@@ -292,9 +347,7 @@ const config = {
 
 #### description
 
-<span class="badge badge--secondary">Optional</span>
-
-[`LocalizedStringArray`](/reference/typescript-api/configurable-operation-def/localized-string-array)
+<CustomFieldProperty required={false} type="LocalizedStringArray" typeLink="/reference/typescript-api/configurable-operation-def/localized-string-array"/>
 
 An array of localized descriptions for the field. These are used in the Admin UI to describe the field.
 
@@ -323,9 +376,7 @@ const config = {
 
 #### public
 
-<span class="badge badge--secondary">Optional</span>
-
-`boolean`
+<CustomFieldProperty required={false} type="boolean" />
 
 Whether the custom field is available via the Shop API. Defaults to `true`.
 
@@ -347,9 +398,7 @@ const config = {
 
 #### readonly
 
-<span class="badge badge--secondary">Optional</span>
-
-`boolean`
+<CustomFieldProperty required={false} type="boolean" />
 
 Whether the custom field can be updated via the GraphQL APIs. Defaults to `false`. If set to `true`, then the field
 can only be updated via direct manipulation via TypeScript code in a plugin.
@@ -372,9 +421,7 @@ const config = {
 
 #### internal
 
-<span class="badge badge--secondary">Optional</span>
-
-`boolean`
+<CustomFieldProperty required={false} type="boolean" />
 
 Whether the custom field is exposed at all via the GraphQL APIs. Defaults to `false`. If set to `true`, then the field will not be available
 via the GraphQL API, but can still be used in TypeScript code in a plugin. Internal fields are useful for storing data which is not intended
@@ -398,9 +445,7 @@ const config = {
 
 #### defaultValue
 
-<span class="badge badge--secondary">Optional</span>
-
-`any`
+<CustomFieldProperty required={false} type="any" />
 
 The default value when an Entity is created with this field. If not provided, then the default value will be `null`. Note that if you set `nullable: false`, then
 you should also provide a `defaultValue` to avoid database errors when creating new entities.
@@ -423,9 +468,7 @@ const config = {
 
 #### nullable
 
-<span class="badge badge--secondary">Optional</span>
-
-`boolean`
+<CustomFieldProperty required={false} type="boolean" />
 
 Whether the field is nullable in the database. If set to `false`, then a `defaultValue` should be provided.
 
@@ -449,9 +492,7 @@ const config = {
 
 #### unique
 
-<span class="badge badge--secondary">Optional</span>
-
-`boolean`
+<CustomFieldProperty required={false} type="boolean" />
 
 Whether the value of the field should be unique. When set to `true`, a UNIQUE constraint is added to the column. Defaults
 to `false`.
@@ -474,9 +515,7 @@ const config = {
 
 #### validate
 
-<span class="badge badge--secondary">Optional</span>
-
-`(value: any) => string | LocalizedString[] | void`
+<CustomFieldProperty required={false} type="(value: any) => string | LocalizedString[] | void" />
 
 A custom validation function. If the value is valid, then the function should not return a value. If a string or LocalizedString array is returned, this is interpreted as an error message.
 
@@ -544,9 +583,7 @@ In addition to the common properties, the `string` custom fields have some type-
 
 #### pattern
 
-<span class="badge badge--secondary">Optional</span>
-
-`string`
+<CustomFieldProperty required={false} type="string" />
 
 A regex pattern which the field value must match. If the value does not match the pattern, then the validation will fail.
 
@@ -568,9 +605,7 @@ const config = {
 
 #### options
 
-<span class="badge badge--secondary">Optional</span>
-
-`{ value: string; label?: LocalizedString[]; }[]`
+<CustomFieldProperty required={false} type="{ value: string; label?: LocalizedString[]; }[]" />
 
 An array of pre-defined options for the field. This is useful for fields which should only have a limited set of values. The `value` property is the value which will be stored in the database, and the `label` property is an optional array of localized strings which will be displayed in the admin UI.
 
@@ -600,9 +635,7 @@ Attempting to set the value of the field to a value which is not in the `options
 
 #### length
 
-<span class="badge badge--secondary">Optional</span>
-
-`number`
+<CustomFieldProperty required={false} type="number" />
 
 The max length of the varchar created in the database. Defaults to 255. Maximum is 65,535.
 
@@ -628,17 +661,13 @@ In addition to the common properties, the `localeString` custom fields have some
 
 #### pattern
 
-<span class="badge badge--secondary">Optional</span>
-
-`string`
+<CustomFieldProperty required={false} type="string" />
 
 Same as the `pattern` property for `string` fields.
 
 #### length
 
-<span class="badge badge--secondary">Optional</span>
-
-`number`
+<CustomFieldProperty required={false} type="number" />
 
 Same as the `length` property for `string` fields.
 
@@ -648,9 +677,7 @@ In addition to the common properties, the `int` & `float` custom fields have som
 
 #### min
 
-<span class="badge badge--secondary">Optional</span>
-
-`number`
+<CustomFieldProperty required={false} type="number" />
 
 The minimum permitted value. If the value is less than this, then the validation will fail.
 
@@ -672,9 +699,7 @@ const config = {
 
 #### max
 
-<span class="badge badge--secondary">Optional</span>
-
-`number`
+<CustomFieldProperty required={false} type="number" />
 
 The maximum permitted value. If the value is greater than this, then the validation will fail.
 
@@ -696,9 +721,7 @@ const config = {
 
 #### step
 
-<span class="badge badge--secondary">Optional</span>
-
-`number`
+<CustomFieldProperty required={false} type="number" />
 
 The step value. This is used in the Admin UI to determine the increment/decrement value of the input field.
 
@@ -726,9 +749,7 @@ The min, max & step properties for datetime fields are intended to be used as de
 
 #### min
 
-<span class="badge badge--secondary">Optional</span>
-
-`string`
+<CustomFieldProperty required={false} type="string" />
 
 The earliest permitted date. If the value is earlier than this, then the validation will fail.
 
@@ -750,9 +771,7 @@ const config = {
 
 #### max
 
-<span class="badge badge--secondary">Optional</span>
-
-`string`
+<CustomFieldProperty required={false} type="string" />
 
 The latest permitted date. If the value is later than this, then the validation will fail.
 
@@ -774,9 +793,7 @@ const config = {
 
 #### step
 
-<span class="badge badge--secondary">Optional</span>
-
-`string`
+<CustomFieldProperty required={false} type="string" />
 
 The step value. See [the MDN datetime-local docs](https://developer.mozilla.org/en-US/docs/Web/HTML/Element/input/datetime-local#step) to understand how this is used.
 
@@ -786,9 +803,8 @@ In addition to the common properties, the `relation` custom fields have some typ
 
 #### entity
 
-<span class="badge badge--primary">Required</span>
+<CustomFieldProperty required={true} type="VendureEntity" typeLink="/reference/typescript-api/entities/vendure-entity" />
 
-`VendureEntity`
 
 The entity which this custom field is referencing. This can be one of the built-in entities, or a custom entity. If the entity is a custom entity, it must extend the `VendureEntity` class.
 
@@ -814,9 +830,7 @@ const config = {
 
 #### eager
 
-<span class="badge badge--secondary">Optional</span>
-
-`boolean`
+<CustomFieldProperty required={false} type="boolean" />
 
 Whether to [eagerly load](https://typeorm.io/#/eager-and-lazy-relations) the relation. Defaults to false. Note that eager loading has performance implications, so should only be used when necessary.
 
@@ -842,9 +856,7 @@ const config = {
 
 #### graphQLType
 
-<span class="badge badge--secondary">Optional</span>
-
-`string`
+<CustomFieldProperty required={false} type="string" />
 
 The name of the GraphQL type that corresponds to the entity. Can be omitted if the GraphQL type name is the same as the entity name, which is the case for all of the built-in entities.
 
@@ -870,11 +882,9 @@ const config = {
 
 In the above example, the `CmsArticle` entity is being used as a related entity. However, the GraphQL type name is `BlogPost`, so we must specify this in the `graphQLType` property, otherwise Vendure will try to extend the GraphQL schema with reference to a non-existent "CmsArticle" type.
 
-### `inverseSide`
-
-<span class="badge badge--secondary">Optional</span>
+#### inverseSide
 
-`string | ((object: VendureEntity) => any);`
+<CustomFieldProperty required={false} type="string | ((object: VendureEntity) => any)" />
 
 Allows you to specify the [inverse side of the relation](https://typeorm.io/#inverse-side-of-the-relationship). Let's say you are adding a relation from `Product`
 to a custom entity which refers back to the product. You can specify this inverse relation like so:
diff --git a/docs/docs/guides/developer-guide/overview/index.md b/docs/docs/guides/developer-guide/overview/index.md
index 2fff5d6d84..c998cffbb5 100644
--- a/docs/docs/guides/developer-guide/overview/index.md
+++ b/docs/docs/guides/developer-guide/overview/index.md
@@ -24,7 +24,7 @@ Vendure is built on the following open-source technologies:
 
 - **SQL Database**: Vendure requires an SQL database compatible with [TypeORM](https://typeorm.io/). Officially we support **PostgreSQL**, **MySQL/MariaDB** and **SQLite** but Vendure can also be used with API-compatible variants such [Amazon Aurora](https://aws.amazon.com/rds/aurora/), [CockroachDB](https://www.cockroachlabs.com/), or [PlanetScale](https://planetscale.com/).
 - **TypeScript & Node.js**: Vendure is written in [TypeScript](https://www.typescriptlang.org/) and runs on [Node.js](https://nodejs.org).
-- **NestJS**: The underlying framework is [NestJS](https://nestjs.com/), which is a full-featured application development framework for Node.js. Building on NestJS means that Vendure from the well-defined structure and rich feature-set and ecosystem that NestJS provides.
+- **NestJS**: The underlying framework is [NestJS](https://nestjs.com/), which is a full-featured application development framework for Node.js. Building on NestJS means that Vendure benefits from the well-defined structure and rich feature-set and ecosystem that NestJS provides.
 - **GraphQL**: The Shop and Admin APIs use [GraphQL](https://graphql.org/), which is a modern API technology which allows you to specify the exact data that your client application needs in a convenient and type-safe way. Internally we use [Apollo Server](https://www.apollographql.com/docs/apollo-server/) to power our GraphQL APIs.
 - **Angular**: The Admin UI is built with [Angular](https://angular.io/), a popular, stable application framework from Google. Note that you do not need to know Angular to use Vendure, and UI extensions can even be written in the front-end framework of your choice, such as React or Vue.
 
diff --git a/docs/docs/guides/developer-guide/rest-endpoint/index.md b/docs/docs/guides/developer-guide/rest-endpoint/index.md
index 2c8dd12e8d..32f033baba 100644
--- a/docs/docs/guides/developer-guide/rest-endpoint/index.md
+++ b/docs/docs/guides/developer-guide/rest-endpoint/index.md
@@ -9,7 +9,7 @@ REST-style endpoints can be defined as part of a [plugin](/guides/developer-guid
 REST endpoints are implemented as NestJS Controllers. For comprehensive documentation, see the [NestJS controllers documentation](https://docs.nestjs.com/controllers).
 :::
 
-In this guide we will define a plugin adds a single REST endpoint at `http://localhost:3000/products` which returns a list of all products.
+In this guide we will define a plugin that adds a single REST endpoint at `http://localhost:3000/products` which returns a list of all products.
 
 ## Create a controller
 
diff --git a/docs/docs/guides/developer-guide/testing/index.md b/docs/docs/guides/developer-guide/testing/index.md
index 40c7d3b994..a07aef1b1e 100644
--- a/docs/docs/guides/developer-guide/testing/index.md
+++ b/docs/docs/guides/developer-guide/testing/index.md
@@ -210,3 +210,38 @@ describe('my plugin', () => {
 });
 ```
 :::
+
+## Accessing internal services
+
+It is possible to access any internal service of the Vendure server via the `server.app` object, which is an instance of the NestJS `INestApplication`.
+
+For example, to access the `ProductService`:
+
+```ts title="src/plugins/my-plugin/e2e/my-plugin.e2e-spec.ts"
+import { createTestEnvironment, testConfig } from '@vendure/testing';
+import { describe, beforeAll } from 'vitest';
+import { MyPlugin } from '../my-plugin.ts';
+
+describe('my plugin', () => {
+    
+    const { server, adminClient, shopClient } = createTestEnvironment({
+        ...testConfig,
+        plugins: [MyPlugin],
+    });
+    
+    // highlight-next-line
+    let productService: ProductService;
+    
+    beforeAll(async () => {
+        await server.init({
+            productsCsvPath: path.join(__dirname, 'fixtures/e2e-products.csv'),
+            initialData: myInitialData,
+            customerCount: 2,
+        });
+        await adminClient.asSuperAdmin();
+        // highlight-next-line
+        productService = server.app.get(ProductService);
+    }, 60000);
+
+});
+```
diff --git a/docs/docs/guides/developer-guide/the-service-layer/index.mdx b/docs/docs/guides/developer-guide/the-service-layer/index.mdx
index 5c96bd3809..2166d16bbe 100644
--- a/docs/docs/guides/developer-guide/the-service-layer/index.mdx
+++ b/docs/docs/guides/developer-guide/the-service-layer/index.mdx
@@ -229,3 +229,83 @@ export class ItemService {
 Further examples can be found in the [TypeORM QueryBuilder documentation](https://typeorm.io/select-query-builder).
 
 :::
+
+### Working with relations
+
+One limitation of TypeORM's typings is that we have no way of knowing at build-time whether a particular relation will be
+joined at runtime. For instance, the following code will build without issues, but will result in a runtime error:
+
+```ts
+const product = await this.connection.getRepository(ctx, Product).findOne({
+    where: { id: productId },
+});
+if (product) {
+    // highlight-start
+    console.log(product.featuredAsset.preview);
+    // ^ Error: Cannot read property 'preview' of undefined
+    // highlight-end
+}
+```
+
+This is because the `featuredAsset` relation is not joined by default. The simple fix for the above example is to use
+the `relations` option:
+
+```ts
+const product = await this.connection.getRepository(ctx, Product).findOne({
+    where: { id: productId },
+    // highlight-next-line
+    relations: { featuredAsset: true },
+});
+```
+or in the case of the QueryBuilder API, we can use the `leftJoinAndSelect()` method:
+
+```ts
+const product = await this.connection.getRepository(ctx, Product).createQueryBuilder('product')
+    // highlight-next-line
+    .leftJoinAndSelect('product.featuredAsset', 'featuredAsset')
+    .where('product.id = :id', { id: productId })
+    .getOne();
+```
+
+### Using the EntityHydrator
+
+But what about when we do not control the code which fetches the entity from the database? For instance, we might be implementing
+a function which gets an entity passed to it by Vendure. In this case, we can use the [`EntityHydrator`](/reference/typescript-api/data-access/entity-hydrator/)
+to ensure that a given relation is "hydrated" (i.e. joined) before we use it:
+
+```ts
+import { EntityHydrator, ShippingCalculator } from '@vendure/core';
+
+let entityHydrator: EntityHydrator;
+
+const myShippingCalculator = new ShippingCalculator({
+    // ... rest of config omitted for brevity
+    init(injector) {
+        entityHydrator = injector.get(EntityHydrator);
+    },
+    calculate: (ctx, order, args) => {
+      // highlight-start
+      // ensure that the customer and customer.groups relations are joined
+      await entityHydrator.hydrate(ctx, order, { relations: ['customer.groups' ]});
+      // highlight-end
+
+      if (order.customer?.groups?.some(g => g.name === 'VIP')) {
+        // ... do something special for VIP customers
+      } else {
+        // ... do something else
+      }
+    },
+});
+```
+
+### Joining relations in built-in service methods
+
+Many of the core services allow an optional `relations` argument in their `findOne()` and `findMany()` and related methods.
+This allows you to specify which relations should be joined when the query is executed. For instance, in the [`ProductService`](/reference/typescript-api/services/product-service)
+there is a `findOne()` method which allows you to specify which relations should be joined:
+
+```ts
+const productWithAssets = await this.productService
+    .findOne(ctx, productId, ['featuredAsset', 'assets']);
+```
+
diff --git a/docs/docs/guides/extending-the-admin-ui/getting-started/index.md b/docs/docs/guides/extending-the-admin-ui/getting-started/index.md
index ee58610e14..6974a33fa2 100644
--- a/docs/docs/guides/extending-the-admin-ui/getting-started/index.md
+++ b/docs/docs/guides/extending-the-admin-ui/getting-started/index.md
@@ -31,7 +31,7 @@ npm install --save-dev @vendure/ui-devkit
 <TabItem value="yarn" label="yarn">
 
 ```bash
-yarn add --save-dev @vendure/ui-devkit
+yarn add --dev @vendure/ui-devkit
 ```
 
 </TabItem>
diff --git a/docs/docs/guides/extending-the-admin-ui/nav-menu/index.md b/docs/docs/guides/extending-the-admin-ui/nav-menu/index.md
index afd11c9331..2d76e8ee78 100644
--- a/docs/docs/guides/extending-the-admin-ui/nav-menu/index.md
+++ b/docs/docs/guides/extending-the-admin-ui/nav-menu/index.md
@@ -71,4 +71,27 @@ Running the server will compile our new shared module into the app, and the resu
 
 It is also possible to override one of the default (built-in) nav menu sections or items. This can be useful for example if you wish to provide a completely different implementation of the product list view.
 
-This is done by setting the `id` property to that of an existing nav menu section or item.
+This is done by setting the `id` property to that of an existing nav menu section or item. The `id` can be found by inspecting the link element in your browser's dev tools for the `data-item-id` attribute:
+
+![Navbar menu id](./nav-menu-id.webp)
+
+## Removing existing nav items
+
+If you would like to remove an existing nav item, you can do so by overriding it and setting the `requiresPermission` property to an invalid value:
+
+```ts title="src/plugins/greeter/ui/providers.ts"
+import { SharedModule, addNavMenuItem} from '@vendure/admin-ui/core';
+
+export default [
+    addNavMenuItem({
+        id: 'collections',  // <-- we will override the "collections" menu item
+        label: 'Collections',
+        routerLink: ['/catalog', 'collections'],
+        // highlight-start
+        // we use an invalid permission which ensures it is hidden from all users
+        requiresPermission: '__disable__'
+        // highlight-end
+    },
+    'catalog'),
+];
+```
diff --git a/docs/docs/guides/extending-the-admin-ui/nav-menu/nav-menu-id.webp b/docs/docs/guides/extending-the-admin-ui/nav-menu/nav-menu-id.webp
new file mode 100644
index 0000000000..5dafda2a2f
Binary files /dev/null and b/docs/docs/guides/extending-the-admin-ui/nav-menu/nav-menu-id.webp differ
diff --git a/docs/docs/guides/storefront/checkout-flow/index.mdx b/docs/docs/guides/storefront/checkout-flow/index.mdx
index 0005193f04..26c8a5c554 100644
--- a/docs/docs/guides/storefront/checkout-flow/index.mdx
+++ b/docs/docs/guides/storefront/checkout-flow/index.mdx
@@ -308,7 +308,7 @@ while the payment is being arranged. The [`transitionOrderToState`](/reference/g
 <TabItem value="Query" label="Query" default>
 
 ```graphql
-mutation TransitionToState($state: String!)
+mutation TransitionToState($state: String!) {
   transitionOrderToState(state: $state) {
     ...ActiveOrder
     ...on OrderStateTransitionError {
diff --git a/docs/docs/guides/storefront/connect-api/index.mdx b/docs/docs/guides/storefront/connect-api/index.mdx
index 35799925ae..0aad8e05ff 100644
--- a/docs/docs/guides/storefront/connect-api/index.mdx
+++ b/docs/docs/guides/storefront/connect-api/index.mdx
@@ -536,7 +536,7 @@ const requestMiddleware: RequestMiddleware = async (request) => {
 
 // Check all responses for a new session token
 const responseMiddleware: ResponseMiddleware = (response) => {
-    if (!(response instanceof Error) && response.errors) {
+    if (!(response instanceof Error) && !response.errors) {
         const authHeader = response.headers.get('vendure-auth-token');
         if (authHeader) {
             // If the session token has been returned by the Vendure
diff --git a/docs/docs/reference/admin-ui-api/custom-input-components/default-inputs.md b/docs/docs/reference/admin-ui-api/custom-input-components/default-inputs.md
index 3f06ec5014..43d825ee45 100644
--- a/docs/docs/reference/admin-ui-api/custom-input-components/default-inputs.md
+++ b/docs/docs/reference/admin-ui-api/custom-input-components/default-inputs.md
@@ -289,7 +289,7 @@ class CustomerGroupFormInputComponent implements FormInputComponent, OnInit {
     constructor(dataService: DataService)
     ngOnInit() => ;
     selectGroup(group: ItemOf<GetCustomerGroupsQuery, 'customerGroups'>) => ;
-    compareWith(o1: ItemOf<GetCustomerGroupsQuery, 'customerGroups'>, o2: ItemOf<GetCustomerGroupsQuery, 'customerGroups'>) => ;
+    compareWith(o1: T, o2: T) => ;
 }
 ```
 * Implements: <code><a href='/reference/admin-ui-api/custom-input-components/form-input-component#forminputcomponent'>FormInputComponent</a></code>, <code>OnInit</code>
@@ -340,7 +340,7 @@ class CustomerGroupFormInputComponent implements FormInputComponent, OnInit {
 
 ### compareWith
 
-<MemberInfo kind="method" type={`(o1: ItemOf&#60;GetCustomerGroupsQuery, 'customerGroups'&#62;, o2: ItemOf&#60;GetCustomerGroupsQuery, 'customerGroups'&#62;) => `}   />
+<MemberInfo kind="method" type={`(o1: T, o2: T) => `}   />
 
 
 
diff --git a/docs/docs/reference/admin-ui-api/custom-table-components/custom-column-component.md b/docs/docs/reference/admin-ui-api/custom-table-components/custom-column-component.md
index 99aa70b88f..13af4351cb 100644
--- a/docs/docs/reference/admin-ui-api/custom-table-components/custom-column-component.md
+++ b/docs/docs/reference/admin-ui-api/custom-table-components/custom-column-component.md
@@ -11,7 +11,7 @@ import MemberDescription from '@site/src/components/MemberDescription';
 
 ## CustomColumnComponent
 
-<GenerationInfo sourceFile="packages/admin-ui/src/lib/core/src/shared/components/data-table-2/data-table-custom-component.service.ts" sourceLine="43" packageName="@vendure/admin-ui" />
+<GenerationInfo sourceFile="packages/admin-ui/src/lib/core/src/shared/components/data-table-2/data-table-custom-component.service.ts" sourceLine="44" packageName="@vendure/admin-ui" />
 
 Components which are to be used to render custom cells in a data table should implement this interface.
 
diff --git a/docs/docs/reference/admin-ui-api/custom-table-components/data-table-component-config.md b/docs/docs/reference/admin-ui-api/custom-table-components/data-table-component-config.md
index 10ad7b2fc9..2409146735 100644
--- a/docs/docs/reference/admin-ui-api/custom-table-components/data-table-component-config.md
+++ b/docs/docs/reference/admin-ui-api/custom-table-components/data-table-component-config.md
@@ -11,7 +11,7 @@ import MemberDescription from '@site/src/components/MemberDescription';
 
 ## DataTableComponentConfig
 
-<GenerationInfo sourceFile="packages/admin-ui/src/lib/core/src/shared/components/data-table-2/data-table-custom-component.service.ts" sourceLine="53" packageName="@vendure/admin-ui" />
+<GenerationInfo sourceFile="packages/admin-ui/src/lib/core/src/shared/components/data-table-2/data-table-custom-component.service.ts" sourceLine="54" packageName="@vendure/admin-ui" />
 
 Configures a <a href='/reference/admin-ui-api/custom-detail-components/custom-detail-component#customdetailcomponent'>CustomDetailComponent</a> to be placed in the given location.
 
diff --git a/docs/docs/reference/typescript-api/data-access/entity-hydrator.md b/docs/docs/reference/typescript-api/data-access/entity-hydrator.md
index 9ac4442c09..317736d30d 100644
--- a/docs/docs/reference/typescript-api/data-access/entity-hydrator.md
+++ b/docs/docs/reference/typescript-api/data-access/entity-hydrator.md
@@ -11,20 +11,42 @@ import MemberDescription from '@site/src/components/MemberDescription';
 
 ## EntityHydrator
 
-<GenerationInfo sourceFile="packages/core/src/service/helpers/entity-hydrator/entity-hydrator.service.ts" sourceLine="53" packageName="@vendure/core" since="1.3.0" />
+<GenerationInfo sourceFile="packages/core/src/service/helpers/entity-hydrator/entity-hydrator.service.ts" sourceLine="75" packageName="@vendure/core" since="1.3.0" />
 
 This is a helper class which is used to "hydrate" entity instances, which means to populate them
-with the specified relations. This is useful when writing plugin code which receives an entity
+with the specified relations. This is useful when writing plugin code which receives an entity,
 and you need to ensure that one or more relations are present.
 
 *Example*
 
 ```ts
-const product = await this.productVariantService
-  .getProductForVariant(ctx, variantId);
+import { Injectable } from '@nestjs/common';
+import { ID, RequestContext, EntityHydrator, ProductVariantService } from '@vendure/core';
 
-await this.entityHydrator
-  .hydrate(ctx, product, { relations: ['facetValues.facet' ]});
+@Injectable()
+export class MyService {
+
+  constructor(
+     // highlight-next-line
+     private entityHydrator: EntityHydrator,
+     private productVariantService: ProductVariantService,
+  ) {}
+
+  myMethod(ctx: RequestContext, variantId: ID) {
+    const product = await this.productVariantService
+      .getProductForVariant(ctx, variantId);
+
+    // at this stage, we don't know which of the Product relations
+    // will be joined at runtime.
+
+    // highlight-start
+    await this.entityHydrator
+      .hydrate(ctx, product, { relations: ['facetValues.facet' ]});
+
+    // You can be sure now that the `facetValues` & `facetValues.facet` relations are populated
+    // highlight-end
+  }
+}
 ```
 
 In this above example, the `product` instance will now have the `facetValues` relation
diff --git a/docs/docs/reference/typescript-api/services/customer-service.md b/docs/docs/reference/typescript-api/services/customer-service.md
index 9de458b184..2e91471aa6 100644
--- a/docs/docs/reference/typescript-api/services/customer-service.md
+++ b/docs/docs/reference/typescript-api/services/customer-service.md
@@ -31,8 +31,8 @@ class CustomerService {
     refreshVerificationToken(ctx: RequestContext, emailAddress: string) => Promise<void>;
     verifyCustomerEmailAddress(ctx: RequestContext, verificationToken: string, password?: string) => Promise<ErrorResultUnion<VerifyCustomerAccountResult, Customer>>;
     requestPasswordReset(ctx: RequestContext, emailAddress: string) => Promise<void>;
-    resetPassword(ctx: RequestContext, passwordResetToken: string, password: string) => Promise<
-        User | PasswordResetTokenExpiredError | PasswordResetTokenInvalidError | PasswordValidationError
+    resetPassword(ctx: RequestContext, passwordResetToken: string, password: string) => Promise<
+        User | PasswordResetTokenExpiredError | PasswordResetTokenInvalidError | PasswordValidationError
     >;
     requestUpdateEmailAddress(ctx: RequestContext, userId: ID, newEmailAddress: string) => Promise<boolean | EmailAddressConflictError>;
     updateEmailAddress(ctx: RequestContext, token: string) => Promise<boolean | IdentifierChangeTokenInvalidError | IdentifierChangeTokenExpiredError>;
@@ -69,8 +69,8 @@ class CustomerService {
 
 <MemberInfo kind="method" type={`(ctx: <a href='/reference/typescript-api/request/request-context#requestcontext'>RequestContext</a>, userId: <a href='/reference/typescript-api/common/id#id'>ID</a>, filterOnChannel:  = true) => Promise&#60;<a href='/reference/typescript-api/entities/customer#customer'>Customer</a> | undefined&#62;`}   />
 
-Returns the Customer entity associated with the given userId, if one exists.
-Setting `filterOnChannel` to `true` will limit the results to Customers which are assigned
+Returns the Customer entity associated with the given userId, if one exists.
+Setting `filterOnChannel` to `true` will limit the results to Customers which are assigned
 to the current active Channel only.
 ### findAddressesByCustomerId
 
@@ -86,13 +86,13 @@ Returns a list of all <a href='/reference/typescript-api/entities/customer-group
 
 <MemberInfo kind="method" type={`(ctx: <a href='/reference/typescript-api/request/request-context#requestcontext'>RequestContext</a>, input: CreateCustomerInput, password?: string) => Promise&#60;ErrorResultUnion&#60;CreateCustomerResult, <a href='/reference/typescript-api/entities/customer#customer'>Customer</a>&#62;&#62;`}   />
 
-Creates a new Customer, including creation of a new User with the special `customer` Role.
-
-If the `password` argument is specified, the Customer will be immediately verified. If not,
-then an <a href='/reference/typescript-api/events/event-types#accountregistrationevent'>AccountRegistrationEvent</a> is published, so that the customer can have their
-email address verified and set their password in a later step using the `verifyCustomerEmailAddress()`
-method.
-
+Creates a new Customer, including creation of a new User with the special `customer` Role.
+
+If the `password` argument is specified, the Customer will be immediately verified. If not,
+then an <a href='/reference/typescript-api/events/event-types#accountregistrationevent'>AccountRegistrationEvent</a> is published, so that the customer can have their
+email address verified and set their password in a later step using the `verifyCustomerEmailAddress()`
+method.
+
 This method is intended to be used in admin-created Customer flows.
 ### update
 
@@ -113,47 +113,47 @@ This method is intended to be used in admin-created Customer flows.
 
 <MemberInfo kind="method" type={`(ctx: <a href='/reference/typescript-api/request/request-context#requestcontext'>RequestContext</a>, input: RegisterCustomerInput) => Promise&#60;RegisterCustomerAccountResult | EmailAddressConflictError | PasswordValidationError&#62;`}   />
 
-Registers a new Customer account with the <a href='/reference/typescript-api/auth/native-authentication-strategy#nativeauthenticationstrategy'>NativeAuthenticationStrategy</a> and starts
-the email verification flow (unless <a href='/reference/typescript-api/auth/auth-options#authoptions'>AuthOptions</a> `requireVerification` is set to `false`)
-by publishing an <a href='/reference/typescript-api/events/event-types#accountregistrationevent'>AccountRegistrationEvent</a>.
-
+Registers a new Customer account with the <a href='/reference/typescript-api/auth/native-authentication-strategy#nativeauthenticationstrategy'>NativeAuthenticationStrategy</a> and starts
+the email verification flow (unless <a href='/reference/typescript-api/auth/auth-options#authoptions'>AuthOptions</a> `requireVerification` is set to `false`)
+by publishing an <a href='/reference/typescript-api/events/event-types#accountregistrationevent'>AccountRegistrationEvent</a>.
+
 This method is intended to be used in storefront Customer-creation flows.
 ### refreshVerificationToken
 
 <MemberInfo kind="method" type={`(ctx: <a href='/reference/typescript-api/request/request-context#requestcontext'>RequestContext</a>, emailAddress: string) => Promise&#60;void&#62;`}   />
 
-Refreshes a stale email address verification token by generating a new one and
+Refreshes a stale email address verification token by generating a new one and
 publishing a <a href='/reference/typescript-api/events/event-types#accountregistrationevent'>AccountRegistrationEvent</a>.
 ### verifyCustomerEmailAddress
 
 <MemberInfo kind="method" type={`(ctx: <a href='/reference/typescript-api/request/request-context#requestcontext'>RequestContext</a>, verificationToken: string, password?: string) => Promise&#60;ErrorResultUnion&#60;VerifyCustomerAccountResult, <a href='/reference/typescript-api/entities/customer#customer'>Customer</a>&#62;&#62;`}   />
 
-Given a valid verification token which has been published in an <a href='/reference/typescript-api/events/event-types#accountregistrationevent'>AccountRegistrationEvent</a>, this
+Given a valid verification token which has been published in an <a href='/reference/typescript-api/events/event-types#accountregistrationevent'>AccountRegistrationEvent</a>, this
 method is used to set the Customer as `verified` as part of the account registration flow.
 ### requestPasswordReset
 
 <MemberInfo kind="method" type={`(ctx: <a href='/reference/typescript-api/request/request-context#requestcontext'>RequestContext</a>, emailAddress: string) => Promise&#60;void&#62;`}   />
 
-Publishes a new <a href='/reference/typescript-api/events/event-types#passwordresetevent'>PasswordResetEvent</a> for the given email address. This event creates
+Publishes a new <a href='/reference/typescript-api/events/event-types#passwordresetevent'>PasswordResetEvent</a> for the given email address. This event creates
 a token which can be used in the `resetPassword()` method.
 ### resetPassword
 
-<MemberInfo kind="method" type={`(ctx: <a href='/reference/typescript-api/request/request-context#requestcontext'>RequestContext</a>, passwordResetToken: string, password: string) => Promise&#60;
         <a href='/reference/typescript-api/entities/user#user'>User</a> | PasswordResetTokenExpiredError | PasswordResetTokenInvalidError | PasswordValidationError
     &#62;`}   />
+<MemberInfo kind="method" type={`(ctx: <a href='/reference/typescript-api/request/request-context#requestcontext'>RequestContext</a>, passwordResetToken: string, password: string) => Promise&#60;         <a href='/reference/typescript-api/entities/user#user'>User</a> | PasswordResetTokenExpiredError | PasswordResetTokenInvalidError | PasswordValidationError     &#62;`}   />
 
-Given a valid password reset token created by a call to the `requestPasswordReset()` method,
+Given a valid password reset token created by a call to the `requestPasswordReset()` method,
 this method will change the Customer's password to that given as the `password` argument.
 ### requestUpdateEmailAddress
 
 <MemberInfo kind="method" type={`(ctx: <a href='/reference/typescript-api/request/request-context#requestcontext'>RequestContext</a>, userId: <a href='/reference/typescript-api/common/id#id'>ID</a>, newEmailAddress: string) => Promise&#60;boolean | EmailAddressConflictError&#62;`}   />
 
-Publishes a <a href='/reference/typescript-api/events/event-types#identifierchangerequestevent'>IdentifierChangeRequestEvent</a> for the given User. This event contains a token
-which is then used in the `updateEmailAddress()` method to change the email address of the User &
+Publishes a <a href='/reference/typescript-api/events/event-types#identifierchangerequestevent'>IdentifierChangeRequestEvent</a> for the given User. This event contains a token
+which is then used in the `updateEmailAddress()` method to change the email address of the User &
 Customer.
 ### updateEmailAddress
 
 <MemberInfo kind="method" type={`(ctx: <a href='/reference/typescript-api/request/request-context#requestcontext'>RequestContext</a>, token: string) => Promise&#60;boolean | IdentifierChangeTokenInvalidError | IdentifierChangeTokenExpiredError&#62;`}   />
 
-Given a valid email update token published in a <a href='/reference/typescript-api/events/event-types#identifierchangerequestevent'>IdentifierChangeRequestEvent</a>, this method
+Given a valid email update token published in a <a href='/reference/typescript-api/events/event-types#identifierchangerequestevent'>IdentifierChangeRequestEvent</a>, this method
 will update the Customer & User email address.
 ### createOrUpdate
 
@@ -184,8 +184,8 @@ Creates a new <a href='/reference/typescript-api/entities/address#address'>Addre
 
 <MemberInfo kind="method" type={`(ctx: <a href='/reference/typescript-api/request/request-context#requestcontext'>RequestContext</a>, order: <a href='/reference/typescript-api/entities/order#order'>Order</a>) => `}   />
 
-If the Customer associated with the given Order does not yet have any Addresses,
-this method will create new Address(es) based on the Order's shipping & billing
+If the Customer associated with the given Order does not yet have any Addresses,
+this method will create new Address(es) based on the Order's shipping & billing
 addresses.
 ### addNoteToCustomer
 
diff --git a/docs/docs/reference/typescript-api/shipping/shipping-calculator.md b/docs/docs/reference/typescript-api/shipping/shipping-calculator.md
index 0e20f9bc3e..bc37d2af30 100644
--- a/docs/docs/reference/typescript-api/shipping/shipping-calculator.md
+++ b/docs/docs/reference/typescript-api/shipping/shipping-calculator.md
@@ -31,7 +31,7 @@ const flatRateCalculator = new ShippingCalculator({
       ui: { component: 'number-form-input', suffix: '%' },
     },
   },
-  calculate: (order, args) => {
+  calculate: (ctx, order, args) => {
     return {
       price: args.rate,
       taxRate: args.taxRate,
@@ -64,7 +64,7 @@ class ShippingCalculator<T extends ConfigArgs = ConfigArgs> extends Configurable
 
 ## ShippingCalculationResult
 
-<GenerationInfo sourceFile="packages/core/src/config/shipping-method/shipping-calculator.ts" sourceLine="74" packageName="@vendure/core" />
+<GenerationInfo sourceFile="packages/core/src/config/shipping-method/shipping-calculator.ts" sourceLine="79" packageName="@vendure/core" />
 
 The return value of the <a href='/reference/typescript-api/shipping/shipping-calculator#calculateshippingfn'>CalculateShippingFn</a>.
 
@@ -108,7 +108,7 @@ needed in the storefront application when listing eligible shipping methods.
 
 ## CalculateShippingFn
 
-<GenerationInfo sourceFile="packages/core/src/config/shipping-method/shipping-calculator.ts" sourceLine="114" packageName="@vendure/core" />
+<GenerationInfo sourceFile="packages/core/src/config/shipping-method/shipping-calculator.ts" sourceLine="119" packageName="@vendure/core" />
 
 A function which implements the specific shipping calculation logic. It takes an <a href='/reference/typescript-api/entities/order#order'>Order</a> and
 an arguments object and should return the shipping price as an integer in cents.
@@ -120,6 +120,6 @@ type CalculateShippingFn<T extends ConfigArgs> = (
     ctx: RequestContext,
     order: Order,
     args: ConfigArgValues<T>,
-    method: ShippingMethod
+    method: ShippingMethod,
 ) => CalculateShippingFnResult
 ```
diff --git a/docs/docusaurus.config.js b/docs/docusaurus.config.js
index 09807a6d1d..9a710fdb91 100644
--- a/docs/docusaurus.config.js
+++ b/docs/docusaurus.config.js
@@ -39,9 +39,7 @@ const config = {
                 docs: {
                     routeBasePath: '/',
                     sidebarPath: require.resolve('./sidebars.js'),
-                    // Please change this to your repo.
-                    // Remove this to remove the "edit this page" links.
-                    editUrl: 'https://github.com/vendure-ecommerce/vendure/tree/new-docs/docs/',
+                    editUrl: 'https://github.com/vendure-ecommerce/vendure/blob/master/docs/',
                     showLastUpdateTime: true,
                 },
                 blog: false,
diff --git a/docs/scraper/config.json b/docs/scraper/config.json
index e37898d586..7ba0afdccb 100644
--- a/docs/scraper/config.json
+++ b/docs/scraper/config.json
@@ -1,12 +1,12 @@
 {
   "index_name": "vendure-docs",
   "start_urls": [
-    "https://vendure-docs-beta.netlify.app/"
+    "https://docs.vendure.io/"
   ],
   "sitemap_urls": [
-    "https://vendure-docs-beta.netlify.app/sitemap.xml"
+    "https://docs.vendure.io/sitemap.xml"
   ],
-  "allowed_domains":["vendure-docs-beta.netlify.app"],
+  "allowed_domains":["docs.vendure.io"],
   "sitemap_alternate_links": true,
   "stop_urls": [],
   "selectors": {
diff --git a/docs/src/components/CustomFieldProperty/index.tsx b/docs/src/components/CustomFieldProperty/index.tsx
new file mode 100644
index 0000000000..6d7eaa6292
--- /dev/null
+++ b/docs/src/components/CustomFieldProperty/index.tsx
@@ -0,0 +1,26 @@
+import React from 'react';
+
+import styles from './styles.module.css';
+
+export default function CustomFieldProperty(props: { required: boolean; type: string; typeLink?: string }) {
+    return (
+        <div className={styles.wrapper}>
+            <div>
+                {props.required ? (
+                    <span className="badge badge--primary">Required</span>
+                ) : (
+                    <span className="badge badge--secondary">Optional</span>
+                )}
+            </div>
+            <div>
+                {props.typeLink ? (
+                    <a href={props.typeLink}>
+                        <code>{props.type}</code>
+                    </a>
+                ) : (
+                    <code>{props.type}</code>
+                )}
+            </div>
+        </div>
+    );
+}
diff --git a/docs/src/components/CustomFieldProperty/styles.module.css b/docs/src/components/CustomFieldProperty/styles.module.css
new file mode 100644
index 0000000000..c39cb0d49f
--- /dev/null
+++ b/docs/src/components/CustomFieldProperty/styles.module.css
@@ -0,0 +1,7 @@
+.wrapper {
+    display: flex;
+    flex-wrap: wrap;
+    gap: 4px 12px;
+    margin-top: -12px;
+    margin-bottom: 22px;
+}
diff --git a/docs/static/_redirects b/docs/static/_redirects
new file mode 100644
index 0000000000..95e6949e57
--- /dev/null
+++ b/docs/static/_redirects
@@ -0,0 +1,22 @@
+# Add redirects for popular pages from old docs
+/getting-started                            /guides/getting-started/installation
+/developer-guide/customizing-models         /guides/developer-guide/custom-fields
+/developer-guide/authentication             /guides/core-concepts/auth
+/developer-guide/payment-integrations       /reference/core-plugins/payments-plugin
+/plugins                                    /guides/developer-guide/plugins
+/plugins/extending-the-admin-ui             /guides/extending-the-admin-ui/getting-started
+/storefront/building-a-storefront           /guides/storefront/storefront-starters
+/developer-guide/multi-vendor-marketplaces  /guides/how-to/multi-vendor-marketplaces
+/developer-guide/configuration              /guides/developer-guide/configuration
+/plugins/plugin-examples/extending-graphql-api  /guides/developer-guide/extend-graphql-api
+/storefront/order-workflow                  /guides/storefront/active-order
+/typescript-api/custom-fields               /reference/typescript-api/custom-fields
+/developer-guide/migrations                 /guides/developer-guide/migrations
+/typescript-api/core-plugins/payments-plugin/stripe-plugin  /reference/core-plugins/payments-plugin/stripe-plugin
+/developer-guide/channels                   /guides/core-concepts/channels
+/graphql-api/shop                           /reference/graphql-api/shop/queries
+/developer-guide/customizing-the-order-process  /guides/core-concepts/orders
+/developer-guide/importing-product-data     /guides/developer-guide/importing-data
+/plugins/plugin-examples                    /guides/developer-guide/plugins
+/plugins/writing-a-vendure-plugin           /guides/developer-guide/plugins
+/deployment/using-docker                    /guides/deployment/using-docker
diff --git a/lerna.json b/lerna.json
index 9bd1a14a2b..5724fa51b1 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,6 +1,6 @@
 {
     "packages": ["packages/*"],
-    "version": "2.1.0",
+    "version": "2.1.1",
     "npmClient": "yarn",
     "command": {
         "version": {
diff --git a/packages/admin-ui-plugin/package.json b/packages/admin-ui-plugin/package.json
index 5ba4b10852..a3c4abf95f 100644
--- a/packages/admin-ui-plugin/package.json
+++ b/packages/admin-ui-plugin/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@vendure/admin-ui-plugin",
-    "version": "2.1.0",
+    "version": "2.1.1",
     "main": "lib/index.js",
     "types": "lib/index.d.ts",
     "files": [
@@ -21,8 +21,8 @@
     "devDependencies": {
         "@types/express": "^4.17.8",
         "@types/fs-extra": "^9.0.1",
-        "@vendure/common": "^2.1.0",
-        "@vendure/core": "^2.1.0",
+        "@vendure/common": "^2.1.1",
+        "@vendure/core": "^2.1.1",
         "express": "^4.17.1",
         "rimraf": "^3.0.2",
         "typescript": "4.9.5"
diff --git a/packages/admin-ui-plugin/src/constants.ts b/packages/admin-ui-plugin/src/constants.ts
index 85de601824..ae226c25a2 100644
--- a/packages/admin-ui-plugin/src/constants.ts
+++ b/packages/admin-ui-plugin/src/constants.ts
@@ -24,4 +24,5 @@ export const defaultAvailableLanguages = [
     LanguageCode.it,
     LanguageCode.fa,
     LanguageCode.ne,
+    LanguageCode.hr,
 ];
diff --git a/packages/admin-ui/i18n-coverage.json b/packages/admin-ui/i18n-coverage.json
index e67e57c87e..b3884e559e 100644
--- a/packages/admin-ui/i18n-coverage.json
+++ b/packages/admin-ui/i18n-coverage.json
@@ -1,6 +1,7 @@
 {
-  "generatedOn": "2023-10-02T08:18:19.015Z",
-  "lastCommit": "e92e8207cb0296964e779bc81f731a035ec76768",
+  "generatedOn": "2023-10-17T19:32:07.745Z",
+  "lastCommit": "97bc099006adda7449a7b63e72191c2bb7e7b4ed",
+
   "translationStatus": {
     "ar": {
       "tokenCount": 761,
@@ -47,6 +48,11 @@
       "translatedCount": 760,
       "percentage": 100
     },
+    "ne": {
+      "tokenCount": 761,
+      "translatedCount": 725,
+      "percentage": 95
+    },
     "pl": {
       "tokenCount": 761,
       "translatedCount": 400,
diff --git a/packages/admin-ui/package-lock.json b/packages/admin-ui/package-lock.json
index c4e21caa31..28c7689beb 100644
--- a/packages/admin-ui/package-lock.json
+++ b/packages/admin-ui/package-lock.json
@@ -1,6 +1,6 @@
 {
     "name": "@vendure/admin-ui",
-    "version": "2.1.0",
+    "version": "2.1.1",
     "lockfileVersion": 1,
     "requires": true,
     "dependencies": {
diff --git a/packages/admin-ui/package.json b/packages/admin-ui/package.json
index ff463be840..ea8074581c 100644
--- a/packages/admin-ui/package.json
+++ b/packages/admin-ui/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@vendure/admin-ui",
-    "version": "2.1.0",
+    "version": "2.1.1",
     "license": "MIT",
     "scripts": {
         "ng": "ng",
@@ -49,7 +49,7 @@
         "@ng-select/ng-select": "^11.1.1",
         "@ngx-translate/core": "^15.0.0",
         "@ngx-translate/http-loader": "^8.0.0",
-        "@vendure/common": "^2.1.0",
+        "@vendure/common": "^2.1.1",
         "@webcomponents/custom-elements": "^1.6.0",
         "apollo-angular": "^5.0.0",
         "apollo-upload-client": "^17.0.0",
diff --git a/packages/admin-ui/src/lib/catalog/src/catalog.module.ts b/packages/admin-ui/src/lib/catalog/src/catalog.module.ts
index eb39d6ef01..bb92ca351f 100644
--- a/packages/admin-ui/src/lib/catalog/src/catalog.module.ts
+++ b/packages/admin-ui/src/lib/catalog/src/catalog.module.ts
@@ -9,7 +9,6 @@ import {
     GetFacetDetailDocument,
     GetProductDetailDocument,
     GetProductVariantDetailDocument,
-    GetStockLocationDetailDocument,
     PageService,
     SharedModule,
 } from '@vendure/admin-ui/core';
@@ -57,12 +56,12 @@ import {
 import { ProductListComponent } from './components/product-list/product-list.component';
 import { ProductOptionsEditorComponent } from './components/product-options-editor/product-options-editor.component';
 import { ProductVariantDetailComponent } from './components/product-variant-detail/product-variant-detail.component';
-import { ProductVariantListComponent } from './components/product-variant-list/product-variant-list.component';
 import {
     assignProductVariantsToChannelBulkAction,
-    removeProductVariantsFromChannelBulkAction,
     deleteProductVariantsBulkAction,
+    removeProductVariantsFromChannelBulkAction,
 } from './components/product-variant-list/product-variant-list-bulk-actions';
+import { ProductVariantListComponent } from './components/product-variant-list/product-variant-list.component';
 import { ProductVariantQuickJumpComponent } from './components/product-variant-quick-jump/product-variant-quick-jump.component';
 import { ProductVariantsEditorComponent } from './components/product-variants-editor/product-variants-editor.component';
 import { ProductVariantsTableComponent } from './components/product-variants-table/product-variants-table.component';
@@ -118,10 +117,7 @@ const CATALOG_COMPONENTS = [
     ],
 })
 export class CatalogModule {
-    constructor(
-        private bulkActionRegistryService: BulkActionRegistryService,
-        private pageService: PageService,
-    ) {
+    constructor(bulkActionRegistryService: BulkActionRegistryService, pageService: PageService) {
         bulkActionRegistryService.registerBulkAction(assignFacetValuesToProductsBulkAction);
         bulkActionRegistryService.registerBulkAction(assignProductsToChannelBulkAction);
         bulkActionRegistryService.registerBulkAction(assignProductVariantsToChannelBulkAction);
@@ -170,30 +166,6 @@ export class CatalogModule {
             route: 'variants',
             component: ProductVariantListComponent,
         });
-        // pageService.registerPageTab({
-        //     priority: 0,
-        //     location: 'stock-location-detail',
-        //     tab: _('catalog.stock-location'),
-        //     route: '',
-        //     component: detailComponentWithResolver({
-        //         component: StockLocationDetailComponent,
-        //         query: GetStockLocationDetailDocument,
-        //         entityKey: 'stockLocation',
-        //         getBreadcrumbs: entity => [
-        //             {
-        //                 label: entity ? entity.name : _('catalog.create-new-stock-location'),
-        //                 link: [entity?.id],
-        //             },
-        //         ],
-        //     }),
-        // });
-        // pageService.registerPageTab({
-        //     priority: 0,
-        //     location: 'product-list',
-        //     tab: _('catalog.stock-locations'),
-        //     route: 'stock-locations',
-        //     component: StockLocationListComponent,
-        // });
         pageService.registerPageTab({
             priority: 0,
             location: 'product-variant-detail',
diff --git a/packages/admin-ui/src/lib/catalog/src/components/product-detail/product-detail.component.html b/packages/admin-ui/src/lib/catalog/src/components/product-detail/product-detail.component.html
index a9ecbb895b..189e242e1b 100644
--- a/packages/admin-ui/src/lib/catalog/src/components/product-detail/product-detail.component.html
+++ b/packages/admin-ui/src/lib/catalog/src/components/product-detail/product-detail.component.html
@@ -198,6 +198,7 @@
                 <ng-template #variantList>
                     <vdr-product-variant-list
                         [productId]="this.id"
+                        dataTableId="product-detail-variants-list"
                         [hideLanguageSelect]="true"
                     ></vdr-product-variant-list>
                 </ng-template>
diff --git a/packages/admin-ui/src/lib/catalog/src/components/product-detail/product-detail.component.ts b/packages/admin-ui/src/lib/catalog/src/components/product-detail/product-detail.component.ts
index 07d030d4e1..87e8daa4c0 100644
--- a/packages/admin-ui/src/lib/catalog/src/components/product-detail/product-detail.component.ts
+++ b/packages/admin-ui/src/lib/catalog/src/components/product-detail/product-detail.component.ts
@@ -1,6 +1,5 @@
 import { ChangeDetectionStrategy, ChangeDetectorRef, Component, OnDestroy, OnInit } from '@angular/core';
 import { FormBuilder, UntypedFormGroup, Validators } from '@angular/forms';
-import { ActivatedRoute, Router } from '@angular/router';
 import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker';
 import {
     Asset,
@@ -20,7 +19,6 @@ import {
     PRODUCT_DETAIL_FRAGMENT,
     ProductDetailFragment,
     ProductVariantFragment,
-    ServerConfigService,
     TypedBaseDetailComponent,
     unicodePatternValidator,
     UpdateProductInput,
@@ -33,17 +31,8 @@ import { normalizeString } from '@vendure/common/lib/normalize-string';
 import { DEFAULT_CHANNEL_CODE } from '@vendure/common/lib/shared-constants';
 import { unique } from '@vendure/common/lib/unique';
 import { gql } from 'apollo-angular';
-import { combineLatest, concat, EMPTY, from, Observable } from 'rxjs';
-import {
-    distinctUntilChanged,
-    map,
-    mergeMap,
-    shareReplay,
-    skip,
-    switchMap,
-    switchMapTo,
-    take,
-} from 'rxjs/operators';
+import { combineLatest, concat, EMPTY, from, Observable, of } from 'rxjs';
+import { distinctUntilChanged, map, mergeMap, shareReplay, switchMap, take } from 'rxjs/operators';
 
 import { ProductDetailService } from '../../providers/product-detail/product-detail.service';
 import { ApplyFacetDialogComponent } from '../apply-facet-dialog/apply-facet-dialog.component';
@@ -91,9 +80,6 @@ export class ProductDetailComponent
     public readonly updatePermissions = [Permission.UpdateCatalog, Permission.UpdateProduct];
 
     constructor(
-        route: ActivatedRoute,
-        router: Router,
-        serverConfigService: ServerConfigService,
         private productDetailService: ProductDetailService,
         private formBuilder: FormBuilder,
         private modalService: ModalService,
@@ -106,11 +92,15 @@ export class ProductDetailComponent
 
     ngOnInit() {
         this.init();
-        const productFacetValues$ = this.entity$.pipe(map(product => product.facetValues));
+
+        const productFacetValues$ = this.isNew$.pipe(
+            switchMap(isNew => {
+                return isNew ? of([]) : this.entity$.pipe(map(product => product.facetValues));
+            }),
+        );
         const productGroup = this.detailForm;
         // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
         const formFacetValueIdChanges$ = productGroup.get('facetValueIds')!.valueChanges.pipe(
-            skip(1),
             distinctUntilChanged(),
             switchMap(ids =>
                 this.dataService.facet
@@ -121,7 +111,7 @@ export class ProductDetailComponent
         );
         this.facetValues$ = concat(
             productFacetValues$.pipe(take(1)),
-            productFacetValues$.pipe(switchMapTo(formFacetValueIdChanges$)),
+            productFacetValues$.pipe(switchMap(() => formFacetValueIdChanges$)),
         );
         this.productChannels$ = this.entity$.pipe(map(p => p.channels));
     }
@@ -261,6 +251,7 @@ export class ProductDetailComponent
                     facetValueIds: unique([...currentFacetValueIds, ...facetValueIds]),
                 });
                 productGroup.markAsDirty();
+                this.changeDetector.markForCheck();
             }
         });
     }
diff --git a/packages/admin-ui/src/lib/catalog/src/components/product-variant-list/product-variant-list.component.html b/packages/admin-ui/src/lib/catalog/src/components/product-variant-list/product-variant-list.component.html
index 1b11b1eb38..62466347e3 100644
--- a/packages/admin-ui/src/lib/catalog/src/components/product-variant-list/product-variant-list.component.html
+++ b/packages/admin-ui/src/lib/catalog/src/components/product-variant-list/product-variant-list.component.html
@@ -7,7 +7,7 @@
 </vdr-page-block>
 <vdr-data-table-2
     class="mt-2"
-    id="product-variant-list"
+    [id]="dataTableId || 'product-variant-list'"
     [items]="items$ | async"
     [itemsPerPage]="itemsPerPage$ | async"
     [totalItems]="totalItems$ | async"
diff --git a/packages/admin-ui/src/lib/catalog/src/components/product-variant-list/product-variant-list.component.ts b/packages/admin-ui/src/lib/catalog/src/components/product-variant-list/product-variant-list.component.ts
index 395a10dd06..2e9dc191ff 100644
--- a/packages/admin-ui/src/lib/catalog/src/components/product-variant-list/product-variant-list.component.ts
+++ b/packages/admin-ui/src/lib/catalog/src/components/product-variant-list/product-variant-list.component.ts
@@ -1,7 +1,7 @@
 import { Component, Input, OnInit } from '@angular/core';
 import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker';
 import {
-    LogicalOperator,
+    DataTableLocationId,
     ProductVariantListQueryDocument,
     TypedBaseListComponent,
 } from '@vendure/admin-ui/core';
@@ -17,6 +17,7 @@ export class ProductVariantListComponent
 {
     @Input() productId?: string;
     @Input() hideLanguageSelect = false;
+    @Input() dataTableId: DataTableLocationId | undefined;
     readonly customFields = this.getCustomFieldConfig('ProductVariant');
     readonly filters = this.createFilterCollection()
         .addIdFilter()
diff --git a/packages/admin-ui/src/lib/core/src/common/version.ts b/packages/admin-ui/src/lib/core/src/common/version.ts
index 21801009be..88bd71ebae 100644
--- a/packages/admin-ui/src/lib/core/src/common/version.ts
+++ b/packages/admin-ui/src/lib/core/src/common/version.ts
@@ -1,2 +1,2 @@
 // Auto-generated by the set-version.js script.
-export const ADMIN_UI_VERSION = '2.1.0';
+export const ADMIN_UI_VERSION = '2.1.1';
diff --git a/packages/admin-ui/src/lib/core/src/core.module.ts b/packages/admin-ui/src/lib/core/src/core.module.ts
index 5c23645a6b..8324271b69 100644
--- a/packages/admin-ui/src/lib/core/src/core.module.ts
+++ b/packages/admin-ui/src/lib/core/src/core.module.ts
@@ -30,6 +30,7 @@ import { LocalStorageService } from './providers/local-storage/local-storage.ser
 import { NotificationService } from './providers/notification/notification.service';
 import { registerDefaultFormInputs } from './shared/dynamic-form-inputs/default-form-inputs';
 import { SharedModule } from './shared/shared.module';
+import { Permission } from './public_api';
 
 @NgModule({
     imports: [
@@ -107,6 +108,7 @@ export class CoreModule {
     private initAlerts() {
         this.alertsService.configureAlert({
             id: 'pending-search-index-updates',
+            requiredPermissions: [Permission.ReadCatalog, Permission.ReadProduct],
             check: () =>
                 this.dataService.product
                     .getPendingSearchIndexUpdates()
diff --git a/packages/admin-ui/src/lib/core/src/extension/register-route-component.ts b/packages/admin-ui/src/lib/core/src/extension/register-route-component.ts
index b3f3a8e8ba..df36938b75 100644
--- a/packages/admin-ui/src/lib/core/src/extension/register-route-component.ts
+++ b/packages/admin-ui/src/lib/core/src/extension/register-route-component.ts
@@ -86,6 +86,19 @@ export function registerRouteComponent<
     const breadcrumbSubject$ = new BehaviorSubject<BreadcrumbValue>(options.breadcrumb ?? '');
     const titleSubject$ = new BehaviorSubject<string | undefined>(options.title);
 
+    if (getBreadcrumbs != null && (query == null || entityKey == null)) {
+        console.error(
+            [
+                `[${
+                    options.path ?? 'custom'
+                } route] When using the "getBreadcrumbs" option, the "query" and "entityKey" options must also be provided.`,
+                ``,
+                `Alternatively, use the "breadcrumb" option instead, or use the "PageMetadataService" inside your Angular component`,
+                `or the "usePageMetadata" React hook to set the breadcrumb.`,
+            ].join('\n'),
+        );
+    }
+
     const resolveFn:
         | ResolveFn<{
               entity: Observable<ResultOf<T>[Field] | null>;
@@ -118,7 +131,7 @@ export function registerRouteComponent<
         data: {
             breadcrumb: breadcrumbSubject$,
             ...(options.routeConfig?.data ?? {}),
-            ...(getBreadcrumbs
+            ...(getBreadcrumbs && query && entityKey
                 ? {
                       breadcrumb: data =>
                           data.detail.entity.pipe(map((entity: any) => getBreadcrumbs(entity))),
diff --git a/packages/admin-ui/src/lib/core/src/providers/alerts/alerts.service.ts b/packages/admin-ui/src/lib/core/src/providers/alerts/alerts.service.ts
index 69abd9ecb3..bd555a9985 100644
--- a/packages/admin-ui/src/lib/core/src/providers/alerts/alerts.service.ts
+++ b/packages/admin-ui/src/lib/core/src/providers/alerts/alerts.service.ts
@@ -1,7 +1,18 @@
 import { Injectable } from '@angular/core';
 import { notNullOrUndefined } from '@vendure/common/lib/shared-utils';
-import { BehaviorSubject, combineLatest, interval, isObservable, Observable, Subject, switchMap } from 'rxjs';
-import { map, mapTo, startWith, take } from 'rxjs/operators';
+import {
+    BehaviorSubject,
+    combineLatest,
+    interval,
+    isObservable,
+    Observable,
+    of,
+    Subject,
+    switchMap,
+} from 'rxjs';
+import { filter, first, map, mapTo, startWith, take } from 'rxjs/operators';
+import { Permission } from '../../common/generated-types';
+import { DataService } from '../../data/providers/data.service';
 
 export interface AlertConfig<T = any> {
     id: string;
@@ -10,6 +21,7 @@ export interface AlertConfig<T = any> {
     isAlert: (value: T) => boolean;
     action: (data: T) => void;
     label: (data: T) => { text: string; translationVars?: { [key: string]: string | number } };
+    requiredPermissions?: Permission[];
 }
 
 export interface ActiveAlert {
@@ -74,7 +86,7 @@ export class AlertsService {
     private alertsMap = new Map<string, Alert<any>>();
     private configUpdated = new Subject<void>();
 
-    constructor() {
+    constructor(private dataService: DataService) {
         const alerts$ = this.configUpdated.pipe(
             mapTo([...this.alertsMap.values()]),
             startWith([...this.alertsMap.values()]),
@@ -91,8 +103,26 @@ export class AlertsService {
     }
 
     configureAlert<T>(config: AlertConfig<T>) {
-        this.alertsMap.set(config.id, new Alert(config));
-        this.configUpdated.next();
+        this.hasSufficientPermissions(config.requiredPermissions)
+            .pipe(first())
+            .subscribe(hasSufficientPermissions => {
+                if (hasSufficientPermissions) {
+                    this.alertsMap.set(config.id, new Alert(config));
+                    this.configUpdated.next();
+                }
+            });
+    }
+
+    hasSufficientPermissions(permissions?: Permission[]) {
+        if (!permissions || permissions.length === 0) {
+            return of(true);
+        }
+        return this.dataService.client.userStatus().stream$.pipe(
+            filter(({ userStatus }) => userStatus.isLoggedIn),
+            map(({ userStatus }) =>
+                permissions.some(permission => userStatus.permissions.includes(permission)),
+            ),
+        );
     }
 
     refresh(id?: string) {
diff --git a/packages/admin-ui/src/lib/core/src/public_api.ts b/packages/admin-ui/src/lib/core/src/public_api.ts
index 8e6acb6291..0d33c245b8 100644
--- a/packages/admin-ui/src/lib/core/src/public_api.ts
+++ b/packages/admin-ui/src/lib/core/src/public_api.ts
@@ -113,6 +113,7 @@ export * from './providers/i18n/custom-message-format-compiler';
 export * from './providers/i18n/i18n.service';
 export * from './providers/job-queue/job-queue.service';
 export * from './providers/local-storage/local-storage.service';
+export * from './providers/localization/localization.service';
 export * from './providers/modal/modal.service';
 export * from './providers/modal/modal.types';
 export * from './providers/nav-builder/nav-builder-types';
diff --git a/packages/admin-ui/src/lib/core/src/shared/components/data-table-2/data-table-custom-component.service.ts b/packages/admin-ui/src/lib/core/src/shared/components/data-table-2/data-table-custom-component.service.ts
index c58014e449..719efca353 100644
--- a/packages/admin-ui/src/lib/core/src/shared/components/data-table-2/data-table-custom-component.service.ts
+++ b/packages/admin-ui/src/lib/core/src/shared/components/data-table-2/data-table-custom-component.service.ts
@@ -9,6 +9,7 @@ export type DataTableLocationId =
     | 'edit-options-list'
     | 'manage-product-variant-list'
     | 'customer-order-list'
+    | 'product-detail-variants-list'
     | string;
 
 export type DataTableColumnId =
diff --git a/packages/admin-ui/src/lib/core/src/shared/components/extension-host/extension-host.component.ts b/packages/admin-ui/src/lib/core/src/shared/components/extension-host/extension-host.component.ts
index f4f7e4ed74..ffabc06563 100644
--- a/packages/admin-ui/src/lib/core/src/shared/components/extension-host/extension-host.component.ts
+++ b/packages/admin-ui/src/lib/core/src/shared/components/extension-host/extension-host.component.ts
@@ -9,6 +9,7 @@ import {
 } from '@angular/core';
 import { DomSanitizer, SafeResourceUrl } from '@angular/platform-browser';
 import { ActivatedRoute } from '@angular/router';
+import { SharedModule } from '../../shared.module';
 
 import { ExtensionHostConfig } from './extension-host-config';
 import { ExtensionHostService } from './extension-host.service';
@@ -22,6 +23,8 @@ import { ExtensionHostService } from './extension-host.service';
     templateUrl: './extension-host.component.html',
     styleUrls: ['./extension-host.component.scss'],
     changeDetection: ChangeDetectionStrategy.Default,
+    standalone: true,
+    imports: [SharedModule],
     providers: [ExtensionHostService],
 })
 export class ExtensionHostComponent implements OnInit, AfterViewInit, OnDestroy {
diff --git a/packages/admin-ui/src/lib/core/src/shared/components/product-multi-selector-dialog/product-multi-selector-dialog.component.html b/packages/admin-ui/src/lib/core/src/shared/components/product-multi-selector-dialog/product-multi-selector-dialog.component.html
index 0a0f9737cd..538c96f4e6 100644
--- a/packages/admin-ui/src/lib/core/src/shared/components/product-multi-selector-dialog/product-multi-selector-dialog.component.html
+++ b/packages/admin-ui/src/lib/core/src/shared/components/product-multi-selector-dialog/product-multi-selector-dialog.component.html
@@ -37,6 +37,12 @@
                 <span [title]="mode === 'product' ? item.productName : item.productVariantName">{{
                     mode === 'product' ? item.productName : item.productVariantName
                 }}</span>
+                <div *ngIf="mode === 'product'">
+                    <small>
+                        <span class="mr-1">{{ 'common.slug' | translate }}:</span>
+                        <code>{{ item.slug }}</code>
+                    </small>
+                </div>
                 <div *ngIf="mode === 'variant'"><small>{{ item.sku }}</small></div>
             </div>
         </div>
diff --git a/packages/admin-ui/src/lib/core/src/shared/components/product-multi-selector-dialog/product-multi-selector-dialog.component.scss b/packages/admin-ui/src/lib/core/src/shared/components/product-multi-selector-dialog/product-multi-selector-dialog.component.scss
index 86d39a37a0..def20113c7 100644
--- a/packages/admin-ui/src/lib/core/src/shared/components/product-multi-selector-dialog/product-multi-selector-dialog.component.scss
+++ b/packages/admin-ui/src/lib/core/src/shared/components/product-multi-selector-dialog/product-multi-selector-dialog.component.scss
@@ -74,3 +74,4 @@ vdr-select-toggle {
     align-items: center;
     justify-content: space-between;
 }
+
diff --git a/packages/admin-ui/src/lib/core/src/shared/dynamic-form-inputs/code-editor-form-input/base-code-editor-form-input.component.ts b/packages/admin-ui/src/lib/core/src/shared/dynamic-form-inputs/code-editor-form-input/base-code-editor-form-input.component.ts
index 0a3749abd9..b02f28a14a 100644
--- a/packages/admin-ui/src/lib/core/src/shared/dynamic-form-inputs/code-editor-form-input/base-code-editor-form-input.component.ts
+++ b/packages/admin-ui/src/lib/core/src/shared/dynamic-form-inputs/code-editor-form-input/base-code-editor-form-input.component.ts
@@ -48,7 +48,12 @@ export abstract class BaseCodeEditorFormInputComponent implements FormInputCompo
             editor.innerHTML = this.highlight(code, this.getErrorPos(this.errorMessage));
         };
         this.jar = CodeJar(this.editorElementRef.nativeElement, highlight);
+        let isFirstUpdate = true;
         this.jar.onUpdate(value => {
+            if (isFirstUpdate) {
+                isFirstUpdate = false;
+                return;
+            }
             this.formControl.setValue(value);
             this.formControl.markAsDirty();
             this.isValid = this.formControl.valid;
diff --git a/packages/admin-ui/src/lib/core/src/shared/dynamic-form-inputs/customer-group-form-input/customer-group-form-input.component.ts b/packages/admin-ui/src/lib/core/src/shared/dynamic-form-inputs/customer-group-form-input/customer-group-form-input.component.ts
index df8ab3fa39..f30afa2939 100644
--- a/packages/admin-ui/src/lib/core/src/shared/dynamic-form-inputs/customer-group-form-input/customer-group-form-input.component.ts
+++ b/packages/admin-ui/src/lib/core/src/shared/dynamic-form-inputs/customer-group-form-input/customer-group-form-input.component.ts
@@ -1,5 +1,5 @@
 import { ChangeDetectionStrategy, Component, Input, OnInit } from '@angular/core';
-import { FormControl, UntypedFormControl } from '@angular/forms';
+import { FormControl } from '@angular/forms';
 import { DefaultFormComponentConfig, DefaultFormComponentId } from '@vendure/common/lib/shared-types';
 import { Observable } from 'rxjs';
 import { startWith } from 'rxjs/operators';
@@ -42,13 +42,12 @@ export class CustomerGroupFormInputComponent implements FormInputComponent, OnIn
     }
 
     selectGroup(group: ItemOf<GetCustomerGroupsQuery, 'customerGroups'>) {
-        this.formControl.setValue(group ?? undefined);
+        this.formControl.setValue(group?.id ?? undefined);
     }
 
-    compareWith(
-        o1: ItemOf<GetCustomerGroupsQuery, 'customerGroups'>,
-        o2: ItemOf<GetCustomerGroupsQuery, 'customerGroups'>,
-    ) {
-        return o1.id === o2.id;
+    compareWith<T extends ItemOf<GetCustomerGroupsQuery, 'customerGroups'> | string>(o1: T, o2: T) {
+        const id1 = typeof o1 === 'string' ? o1 : o1.id;
+        const id2 = typeof o2 === 'string' ? o2 : o2.id;
+        return id1 === id2;
     }
 }
diff --git a/packages/admin-ui/src/lib/core/src/shared/shared.module.ts b/packages/admin-ui/src/lib/core/src/shared/shared.module.ts
index 5f03fd28de..9ca91622c4 100644
--- a/packages/admin-ui/src/lib/core/src/shared/shared.module.ts
+++ b/packages/admin-ui/src/lib/core/src/shared/shared.module.ts
@@ -59,7 +59,6 @@ import { DropdownComponent } from './components/dropdown/dropdown.component';
 import { EditNoteDialogComponent } from './components/edit-note-dialog/edit-note-dialog.component';
 import { EmptyPlaceholderComponent } from './components/empty-placeholder/empty-placeholder.component';
 import { EntityInfoComponent } from './components/entity-info/entity-info.component';
-import { ExtensionHostComponent } from './components/extension-host/extension-host.component';
 import { FacetValueChipComponent } from './components/facet-value-chip/facet-value-chip.component';
 import { FacetValueSelectorComponent } from './components/facet-value-selector/facet-value-selector.component';
 import { FocalPointControlComponent } from './components/focal-point-control/focal-point-control.component';
@@ -249,7 +248,6 @@ const DECLARATIONS = [
     ChannelAssignmentControlComponent,
     ChannelLabelPipe,
     IfDefaultChannelActiveDirective,
-    ExtensionHostComponent,
     CustomFieldLabelPipe,
     CustomFieldDescriptionPipe,
     FocalPointControlComponent,
diff --git a/packages/admin-ui/src/lib/login/src/components/login/login.component.html b/packages/admin-ui/src/lib/login/src/components/login/login.component.html
index 5651dc490c..0f8a870f17 100644
--- a/packages/admin-ui/src/lib/login/src/components/login/login.component.html
+++ b/packages/admin-ui/src/lib/login/src/components/login/login.component.html
@@ -1,4 +1,4 @@
-<div class="login-wrapper">
+<div class="login-wrapper" [dir]="direction$ | async">
     <div class="login-wrapper-inner">
         <div class="login-wrapper-image">
             <div class="login-wrapper-image-content">
diff --git a/packages/admin-ui/src/lib/login/src/components/login/login.component.scss b/packages/admin-ui/src/lib/login/src/components/login/login.component.scss
index 3ef1cfa4a8..97c3ae3161 100644
--- a/packages/admin-ui/src/lib/login/src/components/login/login.component.scss
+++ b/packages/admin-ui/src/lib/login/src/components/login/login.component.scss
@@ -10,6 +10,8 @@
     padding: 20px;
 
     .login-wrapper-inner {
+
+
         background: #fff;
         width: 1120px;
         height: 590px;
@@ -53,8 +55,8 @@
                 left: 0;
                 bottom: 0;
                 z-index: 10;
-                background: rgb(2,0,36);
-                background: linear-gradient(180deg, rgba(2,0,36,0) 0%, rgba(0,0,0,0.75) 100%);
+                background: rgb(2, 0, 36);
+                background: linear-gradient(180deg, rgba(2, 0, 36, 0) 0%, rgba(0, 0, 0, 0.75) 100%);
                 display: flex;
                 flex-direction: column;
                 align-items: flex-start;
@@ -74,13 +76,14 @@
 
                 .login-wrapper-image-copyright {
                     opacity: 0.8;
+
                     p {
                         font-size: 0.6rem;
                         color: white;
                         margin: 0 !important;
                     }
 
-                    a{
+                    a {
                         color: white;
                         text-decoration: underline;
                     }
@@ -96,7 +99,7 @@
             flex-direction: column;
             align-items: stretch;
             justify-content: center;
-            box-shadow: 0px 20px 25px rgba(0,0,0,0.1);
+            box-shadow: 0px 20px 25px rgba(0, 0, 0, 0.1);
             overflow: hidden;
             border-radius: 5px;
             flex-shrink: 0;
@@ -182,6 +185,7 @@
 }
 
 @keyframes shake {
+
     10%,
     90% {
         transform: translate3d(-1px, 0, 0);
@@ -203,3 +207,19 @@
         transform: translate3d(4px, 0, 0);
     }
 }
+
+.login-wrapper[dir="rtl"] {
+    .login-wrapper-inner {
+        .login-wrapper-logo {
+            right: auto;
+            left: 20px;
+        }
+
+        .login-wrapper-image {
+            .login-wrapper-image-content {
+                left: auto;
+                right: 0;
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/packages/admin-ui/src/lib/login/src/components/login/login.component.ts b/packages/admin-ui/src/lib/login/src/components/login/login.component.ts
index 6f47de67e7..e3427e984d 100644
--- a/packages/admin-ui/src/lib/login/src/components/login/login.component.ts
+++ b/packages/admin-ui/src/lib/login/src/components/login/login.component.ts
@@ -1,14 +1,16 @@
-import { HttpClient, HttpParams } from '@angular/common/http';
-import { Component } from '@angular/core';
+import { HttpClient } from '@angular/common/http';
+import { Component, OnInit } from '@angular/core';
 import { Router } from '@angular/router';
-import { ADMIN_UI_VERSION, AuthService, AUTH_REDIRECT_PARAM, getAppConfig } from '@vendure/admin-ui/core';
+import { ADMIN_UI_VERSION, AuthService, AUTH_REDIRECT_PARAM, getAppConfig, LocalizationDirectionType, LocalizationService } from '@vendure/admin-ui/core';
 
 @Component({
     selector: 'vdr-login',
     templateUrl: './login.component.html',
     styleUrls: ['./login.component.scss'],
 })
-export class LoginComponent {
+export class LoginComponent implements OnInit {
+    direction$: LocalizationDirectionType;
+
     username = '';
     password = '';
     rememberMe = false;
@@ -24,13 +26,16 @@ export class LoginComponent {
     imageCreator = '';
     imageCreatorUrl = '';
 
-    constructor(private authService: AuthService, private router: Router, private httpClient: HttpClient) {
+    constructor(private authService: AuthService, private router: Router, private httpClient: HttpClient, private localizationService: LocalizationService) {
         if (this.customImageUrl) {
             this.imageUrl = this.customImageUrl;
         } else {
             this.loadImage();
         }
     }
+    ngOnInit(): void {
+        this.direction$ = this.localizationService.direction$;
+    }
 
     logIn(): void {
         this.errorMessage = undefined;
diff --git a/packages/admin-ui/src/lib/static/i18n-messages/hr.json b/packages/admin-ui/src/lib/static/i18n-messages/hr.json
new file mode 100644
index 0000000000..9119278775
--- /dev/null
+++ b/packages/admin-ui/src/lib/static/i18n-messages/hr.json
@@ -0,0 +1,795 @@
+{
+  "admin": {
+    "create-new-administrator": "Kreiraj novog administratora"
+  },
+  "asset": {
+    "add-asset": "Dodaj medij",
+    "add-asset-with-count": "Dodaj {count, plural, =0 {medija} one {1 medij} few {{count} medija} other {{count} medija}}",
+    "assets-selected-count": "Odabrano {count} medija",
+    "dimensions": "Dimenzije",
+    "focal-point": "Fokalna točka",
+    "notify-create-assets-success": "Kreirano {count, plural, one {1 novo sredstvo} few {{count} nova sredstva} other {{count} novih sredstava}}",
+    "original-asset-size": "Izvorna veličina",
+    "preview": "Pregled",
+    "remove-asset": "Ukloni medij",
+    "select-asset": "Odaberi medij",
+    "select-assets": "Odaberi medije",
+    "set-as-featured-asset": "Postavi kao istaknuti medij",
+    "set-focal-point": "Postavi fokalnu točku",
+    "source-file": "Izvorna datoteka",
+    "unset-focal-point": "Poništi",
+    "update-focal-point": "Ažuriraj točku",
+    "update-focal-point-error": "Nije moguće ažurirati fokalnu točku",
+    "update-focal-point-success": "Fokalna točka ažurirana",
+    "upload-assets": "Prenesi medije",
+    "uploading": "Prenosim..."
+  },
+  "breadcrumb": {
+    "administrators": "Administratori",
+    "assets": "Mediji",
+    "channels": "Kanali",
+    "collections": "Kolekcije",
+    "countries": "Zemlje",
+    "customer-groups": "Grupa kupaca",
+    "customers": "Kupci",
+    "dashboard": "Kontrolna ploča",
+    "facets": "Aspekti",
+    "global-settings": "Globalne postavke",
+    "job-queue": "Red poslova",
+    "manage-variants": "Upravljaj varijantama",
+    "modifying": "Uređivanje",
+    "orders": "Narudžbe",
+    "payment-methods": "Načini plaćanja",
+    "product-options": "Opcije proizvoda",
+    "products": "Artikli",
+    "profile": "Profil",
+    "promotions": "Promocije",
+    "roles": "Uloge",
+    "seller-orders": "Narudžbe prodavača",
+    "sellers": "Prodavači",
+    "shipping-methods": "Načini dostave",
+    "stock-locations": "Lokacije zaliha",
+    "system-status": "Status sustava",
+    "tax-categories": "Porezne kategorije",
+    "tax-rates": "Porezne stope",
+    "zones": "Zone"
+  },
+  "catalog": {
+    "add-facet-value": "Dodaj vrijednost aspekta",
+    "add-facets": "Dodaj aspekte",
+    "add-option": "Dodaj opciju",
+    "add-price-in-another-currency": "Dodaj cijenu u drugoj valuti",
+    "add-stock-location": "Dodaj lokaciju zaliha",
+    "add-stock-to-location": "Dodaj zalihe na lokaciju",
+    "asset": "Sredstvo",
+    "asset-preview-links": "Poveznice za pregled sredstva",
+    "assets": "Sredstva",
+    "assign-product-to-channel-success": "Uspješno dodijeljeno {count, plural, one {1 proizvod} other {{count} proizvoda}} kanalu {channel}",
+    "assign-products-to-channel": "Dodijeli proizvode kanalu",
+    "assign-to-channel": "Dodijeli kanalu",
+    "assign-to-named-channel": "Dodijeli kanalu {channelCode}",
+    "assign-variant-to-channel-success": "Uspješno dodijeljeno {count, plural, one {1 varijanta proizvoda} other {{count} varijanti proizvoda}} kanalu {channel}",
+    "assign-variants-to-channel": "Dodijeli varijante proizvoda kanalu",
+    "auto-update-option-variant-name": "Automatski ažuriraj nazive varijanti proizvoda koristeći ovu opciju",
+    "auto-update-product-variant-name": "Automatski ažuriraj nazive varijanti proizvoda",
+    "cannot-create-variants-without-options": "Nije moguće stvoriti varijante proizvoda dok nije definirana grupa opcija s najmanje dvije opcije proizvoda",
+    "channel-price-preview": "Pregled cijene za kanal",
+    "collection": "Kolekcija",
+    "collection-contents": "Sadržaj kolekcije",
+    "collections": "Kolekcije",
+    "confirm-bulk-delete-products": "Izbrisati {count} proizvoda?",
+    "confirm-cancel": "Odustati?",
+    "confirm-delete-assets": "Izbrisati {count} {count, plural, one {sredstvo} other {sredstava}}?",
+    "confirm-delete-facet-value": "Izbrisati vrijednost aspekta?",
+    "confirm-delete-product": "Izbrisati proizvod?",
+    "confirm-delete-product-option": "Izbrisati opciju proizvoda \"{name}\"?",
+    "confirm-delete-product-option-group": "Izbrisati grupu opcija proizvoda \"{name}\"?",
+    "confirm-delete-product-option-group-body": "Ova grupa opcija se koristi za {count} {count, plural, one {varijantu} other {varijante}}. Jeste li sigurni da želite izbrisati?",
+    "confirm-delete-product-variant": "Izbrisati varijantu proizvoda \"{name}\"?",
+    "confirm-deletion-of-unused-variants-body": "Sljedeće varijante proizvoda su postale zastarjele zbog dodavanja novih opcija. Bit će izbrisane tijekom stvaranja novih varijanti proizvoda.",
+    "confirm-deletion-of-unused-variants-title": "",
+    "create-draft-order": "Kreiraj privremenu narudžbu",
+    "create-new-collection": "Kreiraj novu kolekciju",
+    "create-new-facet": "Kreiraj novi aspekt",
+    "create-new-product": "Novi proizvod",
+    "create-new-stock-location": "Kreiraj novu lokaciju zaliha",
+    "create-product-option-group": "Kreiraj grupu opcija proizvoda",
+    "create-product-variant": "Kreiraj varijantu proizvoda",
+    "default-currency": "Zadana valuta",
+    "do-not-inherit-filters": "Ne nasljeđuj filtre",
+    "drop-files-to-upload": "Ispustite datoteke za prijenos",
+    "edit-facet-values": "Uredi vrijednosti aspekta",
+    "edit-options": "Uredi opcije",
+    "facet": "Aspekt",
+    "facet-value-not-available": "Vrijednost aspekta \"{id}\" nije dostupna",
+    "facet-values": "Vrijednosti aspekta",
+    "facets": "Aspekti",
+    "filter-by-name": "Filtriraj po imenu",
+    "filter-by-sku": "Filtriraj po SKU",
+    "filter-inheritance": "Nasljeđivanje filtera",
+    "filters": "Filteri",
+    "inherit-filters-from-parent": "Naslijedi filtere od roditelja",
+    "live-preview-contents": "Sadržaj uživo",
+    "manage-variants": "Upravljanje varijantama",
+    "move-collection-to": "Premjesti u {name}",
+    "move-collections": "Premjesti kolekcije",
+    "move-collections-success": "Premješteno {count} kolekcija",
+    "move-down": "Premjesti dolje",
+    "move-to": "Premjesti na",
+    "move-up": "Premjesti gore",
+    "name": "Naziv",
+    "no-channel-selected": "Nije odabran kanal",
+    "no-featured-asset": "Nema istaknutih sredstava",
+    "no-selection": "Nema odabira",
+    "no-stock-locations-available-on-current-channel": "Nema dostupnih lokacija zaliha na trenutnom kanalu. Postavite barem jednu lokaciju zaliha prije dodavanja proizvoda.",
+    "notify-bulk-delete-products-success": "Uspješno izbrisano {count, plural, one {1 proizvod} other {{count} proizvoda}}",
+    "notify-remove-facets-from-channel-success": "Uspješno uklonjeno {count, plural, one {1 aspekt} other {{count} aspekta}} iz kanala {channelCode}",
+    "notify-remove-product-from-channel-error": "Nije moguće ukloniti proizvod iz kanala",
+    "notify-remove-product-from-channel-success": "Uspješno uklonjen proizvod iz kanala",
+    "notify-remove-variant-from-channel-error": "Nije moguće ukloniti varijantu proizvoda iz kanala",
+    "notify-remove-variant-from-channel-success": "Uspješno uklonjena varijanta proizvoda iz kanala",
+    "number-of-variants": "Broj varijanti",
+    "option": "Opcija",
+    "option-name": "Naziv opcije",
+    "option-values": "Vrijednosti opcije",
+    "out-of-stock-threshold": "Prag rasprodaje",
+    "out-of-stock-threshold-tooltip": "Postavlja razinu zaliha na kojoj se ova varijanta smatra rasprodanom. Upotreba negativne vrijednosti omogućuje podršku za narudžbe proizvoda koji trenutačno nisu dostupni.",
+    "page-description-options-editor": "Uredi nazive i kodove opcija za ovaj proizvod. Za dodavanje ili uklanjanje opcija koristite gumb \"Upravljanje varijantama\" ispod popisa varijanti proizvoda.",
+    "price": "Cijena",
+    "price-and-tax": "Cijena i porez",
+    "price-conversion-factor": "Faktor konverzije cijene",
+    "price-in-channel": "Cijena u { channel }",
+    "price-includes-tax-at": "Uključuje porez od { rate }%",
+    "price-with-tax-in-default-zone": "Uklj. { rate }% poreza: { price }",
+    "private": "Privatno",
+    "product": "Proizvod",
+    "product-name": "Naziv proizvoda",
+    "product-options": "Opcije proizvoda",
+    "product-variant-exists": "Varijanta proizvoda s ovim opcijama već postoji",
+    "product-variants": "Varijante proizvoda",
+    "products": "Proizvodi",
+    "public": "Javno",
+    "quick-jump-placeholder": "Brzo pretraživanje varijante",
+    "rebuild-search-index": "Obnovi indeks pretraživanja",
+    "reindex-error": "Došlo je do pogreške prilikom obnove indeksa pretraživanja",
+    "reindex-successful": "Indeksirano {count, plural, one {proizvodna varijanta} other {{count} proizvodnih varijanti}} u {time}ms",
+    "reindexing": "Obnova indeksa pretraživanja",
+    "remove-from-channel": "Ukloni iz {channelCode, select, undefined{kanala} other{{channelCode}}}",
+    "remove-option": "Ukloni opciju",
+    "remove-product-from-channel": "Ukloni proizvod iz kanala",
+    "remove-product-variant-from-channel": "Ukloni varijantu proizvoda iz kanala",
+    "reorder-collection": "Promijeni redoslijed kolekcije",
+    "root-collection": "Glavna kolekcija",
+    "run-pending-search-index-updates": "Pretraživanje: izvrši {count, plural, one {1 čekajuću nadogradnju} other {{count} čekajućih nadogradnji}}",
+    "running-search-index-updates": "Izvršava se {count, plural, one {1 nadogradnja} other {{count} nadogradnji}} indeksa pretraživanja",
+    "search-asset-name-or-tag": "Pretraži po nazivu sredstva ili oznakama",
+    "search-for-term": "Pretraži po terminu",
+    "search-product-name-or-code": "Pretraži po nazivu proizvoda ili kodu",
+    "select-product": "Odaberi proizvod",
+    "select-product-variant": "Odaberi varijantu proizvoda",
+    "sku": "SKU",
+    "slug": "Slug",
+    "slug-pattern-error": "Slug nije valjan",
+    "stock-allocated": "Dodijeljeno",
+    "stock-levels": "Razine zaliha",
+    "stock-location": "Lokacija zaliha",
+    "stock-locations": "Lokacije zaliha",
+    "stock-on-hand": "Na skladištu",
+    "tax-category": "Porezna kategorija",
+    "taxes": "Porezi",
+    "track-inventory": "Prati inventar",
+    "track-inventory-false": "Ne prati",
+    "track-inventory-inherit": "Naslijedi iz globalnih postavki",
+    "track-inventory-tooltip": "Kada se prati, razine zaliha varijanti proizvoda automatski će se prilagođavati prilikom prodaje",
+    "track-inventory-true": "Prati",
+    "update-product-option": "Ažuriraj opciju proizvoda",
+    "use-global-value": "Koristi globalnu vrijednost",
+    "values": "Vrijednosti",
+    "variant": "Varijanta",
+    "variant-count": "{count, plural, one {1 varijanta} other {{count} varijante}}",
+    "view-contents": "Pregledaj sadržaj",
+    "visibility": "Vidljivost"
+  },
+  "common": {
+    "ID": "ID",
+    "add-filter": "Dodaj filter",
+    "add-item-to-list": "Dodaj stavku na popis",
+    "add-note": "Dodaj bilješku",
+    "apply": "Primijeni",
+    "assign-to-channel": "Dodijeli kanalu",
+    "available-currencies": "Dostupne valute",
+    "available-languages": "Dostupni jezici",
+    "boolean-and": "i",
+    "boolean-false": "netočno",
+    "boolean-or": "ili",
+    "boolean-true": "točno",
+    "breadcrumb": "Trag",
+    "browser-default": "Zadano za preglednik",
+    "cancel": "Odustani",
+    "cancel-navigation": "Prekini navigaciju",
+    "change-selection": "Promijeni odabir",
+    "channel": "Kanal",
+    "channels": "Kanali",
+    "clear-selection": "Očisti odabir",
+    "code": "Kod",
+    "collapse-entries": "Skupi unose",
+    "confirm": "Potvrdi",
+    "confirm-bulk-assign-to-channel": "Dodijeliti stavke kanalu?",
+    "confirm-bulk-delete": "Izbrisati odabrane stavke?",
+    "confirm-bulk-remove-from-channel": "Ukloniti stavke iz trenutnog kanala?",
+    "confirm-delete-note": "Izbrisati bilješku?",
+    "confirm-navigation": "Potvrdi navigaciju",
+    "contents": "Sadržaj",
+    "create": "Stvori",
+    "created-at": "Stvoreno u",
+    "custom-fields": "Prilagođena polja",
+    "data-table-filter-date-mode": "Mod datuma",
+    "data-table-filter-date-range": "Raspon datuma",
+    "data-table-filter-date-relative": "Relativan datum",
+    "default-channel": "Zadani kanal",
+    "default-language": "Zadani jezik",
+    "default-tax-category": "Zadana porezna kategorija",
+    "delete": "Izbriši",
+    "description": "Opis",
+    "details": "Detalji",
+    "disabled": "Onemogućeno",
+    "discard-changes": "Odbaci promjene",
+    "edit": "Uredi",
+    "edit-field": "Uredi polje",
+    "edit-note": "Uredi bilješku",
+    "enabled": "Omogućeno",
+    "end-date": "Datum završetka",
+    "expand-entries": "Proširi unose",
+    "extension-running-in-separate-window": "Proširenje radi u zasebnom prozoru",
+    "filter": "Filter",
+    "filter-preset-name": "Filter preset name",
+    "force-delete": "Snažno izbriši",
+    "force-remove": "Snažno ukloni",
+    "general": "Općenito",
+    "guest": "Gost",
+    "id": "ID",
+    "image": "Slika",
+    "items-per-page-option": "{ count } po stranici",
+    "items-selected-count": "{ count } {count, plural, one {stavka} other {stavke}} odabrano",
+    "keep-editing": "Nastavi uređivanje",
+    "language": "Jezik",
+    "launch-extension": "Pokreni proširenje",
+    "list-items-and-n-more": "{ items } i {nMore} više",
+    "live-update": "Stvarno vrijeme ažuriranje",
+    "locale": "Lokalno",
+    "log-out": "Odjava",
+    "login": "Prijava",
+    "login-image-title": "Bok! Dobrodošli natrag. Drago nam je vidjeti vas.",
+    "login-title": "Prijavi se na {brand}",
+    "manage-tags": "Upravljanje oznakama",
+    "manage-tags-description": "Ažurirajte ili izbrišite oznake globalno.",
+    "medium-date": "Srednji datum",
+    "more": "Više...",
+    "name": "Ime",
+    "no-alerts": "Nema upozorenja",
+    "no-bulk-actions-available": "Nema dostupnih grupnih radnji",
+    "no-results": "Nema rezultata",
+    "not-applicable": "Nije primjenjivo",
+    "not-set": "Nije postavljeno",
+    "notify-assign-to-channel-success-with-count": "Uspješno dodijeljeno {count, plural, one {1 stavka} other {{count} stavki}} kanalu { channelCode }",
+    "notify-bulk-update-success": "Ažurirano { count } { entity }",
+    "notify-create-error": "Došlo je do pogreške, nije moguće stvoriti { entity }",
+    "notify-create-success": "Stvoreno novo { entity }",
+    "notify-delete-error": "Došlo je do pogreške, nije moguće izbrisati { entity }",
+    "notify-delete-error-with-count": "Nije moguće izbrisati {count, plural, one {1 stavku} other {{count} stavki}}",
+    "notify-delete-success": "Izbrisano { entity }",
+    "notify-delete-success-with-count": "Uspješno izbrisano {count, plural, one {1 stavka} other {{count} stavki}}",
+    "notify-remove-from-channel-success-with-count": "Uspješno uklonjeno { count } stavki iz kanala",
+    "notify-save-changes-error": "Došlo je do pogreške, nije moguće spremiti promjene",
+    "notify-saved-changes": "Spremljene promjene",
+    "notify-update-error": "Došlo je do pogreške, nije moguće ažurirati { entity }",
+    "notify-update-success": "Ažurirano { entity }",
+    "notify-updated-tags-success": "Uspješno ažurirane oznake",
+    "okay": "U redu",
+    "operator-contains": "sadrži",
+    "operator-eq": "jednako",
+    "operator-gt": "veće od",
+    "operator-lt": "manje od",
+    "operator-not-contains": "ne sadrži",
+    "operator-not-eq": "nije jednako",
+    "operator-notContains": "ne sadrži",
+    "operator-regex": "odgovara regexu",
+    "password": "Lozinka",
+    "position": "Pozicija",
+    "price": "Cijena",
+    "price-with-tax": "Cijena s porezom",
+    "private": "Privatno",
+    "public": "Javno",
+    "remember-me": "Zapamti me",
+    "remove": "Ukloni",
+    "remove-from-channel": "Ukloni iz trenutnog kanala",
+    "remove-item-from-list": "Ukloni stavku s popisa",
+    "rename-filter-preset": "Rename preset",
+    "reset-columns": "Ponovno postavi stupce",
+    "results-count": "{ count } {count, plural, one {rezultat} other {rezultata}}",
+    "sample-formatting": "Primjer formatiranja",
+    "save-filter-preset": "Spremi kao prečac",
+    "search-and-filter-list": "Pretraži i filtriraj ovaj popis",
+    "search-by-name": "Pretraži po imenu",
+    "select": "Odaberi...",
+    "select-display-language": "Odaberi jezik prikaza",
+    "select-items-with-count": "Odaberi { count } {count, plural, one {stavku} other {stavki}}",
+    "select-products": "Odaberi proizvode",
+    "select-relation-id": "Odaberi ID odnosa",
+    "select-table-columns": "Odaberi stupce tablice",
+    "select-today": "Odaberi danas",
+    "select-variants": "Odaberi varijante",
+    "seller": "Prodavač",
+    "set-language": "Postavi jezik",
+    "short-date": "Kratki datum",
+    "slug": "Slug",
+    "start-date": "Datum početka",
+    "status": "Status",
+    "tags": "Oznake",
+    "theme": "Tema",
+    "there-are-unsaved-changes": "Imate nespremljenih promjena. Napuštanje će rezultirati gubitkom tih promjena.",
+    "toggle-all": "Uključi/Isključi sve",
+    "total-items": "{currentStart} - {currentEnd} od {totalItems}",
+    "update": "Ažuriraj",
+    "updated-at": "Ažurirano u",
+    "username": "Korisničko ime",
+    "value": "Vrijednost",
+    "view-contents": "Pogledaj sadržaj",
+    "view-next-month": "Pogledaj sljedeći mjesec",
+    "view-previous-month": "Pogledaj prethodni mjesec",
+    "visibility": "Vidljivost",
+    "with-selected": "S odabranima ({count})..."
+  },
+  "customer": {
+    "add-customer-to-group": "Dodaj kupca u grupu",
+    "add-customer-to-groups-with-count": "Dodaj kupca u {count, plural, one {1 grupu} other {{count} grupe}}",
+    "add-customers-to-group": "Dodaj kupce u grupu",
+    "add-customers-to-group-success": "Dodano {customerCount, plural, one {1 kupac} other {{customerCount} kupaca}} u \"{ groupName }\"",
+    "add-customers-to-group-with-count": "Dodaj {count, plural, one {1 kupca} other {{count} kupaca}}",
+    "add-customers-to-group-with-name": "Dodaj kupce u \"{ groupName }\"",
+    "addresses": "Adrese",
+    "city": "Grad",
+    "company": "Tvrtka",
+    "confirm-remove-customer-from-group": "Ukloniti kupca iz grupe?",
+    "country": "Država",
+    "create-customer-group": "Stvori grupu kupaca",
+    "create-new-address": "Stvori novu adresu",
+    "create-new-customer": "Stvori novog kupca",
+    "create-new-customer-group": "Stvori novu grupu kupaca",
+    "customer": "Kupac",
+    "customer-group": "Grupa kupaca",
+    "customer-groups": "Grupe kupaca",
+    "customer-history": "Povijest kupca",
+    "customers": "Kupci",
+    "default-billing-address": "Zadana adresa za naplatu",
+    "default-shipping-address": "Zadana adresa za dostavu",
+    "email-address": "Adresa e-pošte",
+    "email-verification-sent": "Na { emailAddress } poslana je verifikacijska e-pošta",
+    "first-name": "Ime",
+    "full-name": "Puno ime",
+    "guest": "Gost",
+    "history-customer-added-to-group": "Kupac dodan u grupu \"{ groupName }\"",
+    "history-customer-address-created": "Adresa stvorena",
+    "history-customer-address-deleted": "Adresa izbrisana",
+    "history-customer-address-updated": "Adresa ažurirana",
+    "history-customer-detail-updated": "Ažurirani detalji kupca",
+    "history-customer-email-update-requested": "Zahtjev za ažuriranje adrese e-pošte",
+    "history-customer-email-update-verified": "Verifikacija ažurirane adrese e-pošte",
+    "history-customer-password-reset-requested": "Zahtjev za resetiranje lozinke",
+    "history-customer-password-reset-verified": "Verifikacija resetirane lozinke",
+    "history-customer-password-updated": "Ažurirana lozinka",
+    "history-customer-registered": "Kupac registriran",
+    "history-customer-removed-from-group": "Kupac uklonjen iz grupe \"{ groupName }\"",
+    "history-customer-verified": "Kupac verificiran",
+    "history-using-external-auth-strategy": "koristi { strategy }",
+    "history-using-native-auth-strategy": "koristi adresu e-pošte",
+    "last-login": "Posljednja prijava",
+    "last-name": "Prezime",
+    "name": "Ime",
+    "new-email-address": "Nova adresa e-pošte",
+    "no-orders-placed": "Nema postavljenih narudžbi",
+    "not-a-member-of-any-groups": "Ovaj kupac nije član nijedne grupe",
+    "old-email-address": "Stara adresa e-pošte",
+    "orders": "Narudžbe",
+    "password": "Lozinka",
+    "phone-number": "Broj telefona",
+    "postal-code": "Poštanski broj",
+    "province": "Županija",
+    "registered": "Registriran",
+    "remove-customers-from-group-success": "Uklonjeno {customerCount, plural, one {1 kupac} other {{customerCount} kupaca}} iz \"{ groupName }\"",
+    "remove-from-group": "Ukloni iz ove grupe",
+    "search-customers-by-email": "Pretraži po adresi e-pošte",
+    "search-customers-by-email-last-name-postal-code": "Pretraži po adresi e-pošte / prezimenu / poštanskom broju",
+    "select-customer": "Odaberi kupca",
+    "set-as-default-billing-address": "Postavi kao zadanu adresu za naplatu",
+    "set-as-default-shipping-address": "Postavi kao zadanu adresu za dostavu",
+    "street-line-1": "Adresa, redak 1",
+    "street-line-2": "Adresa, redak 2",
+    "title": "Naslov",
+    "update-customer-group": "Ažuriraj grupu kupaca",
+    "verified": "Verificirano",
+    "view-group-members": "Pogledaj članove grupe"
+  },
+  "dashboard": {
+    "add-widget": "Dodaj widget",
+    "latest-orders": "Najnovije narudžbe",
+    "metric-average-order-value": "Prosječna vrijednost narudžbe",
+    "metric-number-of-orders": "Broj narudžbi",
+    "metric-order-total-value": "Ukupna vrijednost narudžbe",
+    "metrics": "Statistika",
+    "orders-summary": "Sažetak narudžbi",
+    "remove-widget": "Ukloni widget",
+    "thisMonth": "Ovaj mjesec",
+    "thisWeek": "Ovaj tjedan",
+    "today": "Danas",
+    "total-order-value": "Ukupna vrijednost",
+    "total-orders": "Ukupno narudžbi",
+    "widget-resize": "Promijeni veličinu",
+    "widget-width": "Širina: {width}",
+    "yesterday": "Jučer"
+  },
+  "datetime": {
+    "ago-days": "{count, plural, one {prije 1 dan} other {prije {count} dana}}",
+    "ago-hours": "{count, plural, one {prije 1 sat} other {prije {count} sati}}",
+    "ago-minutes": "{count, plural, one {prije 1 minutu} other {prije {count} minuta}}",
+    "ago-seconds": "{count, plural, =0 {upravo sada} one {prije 1 sekunde} other {prije {count} sekundi}}",
+    "ago-years": "{count, plural, one {prije 1 godinu} other {prije {count} godina}}",
+    "day": "dan",
+    "duration-milliseconds": "{ms}ms",
+    "duration-minutes:seconds": "{m}:{s}m",
+    "duration-seconds": "{s}s",
+    "month": "mjesec",
+    "month-apr": "Travanj",
+    "month-aug": "Kolovoz",
+    "month-dec": "Prosinac",
+    "month-feb": "Veljača",
+    "month-jan": "Siječanj",
+    "month-jul": "Srpanj",
+    "month-jun": "Lipanj",
+    "month-mar": "Ožujak",
+    "month-may": "Svibanj",
+    "month-nov": "Studeni",
+    "month-oct": "Listopad",
+    "month-sep": "Rujan",
+    "relative-past-days": "Prošao {count, plural, one {1 dan} other {{count} dana}}",
+    "relative-past-months": "Prošao {count, plural, one {1 mjesec} other {{count} mjeseci}}",
+    "relative-past-years": "Prošlo {count, plural, one {1 godina} other {{count} godina}}",
+    "time": "Vrijeme",
+    "weekday-fr": "Pet",
+    "weekday-mo": "Pon",
+    "weekday-sa": "Sub",
+    "weekday-su": "Ned",
+    "weekday-th": "Čet",
+    "weekday-tu": "Uto",
+    "weekday-we": "Sri",
+    "year": "godina"
+  },
+  "editor": {
+    "image-alt": "Opis (alt)",
+    "image-src": "Izvor",
+    "image-title": "Naziv",
+    "insert-image": "Umetni sliku",
+    "link-href": "Link",
+    "link-target": "Target linka",
+    "link-title": "Naziv linka",
+    "remove-link": "Ukloni",
+    "set-link": "Postavi link"
+  },
+  "error": {
+    "403-forbidden": "Trenutno nemate ovlaštenje za pristup \"{ path }\". Ili vam nedostaju ovlasti ili je vaša sesija istekla.",
+    "could-not-connect-to-server": "Nije moguće povezati se s Vendure serverom na { url }",
+    "facet-value-form-values-do-not-match": "Broj vrijednosti u obrascu za aspekte ne podudara se s stvarnim brojem vrijednosti",
+    "health-check-failed": "Provjera zdravlja sustava nije uspjela",
+    "no-default-shipping-zone-set": "Ovaj kanal nema zadaniu zonu dostave. To može uzrokovati pogreške pri izračunavanju troškova dostave narudžbe.",
+    "no-default-tax-zone-set": "Ovaj kanal nema zadaniu poreznu zonu, što će uzrokovati pogreške pri izračunavanju cijena. Molimo kreirajte ili odaberite zonu."
+  },
+  "marketing": {
+    "actions": "Radnje",
+    "add-action": "Dodaj radnju",
+    "add-condition": "Dodaj uvjet",
+    "conditions": "Uvjeti",
+    "coupon-code": "Kod kupona",
+    "create-new-promotion": "Stvori novu promociju",
+    "ends-at": "Završava u",
+    "per-customer-limit": "Limit po kupcu",
+    "per-customer-limit-tooltip": "Maksimalni broj puta koje ovu promociju može koristiti jedan pojedinačni kupac",
+    "promotion": "Promocija",
+    "search-by-name-or-coupon-code": "Pretraži po imenu ili kodu kupona",
+    "starts-at": "Počinje u",
+    "usage-limit": "Ukupno ograničenje upotrebe",
+    "usage-limit-tooltip": "Maksimalni broj puta koje se ovu promociju može koristiti ukupno"
+  },
+  "nav": {
+    "administrators": "Administratori",
+    "assets": "Resursi",
+    "catalog": "Katalog",
+    "channels": "Kanali",
+    "collections": "Kolekcije",
+    "countries": "Države",
+    "customer-groups": "Grupe kupaca",
+    "customers": "Kupci",
+    "facets": "Aspekti",
+    "global-settings": "Globalne postavke",
+    "job-queue": "Red čekanja poslova",
+    "marketing": "Oglašavanje",
+    "orders": "Narudžbe",
+    "payment-methods": "Načini plaćanja",
+    "products": "Proizvodi",
+    "promotions": "Promocije",
+    "roles": "Uloge",
+    "sales": "Prodaja",
+    "sellers": "Prodavači",
+    "settings": "Postavke",
+    "shipping-methods": "Načini dostave",
+    "stock-locations": "Lokacije zaliha",
+    "system": "Sustav",
+    "system-status": "Status sustava",
+    "tax-categories": "Porezne kategorije",
+    "tax-rates": "Porezne stope",
+    "zones": "Zone"
+  },
+  "order": {
+    "add-item-to-order": "Dodaj stavku u narudžbu",
+    "add-note": "Dodaj napomenu",
+    "add-payment": "Dodaj plaćanje",
+    "add-payment-to-order": "Dodaj plaćanje narudžbi",
+    "add-payment-to-order-success": "Uspješno dodano plaćanje narudžbi",
+    "add-surcharge": "Dodaj nadoplatu",
+    "added-items": "Dodane stavke",
+    "amount": "Iznos",
+    "arrange-additional-payment": "Organiziraj dodatno plaćanje",
+    "billing-address": "Adresa za naplatu",
+    "cancel": "Otkaži",
+    "cancel-entire-order": "Otkaži cijelu narudžbu",
+    "cancel-fulfillment": "Otkaži ispunjenje",
+    "cancel-modification": "Otkaži izmjenu",
+    "cancel-order": "Otkaži narudžbu ili stavke",
+    "cancel-payment": "Otkaži plaćanje",
+    "cancel-reason-customer-request": "Zahtjev kupca",
+    "cancel-reason-not-available": "Nedostupno",
+    "cancel-selected-items": "Otkaži odabrane stavke",
+    "cancel-specified-items": "Otkaži određene stavke",
+    "cancellation-reason": "Razlog otkazivanja",
+    "cancelled-order-success": "Narudžba uspješno otkazana",
+    "complete-draft-order": "Završi skicu",
+    "confirm-modifications": "Potvrdi izmjene",
+    "contents": "Sadržaj",
+    "create-fulfillment": "Stvori ispunjenje",
+    "create-fulfillment-success": "Ispunjenje stvoreno",
+    "customer": "Kupac",
+    "delete-draft-order": "Izbriši skicu",
+    "draft-order": "Skica narudžbe",
+    "edit-billing-address": "Uredi adresu za naplatu",
+    "edit-shipping-address": "Uredi adresu za dostavu",
+    "error-message": "Poruka o grešci",
+    "existing-address": "Postojeća adresa",
+    "existing-customer": "Postojeći kupac",
+    "filter-is-active": "Aktivan je",
+    "fulfill": "Ispuni",
+    "fulfill-order": "Ispuni narudžbu",
+    "fulfillment": "Ispunjenje",
+    "fulfillment-method": "Metoda ispunjenja",
+    "history-coupon-code-applied": "Primijenjen kod kupona",
+    "history-coupon-code-removed": "Uklonjen kod kupona",
+    "history-fulfillment-created": "Ispunjenje stvoreno",
+    "history-fulfillment-delivered": "Ispunjenje isporučeno",
+    "history-fulfillment-shipped": "Ispunjenje poslano",
+    "history-fulfillment-transition": "Ispunjenje prešlo iz {from} u {to}",
+    "history-items-cancelled": "{count} {count, plural, one {stavka} other {stavke}} otkazane",
+    "history-order-cancelled": "Narudžba otkazana",
+    "history-order-created": "Narudžba stvorena",
+    "history-order-fulfilled": "Narudžba ispunjena",
+    "history-order-modified": "Narudžba izmijenjena",
+    "history-order-transition": "Narudžba prešla iz {from} u {to}",
+    "history-payment-settled": "Plaćanje riješeno",
+    "history-payment-transition": "Plaćanje #{id} prešlo iz {from} u {to}",
+    "history-refund-transition": "Povrat #{id} prešao iz {from} u {to}",
+    "item-count": "{count} {count, plural, one {stavka} other {stavke}}",
+    "line-fulfillment-all": "Sve stavke su ispunjene",
+    "line-fulfillment-none": "Nijedna stavka nije ispunjena",
+    "line-fulfillment-partial": "{ count } od { total } stavki ispunjeno",
+    "manually-transition-to-state": "Ručno prijeđite u stanje...",
+    "manually-transition-to-state-message": "Ručno prijeđite narudžbu u drugo stanje. Napomena da su stanja narudžbe regulirana pravilima koja mogu spriječiti određene prijelaze.",
+    "modification-adding-items": "Dodavanje {count} {count, plural, one {stavka} other {stavke}}",
+    "modification-adding-surcharges": "Dodavanje {count} {count, plural, one {nadoplata} other {nadoplata}}",
+    "modification-adjusting-lines": "Prilagođavanje {count} {count, plural, one {linija} other {linija}}",
+    "modification-not-settled": "Nije riješeno",
+    "modification-recalculate-shipping": "Ponovno izračunaj dostavu",
+    "modification-settled": "Riješeno",
+    "modification-summary": "Sažetak izmjena",
+    "modification-updating-billing-address": "Ažuriranje adrese za naplatu",
+    "modification-updating-shipping-address": "Ažuriranje adrese za dostavu",
+    "modifications": "Izmjene",
+    "modify-order": "Izmijeni narudžbu",
+    "modify-order-price-difference": "Razlika u cijeni",
+    "net-price": "Neto cijena",
+    "note": "Napomena",
+    "note-is-private": "Napomena je privatna",
+    "note-only-visible-to-administrators": "Vidljivo samo administratorima",
+    "note-visible-to-customer": "Vidljivo administratorima i kupcu",
+    "order": "Narudžba",
+    "order-history": "Povijest narudžbe",
+    "order-is-empty": "Narudžba je prazna",
+    "order-state-diagram": "Dijagram stanja narudžbe",
+    "order-type": "Vrsta narudžbe",
+    "order-type-aggregate": "Agregat",
+    "order-type-regular": "Redovita",
+    "order-type-seller": "Prodavač",
+    "orders": "Narudžbe",
+    "original-quantity-at-checkout": "Izvorna količina pri završetku kupovine",
+    "payment": "Plaćanje",
+    "payment-amount": "Iznos plaćanja",
+    "payment-metadata": "Metapodaci plaćanja",
+    "payment-method": "Metoda plaćanja",
+    "payment-state": "Stanje plaćanja",
+    "payment-to-refund": "Plaćanje za povrat",
+    "payments": "Plaćanja",
+    "placed-at": "Naručeno u",
+    "preview-changes": "Pregled promjena",
+    "product-name": "Naziv proizvoda",
+    "product-sku": "SKU",
+    "promotions-applied": "Primijenjeni promotivni kodovi",
+    "prorated-unit-price": "Proračunska cijena po komadu",
+    "quantity": "Količina",
+    "refund": "Povrat sredstava",
+    "refund-adjustment": "Prilagodba",
+    "refund-and-cancel-order": "Povrat sredstava i otkazivanje narudžbe",
+    "refund-cancellation-reason": "Razlog povrata sredstava/otkazivanja",
+    "refund-cancellation-reason-required": "Razlog povrata sredstava/otkazivanja je obavezan",
+    "refund-metadata": "Metapodaci povrata sredstava",
+    "refund-order-failed": "Povrat narudžbe nije uspio",
+    "refund-order-success": "Uspješno izvršen povrat narudžbe",
+    "refund-reason": "Razlog povrata sredstava",
+    "refund-reason-customer-request": "Zahtjev kupca",
+    "refund-reason-not-available": "Nedostupno",
+    "refund-shipping": "Povrat troškova dostave",
+    "refund-total": "Ukupan iznos povrata",
+    "refund-total-error": "Ukupan iznos povrata mora biti između {min} i {max}",
+    "refund-total-warning": "Ukupan iznos povrata premašuje odabrani iznos plaćanja. Preostali iznos povrata bit će vraćen iz drugih plaćanja.",
+    "refund-with-amount": "Povrat u iznosu od {amount}",
+    "refunded-count": "Povraćeno {count} {count, plural, one {stavka} other {stavki}}",
+    "removed-items": "Uklonjene stavke",
+    "search-by-order-filters": "Pretraga po imenu / kodu / ID transakcije",
+    "select-address": "Odaberi adresu",
+    "select-shipping-method": "Odaberi metodu dostave",
+    "select-state": "Odaberi državu",
+    "seller-orders": "Narudžbe prodavača",
+    "set-billing-address": "Postavi adresu za naplatu",
+    "set-coupon-codes": "Postavi kôdove kupona",
+    "set-customer-for-order": "Postavi kupca",
+    "set-fulfillment-state": "Označi kao {state}",
+    "set-shipping-address": "Postavi adresu za dostavu",
+    "set-shipping-method": "Postavi metodu dostave",
+    "settle-payment": "Izmiri plaćanje",
+    "settle-payment-error": "Plaćanje nije moglo biti izmireno",
+    "settle-payment-success": "Plaćanje je uspješno izmireno",
+    "settle-refund": "Izmiri povrat sredstava",
+    "settle-refund-manual-instructions": "Nakon ručnog povrata putem vašeg pružatelja plaćanja ({method}), unesite ID transakcije ovdje.",
+    "settle-refund-success": "Povrat sredstava je uspješno izmiren",
+    "shipping": "Dostava",
+    "shipping-address": "Adresa dostave",
+    "shipping-cancelled": "Dostava otkazana",
+    "shipping-method": "Metoda dostave",
+    "state": "Stanje",
+    "sub-total": "Prije poreza",
+    "successfully-updated-fulfillment": "Dostava je uspješno ažurirana",
+    "surcharges": "Dodatne naknade",
+    "tax-base": "Osnova za porez",
+    "tax-description": "Opis poreza",
+    "tax-rate": "Porezna stopa",
+    "tax-summary": "Porezni sažetak",
+    "tax-total": "Ukupan porez",
+    "total": "Ukupno",
+    "tracking-code": "Kôd za praćenje",
+    "transaction-id": "ID transakcije",
+    "transition-to-state": "Prijelaz u stanje {state}",
+    "transitioned-payment-to-state-success": "Uspješno izvršen prijelaz plaćanja u stanje {state}",
+    "transitioned-to-state-success": "Uspješno izvršen prijelaz u stanje {state}",
+    "unable-to-transition-to-state-try-another": "Narudžba se nije mogla vratiti u stanje \"{state}\". Molimo odaberite alternativno stanje",
+    "unfulfilled": "Neispunjeno",
+    "unit-price": "Jedinična cijena"
+  },
+  "settings": {
+    "add-countries-to-zone": "Dodaj države u { zoneName }",
+    "add-countries-to-zone-success": "Dodane su { countryCount } {countryCount, plural, one {država} other {države}} u zonu \"{ zoneName }\"",
+    "add-products-to-test-order": "Dodajte proizvode u test narudžbu",
+    "administrator": "Administrator",
+    "channel": "Kanal",
+    "channel-token": "Token kanala",
+    "country": "Država",
+    "create-new-channel": "Kreirajte novi kanal",
+    "create-new-country": "Kreirajte novu državu",
+    "create-new-payment-method": "Kreirajte novu metodu plaćanja",
+    "create-new-role": "Kreirajte novu ulogu",
+    "create-new-seller": "Kreirajte novog prodavača",
+    "create-new-shipping-method": "Kreirajte novu metodu dostave",
+    "create-new-tax-category": "Kreirajte novu kategoriju poreza",
+    "create-new-tax-rate": "Kreirajte novu stopu poreza",
+    "create-new-zone": "Kreirajte novu zonu",
+    "default-currency": "Zadana valuta",
+    "default-role-label": "Ovo je zadana uloga i ne može se mijenjati",
+    "default-shipping-zone": "Zadana zona dostave",
+    "default-tax-zone": "Zadana porezna zona",
+    "defaults": "Zadano",
+    "eligible": "Opravdan",
+    "email-address": "Adresa e-pošte",
+    "email-address-or-identifier": "Adresa e-pošte ili identifikator",
+    "first-name": "Ime",
+    "fulfillment-handler": "Izvršitelj",
+    "global-available-languages-tooltip": "Postavlja jezike koji su dostupni za sve kanale. Individualni kanali mogu podržavati podskup ovih jezika.",
+    "global-out-of-stock-threshold": "Globalni prag isteka zaliha",
+    "global-out-of-stock-threshold-tooltip": "Postavlja razinu zaliha na kojoj se varijanta smatra nedostupnom. Upotreba negativne vrijednosti omogućuje podršku za narudžbe izvan zaliha. Može se zamijeniti varijantama proizvoda.",
+    "last-name": "Prezime",
+    "no-eligible-shipping-methods": "Nema prikladnih metoda dostave",
+    "password": "Lozinka",
+    "payment-eligibility-checker": "Provjeravač opravdanosti plaćanja",
+    "payment-handler": "Rukovatelj plaćanjem",
+    "payment-method": "Metoda plaćanja",
+    "permissions": "Dozvole",
+    "prices-include-tax": "Cijene uključuju porez za zadanu zonu",
+    "profile": "Profil",
+    "rate": "Ocijeni",
+    "remove-countries-from-zone-success": "Uklonjeno { countryCount } {countryCount, plural, one {država} other {država}} iz zone \"{ zoneName }\"",
+    "remove-from-zone": "Uklonite iz zone",
+    "role": "Uloga",
+    "roles": "Uloge",
+    "search-by-product-name-or-sku": "Pretraži po nazivu proizvoda ili SKU",
+    "seller": "Prodavač",
+    "shipping-calculator": "Kalkulator dostave",
+    "shipping-eligibility-checker": "Provjera mogućnosti dostave",
+    "shipping-method": "Metoda dostave",
+    "tax-category": "Kategorija poreza",
+    "tax-rate": "Stopa poreza",
+    "test-address": "Testna adresa",
+    "test-result": "Rezultat testa",
+    "test-shipping-method": "Testna metoda dostave",
+    "test-shipping-methods": "Testne metode dostave",
+    "track-inventory-default": "Pratite zadani inventar",
+    "view-zone-members": "Pregledajte članove",
+    "zone": "Zona"
+  },
+  "state": {
+    "adding-items": "Dodavanje stavki",
+    "arranging-additional-payment": "Organizacija dodatnog plaćanja",
+    "arranging-payment": "Organizacija plaćanja",
+    "authorized": "Odobreno",
+    "cancelled": "Otkazano",
+    "created": "Kreirano",
+    "declined": "Odbijeno",
+    "delivered": "Isporučeno",
+    "draft": "Skica",
+    "error": "Greška",
+    "failed": "Neuspelo",
+    "modifying": "Izmene",
+    "partially-delivered": "Delimično isporučeno",
+    "partially-shipped": "Delimično otpremljeno",
+    "payment-authorized": "Odobreno plaćanje",
+    "payment-settled": "Plaćanje izmireno",
+    "pending": "U tijeku",
+    "settled": "Izmireno",
+    "shipped": "Otpremljeno"
+  },
+  "system": {
+    "all-job-queues": "Sve redove zadataka",
+    "health-all-systems-up": "Svi sistemi su dostupni",
+    "health-error": "Greška: jedan ili više sistema je nedostupno!",
+    "health-last-checked": "Poslednja provera",
+    "health-message": "Poruka",
+    "health-refresh": "Osvježi",
+    "health-status": "Status",
+    "health-status-down": "Nedostupno",
+    "health-status-up": "Dostupno",
+    "job-data": "Podaci o zadatku",
+    "job-duration": "Trajanje",
+    "job-error": "Greška zadatka",
+    "job-queue-name": "Ime reda zadatka",
+    "job-result": "Rezultat zadatka",
+    "job-state": "Stanje zadatka",
+    "job-state-all": "Svi statusi",
+    "job-state-cancelled": "Otkazano",
+    "job-state-completed": "Završeno",
+    "job-state-failed": "Neuspjelo",
+    "job-state-pending": "Na čekanju",
+    "job-state-running": "U tijeku"
+  }
+}
\ No newline at end of file
diff --git a/packages/admin-ui/src/lib/static/i18n-messages/it.json b/packages/admin-ui/src/lib/static/i18n-messages/it.json
index 7608f60e5e..46e3fc4f0d 100644
--- a/packages/admin-ui/src/lib/static/i18n-messages/it.json
+++ b/packages/admin-ui/src/lib/static/i18n-messages/it.json
@@ -45,10 +45,10 @@
     "profile": "Profilo",
     "promotions": "Promozioni",
     "roles": "Ruoli",
-    "seller-orders": "Ordini venditore",
-    "sellers": "Venditore",
+    "seller-orders": "Ordini venditori",
+    "sellers": "Venditori",
     "shipping-methods": "Metodi di spedizione",
-    "stock-locations": "Posizioni magazzino",
+    "stock-locations": "Posizioni scorte",
     "system-status": "Stato del sistema",
     "tax-categories": "Impostazioni Tasse",
     "tax-rates": "Importo Tasse",
@@ -59,7 +59,7 @@
     "add-facets": "Aggiungi attributi",
     "add-option": "Aggiungi opzione",
     "add-price-in-another-currency": "Aggiungi un prezzo in un'altra valuta",
-    "add-stock-location": "Aggiungi posizione magazzino",
+    "add-stock-location": "Aggiungi posizione scorte",
     "add-stock-to-location": "ggiungi merce alla posizione",
     "asset": "Media",
     "asset-preview-links": "Media preview link",
@@ -92,8 +92,8 @@
     "create-new-collection": "Crea nuova Collezione",
     "create-new-facet": "Crea nuovo attributo",
     "create-new-product": "Crea nuovo prodotto",
-    "create-new-stock-location": "Creare una nuova posizione di magazzino",
-    "create-product-option-group": "Crea gruppo di opzione di prodotto",
+    "create-new-stock-location": "Creare una nuova posizione delle scorte ",
+    "create-product-option-group": "Crea gruppo di opzione del prodotto",
     "create-product-variant": "Crea variante prodotto",
     "default-currency": "Valuta predefinita",
     "do-not-inherit-filters": "Non ereditare i filtri",
@@ -121,7 +121,7 @@
     "no-channel-selected": "Nessun canale selezionato",
     "no-featured-asset": "Nessun media in evidenza",
     "no-selection": "Nessuna selezione",
-    "no-stock-locations-available-on-current-channel": "Non sono disponibili posizioni di magazzino nel canale corrente. Impostare almeno una posizione di magazzino prima di aggiungere prodotti.",
+    "no-stock-locations-available-on-current-channel": "Non sono disponibili posizioni delle scorte nel canale corrente. Impostare almeno una posizione delle scorte prima di aggiungere prodotti.",
     "notify-bulk-delete-products-success": "Rimossi con successo {count, plural, one {1 prodotto} other {{count} prodotti}}",
     "notify-remove-facets-from-channel-success": "Rimossi con successo {count, plural, one {1 attributo} other {{count} attributi}} da { channelCode }",
     "notify-remove-product-from-channel-error": "Impossibile rimuovere il prodotto dal canale",
@@ -159,7 +159,7 @@
     "remove-product-from-channel": "Rimuovi prodotto dal canale",
     "remove-product-variant-from-channel": "Rimuovi variante dal canale",
     "reorder-collection": "Riordina collezione",
-    "root-collection": "",
+    "root-collection": "Collezione base",
     "run-pending-search-index-updates": "Indice di ricerca: eseguire {count, plural, one {1 aggiornamento in attesa} other {{count} aggiornamenti in attesa}}",
     "running-search-index-updates": "Esecuzione {count, plural, one {1 aggiornamento} other {{count} aggiornamenti}} all'indice di ricerca",
     "search-asset-name-or-tag": "Cerca per nome o tag del media",
@@ -171,7 +171,7 @@
     "slug": "Slug",
     "slug-pattern-error": "Lo slug non è valido",
     "stock-allocated": "Allocato",
-    "stock-levels": "Livelli di scorte",
+    "stock-levels": "Livello delle scorte",
     "stock-location": "Posizione delle scorte",
     "stock-locations": "Posizioni delle scorte",
     "stock-on-hand": "Scorte",
@@ -203,7 +203,7 @@
     "boolean-false": "falso",
     "boolean-or": "o",
     "boolean-true": "vero",
-    "breadcrumb": "Breadcrump",
+    "breadcrumb": "Breadcrumb",
     "browser-default": "Predefinito del browser",
     "cancel": "Annulla",
     "cancel-navigation": "Annulla navigazione",
@@ -221,7 +221,7 @@
     "confirm-navigation": "Prosegui con la navigazione",
     "contents": "Contenuti",
     "create": "Crea",
-    "created-at": "Creato il",
+    "created-at": "Creata il",
     "custom-fields": "Campi personalizzati",
     "data-table-filter-date-mode": "Modalità data",
     "data-table-filter-date-range": "Intervallo date",
@@ -331,7 +331,7 @@
     "toggle-all": "Cambia tutti",
     "total-items": "{currentStart} - {currentEnd} di {totalItems}",
     "update": "Aggiorna",
-    "updated-at": "Aggiornare a",
+    "updated-at": "Aggiornata il",
     "username": "Username",
     "value": "Valore",
     "view-contents": "Mostra contenuti",
@@ -521,7 +521,7 @@
     "sellers": "Venditori",
     "settings": "Impostazioni",
     "shipping-methods": "Metodi di Spedizione",
-    "stock-locations": "Posizioni magazzino",
+    "stock-locations": "Posizioni scorte",
     "system": "Sistema",
     "system-status": "Stato del Sistema",
     "tax-categories": "Impostazioni Tasse",
@@ -581,7 +581,7 @@
     "history-order-fulfilled": "Ordine spedito",
     "history-order-modified": "Ordine modificato",
     "history-order-transition": "Ordine passato da {from} a {to}",
-    "history-payment-settled": "Pagamento incassato",
+    "history-payment-settled": "Pagamento ricevuto",
     "history-payment-transition": "Pagamento #{id} passato da {from} a {to}",
     "history-refund-transition": "Rimborso #{id} passato da {from} a {to}",
     "item-count": "{count} {count, plural, one {prodotto} other {prodotti}}",
@@ -593,12 +593,12 @@
     "modification-adding-items": "Aggiungo {count} {count, plural, one {prodotto} other {prodotti}}",
     "modification-adding-surcharges": "Aggiungo {count} {count, plural, one {sovrapprezzo} other {sovrapprezzi}}",
     "modification-adjusting-lines": "Modifico {count} {count, plural, one {linea} other {linee}} dell'ordine",
-    "modification-not-settled": "Non incassato",
+    "modification-not-settled": "Non ricevuto",
     "modification-recalculate-shipping": "Ricalcola spedizione",
-    "modification-settled": "Incassato",
+    "modification-settled": "Ricevuto",
     "modification-summary": "Riepilogo delle modifiche",
-    "modification-updating-billing-address": "Aggiorno indirizzo di fatturazione",
-    "modification-updating-shipping-address": "Aggiorno indirizzo di spedizione",
+    "modification-updating-billing-address": "Aggiornando l'indirizzo di fatturazione",
+    "modification-updating-shipping-address": "Aggiornando l'indirizzo di spedizione",
     "modifications": "Modifiche",
     "modify-order": "Modifica ordine",
     "modify-order-price-difference": "Differenza di prezzo",
@@ -692,7 +692,7 @@
   "settings": {
     "add-countries-to-zone": "Aggiungi nazioni a { zoneName }",
     "add-countries-to-zone-success": "Ho aggiunto { countryCount } {countryCount, plural, one {nazione} other {nazioni}} alla zona \"{ zoneName }\"",
-    "add-products-to-test-order": "Aggiunti prodotti all'ordine di test",
+    "add-products-to-test-order": "Aggiunti prodotti all'ordine di prova",
     "administrator": "Amministratore",
     "channel": "Canale",
     "channel-token": "Token del canale",
@@ -722,8 +722,8 @@
     "last-name": "Cognome",
     "no-eligible-shipping-methods": "Nessun metodo di spedizione compatibile",
     "password": "Password",
-    "payment-eligibility-checker": "Metodo di verifica compatibilità pagamento",
-    "payment-handler": "Funzione gestione pagamento",
+    "payment-eligibility-checker": "Criterio di idoneità metodo di pagamento",
+    "payment-handler": "Gestore Pagamento",
     "payment-method": "Metodo di pagamento",
     "permissions": "Permessi",
     "prices-include-tax": "I prezzi includono le tasse per la zona fiscale predefinita",
@@ -733,24 +733,24 @@
     "remove-from-zone": "Rimuovi dalla zona",
     "role": "Ruolo",
     "roles": "Ruoli",
-    "search-by-product-name-or-sku": "Cerca per prodotto o codice SKU",
+    "search-by-product-name-or-sku": "Cerca per nome prodotto o codice SKU",
     "seller": "Venditore",
-    "shipping-calculator": "Calcolo prezzo spedizioni",
-    "shipping-eligibility-checker": "Criterio di selezione metodi di spedizione",
+    "shipping-calculator": "Calcolo prezzo spedizione",
+    "shipping-eligibility-checker": "Criterio di idoneità metodo di spedizione",
     "shipping-method": "Metodo di spedizione",
     "tax-category": "Categoria tasse",
     "tax-rate": "Tasso fiscale",
-    "test-address": "Indirizzo di test",
-    "test-result": "Risultato test",
-    "test-shipping-method": "Testa metodo di spedizione",
-    "test-shipping-methods": "Testa metodi di spedizione",
+    "test-address": "Indirizzo di prova",
+    "test-result": "Risultato prova",
+    "test-shipping-method": "Prova metodo di spedizione",
+    "test-shipping-methods": "Prova metodi di spedizione",
     "track-inventory-default": "Monitora inventario automaticamente",
     "view-zone-members": "Vedi membri",
     "zone": "Zona"
   },
   "state": {
     "adding-items": "Aggiunta prodotti",
-    "arranging-additional-payment": "Scelta pagamento ulteriore",
+    "arranging-additional-payment": "Scelta ulteriore pagamento ",
     "arranging-payment": "Scelta pagamento",
     "authorized": "Autorizzato",
     "cancelled": "Cancellato",
@@ -770,8 +770,8 @@
     "shipped": "Spedito"
   },
   "system": {
-    "all-job-queues": "Tutte le code di operazioni",
-    "health-all-systems-up": "Tutto il sistema è attivo",
+    "all-job-queues": "Tutte le operazioni",
+    "health-all-systems-up": "I sistemi sono attivi",
     "health-error": "Errore: uno o più sistemi sono inattivi!",
     "health-last-checked": "Ultimo controllo",
     "health-message": "Messaggio",
@@ -792,4 +792,4 @@
     "job-state-pending": "In attesa",
     "job-state-running": "In esecuzione"
   }
-}
\ No newline at end of file
+}
diff --git a/packages/admin-ui/src/lib/static/i18n-messages/ne.json b/packages/admin-ui/src/lib/static/i18n-messages/ne.json
index 0824fb6d85..c9ef969d9f 100644
--- a/packages/admin-ui/src/lib/static/i18n-messages/ne.json
+++ b/packages/admin-ui/src/lib/static/i18n-messages/ne.json
@@ -28,26 +28,26 @@
     "administrators": "प्रशासकहरू",
     "assets": "फाइलहरू",
     "channels": "च्यानलहरू",
-    "collections": "संग्रहहरू",
+    "collections": "",
     "countries": "देशहरू",
     "customer-groups": "ग्राहक समूहहरू",
     "customers": "ग्राहकहरू",
     "dashboard": "ड्यासबोर्ड",
-    "facets": "पहिचानहरू",
+    "facets": "गुणस्तरहरू",
     "global-settings": "वैश्विक सेटिङहरू",
     "job-queue": "काम कत्ति",
     "manage-variants": "विविध विकल्पहरू प्रबन्ध गर्नुहोस्",
     "modifying": "परिमार्जन",
-    "orders": "आदेशहरू",
+    "orders": "ओर्दरहरु",
     "payment-methods": "भुक्तानी विधिहरू",
     "product-options": "समान विकल्पहरू",
     "products": "उत्पादनहरू",
     "profile": "प्रोफाइल",
     "promotions": "प्रमोशनहरू",
     "roles": "भूमिकाहरू",
-    "seller-orders": "बेच्ने आदेशहरू",
-    "sellers": "बेच्ने गर्ने व्यक्तिहरू",
-    "shipping-methods": "माल गर्ने तरिकाहरू",
+    "seller-orders": "विक्रेता ओर्दरहरु",
+    "sellers": "विक्रेता व्यक्तिहरू",
+    "shipping-methods": "ढुवानी गर्ने तरिकाहरू",
     "stock-locations": "स्टक स्थानहरू",
     "system-status": "प्रणालीको स्थिति",
     "tax-categories": "कर श्रेणिहरू",
@@ -64,37 +64,37 @@
     "asset": "संपत्ति",
     "asset-preview-links": "संपत्ति पूर्वावलोकन लिङ्कहरू",
     "assets": "फाइलहरू",
-    "assign-product-to-channel-success": "{count, plural, one {1 उत्पाद} other {{count} उत्पादहरू}} लाई { channel } मा सफलतापूर्वक लगाइएको",
-    "assign-products-to-channel": "उत्पादहरूलाई च्यानलमा लगाउनुहोस्",
+    "assign-product-to-channel-success": "{count, plural, one {1 समान} other {{count} समानहरू}} लाई { channel } मा सफलतापूर्वक लगाइएको",
+    "assign-products-to-channel": "समानहरूलाई च्यानलमा लगाउनुहोस्",
     "assign-to-channel": "च्यानलमा लगाउनुहोस्",
     "assign-to-named-channel": "{ channelCode } मा लगाउनुहोस्",
-    "assign-variant-to-channel-success": "{count, plural, one {1 उत्पाद विविधता} other {{count} उत्पाद विविधताहरू}} लाई { channel } मा सफलतापूर्वक लगाइएको",
-    "assign-variants-to-channel": "उत्पाद विविधताहरूलाई च्यानलमा लगाउनुहोस्",
+    "assign-variant-to-channel-success": "{count, plural, one {1 समान विविधता} other {{count} समान विविधताहरू}} लाई { channel } मा सफलतापूर्वक लगाइएको",
+    "assign-variants-to-channel": "समान विविधताहरूलाई च्यानलमा लगाउनुहोस्",
     "auto-update-option-variant-name": "विकल्प परिविकल्पको नाम आफ्नो आपदेट गर्नका लागि स्वचालित गर्नुहोस्",
-    "auto-update-product-variant-name": "उत्पाद विविधताका नाम आफ्नो आपदेट गर्नका लागि स्वचालित गर्नुहोस्",
-    "cannot-create-variants-without-options": "कम्ति दुई उत्पाद विकल्पसम्म विकल्प संग समावेश गरिएको पर्याप्त छेनपछि उत्पाद विविधता सिर्जना गर्न सकिदैन",
+    "auto-update-product-variant-name": "समान विविधताका नाम आफ्नो आपदेट गर्नका लागि स्वचालित गर्नुहोस्",
+    "cannot-create-variants-without-options": "कम्ति दुई समान विकल्पसम्म विकल्प संग समावेश गरिएको पर्याप्त छेनपछि समान विविधता सिर्जना गर्न सकिदैन",
     "channel-price-preview": "च्यानल मूल्य पूर्वावलोकन",
-    "collection": "संग्रह",
-    "collection-contents": "संग्रह सामग्रीहरू",
-    "collections": "संग्रहहरू",
-    "confirm-bulk-delete-products": "{count} उत्पादहरू मेटाउनुहोस्?",
+    "collection": "",
+    "collection-contents": "",
+    "collections": "",
+    "confirm-bulk-delete-products": "{count} समानहरू मेटाउनुहोस्?",
     "confirm-cancel": "रद्द गर्नुहोस्?",
     "confirm-delete-assets": "{count} {count, plural, one {संपत्ति} other {संपत्तिहरू}} मेटाउनुहोस्?",
-    "confirm-delete-facet-value": "मूल्य मेटाउनुहोस्?",
-    "confirm-delete-product": "उत्पाद मेटाउनुहोस्?",
-    "confirm-delete-product-option": "उत्पाद विकल्प \"{name}\" मेटाउनुहोस्?",
-    "confirm-delete-product-option-group": "उत्पाद विकल्प समूह \"{name}\" मेटाउनुहोस्?",
+    "confirm-delete-facet-value": "गुणस्तर मूल्य मेटाउनुहोस्?",
+    "confirm-delete-product": "समान मेटाउनुहोस्?",
+    "confirm-delete-product-option": "समान विकल्प \"{name}\" मेटाउनुहोस्?",
+    "confirm-delete-product-option-group": "समान विकल्प समूह \"{name}\" मेटाउनुहोस्?",
     "confirm-delete-product-option-group-body": "यस विकल्प समूहलाई {count} {count, plural, one {विविधता} other {विविधताहरू}} द्वारा प्रयोग गरिएको छ। के तपाईं यसलाई मेटाउन चाहनुहुन्छ?",
-    "confirm-delete-product-variant": "उत्पाद विविधता \"{name}\" मेटाउनुहोस्?",
-    "confirm-deletion-of-unused-variants-body": "नयाँ विकल्पहरू थप्दा पुरानो उत्पाद विविधताहरूमा प्रयुक्त भएको कारण पुरानो उत्पाद विविधताहरू मेटाइनेछन्।",
-    "confirm-deletion-of-unused-variants-title": "अपयोगित उत्पाद विविधताहरू मेटाउनुहोस्?",
-    "create-draft-order": "मस्यौदा आदेश सिर्जना गर्नुहोस्",
-    "create-new-collection": "नयाँ संग्रह सिर्जना गर्नुहोस्",
+    "confirm-delete-product-variant": "समान विविधता \"{name}\" मेटाउनुहोस्?",
+    "confirm-deletion-of-unused-variants-body": "नयाँ विकल्पहरू थप्दा पुरानो समान विविधताहरूमा प्रयुक्त भएको कारण पुरानो समान विविधताहरू मेटाइनेछन्।",
+    "confirm-deletion-of-unused-variants-title": "अपयोगित समान विविधताहरू मेटाउनुहोस्?",
+    "create-draft-order": "मस्यौदा ओर्दर सिर्जना गर्नुहोस्",
+    "create-new-collection": "",
     "create-new-facet": "नयाँ मूल्य सिर्जना गर्नुहोस्",
-    "create-new-product": "नयाँ उत्पाद",
+    "create-new-product": "नयाँ समान",
     "create-new-stock-location": "नयाँ स्टक स्थान सिर्जना गर्नुहोस्",
-    "create-product-option-group": "उत्पाद विकल्प समूह सिर्जना गर्नुहोस्",
-    "create-product-variant": "उत्पाद विविधता सिर्जना गर्नुहोस्",
+    "create-product-option-group": "समान विकल्प समूह सिर्जना गर्नुहोस्",
+    "create-product-variant": "समान विविधता सिर्जना गर्नुहोस्",
     "default-currency": "पूर्वनिर्धारित मुद्रा",
     "do-not-inherit-filters": "फिल्टरहरू समावेश गर्न नगर्नुहोस्",
     "drop-files-to-upload": "अपलोड गर्नका लागि फाइलहरू टाँच्नुहोस्",
@@ -111,9 +111,9 @@
     "inherit-filters-from-parent": "उत्तराधिकारीबाट फिल्टरहरू समावेश गर्नुहोस्",
     "live-preview-contents": "सामग्री लाइभ पूर्वावलोकन",
     "manage-variants": "विविधताहरू प्रबन्धन गर्नुहोस्",
-    "move-collection-to": "{ name } मा सार्नुहोस्",
-    "move-collections": "संग्रहहरू सार्नुहोस्",
-    "move-collections-success": "{count, plural, one {1 संग्रह} other {{count} संग्रहहरू}} सारियो",
+    "move-collection-to": "",
+    "move-collections": "",
+    "move-collections-success": "",
     "move-down": "तल सार्नुहोस्",
     "move-to": "यहाँ सार्नुहोस्",
     "move-up": "माथि सार्नुहोस्",
@@ -143,7 +143,7 @@
     "price-with-tax-in-default-zone": "संलग्न गर्दछ {rate}% कर: {price}",
     "private": "गोप्य",
     "product": "समान",
-    "product-name": "समान नाम",
+    "product-name": "समानको नाम",
     "product-options": "समान विकल्पहरू",
     "product-variant-exists": "यस विकल्पसहितको समान वेरिएन्ट पहिले नै छ",
     "product-variants": "समान वेरिएन्टहरू",
@@ -158,16 +158,16 @@
     "remove-option": "विकल्प हटाउनुहोस्",
     "remove-product-from-channel": "च्यानलबाट समान हटाउनुहोस्",
     "remove-product-variant-from-channel": "च्यानलबाट समान वेरिएन्ट हटाउनुहोस्",
-    "reorder-collection": "संग्रह पुनः क्रममा ल्याउनुहोस्",
-    "root-collection": "मूल संग्रह",
+    "reorder-collection": "",
+    "root-collection": "",
     "run-pending-search-index-updates": "खोज सूची: चलाउँदै छ {count, plural, one {1 पेन्डिङ अपडेट} other {{count} पेन्डिङ अपडेटहरू}}",
     "running-search-index-updates": "चलाउँदै छ {count, plural, one {1 अपडेट} other {{count} अपडेटहरू}} खोज सूचीमा",
     "search-asset-name-or-tag": "संपत्ति नाम वा ट्यागका लागि खोज्नुहोस्",
     "search-for-term": "मात्रकको लागि खोज्नुहोस्",
-    "search-product-name-or-code": "समान नाम वा कोडका लागि खोज्नुहोस्",
+    "search-product-name-or-code": "समानको नाम वा कोडका लागि खोज्नुहोस्",
     "select-product": "समान छनोट गर्नुहोस्",
     "select-product-variant": "समान वेरिएन्ट छनोट गर्नुहोस्",
-    "sku": "एसक्यू",
+    "sku": "SKU",
     "slug": "स्लग",
     "slug-pattern-error": "स्लग अमान्य छ",
     "stock-allocated": "स्टक प्रियापित",
@@ -191,7 +191,7 @@
     "visibility": "दृश्यता"
   },
   "common": {
-    "ID": "पहिचान",
+    "ID": "गुणस्तर",
     "add-filter": "फिल्टर थप्नुहोस्",
     "add-item-to-list": "सूचीमा वस्त्र थप्नुहोस्",
     "add-note": "नोट थप्नुहोस्",
@@ -215,8 +215,8 @@
     "collapse-entries": "प्रवेशहरू ढिलो गर्नुहोस्",
     "confirm": "पुष्टि गर्नुहोस्",
     "confirm-bulk-assign-to-channel": "केहि चयन च्यानलमा खस्यौँ गर्ने?",
-    "confirm-bulk-delete": "चयन गरिएका वस्तुहरूलाई हटाउने?",
-    "confirm-bulk-remove-from-channel": "चयन गरिएका वस्तुहरूलाई वर्तमान च्यानलबाट हटाउने?",
+    "confirm-bulk-delete": "चयन गरिएका समानहरूलाई हटाउने?",
+    "confirm-bulk-remove-from-channel": "चयन गरिएका समानहरूलाई वर्तमान च्यानलबाट हटाउने?",
     "confirm-delete-note": "नोट हटाउने?",
     "confirm-navigation": "नेभिगेसन पुष्टि गर्नुहोस्",
     "contents": "सामग्री",
@@ -247,14 +247,14 @@
     "force-remove": "बल पुर्वप्रक्षिप्त गर्नुहोस्",
     "general": "सामान्य",
     "guest": "अतिथि",
-    "id": "पहिचान",
+    "id": "गुणस्तर",
     "image": "प्रतिमा",
     "items-per-page-option": "{ पृष्ठमा गर्ने } प्रति पृष्ठ",
-    "items-selected-count": "{ परिमाण } {count, plural, one {वस्तु} other {वस्तुहरू}} चयन गरिएको",
+    "items-selected-count": "{ परिमाण } {count, plural, one {समान} other {समानहरू}} चयन गरिएको",
     "keep-editing": "सम्पादन जारी राख्नुहोस्",
     "language": "भाषा",
     "launch-extension": "एक्सटेन्सन प्रारम्भ गर्नुहोस्",
-    "list-items-and-n-more": "{ वस्तुहरू } र {nMore} थप",
+    "list-items-and-n-more": "{ समानहरू } र {nMore} थप",
     "live-update": "लाइभ अपडेट",
     "locale": "स्थान",
     "log-out": "बाहिर जानुहोस्",
@@ -271,14 +271,14 @@
     "no-results": "कुनै परिणाम छैन",
     "not-applicable": "लागू छैन",
     "not-set": "सेट गरिएको छैन",
-    "notify-assign-to-channel-success-with-count": "{ गणना } {count, plural, one {वस्तु} other {वस्तुहरू}} { channelCode } मा सफलतापूर्वक कुनै पनि दिएको छ",
+    "notify-assign-to-channel-success-with-count": "{ गणना } {count, plural, one {समान} other {समानहरू}} { channelCode } मा सफलतापूर्वक कुनै पनि दिएको छ",
     "notify-bulk-update-success": "सफलतापूर्वक { count } { entity } परिमाण",
     "notify-create-error": "त्रुटि देखा पर्‍यो, { entity } सिर्जना गर्न असमर्थ",
     "notify-create-success": "{ entity } नयाँ सिर्जना गरियो",
     "notify-delete-error": "त्रुटि देखा पर्‍यो, { entity } मेटाउन असमर्थ",
-    "notify-delete-error-with-count": "{count, plural, one {1 वस्तु} other {{count} वस्तुहरू}} मेटाउन असमर्थ",
+    "notify-delete-error-with-count": "{count, plural, one {1 समान} other {{count} समानहरू}} मेटाउन असमर्थ",
     "notify-delete-success": "{ entity } मेटाइयो",
-    "notify-delete-success-with-count": "{count, plural, one {1 वस्तु} other {{count} वस्तुहरू}} सफलतापूर्वक मेटाइयो",
+    "notify-delete-success-with-count": "{count, plural, one {1 समान} other {{count} समानहरू}} सफलतापूर्वक मेटाइयो",
     "notify-remove-from-channel-success-with-count": "{ count } च्यानलबाट सफलतापूर्वक हटाइयो",
     "notify-save-changes-error": "त्रुटि देखा पर्‍यो, परिवर्तनहरू संरक्षण गर्न असमर्थ",
     "notify-saved-changes": "परिवर्तनहरू संरक्षित गरियो",
@@ -313,8 +313,8 @@
     "search-by-name": "नाम द्वारा खोज्नुहोस्",
     "select": "चयन गर्नुहोस्...",
     "select-display-language": "प्रदर्शन भाषा चयन गर्नुहोस्",
-    "select-items-with-count": "{ count } {count, plural, one {वस्तु} other {वस्तुहरू}} चयन गर्नुहोस्",
-    "select-products": "उत्पादन चयन गर्नुहोस्",
+    "select-items-with-count": "{ count } {count, plural, one {समान} other {समानहरू}} चयन गर्नुहोस्",
+    "select-products": "समानन चयन गर्नुहोस्",
     "select-relation-id": "सम्बन्ध आइडी चयन गर्नुहोस्",
     "select-table-columns": "तालिका स्तंभ चयन गर्नुहोस्",
     "select-today": "आज चयन गर्नुहोस्",
@@ -504,7 +504,7 @@
     "assets": "फाइलहरू",
     "catalog": "क्याटलग",
     "channels": "च्यानलहरू",
-    "collections": "संग्रहहरू",
+    "collections": "",
     "countries": "देशहरू",
     "customer-groups": "ग्राहक समूहहरू",
     "customers": "ग्राहकहरू",
@@ -512,7 +512,7 @@
     "global-settings": "वैश्विक सेटिङ्ग्स",
     "job-queue": "काम कतार",
     "marketing": "मार्केटिङ्ग",
-    "orders": "आदेशहरू",
+    "orders": "ओर्दरहरु",
     "payment-methods": "भुक्तानी गर्ने तरिकाहरू",
     "products": "उत्पादनहरू",
     "promotions": "प्रमोशनहरू",
@@ -520,7 +520,7 @@
     "sales": "बिक्री",
     "sellers": "बेच्नेहरू",
     "settings": "सेटिङ्ग्स",
-    "shipping-methods": "पारिश्रमिक तरिकाहरू",
+    "shipping-methods": "ढुवानी तरिकाहरू",
     "stock-locations": "स्टक स्थानहरू",
     "system": "प्रणाली",
     "system-status": "प्रणाली स्थिति",
@@ -529,28 +529,28 @@
     "zones": "क्षेत्रहरू"
   },
   "order": {
-    "add-item-to-order": "आदेशमा वस्तु थप्नुहोस्",
+    "add-item-to-order": "ओर्दरमा समान थप्नुहोस्",
     "add-note": "टिप्पणी थप्नुहोस्",
     "add-payment": "भुक्तानी थप्नुहोस्",
-    "add-payment-to-order": "आदेशमा भुक्तानी थप्नुहोस्",
-    "add-payment-to-order-success": "आदेशमा भुक्तानी सफलतापूर्वक थपियो",
+    "add-payment-to-order": "ओर्दरमा भुक्तानी थप्नुहोस्",
+    "add-payment-to-order-success": "ओर्दरमा भुक्तानी सफलतापूर्वक थपियो",
     "add-surcharge": "सर्चार्ज थप्नुहोस्",
-    "added-items": "थपिएका वस्तुहरू",
+    "added-items": "थपिएका समानहरू",
     "amount": "रकम",
     "arrange-additional-payment": "अतिरिक्त भुक्तानी गर्नुहोस्",
     "billing-address": "बिलिङ ठेगाना",
     "cancel": "रद्द गर्नुहोस्",
-    "cancel-entire-order": "पूरा आदेश रद्द गर्नुहोस्",
+    "cancel-entire-order": "पूरा ओर्दर रद्द गर्नुहोस्",
     "cancel-fulfillment": "पूर्णाउण रद्द गर्नुहोस्",
     "cancel-modification": "संशोधन रद्द गर्नुहोस्",
-    "cancel-order": "आदेश वा वस्तुहरू रद्द गर्नुहोस्",
+    "cancel-order": "ओर्दर वा समानहरू रद्द गर्नुहोस्",
     "cancel-payment": "भुक्तानी रद्द गर्नुहोस्",
     "cancel-reason-customer-request": "ग्राहकको अनुरोध",
     "cancel-reason-not-available": "उपलब्ध छैन",
-    "cancel-selected-items": "चयन गरिएका वस्तुहरू रद्द गर्नुहोस्",
-    "cancel-specified-items": "निर्दिष्ट वस्तुहरू रद्द गर्नुहोस्",
+    "cancel-selected-items": "चयन गरिएका समानहरू रद्द गर्नुहोस्",
+    "cancel-specified-items": "निर्दिष्ट समानहरू रद्द गर्नुहोस्",
     "cancellation-reason": "रद्द गर्ने कारण",
-    "cancelled-order-success": "आदेश सफलतापूर्वक रद्द गरियो",
+    "cancelled-order-success": "ओर्दर सफलतापूर्वक रद्द गरियो",
     "complete-draft-order": "पूरा प्रारूप",
     "confirm-modifications": "संशोधनहरू पुष्टि गर्नुहोस्",
     "contents": "अनुकूलन",
@@ -558,7 +558,7 @@
     "create-fulfillment-success": "पूर्णाउण सफलतापूर्वक सिर्जना गरियो",
     "customer": "ग्राहक",
     "delete-draft-order": "प्रारूप रद्द गर्नुहोस्",
-    "draft-order": "प्रारूप आदेश",
+    "draft-order": "प्रारूप ओर्दर",
     "edit-billing-address": "बिलिङ ठेगाना सम्पादन गर्नुहोस्",
     "edit-shipping-address": "पारिश्रमिक ठेगाना सम्पादन गर्नुहोस्",
     "error-message": "त्रुटि संदेश",
@@ -566,7 +566,7 @@
     "existing-customer": "मौजूदा ग्राहक",
     "filter-is-active": "सक्रिय छ",
     "fulfill": "पूर्णाउनुहोस्",
-    "fulfill-order": "पूर्णाउण आदेश",
+    "fulfill-order": "पूर्णाउण ओर्दर",
     "fulfillment": "पूर्णाउण",
     "fulfillment-method": "पूर्णाउण तरिका",
     "history-coupon-code-applied": "कुपन कोड लागू गरियो",
@@ -575,22 +575,22 @@
     "history-fulfillment-delivered": "पूर्णाउण पुर्याइयो",
     "history-fulfillment-shipped": "पूर्णाउण पठाइयो",
     "history-fulfillment-transition": "पूर्णाउण यात्रा गर्दा {from} बाट {to} मा",
-    "history-items-cancelled": "{count} {count, plural, one {वस्तु} other {वस्तुहरू}} रद्द गरियो",
-    "history-order-cancelled": "आदेश रद्द गरियो",
-    "history-order-created": "आदेश सिर्जना गरियो",
-    "history-order-fulfilled": "आदेश पूर्ण भयो",
-    "history-order-modified": "आदेश संशोधन गरियो",
-    "history-order-transition": "आदेशको यात्रा गर्दा {from} बाट {to} मा",
+    "history-items-cancelled": "{count} {count, plural, one {समान} other {समानहरू}} रद्द गरियो",
+    "history-order-cancelled": "ओर्दर रद्द गरियो",
+    "history-order-created": "ओर्दर सिर्जना गरियो",
+    "history-order-fulfilled": "ओर्दर पूर्ण भयो",
+    "history-order-modified": "ओर्दर संशोधन गरियो",
+    "history-order-transition": "ओर्दरको यात्रा गर्दा {from} बाट {to} मा",
     "history-payment-settled": "भुक्तानी लिएको",
     "history-payment-transition": "भुक्तानी #{id} लाई {from} बाट {to} मा यात्रा गरियो",
     "history-refund-transition": "वापसी #{id} लाई {from} बाट {to} मा यात्रा गरियो",
-    "item-count": "{count} {count, plural, one {वस्तु} other {वस्तुहरू}}",
+    "item-count": "{count} {count, plural, one {समान} other {समानहरू}}",
     "line-fulfillment-all": "सबै लाएन पूर्ण भएको छ",
     "line-fulfillment-none": "कुनै पनि लाएन पूर्ण भएको छैन",
     "line-fulfillment-partial": "{count} मध्ये {total} लाएन पूर्ण भएको छ",
     "manually-transition-to-state": "हातमा यात्रा गर्नुहोस्...",
-    "manually-transition-to-state-message": "आदेश अझै अर्को स्थितिमा हातमा यात्रा गर्नुहोस्। कृपया ध्यान दिनुहोस् कि आदेश स्थितिहरूले केहि यात्रा रोक्ने नियमहरू अनुसरण गर्दछ जसले केहि यात्राहरूलाई रोक्दै गर्दछ।",
-    "modification-adding-items": "{count} {count, plural, one {वस्तु} other {वस्तुहरू}} थपिएको छ",
+    "manually-transition-to-state-message": "ओर्दर अझै अर्को स्थितिमा हातमा यात्रा गर्नुहोस्। कृपया ध्यान दिनुहोस् कि ओर्दर स्थितिहरूले केहि यात्रा रोक्ने नियमहरू अनुसरण गर्दछ जसले केहि यात्राहरूलाई रोक्दै गर्दछ।",
+    "modification-adding-items": "{count} {count, plural, one {समान} other {समानहरू}} थपिएको छ",
     "modification-adding-surcharges": "{count} {count, plural, one {सर्चार्ज} other {सर्चार्जहरू}} थपिएको छ",
     "modification-adjusting-lines": "{count} {count, plural, one {लाइन} other {लाइनहरू}} सम्पादन गरिएको छ",
     "modification-not-settled": "लिएको छैन",
@@ -600,22 +600,22 @@
     "modification-updating-billing-address": "बिलिङ ठेगाना अपडेट गरिएको छ",
     "modification-updating-shipping-address": "पारिश्रमिक ठेगाना अपडेट गरिएको छ",
     "modifications": "संशोधनहरू",
-    "modify-order": "आदेश संशोधन गर्नुहोस्",
+    "modify-order": "ओर्दर संशोधन गर्नुहोस्",
     "modify-order-price-difference": "मूल्य अन्तर",
     "net-price": "नेट मूल्य",
     "note": "टिप्पणी",
     "note-is-private": "टिप्पणी प्राइभेट छ",
     "note-only-visible-to-administrators": "मात्र प्रशासकहरूले मात्र हेर्न सक्छन्",
     "note-visible-to-customer": "प्रशासकहरू र ग्राहकहरूले हेर्न सक्छन्",
-    "order": "आदेश",
-    "order-history": "आदेश इतिहास",
-    "order-is-empty": "आदेश खाली छ",
-    "order-state-diagram": "आदेश स्थिति डायग्राम",
-    "order-type": "आदेश प्रकार",
+    "order": "ओर्दर",
+    "order-history": "ओर्दर इतिहास",
+    "order-is-empty": "ओर्दर खाली छ",
+    "order-state-diagram": "ओर्दर स्थिति डायग्राम",
+    "order-type": "ओर्दर प्रकार",
     "order-type-aggregate": "संचयन",
     "order-type-regular": "साधारण",
     "order-type-seller": "विक्रेता",
-    "orders": "आदेशहरू",
+    "orders": "ओर्दरहरु",
     "original-quantity-at-checkout": "चेकआउटमा मूल संख्या",
     "payment": "भुक्तानी",
     "payment-amount": "भुक्तानी रकम",
@@ -627,18 +627,18 @@
     "placed-at": "मा राखिएको",
     "preview-changes": "पूर्वावलोकन परिवर्तनहरू",
     "product-name": "समानको नाम",
-    "product-sku": "समानको एसक्यू",
+    "product-sku": "SKU",
     "promotions-applied": "प्रचारहरू लागू गरिएको",
     "prorated-unit-price": "प्राप्त मूल्य यूनिट मूल्य",
     "quantity": "मात्रा",
     "refund": "वापसी",
     "refund-adjustment": "सम्यक गर्दैछ",
-    "refund-and-cancel-order": "वापसी गर्दै र आदेश रद्द गर्दै",
+    "refund-and-cancel-order": "वापसी गर्दै र ओर्दर रद्द गर्दै",
     "refund-cancellation-reason": "वापसी/रद्द गर्दै कारण",
     "refund-cancellation-reason-required": "वापसी/रद्द गर्दै कारण आवश्यक छ",
     "refund-metadata": "वापसी मेटाडाटा",
-    "refund-order-failed": "आदेश वापसी गर्दा असफल भयो",
-    "refund-order-success": "आदेश सफलतापूर्वक वापसी गरियो",
+    "refund-order-failed": "ओर्दर वापसी गर्दा असफल भयो",
+    "refund-order-success": "ओर्दर सफलतापूर्वक वापसी गरियो",
     "refund-reason": "वापसी कारण",
     "refund-reason-customer-request": "ग्राहकको अनुरोध",
     "refund-reason-not-available": "उपलब्ध छैन",
@@ -647,19 +647,19 @@
     "refund-total-error": "कुल वापसी {min} र {max} को बीचमा हुनुपर्छ",
     "refund-total-warning": "कुल वापसी चयन गरिएको भुक्तानी रकमलाई माथि पुर्याइएको छैन। अरू भुक्तानीहरूबाट बाँकी वापसी रकम वापसी गरिनेछ।",
     "refund-with-amount": "{amount} वापसी गर्नुहोस्",
-    "refunded-count": "{count} {count, plural, one {वस्तु} other {वस्तुहरू}} वापसी गरियो",
-    "removed-items": "हटाइएका वस्तुहरू",
+    "refunded-count": "{count} {count, plural, one {समान} other {समानहरू}} वापसी गरियो",
+    "removed-items": "हटाइएका समानहरू",
     "search-by-order-filters": "नाम / कोड / लेखा निम्ति खोज्नुहोस्",
     "select-address": "ठेगाना चयन गर्नुहोस्",
-    "select-shipping-method": "पारिश्रमिक तरिका चयन गर्नुहोस्",
+    "select-shipping-method": "ढुवानी तरिका चयन गर्नुहोस्",
     "select-state": "स्थिति चयन गर्नुहोस्",
-    "seller-orders": "विक्रेता आदेशहरू",
+    "seller-orders": "विक्रेता ओर्दरहरु",
     "set-billing-address": "बिलिङ ठेगाना सेट गर्नुहोस्",
     "set-coupon-codes": "कुपन कोड सेट गर्नुहोस्",
     "set-customer-for-order": "ग्राहक सेट गर्नुहोस्",
     "set-fulfillment-state": "{state} मा चिन्ह गर्नुहोस्",
-    "set-shipping-address": "पारिश्रमिक ठेगाना सेट गर्नुहोस्",
-    "set-shipping-method": "पारिश्रमिक तरिका सेट गर्नुहोस्",
+    "set-shipping-address": "ढुवानी ठेगाना सेट गर्नुहोस्",
+    "set-shipping-method": "ढुवानी तरिका सेट गर्नुहोस्",
     "settle-payment": "भुक्तानी गर्नुहोस्",
     "settle-payment-error": "भुक्तानी सफल गर्न सकिएन",
     "settle-payment-success": "भुक्तानी सफलतापूर्वक सेटल गरियो",
@@ -667,9 +667,9 @@
     "settle-refund-manual-instructions": "तपाईंको भुक्तान प्रदान गर्दा मान्य भएको छ, तलका मा अर्को भुक्तान कोडहरू छन् ({method}), यहाँ व्यक्त गर्नुहोस्।",
     "settle-refund-success": "वापसी सफलतापूर्वक सेटल गरियो",
     "shipping": "पारिश्रमिक",
-    "shipping-address": "पारिश्रमिक ठेगाना",
-    "shipping-cancelled": "पारिश्रमिक रद्द गरियो",
-    "shipping-method": "पारिश्रमिक तरिका",
+    "shipping-address": "ढुवानी ठेगाना",
+    "shipping-cancelled": "ढुवानी रद्द गरियो",
+    "shipping-method": "ढुवानी तरिका",
     "state": "स्थिति",
     "sub-total": "उपकुल",
     "successfully-updated-fulfillment": "पूर्णाउण सफलतापूर्वक अपडेट गरियो",
@@ -685,14 +685,14 @@
     "transition-to-state": "{ state } स्थिति मा यात्रा गर्नुहोस्",
     "transitioned-payment-to-state-success": "{ state } मा भुक्तानी सफलतापूर्वक यात्रा गरियो",
     "transitioned-to-state-success": "{ state } मा सफलतापूर्वक यात्रा गरियो",
-    "unable-to-transition-to-state-try-another": "आदेशलाई फर्का \"{state}\" स्थितिमा यात्रा गर्न सकिएन। कृपया अन्य एक विकल्प चयन गर्नुहोस्।",
+    "unable-to-transition-to-state-try-another": "ओर्दरलाई फर्का \"{state}\" स्थितिमा यात्रा गर्न सकिएन। कृपया अन्य एक विकल्प चयन गर्नुहोस्।",
     "unfulfilled": "पूर्ण नहुने",
     "unit-price": "यूनिट मूल्य"
   },
   "settings": {
     "add-countries-to-zone": "देशहरू थप्नुहोस् { zoneName } मा",
     "add-countries-to-zone-success": "थपिएको छ { countryCount } {countryCount, plural, one {देश} other {देशहरू}} मा \"{ zoneName }\" जोनमा",
-    "add-products-to-test-order": "परीक्षण आदेशमा समानन थप्नुहोस्",
+    "add-products-to-test-order": "परीक्षण ओर्दरमा समानन थप्नुहोस्",
     "administrator": "प्रशासक",
     "channel": "स्रोत",
     "channel-token": "स्रोत टोकन",
@@ -702,7 +702,7 @@
     "create-new-payment-method": "नयाँ भुक्तानी तरिका बनाउनुहोस्",
     "create-new-role": "नयाँ भूमिका बनाउनुहोस्",
     "create-new-seller": "नयाँ विक्रेता बनाउनुहोस्",
-    "create-new-shipping-method": "नयाँ पारिश्रमिक तरिका बनाउनुहोस्",
+    "create-new-shipping-method": "नयाँ ढुवानी तरिका बनाउनुहोस्",
     "create-new-tax-category": "कर श्रेणी बनाउनुहोस्",
     "create-new-tax-rate": "नयाँ कर दर बनाउनुहोस्",
     "create-new-zone": "नयाँ जोन बनाउनुहोस्",
@@ -713,14 +713,14 @@
     "defaults": "पूर्वनिर्धारित",
     "eligible": "योग्य",
     "email-address": "ईमेल ठेगाना",
-    "email-address-or-identifier": "ईमेल ठेगाना वा पहिचानकर्ता",
+    "email-address-or-identifier": "ईमेल ठेगाना वा गुणस्तरकर्ता",
     "first-name": "पहिलो नाम",
     "fulfillment-handler": "पूर्णाउण प्राप्त गर्ने व्यक्ति",
     "global-available-languages-tooltip": "सबै स्रोतका लागि उपलब्ध गराइएको भाषाहरू सेट गर्दछ। व्यक्तिगत स्रोतहरू तपाईंको विशिष्ट भाषा समर्थन गर्दछन्।",
     "global-out-of-stock-threshold": "वैशिष्ट्यिक अप्राप्य गरिएको स्टक स्तर",
     "global-out-of-stock-threshold-tooltip": "यसले यस एक वैशिष्ट्यिक भरिएको स्टक स्तरमा रहेको छ जसले यस विशेष भरिएको छलैन्छ। नकारात्मक मूल्य प्रतिक्षिप्त बनाउँदछ। समान विशेष द्वारा अद्यायित गर्न सकिन्छ।",
     "last-name": "थर",
-    "no-eligible-shipping-methods": "कुनै पनि योग्य पारिश्रमिक तरिका छैन",
+    "no-eligible-shipping-methods": "कुनै पनि योग्य ढुवानी तरिका छैन",
     "password": "पासवर्ड",
     "payment-eligibility-checker": "भुक्तानी योग्यता चेकर",
     "payment-handler": "भुक्तानी ह्यान्डलर",
@@ -733,23 +733,23 @@
     "remove-from-zone": "जोनबाट हटाउनुहोस्",
     "role": "भूमिका",
     "roles": "भूमिकाहरू",
-    "search-by-product-name-or-sku": "समानको नाम वा एसक्यू द्वारा खोज्नुहोस्",
+    "search-by-product-name-or-sku": "समानको नाम वा SKU द्वारा खोज्नुहोस्",
     "seller": "विक्रेता",
     "shipping-calculator": "पारिश्रमिक क्याल्कुलेटर",
     "shipping-eligibility-checker": "पारिश्रमिक योग्यता चेकर",
-    "shipping-method": "पारिश्रमिक तरिका",
+    "shipping-method": "ढुवानी तरिका",
     "tax-category": "कर श्रेणी",
     "tax-rate": "कर दर",
     "test-address": "परीक्षण ठेगाना",
     "test-result": "परीक्षण परिणाम",
-    "test-shipping-method": "परीक्षण पारिश्रमिक तरिका",
-    "test-shipping-methods": "परीक्षण पारिश्रमिक तरिकाहरू",
+    "test-shipping-method": "परीक्षण ढुवानी तरिका",
+    "test-shipping-methods": "परीक्षण ढुवानी तरिकाहरू",
     "track-inventory-default": "पूर्वनिर्धारित रूपमा स्टक परिवर्तन गर्नुहोस्",
     "view-zone-members": "सदस्यहरू हेर्नुहोस्",
     "zone": "जोन"
   },
   "state": {
-    "adding-items": "वस्तुहरू थप्दै छ",
+    "adding-items": "समानहरू थप्दै छ",
     "arranging-additional-payment": "अतिरिक्त भुक्तान योजना गर्दै",
     "arranging-payment": "भुक्तान योजना गर्दै",
     "authorized": "स्वीकृत",
diff --git a/packages/admin-ui/src/lib/static/styles/global/_utilities.scss b/packages/admin-ui/src/lib/static/styles/global/_utilities.scss
index eb7330fdee..8c072b2530 100644
--- a/packages/admin-ui/src/lib/static/styles/global/_utilities.scss
+++ b/packages/admin-ui/src/lib/static/styles/global/_utilities.scss
@@ -52,17 +52,17 @@ $spacings: (1, 2, 3, 4, 5, auto);
 $sides: (
     't': 'top',
     'b': 'bottom',
-    'l': 'left',
-    'r': 'right',
+    'l': 'inline-start',
+    'r': 'inline-end',
     '': (
         'top',
-        'left',
+        'inline-start',
         'bottom',
-        'right',
+        'inline-end',
     ),
     'x': (
-        'left',
-        'right',
+        'inline-start',
+        'inline-end',
     ),
     'y': (
         'top',
diff --git a/packages/admin-ui/src/lib/static/vendure-ui-config.json b/packages/admin-ui/src/lib/static/vendure-ui-config.json
index 2829682fc7..10617b5192 100644
--- a/packages/admin-ui/src/lib/static/vendure-ui-config.json
+++ b/packages/admin-ui/src/lib/static/vendure-ui-config.json
@@ -23,7 +23,8 @@
         "uk",
         "it",
         "fa",
-        "ne"
+        "ne",
+        "hr"
     ],
     "brand": "",
     "hideVendureBranding": false,
diff --git a/packages/asset-server-plugin/package.json b/packages/asset-server-plugin/package.json
index 6b27108c83..318d6ad8e3 100644
--- a/packages/asset-server-plugin/package.json
+++ b/packages/asset-server-plugin/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@vendure/asset-server-plugin",
-    "version": "2.1.0",
+    "version": "2.1.1",
     "main": "lib/index.js",
     "types": "lib/index.d.ts",
     "files": [
@@ -27,8 +27,8 @@
         "@types/fs-extra": "^11.0.1",
         "@types/node-fetch": "^2.5.8",
         "@types/sharp": "^0.30.4",
-        "@vendure/common": "^2.1.0",
-        "@vendure/core": "^2.1.0",
+        "@vendure/common": "^2.1.1",
+        "@vendure/core": "^2.1.1",
         "express": "^4.17.1",
         "node-fetch": "^2.6.7",
         "rimraf": "^3.0.2",
diff --git a/packages/cli/package.json b/packages/cli/package.json
index 409608ff51..197fb88c0b 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@vendure/cli",
-    "version": "2.1.0",
+    "version": "2.1.1",
     "description": "A modern, headless ecommerce framework",
     "repository": {
         "type": "git",
@@ -34,7 +34,7 @@
     ],
     "dependencies": {
         "@clack/prompts": "^0.7.0",
-        "@vendure/common": "^2.1.0",
+        "@vendure/common": "^2.1.1",
         "change-case": "^4.1.2",
         "commander": "^11.0.0",
         "fs-extra": "^11.1.1",
diff --git a/packages/common/package.json b/packages/common/package.json
index 9dd9f71ca0..79c2599900 100644
--- a/packages/common/package.json
+++ b/packages/common/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@vendure/common",
-    "version": "2.1.0",
+    "version": "2.1.1",
     "main": "index.js",
     "license": "MIT",
     "scripts": {
diff --git a/packages/common/src/normalize-string.spec.ts b/packages/common/src/normalize-string.spec.ts
index 27bfca888d..b0324c8ac1 100644
--- a/packages/common/src/normalize-string.spec.ts
+++ b/packages/common/src/normalize-string.spec.ts
@@ -25,7 +25,7 @@ describe('normalizeString()', () => {
     it('strips non-alphanumeric characters', () => {
         expect(normalizeString('hi!!!')).toBe('hi');
         expect(normalizeString('who? me?')).toBe('who me');
-        expect(normalizeString('!"£$%^&*()+[]{};:@#~?/,|\\><`¬\'=')).toBe('');
+        expect(normalizeString('!"£$%^&*()+[]{};:@#~?/,|\\><`¬\'=©®™')).toBe('');
     });
 
     it('allows a subset of non-alphanumeric characters to pass through', () => {
diff --git a/packages/common/src/normalize-string.ts b/packages/common/src/normalize-string.ts
index 48aa45c676..b3fc74c814 100644
--- a/packages/common/src/normalize-string.ts
+++ b/packages/common/src/normalize-string.ts
@@ -8,6 +8,6 @@ export function normalizeString(input: string, spaceReplacer = ' '): string {
         .normalize('NFD')
         .replace(/[\u0300-\u036f]/g, '')
         .toLowerCase()
-        .replace(/[!"£$%^&*()+[\]{};:@#~?\\/,|><`¬'=‘’]/g, '')
+        .replace(/[!"£$%^&*()+[\]{};:@#~?\\/,|><`¬'=‘’©®™]/g, '')
         .replace(/\s+/g, spaceReplacer);
 }
diff --git a/packages/core/e2e/custom-field-relations.e2e-spec.ts b/packages/core/e2e/custom-field-relations.e2e-spec.ts
index c92b8ca3e6..7263ddaec5 100644
--- a/packages/core/e2e/custom-field-relations.e2e-spec.ts
+++ b/packages/core/e2e/custom-field-relations.e2e-spec.ts
@@ -34,6 +34,7 @@ import { testConfig, TEST_SETUP_TIMEOUT_MS } from '../../../e2e-common/test-conf
 
 import { testSuccessfulPaymentMethod } from './fixtures/test-payment-methods';
 import { TestPlugin1636_1664 } from './fixtures/test-plugins/issue-1636-1664/issue-1636-1664-plugin';
+import { PluginIssue2453 } from './fixtures/test-plugins/issue-2453/plugin-issue2453';
 import { TestCustomEntity, WithCustomEntity } from './fixtures/test-plugins/with-custom-entity';
 import { AddItemToOrderMutationVariables } from './graphql/generated-e2e-shop-types';
 import { ADD_ITEM_TO_ORDER } from './graphql/shop-definitions';
@@ -115,7 +116,7 @@ const customConfig = mergeConfig(testConfig(), {
         timezone: 'Z',
     },
     customFields: customFieldConfig,
-    plugins: [TestPlugin1636_1664, WithCustomEntity],
+    plugins: [TestPlugin1636_1664, WithCustomEntity, PluginIssue2453],
 });
 
 describe('Custom field relations', () => {
@@ -286,6 +287,39 @@ describe('Custom field relations', () => {
             assertTranslatableCustomFieldValues(product);
         });
 
+        // https://github.com/vendure-ecommerce/vendure/issues/2453
+        it('translatable eager-loaded relation works (issue 2453)', async () => {
+            const { collections } = await adminClient.query(gql`
+                query {
+                    collections(options: { sort: { name: DESC } }) {
+                        totalItems
+                        items {
+                            id
+                            name
+                            customFields {
+                                campaign {
+                                    name
+                                    languageCode
+                                }
+                            }
+                        }
+                    }
+                }
+            `);
+
+            expect(collections.totalItems).toBe(3);
+            expect(collections.items.find((c: any) => c.id === 'T_3')).toEqual({
+                customFields: {
+                    campaign: {
+                        languageCode: 'en',
+                        name: 'Clearance Up to 70% Off frames',
+                    },
+                },
+                id: 'T_3',
+                name: 'children collection',
+            });
+        });
+
         it('ProductVariant prices get resolved', async () => {
             const { product } = await adminClient.query(gql`
                 query {
diff --git a/packages/core/e2e/customer.e2e-spec.ts b/packages/core/e2e/customer.e2e-spec.ts
index df78313bde..e1ff171ce9 100644
--- a/packages/core/e2e/customer.e2e-spec.ts
+++ b/packages/core/e2e/customer.e2e-spec.ts
@@ -525,6 +525,22 @@ describe('Customer resolver', () => {
             expect(createCustomer.message).toBe('The email address is not available.');
             expect(createCustomer.errorCode).toBe(ErrorCode.EMAIL_ADDRESS_CONFLICT_ERROR);
         });
+
+        it('normalizes email address on creation', async () => {
+            const { createCustomer } = await adminClient.query<
+                Codegen.CreateCustomerMutation,
+                Codegen.CreateCustomerMutationVariables
+            >(CREATE_CUSTOMER, {
+                input: {
+                    emailAddress: ' JoeSmith@test.com ',
+                    firstName: 'Joe',
+                    lastName: 'Smith',
+                },
+                password: 'test',
+            });
+            customerErrorGuard.assertSuccess(createCustomer);
+            expect(createCustomer.emailAddress).toBe('joesmith@test.com');
+        });
     });
 
     describe('update', () => {
@@ -566,6 +582,27 @@ describe('Customer resolver', () => {
 
             expect(me?.identifier).toBe('unique-email@test.com');
         });
+
+        // https://github.com/vendure-ecommerce/vendure/issues/2449
+        it('normalizes email address on update', async () => {
+            const { updateCustomer } = await adminClient.query<
+                Codegen.UpdateCustomerMutation,
+                Codegen.UpdateCustomerMutationVariables
+            >(UPDATE_CUSTOMER, {
+                input: {
+                    id: thirdCustomer.id,
+                    emailAddress: ' Another-Address@test.com ',
+                },
+            });
+            customerErrorGuard.assertSuccess(updateCustomer);
+
+            expect(updateCustomer.emailAddress).toBe('another-address@test.com');
+
+            await shopClient.asUserWithCredentials('another-address@test.com', 'test');
+            const { me } = await shopClient.query<Codegen.MeQuery>(ME);
+
+            expect(me?.identifier).toBe('another-address@test.com');
+        });
     });
 
     describe('deletion', () => {
diff --git a/packages/core/e2e/fixtures/test-plugins/issue-2453/api/index.ts b/packages/core/e2e/fixtures/test-plugins/issue-2453/api/index.ts
new file mode 100644
index 0000000000..f01f20e29a
--- /dev/null
+++ b/packages/core/e2e/fixtures/test-plugins/issue-2453/api/index.ts
@@ -0,0 +1,21 @@
+import { gql } from 'graphql-tag';
+
+export const apiExtensions = gql`
+    type Campaign implements Node {
+        id: ID!
+        createdAt: DateTime!
+        updatedAt: DateTime!
+        name: String
+        code: String!
+        promotion: Promotion
+        promotionId: ID
+        languageCode: LanguageCode!
+        translations: [CampaignTranslation!]!
+    }
+
+    type CampaignTranslation implements Node {
+        id: ID!
+        languageCode: LanguageCode!
+        name: String!
+    }
+`;
diff --git a/packages/core/e2e/fixtures/test-plugins/issue-2453/entities/campaign-translation.entity.ts b/packages/core/e2e/fixtures/test-plugins/issue-2453/entities/campaign-translation.entity.ts
new file mode 100644
index 0000000000..eafbdc8104
--- /dev/null
+++ b/packages/core/e2e/fixtures/test-plugins/issue-2453/entities/campaign-translation.entity.ts
@@ -0,0 +1,27 @@
+import type { Translation } from '@vendure/core';
+import { DeepPartial, LanguageCode, VendureEntity } from '@vendure/core';
+import { Column, Entity, Relation, ManyToOne } from 'typeorm';
+
+import { Campaign } from './campaign.entity';
+
+/**
+ * @description This entity represents a front end campaign
+ *
+ * @docsCategory entities
+ */
+@Entity('campaign_translation')
+export class CampaignTranslation extends VendureEntity implements Translation<Campaign> {
+    constructor(input?: DeepPartial<Translation<Campaign>>) {
+        super(input);
+    }
+    @Column('varchar')
+    languageCode: LanguageCode;
+
+    @Column('varchar')
+    name: string;
+
+    @ManyToOne(() => Campaign, base => base.translations, {
+        onDelete: 'CASCADE',
+    })
+    base: Relation<Campaign>;
+}
diff --git a/packages/core/e2e/fixtures/test-plugins/issue-2453/entities/campaign.entity.ts b/packages/core/e2e/fixtures/test-plugins/issue-2453/entities/campaign.entity.ts
new file mode 100644
index 0000000000..deaf263c17
--- /dev/null
+++ b/packages/core/e2e/fixtures/test-plugins/issue-2453/entities/campaign.entity.ts
@@ -0,0 +1,33 @@
+import type { ID, LocaleString, Translation } from '@vendure/core';
+import { DeepPartial, Promotion, VendureEntity } from '@vendure/core';
+import { Column, Entity, ManyToOne, OneToMany } from 'typeorm';
+
+import { CampaignTranslation } from './campaign-translation.entity';
+
+/**
+ * @description This entity represents a front end campaign
+ *
+ * @docsCategory entities
+ */
+@Entity('campaign')
+export class Campaign extends VendureEntity {
+    constructor(input?: DeepPartial<Campaign>) {
+        super(input);
+    }
+
+    @Column({ unique: true })
+    code: string;
+
+    name: LocaleString;
+
+    @ManyToOne(() => Promotion, { onDelete: 'SET NULL' })
+    promotion: Promotion | null;
+
+    @Column('int', { nullable: true })
+    promotionId: ID | null;
+
+    @OneToMany(() => CampaignTranslation, translation => translation.base, {
+        eager: true,
+    })
+    translations: Array<Translation<Campaign>>;
+}
diff --git a/packages/core/e2e/fixtures/test-plugins/issue-2453/entities/custom-fields-collection.entity.ts b/packages/core/e2e/fixtures/test-plugins/issue-2453/entities/custom-fields-collection.entity.ts
new file mode 100644
index 0000000000..9fb9a86400
--- /dev/null
+++ b/packages/core/e2e/fixtures/test-plugins/issue-2453/entities/custom-fields-collection.entity.ts
@@ -0,0 +1,51 @@
+import type { CustomFieldConfig } from '@vendure/core';
+import { LanguageCode } from '@vendure/core';
+
+import { Campaign } from './campaign.entity.js';
+
+/**
+ * `Collection` basic custom fields for `campaign`
+ */
+export const collectionCustomFields: CustomFieldConfig[] = [
+    {
+        type: 'relation',
+        name: 'campaign',
+        nullable: true,
+        entity: Campaign,
+        eager: true,
+        // 当shop-api必须定义schema `Campaign` type,申明, 因为public=true
+        public: true,
+        graphQLType: 'Campaign',
+        label: [
+            {
+                languageCode: LanguageCode.en,
+                value: 'Campaign',
+            },
+        ],
+        description: [
+            {
+                languageCode: LanguageCode.en,
+                value: 'Campaign of this collection page',
+            },
+        ],
+    },
+    {
+        name: 'invisible',
+        type: 'boolean',
+        public: true,
+        nullable: true,
+        defaultValue: false,
+        label: [
+            {
+                languageCode: LanguageCode.en,
+                value: 'Invisible',
+            },
+        ],
+        description: [
+            {
+                languageCode: LanguageCode.en,
+                value: 'This flag indicates if current collection is visible or inVisible, against `public`',
+            },
+        ],
+    },
+];
diff --git a/packages/core/e2e/fixtures/test-plugins/issue-2453/plugin-issue2453.ts b/packages/core/e2e/fixtures/test-plugins/issue-2453/plugin-issue2453.ts
new file mode 100644
index 0000000000..7edca04861
--- /dev/null
+++ b/packages/core/e2e/fixtures/test-plugins/issue-2453/plugin-issue2453.ts
@@ -0,0 +1,30 @@
+import { PluginCommonModule, VendurePlugin } from '@vendure/core';
+
+import { apiExtensions } from './api/index';
+import { CampaignTranslation } from './entities/campaign-translation.entity';
+import { Campaign } from './entities/campaign.entity';
+import { collectionCustomFields } from './entities/custom-fields-collection.entity';
+import { CampaignService } from './services/campaign.service';
+
+@VendurePlugin({
+    imports: [PluginCommonModule],
+    entities: [Campaign, CampaignTranslation],
+    adminApiExtensions: {
+        schema: apiExtensions,
+    },
+    shopApiExtensions: {
+        schema: apiExtensions,
+    },
+    compatibility: '>=2.0.0',
+    providers: [CampaignService],
+    configuration: config => {
+        config.customFields.Collection.push(...collectionCustomFields);
+        return config;
+    },
+})
+export class PluginIssue2453 {
+    constructor(private campaignService: CampaignService) {}
+    async onApplicationBootstrap() {
+        await this.campaignService.initCampaigns();
+    }
+}
diff --git a/packages/core/e2e/fixtures/test-plugins/issue-2453/services/campaign.service.ts b/packages/core/e2e/fixtures/test-plugins/issue-2453/services/campaign.service.ts
new file mode 100644
index 0000000000..bba6ab1b20
--- /dev/null
+++ b/packages/core/e2e/fixtures/test-plugins/issue-2453/services/campaign.service.ts
@@ -0,0 +1,161 @@
+import { Injectable } from '@nestjs/common';
+import { DeletionResponse, DeletionResult } from '@vendure/common/lib/generated-types';
+import type { ID, ListQueryOptions, PaginatedList, Translated } from '@vendure/core';
+import {
+    assertFound,
+    CollectionService,
+    LanguageCode,
+    ListQueryBuilder,
+    RequestContext,
+    TransactionalConnection,
+    TranslatableSaver,
+    translateDeep,
+} from '@vendure/core';
+import { In } from 'typeorm';
+
+import { CampaignTranslation } from '../entities/campaign-translation.entity';
+import { Campaign } from '../entities/campaign.entity';
+
+import { defaultCampaignData } from './default-campaigns/index';
+
+@Injectable()
+export class CampaignService {
+    constructor(
+        private readonly connection: TransactionalConnection,
+        private readonly listQueryBuilder: ListQueryBuilder,
+        private readonly collectionService: CollectionService,
+        private readonly translatableSaver: TranslatableSaver,
+    ) {}
+
+    async initCampaigns() {
+        const item = await this.makeSureDefaultCampaigns();
+        // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+        await this.makeSureDefaultCollections(item!);
+    }
+
+    findAll(
+        ctx: RequestContext,
+        options?: ListQueryOptions<Campaign>,
+    ): Promise<PaginatedList<Translated<Campaign>>> {
+        return this.listQueryBuilder
+            .build(Campaign, options, { relations: ['promotion'], ctx })
+            .getManyAndCount()
+            .then(([campaignItems, totalItems]) => {
+                const items = campaignItems.map(campaignItem =>
+                    translateDeep(campaignItem, ctx.languageCode, ['promotion']),
+                );
+                return {
+                    items,
+                    totalItems,
+                };
+            });
+    }
+
+    findOne(ctx: RequestContext, id: ID): Promise<Translated<Campaign> | undefined | null> {
+        return this.connection
+            .getRepository(ctx, Campaign)
+            .findOne({ where: { id }, relations: ['promotion'] })
+            .then(campaignItem => {
+                return campaignItem && translateDeep(campaignItem, ctx.languageCode, ['promotion']);
+            });
+    }
+
+    findOneByCode(ctx: RequestContext, code: string): Promise<Translated<Campaign> | undefined | null> {
+        return this.connection
+            .getRepository(ctx, Campaign)
+            .findOne({ where: { code }, relations: ['promotion'] })
+            .then(campaignItem => {
+                return campaignItem && translateDeep(campaignItem, ctx.languageCode, ['promotion']);
+            });
+    }
+
+    async create(ctx: RequestContext, input: any): Promise<Translated<Campaign>> {
+        const campaignItem = await this.translatableSaver.create({
+            ctx,
+            // eslint-disable-next-line @typescript-eslint/no-explicit-any
+            input,
+            entityType: Campaign,
+            translationType: CampaignTranslation,
+        });
+        return assertFound(this.findOne(ctx, campaignItem.id));
+    }
+
+    async update(ctx: RequestContext, input: any): Promise<Translated<Campaign>> {
+        const campaignItem = await this.translatableSaver.update({
+            ctx,
+            // eslint-disable-next-line @typescript-eslint/no-explicit-any
+            input,
+            entityType: Campaign,
+            translationType: CampaignTranslation,
+        });
+        return assertFound(this.findOne(ctx, campaignItem.id));
+    }
+
+    async delete(ctx: RequestContext, ids: ID[]): Promise<DeletionResponse> {
+        const items = await this.connection.getRepository(ctx, Campaign).find({
+            where: {
+                id: In(ids),
+            },
+        });
+        await this.connection.getRepository(ctx, Campaign).delete(items.map(s => String(s.id)));
+
+        return {
+            result: DeletionResult.DELETED,
+            message: '',
+        };
+    }
+
+    private async makeSureDefaultCampaigns() {
+        const ctx = RequestContext.empty();
+        const { items } = await this.findAll(ctx);
+        let item;
+        for (const campaignItem of defaultCampaignData()) {
+            const hasOne = items.find(s => s.code === campaignItem.code);
+            if (!hasOne) {
+                item = await this.create(ctx, campaignItem);
+            } else {
+                item = await this.update(ctx, {
+                    ...campaignItem,
+                    id: hasOne.id,
+                });
+            }
+        }
+        return item;
+    }
+
+    private async makeSureDefaultCollections(campaign: Translated<Campaign>) {
+        const ctx = RequestContext.empty();
+        const { totalItems } = await this.collectionService.findAll(ctx);
+        if (totalItems > 0) {
+            return;
+        }
+        const parent = await this.collectionService.create(ctx, {
+            filters: [],
+            translations: [
+                {
+                    name: 'parent collection',
+                    slug: 'parent-collection',
+                    description: 'parent collection description',
+                    languageCode: LanguageCode.en,
+                    customFields: {},
+                },
+            ],
+        });
+        await this.collectionService.create(ctx, {
+            filters: [],
+            parentId: parent?.id,
+            customFields: {
+                campaignId: campaign?.id,
+            },
+            translations: [
+                {
+                    name: 'children collection',
+                    slug: 'children-collection',
+                    description: 'children collection description',
+                    languageCode: LanguageCode.en,
+                    customFields: {},
+                },
+            ],
+        });
+    }
+}
diff --git a/packages/core/e2e/fixtures/test-plugins/issue-2453/services/default-campaigns/default-campaigns.ts b/packages/core/e2e/fixtures/test-plugins/issue-2453/services/default-campaigns/default-campaigns.ts
new file mode 100644
index 0000000000..c402876ba7
--- /dev/null
+++ b/packages/core/e2e/fixtures/test-plugins/issue-2453/services/default-campaigns/default-campaigns.ts
@@ -0,0 +1,23 @@
+import { LanguageCode } from '@vendure/common/lib/generated-types';
+
+export const defaultCampaigns = () =>
+    [
+        {
+            code: 'discount',
+            campaignType: 'DirectDiscount',
+            needClaimCoupon: false,
+            enabled: true,
+            translations: [
+                {
+                    languageCode: LanguageCode.en,
+                    name: 'Clearance Up to 70% Off frames',
+                    shortDesc: 'Clearance Up to 70% Off frames',
+                },
+                {
+                    languageCode: LanguageCode.de,
+                    name: 'Clearance Up to 70% Off frames of de',
+                    shortDesc: 'Clearance Up to 70% Off frames of de',
+                },
+            ],
+        },
+    ] as any[];
diff --git a/packages/core/e2e/fixtures/test-plugins/issue-2453/services/default-campaigns/index.ts b/packages/core/e2e/fixtures/test-plugins/issue-2453/services/default-campaigns/index.ts
new file mode 100644
index 0000000000..31fab4a66d
--- /dev/null
+++ b/packages/core/e2e/fixtures/test-plugins/issue-2453/services/default-campaigns/index.ts
@@ -0,0 +1,3 @@
+import { defaultCampaigns } from './default-campaigns';
+
+export const defaultCampaignData = () => [...defaultCampaigns()];
diff --git a/packages/core/e2e/order-promotion.e2e-spec.ts b/packages/core/e2e/order-promotion.e2e-spec.ts
index 669e5301fb..359aab889b 100644
--- a/packages/core/e2e/order-promotion.e2e-spec.ts
+++ b/packages/core/e2e/order-promotion.e2e-spec.ts
@@ -1663,7 +1663,7 @@ describe('Promotions applied to Orders', () => {
         });
     });
 
-    describe.only('usage limit', () => {
+    describe('usage limit', () => {
         const TEST_COUPON_CODE = 'TESTCOUPON';
         const orderGuard: ErrorResultGuard<CodegenShop.TestOrderWithPaymentsFragment> =
             createErrorResultGuard(input => !!input.lines);
diff --git a/packages/core/e2e/shop-auth.e2e-spec.ts b/packages/core/e2e/shop-auth.e2e-spec.ts
index 098f469656..c845e46cca 100644
--- a/packages/core/e2e/shop-auth.e2e-spec.ts
+++ b/packages/core/e2e/shop-auth.e2e-spec.ts
@@ -1263,6 +1263,29 @@ describe('Updating email address without email verification', () => {
         );
         expect(activeCustomer!.emailAddress).toBe(NEW_EMAIL_ADDRESS);
     });
+
+    it('normalizes updated email address', async () => {
+        await shopClient.asUserWithCredentials(NEW_EMAIL_ADDRESS, 'test');
+        const { requestUpdateCustomerEmailAddress } = await shopClient.query<
+            CodegenShop.RequestUpdateEmailAddressMutation,
+            CodegenShop.RequestUpdateEmailAddressMutationVariables
+        >(REQUEST_UPDATE_EMAIL_ADDRESS, {
+            password: 'test',
+            newEmailAddress: ' Not.Normal@test.com ',
+        });
+        successErrorGuard.assertSuccess(requestUpdateCustomerEmailAddress);
+        // Attempting to fix flakiness possibly caused by race condition on the event
+        // subscriber
+        await new Promise(resolve => setTimeout(resolve, 100));
+        expect(requestUpdateCustomerEmailAddress.success).toBe(true);
+        expect(sendEmailFn).toHaveBeenCalledTimes(1);
+        expect(sendEmailFn.mock.calls[0][0] instanceof IdentifierChangeEvent).toBe(true);
+
+        const { activeCustomer } = await shopClient.query<CodegenShop.GetActiveCustomerQuery>(
+            GET_ACTIVE_CUSTOMER,
+        );
+        expect(activeCustomer!.emailAddress).toBe('not.normal@test.com');
+    });
 });
 
 function getVerificationTokenPromise(): Promise<string> {
diff --git a/packages/core/package.json b/packages/core/package.json
index 1c4898183f..7483451985 100644
--- a/packages/core/package.json
+++ b/packages/core/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@vendure/core",
-    "version": "2.1.0",
+    "version": "2.1.1",
     "description": "A modern, headless ecommerce framework",
     "repository": {
         "type": "git",
@@ -50,7 +50,7 @@
         "@nestjs/testing": "10.2.1",
         "@nestjs/typeorm": "10.0.0",
         "@types/fs-extra": "^9.0.1",
-        "@vendure/common": "^2.1.0",
+        "@vendure/common": "^2.1.1",
         "bcrypt": "^5.1.1",
         "body-parser": "^1.20.2",
         "chalk": "^4.1.2",
diff --git a/packages/core/src/api/common/configurable-operation-codec.ts b/packages/core/src/api/common/configurable-operation-codec.ts
index a8e920530d..170ba9761f 100644
--- a/packages/core/src/api/common/configurable-operation-codec.ts
+++ b/packages/core/src/api/common/configurable-operation-codec.ts
@@ -43,8 +43,7 @@ export class ConfigurableOperationCodec {
                         const decodedIds = ids.map(id => this.idCodecService.decode(id));
                         arg.value = JSON.stringify(decodedIds);
                     } else {
-                        const decodedId = this.idCodecService.decode(arg.value);
-                        arg.value = JSON.stringify(decodedId);
+                        arg.value = this.idCodecService.decode(arg.value);
                     }
                 }
             }
diff --git a/packages/core/src/api/common/custom-field-relation-resolver.service.ts b/packages/core/src/api/common/custom-field-relation-resolver.service.ts
index 27ebba13ec..c008731fb6 100644
--- a/packages/core/src/api/common/custom-field-relation-resolver.service.ts
+++ b/packages/core/src/api/common/custom-field-relation-resolver.service.ts
@@ -55,6 +55,14 @@ export class CustomFieldRelationResolverService {
 
         const result = fieldDef.list ? await qb.getMany() : await qb.getOne();
 
+        return await this.translateEntity(ctx, result, fieldDef);
+    }
+
+    async translateEntity(
+        ctx: RequestContext,
+        result: VendureEntity | VendureEntity[] | null,
+        fieldDef: RelationCustomFieldConfig,
+    ) {
         if (fieldDef.entity === ProductVariant) {
             if (Array.isArray(result)) {
                 await Promise.all(result.map(r => this.applyVariantPrices(ctx, r as any)));
diff --git a/packages/core/src/api/config/generate-resolvers.ts b/packages/core/src/api/config/generate-resolvers.ts
index 065c747294..bfde3f677c 100644
--- a/packages/core/src/api/config/generate-resolvers.ts
+++ b/packages/core/src/api/config/generate-resolvers.ts
@@ -207,10 +207,12 @@ function generateCustomFieldRelationResolvers(
                 args: any,
                 context: any,
             ) => {
-                if (source[fieldDef.name] != null) {
-                    return source[fieldDef.name];
-                }
                 const ctx: RequestContext = context.req[REQUEST_CONTEXT_KEY];
+                const eagerEntity = source[fieldDef.name];
+                // If the relation is eager-loaded, we can simply try to translate this relation entity if they have translations
+                if (eagerEntity != null) {
+                    return customFieldRelationResolverService.translateEntity(ctx, eagerEntity, fieldDef);
+                }
                 const entityId = source[ENTITY_ID_KEY];
                 return customFieldRelationResolverService.resolveRelation({
                     ctx,
diff --git a/packages/core/src/config/shipping-method/shipping-calculator.ts b/packages/core/src/config/shipping-method/shipping-calculator.ts
index 2b20ae62e3..8390b536f6 100644
--- a/packages/core/src/config/shipping-method/shipping-calculator.ts
+++ b/packages/core/src/config/shipping-method/shipping-calculator.ts
@@ -32,7 +32,7 @@ export interface ShippingCalculatorConfig<T extends ConfigArgs> extends Configur
          ui: { component: 'number-form-input', suffix: '%' },
        },
  *   },
- *   calculate: (order, args) => {
+ *   calculate: (ctx, order, args) => {
  *     return {
  *       price: args.rate,
  *       taxRate: args.taxRate,
@@ -59,7 +59,12 @@ export class ShippingCalculator<T extends ConfigArgs = ConfigArgs> extends Confi
      *
      * @internal
      */
-    calculate(ctx: RequestContext, order: Order, args: ConfigArg[], method: ShippingMethod): CalculateShippingFnResult {
+    calculate(
+        ctx: RequestContext,
+        order: Order,
+        args: ConfigArg[],
+        method: ShippingMethod,
+    ): CalculateShippingFnResult {
         return this.calculateFn(ctx, order, this.argsArrayToHash(args), method);
     }
 }
@@ -115,5 +120,5 @@ export type CalculateShippingFn<T extends ConfigArgs> = (
     ctx: RequestContext,
     order: Order,
     args: ConfigArgValues<T>,
-    method: ShippingMethod
+    method: ShippingMethod,
 ) => CalculateShippingFnResult;
diff --git a/packages/core/src/service/helpers/entity-hydrator/entity-hydrator.service.ts b/packages/core/src/service/helpers/entity-hydrator/entity-hydrator.service.ts
index 3e5313e50a..6316b64aba 100644
--- a/packages/core/src/service/helpers/entity-hydrator/entity-hydrator.service.ts
+++ b/packages/core/src/service/helpers/entity-hydrator/entity-hydrator.service.ts
@@ -16,16 +16,38 @@ import { HydrateOptions } from './entity-hydrator-types';
 /**
  * @description
  * This is a helper class which is used to "hydrate" entity instances, which means to populate them
- * with the specified relations. This is useful when writing plugin code which receives an entity
+ * with the specified relations. This is useful when writing plugin code which receives an entity,
  * and you need to ensure that one or more relations are present.
  *
  * @example
  * ```ts
- * const product = await this.productVariantService
- *   .getProductForVariant(ctx, variantId);
+ * import { Injectable } from '\@nestjs/common';
+ * import { ID, RequestContext, EntityHydrator, ProductVariantService } from '\@vendure/core';
  *
- * await this.entityHydrator
- *   .hydrate(ctx, product, { relations: ['facetValues.facet' ]});
+ * \@Injectable()
+ * export class MyService {
+ *
+ *   constructor(
+ *      // highlight-next-line
+ *      private entityHydrator: EntityHydrator,
+ *      private productVariantService: ProductVariantService,
+ *   ) {}
+ *
+ *   myMethod(ctx: RequestContext, variantId: ID) {
+ *     const product = await this.productVariantService
+ *       .getProductForVariant(ctx, variantId);
+ *
+ *     // at this stage, we don't know which of the Product relations
+ *     // will be joined at runtime.
+ *
+ *     // highlight-start
+ *     await this.entityHydrator
+ *       .hydrate(ctx, product, { relations: ['facetValues.facet' ]});
+ *
+ *     // You can be sure now that the `facetValues` & `facetValues.facet` relations are populated
+ *     // highlight-end
+ *   }
+ * }
  *```
  *
  * In this above example, the `product` instance will now have the `facetValues` relation
diff --git a/packages/core/src/service/services/customer.service.ts b/packages/core/src/service/services/customer.service.ts
index 2bffe9dec9..039166ef6f 100644
--- a/packages/core/src/service/services/customer.service.ts
+++ b/packages/core/src/service/services/customer.service.ts
@@ -308,13 +308,16 @@ export class CustomerService {
         });
 
         if (hasEmailAddress(input)) {
+            input.emailAddress = normalizeEmailAddress(input.emailAddress);
             if (input.emailAddress !== customer.emailAddress) {
                 const existingCustomerInChannel = await this.connection
                     .getRepository(ctx, Customer)
                     .createQueryBuilder('customer')
                     .leftJoin('customer.channels', 'channel')
                     .where('channel.id = :channelId', { channelId: ctx.channelId })
-                    .andWhere('customer.emailAddress = :emailAddress', { emailAddress: input.emailAddress })
+                    .andWhere('customer.emailAddress = :emailAddress', {
+                        emailAddress: input.emailAddress,
+                    })
                     .andWhere('customer.id != :customerId', { customerId: input.id })
                     .andWhere('customer.deletedAt is null')
                     .getOne();
@@ -566,6 +569,7 @@ export class CustomerService {
         userId: ID,
         newEmailAddress: string,
     ): Promise<boolean | EmailAddressConflictError> {
+        const normalizedEmailAddress = normalizeEmailAddress(newEmailAddress);
         const userWithConflictingIdentifier = await this.userService.getUserByEmailAddress(
             ctx,
             newEmailAddress,
@@ -588,18 +592,18 @@ export class CustomerService {
             type: HistoryEntryType.CUSTOMER_EMAIL_UPDATE_REQUESTED,
             data: {
                 oldEmailAddress,
-                newEmailAddress,
+                newEmailAddress: normalizedEmailAddress,
             },
         });
         if (this.configService.authOptions.requireVerification) {
-            user.getNativeAuthenticationMethod().pendingIdentifier = newEmailAddress;
+            user.getNativeAuthenticationMethod().pendingIdentifier = normalizedEmailAddress;
             await this.userService.setIdentifierChangeToken(ctx, user);
             this.eventBus.publish(new IdentifierChangeRequestEvent(ctx, user));
             return true;
         } else {
             const oldIdentifier = user.identifier;
-            user.identifier = newEmailAddress;
-            customer.emailAddress = newEmailAddress;
+            user.identifier = normalizedEmailAddress;
+            customer.emailAddress = normalizedEmailAddress;
             await this.connection.getRepository(ctx, User).save(user, { reload: false });
             await this.connection.getRepository(ctx, Customer).save(customer, { reload: false });
             this.eventBus.publish(new IdentifierChangeEvent(ctx, user, oldIdentifier));
@@ -609,7 +613,7 @@ export class CustomerService {
                 type: HistoryEntryType.CUSTOMER_EMAIL_UPDATE_VERIFIED,
                 data: {
                     oldEmailAddress,
-                    newEmailAddress,
+                    newEmailAddress: normalizedEmailAddress,
                 },
             });
             return true;
diff --git a/packages/core/src/service/services/product.service.ts b/packages/core/src/service/services/product.service.ts
index b5f2dbd98a..eedbde2b17 100644
--- a/packages/core/src/service/services/product.service.ts
+++ b/packages/core/src/service/services/product.service.ts
@@ -2,7 +2,6 @@ import { Injectable } from '@nestjs/common';
 import {
     AssignProductsToChannelInput,
     CreateProductInput,
-    CustomerListOptions,
     DeletionResponse,
     DeletionResult,
     ProductListOptions,
@@ -41,12 +40,9 @@ import { TranslatorService } from '../helpers/translator/translator.service';
 
 import { AssetService } from './asset.service';
 import { ChannelService } from './channel.service';
-import { CollectionService } from './collection.service';
 import { FacetValueService } from './facet-value.service';
 import { ProductOptionGroupService } from './product-option-group.service';
 import { ProductVariantService } from './product-variant.service';
-import { RoleService } from './role.service';
-import { TaxRateService } from './tax-rate.service';
 
 /**
  * @description
@@ -61,12 +57,9 @@ export class ProductService {
     constructor(
         private connection: TransactionalConnection,
         private channelService: ChannelService,
-        private roleService: RoleService,
         private assetService: AssetService,
         private productVariantService: ProductVariantService,
         private facetValueService: FacetValueService,
-        private taxRateService: TaxRateService,
-        private collectionService: CollectionService,
         private listQueryBuilder: ListQueryBuilder,
         private translatableSaver: TranslatableSaver,
         private eventBus: EventBus,
@@ -120,12 +113,7 @@ export class ProductService {
             effectiveRelations.push('facetValues.facet');
         }
         const product = await this.connection.findOneInChannel(ctx, Product, productId, ctx.channelId, {
-            // relations: unique(effectiveRelations),
-            relations: {
-                facetValues: {
-                    facet: true,
-                },
-            },
+            relations: unique(effectiveRelations),
             where: {
                 deletedAt: IsNull(),
             },
diff --git a/packages/create/package.json b/packages/create/package.json
index 2f8d9a596d..bf8aa2a55b 100644
--- a/packages/create/package.json
+++ b/packages/create/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@vendure/create",
-    "version": "2.1.0",
+    "version": "2.1.1",
     "license": "MIT",
     "bin": {
         "create": "./index.js"
@@ -28,14 +28,14 @@
         "@types/fs-extra": "^9.0.1",
         "@types/handlebars": "^4.1.0",
         "@types/semver": "^6.2.2",
-        "@vendure/core": "^2.1.0",
+        "@vendure/core": "^2.1.1",
         "rimraf": "^3.0.2",
         "ts-node": "^10.9.1",
         "typescript": "4.9.5"
     },
     "dependencies": {
         "@clack/prompts": "^0.7.0",
-        "@vendure/common": "^2.1.0",
+        "@vendure/common": "^2.1.1",
         "commander": "^11.0.0",
         "cross-spawn": "^7.0.3",
         "detect-port": "^1.5.1",
diff --git a/packages/dev-server/dev-config.ts b/packages/dev-server/dev-config.ts
index ea20c748bc..7cb3fc7c12 100644
--- a/packages/dev-server/dev-config.ts
+++ b/packages/dev-server/dev-config.ts
@@ -105,21 +105,10 @@ export const devConfig: VendureConfig = {
             //     outputPath: path.join(__dirname, './custom-admin-ui'),
             //     extensions: [
             //         {
-            //             id: 'test-ui-extension',
-            //             extensionPath: path.join(__dirname, 'test-plugins/with-ui-extension/ui'),
-            //             ngModules: [
-            //                 {
-            //                     type: 'lazy',
-            //                     route: 'greetz',
-            //                     ngModuleFileName: 'greeter.module.ts',
-            //                     ngModuleName: 'GreeterModule',
-            //                 },
-            //                 {
-            //                     type: 'shared',
-            //                     ngModuleFileName: 'greeter-shared.module.ts',
-            //                     ngModuleName: 'GreeterSharedModule',
-            //                 },
-            //             ],
+            //             id: 'ui-extensions-library',
+            //             extensionPath: path.join(__dirname, 'example-plugins/ui-extensions-library/ui'),
+            //             routes: [{ route: 'ui-library', filePath: 'routes.ts' }],
+            //             providers: ['providers.ts'],
             //         },
             //         {
             //             globalStyles: path.join(
@@ -127,24 +116,6 @@ export const devConfig: VendureConfig = {
             //                 'test-plugins/with-ui-extension/ui/custom-theme.scss',
             //             ),
             //         },
-            //         {
-            //             id: 'external-ui-extension',
-            //             extensionPath: path.join(__dirname, 'test-plugins/with-external-ui-extension'),
-            //             ngModules: [
-            //                 {
-            //                     type: 'lazy',
-            //                     route: 'greet',
-            //                     ngModuleFileName: 'external-ui-extension.ts',
-            //                     ngModuleName: 'ExternalUiExtensionModule',
-            //                 },
-            //             ],
-            //             staticAssets: [
-            //                 {
-            //                     path: path.join(__dirname, 'test-plugins/with-external-ui-extension/app'),
-            //                     rename: 'external-app',
-            //                 },
-            //             ],
-            //         },
             //     ],
             //     devMode: true,
             // }),
@@ -192,7 +163,7 @@ function getDbConfig(): DataSourceOptions {
                 port: 3306,
                 username: 'root',
                 password: '',
-                database: 'vendure2-dev',
+                database: 'vendure-dev',
             };
     }
 }
diff --git a/packages/dev-server/package.json b/packages/dev-server/package.json
index 1aa2769554..caea610c79 100644
--- a/packages/dev-server/package.json
+++ b/packages/dev-server/package.json
@@ -1,6 +1,6 @@
 {
     "name": "dev-server",
-    "version": "2.1.0",
+    "version": "2.1.1",
     "main": "index.js",
     "license": "MIT",
     "private": true,
@@ -15,18 +15,18 @@
     },
     "dependencies": {
         "@nestjs/axios": "^3.0.0",
-        "@vendure/admin-ui-plugin": "^2.1.0",
-        "@vendure/asset-server-plugin": "^2.1.0",
-        "@vendure/common": "^2.1.0",
-        "@vendure/core": "^2.1.0",
-        "@vendure/elasticsearch-plugin": "^2.1.0",
-        "@vendure/email-plugin": "^2.1.0",
+        "@vendure/admin-ui-plugin": "^2.1.1",
+        "@vendure/asset-server-plugin": "^2.1.1",
+        "@vendure/common": "^2.1.1",
+        "@vendure/core": "^2.1.1",
+        "@vendure/elasticsearch-plugin": "^2.1.1",
+        "@vendure/email-plugin": "^2.1.1",
         "typescript": "4.9.5"
     },
     "devDependencies": {
         "@types/csv-stringify": "^3.1.0",
-        "@vendure/testing": "^2.1.0",
-        "@vendure/ui-devkit": "^2.1.0",
+        "@vendure/testing": "^2.1.1",
+        "@vendure/ui-devkit": "^2.1.1",
         "commander": "^7.1.0",
         "concurrently": "^8.2.1",
         "csv-stringify": "^5.3.3",
diff --git a/packages/elasticsearch-plugin/package.json b/packages/elasticsearch-plugin/package.json
index 94da42c572..53f615cff4 100644
--- a/packages/elasticsearch-plugin/package.json
+++ b/packages/elasticsearch-plugin/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@vendure/elasticsearch-plugin",
-    "version": "2.1.0",
+    "version": "2.1.1",
     "license": "MIT",
     "main": "lib/index.js",
     "types": "lib/index.d.ts",
@@ -26,8 +26,8 @@
         "fast-deep-equal": "^3.1.3"
     },
     "devDependencies": {
-        "@vendure/common": "^2.1.0",
-        "@vendure/core": "^2.1.0",
+        "@vendure/common": "^2.1.1",
+        "@vendure/core": "^2.1.1",
         "rimraf": "^3.0.2",
         "typescript": "4.9.5"
     }
diff --git a/packages/email-plugin/package.json b/packages/email-plugin/package.json
index d7483ee81f..d23d7ce15e 100644
--- a/packages/email-plugin/package.json
+++ b/packages/email-plugin/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@vendure/email-plugin",
-    "version": "2.1.0",
+    "version": "2.1.1",
     "license": "MIT",
     "main": "lib/index.js",
     "types": "lib/index.d.ts",
@@ -35,8 +35,8 @@
         "@types/fs-extra": "^9.0.1",
         "@types/handlebars": "^4.1.0",
         "@types/mjml": "^4.0.4",
-        "@vendure/common": "^2.1.0",
-        "@vendure/core": "^2.1.0",
+        "@vendure/common": "^2.1.1",
+        "@vendure/core": "^2.1.1",
         "rimraf": "^3.0.2",
         "typescript": "4.9.5"
     }
diff --git a/packages/harden-plugin/package.json b/packages/harden-plugin/package.json
index 5b2f3231f9..0965c47fa9 100644
--- a/packages/harden-plugin/package.json
+++ b/packages/harden-plugin/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@vendure/harden-plugin",
-    "version": "2.1.0",
+    "version": "2.1.1",
     "license": "MIT",
     "main": "lib/index.js",
     "types": "lib/index.d.ts",
@@ -21,7 +21,7 @@
         "graphql-query-complexity": "^0.12.0"
     },
     "devDependencies": {
-        "@vendure/common": "^2.1.0",
-        "@vendure/core": "^2.1.0"
+        "@vendure/common": "^2.1.1",
+        "@vendure/core": "^2.1.1"
     }
 }
diff --git a/packages/job-queue-plugin/package.json b/packages/job-queue-plugin/package.json
index ddb2369f02..4e9b005405 100644
--- a/packages/job-queue-plugin/package.json
+++ b/packages/job-queue-plugin/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@vendure/job-queue-plugin",
-    "version": "2.1.0",
+    "version": "2.1.1",
     "license": "MIT",
     "main": "package/index.js",
     "types": "package/index.d.ts",
@@ -23,8 +23,8 @@
     },
     "devDependencies": {
         "@google-cloud/pubsub": "^2.8.0",
-        "@vendure/common": "^2.1.0",
-        "@vendure/core": "^2.1.0",
+        "@vendure/common": "^2.1.1",
+        "@vendure/core": "^2.1.1",
         "bullmq": "^3.15.5",
         "ioredis": "^5.3.0",
         "rimraf": "^3.0.2",
diff --git a/packages/payments-plugin/e2e/mollie-payment.e2e-spec.ts b/packages/payments-plugin/e2e/mollie-payment.e2e-spec.ts
index 0cab90543a..87c6bced31 100644
--- a/packages/payments-plugin/e2e/mollie-payment.e2e-spec.ts
+++ b/packages/payments-plugin/e2e/mollie-payment.e2e-spec.ts
@@ -381,8 +381,7 @@ describe('Mollie payments (with useDynamicRedirectUrl set to true)', () => {
                 body: JSON.stringify({ id: mockData.mollieOrderResponse.id }),
                 headers: { 'Content-Type': 'application/json' },
             });
-            // tslint:disable-next-line:no-non-null-assertion
-            const { order: adminOrder } = await adminClient.query(GET_ORDER_PAYMENTS, { id: order!.id });
+            const { order: adminOrder } = await adminClient.query(GET_ORDER_PAYMENTS, { id: order?.id });
             expect(adminOrder.state).toBe('ArrangingPayment');
         });
 
@@ -457,7 +456,7 @@ describe('Mollie payments (with useDynamicRedirectUrl set to true)', () => {
                 adminClient,
                 order.lines[0].id,
                 10,
-                // tslint:disable-next-line:no-non-null-assertion
+                // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
                 order.payments!.find(p => p.amount === 108990)!.id,
                 SURCHARGE_AMOUNT,
             );
@@ -468,6 +467,8 @@ describe('Mollie payments (with useDynamicRedirectUrl set to true)', () => {
     });
 
     describe('Handle pay-later methods', () => {
+        // TODO: Add testcases that mock incoming webhook to: 1. Authorize payment and 2. AutoCapture payments
+
         it('Should prepare a new order', async () => {
             await shopClient.asUserWithCredentials(customers[0].emailAddress, 'test');
             const { addItemToOrder } = await shopClient.query<
diff --git a/packages/payments-plugin/e2e/stripe-payment.e2e-spec.ts b/packages/payments-plugin/e2e/stripe-payment.e2e-spec.ts
index 7bebbfcef7..a4bfe62d5d 100644
--- a/packages/payments-plugin/e2e/stripe-payment.e2e-spec.ts
+++ b/packages/payments-plugin/e2e/stripe-payment.e2e-spec.ts
@@ -10,7 +10,9 @@ import { CREATE_PRODUCT, CREATE_PRODUCT_VARIANTS } from '@vendure/core/e2e/graph
 import { createTestEnvironment, E2E_DEFAULT_CHANNEL_TOKEN } from '@vendure/testing';
 import gql from 'graphql-tag';
 import nock from 'nock';
+import fetch from 'node-fetch';
 import path from 'path';
+import { Stripe } from 'stripe';
 import { afterAll, beforeAll, describe, expect, it } from 'vitest';
 
 import { initialData } from '../../../e2e-common/e2e-initial-data';
@@ -293,6 +295,101 @@ describe('Stripe payments', () => {
         });
     });
 
+    // https://github.com/vendure-ecommerce/vendure/issues/2450
+    it('Should not crash on signature validation failure', async () => {
+        const MOCKED_WEBHOOK_PAYLOAD = {
+            id: 'evt_0',
+            object: 'event',
+            api_version: '2022-11-15',
+            data: {
+                object: {
+                    id: 'pi_0',
+                    currency: 'usd',
+                    status: 'succeeded',
+                },
+            },
+            livemode: false,
+            pending_webhooks: 1,
+            request: {
+                id: 'req_0',
+                idempotency_key: '00000000-0000-0000-0000-000000000000',
+            },
+            type: 'payment_intent.succeeded',
+        };
+
+        const payloadString = JSON.stringify(MOCKED_WEBHOOK_PAYLOAD, null, 2);
+
+        const result = await fetch(`http://localhost:${serverPort}/payments/stripe`, {
+            method: 'post',
+            body: payloadString,
+            headers: { 'Content-Type': 'application/json' },
+        });
+
+        // We didn't provided any signatures, it should result in a 400 - Bad request
+        expect(result.status).toEqual(400);
+    });
+
+    // TODO: Contribution welcome: test webhook handling and order settlement
+    // https://github.com/vendure-ecommerce/vendure/issues/2450
+    it("Should validate the webhook's signature properly", async () => {
+        await shopClient.asUserWithCredentials(customers[0].emailAddress, 'test');
+
+        const { activeOrder } = await shopClient.query<GetActiveOrderQuery>(GET_ACTIVE_ORDER);
+        order = activeOrder!;
+
+        const MOCKED_WEBHOOK_PAYLOAD = {
+            id: 'evt_0',
+            object: 'event',
+            api_version: '2022-11-15',
+            data: {
+                object: {
+                    id: 'pi_0',
+                    currency: 'usd',
+                    metadata: {
+                        orderCode: order.code,
+                        orderId: parseInt(order.id.replace('T_', ''), 10),
+                        channelToken: E2E_DEFAULT_CHANNEL_TOKEN,
+                    },
+                    amount_received: order.totalWithTax,
+                    status: 'succeeded',
+                },
+            },
+            livemode: false,
+            pending_webhooks: 1,
+            request: {
+                id: 'req_0',
+                idempotency_key: '00000000-0000-0000-0000-000000000000',
+            },
+            type: 'payment_intent.succeeded',
+        };
+
+        const payloadString = JSON.stringify(MOCKED_WEBHOOK_PAYLOAD, null, 2);
+        const stripeWebhooks = new Stripe('test-api-secret', { apiVersion: '2023-08-16' }).webhooks;
+        const header = stripeWebhooks.generateTestHeaderString({
+            payload: payloadString,
+            secret: 'test-signing-secret',
+        });
+
+        const event = stripeWebhooks.constructEvent(payloadString, header, 'test-signing-secret');
+        expect(event.id).to.equal(MOCKED_WEBHOOK_PAYLOAD.id);
+        await setShipping(shopClient);
+        // Due to the `this.orderService.transitionToState(...)` fails with the internal lookup by id,
+        // we need to put the order into `ArrangingPayment` state manually before calling the webhook handler.
+        // const transitionResult = await adminClient.query(TRANSITION_TO_ARRANGING_PAYMENT, { id: order.id });
+        // expect(transitionResult.transitionOrderToState.__typename).toBe('Order')
+
+        const result = await fetch(`http://localhost:${serverPort}/payments/stripe`, {
+            method: 'post',
+            body: payloadString,
+            headers: { 'Content-Type': 'application/json', 'Stripe-Signature': header },
+        });
+
+        // I would expect to the status to be 200, but at the moment either the
+        // `orderService.transitionToState()` or the `orderService.addPaymentToOrder()`
+        // throws an error of 'error.entity-with-id-not-found'
+        expect(result.status).toEqual(200);
+    });
+
     // https://github.com/vendure-ecommerce/vendure/issues/1630
     describe('currencies with no fractional units', () => {
         let japanProductId: string;
@@ -401,6 +498,4 @@ describe('Stripe payments', () => {
             expect(createPaymentIntentPayload.currency).toBe('jpy');
         });
     });
-
-    // TODO: Contribution welcome: test webhook handling and order settlement
 });
diff --git a/packages/payments-plugin/package.json b/packages/payments-plugin/package.json
index 5fdb5aa68e..16c28c91dc 100644
--- a/packages/payments-plugin/package.json
+++ b/packages/payments-plugin/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@vendure/payments-plugin",
-    "version": "2.1.0",
+    "version": "2.1.1",
     "license": "MIT",
     "main": "package/index.js",
     "types": "package/index.d.ts",
@@ -46,9 +46,9 @@
         "@mollie/api-client": "^3.7.0",
         "@types/braintree": "^2.22.15",
         "@types/localtunnel": "2.0.1",
-        "@vendure/common": "^2.1.0",
-        "@vendure/core": "^2.1.0",
-        "@vendure/testing": "^2.1.0",
+        "@vendure/common": "^2.1.1",
+        "@vendure/core": "^2.1.1",
+        "@vendure/testing": "^2.1.1",
         "braintree": "^3.16.0",
         "localtunnel": "2.0.2",
         "nock": "^13.1.4",
diff --git a/packages/payments-plugin/src/mollie/mollie.helpers.ts b/packages/payments-plugin/src/mollie/mollie.helpers.ts
index 0c732fae10..6b8612cc77 100644
--- a/packages/payments-plugin/src/mollie/mollie.helpers.ts
+++ b/packages/payments-plugin/src/mollie/mollie.helpers.ts
@@ -61,14 +61,16 @@ export function toMollieOrderLines(order: Order, alreadyPaid: number): CreatePar
         vatAmount: toAmount(surcharge.priceWithTax - surcharge.price, order.currencyCode),
     })));
     // Deduct amount already paid
-    lines.push({
-        name: 'Already paid',
-        quantity: 1,
-        unitPrice: toAmount(-alreadyPaid, order.currencyCode),
-        totalAmount: toAmount(-alreadyPaid, order.currencyCode),
-        vatRate: String(0),
-        vatAmount: toAmount(0, order.currencyCode),
-    });
+    if (alreadyPaid) {
+        lines.push({
+            name: 'Already paid',
+            quantity: 1,
+            unitPrice: toAmount(-alreadyPaid, order.currencyCode),
+            totalAmount: toAmount(-alreadyPaid, order.currencyCode),
+            vatRate: String(0),
+            vatAmount: toAmount(0, order.currencyCode),
+        });
+    }
     return lines;
 }
 
diff --git a/packages/payments-plugin/src/mollie/mollie.service.ts b/packages/payments-plugin/src/mollie/mollie.service.ts
index e48b7e2051..2c9aadb43f 100644
--- a/packages/payments-plugin/src/mollie/mollie.service.ts
+++ b/packages/payments-plugin/src/mollie/mollie.service.ts
@@ -227,6 +227,13 @@ export class MollieService {
                 `Unable to find order ${mollieOrder.orderNumber}, unable to process Mollie order ${mollieOrder.id}`,
             );
         }
+        if (order.state === 'PaymentSettled') {
+            Logger.info(
+                `Order ${order.code} is already 'PaymentSettled', no need for handling Mollie status '${mollieOrder.status}'`,
+                loggerCtx,
+            );
+            return;
+        }
         if (mollieOrder.status === OrderStatus.expired) {
             // Expired is fine, a customer can retry the payment later
             return;
@@ -248,13 +255,6 @@ export class MollieService {
         if (order.state === 'PaymentAuthorized' && mollieOrder.status === OrderStatus.completed) {
             return this.settleExistingPayment(ctx, order, mollieOrder.id);
         }
-        if (order.state === 'PaymentAuthorized' || order.state === 'PaymentSettled') {
-            Logger.info(
-                `Order ${order.code} is '${order.state}', no need for handling Mollie status '${mollieOrder.status}'`,
-                loggerCtx,
-            );
-            return;
-        }
         // Any other combination of Mollie status and Vendure status indicates something is wrong.
         throw Error(
             `Unhandled incoming Mollie status '${mollieOrder.status}' for order ${order.code} with status '${order.state}'`,
@@ -308,6 +308,7 @@ export class MollieService {
      * Settle an existing payment based on the given mollieOrder
      */
     async settleExistingPayment(ctx: RequestContext, order: Order, mollieOrderId: string): Promise<void> {
+        order = await this.entityHydrator.hydrate(ctx, order, { relations: ['payments'] });
         const payment = order.payments.find(p => p.transactionId === mollieOrderId);
         if (!payment) {
             throw Error(
@@ -335,7 +336,7 @@ export class MollieService {
         }
         const client = createMollieClient({ apiKey });
         // We use the orders API, so list available methods for that API usage
-        const methods = await client.methods.list({resource: 'orders'});
+        const methods = await client.methods.list({ resource: 'orders' });
         return methods.map(m => ({
             ...m,
             code: m.id,
diff --git a/packages/payments-plugin/src/stripe/raw-body.middleware.ts b/packages/payments-plugin/src/stripe/raw-body.middleware.ts
index 03257b6748..71c21b55ac 100644
--- a/packages/payments-plugin/src/stripe/raw-body.middleware.ts
+++ b/packages/payments-plugin/src/stripe/raw-body.middleware.ts
@@ -8,6 +8,7 @@ import { RequestWithRawBody } from './types';
  * Stripe to properly verify webhook events.
  */
 export const rawBodyMiddleware = raw({
+    type: '*/*',
     verify(req: RequestWithRawBody, res: http.ServerResponse, buf: Buffer, encoding: string) {
         if (Buffer.isBuffer(buf)) {
             req.rawBody = Buffer.from(buf);
diff --git a/packages/payments-plugin/src/stripe/stripe.controller.ts b/packages/payments-plugin/src/stripe/stripe.controller.ts
index 91fd4fde04..0c80a5d512 100644
--- a/packages/payments-plugin/src/stripe/stripe.controller.ts
+++ b/packages/payments-plugin/src/stripe/stripe.controller.ts
@@ -45,7 +45,7 @@ export class StripeController {
             return;
         }
 
-        const event = request.body as Stripe.Event;
+        const event = JSON.parse(request.body.toString()) as Stripe.Event;
         const paymentIntent = event.data.object as Stripe.PaymentIntent;
 
         if (!paymentIntent) {
@@ -120,11 +120,20 @@ export class StripeController {
                     `Error adding payment to order ${orderCode}: ${addPaymentToOrderResult.message}`,
                     loggerCtx,
                 );
+                return;
             }
+
+            // The payment intent ID is added to the order only if we can reach this point.
+            Logger.info(
+                `Stripe payment intent id ${paymentIntent.id} added to order ${orderCode}`,
+                loggerCtx,
+            );
         });
 
-        Logger.info(`Stripe payment intent id ${paymentIntent.id} added to order ${orderCode}`, loggerCtx);
-        response.status(HttpStatus.OK).send('Ok');
+        // Send the response status only if we didn't sent anything yet.
+        if (!response.headersSent) {
+            response.status(HttpStatus.OK).send('Ok');
+        }
     }
 
     private async createContext(channelToken: string, req: RequestWithRawBody): Promise<RequestContext> {
diff --git a/packages/testing/package.json b/packages/testing/package.json
index ad56b6c0de..14482bedf3 100644
--- a/packages/testing/package.json
+++ b/packages/testing/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@vendure/testing",
-    "version": "2.1.0",
+    "version": "2.1.1",
     "description": "End-to-end testing tools for Vendure projects",
     "keywords": [
         "vendure",
@@ -38,7 +38,7 @@
     "dependencies": {
         "@graphql-typed-document-node/core": "^3.2.0",
         "@types/node-fetch": "^2.6.4",
-        "@vendure/common": "^2.1.0",
+        "@vendure/common": "^2.1.1",
         "faker": "^4.1.0",
         "form-data": "^4.0.0",
         "graphql": "16.8.0",
@@ -49,7 +49,7 @@
     "devDependencies": {
         "@types/mysql": "^2.15.15",
         "@types/pg": "^7.14.5",
-        "@vendure/core": "^2.1.0",
+        "@vendure/core": "^2.1.1",
         "mysql": "^2.18.1",
         "pg": "^8.4.0",
         "rimraf": "^3.0.0",
diff --git a/packages/ui-devkit/package.json b/packages/ui-devkit/package.json
index 98b5fc6e78..7b68262844 100644
--- a/packages/ui-devkit/package.json
+++ b/packages/ui-devkit/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@vendure/ui-devkit",
-    "version": "2.1.0",
+    "version": "2.1.1",
     "description": "A library for authoring Vendure Admin UI extensions",
     "keywords": [
         "vendure",
@@ -40,8 +40,8 @@
         "@angular/cli": "^16.2.0",
         "@angular/compiler": "^16.2.2",
         "@angular/compiler-cli": "^16.2.2",
-        "@vendure/admin-ui": "^2.1.0",
-        "@vendure/common": "^2.1.0",
+        "@vendure/admin-ui": "^2.1.1",
+        "@vendure/common": "^2.1.1",
         "chalk": "^4.1.0",
         "chokidar": "^3.5.3",
         "fs-extra": "^11.1.1",
@@ -51,7 +51,7 @@
     "devDependencies": {
         "@rollup/plugin-node-resolve": "^15.2.1",
         "@types/fs-extra": "^11.0.1",
-        "@vendure/core": "^2.1.0",
+        "@vendure/core": "^2.1.1",
         "react": "^18.2.0",
         "react-dom": "^18.2.0",
         "rimraf": "^3.0.2",