Merge some changes from main * VPC change, minor VPC script changes * Fixed tier1, tier0 exclude VPCs causing warnings during project gen