@aws-cdk/mixins-preview 2.241.0-alpha.0 → 2.242.0-alpha.0

package/lib/services/aws-ec2/cfn-props-mixins.generated.js

@@ -8,7 +8,6 @@ const JSII_RTTI_SYMBOL_1 = Symbol.for("jsii.rtti");
 /* eslint-disable @stylistic/max-len, eol-last */
 const cdk = require("aws-cdk-lib/core");
 const mixins = require("../../mixins");
-const helpers = require("../../util/property-mixins");
 const service = require("aws-cdk-lib/aws-ec2");
 /**
  * Creates a new Capacity Reservation with the specified attributes.
@@ -21,7 +20,7 @@ const service = require("aws-cdk-lib/aws-ec2");
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-capacityreservation.html
  */
 class CfnCapacityReservationPropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_ec2.mixins.CfnCapacityReservationPropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_ec2.mixins.CfnCapacityReservationPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["availabilityZone", "availabilityZoneId", "ebsOptimized", "endDate", "endDateType", "ephemeralStorage", "instanceCount", "instanceMatchCriteria", "instancePlatform", "instanceType", "outPostArn", "placementGroupArn", "tagSpecifications", "tenancy", "unusedReservationBillingOwnerId"];
     props;
     strategy;
@@ -44,7 +43,7 @@ class CfnCapacityReservationPropsMixin extends cdk.Mixin {
             throw error;
         }
         this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -57,12 +56,7 @@ class CfnCapacityReservationPropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnCapacityReservationPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnCapacityReservationPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnCapacityReservationPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -78,7 +72,7 @@ exports.CfnCapacityReservationPropsMixin = CfnCapacityReservationPropsMixin;
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-capacityreservationfleet.html
  */
 class CfnCapacityReservationFleetPropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_ec2.mixins.CfnCapacityReservationFleetPropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_ec2.mixins.CfnCapacityReservationFleetPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["allocationStrategy", "endDate", "instanceMatchCriteria", "instanceTypeSpecifications", "noRemoveEndDate", "removeEndDate", "tagSpecifications", "tenancy", "totalTargetCapacity"];
     props;
     strategy;
@@ -101,7 +95,7 @@ class CfnCapacityReservationFleetPropsMixin extends cdk.Mixin {
             throw error;
         }
         this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -114,12 +108,7 @@ class CfnCapacityReservationFleetPropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnCapacityReservationFleetPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnCapacityReservationFleetPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnCapacityReservationFleetPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -135,7 +124,7 @@ exports.CfnCapacityReservationFleetPropsMixin = CfnCapacityReservationFleetProps
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-carriergateway.html
  */
 class CfnCarrierGatewayPropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_ec2.mixins.CfnCarrierGatewayPropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_ec2.mixins.CfnCarrierGatewayPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["tags", "vpcId"];
     props;
     strategy;
@@ -157,8 +146,11 @@ class CfnCarrierGatewayPropsMixin extends cdk.Mixin {
             }
             throw error;
         }
-        this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.props = {
+            ...props,
+            ...flattenCfnCarrierGatewayMixinProps(props)
+        };
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -171,16 +163,18 @@ class CfnCarrierGatewayPropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnCarrierGatewayPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnCarrierGatewayPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnCarrierGatewayPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
 exports.CfnCarrierGatewayPropsMixin = CfnCarrierGatewayPropsMixin;
+// @ts-ignore TS6133
+function flattenCfnCarrierGatewayMixinProps(props) {
+    const ret = {};
+    if ((props.vpcId !== undefined))
+        ret.vpcId = cdk.getRefProperty(props.vpcId?.vpcRef, 'vpcId') ?? cdk.ensureStringOrUndefined(props.vpcId, "vpcId", "ec2.IVPCRef | string");
+    return ret;
+}
 /**
  * Specifies an ingress authorization rule to add to a Client VPN endpoint.
  *
@@ -192,7 +186,7 @@ exports.CfnCarrierGatewayPropsMixin = CfnCarrierGatewayPropsMixin;
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-clientvpnauthorizationrule.html
  */
 class CfnClientVpnAuthorizationRulePropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_ec2.mixins.CfnClientVpnAuthorizationRulePropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_ec2.mixins.CfnClientVpnAuthorizationRulePropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["accessGroupId", "authorizeAllGroups", "clientVpnEndpointId", "description", "targetNetworkCidr"];
     props;
     strategy;
@@ -215,7 +209,7 @@ class CfnClientVpnAuthorizationRulePropsMixin extends cdk.Mixin {
             throw error;
         }
         this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -228,12 +222,7 @@ class CfnClientVpnAuthorizationRulePropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnClientVpnAuthorizationRulePropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnClientVpnAuthorizationRulePropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnClientVpnAuthorizationRulePropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -249,7 +238,7 @@ exports.CfnClientVpnAuthorizationRulePropsMixin = CfnClientVpnAuthorizationRuleP
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-clientvpnendpoint.html
  */
 class CfnClientVpnEndpointPropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_ec2.mixins.CfnClientVpnEndpointPropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_ec2.mixins.CfnClientVpnEndpointPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["authenticationOptions", "clientCidrBlock", "clientConnectOptions", "clientLoginBannerOptions", "clientRouteEnforcementOptions", "connectionLogOptions", "description", "disconnectOnSessionTimeout", "dnsServers", "endpointIpAddressType", "securityGroupIds", "selfServicePortal", "serverCertificateArn", "sessionTimeoutHours", "splitTunnel", "tagSpecifications", "trafficIpAddressType", "transportProtocol", "vpcId", "vpnPort"];
     props;
     strategy;
@@ -272,7 +261,7 @@ class CfnClientVpnEndpointPropsMixin extends cdk.Mixin {
             throw error;
         }
         this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -285,12 +274,7 @@ class CfnClientVpnEndpointPropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnClientVpnEndpointPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnClientVpnEndpointPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnClientVpnEndpointPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -308,7 +292,7 @@ exports.CfnClientVpnEndpointPropsMixin = CfnClientVpnEndpointPropsMixin;
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-clientvpnroute.html
  */
 class CfnClientVpnRoutePropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_ec2.mixins.CfnClientVpnRoutePropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_ec2.mixins.CfnClientVpnRoutePropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["clientVpnEndpointId", "description", "destinationCidrBlock", "targetVpcSubnetId"];
     props;
     strategy;
@@ -331,7 +315,7 @@ class CfnClientVpnRoutePropsMixin extends cdk.Mixin {
             throw error;
         }
         this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -344,12 +328,7 @@ class CfnClientVpnRoutePropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnClientVpnRoutePropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnClientVpnRoutePropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnClientVpnRoutePropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -365,7 +344,7 @@ exports.CfnClientVpnRoutePropsMixin = CfnClientVpnRoutePropsMixin;
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-clientvpntargetnetworkassociation.html
  */
 class CfnClientVpnTargetNetworkAssociationPropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_ec2.mixins.CfnClientVpnTargetNetworkAssociationPropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_ec2.mixins.CfnClientVpnTargetNetworkAssociationPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["clientVpnEndpointId", "subnetId"];
     props;
     strategy;
@@ -388,7 +367,7 @@ class CfnClientVpnTargetNetworkAssociationPropsMixin extends cdk.Mixin {
             throw error;
         }
         this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -401,12 +380,7 @@ class CfnClientVpnTargetNetworkAssociationPropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnClientVpnTargetNetworkAssociationPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnClientVpnTargetNetworkAssociationPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnClientVpnTargetNetworkAssociationPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -420,7 +394,7 @@ exports.CfnClientVpnTargetNetworkAssociationPropsMixin = CfnClientVpnTargetNetwo
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-customergateway.html
  */
 class CfnCustomerGatewayPropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_ec2.mixins.CfnCustomerGatewayPropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_ec2.mixins.CfnCustomerGatewayPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["bgpAsn", "bgpAsnExtended", "certificateArn", "deviceName", "ipAddress", "tags", "type"];
     props;
     strategy;
@@ -442,8 +416,11 @@ class CfnCustomerGatewayPropsMixin extends cdk.Mixin {
             }
             throw error;
         }
-        this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.props = {
+            ...props,
+            ...flattenCfnCustomerGatewayMixinProps(props)
+        };
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -456,16 +433,18 @@ class CfnCustomerGatewayPropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnCustomerGatewayPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnCustomerGatewayPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnCustomerGatewayPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
 exports.CfnCustomerGatewayPropsMixin = CfnCustomerGatewayPropsMixin;
+// @ts-ignore TS6133
+function flattenCfnCustomerGatewayMixinProps(props) {
+    const ret = {};
+    if ((props.ipAddress !== undefined))
+        ret.ipAddress = props.ipAddress;
+    return ret;
+}
 /**
  * Specifies a set of DHCP options for your VPC.
  *
@@ -477,7 +456,7 @@ exports.CfnCustomerGatewayPropsMixin = CfnCustomerGatewayPropsMixin;
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-dhcpoptions.html
  */
 class CfnDHCPOptionsPropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_ec2.mixins.CfnDHCPOptionsPropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_ec2.mixins.CfnDHCPOptionsPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["domainName", "domainNameServers", "ipv6AddressPreferredLeaseTime", "netbiosNameServers", "netbiosNodeType", "ntpServers", "tags"];
     props;
     strategy;
@@ -500,7 +479,7 @@ class CfnDHCPOptionsPropsMixin extends cdk.Mixin {
             throw error;
         }
         this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -513,12 +492,7 @@ class CfnDHCPOptionsPropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnDHCPOptionsPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnDHCPOptionsPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnDHCPOptionsPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -534,7 +508,7 @@ exports.CfnDHCPOptionsPropsMixin = CfnDHCPOptionsPropsMixin;
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-ec2fleet.html
  */
 class CfnEC2FleetPropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_ec2.mixins.CfnEC2FleetPropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_ec2.mixins.CfnEC2FleetPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["context", "excessCapacityTerminationPolicy", "launchTemplateConfigs", "onDemandOptions", "replaceUnhealthyInstances", "spotOptions", "tagSpecifications", "targetCapacitySpecification", "terminateInstancesWithExpiration", "type", "validFrom", "validUntil"];
     props;
     strategy;
@@ -557,7 +531,7 @@ class CfnEC2FleetPropsMixin extends cdk.Mixin {
             throw error;
         }
         this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -570,12 +544,7 @@ class CfnEC2FleetPropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnEC2FleetPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnEC2FleetPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnEC2FleetPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -593,7 +562,7 @@ exports.CfnEC2FleetPropsMixin = CfnEC2FleetPropsMixin;
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-eip.html
  */
 class CfnEIPPropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_ec2.mixins.CfnEIPPropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_ec2.mixins.CfnEIPPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["address", "domain", "instanceId", "ipamPoolId", "networkBorderGroup", "publicIpv4Pool", "tags", "transferAddress"];
     props;
     strategy;
@@ -615,8 +584,11 @@ class CfnEIPPropsMixin extends cdk.Mixin {
             }
             throw error;
         }
-        this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.props = {
+            ...props,
+            ...flattenCfnEIPMixinProps(props)
+        };
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -629,16 +601,18 @@ class CfnEIPPropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnEIPPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnEIPPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnEIPPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
 exports.CfnEIPPropsMixin = CfnEIPPropsMixin;
+// @ts-ignore TS6133
+function flattenCfnEIPMixinProps(props) {
+    const ret = {};
+    if ((props.instanceId !== undefined))
+        ret.instanceId = cdk.getRefProperty(props.instanceId?.instanceRef, 'instanceId') ?? cdk.ensureStringOrUndefined(props.instanceId, "instanceId", "ec2.IInstanceRef | string");
+    return ret;
+}
 /**
  * Associates an Elastic IP address with an instance or a network interface.
  *
@@ -652,7 +626,7 @@ exports.CfnEIPPropsMixin = CfnEIPPropsMixin;
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-eipassociation.html
  */
 class CfnEIPAssociationPropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_ec2.mixins.CfnEIPAssociationPropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_ec2.mixins.CfnEIPAssociationPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["allocationId", "eip", "instanceId", "networkInterfaceId", "privateIpAddress"];
     props;
     strategy;
@@ -674,8 +648,11 @@ class CfnEIPAssociationPropsMixin extends cdk.Mixin {
             }
             throw error;
         }
-        this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.props = {
+            ...props,
+            ...flattenCfnEIPAssociationMixinProps(props)
+        };
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -688,16 +665,22 @@ class CfnEIPAssociationPropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnEIPAssociationPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnEIPAssociationPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnEIPAssociationPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
 exports.CfnEIPAssociationPropsMixin = CfnEIPAssociationPropsMixin;
+// @ts-ignore TS6133
+function flattenCfnEIPAssociationMixinProps(props) {
+    const ret = {};
+    if ((props.eip !== undefined))
+        ret.eip = cdk.getRefProperty(props.eip?.eipRef, 'publicIp') ?? cdk.getRefProperty(props.eip?.eipRef, 'allocationId') ?? cdk.ensureStringOrUndefined(props.eip, "eip", "ec2.IEIPRef | string");
+    if ((props.instanceId !== undefined))
+        ret.instanceId = cdk.getRefProperty(props.instanceId?.instanceRef, 'instanceId') ?? cdk.ensureStringOrUndefined(props.instanceId, "instanceId", "ec2.IInstanceRef | string");
+    if ((props.networkInterfaceId !== undefined))
+        ret.networkInterfaceId = cdk.getRefProperty(props.networkInterfaceId?.networkInterfaceRef, 'networkInterfaceId') ?? cdk.ensureStringOrUndefined(props.networkInterfaceId, "networkInterfaceId", "ec2.INetworkInterfaceRef | string");
+    return ret;
+}
 /**
  * [IPv6 only] Specifies an egress-only internet gateway for your VPC.
  *
@@ -711,7 +694,7 @@ exports.CfnEIPAssociationPropsMixin = CfnEIPAssociationPropsMixin;
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-egressonlyinternetgateway.html
  */
 class CfnEgressOnlyInternetGatewayPropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_ec2.mixins.CfnEgressOnlyInternetGatewayPropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_ec2.mixins.CfnEgressOnlyInternetGatewayPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["tags", "vpcId"];
     props;
     strategy;
@@ -733,8 +716,11 @@ class CfnEgressOnlyInternetGatewayPropsMixin extends cdk.Mixin {
             }
             throw error;
         }
-        this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.props = {
+            ...props,
+            ...flattenCfnEgressOnlyInternetGatewayMixinProps(props)
+        };
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -747,16 +733,18 @@ class CfnEgressOnlyInternetGatewayPropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnEgressOnlyInternetGatewayPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnEgressOnlyInternetGatewayPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnEgressOnlyInternetGatewayPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
 exports.CfnEgressOnlyInternetGatewayPropsMixin = CfnEgressOnlyInternetGatewayPropsMixin;
+// @ts-ignore TS6133
+function flattenCfnEgressOnlyInternetGatewayMixinProps(props) {
+    const ret = {};
+    if ((props.vpcId !== undefined))
+        ret.vpcId = cdk.getRefProperty(props.vpcId?.vpcRef, 'vpcId') ?? cdk.ensureStringOrUndefined(props.vpcId, "vpcId", "ec2.IVPCRef | string");
+    return ret;
+}
 /**
  * Associates an AWS Identity and Access Management (IAM) role with an Certificate Manager (ACM) certificate.
  *
@@ -772,7 +760,7 @@ exports.CfnEgressOnlyInternetGatewayPropsMixin = CfnEgressOnlyInternetGatewayPro
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-enclavecertificateiamroleassociation.html
  */
 class CfnEnclaveCertificateIamRoleAssociationPropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_ec2.mixins.CfnEnclaveCertificateIamRoleAssociationPropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_ec2.mixins.CfnEnclaveCertificateIamRoleAssociationPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["certificateArn", "roleArn"];
     props;
     strategy;
@@ -795,7 +783,7 @@ class CfnEnclaveCertificateIamRoleAssociationPropsMixin extends cdk.Mixin {
             throw error;
         }
         this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -808,12 +796,7 @@ class CfnEnclaveCertificateIamRoleAssociationPropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnEnclaveCertificateIamRoleAssociationPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnEnclaveCertificateIamRoleAssociationPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnEnclaveCertificateIamRoleAssociationPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -829,7 +812,7 @@ exports.CfnEnclaveCertificateIamRoleAssociationPropsMixin = CfnEnclaveCertificat
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-flowlog.html
  */
 class CfnFlowLogPropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_ec2.mixins.CfnFlowLogPropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_ec2.mixins.CfnFlowLogPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["deliverCrossAccountRole", "deliverLogsPermissionArn", "destinationOptions", "logDestination", "logDestinationType", "logFormat", "logGroupName", "maxAggregationInterval", "resourceId", "resourceType", "tags", "trafficType"];
     props;
     strategy;
@@ -851,8 +834,11 @@ class CfnFlowLogPropsMixin extends cdk.Mixin {
             }
             throw error;
         }
-        this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.props = {
+            ...props,
+            ...flattenCfnFlowLogMixinProps(props)
+        };
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -865,16 +851,24 @@ class CfnFlowLogPropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnFlowLogPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnFlowLogPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnFlowLogPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
 exports.CfnFlowLogPropsMixin = CfnFlowLogPropsMixin;
+// @ts-ignore TS6133
+function flattenCfnFlowLogMixinProps(props) {
+    const ret = {};
+    if ((props.deliverLogsPermissionArn !== undefined))
+        ret.deliverLogsPermissionArn = cdk.getRefProperty(props.deliverLogsPermissionArn?.roleRef, 'roleArn') ?? cdk.ensureStringOrUndefined(props.deliverLogsPermissionArn, "deliverLogsPermissionArn", "iam.IRoleRef | string");
+    if ((props.logDestination !== undefined))
+        ret.logDestination = cdk.getRefProperty(props.logDestination?.bucketRef, 'bucketArn') ?? cdk.getRefProperty(props.logDestination?.logGroupRef, 'logGroupArn') ?? cdk.ensureStringOrUndefined(props.logDestination, "logDestination", "s3.IBucketRef | logs.ILogGroupRef | string");
+    if ((props.logGroupName !== undefined))
+        ret.logGroupName = cdk.getRefProperty(props.logGroupName?.logGroupRef, 'logGroupName') ?? cdk.ensureStringOrUndefined(props.logGroupName, "logGroupName", "logs.ILogGroupRef | string");
+    if ((props.resourceId !== undefined))
+        ret.resourceId = cdk.getRefProperty(props.resourceId?.vpcRef, 'vpcId') ?? cdk.getRefProperty(props.resourceId?.subnetRef, 'subnetId') ?? cdk.getRefProperty(props.resourceId?.transitGatewayRef, 'transitGatewayId') ?? cdk.ensureStringOrUndefined(props.resourceId, "resourceId", "ec2.IVPCRef | ec2.ISubnetRef | ec2.ITransitGatewayRef | string");
+    return ret;
+}
 /**
  * Associates a virtual private gateway or internet gateway with a route table.
  *
@@ -886,7 +880,7 @@ exports.CfnFlowLogPropsMixin = CfnFlowLogPropsMixin;
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-gatewayroutetableassociation.html
  */
 class CfnGatewayRouteTableAssociationPropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_ec2.mixins.CfnGatewayRouteTableAssociationPropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_ec2.mixins.CfnGatewayRouteTableAssociationPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["gatewayId", "routeTableId"];
     props;
     strategy;
@@ -908,8 +902,11 @@ class CfnGatewayRouteTableAssociationPropsMixin extends cdk.Mixin {
             }
             throw error;
         }
-        this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.props = {
+            ...props,
+            ...flattenCfnGatewayRouteTableAssociationMixinProps(props)
+        };
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -922,16 +919,20 @@ class CfnGatewayRouteTableAssociationPropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnGatewayRouteTableAssociationPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnGatewayRouteTableAssociationPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnGatewayRouteTableAssociationPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
 exports.CfnGatewayRouteTableAssociationPropsMixin = CfnGatewayRouteTableAssociationPropsMixin;
+// @ts-ignore TS6133
+function flattenCfnGatewayRouteTableAssociationMixinProps(props) {
+    const ret = {};
+    if ((props.gatewayId !== undefined))
+        ret.gatewayId = cdk.getRefProperty(props.gatewayId?.internetGatewayRef, 'internetGatewayId') ?? cdk.getRefProperty(props.gatewayId?.vpnGatewayRef, 'vpnGatewayId') ?? cdk.ensureStringOrUndefined(props.gatewayId, "gatewayId", "ec2.IInternetGatewayRef | ec2.IVPNGatewayRef | string");
+    if ((props.routeTableId !== undefined))
+        ret.routeTableId = cdk.getRefProperty(props.routeTableId?.routeTableRef, 'routeTableId') ?? cdk.ensureStringOrUndefined(props.routeTableId, "routeTableId", "ec2.IRouteTableRef | string");
+    return ret;
+}
 /**
  * Allocates a fully dedicated physical server for launching EC2 instances.
  *
@@ -943,7 +944,7 @@ exports.CfnGatewayRouteTableAssociationPropsMixin = CfnGatewayRouteTableAssociat
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-host.html
  */
 class CfnHostPropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_ec2.mixins.CfnHostPropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_ec2.mixins.CfnHostPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["assetId", "autoPlacement", "availabilityZone", "hostMaintenance", "hostRecovery", "instanceFamily", "instanceType", "outpostArn", "tags"];
     props;
     strategy;
