Merge pull request #8120 from jefferyto/socat-init