Merge "[Suggestion] Fix merged network test" into sc-dev