updates to mido-vpc
resolving testing merge conflicts
Merge branch 'team/network/vpc-mido' into testing