@@ -966,7 +967,7 @@ class CfnHostPropsMixin extends cdk.Mixin {
             throw error;
         }
         this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -979,12 +980,7 @@ class CfnHostPropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnHostPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnHostPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnHostPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -1002,7 +998,7 @@ exports.CfnHostPropsMixin = CfnHostPropsMixin;
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-ipam.html
  */
 class CfnIPAMPropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_ec2.mixins.CfnIPAMPropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_ec2.mixins.CfnIPAMPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["defaultResourceDiscoveryOrganizationalUnitExclusions", "description", "enablePrivateGua", "meteredAccount", "operatingRegions", "tags", "tier"];
     props;
     strategy;
@@ -1025,7 +1021,7 @@ class CfnIPAMPropsMixin extends cdk.Mixin {
             throw error;
         }
         this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -1038,12 +1034,7 @@ class CfnIPAMPropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnIPAMPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnIPAMPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnIPAMPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -1057,7 +1048,7 @@ exports.CfnIPAMPropsMixin = CfnIPAMPropsMixin;
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-ipamallocation.html
  */
 class CfnIPAMAllocationPropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_ec2.mixins.CfnIPAMAllocationPropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_ec2.mixins.CfnIPAMAllocationPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["cidr", "description", "ipamPoolId", "netmaskLength"];
     props;
     strategy;
@@ -1080,7 +1071,7 @@ class CfnIPAMAllocationPropsMixin extends cdk.Mixin {
             throw error;
         }
         this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -1093,12 +1084,7 @@ class CfnIPAMAllocationPropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnIPAMAllocationPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnIPAMAllocationPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnIPAMAllocationPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -1114,7 +1100,7 @@ exports.CfnIPAMAllocationPropsMixin = CfnIPAMAllocationPropsMixin;
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-ipampool.html
  */
 class CfnIPAMPoolPropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_ec2.mixins.CfnIPAMPoolPropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_ec2.mixins.CfnIPAMPoolPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["addressFamily", "allocationDefaultNetmaskLength", "allocationMaxNetmaskLength", "allocationMinNetmaskLength", "allocationResourceTags", "autoImport", "awsService", "description", "ipamScopeId", "locale", "provisionedCidrs", "publicIpSource", "publiclyAdvertisable", "sourceIpamPoolId", "sourceResource", "tags"];
     props;
     strategy;
@@ -1137,7 +1123,7 @@ class CfnIPAMPoolPropsMixin extends cdk.Mixin {
             throw error;
         }
         this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -1150,12 +1136,7 @@ class CfnIPAMPoolPropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnIPAMPoolPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnIPAMPoolPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnIPAMPoolPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -1169,7 +1150,7 @@ exports.CfnIPAMPoolPropsMixin = CfnIPAMPoolPropsMixin;
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-ipampoolcidr.html
  */
 class CfnIPAMPoolCidrPropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_ec2.mixins.CfnIPAMPoolCidrPropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_ec2.mixins.CfnIPAMPoolCidrPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["cidr", "ipamPoolId", "netmaskLength"];
     props;
     strategy;
@@ -1192,7 +1173,7 @@ class CfnIPAMPoolCidrPropsMixin extends cdk.Mixin {
             throw error;
         }
         this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -1205,12 +1186,7 @@ class CfnIPAMPoolCidrPropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnIPAMPoolCidrPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnIPAMPoolCidrPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnIPAMPoolCidrPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -1224,7 +1200,7 @@ exports.CfnIPAMPoolCidrPropsMixin = CfnIPAMPoolCidrPropsMixin;
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-ipamresourcediscovery.html
  */
 class CfnIPAMResourceDiscoveryPropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_ec2.mixins.CfnIPAMResourceDiscoveryPropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_ec2.mixins.CfnIPAMResourceDiscoveryPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["description", "operatingRegions", "organizationalUnitExclusions", "tags"];
     props;
     strategy;
@@ -1247,7 +1223,7 @@ class CfnIPAMResourceDiscoveryPropsMixin extends cdk.Mixin {
             throw error;
         }
         this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -1260,12 +1236,7 @@ class CfnIPAMResourceDiscoveryPropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnIPAMResourceDiscoveryPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnIPAMResourceDiscoveryPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnIPAMResourceDiscoveryPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -1281,7 +1252,7 @@ exports.CfnIPAMResourceDiscoveryPropsMixin = CfnIPAMResourceDiscoveryPropsMixin;
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-ipamresourcediscoveryassociation.html
  */
 class CfnIPAMResourceDiscoveryAssociationPropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_ec2.mixins.CfnIPAMResourceDiscoveryAssociationPropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_ec2.mixins.CfnIPAMResourceDiscoveryAssociationPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["ipamId", "ipamResourceDiscoveryId", "tags"];
     props;
     strategy;
@@ -1304,7 +1275,7 @@ class CfnIPAMResourceDiscoveryAssociationPropsMixin extends cdk.Mixin {
             throw error;
         }
         this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -1317,12 +1288,7 @@ class CfnIPAMResourceDiscoveryAssociationPropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnIPAMResourceDiscoveryAssociationPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnIPAMResourceDiscoveryAssociationPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnIPAMResourceDiscoveryAssociationPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -1340,7 +1306,7 @@ exports.CfnIPAMResourceDiscoveryAssociationPropsMixin = CfnIPAMResourceDiscovery
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-ipamscope.html
  */
 class CfnIPAMScopePropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_ec2.mixins.CfnIPAMScopePropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_ec2.mixins.CfnIPAMScopePropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["description", "externalAuthorityConfiguration", "ipamId", "tags"];
     props;
     strategy;
@@ -1363,7 +1329,7 @@ class CfnIPAMScopePropsMixin extends cdk.Mixin {
             throw error;
         }
         this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -1376,12 +1342,7 @@ class CfnIPAMScopePropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnIPAMScopePropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnIPAMScopePropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnIPAMScopePropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -1397,7 +1358,7 @@ exports.CfnIPAMScopePropsMixin = CfnIPAMScopePropsMixin;
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-instance.html
  */
 class CfnInstancePropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_ec2.mixins.CfnInstancePropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_ec2.mixins.CfnInstancePropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["additionalInfo", "affinity", "availabilityZone", "blockDeviceMappings", "cpuOptions", "creditSpecification", "disableApiTermination", "ebsOptimized", "elasticGpuSpecifications", "elasticInferenceAccelerators", "enclaveOptions", "hibernationOptions", "hostId", "hostResourceGroupArn", "iamInstanceProfile", "imageId", "instanceInitiatedShutdownBehavior", "instanceType", "ipv6AddressCount", "ipv6Addresses", "kernelId", "keyName", "launchTemplate", "licenseSpecifications", "metadataOptions", "monitoring", "networkInterfaces", "placementGroupName", "privateDnsNameOptions", "privateIpAddress", "propagateTagsToVolumeOnCreation", "ramdiskId", "securityGroupIds", "securityGroups", "sourceDestCheck", "ssmAssociations", "subnetId", "tags", "tenancy", "userData", "volumes"];
     props;
     strategy;
@@ -1419,8 +1380,11 @@ class CfnInstancePropsMixin extends cdk.Mixin {
             }
             throw error;
         }
-        this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.props = {
+            ...props,
+            ...flattenCfnInstanceMixinProps(props)
+        };
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -1433,16 +1397,110 @@ class CfnInstancePropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnInstancePropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnInstancePropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnInstancePropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
 exports.CfnInstancePropsMixin = CfnInstancePropsMixin;
+// @ts-ignore TS6133
+function flattenCfnInstancePropsMixinEbsProperty(props) {
+    if (cdk.isResolvableObject(props))
+        return props;
+    return {
+        deleteOnTermination: (!props.deleteOnTermination ? undefined : props.deleteOnTermination),
+        encrypted: (!props.encrypted ? undefined : props.encrypted),
+        iops: (!props.iops ? undefined : props.iops),
+        kmsKeyId: (!props.kmsKeyId ? undefined : cdk.getRefProperty(props.kmsKeyId?.keyRef, 'keyArn') ?? cdk.getRefProperty(props.kmsKeyId?.keyRef, 'keyId') ?? cdk.ensureStringOrUndefined(props.kmsKeyId, "kmsKeyId", "kms.IKeyRef | string")),
+        snapshotId: (!props.snapshotId ? undefined : props.snapshotId),
+        volumeSize: (!props.volumeSize ? undefined : props.volumeSize),
+        volumeType: (!props.volumeType ? undefined : props.volumeType)
+    };
+}
+// @ts-ignore TS6133
+function flattenCfnInstancePropsMixinBlockDeviceMappingProperty(props) {
+    if (cdk.isResolvableObject(props))
+        return props;
+    return {
+        deviceName: (!props.deviceName ? undefined : props.deviceName),
+        ebs: (!props.ebs ? undefined : (!props.ebs ? undefined : flattenCfnInstancePropsMixinEbsProperty(props.ebs))),
+        noDevice: (!props.noDevice ? undefined : props.noDevice),
+        virtualName: (!props.virtualName ? undefined : props.virtualName)
+    };
+}
+// @ts-ignore TS6133
+function flattenCfnInstancePropsMixinLaunchTemplateSpecificationProperty(props) {
+    if (cdk.isResolvableObject(props))
+        return props;
+    return {
+        launchTemplateId: (!props.launchTemplateId ? undefined : cdk.getRefProperty(props.launchTemplateId?.launchTemplateRef, 'launchTemplateId') ?? cdk.ensureStringOrUndefined(props.launchTemplateId, "launchTemplateId", "ec2.ILaunchTemplateRef | string")),
+        launchTemplateName: (!props.launchTemplateName ? undefined : props.launchTemplateName),
+        version: (!props.version ? undefined : props.version)
+    };
+}
+// @ts-ignore TS6133
+function flattenCfnInstancePropsMixinNetworkInterfaceProperty(props) {
+    if (cdk.isResolvableObject(props))
+        return props;
+    return {
+        associateCarrierIpAddress: (!props.associateCarrierIpAddress ? undefined : props.associateCarrierIpAddress),
+        associatePublicIpAddress: (!props.associatePublicIpAddress ? undefined : props.associatePublicIpAddress),
+        deleteOnTermination: (!props.deleteOnTermination ? undefined : props.deleteOnTermination),
+        description: (!props.description ? undefined : props.description),
+        deviceIndex: (!props.deviceIndex ? undefined : props.deviceIndex),
+        enaSrdSpecification: (!props.enaSrdSpecification ? undefined : props.enaSrdSpecification),
+        groupSet: (!props.groupSet ? undefined : cdk.mapArrayInPlace(props.groupSet, (item) => cdk.getRefProperty(item?.securityGroupRef, 'securityGroupId') ?? cdk.ensureStringOrUndefined(item, "groupSet", "ec2.ISecurityGroupRef | string"))),
+        ipv6AddressCount: (!props.ipv6AddressCount ? undefined : props.ipv6AddressCount),
+        ipv6Addresses: (!props.ipv6Addresses ? undefined : props.ipv6Addresses),
+        networkInterfaceId: (!props.networkInterfaceId ? undefined : cdk.getRefProperty(props.networkInterfaceId?.networkInterfaceRef, 'networkInterfaceId') ?? cdk.ensureStringOrUndefined(props.networkInterfaceId, "networkInterfaceId", "ec2.INetworkInterfaceRef | string")),
+        privateIpAddress: (!props.privateIpAddress ? undefined : props.privateIpAddress),
+        privateIpAddresses: (!props.privateIpAddresses ? undefined : props.privateIpAddresses),
+        secondaryPrivateIpAddressCount: (!props.secondaryPrivateIpAddressCount ? undefined : props.secondaryPrivateIpAddressCount),
+        subnetId: (!props.subnetId ? undefined : cdk.getRefProperty(props.subnetId?.subnetRef, 'subnetId') ?? cdk.ensureStringOrUndefined(props.subnetId, "subnetId", "ec2.ISubnetRef | string"))
+    };
+}
+// @ts-ignore TS6133
+function flattenCfnInstancePropsMixinSsmAssociationProperty(props) {
+    if (cdk.isResolvableObject(props))
+        return props;
+    return {
+        associationParameters: (!props.associationParameters ? undefined : props.associationParameters),
+        documentName: (!props.documentName ? undefined : cdk.getRefProperty(props.documentName?.documentRef, 'documentName') ?? cdk.ensureStringOrUndefined(props.documentName, "documentName", "ssm.IDocumentRef | string"))
+    };
+}
+// @ts-ignore TS6133
+function flattenCfnInstancePropsMixinVolumeProperty(props) {
+    if (cdk.isResolvableObject(props))
+        return props;
+    return {
+        device: (!props.device ? undefined : props.device),
+        volumeId: (!props.volumeId ? undefined : cdk.getRefProperty(props.volumeId?.volumeRef, 'volumeId') ?? cdk.ensureStringOrUndefined(props.volumeId, "volumeId", "ec2.IVolumeRef | string"))
+    };
+}
+// @ts-ignore TS6133
+function flattenCfnInstanceMixinProps(props) {
+    const ret = {};
+    if ((props.blockDeviceMappings !== undefined))
+        ret.blockDeviceMappings = (cdk.isResolvableObject(props.blockDeviceMappings) ? props.blockDeviceMappings : cdk.mapArrayInPlace(props.blockDeviceMappings, (item) => flattenCfnInstancePropsMixinBlockDeviceMappingProperty(item)));
+    if ((props.hostId !== undefined))
+        ret.hostId = cdk.getRefProperty(props.hostId?.hostRef, 'hostId') ?? cdk.ensureStringOrUndefined(props.hostId, "hostId", "ec2.IHostRef | string");
+    if ((props.iamInstanceProfile !== undefined))
+        ret.iamInstanceProfile = cdk.getRefProperty(props.iamInstanceProfile?.instanceProfileRef, 'instanceProfileName') ?? cdk.ensureStringOrUndefined(props.iamInstanceProfile, "iamInstanceProfile", "iam.IInstanceProfileRef | string");
+    if ((props.launchTemplate !== undefined))
+        ret.launchTemplate = flattenCfnInstancePropsMixinLaunchTemplateSpecificationProperty(props.launchTemplate);
+    if ((props.networkInterfaces !== undefined))
+        ret.networkInterfaces = (cdk.isResolvableObject(props.networkInterfaces) ? props.networkInterfaces : cdk.mapArrayInPlace(props.networkInterfaces, (item) => flattenCfnInstancePropsMixinNetworkInterfaceProperty(item)));
+    if ((props.placementGroupName !== undefined))
+        ret.placementGroupName = cdk.getRefProperty(props.placementGroupName?.placementGroupRef, 'groupName') ?? cdk.ensureStringOrUndefined(props.placementGroupName, "placementGroupName", "ec2.IPlacementGroupRef | string");
+    if ((props.securityGroupIds !== undefined))
+        ret.securityGroupIds = cdk.mapArrayInPlace(props.securityGroupIds, (item) => cdk.getRefProperty(item?.securityGroupRef, 'securityGroupId') ?? cdk.ensureStringOrUndefined(item, "securityGroupIds", "ec2.ISecurityGroupRef | string"));
+    if ((props.ssmAssociations !== undefined))
+        ret.ssmAssociations = (cdk.isResolvableObject(props.ssmAssociations) ? props.ssmAssociations : cdk.mapArrayInPlace(props.ssmAssociations, (item) => flattenCfnInstancePropsMixinSsmAssociationProperty(item)));
+    if ((props.subnetId !== undefined))
+        ret.subnetId = cdk.getRefProperty(props.subnetId?.subnetRef, 'subnetId') ?? cdk.ensureStringOrUndefined(props.subnetId, "subnetId", "ec2.ISubnetRef | string");
+    if ((props.volumes !== undefined))
+        ret.volumes = (cdk.isResolvableObject(props.volumes) ? props.volumes : cdk.mapArrayInPlace(props.volumes, (item) => flattenCfnInstancePropsMixinVolumeProperty(item)));
+    return ret;
+}
 /**
  * Creates an EC2 Instance Connect Endpoint.
  *
@@ -1456,7 +1514,7 @@ exports.CfnInstancePropsMixin = CfnInstancePropsMixin;
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-instanceconnectendpoint.html
  */
 class CfnInstanceConnectEndpointPropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_ec2.mixins.CfnInstanceConnectEndpointPropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_ec2.mixins.CfnInstanceConnectEndpointPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["clientToken", "preserveClientIp", "securityGroupIds", "subnetId", "tags"];
     props;
     strategy;
@@ -1479,7 +1537,7 @@ class CfnInstanceConnectEndpointPropsMixin extends cdk.Mixin {
             throw error;
         }
         this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -1492,12 +1550,7 @@ class CfnInstanceConnectEndpointPropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnInstanceConnectEndpointPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnInstanceConnectEndpointPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnInstanceConnectEndpointPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -1513,7 +1566,7 @@ exports.CfnInstanceConnectEndpointPropsMixin = CfnInstanceConnectEndpointPropsMi
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-internetgateway.html
  */
 class CfnInternetGatewayPropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_ec2.mixins.CfnInternetGatewayPropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_ec2.mixins.CfnInternetGatewayPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["tags"];
     props;
     strategy;
@@ -1536,7 +1589,7 @@ class CfnInternetGatewayPropsMixin extends cdk.Mixin {
             throw error;
         }
         this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -1549,12 +1602,7 @@ class CfnInternetGatewayPropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnInternetGatewayPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnInternetGatewayPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnInternetGatewayPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -1577,7 +1625,7 @@ exports.CfnInternetGatewayPropsMixin = CfnInternetGatewayPropsMixin;
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-keypair.html
  */
 class CfnKeyPairPropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_ec2.mixins.CfnKeyPairPropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_ec2.mixins.CfnKeyPairPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["keyFormat", "keyName", "keyType", "publicKeyMaterial", "tags"];
     props;
     strategy;
@@ -1600,7 +1648,7 @@ class CfnKeyPairPropsMixin extends cdk.Mixin {
             throw error;
         }
         this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -1613,12 +1661,7 @@ class CfnKeyPairPropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnKeyPairPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnKeyPairPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnKeyPairPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -1641,7 +1684,7 @@ exports.CfnKeyPairPropsMixin = CfnKeyPairPropsMixin;
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-launchtemplate.html
  */
 class CfnLaunchTemplatePropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_ec2.mixins.CfnLaunchTemplatePropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_ec2.mixins.CfnLaunchTemplatePropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["launchTemplateData", "launchTemplateName", "tagSpecifications", "versionDescription"];
     props;
     strategy;
@@ -1663,8 +1706,11 @@ class CfnLaunchTemplatePropsMixin extends cdk.Mixin {
             }
             throw error;
         }
-        this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.props = {
+            ...props,
+            ...flattenCfnLaunchTemplateMixinProps(props)
+        };
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -1677,16 +1723,140 @@ class CfnLaunchTemplatePropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnLaunchTemplatePropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnLaunchTemplatePropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnLaunchTemplatePropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
 exports.CfnLaunchTemplatePropsMixin = CfnLaunchTemplatePropsMixin;
