I merged the PR only on master for now, to see if there are failing tests. I'll merge on LTS branch if CI is OK.