Merge "Use ExecutorService to replace CompletableFuture"