Merge pull request #22599 from vooon/add-net-wgsd