Merge pull request #22723 from mhei/fix-gensio-build