diff --git a/last_commit.txt b/last_commit.txt
index 95d79b309b..389a44bf43 100644
--- a/last_commit.txt
+++ b/last_commit.txt
@@ -1,51 +1,52 @@
-Repository: plone.app.layout
-
-
-Branch: refs/heads/master
-Date: 2024-09-10T12:41:32+02:00
-Author: ale-rt (ale-rt) <alessandro.pisa@gmail.com>
-Commit: https://github.com/plone/plone.app.layout/commit/35ea07b06e517452ef8db7cf6fb34a2ed6f5ebd3
-
-Do not break if a syndication feed comes from a protected resource
-
-Files changed:
-A news/374.bugfix
-M plone/app/layout/links/tests/test_rssviewlet.py
-M plone/app/layout/links/viewlets.py
-
-b'diff --git a/news/374.bugfix b/news/374.bugfix\nnew file mode 100644\nindex 00000000..42cdb6cc\n--- /dev/null\n+++ b/news/374.bugfix\n@@ -0,0 +1,2 @@\n+Do not break if a syndication feed comes from a protected resource.\n+[ale-rt]\ndiff --git a/plone/app/layout/links/tests/test_rssviewlet.py b/plone/app/layout/links/tests/test_rssviewlet.py\nindex ae12c856..aaea7e41 100644\n--- a/plone/app/layout/links/tests/test_rssviewlet.py\n+++ b/plone/app/layout/links/tests/test_rssviewlet.py\n@@ -1,11 +1,16 @@\n from plone.app.layout.links.viewlets import RSSViewlet\n from plone.app.layout.viewlets.tests.base import ViewletsTestCase\n+from plone.app.testing import login\n+from plone.app.testing import logout\n from plone.app.testing import setRoles\n from plone.app.testing import TEST_USER_ID\n+from plone.app.testing import TEST_USER_NAME\n from plone.base.interfaces import ISiteSyndicationSettings\n from plone.registry.interfaces import IRegistry\n from zope.component import getUtility\n \n+import re\n+\n \n class TestRSSViewletView(ViewletsTestCase):\n     def test_RSSViewlet(self):\n@@ -30,3 +35,52 @@ def test_RSSViewlet(self):\n         self.assertFalse("<link" not in result)\n         self.assertFalse("http://nohost/plone/atom.xml" not in result)\n         self.assertFalse("http://nohost/plone/news/atom.xml" not in result)\n+\n+    def test_RSSViewlet_with_private_objs(self):\n+        setRoles(self.portal, TEST_USER_ID, ["Manager"])\n+        self.portal.invokeFactory("Folder", "news")\n+        registry = getUtility(IRegistry)\n+        settings = registry.forInterface(ISiteSyndicationSettings)\n+        self.assertTrue(settings.allowed)\n+\n+        # Stream a private folder\n+        self.portal.news.invokeFactory("Collection", "aggregator")\n+        settings.site_rss_items = (self.portal.news.aggregator.UID(),)\n+        request = self.layer["request"]\n+\n+        link_href_pattern = re.compile(r\'<link href="(.*?)"\')\n+\n+        # Verify that anonymous users can\'t see the RSS feed\n+        # from the aggregator collection\n+        logout()\n+        viewlet = RSSViewlet(self.portal, request.clone(), None, None)\n+        viewlet.update()\n+        result = viewlet.render()\n+\n+        self.assertSetEqual(\n+            {\n+                "http://nohost/plone/atom.xml",\n+                "http://nohost/plone/rss.xml",\n+                "http://nohost/plone/RSS",\n+            },\n+            {match.group(1) for match in link_href_pattern.finditer(result)},\n+        )\n+\n+        login(self.portal, TEST_USER_NAME)\n+        viewlet = RSSViewlet(self.portal, request.clone(), None, None)\n+        viewlet.update()\n+        result = viewlet.render()\n+\n+        # Verify that an anonymous users can see the RSS feed\n+        # from the aggregator collection\n+        self.assertSetEqual(\n+            {\n+                "http://nohost/plone/atom.xml",\n+                "http://nohost/plone/rss.xml",\n+                "http://nohost/plone/RSS",\n+                "http://nohost/plone/news/aggregator/atom.xml",\n+                "http://nohost/plone/news/aggregator/rss.xml",\n+                "http://nohost/plone/news/aggregator/RSS",\n+            },\n+            {match.group(1) for match in link_href_pattern.finditer(result)},\n+        )\ndiff --git a/plone/app/layout/links/viewlets.py b/plone/app/layout/links/viewlets.py\nindex 4be24c2d..cbcadc42 100644\n--- a/plone/app/layout/links/viewlets.py\n+++ b/plone/app/layout/links/viewlets.py\n@@ -1,3 +1,4 @@\n+from AccessControl import Unauthorized\n from Acquisition import aq_inner\n from plone.app.layout.viewlets import ViewletBase\n from plone.app.uuid.utils import uuidToObject\n@@ -156,7 +157,12 @@ def update(self):\n                     for uid in settings.site_rss_items:\n                         if not uid:\n                             continue\n-                        obj = uuidToObject(uid)\n+                        try:\n+                            obj = uuidToObject(uid)\n+                        except Unauthorized:\n+                            # Do not break if we do not have enough permission\n+                            # to access the object\n+                            obj = None\n                         if obj is None and uid[0] == "/":\n                             obj = portal.restrictedTraverse(uid.lstrip("/"), None)\n                         if obj is not None:\n'
-
-Repository: plone.app.layout
-
-
-Branch: refs/heads/master
-Date: 2024-09-10T09:10:24-07:00
-Author: David Glick (davisagli) <david@glicksoftware.com>
-Commit: https://github.com/plone/plone.app.layout/commit/1f16d91a81de14eb4ff23722ce2a701ab85a72de
-
-Update plone/app/layout/links/tests/test_rssviewlet.py
+Repository: plone.restapi
+
+
+Branch: refs/heads/main
+Date: 2024-09-11T20:06:13-07:00
+Author: Maurits van Rees (mauritsvanrees) <maurits@vanrees.org>
+Commit: https://github.com/plone/plone.restapi/commit/057c59a04d4cb2e5d51e83cdab41b7e921aaae88
+
+Fix error getting allow_discussion  when p.a.discussion is not activated. (#1808)
+
+* Fix error getting allow_discussion value when p.a.discussion is not activated.
+
+This fixes an error in Plone 6.1 when the `plone.app.discussion` package is available but not activated in the Add-ons.
+Problem is that the `conversation_view` is only defined when the browser layer of `plone.app.discussion` is found.
+Sample error:
+
+```
+Traceback (innermost last):
+  Module ZPublisher.WSGIPublisher, line 181, in transaction_pubevents
+  Module ZPublisher.WSGIPublisher, line 391, in publish_module
+  Module ZPublisher.WSGIPublisher, line 285, in publish
+  Module ZPublisher.mapply, line 98, in mapply
+  Module ZPublisher.WSGIPublisher, line 68, in call_object
+  Module plone.rest.service, line 21, in __call__
+  Module plone.restapi.services, line 19, in render
+  Module plone.restapi.services.content.get, line 16, in reply
+  Module plone.restapi.serializer.dxcontent, line 179, in __call__
+  Module plone.restapi.serializer.dxcontent, line 142, in __call__
+  Module plone.restapi.serializer.dxcontent, line 48, in get_allow_discussion_value
+  Module zope.component._api, line 113, in getMultiAdapter
+zope.interface.interfaces.ComponentLookupError:
+((&lt;FolderishDocument at /PloneVolto/page&gt;,
+  &lt;WSGIRequest, URL=http://localhost:8080/PloneVolto/++api++/page/GET_application_json_&gt;),
+ &lt;InterfaceClass zope.interface.Interface&gt;, 'conversation_view')
+```
+
+* Fix tests: Plone Site now gets allow_discussion false instead of null.
 
 Files changed:
-M plone/app/layout/links/tests/test_rssviewlet.py
-
-b'diff --git a/plone/app/layout/links/tests/test_rssviewlet.py b/plone/app/layout/links/tests/test_rssviewlet.py\nindex aaea7e41..b90b8de7 100644\n--- a/plone/app/layout/links/tests/test_rssviewlet.py\n+++ b/plone/app/layout/links/tests/test_rssviewlet.py\n@@ -71,7 +71,7 @@ def test_RSSViewlet_with_private_objs(self):\n         viewlet.update()\n         result = viewlet.render()\n \n-        # Verify that an anonymous users can see the RSS feed\n+        # Verify that an authenticated user can see the RSS feed\n         # from the aggregator collection\n         self.assertSetEqual(\n             {\n'
-
-Repository: plone.app.layout
-
-
-Branch: refs/heads/master
-Date: 2024-09-10T09:11:32-07:00
-Author: David Glick (davisagli) <david@glicksoftware.com>
-Commit: https://github.com/plone/plone.app.layout/commit/d1c00f7e9d41c5c0b8e208e6596cce8e8dccf3d8
-
-Merge pull request #375 from plone/ale/374/fix-unauthorized
-
-Do not break if a syndication feed comes from a protected resource
-
-Files changed:
-A news/374.bugfix
-M plone/app/layout/links/tests/test_rssviewlet.py
-M plone/app/layout/links/viewlets.py
-
-b'diff --git a/news/374.bugfix b/news/374.bugfix\nnew file mode 100644\nindex 00000000..42cdb6cc\n--- /dev/null\n+++ b/news/374.bugfix\n@@ -0,0 +1,2 @@\n+Do not break if a syndication feed comes from a protected resource.\n+[ale-rt]\ndiff --git a/plone/app/layout/links/tests/test_rssviewlet.py b/plone/app/layout/links/tests/test_rssviewlet.py\nindex ae12c856..b90b8de7 100644\n--- a/plone/app/layout/links/tests/test_rssviewlet.py\n+++ b/plone/app/layout/links/tests/test_rssviewlet.py\n@@ -1,11 +1,16 @@\n from plone.app.layout.links.viewlets import RSSViewlet\n from plone.app.layout.viewlets.tests.base import ViewletsTestCase\n+from plone.app.testing import login\n+from plone.app.testing import logout\n from plone.app.testing import setRoles\n from plone.app.testing import TEST_USER_ID\n+from plone.app.testing import TEST_USER_NAME\n from plone.base.interfaces import ISiteSyndicationSettings\n from plone.registry.interfaces import IRegistry\n from zope.component import getUtility\n \n+import re\n+\n \n class TestRSSViewletView(ViewletsTestCase):\n     def test_RSSViewlet(self):\n@@ -30,3 +35,52 @@ def test_RSSViewlet(self):\n         self.assertFalse("<link" not in result)\n         self.assertFalse("http://nohost/plone/atom.xml" not in result)\n         self.assertFalse("http://nohost/plone/news/atom.xml" not in result)\n+\n+    def test_RSSViewlet_with_private_objs(self):\n+        setRoles(self.portal, TEST_USER_ID, ["Manager"])\n+        self.portal.invokeFactory("Folder", "news")\n+        registry = getUtility(IRegistry)\n+        settings = registry.forInterface(ISiteSyndicationSettings)\n+        self.assertTrue(settings.allowed)\n+\n+        # Stream a private folder\n+        self.portal.news.invokeFactory("Collection", "aggregator")\n+        settings.site_rss_items = (self.portal.news.aggregator.UID(),)\n+        request = self.layer["request"]\n+\n+        link_href_pattern = re.compile(r\'<link href="(.*?)"\')\n+\n+        # Verify that anonymous users can\'t see the RSS feed\n+        # from the aggregator collection\n+        logout()\n+        viewlet = RSSViewlet(self.portal, request.clone(), None, None)\n+        viewlet.update()\n+        result = viewlet.render()\n+\n+        self.assertSetEqual(\n+            {\n+                "http://nohost/plone/atom.xml",\n+                "http://nohost/plone/rss.xml",\n+                "http://nohost/plone/RSS",\n+            },\n+            {match.group(1) for match in link_href_pattern.finditer(result)},\n+        )\n+\n+        login(self.portal, TEST_USER_NAME)\n+        viewlet = RSSViewlet(self.portal, request.clone(), None, None)\n+        viewlet.update()\n+        result = viewlet.render()\n+\n+        # Verify that an authenticated user can see the RSS feed\n+        # from the aggregator collection\n+        self.assertSetEqual(\n+            {\n+                "http://nohost/plone/atom.xml",\n+                "http://nohost/plone/rss.xml",\n+                "http://nohost/plone/RSS",\n+                "http://nohost/plone/news/aggregator/atom.xml",\n+                "http://nohost/plone/news/aggregator/rss.xml",\n+                "http://nohost/plone/news/aggregator/RSS",\n+            },\n+            {match.group(1) for match in link_href_pattern.finditer(result)},\n+        )\ndiff --git a/plone/app/layout/links/viewlets.py b/plone/app/layout/links/viewlets.py\nindex 4be24c2d..cbcadc42 100644\n--- a/plone/app/layout/links/viewlets.py\n+++ b/plone/app/layout/links/viewlets.py\n@@ -1,3 +1,4 @@\n+from AccessControl import Unauthorized\n from Acquisition import aq_inner\n from plone.app.layout.viewlets import ViewletBase\n from plone.app.uuid.utils import uuidToObject\n@@ -156,7 +157,12 @@ def update(self):\n                     for uid in settings.site_rss_items:\n                         if not uid:\n                             continue\n-                        obj = uuidToObject(uid)\n+                        try:\n+                            obj = uuidToObject(uid)\n+                        except Unauthorized:\n+                            # Do not break if we do not have enough permission\n+                            # to access the object\n+                            obj = None\n                         if obj is None and uid[0] == "/":\n                             obj = portal.restrictedTraverse(uid.lstrip("/"), None)\n                         if obj is not None:\n'
+A news/1808.bugfix
+M src/plone/restapi/serializer/dxcontent.py
+M src/plone/restapi/tests/http-examples/jwt_logged_in.resp
+M src/plone/restapi/tests/http-examples/navroot_site_get.resp
+M src/plone/restapi/tests/http-examples/navroot_standard_site_content_get.resp
+M src/plone/restapi/tests/http-examples/navroot_standard_site_content_get_expansion.resp
+M src/plone/restapi/tests/http-examples/navroot_standard_site_get.resp
+M src/plone/restapi/tests/http-examples/navroot_standard_site_get_expansion.resp
+M src/plone/restapi/tests/http-examples/site_get_expand_navroot.resp
+M src/plone/restapi/tests/http-examples/siteroot.resp
+
+b'diff --git a/news/1808.bugfix b/news/1808.bugfix\nnew file mode 100644\nindex 0000000000..7a8ab1df8e\n--- /dev/null\n+++ b/news/1808.bugfix\n@@ -0,0 +1,2 @@\n+Fix error getting allow_discussion value when p.a.discussion is not activated.\n+[maurits]\ndiff --git a/src/plone/restapi/serializer/dxcontent.py b/src/plone/restapi/serializer/dxcontent.py\nindex 0154f1c91f..1c546d091d 100644\n--- a/src/plone/restapi/serializer/dxcontent.py\n+++ b/src/plone/restapi/serializer/dxcontent.py\n@@ -23,6 +23,7 @@\n from Products.CMFPlone.utils import base_hasattr\n from Products.CMFCore.interfaces import IContentish\n from zope.component import adapter\n+from zope.component import ComponentLookupError\n from zope.component import getMultiAdapter\n from zope.component import queryMultiAdapter\n from zope.component import queryUtility\n@@ -41,15 +42,16 @@\n \n \n def get_allow_discussion_value(context, request, result):\n-    # This test is to handle the plone.app.discussion not being installed situation\n-    if "allow_discussion" in result:\n-        # Check if the content item implements the IContentish interface\n-        if IContentish.providedBy(context):\n-            result["allow_discussion"] = getMultiAdapter(\n-                (context, request), name="conversation_view"\n-            ).enabled()\n-    else:\n-        result["allow_discussion"] = False\n+    # This test is to handle the situation of plone.app.discussion not being installed\n+    # or not being activated.\n+    if "allow_discussion" in result and IContentish.providedBy(context):\n+        try:\n+            view = getMultiAdapter((context, request), name="conversation_view")\n+            result["allow_discussion"] = view.enabled()\n+            return\n+        except ComponentLookupError:\n+            pass\n+    result["allow_discussion"] = False\n \n \n @implementer(ISerializeToJson)\ndiff --git a/src/plone/restapi/tests/http-examples/jwt_logged_in.resp b/src/plone/restapi/tests/http-examples/jwt_logged_in.resp\nindex 51b29477ff..df8437977a 100644\n--- a/src/plone/restapi/tests/http-examples/jwt_logged_in.resp\n+++ b/src/plone/restapi/tests/http-examples/jwt_logged_in.resp\n@@ -31,7 +31,7 @@ Content-Type: application/json\n     "@id": "http://localhost:55001/plone",\n     "@type": "Plone Site",\n     "UID": "55c25ebc220d400393574f37d648727c",\n-    "allow_discussion": null,\n+    "allow_discussion": false,\n     "contributors": [],\n     "creators": [\n         "admin"\ndiff --git a/src/plone/restapi/tests/http-examples/navroot_site_get.resp b/src/plone/restapi/tests/http-examples/navroot_site_get.resp\nindex 8773250024..1f5d023ab3 100644\n--- a/src/plone/restapi/tests/http-examples/navroot_site_get.resp\n+++ b/src/plone/restapi/tests/http-examples/navroot_site_get.resp\n@@ -33,7 +33,7 @@ Content-Type: application/json\n         "@id": "http://localhost:55001/plone",\n         "@type": "Plone Site",\n         "UID": "55c25ebc220d400393574f37d648727c",\n-        "allow_discussion": null,\n+        "allow_discussion": false,\n         "contributors": [],\n         "creators": [\n             "admin"\ndiff --git a/src/plone/restapi/tests/http-examples/navroot_standard_site_content_get.resp b/src/plone/restapi/tests/http-examples/navroot_standard_site_content_get.resp\nindex 0c374d5389..300b311865 100644\n--- a/src/plone/restapi/tests/http-examples/navroot_standard_site_content_get.resp\n+++ b/src/plone/restapi/tests/http-examples/navroot_standard_site_content_get.resp\n@@ -33,7 +33,7 @@ Content-Type: application/json\n         "@id": "http://localhost:55001/plone",\n         "@type": "Plone Site",\n         "UID": "55c25ebc220d400393574f37d648727c",\n-        "allow_discussion": null,\n+        "allow_discussion": false,\n         "contributors": [],\n         "creators": [\n             "admin"\ndiff --git a/src/plone/restapi/tests/http-examples/navroot_standard_site_content_get_expansion.resp b/src/plone/restapi/tests/http-examples/navroot_standard_site_content_get_expansion.resp\nindex a421c0b009..ccaeb686dd 100644\n--- a/src/plone/restapi/tests/http-examples/navroot_standard_site_content_get_expansion.resp\n+++ b/src/plone/restapi/tests/http-examples/navroot_standard_site_content_get_expansion.resp\n@@ -50,7 +50,7 @@ Content-Type: application/json\n                 "@id": "http://localhost:55001/plone",\n                 "@type": "Plone Site",\n                 "UID": "55c25ebc220d400393574f37d648727c",\n-                "allow_discussion": null,\n+                "allow_discussion": false,\n                 "contributors": [],\n                 "creators": [\n                     "admin"\ndiff --git a/src/plone/restapi/tests/http-examples/navroot_standard_site_get.resp b/src/plone/restapi/tests/http-examples/navroot_standard_site_get.resp\nindex 532ec7d6ca..abc42909a4 100644\n--- a/src/plone/restapi/tests/http-examples/navroot_standard_site_get.resp\n+++ b/src/plone/restapi/tests/http-examples/navroot_standard_site_get.resp\n@@ -33,7 +33,7 @@ Content-Type: application/json\n         "@id": "http://localhost:55001/plone",\n         "@type": "Plone Site",\n         "UID": "55c25ebc220d400393574f37d648727c",\n-        "allow_discussion": null,\n+        "allow_discussion": false,\n         "contributors": [],\n         "creators": [\n             "admin"\ndiff --git a/src/plone/restapi/tests/http-examples/navroot_standard_site_get_expansion.resp b/src/plone/restapi/tests/http-examples/navroot_standard_site_get_expansion.resp\nindex 0a33c7475c..b3391b8314 100644\n--- a/src/plone/restapi/tests/http-examples/navroot_standard_site_get_expansion.resp\n+++ b/src/plone/restapi/tests/http-examples/navroot_standard_site_get_expansion.resp\n@@ -50,7 +50,7 @@ Content-Type: application/json\n                 "@id": "http://localhost:55001/plone",\n                 "@type": "Plone Site",\n                 "UID": "55c25ebc220d400393574f37d648727c",\n-                "allow_discussion": null,\n+                "allow_discussion": false,\n                 "contributors": [],\n                 "creators": [\n                     "admin"\n@@ -101,7 +101,7 @@ Content-Type: application/json\n     "@id": "http://localhost:55001/plone",\n     "@type": "Plone Site",\n     "UID": "55c25ebc220d400393574f37d648727c",\n-    "allow_discussion": null,\n+    "allow_discussion": false,\n     "contributors": [],\n     "creators": [\n         "admin"\ndiff --git a/src/plone/restapi/tests/http-examples/site_get_expand_navroot.resp b/src/plone/restapi/tests/http-examples/site_get_expand_navroot.resp\nindex 00a8775fa7..d92a212bdc 100644\n--- a/src/plone/restapi/tests/http-examples/site_get_expand_navroot.resp\n+++ b/src/plone/restapi/tests/http-examples/site_get_expand_navroot.resp\n@@ -50,7 +50,7 @@ Content-Type: application/json\n                 "@id": "http://localhost:55001/plone",\n                 "@type": "Plone Site",\n                 "UID": "55c25ebc220d400393574f37d648727c",\n-                "allow_discussion": null,\n+                "allow_discussion": false,\n                 "contributors": [],\n                 "creators": [\n                     "admin"\n@@ -125,7 +125,7 @@ Content-Type: application/json\n     "@id": "http://localhost:55001/plone",\n     "@type": "Plone Site",\n     "UID": "55c25ebc220d400393574f37d648727c",\n-    "allow_discussion": null,\n+    "allow_discussion": false,\n     "contributors": [],\n     "creators": [\n         "admin"\ndiff --git a/src/plone/restapi/tests/http-examples/siteroot.resp b/src/plone/restapi/tests/http-examples/siteroot.resp\nindex 51b29477ff..df8437977a 100644\n--- a/src/plone/restapi/tests/http-examples/siteroot.resp\n+++ b/src/plone/restapi/tests/http-examples/siteroot.resp\n@@ -31,7 +31,7 @@ Content-Type: application/json\n     "@id": "http://localhost:55001/plone",\n     "@type": "Plone Site",\n     "UID": "55c25ebc220d400393574f37d648727c",\n-    "allow_discussion": null,\n+    "allow_discussion": false,\n     "contributors": [],\n     "creators": [\n         "admin"\n'