Merge "Search more NetworkStack paths" into rvc-dev