Merge "[noha] Parameterize network configuration"