Upgrade to ES v. 0.20.2