Merge pull request #22438 from Ansuel/fix-net-snmp