Include commit 572d628 again, as it was lost with a forward port. closes odoo/odoo#31479
c22e479246
ce038f5d15
3d9a2340d9