Merge "Fix memory access violation in NetworkStack" into sc-dev