diff --git a/last_commit.txt b/last_commit.txt
index a93147b4be..0c912f59ee 100644
--- a/last_commit.txt
+++ b/last_commit.txt
@@ -2,33 +2,31 @@ Repository: Products.CMFEditions
 
 
 Branch: refs/heads/master
-Date: 2024-12-11T12:48:52-08:00
+Date: 2024-12-11T14:08:16-08:00
 Author: David Glick (davisagli) <david@glicksoftware.com>
-Commit: https://github.com/plone/Products.CMFEditions/commit/6ee7fb4e9d176f2e394bd2232c7271ba6f157aef
+Commit: https://github.com/plone/Products.CMFEditions/commit/da3a03ceaafcbc5d7c7a10acaa1c7d104f1eb7ef
 
-Fix handling of aq-wrapped objects in children modifiers
+Preparing release 4.0.4
 
 Files changed:
-A news/26.bugfix
-M Products/CMFEditions/StandardModifiers.py
+M CHANGES.rst
+M setup.py
+D news/26.bugfix
 
-b'diff --git a/Products/CMFEditions/StandardModifiers.py b/Products/CMFEditions/StandardModifiers.py\nindex f32c25d5..50d03a08 100644\n--- a/Products/CMFEditions/StandardModifiers.py\n+++ b/Products/CMFEditions/StandardModifiers.py\n@@ -335,7 +335,7 @@ def persistent_id(obj):\n             try:\n                 # return a non None value if it is one of the object\n                 # managers subobjects or raise an KeyError exception\n-                return refs[id(obj)]\n+                return refs[id(aq_base(obj))]\n             except KeyError:\n                 # signalize the pickler to just pickle the \'obj\' as\n                 # usual\ndiff --git a/news/26.bugfix b/news/26.bugfix\nnew file mode 100644\nindex 00000000..0a58eb0d\n--- /dev/null\n+++ b/news/26.bugfix\n@@ -0,0 +1,2 @@\n+Fix "Can\'t pickle objects in acquisition wrappers." error in\n+`OMOutsideChildrensModifier` and `OMInsideChildrensModifier`. @davisagli\n'
+b'diff --git a/CHANGES.rst b/CHANGES.rst\nindex 20d6e4f2..66f734e5 100644\n--- a/CHANGES.rst\n+++ b/CHANGES.rst\n@@ -8,6 +8,16 @@ Changelog\n \n .. towncrier release notes start\n \n+4.0.4 (2024-12-11)\n+------------------\n+\n+Bug fixes:\n+\n+\n+- Fix "Can\'t pickle objects in acquisition wrappers." error in\n+  `OMOutsideChildrensModifier` and `OMInsideChildrensModifier`. @davisagli (#26)\n+\n+\n 4.0.3 (2024-01-18)\n ------------------\n \ndiff --git a/news/26.bugfix b/news/26.bugfix\ndeleted file mode 100644\nindex 0a58eb0d..00000000\n--- a/news/26.bugfix\n+++ /dev/null\n@@ -1,2 +0,0 @@\n-Fix "Can\'t pickle objects in acquisition wrappers." error in\n-`OMOutsideChildrensModifier` and `OMInsideChildrensModifier`. @davisagli\ndiff --git a/setup.py b/setup.py\nindex 3ffbd319..42ad53e6 100644\n--- a/setup.py\n+++ b/setup.py\n@@ -3,7 +3,7 @@\n from setuptools import setup\n \n \n-version = "4.0.4.dev0"\n+version = "4.0.4"\n \n long_description = (\n     f"{Path(\'README.rst\').read_text()}\\n{Path(\'CHANGES.rst\').read_text()}"\n'
 
 Repository: Products.CMFEditions
 
 
 Branch: refs/heads/master
-Date: 2024-12-11T13:55:16-08:00
+Date: 2024-12-11T14:09:30-08:00
 Author: David Glick (davisagli) <david@glicksoftware.com>
-Commit: https://github.com/plone/Products.CMFEditions/commit/0627338eb36817ad3a5a96232425842fc861468c
+Commit: https://github.com/plone/Products.CMFEditions/commit/a56c1d89019faaf75023bf008bac5d6de1e36eb9
 
-Merge pull request #117 from plone/26-aqbase
-
-Fix handling of aq-wrapped objects in children modifiers
+back to dev
 
 Files changed:
-A news/26.bugfix
-M Products/CMFEditions/StandardModifiers.py
+M setup.py
 
-b'diff --git a/Products/CMFEditions/StandardModifiers.py b/Products/CMFEditions/StandardModifiers.py\nindex f32c25d5..50d03a08 100644\n--- a/Products/CMFEditions/StandardModifiers.py\n+++ b/Products/CMFEditions/StandardModifiers.py\n@@ -335,7 +335,7 @@ def persistent_id(obj):\n             try:\n                 # return a non None value if it is one of the object\n                 # managers subobjects or raise an KeyError exception\n-                return refs[id(obj)]\n+                return refs[id(aq_base(obj))]\n             except KeyError:\n                 # signalize the pickler to just pickle the \'obj\' as\n                 # usual\ndiff --git a/news/26.bugfix b/news/26.bugfix\nnew file mode 100644\nindex 00000000..0a58eb0d\n--- /dev/null\n+++ b/news/26.bugfix\n@@ -0,0 +1,2 @@\n+Fix "Can\'t pickle objects in acquisition wrappers." error in\n+`OMOutsideChildrensModifier` and `OMInsideChildrensModifier`. @davisagli\n'
+b'diff --git a/setup.py b/setup.py\nindex 42ad53e..e000140 100644\n--- a/setup.py\n+++ b/setup.py\n@@ -3,7 +3,7 @@\n from setuptools import setup\n \n \n-version = "4.0.4"\n+version = "4.0.5.dev0"\n \n long_description = (\n     f"{Path(\'README.rst\').read_text()}\\n{Path(\'CHANGES.rst\').read_text()}"\n'