Merge pull request #9676 from dengqf6/upnpc