[MERGE] forward port branch saas-6 up to e60ba73e528
[MERGE] forward port branch saas-6 up to e60ba73e528

dfang/odoo,laslabs/odoo,laslabs/odoo,ygol/odoo,Elico-Corp/odoo_OCB,Elico-Corp/odoo_OCB,dfang/odoo,Elico-Corp/odoo_OCB,hip-odoo/odoo,laslabs/odoo,ygol/odoo,ygol/odoo,bplancher/odoo,hip-odoo/odoo,bplancher/odoo,bplancher/odoo,ygol/odoo,dfang/odoo,bplancher/odoo,laslabs/odoo,Elico-Corp/odoo_OCB,ygol/odoo,hip-odoo/odoo,hip-odoo/odoo,bplancher/odoo,dfang/odoo,hip-odoo/odoo,Elico-Corp/odoo_OCB,Elico-Corp/odoo_OCB,ygol/odoo,laslabs/odoo,dfang/odoo,laslabs/odoo,bplancher/odoo,hip-odoo/odoo,dfang/odoo,ygol/odoo