Merge "Adding the ability to use pre-created ports in Network scenarios"