Upgrade to ES 1.2.1