diff --git a/draft-ietf-netmod-acl-extensions-11/draft-ietf-netmod-acl-extensions.html b/draft-ietf-netmod-acl-extensions-12/draft-ietf-netmod-acl-extensions.html
similarity index 94%
rename from draft-ietf-netmod-acl-extensions-11/draft-ietf-netmod-acl-extensions.html
rename to draft-ietf-netmod-acl-extensions-12/draft-ietf-netmod-acl-extensions.html
index e996e4d..03cf196 100644
--- a/draft-ietf-netmod-acl-extensions-11/draft-ietf-netmod-acl-extensions.html
+++ b/draft-ietf-netmod-acl-extensions-12/draft-ietf-netmod-acl-extensions.html
@@ -15,17 +15,17 @@
 the limitations of the ACL model as initially defined in RFC 8519. 
        The document also defines IANA-maintained modules for ICMP types and IPv6 extension headers. 
     " name="description">
-<meta content="xml2rfc 3.23.2" name="generator">
+<meta content="xml2rfc 3.24.0" name="generator">
 <meta content="Internet-Draft" name="keyword">
 <meta content="draft-ietf-netmod-acl-extensions-latest" name="ietf.draft">
 <!-- Generator version information:
-  xml2rfc 3.23.2
+  xml2rfc 3.24.0
     Python 3.12.7
     ConfigArgParse 1.7
     google-i18n-address 3.1.1
     intervaltree 3.1.0
     Jinja2 3.1.4
-    lxml 4.9.4
+    lxml 5.3.0
     platformdirs 4.3.6
     pycountry 22.3.5
     PyYAML 6.0.1
@@ -167,45 +167,91 @@
 }
 
 @font-face {
-  font-family: 'Cabin Condensed';
-  font-style: normal;
-  font-weight: 600;
-  font-display: swap;
-  src: local('Cabin Condensed SemiBold'), local('CabinCondensed-SemiBold'), url('https://martinthomson.github.io/rfc-css/fonts/cabincondensed-semibold-vietnamese.woff2') format('woff2');
-  unicode-range: U+0102-0103, U+0110-0111, U+1EA0-1EF9, U+20AB;
-}
-@font-face {
-  font-family: 'Cabin Condensed';
+  font-family: 'Oxygen Mono';
   font-style: normal;
-  font-weight: 600;
+  font-weight: 400;
   font-display: swap;
-  src: local('Cabin Condensed SemiBold'), local('CabinCondensed-SemiBold'), url('https://martinthomson.github.io/rfc-css/fonts/cabincondensed-semibold-latin-ext.woff2') format('woff2');
+  src: local('Oxygen Mono'), local('OxygenMono-Regular'), url('https://martinthomson.github.io/rfc-css/fonts/oxygenmono-regular-latin-ext.woff2') format('woff2');
   unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
 }
 @font-face {
-  font-family: 'Cabin Condensed';
+  font-family: 'Oxygen Mono';
   font-style: normal;
-  font-weight: 600;
+  font-weight: 400;
   font-display: swap;
-  src: local('Cabin Condensed SemiBold'), local('CabinCondensed-SemiBold'), url('https://martinthomson.github.io/rfc-css/fonts/cabincondensed-semibold-latin.woff2') format('woff2');
+  src: local('Oxygen Mono'), local('OxygenMono-Regular'), url('https://martinthomson.github.io/rfc-css/fonts/oxygenmono-regular-latin.woff2') format('woff2');
   unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
 }
 
 @font-face {
-  font-family: 'Oxygen Mono';
+  font-family: 'Sofia Sans Semi Condensed';
+  font-style: italic;
+  font-weight: 1 1000;
+  src: url('https://martinthomson.github.io/rfc-css/fonts/sofiasanssemicondensed-italic-cyrillic-ext.woff2') format('woff2');
+  unicode-range: U+0460-052F, U+1C80-1C8A, U+20B4, U+2DE0-2DFF, U+A640-A69F, U+FE2E-FE2F;
+}
+@font-face {
+  font-family: 'Sofia Sans Semi Condensed';
+  font-style: italic;
+  font-weight: 1 1000;
+  src: url('https://martinthomson.github.io/rfc-css/fonts/sofiasanssemicondensed-italic-cyrillic.woff2') format('woff2');
+  unicode-range: U+0301, U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116;
+}
+@font-face {
+  font-family: 'Sofia Sans Semi Condensed';
+  font-style: italic;
+  font-weight: 1 1000;
+  src: url('https://martinthomson.github.io/rfc-css/fonts/sofiasanssemicondensed-italic-greek.woff2') format('woff2');
+  unicode-range: U+0370-0377, U+037A-037F, U+0384-038A, U+038C, U+038E-03A1, U+03A3-03FF;
+}
+@font-face {
+  font-family: 'Sofia Sans Semi Condensed';
+  font-style: italic;
+  font-weight: 1 1000;
+  src: url('https://martinthomson.github.io/rfc-css/fonts/sofiasanssemicondensed-italic-latin-ext.woff2') format('woff2');
+  unicode-range: U+0100-02BA, U+02BD-02C5, U+02C7-02CC, U+02CE-02D7, U+02DD-02FF, U+0304, U+0308, U+0329, U+1D00-1DBF, U+1E00-1E9F, U+1EF2-1EFF, U+2020, U+20A0-20AB, U+20AD-20C0, U+2113, U+2C60-2C7F, U+A720-A7FF;
+}
+@font-face {
+  font-family: 'Sofia Sans Semi Condensed';
+  font-style: italic;
+  font-weight: 1 1000;
+  src: url('https://martinthomson.github.io/rfc-css/fonts/sofiasanssemicondensed-italic-latin.woff2') format('woff2');
+  unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+0304, U+0308, U+0329, U+2000-206F, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
+}
+@font-face {
+  font-family: 'Sofia Sans Semi Condensed';
   font-style: normal;
-  font-weight: 400;
-  font-display: swap;
-  src: local('Oxygen Mono'), local('OxygenMono-Regular'), url('https://martinthomson.github.io/rfc-css/fonts/oxygenmono-regular-latin-ext.woff2') format('woff2');
-  unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
+  font-weight: 1 1000;
+  src: url('https://martinthomson.github.io/rfc-css/fonts/sofiasanssemicondensed-regular-cyrillic-ext.woff2') format('woff2');
+  unicode-range: U+0460-052F, U+1C80-1C8A, U+20B4, U+2DE0-2DFF, U+A640-A69F, U+FE2E-FE2F;
 }
 @font-face {
-  font-family: 'Oxygen Mono';
+  font-family: 'Sofia Sans Semi Condensed';
   font-style: normal;
-  font-weight: 400;
-  font-display: swap;
-  src: local('Oxygen Mono'), local('OxygenMono-Regular'), url('https://martinthomson.github.io/rfc-css/fonts/oxygenmono-regular-latin.woff2') format('woff2');
-  unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
+  font-weight: 1 1000;
+  src: url('https://martinthomson.github.io/rfc-css/fonts/sofiasanssemicondensed-regular-cyrillic.woff2') format('woff2');
+  unicode-range: U+0301, U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116;
+}
+@font-face {
+  font-family: 'Sofia Sans Semi Condensed';
+  font-style: normal;
+  font-weight: 1 1000;
+  src: url('https://martinthomson.github.io/rfc-css/fonts/sofiasanssemicondensed-regular-greek.woff2') format('woff2');
+  unicode-range: U+0370-0377, U+037A-037F, U+0384-038A, U+038C, U+038E-03A1, U+03A3-03FF;
+}
+@font-face {
+  font-family: 'Sofia Sans Semi Condensed';
+  font-style: normal;
+  font-weight: 1 1000;
+  src: url('https://martinthomson.github.io/rfc-css/fonts/sofiasanssemicondensed-regular-latin-ext.woff2') format('woff2');
+  unicode-range: U+0100-02BA, U+02BD-02C5, U+02C7-02CC, U+02CE-02D7, U+02DD-02FF, U+0304, U+0308, U+0329, U+1D00-1DBF, U+1E00-1E9F, U+1EF2-1EFF, U+2020, U+20A0-20AB, U+20AD-20C0, U+2113, U+2C60-2C7F, U+A720-A7FF;
+}
+@font-face {
+  font-family: 'Sofia Sans Semi Condensed';
+  font-style: normal;
+  font-weight: 1 1000;
+  src: url('https://martinthomson.github.io/rfc-css/fonts/sofiasanssemicondensed-regular-latin.woff2') format('woff2');
+  unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+0304, U+0308, U+0329, U+2000-206F, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
 }
 
 :root {
@@ -220,6 +266,7 @@
   --pilcrow-strong: #bbb;
   --small-font-size: 14.5px;
   --font-mono: 'Oxygen Mono', monospace;
+  --font-title: "Sofia Sans Semi Condensed", sans-serif;
   scrollbar-color: #bbb #eee;
 }
 body {
@@ -237,9 +284,15 @@
 }
 
 /* headings */
+section {
+  clear: both;
+}
+.section-number {
+  padding-right: 0.5em;
+}
 h1, h2, h3, h4, h5, h6 {
-  font-family: "Cabin Condensed", sans-serif;
-  font-weight: 600;
+  font-family: var(--font-title);
+  font-weight: 680;
   margin: 0.8em 0 0.3em;
   font-size-adjust: 0.5;
   color: var(--title-color);
@@ -268,6 +321,7 @@
 /* general structure */
 .author {
   padding-bottom: 0.3em;
+  vertical-align: top;
 }
 #abstract+p {
   font-size: 18px;
@@ -345,25 +399,26 @@
 ol, ul {
   padding: 0;
   margin: 0 0 0.5em 2em;
-}
-:is(ol, ul) :is(ol, ul) {
-  margin-left: 1em;
+  & :is(ol, ul) {
+    margin-left: 1em;
+  }
 }
 li {
   margin: 0 0 0.25em 0;
 }
-.ulCompact li {
-  margin: 0;
-}
 ul.empty, .ulEmpty {
   list-style-type: none;
-}
-ul.empty li, .ulEmpty li {
-  margin-top: 0.5em;
+  & li {
+    margin-top: 0.5em;
+  }
 }
 :is(ul, ol).compact, .ulCompact, .olCompact {
-  line-height: 1;
   margin: 0 0 0 2em;
+  & li {
+    margin: 0;
+    & :first-child { margin-top: 0; }
+    & :last-child { margin-bottom: 0; }
+  }
 }
 
 /* definition lists */
@@ -371,38 +426,39 @@
   clear: left;
   --indent: 3ch;
   /* --indent: attr(indent ch); not supported in any browser, but we can dream */
-}
-dl.olPercent {
-  --indent: 5ch;
+  &.olPercent {
+    --indent: 5ch;
+    & > dt {
+      min-width: calc(var(--indent) - 2ch);
+    }
+  }
+  &.olPercent > dt {
+    float: none;
+  }
+
+  dl > dd > & {
+    margin-top: 0.5em;
+    margin-bottom: 0;
+  }
 }
 dl > dt {
   float: left;
   margin-right: 2ch;
   min-width: 8ch;
 }
