[MERGE] forward port of branch saas-15 up to 59a505127b21b8dddc756a3f06d98a6165446288
[MERGE] forward port of branch saas-15 up to 59a505127b21b8dddc756a3f06d98a6165446288

ygol/odoo,ygol/odoo,ygol/odoo,ygol/odoo,ygol/odoo,ygol/odoo,ygol/odoo