Wait on pull from another client

Fixes #2911 
Fixes #1904