-dl.dlNewline > dt {
-  float: none;
-}
 dl > dd {
   margin-bottom: .8em;
   margin-left: var(--indent) !important; /* stupid element overrides */
   min-height: 2ex;
 }
-dl.olPercent > dt {
-  min-width: calc(var(--indent) - 2ch);
-}
 :is(dl.compact, .dlCompact) > dd {
   margin-bottom: 0;
-}
-:is(dl.compact, .dlCompact) > dd > :is(:first-child, .break:first-child + *) {
-  margin-top: 0;
-}
-:is(dl.compact, .dlCompact) > dd > :is(:last-child) {
-  margin-bottom: 0;
-}
-dl > dd > dl {
-  margin-top: 0.5em;
-  margin-bottom: 0;
+  & > :is(:first-child, .break:first-child + *) {
+    margin-top: 0;
+  }
+  & > :is(:last-child) {
+    margin-bottom: 0;
+  }
 }
 :is(dd, span).break {
   display: none;
@@ -466,6 +522,7 @@
   font-style: italic;
   margin: 0.5em 1.5em;
   text-align: left;
+  caption-side: bottom;
 }
 @media screen {
   /* Auto-collapse boilerplate. */
@@ -520,6 +577,7 @@
 
 /* tables */
 table {
+  width: auto;
   max-width: 100%;
   margin: 0 0 1em;
   border-collapse: collapse;
@@ -534,6 +592,16 @@
 table.left {
   margin-right: auto;
 }
+table .text-left {
+  text-align: left;
+}
+table .text-center {
+  text-align: center;
+}
+table .text-right {
+  text-align: right;
+}
+
 thead, tbody {
   border: 1px solid var(--line-color);
 }
@@ -564,9 +632,11 @@
   margin-left: 3px;
   opacity: 0.2;
   user-select: none;
+  &[href] {
+    color: var(--pilcrow-weak);
+    &:hover { text-decoration: none; }
+  }
 }
-a.pilcrow[href] { color: var(--pilcrow-weak); }
-a.pilcrow[href]:hover { text-decoration: none; }
 @media not print {
   :hover > a.pilcrow {
     opacity: 1;
@@ -606,26 +676,28 @@
   font-size: var(--small-font-size);
   line-height: 18px;
   --identifier-width: 15ch;
-}
-#identifiers dt {
-  width: var(--identifier-width);
-  min-width: var(--identifier-width);
-  clear: left;
-  float: left;
-  text-align: right;
-  margin-right: 1ch;
-}
-#identifiers dd {
-  margin: 0;
-  margin-left: calc(1em + var(--identifier-width)) !important;
-  min-width: 5em;
-}
-#identifiers .authors .author {
-  display: inline-block;
-  margin-right: 1.5em;
-}
-#identifiers .authors .org {
-  font-style: italic;
+  & dt {
+    width: var(--identifier-width);
+    min-width: var(--identifier-width);
+    clear: left;
+    float: left;
+    text-align: right;
+    margin-right: 1ch;
+  }
+  & dd {
+    margin: 0;
+    margin-left: calc(1em + var(--identifier-width)) !important;
+    min-width: 5em;
+  }
+  & .authors {
+    & .author {
+      display: inline-block;
+      margin-right: 1.5em;
+    }
+    & .org {
+      font-style: italic;
+    }
+  }
 }
 
 /* The prepared/rendered info at the very bottom of the page */
@@ -635,9 +707,6 @@
   font-style: italic;
   margin-top: 2em;
 }
-.docInfo .prepared {
-  float: left;
-}
 .docInfo .prepared {
   float: right;
 }
@@ -646,47 +715,48 @@
 #toc {
   padding: 0.75em 0 2em 0;
   margin-bottom: 1em;
-}
-#toc nav ul {
-  margin: 0 0.5em 0 0;
-  padding: 0;
-  list-style: none;
-}
-#toc nav li {
-  line-height: 1.3em;
-  margin: 2px 0;
-  padding-left: 1.2em;
-  text-indent: -1.2em;
-}
-#toc a.xref {
-  white-space: normal;
-}
-/* references */
-.references dt {
-  text-align: right;
-  font-weight: bold;
-  min-width: 10ch;
-  margin-right: 1.5ch;
-}
-.references dt:target::before {
-  content: "⇒";
-  width: 15px;
-  margin: 0 10px 0 -25px;
-}
-.references dd {
-  margin-left: 12ch !important;
-  overflow: auto;
-}
 
-.refInstance {
-  margin-bottom: 1.25em;
+  & nav {
+    & ul {
+      margin: 0 0.5em 0 0;
+      padding: 0;
+      list-style: none;
+    }
+    & li {
+      line-height: 1.3em;
+      margin: 2px 0;
+      padding-left: 1.2em;
+      text-indent: -1.2em;
+    }
+  }
+  & a.xref {
+    white-space: normal;
+  }
 }
 
-.references .ascii {
-  margin-bottom: 0.25em;
+.references {
+  & > dt {
+    text-align: right;
+    font-weight: bold;
+    min-width: 10ch;
+    margin-right: 1.5ch;
+    &:target::before {
+      content: "⇒";
+      margin: 0 10px 0 -25px;
+    }
+  }
+  & > dd {
+    margin-left: 12ch !important;
+    overflow: visible;
+    & .refInstance {
+      margin-bottom: 0.8em;
+    }
+    & .ascii {
+      margin-bottom: 0.25em;
+    }
+  }
 }
 
-/* index */
 #rfc\.index\.index + ul {
   margin-left: 0;
 }
@@ -694,21 +764,33 @@
 /* authors */
 address.vcard {
   font-style: normal;
-  margin: 1em 0;
-}
-address.vcard .nameRole {
-  font-weight: 700;
-  margin-left: 0;
-}
-address.vcard .label {
-  margin: 0.5em 0;
-}
-address.vcard .type {
-  display: none;
-}
-.alternative-contact {
-  margin: 1.5em 0 1em;
+  max-width: 20em;
+  margin: 1em auto 1em 0;
+
+  & .nameRole {
+    font-weight: 700;
+    margin-left: 0;
+  }
+  & .label {
+    margin: 0.5em 0;
+  }
+  & .type {
+    display: none;
+  }
+  & .alternative-contact {
+    margin: 0.5em 0 0.25em 0;
+  }
+  & .non-ascii {
+    margin: 0 0 0 2em;
+  }
+  & div.left {
+    text-align: left;
+  }
+  & div.right {
+    text-align: right;
+  }
 }
+
 hr.addr {
   border-top: 1px dashed;
   margin: 0;
@@ -730,6 +812,7 @@
   }
 }
 
+/* Comments */
 .rfcEditorRemove p:first-of-type {
   font-style: italic;
 }
@@ -740,7 +823,31 @@
 .crefSource {
   font-style: italic;
 }
-/* alternative layout for smaller screens */
+
+@media screen {
+  #toc nav {
+    font-family: var(--font-title);
+    font-weight: 360;
+    & > ul { margin-bottom: 2em; }
+    & ul {
+      margin: 0 0 0 4px;
+      & :is(p, li) {
+        margin: 2px 0;
+      }
+    }
+  }
+  #toc a.toplink {
+    float: right;
+  }
+}
+@media not screen {
+  #toc a.toplink {
+    display: none;
+  }
+}
+
+
+/* TOC layout for smaller screens */
 @media screen and (max-width: 929px) {
   #toc {
     position: fixed;
@@ -752,9 +859,6 @@
     border-bottom: 1px solid #ccc;
     opacity: 0.6;
   }
-  #toc.active {
-      opacity: 1;
-  }
   #toc h2 {
     margin: 0;
     padding: 2px 0 2px 6px;
@@ -766,17 +870,17 @@
     background-color: #444;
     color: white;
     cursor: pointer;
-  }
-  #toc h2::before { /* css hamburger */
-    float: right;
-    position: relative;
-    width: 1em;
-    height: 1px;
-    left: -164px;
-    margin: 8px 0 0 0;
-    background: white none repeat scroll 0 0;
-    box-shadow: 0 4px 0 0 white, 0 8px 0 0 white;
-    content: "";
+    &::before { /* css hamburger */
+      float: right;
+      position: relative;
+      width: 1em;
+      height: 1px;
+      left: -164px;
+      margin: 8px 0 0 0;
+      background: white none repeat scroll 0 0;
+      box-shadow: 0 4px 0 0 white, 0 8px 0 0 white;
+      content: "";
+    }
   }
   #toc nav {
     display: none;
@@ -787,14 +891,13 @@
     height: calc(100vh - 48px);
     border-left: 1px solid #ddd;
   }
-  #toc.active nav {
-    display: block;
+  #toc.active {
+    opacity: 1;
+    & nav { display: block; }
   }
   /* Make the collapsed ToC header render white on gray also when it's a link */
   #toc h2 a,
-  #toc h2 a:link,
-  #toc h2 a:focus,
-  #toc h2 a:hover,
+  #toc h2 a:is(:link, :focus, :hover),
   #toc a.toplink,
   #toc a.toplink:hover {
     color: white;
@@ -802,11 +905,11 @@
     text-decoration: none;
   }
   #toc a.toplink {
-    margin-top: 2px;
+    margin: 2px 0.5em 0;
   }
 }
 
