[MERGE] New changes from Odoo repo