Update to 1.8-pre3