Merge "Fix memory access violation in NetworkStack"