Merge "Add proxy as another network." into klp-modular-dev