Eng 3373 upgrade to es 0.20