[MERGE] forward port branch saas-12 up to ac8b882
[MERGE] forward port branch saas-12 up to ac8b882

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