Forward port fixes done in stable versions and not correclty forward ported
into master at merge time.
LINKS
Task ID-2421795
PR odoo/odoo#63677
X-Original-commit odoo/odoo@340f6baf61
X-Original-Task ID-2348333
X-original-commit: 6c1ed107d9d4144ba078ae0216cf8dcdf02d8a7f