-/* alternative layout for wide screens */
+/* TOC layout for wide screens */
 @media screen and (min-width: 930px) {
   body {
     padding-right: 360px;
@@ -835,21 +938,13 @@
     overscroll-behavior: contain;
     scrollbar-width: thin;
   }
-  #toc nav > ul  {
-    margin-bottom: 2em;
-  }
-  #toc ul {
-    margin: 0 0 0 4px;
-    font-size: var(--small-font-size);
-  }
-  #toc ul :is(p, li) {
-    margin: 2px 0;
-    line-height: 22px;
-  }
   img { /* future proofing */
     max-width: 100%;
     height: auto;
   }
+  #toc a.toplink {
+    margin: 8px 0.5em 0;
+  }
 }
 
 /* pagination */
@@ -891,9 +986,6 @@
   td {
     border-top: 1px solid #ddd;
   }
-  .toplink {
-    display: none;
-  }
 }
 
 @page :first {
@@ -918,82 +1010,6 @@
   padding-top: 20px;
 }
 
-/* Changes introduced to fix issues found during implementation */
-
-/* Separate body from document info even without intervening H1 */
-section {
-  clear: both;
-}
-
-/* Top align author divs, to avoid names without organization dropping level with org names */
-.author {
-  vertical-align: top;
-}
-
-/* Style section numbers with more space between number and title */
-.section-number {
-  padding-right: 0.5em;
-}
-
-/* Add styling for a link in the ToC that points to the top of the document */
-a.toplink {
-  float: right;
-  margin: 8px 0.5em 0;
-}
-
-/* Provide styling for table cell text alignment */
-table .text-left {
-  text-align: left;
-}
-table .text-center {
-  text-align: center;
-}
-table .text-right {
-  text-align: right;
-}
-
-/* Make the alternative author contact information look less like just another
-   author, and group it closer with the primary author contact information */
-.alternative-contact {
-  margin: 0.5em 0 0.25em 0;
-}
-address .non-ascii {
-  margin: 0 0 0 2em;
-}
-
-/* With it being possible to set tables with alignment
-  left, center, and right, { width: 100%; } does not make sense */
-table {
-  width: auto;
-}
-
-/* Avoid reference text that sits in a block with very wide left margin,
-   because of a long floating dt label.*/
-.references dd {
-  overflow: visible;
-}
-
-/* Control caption placement */
-caption {
-  caption-side: bottom;
-}
-
-/* Limit the width of the author address vcard, so names in right-to-left
-   script don't end up on the other side of the page. */
-
-address.vcard {
-  max-width: 20em;
-  margin-right: auto;
-}
-
-/* For address alignment dependent on LTR or RTL scripts */
-address div.left {
-  text-align: left;
-}
-address div.right {
-  text-align: right;
-}
-
 /* Dark mode. */
 @media (prefers-color-scheme: dark) {
 :root {
@@ -1030,11 +1046,11 @@
 <thead><tr>
 <td class="left">Internet-Draft</td>
 <td class="center">Enhanced ACLs</td>
-<td class="right">October 2024</td>
+<td class="right">November 2024</td>
 </tr></thead>
 <tfoot><tr>
 <td class="left">Dios, et al.</td>
-<td class="center">Expires 24 April 2025</td>
+<td class="center">Expires 31 May 2025</td>
 <td class="right">[Page]</td>
 </tr></tfoot>
 </table>
@@ -1047,12 +1063,12 @@
 <dd class="internet-draft">draft-ietf-netmod-acl-extensions-latest</dd>
 <dt class="label-published">Published:</dt>
 <dd class="published">
-<time datetime="2024-10-21" class="published">21 October 2024</time>
+<time datetime="2024-11-27" class="published">27 November 2024</time>
     </dd>
 <dt class="label-intended-status">Intended Status:</dt>
 <dd class="intended-status">Standards Track</dd>
 <dt class="label-expires">Expires:</dt>
-<dd class="expires"><time datetime="2025-04-24">24 April 2025</time></dd>
+<dd class="expires"><time datetime="2025-05-31">31 May 2025</time></dd>
 <dt class="label-authors">Authors:</dt>
 <dd class="authors">
 <div class="author">
@@ -1112,7 +1128,7 @@ <h2 id="name-status-of-this-memo">
         time. It is inappropriate to use Internet-Drafts as reference
         material or to cite them other than as "work in progress."<a href="#section-boilerplate.1-3" class="pilcrow">¶</a></p>
 <p id="section-boilerplate.1-4">
-        This Internet-Draft will expire on 24 April 2025.<a href="#section-boilerplate.1-4" class="pilcrow">¶</a></p>
+        This Internet-Draft will expire on 31 May 2025.<a href="#section-boilerplate.1-4" class="pilcrow">¶</a></p>
 </section>
 </div>
 <div id="copyright">
@@ -1445,7 +1461,7 @@ <h3 id="name-tree-structure">
     +--rw (payload)?
     |  +--:(prefix-pattern)
     |     +--rw prefix-pattern {match-on-payload}?
-    |        +---u payload
+    |        +---u payload-match
     +--rw (alias)?
     |  +--:(alias-name)
     |     +--rw alias-name*       alias-ref
@@ -1532,7 +1548,7 @@ <h3 id="name-tree-structure">
     +-- lower-label-range?   rt-types:mpls-label
     +-- label-block-name?    string
     +-- ttl-value?           uint8
-  grouping payload:
+  grouping payload-match:
     +-- offset?       identityref
     +-- offset-end?   uint64
     +-- operator?     operator
@@ -1685,7 +1701,7 @@ <h3 id="name-ipv6-extension-headers">
         <h3 id="name-tcp-flags-handling">
 <a href="#section-3.4" class="section-number selfRef">3.4. </a><a href="#name-tcp-flags-handling" class="section-name selfRef">TCP Flags Handling</a>
         </h3>
-<p id="section-3.4-1">The augmented ACL structure (<a href="#enh-acl-tree" class="auto internal xref">Figure 1</a>) includes a new container 'flags-bitmask' to better handle TCP flags <span>[<a href="#RFC9293" class="cite xref">RFC9293</a>]</span>.<a href="#section-3.4-1" class="pilcrow">¶</a></p>
+<p id="section-3.4-1">The augmented ACL structure (<a href="#enh-acl-tree" class="auto internal xref">Figure 1</a>) includes a new container 'flags-bitmask' to better handle TCP flags (<span><a href="https://rfc-editor.org/rfc/rfc9293#section-3.1" class="relref">Section 3.1</a> of [<a href="#RFC9293" class="cite xref">RFC9293</a>]</span>). Assigned TCP flags are maintained in the "TCP Header Flags" registry under the "Transmission Control Protocol (TCP) Parameters" registry group <span>[<a href="#IANA-TCP-FLAGS" class="cite xref">IANA-TCP-FLAGS</a>]</span>.<a href="#section-3.4-1" class="pilcrow">¶</a></p>
 <p id="section-3.4-2">Clients that support both 'flags-bitmask' and 'flags' <span>[<a href="#RFC8519" class="cite xref">RFC8519</a>]</span> matching fields <span class="bcp14">MUST NOT</span> set these fields in the same request.<a href="#section-3.4-2" class="pilcrow">¶</a></p>
 </section>
 </div>
@@ -2203,13 +2219,18 @@ <h2 id="name-enhanced-acl-yang-module">
         leaf bitmask {
           type uint16;
           description
-            "The bitmask matches the last 4 bits of byte 12 and 13 of
-             the TCP header.  For clarity, the 4 bits of byte 12
+            "The bitmask matches the last 4 bits of byte 13
+             and byte 14 of the TCP header.
+             For clarity, the 4 bits of byte 12
              corresponding to the TCP data offset field are not
-             included in any matching.";
+             included in any matching.
+             Assigned TCP flags and their position are maintained
+             in the IANA'Transmission Control Protocol (TCP)
+             Parameters' registry group.";
           reference
             "RFC 9293: Transmission Control Protocol (TCP),
-                       Section 3.1";
+                       Section 3.1
+             https://www.iana.org/assignments/tcp-parameters";
         }
       }
     }
@@ -2286,7 +2307,7 @@ <h2 id="name-enhanced-acl-yang-module">
     }
   }
 
