Eng 6344

You can probably remove this one since the `close()` is going to do the wait for termination.