Merge pull request #16962 from orgads/platform-socket-types