Newtork add/verify fix
Merge remote-tracking branch 'origin/stable' into stable