diff --git a/CHANGELOG.md b/CHANGELOG.md
index ed90e70754..e7c8d246e5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,19 @@
+## 17.0.0-alpha.9 (2023-06-01)
+
+### Bugfix
+
+- Fix special characters in request urls @pnicolli @mamico @luca-bellenghi @cekk [#4825](https://github.com/plone/volto/issues/4825)
+- Fix block is undefined in StyleWrapper helper when building classnames @sneridagh [#4827](https://github.com/plone/volto/issues/4827)
+- Fix navigation sections in 404 pages @sneridagh [#4836](https://github.com/plone/volto/issues/4836)
+
+### Documentation
+
+- Fix glossary warning due to lack of empty line before a term. @stevepiercy [#4820](https://github.com/plone/volto/issues/4820)
+
+
## 17.0.0-alpha.8 (2023-05-24)
### Feature
diff --git a/news/4820.documentation b/news/4820.documentation
deleted file mode 100644
index 54143e75c9..0000000000
--- a/news/4820.documentation
+++ /dev/null
@@ -1 +0,0 @@
-Fix glossary warning due to lack of empty line before a term. @stevepiercy
diff --git a/news/4825.bugfix b/news/4825.bugfix
deleted file mode 100644
index 1954c0f6ec..0000000000
--- a/news/4825.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix special characters in request urls @pnicolli @mamico @luca-bellenghi @cekk
diff --git a/news/4827.bugfix b/news/4827.bugfix
deleted file mode 100644
index 5fb332d601..0000000000
--- a/news/4827.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix block is undefined in StyleWrapper helper when building classnames @sneridagh
diff --git a/package.json b/package.json
index 06606e5281..4dc9c19184 100644
--- a/package.json
+++ b/package.json
@@ -9,7 +9,7 @@
}
],
"license": "MIT",
- "version": "17.0.0-alpha.8",
+ "version": "17.0.0-alpha.9",
"repository": {
"type": "git",
"url": "git@github.com:plone/volto.git"
diff --git a/packages/volto-slate/package.json b/packages/volto-slate/package.json
index 4b159c1895..5cffb00466 100644
--- a/packages/volto-slate/package.json
+++ b/packages/volto-slate/package.json
@@ -1,6 +1,6 @@
{
"name": "@plone/volto-slate",
- "version": "17.0.0-alpha.8",
+ "version": "17.0.0-alpha.9",
"description": "Slate.js integration with Volto",
"main": "src/index.js",
"author": "European Environment Agency: IDM2 A-Team",
diff --git a/src/components/theme/NotFound/NotFound.jsx b/src/components/theme/NotFound/NotFound.jsx
index 3f93d0fe9b..d0a90723a2 100644
--- a/src/components/theme/NotFound/NotFound.jsx
+++ b/src/components/theme/NotFound/NotFound.jsx
@@ -1,53 +1,67 @@
-/**
- * Home container.
- * @module components/theme/NotFound/NotFound
- */
-
-import React from 'react';
+import { useEffect } from 'react';
+import { BodyClass, toBackendLang } from '@plone/volto/helpers';
import { FormattedMessage } from 'react-intl';
import { Link } from 'react-router-dom';
import { Container } from 'semantic-ui-react';
import { withServerErrorCode } from '@plone/volto/helpers/Utils/Utils';
+import { useDispatch, useSelector } from 'react-redux';
+import { getNavigation } from '@plone/volto/actions';
+import config from '@plone/volto/registry';
/**
* Not found function.
* @function NotFound
* @returns {string} Markup of the not found page.
*/
-const NotFound = () => (
-
-
-
-
-
-
-
-
-
-
-
- ),
- }}
- />
-
-
-
-
-
-);
+const NotFound = () => {
+ const dispatch = useDispatch();
+ const lang = useSelector((state) => state.intl.locale);
+
+ useEffect(() => {
+ dispatch(
+ getNavigation(
+ config.settings.isMultilingual ? `/${toBackendLang(lang)}` : '/',
+ config.settings.navDepth,
+ ),
+ );
+ }, [dispatch, lang]);
+
+ return (
+
+
+
+
+
+
+
+
+
+
+
+
+ ),
+ }}
+ />
+
+
+
+
+
+ );
+};
export default withServerErrorCode(404)(NotFound);