Include commit 572d628 again, as it was lost with a forward port. closes odoo/odoo#31479
fe77df3ba4
f41690538d
810b6aa760