Odoo's Mergebot

@n-kmron @qle-odoo unable to stage: merge conflict

[](https://mergebot.odoo.com/odoo/odoo/pull/165893).

[](https://mergebot.odoo.com/odoo/odoo/pull/165896).

[](https://mergebot.odoo.com/odoo/odoo/pull/164091).

@Whenrow you may want to rebuild or fix this PR as it has failed CI.

[](https://mergebot.odoo.com/odoo/odoo/pull/165884).

[](https://mergebot.odoo.com/odoo/odoo/pull/165889).

[](https://mergebot.odoo.com/odoo/odoo/pull/165886).

[](https://mergebot.odoo.com/odoo/odoo/pull/165887).

[](https://mergebot.odoo.com/odoo/odoo/pull/165885).