Merge "Don't reuse NetworkFactory objects." into rvc-dev