8.0 merge from odoo truiz