diff --git a/addons/product/models/product_template.py b/addons/product/models/product_template.py
index c8a1268cb52..a4972d2721d 100644
--- a/addons/product/models/product_template.py
+++ b/addons/product/models/product_template.py
@@ -312,6 +312,9 @@ class ProductTemplate(models.Model):
             related_vals['volume'] = vals['volume']
         if vals.get('weight'):
             related_vals['weight'] = vals['weight']
+        # Please do forward port
+        if vals.get('packaging_ids'):
+            related_vals['packaging_ids'] = vals['packaging_ids']
         if related_vals:
             template.write(related_vals)
         return template
diff --git a/addons/product/views/product_views.xml b/addons/product/views/product_views.xml
index 8866b7fcb8f..2684d71a764 100644
--- a/addons/product/views/product_views.xml
+++ b/addons/product/views/product_views.xml
@@ -87,7 +87,7 @@
                                 colspan="4"
                                 attrs="{'invisible':['|', ('type', 'not in', ['product', 'consu']), ('product_variant_count', '>', 1)]}"
                                 groups="product.group_stock_packaging">
-                                <field name="packaging_ids" nolabel="1" context="{'default_product_id': product_variant_id,'tree_view_ref':'product.product_packaging_tree_view', 'form_view_ref':'product.product_packaging_form_view'}"/>
+                                <field name="packaging_ids" nolabel="1" context="{'default_product_id': product_variant_id,'tree_view_ref':'product.product_packaging_tree_view', 'form_view_ref':'product.product_packaging_form_view2'}"/>
                             </group>
                         </page>
                         <page string="Notes" name="notes">
@@ -505,6 +505,18 @@
             </field>
         </record>
 
+        <!-- Don't forward port in V >= saas-11.5 -->
+        <record id="product_packaging_form_view2" model="ir.ui.view">
+            <field name="name">product.packaging.form.view2</field>
+            <field name="model">product.packaging</field>
+            <field name="mode">primary</field>
+            <field name="inherit_id" ref="product.product_packaging_form_view"/>
+            <field name="arch" type="xml">
+                <xpath expr="//field[@name='product_id']" position="replace"/>
+                <xpath expr="//field[@name='id']" position="replace"/>
+            </field>
+        </record>
+
         <record model="ir.actions.act_window" id="action_packaging_view">
             <field name="name">Product Packages</field>
             <field name="res_model">product.packaging</field>