[MERGE] forward port branch 9.0 up to 975086c0394
[MERGE] forward port branch 9.0 up to 975086c0394

ygol/odoo,ygol/odoo,hip-odoo/odoo,ygol/odoo,ygol/odoo,hip-odoo/odoo,ygol/odoo,ygol/odoo,hip-odoo/odoo,hip-odoo/odoo,hip-odoo/odoo,ygol/odoo,hip-odoo/odoo