diff --git a/.markdownlint-cli2.yaml b/.markdownlint-cli2.yaml
index 2c1a1304e5..5d14206277 100644
--- a/.markdownlint-cli2.yaml
+++ b/.markdownlint-cli2.yaml
@@ -14,6 +14,9 @@ config:
   table-pipe-style:
     style: leading_and_trailing
 
+  no-emphasis-as-heading: true
+  table-column-count: true
+
 ignores:
   - "docs/snippets/**"
   - "docs/index.md"
diff --git a/docs/administration/admin_panel/roles_admin_panel.md b/docs/administration/admin_panel/roles_admin_panel.md
index cf26343d98..bd6bb31b01 100644
--- a/docs/administration/admin_panel/roles_admin_panel.md
+++ b/docs/administration/admin_panel/roles_admin_panel.md
@@ -10,7 +10,7 @@ To give users an access to your website you need to assign them roles in the **A
 
 Each role consists of:
 
-**Policies**
+## Policies
 
 ![Policies](admin_panel_policies.png "Policies")
 
@@ -27,7 +27,7 @@ See [example use case](permission_use_cases.md#restrict-editing-to-part-of-the-t
 
     For more information, see [Limitation reference](limitation_reference.md).
 
-**Assignments**
+## Assignments
 
 ![Assignments](admin_panel_assignments.png "Assignments")
 
diff --git a/docs/administration/back_office/back_office_elements/add_dropdowns.md b/docs/administration/back_office/back_office_elements/add_dropdowns.md
index 811f3fd3b7..c3ba474859 100644
--- a/docs/administration/back_office/back_office_elements/add_dropdowns.md
+++ b/docs/administration/back_office/back_office_elements/add_dropdowns.md
@@ -108,13 +108,13 @@ The following attributes are available:
 |---|------|----------|
 |`source`| - |What is currently defined in the `<select>` input header.|
 |`choices`| - |Elements listed in the drop-down.|
-|`preferred_choices`|Elements listed at the top of the list with a separator.|
+|`preferred_choices`| - | Elements listed at the top of the list with a separator.|
 |`value`|-|The currently selected element. It is an object with a key `value`. |
 |`multiple`| true</br>false|Boolean. To allow users to select multiple items.|
 |`translation_domain`|true</br>false|Used for translating choices and placeholder.|
 |`custom_form`|true</br>false|For custom form must be set to true.|
 |`class`| - |Additional classes for the element with `ibexa-dropdown` class.|
-|`placeholder`|Placeholder displayed when no option is selected.|
+|`placeholder`| - | Placeholder displayed when no option is selected.|
 |`custom_init`|true</br>false|By default set to `false`. If set to `true`, requires manually initializing drop-down in JavaScript.|
 |`is_disabled`|true</br>false|Disables drop-down.|
 |`is_hidden`|true</br>false|Hides the whole widget.|
diff --git a/docs/administration/back_office/back_office_elements/reusable_components.md b/docs/administration/back_office/back_office_elements/reusable_components.md
index 68ee7adfba..bf47f5d2ae 100644
--- a/docs/administration/back_office/back_office_elements/reusable_components.md
+++ b/docs/administration/back_office/back_office_elements/reusable_components.md
@@ -54,7 +54,7 @@ Variables:
 |Name|Type|Values|
 |----|----|-----------|
 |`headline` (optional)|string|if not specified, the header isn't rendered|
-|`headline_items`|array|
+|`headline_items`|array| |
 |`view_mode`|string|`vertical`, default set to `''`|
 |`items`|hash|{`label`, `content_raw`, `content`}|
 
diff --git a/docs/api/event_reference/content_events.md b/docs/api/event_reference/content_events.md
index 4d9f7f6b09..7eb8db3f2b 100644
--- a/docs/api/event_reference/content_events.md
+++ b/docs/api/event_reference/content_events.md
@@ -7,19 +7,19 @@ page_type: reference
 
 | Event | Dispatched by | Properties |
 |---|---|---|
-|`BeforeCreateContentDraftEvent`|`ContentService::createContentDraft`|`ContentInfo $contentInfo`</br>`VersionInfo $versionInfo`</br>`User $creator`</br>`Language|null $language`</br>`Content|null $contentDraft`|
-|`CreateContentDraftEvent`|`ContentService::createContentDraft`|`Content $contentDraft`</br>`ContentInfo $contentInfo`</br>`VersionInfo $versionInfo`</br>`User $creator`</br>`Language|null $language`|
-|`BeforeCreateContentEvent`|`ContentService::createContent`|`ContentCreateStruct $contentCreateStruct`</br>`array $locationCreateStructs`</br>`Content|null $content`</br>`string[]|null $fieldIdentifiersToValidate`|
-|`CreateContentEvent`|`ContentService::createContent`|`ContentCreateStruct $contentCreateStruct`</br>`array $locationCreateStructs`</br>`Content $content`</br>`string[]|null $fieldIdentifiersToValidate`|
-|`BeforeUpdateContentEvent`|`ContentService::updateContent`|`VersionInfo $versionInfo`</br>`ContentUpdateStruct $contentUpdateStruct`</br>`Content|null $content`</br>`string[]|null $fieldIdentifiersToValidate`|
-|`UpdateContentEvent`|`ContentService::updateContent`|`Content $content`</br>`VersionInfo $versionInfo`</br>`ContentUpdateStruct $contentUpdateStruct`</br>`string[]|null $fieldIdentifiersToValidate`|
-|`BeforeUpdateContentMetadataEvent`|`ContentService::updateContentMetadata`|`ContentInfo $contentInfo`</br>`ContentMetadataUpdateStruct $contentMetadataUpdateStruct`</br>`Content|null $content`|
+|`BeforeCreateContentDraftEvent`|`ContentService::createContentDraft`|`ContentInfo $contentInfo`</br>`VersionInfo $versionInfo`</br>`User $creator`</br>`?Language $language`</br>`?Content $contentDraft`|
+|`CreateContentDraftEvent`|`ContentService::createContentDraft`|`Content $contentDraft`</br>`ContentInfo $contentInfo`</br>`VersionInfo $versionInfo`</br>`User $creator`</br>`?Language $language`|
+|`BeforeCreateContentEvent`|`ContentService::createContent`|`ContentCreateStruct $contentCreateStruct`</br>`array $locationCreateStructs`</br>`?Content $content`</br>`string[] or null  $fieldIdentifiersToValidate`|
+|`CreateContentEvent`|`ContentService::createContent`|`ContentCreateStruct $contentCreateStruct`</br>`array $locationCreateStructs`</br>`Content $content`</br>`string[] or null $fieldIdentifiersToValidate`|
+|`BeforeUpdateContentEvent`|`ContentService::updateContent`|`VersionInfo $versionInfo`</br>`ContentUpdateStruct $contentUpdateStruct`</br>`?Content $content`</br>`string[] or null $fieldIdentifiersToValidate`|
+|`UpdateContentEvent`|`ContentService::updateContent`|`Content $content`</br>`VersionInfo $versionInfo`</br>`ContentUpdateStruct $contentUpdateStruct`</br>`string[] or null $fieldIdentifiersToValidate`|
+|`BeforeUpdateContentMetadataEvent`|`ContentService::updateContentMetadata`|`ContentInfo $contentInfo`</br>`ContentMetadataUpdateStruct $contentMetadataUpdateStruct`</br>`?Content $content`|
 |`UpdateContentMetadataEvent`|`ContentService::updateContentMetadata`|`Content $content`</br>`ContentInfo $contentInfo`</br>`ContentMetadataUpdateStruct $contentMetadataUpdateStruct`|
-|`BeforeCopyContentEvent`|`ContentService::copyContent`|`ContentInfo $contentInfo`</br>`LocationCreateStruct $destinationLocationCreateStruct`</br>`VersionInfo $versionInfo`</br>`Content|null $content`|
+|`BeforeCopyContentEvent`|`ContentService::copyContent`|`ContentInfo $contentInfo`</br>`LocationCreateStruct $destinationLocationCreateStruct`</br>`VersionInfo $versionInfo`</br>`?Content $content`|
 |`CopyContentEvent`|`ContentService::copyContent`|`Content $content`</br>`ContentInfo $contentInfo`</br>`LocationCreateStruct $destinationLocationCreateStruct`</br>`VersionInfo $versionInfo`|
-|`BeforePublishVersionEvent`|`ContentService::publishVersion`|`VersionInfo $versionInfo`</br>`Content|null $content`</br>`string[] $translations`|
+|`BeforePublishVersionEvent`|`ContentService::publishVersion`|`VersionInfo $versionInfo`</br>`?Content $content`</br>`string[] $translations`|
 |`PublishVersionEvent`|`ContentService::publishVersion`|`Content $content`</br>`VersionInfo $versionInfo`</br>`string[] $translations`|
-|`BeforeDeleteContentEvent`|`ContentService::deleteContent`|`ContentInfo $contentInfo`</br>`array|null $locations`|
+|`BeforeDeleteContentEvent`|`ContentService::deleteContent`|`ContentInfo $contentInfo`</br>`array or null $locations`|
 |`DeleteContentEvent`|`ContentService::deleteContent`|`array $locations`</br>`ContentInfo $contentInfo`|
 |`BeforeDeleteVersionEvent`|`ContentService::deleteVersion`|`VersionInfo $versionInfo`|
 |`DeleteVersionEvent`|`ContentService::deleteVersion`|`VersionInfo $versionInfo`|
@@ -28,7 +28,7 @@ page_type: reference
 
 | Event | Dispatched by | Properties |
 |---|---|---|
-|`BeforeAddRelationEvent`|`ContentService::addRelation`|`VersionInfo $sourceVersion`</br>`ContentInfo $destinationContent`</br>`Relation|null $relation`|
+|`BeforeAddRelationEvent`|`ContentService::addRelation`|`VersionInfo $sourceVersion`</br>`ContentInfo $destinationContent`</br>`?Relation $relation`|
 |`AddRelationEvent`|`ContentService::addRelation`|`Relation $relation`</br>`VersionInfo $sourceVersion`</br>`ContentInfo $destinationContent`|
 |`BeforeDeleteRelationEvent`|`ContentService::deleteRelation`|`VersionInfo $sourceVersion`</br>`ContentInfo $destinationContent`|
 |`DeleteRelationEvent`|`ContentService::deleteRelation`|`VersionInfo $sourceVersion`</br>`ContentInfo $destinationContent`|
diff --git a/docs/api/event_reference/content_type_events.md b/docs/api/event_reference/content_type_events.md
index ac62cdb89c..8c64392ae1 100644
--- a/docs/api/event_reference/content_type_events.md
+++ b/docs/api/event_reference/content_type_events.md
@@ -7,13 +7,13 @@ page_type: reference
 
 | Event | Dispatched by | Properties |
 |---|---|---|
-|`BeforeCreateContentTypeDraftEvent`|`ContentTypeService::createContentTypeDraft`|`ContentType $contentType`</br>`ContentTypeDraft|null $contentTypeDraft`|
+|`BeforeCreateContentTypeDraftEvent`|`ContentTypeService::createContentTypeDraft`|`ContentType $contentType`</br>`?ContentTypeDraft $contentTypeDraft`|
 |`CreateContentTypeDraftEvent`|`ContentTypeService::createContentTypeDraft`|`ContentTypeDraft $contentTypeDraft`</br>`ContentType $contentType`|
-|`BeforeCreateContentTypeEvent`|`ContentTypeService::createContentType`|`ContentTypeCreateStruct $contentTypeCreateStruct`</br>`array $contentTypeGroups`</br>`ContentTypeDraft|null $contentTypeDraft`|
+|`BeforeCreateContentTypeEvent`|`ContentTypeService::createContentType`|`ContentTypeCreateStruct $contentTypeCreateStruct`</br>`array $contentTypeGroups`</br>`?ContentTypeDraft $contentTypeDraft`|
 |`CreateContentTypeEvent`|`ContentTypeService::createContentType`|`ContentTypeDraft $contentTypeDraft`</br>`ContentTypeCreateStruct $contentTypeCreateStruct`</br>`array $contentTypeGroups`|
 |`BeforeUpdateContentTypeDraftEvent`|`ContentTypeService::updateContentTypeDraft`|`ContentTypeDraft $contentTypeDraft`</br>`ContentTypeUpdateStruct $contentTypeUpdateStruct`|
 |`UpdateContentTypeDraftEvent`|`ContentTypeService::updateContentTypeDraft`|`ContentTypeDraft $contentTypeDraft`</br>`ContentTypeUpdateStruct $contentTypeUpdateStruct`|
-|`BeforeCopyContentTypeEvent`|`ContentTypeService::copyContentType`|`ContentType $contentType`</br>`User $creator`</br>`ContentType|null $contentTypeCopy`|
+|`BeforeCopyContentTypeEvent`|`ContentTypeService::copyContentType`|`ContentType $contentType`</br>`User $creator`</br>`?ContentType $contentTypeCopy`|
 |`CopyContentTypeEvent`|`ContentTypeService::copyContentType`|`ContentType $contentTypeCopy`</br>`ContentType $contentType`</br>`User $creator`|
 |`BeforePublishContentTypeDraftEvent`|`ContentTypeService::publishContentTypeDraft`|`ContentTypeDraft $contentTypeDraft`|
 |`PublishContentTypeDraftEvent`|`ContentTypeService::publishContentTypeDraft`|`ContentTypeDraft $contentTypeDraft`|
@@ -24,7 +24,7 @@ page_type: reference
 
 | Event | Dispatched by | Properties |
 |---|---|---|
-|`BeforeCreateContentTypeGroupEvent`|`ContentTypeService::createContentTypeGroup`|`ContentTypeCreateStruct $contentTypeCreateStruct`</br>`array $contentTypeGroups`</br>`ContentTypeDraft|null $contentTypeDraft`|
+|`BeforeCreateContentTypeGroupEvent`|`ContentTypeService::createContentTypeGroup`|`ContentTypeCreateStruct $contentTypeCreateStruct`</br>`array $contentTypeGroups`</br>`?ContentTypeDraft $contentTypeDraft`|
 |`CreateContentTypeGroupEvent`|`ContentTypeService::createContentTypeGroup`|`ContentTypeGroup $contentTypeGroup`</br>`ContentTypeGroupCreateStruct $contentTypeGroupCreateStruct`|
 |`BeforeUpdateContentTypeGroupEvent`|`ContentTypeService::updateContentTypeGroup`|`ContentTypeGroup $contentTypeGroup`</br>`ContentTypeGroupUpdateStruct $contentTypeGroupUpdateStruct`|
 |`UpdateContentTypeGroupEvent`|`ContentTypeService::updateContentTypeGroup`|`ContentTypeGroup $contentTypeGroup`</br>`ContentTypeGroupUpdateStruct $contentTypeGroupUpdateStruct`|
@@ -35,7 +35,7 @@ page_type: reference
 
 | Event | Dispatched by | Properties |
 |---|---|---|
-|`BeforeRemoveContentTypeTranslationEvent`|`ContentTypeService::removeContentTypeTranslation`|`ContentTypeDraft $contentTypeDraft`</br>`string $languageCode`</br>`ContentTypeDraft|null $newContentTypeDraft`|
+|`BeforeRemoveContentTypeTranslationEvent`|`ContentTypeService::removeContentTypeTranslation`|`ContentTypeDraft $contentTypeDraft`</br>`string $languageCode`</br>`?ContentTypeDraft $newContentTypeDraft`|
 |`RemoveContentTypeTranslationEvent`|`ContentTypeService::removeContentTypeTranslation`|`ContentTypeDraft $newContentTypeDraft`</br>`ContentTypeDraft $contentTypeDraft`</br>`string $languageCode`|
 
 ## Field definitions
diff --git a/docs/api/event_reference/language_events.md b/docs/api/event_reference/language_events.md
index f2d323b603..5f3c378d07 100644
--- a/docs/api/event_reference/language_events.md
+++ b/docs/api/event_reference/language_events.md
@@ -7,9 +7,9 @@ page_type: reference
 
 | Event | Dispatched by | Properties |
 |---|---|---|
-|`BeforeCreateLanguageEvent`|`LanguageService::createLanguage`|`LanguageCreateStruct $languageCreateStruct`</br>`Language|null $language`|
+|`BeforeCreateLanguageEvent`|`LanguageService::createLanguage`|`LanguageCreateStruct $languageCreateStruct`</br>`?Language $language`|
 |`CreateLanguageEvent`|`LanguageService::createLanguage`|`Language $language`</br>`LanguageCreateStruct $languageCreateStruct`|
-|`BeforeUpdateLanguageNameEvent`|`LanguageService::updateLanguageName`|`Language $language`</br>`string $newName`</br>`Language|null $updatedLanguage`|
+|`BeforeUpdateLanguageNameEvent`|`LanguageService::updateLanguageName`|`Language $language`</br>`string $newName`</br>`?Language $updatedLanguage`|
 |`UpdateLanguageNameEvent`|`LanguageService::updateLanguageName`|`Language $updatedLanguage`</br>`Language $language`</br>`string $newName`|
 |`BeforeDeleteLanguageEvent`|`LanguageService::deleteLanguage`|`Language $language`|
 |`DeleteLanguageEvent`|`LanguageService::deleteLanguage`|`Language $language`|
@@ -18,7 +18,7 @@ page_type: reference
 
 | Event | Dispatched by | Properties |
 |---|---|---|
-|`BeforeEnableLanguageEvent`|`LanguageService::enableLanguage`|`Language $language`</br>`Language|null $enabledLanguage`|
+|`BeforeEnableLanguageEvent`|`LanguageService::enableLanguage`|`Language $language`</br>`?Language $enabledLanguage`|
 |`EnableLanguageEvent`|`LanguageService::enableLanguage`|`Language $enabledLanguage`</br>`Language $language`|
-|`BeforeDisableLanguageEvent`|`LanguageService::disableLanguage`|`Language $language`</br>`Language|null $disabledLanguage`|
+|`BeforeDisableLanguageEvent`|`LanguageService::disableLanguage`|`Language $language`</br>`?Language $disabledLanguage`|
 |`DisableLanguageEvent`|`LanguageService::disableLanguage`|`Language $disabledLanguage`</br>`Language $language`|
diff --git a/docs/api/event_reference/location_events.md b/docs/api/event_reference/location_events.md
index 3d84c98906..ecc463cc89 100644
--- a/docs/api/event_reference/location_events.md
+++ b/docs/api/event_reference/location_events.md
@@ -7,9 +7,9 @@ page_type: reference
 
 | Event | Dispatched by | Properties |
 |---|---|---|
-|`BeforeCreateLocationEvent`|`LocationService::createLocation`|`ContentInfo $contentInfo`</br>`LocationCreateStruct $locationCreateStruct`</br>`Location|null $location`|
+|`BeforeCreateLocationEvent`|`LocationService::createLocation`|`ContentInfo $contentInfo`</br>`LocationCreateStruct $locationCreateStruct`</br>`?Location $location`|
 |`CreateLocationEvent`|`LocationService::createLocation`|`Location $location`</br>`ContentInfo $contentInfo`</br>`LocationCreateStruct $locationCreateStruct`|
-|`BeforeUpdateLocationEvent`|`LocationService::updateLocation`|`Location $location`</br>`LocationUpdateStruct $locationUpdateStruct`</br>`Location|null $updatedLocation`|
+|`BeforeUpdateLocationEvent`|`LocationService::updateLocation`|`Location $location`</br>`LocationUpdateStruct $locationUpdateStruct`</br>`?Location $updatedLocation`|
 |`UpdateLocationEvent`|`LocationService::updateLocation`|`Location $updatedLocation`</br>`Location $location`</br>`LocationUpdateStruct $locationUpdateStruct`|
 |`BeforeDeleteLocationEvent`|`LocationService::deleteLocation`|`Location $location`|
 |`DeleteLocationEvent`|`LocationService::deleteLocation`|`Location $location`|
@@ -18,16 +18,16 @@ page_type: reference
 
 | Event | Dispatched by | Properties |
 |---|---|---|
-|`BeforeHideLocationEvent`|`LocationService::hideLocation`|`Location $location`</br>`Location|null $hiddenLocation`|
+|`BeforeHideLocationEvent`|`LocationService::hideLocation`|`Location $location`</br>`?Location $hiddenLocation`|
 |`HideLocationEvent`|`LocationService::hideLocation`|`Location $hiddenLocation`</br>`Location $location`|
-|`BeforeUnhideLocationEvent`|`LocationService::unhideLocation`|`Location $location`</br>`Location|null $revealedLocation`|
+|`BeforeUnhideLocationEvent`|`LocationService::unhideLocation`|`Location $location`</br>`?Location $revealedLocation`|
 |`UnhideLocationEvent`|`LocationService::unhideLocation`|`Location $revealedLocation`</br>`Location $location`|
 
 ## Subtree and Location management
 
 | Event | Dispatched by | Properties |
 |---|---|---|
-|`BeforeCopySubtreeEvent`|`LocationService::copySubtree`|`Location $subtree`</br>`Location $targetParentLocation`</br>`Location|null $location`|
+|`BeforeCopySubtreeEvent`|`LocationService::copySubtree`|`Location $subtree`</br>`Location $targetParentLocation`</br>`?Location $location`|
 |`CopySubtreeEvent`|`LocationService::copySubtree`|`Location $location`</br>`Location $subtree`</br>`Location $targetParentLocation`|
 |`BeforeMoveSubtreeEvent`|`LocationService::moveSubtree`|`Location $location`</br>`Location $newParentLocation`|
 |`MoveSubtreeEvent`|`LocationService::moveSubtree`|`Location $location`</br>`Location $newParentLocation`|
diff --git a/docs/api/event_reference/object_state_events.md b/docs/api/event_reference/object_state_events.md
index fdbd724b29..6d286ad244 100644
--- a/docs/api/event_reference/object_state_events.md
+++ b/docs/api/event_reference/object_state_events.md
@@ -7,9 +7,9 @@ page_type: reference
 
 | Event | Dispatched by | Properties |
 |---|---|---|
-|`BeforeCreateObjectStateEvent`|`ObjectStateService::createObjectState`|`ObjectStateGroup $objectStateGroup`</br>`ObjectStateCreateStruct $objectStateCreateStruct`</br>`ObjectState|null $objectState`|
+|`BeforeCreateObjectStateEvent`|`ObjectStateService::createObjectState`|`ObjectStateGroup $objectStateGroup`</br>`ObjectStateCreateStruct $objectStateCreateStruct`</br>`?ObjectState $objectState`|
 |`CreateObjectStateEvent`|`ObjectStateService::createObjectState`|`ObjectState $objectState`</br>`ObjectStateGroup $objectStateGroup`</br>`ObjectStateCreateStruct $objectStateCreateStruct`|
-|`BeforeUpdateObjectStateEvent`|`ObjectStateService::updateObjectState`|`ObjectState $objectState`</br>`ObjectStateUpdateStruct $objectStateUpdateStruct`</br>`ObjectState|null $updatedObjectState`|
+|`BeforeUpdateObjectStateEvent`|`ObjectStateService::updateObjectState`|`ObjectState $objectState`</br>`ObjectStateUpdateStruct $objectStateUpdateStruct`</br>`?ObjectState $updatedObjectState`|
 |`UpdateObjectStateEvent`|`ObjectStateService::updateObjectState`|`ObjectState $updatedObjectState`</br>`ObjectState $objectState`</br>`ObjectStateUpdateStruct $objectStateUpdateStruct`|
 |`BeforeDeleteObjectStateEvent`|`ObjectStateService::deleteObjectState`|`ObjectState $objectState`|
 |`DeleteObjectStateEvent`|`ObjectStateService::deleteObjectState`|`ObjectState $objectState`|
@@ -18,9 +18,9 @@ page_type: reference
 
 | Event | Dispatched by | Properties |
 |---|---|---|
-|`BeforeCreateObjectStateGroupEvent`|`ObjectStateService::createObjectStateGroup`|`ObjectStateGroupCreateStruct $objectStateGroupCreateStruct`</br>`ObjectStateGroup|null $objectStateGroup`|
+|`BeforeCreateObjectStateGroupEvent`|`ObjectStateService::createObjectStateGroup`|`ObjectStateGroupCreateStruct $objectStateGroupCreateStruct`</br>`?ObjectStateGroup $objectStateGroup`|
 |`CreateObjectStateGroupEvent`|`ObjectStateService::createObjectStateGroup`|`ObjectStateGroup $objectStateGroup`</br>`ObjectStateGroupCreateStruct $objectStateGroupCreateStruct`|
-|`BeforeUpdateObjectStateGroupEvent`|`ObjectStateService::updateObjectStateGroup`|`ObjectStateGroup $objectStateGroup`</br>`ObjectStateGroupUpdateStruct $objectStateGroupUpdateStruct`</br>`ObjectStateGroup|null $updatedObjectStateGroup`|
+|`BeforeUpdateObjectStateGroupEvent`|`ObjectStateService::updateObjectStateGroup`|`ObjectStateGroup $objectStateGroup`</br>`ObjectStateGroupUpdateStruct $objectStateGroupUpdateStruct`</br>`?ObjectStateGroup $updatedObjectStateGroup`|
 |`UpdateObjectStateGroupEvent`|`ObjectStateService::updateObjectStateGroup`|`ObjectStateGroup $updatedObjectStateGroup`</br>`ObjectStateGroup $objectStateGroup`</br>`ObjectStateGroupUpdateStruct $objectStateGroupUpdateStruct`|
 |`BeforeDeleteObjectStateGroupEvent`|`ObjectStateService::deleteObjectStateGroup`|`ObjectStateGroup $objectStateGroup`|
 |`DeleteObjectStateGroupEvent`|`ObjectStateService::deleteObjectStateGroup`|`ObjectStateGroup $objectStateGroup`|
diff --git a/docs/api/event_reference/other_events.md b/docs/api/event_reference/other_events.md
index 792c2ed781..3b4a289f4d 100644
--- a/docs/api/event_reference/other_events.md
+++ b/docs/api/event_reference/other_events.md
@@ -23,7 +23,7 @@ The following events refer to [notifications displayed in the user menu](notific
 
 | Event | Dispatched by | Properties |
 |---|---|---|
-|[`BeforeCreateNotificationEvent`](/api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Events-Notification-BeforeCreateNotificationEvent.html)|[`NotificationService::createNotification`](/api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-NotificationService.html#method_createNotification)|`CreateStruct $createStruct`</br>`Notification|null $notification`|
+|[`BeforeCreateNotificationEvent`](/api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Events-Notification-BeforeCreateNotificationEvent.html)|[`NotificationService::createNotification`](/api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-NotificationService.html#method_createNotification)|`CreateStruct $createStruct`</br>`?Notification $notification`|
 |[`CreateNotificationEvent`](/api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Events-Notification-CreateNotificationEvent.html)|[`NotificationService::createNotification`](/api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-NotificationService.html#method_createNotification)|`Notification $notification`</br>`CreateStruct $createStruct`|
 |[`BeforeDeleteNotificationEvent`](/api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Events-Notification-BeforeDeleteNotificationEvent.html)|[`NotificationService::deleteNotification`](/api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-NotificationService.html#method_deleteNotification)|`Notification $notification`|
 |[`DeleteNotificationEvent`](/api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Events-Notification-DeleteNotificationEvent.html)|[`NotificationService::deleteNotification`](/api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-NotificationService.html#method_deleteNotification)|`Notification $notification`|
@@ -38,9 +38,9 @@ The following events refer to key/value application-wide settings in database.
 
 | Event | Dispatched by | Properties |
 |---|---|---|
-|`BeforeCreateSettingEvent`|`SettingService::createSetting`|`SettingCreateStruct $settingCreateStruct`</br>`Setting|null $setting`|
+|`BeforeCreateSettingEvent`|`SettingService::createSetting`|`SettingCreateStruct $settingCreateStruct`</br>`?Setting $setting`|
 |`CreateSettingEvent`|`SettingService::createSetting`|`Setting $setting`</br>`SettingCreateStruct $settingCreateStruct`|
-|`BeforeUpdateSettingEvent`|`SettingService::updateSetting`|`Setting $setting`</br>`SettingUpdateStruct $settingUpdateStruct`</br>`Setting|null $updatedSetting`|
+|`BeforeUpdateSettingEvent`|`SettingService::updateSetting`|`Setting $setting`</br>`SettingUpdateStruct $settingUpdateStruct`</br>`?Setting $updatedSetting`|
 |`UpdateSettingEvent`|`SettingService::updateSetting`|`Setting $updatedSetting`</br>`Setting $setting`</br>`SettingUpdateStruct $settingUpdateStruct`|
 |`BeforeDeleteSettingEvent`|`SettingService::deleteSetting`|`Setting $setting`|
 |`DeleteSettingEvent`|`SettingService::deleteSetting`|`Setting $setting`|
diff --git a/docs/api/event_reference/page_events.md b/docs/api/event_reference/page_events.md
index c9c74c2231..bea60ff38f 100644
--- a/docs/api/event_reference/page_events.md
+++ b/docs/api/event_reference/page_events.md
@@ -8,12 +8,12 @@ page_type: reference
 
 | Event | Dispatched by | Properties |
 |---|---|---|
-|`AttributeSerializationEvent`|`AttributeSerializationDispatcher::serialize`|`LandingPage\Model\BlockValue $blockValue`</br>`string $attributeIdentifier`</br>`mixed|null $serializedValue`</br>`mixed $deserializedValue`|
-|`BlockContextEvent`|`BlockService::createBlockContextFromRequest`|`Request $request`</br>`BlockContextInterface|null $blockContext`|
-|`BlockFragmentRenderEvent`|`BlockRenderOptionsFragmentRenderer::dispatchFragmentRenderEvent`|`Content $content`</br>`Location|null $location`</br>`LandingPage\Model\Page $page`</br>`LandingPage\Model\BlockValue $blockValue`</br>`ControllerReference $uri`</br>`Request $request`</br>`array $options`|
+|`AttributeSerializationEvent`|`AttributeSerializationDispatcher::serialize`|`LandingPage\Model\BlockValue $blockValue`</br>`string $attributeIdentifier`</br>`mixed $serializedValue`</br>`mixed $deserializedValue`|
+|`BlockContextEvent`|`BlockService::createBlockContextFromRequest`|`Request $request`</br>`?BlockContextInterface $blockContext`|
+|`BlockFragmentRenderEvent`|`BlockRenderOptionsFragmentRenderer::dispatchFragmentRenderEvent`|`Content $content`</br>`?Location $location`</br>`LandingPage\Model\Page $page`</br>`LandingPage\Model\BlockValue $blockValue`</br>`ControllerReference $uri`</br>`Request $request`</br>`array $options`|
 |`BlockResponseEvent`|`BlockResponseSubscriber::getSubscribedEvents`|`BlockContextInterface $blockContext`</br>`LandingPage\Model\BlockValue $blockValue`</br>`Request $request`</br>`Response $response`|
 |`CollectBlockRelationsEvent`|`CollectRelationsSubscriber::onCollectBlockRelations`|`LandingPage\Value $fieldValue`</br>`LandingPage\Model\BlockValue $blockValue`</br>`int[] $relations`|
-|`PageRenderEvent`|`PageService::dispatchRenderPageEvent`|`Content $content`</br>`Location|null $location`</br>`LandingPage\Model\Page $page`</br>`Request $request`|
+|`PageRenderEvent`|`PageService::dispatchRenderPageEvent`|`Content $content`</br>`?Location $location`</br>`LandingPage\Model\Page $page`</br>`Request $request`|
 
 ## Page Builder
 
diff --git a/docs/api/event_reference/role_events.md b/docs/api/event_reference/role_events.md
index 7f21faf1de..f0374ff983 100644
--- a/docs/api/event_reference/role_events.md
+++ b/docs/api/event_reference/role_events.md
@@ -7,13 +7,13 @@ page_type: reference
 
 | Event | Dispatched by | Properties |
 |---|---|---|
-|`BeforeCreateRoleDraftEvent`|`RoleService::createRoleDraft`|`Role $role`</br>`RoleDraft|null $roleDraft`|
+|`BeforeCreateRoleDraftEvent`|`RoleService::createRoleDraft`|`Role $role`</br>`?RoleDraft $roleDraft`|
 |`CreateRoleDraftEvent`|`RoleService::createRoleDraft`|`Role $role`</br>`RoleDraft $roleDraft`|
-|`BeforeCreateRoleEvent`|`RoleService::createRole`|`RoleCreateStruct $roleCreateStruct`</br>`RoleDraft|null $roleDraft`|
+|`BeforeCreateRoleEvent`|`RoleService::createRole`|`RoleCreateStruct $roleCreateStruct`</br>`?RoleDraft $roleDraft`|
 |`CreateRoleEvent`|`RoleService::createRole`|`RoleCreateStruct $roleCreateStruct`</br>`RoleDraft $roleDraft`|
-|`BeforeUpdateRoleDraftEvent`|`RoleService::updateRoleDraft`|`RoleDraft $roleDraft`</br>`RoleUpdateStruct $roleUpdateStruct`</br>`RoleDraft|null $updatedRoleDraft`|
+|`BeforeUpdateRoleDraftEvent`|`RoleService::updateRoleDraft`|`RoleDraft $roleDraft`</br>`RoleUpdateStruct $roleUpdateStruct`</br>`?RoleDraft $updatedRoleDraft`|
 |`UpdateRoleDraftEvent`|`RoleService::updateRoleDraft`|`RoleDraft $roleDraft`</br>`RoleUpdateStruct $roleUpdateStruct`</br>`RoleDraft $updatedRoleDraft`|
-|`BeforeCopyRoleEvent`|`RoleService::copyRole`|`Role $role`</br>`RoleCopyStruct $roleCopyStruct`</br>`Role|null $copiedRole`|
+|`BeforeCopyRoleEvent`|`RoleService::copyRole`|`Role $role`</br>`RoleCopyStruct $roleCopyStruct`</br>`?Role $copiedRole`|
 |`CopyRoleEvent`|`RoleService::copyRole`|`Role $copiedRole`</br>`Role $role`</br>`RoleCopyStruct $roleCopyStruct`|
 |`BeforePublishRoleDraftEvent`|`RoleService::publishRoleDraft`|`RoleDraft $roleDraft`|
 |`PublishRoleDraftEvent`|`RoleService::publishRoleDraft`|`RoleDraft $roleDraft`|
@@ -26,11 +26,11 @@ page_type: reference
 
 | Event | Dispatched by | Properties |
 |---|---|---|
-|`BeforeAddPolicyByRoleDraftEvent`|`RoleService::addPolicyByRoleDraft`|`RoleDraft $roleDraft`</br>`PolicyCreateStruct $policyCreateStruct`</br>`RoleDraft|null $updatedRoleDraft`|
+|`BeforeAddPolicyByRoleDraftEvent`|`RoleService::addPolicyByRoleDraft`|`RoleDraft $roleDraft`</br>`PolicyCreateStruct $policyCreateStruct`</br>`?RoleDraft $updatedRoleDraft`|
 |`AddPolicyByRoleDraftEvent`|`RoleService::addPolicyByRoleDraft`|`RoleDraft $roleDraft`</br>`PolicyCreateStruct $policyCreateStruct`</br>`private $updatedRoleDraft`|
-|`BeforeUpdatePolicyByRoleDraftEvent`|`RoleService::updatePolicyByRoleDraft`|`RoleDraft $roleDraft`</br>`PolicyDraft $policy`</br>`PolicyUpdateStruct $policyUpdateStruct`</br>`PolicyDraft|null $updatedPolicyDraft`|
+|`BeforeUpdatePolicyByRoleDraftEvent`|`RoleService::updatePolicyByRoleDraft`|`RoleDraft $roleDraft`</br>`PolicyDraft $policy`</br>`PolicyUpdateStruct $policyUpdateStruct`</br>`?PolicyDraft $updatedPolicyDraft`|
 |`UpdatePolicyByRoleDraftEvent`|`RoleService::updatePolicyByRoleDraft`|`RoleDraft $roleDraft`</br>`PolicyDraft $policy`</br>`PolicyUpdateStruct $policyUpdateStruct`</br>`PolicyDraft $updatedPolicyDraft`|
-|`BeforeRemovePolicyByRoleDraftEvent`|`RoleService::removePolicyByRoleDraft`|`RoleDraft $roleDraft`</br>`PolicyDraft $policyDraft`</br>`RoleDraft|null $updatedRoleDraft`|
+|`BeforeRemovePolicyByRoleDraftEvent`|`RoleService::removePolicyByRoleDraft`|`RoleDraft $roleDraft`</br>`PolicyDraft $policyDraft`</br>`?RoleDraft $updatedRoleDraft`|
 |`RemovePolicyByRoleDraftEvent`|`RoleService::removePolicyByRoleDraft`|`RoleDraft $roleDraft`</br>`PolicyDraft $policyDraft`</br>`RoleDraft $updatedRoleDraft`|
 
 ## Assigning roles
diff --git a/docs/api/event_reference/section_events.md b/docs/api/event_reference/section_events.md
index dfc7234992..10921a0d3d 100644
--- a/docs/api/event_reference/section_events.md
+++ b/docs/api/event_reference/section_events.md
@@ -7,11 +7,11 @@ page_type: reference
 
 | Event | Dispatched by | Properties |
 |---|---|---|
-|`BeforeCreateSectionEvent`|`SectionService::createSection`|`SectionCreateStruct $sectionCreateStruct`</br>`Section|null $section`|
+|`BeforeCreateSectionEvent`|`SectionService::createSection`|`SectionCreateStruct $sectionCreateStruct`</br>`?Section $section`|
 |`CreateSectionEvent`|`SectionService::createSection`|`SectionCreateStruct $sectionCreateStruct`</br>`Section $section`|
 |`BeforeDeleteSectionEvent`|`SectionService::deleteSection`|`Section $section`|
 |`DeleteSectionEvent`|`SectionService::deleteSection`|`Section $section`|
-|`BeforeUpdateSectionEvent`|`SectionService::updateSection`|`Section $section`</br>`SectionUpdateStruct $sectionUpdateStruct`</br>`Section|null $updatedSection`|
+|`BeforeUpdateSectionEvent`|`SectionService::updateSection`|`Section $section`</br>`SectionUpdateStruct $sectionUpdateStruct`</br>`?Section $updatedSection`|
 |`UpdateSectionEvent`|`SectionService::updateSection`|`Section $section`</br>`SectionUpdateStruct $sectionUpdateStruct`</br>`Section $updatedSection`|
 
 ## Assigning sections
diff --git a/docs/api/event_reference/site_events.md b/docs/api/event_reference/site_events.md
index af4373b2c4..7910c81f5b 100644
--- a/docs/api/event_reference/site_events.md
+++ b/docs/api/event_reference/site_events.md
@@ -12,7 +12,7 @@ The following events are dispatched when managing [Sites](site_factory.md).
 |---|---|---|
 |`BeforeCreateSiteEvent`|`SiteService::createSite`|`SiteCreateStruct $siteCreateStruct`</br>`Site $site`|
 |`CreateSiteEvent`|`SiteService::createSite`|`Site $site`</br>`SiteCreateStruct $siteCreateStruct`|
-|`BeforeUpdateSiteEvent`|`SiteService::updateSite`|`Site $site`</br>`SiteUpdateStruct $siteUpdateStruct`</br>`Site|null $updatedSite`|
+|`BeforeUpdateSiteEvent`|`SiteService::updateSite`|`Site $site`</br>`SiteUpdateStruct $siteUpdateStruct`</br>`?Site $updatedSite`|
 |`UpdateSiteEvent`|`SiteService::updateSite`|`Site $updatedSite`</br>`Site $site`</br>`SiteUpdateStruct $siteUpdateStruct`|
 |`BeforeDeleteSiteEvent`|`SiteService::deleteSite`|`Site $site`|
 |`DeleteSiteEvent`|`SiteService::deleteSite`|`Site $site`|
diff --git a/docs/api/event_reference/trash_events.md b/docs/api/event_reference/trash_events.md
index 626988c0e8..87356e2e72 100644
--- a/docs/api/event_reference/trash_events.md
+++ b/docs/api/event_reference/trash_events.md
@@ -9,11 +9,11 @@ The following events are dispatched when managing Trash.
 
 | Event | Dispatched by | Properties |
 |---|---|---|
-|`BeforeDeleteTrashItemEvent`|`TrashService::deleteTrashItem`|`TrashItem $trashItem`</br>`TrashItemDeleteResult|null $result`|
+|`BeforeDeleteTrashItemEvent`|`TrashService::deleteTrashItem`|`TrashItem $trashItem`</br>`?TrashItemDeleteResult $result`|
 |`DeleteTrashItemEvent`|`TrashService::deleteTrashItem`|`TrashItem $trashItem`</br>`TrashItemDeleteResult $result`|
-|`BeforeEmptyTrashEvent`|`TrashService::emptyTrash`|`TrashItemDeleteResultList|null $resultList`|
+|`BeforeEmptyTrashEvent`|`TrashService::emptyTrash`|`?TrashItemDeleteResultList $resultList`|
 |`EmptyTrashEvent`|`TrashService::emptyTrash`|`TrashItemDeleteResultList $resultList`|
-|`BeforeRecoverEvent`|`TrashService::recover`|`TrashItem $trashItem`</br>`Location $newParentLocation`</br>`Location|null $location`|
+|`BeforeRecoverEvent`|`TrashService::recover`|`TrashItem $trashItem`</br>`Location $newParentLocation`</br>`?Location $location`|
 |`RecoverEvent`|`TrashService::recover`|`TrashItem $trashItem`</br>`Location $newParentLocation`</br>`Location $location`|
-|`BeforeTrashEvent`|`TrashService::trash`|`Location $location`</br>`TrashItem|null $result`</br>`bool $resultSet = false`|
-|`TrashEvent`|`TrashService::trash`|`Location $location`</br>`TrashItem|null $trashItem`|
+|`BeforeTrashEvent`|`TrashService::trash`|`Location $location`</br>`?TrashItem $result`</br>`bool $resultSet = false`|
+|`TrashEvent`|`TrashService::trash`|`Location $location`</br>`?TrashItem $trashItem`|
diff --git a/docs/api/event_reference/url_events.md b/docs/api/event_reference/url_events.md
index 4b7cce5010..e6b236809b 100644
--- a/docs/api/event_reference/url_events.md
+++ b/docs/api/event_reference/url_events.md
@@ -9,7 +9,7 @@ page_type: reference
 
 | Event | Dispatched by | Properties |
 |---|---|---|
-|`BeforeUpdateUrlEvent`|`URLService::updateUrl`|`URL $url`</br>`URLUpdateStruct $struct`</br>`URL|null $updatedUrl`|
+|`BeforeUpdateUrlEvent`|`URLService::updateUrl`|`URL $url`</br>`URLUpdateStruct $struct`</br>`?URL $updatedUrl`|
 |`UpdateUrlEvent`|`URLService::updateUrl`|`URL $url`</br>`URLUpdateStruct $struct`</br>`URL $updatedUrl`|
 
 ## URL aliases
@@ -18,9 +18,9 @@ The following events are dispatched when creating and managing [URL aliases](url
 
 | Event | Dispatched by | Properties |
 |---|---|---|
-|`BeforeCreateGlobalUrlAliasEvent`|`URLAliasService::createGlobalUrlAlias`|`private $resource`</br>`private $path`</br>`private $languageCode`</br>`private $forwarding`</br>`private $alwaysAvailable`</br>`URLAlias|null $urlAlias`|
+|`BeforeCreateGlobalUrlAliasEvent`|`URLAliasService::createGlobalUrlAlias`|`private $resource`</br>`private $path`</br>`private $languageCode`</br>`private $forwarding`</br>`private $alwaysAvailable`</br>`?URLAlias $urlAlias`|
 |`CreateGlobalUrlAliasEvent`|`URLAliasService::createGlobalUrlAlias`|`private $resource`</br>`private $path`</br>`private $languageCode`</br>`private $forwarding`</br>`private $alwaysAvailable`</br>`URLAlias $urlAlias`|
-|`BeforeCreateUrlAliasEvent`|`URLAliasService::createUrlAlias`|`Location $location`</br>`private $path`</br>`private $languageCode`</br>`private $forwarding`</br>`private $alwaysAvailable`</br>`URLAlias|null $urlAlias`|
+|`BeforeCreateUrlAliasEvent`|`URLAliasService::createUrlAlias`|`Location $location`</br>`private $path`</br>`private $languageCode`</br>`private $forwarding`</br>`private $alwaysAvailable`</br>`?URLAlias $urlAlias`|
 |`CreateUrlAliasEvent`|`URLAliasService::createUrlAlias`|`Location $location`</br>`private $path`</br>`private $languageCode`</br>`private $forwarding`</br>`private $alwaysAvailable`</br>`URLAlias $urlAlias`|
 |`BeforeRefreshSystemUrlAliasesForLocationEvent`|`URLAliasService::refreshSystemUrlAliasesForLocation`|`Location $location`|
 |`RefreshSystemUrlAliasesForLocationEvent`|`URLAliasService::refreshSystemUrlAliasesForLocation`|`Location $location`|
@@ -33,11 +33,11 @@ The following events are dispatched when creating and managing [URL wildcards](u
 
 | Event | Dispatched by | Properties |
 |---|---|---|
-|`BeforeCreateEvent`|`URLWildcardService::create`|`private $sourceUrl`</br>`private $destinationUrl`</br>`private $forward`</br>`URLWildcard|null $urlWildcard`|
+|`BeforeCreateEvent`|`URLWildcardService::create`|`private $sourceUrl`</br>`private $destinationUrl`</br>`private $forward`</br>`?URLWildcard $urlWildcard`|
 |`CreateEvent`|`URLWildcardService::create`|`private $sourceUrl`</br>`private $destinationUrl`</br>`private $forward`</br>`URLWildcard $urlWildcard`|
 |`BeforeUpdateEvent`|`URLWildcardService::update`|`URLWildcard $urlWildcard`</br>`URLWildcardUpdateStruct $updateStruct`|
 |`UpdateEvent`|`URLWildcardService::update`|`URLWildcard $urlWildcard`</br>`URLWildcardUpdateStruct $updateStruct`|
-|`BeforeTranslateEvent`|`URLWildcardService::translate`|`private $url`</br>`URLWildcardTranslationResult|null $result`|
+|`BeforeTranslateEvent`|`URLWildcardService::translate`|`private $url`</br>`?URLWildcardTranslationResult $result`|
 |`TranslateEvent`|`URLWildcardService::translate`|`private $url`</br>`URLWildcardTranslationResult $result`|
 |`BeforeRemoveEvent`|`URLWildcardService::remove`|`URLWildcard $urlWildcard`|
 |`RemoveEvent`|`URLWildcardService::remove`|`URLWildcard $urlWildcard`|
diff --git a/docs/api/event_reference/user_events.md b/docs/api/event_reference/user_events.md
index 29d83c0e50..790561aeba 100644
--- a/docs/api/event_reference/user_events.md
+++ b/docs/api/event_reference/user_events.md
@@ -7,22 +7,22 @@ page_type: reference
 
 | Event | Dispatched by | Properties |
 |---|---|---|
-|`BeforeCreateUserEvent`|`UserService::createUser`|`UserCreateStruct $userCreateStruct`</br>`array $parentGroups`</br>`User|null $user`|
+|`BeforeCreateUserEvent`|`UserService::createUser`|`UserCreateStruct $userCreateStruct`</br>`array $parentGroups`</br>`?User $user`|
 |`CreateUserEvent`|`UserService::createUser`|`UserCreateStruct $userCreateStruct`</br>`array $parentGroups`</br>`User $user`|
-|`BeforeUpdateUserEvent`|`UserService::updateUser`|`User $user`</br>`UserUpdateStruct $userUpdateStruct`</br>`User|null $updatedUser`|
+|`BeforeUpdateUserEvent`|`UserService::updateUser`|`User $user`</br>`UserUpdateStruct $userUpdateStruct`</br>`?User $updatedUser`|
 |`UpdateUserEvent`|`UserService::updateUser`|`User $user`</br>`UserUpdateStruct $userUpdateStruct`</br>`User $updatedUser`|
-|`BeforeDeleteUserEvent`|`UserService::deleteUser`|`User $user`</br>`array|null $locations`|
+|`BeforeDeleteUserEvent`|`UserService::deleteUser`|`User $user`</br>`array or null $locations`|
 |`DeleteUserEvent`|`UserService::deleteUser`|`User $user`</br>`array $locations`|
 
 ## User groups
 
 | Event | Dispatched by | Properties |
 |---|---|---|
-|`BeforeCreateUserGroupEvent`|`UserService::createUserGroup`|`UserGroupCreateStruct $userGroupCreateStruct`</br>`UserGroup $parentGroup`</br>`UserGroup|null $userGroup`|
+|`BeforeCreateUserGroupEvent`|`UserService::createUserGroup`|`UserGroupCreateStruct $userGroupCreateStruct`</br>`UserGroup $parentGroup`</br>`?UserGroup $userGroup`|
 |`CreateUserGroupEvent`|`UserService::createUserGroup`|`UserGroupCreateStruct $userGroupCreateStruct`</br>`UserGroup $parentGroup`</br>`UserGroup $userGroup`|
-|`BeforeUpdateUserGroupEvent`|`UserService::updateUserGroup`|`UserGroup $userGroup`</br>`UserGroupUpdateStruct $userGroupUpdateStruct`</br>`UserGroup|null $updatedUserGroup`|
+|`BeforeUpdateUserGroupEvent`|`UserService::updateUserGroup`|`UserGroup $userGroup`</br>`UserGroupUpdateStruct $userGroupUpdateStruct`</br>`?UserGroup $updatedUserGroup`|
 |`UpdateUserGroupEvent`|`UserService::updateUserGroup`|`UserGroup $userGroup`</br>`UserGroupUpdateStruct $userGroupUpdateStruct`|
-|`BeforeDeleteUserGroupEvent`|`UserService::deleteUserGroup`|`UserGroup $userGroup`</br>`array|null $locations`|
+|`BeforeDeleteUserGroupEvent`|`UserService::deleteUserGroup`|`UserGroup $userGroup`</br>`array or null $locations`|
 |`DeleteUserGroupEvent`|`UserService::deleteUserGroup`|`UserGroup $userGroup`</br>`array $locations`|
 |`BeforeMoveUserGroupEvent`|`UserService::moveUserGroup`|`UserGroup $userGroup`</br>`UserGroup $newParent`|
 |`MoveUserGroupEvent`|`UserService::moveUserGroup`|`UserGroup $userGroup`</br>`UserGroup $newParent`|
@@ -40,7 +40,7 @@ page_type: reference
 
 | Event | Dispatched by | Properties |
 |---|---|---|
-|`BeforeUpdateUserPasswordEvent`|`UserService::updateUserPassword`|`User $user`</br>`string $newPassword`</br>`User|null $updatedUser`|
+|`BeforeUpdateUserPasswordEvent`|`UserService::updateUserPassword`|`User $user`</br>`string $newPassword`</br>`?User $updatedUser`|
 |`UpdateUserPasswordEvent`|`UserService::updateUserPassword`|`User $user`</br>`string $newPassword`</br>`User $updatedUser`|
-|`BeforeUpdateUserTokenEvent`|`UserService::updateUserToken`|`User $user`</br>`UserTokenUpdateStruct $userTokenUpdateStruct`</br>`User|null $updatedUser`|
+|`BeforeUpdateUserTokenEvent`|`UserService::updateUserToken`|`User $user`</br>`UserTokenUpdateStruct $userTokenUpdateStruct`</br>`?User $updatedUser`|
 |`UpdateUserTokenEvent`|`UserService::updateUserToken`|`User $user`</br>`UserTokenUpdateStruct $userTokenUpdateStruct`</br>`User $updatedUser`|
diff --git a/docs/api/rest_api/rest_api_authentication.md b/docs/api/rest_api/rest_api_authentication.md
index f7f77366f8..de97086451 100644
--- a/docs/api/rest_api/rest_api_authentication.md
+++ b/docs/api/rest_api/rest_api_authentication.md
@@ -353,7 +353,7 @@ For details, see [RFC 2617](https://datatracker.ietf.org/doc/html/rfc2617).
 Most HTTP client libraries and REST libraries support this method.
 [Creating content with binary attachments](rest_requests.md#creating-content-with-binary-attachments) is an example of using basic authentication with [cURL](https://www.php.net/manual/en/book.curl.php) and its `CURLOPT_USERPWD`.
 
-**Raw HTTP request with basic authentication**
+See the following raw HTTP request with basic authentication example:
 
 ```http
 GET / HTTP/1.1
diff --git a/docs/commerce/transactional_emails/transactional_emails_parameters.md b/docs/commerce/transactional_emails/transactional_emails_parameters.md
index 13e2fef59e..e76f85f953 100644
--- a/docs/commerce/transactional_emails/transactional_emails_parameters.md
+++ b/docs/commerce/transactional_emails/transactional_emails_parameters.md
@@ -11,32 +11,32 @@ If this extensive list of variables isn't sufficient, you can [extend it to incl
 
 |Category|Variable|Description|Example values|Notes|
 |:----|:----|:----|:----|:----|
-|Order processing|orderId|Order numerical ID|123|
-| |orderIdentifier|Order identifier|660575f7-aa75-47af-b4d3-db2693f7e37c|
-| |orderCurrency|Currency code|EUR|
-| |orderSource|Order source|storefront|
-| |orderValueNet|Total value (net)|€700,00|
-| |orderValueGross|Total value (gross)|€749,50|
-| |orderValueVat|Vat value|€49,50|
-| |shippingAddressCountry|Country code|US|
-| |shippingAddressRegion|Region|California|
-| |shippingAddressLocality|City|Los Angeles|
-| |shippingAddressStreet|Street|10250 Santa Monica Blvd|
-| |shippingAddressPostalCode|Postal code|90067|
-| |shippingAddressFirstName|Addressee's first name|John|
-| |shippingAddressLastName|Addressee's last name|Doe|
-| |shippingAddressEmail|E-mail address|user@example.com|
-| |shippingAddressPhoneNumber|Phone number|123456789|
-| |billingAddressCountry|Country code|US|
-| |billingAddressTaxId|Tax Identification Number i.e. VAT|12345678|
-| |billingAddressRegion|Region|California|
-| |billingAddressLocality|City|Los Angeles|
-| |billingAddressStreet|Street|10250 Santa Monica Blvd|
-| |billingAddressPostalCode|Postal code|90067|
-| |billingAddressFirstName|Payer's first name|John|
-| |billingAddressLastName|Payer's last name|Doe|
-| |billingAddressEmail|E-mail address|user@example.com|
-| |billingAddressPhoneNumber|Phone number|123456789|
+|Order processing|orderId|Order numerical ID|123| |
+| |orderIdentifier|Order identifier|660575f7-aa75-47af-b4d3-db2693f7e37c| |
+| |orderCurrency|Currency code|EUR| |
+| |orderSource|Order source|storefront| |
+| |orderValueNet|Total value (net)|€700,00| |
+| |orderValueGross|Total value (gross)|€749,50| |
+| |orderValueVat|Vat value|€49,50| |
+| |shippingAddressCountry|Country code|US| |
+| |shippingAddressRegion|Region|California| |
+| |shippingAddressLocality|City|Los Angeles| |
+| |shippingAddressStreet|Street|10250 Santa Monica Blvd| |
+| |shippingAddressPostalCode|Postal code|90067| |
+| |shippingAddressFirstName|Addressee's first name|John| |
+| |shippingAddressLastName|Addressee's last name|Doe| |
+| |shippingAddressEmail|E-mail address|user@example.com| |
+| |shippingAddressPhoneNumber|Phone number|123456789| |
+| |billingAddressCountry|Country code|US| |
+| |billingAddressTaxId|Tax Identification Number i.e. VAT|12345678| |
+| |billingAddressRegion|Region|California| |
+| |billingAddressLocality|City|Los Angeles| |
+| |billingAddressStreet|Street|10250 Santa Monica Blvd| |
+| |billingAddressPostalCode|Postal code|90067| |
+| |billingAddressFirstName|Payer's first name|John| |
+| |billingAddressLastName|Payer's last name|Doe| |
+| |billingAddressEmail|E-mail address|user@example.com| |
+| |billingAddressPhoneNumber|Phone number|123456789| |
 |Payment|paymentMethodIdentifier|Technical identifier of payment method| | |
 | |paymentMethodName|Human readable name of payment method| | |
 | |paymentMethodDescription|Human readable description of payment method|Prepaid cards and gift cards (offline version)| |
@@ -47,19 +47,19 @@ If this extensive list of variables isn't sufficient, you can [extend it to incl
 | |shippingMethodDescription|Human readable description of shipping method| | |
 | |shippingMethodTypeName|Technical name of shipping method type| | |
 | |shipmentStatus|Technical identifier of shipment status| |Only available in ShipmentStatusChange notification|
-|Product information|products.id|Product numerical ID|123|
-| |products.code|Product code (SKU)|123456|
-| |products.name|Product name|iPhone 15 Pro 256GB Space Gray|
-| |products.url|Product view URL|https://example.com/product/iphone-15-pro-256gb-space-gray/|
-| |products.thumbnail|Product thumbnail URL|https://example.com/assets/images/iphone-15-pro-256gb-space-gray.jpg|
-| |products.quantity|Quantity|5|
-| |products.unitPriceNet|Unit price (net)|€700,00|
-| |products.unitPriceGross|Unit Price (gross)|€749,50|
-| |products.subtotalPriceNet|Subtotal price (net), quantity * unit price (net)|€2700,00|
-| |products.subtotalPriceGross|Subtotal price (gross), quantity * unit price (gross)|€2749,50|
-|User information|userId|Numerical ID|255|
-| |userLogin|User login|john.doe|
-| |userEmail|User e-mail address|john.doe@example.com|
-| |userName|User name|John Doe|
-|Password reset|token|Token used to reset password|5bcc871f1a966db58c06187369813447|
-| |passwordResetUrl|Absolute URL to reset password|http://example.com/user/reset-password/5bcc871f1a966db58c06187369813447|
+|Product information|products.id|Product numerical ID|123| |
+| |products.code|Product code (SKU)|123456| |
+| |products.name|Product name|iPhone 15 Pro 256GB Space Gray| |
+| |products.url|Product view URL|https://example.com/product/iphone-15-pro-256gb-space-gray/| |
+| |products.thumbnail|Product thumbnail URL|https://example.com/assets/images/iphone-15-pro-256gb-space-gray.jpg| |
+| |products.quantity|Quantity|5| |
+| |products.unitPriceNet|Unit price (net)|€700,00| |
+| |products.unitPriceGross|Unit Price (gross)|€749,50| |
+| |products.subtotalPriceNet|Subtotal price (net), quantity * unit price (net)|€2700,00| |
+| |products.subtotalPriceGross|Subtotal price (gross), quantity * unit price (gross)|€2749,50| |
+|User information|userId|Numerical ID|255| |
+| |userLogin|User login|john.doe| |
+| |userEmail|User e-mail address|john.doe@example.com| |
+| |userName|User name|John Doe| |
+|Password reset|token|Token used to reset password|5bcc871f1a966db58c06187369813447| |
+| |passwordResetUrl|Absolute URL to reset password|http://example.com/user/reset-password/5bcc871f1a966db58c06187369813447| |
diff --git a/docs/content_management/field_types/field_type_reference/dateandtimefield.md b/docs/content_management/field_types/field_type_reference/dateandtimefield.md
index d0d5e3fd25..13ca072ddd 100644
--- a/docs/content_management/field_types/field_type_reference/dateandtimefield.md
+++ b/docs/content_management/field_types/field_type_reference/dateandtimefield.md
@@ -74,11 +74,11 @@ This field type doesn't perform any special validation of the input value.
 
 The field definition of this field type can be configured with several options:
 
-| Name           | Type      | Default value         | Description                                                                                                                             |
-|----------------|-----------|-----------------------|-----------------------------------------------------------------------------------------------------------------------------------------|
-| `useSeconds`   | `boolean` | `false`               | Used to control displaying of seconds in the output.                                                                                    |
-| `defaultType`  | `mixed`   | `Type::DEFAULT_EMPTY` | One of the `DEFAULT_*` constants, used by the administration interface for setting the default field value. See below for more details. |
-| `dateInterval` | `null     | \DateInterval`        | `null`                                                                                                                                  |This setting complements `defaultType` setting and can be used only when the latter is set to `Type::DEFAULT_CURRENT_DATE_ADJUSTED`. In that case the default input value when using administration interface is adjusted by the given `\DateInterval`.|
+| Name           | Type             | Default value         | Description                                                                                                                             |
+|----------------|------------------|-----------------------|-----------------------------------------------------------------------------------------------------------------------------------------|
+| `useSeconds`   | `boolean`        | `false`               | Used to control displaying of seconds in the output.                                                                                    |
+| `defaultType`  | `mixed`          | `Type::DEFAULT_EMPTY` | One of the `DEFAULT_*` constants, used by the administration interface for setting the default field value. See below for more details. |
+| `dateInterval` | `?\DateInterval` | `null`                | This setting complements `defaultType` setting and can be used only when the latter is set to `Type::DEFAULT_CURRENT_DATE_ADJUSTED`. In that case the default input value when using administration interface is adjusted by the given `\DateInterval`.|
 
 Following `defaultType` default value options are available as constants in the `Ibexa\Core\FieldType\DateAndTime\Type` class:
 
diff --git a/docs/content_management/field_types/field_type_reference/keywordfield.md b/docs/content_management/field_types/field_type_reference/keywordfield.md
index 1d1d09b35f..87bdadafe5 100644
--- a/docs/content_management/field_types/field_type_reference/keywordfield.md
+++ b/docs/content_management/field_types/field_type_reference/keywordfield.md
@@ -2,9 +2,9 @@
 
 This field type stores one or several comma-separated keywords as a string or array of strings.
 
-| Name      | Internal name   | Expected input    |
-|-----------|-----------------|-------------------|
-| `Keyword` | `ibexa_keyword` | `string[]|string` |
+| Name      | Internal name   | Expected input         |
+|-----------|-----------------|------------------------|
+| `Keyword` | `ibexa_keyword` | `string[]` or `string` |
 
 ## PHP API field type
 
diff --git a/docs/content_management/field_types/field_type_reference/maplocationfield.md b/docs/content_management/field_types/field_type_reference/maplocationfield.md
index feaf4ef115..723d8876a6 100644
--- a/docs/content_management/field_types/field_type_reference/maplocationfield.md
+++ b/docs/content_management/field_types/field_type_reference/maplocationfield.md
@@ -53,15 +53,15 @@ $MapLocationValue = new MapLocation\Value(
 
 The template called by [the `ibexa_render_field()` Twig function](field_twig_functions.md#ibexa_render_field) while rendering a Map location field accepts the following parameters:
 
-| Parameter     | Type       | Default | Description                                                                                                    |
-|---------------|------------|---------|----------------------------------------------------------------------------------------------------------------|
-| `draggable`   | `boolean`  | `true`  | Whether to enable a draggable map.                                                                             |
-| `height`      | `string    | false`  | `"200px"`                                                                                                      |The height of the rendered map with its unit (for example "200px" or "20em"), set to false to not set any height style inline.|
-| `scrollWheel` | `boolean`  | `true`  | Allows you to disable scroll wheel starting to zoom when mouse comes over the map as user scrolls down a page. |
-| `showInfo`    | `booolean` | `true`  | Whether to show a latitude, longitude and the address outside of the map.                                      |
-| `showMap`     | `boolean`  | `true`  | Whether to show the OpenStreetMap.                                                                             |
-| `width`       | `string    | false`  | `"500px"`                                                                                                      |The width of the rendered map with its unit (for example "500px" or "50em"), set to false to not set any width style inline.|
-| `zoom`        | `integer`  | `13`    | The initial zoom level on the map.                                                                             |
+| Parameter     | Type                | Default   | Description                                                                                                                    |
+|---------------|---------------------|-----------|--------------------------------------------------------------------------------------------------------------------------------|
+| `draggable`   | `boolean`           | `true`    | Whether to enable a draggable map.                                                                                             |
+| `height`      | `string` or `false` | `"200px"` | The height of the rendered map with its unit (for example "200px" or "20em"), set to false to not set any height style inline. |
+| `scrollWheel` | `boolean`           | `true`    | Allows you to disable scroll wheel starting to zoom when mouse comes over the map as user scrolls down a page.                 |
+| `showInfo`    | `booolean`          | `true`    | Whether to show a latitude, longitude and the address outside of the map.                                                      |
+| `showMap`     | `boolean`           | `true`    | Whether to show the OpenStreetMap.                                                                                             |
+| `width`       | `string` or `false` | `"500px"` | The width of the rendered map with its unit (for example "500px" or "50em"), set to false to not set any width style inline.   |
+| `zoom`        | `integer`           | `13`      | The initial zoom level on the map.                                                                                             |
 
 Example:
 
diff --git a/docs/content_management/field_types/field_type_reference/relationfield.md b/docs/content_management/field_types/field_type_reference/relationfield.md
index 6f8b9a8543..aa683ebcc4 100644
--- a/docs/content_management/field_types/field_type_reference/relationfield.md
+++ b/docs/content_management/field_types/field_type_reference/relationfield.md
@@ -21,9 +21,9 @@ This field type makes it possible to store and retrieve the value of a relation
 
 The Value class of this field type contains the following properties:
 
-| Property               | Type              | Description                                                                               |
-|------------------------|-------------------|-------------------------------------------------------------------------------------------|
-| `$destinationContentId` | `string|int|null` | This property is used to store the value provided, which represents the related content. |
+| Property               | Type                        | Description                                                                               |
+|------------------------|-----------------------------|-------------------------------------------------------------------------------------------|
+| `$destinationContentId` | `string`, `int`, or `null` | This property is used to store the value provided, which represents the related content.  |
 
 ``` php
 // Value object content example
diff --git a/docs/content_management/field_types/field_type_reference/relationlistfield.md b/docs/content_management/field_types/field_type_reference/relationlistfield.md
index f920a2a9ae..93e991fee2 100644
--- a/docs/content_management/field_types/field_type_reference/relationlistfield.md
+++ b/docs/content_management/field_types/field_type_reference/relationlistfield.md
@@ -12,7 +12,7 @@ This field type makes it possible to store and retrieve values of a relation to
 
 |Type|Description|Example|
 |------|------|------|
-|`int|string`|ID of the related content item|`42`|
+|`int` or `string`|ID of the related content item|`42`|
 |`array`|An array of related Content IDs|`[ 24, 42 ]`|
 |`Ibexa\Contracts\Core\Repository\Values\Content\ContentInfo`|ContentInfo instance of the related Content|n/a|
 |`Ibexa\Core\FieldType\RelationList\Value`|RelationList field type value object|See below.|
@@ -74,7 +74,7 @@ The field definition of this field type can be configured with the following opt
 |Name|Type|Default value|Description|
 |------|------|------|------|
 |`selectionMethod`|`mixed`|`SELECTION_BROWSE`|Method of selection in the back-end interface.|
-|`selectionDefaultLocation`|`string|integer`|`null`|ID of the default Location for the selection when using the back-end interface.|
+|`selectionDefaultLocation`|`string` or `integer`|`null`|ID of the default Location for the selection when using the back-end interface.|
 |`selectionContentTypes`|`array`|`[]`|An array of content type IDs that are allowed for related Content.|
 
 Following selection methods are available:
diff --git a/docs/content_management/field_types/field_type_reference/taxonomyentryfield.md b/docs/content_management/field_types/field_type_reference/taxonomyentryfield.md
index 1fdbb9ec8b..9a6fddabf0 100644
--- a/docs/content_management/field_types/field_type_reference/taxonomyentryfield.md
+++ b/docs/content_management/field_types/field_type_reference/taxonomyentryfield.md
@@ -38,7 +38,7 @@ Example using array:
 
 |Property|Type|Description|
 |--------|----|-----------|
-|`taxonomyEntry`|`Ibexa\Contracts\Taxonomy\Value\TaxonomyEntry|null`|Stores selected taxonomy entry.|
+|`taxonomyEntry`|`?Ibexa\Contracts\Taxonomy\Value\TaxonomyEntry`|Stores selected taxonomy entry.|
 
 #### Constructor
 
diff --git a/docs/content_management/field_types/field_type_reference/timefield.md b/docs/content_management/field_types/field_type_reference/timefield.md
index 8fc0bd7916..80920354fc 100644
--- a/docs/content_management/field_types/field_type_reference/timefield.md
+++ b/docs/content_management/field_types/field_type_reference/timefield.md
@@ -30,9 +30,9 @@ It's also possible to directly pass an instance of `\DateTime`.
 
 The Value class of this field type contains the following properties:
 
-| Property | Type           | Description                                                                       |
-|----------|----------------|-----------------------------------------------------------------------------------|
-| `$time`  | `integer|null` | Holds the time information as a number of seconds since the beginning of the day. |
+| Property | Type                | Description                                                                       |
+|----------|---------------------|-----------------------------------------------------------------------------------|
+| `$time`  | `integer` or `null` | Holds the time information as a number of seconds since the beginning of the day. |
 
 ##### Constructor
 
diff --git a/docs/content_management/field_types/field_type_reference/userfield.md b/docs/content_management/field_types/field_type_reference/userfield.md
index 7fb1e258e0..3dc808c78f 100644
--- a/docs/content_management/field_types/field_type_reference/userfield.md
+++ b/docs/content_management/field_types/field_type_reference/userfield.md
@@ -13,7 +13,7 @@ This field type validates and stores information about a user.
 | Property           | Type      | Description                                                                                                                                      | Example                                           |
 |--------------------|-----------|--------------------------------------------------------------------------------------------------------------------------------------------------|---------------------------------------------------|
 | `hasStoredLogin`   | `boolean` | Denotes if user has stored login.                                                                                                                | `true`                                            |
-| `contentId`        | `int      | string`                                                                                                                                          | ID of the content item corresponding to the user. |`42`|
+| `contentId`        | `int` or `string` | ID of the content item corresponding to the user. |`42`|
 | `login`            | `string`  | Username.                                                                                                                                        | `john`                                            |
 | `email`            | `string`  | The user's email address.                                                                                                                        | `john@smith.com`                                  |
 | `passwordHash`     | `string`  | Hash of the user's password.                                                                                                                     | `1234567890abcdef`                                |
diff --git a/docs/content_management/images/images.md b/docs/content_management/images/images.md
index fc58207a04..0716111318 100644
--- a/docs/content_management/images/images.md
+++ b/docs/content_management/images/images.md
@@ -168,19 +168,19 @@ If there is no configuration assigned to the `binary_handler`, the placeholder g
 
 ##### Configuration examples:
 
-**Example 1 - placeholders with basic information about original image**
+##### Example 1 - placeholders with basic information about original image
 
 ```yaml
 [[= include_file('code_samples/back_office/images/config/packages/images_basic.yaml') =]]
 ```
 
-**Example 2 - placeholders from remote source**
+##### Example 2 - placeholders from remote source
 
 ```yaml
 [[= include_file('code_samples/back_office/images/config/packages/images_remote.yaml') =]]
 ```
 
-**Example 3 - placeholders from live version of a site**
+##### Example 3 - placeholders from live version of a site
 
 ```yaml
 [[= include_file('code_samples/back_office/images/config/packages/images_live.yaml') =]]
diff --git a/docs/infrastructure_and_maintenance/cache/persistence_cache.md b/docs/infrastructure_and_maintenance/cache/persistence_cache.md
index 4b34d52a2d..f33fc1dd7e 100644
--- a/docs/infrastructure_and_maintenance/cache/persistence_cache.md
+++ b/docs/infrastructure_and_maintenance/cache/persistence_cache.md
@@ -54,7 +54,7 @@ Use of Redis as shared cache back end is a requirement for use in clustering set
 For an overview of this feature, see [Clustering](clustering.md).
 Filesystem adapters, for example, are **not** intended to be used over a shared filesystem.
 
-**Cache service**
+### Cache service
 
 The underlying cache system is exposed as an `ibexa.cache_pool` service, and can be reused by any other service as described in the [Using Cache service](#using-cache-service) section.
 
diff --git a/docs/permissions/policies.md b/docs/permissions/policies.md
index 723b90d4f9..4bc5eb5cd3 100644
--- a/docs/permissions/policies.md
+++ b/docs/permissions/policies.md
@@ -34,20 +34,20 @@ Each role you assign to user or user group consists of policies which define, wh
 
 | Module                              | Function               | Effect                 | Possible Limitations |
 |-------------------------------------|------------------------|------------------------|----------------------|
-| <nobr>`action_configuration`</nobr> | <nobr>`view`</nobr>    | view AI Action         |
-|                                     | <nobr>`create`</nobr>  | create a new AI action |
-|                                     | <nobr>`edit`</nobr>    | edit an AI action      |
-|                                     | <nobr>`delete`</nobr>  | delete an AI action    |
-|                                     | <nobr>`execute`</nobr> | execute an AI action   |
+| <nobr>`action_configuration`</nobr> | <nobr>`view`</nobr>    | view AI Action         |                      |
+|                                     | <nobr>`create`</nobr>  | create a new AI action |                      |
+|                                     | <nobr>`edit`</nobr>    | edit an AI action      |                      |
+|                                     | <nobr>`delete`</nobr>  | delete an AI action    |                      |
+|                                     | <nobr>`execute`</nobr> | execute an AI action   |                      |
 
 #### Customer groups
 
 | Module                        | Function              | Effect                  | Possible limitations |
 |-------------------------------|-----------------------|-------------------------|----------------------|
-| <nobr>`customer_group`</nobr> | <nobr>`create`</nobr> | create a customer group |
-|                               | <nobr>`delete`</nobr> | delete a customer group |
-|                               | <nobr>`edit`</nobr>   | edit a customer group   |
-|                               | <nobr>`view`</nobr>   | view customer groups    |
+| <nobr>`customer_group`</nobr> | <nobr>`create`</nobr> | create a customer group |                      |
+|                               | <nobr>`delete`</nobr> | delete a customer group |                      |
+|                               | <nobr>`edit`</nobr>   | edit a customer group   |                      |
+|                               | <nobr>`view`</nobr>   | view customer groups    |                      |
 
 #### Personalization
 
@@ -60,43 +60,43 @@ Each role you assign to user or user group consists of policies which define, wh
 
 | Module              | Function              | Effect                                                                     | Possible limitations |
 |---------------------|-----------------------|----------------------------------------------------------------------------|----------------------|
-| <nobr>`role`</nobr> | <nobr>`assign`</nobr> | assign roles to users and user groups                                      |
-|                     | <nobr>`create`</nobr> | create new roles                                                           |
-|                     | <nobr>`delete`</nobr> | delete roles                                                               |
-|                     | <nobr>`read`</nobr>   | view the roles list in Admin. Required for all other role-related policies |
-|                     | <nobr>`update`</nobr> | modify existing roles                                                      |
+| <nobr>`role`</nobr> | <nobr>`assign`</nobr> | assign roles to users and user groups                                      |                      |
+|                     | <nobr>`create`</nobr> | create new roles                                                           |                      |
+|                     | <nobr>`delete`</nobr> | delete roles                                                               |                      |
+|                     | <nobr>`read`</nobr>   | view the roles list in Admin. Required for all other role-related policies |                      |
+|                     | <nobr>`update`</nobr> | modify existing roles                                                      |                      |
 
 #### Setup
 
-| Module               | Function                    | Effect                                   | Possible limitations |
-|----------------------|-----------------------------|------------------------------------------|----------------------|
-| <nobr>`setup`</nobr> | <nobr>`administrate`</nobr> | access Admin                             |
-|                      | <nobr>`install`</nobr>      | unused                                   |
-|                      | <nobr>`setup`</nobr>        | unused                                   |
-|                      | <nobr>`system_info`</nobr>  | view the **System Information** tab in Admin |
+| Module               | Function                    | Effect                                       | Possible limitations |
+|----------------------|-----------------------------|----------------------------------------------|----------------------|
+| <nobr>`setup`</nobr> | <nobr>`administrate`</nobr> | access Admin                                 |                      |
+|                      | <nobr>`install`</nobr>      | unused                                       |                      |
+|                      | <nobr>`setup`</nobr>        | unused                                       |                      |
+|                      | <nobr>`system_info`</nobr>  | view the **System Information** tab in Admin |                      |
 
 #### Sites [[% include 'snippets/experience_badge.md' %]] [[% include 'snippets/commerce_badge.md' %]]
 
 | Module              | Function                     | Effect                                                                                                | Possible limitations |
 |---------------------|------------------------------|-------------------------------------------------------------------------------------------------------|----------------------|
-| <nobr>`site`</nobr> | <nobr>`change_status`</nobr> | change status of the public accesses of sites to <nobr>`Live` or `Offline`</nobr> in the Site Factory |
-|                     | <nobr>`create`</nobr>        | create sites in the Site Factory                                                                      |
-|                     | <nobr>`delete`</nobr>        | delete sites from the Site Factory                                                                    |
-|                     | <nobr>`edit`</nobr>          | edit sites in the Site Factory                                                                        |
-|                     | <nobr>`update`</nobr>        | update sites in the Site Factory                                                                      |
-|                     | <nobr>`view`</nobr>          | view the "Sites" in the top navigation                                                                |
+| <nobr>`site`</nobr> | <nobr>`change_status`</nobr> | change status of the public accesses of sites to <nobr>`Live` or `Offline`</nobr> in the Site Factory |                      |
+|                     | <nobr>`create`</nobr>        | create sites in the Site Factory                                                                      |                      |
+|                     | <nobr>`delete`</nobr>        | delete sites from the Site Factory                                                                    |                      |
+|                     | <nobr>`edit`</nobr>          | edit sites in the Site Factory                                                                        |                      |
+|                     | <nobr>`update`</nobr>        | update sites in the Site Factory                                                                      |                      |
+|                     | <nobr>`view`</nobr>          | view the "Sites" in the top navigation                                                                |                      |
 
 #### Users
 
 | Module              | Function                   | Effect                                            | Possible limitations |
 |---------------------|----------------------------|---------------------------------------------------|----------------------|
-| <nobr>`user`</nobr> | <nobr>`activation`</nobr>  | unused                                            |
-|                     | <nobr>`invite`</nobr>      | create and send invitations to create an account  |
-|                     | <nobr>`login`</nobr>       | log in to the application                         |
-|                     | <nobr>`password`</nobr>    | unused                                            |
-|                     | <nobr>`preferences`</nobr> | access and set user preferences                   |
-|                     | <nobr>`register`</nobr>    | register using the <nobr>`/register`</nobr> route |
-|                     | <nobr>`selfedit`</nobr>    | unused                                            |
+| <nobr>`user`</nobr> | <nobr>`activation`</nobr>  | unused                                            |                      |
+|                     | <nobr>`invite`</nobr>      | create and send invitations to create an account  |                      |
+|                     | <nobr>`login`</nobr>       | log in to the application                         |                      |
+|                     | <nobr>`password`</nobr>    | unused                                            |                      |
+|                     | <nobr>`preferences`</nobr> | access and set user preferences                   |                      |
+|                     | <nobr>`register`</nobr>    | register using the <nobr>`/register`</nobr> route |                      |
+|                     | <nobr>`selfedit`</nobr>    | unused                                            |                      |
 
 ### Commerce
 
@@ -113,17 +113,17 @@ Each role you assign to user or user group consists of policies which define, wh
 
 | Module                  | Function              | Effect                                                              | Possible limitations |
 |-------------------------|-----------------------|---------------------------------------------------------------------|----------------------|
-| <nobr>`checkout`</nobr> | <nobr>`create`</nobr> | create new checkout, for example, after workflow fails to complete  |
-|                         | <nobr>`delete`</nobr> | delete checkout, for example, after workflow completes successfully |
-|                         | <nobr>`update`</nobr> | change currency, quantity                                           |
-|                         | <nobr>`view`</nobr>   | access checkout                                                     |
+| <nobr>`checkout`</nobr> | <nobr>`create`</nobr> | create new checkout, for example, after workflow fails to complete  |                      |
+|                         | <nobr>`delete`</nobr> | delete checkout, for example, after workflow completes successfully |                      |
+|                         | <nobr>`update`</nobr> | change currency, quantity                                           |                      |
+|                         | <nobr>`view`</nobr>   | access checkout                                                     |                      |
 
 #### Currencies and regions
 
 | Module                  | Function                | Effect            | Possible limitations |
 |-------------------------|-------------------------|-------------------|----------------------|
-| <nobr>`commerce`</nobr> | <nobr>`currency`</nobr> | manage currencies |
-|                         | <nobr>`region`</nobr>   | manage regions    |
+| <nobr>`commerce`</nobr> | <nobr>`currency`</nobr> | manage currencies |                      |
+|                         | <nobr>`region`</nobr>   | manage regions    |                      |
 
 #### Discounts [[% include 'snippets/commerce_badge.md' %]]
 
@@ -166,10 +166,10 @@ The [discount](discounts.md) policies decide which actions can be executed by gi
 
 | Module                        | Function              | Effect                  | Possible limitations |
 |-------------------------------|-----------------------|-------------------------|----------------------|
-| <nobr>`payment_method`</nobr> | <nobr>`create`</nobr> | create a payment method |
-|                               | <nobr>`delete`</nobr> | delete a payment method |
-|                               | <nobr>`edit`</nobr>   | modify a payment method |
-|                               | <nobr>`view`</nobr>   | view payment methods    |
+| <nobr>`payment_method`</nobr> | <nobr>`create`</nobr> | create a payment method |                      |
+|                               | <nobr>`delete`</nobr> | delete a payment method |                      |
+|                               | <nobr>`edit`</nobr>   | modify a payment method |                      |
+|                               | <nobr>`view`</nobr>   | view payment methods    |                      |
 
 #### Segments [[% include 'snippets/commerce_badge.md' %]]
 
@@ -185,10 +185,10 @@ The [discount](discounts.md) policies decide which actions can be executed by gi
 
 | Module                       | Function              | Effect                         | Possible limitations |
 |------------------------------|-----------------------|--------------------------------|----------------------|
-| <nobr>`segment_group`</nobr> | <nobr>`create`</nobr> | create segment groups          |
-|                              | <nobr>`read`</nobr>   | load segment group information |
-|                              | <nobr>`remove`</nobr> | remove segment groups          |
-|                              | <nobr>`update`</nobr> | update segment groups          |
+| <nobr>`segment_group`</nobr> | <nobr>`create`</nobr> | create segment groups          |                      |
+|                              | <nobr>`read`</nobr>   | load segment group information |                      |
+|                              | <nobr>`remove`</nobr> | remove segment groups          |                      |
+|                              | <nobr>`update`</nobr> | update segment groups          |                      |
 
 #### Shipments [[% include 'snippets/commerce_badge.md' %]]
 
@@ -203,10 +203,10 @@ The [discount](discounts.md) policies decide which actions can be executed by gi
 
 | Module                         | Function              | Effect                   | Possible limitations |
 |--------------------------------|-----------------------|--------------------------|----------------------|
-| <nobr>`shipping_method`</nobr> | <nobr>`create`</nobr> | create a shipping method |
-|                                | <nobr>`delete`</nobr> | delete a shipping method |
-|                                | <nobr>`update`</nobr> | modify a shipping method |
-|                                | <nobr>`view`</nobr>   | view shipping methods    |
+| <nobr>`shipping_method`</nobr> | <nobr>`create`</nobr> | create a shipping method |                      |
+|                                | <nobr>`delete`</nobr> | delete a shipping method |                      |
+|                                | <nobr>`update`</nobr> | modify a shipping method |                      |
+|                                | <nobr>`view`</nobr>   | view shipping methods    |                      |
 
 #### Shopping lists [[% include 'snippets/lts-update_badge.md' %]] [[% include 'snippets/commerce_badge.md' %]]
 
@@ -223,22 +223,22 @@ The [discount](discounts.md) policies decide which actions can be executed by gi
 
 | Module                 | Function                          | Effect                                                                                                                                  | Possible limitations                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    |
 |------------------------|-----------------------------------|-----------------------------------------------------------------------------------------------------------------------------------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| <nobr>`content`</nobr> | <nobr>`cleantrash`</nobr>         | empty the Trash (even when the User doesn't have access to individual content items)                                                   |
+| <nobr>`content`</nobr> | <nobr>`cleantrash`</nobr>         | empty the Trash (even when the User doesn't have access to individual content items)                                                   | |
 |                        | <nobr>`create`</nobr>             | create new content. Note: even without this policy the user is able to enter edit mode, but cannot finalize work with the content item. | [Content type](limitation_reference.md#content-type-limitation)</br>[Section](limitation_reference.md#section-limitation)</br>[Location](limitation_reference.md#location-limitation)</br>[Subtree](limitation_reference.md#subtree-limitation)</br>[Language](limitation_reference.md#language-limitation)</br>[Owner of Parent](limitation_reference.md#owner-of-parent-limitation)</br>[Content type Group of Parent](limitation_reference.md#content-type-group-of-parent-limitation)</br>[Content type of Parent](limitation_reference.md#content-type-of-parent-limitation)</br>[Parent Depth](limitation_reference.md#parent-depth-limitation)</br>[Field Group](limitation_reference.md#field-group-limitation)</br>[Change Owner](limitation_reference.md#change-owner-limitation)             |
-|                        | <nobr>`diff`</nobr>               | unused                                                                                                                                  |
+|                        | <nobr>`diff`</nobr>               | unused                                                                                                                                  | |
 |                        | <nobr>`edit`</nobr>               | edit existing content                                                                                                                   | [Content type](limitation_reference.md#content-type-limitation)</br>[Section](limitation_reference.md#section-limitation)</br>[Owner](limitation_reference.md#owner-limitation)</br>[Content type Group](limitation_reference.md#content-type-group-limitation)</br>[Location](limitation_reference.md#location-limitation)</br>[Subtree](limitation_reference.md#subtree-limitation)</br>[Language](limitation_reference.md#language-limitation)</br>[Object State](limitation_reference.md#object-state-limitation)</br>[Workflow Stage](limitation_reference.md#workflow-stage-limitation)</br>[Field Group](limitation_reference.md#field-group-limitation)</br>[Version Lock](limitation_reference.md#version-lock-limitation)</br>[Change Owner](limitation_reference.md#change-owner-limitation) |
 |                        | <nobr>`hide`</nobr>               | hide and reveal content locations                                                                                                       | [Content type](limitation_reference.md#content-type-limitation)</br>[Section](limitation_reference.md#section-limitation)</br>[Owner](limitation_reference.md#owner-limitation)</br>[Content type Group](limitation_reference.md#content-type-group-limitation)</br>[Location](limitation_reference.md#location-limitation)</br>[Subtree](limitation_reference.md#subtree-limitation)</br>[Language](limitation_reference.md#language-limitation)                                                                                                                                                                                                                                                                                                                                                       |
 |                        | <nobr>`manage_locations`</nobr>   | remove locations and send content to Trash                                                                                              | [Content type](limitation_reference.md#content-type-limitation)</br>[Section](limitation_reference.md#section-limitation)</br>[Owner](limitation_reference.md#owner-limitation)</br>[Subtree](limitation_reference.md#subtree-limitation)</br>[Object State](limitation_reference.md#object-state-limitation)                                                                                                                                                                                                                                                                                                                                                                                                                                                                                           |
-|                        | <nobr>`pendinglist`</nobr>        | unused                                                                                                                                  |
+|                        | <nobr>`pendinglist`</nobr>        | unused                                                                                                                                  | |
 |                        | <nobr>`publish`</nobr>            | publish content. Without this Policy, the User can only save drafts or send them for review (in [[= product_name_exp =]])               | [Content type](limitation_reference.md#content-type-limitation)</br>[Section](limitation_reference.md#section-limitation)</br>[Owner](limitation_reference.md#owner-limitation)</br>[Content type Group](limitation_reference.md#content-type-group-limitation)</br>[Location](limitation_reference.md#location-limitation)</br>[Subtree](limitation_reference.md#subtree-limitation)</br>[Language](limitation_reference.md#language-limitation)</br>[Object State](limitation_reference.md#object-state-limitation)</br>[Workflow Stage](limitation_reference.md#workflow-stage-limitation)                                                                                                                                                                                                           |
 |                        | <nobr>`read`</nobr>               | view the content both in front and back end                                                                                             | [Content type](limitation_reference.md#content-type-limitation)</br>[Section](limitation_reference.md#section-limitation)</br>[Owner](limitation_reference.md#owner-limitation)</br>[Content type Group](limitation_reference.md#content-type-group-limitation)</br>[Location](limitation_reference.md#location-limitation)</br>[Subtree](limitation_reference.md#subtree-limitation)</br>[Object State](limitation_reference.md#object-state-limitation)                                                                                                                                                                                                                                                                                                                                               |
 |                        | <nobr>`remove`</nobr>             | remove locations and send content to Trash                                                                                              | [Content type](limitation_reference.md#content-type-limitation)</br>[Section](limitation_reference.md#section-limitation)</br>[Owner](limitation_reference.md#owner-limitation)</br>[Location](limitation_reference.md#location-limitation)</br>[Subtree](limitation_reference.md#subtree-limitation)</br>[Object State](limitation_reference.md#object-state-limitation)</br>[Language](limitation_reference.md#language-limitation)                                                                                                                                                                                                                                                                                                                                                                   |
-|                        | <nobr>`restore`</nobr>            | restore content from Trash                                                                                                              |
+|                        | <nobr>`restore`</nobr>            | restore content from Trash                                                                                                              | |
 |                        | <nobr>`reverserelatedlist`</nobr> | see all content that a content item relates to (even when the User isn't allowed to view it as an individual content items)            | [Content type](limitation_reference.md#content-type-limitation)</br>[Section](limitation_reference.md#section-limitation)</br>                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          |
 |                        | <nobr>`translate`</nobr>          | unused                                                                                                                                  | [Content type](limitation_reference.md#content-type-limitation)</br>[Section](limitation_reference.md#section-limitation)</br>[Owner](limitation_reference.md#owner-limitation)</br>[Location](limitation_reference.md#location-limitation)</br>[Subtree](limitation_reference.md#subtree-limitation)</br>[Language](limitation_reference.md#language-limitation)                                                                                                                                                                                                                                                                                                                                                                                                                                       |
-|                        | <nobr>`translations`</nobr>       | manage the language list in Admin                                                                                                       |
+|                        | <nobr>`translations`</nobr>       | manage the language list in Admin                                                                                                       ||
 |                        | <nobr>`unlock`</nobr>             | unlock drafts locked to a user for performing actions                                                                                   | [Owner](limitation_reference.md#owner-limitation)</br>[Content type Group](limitation_reference.md#content-type-group-limitation)</br>[Subtree](limitation_reference.md#subtree-limitation)</br>[Language](limitation_reference.md#language-limitation)</br>[Version Lock](limitation_reference.md#version-lock-limitation)                                                                                                                                                                                                                                                                                                                                                                                                                                                                             |
-|                        | <nobr>`urltranslator`</nobr>      | manage URL aliases of a content item                                                                                                    |
+|                        | <nobr>`urltranslator`</nobr>      | manage URL aliases of a content item                                                                                                    | |
 |                        | <nobr>`versionread`</nobr>        | view content after publishing, and to preview any content in the Site mode                                                              | [Content type](limitation_reference.md#content-type-limitation)</br>[Section](limitation_reference.md#section-limitation)</br>[Owner](limitation_reference.md#owner-limitation)</br>Status</br>[Location](limitation_reference.md#location-limitation)</br>[Subtree](limitation_reference.md#subtree-limitation)</br>[Object State](limitation_reference.md#object-state-limitation)                                                                                                                                                                                                                                                                                                                                                                                                                    |
 |                        | <nobr>`versionremove`</nobr>      | remove archived content versions                                                                                                        | [Content type](limitation_reference.md#content-type-limitation)</br>[Section](limitation_reference.md#section-limitation)</br>[Owner](limitation_reference.md#owner-limitation)</br>Status</br>[Location](limitation_reference.md#location-limitation)</br>[Subtree](limitation_reference.md#subtree-limitation)</br>[Object State](limitation_reference.md#object-state-limitation)                                                                                                                                                                                                                                                                                                                                                                                                                    |
 |                        | <nobr>`view_embed`</nobr>         | view content embedded in another content item (even when the User isn't allowed to view it as an individual content item)              | [Content type](limitation_reference.md#content-type-limitation)</br>[Section](limitation_reference.md#section-limitation)</br>[Owner](limitation_reference.md#owner-limitation)</br>[Location](limitation_reference.md#location-limitation)</br>[Subtree](limitation_reference.md#subtree-limitation)                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                   |
@@ -248,45 +248,45 @@ The [discount](discounts.md) policies decide which actions can be executed by gi
 | Module               | Function              | Effect                                                                   | Possible limitations |
 |----------------------|-----------------------|--------------------------------------------------------------------------|----------------------|
 | <nobr>`content`</nobr> | <nobr>`share`</nobr> | share content drafts with internal and external users through [collaborative editing](collaborative_editing.md)    |[Owner](limitation_reference.md#collaborative-editing-owner-limitation)</br>[PublicLink](limitation_reference.md#collaborative-editing-publiclink-limitation)</br>[Scope](limitation_reference.md#collaborative-editing-scope-limitation) |
-| <nobr>`rte`</nobr> | <nobr>`edit`</nobr> | use [Real-time editing](collaborative_editing_guide.md#real-time-editing)    |
+| <nobr>`rte`</nobr> | <nobr>`edit`</nobr> | use [Real-time editing](collaborative_editing_guide.md#real-time-editing)    |                      |
 
 
 #### Content types
 
 | Module               | Function              | Effect                                                                   | Possible limitations |
 |----------------------|-----------------------|--------------------------------------------------------------------------|----------------------|
-| <nobr>`class`</nobr> | <nobr>`create`</nobr> | create new content types. Also required to edit exiting content types    |
-|                      | <nobr>`delete`</nobr> | delete content types                                                     |
-|                      | <nobr>`update`</nobr> | modify existing content types. Also required to create new content types |
+| <nobr>`class`</nobr> | <nobr>`create`</nobr> | create new content types. Also required to edit exiting content types    |                      |
+|                      | <nobr>`delete`</nobr> | delete content types                                                     |                      |
+|                      | <nobr>`update`</nobr> | modify existing content types. Also required to create new content types |                      |
 
 #### Sections
 
 | Module                 | Function              | Effect                                                                           | Possible limitations                                                                                                                                                                                                                              |
 |------------------------|-----------------------|----------------------------------------------------------------------------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
 | <nobr>`section`</nobr> | <nobr>`assign`</nobr> | assign Sections to content                                                       | [content type](limitation_reference.md#content-type-limitation)</br>[Section](limitation_reference.md#section-limitation)</br>[Owner](limitation_reference.md#owner-limitation)</br>[New Section](limitation_reference.md#new-section-limitation) |
-|                        | <nobr>`edit`</nobr>   | edit existing Sections and create new ones                                       |
-|                        | <nobr>`view`</nobr>   | view the Sections list in Admin. Required for all other section-related policies |
+|                        | <nobr>`edit`</nobr>   | edit existing Sections and create new ones                                       | |
+|                        | <nobr>`view`</nobr>   | view the Sections list in Admin. Required for all other section-related policies | |
 
 #### Object States
 
 | Module               | Function                    | Effect                                | Possible limitations                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    |
 |----------------------|-----------------------------|---------------------------------------|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
 | <nobr>`state`</nobr> | <nobr>`assign`</nobr>       | assign object states to content items | [Content type](limitation_reference.md#content-type-limitation)</br>[Section](limitation_reference.md#section-limitation)</br>[Owner](limitation_reference.md#owner-limitation)</br>[Content type Group](limitation_reference.md#content-type-group-limitation)</br>[Location](limitation_reference.md#location-limitation)</br>[Subtree](limitation_reference.md#subtree-limitation)</br>[Object State](limitation_reference.md#object-state-limitation)</br>[New State](limitation_reference.md#new-state-limitation) |
-|                      | <nobr>`administrate`</nobr> | view, add and edit object states      |
+|                      | <nobr>`administrate`</nobr> | view, add and edit object states      | |
 
 #### Taxonomy
 
 | Module                  | Function              | Effect                        | Possible limitations |
 |-------------------------|-----------------------|-------------------------------|----------------------|
-| <nobr>`taxonomy`</nobr> | <nobr>`assign`</nobr> | tag or untag content          |
-|                         | <nobr>`manage`</nobr> | create, edit, and delete tags |
-|                         | <nobr>`read`</nobr>   | view the Taxonomy interface   |
+| <nobr>`taxonomy`</nobr> | <nobr>`assign`</nobr> | tag or untag content          |                      |
+|                         | <nobr>`manage`</nobr> | create, edit, and delete tags |                      |
+|                         | <nobr>`read`</nobr>   | view the Taxonomy interface   |                      |
 
 #### Workflow and version comparison
 
 | Module                    | Function                    | Effect                                 | Possible limitations                                                          |
 |---------------------------|-----------------------------|----------------------------------------|-------------------------------------------------------------------------------|
-| <nobr>`comparison`</nobr> | <nobr>`view`</nobr>         | view version comparison                |
+| <nobr>`comparison`</nobr> | <nobr>`view`</nobr>         | view version comparison                |                                                                               |
 | <nobr>`workflow`</nobr>   | <nobr>`change_stage`</nobr> | change stage in the specified workflow | [Workflow Transition](limitation_reference.md#workflow-transition-limitation) |
 
 ### Product catalog
@@ -295,10 +295,10 @@ The [discount](discounts.md) policies decide which actions can be executed by gi
 
 | Module                 | Function              | Effect           | Possible limitations |
 |------------------------|-----------------------|------------------|----------------------|
-| <nobr>`catalog`</nobr> | <nobr>`create`</nobr> | create a catalog |
-|                        | <nobr>`delete`</nobr> | delete a catalog |
-|                        | <nobr>`edit`</nobr>   | edit a catalog   |
-|                        | <nobr>`view`</nobr>   | view catalogs    |
+| <nobr>`catalog`</nobr> | <nobr>`create`</nobr> | create a catalog |                      |
+|                        | <nobr>`delete`</nobr> | delete a catalog |                      |
+|                        | <nobr>`edit`</nobr>   | edit a catalog   |                      |
+|                        | <nobr>`view`</nobr>   | view catalogs    |                      |
 
 #### Products
 
diff --git a/docs/search/criteria_reference/search_criteria_reference.md b/docs/search/criteria_reference/search_criteria_reference.md
index 2e73e8724c..0a6638217c 100644
--- a/docs/search/criteria_reference/search_criteria_reference.md
+++ b/docs/search/criteria_reference/search_criteria_reference.md
@@ -60,7 +60,7 @@ Due to this storage limitation, searching content using the Country field type o
 | [ObjectStateId](objectstateid_criterion.md)                   | Object state ID                                                                             | &#10004;       | &#10004;        | &#10004;  |          |
 | [ObjectStateIdentifier](objectstateidentifier_criterion.md)   | Object state Identifier                                                                     | &#10004;       | &#10004;        | &#10004;  |          |
 | [ParentLocationId](parentlocationid_criterion.md)             | Location ID of a content item's parent                                                      | &#10004;       | &#10004;        | &#10004;  |          |
-| [ParentLocationRemoteId](parentlocationremoteId_criterion.md) | Location remote ID of a content item's parent                                               | &#10004;       | &#10004;        |           |
+| [ParentLocationRemoteId](parentlocationremoteId_criterion.md) | Location remote ID of a content item's parent                                               | &#10004;       | &#10004;        |           |          |
 | [Priority](priority_criterion.md)                             | Location priority                                                                           |                | &#10004;        | &#10004;  |          |
 | [RemoteId](remoteid_criterion.md)                             | Remote content ID                                                                           | &#10004;       | &#10004;        | &#10004;  |          |
 | [SectionId](sectionid_criterion.md)                           | ID of the Section content is assigned to                                                    | &#10004;       | &#10004;        | &#10004;  | &#10004; |
diff --git a/docs/search/search_engines/elasticsearch/elasticsearch_overview.md b/docs/search/search_engines/elasticsearch/elasticsearch_overview.md
index 8902ba97f0..3951aad368 100644
--- a/docs/search/search_engines/elasticsearch/elasticsearch_overview.md
+++ b/docs/search/search_engines/elasticsearch/elasticsearch_overview.md
@@ -17,7 +17,7 @@ Thanks to this mechanism, it's able to achieve fast response.
 For a detailed description of advanced settings that you might require in a specific production environment, see the documentation provided by Elastic.
 Start with the [Set up Elasticsearch](https://www.elastic.co/guide/en/elasticsearch/reference/8.19/setup.html) section.
 
-**Prerequisite**
+## Prerequisite
 
 To proceed you need to be familiar with how indexing, filtering and queries work.
 
diff --git a/docs/templating/urls_and_routes/custom_breadcrumbs.md b/docs/templating/urls_and_routes/custom_breadcrumbs.md
index 3da8df6e42..7e35dfbae0 100644
--- a/docs/templating/urls_and_routes/custom_breadcrumbs.md
+++ b/docs/templating/urls_and_routes/custom_breadcrumbs.md
@@ -22,7 +22,7 @@ Both `breadcrumb_path` and `breadcrumb_names` must be configured for the breadcr
 |Option|Description|
 |--- |--- |
 |`breadcrumb_path`|Valid route identifier which exists in at least one of the routing YAML files.|
-|`breadcrumb_names`|Name for the breadcrumb element. If the translation isn't set, there is a fallback to route translation.</br>In the example above if the `Blog List` key has no translation, the fallback key is `custom_blog_index|breadcrumb`.|
+|`breadcrumb_names`|Name for the breadcrumb element. If the translation isn't set, there is a fallback to route translation.</br>In the example above if the `Blog List` key has no translation, the fallback key is <code>custom_blog_index &#124; breadcrumb</code>.|
 
 ### Multi-part routes
 
diff --git a/docs/update_and_migration/migrate_to_ibexa_dxp/migrating_from_ez_publish_platform.md b/docs/update_and_migration/migrate_to_ibexa_dxp/migrating_from_ez_publish_platform.md
index c90101af41..08ab4fcb64 100644
--- a/docs/update_and_migration/migrate_to_ibexa_dxp/migrating_from_ez_publish_platform.md
+++ b/docs/update_and_migration/migrate_to_ibexa_dxp/migrating_from_ez_publish_platform.md
@@ -427,9 +427,11 @@ Once you have fixed all the dump files in `ezxmltext-export/`, you may skip the
 
 `php -d memory_limit=1536M bin/console ezxmltext:import-xml --export-dir=ezxmltext-export -v`
 
+##### Typical problems
+
 Typical problems that needs manual fixing:
 
-**Duplicate XHTML IDs**
+###### Duplicate XHTML ID
 
 XHTML IDs needs to be unique. The following `ezxmltext` results in a warning:
 
@@ -445,7 +447,7 @@ XHTML IDs needs to be unique. The following `ezxmltext` results in a warning:
 The conversion tool replaces the duplicate id (`inv5`) with a random value. If you need the ID value to match your CSS, you need to change it manually.
 The conversion tool also complains about IDs which contain invalid characters.
 
-**Links with non-existing `object_remote_id` or `node_remote_id`.**
+###### Links with non-existing `object_remote_id` or `node_remote_id`
 
 In `ezxmltext` you may have links which refer to other objects by their remote ID. This isn't supported in `richtext`, so the conversion tool must look up such remote IDs and replace them with the `object_id` or `node_id`. If the conversion tool cannot find the object by its remote id, it issues a warning about it.
 
@@ -457,7 +459,7 @@ In older eZ Publish databases you may also have invalid links due to lack of ref
 
 When the conversion tool detects links with no reference it issues a warning and rewrite the URL to point to current page (`href="#"`).
 
-**`<literal>`**
+###### `<literal>`
 
 The `<literal>` tag isn't yet supported in eZ Platform.
 
@@ -465,7 +467,7 @@ When you're ready to migrate your eZ Publish XmlText content to the eZ Platform
 
 `php -d memory_limit=1536M bin/console ezxmltext:convert-to-richtext --export-dir=ezxmltext-export --export-dir-filter=notice,warning,error --concurrency 4 -v`
 
-**Custom tags and attributes**
+###### Custom tags and attributes
 
 eZ Platform now supports custom tags, including inline custom tags, and limited use of custom tag attributes.
 After migrating to RichText, you need to adapt your custom tag config for eZ Platform and rewrite the custom tags in Twig.
@@ -593,18 +595,16 @@ new EzSystems\EzFlowMigrationToolkitBundle\EzSystemsEzFlowMigrationToolkitBundle
 bin/console cache:clear
 ```
 
-**4.** Run the script with the following parameters:
+**4.** Run the script below with the following parameters:
 
 - absolute path of your legacy application
 - list of .ini files which define your legacy blocks
 
-**Script command**
-
 ``` bash
 bin/console ezflow:migrate <legacy path> —ini=<block definitions> [—ini=<another block definition> ...]
 ```
 
-**Example of the migration script command**
+Example usage:
 
 ``` bash
 bin/console ezflow:migrate /var/www/legacy.application.com/ —ini=extension/myapplication/settings/block.ini.append.php