diff --git a/src/_includes/backward-incompatible-changes/commerce/2.3.5-2.3.6.md b/src/_includes/backward-incompatible-changes/commerce/2.3.5-2.3.6.md
new file mode 100644
index 00000000000..0cdd0522c1d
--- /dev/null
+++ b/src/_includes/backward-incompatible-changes/commerce/2.3.5-2.3.6.md
@@ -0,0 +1,5 @@
+### {{ site.data.var.ee }} only changes in classes {#ee-235-236-class}
+
+| What changed | How it changed |
+| --- | --- |
+| Magento\Rma\Block\Email\Items::getCollection | [public] Method has been added. |
diff --git a/src/_includes/backward-incompatible-changes/commerce/2.4.0-2.4.1-develop.html b/src/_includes/backward-incompatible-changes/commerce/2.4.0-2.4.1-develop.html
deleted file mode 100644
index 6d424299dcb..00000000000
--- a/src/_includes/backward-incompatible-changes/commerce/2.4.0-2.4.1-develop.html
+++ /dev/null
@@ -1,28 +0,0 @@
-
-<h3 id="ee_2.4.0-2.4.1-develop-class">Class changes</h3>
-<table><tbody>
-    <tr>
-        <th>What changed</th>
-        <th>How it changed</th>
-    </tr>
-    <tr>
-        <td>Magento\CustomerSegment\Model\ResourceModel\Segment::createSelect</td>
-        <td>[public] Method return typing changed.</td>
-    </tr>
-</tbody></table>
-
-<h3 id="ee_2.4.0-2.4.1-develop-class-api-membership">Class API membership changes</h3>
-<table><tbody>
-    <tr>
-        <th>What changed</th>
-        <th>How it changed</th>
-    </tr>
-    <tr>
-        <td>Magento\TargetRule\Block\Product\AbstractProduct</td>
-        <td>Class was added.</td>
-    </tr>
-    <tr>
-        <td>Magento\AdvancedCheckout\Block\Adminhtml\Sku\AbstractSku</td>
-        <td>Class was added.</td>
-    </tr>
-</tbody></table>
diff --git a/src/_includes/backward-incompatible-changes/commerce/2.4.0-2.4.1.md b/src/_includes/backward-incompatible-changes/commerce/2.4.0-2.4.1.md
new file mode 100644
index 00000000000..e7b2055b6bc
--- /dev/null
+++ b/src/_includes/backward-incompatible-changes/commerce/2.4.0-2.4.1.md
@@ -0,0 +1,12 @@
+### {{ site.data.var.ee }} only changes in classes {#ee-240-241-class}
+
+| What changed | How it changed |
+| --- | --- |
+| Magento\CustomerSegment\Model\ResourceModel\Segment::createSelect | [public] Method return typing changed. |
+
+### {{ site.data.var.ee }} only changes in API membership {#ee-240-241-class-api-membership}
+
+| What changed | How it changed |
+| --- | --- |
+| Magento\TargetRule\Block\Product\AbstractProduct | Class was added. |
+| Magento\AdvancedCheckout\Block\Adminhtml\Sku\AbstractSku | Class was added. |
diff --git a/src/_includes/backward-incompatible-changes/open-source/2.3.5-2.3.6.html b/src/_includes/backward-incompatible-changes/open-source/2.3.5-2.3.6.html
new file mode 100644
index 00000000000..6f5b67141bc
--- /dev/null
+++ b/src/_includes/backward-incompatible-changes/open-source/2.3.5-2.3.6.html
@@ -0,0 +1,100 @@
+
+<h3 id="ce_2.3.5-2.3.6-class">Class changes</h3>
+<table><tbody>
+    <tr>
+        <th>What changed</th>
+        <th>How it changed</th>
+    </tr>
+    <tr>
+        <td>Magento\User\Model\User::$_cacheTag</td>
+        <td>[protected] Property has been added.</td>
+    </tr>
+    <tr>
+        <td>Magento\Sales\Block\Order\Email\Items::__construct</td>
+        <td>[public] Method has been added.</td>
+    </tr>
+    <tr>
+        <td>Magento\Sales\Block\Order\Email\Items::getOrder</td>
+        <td>[public] Method has been added.</td>
+    </tr>
+    <tr>
+        <td>Magento\Sales\Block\Order\Email\Shipment\Items::__construct</td>
+        <td>[public] Method has been added.</td>
+    </tr>
+    <tr>
+        <td>Magento\Sales\Block\Order\Email\Shipment\Items::getOrder</td>
+        <td>[public] Method has been added.</td>
+    </tr>
+    <tr>
+        <td>Magento\Sales\Block\Order\Email\Shipment\Items::getShipment</td>
+        <td>[public] Method has been added.</td>
+    </tr>
+    <tr>
+        <td>Magento\Sales\Block\Order\Email\Invoice\Items::__construct</td>
+        <td>[public] Method has been added.</td>
+    </tr>
+    <tr>
+        <td>Magento\Sales\Block\Order\Email\Invoice\Items::getOrder</td>
+        <td>[public] Method has been added.</td>
+    </tr>
+    <tr>
+        <td>Magento\Sales\Block\Order\Email\Invoice\Items::getInvoice</td>
+        <td>[public] Method has been added.</td>
+    </tr>
+    <tr>
+        <td>Magento\Sales\Block\Order\Email\Creditmemo\Items::__construct</td>
+        <td>[public] Method has been added.</td>
+    </tr>
+    <tr>
+        <td>Magento\Sales\Block\Order\Email\Creditmemo\Items::getOrder</td>
+        <td>[public] Method has been added.</td>
+    </tr>
+    <tr>
+        <td>Magento\Sales\Block\Order\Email\Creditmemo\Items::getCreditmemo</td>
+        <td>[public] Method has been added.</td>
+    </tr>
+    <tr>
+        <td>Magento\Catalog\Model\Category::getCacheTags</td>
+        <td>[public] Method has been added.</td>
+    </tr>
+    <tr>
+        <td>Magento\Catalog\Model\Product::getCacheTags</td>
+        <td>[public] Method has been added.</td>
+    </tr>
+    <tr>
+        <td>Magento\Authorization\Model\Role::$_cacheTag</td>
+        <td>[protected] Property has been added.</td>
+    </tr>
+</tbody></table>
+
+<h3 id="ce_2.3.5-2.3.6-class-api-membership">Class API membership changes</h3>
+<table><tbody>
+    <tr>
+        <th>What changed</th>
+        <th>How it changed</th>
+    </tr>
+    <tr>
+        <td>Magento\Framework\Url</td>
+        <td>Class was added.</td>
+    </tr>
+    <tr>
+        <td>Magento\Framework\Locale\Resolver</td>
+        <td>Class was added.</td>
+    </tr>
+    <tr>
+        <td>Magento\Framework\Api\AbstractSimpleObjectBuilder</td>
+        <td>Class was added.</td>
+    </tr>
+    <tr>
+        <td>Magento\Translation\Model\ResourceModel\Translate</td>
+        <td>Class was added.</td>
+    </tr>
+    <tr>
+        <td>Magento\SalesRule\Model\Validator</td>
+        <td>Class was added.</td>
+    </tr>
+    <tr>
+        <td>Magento\Review\Block\Product\View</td>
+        <td>Class was added.</td>
+    </tr>
+</tbody></table>
diff --git a/src/_includes/backward-incompatible-changes/open-source/2.3.5-2.3.6.md b/src/_includes/backward-incompatible-changes/open-source/2.3.5-2.3.6.md
new file mode 100644
index 00000000000..23ebcab75ca
--- /dev/null
+++ b/src/_includes/backward-incompatible-changes/open-source/2.3.5-2.3.6.md
@@ -0,0 +1,30 @@
+### Class changes {#ce-235-236-class}
+
+| What changed | How it changed |
+| --- | --- |
+| Magento\User\Model\User::$\_cacheTag | [protected] Property has been added. |
+| Magento\Sales\Block\Order\Email\Items::\_\_construct | [public] Method has been added. |
+| Magento\Sales\Block\Order\Email\Items::getOrder | [public] Method has been added. |
+| Magento\Sales\Block\Order\Email\Shipment\Items::\_\_construct | [public] Method has been added. |
+| Magento\Sales\Block\Order\Email\Shipment\Items::getOrder | [public] Method has been added. |
+| Magento\Sales\Block\Order\Email\Shipment\Items::getShipment | [public] Method has been added. |
+| Magento\Sales\Block\Order\Email\Invoice\Items::\_\_construct | [public] Method has been added. |
+| Magento\Sales\Block\Order\Email\Invoice\Items::getOrder | [public] Method has been added. |
+| Magento\Sales\Block\Order\Email\Invoice\Items::getInvoice | [public] Method has been added. |
+| Magento\Sales\Block\Order\Email\Creditmemo\Items::\_\_construct | [public] Method has been added. |
+| Magento\Sales\Block\Order\Email\Creditmemo\Items::getOrder | [public] Method has been added. |
+| Magento\Sales\Block\Order\Email\Creditmemo\Items::getCreditmemo | [public] Method has been added. |
+| Magento\Catalog\Model\Category::getCacheTags | [public] Method has been added. |
+| Magento\Catalog\Model\Product::getCacheTags | [public] Method has been added. |
+| Magento\Authorization\Model\Role::$\_cacheTag | [protected] Property has been added. |
+
+### Class API membership changes {#ce-235-236-class-api-membership}
+
+| What changed | How it changed |
+| --- | --- |
+| Magento\Framework\Url | Class was added. |
+| Magento\Framework\Locale\Resolver | Class was added. |
+| Magento\Framework\Api\AbstractSimpleObjectBuilder | Class was added. |
+| Magento\Translation\Model\ResourceModel\Translate | Class was added. |
+| Magento\SalesRule\Model\Validator | Class was added. |
+| Magento\Review\Block\Product\View | Class was added. |
diff --git a/src/_includes/backward-incompatible-changes/open-source/2.4.0-2.4.1-develop.html b/src/_includes/backward-incompatible-changes/open-source/2.4.0-2.4.1.html
similarity index 91%
rename from src/_includes/backward-incompatible-changes/open-source/2.4.0-2.4.1-develop.html
rename to src/_includes/backward-incompatible-changes/open-source/2.4.0-2.4.1.html
index 960d70a9dfd..3b7298832c8 100644
--- a/src/_includes/backward-incompatible-changes/open-source/2.4.0-2.4.1-develop.html
+++ b/src/_includes/backward-incompatible-changes/open-source/2.4.0-2.4.1.html
@@ -1,5 +1,5 @@
 
