Updates to SNMP sync code for Bugs #871, #751 & #777