+// @ts-ignore TS6133
+function flattenCfnLaunchTemplatePropsMixinEbsProperty(props) {
+    if (cdk.isResolvableObject(props))
+        return props;
+    return {
+        deleteOnTermination: (!props.deleteOnTermination ? undefined : props.deleteOnTermination),
+        ebsCardIndex: (!props.ebsCardIndex ? undefined : props.ebsCardIndex),
+        encrypted: (!props.encrypted ? undefined : props.encrypted),
+        iops: (!props.iops ? undefined : props.iops),
+        kmsKeyId: (!props.kmsKeyId ? undefined : cdk.getRefProperty(props.kmsKeyId?.keyRef, 'keyArn') ?? cdk.getRefProperty(props.kmsKeyId?.keyRef, 'keyId') ?? cdk.ensureStringOrUndefined(props.kmsKeyId, "kmsKeyId", "kms.IKeyRef | string")),
+        snapshotId: (!props.snapshotId ? undefined : props.snapshotId),
+        throughput: (!props.throughput ? undefined : props.throughput),
+        volumeInitializationRate: (!props.volumeInitializationRate ? undefined : props.volumeInitializationRate),
+        volumeSize: (!props.volumeSize ? undefined : props.volumeSize),
+        volumeType: (!props.volumeType ? undefined : props.volumeType)
+    };
+}
+// @ts-ignore TS6133
+function flattenCfnLaunchTemplatePropsMixinBlockDeviceMappingProperty(props) {
+    if (cdk.isResolvableObject(props))
+        return props;
+    return {
+        deviceName: (!props.deviceName ? undefined : props.deviceName),
+        ebs: (!props.ebs ? undefined : (!props.ebs ? undefined : flattenCfnLaunchTemplatePropsMixinEbsProperty(props.ebs))),
+        noDevice: (!props.noDevice ? undefined : props.noDevice),
+        virtualName: (!props.virtualName ? undefined : props.virtualName)
+    };
+}
+// @ts-ignore TS6133
+function flattenCfnLaunchTemplatePropsMixinIamInstanceProfileProperty(props) {
+    if (cdk.isResolvableObject(props))
+        return props;
+    return {
+        arn: (!props.arn ? undefined : props.arn),
+        name: (!props.name ? undefined : cdk.getRefProperty(props.name?.instanceProfileRef, 'instanceProfileName') ?? cdk.ensureStringOrUndefined(props.name, "name", "iam.IInstanceProfileRef | string"))
+    };
+}
+// @ts-ignore TS6133
+function flattenCfnLaunchTemplatePropsMixinPlacementProperty(props) {
+    if (cdk.isResolvableObject(props))
+        return props;
+    return {
+        affinity: (!props.affinity ? undefined : props.affinity),
+        availabilityZone: (!props.availabilityZone ? undefined : props.availabilityZone),
+        groupId: (!props.groupId ? undefined : props.groupId),
+        groupName: (!props.groupName ? undefined : cdk.getRefProperty(props.groupName?.placementGroupRef, 'groupName') ?? cdk.ensureStringOrUndefined(props.groupName, "groupName", "ec2.IPlacementGroupRef | string")),
+        hostId: (!props.hostId ? undefined : props.hostId),
+        hostResourceGroupArn: (!props.hostResourceGroupArn ? undefined : props.hostResourceGroupArn),
+        partitionNumber: (!props.partitionNumber ? undefined : props.partitionNumber),
+        spreadDomain: (!props.spreadDomain ? undefined : props.spreadDomain),
+        tenancy: (!props.tenancy ? undefined : props.tenancy)
+    };
+}
+// @ts-ignore TS6133
+function flattenCfnLaunchTemplatePropsMixinNetworkInterfaceProperty(props) {
+    if (cdk.isResolvableObject(props))
+        return props;
+    return {
+        associateCarrierIpAddress: (!props.associateCarrierIpAddress ? undefined : props.associateCarrierIpAddress),
+        associatePublicIpAddress: (!props.associatePublicIpAddress ? undefined : props.associatePublicIpAddress),
+        connectionTrackingSpecification: (!props.connectionTrackingSpecification ? undefined : props.connectionTrackingSpecification),
+        deleteOnTermination: (!props.deleteOnTermination ? undefined : props.deleteOnTermination),
+        description: (!props.description ? undefined : props.description),
+        deviceIndex: (!props.deviceIndex ? undefined : props.deviceIndex),
+        enaQueueCount: (!props.enaQueueCount ? undefined : props.enaQueueCount),
+        enaSrdSpecification: (!props.enaSrdSpecification ? undefined : props.enaSrdSpecification),
+        groups: (!props.groups ? undefined : cdk.mapArrayInPlace(props.groups, (item) => cdk.getRefProperty(item?.securityGroupRef, 'securityGroupId') ?? cdk.ensureStringOrUndefined(item, "groups", "ec2.ISecurityGroupRef | string"))),
+        interfaceType: (!props.interfaceType ? undefined : props.interfaceType),
+        ipv4PrefixCount: (!props.ipv4PrefixCount ? undefined : props.ipv4PrefixCount),
+        ipv4Prefixes: (!props.ipv4Prefixes ? undefined : props.ipv4Prefixes),
+        ipv6AddressCount: (!props.ipv6AddressCount ? undefined : props.ipv6AddressCount),
+        ipv6Addresses: (!props.ipv6Addresses ? undefined : props.ipv6Addresses),
+        ipv6PrefixCount: (!props.ipv6PrefixCount ? undefined : props.ipv6PrefixCount),
+        ipv6Prefixes: (!props.ipv6Prefixes ? undefined : props.ipv6Prefixes),
+        networkCardIndex: (!props.networkCardIndex ? undefined : props.networkCardIndex),
+        networkInterfaceId: (!props.networkInterfaceId ? undefined : cdk.getRefProperty(props.networkInterfaceId?.networkInterfaceRef, 'networkInterfaceId') ?? cdk.ensureStringOrUndefined(props.networkInterfaceId, "networkInterfaceId", "ec2.INetworkInterfaceRef | string")),
+        primaryIpv6: (!props.primaryIpv6 ? undefined : props.primaryIpv6),
+        privateIpAddress: (!props.privateIpAddress ? undefined : props.privateIpAddress),
+        privateIpAddresses: (!props.privateIpAddresses ? undefined : props.privateIpAddresses),
+        secondaryPrivateIpAddressCount: (!props.secondaryPrivateIpAddressCount ? undefined : props.secondaryPrivateIpAddressCount),
+        subnetId: (!props.subnetId ? undefined : cdk.getRefProperty(props.subnetId?.subnetRef, 'subnetId') ?? cdk.ensureStringOrUndefined(props.subnetId, "subnetId", "ec2.ISubnetRef | string"))
+    };
+}
+// @ts-ignore TS6133
+function flattenCfnLaunchTemplatePropsMixinLaunchTemplateDataProperty(props) {
+    if (cdk.isResolvableObject(props))
+        return props;
+    return {
+        blockDeviceMappings: (!props.blockDeviceMappings ? undefined : (cdk.isResolvableObject(props.blockDeviceMappings) ? props.blockDeviceMappings : (!props.blockDeviceMappings ? undefined : cdk.mapArrayInPlace(props.blockDeviceMappings, (item) => flattenCfnLaunchTemplatePropsMixinBlockDeviceMappingProperty(item))))),
+        capacityReservationSpecification: (!props.capacityReservationSpecification ? undefined : props.capacityReservationSpecification),
+        cpuOptions: (!props.cpuOptions ? undefined : props.cpuOptions),
+        creditSpecification: (!props.creditSpecification ? undefined : props.creditSpecification),
+        disableApiStop: (!props.disableApiStop ? undefined : props.disableApiStop),
+        disableApiTermination: (!props.disableApiTermination ? undefined : props.disableApiTermination),
+        ebsOptimized: (!props.ebsOptimized ? undefined : props.ebsOptimized),
+        elasticGpuSpecifications: (!props.elasticGpuSpecifications ? undefined : props.elasticGpuSpecifications),
+        elasticInferenceAccelerators: (!props.elasticInferenceAccelerators ? undefined : props.elasticInferenceAccelerators),
+        enclaveOptions: (!props.enclaveOptions ? undefined : props.enclaveOptions),
+        hibernationOptions: (!props.hibernationOptions ? undefined : props.hibernationOptions),
+        iamInstanceProfile: (!props.iamInstanceProfile ? undefined : (!props.iamInstanceProfile ? undefined : flattenCfnLaunchTemplatePropsMixinIamInstanceProfileProperty(props.iamInstanceProfile))),
+        imageId: (!props.imageId ? undefined : props.imageId),
+        instanceInitiatedShutdownBehavior: (!props.instanceInitiatedShutdownBehavior ? undefined : props.instanceInitiatedShutdownBehavior),
+        instanceMarketOptions: (!props.instanceMarketOptions ? undefined : props.instanceMarketOptions),
+        instanceRequirements: (!props.instanceRequirements ? undefined : props.instanceRequirements),
+        instanceType: (!props.instanceType ? undefined : props.instanceType),
+        kernelId: (!props.kernelId ? undefined : props.kernelId),
+        keyName: (!props.keyName ? undefined : props.keyName),
+        licenseSpecifications: (!props.licenseSpecifications ? undefined : props.licenseSpecifications),
+        maintenanceOptions: (!props.maintenanceOptions ? undefined : props.maintenanceOptions),
+        metadataOptions: (!props.metadataOptions ? undefined : props.metadataOptions),
+        monitoring: (!props.monitoring ? undefined : props.monitoring),
+        networkInterfaces: (!props.networkInterfaces ? undefined : (cdk.isResolvableObject(props.networkInterfaces) ? props.networkInterfaces : (!props.networkInterfaces ? undefined : cdk.mapArrayInPlace(props.networkInterfaces, (item) => flattenCfnLaunchTemplatePropsMixinNetworkInterfaceProperty(item))))),
+        networkPerformanceOptions: (!props.networkPerformanceOptions ? undefined : props.networkPerformanceOptions),
+        placement: (!props.placement ? undefined : (!props.placement ? undefined : flattenCfnLaunchTemplatePropsMixinPlacementProperty(props.placement))),
+        privateDnsNameOptions: (!props.privateDnsNameOptions ? undefined : props.privateDnsNameOptions),
+        ramDiskId: (!props.ramDiskId ? undefined : props.ramDiskId),
+        securityGroupIds: (!props.securityGroupIds ? undefined : cdk.mapArrayInPlace(props.securityGroupIds, (item) => cdk.getRefProperty(item?.securityGroupRef, 'securityGroupId') ?? cdk.ensureStringOrUndefined(item, "securityGroupIds", "ec2.ISecurityGroupRef | string"))),
+        securityGroups: (!props.securityGroups ? undefined : props.securityGroups),
+        tagSpecifications: (!props.tagSpecifications ? undefined : props.tagSpecifications),
+        userData: (!props.userData ? undefined : props.userData)
+    };
+}
+// @ts-ignore TS6133
+function flattenCfnLaunchTemplateMixinProps(props) {
+    const ret = {};
+    if ((props.launchTemplateData !== undefined))
+        ret.launchTemplateData = flattenCfnLaunchTemplatePropsMixinLaunchTemplateDataProperty(props.launchTemplateData);
+    return ret;
+}
 /**
  * Creates a static route for the specified local gateway route table. You must specify one of the following targets:.
  *
@@ -1699,7 +1869,7 @@ exports.CfnLaunchTemplatePropsMixin = CfnLaunchTemplatePropsMixin;
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-localgatewayroute.html
  */
 class CfnLocalGatewayRoutePropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_ec2.mixins.CfnLocalGatewayRoutePropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_ec2.mixins.CfnLocalGatewayRoutePropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["destinationCidrBlock", "localGatewayRouteTableId", "localGatewayVirtualInterfaceGroupId", "networkInterfaceId"];
     props;
     strategy;
@@ -1722,7 +1892,7 @@ class CfnLocalGatewayRoutePropsMixin extends cdk.Mixin {
             throw error;
         }
         this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -1735,12 +1905,7 @@ class CfnLocalGatewayRoutePropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnLocalGatewayRoutePropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnLocalGatewayRoutePropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnLocalGatewayRoutePropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -1754,7 +1919,7 @@ exports.CfnLocalGatewayRoutePropsMixin = CfnLocalGatewayRoutePropsMixin;
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-localgatewayroutetable.html
  */
 class CfnLocalGatewayRouteTablePropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_ec2.mixins.CfnLocalGatewayRouteTablePropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_ec2.mixins.CfnLocalGatewayRouteTablePropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["localGatewayId", "mode", "tags"];
     props;
     strategy;
@@ -1777,7 +1942,7 @@ class CfnLocalGatewayRouteTablePropsMixin extends cdk.Mixin {
             throw error;
         }
         this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -1790,12 +1955,7 @@ class CfnLocalGatewayRouteTablePropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnLocalGatewayRouteTablePropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnLocalGatewayRouteTablePropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnLocalGatewayRouteTablePropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -1809,7 +1969,7 @@ exports.CfnLocalGatewayRouteTablePropsMixin = CfnLocalGatewayRouteTablePropsMixi
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-localgatewayroutetablevpcassociation.html
  */
 class CfnLocalGatewayRouteTableVPCAssociationPropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_ec2.mixins.CfnLocalGatewayRouteTableVPCAssociationPropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_ec2.mixins.CfnLocalGatewayRouteTableVPCAssociationPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["localGatewayRouteTableId", "tags", "vpcId"];
     props;
     strategy;
@@ -1831,8 +1991,11 @@ class CfnLocalGatewayRouteTableVPCAssociationPropsMixin extends cdk.Mixin {
             }
             throw error;
         }
-        this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.props = {
+            ...props,
+            ...flattenCfnLocalGatewayRouteTableVPCAssociationMixinProps(props)
+        };
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -1845,16 +2008,18 @@ class CfnLocalGatewayRouteTableVPCAssociationPropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnLocalGatewayRouteTableVPCAssociationPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnLocalGatewayRouteTableVPCAssociationPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnLocalGatewayRouteTableVPCAssociationPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
 exports.CfnLocalGatewayRouteTableVPCAssociationPropsMixin = CfnLocalGatewayRouteTableVPCAssociationPropsMixin;
+// @ts-ignore TS6133
+function flattenCfnLocalGatewayRouteTableVPCAssociationMixinProps(props) {
+    const ret = {};
+    if ((props.vpcId !== undefined))
+        ret.vpcId = cdk.getRefProperty(props.vpcId?.vpcRef, 'vpcId') ?? cdk.ensureStringOrUndefined(props.vpcId, "vpcId", "ec2.IVPCRef | string");
+    return ret;
+}
 /**
  * Describes an association between a local gateway route table and a virtual interface group.
  *
@@ -1864,7 +2029,7 @@ exports.CfnLocalGatewayRouteTableVPCAssociationPropsMixin = CfnLocalGatewayRoute
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-localgatewayroutetablevirtualinterfacegroupassociation.html
  */
 class CfnLocalGatewayRouteTableVirtualInterfaceGroupAssociationPropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_ec2.mixins.CfnLocalGatewayRouteTableVirtualInterfaceGroupAssociationPropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_ec2.mixins.CfnLocalGatewayRouteTableVirtualInterfaceGroupAssociationPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["localGatewayRouteTableId", "localGatewayVirtualInterfaceGroupId", "tags"];
     props;
     strategy;
@@ -1887,7 +2052,7 @@ class CfnLocalGatewayRouteTableVirtualInterfaceGroupAssociationPropsMixin extend
             throw error;
         }
         this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -1900,12 +2065,7 @@ class CfnLocalGatewayRouteTableVirtualInterfaceGroupAssociationPropsMixin extend
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnLocalGatewayRouteTableVirtualInterfaceGroupAssociationPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnLocalGatewayRouteTableVirtualInterfaceGroupAssociationPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnLocalGatewayRouteTableVirtualInterfaceGroupAssociationPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -1927,7 +2087,7 @@ exports.CfnLocalGatewayRouteTableVirtualInterfaceGroupAssociationPropsMixin = Cf
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-natgateway.html
  */
 class CfnNatGatewayPropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_ec2.mixins.CfnNatGatewayPropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_ec2.mixins.CfnNatGatewayPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["allocationId", "availabilityMode", "availabilityZoneAddresses", "connectivityType", "maxDrainDurationSeconds", "privateIpAddress", "secondaryAllocationIds", "secondaryPrivateIpAddressCount", "secondaryPrivateIpAddresses", "subnetId", "tags", "vpcId"];
     props;
     strategy;
@@ -1949,8 +2109,11 @@ class CfnNatGatewayPropsMixin extends cdk.Mixin {
             }
             throw error;
         }
-        this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.props = {
+            ...props,
+            ...flattenCfnNatGatewayMixinProps(props)
+        };
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -1963,16 +2126,20 @@ class CfnNatGatewayPropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnNatGatewayPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnNatGatewayPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnNatGatewayPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
 exports.CfnNatGatewayPropsMixin = CfnNatGatewayPropsMixin;
+// @ts-ignore TS6133
+function flattenCfnNatGatewayMixinProps(props) {
+    const ret = {};
+    if ((props.allocationId !== undefined))
+        ret.allocationId = cdk.getRefProperty(props.allocationId?.eipRef, 'allocationId') ?? cdk.ensureStringOrUndefined(props.allocationId, "allocationId", "ec2.IEIPRef | string");
+    if ((props.subnetId !== undefined))
+        ret.subnetId = cdk.getRefProperty(props.subnetId?.subnetRef, 'subnetId') ?? cdk.ensureStringOrUndefined(props.subnetId, "subnetId", "ec2.ISubnetRef | string");
+    return ret;
+}
 /**
  * Specifies a network ACL for your VPC.
  *
@@ -1984,7 +2151,7 @@ exports.CfnNatGatewayPropsMixin = CfnNatGatewayPropsMixin;
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-networkacl.html
  */
 class CfnNetworkAclPropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_ec2.mixins.CfnNetworkAclPropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_ec2.mixins.CfnNetworkAclPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["tags", "vpcId"];
     props;
     strategy;
@@ -2006,8 +2173,11 @@ class CfnNetworkAclPropsMixin extends cdk.Mixin {
             }
             throw error;
         }
-        this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.props = {
+            ...props,
+            ...flattenCfnNetworkAclMixinProps(props)
+        };
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -2020,16 +2190,18 @@ class CfnNetworkAclPropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnNetworkAclPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnNetworkAclPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnNetworkAclPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
 exports.CfnNetworkAclPropsMixin = CfnNetworkAclPropsMixin;
+// @ts-ignore TS6133
+function flattenCfnNetworkAclMixinProps(props) {
+    const ret = {};
+    if ((props.vpcId !== undefined))
+        ret.vpcId = cdk.getRefProperty(props.vpcId?.vpcRef, 'vpcId') ?? cdk.ensureStringOrUndefined(props.vpcId, "vpcId", "ec2.IVPCRef | string");
+    return ret;
+}
 /**
  * Specifies an entry, known as a rule, in a network ACL with a rule number you specify.
  *
@@ -2045,7 +2217,7 @@ exports.CfnNetworkAclPropsMixin = CfnNetworkAclPropsMixin;
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-networkaclentry.html
  */
 class CfnNetworkAclEntryPropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_ec2.mixins.CfnNetworkAclEntryPropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_ec2.mixins.CfnNetworkAclEntryPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["cidrBlock", "egress", "icmp", "ipv6CidrBlock", "networkAclId", "portRange", "protocol", "ruleAction", "ruleNumber"];
     props;
     strategy;
@@ -2068,7 +2240,7 @@ class CfnNetworkAclEntryPropsMixin extends cdk.Mixin {
             throw error;
         }
         this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -2081,12 +2253,7 @@ class CfnNetworkAclEntryPropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnNetworkAclEntryPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnNetworkAclEntryPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnNetworkAclEntryPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -2104,7 +2271,7 @@ exports.CfnNetworkAclEntryPropsMixin = CfnNetworkAclEntryPropsMixin;
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-networkinsightsaccessscope.html
  */
 class CfnNetworkInsightsAccessScopePropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_ec2.mixins.CfnNetworkInsightsAccessScopePropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_ec2.mixins.CfnNetworkInsightsAccessScopePropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["excludePaths", "matchPaths", "tags"];
     props;
     strategy;
@@ -2127,7 +2294,7 @@ class CfnNetworkInsightsAccessScopePropsMixin extends cdk.Mixin {
             throw error;
         }
         this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -2140,12 +2307,7 @@ class CfnNetworkInsightsAccessScopePropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnNetworkInsightsAccessScopePropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnNetworkInsightsAccessScopePropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnNetworkInsightsAccessScopePropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -2159,7 +2321,7 @@ exports.CfnNetworkInsightsAccessScopePropsMixin = CfnNetworkInsightsAccessScopeP
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-networkinsightsaccessscopeanalysis.html
  */
 class CfnNetworkInsightsAccessScopeAnalysisPropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_ec2.mixins.CfnNetworkInsightsAccessScopeAnalysisPropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_ec2.mixins.CfnNetworkInsightsAccessScopeAnalysisPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["networkInsightsAccessScopeId", "tags"];
     props;
     strategy;
@@ -2182,7 +2344,7 @@ class CfnNetworkInsightsAccessScopeAnalysisPropsMixin extends cdk.Mixin {
             throw error;
         }
         this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -2195,12 +2357,7 @@ class CfnNetworkInsightsAccessScopeAnalysisPropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnNetworkInsightsAccessScopeAnalysisPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnNetworkInsightsAccessScopeAnalysisPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnNetworkInsightsAccessScopeAnalysisPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -2214,7 +2371,7 @@ exports.CfnNetworkInsightsAccessScopeAnalysisPropsMixin = CfnNetworkInsightsAcce
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-networkinsightsanalysis.html
  */
 class CfnNetworkInsightsAnalysisPropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_ec2.mixins.CfnNetworkInsightsAnalysisPropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_ec2.mixins.CfnNetworkInsightsAnalysisPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["additionalAccounts", "filterInArns", "filterOutArns", "networkInsightsPathId", "tags"];
     props;
     strategy;
