Merge remote-tracking branch 'naglis/sockshare'