[MERGE] forward port of branch saas-11 up to 5e4f1f5
[MERGE] forward port of branch saas-11 up to 5e4f1f5

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