c#19474 - Changes due to ES upgrade to 0.20.5