Merge pull request #2320 from maryamtahhan/feat_snmp_compilation_issue