-  grouping payload {
+  grouping payload-match {
     description
       "Operations on payload match.";
     leaf offset {
@@ -2734,7 +2755,7 @@ <h2 id="name-enhanced-acl-yang-module">
         if-feature "match-on-payload";
         description
           "Indicates the rule to perform the payload-based match.";
-        uses payload;
+        uses payload-match;
       }
     }
     choice alias {
@@ -3016,41 +3037,42 @@ <h2 id="name-enhanced-acl-yang-module">
       <h2 id="name-security-considerations">
 <a href="#section-5" class="section-number selfRef">5. </a><a href="#name-security-considerations" class="section-name selfRef">Security Considerations</a>
       </h2>
-<p id="section-5-1">The YANG modules specified in this document define a schema for data
- that is designed to be accessed via network management protocol such
- as NETCONF <span>[<a href="#RFC6241" class="cite xref">RFC6241</a>]</span> or RESTCONF <span>[<a href="#RFC8040" class="cite xref">RFC8040</a>]</span>.  The lowest NETCONF layer
- is the secure transport layer, and the mandatory-to-implement secure
- transport is Secure Shell (SSH) <span>[<a href="#RFC6242" class="cite xref">RFC6242</a>]</span>.  The lowest RESTCONF layer
- is HTTPS, and the mandatory-to-implement secure transport is TLS
- <span>[<a href="#RFC8446" class="cite xref">RFC8446</a>]</span>.<a href="#section-5-1" class="pilcrow">¶</a></p>
-<p id="section-5-2">The Network Configuration Access Control Model (NACM) <span>[<a href="#RFC8341" class="cite xref">RFC8341</a>]</span> provides the means to restrict access for particular NETCONF or RESTCONF users to a preconfigured subset of all available NETCONF or RESTCONF protocol operations and content.<a href="#section-5-2" class="pilcrow">¶</a></p>
-<p id="section-5-3">There are a number of data nodes defined in the "ietf-acl-enh" YANG module that are writable/creatable/deletable (i.e., config true, which is the default). These data nodes may be considered sensitive or vulnerable in some network environments. Write operations (e.g., edit-config) to these data nodes without proper protection can have a negative effect on network operations. These are the subtrees and data nodes and their sensitivity/vulnerability:<a href="#section-5-3" class="pilcrow">¶</a></p>
-<span class="break"></span><dl class="dlParallel" id="section-5-4">
-        <dt id="section-5-4.1">'defined-sets':</dt>
-        <dd style="margin-left: 1.5em" id="section-5-4.2">
-          <p id="section-5-4.2.1">These lists specify a set of sets and aliases. Similar to <span>[<a href="#RFC8519" class="cite xref">RFC8519</a>]</span>, unauthorized write access to these
+<p id="section-5-1">This section is modeled after the template described in <span><a href="https://datatracker.ietf.org/doc/html/draft-ietf-netmod-rfc8407bis-21#section-3.7" class="relref">Section 3.7</a> of [<a href="#I-D.ietf-netmod-rfc8407bis" class="cite xref">I-D.ietf-netmod-rfc8407bis</a>]</span>.<a href="#section-5-1" class="pilcrow">¶</a></p>
+<p id="section-5-2">The "ietf-acl-enh" YANG module defines a data model that is
+designed to be accessed via YANG-based management protocols, such as
+NETCONF <span>[<a href="#RFC6241" class="cite xref">RFC6241</a>]</span> and RESTCONF <span>[<a href="#RFC8040" class="cite xref">RFC8040</a>]</span>. These protocols have to
+use a secure transport layer (e.g., SSH <span>[<a href="#RFC4252" class="cite xref">RFC4252</a>]</span>, TLS <span>[<a href="#RFC8446" class="cite xref">RFC8446</a>]</span>, and
+QUIC <span>[<a href="#RFC9000" class="cite xref">RFC9000</a>]</span>) and have to use mutual authentication.<a href="#section-5-2" class="pilcrow">¶</a></p>
+<p id="section-5-3">The Network Configuration Access Control Model (NACM) <span>[<a href="#RFC8341" class="cite xref">RFC8341</a>]</span> provides the means to restrict access for particular NETCONF or RESTCONF users to a preconfigured subset of all available NETCONF or RESTCONF protocol operations and content.<a href="#section-5-3" class="pilcrow">¶</a></p>
+<p id="section-5-4">There are a number of data nodes defined in the "ietf-acl-enh" YANG module that are writable/creatable/deletable (i.e., config true, which is the default). These data nodes may be considered sensitive or vulnerable in some network environments. Write operations (e.g., edit-config) to these data nodes without proper protection can have a negative effect on network operations. These are the subtrees and data nodes and their sensitivity/vulnerability:<a href="#section-5-4" class="pilcrow">¶</a></p>
+<span class="break"></span><dl class="dlParallel" id="section-5-5">
+        <dt id="section-5-5.1">'defined-sets':</dt>
+        <dd style="margin-left: 1.5em" id="section-5-5.2">
+          <p id="section-5-5.2.1">These lists specify a set of sets and aliases. Similar to <span>[<a href="#RFC8519" class="cite xref">RFC8519</a>]</span>, unauthorized write access to these
    list can allow intruders to modify the entries so as to permit
    traffic that should not be permitted, or deny traffic that should
    be permitted.  The former may result in a DoS attack, or
-   compromise a device.  The latter may result in a DoS attack.<a href="#section-5-4.2.1" class="pilcrow">¶</a></p>
+   compromise a device.  The latter may result in a DoS attack.<a href="#section-5-5.2.1" class="pilcrow">¶</a></p>
 </dd>
       <dd class="break"></dd>
 </dl>
-<p id="section-5-5">Some of the readable data nodes in the "ietf-acl-enh" YANG module may be considered sensitive or vulnerable in some network environments. It is thus important to control read access (e.g., via get, get-config, or notification) to these data nodes. These are the subtrees and data nodes and their sensitivity/vulnerability:<a href="#section-5-5" class="pilcrow">¶</a></p>
-<span class="break"></span><dl class="dlParallel" id="section-5-6">
-        <dt id="section-5-6.1">'defined-sets':</dt>
-        <dd style="margin-left: 1.5em" id="section-5-6.2">
-          <p id="section-5-6.2.1">Unauthorized read access of these lists will allow
+<p id="section-5-6">Some of the readable data nodes in the "ietf-acl-enh" YANG module may be considered sensitive or vulnerable in some network environments. It is thus important to control read access (e.g., via get, get-config, or notification) to these data nodes. These are the subtrees and data nodes and their sensitivity/vulnerability:<a href="#section-5-6" class="pilcrow">¶</a></p>
+<span class="break"></span><dl class="dlParallel" id="section-5-7">
+        <dt id="section-5-7.1">'defined-sets':</dt>
+        <dd style="margin-left: 1.5em" id="section-5-7.2">
+          <p id="section-5-7.2.1">Unauthorized read access of these lists will allow
 an attacker to identify the actual resources that are bound
-to ACLs.<a href="#section-5-6.2.1" class="pilcrow">¶</a></p>
+to ACLs.<a href="#section-5-7.2.1" class="pilcrow">¶</a></p>
 </dd>
       <dd class="break"></dd>
 </dl>
-<p id="section-5-7">The YANG modules "iana-icmpv4-types", "iana-icmpv6-types", and "iana-ipv6-ext-types defines" a set of types. These nodes are intended to be reused by other YANG
+<p id="section-5-8">The document defines a match policy based on a pattern that can be observed in a packet. For example, such a policy can be combined with header-based matches in the context of DDoS mitigation. Filtering based on a pattern match is deterministic for packets with unencrypted data. However, the efficiency for encrypted
+packets depend on the presence of an unvarying pattern.<a href="#section-5-8" class="pilcrow">¶</a></p>
+<p id="section-5-9">The YANG modules "iana-icmpv4-types", "iana-icmpv6-types", and "iana-ipv6-ext-types defines" a set of types. These nodes are intended to be reused by other YANG
 modules. Each of these modules by itself does not expose any data nodes that
 are writable, data nodes that contain read-only state, or RPCs.
 As such, there are no additional security issues related to
-these YANG modules that need to be considered.<a href="#section-5-7" class="pilcrow">¶</a></p>
+these YANG modules that need to be considered.<a href="#section-5-9" class="pilcrow">¶</a></p>
 </section>
 </div>
 <div id="iana-considerations">
@@ -3153,7 +3175,7 @@ <h4 id="name-icmpv4-types-iana-module">
 <span class="break"></span><dl class="dlParallel" id="section-6.3.1-6">
             <dt id="section-6.3.1-6.1">"enum":</dt>
             <dd style="margin-left: 1.5em" id="section-6.3.1-6.2">
-              <p id="section-6.3.1-6.2.1">Replicates a name from the registry.<a href="#section-6.3.1-6.2.1" class="pilcrow">¶</a></p>
+              <p id="section-6.3.1-6.2.1">Replicates the name from the registry with all spaces striped.<a href="#section-6.3.1-6.2.1" class="pilcrow">¶</a></p>
 </dd>
             <dd class="break"></dd>
 <dt id="section-6.3.1-6.3">"value":</dt>
@@ -3171,7 +3193,7 @@ <h4 id="name-icmpv4-types-iana-module">
             <dd class="break"></dd>
 <dt id="section-6.3.1-6.7">"description":</dt>
             <dd style="margin-left: 1.5em" id="section-6.3.1-6.8">
-              <p id="section-6.3.1-6.8.1">Replicates the description from the registry.<a href="#section-6.3.1-6.8.1" class="pilcrow">¶</a></p>
+              <p id="section-6.3.1-6.8.1">Replicates the name from the registry.<a href="#section-6.3.1-6.8.1" class="pilcrow">¶</a></p>
 </dd>
             <dd class="break"></dd>
 <dt id="section-6.3.1-6.9">"reference":</dt>
@@ -3233,7 +3255,7 @@ <h4 id="name-icmpv6-types-iana-module">
 <span class="break"></span><dl class="dlParallel" id="section-6.3.2-6">
             <dt id="section-6.3.2-6.1">"enum":</dt>
             <dd style="margin-left: 1.5em" id="section-6.3.2-6.2">
-              <p id="section-6.3.2-6.2.1">Replicates a name from the registry.<a href="#section-6.3.2-6.2.1" class="pilcrow">¶</a></p>
+              <p id="section-6.3.2-6.2.1">Replicates the name from the registry with all spaces striped.<a href="#section-6.3.2-6.2.1" class="pilcrow">¶</a></p>
 </dd>
             <dd class="break"></dd>
 <dt id="section-6.3.2-6.3">"value":</dt>
@@ -3251,7 +3273,7 @@ <h4 id="name-icmpv6-types-iana-module">
             <dd class="break"></dd>
 <dt id="section-6.3.2-6.7">"description":</dt>
             <dd style="margin-left: 1.5em" id="section-6.3.2-6.8">
-              <p id="section-6.3.2-6.8.1">Replicates the description from the registry.<a href="#section-6.3.2-6.8.1" class="pilcrow">¶</a></p>
+              <p id="section-6.3.2-6.8.1">Replicates the name from the registry.<a href="#section-6.3.2-6.8.1" class="pilcrow">¶</a></p>
 </dd>
             <dd class="break"></dd>
 <dt id="section-6.3.2-6.9">"reference":</dt>
@@ -3313,7 +3335,7 @@ <h4 id="name-ipv6-extension-header-types">
 <span class="break"></span><dl class="dlParallel" id="section-6.3.3-6">
             <dt id="section-6.3.3-6.1">"enum":</dt>
             <dd style="margin-left: 1.5em" id="section-6.3.3-6.2">
-              <p id="section-6.3.3-6.2.1">Replicates a name from the registry.<a href="#section-6.3.3-6.2.1" class="pilcrow">¶</a></p>
+              <p id="section-6.3.3-6.2.1">Replicates the description from the registry with all spaces striped.<a href="#section-6.3.3-6.2.1" class="pilcrow">¶</a></p>
 </dd>
             <dd class="break"></dd>
 <dt id="section-6.3.3-6.3">"value":</dt>
@@ -3411,14 +3433,6 @@ <h3 id="name-normative-references">
         <dd>
 <span class="refAuthor">Bjorklund, M., Ed.</span>, <span class="refTitle">"YANG - A Data Modeling Language for the Network Configuration Protocol (NETCONF)"</span>, <span class="seriesInfo">RFC 6020</span>, <span class="seriesInfo">DOI 10.17487/RFC6020</span>, <time datetime="2010-10" class="refDate">October 2010</time>, <span>&lt;<a href="https://www.rfc-editor.org/rfc/rfc6020">https://www.rfc-editor.org/rfc/rfc6020</a>&gt;</span>. </dd>
 <dd class="break"></dd>
-<dt id="RFC6241">[RFC6241]</dt>
-        <dd>
-<span class="refAuthor">Enns, R., Ed.</span>, <span class="refAuthor">Bjorklund, M., Ed.</span>, <span class="refAuthor">Schoenwaelder, J., Ed.</span>, and <span class="refAuthor">A. Bierman, Ed.</span>, <span class="refTitle">"Network Configuration Protocol (NETCONF)"</span>, <span class="seriesInfo">RFC 6241</span>, <span class="seriesInfo">DOI 10.17487/RFC6241</span>, <time datetime="2011-06" class="refDate">June 2011</time>, <span>&lt;<a href="https://www.rfc-editor.org/rfc/rfc6241">https://www.rfc-editor.org/rfc/rfc6241</a>&gt;</span>. </dd>
-<dd class="break"></dd>
-<dt id="RFC6242">[RFC6242]</dt>
-        <dd>
-<span class="refAuthor">Wasserman, M.</span>, <span class="refTitle">"Using the NETCONF Protocol over Secure Shell (SSH)"</span>, <span class="seriesInfo">RFC 6242</span>, <span class="seriesInfo">DOI 10.17487/RFC6242</span>, <time datetime="2011-06" class="refDate">June 2011</time>, <span>&lt;<a href="https://www.rfc-editor.org/rfc/rfc6242">https://www.rfc-editor.org/rfc/rfc6242</a>&gt;</span>. </dd>
-<dd class="break"></dd>
 <dt id="RFC6991">[RFC6991]</dt>
         <dd>
 <span class="refAuthor">Schoenwaelder, J., Ed.</span>, <span class="refTitle">"Common YANG Data Types"</span>, <span class="seriesInfo">RFC 6991</span>, <span class="seriesInfo">DOI 10.17487/RFC6991</span>, <time datetime="2013-07" class="refDate">July 2013</time>, <span>&lt;<a href="https://www.rfc-editor.org/rfc/rfc6991">https://www.rfc-editor.org/rfc/rfc6991</a>&gt;</span>. </dd>
@@ -3427,10 +3441,6 @@ <h3 id="name-normative-references">
         <dd>
 <span class="refAuthor">Bjorklund, M., Ed.</span>, <span class="refTitle">"The YANG 1.1 Data Modeling Language"</span>, <span class="seriesInfo">RFC 7950</span>, <span class="seriesInfo">DOI 10.17487/RFC7950</span>, <time datetime="2016-08" class="refDate">August 2016</time>, <span>&lt;<a href="https://www.rfc-editor.org/rfc/rfc7950">https://www.rfc-editor.org/rfc/rfc7950</a>&gt;</span>. </dd>
 <dd class="break"></dd>
-<dt id="RFC8040">[RFC8040]</dt>
-        <dd>
-<span class="refAuthor">Bierman, A.</span>, <span class="refAuthor">Bjorklund, M.</span>, and <span class="refAuthor">K. Watsen</span>, <span class="refTitle">"RESTCONF Protocol"</span>, <span class="seriesInfo">RFC 8040</span>, <span class="seriesInfo">DOI 10.17487/RFC8040</span>, <time datetime="2017-01" class="refDate">January 2017</time>, <span>&lt;<a href="https://www.rfc-editor.org/rfc/rfc8040">https://www.rfc-editor.org/rfc/rfc8040</a>&gt;</span>. </dd>
-<dd class="break"></dd>
 <dt id="RFC8174">[RFC8174]</dt>
         <dd>
 <span class="refAuthor">Leiba, B.</span>, <span class="refTitle">"Ambiguity of Uppercase vs Lowercase in RFC 2119 Key Words"</span>, <span class="seriesInfo">BCP 14</span>, <span class="seriesInfo">RFC 8174</span>, <span class="seriesInfo">DOI 10.17487/RFC8174</span>, <time datetime="2017-05" class="refDate">May 2017</time>, <span>&lt;<a href="https://www.rfc-editor.org/rfc/rfc8174">https://www.rfc-editor.org/rfc/rfc8174</a>&gt;</span>. </dd>
@@ -3451,10 +3461,6 @@ <h3 id="name-normative-references">
         <dd>
 <span class="refAuthor">Bjorklund, M.</span>, <span class="refAuthor">Schoenwaelder, J.</span>, <span class="refAuthor">Shafer, P.</span>, <span class="refAuthor">Watsen, K.</span>, and <span class="refAuthor">R. Wilton</span>, <span class="refTitle">"Network Management Datastore Architecture (NMDA)"</span>, <span class="seriesInfo">RFC 8342</span>, <span class="seriesInfo">DOI 10.17487/RFC8342</span>, <time datetime="2018-03" class="refDate">March 2018</time>, <span>&lt;<a href="https://www.rfc-editor.org/rfc/rfc8342">https://www.rfc-editor.org/rfc/rfc8342</a>&gt;</span>. </dd>
 <dd class="break"></dd>
-<dt id="RFC8446">[RFC8446]</dt>
-        <dd>
-<span class="refAuthor">Rescorla, E.</span>, <span class="refTitle">"The Transport Layer Security (TLS) Protocol Version 1.3"</span>, <span class="seriesInfo">RFC 8446</span>, <span class="seriesInfo">DOI 10.17487/RFC8446</span>, <time datetime="2018-08" class="refDate">August 2018</time>, <span>&lt;<a href="https://www.rfc-editor.org/rfc/rfc8446">https://www.rfc-editor.org/rfc/rfc8446</a>&gt;</span>. </dd>
-<dd class="break"></dd>
 <dt id="RFC8519">[RFC8519]</dt>
         <dd>
 <span class="refAuthor">Jethanandani, M.</span>, <span class="refAuthor">Agarwal, S.</span>, <span class="refAuthor">Huang, L.</span>, and <span class="refAuthor">D. Blair</span>, <span class="refTitle">"YANG Data Model for Network Access Control Lists (ACLs)"</span>, <span class="seriesInfo">RFC 8519</span>, <span class="seriesInfo">DOI 10.17487/RFC8519</span>, <time datetime="2019-03" class="refDate">March 2019</time>, <span>&lt;<a href="https://www.rfc-editor.org/rfc/rfc8519">https://www.rfc-editor.org/rfc/rfc8519</a>&gt;</span>. </dd>
@@ -3478,7 +3484,7 @@ <h3 id="name-informative-references">
 <dl class="references">
 <dt id="I-D.ietf-netmod-rfc8407bis">[I-D.ietf-netmod-rfc8407bis]</dt>
         <dd>
-<span class="refAuthor">Bierman, A.</span>, <span class="refAuthor">Boucadair, M.</span>, and <span class="refAuthor">Q. Wu</span>, <span class="refTitle">"Guidelines for Authors and Reviewers of Documents Containing YANG Data Models"</span>, <span class="refContent">Work in Progress</span>, <span class="seriesInfo">Internet-Draft, draft-ietf-netmod-rfc8407bis-19</span>, <time datetime="2024-10-21" class="refDate">21 October 2024</time>, <span>&lt;<a href="https://datatracker.ietf.org/doc/html/draft-ietf-netmod-rfc8407bis-19">https://datatracker.ietf.org/doc/html/draft-ietf-netmod-rfc8407bis-19</a>&gt;</span>. </dd>
+<span class="refAuthor">Bierman, A.</span>, <span class="refAuthor">Boucadair, M.</span>, and <span class="refAuthor">Q. Wu</span>, <span class="refTitle">"Guidelines for Authors and Reviewers of Documents Containing YANG Data Models"</span>, <span class="refContent">Work in Progress</span>, <span class="seriesInfo">Internet-Draft, draft-ietf-netmod-rfc8407bis-21</span>, <time datetime="2024-11-13" class="refDate">13 November 2024</time>, <span>&lt;<a href="https://datatracker.ietf.org/doc/html/draft-ietf-netmod-rfc8407bis-21">https://datatracker.ietf.org/doc/html/draft-ietf-netmod-rfc8407bis-21</a>&gt;</span>. </dd>
 <dd class="break"></dd>
 <dt id="IANA-ICMPv4">[IANA-ICMPv4]</dt>
         <dd>
@@ -3492,6 +3498,10 @@ <h3 id="name-informative-references">
         <dd>
 <span class="refTitle">"IPv6 Extension Header Types"</span>, <span>n.d.</span>, <span>&lt;<a href="https://www.iana.org/assignments/ipv6-parameters/ipv6-parameters.xhtml">https://www.iana.org/assignments/ipv6-parameters/ipv6-parameters.xhtml</a>&gt;</span>. </dd>
 <dd class="break"></dd>
+<dt id="IANA-TCP-FLAGS">[IANA-TCP-FLAGS]</dt>
+        <dd>
+<span class="refTitle">"Transmission Control Protocol (TCP) Parameters"</span>, <span>n.d.</span>, <span>&lt;<a href="https://www.iana.org/assignments/tcp-parameters/">https://www.iana.org/assignments/tcp-parameters/</a>&gt;</span>. </dd>
+<dd class="break"></dd>
 <dt id="IANA-YANG-PARAMETERS">[IANA-YANG-PARAMETERS]</dt>
         <dd>
 <span class="refTitle">"YANG Parameters"</span>, <span>n.d.</span>, <span>&lt;<a href="https://www.iana.org/assignments/yang-parameters">https://www.iana.org/assignments/yang-parameters</a>&gt;</span>. </dd>
@@ -3520,10 +3530,18 @@ <h3 id="name-informative-references">
         <dd>
 <span class="refAuthor">Bradner, S.</span> and <span class="refAuthor">V. Paxson</span>, <span class="refTitle">"IANA Allocation Guidelines For Values In the Internet Protocol and Related Headers"</span>, <span class="seriesInfo">BCP 37</span>, <span class="seriesInfo">RFC 2780</span>, <span class="seriesInfo">DOI 10.17487/RFC2780</span>, <time datetime="2000-03" class="refDate">March 2000</time>, <span>&lt;<a href="https://www.rfc-editor.org/rfc/rfc2780">https://www.rfc-editor.org/rfc/rfc2780</a>&gt;</span>. </dd>
 <dd class="break"></dd>
+<dt id="RFC4252">[RFC4252]</dt>
+        <dd>
+<span class="refAuthor">Ylonen, T.</span> and <span class="refAuthor">C. Lonvick, Ed.</span>, <span class="refTitle">"The Secure Shell (SSH) Authentication Protocol"</span>, <span class="seriesInfo">RFC 4252</span>, <span class="seriesInfo">DOI 10.17487/RFC4252</span>, <time datetime="2006-01" class="refDate">January 2006</time>, <span>&lt;<a href="https://www.rfc-editor.org/rfc/rfc4252">https://www.rfc-editor.org/rfc/rfc4252</a>&gt;</span>. </dd>
+<dd class="break"></dd>
 <dt id="RFC5237">[RFC5237]</dt>
         <dd>
 <span class="refAuthor">Arkko, J.</span> and <span class="refAuthor">S. Bradner</span>, <span class="refTitle">"IANA Allocation Guidelines for the Protocol Field"</span>, <span class="seriesInfo">BCP 37</span>, <span class="seriesInfo">RFC 5237</span>, <span class="seriesInfo">DOI 10.17487/RFC5237</span>, <time datetime="2008-02" class="refDate">February 2008</time>, <span>&lt;<a href="https://www.rfc-editor.org/rfc/rfc5237">https://www.rfc-editor.org/rfc/rfc5237</a>&gt;</span>. </dd>
 <dd class="break"></dd>
+<dt id="RFC6241">[RFC6241]</dt>
+        <dd>
+<span class="refAuthor">Enns, R., Ed.</span>, <span class="refAuthor">Bjorklund, M., Ed.</span>, <span class="refAuthor">Schoenwaelder, J., Ed.</span>, and <span class="refAuthor">A. Bierman, Ed.</span>, <span class="refTitle">"Network Configuration Protocol (NETCONF)"</span>, <span class="seriesInfo">RFC 6241</span>, <span class="seriesInfo">DOI 10.17487/RFC6241</span>, <time datetime="2011-06" class="refDate">June 2011</time>, <span>&lt;<a href="https://www.rfc-editor.org/rfc/rfc6241">https://www.rfc-editor.org/rfc/rfc6241</a>&gt;</span>. </dd>
+<dd class="break"></dd>
 <dt id="RFC7045">[RFC7045]</dt>
         <dd>
 <span class="refAuthor">Carpenter, B.</span> and <span class="refAuthor">S. Jiang</span>, <span class="refTitle">"Transmission and Processing of IPv6 Extension Headers"</span>, <span class="seriesInfo">RFC 7045</span>, <span class="seriesInfo">DOI 10.17487/RFC7045</span>, <time datetime="2013-12" class="refDate">December 2013</time>, <span>&lt;<a href="https://www.rfc-editor.org/rfc/rfc7045">https://www.rfc-editor.org/rfc/rfc7045</a>&gt;</span>. </dd>
@@ -3532,10 +3550,18 @@ <h3 id="name-informative-references">
         <dd>
 <span class="refAuthor">Sajassi, A.</span>, <span class="refAuthor">Aggarwal, R.</span>, <span class="refAuthor">Uttaro, J.</span>, <span class="refAuthor">Bitar, N.</span>, <span class="refAuthor">Henderickx, W.</span>, and <span class="refAuthor">A. Isaac</span>, <span class="refTitle">"Requirements for Ethernet VPN (EVPN)"</span>, <span class="seriesInfo">RFC 7209</span>, <span class="seriesInfo">DOI 10.17487/RFC7209</span>, <time datetime="2014-05" class="refDate">May 2014</time>, <span>&lt;<a href="https://www.rfc-editor.org/rfc/rfc7209">https://www.rfc-editor.org/rfc/rfc7209</a>&gt;</span>. </dd>
 <dd class="break"></dd>
+<dt id="RFC8040">[RFC8040]</dt>
+        <dd>
+<span class="refAuthor">Bierman, A.</span>, <span class="refAuthor">Bjorklund, M.</span>, and <span class="refAuthor">K. Watsen</span>, <span class="refTitle">"RESTCONF Protocol"</span>, <span class="seriesInfo">RFC 8040</span>, <span class="seriesInfo">DOI 10.17487/RFC8040</span>, <time datetime="2017-01" class="refDate">January 2017</time>, <span>&lt;<a href="https://www.rfc-editor.org/rfc/rfc8040">https://www.rfc-editor.org/rfc/rfc8040</a>&gt;</span>. </dd>
+<dd class="break"></dd>
 <dt id="RFC8340">[RFC8340]</dt>
         <dd>
 <span class="refAuthor">Bjorklund, M.</span> and <span class="refAuthor">L. Berger, Ed.</span>, <span class="refTitle">"YANG Tree Diagrams"</span>, <span class="seriesInfo">BCP 215</span>, <span class="seriesInfo">RFC 8340</span>, <span class="seriesInfo">DOI 10.17487/RFC8340</span>, <time datetime="2018-03" class="refDate">March 2018</time>, <span>&lt;<a href="https://www.rfc-editor.org/rfc/rfc8340">https://www.rfc-editor.org/rfc/rfc8340</a>&gt;</span>. </dd>
 <dd class="break"></dd>
+<dt id="RFC8446">[RFC8446]</dt>
+        <dd>
+<span class="refAuthor">Rescorla, E.</span>, <span class="refTitle">"The Transport Layer Security (TLS) Protocol Version 1.3"</span>, <span class="seriesInfo">RFC 8446</span>, <span class="seriesInfo">DOI 10.17487/RFC8446</span>, <time datetime="2018-08" class="refDate">August 2018</time>, <span>&lt;<a href="https://www.rfc-editor.org/rfc/rfc8446">https://www.rfc-editor.org/rfc/rfc8446</a>&gt;</span>. </dd>
+<dd class="break"></dd>
 <dt id="RFC8955">[RFC8955]</dt>
         <dd>
 <span class="refAuthor">Loibl, C.</span>, <span class="refAuthor">Hares, S.</span>, <span class="refAuthor">Raszuk, R.</span>, <span class="refAuthor">McPherson, D.</span>, and <span class="refAuthor">M. Bacher</span>, <span class="refTitle">"Dissemination of Flow Specification Rules"</span>, <span class="seriesInfo">RFC 8955</span>, <span class="seriesInfo">DOI 10.17487/RFC8955</span>, <time datetime="2020-12" class="refDate">December 2020</time>, <span>&lt;<a href="https://www.rfc-editor.org/rfc/rfc8955">https://www.rfc-editor.org/rfc/rfc8955</a>&gt;</span>. </dd>
@@ -4963,15 +4989,15 @@ <h2 id="name-examples">
 <a href="#appendix-E" class="section-number selfRef">Appendix E. </a><a href="#name-examples" class="section-name selfRef">Examples</a>
       </h2>
 <p id="appendix-E-1">This section provides a few examples to illustrate the use of the enhanced ACL module ("ietf-acl-enh").<a href="#appendix-E-1" class="pilcrow">¶</a></p>
-<p id="appendix-E-2"><a href="#example_4" class="auto internal xref">Figure 4</a> shows an example of the message body of a request to install a filter to discard incoming TCP messages having all flags unset.<a href="#appendix-E-2" class="pilcrow">¶</a></p>
 <div id="tcp-flags-handling-1">
 <section id="appendix-E.1">
         <h3 id="name-tcp-flags-handling-2">
 <a href="#appendix-E.1" class="section-number selfRef">E.1. </a><a href="#name-tcp-flags-handling-2" class="section-name selfRef">TCP Flags Handling</a>
         </h3>
+<p id="appendix-E.1-1"><a href="#example_4" class="auto internal xref">Figure 4</a> shows an example of the message body of a request to install a filter to discard incoming TCP messages having all flags unset.<a href="#appendix-E.1-1" class="pilcrow">¶</a></p>
 <span id="name-example-of-an-acl-to-deny-t"></span><div id="example_4">
 <figure id="figure-4">
-          <div class="lang-json sourcecode" id="appendix-E.1-1.1">
+          <div class="lang-json sourcecode" id="appendix-E.1-2.1">
 <pre>
 {
   "ietf-access-control-list:acls": {
@@ -5286,9 +5312,10 @@ <h2 id="name-acknowledgements">
 <p id="appendix-F-1">Many thanks to Jon Shallow and Miguel Cros for the review and comments to the document, including prior to publishing the document.<a href="#appendix-F-1" class="pilcrow">¶</a></p>
 <p id="appendix-F-2">Thanks to Qiufang Ma, Victor Lopez, Joe Clarke, and Mahesh Jethanandani for the comments and suggestions.<a href="#appendix-F-2" class="pilcrow">¶</a></p>
 <p id="appendix-F-3">Thanks to Lou Berger for Shepherding the document.<a href="#appendix-F-3" class="pilcrow">¶</a></p>
-<p id="appendix-F-4">The IANA-maintained modules were generated using an XSLT stylesheet from the 'iana-yang' project (https://github.com/llhotka/iana-yang).<a href="#appendix-F-4" class="pilcrow">¶</a></p>
-<p id="appendix-F-5">This work is partially supported by the European Commission under   Horizon 2020 Secured autonomic traffic management for a Tera of SDN
-flows (Teraflow) project (grant agreement number 101015857).<a href="#appendix-F-5" class="pilcrow">¶</a></p>
+<p id="appendix-F-4">Thanks to David Black for the TSV review and Tim Wicinski for the intdir review.<a href="#appendix-F-4" class="pilcrow">¶</a></p>
+<p id="appendix-F-5">The IANA-maintained modules were generated using an XSLT stylesheet from the 'iana-yang' project (https://github.com/llhotka/iana-yang).<a href="#appendix-F-5" class="pilcrow">¶</a></p>
+<p id="appendix-F-6">This work is partially supported by the European Commission under   Horizon 2020 Secured autonomic traffic management for a Tera of SDN
+flows (Teraflow) project (grant agreement number 101015857).<a href="#appendix-F-6" class="pilcrow">¶</a></p>
 </section>
 </div>
 <div id="authors-addresses">
diff --git a/draft-ietf-netmod-acl-extensions-11/draft-ietf-netmod-acl-extensions.txt b/draft-ietf-netmod-acl-extensions-12/draft-ietf-netmod-acl-extensions.txt
similarity index 97%
rename from draft-ietf-netmod-acl-extensions-11/draft-ietf-netmod-acl-extensions.txt
rename to draft-ietf-netmod-acl-extensions-12/draft-ietf-netmod-acl-extensions.txt
index 0daad8a..8acbc39 100644
--- a/draft-ietf-netmod-acl-extensions-11/draft-ietf-netmod-acl-extensions.txt
+++ b/draft-ietf-netmod-acl-extensions-12/draft-ietf-netmod-acl-extensions.txt
@@ -5,12 +5,12 @@
 netmod                                                     O. G. D. Dios
 Internet-Draft                                                Telefonica
 Intended status: Standards Track                              S. Barguil
-Expires: 24 April 2025                                             Nokia
+Expires: 31 May 2025                                               Nokia
                                                             M. Boucadair
                                                                   Orange
                                                                    Q. Wu
                                                                   Huawei
-                                                         21 October 2024
+                                                        27 November 2024
 
 
         Extensions to the Access Control Lists (ACLs) YANG Model
@@ -51,7 +51,7 @@ Status of This Memo
    time.  It is inappropriate to use Internet-Drafts as reference
    material or to cite them other than as "work in progress."
 
-   This Internet-Draft will expire on 24 April 2025.
+   This Internet-Draft will expire on 31 May 2025.
 
 Copyright Notice
 
@@ -252,7 +252,7 @@ Table of Contents
        +--rw (payload)?
        |  +--:(prefix-pattern)
        |     +--rw prefix-pattern {match-on-payload}?
-       |        +---u payload
+       |        +---u payload-match
        +--rw (alias)?
        |  +--:(alias-name)
        |     +--rw alias-name*       alias-ref
@@ -334,7 +334,7 @@ Table of Contents
        +-- lower-label-range?   rt-types:mpls-label
        +-- label-block-name?    string
        +-- ttl-value?           uint8
-     grouping payload:
+     grouping payload-match:
        +-- offset?       identityref
        +-- offset-end?   uint64
        +-- operator?     operator
@@ -467,7 +467,10 @@ Table of Contents
 3.4.  TCP Flags Handling
 
    The augmented ACL structure (Figure 1) includes a new container
-   'flags-bitmask' to better handle TCP flags [RFC9293].
+   'flags-bitmask' to better handle TCP flags (Section 3.1 of
+   [RFC9293]).  Assigned TCP flags are maintained in the "TCP Header
+   Flags" registry under the "Transmission Control Protocol (TCP)
+   Parameters" registry group [IANA-TCP-FLAGS].
 
    Clients that support both 'flags-bitmask' and 'flags' [RFC8519]
    matching fields MUST NOT set these fields in the same request.
@@ -964,13 +967,18 @@ Table of Contents
            leaf bitmask {
              type uint16;
              description
-               "The bitmask matches the last 4 bits of byte 12 and 13 of
-                the TCP header.  For clarity, the 4 bits of byte 12
+               "The bitmask matches the last 4 bits of byte 13
+                and byte 14 of the TCP header.
+                For clarity, the 4 bits of byte 12
                 corresponding to the TCP data offset field are not
-                included in any matching.";
+                included in any matching.
+                Assigned TCP flags and their position are maintained
+                in the IANA'Transmission Control Protocol (TCP)
+                Parameters' registry group.";
              reference
                "RFC 9293: Transmission Control Protocol (TCP),
-                          Section 3.1";
+                          Section 3.1
+                https://www.iana.org/assignments/tcp-parameters";
            }
          }
        }
@@ -1047,7 +1055,7 @@ Table of Contents
        }
      }
 
-     grouping payload {
+     grouping payload-match {
        description
          "Operations on payload match.";
        leaf offset {
@@ -1495,7 +1503,7 @@ Table of Contents
            if-feature "match-on-payload";
            description
              "Indicates the rule to perform the payload-based match.";
-           uses payload;
+           uses payload-match;
          }
        }
        choice alias {
@@ -1771,13 +1779,14 @@ Table of Contents
 
 5.  Security Considerations
 
-   The YANG modules specified in this document define a schema for data
-   that is designed to be accessed via network management protocol such
-   as NETCONF [RFC6241] or RESTCONF [RFC8040].  The lowest NETCONF layer
-   is the secure transport layer, and the mandatory-to-implement secure
-   transport is Secure Shell (SSH) [RFC6242].  The lowest RESTCONF layer
-   is HTTPS, and the mandatory-to-implement secure transport is TLS
-   [RFC8446].
+   This section is modeled after the template described in Section 3.7
+   of [I-D.ietf-netmod-rfc8407bis].
+
+   The "ietf-acl-enh" YANG module defines a data model that is designed
+   to be accessed via YANG-based management protocols, such as NETCONF
+   [RFC6241] and RESTCONF [RFC8040].  These protocols have to use a
+   secure transport layer (e.g., SSH [RFC4252], TLS [RFC8446], and QUIC
+   [RFC9000]) and have to use mutual authentication.
 
    The Network Configuration Access Control Model (NACM) [RFC8341]
    provides the means to restrict access for particular NETCONF or
@@ -1809,6 +1818,13 @@ Table of Contents
       an attacker to identify the actual resources that are bound to
       ACLs.
 
+   The document defines a match policy based on a pattern that can be
+   observed in a packet.  For example, such a policy can be combined
+   with header-based matches in the context of DDoS mitigation.
+   Filtering based on a pattern match is deterministic for packets with
+   unencrypted data.  However, the efficiency for encrypted packets
+   depend on the presence of an unvarying pattern.
+
    The YANG modules "iana-icmpv4-types", "iana-icmpv6-types", and "iana-
    ipv6-ext-types defines" a set of types.  These nodes are intended to
    be reused by other YANG modules.  Each of these modules by itself
@@ -1895,7 +1911,8 @@ Table of Contents
    module.  The "enum" statement, and sub-statements thereof, should be
    defined:
 
-   "enum":  Replicates a name from the registry.
+   "enum":  Replicates the name from the registry with all spaces
+      striped.
 
    "value":  Contains the decimal value of the IANA-assigned value.
 
@@ -1903,7 +1920,7 @@ Table of Contents
       obsoleted.  IANA "deprecated" maps to YANG status "deprecated",
       and IANA "obsolete" maps to YANG status "obsolete".
 
-   "description":  Replicates the description from the registry.
+   "description":  Replicates the name from the registry.
 
    "reference":  Replicates the reference(s) from the registry with the
       title of the document(s) added.
@@ -1950,7 +1967,8 @@ Table of Contents
    module.  The "enum" statement, and sub-statements thereof, should be
    defined:
 
-   "enum":  Replicates a name from the registry.
+   "enum":  Replicates the name from the registry with all spaces
+      striped.
 
    "value":  Contains the decimal value of the IANA-assigned value.
 
@@ -1958,7 +1976,7 @@ Table of Contents
       obsoleted.  IANA "deprecated" maps to YANG status "deprecated",
       and IANA "obsolete" maps to YANG status "obsolete".
 
-   "description":  Replicates the description from the registry.
+   "description":  Replicates the name from the registry.
 
    "reference":  Replicates the reference(s) from the registry with the
       title of the document(s) added.
@@ -2005,7 +2023,8 @@ Table of Contents
    YANG module.  The "enum" statement, and sub-statements thereof,
    should be defined:
 
-   "enum":  Replicates a name from the registry.
+   "enum":  Replicates the description from the registry with all spaces
+      striped.
 
    "value":  Contains the decimal value of the IANA-assigned value.
 
@@ -2075,15 +2094,6 @@ Table of Contents
               DOI 10.17487/RFC6020, October 2010,
               <https://www.rfc-editor.org/rfc/rfc6020>.
 
-   [RFC6241]  Enns, R., Ed., Bjorklund, M., Ed., Schoenwaelder, J., Ed.,
-              and A. Bierman, Ed., "Network Configuration Protocol
-              (NETCONF)", RFC 6241, DOI 10.17487/RFC6241, June 2011,
-              <https://www.rfc-editor.org/rfc/rfc6241>.
-
-   [RFC6242]  Wasserman, M., "Using the NETCONF Protocol over Secure
-              Shell (SSH)", RFC 6242, DOI 10.17487/RFC6242, June 2011,
-              <https://www.rfc-editor.org/rfc/rfc6242>.
-
    [RFC6991]  Schoenwaelder, J., Ed., "Common YANG Data Types",
               RFC 6991, DOI 10.17487/RFC6991, July 2013,
               <https://www.rfc-editor.org/rfc/rfc6991>.
@@ -2092,10 +2102,6 @@ Table of Contents
               RFC 7950, DOI 10.17487/RFC7950, August 2016,
               <https://www.rfc-editor.org/rfc/rfc7950>.
 
-   [RFC8040]  Bierman, A., Bjorklund, M., and K. Watsen, "RESTCONF
-              Protocol", RFC 8040, DOI 10.17487/RFC8040, January 2017,
-              <https://www.rfc-editor.org/rfc/rfc8040>.
-
    [RFC8174]  Leiba, B., "Ambiguity of Uppercase vs Lowercase in RFC
               2119 Key Words", BCP 14, RFC 8174, DOI 10.17487/RFC8174,
               May 2017, <https://www.rfc-editor.org/rfc/rfc8174>.
@@ -2120,10 +2126,6 @@ Table of Contents
               (NMDA)", RFC 8342, DOI 10.17487/RFC8342, March 2018,
               <https://www.rfc-editor.org/rfc/rfc8342>.
 
-   [RFC8446]  Rescorla, E., "The Transport Layer Security (TLS) Protocol
-              Version 1.3", RFC 8446, DOI 10.17487/RFC8446, August 2018,
-              <https://www.rfc-editor.org/rfc/rfc8446>.
-
    [RFC8519]  Jethanandani, M., Agarwal, S., Huang, L., and D. Blair,
               "YANG Data Model for Network Access Control Lists (ACLs)",
               RFC 8519, DOI 10.17487/RFC8519, March 2019,
@@ -2144,9 +2146,9 @@ Table of Contents
               Bierman, A., Boucadair, M., and Q. Wu, "Guidelines for
               Authors and Reviewers of Documents Containing YANG Data
               Models", Work in Progress, Internet-Draft, draft-ietf-
-              netmod-rfc8407bis-19, 21 October 2024,
+              netmod-rfc8407bis-21, 13 November 2024,
               <https://datatracker.ietf.org/doc/html/draft-ietf-netmod-
-              rfc8407bis-19>.
+              rfc8407bis-21>.
 
    [IANA-ICMPv4]
               "ICMP Type Numbers", n.d.,
@@ -2163,6 +2165,10 @@ Table of Contents
               <https://www.iana.org/assignments/ipv6-parameters/
               ipv6-parameters.xhtml>.
 
+   [IANA-TCP-FLAGS]
+              "Transmission Control Protocol (TCP) Parameters", n.d.,
+              <https://www.iana.org/assignments/tcp-parameters/>.
+
    [IANA-YANG-PARAMETERS]
               "YANG Parameters", n.d.,
               <https://www.iana.org/assignments/yang-parameters>.
@@ -2199,11 +2205,20 @@ Table of Contents
               BCP 37, RFC 2780, DOI 10.17487/RFC2780, March 2000,
               <https://www.rfc-editor.org/rfc/rfc2780>.
 
+   [RFC4252]  Ylonen, T. and C. Lonvick, Ed., "The Secure Shell (SSH)
+              Authentication Protocol", RFC 4252, DOI 10.17487/RFC4252,
+              January 2006, <https://www.rfc-editor.org/rfc/rfc4252>.
+
    [RFC5237]  Arkko, J. and S. Bradner, "IANA Allocation Guidelines for
               the Protocol Field", BCP 37, RFC 5237,
               DOI 10.17487/RFC5237, February 2008,
               <https://www.rfc-editor.org/rfc/rfc5237>.
 
+   [RFC6241]  Enns, R., Ed., Bjorklund, M., Ed., Schoenwaelder, J., Ed.,
+              and A. Bierman, Ed., "Network Configuration Protocol
+              (NETCONF)", RFC 6241, DOI 10.17487/RFC6241, June 2011,
+              <https://www.rfc-editor.org/rfc/rfc6241>.
+
    [RFC7045]  Carpenter, B. and S. Jiang, "Transmission and Processing
               of IPv6 Extension Headers", RFC 7045,
               DOI 10.17487/RFC7045, December 2013,
@@ -2214,10 +2229,18 @@ Table of Contents
               VPN (EVPN)", RFC 7209, DOI 10.17487/RFC7209, May 2014,
               <https://www.rfc-editor.org/rfc/rfc7209>.
 
+   [RFC8040]  Bierman, A., Bjorklund, M., and K. Watsen, "RESTCONF
+              Protocol", RFC 8040, DOI 10.17487/RFC8040, January 2017,
+              <https://www.rfc-editor.org/rfc/rfc8040>.
+
    [RFC8340]  Bjorklund, M. and L. Berger, Ed., "YANG Tree Diagrams",
               BCP 215, RFC 8340, DOI 10.17487/RFC8340, March 2018,
               <https://www.rfc-editor.org/rfc/rfc8340>.
 
+   [RFC8446]  Rescorla, E., "The Transport Layer Security (TLS) Protocol
+              Version 1.3", RFC 8446, DOI 10.17487/RFC8446, August 2018,
+              <https://www.rfc-editor.org/rfc/rfc8446>.
+
    [RFC8955]  Loibl, C., Hares, S., Raszuk, R., McPherson, D., and M.
               Bacher, "Dissemination of Flow Specification Rules",
               RFC 8955, DOI 10.17487/RFC8955, December 2020,
@@ -3537,11 +3560,11 @@ Appendix E.  Examples
    This section provides a few examples to illustrate the use of the
    enhanced ACL module ("ietf-acl-enh").
 
+E.1.  TCP Flags Handling
+
    Figure 4 shows an example of the message body of a request to install
    a filter to discard incoming TCP messages having all flags unset.
 
-E.1.  TCP Flags Handling
-
    {
      "ietf-access-control-list:acls": {
        "acl": [
@@ -3805,6 +3828,9 @@ Acknowledgements
 
    Thanks to Lou Berger for Shepherding the document.
 
+   Thanks to David Black for the TSV review and Tim Wicinski for the
+   intdir review.
+
    The IANA-maintained modules were generated using an XSLT stylesheet
    from the 'iana-yang' project (https://github.com/llhotka/iana-yang).
 
diff --git a/draft-ietf-netmod-acl-extensions-11/index.html b/draft-ietf-netmod-acl-extensions-12/index.html
similarity index 89%
rename from draft-ietf-netmod-acl-extensions-11/index.html
rename to draft-ietf-netmod-acl-extensions-12/index.html
index bb11ce7..567ce00 100644
--- a/draft-ietf-netmod-acl-extensions-11/index.html
+++ b/draft-ietf-netmod-acl-extensions-12/index.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
   <head>
-    <title>netmod-wg/enhanced-acl-netmod draft-ietf-netmod-acl-extensions-11 preview</title>
+    <title>netmod-wg/enhanced-acl-netmod draft-ietf-netmod-acl-extensions-12 preview</title>
     <meta name="viewport" content="initial-scale=1.0">
     <style type="text/css">/*<![CDATA[*/
       body { font-family: "Helvetica Neue","Open Sans", Helvetica, Calibri,sans-serif; }
@@ -13,8 +13,8 @@
     /*]]>*/</style>
   </head>
   <body>
-    <h1>Editor's drafts for draft-ietf-netmod-acl-extensions-11 branch of <a href="https://github.com/netmod-wg/enhanced-acl-netmod/tree/draft-ietf-netmod-acl-extensions-11">netmod-wg/enhanced-acl-netmod</a></h1>
-    <table id="branch-draft-ietf-netmod-acl-extensions-11">
+    <h1>Editor's drafts for draft-ietf-netmod-acl-extensions-12 branch of <a href="https://github.com/netmod-wg/enhanced-acl-netmod/tree/draft-ietf-netmod-acl-extensions-12">netmod-wg/enhanced-acl-netmod</a></h1>
+    <table id="branch-draft-ietf-netmod-acl-extensions-12">
       <tr>
         <td><a href="./draft-ietf-netmod-acl-extensions.html" class="html draft-ietf-netmod-acl-extensions" title="Extensions to the Access Control Lists (ACLs) YANG Model (HTML)">Enhanced ACLs</a></td>
         <td><a href="./draft-ietf-netmod-acl-extensions.txt" class="txt draft-ietf-netmod-acl-extensions" title="Extensions to the Access Control Lists (ACLs) YANG Model (Text)">plain text</a></td>
diff --git a/index.html b/index.html
index add5ab9..39cb242 100644
--- a/index.html
+++ b/index.html
@@ -24,6 +24,14 @@ <h1>Editor's drafts for main branch of <a href="https://github.com/netmod-wg/enh
         <td></td>
       </tr>
     </table>
+    <h2>Preview for branch <a href="draft-ietf-netmod-acl-extensions-12">draft-ietf-netmod-acl-extensions-12</a></h2>
+    <table id="branch-draft-ietf-netmod-acl-extensions-12">
+      <tr>
+        <td><a href="draft-ietf-netmod-acl-extensions-12/draft-ietf-netmod-acl-extensions.html" class="html draft-ietf-netmod-acl-extensions" title="Extensions to the Access Control Lists (ACLs) YANG Model (HTML)">Enhanced ACLs</a></td>
+        <td><a href="draft-ietf-netmod-acl-extensions-12/draft-ietf-netmod-acl-extensions.txt" class="txt draft-ietf-netmod-acl-extensions" title="Extensions to the Access Control Lists (ACLs) YANG Model (Text)">plain text</a></td>
+        <td>same as main</td>
+      </tr>
+    </table>
     <h2>Preview for branch <a href="TSV-review">TSV-review</a></h2>
     <table id="branch-TSV-review">
       <tr>
@@ -32,14 +40,6 @@ <h2>Preview for branch <a href="TSV-review">TSV-review</a></h2>
         <td><a href="https://author-tools.ietf.org/api/iddiff?url_1=https://netmod-wg.github.io/enhanced-acl-netmod/draft-ietf-netmod-acl-extensions.txt&amp;url_2=https://netmod-wg.github.io/enhanced-acl-netmod/TSV-review/draft-ietf-netmod-acl-extensions.txt" class="diff draft-ietf-netmod-acl-extensions">diff with main</a></td>
       </tr>
     </table>
-    <h2>Preview for branch <a href="draft-ietf-netmod-acl-extensions-11">draft-ietf-netmod-acl-extensions-11</a></h2>
-    <table id="branch-draft-ietf-netmod-acl-extensions-11">
-      <tr>
-        <td><a href="draft-ietf-netmod-acl-extensions-11/draft-ietf-netmod-acl-extensions.html" class="html draft-ietf-netmod-acl-extensions" title="Extensions to the Access Control Lists (ACLs) YANG Model (HTML)">Enhanced ACLs</a></td>
-        <td><a href="draft-ietf-netmod-acl-extensions-11/draft-ietf-netmod-acl-extensions.txt" class="txt draft-ietf-netmod-acl-extensions" title="Extensions to the Access Control Lists (ACLs) YANG Model (Text)">plain text</a></td>
-        <td><a href="https://author-tools.ietf.org/api/iddiff?url_1=https://netmod-wg.github.io/enhanced-acl-netmod/draft-ietf-netmod-acl-extensions.txt&amp;url_2=https://netmod-wg.github.io/enhanced-acl-netmod/draft-ietf-netmod-acl-extensions-11/draft-ietf-netmod-acl-extensions.txt" class="diff draft-ietf-netmod-acl-extensions">diff with main</a></td>
-      </tr>
-    </table>
     <h2>Preview for branch <a href="bug-iana-and-example">bug-iana-and-example</a></h2>
     <table id="branch-bug-iana-and-example">
       <tr>