Merge branch 'snmp-stat-aggregation'