[MERGE] forward port branch 9.0 up to 4af0054
[MERGE] forward port branch 9.0 up to 4af0054

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