Merge pull request #2702 from elfiesmelfie/feat_snmp_agent