-<h3 id="ce_2.4.0-2.4.1-develop-class">Class changes</h3>
+<h3 id="ce_2.4.0-2.4.1-class">Class changes</h3>
 <table><tbody>
     <tr>
         <th>What changed</th>
@@ -35,7 +35,7 @@ <h3 id="ce_2.4.0-2.4.1-develop-class">Class changes</h3>
     </tr>
 </tbody></table>
 
-<h3 id="ce_2.4.0-2.4.1-develop-interface">Interface changes</h3>
+<h3 id="ce_2.4.0-2.4.1-interface">Interface changes</h3>
 <table><tbody>
     <tr>
         <th>What changed</th>
@@ -51,7 +51,7 @@ <h3 id="ce_2.4.0-2.4.1-develop-interface">Interface changes</h3>
     </tr>
 </tbody></table>
 
-<h3 id="ce_2.4.0-2.4.1-develop-database">Database changes</h3>
+<h3 id="ce_2.4.0-2.4.1-database">Database changes</h3>
 <table><tbody>
     <tr>
         <th>What changed</th>
@@ -103,7 +103,7 @@ <h3 id="ce_2.4.0-2.4.1-develop-database">Database changes</h3>
     </tr>
 </tbody></table>
 
-<h3 id="ce_2.4.0-2.4.1-develop-system">System changes</h3>
+<h3 id="ce_2.4.0-2.4.1-system">System changes</h3>
 <table><tbody>
     <tr>
         <th>What changed</th>
