Correctly add network ID to mapping
Merge branch 'master' into fake-cloud-backend