Merge pull request #2819 from rpv-tomsk/snmp-fix-2291-1