Merge 3.4 (test_socket, issue #25138)