Update to ES-1.2.0