1663 | Subhas/Kavitha | Fix Netbook-to-netbook sync