diff --git a/docs/source/configuration/how-to.md b/docs/source/configuration/how-to.md
index 5d4eafd897..a1023c1837 100644
--- a/docs/source/configuration/how-to.md
+++ b/docs/source/configuration/how-to.md
@@ -20,7 +20,7 @@ then access any of its internal configuration to retrieve the configuration you
 like:
 
 ```js
-const absoluteUrl = `${config.settings.apiPath}/${content.url}`
+const absoluteUrl = `${config.settings.apiPath}/${content.url}`;
 ```
 
 Both the main project and individual add-ons can extend Volto's configuration registry.
@@ -150,3 +150,31 @@ export default function applyConfig(config) {
 
   return config;
 }
+```
+
+## `nonContentRoutes` and `nonContentRoutesPublic`
+
+`nonContentRoutes` is a list of routes reserved in Volto for its functionality as a content management system.
+These functions include user authentication and registration, changing settings through control panels, generating a site map, and other functions.
+Examples of these routes include `/login`, `/register`, and `/\/controlpanel\/.*$/`.
+Editors can't use them for content.
+The HTML attribute class value `cms-ui` is applied to members of `nonContentRoutes`.
+You can configure `nonContentRoutes` with either a regular expression or a string representing the end of the URI.
+
+`nonContentRoutesPublic` is a subset of `nonContentRoutes`.
+These routes are used for public sections of a Volto site that do not require authentication.
+This subset includes `/login`, `/search`, and `/sitemap`.
+
+The following example shows how to configure settings for `nonContentRoutes` and `nonContentRoutesPublic`.
+
+```js
+export default function applyConfig(config) {
+  config.settings = {
+    ...config.settings,
+    nonContentRoutes:[....],
+    nonContentRoutesPublic: [....]
+  };
+
+  return config;
+}
+```
diff --git a/docs/source/development/how-to-restrict-blocks.md b/docs/source/development/how-to-restrict-blocks.md
index 15fee224ed..ed274ee37b 100644
--- a/docs/source/development/how-to-restrict-blocks.md
+++ b/docs/source/development/how-to-restrict-blocks.md
@@ -22,12 +22,16 @@ The function has this signature:
     block: BlockConfigBase;
     navRoot: Content;
     contentType: string;
+    user: Object
   }) => boolean;
 }
 ```
 
-Where `properties` is the current object data and `block` is the block being evaluated in `BlockChooser`.
-`navRoot` is the nearest navigation root object and `contentType` is the current content type.
+`properties` is the current object data.
+`block` is the block being evaluated in `BlockChooser`.
+`navRoot` is the nearest navigation root object.
+`contentType` is the current content type.
+`user` is an object that represents the currently authenticated user.
 
 In the following configuration example, you can restrict a block so that it cannot be added unless the content type is `News Item` or the content item is in a specific path in the content tree (`/folder`):
 
diff --git a/docs/source/release-notes/index.md b/docs/source/release-notes/index.md
index 91db671d96..8a11d4dcff 100644
--- a/docs/source/release-notes/index.md
+++ b/docs/source/release-notes/index.md
@@ -17,6 +17,78 @@ myst:
 
 <!-- towncrier release notes start -->
 
