* Code for BAEL-6814 Convert List<CompletableFuture> to CompletableFuture<List> * Refactor some comments