Merge branch 'net-start-to-replace-copy_from_sockptr'