Merge pull request #21409 from morganchristiansson/ser2net