Merge "Replace wait with communicate to avoid potential deadlock"