Merge "Repin NNG refs to capture proxy reconnect fix"