OPS-2334 handle GD ExecutionContext API change