Always wait for socket recv to complete
Merge remote-tracking branch 'origin/master'