@@ -2237,7 +2394,7 @@ class CfnNetworkInsightsAnalysisPropsMixin extends cdk.Mixin {
             throw error;
         }
         this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -2250,12 +2407,7 @@ class CfnNetworkInsightsAnalysisPropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnNetworkInsightsAnalysisPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnNetworkInsightsAnalysisPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnNetworkInsightsAnalysisPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -2271,7 +2423,7 @@ exports.CfnNetworkInsightsAnalysisPropsMixin = CfnNetworkInsightsAnalysisPropsMi
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-networkinsightspath.html
  */
 class CfnNetworkInsightsPathPropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_ec2.mixins.CfnNetworkInsightsPathPropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_ec2.mixins.CfnNetworkInsightsPathPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["destination", "destinationIp", "destinationPort", "filterAtDestination", "filterAtSource", "protocol", "source", "sourceIp", "tags"];
     props;
     strategy;
@@ -2294,7 +2446,7 @@ class CfnNetworkInsightsPathPropsMixin extends cdk.Mixin {
             throw error;
         }
         this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -2307,12 +2459,7 @@ class CfnNetworkInsightsPathPropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnNetworkInsightsPathPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnNetworkInsightsPathPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnNetworkInsightsPathPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -2326,7 +2473,7 @@ exports.CfnNetworkInsightsPathPropsMixin = CfnNetworkInsightsPathPropsMixin;
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-networkinterface.html
  */
 class CfnNetworkInterfacePropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_ec2.mixins.CfnNetworkInterfacePropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_ec2.mixins.CfnNetworkInterfacePropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["connectionTrackingSpecification", "description", "enablePrimaryIpv6", "groupSet", "interfaceType", "ipv4PrefixCount", "ipv4Prefixes", "ipv6AddressCount", "ipv6Addresses", "ipv6PrefixCount", "ipv6Prefixes", "privateIpAddress", "privateIpAddresses", "publicIpDnsHostnameTypeSpecification", "secondaryPrivateIpAddressCount", "sourceDestCheck", "subnetId", "tags"];
     props;
     strategy;
@@ -2348,8 +2495,11 @@ class CfnNetworkInterfacePropsMixin extends cdk.Mixin {
             }
             throw error;
         }
-        this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.props = {
+            ...props,
+            ...flattenCfnNetworkInterfaceMixinProps(props)
+        };
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -2362,16 +2512,20 @@ class CfnNetworkInterfacePropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnNetworkInterfacePropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnNetworkInterfacePropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnNetworkInterfacePropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
 exports.CfnNetworkInterfacePropsMixin = CfnNetworkInterfacePropsMixin;
+// @ts-ignore TS6133
+function flattenCfnNetworkInterfaceMixinProps(props) {
+    const ret = {};
+    if ((props.groupSet !== undefined))
+        ret.groupSet = cdk.mapArrayInPlace(props.groupSet, (item) => cdk.getRefProperty(item?.securityGroupRef, 'securityGroupId') ?? cdk.ensureStringOrUndefined(item, "groupSet", "ec2.ISecurityGroupRef | string"));
+    if ((props.subnetId !== undefined))
+        ret.subnetId = cdk.getRefProperty(props.subnetId?.subnetRef, 'subnetId') ?? cdk.ensureStringOrUndefined(props.subnetId, "subnetId", "ec2.ISubnetRef | string");
+    return ret;
+}
 /**
  * Attaches an elastic network interface (ENI) to an Amazon EC2 instance.
  *
@@ -2383,7 +2537,7 @@ exports.CfnNetworkInterfacePropsMixin = CfnNetworkInterfacePropsMixin;
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-networkinterfaceattachment.html
  */
 class CfnNetworkInterfaceAttachmentPropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_ec2.mixins.CfnNetworkInterfaceAttachmentPropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_ec2.mixins.CfnNetworkInterfaceAttachmentPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["deleteOnTermination", "deviceIndex", "enaQueueCount", "enaSrdSpecification", "instanceId", "networkInterfaceId"];
     props;
     strategy;
@@ -2406,7 +2560,7 @@ class CfnNetworkInterfaceAttachmentPropsMixin extends cdk.Mixin {
             throw error;
         }
         this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -2419,12 +2573,7 @@ class CfnNetworkInterfaceAttachmentPropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnNetworkInterfaceAttachmentPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnNetworkInterfaceAttachmentPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnNetworkInterfaceAttachmentPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -2438,7 +2587,7 @@ exports.CfnNetworkInterfaceAttachmentPropsMixin = CfnNetworkInterfaceAttachmentP
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-networkinterfacepermission.html
  */
 class CfnNetworkInterfacePermissionPropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_ec2.mixins.CfnNetworkInterfacePermissionPropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_ec2.mixins.CfnNetworkInterfacePermissionPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["awsAccountId", "networkInterfaceId", "permission"];
     props;
     strategy;
@@ -2461,7 +2610,7 @@ class CfnNetworkInterfacePermissionPropsMixin extends cdk.Mixin {
             throw error;
         }
         this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -2474,12 +2623,7 @@ class CfnNetworkInterfacePermissionPropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnNetworkInterfacePermissionPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnNetworkInterfacePermissionPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnNetworkInterfacePermissionPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -2493,7 +2637,7 @@ exports.CfnNetworkInterfacePermissionPropsMixin = CfnNetworkInterfacePermissionP
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-networkperformancemetricsubscription.html
  */
 class CfnNetworkPerformanceMetricSubscriptionPropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_ec2.mixins.CfnNetworkPerformanceMetricSubscriptionPropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_ec2.mixins.CfnNetworkPerformanceMetricSubscriptionPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["destination", "metric", "source", "statistic"];
     props;
     strategy;
@@ -2516,7 +2660,7 @@ class CfnNetworkPerformanceMetricSubscriptionPropsMixin extends cdk.Mixin {
             throw error;
         }
         this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -2529,12 +2673,7 @@ class CfnNetworkPerformanceMetricSubscriptionPropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnNetworkPerformanceMetricSubscriptionPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnNetworkPerformanceMetricSubscriptionPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnNetworkPerformanceMetricSubscriptionPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -2554,7 +2693,7 @@ exports.CfnNetworkPerformanceMetricSubscriptionPropsMixin = CfnNetworkPerformanc
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-placementgroup.html
  */
 class CfnPlacementGroupPropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_ec2.mixins.CfnPlacementGroupPropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_ec2.mixins.CfnPlacementGroupPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["partitionCount", "spreadLevel", "strategy", "tags"];
     props;
     strategy;
@@ -2577,7 +2716,7 @@ class CfnPlacementGroupPropsMixin extends cdk.Mixin {
             throw error;
         }
         this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -2590,12 +2729,7 @@ class CfnPlacementGroupPropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnPlacementGroupPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnPlacementGroupPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnPlacementGroupPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -2611,7 +2745,7 @@ exports.CfnPlacementGroupPropsMixin = CfnPlacementGroupPropsMixin;
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-prefixlist.html
  */
 class CfnPrefixListPropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_ec2.mixins.CfnPrefixListPropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_ec2.mixins.CfnPrefixListPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["addressFamily", "entries", "maxEntries", "prefixListName", "tags"];
     props;
     strategy;
@@ -2634,7 +2768,7 @@ class CfnPrefixListPropsMixin extends cdk.Mixin {
             throw error;
         }
         this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -2647,12 +2781,7 @@ class CfnPrefixListPropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnPrefixListPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnPrefixListPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnPrefixListPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -2670,7 +2799,7 @@ exports.CfnPrefixListPropsMixin = CfnPrefixListPropsMixin;
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-route.html
  */
 class CfnRoutePropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_ec2.mixins.CfnRoutePropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_ec2.mixins.CfnRoutePropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["carrierGatewayId", "coreNetworkArn", "destinationCidrBlock", "destinationIpv6CidrBlock", "destinationPrefixListId", "egressOnlyInternetGatewayId", "gatewayId", "instanceId", "localGatewayId", "natGatewayId", "networkInterfaceId", "routeTableId", "transitGatewayId", "vpcEndpointId", "vpcPeeringConnectionId"];
     props;
     strategy;
@@ -2692,8 +2821,11 @@ class CfnRoutePropsMixin extends cdk.Mixin {
             }
             throw error;
         }
-        this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.props = {
+            ...props,
+            ...flattenCfnRouteMixinProps(props)
+        };
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -2706,16 +2838,32 @@ class CfnRoutePropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnRoutePropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnRoutePropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnRoutePropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
 exports.CfnRoutePropsMixin = CfnRoutePropsMixin;
+// @ts-ignore TS6133
+function flattenCfnRouteMixinProps(props) {
+    const ret = {};
+    if ((props.carrierGatewayId !== undefined))
+        ret.carrierGatewayId = cdk.getRefProperty(props.carrierGatewayId?.carrierGatewayRef, 'carrierGatewayId') ?? cdk.ensureStringOrUndefined(props.carrierGatewayId, "carrierGatewayId", "ec2.ICarrierGatewayRef | string");
+    if ((props.egressOnlyInternetGatewayId !== undefined))
+        ret.egressOnlyInternetGatewayId = cdk.getRefProperty(props.egressOnlyInternetGatewayId?.egressOnlyInternetGatewayRef, 'egressOnlyInternetGatewayId') ?? cdk.ensureStringOrUndefined(props.egressOnlyInternetGatewayId, "egressOnlyInternetGatewayId", "ec2.IEgressOnlyInternetGatewayRef | string");
+    if ((props.gatewayId !== undefined))
+        ret.gatewayId = cdk.getRefProperty(props.gatewayId?.internetGatewayRef, 'internetGatewayId') ?? cdk.getRefProperty(props.gatewayId?.vpnGatewayRef, 'vpnGatewayId') ?? cdk.ensureStringOrUndefined(props.gatewayId, "gatewayId", "ec2.IInternetGatewayRef | ec2.IVPNGatewayRef | string");
+    if ((props.instanceId !== undefined))
+        ret.instanceId = cdk.getRefProperty(props.instanceId?.instanceRef, 'instanceId') ?? cdk.ensureStringOrUndefined(props.instanceId, "instanceId", "ec2.IInstanceRef | string");
+    if ((props.natGatewayId !== undefined))
+        ret.natGatewayId = cdk.getRefProperty(props.natGatewayId?.natGatewayRef, 'natGatewayId') ?? cdk.ensureStringOrUndefined(props.natGatewayId, "natGatewayId", "ec2.INatGatewayRef | string");
+    if ((props.routeTableId !== undefined))
+        ret.routeTableId = cdk.getRefProperty(props.routeTableId?.routeTableRef, 'routeTableId') ?? cdk.ensureStringOrUndefined(props.routeTableId, "routeTableId", "ec2.IRouteTableRef | string");
+    if ((props.transitGatewayId !== undefined))
+        ret.transitGatewayId = cdk.getRefProperty(props.transitGatewayId?.transitGatewayRef, 'transitGatewayId') ?? cdk.ensureStringOrUndefined(props.transitGatewayId, "transitGatewayId", "ec2.ITransitGatewayRef | string");
+    if ((props.vpcPeeringConnectionId !== undefined))
+        ret.vpcPeeringConnectionId = cdk.getRefProperty(props.vpcPeeringConnectionId?.vpcPeeringConnectionRef, 'vpcPeeringConnectionId') ?? cdk.ensureStringOrUndefined(props.vpcPeeringConnectionId, "vpcPeeringConnectionId", "ec2.IVPCPeeringConnectionRef | string");
+    return ret;
+}
 /**
  * Specifies a route table for the specified VPC.
  *
@@ -2729,7 +2877,7 @@ exports.CfnRoutePropsMixin = CfnRoutePropsMixin;
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-routetable.html
  */
 class CfnRouteTablePropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_ec2.mixins.CfnRouteTablePropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_ec2.mixins.CfnRouteTablePropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["tags", "vpcId"];
     props;
     strategy;
@@ -2751,8 +2899,11 @@ class CfnRouteTablePropsMixin extends cdk.Mixin {
             }
             throw error;
         }
-        this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.props = {
+            ...props,
+            ...flattenCfnRouteTableMixinProps(props)
+        };
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -2765,16 +2916,18 @@ class CfnRouteTablePropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnRouteTablePropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnRouteTablePropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnRouteTablePropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
 exports.CfnRouteTablePropsMixin = CfnRouteTablePropsMixin;
+// @ts-ignore TS6133
+function flattenCfnRouteTableMixinProps(props) {
+    const ret = {};
+    if ((props.vpcId !== undefined))
+        ret.vpcId = cdk.getRefProperty(props.vpcId?.vpcRef, 'vpcId') ?? cdk.ensureStringOrUndefined(props.vpcId, "vpcId", "ec2.IVPCRef | string");
+    return ret;
+}
 /**
  * Specifies a security group.
  *
@@ -2794,7 +2947,7 @@ exports.CfnRouteTablePropsMixin = CfnRouteTablePropsMixin;
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-securitygroup.html
  */
 class CfnSecurityGroupPropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_ec2.mixins.CfnSecurityGroupPropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_ec2.mixins.CfnSecurityGroupPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["groupDescription", "groupName", "securityGroupEgress", "securityGroupIngress", "tags", "vpcId"];
     props;
     strategy;
@@ -2816,8 +2969,11 @@ class CfnSecurityGroupPropsMixin extends cdk.Mixin {
             }
             throw error;
         }
-        this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.props = {
+            ...props,
+            ...flattenCfnSecurityGroupMixinProps(props)
+        };
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -2830,16 +2986,54 @@ class CfnSecurityGroupPropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnSecurityGroupPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnSecurityGroupPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnSecurityGroupPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
 exports.CfnSecurityGroupPropsMixin = CfnSecurityGroupPropsMixin;
+// @ts-ignore TS6133
+function flattenCfnSecurityGroupPropsMixinEgressProperty(props) {
+    if (cdk.isResolvableObject(props))
+        return props;
+    return {
+        cidrIp: (!props.cidrIp ? undefined : props.cidrIp),
+        cidrIpv6: (!props.cidrIpv6 ? undefined : props.cidrIpv6),
+        description: (!props.description ? undefined : props.description),
+        destinationPrefixListId: (!props.destinationPrefixListId ? undefined : props.destinationPrefixListId),
+        destinationSecurityGroupId: (!props.destinationSecurityGroupId ? undefined : cdk.getRefProperty(props.destinationSecurityGroupId?.securityGroupRef, 'securityGroupId') ?? cdk.ensureStringOrUndefined(props.destinationSecurityGroupId, "destinationSecurityGroupId", "ec2.ISecurityGroupRef | string")),
+        fromPort: (!props.fromPort ? undefined : props.fromPort),
+        ipProtocol: (!props.ipProtocol ? undefined : props.ipProtocol),
+        toPort: (!props.toPort ? undefined : props.toPort)
+    };
+}
+// @ts-ignore TS6133
+function flattenCfnSecurityGroupPropsMixinIngressProperty(props) {
+    if (cdk.isResolvableObject(props))
+        return props;
+    return {
+        cidrIp: (!props.cidrIp ? undefined : props.cidrIp),
+        cidrIpv6: (!props.cidrIpv6 ? undefined : props.cidrIpv6),
+        description: (!props.description ? undefined : props.description),
+        fromPort: (!props.fromPort ? undefined : props.fromPort),
+        ipProtocol: (!props.ipProtocol ? undefined : props.ipProtocol),
+        sourcePrefixListId: (!props.sourcePrefixListId ? undefined : props.sourcePrefixListId),
+        sourceSecurityGroupId: (!props.sourceSecurityGroupId ? undefined : cdk.getRefProperty(props.sourceSecurityGroupId?.securityGroupRef, 'securityGroupId') ?? cdk.ensureStringOrUndefined(props.sourceSecurityGroupId, "sourceSecurityGroupId", "ec2.ISecurityGroupRef | string")),
+        sourceSecurityGroupName: (!props.sourceSecurityGroupName ? undefined : cdk.getRefProperty(props.sourceSecurityGroupName?.securityGroupRef, 'securityGroupId') ?? cdk.ensureStringOrUndefined(props.sourceSecurityGroupName, "sourceSecurityGroupName", "ec2.ISecurityGroupRef | string")),
+        sourceSecurityGroupOwnerId: (!props.sourceSecurityGroupOwnerId ? undefined : props.sourceSecurityGroupOwnerId),
+        toPort: (!props.toPort ? undefined : props.toPort)
+    };
+}
+// @ts-ignore TS6133
+function flattenCfnSecurityGroupMixinProps(props) {
+    const ret = {};
+    if ((props.securityGroupEgress !== undefined))
+        ret.securityGroupEgress = (cdk.isResolvableObject(props.securityGroupEgress) ? props.securityGroupEgress : cdk.mapArrayInPlace(props.securityGroupEgress, (item) => flattenCfnSecurityGroupPropsMixinEgressProperty(item)));
+    if ((props.securityGroupIngress !== undefined))
+        ret.securityGroupIngress = (cdk.isResolvableObject(props.securityGroupIngress) ? props.securityGroupIngress : cdk.mapArrayInPlace(props.securityGroupIngress, (item) => flattenCfnSecurityGroupPropsMixinIngressProperty(item)));
+    if ((props.vpcId !== undefined))
+        ret.vpcId = cdk.getRefProperty(props.vpcId?.vpcRef, 'vpcId') ?? cdk.ensureStringOrUndefined(props.vpcId, "vpcId", "ec2.IVPCRef | string");
+    return ret;
+}
 /**
  * Adds the specified outbound (egress) rule to a security group.
  *
@@ -2857,7 +3051,7 @@ exports.CfnSecurityGroupPropsMixin = CfnSecurityGroupPropsMixin;
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-securitygroupegress.html
  */
 class CfnSecurityGroupEgressPropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_ec2.mixins.CfnSecurityGroupEgressPropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_ec2.mixins.CfnSecurityGroupEgressPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["cidrIp", "cidrIpv6", "description", "destinationPrefixListId", "destinationSecurityGroupId", "fromPort", "groupId", "ipProtocol", "toPort"];
     props;
     strategy;
@@ -2879,8 +3073,11 @@ class CfnSecurityGroupEgressPropsMixin extends cdk.Mixin {
             }
             throw error;
         }
-        this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.props = {
+            ...props,
+            ...flattenCfnSecurityGroupEgressMixinProps(props)
+        };
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -2893,16 +3090,20 @@ class CfnSecurityGroupEgressPropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnSecurityGroupEgressPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnSecurityGroupEgressPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnSecurityGroupEgressPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
 exports.CfnSecurityGroupEgressPropsMixin = CfnSecurityGroupEgressPropsMixin;
+// @ts-ignore TS6133
+function flattenCfnSecurityGroupEgressMixinProps(props) {
+    const ret = {};
+    if ((props.destinationSecurityGroupId !== undefined))
+        ret.destinationSecurityGroupId = cdk.getRefProperty(props.destinationSecurityGroupId?.securityGroupRef, 'securityGroupId') ?? cdk.ensureStringOrUndefined(props.destinationSecurityGroupId, "destinationSecurityGroupId", "ec2.ISecurityGroupRef | string");
+    if ((props.groupId !== undefined))
+        ret.groupId = cdk.getRefProperty(props.groupId?.securityGroupRef, 'securityGroupId') ?? cdk.ensureStringOrUndefined(props.groupId, "groupId", "ec2.ISecurityGroupRef | string");
+    return ret;
+}
 /**
  * Adds an inbound (ingress) rule to a security group.
  *
@@ -2920,7 +3121,7 @@ exports.CfnSecurityGroupEgressPropsMixin = CfnSecurityGroupEgressPropsMixin;
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-securitygroupingress.html
  */
 class CfnSecurityGroupIngressPropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_ec2.mixins.CfnSecurityGroupIngressPropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_ec2.mixins.CfnSecurityGroupIngressPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["cidrIp", "cidrIpv6", "description", "fromPort", "groupId", "groupName", "ipProtocol", "sourcePrefixListId", "sourceSecurityGroupId", "sourceSecurityGroupName", "sourceSecurityGroupOwnerId", "toPort"];
     props;
     strategy;
@@ -2942,8 +3143,11 @@ class CfnSecurityGroupIngressPropsMixin extends cdk.Mixin {
             }
             throw error;
         }
-        this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.props = {
+            ...props,
+            ...flattenCfnSecurityGroupIngressMixinProps(props)
+        };
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -2956,16 +3160,26 @@ class CfnSecurityGroupIngressPropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnSecurityGroupIngressPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnSecurityGroupIngressPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnSecurityGroupIngressPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
 exports.CfnSecurityGroupIngressPropsMixin = CfnSecurityGroupIngressPropsMixin;