@@ -123,7 +123,7 @@ <h3 id="ce_2.4.0-2.4.1-develop-system">System changes</h3>
     </tr>
 </tbody></table>
 
-<h3 id="ce_2.4.0-2.4.1-develop-xsd">Xsd changes</h3>
+<h3 id="ce_2.4.0-2.4.1-xsd">Xsd changes</h3>
 <table><tbody>
     <tr>
         <th>What changed</th>
@@ -143,7 +143,7 @@ <h3 id="ce_2.4.0-2.4.1-develop-xsd">Xsd changes</h3>
     </tr>
 </tbody></table>
 
-<h3 id="ce_2.4.0-2.4.1-develop-class-api-membership">Class API membership changes</h3>
+<h3 id="ce_2.4.0-2.4.1-class-api-membership">Class API membership changes</h3>
 <table><tbody>
     <tr>
         <th>What changed</th>
diff --git a/src/_includes/backward-incompatible-changes/open-source/2.4.0-2.4.1.md b/src/_includes/backward-incompatible-changes/open-source/2.4.0-2.4.1.md
new file mode 100644
index 00000000000..4c60460a035
--- /dev/null
+++ b/src/_includes/backward-incompatible-changes/open-source/2.4.0-2.4.1.md
@@ -0,0 +1,48 @@
+### Class changes {#ce-240-241-class}
+
+| What changed | How it changed |
+| --- | --- |
+| Magento\Framework\Stdlib\Cookie\CookieMetadata::setSameSite | [public] Method has been added. |
+| Magento\Framework\Stdlib\Cookie\CookieMetadata::getSameSite | [public] Method has been added. |
+| Magento\Framework\Stdlib\Cookie\CookieMetadata::KEY\_SAME\_SITE | Constant has been added. |
+| Magento\User\Model\User::$\_cacheTag | [protected] Property has been added. |
+| Magento\Catalog\Model\Category::getCacheTags | [public] Method has been added. |
+| Magento\Catalog\Model\Product::getCacheTags | [public] Method has been added. |
+| Magento\Authorization\Model\Role::$\_cacheTag | [protected] Property has been added. |
+
+### Interface changes {#ce-240-241-interface}
+
+| What changed | How it changed |
+| --- | --- |
+| Magento\Eav\Api\AttributeOptionUpdateInterface | Interface was added. |
+| Magento\Catalog\Api\ProductAttributeOptionUpdateInterface | Interface was added. |
+
+### Database changes {#ce-240-241-database}
+
+| What changed | How it changed |
+| --- | --- |
+| media\_gallery\_asset/MEDIA\_GALLERY\_ID\_PATH\_TITLE\_CONTENT\_TYPE\_WIDTH\_HEIGHT | Unique key was removed |
+| media\_gallery\_asset/constraint | Module db schema whitelist reduced (media\_gallery\_asset/constraint). |
+| login\_as\_customer\_assistance\_allowed | Table was added |
+
+### System changes {#ce-240-241-system}
+
+| What changed | How it changed |
+| --- | --- |
+| system.xml | System configuration file was added |
+| checkout/cart/enable\_clear\_shopping\_cart | A field-node was added |
+
+### Xsd changes {#ce-240-241-xsd}
+
+| What changed | How it changed |
+| --- | --- |
+| maxIdleTime | An optional attribute was added |
+| sleep | An optional attribute was added |
+| onlySpawnWhenMessageAvailable | An optional attribute was added |
+
+### Class API membership changes {#ce-240-241-class-api-membership}
+
+| What changed | How it changed |
+| --- | --- |
+| Magento\Framework\View\Page\Builder | Class was added. |
+| Magento\SalesRule\Model\Validator | Class was added. |
diff --git a/src/guides/v2.3/release-notes/backward-incompatible-changes/reference.md b/src/guides/v2.3/release-notes/backward-incompatible-changes/reference.md
index 3f43e4f1639..aa3fd3083a8 100644
--- a/src/guides/v2.3/release-notes/backward-incompatible-changes/reference.md
+++ b/src/guides/v2.3/release-notes/backward-incompatible-changes/reference.md
@@ -22,6 +22,12 @@ We expanded documentation coverage of the types of changes in 2.3.5. Previously,
 {:.bs-callout-info}
 Patch releases are primarily focused on delivering security and quality enhancements on a regular basis to help you keep your sites performing at their peak. On an exceptional basis, breaking changes or additional patches or hotfixes may be released to address security or compliance issues and high-impact quality issues. On the module level, these are mostly PATCH-level changes; sometimes MINOR-level changes. See [Release policy]({{site.baseurl}}/release/policy/).
 
