Update client menu and some TCP objects.
Merge remote-tracking branch 'origin/master'