+// @ts-ignore TS6133
+function flattenCfnSecurityGroupIngressMixinProps(props) {
+    const ret = {};
+    if ((props.cidrIp !== undefined))
+        ret.cidrIp = props.cidrIp;
+    if ((props.groupId !== undefined))
+        ret.groupId = cdk.getRefProperty(props.groupId?.securityGroupRef, 'securityGroupId') ?? cdk.ensureStringOrUndefined(props.groupId, "groupId", "ec2.ISecurityGroupRef | string");
+    if ((props.groupName !== undefined))
+        ret.groupName = cdk.getRefProperty(props.groupName?.securityGroupRef, 'securityGroupId') ?? cdk.ensureStringOrUndefined(props.groupName, "groupName", "ec2.ISecurityGroupRef | string");
+    if ((props.sourcePrefixListId !== undefined))
+        ret.sourcePrefixListId = cdk.getRefProperty(props.sourcePrefixListId?.prefixListRef, 'prefixListId') ?? cdk.ensureStringOrUndefined(props.sourcePrefixListId, "sourcePrefixListId", "ec2.IPrefixListRef | string");
+    if ((props.sourceSecurityGroupId !== undefined))
+        ret.sourceSecurityGroupId = cdk.getRefProperty(props.sourceSecurityGroupId?.securityGroupRef, 'securityGroupId') ?? cdk.ensureStringOrUndefined(props.sourceSecurityGroupId, "sourceSecurityGroupId", "ec2.ISecurityGroupRef | string");
+    return ret;
+}
 /**
  * Specifies a Spot Fleet request.
  *
@@ -2987,7 +3201,7 @@ exports.CfnSecurityGroupIngressPropsMixin = CfnSecurityGroupIngressPropsMixin;
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-spotfleet.html
  */
 class CfnSpotFleetPropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_ec2.mixins.CfnSpotFleetPropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_ec2.mixins.CfnSpotFleetPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["spotFleetRequestConfigData", "tags"];
     props;
     strategy;
@@ -3009,8 +3223,11 @@ class CfnSpotFleetPropsMixin extends cdk.Mixin {
             }
             throw error;
         }
-        this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.props = {
+            ...props,
+            ...flattenCfnSpotFleetMixinProps(props)
+        };
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -3023,16 +3240,67 @@ class CfnSpotFleetPropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnSpotFleetPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnSpotFleetPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnSpotFleetPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
 exports.CfnSpotFleetPropsMixin = CfnSpotFleetPropsMixin;
+// @ts-ignore TS6133
+function flattenCfnSpotFleetPropsMixinFleetLaunchTemplateSpecificationProperty(props) {
+    if (cdk.isResolvableObject(props))
+        return props;
+    return {
+        launchTemplateId: (!props.launchTemplateId ? undefined : cdk.getRefProperty(props.launchTemplateId?.launchTemplateRef, 'launchTemplateId') ?? cdk.ensureStringOrUndefined(props.launchTemplateId, "launchTemplateId", "ec2.ILaunchTemplateRef | string")),
+        launchTemplateName: (!props.launchTemplateName ? undefined : props.launchTemplateName),
+        version: (!props.version ? undefined : props.version)
+    };
+}
+// @ts-ignore TS6133
+function flattenCfnSpotFleetPropsMixinLaunchTemplateConfigProperty(props) {
+    if (cdk.isResolvableObject(props))
+        return props;
+    return {
+        launchTemplateSpecification: (!props.launchTemplateSpecification ? undefined : (!props.launchTemplateSpecification ? undefined : flattenCfnSpotFleetPropsMixinFleetLaunchTemplateSpecificationProperty(props.launchTemplateSpecification))),
+        overrides: (!props.overrides ? undefined : props.overrides)
+    };
+}
+// @ts-ignore TS6133
+function flattenCfnSpotFleetPropsMixinSpotFleetRequestConfigDataProperty(props) {
+    if (cdk.isResolvableObject(props))
+        return props;
+    return {
+        allocationStrategy: (!props.allocationStrategy ? undefined : props.allocationStrategy),
+        context: (!props.context ? undefined : props.context),
+        excessCapacityTerminationPolicy: (!props.excessCapacityTerminationPolicy ? undefined : props.excessCapacityTerminationPolicy),
+        iamFleetRole: (!props.iamFleetRole ? undefined : cdk.getRefProperty(props.iamFleetRole?.roleRef, 'roleArn') ?? cdk.ensureStringOrUndefined(props.iamFleetRole, "iamFleetRole", "iam.IRoleRef | string")),
+        instanceInterruptionBehavior: (!props.instanceInterruptionBehavior ? undefined : props.instanceInterruptionBehavior),
+        instancePoolsToUseCount: (!props.instancePoolsToUseCount ? undefined : props.instancePoolsToUseCount),
+        launchSpecifications: (!props.launchSpecifications ? undefined : props.launchSpecifications),
+        launchTemplateConfigs: (!props.launchTemplateConfigs ? undefined : (cdk.isResolvableObject(props.launchTemplateConfigs) ? props.launchTemplateConfigs : (!props.launchTemplateConfigs ? undefined : cdk.mapArrayInPlace(props.launchTemplateConfigs, (item) => flattenCfnSpotFleetPropsMixinLaunchTemplateConfigProperty(item))))),
+        loadBalancersConfig: (!props.loadBalancersConfig ? undefined : props.loadBalancersConfig),
+        onDemandAllocationStrategy: (!props.onDemandAllocationStrategy ? undefined : props.onDemandAllocationStrategy),
+        onDemandMaxTotalPrice: (!props.onDemandMaxTotalPrice ? undefined : props.onDemandMaxTotalPrice),
+        onDemandTargetCapacity: (!props.onDemandTargetCapacity ? undefined : props.onDemandTargetCapacity),
+        replaceUnhealthyInstances: (!props.replaceUnhealthyInstances ? undefined : props.replaceUnhealthyInstances),
+        spotMaintenanceStrategies: (!props.spotMaintenanceStrategies ? undefined : props.spotMaintenanceStrategies),
+        spotMaxTotalPrice: (!props.spotMaxTotalPrice ? undefined : props.spotMaxTotalPrice),
+        spotPrice: (!props.spotPrice ? undefined : props.spotPrice),
+        tagSpecifications: (!props.tagSpecifications ? undefined : props.tagSpecifications),
+        targetCapacity: (!props.targetCapacity ? undefined : props.targetCapacity),
+        targetCapacityUnitType: (!props.targetCapacityUnitType ? undefined : props.targetCapacityUnitType),
+        terminateInstancesWithExpiration: (!props.terminateInstancesWithExpiration ? undefined : props.terminateInstancesWithExpiration),
+        type: (!props.type ? undefined : props.type),
+        validFrom: (!props.validFrom ? undefined : props.validFrom),
+        validUntil: (!props.validUntil ? undefined : props.validUntil)
+    };
+}
+// @ts-ignore TS6133
+function flattenCfnSpotFleetMixinProps(props) {
+    const ret = {};
+    if ((props.spotFleetRequestConfigData !== undefined))
+        ret.spotFleetRequestConfigData = flattenCfnSpotFleetPropsMixinSpotFleetRequestConfigDataProperty(props.spotFleetRequestConfigData);
+    return ret;
+}
 /**
  * Specifies a subnet for the specified VPC.
  *
@@ -3046,7 +3314,7 @@ exports.CfnSpotFleetPropsMixin = CfnSpotFleetPropsMixin;
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-subnet.html
  */
 class CfnSubnetPropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_ec2.mixins.CfnSubnetPropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_ec2.mixins.CfnSubnetPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["assignIpv6AddressOnCreation", "availabilityZone", "availabilityZoneId", "cidrBlock", "enableDns64", "enableLniAtDeviceIndex", "ipv4IpamPoolId", "ipv4NetmaskLength", "ipv6CidrBlock", "ipv6IpamPoolId", "ipv6Native", "ipv6NetmaskLength", "mapPublicIpOnLaunch", "outpostArn", "privateDnsNameOptionsOnLaunch", "tags", "vpcId"];
     props;
     strategy;
@@ -3068,8 +3336,11 @@ class CfnSubnetPropsMixin extends cdk.Mixin {
             }
             throw error;
         }
-        this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.props = {
+            ...props,
+            ...flattenCfnSubnetMixinProps(props)
+        };
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -3082,16 +3353,18 @@ class CfnSubnetPropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnSubnetPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnSubnetPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnSubnetPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
 exports.CfnSubnetPropsMixin = CfnSubnetPropsMixin;
+// @ts-ignore TS6133
+function flattenCfnSubnetMixinProps(props) {
+    const ret = {};
+    if ((props.vpcId !== undefined))
+        ret.vpcId = cdk.getRefProperty(props.vpcId?.vpcRef, 'vpcId') ?? cdk.ensureStringOrUndefined(props.vpcId, "vpcId", "ec2.IVPCRef | string");
+    return ret;
+}
 /**
  * Associates a CIDR block with your subnet.
  *
@@ -3103,7 +3376,7 @@ exports.CfnSubnetPropsMixin = CfnSubnetPropsMixin;
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-subnetcidrblock.html
  */
 class CfnSubnetCidrBlockPropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_ec2.mixins.CfnSubnetCidrBlockPropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_ec2.mixins.CfnSubnetCidrBlockPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["ipv6CidrBlock", "ipv6IpamPoolId", "ipv6NetmaskLength", "subnetId"];
     props;
     strategy;
@@ -3125,8 +3398,11 @@ class CfnSubnetCidrBlockPropsMixin extends cdk.Mixin {
             }
             throw error;
         }
-        this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.props = {
+            ...props,
+            ...flattenCfnSubnetCidrBlockMixinProps(props)
+        };
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -3139,16 +3415,18 @@ class CfnSubnetCidrBlockPropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnSubnetCidrBlockPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnSubnetCidrBlockPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnSubnetCidrBlockPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
 exports.CfnSubnetCidrBlockPropsMixin = CfnSubnetCidrBlockPropsMixin;
+// @ts-ignore TS6133
+function flattenCfnSubnetCidrBlockMixinProps(props) {
+    const ret = {};
+    if ((props.subnetId !== undefined))
+        ret.subnetId = cdk.getRefProperty(props.subnetId?.subnetRef, 'subnetId') ?? cdk.ensureStringOrUndefined(props.subnetId, "subnetId", "ec2.ISubnetRef | string");
+    return ret;
+}
 /**
  * Associates a subnet with a network ACL. For more information, see [ReplaceNetworkAclAssociation](https://docs.aws.amazon.com/AWSEC2/latest/APIReference/ApiReference-query-ReplaceNetworkAclAssociation.html) in the *Amazon EC2 API Reference* .
  *
@@ -3160,7 +3438,7 @@ exports.CfnSubnetCidrBlockPropsMixin = CfnSubnetCidrBlockPropsMixin;
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-subnetnetworkaclassociation.html
  */
 class CfnSubnetNetworkAclAssociationPropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_ec2.mixins.CfnSubnetNetworkAclAssociationPropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_ec2.mixins.CfnSubnetNetworkAclAssociationPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["networkAclId", "subnetId"];
     props;
     strategy;
@@ -3182,8 +3460,11 @@ class CfnSubnetNetworkAclAssociationPropsMixin extends cdk.Mixin {
             }
             throw error;
         }
-        this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.props = {
+            ...props,
+            ...flattenCfnSubnetNetworkAclAssociationMixinProps(props)
+        };
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -3196,16 +3477,20 @@ class CfnSubnetNetworkAclAssociationPropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnSubnetNetworkAclAssociationPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnSubnetNetworkAclAssociationPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnSubnetNetworkAclAssociationPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
 exports.CfnSubnetNetworkAclAssociationPropsMixin = CfnSubnetNetworkAclAssociationPropsMixin;
+// @ts-ignore TS6133
+function flattenCfnSubnetNetworkAclAssociationMixinProps(props) {
+    const ret = {};
+    if ((props.networkAclId !== undefined))
+        ret.networkAclId = cdk.getRefProperty(props.networkAclId?.networkAclRef, 'networkAclId') ?? cdk.ensureStringOrUndefined(props.networkAclId, "networkAclId", "ec2.INetworkAclRef | string");
+    if ((props.subnetId !== undefined))
+        ret.subnetId = cdk.getRefProperty(props.subnetId?.subnetRef, 'subnetId') ?? cdk.ensureStringOrUndefined(props.subnetId, "subnetId", "ec2.ISubnetRef | string");
+    return ret;
+}
 /**
  * Associates a subnet with a route table.
  *
@@ -3217,7 +3502,7 @@ exports.CfnSubnetNetworkAclAssociationPropsMixin = CfnSubnetNetworkAclAssociatio
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-subnetroutetableassociation.html
  */
 class CfnSubnetRouteTableAssociationPropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_ec2.mixins.CfnSubnetRouteTableAssociationPropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_ec2.mixins.CfnSubnetRouteTableAssociationPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["routeTableId", "subnetId"];
     props;
     strategy;
@@ -3239,8 +3524,11 @@ class CfnSubnetRouteTableAssociationPropsMixin extends cdk.Mixin {
             }
             throw error;
         }
-        this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.props = {
+            ...props,
+            ...flattenCfnSubnetRouteTableAssociationMixinProps(props)
+        };
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -3253,16 +3541,20 @@ class CfnSubnetRouteTableAssociationPropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnSubnetRouteTableAssociationPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnSubnetRouteTableAssociationPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnSubnetRouteTableAssociationPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
 exports.CfnSubnetRouteTableAssociationPropsMixin = CfnSubnetRouteTableAssociationPropsMixin;
+// @ts-ignore TS6133
+function flattenCfnSubnetRouteTableAssociationMixinProps(props) {
+    const ret = {};
+    if ((props.routeTableId !== undefined))
+        ret.routeTableId = cdk.getRefProperty(props.routeTableId?.routeTableRef, 'routeTableId') ?? cdk.ensureStringOrUndefined(props.routeTableId, "routeTableId", "ec2.IRouteTableRef | string");
+    if ((props.subnetId !== undefined))
+        ret.subnetId = cdk.getRefProperty(props.subnetId?.subnetRef, 'subnetId') ?? cdk.ensureStringOrUndefined(props.subnetId, "subnetId", "ec2.ISubnetRef | string");
+    return ret;
+}
 /**
  * Specifies a Traffic Mirror filter.
  *
@@ -3276,7 +3568,7 @@ exports.CfnSubnetRouteTableAssociationPropsMixin = CfnSubnetRouteTableAssociatio
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-trafficmirrorfilter.html
  */
 class CfnTrafficMirrorFilterPropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_ec2.mixins.CfnTrafficMirrorFilterPropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_ec2.mixins.CfnTrafficMirrorFilterPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["description", "networkServices", "tags"];
     props;
     strategy;
@@ -3299,7 +3591,7 @@ class CfnTrafficMirrorFilterPropsMixin extends cdk.Mixin {
             throw error;
         }
         this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -3312,12 +3604,7 @@ class CfnTrafficMirrorFilterPropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnTrafficMirrorFilterPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnTrafficMirrorFilterPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnTrafficMirrorFilterPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -3335,7 +3622,7 @@ exports.CfnTrafficMirrorFilterPropsMixin = CfnTrafficMirrorFilterPropsMixin;
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-trafficmirrorfilterrule.html
  */
 class CfnTrafficMirrorFilterRulePropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_ec2.mixins.CfnTrafficMirrorFilterRulePropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_ec2.mixins.CfnTrafficMirrorFilterRulePropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["description", "destinationCidrBlock", "destinationPortRange", "protocol", "ruleAction", "ruleNumber", "sourceCidrBlock", "sourcePortRange", "tags", "trafficDirection", "trafficMirrorFilterId"];
     props;
     strategy;
@@ -3358,7 +3645,7 @@ class CfnTrafficMirrorFilterRulePropsMixin extends cdk.Mixin {
             throw error;
         }
         this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -3371,12 +3658,7 @@ class CfnTrafficMirrorFilterRulePropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnTrafficMirrorFilterRulePropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnTrafficMirrorFilterRulePropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnTrafficMirrorFilterRulePropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -3396,7 +3678,7 @@ exports.CfnTrafficMirrorFilterRulePropsMixin = CfnTrafficMirrorFilterRulePropsMi
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-trafficmirrorsession.html
  */
 class CfnTrafficMirrorSessionPropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_ec2.mixins.CfnTrafficMirrorSessionPropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_ec2.mixins.CfnTrafficMirrorSessionPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["description", "networkInterfaceId", "ownerId", "packetLength", "sessionNumber", "tags", "trafficMirrorFilterId", "trafficMirrorTargetId", "virtualNetworkId"];
     props;
     strategy;
@@ -3419,7 +3701,7 @@ class CfnTrafficMirrorSessionPropsMixin extends cdk.Mixin {
             throw error;
         }
         this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -3432,12 +3714,7 @@ class CfnTrafficMirrorSessionPropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnTrafficMirrorSessionPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnTrafficMirrorSessionPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnTrafficMirrorSessionPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -3457,7 +3734,7 @@ exports.CfnTrafficMirrorSessionPropsMixin = CfnTrafficMirrorSessionPropsMixin;
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-trafficmirrortarget.html
  */
 class CfnTrafficMirrorTargetPropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_ec2.mixins.CfnTrafficMirrorTargetPropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_ec2.mixins.CfnTrafficMirrorTargetPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["description", "gatewayLoadBalancerEndpointId", "networkInterfaceId", "networkLoadBalancerArn", "tags"];
     props;
     strategy;
@@ -3480,7 +3757,7 @@ class CfnTrafficMirrorTargetPropsMixin extends cdk.Mixin {
             throw error;
         }
         this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -3493,12 +3770,7 @@ class CfnTrafficMirrorTargetPropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnTrafficMirrorTargetPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnTrafficMirrorTargetPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnTrafficMirrorTargetPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -3522,7 +3794,7 @@ exports.CfnTrafficMirrorTargetPropsMixin = CfnTrafficMirrorTargetPropsMixin;
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-transitgateway.html
  */
 class CfnTransitGatewayPropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_ec2.mixins.CfnTransitGatewayPropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_ec2.mixins.CfnTransitGatewayPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["amazonSideAsn", "associationDefaultRouteTableId", "autoAcceptSharedAttachments", "defaultRouteTableAssociation", "defaultRouteTablePropagation", "description", "dnsSupport", "encryptionSupport", "multicastSupport", "propagationDefaultRouteTableId", "securityGroupReferencingSupport", "tags", "transitGatewayCidrBlocks", "vpnEcmpSupport"];
     props;
     strategy;
@@ -3545,7 +3817,7 @@ class CfnTransitGatewayPropsMixin extends cdk.Mixin {
             throw error;
         }
         this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -3558,12 +3830,7 @@ class CfnTransitGatewayPropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnTransitGatewayPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnTransitGatewayPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnTransitGatewayPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -3583,7 +3850,7 @@ exports.CfnTransitGatewayPropsMixin = CfnTransitGatewayPropsMixin;
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-transitgatewayattachment.html
  */
 class CfnTransitGatewayAttachmentPropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_ec2.mixins.CfnTransitGatewayAttachmentPropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_ec2.mixins.CfnTransitGatewayAttachmentPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["options", "subnetIds", "tags", "transitGatewayId", "vpcId"];
     props;
     strategy;
@@ -3605,8 +3872,11 @@ class CfnTransitGatewayAttachmentPropsMixin extends cdk.Mixin {
             }
             throw error;
         }
-        this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.props = {
+            ...props,
+            ...flattenCfnTransitGatewayAttachmentMixinProps(props)
+        };
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -3619,16 +3889,22 @@ class CfnTransitGatewayAttachmentPropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnTransitGatewayAttachmentPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnTransitGatewayAttachmentPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnTransitGatewayAttachmentPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
 exports.CfnTransitGatewayAttachmentPropsMixin = CfnTransitGatewayAttachmentPropsMixin;
+// @ts-ignore TS6133
+function flattenCfnTransitGatewayAttachmentMixinProps(props) {
+    const ret = {};
+    if ((props.subnetIds !== undefined))
+        ret.subnetIds = cdk.mapArrayInPlace(props.subnetIds, (item) => cdk.getRefProperty(item?.subnetRef, 'subnetId') ?? cdk.ensureStringOrUndefined(item, "subnetIds", "ec2.ISubnetRef | string"));
+    if ((props.transitGatewayId !== undefined))
+        ret.transitGatewayId = cdk.getRefProperty(props.transitGatewayId?.transitGatewayRef, 'transitGatewayId') ?? cdk.ensureStringOrUndefined(props.transitGatewayId, "transitGatewayId", "ec2.ITransitGatewayRef | string");
+    if ((props.vpcId !== undefined))
+        ret.vpcId = cdk.getRefProperty(props.vpcId?.vpcRef, 'vpcId') ?? cdk.ensureStringOrUndefined(props.vpcId, "vpcId", "ec2.IVPCRef | string");
+    return ret;
+}
 /**
  * Creates a Connect attachment from a specified transit gateway attachment.
  *
@@ -3642,7 +3918,7 @@ exports.CfnTransitGatewayAttachmentPropsMixin = CfnTransitGatewayAttachmentProps
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-transitgatewayconnect.html
  */
 class CfnTransitGatewayConnectPropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_ec2.mixins.CfnTransitGatewayConnectPropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_ec2.mixins.CfnTransitGatewayConnectPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["options", "tags", "transportTransitGatewayAttachmentId"];
     props;
     strategy;
