Upgrade ES to 1.2.0