Add VPC related changes to the Grizzly branch