BATCH-2156: blocking when the ExecutionContext is updated to prevent transaction serialization issues