updating the fixes from odoo

Updating v7 fixes from odoo Oct-15