Revert "Revert "V.1.8""

This reverts commit ac7860e4e5b8fae282e28767192917bc0286446f.