@@ -3664,8 +3940,11 @@ class CfnTransitGatewayConnectPropsMixin extends cdk.Mixin {
             }
             throw error;
         }
-        this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.props = {
+            ...props,
+            ...flattenCfnTransitGatewayConnectMixinProps(props)
+        };
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -3678,16 +3957,18 @@ class CfnTransitGatewayConnectPropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnTransitGatewayConnectPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnTransitGatewayConnectPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnTransitGatewayConnectPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
 exports.CfnTransitGatewayConnectPropsMixin = CfnTransitGatewayConnectPropsMixin;
+// @ts-ignore TS6133
+function flattenCfnTransitGatewayConnectMixinProps(props) {
+    const ret = {};
+    if ((props.transportTransitGatewayAttachmentId !== undefined))
+        ret.transportTransitGatewayAttachmentId = cdk.getRefProperty(props.transportTransitGatewayAttachmentId?.transitGatewayVpcAttachmentRef, 'transitGatewayVpcAttachmentId') ?? cdk.ensureStringOrUndefined(props.transportTransitGatewayAttachmentId, "transportTransitGatewayAttachmentId", "ec2.ITransitGatewayVpcAttachmentRef | string");
+    return ret;
+}
 /**
  * Creates a multicast domain using the specified transit gateway.
  *
@@ -3699,7 +3980,7 @@ exports.CfnTransitGatewayConnectPropsMixin = CfnTransitGatewayConnectPropsMixin;
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-transitgatewaymulticastdomain.html
  */
 class CfnTransitGatewayMulticastDomainPropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_ec2.mixins.CfnTransitGatewayMulticastDomainPropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_ec2.mixins.CfnTransitGatewayMulticastDomainPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["options", "tags", "transitGatewayId"];
     props;
     strategy;
@@ -3722,7 +4003,7 @@ class CfnTransitGatewayMulticastDomainPropsMixin extends cdk.Mixin {
             throw error;
         }
         this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -3735,12 +4016,7 @@ class CfnTransitGatewayMulticastDomainPropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnTransitGatewayMulticastDomainPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnTransitGatewayMulticastDomainPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnTransitGatewayMulticastDomainPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -3756,7 +4032,7 @@ exports.CfnTransitGatewayMulticastDomainPropsMixin = CfnTransitGatewayMulticastD
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-transitgatewaymulticastdomainassociation.html
  */
 class CfnTransitGatewayMulticastDomainAssociationPropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_ec2.mixins.CfnTransitGatewayMulticastDomainAssociationPropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_ec2.mixins.CfnTransitGatewayMulticastDomainAssociationPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["subnetId", "transitGatewayAttachmentId", "transitGatewayMulticastDomainId"];
     props;
     strategy;
@@ -3779,7 +4055,7 @@ class CfnTransitGatewayMulticastDomainAssociationPropsMixin extends cdk.Mixin {
             throw error;
         }
         this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -3792,12 +4068,7 @@ class CfnTransitGatewayMulticastDomainAssociationPropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnTransitGatewayMulticastDomainAssociationPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnTransitGatewayMulticastDomainAssociationPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnTransitGatewayMulticastDomainAssociationPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -3813,7 +4084,7 @@ exports.CfnTransitGatewayMulticastDomainAssociationPropsMixin = CfnTransitGatewa
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-transitgatewaymulticastgroupmember.html
  */
 class CfnTransitGatewayMulticastGroupMemberPropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_ec2.mixins.CfnTransitGatewayMulticastGroupMemberPropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_ec2.mixins.CfnTransitGatewayMulticastGroupMemberPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["groupIpAddress", "networkInterfaceId", "transitGatewayMulticastDomainId"];
     props;
     strategy;
@@ -3836,7 +4107,7 @@ class CfnTransitGatewayMulticastGroupMemberPropsMixin extends cdk.Mixin {
             throw error;
         }
         this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -3849,12 +4120,7 @@ class CfnTransitGatewayMulticastGroupMemberPropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnTransitGatewayMulticastGroupMemberPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnTransitGatewayMulticastGroupMemberPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnTransitGatewayMulticastGroupMemberPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -3870,7 +4136,7 @@ exports.CfnTransitGatewayMulticastGroupMemberPropsMixin = CfnTransitGatewayMulti
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-transitgatewaymulticastgroupsource.html
  */
 class CfnTransitGatewayMulticastGroupSourcePropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_ec2.mixins.CfnTransitGatewayMulticastGroupSourcePropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_ec2.mixins.CfnTransitGatewayMulticastGroupSourcePropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["groupIpAddress", "networkInterfaceId", "transitGatewayMulticastDomainId"];
     props;
     strategy;
@@ -3893,7 +4159,7 @@ class CfnTransitGatewayMulticastGroupSourcePropsMixin extends cdk.Mixin {
             throw error;
         }
         this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -3906,12 +4172,7 @@ class CfnTransitGatewayMulticastGroupSourcePropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnTransitGatewayMulticastGroupSourcePropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnTransitGatewayMulticastGroupSourcePropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnTransitGatewayMulticastGroupSourcePropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -3929,7 +4190,7 @@ exports.CfnTransitGatewayMulticastGroupSourcePropsMixin = CfnTransitGatewayMulti
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-transitgatewaypeeringattachment.html
  */
 class CfnTransitGatewayPeeringAttachmentPropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_ec2.mixins.CfnTransitGatewayPeeringAttachmentPropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_ec2.mixins.CfnTransitGatewayPeeringAttachmentPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["peerAccountId", "peerRegion", "peerTransitGatewayId", "tags", "transitGatewayId"];
     props;
     strategy;
@@ -3951,8 +4212,11 @@ class CfnTransitGatewayPeeringAttachmentPropsMixin extends cdk.Mixin {
             }
             throw error;
         }
-        this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.props = {
+            ...props,
+            ...flattenCfnTransitGatewayPeeringAttachmentMixinProps(props)
+        };
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -3965,16 +4229,18 @@ class CfnTransitGatewayPeeringAttachmentPropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnTransitGatewayPeeringAttachmentPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnTransitGatewayPeeringAttachmentPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnTransitGatewayPeeringAttachmentPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
 exports.CfnTransitGatewayPeeringAttachmentPropsMixin = CfnTransitGatewayPeeringAttachmentPropsMixin;
+// @ts-ignore TS6133
+function flattenCfnTransitGatewayPeeringAttachmentMixinProps(props) {
+    const ret = {};
+    if ((props.transitGatewayId !== undefined))
+        ret.transitGatewayId = cdk.getRefProperty(props.transitGatewayId?.transitGatewayRef, 'transitGatewayId') ?? cdk.ensureStringOrUndefined(props.transitGatewayId, "transitGatewayId", "ec2.ITransitGatewayRef | string");
+    return ret;
+}
 /**
  * Specifies a static route for a transit gateway route table.
  *
@@ -3984,7 +4250,7 @@ exports.CfnTransitGatewayPeeringAttachmentPropsMixin = CfnTransitGatewayPeeringA
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-transitgatewayroute.html
  */
 class CfnTransitGatewayRoutePropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_ec2.mixins.CfnTransitGatewayRoutePropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_ec2.mixins.CfnTransitGatewayRoutePropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["blackhole", "destinationCidrBlock", "transitGatewayAttachmentId", "transitGatewayRouteTableId"];
     props;
     strategy;
@@ -4006,8 +4272,11 @@ class CfnTransitGatewayRoutePropsMixin extends cdk.Mixin {
             }
             throw error;
         }
-        this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.props = {
+            ...props,
+            ...flattenCfnTransitGatewayRouteMixinProps(props)
+        };
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -4020,16 +4289,20 @@ class CfnTransitGatewayRoutePropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnTransitGatewayRoutePropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnTransitGatewayRoutePropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnTransitGatewayRoutePropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
 exports.CfnTransitGatewayRoutePropsMixin = CfnTransitGatewayRoutePropsMixin;
+// @ts-ignore TS6133
+function flattenCfnTransitGatewayRouteMixinProps(props) {
+    const ret = {};
+    if ((props.transitGatewayAttachmentId !== undefined))
+        ret.transitGatewayAttachmentId = cdk.getRefProperty(props.transitGatewayAttachmentId?.transitGatewayAttachmentRef, 'transitGatewayAttachmentId') ?? cdk.getRefProperty(props.transitGatewayAttachmentId?.transitGatewayPeeringAttachmentRef, 'transitGatewayAttachmentId') ?? cdk.ensureStringOrUndefined(props.transitGatewayAttachmentId, "transitGatewayAttachmentId", "ec2.ITransitGatewayAttachmentRef | ec2.ITransitGatewayPeeringAttachmentRef | string");
+    if ((props.transitGatewayRouteTableId !== undefined))
+        ret.transitGatewayRouteTableId = cdk.getRefProperty(props.transitGatewayRouteTableId?.transitGatewayRouteTableRef, 'transitGatewayRouteTableId') ?? cdk.ensureStringOrUndefined(props.transitGatewayRouteTableId, "transitGatewayRouteTableId", "ec2.ITransitGatewayRouteTableRef | string");
+    return ret;
+}
 /**
  * Specifies a route table for a transit gateway.
  *
@@ -4039,7 +4312,7 @@ exports.CfnTransitGatewayRoutePropsMixin = CfnTransitGatewayRoutePropsMixin;
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-transitgatewayroutetable.html
  */
 class CfnTransitGatewayRouteTablePropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_ec2.mixins.CfnTransitGatewayRouteTablePropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_ec2.mixins.CfnTransitGatewayRouteTablePropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["tags", "transitGatewayId"];
     props;
     strategy;
@@ -4061,8 +4334,11 @@ class CfnTransitGatewayRouteTablePropsMixin extends cdk.Mixin {
             }
             throw error;
         }
-        this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.props = {
+            ...props,
+            ...flattenCfnTransitGatewayRouteTableMixinProps(props)
+        };
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -4075,16 +4351,18 @@ class CfnTransitGatewayRouteTablePropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnTransitGatewayRouteTablePropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnTransitGatewayRouteTablePropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnTransitGatewayRouteTablePropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
 exports.CfnTransitGatewayRouteTablePropsMixin = CfnTransitGatewayRouteTablePropsMixin;
+// @ts-ignore TS6133
+function flattenCfnTransitGatewayRouteTableMixinProps(props) {
+    const ret = {};
+    if ((props.transitGatewayId !== undefined))
+        ret.transitGatewayId = cdk.getRefProperty(props.transitGatewayId?.transitGatewayRef, 'transitGatewayId') ?? cdk.ensureStringOrUndefined(props.transitGatewayId, "transitGatewayId", "ec2.ITransitGatewayRef | string");
+    return ret;
+}
 /**
  * Associates the specified attachment with the specified transit gateway route table.
  *
@@ -4098,7 +4376,7 @@ exports.CfnTransitGatewayRouteTablePropsMixin = CfnTransitGatewayRouteTableProps
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-transitgatewayroutetableassociation.html
  */
 class CfnTransitGatewayRouteTableAssociationPropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_ec2.mixins.CfnTransitGatewayRouteTableAssociationPropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_ec2.mixins.CfnTransitGatewayRouteTableAssociationPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["transitGatewayAttachmentId", "transitGatewayRouteTableId"];
     props;
     strategy;
@@ -4120,8 +4398,11 @@ class CfnTransitGatewayRouteTableAssociationPropsMixin extends cdk.Mixin {
             }
             throw error;
         }
-        this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.props = {
+            ...props,
+            ...flattenCfnTransitGatewayRouteTableAssociationMixinProps(props)
+        };
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -4134,16 +4415,20 @@ class CfnTransitGatewayRouteTableAssociationPropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnTransitGatewayRouteTableAssociationPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnTransitGatewayRouteTableAssociationPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnTransitGatewayRouteTableAssociationPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
 exports.CfnTransitGatewayRouteTableAssociationPropsMixin = CfnTransitGatewayRouteTableAssociationPropsMixin;
+// @ts-ignore TS6133
+function flattenCfnTransitGatewayRouteTableAssociationMixinProps(props) {
+    const ret = {};
+    if ((props.transitGatewayAttachmentId !== undefined))
+        ret.transitGatewayAttachmentId = cdk.getRefProperty(props.transitGatewayAttachmentId?.transitGatewayAttachmentRef, 'transitGatewayAttachmentId') ?? cdk.ensureStringOrUndefined(props.transitGatewayAttachmentId, "transitGatewayAttachmentId", "ec2.ITransitGatewayAttachmentRef | string");
+    if ((props.transitGatewayRouteTableId !== undefined))
+        ret.transitGatewayRouteTableId = cdk.getRefProperty(props.transitGatewayRouteTableId?.transitGatewayRouteTableRef, 'transitGatewayRouteTableId') ?? cdk.ensureStringOrUndefined(props.transitGatewayRouteTableId, "transitGatewayRouteTableId", "ec2.ITransitGatewayRouteTableRef | string");
+    return ret;
+}
 /**
  * Enables the specified attachment to propagate routes to the specified propagation route table.
  *
@@ -4155,7 +4440,7 @@ exports.CfnTransitGatewayRouteTableAssociationPropsMixin = CfnTransitGatewayRout
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-transitgatewayroutetablepropagation.html
  */
 class CfnTransitGatewayRouteTablePropagationPropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_ec2.mixins.CfnTransitGatewayRouteTablePropagationPropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_ec2.mixins.CfnTransitGatewayRouteTablePropagationPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["transitGatewayAttachmentId", "transitGatewayRouteTableId"];
     props;
     strategy;
@@ -4177,8 +4462,11 @@ class CfnTransitGatewayRouteTablePropagationPropsMixin extends cdk.Mixin {
             }
             throw error;
         }
-        this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.props = {
+            ...props,
+            ...flattenCfnTransitGatewayRouteTablePropagationMixinProps(props)
+        };
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -4191,16 +4479,20 @@ class CfnTransitGatewayRouteTablePropagationPropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnTransitGatewayRouteTablePropagationPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnTransitGatewayRouteTablePropagationPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnTransitGatewayRouteTablePropagationPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
 exports.CfnTransitGatewayRouteTablePropagationPropsMixin = CfnTransitGatewayRouteTablePropagationPropsMixin;
+// @ts-ignore TS6133
+function flattenCfnTransitGatewayRouteTablePropagationMixinProps(props) {
+    const ret = {};
+    if ((props.transitGatewayAttachmentId !== undefined))
+        ret.transitGatewayAttachmentId = cdk.getRefProperty(props.transitGatewayAttachmentId?.transitGatewayAttachmentRef, 'transitGatewayAttachmentId') ?? cdk.ensureStringOrUndefined(props.transitGatewayAttachmentId, "transitGatewayAttachmentId", "ec2.ITransitGatewayAttachmentRef | string");
+    if ((props.transitGatewayRouteTableId !== undefined))
+        ret.transitGatewayRouteTableId = cdk.getRefProperty(props.transitGatewayRouteTableId?.transitGatewayRouteTableRef, 'transitGatewayRouteTableId') ?? cdk.ensureStringOrUndefined(props.transitGatewayRouteTableId, "transitGatewayRouteTableId", "ec2.ITransitGatewayRouteTableRef | string");
+    return ret;
+}
 /**
  * Specifies a VPC attachment.
  *
@@ -4210,7 +4502,7 @@ exports.CfnTransitGatewayRouteTablePropagationPropsMixin = CfnTransitGatewayRout
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-transitgatewayvpcattachment.html
  */
 class CfnTransitGatewayVpcAttachmentPropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_ec2.mixins.CfnTransitGatewayVpcAttachmentPropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_ec2.mixins.CfnTransitGatewayVpcAttachmentPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["addSubnetIds", "options", "removeSubnetIds", "subnetIds", "tags", "transitGatewayId", "vpcId"];
     props;
     strategy;
@@ -4232,8 +4524,11 @@ class CfnTransitGatewayVpcAttachmentPropsMixin extends cdk.Mixin {
             }
             throw error;
         }
-        this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.props = {
+            ...props,
+            ...flattenCfnTransitGatewayVpcAttachmentMixinProps(props)
+        };
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -4246,16 +4541,18 @@ class CfnTransitGatewayVpcAttachmentPropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnTransitGatewayVpcAttachmentPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnTransitGatewayVpcAttachmentPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnTransitGatewayVpcAttachmentPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
 exports.CfnTransitGatewayVpcAttachmentPropsMixin = CfnTransitGatewayVpcAttachmentPropsMixin;
+// @ts-ignore TS6133
+function flattenCfnTransitGatewayVpcAttachmentMixinProps(props) {
+    const ret = {};
+    if ((props.transitGatewayId !== undefined))
+        ret.transitGatewayId = cdk.getRefProperty(props.transitGatewayId?.transitGatewayRef, 'transitGatewayId') ?? cdk.ensureStringOrUndefined(props.transitGatewayId, "transitGatewayId", "ec2.ITransitGatewayRef | string");
+    return ret;
+}
 /**
  * Specifies a virtual private cloud (VPC).
  *
@@ -4269,7 +4566,7 @@ exports.CfnTransitGatewayVpcAttachmentPropsMixin = CfnTransitGatewayVpcAttachmen
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-vpc.html
  */
 class CfnVPCPropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_ec2.mixins.CfnVPCPropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_ec2.mixins.CfnVPCPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["cidrBlock", "enableDnsHostnames", "enableDnsSupport", "instanceTenancy", "ipv4IpamPoolId", "ipv4NetmaskLength", "tags"];
     props;
     strategy;
@@ -4292,7 +4589,7 @@ class CfnVPCPropsMixin extends cdk.Mixin {
             throw error;
         }
         this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -4305,12 +4602,7 @@ class CfnVPCPropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnVPCPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnVPCPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnVPCPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -4328,7 +4620,7 @@ exports.CfnVPCPropsMixin = CfnVPCPropsMixin;
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-vpccidrblock.html
  */
 class CfnVPCCidrBlockPropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_ec2.mixins.CfnVPCCidrBlockPropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_ec2.mixins.CfnVPCCidrBlockPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["amazonProvidedIpv6CidrBlock", "cidrBlock", "ipv4IpamPoolId", "ipv4NetmaskLength", "ipv6CidrBlock", "ipv6CidrBlockNetworkBorderGroup", "ipv6IpamPoolId", "ipv6NetmaskLength", "ipv6Pool", "vpcId"];
     props;
     strategy;
@@ -4350,8 +4642,11 @@ class CfnVPCCidrBlockPropsMixin extends cdk.Mixin {
             }
             throw error;
         }
-        this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.props = {
+            ...props,
+            ...flattenCfnVPCCidrBlockMixinProps(props)
+        };
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -4364,16 +4659,18 @@ class CfnVPCCidrBlockPropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnVPCCidrBlockPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnVPCCidrBlockPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnVPCCidrBlockPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
 exports.CfnVPCCidrBlockPropsMixin = CfnVPCCidrBlockPropsMixin;
+// @ts-ignore TS6133
+function flattenCfnVPCCidrBlockMixinProps(props) {
+    const ret = {};
+    if ((props.vpcId !== undefined))
+        ret.vpcId = cdk.getRefProperty(props.vpcId?.vpcRef, 'vpcId') ?? cdk.ensureStringOrUndefined(props.vpcId, "vpcId", "ec2.IVPCRef | string");
+    return ret;
+}
 /**
  * Associates a set of DHCP options with a VPC, or associates no DHCP options with the VPC.
  *
@@ -4385,7 +4682,7 @@ exports.CfnVPCCidrBlockPropsMixin = CfnVPCCidrBlockPropsMixin;
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-vpcdhcpoptionsassociation.html
  */
 class CfnVPCDHCPOptionsAssociationPropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_ec2.mixins.CfnVPCDHCPOptionsAssociationPropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_ec2.mixins.CfnVPCDHCPOptionsAssociationPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["dhcpOptionsId", "vpcId"];
     props;
     strategy;
@@ -4407,8 +4704,11 @@ class CfnVPCDHCPOptionsAssociationPropsMixin extends cdk.Mixin {
             }
             throw error;
         }
-        this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.props = {
+            ...props,
+            ...flattenCfnVPCDHCPOptionsAssociationMixinProps(props)
+        };
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -4421,16 +4721,20 @@ class CfnVPCDHCPOptionsAssociationPropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnVPCDHCPOptionsAssociationPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnVPCDHCPOptionsAssociationPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnVPCDHCPOptionsAssociationPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
 exports.CfnVPCDHCPOptionsAssociationPropsMixin = CfnVPCDHCPOptionsAssociationPropsMixin;
