task-2574610 Co-authored-by: Jacky Trinh <trj@odoo.com> Co-authored-by: Jonathan Castillo <jcs@odoo.com>