Pull latest GM into Ess 2.x branch.