[MERGE] forward port branch saas-6 up to 43a47dbc936
[MERGE] forward port branch saas-6 up to 43a47dbc936

ygol/odoo,ygol/odoo,ygol/odoo,Elico-Corp/odoo_OCB,ygol/odoo,Elico-Corp/odoo_OCB,Elico-Corp/odoo_OCB,Elico-Corp/odoo_OCB,Elico-Corp/odoo_OCB,ygol/odoo,ygol/odoo,Elico-Corp/odoo_OCB,ygol/odoo