Return ExecutionContext
with correct strategy
#2244
Merged
ExecutionContext
with correct strategy
#2244