The fix was done on another branch to show that it completely solves tests failures introduced by 2be873e3c708. All remaining failures in this branch are due to other changes made after **1.6.6**, namely from fe08d2a1db5b included onwards.