[FIX] core: adapt forward-ported code after 4d581e26c2c30a53c41fcdc89d42c79e9ba1ef2f
[FIX] core: adapt forward-ported code after 4d581e26c2c30a53c41fcdc89d42c79e9ba1ef2f

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