Eng 3372 upgrade to es 0.20