Merge branch 'snmp-stats-update'