Adding carbon context refactoring fixes to ES to resolve APPM-184