Update to 1.18.0