Depends on erp5!1529 (merged) and erp5!1534 (merged)
This will create a new commit in order to revert the existing changes.
