Stuck on server waiting for a response from client. Will currently
result in server freezing until response arrives
Merge remote-tracking branch 'origin/master'