+// @ts-ignore TS6133
+function flattenCfnVPCDHCPOptionsAssociationMixinProps(props) {
+    const ret = {};
+    if ((props.dhcpOptionsId !== undefined))
+        ret.dhcpOptionsId = cdk.getRefProperty(props.dhcpOptionsId?.dhcpOptionsRef, 'dhcpOptionsId') ?? cdk.ensureStringOrUndefined(props.dhcpOptionsId, "dhcpOptionsId", "ec2.IDHCPOptionsRef | string");
+    if ((props.vpcId !== undefined))
+        ret.vpcId = cdk.getRefProperty(props.vpcId?.vpcRef, 'vpcId') ?? cdk.ensureStringOrUndefined(props.vpcId, "vpcId", "ec2.IVPCRef | string");
+    return ret;
+}
 /**
  * Specifies a VPC endpoint.
  *
@@ -4448,7 +4752,7 @@ exports.CfnVPCDHCPOptionsAssociationPropsMixin = CfnVPCDHCPOptionsAssociationPro
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-vpcendpoint.html
  */
 class CfnVPCEndpointPropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_ec2.mixins.CfnVPCEndpointPropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_ec2.mixins.CfnVPCEndpointPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["dnsOptions", "ipAddressType", "policyDocument", "privateDnsEnabled", "resourceConfigurationArn", "routeTableIds", "securityGroupIds", "serviceName", "serviceNetworkArn", "serviceRegion", "subnetIds", "tags", "vpcEndpointType", "vpcId"];
     props;
     strategy;
@@ -4470,8 +4774,11 @@ class CfnVPCEndpointPropsMixin extends cdk.Mixin {
             }
             throw error;
         }
-        this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.props = {
+            ...props,
+            ...flattenCfnVPCEndpointMixinProps(props)
+        };
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -4484,16 +4791,24 @@ class CfnVPCEndpointPropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnVPCEndpointPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnVPCEndpointPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnVPCEndpointPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
 exports.CfnVPCEndpointPropsMixin = CfnVPCEndpointPropsMixin;
+// @ts-ignore TS6133
+function flattenCfnVPCEndpointMixinProps(props) {
+    const ret = {};
+    if ((props.routeTableIds !== undefined))
+        ret.routeTableIds = cdk.mapArrayInPlace(props.routeTableIds, (item) => cdk.getRefProperty(item?.routeTableRef, 'routeTableId') ?? cdk.ensureStringOrUndefined(item, "routeTableIds", "ec2.IRouteTableRef | string"));
+    if ((props.securityGroupIds !== undefined))
+        ret.securityGroupIds = cdk.mapArrayInPlace(props.securityGroupIds, (item) => cdk.getRefProperty(item?.securityGroupRef, 'securityGroupId') ?? cdk.ensureStringOrUndefined(item, "securityGroupIds", "ec2.ISecurityGroupRef | string"));
+    if ((props.subnetIds !== undefined))
+        ret.subnetIds = cdk.mapArrayInPlace(props.subnetIds, (item) => cdk.getRefProperty(item?.subnetRef, 'subnetId') ?? cdk.ensureStringOrUndefined(item, "subnetIds", "ec2.ISubnetRef | string"));
+    if ((props.vpcId !== undefined))
+        ret.vpcId = cdk.getRefProperty(props.vpcId?.vpcRef, 'vpcId') ?? cdk.ensureStringOrUndefined(props.vpcId, "vpcId", "ec2.IVPCRef | string");
+    return ret;
+}
 /**
  * Specifies a connection notification for a VPC endpoint or VPC endpoint service.
  *
@@ -4507,7 +4822,7 @@ exports.CfnVPCEndpointPropsMixin = CfnVPCEndpointPropsMixin;
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-vpcendpointconnectionnotification.html
  */
 class CfnVPCEndpointConnectionNotificationPropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_ec2.mixins.CfnVPCEndpointConnectionNotificationPropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_ec2.mixins.CfnVPCEndpointConnectionNotificationPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["connectionEvents", "connectionNotificationArn", "serviceId", "vpcEndpointId"];
     props;
     strategy;
@@ -4529,8 +4844,11 @@ class CfnVPCEndpointConnectionNotificationPropsMixin extends cdk.Mixin {
             }
             throw error;
         }
-        this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.props = {
+            ...props,
+            ...flattenCfnVPCEndpointConnectionNotificationMixinProps(props)
+        };
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -4543,16 +4861,20 @@ class CfnVPCEndpointConnectionNotificationPropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnVPCEndpointConnectionNotificationPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnVPCEndpointConnectionNotificationPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnVPCEndpointConnectionNotificationPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
 exports.CfnVPCEndpointConnectionNotificationPropsMixin = CfnVPCEndpointConnectionNotificationPropsMixin;
+// @ts-ignore TS6133
+function flattenCfnVPCEndpointConnectionNotificationMixinProps(props) {
+    const ret = {};
+    if ((props.connectionNotificationArn !== undefined))
+        ret.connectionNotificationArn = cdk.getRefProperty(props.connectionNotificationArn?.topicRef, 'topicArn') ?? cdk.ensureStringOrUndefined(props.connectionNotificationArn, "connectionNotificationArn", "sns.ITopicRef | string");
+    if ((props.serviceId !== undefined))
+        ret.serviceId = cdk.getRefProperty(props.serviceId?.vpcEndpointServiceRef, 'serviceId') ?? cdk.ensureStringOrUndefined(props.serviceId, "serviceId", "ec2.IVPCEndpointServiceRef | string");
+    return ret;
+}
 /**
  * Creates a VPC endpoint service configuration to which service consumers ( AWS accounts, users, and IAM roles) can connect.
  *
@@ -4569,7 +4891,7 @@ exports.CfnVPCEndpointConnectionNotificationPropsMixin = CfnVPCEndpointConnectio
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-vpcendpointservice.html
  */
 class CfnVPCEndpointServicePropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_ec2.mixins.CfnVPCEndpointServicePropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_ec2.mixins.CfnVPCEndpointServicePropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["acceptanceRequired", "contributorInsightsEnabled", "gatewayLoadBalancerArns", "networkLoadBalancerArns", "payerResponsibility", "supportedIpAddressTypes", "supportedRegions", "tags"];
     props;
     strategy;
@@ -4591,8 +4913,11 @@ class CfnVPCEndpointServicePropsMixin extends cdk.Mixin {
             }
             throw error;
         }
-        this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.props = {
+            ...props,
+            ...flattenCfnVPCEndpointServiceMixinProps(props)
+        };
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -4605,16 +4930,18 @@ class CfnVPCEndpointServicePropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnVPCEndpointServicePropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnVPCEndpointServicePropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnVPCEndpointServicePropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
 exports.CfnVPCEndpointServicePropsMixin = CfnVPCEndpointServicePropsMixin;
+// @ts-ignore TS6133
+function flattenCfnVPCEndpointServiceMixinProps(props) {
+    const ret = {};
+    if ((props.networkLoadBalancerArns !== undefined))
+        ret.networkLoadBalancerArns = cdk.mapArrayInPlace(props.networkLoadBalancerArns, (item) => cdk.getRefProperty(item?.loadBalancerRef, 'loadBalancerArn') ?? cdk.ensureStringOrUndefined(item, "networkLoadBalancerArns", "elasticloadbalancingv2.ILoadBalancerRef | string"));
+    return ret;
+}
 /**
  * Grant or revoke permissions for service consumers (users, IAM roles, and AWS accounts) to connect to a VPC endpoint service.
  *
@@ -4626,7 +4953,7 @@ exports.CfnVPCEndpointServicePropsMixin = CfnVPCEndpointServicePropsMixin;
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-vpcendpointservicepermissions.html
  */
 class CfnVPCEndpointServicePermissionsPropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_ec2.mixins.CfnVPCEndpointServicePermissionsPropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_ec2.mixins.CfnVPCEndpointServicePermissionsPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["allowedPrincipals", "serviceId"];
     props;
     strategy;
@@ -4648,8 +4975,11 @@ class CfnVPCEndpointServicePermissionsPropsMixin extends cdk.Mixin {
             }
             throw error;
         }
-        this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.props = {
+            ...props,
+            ...flattenCfnVPCEndpointServicePermissionsMixinProps(props)
+        };
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -4662,16 +4992,18 @@ class CfnVPCEndpointServicePermissionsPropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnVPCEndpointServicePermissionsPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnVPCEndpointServicePermissionsPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnVPCEndpointServicePermissionsPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
 exports.CfnVPCEndpointServicePermissionsPropsMixin = CfnVPCEndpointServicePermissionsPropsMixin;
+// @ts-ignore TS6133
+function flattenCfnVPCEndpointServicePermissionsMixinProps(props) {
+    const ret = {};
+    if ((props.serviceId !== undefined))
+        ret.serviceId = cdk.getRefProperty(props.serviceId?.vpcEndpointServiceRef, 'serviceId') ?? cdk.ensureStringOrUndefined(props.serviceId, "serviceId", "ec2.IVPCEndpointServiceRef | string");
+    return ret;
+}
 /**
  * Attaches an internet gateway, or a virtual private gateway to a VPC, enabling connectivity between the internet and the VPC.
  *
@@ -4681,7 +5013,7 @@ exports.CfnVPCEndpointServicePermissionsPropsMixin = CfnVPCEndpointServicePermis
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-vpcgatewayattachment.html
  */
 class CfnVPCGatewayAttachmentPropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_ec2.mixins.CfnVPCGatewayAttachmentPropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_ec2.mixins.CfnVPCGatewayAttachmentPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["internetGatewayId", "vpcId", "vpnGatewayId"];
     props;
     strategy;
@@ -4703,8 +5035,11 @@ class CfnVPCGatewayAttachmentPropsMixin extends cdk.Mixin {
             }
             throw error;
         }
-        this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.props = {
+            ...props,
+            ...flattenCfnVPCGatewayAttachmentMixinProps(props)
+        };
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -4717,16 +5052,22 @@ class CfnVPCGatewayAttachmentPropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnVPCGatewayAttachmentPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnVPCGatewayAttachmentPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnVPCGatewayAttachmentPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
 exports.CfnVPCGatewayAttachmentPropsMixin = CfnVPCGatewayAttachmentPropsMixin;
+// @ts-ignore TS6133
+function flattenCfnVPCGatewayAttachmentMixinProps(props) {
+    const ret = {};
+    if ((props.internetGatewayId !== undefined))
+        ret.internetGatewayId = cdk.getRefProperty(props.internetGatewayId?.internetGatewayRef, 'internetGatewayId') ?? cdk.ensureStringOrUndefined(props.internetGatewayId, "internetGatewayId", "ec2.IInternetGatewayRef | string");
+    if ((props.vpcId !== undefined))
+        ret.vpcId = cdk.getRefProperty(props.vpcId?.vpcRef, 'vpcId') ?? cdk.ensureStringOrUndefined(props.vpcId, "vpcId", "ec2.IVPCRef | string");
+    if ((props.vpnGatewayId !== undefined))
+        ret.vpnGatewayId = cdk.getRefProperty(props.vpnGatewayId?.vpnGatewayRef, 'vpnGatewayId') ?? cdk.ensureStringOrUndefined(props.vpnGatewayId, "vpnGatewayId", "ec2.IVPNGatewayRef | string");
+    return ret;
+}
 /**
  * Requests a VPC peering connection between two VPCs: a requester VPC that you own and an accepter VPC with which to create the connection.
  *
@@ -4744,7 +5085,7 @@ exports.CfnVPCGatewayAttachmentPropsMixin = CfnVPCGatewayAttachmentPropsMixin;
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-vpcpeeringconnection.html
  */
 class CfnVPCPeeringConnectionPropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_ec2.mixins.CfnVPCPeeringConnectionPropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_ec2.mixins.CfnVPCPeeringConnectionPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["assumeRoleRegion", "peerOwnerId", "peerRegion", "peerRoleArn", "peerVpcId", "tags", "vpcId"];
     props;
     strategy;
@@ -4766,8 +5107,11 @@ class CfnVPCPeeringConnectionPropsMixin extends cdk.Mixin {
             }
             throw error;
         }
-        this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.props = {
+            ...props,
+            ...flattenCfnVPCPeeringConnectionMixinProps(props)
+        };
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -4780,16 +5124,20 @@ class CfnVPCPeeringConnectionPropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnVPCPeeringConnectionPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnVPCPeeringConnectionPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnVPCPeeringConnectionPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
 exports.CfnVPCPeeringConnectionPropsMixin = CfnVPCPeeringConnectionPropsMixin;
+// @ts-ignore TS6133
+function flattenCfnVPCPeeringConnectionMixinProps(props) {
+    const ret = {};
+    if ((props.peerVpcId !== undefined))
+        ret.peerVpcId = cdk.getRefProperty(props.peerVpcId?.vpcRef, 'vpcId') ?? cdk.ensureStringOrUndefined(props.peerVpcId, "peerVpcId", "ec2.IVPCRef | string");
+    if ((props.vpcId !== undefined))
+        ret.vpcId = cdk.getRefProperty(props.vpcId?.vpcRef, 'vpcId') ?? cdk.ensureStringOrUndefined(props.vpcId, "vpcId", "ec2.IVPCRef | string");
+    return ret;
+}
 /**
  * Specifies a VPN connection between a virtual private gateway and a VPN customer gateway or a transit gateway and a VPN customer gateway.
  *
@@ -4805,7 +5153,7 @@ exports.CfnVPCPeeringConnectionPropsMixin = CfnVPCPeeringConnectionPropsMixin;
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-vpnconnection.html
  */
 class CfnVPNConnectionPropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_ec2.mixins.CfnVPNConnectionPropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_ec2.mixins.CfnVPNConnectionPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["customerGatewayId", "enableAcceleration", "localIpv4NetworkCidr", "localIpv6NetworkCidr", "outsideIpAddressType", "preSharedKeyStorage", "remoteIpv4NetworkCidr", "remoteIpv6NetworkCidr", "staticRoutesOnly", "tags", "transitGatewayId", "transportTransitGatewayAttachmentId", "tunnelBandwidth", "tunnelInsideIpVersion", "type", "vpnConcentratorId", "vpnGatewayId", "vpnTunnelOptionsSpecifications"];
     props;
     strategy;
@@ -4827,8 +5175,11 @@ class CfnVPNConnectionPropsMixin extends cdk.Mixin {
             }
             throw error;
         }
-        this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.props = {
+            ...props,
+            ...flattenCfnVPNConnectionMixinProps(props)
+        };
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -4841,16 +5192,22 @@ class CfnVPNConnectionPropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnVPNConnectionPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnVPNConnectionPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnVPNConnectionPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
 exports.CfnVPNConnectionPropsMixin = CfnVPNConnectionPropsMixin;
+// @ts-ignore TS6133
+function flattenCfnVPNConnectionMixinProps(props) {
+    const ret = {};
+    if ((props.customerGatewayId !== undefined))
+        ret.customerGatewayId = cdk.getRefProperty(props.customerGatewayId?.customerGatewayRef, 'customerGatewayId') ?? cdk.ensureStringOrUndefined(props.customerGatewayId, "customerGatewayId", "ec2.ICustomerGatewayRef | string");
+    if ((props.transitGatewayId !== undefined))
+        ret.transitGatewayId = cdk.getRefProperty(props.transitGatewayId?.transitGatewayRef, 'transitGatewayId') ?? cdk.ensureStringOrUndefined(props.transitGatewayId, "transitGatewayId", "ec2.ITransitGatewayRef | string");
+    if ((props.vpnGatewayId !== undefined))
+        ret.vpnGatewayId = cdk.getRefProperty(props.vpnGatewayId?.vpnGatewayRef, 'vpnGatewayId') ?? cdk.ensureStringOrUndefined(props.vpnGatewayId, "vpnGatewayId", "ec2.IVPNGatewayRef | string");
+    return ret;
+}
 /**
  * Specifies a static route for a VPN connection between an existing virtual private gateway and a VPN customer gateway.
  *
@@ -4864,7 +5221,7 @@ exports.CfnVPNConnectionPropsMixin = CfnVPNConnectionPropsMixin;
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-vpnconnectionroute.html
  */
 class CfnVPNConnectionRoutePropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_ec2.mixins.CfnVPNConnectionRoutePropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_ec2.mixins.CfnVPNConnectionRoutePropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["destinationCidrBlock", "vpnConnectionId"];
     props;
     strategy;
@@ -4886,8 +5243,11 @@ class CfnVPNConnectionRoutePropsMixin extends cdk.Mixin {
             }
             throw error;
         }
-        this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.props = {
+            ...props,
+            ...flattenCfnVPNConnectionRouteMixinProps(props)
+        };
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -4900,16 +5260,18 @@ class CfnVPNConnectionRoutePropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnVPNConnectionRoutePropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnVPNConnectionRoutePropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnVPNConnectionRoutePropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
 exports.CfnVPNConnectionRoutePropsMixin = CfnVPNConnectionRoutePropsMixin;
+// @ts-ignore TS6133
+function flattenCfnVPNConnectionRouteMixinProps(props) {
+    const ret = {};
+    if ((props.vpnConnectionId !== undefined))
+        ret.vpnConnectionId = cdk.getRefProperty(props.vpnConnectionId?.vpnConnectionRef, 'vpnConnectionId') ?? cdk.ensureStringOrUndefined(props.vpnConnectionId, "vpnConnectionId", "ec2.IVPNConnectionRef | string");
+    return ret;
+}
 /**
  * Specifies a virtual private gateway.
  *
@@ -4923,7 +5285,7 @@ exports.CfnVPNConnectionRoutePropsMixin = CfnVPNConnectionRoutePropsMixin;
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-vpngateway.html
  */
 class CfnVPNGatewayPropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_ec2.mixins.CfnVPNGatewayPropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_ec2.mixins.CfnVPNGatewayPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["amazonSideAsn", "tags", "type"];
     props;
     strategy;
@@ -4946,7 +5308,7 @@ class CfnVPNGatewayPropsMixin extends cdk.Mixin {
             throw error;
         }
         this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -4959,12 +5321,7 @@ class CfnVPNGatewayPropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnVPNGatewayPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnVPNGatewayPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnVPNGatewayPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -4980,7 +5337,7 @@ exports.CfnVPNGatewayPropsMixin = CfnVPNGatewayPropsMixin;
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-vpngatewayroutepropagation.html
  */
 class CfnVPNGatewayRoutePropagationPropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_ec2.mixins.CfnVPNGatewayRoutePropagationPropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_ec2.mixins.CfnVPNGatewayRoutePropagationPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["routeTableIds", "vpnGatewayId"];
     props;
     strategy;
@@ -5003,7 +5360,7 @@ class CfnVPNGatewayRoutePropagationPropsMixin extends cdk.Mixin {
             throw error;
         }
         this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -5016,12 +5373,7 @@ class CfnVPNGatewayRoutePropagationPropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnVPNGatewayRoutePropagationPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnVPNGatewayRoutePropagationPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnVPNGatewayRoutePropagationPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -5037,7 +5389,7 @@ exports.CfnVPNGatewayRoutePropagationPropsMixin = CfnVPNGatewayRoutePropagationP
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-verifiedaccessendpoint.html
  */
 class CfnVerifiedAccessEndpointPropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_ec2.mixins.CfnVerifiedAccessEndpointPropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_ec2.mixins.CfnVerifiedAccessEndpointPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["applicationDomain", "attachmentType", "cidrOptions", "description", "domainCertificateArn", "endpointDomainPrefix", "endpointType", "loadBalancerOptions", "networkInterfaceOptions", "policyDocument", "policyEnabled", "rdsOptions", "securityGroupIds", "sseSpecification", "tags", "verifiedAccessGroupId"];
     props;
     strategy;
@@ -5060,7 +5412,7 @@ class CfnVerifiedAccessEndpointPropsMixin extends cdk.Mixin {
             throw error;
         }
         this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -5073,12 +5425,7 @@ class CfnVerifiedAccessEndpointPropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnVerifiedAccessEndpointPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnVerifiedAccessEndpointPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnVerifiedAccessEndpointPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -5094,7 +5441,7 @@ exports.CfnVerifiedAccessEndpointPropsMixin = CfnVerifiedAccessEndpointPropsMixi
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-verifiedaccessgroup.html
  */
 class CfnVerifiedAccessGroupPropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_ec2.mixins.CfnVerifiedAccessGroupPropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_ec2.mixins.CfnVerifiedAccessGroupPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["description", "policyDocument", "policyEnabled", "sseSpecification", "tags", "verifiedAccessInstanceId"];
     props;
     strategy;
