diff --git a/release/models/acl/openconfig-packet-match.yang b/release/models/acl/openconfig-packet-match.yang
index c28798664..42bbff141 100644
--- a/release/models/acl/openconfig-packet-match.yang
+++ b/release/models/acl/openconfig-packet-match.yang
@@ -313,6 +313,21 @@ module openconfig-packet-match {
         "Source IPv4 address prefix.";
     }
 
+    leaf masked-source-address {
+      type oc-inet:ipv4-address;
+      description
+        "Source IPv4 address, to be used with source-wildcard-mask.
+        This configuration is used in cases of matches that cannot 
+        be expressed by a CIDR mask..";
+    }
+
+    leaf source-wildcard-mask {
+      type oc-inet:ipv4-address;
+      description
+        "Source IPv4 address wildcard mask used
+        by masked-source-address.";
+    }
+
     leaf source-address-prefix-set {
       type leafref {
          path "/oc-sets:defined-sets/oc-sets:ipv4-prefix-sets"
@@ -329,6 +344,21 @@ module openconfig-packet-match {
         "Destination IPv4 address prefix.";
     }
 
+    leaf masked-destination-address {
+      type oc-inet:ipv4-address;
+      description
+        "Destination IPv4 address, to be used with destination-wildcard-mask.
+        This configuration is used in cases of matches that cannot be expressed
+        by a CIDR mask.";
+    }
+
+    leaf destination-wildcard-mask {
+      type oc-inet:ipv4-address;
+      description
+        "Destination IPv4 address wildcard mask used
+        by masked-destination-address.";
+    }
+
     leaf destination-address-prefix-set {
       type leafref {
          path "/oc-sets:defined-sets/oc-sets:ipv4-prefix-sets"
@@ -383,6 +413,21 @@ module openconfig-packet-match {
         "Source IPv6 address prefix.";
     }
 
+    leaf masked-source-address {
+      type oc-inet:ipv6-address;
+      description
+        "Source IPv6 address, to be used with source-wildcard-mask.
+        This configuration is used in cases of matches that cannot 
+        be expressed by a CIDR mask.";
+    }
+
+    leaf source-wildcard-mask {
+      type oc-inet:ipv4-address;
+      description
+        "Source IPv6 address wildcard mask used
+        by masked-source-address.";
+    }
+
     leaf source-address-prefix-set {
       type leafref {
          path "/oc-sets:defined-sets/oc-sets:ipv6-prefix-sets"
@@ -405,6 +450,21 @@ module openconfig-packet-match {
         "Destination IPv6 address prefix.";
     }
 
+    leaf masked-destination-address {
+      type oc-inet:ipv6-address;
+      description
+        "Destination IPv6 address, to be used with destination-wildcard-mask.
+        This configuration is used in cases of matches that cannot be expressed
+        by a CIDR mask.";
+    }
+
+    leaf destination-wildcard-mask {
+      type oc-inet:ipv6-address;
+      description
+        "Destination IPv6 address wildcard mask used
+        by masked-destination-address.";
+    }
+
     leaf destination-address-prefix-set {
       type leafref {
          path "/oc-sets:defined-sets/oc-sets:ipv6-prefix-sets"