Include commit 572d628 again, as it was lost with a forward port. closes odoo/odoo#31479
1ace2ed88b
dce35ca44b