diff --git a/cds-feature-attachments/pom.xml b/cds-feature-attachments/pom.xml
index 43cdb1a3..4a22b1c7 100644
--- a/cds-feature-attachments/pom.xml
+++ b/cds-feature-attachments/pom.xml
@@ -213,6 +213,9 @@
                         <configuration>
                             <basePackage>${generation-package}.cds4j</basePackage>
                             <csnFile>${project.basedir}/src/gen/srv/src/main/resources/edmx/csn.json</csnFile>
+                            <includes>
+                                <include>sap.attachments.**</include>
+                            </includes>
                         </configuration>
                     </execution>
 
diff --git a/doc/CHANGELOG.md b/doc/CHANGELOG.md
index 0bceb2dc..e76b2c16 100644
--- a/doc/CHANGELOG.md
+++ b/doc/CHANGELOG.md
@@ -10,11 +10,12 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/).
 
 ### Added
 
-- Run integration tests also with CAP Java 4.x to ensure compatibility with latest available version.
+- Run integration tests also with CAP Java 4.x and @sap/cds-dk@^9 to ensure compatibility with latest available version.
 
 ### Changed
 
-- Bumped minimum required versions of CAP Java to 3.10.2
+- Bumped minimum required versions of CAP Java to 3.10.3.
+- Avoid the generation of POJOs for cds.outbox and sap.common contexts.
 
 ### Fixed