A forward-port ported this commit: https://github.com/odoo/odoo/commit/c12f2cd5ccc72a680ab741b4ce16d3913dd3854e#diff-473476fda8a8b38a9ee4480eb2bf2e2eR150 But ignored that a more recent one did remove the related code: https://github.com/odoo/odoo/commit/0eafeab1#diff-473476fda8a8b38a9ee4480eb2bf2e2eL173 The result was misindented breaking code.