@@ -5117,7 +5464,7 @@ class CfnVerifiedAccessGroupPropsMixin extends cdk.Mixin {
             throw error;
         }
         this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -5130,12 +5477,7 @@ class CfnVerifiedAccessGroupPropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnVerifiedAccessGroupPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnVerifiedAccessGroupPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnVerifiedAccessGroupPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -5149,7 +5491,7 @@ exports.CfnVerifiedAccessGroupPropsMixin = CfnVerifiedAccessGroupPropsMixin;
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-verifiedaccessinstance.html
  */
 class CfnVerifiedAccessInstancePropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_ec2.mixins.CfnVerifiedAccessInstancePropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_ec2.mixins.CfnVerifiedAccessInstancePropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["cidrEndpointsCustomSubDomain", "description", "fipsEnabled", "loggingConfigurations", "tags", "verifiedAccessTrustProviderIds", "verifiedAccessTrustProviders"];
     props;
     strategy;
@@ -5172,7 +5514,7 @@ class CfnVerifiedAccessInstancePropsMixin extends cdk.Mixin {
             throw error;
         }
         this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -5185,12 +5527,7 @@ class CfnVerifiedAccessInstancePropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnVerifiedAccessInstancePropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnVerifiedAccessInstancePropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnVerifiedAccessInstancePropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -5206,7 +5543,7 @@ exports.CfnVerifiedAccessInstancePropsMixin = CfnVerifiedAccessInstancePropsMixi
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-verifiedaccesstrustprovider.html
  */
 class CfnVerifiedAccessTrustProviderPropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_ec2.mixins.CfnVerifiedAccessTrustProviderPropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_ec2.mixins.CfnVerifiedAccessTrustProviderPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["description", "deviceOptions", "deviceTrustProviderType", "nativeApplicationOidcOptions", "oidcOptions", "policyReferenceName", "sseSpecification", "tags", "trustProviderType", "userTrustProviderType"];
     props;
     strategy;
@@ -5229,7 +5566,7 @@ class CfnVerifiedAccessTrustProviderPropsMixin extends cdk.Mixin {
             throw error;
         }
         this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -5242,12 +5579,7 @@ class CfnVerifiedAccessTrustProviderPropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnVerifiedAccessTrustProviderPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnVerifiedAccessTrustProviderPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnVerifiedAccessTrustProviderPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -5277,7 +5609,7 @@ exports.CfnVerifiedAccessTrustProviderPropsMixin = CfnVerifiedAccessTrustProvide
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-volume.html
  */
 class CfnVolumePropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_ec2.mixins.CfnVolumePropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_ec2.mixins.CfnVolumePropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["autoEnableIo", "availabilityZone", "availabilityZoneId", "encrypted", "iops", "kmsKeyId", "multiAttachEnabled", "outpostArn", "size", "snapshotId", "sourceVolumeId", "tags", "throughput", "volumeInitializationRate", "volumeType"];
     props;
     strategy;
@@ -5300,7 +5632,7 @@ class CfnVolumePropsMixin extends cdk.Mixin {
             throw error;
         }
         this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -5313,12 +5645,7 @@ class CfnVolumePropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnVolumePropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnVolumePropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnVolumePropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -5338,7 +5665,7 @@ exports.CfnVolumePropsMixin = CfnVolumePropsMixin;
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-volumeattachment.html
  */
 class CfnVolumeAttachmentPropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_ec2.mixins.CfnVolumeAttachmentPropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_ec2.mixins.CfnVolumeAttachmentPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["device", "ebsCardIndex", "instanceId", "volumeId"];
     props;
     strategy;
@@ -5360,8 +5687,11 @@ class CfnVolumeAttachmentPropsMixin extends cdk.Mixin {
             }
             throw error;
         }
-        this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.props = {
+            ...props,
+            ...flattenCfnVolumeAttachmentMixinProps(props)
+        };
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -5374,16 +5704,20 @@ class CfnVolumeAttachmentPropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnVolumeAttachmentPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnVolumeAttachmentPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnVolumeAttachmentPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
 exports.CfnVolumeAttachmentPropsMixin = CfnVolumeAttachmentPropsMixin;
+// @ts-ignore TS6133
+function flattenCfnVolumeAttachmentMixinProps(props) {
+    const ret = {};
+    if ((props.instanceId !== undefined))
+        ret.instanceId = cdk.getRefProperty(props.instanceId?.instanceRef, 'instanceId') ?? cdk.ensureStringOrUndefined(props.instanceId, "instanceId", "ec2.IInstanceRef | string");
+    if ((props.volumeId !== undefined))
+        ret.volumeId = cdk.getRefProperty(props.volumeId?.volumeRef, 'volumeId') ?? cdk.ensureStringOrUndefined(props.volumeId, "volumeId", "ec2.IVolumeRef | string");
+    return ret;
+}
 /**
  * Creates a new data export configuration for EC2 Capacity Manager.
  *
@@ -5395,7 +5729,7 @@ exports.CfnVolumeAttachmentPropsMixin = CfnVolumeAttachmentPropsMixin;
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-capacitymanagerdataexport.html
  */
 class CfnCapacityManagerDataExportPropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_ec2.mixins.CfnCapacityManagerDataExportPropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_ec2.mixins.CfnCapacityManagerDataExportPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["outputFormat", "s3BucketName", "s3BucketPrefix", "schedule", "tags"];
     props;
     strategy;
@@ -5418,7 +5752,7 @@ class CfnCapacityManagerDataExportPropsMixin extends cdk.Mixin {
             throw error;
         }
         this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -5431,12 +5765,7 @@ class CfnCapacityManagerDataExportPropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnCapacityManagerDataExportPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnCapacityManagerDataExportPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnCapacityManagerDataExportPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -5450,7 +5779,7 @@ exports.CfnCapacityManagerDataExportPropsMixin = CfnCapacityManagerDataExportPro
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-ipamprefixlistresolver.html
  */
 class CfnIPAMPrefixListResolverPropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_ec2.mixins.CfnIPAMPrefixListResolverPropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_ec2.mixins.CfnIPAMPrefixListResolverPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["addressFamily", "description", "ipamId", "rules", "tags"];
     props;
     strategy;
@@ -5473,7 +5802,7 @@ class CfnIPAMPrefixListResolverPropsMixin extends cdk.Mixin {
             throw error;
         }
         this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -5486,12 +5815,7 @@ class CfnIPAMPrefixListResolverPropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnIPAMPrefixListResolverPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnIPAMPrefixListResolverPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnIPAMPrefixListResolverPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -5505,7 +5829,7 @@ exports.CfnIPAMPrefixListResolverPropsMixin = CfnIPAMPrefixListResolverPropsMixi
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-ippoolroutetableassociation.html
  */
 class CfnIpPoolRouteTableAssociationPropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_ec2.mixins.CfnIpPoolRouteTableAssociationPropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_ec2.mixins.CfnIpPoolRouteTableAssociationPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["publicIpv4Pool", "routeTableId"];
     props;
     strategy;
@@ -5528,7 +5852,7 @@ class CfnIpPoolRouteTableAssociationPropsMixin extends cdk.Mixin {
             throw error;
         }
         this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -5541,12 +5865,7 @@ class CfnIpPoolRouteTableAssociationPropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnIpPoolRouteTableAssociationPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnIpPoolRouteTableAssociationPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnIpPoolRouteTableAssociationPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -5560,7 +5879,7 @@ exports.CfnIpPoolRouteTableAssociationPropsMixin = CfnIpPoolRouteTableAssociatio
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-localgatewayvirtualinterface.html
  */
 class CfnLocalGatewayVirtualInterfacePropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_ec2.mixins.CfnLocalGatewayVirtualInterfacePropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_ec2.mixins.CfnLocalGatewayVirtualInterfacePropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["localAddress", "localGatewayVirtualInterfaceGroupId", "outpostLagId", "peerAddress", "peerBgpAsn", "peerBgpAsnExtended", "tags", "vlan"];
     props;
     strategy;
@@ -5583,7 +5902,7 @@ class CfnLocalGatewayVirtualInterfacePropsMixin extends cdk.Mixin {
             throw error;
         }
         this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -5596,12 +5915,7 @@ class CfnLocalGatewayVirtualInterfacePropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnLocalGatewayVirtualInterfacePropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnLocalGatewayVirtualInterfacePropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnLocalGatewayVirtualInterfacePropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -5615,7 +5929,7 @@ exports.CfnLocalGatewayVirtualInterfacePropsMixin = CfnLocalGatewayVirtualInterf
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-localgatewayvirtualinterfacegroup.html
  */
 class CfnLocalGatewayVirtualInterfaceGroupPropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_ec2.mixins.CfnLocalGatewayVirtualInterfaceGroupPropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_ec2.mixins.CfnLocalGatewayVirtualInterfaceGroupPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["localBgpAsn", "localBgpAsnExtended", "localGatewayId", "tags"];
     props;
     strategy;
@@ -5638,7 +5952,7 @@ class CfnLocalGatewayVirtualInterfaceGroupPropsMixin extends cdk.Mixin {
             throw error;
         }
         this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -5651,12 +5965,7 @@ class CfnLocalGatewayVirtualInterfaceGroupPropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnLocalGatewayVirtualInterfaceGroupPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnLocalGatewayVirtualInterfaceGroupPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnLocalGatewayVirtualInterfaceGroupPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -5674,7 +5983,7 @@ exports.CfnLocalGatewayVirtualInterfaceGroupPropsMixin = CfnLocalGatewayVirtualI
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-routeserver.html
  */
 class CfnRouteServerPropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_ec2.mixins.CfnRouteServerPropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_ec2.mixins.CfnRouteServerPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["amazonSideAsn", "persistRoutes", "persistRoutesDuration", "snsNotificationsEnabled", "tags"];
     props;
     strategy;
@@ -5697,7 +6006,7 @@ class CfnRouteServerPropsMixin extends cdk.Mixin {
             throw error;
         }
         this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -5710,12 +6019,7 @@ class CfnRouteServerPropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnRouteServerPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnRouteServerPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnRouteServerPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -5731,7 +6035,7 @@ exports.CfnRouteServerPropsMixin = CfnRouteServerPropsMixin;
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-routeserverassociation.html
  */
 class CfnRouteServerAssociationPropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_ec2.mixins.CfnRouteServerAssociationPropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_ec2.mixins.CfnRouteServerAssociationPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["routeServerId", "vpcId"];
     props;
     strategy;
@@ -5754,7 +6058,7 @@ class CfnRouteServerAssociationPropsMixin extends cdk.Mixin {
             throw error;
         }
         this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -5767,12 +6071,7 @@ class CfnRouteServerAssociationPropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnRouteServerAssociationPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnRouteServerAssociationPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnRouteServerAssociationPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -5790,7 +6089,7 @@ exports.CfnRouteServerAssociationPropsMixin = CfnRouteServerAssociationPropsMixi
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-routeserverendpoint.html
  */
 class CfnRouteServerEndpointPropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_ec2.mixins.CfnRouteServerEndpointPropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_ec2.mixins.CfnRouteServerEndpointPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["routeServerId", "subnetId", "tags"];
     props;
     strategy;
@@ -5813,7 +6112,7 @@ class CfnRouteServerEndpointPropsMixin extends cdk.Mixin {
             throw error;
         }
         this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -5826,12 +6125,7 @@ class CfnRouteServerEndpointPropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnRouteServerEndpointPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnRouteServerEndpointPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnRouteServerEndpointPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -5847,7 +6141,7 @@ exports.CfnRouteServerEndpointPropsMixin = CfnRouteServerEndpointPropsMixin;
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-routeserverpeer.html
  */
 class CfnRouteServerPeerPropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_ec2.mixins.CfnRouteServerPeerPropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_ec2.mixins.CfnRouteServerPeerPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["bgpOptions", "peerAddress", "routeServerEndpointId", "tags"];
     props;
     strategy;
@@ -5870,7 +6164,7 @@ class CfnRouteServerPeerPropsMixin extends cdk.Mixin {
             throw error;
         }
         this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -5883,12 +6177,7 @@ class CfnRouteServerPeerPropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnRouteServerPeerPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnRouteServerPeerPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnRouteServerPeerPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -5904,7 +6193,7 @@ exports.CfnRouteServerPeerPropsMixin = CfnRouteServerPeerPropsMixin;
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-routeserverpropagation.html
  */
 class CfnRouteServerPropagationPropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_ec2.mixins.CfnRouteServerPropagationPropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_ec2.mixins.CfnRouteServerPropagationPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["routeServerId", "routeTableId"];
     props;
     strategy;
@@ -5927,7 +6216,7 @@ class CfnRouteServerPropagationPropsMixin extends cdk.Mixin {
             throw error;
         }
         this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -5940,12 +6229,7 @@ class CfnRouteServerPropagationPropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnRouteServerPropagationPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnRouteServerPropagationPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnRouteServerPropagationPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -5959,7 +6243,7 @@ exports.CfnRouteServerPropagationPropsMixin = CfnRouteServerPropagationPropsMixi
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-securitygroupvpcassociation.html
  */
 class CfnSecurityGroupVpcAssociationPropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_ec2.mixins.CfnSecurityGroupVpcAssociationPropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_ec2.mixins.CfnSecurityGroupVpcAssociationPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["groupId", "vpcId"];
     props;
     strategy;
@@ -5982,7 +6266,7 @@ class CfnSecurityGroupVpcAssociationPropsMixin extends cdk.Mixin {
             throw error;
         }
         this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -5995,12 +6279,7 @@ class CfnSecurityGroupVpcAssociationPropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnSecurityGroupVpcAssociationPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnSecurityGroupVpcAssociationPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnSecurityGroupVpcAssociationPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -6016,7 +6295,7 @@ exports.CfnSecurityGroupVpcAssociationPropsMixin = CfnSecurityGroupVpcAssociatio
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-snapshotblockpublicaccess.html
  */
 class CfnSnapshotBlockPublicAccessPropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_ec2.mixins.CfnSnapshotBlockPublicAccessPropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_ec2.mixins.CfnSnapshotBlockPublicAccessPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["state"];
     props;
     strategy;
@@ -6039,7 +6318,7 @@ class CfnSnapshotBlockPublicAccessPropsMixin extends cdk.Mixin {
             throw error;
         }
         this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -6052,12 +6331,7 @@ class CfnSnapshotBlockPublicAccessPropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnSnapshotBlockPublicAccessPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnSnapshotBlockPublicAccessPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnSnapshotBlockPublicAccessPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -6071,7 +6345,7 @@ exports.CfnSnapshotBlockPublicAccessPropsMixin = CfnSnapshotBlockPublicAccessPro
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-transitgatewayconnectpeer.html
  */
 class CfnTransitGatewayConnectPeerPropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_ec2.mixins.CfnTransitGatewayConnectPeerPropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_ec2.mixins.CfnTransitGatewayConnectPeerPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["connectPeerConfiguration", "tags", "transitGatewayAttachmentId"];
     props;
     strategy;
@@ -6094,7 +6368,7 @@ class CfnTransitGatewayConnectPeerPropsMixin extends cdk.Mixin {
             throw error;
         }
         this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -6107,12 +6381,7 @@ class CfnTransitGatewayConnectPeerPropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnTransitGatewayConnectPeerPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnTransitGatewayConnectPeerPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnTransitGatewayConnectPeerPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -6126,7 +6395,7 @@ exports.CfnTransitGatewayConnectPeerPropsMixin = CfnTransitGatewayConnectPeerPro
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-transitgatewaymeteringpolicy.html
  */
 class CfnTransitGatewayMeteringPolicyPropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_ec2.mixins.CfnTransitGatewayMeteringPolicyPropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_ec2.mixins.CfnTransitGatewayMeteringPolicyPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["middleboxAttachmentIds", "tags", "transitGatewayId"];
     props;
     strategy;
@@ -6149,7 +6418,7 @@ class CfnTransitGatewayMeteringPolicyPropsMixin extends cdk.Mixin {
             throw error;
         }
         this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -6162,12 +6431,7 @@ class CfnTransitGatewayMeteringPolicyPropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnTransitGatewayMeteringPolicyPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnTransitGatewayMeteringPolicyPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnTransitGatewayMeteringPolicyPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -6181,7 +6445,7 @@ exports.CfnTransitGatewayMeteringPolicyPropsMixin = CfnTransitGatewayMeteringPol
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-transitgatewaymeteringpolicyentry.html
  */
 class CfnTransitGatewayMeteringPolicyEntryPropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_ec2.mixins.CfnTransitGatewayMeteringPolicyEntryPropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_ec2.mixins.CfnTransitGatewayMeteringPolicyEntryPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["destinationCidrBlock", "destinationPortRange", "destinationTransitGatewayAttachmentId", "destinationTransitGatewayAttachmentType", "meteredAccount", "policyRuleNumber", "protocol", "sourceCidrBlock", "sourcePortRange", "sourceTransitGatewayAttachmentId", "sourceTransitGatewayAttachmentType", "transitGatewayMeteringPolicyId"];
     props;
     strategy;
@@ -6204,7 +6468,7 @@ class CfnTransitGatewayMeteringPolicyEntryPropsMixin extends cdk.Mixin {
             throw error;
         }
         this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -6217,12 +6481,7 @@ class CfnTransitGatewayMeteringPolicyEntryPropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnTransitGatewayMeteringPolicyEntryPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnTransitGatewayMeteringPolicyEntryPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnTransitGatewayMeteringPolicyEntryPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -6238,7 +6497,7 @@ exports.CfnTransitGatewayMeteringPolicyEntryPropsMixin = CfnTransitGatewayMeteri
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-vpcblockpublicaccessexclusion.html
  */
 class CfnVPCBlockPublicAccessExclusionPropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_ec2.mixins.CfnVPCBlockPublicAccessExclusionPropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_ec2.mixins.CfnVPCBlockPublicAccessExclusionPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["internetGatewayExclusionMode", "subnetId", "tags", "vpcId"];
     props;
     strategy;
@@ -6261,7 +6520,7 @@ class CfnVPCBlockPublicAccessExclusionPropsMixin extends cdk.Mixin {
             throw error;
         }
         this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -6274,12 +6533,7 @@ class CfnVPCBlockPublicAccessExclusionPropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnVPCBlockPublicAccessExclusionPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnVPCBlockPublicAccessExclusionPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnVPCBlockPublicAccessExclusionPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -6295,7 +6549,7 @@ exports.CfnVPCBlockPublicAccessExclusionPropsMixin = CfnVPCBlockPublicAccessExcl
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-vpcblockpublicaccessoptions.html
  */
 class CfnVPCBlockPublicAccessOptionsPropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_ec2.mixins.CfnVPCBlockPublicAccessOptionsPropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_ec2.mixins.CfnVPCBlockPublicAccessOptionsPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["internetGatewayBlockMode"];
     props;
     strategy;
@@ -6318,7 +6572,7 @@ class CfnVPCBlockPublicAccessOptionsPropsMixin extends cdk.Mixin {
             throw error;
         }
         this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -6331,12 +6585,7 @@ class CfnVPCBlockPublicAccessOptionsPropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnVPCBlockPublicAccessOptionsPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnVPCBlockPublicAccessOptionsPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnVPCBlockPublicAccessOptionsPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -6352,7 +6601,7 @@ exports.CfnVPCBlockPublicAccessOptionsPropsMixin = CfnVPCBlockPublicAccessOption
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-vpcencryptioncontrol.html
  */
 class CfnVPCEncryptionControlPropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_ec2.mixins.CfnVPCEncryptionControlPropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_ec2.mixins.CfnVPCEncryptionControlPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["egressOnlyInternetGatewayExclusionInput", "elasticFileSystemExclusionInput", "internetGatewayExclusionInput", "lambdaExclusionInput", "mode", "natGatewayExclusionInput", "tags", "virtualPrivateGatewayExclusionInput", "vpcId", "vpcLatticeExclusionInput", "vpcPeeringExclusionInput"];
     props;
     strategy;
@@ -6375,7 +6624,7 @@ class CfnVPCEncryptionControlPropsMixin extends cdk.Mixin {
             throw error;
         }
         this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -6388,12 +6637,7 @@ class CfnVPCEncryptionControlPropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnVPCEncryptionControlPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnVPCEncryptionControlPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnVPCEncryptionControlPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -6407,7 +6651,7 @@ exports.CfnVPCEncryptionControlPropsMixin = CfnVPCEncryptionControlPropsMixin;
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-vpnconcentrator.html
  */
 class CfnVPNConcentratorPropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_ec2.mixins.CfnVPNConcentratorPropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_ec2.mixins.CfnVPNConcentratorPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["tags", "transitGatewayId", "type"];
     props;
     strategy;
@@ -6430,7 +6674,7 @@ class CfnVPNConcentratorPropsMixin extends cdk.Mixin {
             throw error;
         }
         this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -6443,12 +6687,7 @@ class CfnVPNConcentratorPropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnVPNConcentratorPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnVPNConcentratorPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnVPNConcentratorPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }