IN PROGRESS - Fix/nonblocking client/master

fixes #3401