+## 18.0.0-alpha.43 (2024-09-13)
+
+### Breaking
+
+- Move `Tags` component to the slot `belowContent`. @wesleybl [#6269](https://github.com/plone/volto/issues/6269)
+
+### Feature
+
+- Refactor AlbumView from class to functional component. @Tishasoumya-02 [#4077](https://github.com/plone/volto/issues/4077)
+- Add setting `unwantedControlPanelsFields` and use it in the function `filterControlPanelsSchema`. @wesleybl [#4819](https://github.com/plone/volto/issues/4819)
+- Refactor the `Register` component from class-based to functional. @Tishasoumya-02 [#4861](https://github.com/plone/volto/issues/4861)
+- Refactor Toolbar/More component from class to functional component. @Tishasoumya-02 [#4955](https://github.com/plone/volto/issues/4955)
+- Refactor Blocks/LeadImage/Edit component from class to functional component. @Tishasoumya-02 [#4959](https://github.com/plone/volto/issues/4959)
+- Refactor Blocks/Video/Edit component from class to functional component. @Tishasoumya-02 [#4960](https://github.com/plone/volto/issues/4960)
+- Refactor ControlPanel/Users/Aliases component , replacing class component lifecycle methods with functional hooks. @Tishasoumya-02 [#4985](https://github.com/plone/volto/issues/4985)
+- Refactor Controlpanel databaseInformation from class component to functional component. @Tishasoumya-02 [#4986](https://github.com/plone/volto/issues/4986)
+- Refactor ControlPanels/Groups RenderGroups from class components to functional component. @Tishasoumya-02 [#4993](https://github.com/plone/volto/issues/4993)
+- Refactor AddonsControlpanel from class to functional components. @Tishasoumya [#4995](https://github.com/plone/volto/issues/4995)
+- Refactor Preference/Change Password from class to functional component. @Tishasoumya-02 [#5044](https://github.com/plone/volto/issues/5044)
+- Refactor Preference/PersonalPreferences from class to functional component. @Tishasoumya-02 [#5045](https://github.com/plone/volto/issues/5045)
+- Refactor Preference/PersonalInformation from Class to Functional component. @Tishasoumya-02 [#5046](https://github.com/plone/volto/issues/5046)
+- Refactor Contents/ContentsUploadModal & Storybook-@Tishasoumya-02 [#5047](https://github.com/plone/volto/issues/5047)
+- Storybook test for ContentBreadcrumbs component. @Tishasoumya [#5048](https://github.com/plone/volto/issues/5048)
+- Storybook Actions component test. @Tishasoumya-02 [#5049](https://github.com/plone/volto/issues/5049)
+- Refactor Display from class to functional component. @Tishasoumya-02 [#5066](https://github.com/plone/volto/issues/5066)
+- Refactor `ReferenceWidget` from class-based to functional component. @Tishasoumya [#5093](https://github.com/plone/volto/issues/5093)
+- Refactor the table of contents block component from a class component to a functional component. @Prince0906 [#6167](https://github.com/plone/volto/issues/6167)
+- Improved URL regex to allow non-public or intranet URLs, such as `https://intranet/` or `file://server/share`. @mamico [#6186](https://github.com/plone/volto/issues/6186)
+- Refactor the `DatetimeWidget` component from a class component to a functional component. @Raman-Luhach [#6213](https://github.com/plone/volto/issues/6213)
+- The schema for the `ContentsPropertiesModal` can be enhanced using the `contentPropertiesSchemaEnhancer` setting.
+  Also, the properties form is now prepopulated with values if all selected items share the same value. @davisagli [#6248](https://github.com/plone/volto/issues/6248)
+- Pass the `user`, `navRoot` and `contentType` objects to the `restricted` function of the block settings. @wesleybl [#6264](https://github.com/plone/volto/issues/6264)
+
+### Bugfix
+
+- Fix search block showing no option select in sort on property @iRohitSingh [#5055](https://github.com/plone/volto/issues/5055)
+- Displays validation error messages on control panel forms. @wesleybl [#5274](https://github.com/plone/volto/issues/5274)
+- Fix `initialValue` block setting. @wesleybl [#5971](https://github.com/plone/volto/issues/5971)
+- When user changes location, set the `userSession.token` value based on cookie. This fixes the login status not being properly determined by the application. @tiberiu-ichim [#6071](https://github.com/plone/volto/issues/6071)
+- Fix `Teaser` block image override option to render external images and internal images pointing to image scales. @Tishasoumya-02 [#6147](https://github.com/plone/volto/issues/6147)
+- Add Cypress test for search block sort on property. @iRohitSingh [#6226](https://github.com/plone/volto/issues/6226)
+- Remove unused i18n message for SortOn component. @davisagli [#6230](https://github.com/plone/volto/issues/6230)
+- Return a 302 response for server-side rendering of the Link view for unauthenticated users. @davisagli [#6235](https://github.com/plone/volto/issues/6235)
+- Fix loading of .cjs in webpack. @davisagli [#6237](https://github.com/plone/volto/issues/6237)
+- fixed change of form.ui.hovered when editing blocks, because if you have a FormBlock component inside another one,
+  onMouseOver fires for all stacked blocks and you cannot use the nested form. @giuliaghisini [#6240](https://github.com/plone/volto/issues/6240)
+- Changed imports from relative to absolute to avoid type errors in add-on tests. @wesleybl [#6244](https://github.com/plone/volto/issues/6244)
+- In the URL Management control panel, allow external URLs as targets. @davisagli [#6247](https://github.com/plone/volto/issues/6247)
+- Disable save button when loading POST query @sabrina-bongiovanni [#6252](https://github.com/plone/volto/issues/6252)
+- Fix `TypeError: values[0] is undefined` in Contents properties modal. @davisagli [#6258](https://github.com/plone/volto/issues/6258)
+- Fix error in `SortOn` component when no sort is selected. @davisagli [#6273](https://github.com/plone/volto/issues/6273)
+- Place actions storybook in correct path. @Tishasoumya-02 [#6275](https://github.com/plone/volto/issues/6275)
+- Remove `Generate tabs for items other than folders` field from navigation control panel. @wesleybl [#6278](https://github.com/plone/volto/issues/6278)
+- Fix error rendering empty grid blocks. @MAX-786 [#6279](https://github.com/plone/volto/issues/6279)
+- Fixed instant error on click on an item of the "Order" tab @sneridagh [#6284](https://github.com/plone/volto/issues/6284)
+
+### Internal
+
+- Refactored the `SelectWidget` component to a functional component. @lorstenoplo [#5570](https://github.com/plone/volto/issues/5570)
+- Allow setting the language for `make backend-docker-start`. Default is `en`. Added usage documentation in Contributing > Develop Volto core, and reorganized it. Cleaned up Configuration > Multilingual. @stevepiercy [#6231](https://github.com/plone/volto/issues/6231)
+- Revert rename of `.gitkeep`. @stevepiercy [#6232](https://github.com/plone/volto/issues/6232)
+- Upgrade Cypress to 13.13.2. @wesleybl [#6241](https://github.com/plone/volto/issues/6241)
+- Complete upgrade Cypress to 13.13.2. Bump actions/upload-artifact@v1 to v4. @stevepiercy [#6242](https://github.com/plone/volto/issues/6242)
+- Add `make i18n` command. @Faakhir30 [#6274](https://github.com/plone/volto/issues/6274)
+- Update to Plone 6.0.13 @sneridagh [#6285](https://github.com/plone/volto/issues/6285)
+
+### Documentation
+
+- Fix redirect of link in documentation to testing Redux store blog post. @stevepiercy [#6239](https://github.com/plone/volto/issues/6239)
+- Fix redirect to Docker documentation. @stevepiercy [#6262](https://github.com/plone/volto/issues/6262)
+- Added upgrade guide notice about CookiePlone as the recommended way for generating projects and add-on boilerplate @sneridagh [#6286](https://github.com/plone/volto/issues/6286)
+
 ## 18.0.0-alpha.42 (2024-07-30)
 
 ### Breaking
diff --git a/docs/source/upgrade-guide/index.md b/docs/source/upgrade-guide/index.md
index b199673aea..e2bac7815c 100644
--- a/docs/source/upgrade-guide/index.md
+++ b/docs/source/upgrade-guide/index.md
@@ -40,7 +40,7 @@ For this purpose, we have developed a {ref}`new utility <upgrade-guide-new-depen
 It is mandatory that you run the utility to make Volto version 18.0.0-alpha.21 or later work in your projects.
 This opens the door to use {term}`pnpm` in projects, too, and other goodies.
 
-```{versionremoved} 18.0.0-alpha.33
+```{versionremoved} Volto 18.0.0-alpha.33
 The setting `config.settings.serverConfig.extractScripts.errorPages` has been removed.
 ```
 
@@ -52,7 +52,7 @@ This setting is no longer necessary.
 
 ### New dependencies synchronizer
 
-```{versionadded} 18.0.0-alpha.21
+```{versionadded} Volto 18.0.0-alpha.21
 ```
 
 ```{versionadded} @plone/scripts 3.6.1
@@ -450,6 +450,30 @@ schema: {
 The `Tags` component has been moved to the `belowContent` slot.
 It now receives the `content` property instead of the `tags` property.
 
+
+{upgrade-18-cookieplone-label}=
+
+### Cookieplone is now the recommended project and add-on generator for Volto 18
+
+```{versionadded} Volto 18.0.0-alpha.43
+```
+
+[Cookieplone](https://github.com/plone/cookieplone) is now the recommended way to develop Volto projects, using it as a boilerplate generator.
+Cookieplone uses the frontend code installed using `pnpm` instead of `yarn`.
+This affects the way that the Plone Release Team generates the Sponsored OSS Docker images, since they must be compatible with the `pnpm` setup.
+
+Since Volto `18.0.0-alpha.43`, the Docker image [`plone-frontend`](https://hub.docker.com/r/plone/plone-frontend) uses `pnpm`.
+
+For developers that won't migrate their boilerplate and code to the new setup with `pnpm` instead of `yarn`, the Release Team will generate a new Docker image named `plone-frontend:18-yarn` for the Volto 18 series of alpha releases.
+
+Support for `yarn` will be dropped in Volto 19.
+
+```{deprecated} Volto 18.0.0-alpha.43
+The `yarn`-based generator [`@plone/generator-volto`](https://www.npmjs.com/package/@plone/generator-volto) package and project boilerplates generated from it are deprecated and will not receive any further updates.
+The recommended way of generating a project boilerplate is [Cookieplone](https://github.com/plone/cookieplone).
+Please update your code to use the `pnpm` based setup.
+```
+
 (volto-upgrade-guide-17.x.x)=
 
 ## Upgrading to Volto 17.x.x
@@ -501,7 +525,7 @@ Upgrade your local dependencies in projects and add-ons by editing your {file}`p
 
 ### TypeScript support in Volto
 
-```{versionadded} 17.0.0-alpha.27
+```{versionadded} Volto 17.0.0-alpha.27
 ```
 
 We added full support of TypeScript in Volto core.
@@ -604,7 +628,7 @@ make develop
 
 ### Upgrade ESlint and use `@babel/eslint-parser`
 
-```{versionchanged} 17.0.0-alpha.27
+```{versionchanged} Volto 17.0.0-alpha.27
 ```
 
 ESlint uses a library to parse the language under analysis.
@@ -617,7 +641,7 @@ Once upgraded, run the linters again to make sure that your code is free of viol
 
 Technically not a breaking, the API nor the component contract has changed, but it's worth noting this change in here.
 
-```{versionadded} 17.0.0-alpha.1
+```{versionadded} Volto 17.0.0-alpha.1
 The `BlockChooser` component now uses `popperjs` library to position itself in the screen.
 It spawns at the end of the body instead of inner the block that called it.
 This is better from the UI point of view, since any other element can take precedence in the CSS element flow, preventing the block chooser to get overlapped by anything else.
@@ -675,7 +699,7 @@ Check the official [Cypress Migration Guide](https://docs.cypress.io/guides/refe
 
 ### New Image component
 
-```{versionadded} 17.0.0-alpha.21
+```{versionadded} Volto 17.0.0-alpha.21
 A new image component has been added to core to render optimized images.
 It requires the latest version of `plone.restapi` (>=8.42.0) installed in the backend to work properly.
 ```
@@ -727,11 +751,11 @@ From Volto 16.0.0-alpha.15 onwards, `volto-slate` is integrated into Volto core
 The previous text block `text` based on `draftJS` is now deprecated and is restricted (hidden) in Volto bootstrap.
 This is a major change and should be planned in advance before you install 16.0.0-alpha.15 or later.
 
-```{versionadded} 16.0.0-alpha.15
+```{versionadded} Volto 16.0.0-alpha.15
 `volto-slate` added to Volto core as the default text block.
 ```
 
-```{deprecated} 16.0.0-alpha.15
+```{deprecated} Volto 16.0.0-alpha.15
 `text` text block based on `draftJS` is now deprecated and will be removed from core in Volto 18.
 ```
 
@@ -825,7 +849,7 @@ Version 16 is recommended.
 
 ### Upgraded to Razzle 4
 
-```{versionadded} 16.0.0-alpha.38
+```{versionadded} Volto 16.0.0-alpha.38
 Volto has upgraded from Razzle 3 to Razzle 4.
 You should perform these steps in case you are upgrading to this version or above.
 ```
@@ -1128,7 +1152,7 @@ It maintains signature compatibility with `registry.resolve`, but introduces new
 
 See documentation for more information.
 
-````{versionchanged} 16.0.0-alpha.23
+````{versionchanged} Volto 16.0.0-alpha.23
 The `component` argument changed in 16.0.0-alpha.23.
 The `component` key has been flattened for simplification and now it's mapped directly to the `component` argument of `registerComponent`:
 
@@ -1207,7 +1231,7 @@ During the alpha stage, we received feedback and determined that it's too diffic
 We decided it is best to deal with it as any other schema field and enhance it via schema enhancers.
 This improves the developer experience, especially when dealing with variations that can provide their own styles and other schema fields.
 
-```{deprecated} 16.0.0-alpha.46
+```{deprecated} Volto 16.0.0-alpha.46
 The options `enableStyling` and `stylesSchema` no longer work.
 You need to provide them using your own block schema.
 If you are extending an existing one, you should add it as a normal `schemaEnhancer` modification.
@@ -1224,7 +1248,7 @@ Since then, the add-on story has improved.
 It now makes sense to extract this feature into its own add-on.
 Integrate Sentry in your app with [`@plone-collective/volto-sentry`](https://www.npmjs.com/package/@plone-collective/volto-sentry).
 
-```{versionchanged} 16.0.0.alpha.45
+```{versionchanged} Volto 16.0.0.alpha.45
 ```
 
 ### Upgrade `husky` to latest version
@@ -1245,7 +1269,7 @@ You can copy over the Volto ones (take a look in Volto's `.husky` folder).
 
 ### Better defaults handling
 
-````{versionadded} 16.0.0-alpha.51
+````{versionadded} Volto 16.0.0-alpha.51
 Prior to this version, we handled default values in schemas for blocks settings in a faulty and buggy manner.
 The state inferred was not deterministic and depended on the fields with defaults present.
 
@@ -1361,7 +1385,7 @@ A new `@root` alias has been set up to replace the `~` alias.
 Support for the `~` alias is still in place, but we now mark it as deprecated.
 The use of `~` will be removed in Volto 16.
 
-```{deprecated} 15.0
+```{deprecated} Volto 15.0
 ```
 
 ## Upgrading to Volto 14.x.x
diff --git a/packages/client/CHANGELOG.md b/packages/client/CHANGELOG.md
index b609e68f8e..37a57ad33b 100644
--- a/packages/client/CHANGELOG.md
+++ b/packages/client/CHANGELOG.md
@@ -8,6 +8,12 @@
 
 <!-- towncrier release notes start -->
 
+## 1.0.0-alpha.17 (2024-09-13)
+
+### Documentation
+
+- Add documentation about optional `token` parameter for `ploneClient` initialization. @MAX-786 [#6076](https://github.com/plone/volto/pull/6076)
+
 ## 1.0.0-alpha.16 (2024-06-06)
 
 ### Bugfix
diff --git a/packages/client/news/6076.documentation b/packages/client/news/6076.documentation
deleted file mode 100644
index 138045af4e..0000000000
--- a/packages/client/news/6076.documentation
+++ /dev/null
@@ -1 +0,0 @@
-Add documentation about optional `token` parameter for `ploneClient` initialization. @MAX-786
\ No newline at end of file
diff --git a/packages/client/package.json b/packages/client/package.json
index e3563d194d..2b9104397b 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -8,7 +8,7 @@
     }
   ],
   "license": "MIT",
-  "version": "1.0.0-alpha.16",
+  "version": "1.0.0-alpha.17",
   "repository": {
     "type": "git",
     "url": "git@github.com:plone/volto.git"
diff --git a/packages/volto-slate/CHANGELOG.md b/packages/volto-slate/CHANGELOG.md
index 554619a18d..c7e8ee3c2f 100644
--- a/packages/volto-slate/CHANGELOG.md
+++ b/packages/volto-slate/CHANGELOG.md
@@ -8,6 +8,12 @@
 
 <!-- towncrier release notes start -->
 
+## 18.0.0-alpha.18 (2024-09-13)
+
+### Feature
+
+- Pass `user`, `navRoot` and `contentType` objects to the `restricted` function of the block settings. @wesleybl [#6264](https://github.com/plone/volto/issues/6264)
+
 ## 18.0.0-alpha.17 (2024-07-05)
 
 ### Feature
diff --git a/packages/volto-slate/locales/pt_BR/LC_MESSAGES/volto.po b/packages/volto-slate/locales/pt_BR/LC_MESSAGES/volto.po
new file mode 100644
index 0000000000..867d80478b
--- /dev/null
+++ b/packages/volto-slate/locales/pt_BR/LC_MESSAGES/volto.po
@@ -0,0 +1,205 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: Plone\n"
+"POT-Creation-Date: 2022-07-20T12:45:09.681Z\n"
+"PO-Revision-Date: \n"
+"Last-Translator: Érico Andrei <ericof@plone.org>\n"
+"Language-Team: Plone i18n <plone-i18n@lists.sourceforge.net>\n"
+"Language: pt_BR\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+"Language-Code: en\n"
+"Language-Name: English\n"
+"Preferred-Encodings: utf-8\n"
+"Domain: volto\n"
+"X-Generator: Poedit 3.5\n"
+
+# defaultMessage: Add link
+#: editor/plugins/Link/index
+msgid "Add link"
+msgstr "Adicionar link"
+
+# defaultMessage: An error has occurred while editing "{name}" field. We have been notified and we are looking into it. Please save your work and retry. If the issue persists please contact the site administrator.
+#: widgets/HtmlSlateWidget
+#, fuzzy
+msgid "An error has occurred while editing \"{name}\" field. We have been notified and we are looking into it. Please save your work and retry. If the issue persists please contact the site administrator."
+msgstr "Ocorreu um erro ao editar o campo \"{name}\". Fomos notificados e estamos analisando o problema. Salve seu trabalho e tente novamente. Se o problema persistir, entre em contato com o administrador do site."
+
+# defaultMessage: An error has occurred while rendering "{name}" field. We have been notified and we are looking into it. If the issue persists please contact the site administrator.
+#: widgets/RichTextWidgetView
+#, fuzzy
+msgid "An error has occurred while rendering \"{name}\" field. We have been notified and we are looking into it. If the issue persists please contact the site administrator."
+msgstr "Ocorreu um erro ao renderizar o campo \"{name}\". Fomos notificados e estamos analisando o problema. Se o problema persistir, entre em contato com o administrador do site."
+
+# defaultMessage: Bottom
+#: blocks/Table/TableBlockEdit
+msgid "Bottom"
+msgstr "Base"
+
+# defaultMessage: Center
+#: blocks/Table/TableBlockEdit
+#, fuzzy
+msgid "Center"
+msgstr "Centro"
+
+# defaultMessage: Delete col
+#: blocks/Table/TableBlockEdit editor/plugins/Table/index
+#, fuzzy
+msgid "Delete col"
+msgstr "Excluir coluna"
+
+# defaultMessage: Delete row
+#: blocks/Table/TableBlockEdit editor/plugins/Table/index
+#, fuzzy
+msgid "Delete row"
+msgstr "Excluir linha"
+
+# defaultMessage: Delete table
+#: editor/plugins/Table/index
+#, fuzzy
+msgid "Delete table"
+msgstr "Excluir tabela"
+
+# defaultMessage: Divide each row into separate cells
+#: blocks/Table/TableBlockEdit
+#, fuzzy
+msgid "Divide each row into separate cells"
+msgstr "Dividir cada linha em células separadas"
+
+# defaultMessage: Edit element
+#: elementEditor/messages
+#, fuzzy
+msgid "Edit element"
+msgstr "Editar elemento"
+
+# defaultMessage: Edit link
+#: editor/plugins/AdvancedLink/index editor/plugins/Link/index
+#, fuzzy
+msgid "Edit link"
+msgstr "Editar link"
+
+# defaultMessage: Fixed width table cells
+#: blocks/Table/TableBlockEdit
+#, fuzzy
+msgid "Fixed width table cells"
+msgstr "Células de tabela de largura fixa"
+
+# defaultMessage: Hide headers
+#: blocks/Table/TableBlockEdit
+#, fuzzy
+msgid "Hide headers"
+msgstr "Ocultar cabeçalhos"
+
+# defaultMessage: Insert col after
+#: blocks/Table/TableBlockEdit editor/plugins/Table/index
+#, fuzzy
+msgid "Insert col after"
+msgstr "Inserir coluna após"
+
+# defaultMessage: Insert col before
+#: blocks/Table/TableBlockEdit editor/plugins/Table/index
+#, fuzzy
+msgid "Insert col before"
+msgstr "Inserir coluna antes"
+
+# defaultMessage: Insert row after
+#: blocks/Table/TableBlockEdit editor/plugins/Table/index
+#, fuzzy
+msgid "Insert row after"
+msgstr "Inserir linha após"
+
+# defaultMessage: Insert row before
+#: blocks/Table/TableBlockEdit editor/plugins/Table/index
+#, fuzzy
+msgid "Insert row before"
+msgstr "Inserir linha antes"
+
+# defaultMessage: Left
+#: blocks/Table/TableBlockEdit
+#, fuzzy
+msgid "Left"
+msgstr "Esquerda"
+
+# defaultMessage: Make the table compact
+#: blocks/Table/TableBlockEdit
+#, fuzzy
+msgid "Make the table compact"
+msgstr "Compactar a tabela"
+
+# defaultMessage: Make the table sortable
+#: blocks/Table/TableBlockEdit
+msgid "Make the table sortable"
+msgstr "Tornar a tabela ordenável"
+
+# defaultMessage: Middle
+#: blocks/Table/TableBlockEdit
+msgid "Middle"
+msgstr "Meio"
+
+# defaultMessage: No matching blocks
+#: blocks/Text/SlashMenu
+#, fuzzy
+msgid "No matching blocks"
+msgstr "Não há blocos correspondentes"
+
+# defaultMessage: Reduce complexity
+#: blocks/Table/TableBlockEdit
+#, fuzzy
+msgid "Reduce complexity"
+msgstr "Reduzir complexidade"
+
+# defaultMessage: Remove element
+#: elementEditor/messages
+#, fuzzy
+msgid "Remove element"
+msgstr "Remover elemento"
+
+# defaultMessage: Remove link
+#: editor/plugins/AdvancedLink/index
+#, fuzzy
+msgid "Remove link"
+msgstr "Remover link"
+
+# defaultMessage: Right
+#: blocks/Table/TableBlockEdit
+#, fuzzy
+msgid "Right"
+msgstr "Direita"
+
+# defaultMessage: Stripe alternate rows with color
+#: blocks/Table/TableBlockEdit
+#, fuzzy
+msgid "Stripe alternate rows with color"
+msgstr "Alternar cores das linhas"
+
+# defaultMessage: Table
+#: blocks/Table/TableBlockEdit
+#, fuzzy
+msgid "Table"
+msgstr "Tabela"
+
+# defaultMessage: Table color inverted
+#: blocks/Table/TableBlockEdit
+#, fuzzy
+msgid "Table color inverted"
+msgstr "Cor da tabela invertida"
+
+# defaultMessage: Top
+#: blocks/Table/TableBlockEdit
+#, fuzzy
+msgid "Top"
+msgstr "Topo"
+
+# defaultMessage: Type text…
+#: blocks/Text/DefaultTextBlockEditor blocks/Text/DetachedTextBlockEditor
+#, fuzzy
+msgid "Type text…"
+msgstr "Digite texto…"
+
+# defaultMessage: Visible only in view mode
+#: blocks/Table/TableBlockEdit
+#, fuzzy
+msgid "Visible only in view mode"
+msgstr "Visível apenas no modo de visualização"
diff --git a/packages/volto-slate/news/+update_pt_br.feature b/packages/volto-slate/news/+update_pt_br.feature
new file mode 100644
index 0000000000..35ce73755f
--- /dev/null
+++ b/packages/volto-slate/news/+update_pt_br.feature
@@ -0,0 +1 @@
+Update Brazilian Portuguese translations. @ericof
diff --git a/packages/volto-slate/package.json b/packages/volto-slate/package.json
index c64a51372f..5e5b6118bd 100644
--- a/packages/volto-slate/package.json
+++ b/packages/volto-slate/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@plone/volto-slate",
-  "version": "18.0.0-alpha.17",
+  "version": "18.0.0-alpha.18",
   "description": "Slate.js integration with Volto",
   "main": "src/index.js",
   "author": "European Environment Agency: IDM2 A-Team",
diff --git a/packages/volto-slate/src/blocks/Text/SlashMenu.jsx b/packages/volto-slate/src/blocks/Text/SlashMenu.jsx
index 6fd5ed2f30..2a26c39cfe 100644
--- a/packages/volto-slate/src/blocks/Text/SlashMenu.jsx
+++ b/packages/volto-slate/src/blocks/Text/SlashMenu.jsx
@@ -4,6 +4,7 @@ import { filter, isEmpty } from 'lodash';
 import { Menu } from 'semantic-ui-react';
 import { useIntl, FormattedMessage } from 'react-intl';
 import { Icon } from '@plone/volto/components';
+import { useSelector } from 'react-redux';
 
 const emptySlateBlock = () => ({
   value: [
@@ -105,9 +106,13 @@ const PersistentSlashMenu = ({ editor }) => {
     selected,
     allowedBlocks,
     detached,
+    navRoot,
+    contentType,
   } = props;
   const disableNewBlocks = data?.disableNewBlocks || detached;
 
+  const user = useSelector((state) => state.users?.user);
+
   const [slashMenuSelected, setSlashMenuSelected] = React.useState(0);
 
   const hasAllowedBlocks = !isEmpty(allowedBlocks);
@@ -122,7 +127,13 @@ const PersistentSlashMenu = ({ editor }) => {
         hasAllowedBlocks
           ? allowedBlocks.includes(item.id)
           : typeof item.restricted === 'function'
-            ? !item.restricted({ properties, block: item })
+            ? !item.restricted({
+                properties,
+                block: item,
+                navRoot,
+                contentType,
+                user,
+              })
             : !item.restricted,
       )
         .filter((block) => Boolean(block.title && block.id))
@@ -152,6 +163,9 @@ const PersistentSlashMenu = ({ editor }) => {
       properties,
       slashCommand,
       hasAllowedBlocks,
+      navRoot,
+      contentType,
+      user,
     ],
   );
 
diff --git a/packages/volto/CHANGELOG.md b/packages/volto/CHANGELOG.md
index 91db671d96..8a11d4dcff 100644
--- a/packages/volto/CHANGELOG.md
+++ b/packages/volto/CHANGELOG.md
@@ -17,6 +17,78 @@ myst:
 
 <!-- towncrier release notes start -->
 
+## 18.0.0-alpha.43 (2024-09-13)
+
+### Breaking
+
+- Move `Tags` component to the slot `belowContent`. @wesleybl [#6269](https://github.com/plone/volto/issues/6269)
+
+### Feature
+
+- Refactor AlbumView from class to functional component. @Tishasoumya-02 [#4077](https://github.com/plone/volto/issues/4077)
+- Add setting `unwantedControlPanelsFields` and use it in the function `filterControlPanelsSchema`. @wesleybl [#4819](https://github.com/plone/volto/issues/4819)
+- Refactor the `Register` component from class-based to functional. @Tishasoumya-02 [#4861](https://github.com/plone/volto/issues/4861)
+- Refactor Toolbar/More component from class to functional component. @Tishasoumya-02 [#4955](https://github.com/plone/volto/issues/4955)
+- Refactor Blocks/LeadImage/Edit component from class to functional component. @Tishasoumya-02 [#4959](https://github.com/plone/volto/issues/4959)
+- Refactor Blocks/Video/Edit component from class to functional component. @Tishasoumya-02 [#4960](https://github.com/plone/volto/issues/4960)
+- Refactor ControlPanel/Users/Aliases component , replacing class component lifecycle methods with functional hooks. @Tishasoumya-02 [#4985](https://github.com/plone/volto/issues/4985)
+- Refactor Controlpanel databaseInformation from class component to functional component. @Tishasoumya-02 [#4986](https://github.com/plone/volto/issues/4986)
+- Refactor ControlPanels/Groups RenderGroups from class components to functional component. @Tishasoumya-02 [#4993](https://github.com/plone/volto/issues/4993)
+- Refactor AddonsControlpanel from class to functional components. @Tishasoumya [#4995](https://github.com/plone/volto/issues/4995)
+- Refactor Preference/Change Password from class to functional component. @Tishasoumya-02 [#5044](https://github.com/plone/volto/issues/5044)
+- Refactor Preference/PersonalPreferences from class to functional component. @Tishasoumya-02 [#5045](https://github.com/plone/volto/issues/5045)
+- Refactor Preference/PersonalInformation from Class to Functional component. @Tishasoumya-02 [#5046](https://github.com/plone/volto/issues/5046)
+- Refactor Contents/ContentsUploadModal & Storybook-@Tishasoumya-02 [#5047](https://github.com/plone/volto/issues/5047)
+- Storybook test for ContentBreadcrumbs component. @Tishasoumya [#5048](https://github.com/plone/volto/issues/5048)
+- Storybook Actions component test. @Tishasoumya-02 [#5049](https://github.com/plone/volto/issues/5049)
+- Refactor Display from class to functional component. @Tishasoumya-02 [#5066](https://github.com/plone/volto/issues/5066)
+- Refactor `ReferenceWidget` from class-based to functional component. @Tishasoumya [#5093](https://github.com/plone/volto/issues/5093)
+- Refactor the table of contents block component from a class component to a functional component. @Prince0906 [#6167](https://github.com/plone/volto/issues/6167)
+- Improved URL regex to allow non-public or intranet URLs, such as `https://intranet/` or `file://server/share`. @mamico [#6186](https://github.com/plone/volto/issues/6186)
+- Refactor the `DatetimeWidget` component from a class component to a functional component. @Raman-Luhach [#6213](https://github.com/plone/volto/issues/6213)
+- The schema for the `ContentsPropertiesModal` can be enhanced using the `contentPropertiesSchemaEnhancer` setting.
+  Also, the properties form is now prepopulated with values if all selected items share the same value. @davisagli [#6248](https://github.com/plone/volto/issues/6248)
+- Pass the `user`, `navRoot` and `contentType` objects to the `restricted` function of the block settings. @wesleybl [#6264](https://github.com/plone/volto/issues/6264)
+
+### Bugfix
+
+- Fix search block showing no option select in sort on property @iRohitSingh [#5055](https://github.com/plone/volto/issues/5055)
+- Displays validation error messages on control panel forms. @wesleybl [#5274](https://github.com/plone/volto/issues/5274)
+- Fix `initialValue` block setting. @wesleybl [#5971](https://github.com/plone/volto/issues/5971)
+- When user changes location, set the `userSession.token` value based on cookie. This fixes the login status not being properly determined by the application. @tiberiu-ichim [#6071](https://github.com/plone/volto/issues/6071)
+- Fix `Teaser` block image override option to render external images and internal images pointing to image scales. @Tishasoumya-02 [#6147](https://github.com/plone/volto/issues/6147)
+- Add Cypress test for search block sort on property. @iRohitSingh [#6226](https://github.com/plone/volto/issues/6226)
+- Remove unused i18n message for SortOn component. @davisagli [#6230](https://github.com/plone/volto/issues/6230)
+- Return a 302 response for server-side rendering of the Link view for unauthenticated users. @davisagli [#6235](https://github.com/plone/volto/issues/6235)
+- Fix loading of .cjs in webpack. @davisagli [#6237](https://github.com/plone/volto/issues/6237)
+- fixed change of form.ui.hovered when editing blocks, because if you have a FormBlock component inside another one,
+  onMouseOver fires for all stacked blocks and you cannot use the nested form. @giuliaghisini [#6240](https://github.com/plone/volto/issues/6240)
+- Changed imports from relative to absolute to avoid type errors in add-on tests. @wesleybl [#6244](https://github.com/plone/volto/issues/6244)
+- In the URL Management control panel, allow external URLs as targets. @davisagli [#6247](https://github.com/plone/volto/issues/6247)
+- Disable save button when loading POST query @sabrina-bongiovanni [#6252](https://github.com/plone/volto/issues/6252)
+- Fix `TypeError: values[0] is undefined` in Contents properties modal. @davisagli [#6258](https://github.com/plone/volto/issues/6258)
+- Fix error in `SortOn` component when no sort is selected. @davisagli [#6273](https://github.com/plone/volto/issues/6273)
+- Place actions storybook in correct path. @Tishasoumya-02 [#6275](https://github.com/plone/volto/issues/6275)
+- Remove `Generate tabs for items other than folders` field from navigation control panel. @wesleybl [#6278](https://github.com/plone/volto/issues/6278)
+- Fix error rendering empty grid blocks. @MAX-786 [#6279](https://github.com/plone/volto/issues/6279)
+- Fixed instant error on click on an item of the "Order" tab @sneridagh [#6284](https://github.com/plone/volto/issues/6284)
+
+### Internal
+
+- Refactored the `SelectWidget` component to a functional component. @lorstenoplo [#5570](https://github.com/plone/volto/issues/5570)
+- Allow setting the language for `make backend-docker-start`. Default is `en`. Added usage documentation in Contributing > Develop Volto core, and reorganized it. Cleaned up Configuration > Multilingual. @stevepiercy [#6231](https://github.com/plone/volto/issues/6231)
+- Revert rename of `.gitkeep`. @stevepiercy [#6232](https://github.com/plone/volto/issues/6232)
+- Upgrade Cypress to 13.13.2. @wesleybl [#6241](https://github.com/plone/volto/issues/6241)
+- Complete upgrade Cypress to 13.13.2. Bump actions/upload-artifact@v1 to v4. @stevepiercy [#6242](https://github.com/plone/volto/issues/6242)
+- Add `make i18n` command. @Faakhir30 [#6274](https://github.com/plone/volto/issues/6274)
+- Update to Plone 6.0.13 @sneridagh [#6285](https://github.com/plone/volto/issues/6285)
+
+### Documentation
+
+- Fix redirect of link in documentation to testing Redux store blog post. @stevepiercy [#6239](https://github.com/plone/volto/issues/6239)
+- Fix redirect to Docker documentation. @stevepiercy [#6262](https://github.com/plone/volto/issues/6262)
+- Added upgrade guide notice about CookiePlone as the recommended way for generating projects and add-on boilerplate @sneridagh [#6286](https://github.com/plone/volto/issues/6286)
+
 ## 18.0.0-alpha.42 (2024-07-30)
 
 ### Breaking
diff --git a/packages/volto/cypress/tests/core/basic/a11y.js b/packages/volto/cypress/tests/core/basic/a11y.js
index 9c21668d8f..593c2b4889 100644
--- a/packages/volto/cypress/tests/core/basic/a11y.js
+++ b/packages/volto/cypress/tests/core/basic/a11y.js
@@ -10,6 +10,10 @@ describe('Accessibility Tests', () => {
 
   it('Contact form has not a11y violations', () => {
     cy.navigate('/contact-form');
+    cy.get('#field-name').click().type('input');
+    cy.get('#field-from').click().type('something@domain.com');
+    cy.get('#field-subject').click().type('input');
+    cy.get('#field-message').click().type('input');
     cy.checkA11y();
   });
 
diff --git a/packages/volto/cypress/tests/core/blocks/blocks-image.js b/packages/volto/cypress/tests/core/blocks/blocks-image.js
index c0c79d2eae..7c9c84b39b 100644
--- a/packages/volto/cypress/tests/core/blocks/blocks-image.js
+++ b/packages/volto/cypress/tests/core/blocks/blocks-image.js
@@ -35,7 +35,8 @@ describe('Blocks Tests', () => {
       .last()
       .focus()
       .should('have.css', 'outline', 'rgb(16, 16, 16) auto 1px');
-    cy.get('.block.image .ui.input input[type="text"]').type(
+    cy.findByLabelText('Enter a URL to an image').click();
+    cy.get('.ui.input.editor-link.input-anchorlink-theme input').type(
       `https://github.com/plone/volto/raw/main/logos/volto-colorful.png{enter}`,
     );
     cy.get('#toolbar-save').click();
@@ -162,7 +163,7 @@ describe('Blocks Tests', () => {
       });
   });
 
-  it.only('Create an image block and initially alt attr is empty', () => {
+  it('Create an image block and initially alt attr is empty', () => {
     // when I add an image block via upload
     cy.get('.content-area .slate-editor [contenteditable=true]', {
       timeout: 10000,
diff --git a/packages/volto/locales/pt_BR/LC_MESSAGES/volto.po b/packages/volto/locales/pt_BR/LC_MESSAGES/volto.po
index bf470f44d5..b5d887bbbe 100644
--- a/packages/volto/locales/pt_BR/LC_MESSAGES/volto.po
+++ b/packages/volto/locales/pt_BR/LC_MESSAGES/volto.po
@@ -3,7 +3,7 @@ msgstr ""
 "Project-Id-Version: Plone\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-04-27T19:30:59.079Z\n"
-"PO-Revision-Date: 2022-11-14 19:36-0300\n"
+"PO-Revision-Date: 2024-09-15 14:20-0300\n"
 "Last-Translator: Érico Andrei <ericof@plone.org>\n"
 "Language: pt_BR\n"
 "Language-Team: Portuguese (https://www.transifex.com/plone/teams/14552/pt/)\n"
@@ -15,7 +15,7 @@ msgstr ""
 "Language-Name: Português do Brasil\n"
 "Preferred-Encodings: utf-8\n"
 "Domain: volto\n"
-"X-Generator: Poedit 3.2\n"
+"X-Generator: Poedit 3.5\n"
 
 #. Default: "<p>Add some HTML here</p>"
 #: components/manage/Blocks/HTML/Edit
@@ -142,7 +142,7 @@ msgstr "Adicionar bloco"
 #. Default: "Add block in position {index}"
 #: components/manage/Blocks/Container/NewBlockAddButton
 msgid "Add block in position {index}"
-msgstr ""
+msgstr "Adicionar bloco na posição {index}"
 
 #. Default: "Add block…"
 #: helpers/MessageLabels/MessageLabels
@@ -595,7 +595,7 @@ msgstr "Alterações guardadas."
 #. Default: "Check this box to customize the title, description, or image of the target content item for this teaser. Leave it unchecked to show updates to the target content item if it is edited later."
 #: components/manage/Blocks/Teaser/schema
 msgid "Check this box to customize the title, description, or image of the target content item for this teaser. Leave it unchecked to show updates to the target content item if it is edited later."
-msgstr ""
+msgstr "Marque essa caixa para personalizar o título, a descrição ou a imagem do item de conteúdo de destino para esse teaser. Deixe-a desmarcada para mostrar atualizações no item de conteúdo de destino se ele for editado posteriormente."
 
 #. Default: "Checkbox"
 #: components/manage/Widgets/SchemaWidget
@@ -750,7 +750,7 @@ msgstr "Itens contidos"
 #. Default: "Container settings"
 #: components/manage/Blocks/Container/SimpleContainerToolbar
 msgid "Container settings"
-msgstr ""
+msgstr "Configurações de contêineres"
 
 #. Default: "Content"
 #: components/manage/Controlpanels/Controlpanels
@@ -781,7 +781,7 @@ msgstr "Regras de conteúdo de pastas pai"
 #. Default: "Content that links to or references {title}"
 #: components/manage/LinksToItem/LinksToItem
 msgid "Content that links to or references {title}"
-msgstr ""
+msgstr "Conteúdo com links ou referências para {title}"
 
 #. Default: "Content type created"
 #: components/manage/Controlpanels/ContentTypes
@@ -880,7 +880,7 @@ msgstr "Senha atual"
 #. Default: "Customize teaser content"
 #: components/manage/Blocks/Teaser/schema
 msgid "Customize teaser content"
-msgstr ""
+msgstr "Personalizar o conteúdo do destaque"
 
 #. Default: "Cut"
 #: components/manage/Actions/Actions
@@ -1017,12 +1017,12 @@ msgstr "Excluir linha"
 #. Default: "Delete selected items?"
 #: components/manage/Contents/Contents
 msgid "Delete selected items?"
-msgstr ""
+msgstr "Excluir os itens selecionados?"
 
 #. Default: "Delete this item?"
 #: components/manage/Contents/Contents
 msgid "Delete this item?"
-msgstr ""
+msgstr "Apagar este item?"
 
 #. Default: "Deleted"
 #: components/manage/Controlpanels/Rules/Rules
@@ -1032,7 +1032,7 @@ msgstr "Removida"
 #. Default: "Deleting this item breaks {brokenReferences} {variation}."
 #: components/manage/Contents/Contents
 msgid "Deleting this item breaks {brokenReferences} {variation}."
-msgstr ""
+msgstr "A exclusão desse item quebra {brokenReferences} {variation}."
 
 #. Default: "Depth"
 #: components/manage/Widgets/QuerystringWidget
@@ -1328,7 +1328,7 @@ msgstr "Informe seu nome de usuário para verificação."
 #. Default: "Entries"
 #: components/manage/Blocks/ToC/Schema
 msgid "Entries"
-msgstr ""
+msgstr "Entradas"
 
 #. Default: "Error"
 #: components/manage/Add/Add
@@ -1359,7 +1359,7 @@ msgstr "Evento"
 #. Default: "Event end date must be on or after {startDateValueOrStartFieldName}"
 #: helpers/MessageLabels/MessageLabels
 msgid "Event end date must be on or after {startDateValueOrStartFieldName}"
-msgstr ""
+msgstr "A data de término do evento deve ser igual ou posterior a {startDateValueOrStartFieldName}"
 
 #. Default: "Event listing"
 #: config/Views
@@ -1369,7 +1369,7 @@ msgstr "Listagem de Evento"
 #. Default: "Event start date must be on or before {endDateValueOrEndFieldName}"
 #: helpers/MessageLabels/MessageLabels
 msgid "Event start date must be on or before {endDateValueOrEndFieldName}"
-msgstr ""
+msgstr "A data de início do evento deve ser igual ou anterior a {endDateValueOrEndFieldName}"
 
 #. Default: "Event view"
 #: config/Views
@@ -1596,7 +1596,7 @@ msgstr "Bloco Google Maps"
 #. Default: "Grid"
 #: components/manage/Blocks/Grid/schema
 msgid "Grid"
-msgstr ""
+msgstr "Grade"
 
 #. Default: "Group"
 #: components/manage/Sharing/Sharing
@@ -1611,7 +1611,7 @@ msgstr "Grupo criado"
 #. Default: "Group deleted"
 #: helpers/MessageLabels/MessageLabels
 msgid "Group deleted"
-msgstr ""
+msgstr "Grupo Excluído"
 
 #. Default: "Group roles updated"
 #: helpers/MessageLabels/MessageLabels
@@ -1676,7 +1676,7 @@ msgstr "Ocultar filtros"
 #. Default: "Hide title"
 #: components/manage/Blocks/ToC/Schema
 msgid "Hide title"
-msgstr ""
+msgstr "Ocultar título"
 
 #. Default: "History"
 #: components/manage/History/History
@@ -1712,7 +1712,7 @@ msgstr "ID"
 #. Default: "Icon View"
 #: components/manage/Sidebar/ObjectBrowserBody
 msgid "Icon View"
-msgstr ""
+msgstr "Visualização de ícone"
 
 #. Default: "If all of the following conditions are met:"
 #: components/manage/Controlpanels/Rules/ConfigureRule
@@ -1869,12 +1869,12 @@ msgstr "Bloco inválido"
 #. Default: "Invalid teaser source"
 #: components/manage/Blocks/Teaser/Data
 msgid "Invalid teaser source"
-msgstr ""
+msgstr "Fonte do destaque inválida"
 
 #. Default: "It is not allowed to define both the password and to request sending the password reset message by e-mail. You need to select one of them."
 #: helpers/MessageLabels/MessageLabels
 msgid "It is not allowed to define both the password and to request sending the password reset message by e-mail. You need to select one of them."
-msgstr ""
+msgstr "Não é permitido definir a senha e solicitar o envio da mensagem de redefinição de senha por e-mail. Por favor, selecione um deles."
 
 #. Default: "Item batch size"
 #: components/manage/Widgets/QuerystringWidget
@@ -1998,7 +1998,7 @@ msgstr "Link"
 #. Default: "Anchor link copied to the clipboard"
 #: helpers/MessageLabels/MessageLabels
 msgid "Link copied to clipboard"
-msgstr ""
+msgstr "Link copiado para área de transferência"
 
 #. Default: "Link more"
 #: components/manage/Blocks/Listing/schema
@@ -2013,7 +2013,7 @@ msgstr "Visão de redireção de Link"
 #. Default: "Link settings"
 #: components/manage/Blocks/Image/schema
 msgid "Link settings"
-msgstr ""
+msgstr "Configurações do link"
 
 #. Default: "Link Title"
 #: components/manage/Blocks/Listing/schema
@@ -2035,18 +2035,18 @@ msgstr "Linkar tradução para"
 #. Default: "Linking this item with hyperlink in text"
 #: components/manage/LinksToItem/LinksToItem
 msgid "Linking this item with hyperlink in text"
-msgstr ""
+msgstr "Vinculação deste item com hiperlink no texto"
 
 #. Default: "Links and references"
 #: components/manage/LinksToItem/LinksToItem
 #: components/manage/Toolbar/More
 msgid "Links and references"
-msgstr ""
+msgstr "Links e referências"
 
 #. Default: "List View"
 #: components/manage/Sidebar/ObjectBrowserBody
 msgid "List View"
-msgstr ""
+msgstr "Exibição de lista"
 
 #. Default: "Listing"
 #: components/manage/Blocks/Listing/schema
@@ -2109,7 +2109,7 @@ msgstr "Nome de usuário"
 #. Default: "Logo of"
 #: components/theme/Logo/Logo
 msgid "Logo of"
-msgstr ""
+msgstr "Logotipo da"
 
 #. Default: "Logout"
 #: components/manage/Toolbar/PersonalTools
@@ -2395,7 +2395,7 @@ msgstr "Nenhum item selecionado"
 #. Default: "No links to this item found."
 #: components/manage/LinksToItem/LinksToItem
 msgid "No links to this item found."
-msgstr ""
+msgstr "Não foram encontrados links para esse item."
 
 #. Default: "No map selected"
 #: components/manage/Blocks/Maps/MapsSidebar
@@ -2501,7 +2501,7 @@ msgstr "Ok"
 #. Default: "Only 7-bit bytes characters are allowed. Cannot contain uppercase letters, special characters: <, >, &, #, /, ?, or others that are illegal in URLs. Cannot start with: _, aq_, @@, ++. Cannot end with __. Cannot be: request,contributors, ., .., "". Cannot contain new lines."
 #: components/manage/Widgets/IdWidget
 msgid "Only 7-bit bytes characters are allowed. Cannot contain uppercase letters, special characters: <, >, &, #, /, ?, or others that are illegal in URLs. Cannot start with: _, aq_, @@, ++. Cannot end with __. Cannot be: request,contributors, ., .., "". Cannot contain new lines."
-msgstr ""
+msgstr "Somente caracteres de bytes de 7 bits são permitidos. Não pode conter letras maiúsculas, caracteres especiais: <, >, &, #, /, ?, ou outros que são ilegais em URLs. Não pode começar com: , aq, @@, ++. Não pode terminar com __. Não pode ser: request, contributors, ., .., “”. Não pode conter quebras de linha."
 
 #. Default: "Open in a new tab"
 #: components/manage/Blocks/Image/schema
@@ -2524,12 +2524,12 @@ msgstr "Abrir navegador de objetos"
 #. Default: "Order"
 #: components/manage/Sidebar/Sidebar
 msgid "Order"
-msgstr ""
+msgstr "Ordem"
 
 #. Default: "Ordered"
 #: components/manage/Blocks/ToC/Schema
 msgid "Ordered"
-msgstr ""
+msgstr "Ordenado"
 
 #. Default: "Origin"
 #: components/manage/Blocks/LeadImage/LeadImageSidebar
@@ -2539,7 +2539,7 @@ msgstr "Origem"
 #. Default: "Overview of relations of all content items"
 #: components/manage/LinksToItem/LinksToItem
 msgid "Overview of relations of all content items"
-msgstr ""
+msgstr "Visão geral das relações de todos os itens de conteúdo"
 
 #. Default: "Page"
 #: components/manage/Toolbar/Toolbar
@@ -2783,17 +2783,17 @@ msgstr "Reduzir complexidade"
 #. Default: "Referencing this item as related item"
 #: components/manage/LinksToItem/LinksToItem
 msgid "Referencing this item as related item"
-msgstr ""
+msgstr "Referenciando este item como item relacionado"
 
 #. Default: "Referencing this item with {relationship}"
 #: components/manage/LinksToItem/LinksToItem
 msgid "Referencing this item with {relationship}"
-msgstr ""
+msgstr "Referenciando este item via {relationship}"
 
 #. Default: "Refresh source content"
 #: components/manage/Blocks/Teaser/Data
 msgid "Refresh source content"
-msgstr ""
+msgstr "Atualizar o conteúdo de origem"
 
 #. Default: "Register"
 #: components/theme/Anontools/Anontools
@@ -2843,7 +2843,7 @@ msgstr "Remover"
 #. Default: "Remove element {index}"
 #: components/manage/Blocks/Container/EditBlockWrapper
 msgid "Remove element {index}"
-msgstr ""
+msgstr "Remover elemento {index}"
 
 #. Default: "Remove item"
 #: components/manage/Widgets/ObjectListWidget
@@ -2932,7 +2932,7 @@ msgstr "Falta informação obrigatória."
 #. Default: "Reset element {index}"
 #: components/manage/Blocks/Container/EditBlockWrapper
 msgid "Reset element {index}"
-msgstr ""
+msgstr "Redefinir elemento {index}"
 
 #. Default: "Reset title"
 #: components/manage/Widgets/VocabularyTermsWidget
@@ -3235,7 +3235,7 @@ msgstr "Envie um e-mail de confirmação com um link para definir a senha."
 #. Default: "Server Error"
 #: components/theme/Error/ServerError
 msgid "Server Error"
-msgstr ""
+msgstr "Erro de servidor"
 
 #. Default: "Set my password"
 #: components/theme/PasswordReset/PasswordReset
@@ -3381,12 +3381,12 @@ msgstr "Pequeno"
 #. Default: "Some items are also a folder. By deleting them you will delete {containedItemsToDelete} {variation} inside the folders."
 #: components/manage/Contents/Contents
 msgid "Some items are also a folder. By deleting them you will delete {containedItemsToDelete} {variation} inside the folders."
-msgstr ""
+msgstr "Alguns itens também são uma pasta. Ao excluí-los, você excluirá {containedItemsToDelete} {variation} dentro destas pastas."
 
 #. Default: "Some items are referenced by other contents. By deleting them {brokenReferences} {variation} will be broken."
 #: components/manage/Contents/Contents
 msgid "Some items are referenced by other contents. By deleting them {brokenReferences} {variation} will be broken."
-msgstr ""
+msgstr "Alguns itens são referenciados por outros conteúdos. Ao excluí-los, {brokenReferences} {variation} podem ser quebrados."
 
 #. Default: "Some relations are broken. Please fix."
 #: components/manage/Controlpanels/Relations/Relations
@@ -3433,7 +3433,7 @@ msgstr "Ordenado"
 #. Default: "Sorted on"
 #: components/manage/Blocks/Search/components/SortOn
 msgid "Sorted on"
-msgstr ""
+msgstr "Ordenado por"
 
 #. Default: "Source"
 #: components/manage/Blocks/HTML/Edit
@@ -3483,7 +3483,7 @@ msgstr "Situação"
 #. Default: "Sticky"
 #: components/manage/Blocks/ToC/Schema
 msgid "Sticky"
-msgstr ""
+msgstr "Fixo"
 
 #. Default: "Stop compare"
 #: components/manage/Multilingual/CompareLanguages
@@ -3513,7 +3513,7 @@ msgstr "Assunto"
 #. Default: "Submit"
 #: components/manage/AnchorPlugin/components/LinkButton/AddLinkForm
 msgid "Submit"
-msgstr ""
+msgstr "Enviar"
 
 #. Default: "Success"
 #: components/manage/Actions/Actions
@@ -3679,12 +3679,12 @@ msgstr "O endereço do link é:"
 #. Default: "The number of items must be greater than or equal to {minItems}"
 #: helpers/MessageLabels/MessageLabels
 msgid "The number of items must be greater than or equal to {minItems}"
-msgstr ""
+msgstr "O número de itens deve ser maior ou igual a {minItems}"
 
 #. Default: "The number of items must be less than or equal to {maxItems}"
 #: helpers/MessageLabels/MessageLabels
 msgid "The number of items must be less than or equal to {maxItems}"
-msgstr ""
+msgstr "O número de itens deve ser menor ou igual a {maxItems}"
 
 #. Default: "The provided alternative url already exists!"
 #: components/manage/Aliases/Aliases
@@ -3705,7 +3705,7 @@ msgstr "A configuração do site está desatualizada e precisa ser atualizada."
 #. Default: "The value does not match the pattern {pattern}"
 #: helpers/MessageLabels/MessageLabels
 msgid "The value does not match the pattern {pattern}"
-msgstr ""
+msgstr "O valor não corresponde ao padrão {pattern}"
 
 #. Default: "The working copy was discarded"
 #: components/manage/Toolbar/More
@@ -3720,12 +3720,12 @@ msgstr "O {plonecms} tem {copyright} de 2000-{current_year} pela {plonefoundatio
 #. Default: "There are no groups with the searched criteria"
 #: helpers/MessageLabels/MessageLabels
 msgid "There are no groups with the searched criteria"
-msgstr ""
+msgstr "Não há grupos com os critérios pesquisados"
 
 #. Default: "There are no users with the searched criteria"
 #: helpers/MessageLabels/MessageLabels
 msgid "There are no users with the searched criteria"
-msgstr ""
+msgstr "Não há usuários com os critérios pesquisados"
 
 #. Default: "There are some errors."
 #: components/manage/Add/Add
@@ -3777,7 +3777,7 @@ msgstr "Esta é uma cópia de trabalho de {title}"
 #. Default: "This item is also a folder. By deleting it you will delete {containedItemsToDelete} {variation} inside the folder."
 #: components/manage/Contents/Contents
 msgid "This item is also a folder. By deleting it you will delete {containedItemsToDelete} {variation} inside the folder."
-msgstr ""
+msgstr "Esse item também é uma pasta. Ao excluí-lo, você excluirá {containedItemsToDelete} {variation} dentro da pasta."
 
 #. Default: "This item was locked by {creator} on {date}"
 #: components/manage/LockingToastsFactory/LockingToastsFactory
@@ -4014,7 +4014,7 @@ msgstr "Atualizar"
 #. Default: "Update User"
 #: helpers/MessageLabels/MessageLabels
 msgid "Update User"
-msgstr ""
+msgstr "Atualizar o usuário"
 
 #. Default: "Update installed addons"
 #: components/manage/Controlpanels/AddonsControlpanel
@@ -4112,7 +4112,7 @@ msgstr "Usuário criado"
 #. Default: "User deleted"
 #: helpers/MessageLabels/MessageLabels
 msgid "User deleted"
-msgstr ""
+msgstr "Usuário excluído"
 
 #. Default: "User name"
 #: components/manage/Controlpanels/Users/UsersControlpanel
@@ -4127,7 +4127,7 @@ msgstr "Papéis do grupo atualizados"
 #. Default: "User updated successfuly"
 #: helpers/MessageLabels/MessageLabels
 msgid "User updated successfuly"
-msgstr ""
+msgstr "Usuário atualizado com sucesso"
 
 #. Default: "Username"
 #: helpers/MessageLabels/MessageLabels
@@ -4186,12 +4186,12 @@ msgstr "Ver mudanças"
 #. Default: "View links and references to this item"
 #: components/manage/Contents/Contents
 msgid "View links and references to this item"
-msgstr ""
+msgstr "Exibir links e referências a este item"
 
 #. Default: "View this revision"
 #: components/manage/History/History
 msgid "View this revision"
-msgstr "Ver esta revisão"
+msgstr "Visualizar esta revisão"
 
 #. Default: "View working copy"
 #: components/manage/Toolbar/More
@@ -4236,7 +4236,7 @@ msgstr "Pedimos desculpas pelo inconveniente, mas a página que você estava ten
 #. Default: "We apologize for the inconvenience, but there was an unexpected error on the server."
 #: components/theme/Error/ServerError
 msgid "We apologize for the inconvenience, but there was an unexpected error on the server."
-msgstr ""
+msgstr "Pedimos desculpas pelo inconveniente, mas ocorreu um erro inesperado no servidor."
 
 #. Default: "We apologize for the inconvenience, but you don't have permissions on this resource."
 #: components/theme/Forbidden/Forbidden
@@ -4424,7 +4424,7 @@ msgstr "Visões disponíveis"
 #. Default: "Error in the block field {errorField}."
 #: helpers/MessageLabels/MessageLabels
 msgid "blocksFieldsErrorTitle"
-msgstr ""
+msgstr "Erro no campo de blocos {errorField}"
 
 #. Default: "Forgot your password?"
 #: components/theme/Login/Login
@@ -4440,12 +4440,12 @@ msgstr "Caixa de seleção"
 #. Default: "column"
 #: components/manage/Blocks/Grid/templates
 msgid "column"
-msgstr ""
+msgstr "coluna"
 
 #. Default: "columns"
 #: components/manage/Blocks/Grid/templates
 msgid "columns"
-msgstr ""
+msgstr "colunas"
 
 #. Default: "Common"
 #: config/Blocks
@@ -4545,7 +4545,7 @@ msgstr "Onde"
 #. Default: "This website does not accept files larger than {limit}"
 #: helpers/MessageLabels/MessageLabels
 msgid "fileTooLarge"
-msgstr ""
+msgstr "Este site não aceita arquivos maiores que {limit}"
 
 #. Default: "flush intIds and rebuild relations"
 #: helpers/MessageLabels/MessageLabels
@@ -4555,7 +4555,7 @@ msgstr "descarrega os intIds e recontrua os relacionamentos"
 #. Default: "<ul><li>Regenerate intIds (tokens of relations in relation catalog)</li><li>Rebuild relations</li></ul><p>Check the log for details!</p><p><b>Warning</b>: If you have add-ons relying on intIds, you should not flush them.</p>"
 #: helpers/MessageLabels/MessageLabels
 msgid "flushAndRebuildRelationsHints"
-msgstr ""
+msgstr "<ul><li>Regerar os intIds (tokens das relações no catálogo de relações)</li><li>Reconstruir relações</li></ul><p>Verifique o log para detalhes!</p><p><b>Aviso</b>: Se você tem complementos que dependem de intIds, não deve excluí-los.</p>"
 
 #. Default: "Head title"
 #: components/manage/Blocks/Teaser/schema
@@ -4585,12 +4585,12 @@ msgstr "Imagem"
 #. Default: "Clear image"
 #: components/manage/Blocks/Image/ImageSidebar
 msgid "image_block_clear"
-msgstr ""
+msgstr "Remover imagem"
 
 #. Default: "Image preview"
 #: components/manage/Blocks/Image/ImageSidebar
 msgid "image_block_preview"
-msgstr ""
+msgstr "Pré-visualização da imagem"
 
 #. Default: "Input must be integer"
 #: helpers/MessageLabels/MessageLabels
@@ -4605,12 +4605,12 @@ msgstr "Intranet"
 #. Default: "item"
 #: components/manage/Contents/Contents
 msgid "item"
-msgstr ""
+msgstr "Item"
 
 #. Default: "items"
 #: components/manage/Contents/Contents
 msgid "items"
-msgstr ""
+msgstr "Itens"
 
 #. Default: "My email is"
 #: components/theme/PasswordReset/RequestPasswordReset
@@ -4754,12 +4754,12 @@ msgstr "reconstruir relacionamentos"
 #. Default: "reference"
 #: components/manage/Contents/Contents
 msgid "reference"
-msgstr ""
+msgstr "referência"
 
 #. Default: "references"
 #: components/manage/Contents/Contents
 msgid "references"
-msgstr ""
+msgstr "referências"
 
 #. Default: "results"
 #: components/theme/Search/Search
@@ -4979,7 +4979,7 @@ msgstr "caminho do destino"
 #. Default: "Text"
 #: config/Blocks
 msgid "text"
-msgstr ""
+msgstr "texto"
 
 #. Default: "Title"
 #: config/Blocks
@@ -5052,7 +5052,7 @@ msgstr "Sim"
 #. Default: "{count, plural, one {Upload {count} file} other {Upload {count} files}}"
 #: components/manage/Contents/ContentsUploadModal
 msgid "{count, plural, one {Upload {count} file} other {Upload {count} files}}"
-msgstr "{count, plural, one {Enviar {count} arquivo} other {Enviar {count} arquivos}}"
+msgstr "{count, plural, one {Enviar {count} arquivo} ou {Enviar {count} arquivos}}"
 
 #. Default: "{count} selected"
 #: components/manage/Contents/Contents
diff --git a/packages/volto/news/+update_pt_br.feature b/packages/volto/news/+update_pt_br.feature
new file mode 100644
index 0000000000..35ce73755f
--- /dev/null
+++ b/packages/volto/news/+update_pt_br.feature
@@ -0,0 +1 @@
+Update Brazilian Portuguese translations. @ericof
diff --git a/packages/volto/news/2570.bugfix b/packages/volto/news/2570.bugfix
new file mode 100644
index 0000000000..490f159699
--- /dev/null
+++ b/packages/volto/news/2570.bugfix
@@ -0,0 +1,2 @@
+Change Form input:focus text color to the `textColor` value for a11y. 
+Add Cypress test for contact form inputs. @ThomasKindermann @tedw87
\ No newline at end of file
diff --git a/packages/volto/news/4077.feature b/packages/volto/news/4077.feature
deleted file mode 100644
index 062a72de76..0000000000
--- a/packages/volto/news/4077.feature
+++ /dev/null
@@ -1 +0,0 @@
-Refactor AlbumView from class to functional component. @Tishasoumya-02
\ No newline at end of file
diff --git a/packages/volto/news/4819.feature b/packages/volto/news/4819.feature
deleted file mode 100644
index fe12773f69..0000000000
--- a/packages/volto/news/4819.feature
+++ /dev/null
@@ -1 +0,0 @@
-Add setting `unwantedControlPanelsFields` and use it in the function `filterControlPanelsSchema`. @wesleybl
diff --git a/packages/volto/news/4861.feature b/packages/volto/news/4861.feature
deleted file mode 100644
index c5521a45f1..0000000000
--- a/packages/volto/news/4861.feature
+++ /dev/null
@@ -1 +0,0 @@
-Refactor the `Register` component from class-based to functional. @Tishasoumya-02
diff --git a/packages/volto/news/4955.feature b/packages/volto/news/4955.feature
deleted file mode 100644
index 4884c96572..0000000000
--- a/packages/volto/news/4955.feature
+++ /dev/null
@@ -1 +0,0 @@
-Refactor Toolbar/More component from class to functional component. @Tishasoumya-02
\ No newline at end of file
diff --git a/packages/volto/news/4959.feature b/packages/volto/news/4959.feature
deleted file mode 100644
index 81e63b0f64..0000000000
--- a/packages/volto/news/4959.feature
+++ /dev/null
@@ -1 +0,0 @@
-Refactor Blocks/LeadImage/Edit component from class to functional component. @Tishasoumya-02
\ No newline at end of file
diff --git a/packages/volto/news/4960.feature b/packages/volto/news/4960.feature
deleted file mode 100644
index 6b28eeee61..0000000000
--- a/packages/volto/news/4960.feature
+++ /dev/null
@@ -1 +0,0 @@
-Refactor Blocks/Video/Edit component from class to functional component. @Tishasoumya-02
\ No newline at end of file
diff --git a/packages/volto/news/4985.feature b/packages/volto/news/4985.feature
deleted file mode 100644
index 1ba74856d9..0000000000
--- a/packages/volto/news/4985.feature
+++ /dev/null
@@ -1 +0,0 @@
-Refactor ControlPanel/Users/Aliases component , replacing class component lifecycle methods with functional hooks. @Tishasoumya-02
\ No newline at end of file
diff --git a/packages/volto/news/4986.feature b/packages/volto/news/4986.feature
deleted file mode 100644
index caaac5aa19..0000000000
--- a/packages/volto/news/4986.feature
+++ /dev/null
@@ -1 +0,0 @@
-Refactor Controlpanel databaseInformation from class component to functional component. @Tishasoumya-02
\ No newline at end of file
diff --git a/packages/volto/news/4993.feature b/packages/volto/news/4993.feature
deleted file mode 100644
index f5f831e506..0000000000
--- a/packages/volto/news/4993.feature
+++ /dev/null
@@ -1 +0,0 @@
-Refactor ControlPanels/Groups RenderGroups from class components to functional component. @Tishasoumya-02
\ No newline at end of file
diff --git a/packages/volto/news/4995.feature b/packages/volto/news/4995.feature
deleted file mode 100644
index 9e38ddfcec..0000000000
--- a/packages/volto/news/4995.feature
+++ /dev/null
@@ -1 +0,0 @@
-Refactor AddonsControlpanel from class to functional components. @Tishasoumya
\ No newline at end of file
diff --git a/packages/volto/news/5044.feature b/packages/volto/news/5044.feature
deleted file mode 100644
index 60833498c6..0000000000
--- a/packages/volto/news/5044.feature
+++ /dev/null
@@ -1 +0,0 @@
-Refactor Preference/Change Password from class to functional component. @Tishasoumya-02
diff --git a/packages/volto/news/5045.feature b/packages/volto/news/5045.feature
deleted file mode 100644
index b5385619ac..0000000000
--- a/packages/volto/news/5045.feature
+++ /dev/null
@@ -1 +0,0 @@
-Refactor Preference/PersonalPreferences from class to functional component. @Tishasoumya-02
diff --git a/packages/volto/news/5046.feature b/packages/volto/news/5046.feature
deleted file mode 100644
index acf69da56f..0000000000
--- a/packages/volto/news/5046.feature
+++ /dev/null
@@ -1 +0,0 @@
-Refactor Preference/PersonalInformation from Class to Functional component. @Tishasoumya-02
\ No newline at end of file
diff --git a/packages/volto/news/5048.feature b/packages/volto/news/5048.feature
deleted file mode 100644
index 756b8f5891..0000000000
--- a/packages/volto/news/5048.feature
+++ /dev/null
@@ -1 +0,0 @@
-Storybook test for ContentBreadcrumbs component. @Tishasoumya
\ No newline at end of file
diff --git a/packages/volto/news/5049.feature b/packages/volto/news/5049.feature
deleted file mode 100644
index 8dc75b2192..0000000000
--- a/packages/volto/news/5049.feature
+++ /dev/null
@@ -1 +0,0 @@
-Storybook Actions component test. @Tishasoumya-02
\ No newline at end of file
diff --git a/packages/volto/news/5055.bugfix b/packages/volto/news/5055.bugfix
deleted file mode 100644
index d089f7d0b4..0000000000
--- a/packages/volto/news/5055.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix search block showing no option select in sort on property @iRohitSingh
\ No newline at end of file
diff --git a/packages/volto/news/5066.feature b/packages/volto/news/5066.feature
deleted file mode 100644
index 347026cf08..0000000000
--- a/packages/volto/news/5066.feature
+++ /dev/null
@@ -1 +0,0 @@
-Refactor Display from class to functional component. @Tishasoumya-02
\ No newline at end of file
diff --git a/packages/volto/news/5093.feature b/packages/volto/news/5093.feature
deleted file mode 100644
index cb0a0ab525..0000000000
--- a/packages/volto/news/5093.feature
+++ /dev/null
@@ -1 +0,0 @@
-Refactor `ReferenceWidget` from class-based to functional component. @Tishasoumya
\ No newline at end of file
diff --git a/packages/volto/news/5274.bugfix b/packages/volto/news/5274.bugfix
deleted file mode 100644
index da9be01184..0000000000
--- a/packages/volto/news/5274.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Displays validation error messages on control panel forms. @wesleybl
diff --git a/packages/volto/news/5971.bugfix b/packages/volto/news/5971.bugfix
deleted file mode 100644
index 71d9814b79..0000000000
--- a/packages/volto/news/5971.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix `initialValue` block setting. @wesleybl
diff --git a/packages/volto/news/6071.bugfix b/packages/volto/news/6071.bugfix
deleted file mode 100644
index a6ac978c83..0000000000
--- a/packages/volto/news/6071.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-When user changes location, set the `userSession.token` value based on cookie. This fixes the login status not being properly determined by the application. @tiberiu-ichim
diff --git a/packages/volto/news/6147.bugfix b/packages/volto/news/6147.bugfix
deleted file mode 100644
index f8636db7f6..0000000000
--- a/packages/volto/news/6147.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix `Teaser` block image override option to render external images and internal images pointing to image scales. @Tishasoumya-02
diff --git a/packages/volto/news/6167.feature b/packages/volto/news/6167.feature
deleted file mode 100644
index bfa7da310f..0000000000
--- a/packages/volto/news/6167.feature
+++ /dev/null
@@ -1 +0,0 @@
-Refactor the table of contents block component from a class component to a functional component. @Prince0906
\ No newline at end of file
diff --git a/packages/volto/news/6173.feature b/packages/volto/news/6173.feature
new file mode 100644
index 0000000000..1d887eae5d
--- /dev/null
+++ b/packages/volto/news/6173.feature
@@ -0,0 +1 @@
+Added `config.settings.nonContentRoutesPublic` to avoid `isCmsUi` issues in these public routes. @giuliaghisini
diff --git a/packages/volto/news/6186.feature b/packages/volto/news/6186.feature
deleted file mode 100644
index bd02ea020f..0000000000
--- a/packages/volto/news/6186.feature
+++ /dev/null
@@ -1 +0,0 @@
-Improved URL regex to allow non-public or intranet URLs, such as `https://intranet/` or `file://server/share`. @mamico
diff --git a/packages/volto/news/6213.feature b/packages/volto/news/6213.feature
deleted file mode 100644
index 76fbceecdc..0000000000
--- a/packages/volto/news/6213.feature
+++ /dev/null
@@ -1,2 +0,0 @@
-
-Refactor the `DatetimeWidget` component from a class component to a functional component. @Raman-Luhach
diff --git a/packages/volto/news/6226.bugfix b/packages/volto/news/6226.bugfix
deleted file mode 100644
index a571bd1d1e..0000000000
--- a/packages/volto/news/6226.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Add Cypress test for search block sort on property. @iRohitSingh
diff --git a/packages/volto/news/6230.bugfix b/packages/volto/news/6230.bugfix
deleted file mode 100644
index 7e8bc151cb..0000000000
--- a/packages/volto/news/6230.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Remove unused i18n message for SortOn component. @davisagli
diff --git a/packages/volto/news/6231.internal b/packages/volto/news/6231.internal
deleted file mode 100644
index 99beab7a0c..0000000000
--- a/packages/volto/news/6231.internal
+++ /dev/null
@@ -1 +0,0 @@
-Allow setting the language for `make backend-docker-start`. Default is `en`. Added usage documentation in Contributing > Develop Volto core, and reorganized it. Cleaned up Configuration > Multilingual. @stevepiercy
diff --git a/packages/volto/news/6232.internal b/packages/volto/news/6232.internal
deleted file mode 100644
index d9d32916c7..0000000000
--- a/packages/volto/news/6232.internal
+++ /dev/null
@@ -1 +0,0 @@
-Revert rename of `.gitkeep`. @stevepiercy
diff --git a/packages/volto/news/6235.bugfix b/packages/volto/news/6235.bugfix
deleted file mode 100644
index 8967eedb2a..0000000000
--- a/packages/volto/news/6235.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Return a 302 response for server-side rendering of the Link view for unauthenticated users. @davisagli
diff --git a/packages/volto/news/6237.bugfix b/packages/volto/news/6237.bugfix
deleted file mode 100644
index 7bb075eac5..0000000000
--- a/packages/volto/news/6237.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix loading of .cjs in webpack. @davisagli
diff --git a/packages/volto/news/6239.documentation b/packages/volto/news/6239.documentation
deleted file mode 100644
index 84013472bd..0000000000
--- a/packages/volto/news/6239.documentation
+++ /dev/null
@@ -1 +0,0 @@
-Fix redirect of link in documentation to testing Redux store blog post. @stevepiercy
diff --git a/packages/volto/news/6240.bugfix b/packages/volto/news/6240.bugfix
deleted file mode 100644
index f69fbc8a6c..0000000000
--- a/packages/volto/news/6240.bugfix
+++ /dev/null
@@ -1,2 +0,0 @@
-fixed change of form.ui.hovered when editing blocks, because if you have a FormBlock component inside another one,
-onMouseOver fires for all stacked blocks and you cannot use the nested form. @giuliaghisini
diff --git a/packages/volto/news/6241.internal b/packages/volto/news/6241.internal
deleted file mode 100644
index d157a14bc8..0000000000
--- a/packages/volto/news/6241.internal
+++ /dev/null
@@ -1 +0,0 @@
-Upgrade Cypress to 13.13.2. @wesleybl
diff --git a/packages/volto/news/6242.internal b/packages/volto/news/6242.internal
deleted file mode 100644
index f362b022e0..0000000000
--- a/packages/volto/news/6242.internal
+++ /dev/null
@@ -1 +0,0 @@
-Complete upgrade Cypress to 13.13.2. Bump actions/upload-artifact@v1 to v4. @stevepiercy
diff --git a/packages/volto/news/6244.bugfix b/packages/volto/news/6244.bugfix
deleted file mode 100644
index 4b9b29e635..0000000000
--- a/packages/volto/news/6244.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Changed imports from relative to absolute to avoid type errors in add-on tests. @wesleybl
diff --git a/packages/volto/news/6247.bugfix b/packages/volto/news/6247.bugfix
deleted file mode 100644
index c74a667f3b..0000000000
--- a/packages/volto/news/6247.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-In the URL Management control panel, allow external URLs as targets. @davisagli
diff --git a/packages/volto/news/6248.feature b/packages/volto/news/6248.feature
deleted file mode 100644
index 8f809c135e..0000000000
--- a/packages/volto/news/6248.feature
+++ /dev/null
@@ -1,2 +0,0 @@
-The schema for the `ContentsPropertiesModal` can be enhanced using the `contentPropertiesSchemaEnhancer` setting.
-Also, the properties form is now prepopulated with values if all selected items share the same value. @davisagli
diff --git a/packages/volto/news/6249.bugfix b/packages/volto/news/6249.bugfix
new file mode 100644
index 0000000000..6e28743161
--- /dev/null
+++ b/packages/volto/news/6249.bugfix
@@ -0,0 +1 @@
+Add missing `for` attribute to checkbox label to improve accessibility. @gomez
\ No newline at end of file
diff --git a/packages/volto/news/6252.bugfix b/packages/volto/news/6252.bugfix
deleted file mode 100644
index ac84782906..0000000000
--- a/packages/volto/news/6252.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Disable save button when loading POST query @sabrina-bongiovanni
diff --git a/packages/volto/news/6258.bugfix b/packages/volto/news/6258.bugfix
deleted file mode 100644
index 44a9fe4b9a..0000000000
--- a/packages/volto/news/6258.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix `TypeError: values[0] is undefined` in Contents properties modal. @davisagli
diff --git a/packages/volto/news/6262.documentation b/packages/volto/news/6262.documentation
deleted file mode 100644
index 0018dd38ef..0000000000
--- a/packages/volto/news/6262.documentation
+++ /dev/null
@@ -1 +0,0 @@
-Fix redirect to Docker documentation. @stevepiercy
diff --git a/packages/volto/news/6269.breaking b/packages/volto/news/6269.breaking
deleted file mode 100644
index a361dd27fc..0000000000
--- a/packages/volto/news/6269.breaking
+++ /dev/null
@@ -1 +0,0 @@
-Move `Tags` component to the slot `belowContent`. @wesleybl
diff --git a/packages/volto/news/6273.bugfix b/packages/volto/news/6273.bugfix
deleted file mode 100644
index 6caa1e8e5e..0000000000
--- a/packages/volto/news/6273.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix error in `SortOn` component when no sort is selected. @davisagli
diff --git a/packages/volto/news/6274.internal b/packages/volto/news/6274.internal
deleted file mode 100644
index d56fc85f27..0000000000
--- a/packages/volto/news/6274.internal
+++ /dev/null
@@ -1 +0,0 @@
-Add `make i18n` command. @Faakhir30
diff --git a/packages/volto/news/6275.bugfix b/packages/volto/news/6275.bugfix
deleted file mode 100644
index 47f0ea53ba..0000000000
--- a/packages/volto/news/6275.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Place actions storybook in correct path. @Tishasoumya-02
\ No newline at end of file
diff --git a/packages/volto/news/6290.documentation b/packages/volto/news/6290.documentation
new file mode 100644
index 0000000000..d31cc808d4
--- /dev/null
+++ b/packages/volto/news/6290.documentation
@@ -0,0 +1 @@
+- Revised Cookieplone section in the Upgrade Guide. @stevepiercy
diff --git a/packages/volto/news/6299.bugfix b/packages/volto/news/6299.bugfix
new file mode 100644
index 0000000000..0d8ad4608a
--- /dev/null
+++ b/packages/volto/news/6299.bugfix
@@ -0,0 +1 @@
+Fixed findBlocks when no blocks are passed. @giuliaghisini
diff --git a/packages/volto/news/6330.bugfix b/packages/volto/news/6330.bugfix
new file mode 100644
index 0000000000..809f559863
--- /dev/null
+++ b/packages/volto/news/6330.bugfix
@@ -0,0 +1 @@
+Changed sidebar accordion text colour from @teal to @textColor. @JeffersonBledsoe
diff --git a/packages/volto/news/6332.bugfix b/packages/volto/news/6332.bugfix
new file mode 100644
index 0000000000..6b82b6cd5e
--- /dev/null
+++ b/packages/volto/news/6332.bugfix
@@ -0,0 +1 @@
+Labels accessibility for ArrayWidget, SelectWidget, TokenWidget. @folix-01
diff --git a/packages/volto/package.json b/packages/volto/package.json
index 03ee312ad8..9b31c08fde 100644
--- a/packages/volto/package.json
+++ b/packages/volto/package.json
@@ -9,7 +9,7 @@
     }
   ],
   "license": "MIT",
-  "version": "18.0.0-alpha.42",
+  "version": "18.0.0-alpha.43",
   "repository": {
     "type": "git",
     "url": "git@github.com:plone/volto.git"
diff --git a/packages/volto/src/components/manage/BlockChooser/BlockChooser.jsx b/packages/volto/src/components/manage/BlockChooser/BlockChooser.jsx
index 69b3d87c38..80c5142e81 100644
--- a/packages/volto/src/components/manage/BlockChooser/BlockChooser.jsx
+++ b/packages/volto/src/components/manage/BlockChooser/BlockChooser.jsx
@@ -1,4 +1,5 @@
 import React from 'react';
+import { useSelector } from 'react-redux';
 import PropTypes from 'prop-types';
 import { filter, map, groupBy, isEmpty } from 'lodash';
 import { Accordion, Button } from 'semantic-ui-react';
@@ -35,6 +36,7 @@ const BlockChooser = ({
   contentType,
 }) => {
   const intl = useIntl();
+  const user = useSelector((state) => state.users?.user);
   const hasAllowedBlocks = !isEmpty(allowedBlocks);
 
   const filteredBlocksConfig = filter(blocksConfig, (item) => {
@@ -57,7 +59,13 @@ const BlockChooser = ({
         // depending on this function, given properties (current present blocks) and the
         // block being evaluated
         return typeof item.restricted === 'function'
-          ? !item.restricted({ properties, block: item, navRoot, contentType })
+          ? !item.restricted({
+              properties,
+              block: item,
+              navRoot,
+              contentType,
+              user,
+            })
           : !item.restricted;
       }
     }
diff --git a/packages/volto/src/components/manage/Blocks/Block/Order/Item.jsx b/packages/volto/src/components/manage/Blocks/Block/Order/Item.jsx
index 68e20edcc6..5580fc416f 100644
--- a/packages/volto/src/components/manage/Blocks/Block/Order/Item.jsx
+++ b/packages/volto/src/components/manage/Blocks/Block/Order/Item.jsx
@@ -98,7 +98,9 @@ export const Item = forwardRef(
             <Icon name={dragSVG} size="16px" />
           </button>
           <span
-            className={cx('text', { errored: Object.keys(errors).length > 0 })}
+            className={cx('text', {
+              errored: errors && Object.keys(errors).length > 0,
+            })}
           >
             {config.blocks.blocksConfig[data?.['@type']]?.icon && (
               <Icon
diff --git a/packages/volto/src/components/manage/Blocks/Grid/View.jsx b/packages/volto/src/components/manage/Blocks/Grid/View.jsx
index b97676f36a..1be481253c 100644
--- a/packages/volto/src/components/manage/Blocks/Grid/View.jsx
+++ b/packages/volto/src/components/manage/Blocks/Grid/View.jsx
@@ -7,6 +7,9 @@ import config from '@plone/volto/registry';
 const GridBlockView = (props) => {
   const { data, path, className, style } = props;
   const metadata = props.metadata || props.properties;
+  if (data.blocks_layout === undefined) {
+    return null;
+  }
   const columns = data.blocks_layout.items;
   const blocksConfig =
     config.blocks.blocksConfig[data['@type']].blocksConfig ||
diff --git a/packages/volto/src/components/manage/Blocks/Search/components/CheckboxFacet.jsx b/packages/volto/src/components/manage/Blocks/Search/components/CheckboxFacet.jsx
index c4b86c1147..7d0665054f 100644
--- a/packages/volto/src/components/manage/Blocks/Search/components/CheckboxFacet.jsx
+++ b/packages/volto/src/components/manage/Blocks/Search/components/CheckboxFacet.jsx
@@ -21,6 +21,7 @@ const CheckboxFacet = (props) => {
         {choices.map(({ label, value }, i) => (
           <div className="entry" key={value}>
             <Checkbox
+              id={value}
               disabled={isEditMode}
               label={label}
               radio={!isMulti}
diff --git a/packages/volto/src/components/manage/Blocks/Search/components/__snapshots__/CheckboxFacet.test.jsx.snap b/packages/volto/src/components/manage/Blocks/Search/components/__snapshots__/CheckboxFacet.test.jsx.snap
index 35403900ec..a4505d82d8 100644
--- a/packages/volto/src/components/manage/Blocks/Search/components/__snapshots__/CheckboxFacet.test.jsx.snap
+++ b/packages/volto/src/components/manage/Blocks/Search/components/__snapshots__/CheckboxFacet.test.jsx.snap
@@ -25,11 +25,14 @@ exports[`CheckboxFacet renders a facet component with checkboxes 1`] = `
         <input
           checked={false}
           className="hidden"
+          id="first"
           readOnly={true}
           tabIndex={0}
           type="checkbox"
         />
-        <label>
+        <label
+          htmlFor="first"
+        >
           First
         </label>
       </div>
@@ -47,11 +50,14 @@ exports[`CheckboxFacet renders a facet component with checkboxes 1`] = `
         <input
           checked={false}
           className="hidden"
+          id="second"
           readOnly={true}
           tabIndex={0}
           type="checkbox"
         />
-        <label>
+        <label
+          htmlFor="second"
+        >
           Second
         </label>
       </div>
diff --git a/packages/volto/src/components/manage/Blocks/Search/widgets/SelectMetadataField.jsx b/packages/volto/src/components/manage/Blocks/Search/widgets/SelectMetadataField.jsx
index 79b1feadef..1b4f9a6841 100644
--- a/packages/volto/src/components/manage/Blocks/Search/widgets/SelectMetadataField.jsx
+++ b/packages/volto/src/components/manage/Blocks/Search/widgets/SelectMetadataField.jsx
@@ -3,8 +3,8 @@
  * @module components/manage/Widgets/SelectWidget
  */
 
-import { map, intersection, filter, toPairs, groupBy } from 'lodash';
-import React, { Component } from 'react';
+import { map, filter, toPairs, groupBy } from 'lodash';
+import { useEffect } from 'react';
 import PropTypes from 'prop-types';
 import { injectLazyLibs } from '@plone/volto/helpers/Loadable/Loadable';
 import { compose } from 'redux';
@@ -30,187 +30,118 @@ const messages = defineMessages({
 });
 
 /**
- * SelectWidget component class.
+ * SelectWidget component function.
  * @function SelectWidget
  * @returns {string} Markup of the component.
  */
-class SelectWidget extends Component {
-  /**
-   * Property types.
-   * @property {Object} propTypes Property types.
-   * @static
-   */
-  static propTypes = {
-    id: PropTypes.string.isRequired,
-    title: PropTypes.string.isRequired,
-    description: PropTypes.string,
-    required: PropTypes.bool,
-    error: PropTypes.arrayOf(PropTypes.string),
-    loading: PropTypes.bool,
-    value: PropTypes.oneOfType([
-      PropTypes.object,
-      PropTypes.string,
-      PropTypes.bool,
-    ]),
-    onChange: PropTypes.func.isRequired,
-    onBlur: PropTypes.func,
-    onClick: PropTypes.func,
-    onEdit: PropTypes.func,
-    onDelete: PropTypes.func,
-    wrapped: PropTypes.bool,
-    querystring: PropTypes.object,
-  };
+const SelectWidget = (props) => {
+  const { choices, vocabBaseUrl, getVocabulary } = props;
 
-  /**
-   * Default properties
-   * @property {Object} defaultProps Default properties.
-   * @static
-   */
-  static defaultProps = {
-    description: null,
-    required: false,
-    items: {
-      vocabulary: null,
-    },
-    widgetOptions: {
-      vocabulary: null,
-    },
-    error: [],
-    choices: [],
-    loading: false,
-    value: null,
-    onChange: () => {},
-    onBlur: () => {},
-    onClick: () => {},
-    onEdit: null,
-    onDelete: null,
-  };
-
-  state = {
-    selectedOption: this.props.value
-      ? { label: this.props.value.title, value: this.props.value.value }
-      : {},
-  };
-
-  /**
-   * Component did mount
-   * @method componentDidMount
-   * @returns {undefined}
-   */
-  componentDidMount() {
-    if (!this.props.choices && this.props.vocabBaseUrl) {
-      this.props.getVocabulary({ vocabNameOrURL: this.props.vocabBaseUrl });
+  useEffect(() => {
+    if (!choices && vocabBaseUrl) {
+      getVocabulary({ vocabNameOrURL: vocabBaseUrl });
     }
-  }
-
-  /**
-   * Initiate search with new query
-   * @method loadOptions
-   * @param {string} search Search query.
-   * @param {string} previousOptions The previous options rendered.
-   * @param {string} additional Additional arguments to pass to the next loadOptions.
-   * @returns {undefined}
-   */
-  loadOptions = (search, previousOptions, additional) => {
-    let hasMore = this.props.itemsTotal > previousOptions.length;
-    if (hasMore) {
-      const offset = this.state.search !== search ? 0 : additional.offset;
-      this.props.getVocabulary({
-        vocabNameOrURL: this.props.vocabBaseUrl,
-        query: search,
-        start: offset,
-      });
-      this.setState({ search });
-
-      return {
-        options:
-          intersection(previousOptions, this.props.choices).length ===
-          this.props.choices.length
-            ? []
-            : this.props.choices,
-        hasMore: hasMore,
-        additional: {
-          offset: offset === additional.offset ? offset + 25 : offset,
-        },
-      };
-    }
-    return null;
-  };
-
-  /* Customized to pass object instead of plain string value */
-  handleChange = (selectedOption) => {
-    this.setState({ selectedOption });
-    this.props.onChange(this.props.id, {
-      value: selectedOption.value,
-      title: selectedOption.label,
-    });
-  };
-
-  /**
-   * Render method.
-   * @method render
-   * @returns {string} Markup for the component.
-   */
-  render() {
-    const {
-      id,
-      // choices,
-      value,
-      onChange,
-      placeholder,
-      querystring,
-      filterOptions = identity,
-    } = this.props;
-    const isDisabled = false;
-    const { indexes = [] } = querystring;
-
-    const Select = this.props.reactSelect.default;
-
-    return (
-      <FormFieldWrapper {...this.props}>
-        <Select
-          id={`field-${id}`}
-          name={id}
-          placeholder={
-            placeholder ?? this.props.intl.formatMessage(messages.select)
-          }
-          isDisabled={isDisabled}
-          className="react-select-container"
-          classNamePrefix="react-select"
-          options={map(
-            toPairs(
-              groupBy(toPairs(filterOptions(indexes)), (item) => item[1].group),
+  }, [choices, vocabBaseUrl, getVocabulary]);
+
+  const {
+    id,
+    value,
+    onChange,
+    placeholder,
+    querystring,
+    filterOptions = identity,
+  } = props;
+
+  const isDisabled = false;
+  const { indexes = [] } = querystring;
+  const Select = props.reactSelect.default;
+
+  return (
+    <FormFieldWrapper {...props}>
+      <Select
+        id={`field-${id}`}
+        name={id}
+        placeholder={placeholder ?? props.intl.formatMessage(messages.select)}
+        isDisabled={isDisabled}
+        className="react-select-container"
+        classNamePrefix="react-select"
+        options={map(
+          toPairs(
+            groupBy(toPairs(filterOptions(indexes)), (item) => item[1].group),
+          ),
+          (group) => ({
+            label: group[0],
+            options: map(
+              filter(group[1], (item) => item[1].enabled),
+              (field) => ({
+                label: field[1].title,
+                value: field[0],
+              }),
             ),
-            (group) => ({
-              label: group[0],
-              options: map(
-                filter(group[1], (item) => item[1].enabled),
-                (field) => ({
-                  label: field[1].title,
-                  value: field[0],
-                }),
-              ),
-            }),
-          )}
-          styles={customSelectStyles}
-          theme={selectTheme}
-          components={{ DropdownIndicator, Option }}
-          value={{ value: value?.value, label: indexes[value?.value]?.title }}
-          onChange={(data) => {
-            let dataValue = [];
-            if (Array.isArray(data)) {
-              for (let obj of data) {
-                dataValue.push(obj.value);
-              }
-              return onChange(id, dataValue);
+          }),
+        )}
+        styles={customSelectStyles}
+        theme={selectTheme}
+        components={{ DropdownIndicator, Option }}
+        value={{
+          value: value?.value,
+          label: indexes[value?.value]?.title,
+        }}
+        onChange={(data) => {
+          let dataValue = [];
+          if (Array.isArray(data)) {
+            for (let obj of data) {
+              dataValue.push(obj.value);
             }
-            return onChange(id, data);
-          }}
-        />
-      </FormFieldWrapper>
-    );
-  }
-}
+            return onChange(id, dataValue);
+          }
+          return onChange(id, data);
+        }}
+      />
+    </FormFieldWrapper>
+  );
+};
+
+SelectWidget.propTypes = {
+  id: PropTypes.string.isRequired,
+  title: PropTypes.string.isRequired,
+  description: PropTypes.string,
+  required: PropTypes.bool,
+  error: PropTypes.arrayOf(PropTypes.string),
+  loading: PropTypes.bool,
+  value: PropTypes.oneOfType([
+    PropTypes.object,
+    PropTypes.string,
+    PropTypes.bool,
+  ]),
+  onChange: PropTypes.func.isRequired,
+  onBlur: PropTypes.func,
+  onClick: PropTypes.func,
+  onEdit: PropTypes.func,
+  onDelete: PropTypes.func,
+  wrapped: PropTypes.bool,
+  querystring: PropTypes.object,
+};
+
+SelectWidget.defaultProps = {
+  description: null,
+  required: false,
+  items: {
+    vocabulary: null,
+  },
+  widgetOptions: {
+    vocabulary: null,
+  },
+  error: [],
+  choices: [],
+  loading: false,
+  value: null,
+  onChange: () => {},
+  onBlur: () => {},
+  onClick: () => {},
+  onEdit: null,
+  onDelete: null,
+};
 
 export default compose(
   withQueryString,
diff --git a/packages/volto/src/components/manage/Contents/ContentsUploadModal.jsx b/packages/volto/src/components/manage/Contents/ContentsUploadModal.jsx
index 4290a3d95f..0d83026e2d 100644
--- a/packages/volto/src/components/manage/Contents/ContentsUploadModal.jsx
+++ b/packages/volto/src/components/manage/Contents/ContentsUploadModal.jsx
@@ -1,12 +1,6 @@
-/**
- * Contents upload modal.
- * @module components/manage/Contents/ContentsUploadModal
- */
-
-import React, { Component } from 'react';
+import { useState, useEffect } from 'react';
 import PropTypes from 'prop-types';
-import { connect } from 'react-redux';
-import { compose } from 'redux';
+import { shallowEqual, useDispatch, useSelector } from 'react-redux';
 import {
   Button,
   Dimmer,
@@ -23,10 +17,10 @@ import loadable from '@loadable/component';
 import { concat, filter, map } from 'lodash';
 import filesize from 'filesize';
 import { readAsDataURL } from 'promise-file-reader';
-import { FormattedMessage, defineMessages, injectIntl } from 'react-intl';
+import { FormattedMessage, defineMessages, useIntl } from 'react-intl';
 import { FormattedRelativeDate } from '@plone/volto/components';
 import { createContent } from '@plone/volto/actions';
-import { validateFileUploadSize } from '@plone/volto/helpers';
+import { validateFileUploadSize, usePrevious } from '@plone/volto/helpers';
 
 const Dropzone = loadable(() => import('react-dropzone'));
 
@@ -52,154 +46,77 @@ const messages = defineMessages({
 
 const SUBREQUEST = 'batch-upload';
 
-/**
- * ContentsUploadModal class.
- * @class ContentsUploadModal
- * @extends Component
- */
-class ContentsUploadModal extends Component {
-  /**
-   * Property types.
-   * @property {Object} propTypes Property types.
-   * @static
-   */
-  static propTypes = {
-    createContent: PropTypes.func.isRequired,
-    pathname: PropTypes.string.isRequired,
-    request: PropTypes.shape({
-      loading: PropTypes.bool,
-      loaded: PropTypes.bool,
-    }).isRequired,
-    open: PropTypes.bool.isRequired,
-    onOk: PropTypes.func.isRequired,
-    onCancel: PropTypes.func.isRequired,
-    uploadedFiles: PropTypes.number,
-    multiple: PropTypes.bool,
-    minSize: PropTypes.number,
-    maxSize: PropTypes.number,
-    accept: PropTypes.oneOfType([
-      PropTypes.string,
-      PropTypes.arrayOf(PropTypes.string),
-    ]),
-  };
+const ContentsUploadModal = (props) => {
+  const intl = useIntl();
+  const dispatch = useDispatch();
+  const request = useSelector(
+    (state) => state.content.subrequests?.[SUBREQUEST] || {},
+    shallowEqual,
+  );
+  const uploadedFiles = useSelector((state) => state.content.uploadedFiles);
 
-  /**
-   * Constructor
-   * @method constructor
-   * @param {Object} props Component properties
-   * @constructs ContentsUploadModal
-   */
-  constructor(props) {
-    super(props);
-    this.onRemoveFile = this.onRemoveFile.bind(this);
-    this.onDrop = this.onDrop.bind(this);
-    this.onCancel = this.onCancel.bind(this);
-    this.onSubmit = this.onSubmit.bind(this);
-    this.state = {
-      files: [],
-      totalFiles: 0,
-    };
-  }
-  /**
-   * Component will receive props
-   * @method componentWillReceiveProps
-   * @param {Object} nextProps Next properties
-   * @returns {undefined}
-   */
-  UNSAFE_componentWillReceiveProps(nextProps) {
-    if (this.props.request.loading && nextProps.request.loaded) {
-      this.props.onOk();
-      this.setState({
-        files: [],
-      });
+  const prevrequestloading = usePrevious(request.loading);
+  const [files, setFiles] = useState([]);
+  const [totalFiles, setTotalFiles] = useState(0);
+  const { onOk } = props;
+  useEffect(() => {
+    if (prevrequestloading && request.loaded) {
+      onOk();
+      setFiles([]);
     }
-  }
+  }, [prevrequestloading, request.loaded, onOk]);
 
-  /**
-   * Remove file handler
-   * @method onRemoveFile
-   * @param {Object} event Event object
-   * @returns {undefined}
-   */
-  onRemoveFile(event) {
-    this.setState({
-      files: filter(
-        this.state.files,
+  const onRemoveFile = (event) => {
+    setFiles(
+      filter(
+        files,
         (file, index) =>
           index !== parseInt(event.target.getAttribute('value'), 10),
       ),
-    });
-    this.setState((prevState) => ({ totalFiles: prevState.totalFiles - 1 }));
-  }
+    );
+    setTotalFiles(totalFiles - 1);
+  };
 
-  /**
-   * Drop handler
-   * @method onDrop
-   * @param {array} files File objects
-   * @returns {undefined}
-   */
-  onDrop = async (files) => {
+  const onDrop = async (newFiles) => {
     const validFiles = [];
-    for (let i = 0; i < files.length; i++) {
-      if (validateFileUploadSize(files[i], this.props.intl.formatMessage)) {
-        await readAsDataURL(files[i]).then((data) => {
+    for (let i = 0; i < newFiles.length; i++) {
+      if (validateFileUploadSize(newFiles[i], intl.formatMessage)) {
+        await readAsDataURL(newFiles[i]).then((data) => {
           const fields = data.match(/^data:(.*);(.*),(.*)$/);
-          files[i].preview = fields[0];
+          newFiles[i].preview = fields[0];
         });
-        validFiles.push(files[i]);
+        validFiles.push(newFiles[i]);
       }
     }
-    this.setState({
-      files: concat(this.state.files, validFiles),
-    });
-
-    this.setState({ totalFiles: validFiles.length });
+    setFiles(concat(files, validFiles));
+    setTotalFiles(validFiles.length);
   };
 
-  /**
-   * Cancel handler
-   * @method onCancel
-   * @returns {undefined}
-   */
-  onCancel() {
-    this.props.onCancel();
-    this.setState({
-      files: [],
-    });
-    this.setState({ totalFiles: 0 });
-  }
-  /**
-   * Name change handler
-   * @method onChangeFileName
-   * @returns {undefined}
-   */
+  const onCancel = () => {
+    props.onCancel();
+    setFiles([]);
+    setTotalFiles(0);
+  };
 
-  onChangeFileName(e, index) {
-    let copyOfFiles = [...this.state.files];
-    let originalFile = this.state.files[index];
+  const onChangeFileName = (e, index) => {
+    let copyOfFiles = [...files];
+    let originalFile = files[index];
     let newFile = new File([originalFile], e.target.value, {
       type: originalFile.type,
     });
     newFile.preview = originalFile.preview;
     newFile.path = e.target.value;
     copyOfFiles[index] = newFile;
-    this.setState({
-      files: copyOfFiles,
-    });
-  }
+    setFiles(copyOfFiles);
+  };
 
-  /**
-   * Submit handlers
-   * @method onSubmit
-   * @returns {undefined}
-   */
-  onSubmit() {
-    Promise.all(map(this.state.files, (file) => readAsDataURL(file))).then(
-      (files) => {
-        this.props.createContent(
-          this.props.pathname,
-          map(this.state.files, (file, index) => {
-            const fields = files[index].match(/^data:(.*);(.*),(.*)$/);
+  const onSubmit = () => {
+    Promise.all(map(files, (file) => readAsDataURL(file))).then((dataUrls) => {
+      dispatch(
+        createContent(
+          props.pathname,
+          map(files, (file, index) => {
+            const fields = dataUrls[index].match(/^data:(.*);(.*),(.*)$/);
             const image = fields[1].split('/')[0] === 'image';
             return {
               '@type': image ? 'Image' : 'File',
@@ -213,205 +130,195 @@ class ContentsUploadModal extends Component {
             };
           }),
           SUBREQUEST,
-        );
-      },
-    );
-  }
-
-  /**
-   * Render method.
-   * @method render
-   * @returns {string} Markup for the component.
-   */
-  render() {
-    const {
-      multiple = true,
-      minSize = null,
-      maxSize = null,
-      accept = null,
-      disabled = false,
-    } = this.props;
-
-    const dropzoneOptions = {
-      multiple,
-      minSize,
-      maxSize,
-      accept,
-      disabled,
-    };
+        ),
+      );
+    });
+  };
 
-    return (
-      this.props.open && (
-        <Modal className="contents-upload-modal" open={this.props.open}>
-          <Header>
-            <FormattedMessage id="Upload files" defaultMessage="Upload files" />
-          </Header>
+  const {
+    multiple = true,
+    minSize = null,
+    maxSize = null,
+    accept = null,
+    disabled = false,
+  } = props;
+  const dropzoneOptions = {
+    multiple,
+    minSize,
+    maxSize,
+    accept,
+    disabled,
+  };
 
-          <Dimmer active={this.props.request.loading}>
-            <div className="progress-container">
-              <Progress
-                className="progress-bar"
-                value={this.props.uploadedFiles}
-                total={this.state.totalFiles}
-              >
-                {this.props.intl.formatMessage(messages.filesUploaded, {
-                  uploadedFiles: this.props.uploadedFiles,
-                })}
-                <br />
-                {this.props.intl.formatMessage(messages.totalFilesToUpload, {
-                  totalFiles: this.state.totalFiles,
-                })}
-              </Progress>
-            </div>
-          </Dimmer>
-          <Modal.Content>
-            <Dropzone
-              onDrop={this.onDrop}
-              className="dropzone"
-              noDragEventsBubbling={true}
-              {...dropzoneOptions}
+  return (
+    props.open && (
+      <Modal className="contents-upload-modal" open={props.open}>
+        <Header>
+          <FormattedMessage id="Upload files" defaultMessage="Upload files" />
+        </Header>
+        <Dimmer active={request.loading}>
+          <div className="progress-container">
+            <Progress
+              className="progress-bar"
+              value={uploadedFiles}
+              total={totalFiles}
             >
-              {({ getRootProps, getInputProps }) => (
-                <div {...getRootProps({ className: 'dashed' })}>
-                  <Segment>
-                    <Table basic="very">
-                      <Table.Body>
-                        <Table.Row>
-                          <Table.Cell>
+              {intl.formatMessage(messages.filesUploaded, {
+                uploadedFiles,
+              })}
+              <br />
+              {intl.formatMessage(messages.totalFilesToUpload, {
+                totalFiles,
+              })}
+            </Progress>
+          </div>
+        </Dimmer>
+        <Modal.Content>
+          <Dropzone
+            onDrop={onDrop}
+            className="dropzone"
+            noDragEventsBubbling={true}
+            {...dropzoneOptions}
+          >
+            {({ getRootProps, getInputProps }) => (
+              <div {...getRootProps({ className: 'dashed' })}>
+                <Segment>
+                  <Table basic="very">
+                    <Table.Body>
+                      <Table.Row>
+                        <Table.Cell>
+                          <FormattedMessage
+                            id="Drag and drop files from your computer onto this area or click the “Browse” button."
+                            defaultMessage="Drag and drop files from your computer onto this area or click the “Browse” button."
+                          />
+                        </Table.Cell>
+                        <Table.Cell>
+                          <Button className="ui button primary">
                             <FormattedMessage
-                              id="Drag and drop files from your computer onto this area or click the “Browse” button."
-                              defaultMessage="Drag and drop files from your computer onto this area or click the “Browse” button."
-                            />
-                          </Table.Cell>
-                          <Table.Cell>
-                            <Button className="ui button primary">
-                              <FormattedMessage
-                                id="Browse"
-                                defaultMessage="Browse"
-                              />
-                            </Button>
-                            <input
-                              {...getInputProps({
-                                type: 'file',
-                                style: { display: 'none' },
-                              })}
+                              id="Browse"
+                              defaultMessage="Browse"
                             />
-                          </Table.Cell>
-                        </Table.Row>
-                      </Table.Body>
-                    </Table>
-                  </Segment>
-                </div>
-              )}
-            </Dropzone>
-            {this.state.files.length > 0 && (
-              <Table compact singleLine>
-                <Table.Header>
-                  <Table.Row>
-                    <Table.HeaderCell width={8}>
-                      <FormattedMessage
-                        id="Filename"
-                        defaultMessage="Filename"
-                      />
-                    </Table.HeaderCell>
-                    <Table.HeaderCell width={4}>
-                      <FormattedMessage
-                        id="Last modified"
-                        defaultMessage="Last modified"
+                          </Button>
+                          <input
+                            {...getInputProps({
+                              type: 'file',
+                              style: { display: 'none' },
+                            })}
+                          />
+                        </Table.Cell>
+                      </Table.Row>
+                    </Table.Body>
+                  </Table>
+                </Segment>
+              </div>
+            )}
+          </Dropzone>
+          {files.length > 0 && (
+            <Table compact singleLine>
+              <Table.Header>
+                <Table.Row>
+                  <Table.HeaderCell width={8}>
+                    <FormattedMessage id="Filename" defaultMessage="Filename" />
+                  </Table.HeaderCell>
+                  <Table.HeaderCell width={4}>
+                    <FormattedMessage
+                      id="Last modified"
+                      defaultMessage="Last modified"
+                    />
+                  </Table.HeaderCell>
+                  <Table.HeaderCell width={4}>
+                    <FormattedMessage
+                      id="File size"
+                      defaultMessage="File size"
+                    />
+                  </Table.HeaderCell>
+                  <Table.HeaderCell width={4}>
+                    <FormattedMessage id="Preview" defaultMessage="Preview" />
+                  </Table.HeaderCell>
+                  <Table.HeaderCell />
+                </Table.Row>
+              </Table.Header>
+              <Table.Body>
+                {map(files, (file, index) => (
+                  <Table.Row className="upload-row" key={index}>
+                    <Table.Cell>
+                      <Input
+                        className="file-name"
+                        value={file.name}
+                        onChange={(e) => onChangeFileName(e, index)}
                       />
-                    </Table.HeaderCell>
-                    <Table.HeaderCell width={4}>
-                      <FormattedMessage
-                        id="File size"
-                        defaultMessage="File size"
+                    </Table.Cell>
+                    <Table.Cell>
+                      {file.lastModifiedDate && (
+                        <FormattedRelativeDate date={file.lastModifiedDate} />
+                      )}
+                    </Table.Cell>
+                    <Table.Cell>{filesize(file.size, { round: 0 })}</Table.Cell>
+                    <Table.Cell>
+                      {file.type.split('/')[0] === 'image' && (
+                        <Image src={file.preview} height={60} />
+                      )}
+                    </Table.Cell>
+                    <Table.Cell>
+                      <Icon
+                        name="close"
+                        value={index}
+                        link
+                        onClick={onRemoveFile}
                       />
-                    </Table.HeaderCell>
-                    <Table.HeaderCell width={4}>
-                      <FormattedMessage id="Preview" defaultMessage="Preview" />
-                    </Table.HeaderCell>
-                    <Table.HeaderCell />
+                    </Table.Cell>
                   </Table.Row>
-                </Table.Header>
-                <Table.Body>
-                  {map(this.state.files, (file, index) => (
-                    <Table.Row className="upload-row" key={index}>
-                      <Table.Cell>
-                        <Input
-                          className="file-name"
-                          value={file.name}
-                          onChange={(e) => this.onChangeFileName(e, index)}
-                        />
-                      </Table.Cell>
-                      <Table.Cell>
-                        {file.lastModifiedDate && (
-                          <FormattedRelativeDate date={file.lastModifiedDate} />
-                        )}
-                      </Table.Cell>
-                      <Table.Cell>
-                        {filesize(file.size, { round: 0 })}
-                      </Table.Cell>
-                      <Table.Cell>
-                        {file.type.split('/')[0] === 'image' && (
-                          <Image src={file.preview} height={60} />
-                        )}
-                      </Table.Cell>
-                      <Table.Cell>
-                        <Icon
-                          name="close"
-                          value={index}
-                          link
-                          onClick={this.onRemoveFile}
-                        />
-                      </Table.Cell>
-                    </Table.Row>
-                  ))}
-                </Table.Body>
-              </Table>
-            )}
-          </Modal.Content>
-          <Modal.Actions>
-            {this.state.files.length > 0 && (
-              <Button
-                basic
-                circular
-                primary
-                floated="right"
-                icon="arrow right"
-                aria-label={this.props.intl.formatMessage(messages.upload, {
-                  count: this.state.files.length,
-                })}
-                onClick={this.onSubmit}
-                title={this.props.intl.formatMessage(messages.upload, {
-                  count: this.state.files.length,
-                })}
-                size="big"
-              />
-            )}
+                ))}
+              </Table.Body>
+            </Table>
+          )}
+        </Modal.Content>
+        <Modal.Actions>
+          {files.length > 0 && (
             <Button
               basic
               circular
-              secondary
-              icon="remove"
-              aria-label={this.props.intl.formatMessage(messages.cancel)}
-              title={this.props.intl.formatMessage(messages.cancel)}
+              primary
               floated="right"
+              icon="arrow right"
+              aria-label={intl.formatMessage(messages.upload, {
+                count: files.length,
+              })}
+              onClick={onSubmit}
+              title={intl.formatMessage(messages.upload, {
+                count: files.length,
+              })}
               size="big"
-              onClick={this.onCancel}
             />
-          </Modal.Actions>
-        </Modal>
-      )
-    );
-  }
-}
+          )}
+          <Button
+            basic
+            circular
+            secondary
+            icon="remove"
+            aria-label={intl.formatMessage(messages.cancel)}
+            title={intl.formatMessage(messages.cancel)}
+            floated="right"
+            size="big"
+            onClick={onCancel}
+          />
+        </Modal.Actions>
+      </Modal>
+    )
+  );
+};
 
-export default compose(
-  injectIntl,
-  connect(
-    (state) => ({
-      request: state.content.subrequests?.[SUBREQUEST] || {},
-      uploadedFiles: state.content.uploadedFiles,
-    }),
-    { createContent },
-  ),
-)(ContentsUploadModal);
+ContentsUploadModal.propTypes = {
+  pathname: PropTypes.string.isRequired,
+  open: PropTypes.bool.isRequired,
+  onOk: PropTypes.func.isRequired,
+  onCancel: PropTypes.func.isRequired,
+  multiple: PropTypes.bool,
+  minSize: PropTypes.number,
+  maxSize: PropTypes.number,
+  accept: PropTypes.oneOfType([
+    PropTypes.string,
+    PropTypes.arrayOf(PropTypes.string),
+  ]),
+};
+export default ContentsUploadModal;
diff --git a/packages/volto/src/components/manage/Contents/ContentsUploadModal.stories.jsx b/packages/volto/src/components/manage/Contents/ContentsUploadModal.stories.jsx
new file mode 100644
index 0000000000..8bc635399c
--- /dev/null
+++ b/packages/volto/src/components/manage/Contents/ContentsUploadModal.stories.jsx
@@ -0,0 +1,56 @@
+import { injectIntl } from 'react-intl';
+import React from 'react';
+import ContentsUploadModalComponent from './ContentsUploadModal';
+import { RealStoreWrapper as Wrapper } from '@plone/volto/storybook';
+
+const IntlContentUploadModalComponent = injectIntl(
+  ContentsUploadModalComponent,
+);
+
+function StoryComponent(args) {
+  return (
+    <Wrapper
+      customStore={{
+        content: {
+          create: {
+            loading: false,
+            loaded: true,
+          },
+        },
+        intl: {
+          locale: 'en',
+          messages: {},
+        },
+      }}
+    >
+      <div id="toolbar" style={{ display: 'none' }} />
+      <IntlContentUploadModalComponent
+        {...args}
+        pathname="/blog"
+        loading={false}
+        loaded={true}
+        onOk={() => {}}
+        onCancel={() => {}}
+      />
+    </Wrapper>
+  );
+}
+
+export const ContentUploadModal = StoryComponent.bind({});
+
+ContentUploadModal.args = {
+  open: false,
+};
+
+export default {
+  title: 'Public components/Contents/Content Upload Modal',
+  component: ContentUploadModal,
+  decorators: [
+    (Story) => (
+      <div className="ui segment form attached" style={{ width: '400px' }}>
+        <Story />
+      </div>
+    ),
+  ],
+  argTypes: {},
+};
diff --git a/packages/volto/src/components/manage/Widgets/ArrayWidget.jsx b/packages/volto/src/components/manage/Widgets/ArrayWidget.jsx
index 2670cc84bc..dc361195b3 100644
--- a/packages/volto/src/components/manage/Widgets/ArrayWidget.jsx
+++ b/packages/volto/src/components/manage/Widgets/ArrayWidget.jsx
@@ -314,6 +314,7 @@ class ArrayWidget extends Component {
           // small fix for https://github.com/clauderic/react-sortable-hoc/pull/352:
           getHelperDimensions={({ node }) => node.getBoundingClientRect()}
           id={`field-${this.props.id}`}
+          aria-labelledby={`fieldset-${this.props.fieldSet}-field-label-${this.props.id}`}
           key={this.props.id}
           isDisabled={this.props.disabled || this.props.isDisabled}
           className="react-select-container"
diff --git a/packages/volto/src/components/manage/Widgets/SelectWidget.jsx b/packages/volto/src/components/manage/Widgets/SelectWidget.jsx
index 64b0cdea69..0c9d61e12f 100644
--- a/packages/volto/src/components/manage/Widgets/SelectWidget.jsx
+++ b/packages/volto/src/components/manage/Widgets/SelectWidget.jsx
@@ -224,6 +224,7 @@ class SelectWidget extends Component {
           id={`field-${id}`}
           key={choices}
           name={id}
+          aria-labelledby={`fieldset-${this.props.fieldSet}-field-label-${id}`}
           menuShouldScrollIntoView={false}
           isDisabled={disabled}
           isSearchable={true}
diff --git a/packages/volto/src/components/manage/Widgets/TokenWidget.jsx b/packages/volto/src/components/manage/Widgets/TokenWidget.jsx
index b38de6897d..cad1f0bdcb 100644
--- a/packages/volto/src/components/manage/Widgets/TokenWidget.jsx
+++ b/packages/volto/src/components/manage/Widgets/TokenWidget.jsx
@@ -173,6 +173,7 @@ class TokenWidget extends Component {
       <FormFieldWrapper {...this.props}>
         <CreatableSelect
           id={`field-${this.props.id}`}
+          aria-labelledby={`fieldset-${this.props.fieldSet}-field-label-${this.props.id}`}
           key={this.props.id}
           menuShouldScrollIntoView={false}
           isDisabled={this.props.isDisabled}
diff --git a/packages/volto/src/components/manage/Widgets/__snapshots__/ArrayWidget.test.jsx.snap b/packages/volto/src/components/manage/Widgets/__snapshots__/ArrayWidget.test.jsx.snap
index 5a9dbbe75c..e37658da42 100644
--- a/packages/volto/src/components/manage/Widgets/__snapshots__/ArrayWidget.test.jsx.snap
+++ b/packages/volto/src/components/manage/Widgets/__snapshots__/ArrayWidget.test.jsx.snap
@@ -67,6 +67,7 @@ exports[`No 'No value' option when default value is 0 1`] = `
                   >
                     <input
                       aria-autocomplete="list"
+                      aria-labelledby="fieldset-default-field-label-my-field"
                       autocapitalize="none"
                       autocomplete="off"
                       autocorrect="off"
@@ -212,6 +213,7 @@ exports[`renders an array widget component 1`] = `
                 >
                   <input
                     aria-autocomplete="list"
+                    aria-labelledby="fieldset-default-field-label-my-field"
                     autoCapitalize="none"
                     autoComplete="off"
                     autoCorrect="off"
diff --git a/packages/volto/src/components/manage/Widgets/__snapshots__/SelectWidget.test.jsx.snap b/packages/volto/src/components/manage/Widgets/__snapshots__/SelectWidget.test.jsx.snap
index 26d283e85c..8433abffa3 100644
--- a/packages/volto/src/components/manage/Widgets/__snapshots__/SelectWidget.test.jsx.snap
+++ b/packages/volto/src/components/manage/Widgets/__snapshots__/SelectWidget.test.jsx.snap
@@ -67,6 +67,7 @@ exports[`No 'No value' option when default value is 0 1`] = `
                   >
                     <input
                       aria-autocomplete="list"
+                      aria-labelledby="fieldset-default-field-label-my-field"
                       autocapitalize="none"
                       autocomplete="off"
                       autocorrect="off"
@@ -222,6 +223,7 @@ exports[`renders a select widget component 1`] = `
                   >
                     <input
                       aria-autocomplete="list"
+                      aria-labelledby="fieldset-default-field-label-my-field"
                       autocapitalize="none"
                       autocomplete="off"
                       autocorrect="off"
diff --git a/packages/volto/src/components/manage/Widgets/__snapshots__/TokenWidget.test.jsx.snap b/packages/volto/src/components/manage/Widgets/__snapshots__/TokenWidget.test.jsx.snap
index 2d2d3857df..2c9f365436 100644
--- a/packages/volto/src/components/manage/Widgets/__snapshots__/TokenWidget.test.jsx.snap
+++ b/packages/volto/src/components/manage/Widgets/__snapshots__/TokenWidget.test.jsx.snap
@@ -64,6 +64,7 @@ exports[`renders a token widget component 1`] = `
                 >
                   <input
                     aria-autocomplete="list"
+                    aria-labelledby="fieldset-default-field-label-my-field"
                     autoCapitalize="none"
                     autoComplete="off"
                     autoCorrect="off"
diff --git a/packages/volto/src/config/ControlPanels.js b/packages/volto/src/config/ControlPanels.js
index 8b7dca7461..1aaeabf488 100644
--- a/packages/volto/src/config/ControlPanels.js
+++ b/packages/volto/src/config/ControlPanels.js
@@ -90,6 +90,7 @@ export const unwantedControlPanelsFields = {
   navigation: [
     'generate_tabs',
     'navigation_depth',
+    'nonfolderish_tabs',
     'sort_tabs_on',
     'sort_tabs_reversed',
     'sitemap_depth',
diff --git a/packages/volto/src/config/NonContentRoutesPublic.jsx b/packages/volto/src/config/NonContentRoutesPublic.jsx
new file mode 100644
index 0000000000..30583c15f3
--- /dev/null
+++ b/packages/volto/src/config/NonContentRoutesPublic.jsx
@@ -0,0 +1,15 @@
+// PublicUi routes that are nonContentRoutes, and should not be members of isCmsUi
+// You can include either RegEx or a string representing the ending of the
+// nonContentRoute. For example, '/add' will match '/foo/bar/add'.
+export const nonContentRoutesPublic = [
+  '/login',
+  '/logout',
+  '/sitemap',
+  '/register',
+  '/search',
+  '/change-password',
+  '/contact-form',
+  '/register',
+  /\/passwordreset\/.*$/,
+  '/passwordreset',
+];
diff --git a/packages/volto/src/config/config.test.js b/packages/volto/src/config/config.test.js
index dcef327e32..59ae1dcc8a 100644
--- a/packages/volto/src/config/config.test.js
+++ b/packages/volto/src/config/config.test.js
@@ -221,6 +221,7 @@ test('test navigation controlpanel fields', () => {
   const not_in_navigation = [
     'generate_tabs',
     'navigation_depth',
+    'nonfolderish_tabs',
     'sort_tabs_on',
     'sort_tabs_reversed',
     'sitemap_depth',
diff --git a/packages/volto/src/config/index.js b/packages/volto/src/config/index.js
index 5dea078810..803048b14d 100644
--- a/packages/volto/src/config/index.js
+++ b/packages/volto/src/config/index.js
@@ -8,6 +8,7 @@ import {
   layoutViewsNamesMapping,
 } from './Views';
 import { nonContentRoutes } from './NonContentRoutes';
+import { nonContentRoutesPublic } from './NonContentRoutesPublic';
 import {
   groupBlocksOrder,
   requiredBlocks,
@@ -113,6 +114,7 @@ let config = {
     legacyTraverse: process.env.RAZZLE_LEGACY_TRAVERSE || false,
     cookieExpires: 15552000, //in seconds. Default is 6 month (15552000)
     nonContentRoutes,
+    nonContentRoutesPublic,
     imageObjects: ['Image'],
     reservedIds: ['login', 'layout', 'plone', 'zip', 'properties'],
     downloadableObjects: ['File'], //list of content-types for which the direct download of the file will be carried out if the user is not authenticated
diff --git a/packages/volto/src/helpers/Blocks/Blocks.js b/packages/volto/src/helpers/Blocks/Blocks.js
index 88f1a5ed15..6b24de9080 100644
--- a/packages/volto/src/helpers/Blocks/Blocks.js
+++ b/packages/volto/src/helpers/Blocks/Blocks.js
@@ -718,7 +718,7 @@ export function isBlockContainer(block) {
  * @param {Object} types A list with the list of types to be matched
  * @return {Array} An array of block ids
  */
-export function findBlocks(blocks, types, result = []) {
+export function findBlocks(blocks = {}, types, result = []) {
   Object.keys(blocks).forEach((blockId) => {
     const block = blocks[blockId];
     // check blocks from data as well since some add-ons use that
diff --git a/packages/volto/src/helpers/Url/Url.js b/packages/volto/src/helpers/Url/Url.js
index fe58098824..889d2c04a2 100644
--- a/packages/volto/src/helpers/Url/Url.js
+++ b/packages/volto/src/helpers/Url/Url.js
@@ -139,7 +139,10 @@ export const isCmsUi = memoize((currentPathname) => {
   // because the regexp test does not take that into account
   // https://github.com/plone/volto/issues/870
   return settings.nonContentRoutes.reduce(
-    (acc, route) => acc || new RegExp(route).test(`/${fullPath}`),
+    (acc, route) =>
+      acc ||
+      (!settings.nonContentRoutesPublic?.includes(route) &&
+        new RegExp(route).test(fullPath)),
     false,
   );
 });
diff --git a/packages/volto/src/helpers/Url/Url.test.js b/packages/volto/src/helpers/Url/Url.test.js
index b85ef9fc3a..d5ca89fb3f 100644
--- a/packages/volto/src/helpers/Url/Url.test.js
+++ b/packages/volto/src/helpers/Url/Url.test.js
@@ -151,15 +151,29 @@ describe('Url', () => {
   describe('isCmsUi', () => {
     [...settings.nonContentRoutes, '/controlpanel/mypanel'].forEach((route) => {
       if (typeof route === 'string') {
-        it(`matches non-content-route ${route}`, () => {
-          expect(isCmsUi(`/mycontent/${route}`)).toBe(true);
-        });
+        if (settings.nonContentRoutesPublic.includes(route)) {
+          it(`matches non-content-route-public ${route}`, () => {
+            expect(isCmsUi(route)).toBe(false);
+          });
+        } else {
+          it(`matches non-content-route ${route}`, () => {
+            expect(isCmsUi(`/mycontent/${route}`)).toBe(true);
+          });
+        }
       }
     });
 
     it('returns false on non-cms-ui views', () => {
       expect(isCmsUi('/mycontent')).toBe(false);
     });
+
+    it('returns true on non content routes', () => {
+      expect(isCmsUi('/mycontent/historyview')).toBe(true);
+    });
+
+    it('returns false on public non content routes', () => {
+      expect(isCmsUi('/mycontent/login')).toBe(false);
+    });
   });
 
   describe('flattenHTMLToAppURL', () => {
diff --git a/packages/volto/test-setup-config.jsx b/packages/volto/test-setup-config.jsx
index 59cb64257f..890205193a 100644
--- a/packages/volto/test-setup-config.jsx
+++ b/packages/volto/test-setup-config.jsx
@@ -10,6 +10,7 @@ import React from 'react';
 import config from '@plone/volto/registry';
 import { loadables } from '@plone/volto/config/Loadables';
 import { nonContentRoutes } from '@plone/volto/config/NonContentRoutes';
+import { nonContentRoutesPublic } from '@plone/volto/config/NonContentRoutesPublic';
 import { contentIcons } from '@plone/volto/config/ContentIcons';
 import {
   styleClassNameConverters,
@@ -35,6 +36,7 @@ config.set('settings', {
   showTags: true,
   isMultilingual: false,
   nonContentRoutes,
+  nonContentRoutesPublic,
   contentIcons: contentIcons,
   loadables,
   lazyBundles: {
diff --git a/packages/volto/theme/themes/pastanaga/collections/form.overrides b/packages/volto/theme/themes/pastanaga/collections/form.overrides
index 3d5ae5e965..680367e099 100644
--- a/packages/volto/theme/themes/pastanaga/collections/form.overrides
+++ b/packages/volto/theme/themes/pastanaga/collections/form.overrides
@@ -50,6 +50,7 @@
 
   &:focus {
     border-radius: 0;
+    color: @textColor;
   }
 }
 
diff --git a/packages/volto/theme/themes/pastanaga/modules/accordion.variables b/packages/volto/theme/themes/pastanaga/modules/accordion.variables
index d3c1835b1a..ffa6fb712b 100644
--- a/packages/volto/theme/themes/pastanaga/modules/accordion.variables
+++ b/packages/volto/theme/themes/pastanaga/modules/accordion.variables
@@ -34,14 +34,14 @@
 
 /* Styled Title */
 @styledTitleFontWeight: @normal;
-@styledTitleColor: @teal;
+@styledTitleColor: @textColor;
 @styledTitleBorder: none;
 
 /* Styled Title States */
 @styledTitleHoverBackground: @darkWhite;
-@styledTitleHoverColor: @teal;
+@styledTitleHoverColor: @textColor;
 @styledActiveTitleBackground: @darkWhite;
-@styledActiveTitleColor: @teal;
+@styledActiveTitleColor: @textColor;
 
 /* Styled Child Title States */
 
diff --git a/packages/volto/types/components/manage/Actions/Actions.stories.d.ts b/packages/volto/types/components/manage/Actions/Actions.stories.d.ts
new file mode 100644
index 0000000000..d10a5d29a4
--- /dev/null
+++ b/packages/volto/types/components/manage/Actions/Actions.stories.d.ts
@@ -0,0 +1,8 @@
+export const Actions: any;
+declare namespace _default {
+    export let title: string;
+    export { Actions as component };
+    export let decorators: ((Story: any) => import("react/jsx-runtime").JSX.Element)[];
+    export let argTypes: {};
+}
+export default _default;
diff --git a/packages/volto/types/components/manage/Blocks/LeadImage/Edit.d.ts b/packages/volto/types/components/manage/Blocks/LeadImage/Edit.d.ts
index c4a5a9776a..8b15800766 100644
--- a/packages/volto/types/components/manage/Blocks/LeadImage/Edit.d.ts
+++ b/packages/volto/types/components/manage/Blocks/LeadImage/Edit.d.ts
@@ -1,5 +1,14 @@
-declare const _default: React.FC<import("react-intl").WithIntlProps<any>> & {
-    WrappedComponent: React.ComponentType<any>;
-};
-export default _default;
-import React from 'react';
+export default Edit;
+declare function Edit(props: any): import("react/jsx-runtime").JSX.Element;
+declare namespace Edit {
+    namespace propTypes {
+        let properties: any;
+        let selected: any;
+        let block: any;
+        let index: any;
+        let data: any;
+        let pathname: any;
+        let onChangeBlock: any;
+        let openObjectBrowser: any;
+    }
+}
diff --git a/packages/volto/types/components/manage/Blocks/Search/widgets/SelectMetadataField.d.ts b/packages/volto/types/components/manage/Blocks/Search/widgets/SelectMetadataField.d.ts
index 24d035eb05..007d6061c3 100644
--- a/packages/volto/types/components/manage/Blocks/Search/widgets/SelectMetadataField.d.ts
+++ b/packages/volto/types/components/manage/Blocks/Search/widgets/SelectMetadataField.d.ts
@@ -1,10 +1,5 @@
 declare const _default: {
     (props: any): import("react/jsx-runtime").JSX.Element;
-    /**
-     * Property types.
-     * @property {Object} propTypes Property types.
-     * @static
-     */
     displayName: string;
 };
 export default _default;
diff --git a/packages/volto/types/components/manage/Blocks/ToC/Edit.d.ts b/packages/volto/types/components/manage/Blocks/ToC/Edit.d.ts
index a8c57888ad..2b00584490 100644
--- a/packages/volto/types/components/manage/Blocks/ToC/Edit.d.ts
+++ b/packages/volto/types/components/manage/Blocks/ToC/Edit.d.ts
@@ -1,7 +1,2 @@
 export default Edit;
-declare class Edit extends React.Component<any, any, any> {
-    constructor(props: any);
-    constructor(props: any, context: any);
-    render(): import("react/jsx-runtime").JSX.Element;
-}
-import React from 'react';
+declare function Edit(props: any): import("react/jsx-runtime").JSX.Element;
diff --git a/packages/volto/types/components/manage/Blocks/Video/Edit.d.ts b/packages/volto/types/components/manage/Blocks/Video/Edit.d.ts
index 5298df7f0f..c17a3f4a2e 100644
--- a/packages/volto/types/components/manage/Blocks/Video/Edit.d.ts
+++ b/packages/volto/types/components/manage/Blocks/Video/Edit.d.ts
@@ -1,2 +1,2 @@
-declare const _default: any;
+declare const _default: (props: any) => import("react/jsx-runtime").JSX.Element;
 export default _default;
diff --git a/packages/volto/types/components/manage/Blocks/Video/Edit.stories.d.ts b/packages/volto/types/components/manage/Blocks/Video/Edit.stories.d.ts
new file mode 100644
index 0000000000..25e7b03027
--- /dev/null
+++ b/packages/volto/types/components/manage/Blocks/Video/Edit.stories.d.ts
@@ -0,0 +1,8 @@
+export const Video: any;
+declare namespace _default {
+    export let title: string;
+    export { Video as component };
+    export let decorators: ((Story: any) => import("react/jsx-runtime").JSX.Element)[];
+    export let argTypes: {};
+}
+export default _default;
diff --git a/packages/volto/types/components/manage/Contents/ContentsBreadcrumbs.stories.d.ts b/packages/volto/types/components/manage/Contents/ContentsBreadcrumbs.stories.d.ts
new file mode 100644
index 0000000000..ecead73652
--- /dev/null
+++ b/packages/volto/types/components/manage/Contents/ContentsBreadcrumbs.stories.d.ts
@@ -0,0 +1,8 @@
+export const ContentBreadcrumbs: any;
+declare namespace _default {
+    export let title: string;
+    export { ContentBreadcrumbs as component };
+    export let decorators: ((Story: any) => import("react/jsx-runtime").JSX.Element)[];
+    export let argTypes: {};
+}
+export default _default;
diff --git a/packages/volto/types/components/manage/Contents/ContentsUploadModal.d.ts b/packages/volto/types/components/manage/Contents/ContentsUploadModal.d.ts
index 5298df7f0f..30685e62c4 100644
--- a/packages/volto/types/components/manage/Contents/ContentsUploadModal.d.ts
+++ b/packages/volto/types/components/manage/Contents/ContentsUploadModal.d.ts
@@ -1,2 +1,14 @@
-declare const _default: any;
-export default _default;
+export default ContentsUploadModal;
+declare function ContentsUploadModal(props: any): import("react/jsx-runtime").JSX.Element;
+declare namespace ContentsUploadModal {
+    namespace propTypes {
+        let pathname: any;
+        let open: any;
+        let onOk: any;
+        let onCancel: any;
+        let multiple: any;
+        let minSize: any;
+        let maxSize: any;
+        let accept: any;
+    }
+}
diff --git a/packages/volto/types/components/manage/Contents/ContentsUploadModal.stories.d.ts b/packages/volto/types/components/manage/Contents/ContentsUploadModal.stories.d.ts
new file mode 100644
index 0000000000..7583bd54e5
--- /dev/null
+++ b/packages/volto/types/components/manage/Contents/ContentsUploadModal.stories.d.ts
@@ -0,0 +1,8 @@
+export const ContentUploadModal: any;
+declare namespace _default {
+    export let title: string;
+    export { ContentUploadModal as component };
+    export let decorators: ((Story: any) => import("react/jsx-runtime").JSX.Element)[];
+    export let argTypes: {};
+}
+export default _default;
diff --git a/packages/volto/types/components/manage/Contents/index.d.ts b/packages/volto/types/components/manage/Contents/index.d.ts
index aeec19b41e..8aa4ed627e 100644
--- a/packages/volto/types/components/manage/Contents/index.d.ts
+++ b/packages/volto/types/components/manage/Contents/index.d.ts
@@ -3,7 +3,7 @@ export declare const ContentsRenameModal: import("@loadable/component").Loadable
 export declare const ContentsBreadcrumbs: import("@loadable/component").LoadableComponent<any>;
 export declare const ContentsIndexHeader: import("@loadable/component").LoadableClassComponent<any>;
 export declare const ContentsItem: import("@loadable/component").LoadableClassComponent<any>;
-export declare const ContentsUploadModal: import("@loadable/component").LoadableClassComponent<any>;
+export declare const ContentsUploadModal: import("@loadable/component").LoadableComponent<any>;
 export declare const ContentsPropertiesModal: import("@loadable/component").LoadableComponent<any>;
 export declare const ContentsWorkflowModal: import("@loadable/component").LoadableComponent<any>;
 export declare const ContentsTagsModal: import("@loadable/component").LoadableComponent<any>;
diff --git a/packages/volto/types/components/manage/Controlpanels/AddonsControlpanel.d.ts b/packages/volto/types/components/manage/Controlpanels/AddonsControlpanel.d.ts
index 5298df7f0f..45e5b13f6f 100644
--- a/packages/volto/types/components/manage/Controlpanels/AddonsControlpanel.d.ts
+++ b/packages/volto/types/components/manage/Controlpanels/AddonsControlpanel.d.ts
@@ -1,2 +1,2 @@
-declare const _default: any;
-export default _default;
+export default AddonsControlpanel;
+declare function AddonsControlpanel(props: any): import("react/jsx-runtime").JSX.Element;
diff --git a/packages/volto/types/components/manage/Controlpanels/Aliases.d.ts b/packages/volto/types/components/manage/Controlpanels/Aliases.d.ts
index 5298df7f0f..ac792068a2 100644
--- a/packages/volto/types/components/manage/Controlpanels/Aliases.d.ts
+++ b/packages/volto/types/components/manage/Controlpanels/Aliases.d.ts
@@ -1,2 +1,2 @@
-declare const _default: any;
-export default _default;
+export default Aliases;
+declare function Aliases(props: any): import("react/jsx-runtime").JSX.Element;
diff --git a/packages/volto/types/components/manage/Controlpanels/Aliases.stories.d.ts b/packages/volto/types/components/manage/Controlpanels/Aliases.stories.d.ts
new file mode 100644
index 0000000000..c20c2498c9
--- /dev/null
+++ b/packages/volto/types/components/manage/Controlpanels/Aliases.stories.d.ts
@@ -0,0 +1,8 @@
+export const Aliases: any;
+declare namespace _default {
+    export let title: string;
+    export { Aliases as component };
+    export let decorators: ((Story: any) => import("react/jsx-runtime").JSX.Element)[];
+    export let argTypes: {};
+}
+export default _default;
diff --git a/packages/volto/types/components/manage/Controlpanels/DatabaseInformation.d.ts b/packages/volto/types/components/manage/Controlpanels/DatabaseInformation.d.ts
index 5298df7f0f..dd8dfda20b 100644
--- a/packages/volto/types/components/manage/Controlpanels/DatabaseInformation.d.ts
+++ b/packages/volto/types/components/manage/Controlpanels/DatabaseInformation.d.ts
@@ -1,2 +1,2 @@
-declare const _default: any;
-export default _default;
+export default DatabaseInformation;
+declare function DatabaseInformation(): import("react/jsx-runtime").JSX.Element;
diff --git a/packages/volto/types/components/manage/Controlpanels/Groups/RenderGroups.d.ts b/packages/volto/types/components/manage/Controlpanels/Groups/RenderGroups.d.ts
index c4a5a9776a..49fea42a00 100644
--- a/packages/volto/types/components/manage/Controlpanels/Groups/RenderGroups.d.ts
+++ b/packages/volto/types/components/manage/Controlpanels/Groups/RenderGroups.d.ts
@@ -1,5 +1,10 @@
-declare const _default: React.FC<import("react-intl").WithIntlProps<any>> & {
-    WrappedComponent: React.ComponentType<any>;
-};
-export default _default;
-import React from 'react';
+export default RenderGroups;
+declare function RenderGroups(props: any): import("react/jsx-runtime").JSX.Element;
+declare namespace RenderGroups {
+    namespace propTypes {
+        let group: any;
+        let roles: any;
+        let inheritedRole: any;
+        let onDelete: any;
+    }
+}
diff --git a/packages/volto/types/components/manage/Controlpanels/index.d.ts b/packages/volto/types/components/manage/Controlpanels/index.d.ts
index 630f51095d..8feb23523b 100644
--- a/packages/volto/types/components/manage/Controlpanels/index.d.ts
+++ b/packages/volto/types/components/manage/Controlpanels/index.d.ts
@@ -9,11 +9,11 @@ export declare const UsersControlpanel: import("@loadable/component").LoadableCl
 export declare const RenderUsers: import("@loadable/component").LoadableClassComponent<any>;
 export declare const UserGroupMembershipControlPanel: import("@loadable/component").LoadableComponent<unknown>;
 export declare const GroupsControlpanel: import("@loadable/component").LoadableClassComponent<any>;
-export declare const RenderGroups: import("@loadable/component").LoadableComponent<import("react-intl").WithIntlProps<any>>;
+export declare const RenderGroups: import("@loadable/component").LoadableComponent<any>;
 export declare const RelationsControlpanel: import("@loadable/component").LoadableComponent<unknown>;
-export declare const AliasesControlpanel: import("@loadable/component").LoadableClassComponent<any>;
+export declare const AliasesControlpanel: import("@loadable/component").LoadableComponent<any>;
 export declare const UndoControlpanel: import("@loadable/component").LoadableClassComponent<any>;
-export declare const AddonsControlpanel: import("@loadable/component").LoadableClassComponent<any>;
+export declare const AddonsControlpanel: import("@loadable/component").LoadableComponent<any>;
 export declare const ContentType: import("@loadable/component").LoadableClassComponent<any>;
 export declare const ContentTypeLayout: import("@loadable/component").LoadableClassComponent<any>;
 export declare const ContentTypeSchema: import("@loadable/component").LoadableClassComponent<any>;
@@ -29,4 +29,4 @@ export declare const VersionOverview: import("@loadable/component").LoadableComp
 }>;
 export declare const UpgradeControlPanel: import("@loadable/component").LoadableClassComponent<any>;
 export declare const ModerateComments: import("@loadable/component").LoadableClassComponent<any>;
-export declare const DatabaseInformation: import("@loadable/component").LoadableClassComponent<any>;
+export declare const DatabaseInformation: import("@loadable/component").LoadableComponent<unknown>;
diff --git a/packages/volto/types/components/manage/Display/Display.stories.d.ts b/packages/volto/types/components/manage/Display/Display.stories.d.ts
new file mode 100644
index 0000000000..37780b6109
--- /dev/null
+++ b/packages/volto/types/components/manage/Display/Display.stories.d.ts
@@ -0,0 +1,8 @@
+export const Display: any;
+declare namespace _default {
+    export let title: string;
+    export { Display as component };
+    export let decorators: ((Story: any) => import("react/jsx-runtime").JSX.Element)[];
+    export let argTypes: {};
+}
+export default _default;
diff --git a/packages/volto/types/components/manage/Preferences/ChangePassword.d.ts b/packages/volto/types/components/manage/Preferences/ChangePassword.d.ts
index 5298df7f0f..9d3f83be5a 100644
--- a/packages/volto/types/components/manage/Preferences/ChangePassword.d.ts
+++ b/packages/volto/types/components/manage/Preferences/ChangePassword.d.ts
@@ -1,2 +1,2 @@
-declare const _default: any;
-export default _default;
+export default ChangePassword;
+declare function ChangePassword(): import("react/jsx-runtime").JSX.Element;
diff --git a/packages/volto/types/components/manage/Preferences/ChangePassword.stories.d.ts b/packages/volto/types/components/manage/Preferences/ChangePassword.stories.d.ts
new file mode 100644
index 0000000000..4491427fb1
--- /dev/null
+++ b/packages/volto/types/components/manage/Preferences/ChangePassword.stories.d.ts
@@ -0,0 +1,8 @@
+export const ChangePassword: any;
+declare namespace _default {
+    export let title: string;
+    export { ChangePassword as component };
+    export let decorators: ((Story: any) => import("react/jsx-runtime").JSX.Element)[];
+    export let argTypes: {};
+}
+export default _default;
diff --git a/packages/volto/types/components/manage/Preferences/PersonalInformation.d.ts b/packages/volto/types/components/manage/Preferences/PersonalInformation.d.ts
index 5298df7f0f..316390f912 100644
--- a/packages/volto/types/components/manage/Preferences/PersonalInformation.d.ts
+++ b/packages/volto/types/components/manage/Preferences/PersonalInformation.d.ts
@@ -1,2 +1,7 @@
-declare const _default: any;
-export default _default;
+export default PersonalInformation;
+declare function PersonalInformation(props: any): import("react/jsx-runtime").JSX.Element;
+declare namespace PersonalInformation {
+    namespace propTypes {
+        let closeMenu: any;
+    }
+}
diff --git a/packages/volto/types/components/manage/Preferences/PersonalPreferences.d.ts b/packages/volto/types/components/manage/Preferences/PersonalPreferences.d.ts
index 5298df7f0f..bfffbce82a 100644
--- a/packages/volto/types/components/manage/Preferences/PersonalPreferences.d.ts
+++ b/packages/volto/types/components/manage/Preferences/PersonalPreferences.d.ts
@@ -1,2 +1,6 @@
-declare const _default: any;
+declare const _default: import("react").ComponentType<{
+    [x: string]: any;
+    [x: number]: any;
+    [x: symbol]: any;
+}>;
 export default _default;
diff --git a/packages/volto/types/components/manage/Preferences/PersonalPreferences.stories.d.ts b/packages/volto/types/components/manage/Preferences/PersonalPreferences.stories.d.ts
new file mode 100644
index 0000000000..ea462d4d80
--- /dev/null
+++ b/packages/volto/types/components/manage/Preferences/PersonalPreferences.stories.d.ts
@@ -0,0 +1,8 @@
+export const PersonalPreferences: any;
+declare namespace _default {
+    export let title: string;
+    export { PersonalPreferences as component };
+    export let decorators: ((Story: any) => import("react/jsx-runtime").JSX.Element)[];
+    export let argTypes: {};
+}
+export default _default;
diff --git a/packages/volto/types/components/manage/Toolbar/More.d.ts b/packages/volto/types/components/manage/Toolbar/More.d.ts
index 6152d8214b..4ef65634f8 100644
--- a/packages/volto/types/components/manage/Toolbar/More.d.ts
+++ b/packages/volto/types/components/manage/Toolbar/More.d.ts
@@ -1,5 +1,8 @@
-declare const _default: React.ForwardRefExoticComponent<Omit<import("react-intl").WithIntlProps<import("react-intl").WrappedComponentProps<string>>, "ref"> & React.RefAttributes<React.ComponentType<import("react-intl").WrappedComponentProps<string>>>> & {
-    WrappedComponent: React.ComponentType<import("react-intl").WrappedComponentProps<string>>;
-};
-export default _default;
-import React from 'react';
+export default More;
+declare function More(props: any): import("react/jsx-runtime").JSX.Element;
+declare namespace More {
+    namespace propTypes {
+        let loadComponent: any;
+        let closeMenu: any;
+    }
+}
diff --git a/packages/volto/types/components/manage/Widgets/DatetimeWidget.d.ts b/packages/volto/types/components/manage/Widgets/DatetimeWidget.d.ts
index 2d758f99e5..5298df7f0f 100644
--- a/packages/volto/types/components/manage/Widgets/DatetimeWidget.d.ts
+++ b/packages/volto/types/components/manage/Widgets/DatetimeWidget.d.ts
@@ -1,87 +1,2 @@
-/**
- * DatetimeWidget component class
- * @class DatetimeWidget
- * @extends Component
- *
- * To use it, in schema properties, declare a field like:
- *
- * ```jsx
- * {
- *  title: "Publish date",
- *  type: 'datetime',
- * }
- * ```
- */
-export class DatetimeWidgetComponent extends React.Component<any, any, any> {
-    /**
-     * Constructor
-     * @method constructor
-     * @param {Object} props Component properties
-     * @constructs DatetimeWidget
-     */
-    constructor(props: any);
-    moment: any;
-    state: {
-        focused: boolean;
-        isDefault: boolean;
-    };
-    getInternalValue(): any;
-    getDateOnly(): any;
-    /**
-     * Update date storage
-     * @method onDateChange
-     * @param {Object} date updated momentjs Object for date
-     * @returns {undefined}
-     */
-    onDateChange: (date: any) => undefined;
-    /**
-     * Update date storage
-     * @method onTimeChange
-     * @param {Object} time updated momentjs Object for time
-     * @returns {undefined}
-     */
-    onTimeChange: (time: any) => undefined;
-    onResetDates: () => void;
-    /**
-     * Handle SingleDatePicker focus
-     * @method onFocusChange
-     * @param {boolean} focused component focus state.
-     * @returns {undefined}
-     */
-    onFocusChange: ({ focused }: boolean) => undefined;
-    render(): import("react/jsx-runtime").JSX.Element;
-}
-export namespace DatetimeWidgetComponent {
-    namespace propTypes {
-        let id: any;
-        let title: any;
-        let description: any;
-        let required: any;
-        let error: any;
-        let dateOnly: any;
-        let noPastDates: any;
-        let value: any;
-        let onChange: any;
-        let wrapped: any;
-        let resettable: any;
-    }
-    namespace defaultProps {
-        let description_1: any;
-        export { description_1 as description };
-        let required_1: boolean;
-        export { required_1 as required };
-        let error_1: any[];
-        export { error_1 as error };
-        let dateOnly_1: boolean;
-        export { dateOnly_1 as dateOnly };
-        let noPastDates_1: boolean;
-        export { noPastDates_1 as noPastDates };
-        let value_1: any;
-        export { value_1 as value };
-        let resettable_1: boolean;
-        export { resettable_1 as resettable };
-    }
-}
 declare const _default: any;
 export default _default;
-import React from 'react';
diff --git a/packages/volto/types/components/manage/Widgets/DatetimeWidget.stories.d.ts b/packages/volto/types/components/manage/Widgets/DatetimeWidget.stories.d.ts
index 4b1343e87e..3b96761e57 100644
--- a/packages/volto/types/components/manage/Widgets/DatetimeWidget.stories.d.ts
+++ b/packages/volto/types/components/manage/Widgets/DatetimeWidget.stories.d.ts
@@ -6,4 +6,3 @@ declare namespace _default {
     export let argTypes: {};
 }
 export default _default;
-import { DatetimeWidgetComponent } from './DatetimeWidget';
diff --git a/packages/volto/types/components/manage/Widgets/ReferenceWidget.d.ts b/packages/volto/types/components/manage/Widgets/ReferenceWidget.d.ts
index 5298df7f0f..de68889e6d 100644
--- a/packages/volto/types/components/manage/Widgets/ReferenceWidget.d.ts
+++ b/packages/volto/types/components/manage/Widgets/ReferenceWidget.d.ts
@@ -1,2 +1,27 @@
-declare const _default: any;
-export default _default;
+export default ReferenceWidget;
+declare function ReferenceWidget(props: any): import("react/jsx-runtime").JSX.Element;
+declare namespace ReferenceWidget {
+    namespace propTypes {
+        let id: any;
+        let title: any;
+        let description: any;
+        let required: any;
+        let multiple: any;
+        let error: any;
+        let value: any;
+        let onChange: any;
+        let wrapped: any;
+    }
+    namespace defaultProps {
+        let description_1: any;
+        export { description_1 as description };
+        let required_1: boolean;
+        export { required_1 as required };
+        let error_1: any[];
+        export { error_1 as error };
+        let value_1: any;
+        export { value_1 as value };
+        let multiple_1: boolean;
+        export { multiple_1 as multiple };
+    }
+}
diff --git a/packages/volto/types/components/manage/Widgets/index.d.ts b/packages/volto/types/components/manage/Widgets/index.d.ts
index df8702be76..e6b763ead7 100644
--- a/packages/volto/types/components/manage/Widgets/index.d.ts
+++ b/packages/volto/types/components/manage/Widgets/index.d.ts
@@ -99,7 +99,7 @@ export declare const EmailWidget: import("@loadable/component").LoadableComponen
 export declare const NumberWidget: import("@loadable/component").LoadableComponent<import("react-intl").WithIntlProps<any>>;
 export declare const ImageSizeWidget: import("@loadable/component").LoadableComponent<import("react-intl").WithIntlProps<any>>;
 export declare const RegistryImageWidget: import("@loadable/component").LoadableComponent<import("react-intl").WithIntlProps<any>>;
-export declare const ReferenceWidget: import("@loadable/component").LoadableClassComponent<any>;
+export declare const ReferenceWidget: import("@loadable/component").LoadableComponent<any>;
 export declare const ObjectBrowserWidget: import("@loadable/component").LoadableComponent<Omit<import("react-intl").WithIntlProps<import("react-intl").WrappedComponentProps<string>>, "ref"> & import("react").RefAttributes<import("react").ComponentType<import("react-intl").WrappedComponentProps<string>>>>;
 export declare const ObjectWidget: import("@loadable/component").LoadableComponent<{
     [x: string]: any;
diff --git a/packages/volto/types/components/theme/Register/Register.d.ts b/packages/volto/types/components/theme/Register/Register.d.ts
index 5298df7f0f..e527e67850 100644
--- a/packages/volto/types/components/theme/Register/Register.d.ts
+++ b/packages/volto/types/components/theme/Register/Register.d.ts
@@ -1,2 +1,2 @@
-declare const _default: any;
-export default _default;
+export default Register;
+declare function Register(): import("react/jsx-runtime").JSX.Element;
diff --git a/packages/volto/types/components/theme/Register/Register.stories.d.ts b/packages/volto/types/components/theme/Register/Register.stories.d.ts
new file mode 100644
index 0000000000..68062de641
--- /dev/null
+++ b/packages/volto/types/components/theme/Register/Register.stories.d.ts
@@ -0,0 +1,9 @@
+export const Default: any;
+declare namespace _default {
+    export let title: string;
+    export { RegisterComponent as component };
+    export let decorators: ((Story: any) => import("react/jsx-runtime").JSX.Element)[];
+    export let argTypes: {};
+}
+export default _default;
+import RegisterComponent from './Register';
diff --git a/packages/volto/types/components/theme/Tags/Tags.d.ts b/packages/volto/types/components/theme/Tags/Tags.d.ts
index 536bfb86f2..9f2155c77f 100644
--- a/packages/volto/types/components/theme/Tags/Tags.d.ts
+++ b/packages/volto/types/components/theme/Tags/Tags.d.ts
@@ -1,17 +1,25 @@
 export default Tags;
 /**
- * Tags component class.
+ * Tags component.
  * @function Tags
- * @param {array} tags Array of tags.
- * @returns {string} Markup of the component.
+ * @param {Object} props Component properties.
+ * @param {Object} props.content Content object that may contain subjects.
+ * @param {Array} [props.content.subjects] Optional array of tags (subjects).
+ * @returns {JSX.Element|null} Markup of the component or null if no tags are available.
  */
-declare function Tags({ tags }: any[]): string;
+declare function Tags({ content }: {
+    content: {
+        subjects?: any[];
+    };
+}): JSX.Element | null;
 declare namespace Tags {
     namespace propTypes {
-        let tags: any;
+        let content: any;
     }
     namespace defaultProps {
-        let tags_1: any;
-        export { tags_1 as tags };
+        export namespace content_1 {
+            let subjects: any[];
+        }
+        export { content_1 as content };
     }
 }
diff --git a/packages/volto/types/components/theme/View/AlbumView.d.ts b/packages/volto/types/components/theme/View/AlbumView.d.ts
index 03b217830c..ca7e94e69f 100644
--- a/packages/volto/types/components/theme/View/AlbumView.d.ts
+++ b/packages/volto/types/components/theme/View/AlbumView.d.ts
@@ -1,23 +1,9 @@
 export default AlbumView;
-/**
- * Album view component class.
- * @function AlbumView
- * @param {Object} content Content object.
- * @returns {string} Markup of the component.
- */
-declare class AlbumView extends React.Component<any, any, any> {
-    constructor(props: any);
-    state: {
-        openIndex: any;
-    };
-    closeModal(): void;
-    nextImage(): void;
-    prevImage(): void;
-    render(): import("react/jsx-runtime").JSX.Element;
-}
+declare function AlbumView({ content }: {
+    content: any;
+}): import("react/jsx-runtime").JSX.Element;
 declare namespace AlbumView {
     namespace propTypes {
         let content: any;
     }
 }
-import React from 'react';
diff --git a/packages/volto/types/config/ControlPanels.d.ts b/packages/volto/types/config/ControlPanels.d.ts
index d6b4f4b325..680475c85f 100644
--- a/packages/volto/types/config/ControlPanels.d.ts
+++ b/packages/volto/types/config/ControlPanels.d.ts
@@ -22,4 +22,12 @@ export const controlPanelsIcons: {
     relations: string;
 };
 export function filterControlPanels(controlpanels?: any[]): any[];
+export namespace unwantedControlPanelsFields {
+    let language: string[];
+    let search: string[];
+    let site: string[];
+    let editing: string[];
+    let imaging: string[];
+    let navigation: string[];
+}
 export function filterControlPanelsSchema(controlpanel: any): any;
diff --git a/packages/volto/types/config/Widgets.d.ts b/packages/volto/types/config/Widgets.d.ts
index 935fad5d80..07ad442ae9 100644
--- a/packages/volto/types/config/Widgets.d.ts
+++ b/packages/volto/types/config/Widgets.d.ts
@@ -40,7 +40,7 @@ export namespace widgetMapping {
     };
     export let factory: {
         'Relation List': import("@loadable/component").LoadableComponent<Omit<import("react-intl").WithIntlProps<import("react-intl").WrappedComponentProps<string>>, "ref"> & import("react").RefAttributes<import("react").ComponentType<import("react-intl").WrappedComponentProps<string>>>>;
-        'Relation Choice': import("@loadable/component").LoadableClassComponent<any>;
+        'Relation Choice': import("@loadable/component").LoadableComponent<any>;
     };
     export { SelectWidget as choices };
     export namespace type {
diff --git a/packages/volto/types/config/slots.d.ts b/packages/volto/types/config/slots.d.ts
new file mode 100644
index 0000000000..059b38b8d0
--- /dev/null
+++ b/packages/volto/types/config/slots.d.ts
@@ -0,0 +1,21 @@
+export default slots;
+declare namespace slots {
+    let belowContent: {
+        name: string;
+        component: {
+            ({ content }: {
+                content: {
+                    subjects?: any[];
+                };
+            }): JSX.Element;
+            propTypes: {
+                content: any;
+            };
+            defaultProps: {
+                content: {
+                    subjects: any[];
+                };
+            };
+        };
+    }[];
+}
diff --git a/packages/volto/types/helpers/Blocks/Blocks.d.ts b/packages/volto/types/helpers/Blocks/Blocks.d.ts
index 9a323690a6..82f74f7fe3 100644
--- a/packages/volto/types/helpers/Blocks/Blocks.d.ts
+++ b/packages/volto/types/helpers/Blocks/Blocks.d.ts
@@ -158,6 +158,12 @@ export function findBlocks(blocks: any, types: any, result?: any[]): any[];
  */
 export function moveBlockEnhanced(formData: any, { source, destination }: number): any;
 export function getBlocks(properties: any): any[];
+export function applyBlockInitialValue({ id, value, blocksConfig, formData, }: {
+    id: any;
+    value: any;
+    blocksConfig: any;
+    formData: any;
+}): any;
 export function styleToClassName(key: any, value: any, prefix?: string): any;
 export function buildStyleClassNamesFromData(obj?: {}, prefix?: string): any;
 export function buildStyleClassNamesExtenders({ block, content, data, classNames, }: any): any[];
diff --git a/packages/volto/types/helpers/FormValidation/FormValidation.d.ts b/packages/volto/types/helpers/FormValidation/FormValidation.d.ts
index 28d094562b..80887c1ef3 100644
--- a/packages/volto/types/helpers/FormValidation/FormValidation.d.ts
+++ b/packages/volto/types/helpers/FormValidation/FormValidation.d.ts
@@ -2,6 +2,7 @@ export function validationMessage(isValid: boolean, criterion: string, valueToCo
 export function tryParseJSON(requestItem: string): any;
 export default FormValidation;
 export function validateFileUploadSize(file: File, intlFunc: Function): boolean;
+export function extractInvariantErrors(erros: any[]): any[];
 declare class FormValidation {
     /**
      * The first Fieldset (Tab) that has any errors
diff --git a/packages/volto/types/helpers/index.d.ts b/packages/volto/types/helpers/index.d.ts
index aafd2dc8dc..8c43edc466 100644
--- a/packages/volto/types/helpers/index.d.ts
+++ b/packages/volto/types/helpers/index.d.ts
@@ -20,10 +20,10 @@ export { ContentTypeCondition } from "./Slots";
 export { getAuthToken, persistAuthToken } from "@plone/volto/helpers/AuthToken/AuthToken";
 export { addAppURL, expandToBackendURL, flattenHTMLToAppURL, flattenToAppURL, stripQuerystring, toPublicURL, isInternalURL, getParentUrl, getBaseUrl, getView, isCmsUi, getId, isUrl, normalizeUrl, removeProtocol, URLUtils, flattenScales, getFieldURL } from "@plone/volto/helpers/Url/Url";
 export { nestContent, getLayoutFieldname, getContentIcon, getLanguageIndependentFields } from "@plone/volto/helpers/Content/Content";
-export { addBlock, insertBlock, blockHasValue, changeBlock, deleteBlock, emptyBlocksForm, getBlocks, getBlocksFieldname, getBlocksLayoutFieldname, hasBlocksData, moveBlock, mutateBlock, nextBlockId, previousBlockId, applyBlockDefaults, applySchemaDefaults, blocksFormGenerator, buildStyleClassNamesFromData, buildStyleClassNamesExtenders, buildStyleObjectFromData, getPreviousNextBlock, findBlocks, getBlocksHierarchy, moveBlockEnhanced } from "@plone/volto/helpers/Blocks/Blocks";
+export { applyBlockInitialValue, addBlock, insertBlock, blockHasValue, changeBlock, deleteBlock, emptyBlocksForm, getBlocks, getBlocksFieldname, getBlocksLayoutFieldname, hasBlocksData, moveBlock, mutateBlock, nextBlockId, previousBlockId, applyBlockDefaults, applySchemaDefaults, blocksFormGenerator, buildStyleClassNamesFromData, buildStyleClassNamesExtenders, buildStyleObjectFromData, getPreviousNextBlock, findBlocks, getBlocksHierarchy, moveBlockEnhanced } from "@plone/volto/helpers/Blocks/Blocks";
 export { getSimpleDefaultBlocks, getDefaultBlocks } from "@plone/volto/helpers/Blocks/defaultBlocks";
 export { getBoolean, getVocabName, getVocabFromHint, getVocabFromField, getVocabFromItems, getFieldsVocabulary } from "@plone/volto/helpers/Vocabularies/Vocabularies";
-export { default as FormValidation, validateFileUploadSize, tryParseJSON } from "./FormValidation/FormValidation";
+export { default as FormValidation, validateFileUploadSize, tryParseJSON, extractInvariantErrors } from "./FormValidation/FormValidation";
 export { difference, getColor, getInitials, safeWrapper, applyConfig, withServerErrorCode, parseDateTime, toGettextLang, normalizeLanguageName, toReactIntlLang, toLangUnderscoreRegion, toBackendLang, hasApiExpander, replaceItemOfArray, cloneDeepSchema, insertInArray, removeFromArray, arrayRange, reorderArray, isInteractiveElement, slugify, normalizeString } from "@plone/volto/helpers/Utils/Utils";
 export { withBlockSchemaEnhancer, withVariationSchemaEnhancer, withBlockExtensions, applySchemaEnhancer, resolveExtension, resolveBlockExtensions, addStyling, composeSchema } from "./Extensions";
 export { userHasRoles, isManager, canAssignGroup, canAssignRole } from "./User/User";
diff --git a/packages/volto/types/middleware/index.d.ts b/packages/volto/types/middleware/index.d.ts
index d65350b2a8..daa57524cb 100644
--- a/packages/volto/types/middleware/index.d.ts
+++ b/packages/volto/types/middleware/index.d.ts
@@ -1,3 +1,4 @@
 export { default as api } from "@plone/volto/middleware/api";
 export { default as blacklistRoutes } from "./blacklistRoutes";
+export { default as userSessionReset } from "./userSessionReset";
 export { protectLoadStart, protectLoadEnd, loadProtector } from "@plone/volto/middleware/storeProtectLoadUtils";
diff --git a/packages/volto/types/middleware/userSessionReset.d.ts b/packages/volto/types/middleware/userSessionReset.d.ts
new file mode 100644
index 0000000000..78d14d37bd
--- /dev/null
+++ b/packages/volto/types/middleware/userSessionReset.d.ts
@@ -0,0 +1,5 @@
+export default userSessionReset;
+declare function userSessionReset({ dispatch, getState }: {
+    dispatch: any;
+    getState: any;
+}): (next: any) => (action: any) => any;
diff --git a/variables.mk b/variables.mk
index 9d880bf43a..3a40d4a3ca 100644
--- a/variables.mk
+++ b/variables.mk
@@ -1,7 +1,7 @@
 INSTANCE_PORT=8080
-DOCKER_IMAGE=plone/server-dev:6.0.11
-DOCKER_IMAGE_ACCEPTANCE=plone/server-acceptance:6.0.11
-KGS=plone.restapi==9.7.0
+DOCKER_IMAGE=plone/server-dev:6.0.13
+DOCKER_IMAGE_ACCEPTANCE=plone/server-acceptance:6.0.13
+KGS=
 NODEBIN = ./node_modules/.bin
 SCRIPTSPACKAGE = ./packages/scripts