Include commit 572d628 again, as it was lost with a forward port. closes odoo/odoo#31479
56645335
9cf0dbe226