DONT MERGE - Nonblocking client/master

fixes #3401