Merge 1.6 6
The FTBFS tests are fixed in upstream. So that here is a MR that revert all our previous delta and use upstream version instead.
The FTBFS tests are fixed in upstream. So that here is a MR that revert all our previous delta and use upstream version instead.