+## 2.3.5 - 2.3.6
+
+{% include backward-incompatible-changes/open-source/2.3.5-2.3.6.md %}
+
+{% include backward-incompatible-changes/commerce/2.3.5-2.3.6.md %}
+
 ## 2.3.4 - 2.3.5
 
 {% include backward-incompatible-changes/open-source/2.3.4-2.3.5.md %}
diff --git a/src/guides/v2.4/release-notes/backward-incompatible-changes/reference.md b/src/guides/v2.4/release-notes/backward-incompatible-changes/reference.md
index 3367caafff3..ddbc7c863fa 100644
--- a/src/guides/v2.4/release-notes/backward-incompatible-changes/reference.md
+++ b/src/guides/v2.4/release-notes/backward-incompatible-changes/reference.md
@@ -24,9 +24,9 @@ Patch releases are primarily focused on delivering security and quality enhancem
 
 ## 2.4.0 - 2.4.1
 
-{% include backward-incompatible-changes/open-source/2.4.0-2.4.1-develop.html %}
+{% include backward-incompatible-changes/open-source/2.4.0-2.4.1.md %}
 
-{% include backward-incompatible-changes/commerce/2.4.0-2.4.1-develop.html %}
+{% include backward-incompatible-changes/commerce/2.4.0-2.4.1.md %}
 
 ## 2.3.0 - 2.4.0