Merge "[CPMS] Fixed issue with immediate CompletableFuture completion"